From 81e009c67e2f87d9b32f26e16ff700395865ce19 Mon Sep 17 00:00:00 2001 From: YuCheng Hu Date: Tue, 30 Apr 2024 11:00:56 -0400 Subject: [PATCH] merge code for testing --- .idea/compiler.xml | 4 +- .idea/jarRepositories.xml | 43 +++++++++++++++++-- core-java-modules/core-java-8-2/README.md | 8 +--- .../src/main/resources/example_manifest.txt | 1 - core-java-modules/core-java-8/README.md | 8 +++- .../com/ossez/game/RockPaperScissorsGame.java | 0 .../ChidlCircleInterfaceImpl.java | 0 .../ChildCircleClass.java | 0 .../interfaceVsAbstractClass/CircleClass.java | 0 .../CircleInterface.java | 0 .../com/ossez/jarArguments/JarExample.java | 0 .../main/java/com/ossez/localization/App.java | 1 - .../com/ossez/localization/ICUFormat.java | 0 .../com/ossez/localization/JavaSEFormat.java | 0 .../com/ossez/localization/Localization.java | 0 .../com/ossez/stream/SkipLimitComparison.java | 0 .../main/java/com/ossez/uuid/UuidHelper.java | 0 .../main/resources/META-INF/persistence.xml | 0 .../src/main/resources/formats_en.properties | 0 .../src/main/resources/formats_fr.properties | 0 .../src/main/resources/formats_it.properties | 0 .../src/main/resources/formats_pl.properties | 0 .../src/main/resources/messages_en.properties | 0 .../src/main/resources/messages_fr.properties | 0 .../src/main/resources/messages_it.properties | 0 .../src/main/resources/messages_pl.properties | 0 .../BiFunctionalInterfacesUnitTest.java | 0 .../InterfaceVsAbstractClassUnitTest.java | 0 .../ossez/localization/ICUFormatUnitTest.java | 0 .../core-java-collections-list/pom.xml | 2 +- .../CollectionFilteringUnitTest.java | 1 + core-java-modules/pom.xml | 1 - 32 files changed, 51 insertions(+), 18 deletions(-) delete mode 100644 core-java-modules/core-java-8-2/src/main/resources/example_manifest.txt rename core-java-modules/{core-java-8-2 => core-java-8}/src/main/java/com/ossez/game/RockPaperScissorsGame.java (100%) rename core-java-modules/{core-java-8-2 => core-java-8}/src/main/java/com/ossez/interfaceVsAbstractClass/ChidlCircleInterfaceImpl.java (100%) rename core-java-modules/{core-java-8-2 => core-java-8}/src/main/java/com/ossez/interfaceVsAbstractClass/ChildCircleClass.java (100%) rename core-java-modules/{core-java-8-2 => core-java-8}/src/main/java/com/ossez/interfaceVsAbstractClass/CircleClass.java (100%) rename core-java-modules/{core-java-8-2 => core-java-8}/src/main/java/com/ossez/interfaceVsAbstractClass/CircleInterface.java (100%) rename core-java-modules/{core-java-8-2 => core-java-8}/src/main/java/com/ossez/jarArguments/JarExample.java (100%) rename core-java-modules/{core-java-8-2 => core-java-8}/src/main/java/com/ossez/localization/App.java (93%) rename core-java-modules/{core-java-8-2 => core-java-8}/src/main/java/com/ossez/localization/ICUFormat.java (100%) rename core-java-modules/{core-java-8-2 => core-java-8}/src/main/java/com/ossez/localization/JavaSEFormat.java (100%) rename core-java-modules/{core-java-8-2 => core-java-8}/src/main/java/com/ossez/localization/Localization.java (100%) rename core-java-modules/{core-java-8-2 => core-java-8}/src/main/java/com/ossez/stream/SkipLimitComparison.java (100%) rename core-java-modules/{core-java-8-2 => core-java-8}/src/main/java/com/ossez/uuid/UuidHelper.java (100%) rename core-java-modules/{core-java-8-2 => core-java-8}/src/main/resources/META-INF/persistence.xml (100%) rename core-java-modules/{core-java-8-2 => core-java-8}/src/main/resources/formats_en.properties (100%) rename core-java-modules/{core-java-8-2 => core-java-8}/src/main/resources/formats_fr.properties (100%) rename core-java-modules/{core-java-8-2 => core-java-8}/src/main/resources/formats_it.properties (100%) rename core-java-modules/{core-java-8-2 => core-java-8}/src/main/resources/formats_pl.properties (100%) rename core-java-modules/{core-java-8-2 => core-java-8}/src/main/resources/messages_en.properties (100%) rename core-java-modules/{core-java-8-2 => core-java-8}/src/main/resources/messages_fr.properties (100%) rename core-java-modules/{core-java-8-2 => core-java-8}/src/main/resources/messages_it.properties (100%) rename core-java-modules/{core-java-8-2 => core-java-8}/src/main/resources/messages_pl.properties (100%) rename core-java-modules/{core-java-8-2 => core-java-8}/src/test/java/com/ossez/bifunction/BiFunctionalInterfacesUnitTest.java (100%) rename core-java-modules/{core-java-8-2 => core-java-8}/src/test/java/com/ossez/interfaceVsAbstractClass/InterfaceVsAbstractClassUnitTest.java (100%) rename core-java-modules/{core-java-8-2 => core-java-8}/src/test/java/com/ossez/localization/ICUFormatUnitTest.java (100%) diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 0d92c7f2b6..742bfec4fa 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -27,20 +27,20 @@ - - + + diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml index d93942bfe5..3e6cf93d04 100644 --- a/.idea/jarRepositories.xml +++ b/.idea/jarRepositories.xml @@ -2,9 +2,9 @@ -