Skip to content

Commit 1eafa91

Browse files
committed
Merge pull request 'Change encoding for prosperity files' (#11) from active_mq into main
Reviewed-on: https://src.isharkfly.com/iSharkFly-Docs/java-tutorials/pulls/11
2 parents 67b82f2 + 8f01109 commit 1eafa91

File tree

54 files changed

+118
-174
lines changed

Some content is hidden

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

54 files changed

+118
-174
lines changed

.idea/compiler.xml

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/jarRepositories.xml

+39-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core-java-modules/core-java-8-2/.gitignore

-25
This file was deleted.

core-java-modules/core-java-8-2/README.md

-13
This file was deleted.

core-java-modules/core-java-8-2/pom.xml

-28
This file was deleted.

core-java-modules/core-java-8-2/src/main/resources/example_manifest.txt

-1
This file was deleted.

core-java-modules/core-java-8-2/src/main/resources/formats_fr.properties

-2
This file was deleted.

core-java-modules/core-java-8-2/src/main/resources/messages_fr.properties

-1
This file was deleted.

core-java-modules/core-java-8-2/src/main/resources/messages_it.properties

-1
This file was deleted.

core-java-modules/core-java-8/README.md

+7-1

core-java-modules/core-java-8-2/src/main/java/com/ossez/localization/App.java renamed to core-java-modules/core-java-8/src/main/java/com/ossez/localization/App.java

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.ossez.localization;
22

3-
import java.text.ParseException;
43
import java.util.Arrays;
54
import java.util.List;
65
import java.util.Locale;
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
label={0, date, short}, {1}{2, choice, 0# ne|0<} vous a envoyé {2, choice, 0#aucun message|1#un message|2#deux messages|2<{2,number,integer} messages}.
2+
label-icu={0} {2, plural, =0 {ne } other {}}vous a envoyé {2, plural, =0 {aucun message} =1 {un message} other {{2, number, integer} messages}}.
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
label=W {0, date, short} {1}{2, choice, 0# nie|0<} wys\u0142a\u0142a ci {2, choice, 0#\u017Cadnych wiadomo\u015Bci|1#wiadomo\u015B\u0107|2#dwie wiadomo\u015Bci|2<{2, number, integer} wiadomo\u015Bci}.
2-
label-icu={0} {2, plural, =0 {nie } other {}}{1, select, male {wys\u0142a\u0142} female {wys\u0142a\u0142a} other {wys\u0142a\u0142o}} ci {2, plural, =0 {\u017Cadnej wiadomo\u015Bci} =1 {wiadomo\u015B\u0107} other {{2, number, integer} wiadomo\u015Bci}}.
2+
label-icu={0} {2, plural, =0 {nie } other {}}{1, select, male {wys\u0142a\u0142} female {wys\u0142a\u0142a} other {wys\u0142a\u0142o}} ci {2, plural, =0 {\u017Cadnej wiadomo\u015Bci} =1 {wiadomo\u015B\u0107} other {{2, number, integer} wiadomo\u015Bci}}.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
label=Alice vous a envoyé un message.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
label=Alice ti ha inviato un messaggio.

core-java-modules/core-java-collections-list-3/README.md

-14
This file was deleted.

core-java-modules/core-java-collections-list-3/pom.xml

-57
This file was deleted.

core-java-modules/core-java-collections-list-3/src/main/resources/logback.xml

-13
This file was deleted.

core-java-modules/core-java-collections-list/README.md

+11-1

core-java-modules/core-java-collections-list/pom.xml

+25
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,31 @@
2525
<artifactId>commons-lang3</artifactId>
2626
<version>${commons-lang3.version}</version>
2727
</dependency>
28+
<dependency>
29+
<groupId>net.sf.trove4j</groupId>
30+
<artifactId>trove4j</artifactId>
31+
<version>${trove4j.version}</version>
32+
</dependency>
33+
<dependency>
34+
<groupId>fastutil</groupId>
35+
<artifactId>fastutil</artifactId>
36+
<version>${fastutil.version}</version>
37+
</dependency>
38+
<dependency>
39+
<groupId>colt</groupId>
40+
<artifactId>colt</artifactId>
41+
<version>${colt.version}</version>
42+
</dependency>
43+
<dependency>
44+
<groupId>org.openjdk.jmh</groupId>
45+
<artifactId>jmh-core</artifactId>
46+
<version>${jmh-core.version}</version>
47+
</dependency>
48+
<dependency>
49+
<groupId>org.openjdk.jmh</groupId>
50+
<artifactId>jmh-generator-annprocess</artifactId>
51+
<version>${jmh-generator.version}</version>
52+
</dependency>
2853
</dependencies>
2954

3055
</project>
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.ossez.collection.filtering;
1+
package com.ossez.filtering;
22

33
/**
44
* Java 8 Collection Filtering by List of Values base class.
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.ossez.java.list;
1+
package com.ossez.list;
22

33
import java.util.ArrayList;
44
import java.util.Collections;
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import java.util.Set;
77
import java.util.stream.Collectors;
88

9+
import com.ossez.filtering.Employee;
910
import org.hamcrest.Matchers;
1011
import org.junit.Assert;
1112
import org.junit.Test;
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.ossez.java.list;
1+
package com.ossez.list;
22

33
import static org.junit.Assert.assertEquals;
44
import static org.junit.Assert.assertFalse;

core-java-modules/pom.xml

-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
<modules>
1818
<module>core-java</module>
1919
<module>core-java-8</module>
20-
<module>core-java-8-2</module>
2120
<module>core-java-11</module>
2221
<module>core-java-11-2</module>
2322
<module>core-java-annotations</module>
@@ -27,14 +26,12 @@
2726
<module>core-java-collections-conversions</module>
2827
<module>core-java-collections-conversions-2</module>
2928
<module>core-java-collections-list</module>
30-
<module>core-java-collections-list-3</module>
3129
<module>core-java-datetime-conversion</module>
3230
<module>core-java-io</module>
3331
<module>core-java-io-2</module>
3432
<module>core-java-lambdas</module>
3533
<module>core-java-serialization</module>
3634
<module>core-java-streams</module>
37-
<module>core-java-streams</module>
3835
<module>core-java-strings</module>
3936
<module>core-java-uuid</module>
4037
</modules>

0 commit comments

Comments
 (0)