Update to use gwt-interop-utils library

Author: Paul Stockley

src/gwt/react/api_sanity_test/apisanitytest.gwt.xml

@@ -3,6 +3,7 @@
     <!-- Inherrit the core Web Toolkit stuff.                        -->
     <inherits name='com.google.gwt.user.User' />
     <inherits name="com.google.gwt.resources.Resources" />
+    <inherits name="gwt.interop.utils.InteropUtils" />
     <inherits name="gwt.react.React" />
 
     <set-property name="user.agent" value="safari"/>

src/gwt/react/api_sanity_test/client/App.java

@@ -1,28 +1,29 @@
 package gwt.react.api_sanity_test.client;
 
 import com.google.gwt.core.client.EntryPoint;
+import com.google.gwt.core.client.GWT;
 import com.google.gwt.dom.client.Document;
 import com.google.gwt.user.client.Window;
+import gwt.interop.utils.client.collections.JsArray;
+import gwt.interop.utils.shared.collections.ArrayListAdapter;
+import gwt.interop.utils.shared.collections.Array;
+import gwt.interop.utils.shared.collections.ArrayFactory;
 import gwt.react.client.api.React;
 import gwt.react.client.api.ReactDOM;
 import gwt.react.client.api.ReactDOMServer;
-import gwt.react.client.components.ReactClass;
 import gwt.react.client.elements.DOMElement;
 import gwt.react.client.proptypes.html.HtmlProps;
 
+import java.util.List;
+
 import static gwt.react.client.api.React.DOM.div;
 
 public class App implements EntryPoint {
 
     @Override
     public void onModuleLoad() {
-        ArrayTests.run();
-        MapTests.run();
-        ObjectLiteralTests.run();
-
-        ReactClass<StatefulReactClassSpec.Props> statefulComponent = React.createClass(new StatefulReactClassSpec());
 
-        StatefulReactClassSpec.Props statefulCompProps = new StatefulReactClassSpec.Props();
+        StatefulExample.Props statefulCompProps = new StatefulExample.Props();
         statefulCompProps.aProp = "aPropValue";
 
         DOMElement<HtmlProps> appComp =
@@ -40,7 +41,7 @@ public void onModuleLoad() {
                     div(null, "Child 1 should be red"),
                     div(null, "Child 2 should be red (should be the last child)")
                 ),
-                React.createElement(statefulComponent, statefulCompProps)
+                React.createElement(StatefulExample.component, statefulCompProps)
             );
 
         ReactDOM.render(appComp, Document.get().getElementById("mainCont"), () -> Window.alert("Rendered"));

src/gwt/react/api_sanity_test/client/ArrayTests.java

@@ -1,13 +1,13 @@
 package gwt.react.api_sanity_test.client;
 
+import gwt.interop.utils.shared.collections.Array;
 import gwt.react.client.api.React;
 import gwt.react.client.components.StatelessComponent;
 import gwt.react.client.elements.ReactElement;
 import gwt.react.client.proptypes.BaseContext;
 import gwt.react.client.proptypes.BaseProps;
 import gwt.react.client.proptypes.html.CssProps;
 import gwt.react.client.proptypes.html.HtmlProps;
-import gwt.react.shared.utils.Array;
 
 import static gwt.react.client.api.GwtReact.castAsReactElement;
 import static gwt.react.client.api.React.DOM.br;

src/gwt/react/api_sanity_test/client/ChildApiTests.java

@@ -2,13 +2,15 @@
 
 import com.google.gwt.dom.client.InputElement;
 import com.google.gwt.user.client.Window;
+import gwt.interop.utils.client.plainobjects.JsPlainObj;
+import gwt.react.client.api.React;
+import gwt.react.client.components.ReactClass;
 import gwt.react.client.components.ReactClassSpec;
 import gwt.react.client.elements.ReactElement;
 import gwt.react.client.events.FormEvent;
 import gwt.react.client.proptypes.BaseProps;
 import gwt.react.client.proptypes.html.BtnProps;
 import gwt.react.client.proptypes.html.InputProps;
-import gwt.react.client.utils.ObjLiteral;
 import jsinterop.annotations.JsOverlay;
 import jsinterop.annotations.JsPackage;
 import jsinterop.annotations.JsType;
@@ -17,15 +19,15 @@
 
 @SuppressWarnings("unused")
 @JsType
-class StatefulReactClassSpec extends ReactClassSpec<StatefulReactClassSpec.Props, StatefulReactClassSpec.State> {
+class StatefulExample extends ReactClassSpec<StatefulExample.Props, StatefulExample.State> {
 
     @JsType(isNative = true, namespace = JsPackage.GLOBAL, name="Object")
     static class Props extends BaseProps {
         String aProp;
     }
 
     @JsType(isNative = true, namespace = JsPackage.GLOBAL, name="Object")
-    static class State extends ObjLiteral {
+    static class State extends JsPlainObj {
         String aStateVar;
 
         @JsOverlay
@@ -72,20 +74,20 @@ public void componentDidMount() {
     }
 
     public void componentWillReceiveProps(Props nextProps) {
-        Window.alert("componentDidMount called (nextProps "+ nextProps.toString() + ")");
+        Window.alert("componentDidMount called (nextProps "+ nextProps.toJSONString() + ")");
     }
 
     public boolean shouldComponentUpdate(Props nextProps, State nextState) {
-        Window.alert("componentWillReceiveProps called (nextProps "+ nextProps.toString() + " nextState " + nextState.toString() + ")");
+        Window.alert("componentWillReceiveProps called (nextProps "+ nextProps.toJSONString() + " nextState " + nextState.toJSONString() + ")");
         return true;
     }
 
     public void componentWillUpdate(Props nextProps, State nextState) {
-        Window.alert("componentWillUpdate called  (nextProps "+ nextProps.toString() + " nextState " + nextState.toString() + ")");
+        Window.alert("componentWillUpdate called  (nextProps "+ nextProps.toJSONString() + " nextState " + nextState.toJSONString() + ")");
     }
 
     public void componentDidUpdate(Props prevProps, State prevState) {
-        Window.alert("componentDidUpdate called (prevProps "+ prevProps.toString() + " prevState " + prevState.toString() + ")");
+        Window.alert("componentDidUpdate called (prevProps "+ prevProps.toJSONString() + " prevState " + prevState.toJSONString() + ")");
     }
 
     public void componentWillUnmount() {
@@ -95,4 +97,6 @@ public void componentWillUnmount() {
     private String getDescription() {
         return "Click Me (state=" + getState().aStateVar + ", props=" + getProps().aProp + ")";
     }
+
+    public static ReactClass<Props> component = React.createClass(new StatefulExample());
 }