From b9ceedea23aaf2dc4875bdf3d82f1bddf8706ebd Mon Sep 17 00:00:00 2001 From: ciro Date: Wed, 3 Apr 2019 16:59:50 -0700 Subject: [PATCH] corrections --- core-java-lang-oop-2/.gitignore | 26 ++----------------- ...ssSolutionI.java => MyClassSolution1.java} | 6 ++--- ...sSolutionII.java => MyClassSolution2.java} | 6 ++--- ...SolutionIII.java => MyClassSolution3.java} | 6 ++--- .../src/main/resources/logback.xml | 19 -------------- .../src/test/resources/.gitignore | 13 ---------- 6 files changed, 11 insertions(+), 65 deletions(-) rename core-java-lang-oop-2/src/main/java/com/baeldung/supertypecompilerexception/{MyClassSolutionI.java => MyClassSolution1.java} (63%) rename core-java-lang-oop-2/src/main/java/com/baeldung/supertypecompilerexception/{MyClassSolutionII.java => MyClassSolution2.java} (70%) rename core-java-lang-oop-2/src/main/java/com/baeldung/supertypecompilerexception/{MyClassSolutionIII.java => MyClassSolution3.java} (64%) delete mode 100644 core-java-lang-oop-2/src/main/resources/logback.xml delete mode 100644 core-java-lang-oop-2/src/test/resources/.gitignore diff --git a/core-java-lang-oop-2/.gitignore b/core-java-lang-oop-2/.gitignore index 3de4cc647e..36aba1c242 100644 --- a/core-java-lang-oop-2/.gitignore +++ b/core-java-lang-oop-2/.gitignore @@ -1,26 +1,4 @@ -*.class - -0.* - -#folders# -/target -/neoDb* -/data -/src/main/webapp/WEB-INF/classes -*/META-INF/* -.resourceCache - -# Packaged files # -*.jar -*.war -*.ear - -# Files generated by integration tests -*.txt -backup-pom.xml -/bin/ -/temp - -#IntelliJ specific +target/ .idea/ +bin/ *.iml \ No newline at end of file diff --git a/core-java-lang-oop-2/src/main/java/com/baeldung/supertypecompilerexception/MyClassSolutionI.java b/core-java-lang-oop-2/src/main/java/com/baeldung/supertypecompilerexception/MyClassSolution1.java similarity index 63% rename from core-java-lang-oop-2/src/main/java/com/baeldung/supertypecompilerexception/MyClassSolutionI.java rename to core-java-lang-oop-2/src/main/java/com/baeldung/supertypecompilerexception/MyClassSolution1.java index 36000e4bf4..36fa446302 100644 --- a/core-java-lang-oop-2/src/main/java/com/baeldung/supertypecompilerexception/MyClassSolutionI.java +++ b/core-java-lang-oop-2/src/main/java/com/baeldung/supertypecompilerexception/MyClassSolution1.java @@ -1,15 +1,15 @@ package com.baeldung.supertypecompilerexception; -public class MyClassSolutionI { +public class MyClassSolution1 { private int myField1 = 10; private int myField2; - public MyClassSolutionI() { + public MyClassSolution1() { myField2 = myField1; } - public MyClassSolutionI(int i) { + public MyClassSolution1(int i) { myField2 = i; } } diff --git a/core-java-lang-oop-2/src/main/java/com/baeldung/supertypecompilerexception/MyClassSolutionII.java b/core-java-lang-oop-2/src/main/java/com/baeldung/supertypecompilerexception/MyClassSolution2.java similarity index 70% rename from core-java-lang-oop-2/src/main/java/com/baeldung/supertypecompilerexception/MyClassSolutionII.java rename to core-java-lang-oop-2/src/main/java/com/baeldung/supertypecompilerexception/MyClassSolution2.java index f9bc9b26ae..adaea4bfbe 100644 --- a/core-java-lang-oop-2/src/main/java/com/baeldung/supertypecompilerexception/MyClassSolutionII.java +++ b/core-java-lang-oop-2/src/main/java/com/baeldung/supertypecompilerexception/MyClassSolution2.java @@ -1,15 +1,15 @@ package com.baeldung.supertypecompilerexception; -public class MyClassSolutionII { +public class MyClassSolution2 { private int myField1 = 10; private int myField2; - public MyClassSolutionII() { + public MyClassSolution2() { setupMyFields(myField1); } - public MyClassSolutionII(int i) { + public MyClassSolution2(int i) { setupMyFields(i); } diff --git a/core-java-lang-oop-2/src/main/java/com/baeldung/supertypecompilerexception/MyClassSolutionIII.java b/core-java-lang-oop-2/src/main/java/com/baeldung/supertypecompilerexception/MyClassSolution3.java similarity index 64% rename from core-java-lang-oop-2/src/main/java/com/baeldung/supertypecompilerexception/MyClassSolutionIII.java rename to core-java-lang-oop-2/src/main/java/com/baeldung/supertypecompilerexception/MyClassSolution3.java index f449aa904d..04048f01db 100644 --- a/core-java-lang-oop-2/src/main/java/com/baeldung/supertypecompilerexception/MyClassSolutionIII.java +++ b/core-java-lang-oop-2/src/main/java/com/baeldung/supertypecompilerexception/MyClassSolution3.java @@ -1,15 +1,15 @@ package com.baeldung.supertypecompilerexception; -public class MyClassSolutionIII { +public class MyClassSolution3 { private static final int SOME_CONSTANT = 10; private int myField2; - public MyClassSolutionIII() { + public MyClassSolution3() { this(SOME_CONSTANT); } - public MyClassSolutionIII(int i) { + public MyClassSolution3(int i) { myField2 = i; } } diff --git a/core-java-lang-oop-2/src/main/resources/logback.xml b/core-java-lang-oop-2/src/main/resources/logback.xml deleted file mode 100644 index 56af2d397e..0000000000 --- a/core-java-lang-oop-2/src/main/resources/logback.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - - - - - - - - - \ No newline at end of file diff --git a/core-java-lang-oop-2/src/test/resources/.gitignore b/core-java-lang-oop-2/src/test/resources/.gitignore deleted file mode 100644 index 83c05e60c8..0000000000 --- a/core-java-lang-oop-2/src/test/resources/.gitignore +++ /dev/null @@ -1,13 +0,0 @@ -*.class - -#folders# -/target -/neoDb* -/data -/src/main/webapp/WEB-INF/classes -*/META-INF/* - -# Packaged files # -*.jar -*.war -*.ear \ No newline at end of file