Updated to latest JSInterops

Author: timeu

ldviewer-sample/pom.xml

@@ -48,7 +48,6 @@
         <dependency>
             <groupId>com.google.gwt</groupId>
             <artifactId>gwt-dev</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.github.timeu.gwt-libs.ldviewer</groupId>

ldviewer-sample/src/main/java/sample/client/SampleEntryPoint.java

@@ -160,7 +160,7 @@ private void zoom(boolean isZoomIn) {
     }
 
     private String getMsgFromDataPoint(LDDataPoint data) {
-        return "x:" + data.getPosX() + ", y:" + data.getPosY() + ",r2:" + data.getR2();
+        return "x:" + data.posX + ", y:" + data.posY + ",r2:" + data.r2;
     }
 
     private void sinkEvents() {

ldviewer/src/main/java/com/github/timeu/gwtlibs/ldviewer/client/LDData.java

@@ -1,13 +1,15 @@
 package com.github.timeu.gwtlibs.ldviewer.client;
 
 
-import com.google.gwt.core.client.js.JsProperty;
-import com.google.gwt.core.client.js.JsType;
+import jsinterop.annotations.JsPackage;
+import jsinterop.annotations.JsProperty;
+import jsinterop.annotations.JsType;
 
-@JsType
+@JsType(isNative = true, namespace = JsPackage.GLOBAL,name="Object")
 public interface LDData {
 
-	@JsProperty int[] getPositions();
+	@JsProperty
+	int[] getPositions();
 	@JsProperty float[][] getR2();
 	@JsProperty int getStart();
 	@JsProperty int getEnd();

ldviewer/src/main/java/com/github/timeu/gwtlibs/ldviewer/client/LDDataPoint.java

@@ -1,25 +1,22 @@
 package com.github.timeu.gwtlibs.ldviewer.client;
 
 
-import com.google.gwt.core.client.js.JsProperty;
-import com.google.gwt.core.client.js.JsType;
+import jsinterop.annotations.JsOverlay;
+import jsinterop.annotations.JsPackage;
+import jsinterop.annotations.JsProperty;
+import jsinterop.annotations.JsType;
 
-@JsType
-public interface LDDataPoint {
+@JsType(isNative = true,namespace = JsPackage.GLOBAL,name="Object")
+public class LDDataPoint {
 
+	public double r2;
 
-	@JsProperty double getR2();
+	public int posX;
 
-	@JsProperty void setR2(double r2);
-	
-	@JsProperty void setPosX(int posX);
-	
-	@JsProperty int getPosX();
+	public int posY;
 
-	@JsProperty int getPosY();
-	
-	@JsProperty void setPosY(int posY);
-	
-	int getR2Color(double threshold,int maxColor);
-	
+	@JsOverlay
+	public final int getR2Color(double threshold,int maxColor) {
+		return (int)Math.round((1 - (r2 - threshold)/(1-threshold))*maxColor);
+	}
 }

ldviewer/src/main/java/com/github/timeu/gwtlibs/ldviewer/client/LDViewerInstance.java

@@ -5,14 +5,14 @@
 import com.google.gwt.core.client.JsArray;
 import com.google.gwt.core.client.JsArrayInteger;
 import com.google.gwt.core.client.JsArrayNumber;
-import com.google.gwt.core.client.js.JsType;
+import jsinterop.annotations.JsType;
 
 import java.util.List;
 
 /**
  * Created by uemit.seren on 8/12/15.
  */
-@JsType
+@JsType(isNative = true)
 interface LDViewerInstance extends ProcessingInstance {
 
     void api_setSize(int width, boolean isDraw);

ldviewer/src/main/java/com/github/timeu/gwtlibs/ldviewer/client/event/EventCallback.java

@@ -1,6 +1,7 @@
 package com.github.timeu.gwtlibs.ldviewer.client.event;
 
-import com.google.gwt.core.client.js.JsFunction;
+
+import jsinterop.annotations.JsFunction;
 
 /**
  * Created by uemit.seren on 8/11/15.

ldviewer/src/test/java/com/github/timeu/gwtlibs/ldviewer/client/LDViewerTest.java

@@ -223,11 +223,11 @@ public void testAddUnHighlightHandler() {
 
     private LDDataPoint[] getFakeHighlightedPoints() {
         LDDataPoint[] points = new LDDataPoint[1];
-        LDDataPoint point1 = mock(LDDataPoint.class);
-        given(point1.getPosX()).willReturn(1);
-        given(point1.getPosY()).willReturn(2);
-        given(point1.getR2()).willReturn(0.5);
-        given(point1.getR2Color(anyDouble(),anyInt())).willReturn(1);
+        LDDataPoint point1 = new LDDataPoint();
+        point1.posX = 1;
+        point1.posY = 2;
+        point1.r2 = 0.5;
+        points[0] = point1;
         return points;
     }
 

pom.xml

@@ -116,7 +116,7 @@
                 <plugin>
                     <groupId>net.ltgt.gwt.maven</groupId>
                     <artifactId>gwt-maven-plugin</artifactId>
-                    <version>1.0-rc-2</version>
+                    <version>1.0-rc-4</version>
                     <extensions>true</extensions>
                     <configuration>
                         <devMode>false</devMode>
@@ -125,23 +125,23 @@
                             <arg>-runStyle</arg>
                             <arg>Manual:1</arg>
                             <arg>-XjsInteropMode</arg>
-                            <arg>JS</arg>
+                            <arg>JS_RC</arg>
                         </testArgs>
                         <startupUrls>
                             <startupUrl>ldviewersample/index.html</startupUrl>
                         </startupUrls>
                         <compilerArgs>
                             <compilerArg>-XjsInteropMode</compilerArg>
-                            <compilerArg>JS</compilerArg>
+                            <compilerArg>JS_RC</compilerArg>
                         </compilerArgs>
                         <devmodeArgs>
                             <arg>-XjsInteropMode</arg>
-                            <arg>JS</arg>
+                            <arg>JS_RC</arg>
                             <devmodeArg>-incremental</devmodeArg>
                         </devmodeArgs>
                         <codeserverArgs>
                             <arg>-XjsInteropMode</arg>
-                            <arg>JS</arg>
+                            <arg>JS_RC</arg>
                             <arg>-incremental</arg>
                         </codeserverArgs>
                         <moduleName>${gwt.module}</moduleName>