iSharkFly-Open/Java-Tutorials
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix conflicts

Browse Source
This commit is contained in:
Dassi Orleando
2017-09-23 00:30:12 +01:00
parent 8b9037ff0a ec6aca9c51
commit 9a9a0fc277
72 changed files with 722 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core-java/README.md
+1
View File
@@ -106,3 +106,4 @@
- [Converting a List to String in Java](http://www.baeldung.com/java-list-to-string)
- [CharSequence vs. String in Java](http://www.baeldung.com/java-char-sequence-string)
- [Period and Duration in Java](http://www.baeldung.com/java-period-duration)
- [Guide to the Diamond Operator in Java](http://www.baeldung.com/java-diamond-operator)
kotlin/README.md → core-kotlin/README.md
View File
kotlin/pom.xml → core-kotlin/pom.xml
+1 -1
View File
@@ -3,7 +3,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>kotlin</artifactId>
<artifactId>core-kotlin</artifactId>
<version>1.0-SNAPSHOT</version>
<parent>
kotlin/src/main/java/com/baeldung/dataclass/Movie.java → core-kotlin/src/main/java/com/baeldung/dataclass/Movie.java
View File
kotlin/src/main/java/com/baeldung/java/ArrayExample.java → core-kotlin/src/main/java/com/baeldung/java/ArrayExample.java
View File
kotlin/src/main/java/com/baeldung/java/Customer.java → core-kotlin/src/main/java/com/baeldung/java/Customer.java
View File
kotlin/src/main/java/com/baeldung/java/StringUtils.java → core-kotlin/src/main/java/com/baeldung/java/StringUtils.java
View File
kotlin/src/main/java/com/baeldung/lazy/ClassWithHeavyInitialization.java → core-kotlin/src/main/java/com/baeldung/lazy/ClassWithHeavyInitialization.java
View File
kotlin/src/main/kotlin/com/baeldung/dataclass/Movie.kt → core-kotlin/src/main/kotlin/com/baeldung/dataclass/Movie.kt
View File
kotlin/src/main/kotlin/com/baeldung/dataclass/Sandbox.kt → core-kotlin/src/main/kotlin/com/baeldung/dataclass/Sandbox.kt
View File
kotlin/src/main/kotlin/com/baeldung/destructuringdeclarations/Person.kt → core-kotlin/src/main/kotlin/com/baeldung/destructuringdeclarations/Person.kt
View File
kotlin/src/main/kotlin/com/baeldung/destructuringdeclarations/Result.kt → core-kotlin/src/main/kotlin/com/baeldung/destructuringdeclarations/Result.kt
View File
kotlin/src/main/kotlin/com/baeldung/destructuringdeclarations/Sandbox.kt → core-kotlin/src/main/kotlin/com/baeldung/destructuringdeclarations/Sandbox.kt
View File
kotlin/src/main/kotlin/com/baeldung/kotlin/Example1.kt → core-kotlin/src/main/kotlin/com/baeldung/kotlin/Example1.kt
View File
kotlin/src/main/kotlin/com/baeldung/kotlin/Item.kt → core-kotlin/src/main/kotlin/com/baeldung/kotlin/Item.kt
View File
kotlin/src/main/kotlin/com/baeldung/kotlin/ItemService.kt → core-kotlin/src/main/kotlin/com/baeldung/kotlin/ItemService.kt
View File
kotlin/src/main/kotlin/com/baeldung/kotlin/JvmSample.kt → core-kotlin/src/main/kotlin/com/baeldung/kotlin/JvmSample.kt
View File
kotlin/src/main/kotlin/com/baeldung/kotlin/ListExtension.kt → core-kotlin/src/main/kotlin/com/baeldung/kotlin/ListExtension.kt
View File
kotlin/src/main/kotlin/com/baeldung/kotlin/MathematicsOperations.kt → core-kotlin/src/main/kotlin/com/baeldung/kotlin/MathematicsOperations.kt
View File
kotlin/src/main/kotlin/com/baeldung/kotlin/Sealed.kt → core-kotlin/src/main/kotlin/com/baeldung/kotlin/Sealed.kt
View File
kotlin/src/main/kotlin/com/baeldung/kotlin/User.kt → core-kotlin/src/main/kotlin/com/baeldung/kotlin/User.kt
View File
kotlin/src/main/kotlin/com/baeldung/kotlin/WhenBlockTypes.kt → core-kotlin/src/main/kotlin/com/baeldung/kotlin/WhenBlockTypes.kt
View File
kotlin/src/main/kotlin/com/baeldung/kotlin/delegates/Database.kt → core-kotlin/src/main/kotlin/com/baeldung/kotlin/delegates/Database.kt
View File
kotlin/src/main/kotlin/com/baeldung/kotlin/delegates/DatabaseDelegate.kt → core-kotlin/src/main/kotlin/com/baeldung/kotlin/delegates/DatabaseDelegate.kt
View File
kotlin/src/main/kotlin/com/baeldung/kotlin/delegates/User.kt → core-kotlin/src/main/kotlin/com/baeldung/kotlin/delegates/User.kt
View File
kotlin/src/main/kotlin/com/baeldung/kotlin/mockito/BookService.kt → core-kotlin/src/main/kotlin/com/baeldung/kotlin/mockito/BookService.kt
View File
kotlin/src/main/kotlin/com/baeldung/kotlin/mockito/LendBookManager.kt → core-kotlin/src/main/kotlin/com/baeldung/kotlin/mockito/LendBookManager.kt
View File
kotlin/src/test/java/com/baeldung/kotlin/JavaCallToKotlinUnitTest.java → core-kotlin/src/test/java/com/baeldung/kotlin/JavaCallToKotlinUnitTest.java
View File
kotlin/src/test/java/com/baeldung/kotlin/LazyJavaUnitTest.java → core-kotlin/src/test/java/com/baeldung/kotlin/LazyJavaUnitTest.java
View File
kotlin/src/test/kotlin/com/baeldung/kotlin/ArrayTest.kt → core-kotlin/src/test/kotlin/com/baeldung/kotlin/ArrayTest.kt
View File

Some files were not shown because too many files have changed in this diff Show More