Moves JSO classes into org.teavm.jso. Fixes bug in StringBuilder

teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TAbstractStringBuilder.java

@@ -623,7 +623,7 @@ class TAbstractStringBuilder extends TObject implements TSerializable, TCharSequ
         if (start > end || end > s.length() || start < 0) {
             throw new TIndexOutOfBoundsException();
         }
-        insertSpace(index, index + end - start + length);
+        insertSpace(index, index + end - start);
         for (int i = start; i < end; ++i) {
             buffer[index++] = s.charAt(i);
         }

teavm-dom/src/main/java/org/teavm/dom/browser/TimerHandler.java

@@ -15,8 +15,8 @@
  */
 package org.teavm.dom.browser;
 
-import org.teavm.javascript.ni.JSFunctor;
+import org.teavm.jso.JSFunctor;
-import org.teavm.javascript.ni.JSObject;
+import org.teavm.jso.JSObject;
 
 /**
  *

teavm-dom/src/main/java/org/teavm/dom/browser/Window.java

@@ -17,9 +17,9 @@ package org.teavm.dom.browser;
 
 import org.teavm.dom.core.Document;
 import org.teavm.dom.core.Element;
-import org.teavm.javascript.ni.JSGlobal;
+import org.teavm.jso.JSGlobal;
-import org.teavm.javascript.ni.JSObject;
+import org.teavm.jso.JSObject;
-import org.teavm.javascript.ni.JSProperty;
+import org.teavm.jso.JSProperty;
 
 /**
  *

teavm-dom/src/main/java/org/teavm/dom/core/Attr.java

@@ -15,7 +15,7 @@
  */
 package org.teavm.dom.core;
 
-import org.teavm.javascript.ni.JSProperty;
+import org.teavm.jso.JSProperty;
 
 /**
  *

teavm-dom/src/main/java/org/teavm/dom/core/CharacterData.java

@@ -15,7 +15,7 @@
  */
 package org.teavm.dom.core;
 
-import org.teavm.javascript.ni.JSProperty;
+import org.teavm.jso.JSProperty;
 
 /**
  *

teavm-dom/src/main/java/org/teavm/dom/core/DOMImplementation.java

@@ -15,7 +15,7 @@
  */
 package org.teavm.dom.core;
 
-import org.teavm.javascript.ni.JSObject;
+import org.teavm.jso.JSObject;
 
 /**
  *

teavm-dom/src/main/java/org/teavm/dom/core/Document.java

@@ -15,7 +15,7 @@
  */
 package org.teavm.dom.core;
 
-import org.teavm.javascript.ni.JSProperty;
+import org.teavm.jso.JSProperty;
 
 /**
  *

teavm-dom/src/main/java/org/teavm/dom/core/NamedNodeMap.java

@@ -15,9 +15,9 @@
  */
 package org.teavm.dom.core;
 
-import org.teavm.javascript.ni.JSArray;
+import org.teavm.jso.JSArray;
-import org.teavm.javascript.ni.JSObject;
+import org.teavm.jso.JSObject;
-import org.teavm.javascript.ni.JSProperty;
+import org.teavm.jso.JSProperty;
 
 /**
  *

teavm-dom/src/main/java/org/teavm/dom/core/Node.java

@@ -15,8 +15,8 @@
  */
 package org.teavm.dom.core;
 
-import org.teavm.javascript.ni.JSObject;
+import org.teavm.jso.JSObject;
-import org.teavm.javascript.ni.JSProperty;
+import org.teavm.jso.JSProperty;
 
 /**
  *

teavm-dom/src/main/java/org/teavm/dom/core/NodeList.java

@@ -15,8 +15,8 @@
  */
 package org.teavm.dom.core;
 
-import org.teavm.javascript.ni.JSArray;
+import org.teavm.jso.JSArray;
-import org.teavm.javascript.ni.JSProperty;
+import org.teavm.jso.JSProperty;
 
 /**
  *

teavm-dom/src/main/java/org/teavm/dom/events/Event.java

@@ -15,8 +15,8 @@
  */
 package org.teavm.dom.events;
 
-import org.teavm.javascript.ni.JSObject;
+import org.teavm.jso.JSObject;
-import org.teavm.javascript.ni.JSProperty;
+import org.teavm.jso.JSProperty;
 
 /**
  *

teavm-dom/src/main/java/org/teavm/dom/events/EventListener.java

@@ -15,8 +15,8 @@
  */
 package org.teavm.dom.events;
 
-import org.teavm.javascript.ni.JSFunctor;
+import org.teavm.jso.JSFunctor;
-import org.teavm.javascript.ni.JSObject;
+import org.teavm.jso.JSObject;
 
 /**
  *

teavm-dom/src/main/java/org/teavm/dom/events/EventTarget.java

@@ -15,7 +15,7 @@
  */
 package org.teavm.dom.events;
 
-import org.teavm.javascript.ni.JSObject;
+import org.teavm.jso.JSObject;
 
 /**
  *

teavm-jso/src/main/java/org/teavm/jso/JS.java

@@ -13,10 +13,12 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.teavm.javascript.ni;
+package org.teavm.jso;
 
 import java.util.Iterator;
 import org.teavm.dependency.PluggableDependency;
+import org.teavm.javascript.ni.GeneratedBy;
+import org.teavm.javascript.ni.InjectedBy;
 
 /**
  *

teavm-jso/src/main/java/org/teavm/jso/JSArray.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.teavm.javascript.ni;
+package org.teavm.jso;
 
 /**
  *

teavm-jso/src/main/java/org/teavm/jso/JSConstructor.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.teavm.javascript.ni;
+package org.teavm.jso;
 
 /**
  *

teavm-jso/src/main/java/org/teavm/jso/JSFunction.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.teavm.javascript.ni;
+package org.teavm.jso;
 
 /**
  *

teavm-jso/src/main/java/org/teavm/jso/JSFunctor.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.teavm.javascript.ni;
+package org.teavm.jso;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

teavm-jso/src/main/java/org/teavm/jso/JSGlobal.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.teavm.javascript.ni;
+package org.teavm.jso;
 
 /**
  *

teavm-jso/src/main/java/org/teavm/jso/JSIndexer.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.teavm.javascript.ni;
+package org.teavm.jso;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

teavm-jso/src/main/java/org/teavm/jso/JSMethod.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.teavm.javascript.ni;
+package org.teavm.jso;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

teavm-jso/src/main/java/org/teavm/jso/JSNativeGenerator.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.teavm.javascript.ni;
+package org.teavm.jso;
 
 import java.io.IOException;
 import org.teavm.codegen.SourceWriter;
@@ -24,6 +24,10 @@ import org.teavm.dependency.MethodDependency;
 import org.teavm.javascript.ast.ConstantExpr;
 import org.teavm.javascript.ast.Expr;
 import org.teavm.javascript.ast.InvocationExpr;
+import org.teavm.javascript.ni.Generator;
+import org.teavm.javascript.ni.GeneratorContext;
+import org.teavm.javascript.ni.Injector;
+import org.teavm.javascript.ni.InjectorContext;
 import org.teavm.model.*;
 
 /**

teavm-jso/src/main/java/org/teavm/jso/JSNumber.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.teavm.javascript.ni;
+package org.teavm.jso;
 
 /**
  *

teavm-jso/src/main/java/org/teavm/jso/JSObject.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.teavm.javascript.ni;
+package org.teavm.jso;
 
 /**
  *

teavm-jso/src/main/java/org/teavm/jso/JSProperty.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.teavm.javascript.ni;
+package org.teavm.jso;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

teavm-jso/src/main/java/org/teavm/jso/JSType.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.teavm.javascript.ni;
+package org.teavm.jso;
 
 /**
  *

teavm-jso/src/main/java/org/teavm/jso/plugin/JSObjectBuilderPlugin.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.teavm.javascript.ni.plugin;
+package org.teavm.jso.plugin;
 
 import org.teavm.vm.spi.TeaVMHost;
 import org.teavm.vm.spi.TeaVMPlugin;

teavm-jso/src/main/java/org/teavm/jso/plugin/JSObjectClassTransformer.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.teavm.javascript.ni.plugin;
+package org.teavm.jso.plugin;
 
 import org.teavm.model.ClassHolder;
 import org.teavm.model.ClassHolderTransformer;

teavm-jso/src/main/java/org/teavm/jso/plugin/JavascriptNativeProcessor.java

@@ -13,10 +13,11 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.teavm.javascript.ni.plugin;
+package org.teavm.jso.plugin;
 
 import java.util.*;
-import org.teavm.javascript.ni.*;
+import org.teavm.javascript.ni.PreserveOriginalName;
+import org.teavm.jso.*;
 import org.teavm.model.*;
 import org.teavm.model.instructions.*;
 

teavm-jso/src/main/java/org/teavm/jso/plugin/NativeJavascriptClassRepository.java

@@ -13,11 +13,11 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.teavm.javascript.ni.plugin;
+package org.teavm.jso.plugin;
 
 import java.util.HashMap;
 import java.util.Map;
-import org.teavm.javascript.ni.JSObject;
+import org.teavm.jso.JSObject;
 import org.teavm.model.ClassReader;
 import org.teavm.model.ClassReaderSource;
 import org.teavm.model.ElementModifier;

teavm-jso/src/main/resources/META-INF/services/org.teavm.vm.spi.TeaVMPlugin

@@ -1 +1 @@
-org.teavm.javascript.ni.plugin.JSObjectBuilderPlugin
+org.teavm.jso.plugin.JSObjectBuilderPlugin

teavm-samples/src/main/java/org/teavm/samples/HelloWorld.java

@@ -21,7 +21,7 @@ import org.teavm.dom.core.Element;
 import org.teavm.dom.events.Event;
 import org.teavm.dom.events.EventListener;
 import org.teavm.dom.events.EventTarget;
-import org.teavm.javascript.ni.JS;
+import org.teavm.jso.JS;
 
 
 /**