Skip to content

Commit 0578acf

Browse files
committed
Inroduce sub packages
1 parent bbf7c93 commit 0578acf

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+64
-57
lines changed

res/nashorn2.js

+1-1
Original file line numberDiff line numberDiff 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');
22
var result = Nashorn2.fun('John Doe');
33
print('\n' + result);
44

res/nashorn4.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ print(Object.prototype.toString.call(javaArray));
7474

7575
// calling super
7676

77-
var SuperRunner = Java.type('com.winterbe.java8.SuperRunner');
77+
var SuperRunner = Java.type('com.winterbe.java8.samples.nashorn.SuperRunner');
7878
var Runner = Java.extend(SuperRunner);
7979

8080
var runner = new Runner() {

res/nashorn6.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ product.set('price', 3.99);
3333

3434

3535
// pass backbone model to java method
36-
var Nashorn6 = Java.type('com.winterbe.java8.Nashorn6');
36+
var Nashorn6 = Java.type('com.winterbe.java8.samples.nashorn.Nashorn6');
3737
Nashorn6.getProduct(product.attributes);
3838

3939

src/com/winterbe/java8/Person.java

-16
This file was deleted.

src/com/winterbe/java8/Interface1.java renamed to src/com/winterbe/java8/samples/lambda/Interface1.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.winterbe.java8;
1+
package com.winterbe.java8.samples.lambda;
22

33
/**
44
* @author Benjamin Winterberg

src/com/winterbe/java8/Lambda1.java renamed to src/com/winterbe/java8/samples/lambda/Lambda1.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.winterbe.java8;
1+
package com.winterbe.java8.samples.lambda;
22

33
import java.util.Arrays;
44
import java.util.Collections;

src/com/winterbe/java8/Lambda2.java renamed to src/com/winterbe/java8/samples/lambda/Lambda2.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
package com.winterbe.java8;
1+
package com.winterbe.java8.samples.lambda;
2+
3+
import com.winterbe.java8.samples.misc.Person;
24

35
/**
46
* @author Benjamin Winterberg

src/com/winterbe/java8/Lambda3.java renamed to src/com/winterbe/java8/samples/lambda/Lambda3.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
package com.winterbe.java8;
1+
package com.winterbe.java8.samples.lambda;
2+
3+
import com.winterbe.java8.samples.misc.Person;
24

35
import java.util.Comparator;
46
import java.util.Objects;

src/com/winterbe/java8/Lambda4.java renamed to src/com/winterbe/java8/samples/lambda/Lambda4.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.winterbe.java8;
1+
package com.winterbe.java8.samples.lambda;
22

33
/**
44
* @author Benjamin Winterberg

src/com/winterbe/java8/Annotations1.java renamed to src/com/winterbe/java8/samples/misc/Annotations1.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.winterbe.java8;
1+
package com.winterbe.java8.samples.misc;
22

33
import java.lang.annotation.ElementType;
44
import java.lang.annotation.Repeatable;

src/com/winterbe/java8/Concurrency1.java renamed to src/com/winterbe/java8/samples/misc/Concurrency1.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.winterbe.java8;
1+
package com.winterbe.java8.samples.misc;
22

33
import java.util.UUID;
44
import java.util.concurrent.ConcurrentHashMap;

src/com/winterbe/java8/Maps1.java renamed to src/com/winterbe/java8/samples/misc/Maps1.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.winterbe.java8;
1+
package com.winterbe.java8.samples.misc;
22

33
import java.util.HashMap;
44
import java.util.Map;
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
package com.winterbe.java8.samples.misc;
2+
3+
/**
4+
* @author Benjamin Winterberg
5+
*/
6+
public class Person {
7+
public String firstName;
8+
public String lastName;
9+
10+
public Person() {}
11+
12+
public Person(String firstName, String lastName) {
13+
this.firstName = firstName;
14+
this.lastName = lastName;
15+
}
16+
}

src/com/winterbe/java8/Nashorn1.java renamed to src/com/winterbe/java8/samples/nashorn/Nashorn1.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
package com.winterbe.java8;
1+
package com.winterbe.java8.samples.nashorn;
2+
3+
import com.winterbe.java8.samples.misc.Person;
24

35
import javax.script.Invocable;
46
import javax.script.ScriptEngine;

src/com/winterbe/java8/Nashorn10.java renamed to src/com/winterbe/java8/samples/nashorn/Nashorn10.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.winterbe.java8;
1+
package com.winterbe.java8.samples.nashorn;
22

33
import jdk.nashorn.api.scripting.NashornScriptEngine;
44

src/com/winterbe/java8/Nashorn2.java renamed to src/com/winterbe/java8/samples/nashorn/Nashorn2.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.winterbe.java8;
1+
package com.winterbe.java8.samples.nashorn;
22

33
import jdk.nashorn.api.scripting.ScriptObjectMirror;
44

src/com/winterbe/java8/Nashorn3.java renamed to src/com/winterbe/java8/samples/nashorn/Nashorn3.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.winterbe.java8;
1+
package com.winterbe.java8.samples.nashorn;
22

33
import javax.script.ScriptEngine;
44
import javax.script.ScriptEngineManager;

src/com/winterbe/java8/Nashorn4.java renamed to src/com/winterbe/java8/samples/nashorn/Nashorn4.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.winterbe.java8;
1+
package com.winterbe.java8.samples.nashorn;
22

33
import javax.script.ScriptEngine;
44
import javax.script.ScriptEngineManager;

src/com/winterbe/java8/Nashorn5.java renamed to src/com/winterbe/java8/samples/nashorn/Nashorn5.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.winterbe.java8;
1+
package com.winterbe.java8.samples.nashorn;
22

33
import javax.script.Invocable;
44
import javax.script.ScriptEngine;

src/com/winterbe/java8/Nashorn6.java renamed to src/com/winterbe/java8/samples/nashorn/Nashorn6.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.winterbe.java8;
1+
package com.winterbe.java8.samples.nashorn;
22

33
import jdk.nashorn.api.scripting.ScriptObjectMirror;
44

src/com/winterbe/java8/Nashorn7.java renamed to src/com/winterbe/java8/samples/nashorn/Nashorn7.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.winterbe.java8;
1+
package com.winterbe.java8.samples.nashorn;
22

33
import javax.script.Invocable;
44
import javax.script.ScriptEngine;

src/com/winterbe/java8/Nashorn8.java renamed to src/com/winterbe/java8/samples/nashorn/Nashorn8.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
package com.winterbe.java8;
1+
package com.winterbe.java8.samples.nashorn;
22

3+
import com.winterbe.java8.samples.misc.Person;
34
import jdk.nashorn.api.scripting.NashornScriptEngine;
45

56
import javax.script.ScriptEngineManager;

src/com/winterbe/java8/Nashorn9.java renamed to src/com/winterbe/java8/samples/nashorn/Nashorn9.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.winterbe.java8;
1+
package com.winterbe.java8.samples.nashorn;
22

33
import jdk.nashorn.api.scripting.NashornScriptEngine;
44

src/com/winterbe/java8/Product.java renamed to src/com/winterbe/java8/samples/nashorn/Product.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.winterbe.java8;
1+
package com.winterbe.java8.samples.nashorn;
22

33
/**
44
* @author Benjamin Winterberg

src/com/winterbe/java8/SuperRunner.java renamed to src/com/winterbe/java8/samples/nashorn/SuperRunner.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.winterbe.java8;
1+
package com.winterbe.java8.samples.nashorn;
22

33
/**
44
* @author Benjamin Winterberg

src/com/winterbe/java8/Optional1.java renamed to src/com/winterbe/java8/samples/stream/Optional1.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.winterbe.java8;
1+
package com.winterbe.java8.samples.stream;
22

33
import java.util.Optional;
44

src/com/winterbe/java8/Optional2.java renamed to src/com/winterbe/java8/samples/stream/Optional2.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.winterbe.java8;
1+
package com.winterbe.java8.samples.stream;
22

33
import java.util.Optional;
44
import java.util.function.Supplier;

src/com/winterbe/java8/Streams1.java renamed to src/com/winterbe/java8/samples/stream/Streams1.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.winterbe.java8;
1+
package com.winterbe.java8.samples.stream;
22

33
import java.util.ArrayList;
44
import java.util.List;

src/com/winterbe/java8/Streams10.java renamed to src/com/winterbe/java8/samples/stream/Streams10.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.winterbe.java8;
1+
package com.winterbe.java8.samples.stream;
22

33
import java.util.Arrays;
44
import java.util.IntSummaryStatistics;

src/com/winterbe/java8/Streams11.java renamed to src/com/winterbe/java8/samples/stream/Streams11.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.winterbe.java8;
1+
package com.winterbe.java8.samples.stream;
22

33
import java.util.Arrays;
44
import java.util.List;

src/com/winterbe/java8/Streams12.java renamed to src/com/winterbe/java8/samples/stream/Streams12.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.winterbe.java8;
1+
package com.winterbe.java8.samples.stream;
22

33
import java.util.ArrayList;
44
import java.util.Arrays;

src/com/winterbe/java8/Streams13.java renamed to src/com/winterbe/java8/samples/stream/Streams13.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.winterbe.java8;
1+
package com.winterbe.java8.samples.stream;
22

33
import java.security.SecureRandom;
44
import java.util.Arrays;

src/com/winterbe/java8/Streams2.java renamed to src/com/winterbe/java8/samples/stream/Streams2.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.winterbe.java8;
1+
package com.winterbe.java8.samples.stream;
22

33
import java.util.ArrayList;
44
import java.util.List;

src/com/winterbe/java8/Streams3.java renamed to src/com/winterbe/java8/samples/stream/Streams3.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.winterbe.java8;
1+
package com.winterbe.java8.samples.stream;
22

33
import java.util.ArrayList;
44
import java.util.List;

src/com/winterbe/java8/Streams4.java renamed to src/com/winterbe/java8/samples/stream/Streams4.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.winterbe.java8;
1+
package com.winterbe.java8.samples.stream;
22

33
import java.util.OptionalInt;
44
import java.util.stream.IntStream;

src/com/winterbe/java8/Streams5.java renamed to src/com/winterbe/java8/samples/stream/Streams5.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.winterbe.java8;
1+
package com.winterbe.java8.samples.stream;
22

33
import java.util.Arrays;
44
import java.util.List;

src/com/winterbe/java8/Streams6.java renamed to src/com/winterbe/java8/samples/stream/Streams6.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.winterbe.java8;
1+
package com.winterbe.java8.samples.stream;
22

33
import java.io.IOException;
44
import java.math.BigDecimal;

src/com/winterbe/java8/Streams7.java renamed to src/com/winterbe/java8/samples/stream/Streams7.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.winterbe.java8;
1+
package com.winterbe.java8.samples.stream;
22

33
import java.util.ArrayList;
44
import java.util.List;

src/com/winterbe/java8/Streams8.java renamed to src/com/winterbe/java8/samples/stream/Streams8.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.winterbe.java8;
1+
package com.winterbe.java8.samples.stream;
22

33
import java.util.Arrays;
44
import java.util.stream.IntStream;

src/com/winterbe/java8/Streams9.java renamed to src/com/winterbe/java8/samples/stream/Streams9.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.winterbe.java8;
1+
package com.winterbe.java8.samples.stream;
22

33
import java.util.Arrays;
44

src/com/winterbe/java8/LocalDate1.java renamed to src/com/winterbe/java8/samples/time/LocalDate1.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.winterbe.java8;
1+
package com.winterbe.java8.samples.time;
22

33
import java.time.DayOfWeek;
44
import java.time.LocalDate;

src/com/winterbe/java8/LocalDateTime1.java renamed to src/com/winterbe/java8/samples/time/LocalDateTime1.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.winterbe.java8;
1+
package com.winterbe.java8.samples.time;
22

33
import java.time.DayOfWeek;
44
import java.time.Instant;

src/com/winterbe/java8/LocalTime1.java renamed to src/com/winterbe/java8/samples/time/LocalTime1.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.winterbe.java8;
1+
package com.winterbe.java8.samples.time;
22

33
import java.time.Clock;
44
import java.time.Instant;

0 commit comments

Comments
 (0)