Inroduce sub packages

winterbe · winterbe · commit 0578acfb7fd5 · 2015-03-17T07:22:50.000+01:00
diff --git a/res/nashorn2.js b/res/nashorn2.js
@@ -1,4 +1,4 @@
-var Nashorn2 = Java.type('com.winterbe.java8.Nashorn2');
+var Nashorn2 = Java.type('com.winterbe.java8.samples.nashorn.Nashorn2');
 var result = Nashorn2.fun('John Doe');
 print('\n' + result);
 
diff --git a/res/nashorn4.js b/res/nashorn4.js
@@ -74,7 +74,7 @@ print(Object.prototype.toString.call(javaArray));
 
 // calling super
 
-var SuperRunner = Java.type('com.winterbe.java8.SuperRunner');
+var SuperRunner = Java.type('com.winterbe.java8.samples.nashorn.SuperRunner');
 var Runner = Java.extend(SuperRunner);
 
 var runner = new Runner() {
diff --git a/res/nashorn6.js b/res/nashorn6.js
@@ -33,7 +33,7 @@ product.set('price', 3.99);
 
 
 // pass backbone model to java method
-var Nashorn6 = Java.type('com.winterbe.java8.Nashorn6');
+var Nashorn6 = Java.type('com.winterbe.java8.samples.nashorn.Nashorn6');
 Nashorn6.getProduct(product.attributes);
 
 
diff --git a/src/com/winterbe/java8/Person.java b/src/com/winterbe/java8/Person.java
diff --git a/src/com/winterbe/java8/samples/lambda/Interface1.java b/src/com/winterbe/java8/samples/lambda/Interface1.java
@@ -1,4 +1,4 @@
-package com.winterbe.java8;
+package com.winterbe.java8.samples.lambda;
 
 /**
  * @author Benjamin Winterberg
diff --git a/src/com/winterbe/java8/samples/lambda/Lambda1.java b/src/com/winterbe/java8/samples/lambda/Lambda1.java
@@ -1,4 +1,4 @@
-package com.winterbe.java8;
+package com.winterbe.java8.samples.lambda;
 
 import java.util.Arrays;
 import java.util.Collections;
diff --git a/src/com/winterbe/java8/samples/lambda/Lambda2.java b/src/com/winterbe/java8/samples/lambda/Lambda2.java
@@ -1,4 +1,6 @@
-package com.winterbe.java8;
+package com.winterbe.java8.samples.lambda;
+
+import com.winterbe.java8.samples.misc.Person;
 
 /**
  * @author Benjamin Winterberg
diff --git a/src/com/winterbe/java8/samples/lambda/Lambda3.java b/src/com/winterbe/java8/samples/lambda/Lambda3.java
@@ -1,4 +1,6 @@
-package com.winterbe.java8;
+package com.winterbe.java8.samples.lambda;
+
+import com.winterbe.java8.samples.misc.Person;
 
 import java.util.Comparator;
 import java.util.Objects;
diff --git a/src/com/winterbe/java8/samples/lambda/Lambda4.java b/src/com/winterbe/java8/samples/lambda/Lambda4.java
@@ -1,4 +1,4 @@
-package com.winterbe.java8;
+package com.winterbe.java8.samples.lambda;
 
 /**
  * @author Benjamin Winterberg
diff --git a/src/com/winterbe/java8/samples/misc/Annotations1.java b/src/com/winterbe/java8/samples/misc/Annotations1.java
@@ -1,4 +1,4 @@
-package com.winterbe.java8;
+package com.winterbe.java8.samples.misc;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Repeatable;
diff --git a/src/com/winterbe/java8/samples/misc/Concurrency1.java b/src/com/winterbe/java8/samples/misc/Concurrency1.java
@@ -1,4 +1,4 @@
-package com.winterbe.java8;
+package com.winterbe.java8.samples.misc;
 
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
diff --git a/src/com/winterbe/java8/samples/misc/Maps1.java b/src/com/winterbe/java8/samples/misc/Maps1.java
@@ -1,4 +1,4 @@
-package com.winterbe.java8;
+package com.winterbe.java8.samples.misc;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/com/winterbe/java8/samples/misc/Person.java b/src/com/winterbe/java8/samples/misc/Person.java
@@ -0,0 +1,16 @@
+package com.winterbe.java8.samples.misc;
+
+/**
+* @author Benjamin Winterberg
+*/
+public class Person {
+    public String firstName;
+    public String lastName;
+
+    public Person() {}
+
+    public Person(String firstName, String lastName) {
+        this.firstName = firstName;
+        this.lastName = lastName;
+    }
+}
diff --git a/src/com/winterbe/java8/samples/nashorn/Nashorn1.java b/src/com/winterbe/java8/samples/nashorn/Nashorn1.java
@@ -1,4 +1,6 @@
-package com.winterbe.java8;
+package com.winterbe.java8.samples.nashorn;
+
+import com.winterbe.java8.samples.misc.Person;
 
 import javax.script.Invocable;
 import javax.script.ScriptEngine;
diff --git a/src/com/winterbe/java8/samples/nashorn/Nashorn10.java b/src/com/winterbe/java8/samples/nashorn/Nashorn10.java
@@ -1,4 +1,4 @@
-package com.winterbe.java8;
+package com.winterbe.java8.samples.nashorn;
 
 import jdk.nashorn.api.scripting.NashornScriptEngine;
 
diff --git a/src/com/winterbe/java8/samples/nashorn/Nashorn2.java b/src/com/winterbe/java8/samples/nashorn/Nashorn2.java
@@ -1,4 +1,4 @@
-package com.winterbe.java8;
+package com.winterbe.java8.samples.nashorn;
 
 import jdk.nashorn.api.scripting.ScriptObjectMirror;
 
diff --git a/src/com/winterbe/java8/samples/nashorn/Nashorn3.java b/src/com/winterbe/java8/samples/nashorn/Nashorn3.java
@@ -1,4 +1,4 @@
-package com.winterbe.java8;
+package com.winterbe.java8.samples.nashorn;
 
 import javax.script.ScriptEngine;
 import javax.script.ScriptEngineManager;
diff --git a/src/com/winterbe/java8/samples/nashorn/Nashorn4.java b/src/com/winterbe/java8/samples/nashorn/Nashorn4.java
@@ -1,4 +1,4 @@
-package com.winterbe.java8;
+package com.winterbe.java8.samples.nashorn;
 
 import javax.script.ScriptEngine;
 import javax.script.ScriptEngineManager;
diff --git a/src/com/winterbe/java8/samples/nashorn/Nashorn5.java b/src/com/winterbe/java8/samples/nashorn/Nashorn5.java
@@ -1,4 +1,4 @@
-package com.winterbe.java8;
+package com.winterbe.java8.samples.nashorn;
 
 import javax.script.Invocable;
 import javax.script.ScriptEngine;
diff --git a/src/com/winterbe/java8/samples/nashorn/Nashorn6.java b/src/com/winterbe/java8/samples/nashorn/Nashorn6.java
@@ -1,4 +1,4 @@
-package com.winterbe.java8;
+package com.winterbe.java8.samples.nashorn;
 
 import jdk.nashorn.api.scripting.ScriptObjectMirror;
 
diff --git a/src/com/winterbe/java8/samples/nashorn/Nashorn7.java b/src/com/winterbe/java8/samples/nashorn/Nashorn7.java
@@ -1,4 +1,4 @@
-package com.winterbe.java8;
+package com.winterbe.java8.samples.nashorn;
 
 import javax.script.Invocable;
 import javax.script.ScriptEngine;
diff --git a/src/com/winterbe/java8/samples/nashorn/Nashorn8.java b/src/com/winterbe/java8/samples/nashorn/Nashorn8.java
@@ -1,5 +1,6 @@
-package com.winterbe.java8;
+package com.winterbe.java8.samples.nashorn;
 
+import com.winterbe.java8.samples.misc.Person;
 import jdk.nashorn.api.scripting.NashornScriptEngine;
 
 import javax.script.ScriptEngineManager;
diff --git a/src/com/winterbe/java8/samples/nashorn/Nashorn9.java b/src/com/winterbe/java8/samples/nashorn/Nashorn9.java
@@ -1,4 +1,4 @@
-package com.winterbe.java8;
+package com.winterbe.java8.samples.nashorn;
 
 import jdk.nashorn.api.scripting.NashornScriptEngine;
 
diff --git a/src/com/winterbe/java8/samples/nashorn/Product.java b/src/com/winterbe/java8/samples/nashorn/Product.java
@@ -1,4 +1,4 @@
-package com.winterbe.java8;
+package com.winterbe.java8.samples.nashorn;
 
 /**
  * @author Benjamin Winterberg
diff --git a/src/com/winterbe/java8/samples/nashorn/SuperRunner.java b/src/com/winterbe/java8/samples/nashorn/SuperRunner.java
@@ -1,4 +1,4 @@
-package com.winterbe.java8;
+package com.winterbe.java8.samples.nashorn;
 
 /**
  * @author Benjamin Winterberg
diff --git a/src/com/winterbe/java8/samples/stream/Optional1.java b/src/com/winterbe/java8/samples/stream/Optional1.java
@@ -1,4 +1,4 @@
-package com.winterbe.java8;
+package com.winterbe.java8.samples.stream;
 
 import java.util.Optional;
 
diff --git a/src/com/winterbe/java8/samples/stream/Optional2.java b/src/com/winterbe/java8/samples/stream/Optional2.java
@@ -1,4 +1,4 @@
-package com.winterbe.java8;
+package com.winterbe.java8.samples.stream;
 
 import java.util.Optional;
 import java.util.function.Supplier;
diff --git a/src/com/winterbe/java8/samples/stream/Streams1.java b/src/com/winterbe/java8/samples/stream/Streams1.java
@@ -1,4 +1,4 @@
-package com.winterbe.java8;
+package com.winterbe.java8.samples.stream;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/winterbe/java8/samples/stream/Streams10.java b/src/com/winterbe/java8/samples/stream/Streams10.java
@@ -1,4 +1,4 @@
-package com.winterbe.java8;
+package com.winterbe.java8.samples.stream;
 
 import java.util.Arrays;
 import java.util.IntSummaryStatistics;
diff --git a/src/com/winterbe/java8/samples/stream/Streams11.java b/src/com/winterbe/java8/samples/stream/Streams11.java
@@ -1,4 +1,4 @@
-package com.winterbe.java8;
+package com.winterbe.java8.samples.stream;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/src/com/winterbe/java8/samples/stream/Streams12.java b/src/com/winterbe/java8/samples/stream/Streams12.java
@@ -1,4 +1,4 @@
-package com.winterbe.java8;
+package com.winterbe.java8.samples.stream;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/src/com/winterbe/java8/samples/stream/Streams13.java b/src/com/winterbe/java8/samples/stream/Streams13.java
@@ -1,4 +1,4 @@
-package com.winterbe.java8;
+package com.winterbe.java8.samples.stream;
 
 import java.security.SecureRandom;
 import java.util.Arrays;
diff --git a/src/com/winterbe/java8/samples/stream/Streams2.java b/src/com/winterbe/java8/samples/stream/Streams2.java
@@ -1,4 +1,4 @@
-package com.winterbe.java8;
+package com.winterbe.java8.samples.stream;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/winterbe/java8/samples/stream/Streams3.java b/src/com/winterbe/java8/samples/stream/Streams3.java
@@ -1,4 +1,4 @@
-package com.winterbe.java8;
+package com.winterbe.java8.samples.stream;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/winterbe/java8/samples/stream/Streams4.java b/src/com/winterbe/java8/samples/stream/Streams4.java
@@ -1,4 +1,4 @@
-package com.winterbe.java8;
+package com.winterbe.java8.samples.stream;
 
 import java.util.OptionalInt;
 import java.util.stream.IntStream;
diff --git a/src/com/winterbe/java8/samples/stream/Streams5.java b/src/com/winterbe/java8/samples/stream/Streams5.java
@@ -1,4 +1,4 @@
-package com.winterbe.java8;
+package com.winterbe.java8.samples.stream;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/src/com/winterbe/java8/samples/stream/Streams6.java b/src/com/winterbe/java8/samples/stream/Streams6.java
@@ -1,4 +1,4 @@
-package com.winterbe.java8;
+package com.winterbe.java8.samples.stream;
 
 import java.io.IOException;
 import java.math.BigDecimal;
diff --git a/src/com/winterbe/java8/samples/stream/Streams7.java b/src/com/winterbe/java8/samples/stream/Streams7.java
@@ -1,4 +1,4 @@
-package com.winterbe.java8;
+package com.winterbe.java8.samples.stream;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/winterbe/java8/samples/stream/Streams8.java b/src/com/winterbe/java8/samples/stream/Streams8.java
@@ -1,4 +1,4 @@
-package com.winterbe.java8;
+package com.winterbe.java8.samples.stream;
 
 import java.util.Arrays;
 import java.util.stream.IntStream;
diff --git a/src/com/winterbe/java8/samples/stream/Streams9.java b/src/com/winterbe/java8/samples/stream/Streams9.java
@@ -1,4 +1,4 @@
-package com.winterbe.java8;
+package com.winterbe.java8.samples.stream;
 
 import java.util.Arrays;
 
diff --git a/src/com/winterbe/java8/samples/time/LocalDate1.java b/src/com/winterbe/java8/samples/time/LocalDate1.java
@@ -1,4 +1,4 @@
-package com.winterbe.java8;
+package com.winterbe.java8.samples.time;
 
 import java.time.DayOfWeek;
 import java.time.LocalDate;
diff --git a/src/com/winterbe/java8/samples/time/LocalDateTime1.java b/src/com/winterbe/java8/samples/time/LocalDateTime1.java
@@ -1,4 +1,4 @@
-package com.winterbe.java8;
+package com.winterbe.java8.samples.time;
 
 import java.time.DayOfWeek;
 import java.time.Instant;
diff --git a/src/com/winterbe/java8/samples/time/LocalTime1.java b/src/com/winterbe/java8/samples/time/LocalTime1.java
@@ -1,4 +1,4 @@
-package com.winterbe.java8;
+package com.winterbe.java8.samples.time;
 
 import java.time.Clock;
 import java.time.Instant;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-var Nashorn2 = Java.type('com.winterbe.java8.Nashorn2');`
	`1`	`+var Nashorn2 = Java.type('com.winterbe.java8.samples.nashorn.Nashorn2');`
`2`	`2`	`var result = Nashorn2.fun('John Doe');`
`3`	`3`	`print('\n' + result);`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.winterbe.java8;`
	`1`	`+package com.winterbe.java8.samples.lambda;`
`2`	`2`
`3`	`3`	`/**`
`4`	`4`	`* @author Benjamin Winterberg`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.winterbe.java8;`
	`1`	`+package com.winterbe.java8.samples.misc;`
`2`	`2`
`3`	`3`	`import java.lang.annotation.ElementType;`
`4`	`4`	`import java.lang.annotation.Repeatable;`