From 189b762465a1307c77d0b787109867839ce077a9 Mon Sep 17 00:00:00 2001 From: olivergeith Date: Fri, 20 Nov 2020 11:41:56 +0100 Subject: [PATCH 1/8] Added comment --- .../src/org/eclipse/example/calc/internal/Calculator.java | 1 + 1 file changed, 1 insertion(+) diff --git a/org.eclipse.forkexample.calc/src/org/eclipse/example/calc/internal/Calculator.java b/org.eclipse.forkexample.calc/src/org/eclipse/example/calc/internal/Calculator.java index 4d8f4942..89398c98 100644 --- a/org.eclipse.forkexample.calc/src/org/eclipse/example/calc/internal/Calculator.java +++ b/org.eclipse.forkexample.calc/src/org/eclipse/example/calc/internal/Calculator.java @@ -43,6 +43,7 @@ private void setupDefaultOperations() { new Minus(); new Plus(); new Square(); + // More to come ... } private void calculate(String cmdName) { From 8ce68c837c9f0effedbc8c4068bc8bd9ce499b12 Mon Sep 17 00:00:00 2001 From: olivergeith Date: Fri, 20 Nov 2020 11:44:53 +0100 Subject: [PATCH 2/8] even more comments --- .../src/org/eclipse/example/calc/internal/Calculator.java | 1 + 1 file changed, 1 insertion(+) diff --git a/org.eclipse.forkexample.calc/src/org/eclipse/example/calc/internal/Calculator.java b/org.eclipse.forkexample.calc/src/org/eclipse/example/calc/internal/Calculator.java index 89398c98..238e366f 100644 --- a/org.eclipse.forkexample.calc/src/org/eclipse/example/calc/internal/Calculator.java +++ b/org.eclipse.forkexample.calc/src/org/eclipse/example/calc/internal/Calculator.java @@ -44,6 +44,7 @@ private void setupDefaultOperations() { new Plus(); new Square(); // More to come ... + // and even more.... } private void calculate(String cmdName) { From fe894eebe73cf96fd5f23574b977cbf549db0e2b Mon Sep 17 00:00:00 2001 From: Claus Traulsen Date: Fri, 20 Nov 2020 11:45:51 +0100 Subject: [PATCH 3/8] New file --- Test.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 Test.txt diff --git a/Test.txt b/Test.txt new file mode 100644 index 00000000..42ebb661 --- /dev/null +++ b/Test.txt @@ -0,0 +1 @@ +Huhu \ No newline at end of file From 744dc253fb3312863af22ea77fcdb6dae02098ba Mon Sep 17 00:00:00 2001 From: olivergeith Date: Fri, 20 Nov 2020 11:47:46 +0100 Subject: [PATCH 4/8] ..... commentsd --- .../src/org/eclipse/example/calc/internal/Calculator.java | 1 + 1 file changed, 1 insertion(+) diff --git a/org.eclipse.forkexample.calc/src/org/eclipse/example/calc/internal/Calculator.java b/org.eclipse.forkexample.calc/src/org/eclipse/example/calc/internal/Calculator.java index 89398c98..b33d0d56 100644 --- a/org.eclipse.forkexample.calc/src/org/eclipse/example/calc/internal/Calculator.java +++ b/org.eclipse.forkexample.calc/src/org/eclipse/example/calc/internal/Calculator.java @@ -39,6 +39,7 @@ private void setupDefaultOperations() { // Das ist der erste Kommentar in masterGithub // Das ist der zweite Kommentar in master // auch noch ein Kommentar von Ruth + // ..... new Equals(); new Minus(); new Plus(); From d934f31e0d6175cc90ee75255481767b842fd700 Mon Sep 17 00:00:00 2001 From: Bolde Date: Fri, 20 Nov 2020 11:56:17 +0100 Subject: [PATCH 5/8] added a comment from stebo58 --- .../src/org/eclipse/example/calc/internal/Calculator.java | 1 + 1 file changed, 1 insertion(+) diff --git a/org.eclipse.forkexample.calc/src/org/eclipse/example/calc/internal/Calculator.java b/org.eclipse.forkexample.calc/src/org/eclipse/example/calc/internal/Calculator.java index 4d8f4942..de1ca5af 100644 --- a/org.eclipse.forkexample.calc/src/org/eclipse/example/calc/internal/Calculator.java +++ b/org.eclipse.forkexample.calc/src/org/eclipse/example/calc/internal/Calculator.java @@ -39,6 +39,7 @@ private void setupDefaultOperations() { // Das ist der erste Kommentar in masterGithub // Das ist der zweite Kommentar in master // auch noch ein Kommentar von Ruth + // ein Kommentar von Stebo58 new Equals(); new Minus(); new Plus(); From 4a0adc00e20884c096265b61cbacf0bdc8c4dde5 Mon Sep 17 00:00:00 2001 From: Bolde Date: Fri, 20 Nov 2020 12:07:14 +0100 Subject: [PATCH 6/8] new line in header from stebo58 --- .../src/org/eclipse/example/calc/internal/operations/Equals.java | 1 + 1 file changed, 1 insertion(+) diff --git a/org.eclipse.forkexample.calc/src/org/eclipse/example/calc/internal/operations/Equals.java b/org.eclipse.forkexample.calc/src/org/eclipse/example/calc/internal/operations/Equals.java index 4907684c..9ba17c9c 100644 --- a/org.eclipse.forkexample.calc/src/org/eclipse/example/calc/internal/operations/Equals.java +++ b/org.eclipse.forkexample.calc/src/org/eclipse/example/calc/internal/operations/Equals.java @@ -5,6 +5,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html + * new header line from stebo58 edited in master branch *******************************************************************************/ package org.eclipse.example.calc.internal.operations; From 1ddc9bfd0b2b8e062746bc256c08b4fb54b152f1 Mon Sep 17 00:00:00 2001 From: Bolde Date: Fri, 20 Nov 2020 12:26:44 +0100 Subject: [PATCH 7/8] noch mehr Kommentar stebo58 --- .../src/org/eclipse/example/calc/internal/Calculator.java | 1 + 1 file changed, 1 insertion(+) diff --git a/org.eclipse.forkexample.calc/src/org/eclipse/example/calc/internal/Calculator.java b/org.eclipse.forkexample.calc/src/org/eclipse/example/calc/internal/Calculator.java index de1ca5af..0fb9f515 100644 --- a/org.eclipse.forkexample.calc/src/org/eclipse/example/calc/internal/Calculator.java +++ b/org.eclipse.forkexample.calc/src/org/eclipse/example/calc/internal/Calculator.java @@ -40,6 +40,7 @@ private void setupDefaultOperations() { // Das ist der zweite Kommentar in master // auch noch ein Kommentar von Ruth // ein Kommentar von Stebo58 + // ein Kommentar von Stebo58 auf SB_local_features new Equals(); new Minus(); new Plus(); From 83f7e1397ee61e9213e02a2c37d998fc5ebf6647 Mon Sep 17 00:00:00 2001 From: olivergeith Date: Fri, 20 Nov 2020 13:39:26 +0100 Subject: [PATCH 8/8] Revert "hol dir das ab!" --- .../src/org/eclipse/example/calc/internal/Calculator.java | 3 --- .../org/eclipse/example/calc/internal/operations/Equals.java | 1 - 2 files changed, 4 deletions(-) diff --git a/org.eclipse.forkexample.calc/src/org/eclipse/example/calc/internal/Calculator.java b/org.eclipse.forkexample.calc/src/org/eclipse/example/calc/internal/Calculator.java index 3c6168c8..faa3a74c 100644 --- a/org.eclipse.forkexample.calc/src/org/eclipse/example/calc/internal/Calculator.java +++ b/org.eclipse.forkexample.calc/src/org/eclipse/example/calc/internal/Calculator.java @@ -39,9 +39,6 @@ private void setupDefaultOperations() { // Das ist der erste Kommentar in masterGithub // Das ist der zweite Kommentar in master // auch noch ein Kommentar von Ruth - - // ein Kommentar von Stebo58 - // ein Kommentar von Stebo58 auf SB_local_features // ..... new Equals(); new Minus(); diff --git a/org.eclipse.forkexample.calc/src/org/eclipse/example/calc/internal/operations/Equals.java b/org.eclipse.forkexample.calc/src/org/eclipse/example/calc/internal/operations/Equals.java index 9ba17c9c..4907684c 100644 --- a/org.eclipse.forkexample.calc/src/org/eclipse/example/calc/internal/operations/Equals.java +++ b/org.eclipse.forkexample.calc/src/org/eclipse/example/calc/internal/operations/Equals.java @@ -5,7 +5,6 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * new header line from stebo58 edited in master branch *******************************************************************************/ package org.eclipse.example.calc.internal.operations;