diff --git a/.classpath b/.classpath index af45d9752..ba8ba3460 100644 --- a/.classpath +++ b/.classpath @@ -12,18 +12,18 @@ - + + - - + - + diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index c7e3f9ecc..4ee5bb158 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,15 +1,16 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.compliance=1.6 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.7 +org.eclipse.jdt.core.compiler.source=1.6 org.eclipse.jdt.core.formatter.align_type_members_on_columns=true org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/pom.xml b/pom.xml index ace288072..bc90ab408 100644 --- a/pom.xml +++ b/pom.xml @@ -68,8 +68,8 @@ maven-compiler-plugin 3.1 - 1.7 - 1.7 + 1.6 + 1.6 diff --git a/src/main/java/com/eclipsesource/v8/V8.java b/src/main/java/com/eclipsesource/v8/V8.java index 838148790..499f88412 100644 --- a/src/main/java/com/eclipsesource/v8/V8.java +++ b/src/main/java/com/eclipsesource/v8/V8.java @@ -44,7 +44,7 @@ class MethodDescriptor { boolean includeReceiver; } - Map functions = new HashMap<>(); + Map functions = new HashMap(); private synchronized static void load(final String tmpDirectory) { try { @@ -341,7 +341,9 @@ protected Object callObjectJavaMethod(final int methodID, final V8Object receive return checkResult(result); } catch (InvocationTargetException e) { throw e.getTargetException(); - } catch (IllegalAccessException | IllegalArgumentException e) { + } catch (IllegalAccessException e) { + throw e; + } catch (IllegalArgumentException e) { throw e; } finally { releaseArguments(args, hasVarArgs); @@ -376,7 +378,9 @@ protected void callVoidJavaMethod(final int methodID, final V8Object receiver, f methodDescriptor.method.invoke(methodDescriptor.object, args); } catch (InvocationTargetException e) { throw e.getTargetException(); - } catch (IllegalAccessException | IllegalArgumentException e) { + } catch (IllegalAccessException e) { + throw e; + } catch (IllegalArgumentException e) { throw e; } finally { releaseArguments(args, hasVarArgs); @@ -419,7 +423,7 @@ private Object[] getArgs(final V8Object receiver, final MethodDescriptor methodD } private List populateParamters(final V8Array parameters, final int varArgIndex, final Object[] args, final boolean includeReceiver) { - List varArgs = new ArrayList<>(); + List varArgs = new ArrayList(); int start = 0; if (includeReceiver) { start = 1; diff --git a/src/main/java/com/eclipsesource/v8/utils/V8ObjectUtils.java b/src/main/java/com/eclipsesource/v8/utils/V8ObjectUtils.java index ed6f3d895..3848c22e1 100644 --- a/src/main/java/com/eclipsesource/v8/utils/V8ObjectUtils.java +++ b/src/main/java/com/eclipsesource/v8/utils/V8ObjectUtils.java @@ -28,7 +28,7 @@ public class V8ObjectUtils { if (object == null) { return Collections.emptyMap(); } - Map result = new HashMap<>(); + Map result = new HashMap(); String[] keys = object.getKeys(); for (String key : keys) { result.put(key, getValue(object, key)); @@ -40,7 +40,7 @@ public static List toList(final V8Array array) { if (array == null) { return Collections.emptyList(); } - List result = new ArrayList<>(); + List result = new ArrayList(); for (int i = 0; i < array.length(); i++) { result.add(getValue(array, i)); } @@ -139,17 +139,17 @@ public static void pushValue(final V8 v8, final V8Array result, final Object val if (value == null) { result.pushUndefined(); } else if (value instanceof Integer) { - result.push((int) value); + result.push((Integer) value); } else if (value instanceof Long) { - result.push((int) (long) value); + result.push((int) (long) (Long) value); } else if (value instanceof Double) { - result.push((double) value); + result.push((Double) value); } else if (value instanceof Float) { - result.push((float) value); + result.push((Float) value); } else if (value instanceof String) { result.push((String) value); } else if (value instanceof Boolean) { - result.push((boolean) value); + result.push((Boolean) value); } else if (value instanceof Map) { V8Object object = toV8Object(v8, (Map) value); result.push(object); @@ -168,17 +168,17 @@ private static void setValue(final V8 v8, final V8Object result, final String ke if (value == null) { result.addUndefined(key); } else if (value instanceof Integer) { - result.add(key, (int) value); + result.add(key, (Integer) value); } else if (value instanceof Long) { - result.add(key, (int) (long) value); + result.add(key, (int) (long) (Long) value); } else if (value instanceof Double) { - result.add(key, (double) value); + result.add(key, (Double) value); } else if (value instanceof Float) { - result.add(key, (float) value); + result.add(key, (Float) value); } else if (value instanceof String) { result.add(key, (String) value); } else if (value instanceof Boolean) { - result.add(key, (boolean) value); + result.add(key, (Boolean) value); } else if (value instanceof Map) { V8Object object = toV8Object(v8, (Map) value); result.add(key, object); diff --git a/src/test/java/com/eclipsesource/v8/V8CallbackTest.java b/src/test/java/com/eclipsesource/v8/V8CallbackTest.java index fc5374e48..c68729893 100644 --- a/src/test/java/com/eclipsesource/v8/V8CallbackTest.java +++ b/src/test/java/com/eclipsesource/v8/V8CallbackTest.java @@ -662,8 +662,8 @@ public void testIntMethodCalledWithParameters() { @Override public Integer answer(final InvocationOnMock invocation) throws Throwable { Object[] args = invocation.getArguments(); - int x = (int) args[0]; - int y = (int) args[1]; + int x = (Integer) args[0]; + int y = (Integer) args[1]; return x + y; } @@ -684,8 +684,8 @@ public void testDoubleMethodCalledWithParameters() { @Override public Double answer(final InvocationOnMock invocation) throws Throwable { Object[] args = invocation.getArguments(); - double x = (double) args[0]; - double y = (double) args[1]; + double x = (Double) args[0]; + double y = (Double) args[1]; return x + y; } diff --git a/src/test/java/com/eclipsesource/v8/V8JSFunctionCallTest.java b/src/test/java/com/eclipsesource/v8/V8JSFunctionCallTest.java index 3e475fbcc..0eadbf86d 100644 --- a/src/test/java/com/eclipsesource/v8/V8JSFunctionCallTest.java +++ b/src/test/java/com/eclipsesource/v8/V8JSFunctionCallTest.java @@ -221,7 +221,7 @@ public void testFunctionCallWithDoubleReturn() { Object result = v8.executeFunction("getFoo", null); - assertEquals(33.3, (double) result, 0.000001); + assertEquals(33.3, (Double) result, 0.000001); } @Test @@ -239,7 +239,7 @@ public void testFunctionCallWithBooleanReturn() { Object result = v8.executeFunction("getFoo", null); - assertTrue((boolean) result); + assertTrue((Boolean) result); } @Test diff --git a/src/test/java/com/eclipsesource/v8/V8MultiThreadTest.java b/src/test/java/com/eclipsesource/v8/V8MultiThreadTest.java index 7c5e391de..65f9e81b8 100644 --- a/src/test/java/com/eclipsesource/v8/V8MultiThreadTest.java +++ b/src/test/java/com/eclipsesource/v8/V8MultiThreadTest.java @@ -23,7 +23,7 @@ public class V8MultiThreadTest { private V8 runtime = null; - private List mergeSortResults = new ArrayList<>(); + private List mergeSortResults = new ArrayList(); @Test public void testKillThread() throws InterruptedException { @@ -112,7 +112,7 @@ public void run() { @Test public void testMultiV8Threads() throws InterruptedException { - final List threads = new ArrayList<>(); + final List threads = new ArrayList(); for (int i = 0; i < 10; i++) { Thread t = new Thread(new Runnable() { diff --git a/src/test/java/com/eclipsesource/v8/V8Test.java b/src/test/java/com/eclipsesource/v8/V8Test.java index 5ee3480b9..b232bef16 100644 --- a/src/test/java/com/eclipsesource/v8/V8Test.java +++ b/src/test/java/com/eclipsesource/v8/V8Test.java @@ -325,7 +325,7 @@ public void testAnyScriptReturnInt() { public void testAnyScriptReturnDouble() { Object result = v8.executeScript("1.1;"); - assertEquals(1.1, (double) result, 0.000001); + assertEquals(1.1, (Double) result, 0.000001); } @Test @@ -339,7 +339,7 @@ public void testAnyScriptReturnString() { public void testAnyScriptReturnBoolean() { Object result = v8.executeScript("false;"); - assertFalse((boolean) result); + assertFalse((Boolean) result); } @Test diff --git a/src/test/java/com/eclipsesource/v8/utils/tests/V8ObjectUtilsTest.java b/src/test/java/com/eclipsesource/v8/utils/tests/V8ObjectUtilsTest.java index 80fe73514..1f7dfc081 100644 --- a/src/test/java/com/eclipsesource/v8/utils/tests/V8ObjectUtilsTest.java +++ b/src/test/java/com/eclipsesource/v8/utils/tests/V8ObjectUtilsTest.java @@ -232,7 +232,7 @@ public void testCreateMapWithNulls() { @Test public void testCreateV8ObjectFromStringMap() { - Map map = new HashMap<>(); + Map map = new HashMap(); map.put("first", "john"); map.put("last", "smith"); @@ -245,7 +245,7 @@ public void testCreateV8ObjectFromStringMap() { @Test public void testCreateV8ObjectFromIntegerMap() { - Map map = new HashMap<>(); + Map map = new HashMap(); map.put("a", 1); map.put("b", 3); @@ -258,7 +258,7 @@ public void testCreateV8ObjectFromIntegerMap() { @Test public void testCreateV8ObjectFromLongMap() { - Map map = new HashMap<>(); + Map map = new HashMap(); map.put("a", 1L); map.put("b", 3L); @@ -271,7 +271,7 @@ public void testCreateV8ObjectFromLongMap() { @Test public void testCreateV8ObjectFromDoubleMap() { - Map map = new HashMap<>(); + Map map = new HashMap(); map.put("a", 1.1); map.put("b", 3.14159); map.put("c", 4.999); @@ -286,7 +286,7 @@ public void testCreateV8ObjectFromDoubleMap() { @Test public void testCreateV8ObjectFromFloatMap() { - Map map = new HashMap<>(); + Map map = new HashMap(); map.put("a", 1.1f); map.put("b", 3.14159f); map.put("c", 4.999f); @@ -301,7 +301,7 @@ public void testCreateV8ObjectFromFloatMap() { @Test public void testCreateV8ObjectFromBooleanMap() { - Map map = new HashMap<>(); + Map map = new HashMap(); map.put("a", true); map.put("b", true); map.put("c", false); @@ -316,7 +316,7 @@ public void testCreateV8ObjectFromBooleanMap() { @Test public void testCreatev8ObjectWithNulls() { - Map map = new HashMap<>(); + Map map = new HashMap(); map.put("a", true); map.put("b", null); @@ -329,7 +329,7 @@ public void testCreatev8ObjectWithNulls() { @Test public void testCreateV8ObjectFromMixedMap() { - Map map = new HashMap<>(); + Map map = new HashMap(); map.put("boolean", true); map.put("integer", 7); map.put("double", 3.14159); @@ -350,7 +350,7 @@ public void testCreateV8ObjectFromMixedMap() { @Test public void testCreateV8ArrayFromIntegerList() { - List list = new ArrayList<>(); + List list = new ArrayList(); list.add(1); list.add(1); for (int i = 2; i < 10; i++) { @@ -374,7 +374,7 @@ public void testCreateV8ArrayFromIntegerList() { @Test public void testCreateV8ArrayFromLongList() { - List list = new ArrayList<>(); + List list = new ArrayList(); list.add((long) 1); int size = registerAndRelease("result", list); @@ -385,7 +385,7 @@ public void testCreateV8ArrayFromLongList() { @Test public void testCreateV8ArrayFromFloatList() { - List list = new ArrayList<>(); + List list = new ArrayList(); list.add(1.1f); int size = registerAndRelease("result", list); @@ -396,7 +396,7 @@ public void testCreateV8ArrayFromFloatList() { @Test public void testCreateV8ArrayFromDoubleList() { - List list = new ArrayList<>(); + List list = new ArrayList(); list.add(3.14159); list.add(4.1); list.add(5.3); @@ -411,7 +411,7 @@ public void testCreateV8ArrayFromDoubleList() { @Test public void testCreateV8ArrayFromBooleanList() { - List list = new ArrayList<>(); + List list = new ArrayList(); list.add(true); list.add(false); @@ -424,7 +424,7 @@ public void testCreateV8ArrayFromBooleanList() { @Test public void testCreateV8ArrayFromStringList() { - List list = new ArrayList<>(); + List list = new ArrayList(); list.add("hello"); list.add("world"); @@ -437,7 +437,7 @@ public void testCreateV8ArrayFromStringList() { @Test public void testCreateV8ArrayWithNullValues() { - List list = new ArrayList<>(); + List list = new ArrayList(); list.add("hello"); list.add(null); list.add("world"); @@ -452,7 +452,7 @@ public void testCreateV8ArrayWithNullValues() { @Test public void testCreateV8AraryFromMixedList() { - List list = new ArrayList<>(); + List list = new ArrayList(); list.add("string"); list.add(7); list.add(3.14159); @@ -471,12 +471,12 @@ public void testCreateV8AraryFromMixedList() { @Test public void testCreateV8ArrayOfMaps() { - List> list = new ArrayList<>(); - Map m1 = new HashMap<>(); + List> list = new ArrayList>(); + Map m1 = new HashMap(); m1.put("Sadie", 7); m1.put("Lily", 5); m1.put("Maggie", 3); - Map m2 = new HashMap<>(); + Map m2 = new HashMap(); m2.put("Ian", 38); list.add(m1); list.add(m2); @@ -492,16 +492,16 @@ public void testCreateV8ArrayOfMaps() { @Test public void testCreatev8ArrayFromMatrix() { - List> matrix = new ArrayList<>(); - List l1 = new ArrayList<>(); + List> matrix = new ArrayList>(); + List l1 = new ArrayList(); l1.add(1); l1.add(2); l1.add(3); - List l2 = new ArrayList<>(); + List l2 = new ArrayList(); l2.add(4); l2.add(5); l2.add(6); - List l3 = new ArrayList<>(); + List l3 = new ArrayList(); l3.add(7); l3.add(8); l3.add(9); @@ -527,16 +527,16 @@ public void testCreatev8ArrayFromMatrix() { @Test public void testCreateV8ObjectFromMapOfLists() { - Map> map = new HashMap<>(); - List l1 = new ArrayList<>(); + Map> map = new HashMap>(); + List l1 = new ArrayList(); l1.add("first"); l1.add("second"); l1.add("third"); - List l2 = new ArrayList<>(); + List l2 = new ArrayList(); l2.add("a"); l2.add("b"); l2.add("c"); - List l3 = new ArrayList<>(); + List l3 = new ArrayList(); l3.add("dog"); l3.add("cat"); map.put("numbers", l1); @@ -558,7 +558,7 @@ public void testCreateV8ObjectFromMapOfLists() { @Test(expected = IllegalStateException.class) public void testCreateV8ObjectWithInvalidContents() { - Map map = new HashMap<>(); + Map map = new HashMap(); map.put("first", new Rectangle()); registerAndRelease("result", map); @@ -566,7 +566,7 @@ public void testCreateV8ObjectWithInvalidContents() { @Test(expected = IllegalStateException.class) public void testCreateV8ArrayWithInvalidContents() { - List list = new ArrayList<>(); + List list = new ArrayList(); list.add(new Rectangle()); registerAndRelease("result", list); @@ -677,7 +677,7 @@ public void testGetV8ResultTrue() { @Test public void testGetV8ResultObject() { - Map map = new HashMap<>(); + Map map = new HashMap(); map.put("foo", "bar"); Object result = V8ObjectUtils.getV8Result(v8, map); @@ -688,7 +688,7 @@ public void testGetV8ResultObject() { @Test public void testGetV8ResultArray() { - List list = new ArrayList<>(); + List list = new ArrayList(); list.add(1); list.add("two"); Object result = V8ObjectUtils.getV8Result(v8, list); @@ -743,7 +743,7 @@ public void testPushString() { @Test public void testPushMap() { V8Array array = new V8Array(v8); - Map map = new HashMap<>(); + Map map = new HashMap(); map.put("foo", "bar"); V8ObjectUtils.pushValue(v8, array, map); @@ -757,7 +757,7 @@ public void testPushMap() { @Test public void testPushList() { V8Array array = new V8Array(v8); - List list = new ArrayList<>(); + List list = new ArrayList(); list.add("one"); V8ObjectUtils.pushValue(v8, array, list);