diff --git a/.project b/.project new file mode 100644 index 00000000..bb121c8e --- /dev/null +++ b/.project @@ -0,0 +1,17 @@ + + + gitsample-fork + + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + + diff --git a/org.eclipse.example.calc.test/org.eclipse.example.calc--All-Tests.launch b/org.eclipse.example.calc.test/org.eclipse.example.calc--All-Tests.launch deleted file mode 100644 index b2e41f4d..00000000 --- a/org.eclipse.example.calc.test/org.eclipse.example.calc--All-Tests.launch +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/org.eclipse.example.calc/.settings/org.eclipse.core.resources.prefs b/org.eclipse.example.calc/.settings/org.eclipse.core.resources.prefs index bc410ebc..99f26c02 100644 --- a/org.eclipse.example.calc/.settings/org.eclipse.core.resources.prefs +++ b/org.eclipse.example.calc/.settings/org.eclipse.core.resources.prefs @@ -1,4 +1,2 @@ -#Mon Mar 21 11:37:12 PDT 2011 eclipse.preferences.version=1 -encoding//src/org/eclipse/example/calc/internal/operations/Square.java=UTF-8 encoding/=UTF-8 diff --git a/org.eclipse.example.calc/SwingCalculatorUI.launch b/org.eclipse.example.calc/SwingCalculatorUI.launch deleted file mode 100644 index 76ff6705..00000000 --- a/org.eclipse.example.calc/SwingCalculatorUI.launch +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/org.eclipse.example.calc/bin/.settings/org.eclipse.core.resources.prefs b/org.eclipse.example.calc/bin/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 00000000..99f26c02 --- /dev/null +++ b/org.eclipse.example.calc/bin/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/org.eclipse.example.calc.test/.classpath b/org.eclipse.forkexample.calc.test/.classpath similarity index 94% rename from org.eclipse.example.calc.test/.classpath rename to org.eclipse.forkexample.calc.test/.classpath index 80f7915f..ecdd0301 100644 --- a/org.eclipse.example.calc.test/.classpath +++ b/org.eclipse.forkexample.calc.test/.classpath @@ -2,7 +2,7 @@ - + diff --git a/org.eclipse.example.calc.test/.gitignore b/org.eclipse.forkexample.calc.test/.gitignore similarity index 100% rename from org.eclipse.example.calc.test/.gitignore rename to org.eclipse.forkexample.calc.test/.gitignore diff --git a/org.eclipse.example.calc.test/.project b/org.eclipse.forkexample.calc.test/.project similarity index 92% rename from org.eclipse.example.calc.test/.project rename to org.eclipse.forkexample.calc.test/.project index a3f0ba92..8c8b4ad6 100644 --- a/org.eclipse.example.calc.test/.project +++ b/org.eclipse.forkexample.calc.test/.project @@ -1,6 +1,6 @@ - org.eclipse.example.calc.test + org.eclipse.forkexample.calc.test diff --git a/org.eclipse.example.calc.test/.settings/org.eclipse.core.resources.prefs b/org.eclipse.forkexample.calc.test/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from org.eclipse.example.calc.test/.settings/org.eclipse.core.resources.prefs rename to org.eclipse.forkexample.calc.test/.settings/org.eclipse.core.resources.prefs diff --git a/org.eclipse.example.calc.test/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.forkexample.calc.test/.settings/org.eclipse.core.runtime.prefs similarity index 100% rename from org.eclipse.example.calc.test/.settings/org.eclipse.core.runtime.prefs rename to org.eclipse.forkexample.calc.test/.settings/org.eclipse.core.runtime.prefs diff --git a/org.eclipse.example.calc.test/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.forkexample.calc.test/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from org.eclipse.example.calc.test/.settings/org.eclipse.jdt.core.prefs rename to org.eclipse.forkexample.calc.test/.settings/org.eclipse.jdt.core.prefs diff --git a/org.eclipse.example.calc.test/META-INF/MANIFEST.MF b/org.eclipse.forkexample.calc.test/META-INF/MANIFEST.MF similarity index 66% rename from org.eclipse.example.calc.test/META-INF/MANIFEST.MF rename to org.eclipse.forkexample.calc.test/META-INF/MANIFEST.MF index d8b37c78..ec9f17da 100644 --- a/org.eclipse.example.calc.test/META-INF/MANIFEST.MF +++ b/org.eclipse.forkexample.calc.test/META-INF/MANIFEST.MF @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Calculator Test -Bundle-SymbolicName: org.eclipse.example.calc.test +Bundle-SymbolicName: org.eclipse.forkexample.calc.test Bundle-Version: 0.1.0.qualifier -Fragment-Host: org.eclipse.example.calc;bundle-version="[0.1.0,0.2.0)" +Fragment-Host: org.eclipse.forkexample.calc;bundle-version="[0.1.0,0.2.0)" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.junit Import-Package: org.eclipse.example.calc.internal;version="[0.1.0,0.2.0)" diff --git a/org.eclipse.example.calc.test/build.properties b/org.eclipse.forkexample.calc.test/build.properties similarity index 100% rename from org.eclipse.example.calc.test/build.properties rename to org.eclipse.forkexample.calc.test/build.properties diff --git a/org.eclipse.forkexample.calc.test/org.eclipse.example.calc--All-Tests.launch b/org.eclipse.forkexample.calc.test/org.eclipse.example.calc--All-Tests.launch new file mode 100644 index 00000000..6eef100c --- /dev/null +++ b/org.eclipse.forkexample.calc.test/org.eclipse.example.calc--All-Tests.launch @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.example.calc.test/pom.xml b/org.eclipse.forkexample.calc.test/pom.xml similarity index 100% rename from org.eclipse.example.calc.test/pom.xml rename to org.eclipse.forkexample.calc.test/pom.xml diff --git a/org.eclipse.example.calc.test/tst/org/eclipse/example/calc/OperationsTest.java b/org.eclipse.forkexample.calc.test/tst/org/eclipse/example/calc/OperationsTest.java similarity index 97% rename from org.eclipse.example.calc.test/tst/org/eclipse/example/calc/OperationsTest.java rename to org.eclipse.forkexample.calc.test/tst/org/eclipse/example/calc/OperationsTest.java index cbb081af..680bdd97 100644 --- a/org.eclipse.example.calc.test/tst/org/eclipse/example/calc/OperationsTest.java +++ b/org.eclipse.forkexample.calc.test/tst/org/eclipse/example/calc/OperationsTest.java @@ -19,7 +19,12 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; - +/** + * + * testclass for @Operations + *

+ * running + */ public class OperationsTest { private Square square; diff --git a/org.eclipse.example.calc.test/tst/org/eclipse/example/calc/internal/CalculatorTest.java b/org.eclipse.forkexample.calc.test/tst/org/eclipse/example/calc/internal/CalculatorTest.java similarity index 100% rename from org.eclipse.example.calc.test/tst/org/eclipse/example/calc/internal/CalculatorTest.java rename to org.eclipse.forkexample.calc.test/tst/org/eclipse/example/calc/internal/CalculatorTest.java diff --git a/org.eclipse.example.calc.test/tst/org/eclipse/example/calc/internal/operations/AbstractOperationTest.java b/org.eclipse.forkexample.calc.test/tst/org/eclipse/example/calc/internal/operations/AbstractOperationTest.java similarity index 100% rename from org.eclipse.example.calc.test/tst/org/eclipse/example/calc/internal/operations/AbstractOperationTest.java rename to org.eclipse.forkexample.calc.test/tst/org/eclipse/example/calc/internal/operations/AbstractOperationTest.java diff --git a/org.eclipse.example.calc.test/tst/org/eclipse/example/calc/internal/operations/EqualsTest.java b/org.eclipse.forkexample.calc.test/tst/org/eclipse/example/calc/internal/operations/EqualsTest.java similarity index 100% rename from org.eclipse.example.calc.test/tst/org/eclipse/example/calc/internal/operations/EqualsTest.java rename to org.eclipse.forkexample.calc.test/tst/org/eclipse/example/calc/internal/operations/EqualsTest.java diff --git a/org.eclipse.example.calc.test/tst/org/eclipse/example/calc/internal/operations/MinusTest.java b/org.eclipse.forkexample.calc.test/tst/org/eclipse/example/calc/internal/operations/MinusTest.java similarity index 100% rename from org.eclipse.example.calc.test/tst/org/eclipse/example/calc/internal/operations/MinusTest.java rename to org.eclipse.forkexample.calc.test/tst/org/eclipse/example/calc/internal/operations/MinusTest.java diff --git a/org.eclipse.example.calc.test/tst/org/eclipse/example/calc/internal/operations/PlusTest.java b/org.eclipse.forkexample.calc.test/tst/org/eclipse/example/calc/internal/operations/PlusTest.java similarity index 100% rename from org.eclipse.example.calc.test/tst/org/eclipse/example/calc/internal/operations/PlusTest.java rename to org.eclipse.forkexample.calc.test/tst/org/eclipse/example/calc/internal/operations/PlusTest.java diff --git a/org.eclipse.example.calc.test/tst/org/eclipse/example/calc/internal/operations/SquareTest.java b/org.eclipse.forkexample.calc.test/tst/org/eclipse/example/calc/internal/operations/SquareTest.java similarity index 100% rename from org.eclipse.example.calc.test/tst/org/eclipse/example/calc/internal/operations/SquareTest.java rename to org.eclipse.forkexample.calc.test/tst/org/eclipse/example/calc/internal/operations/SquareTest.java diff --git a/org.eclipse.example.calc/.classpath b/org.eclipse.forkexample.calc/.classpath similarity index 100% rename from org.eclipse.example.calc/.classpath rename to org.eclipse.forkexample.calc/.classpath diff --git a/org.eclipse.example.calc/.gitignore b/org.eclipse.forkexample.calc/.gitignore similarity index 100% rename from org.eclipse.example.calc/.gitignore rename to org.eclipse.forkexample.calc/.gitignore diff --git a/org.eclipse.example.calc/.project b/org.eclipse.forkexample.calc/.project similarity index 93% rename from org.eclipse.example.calc/.project rename to org.eclipse.forkexample.calc/.project index 3a1f8080..35cbb425 100644 --- a/org.eclipse.example.calc/.project +++ b/org.eclipse.forkexample.calc/.project @@ -1,6 +1,6 @@ - org.eclipse.example.calc + org.eclipse.forkexample.calc diff --git a/org.eclipse.forkexample.calc/.settings/org.eclipse.core.resources.prefs b/org.eclipse.forkexample.calc/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 00000000..bc410ebc --- /dev/null +++ b/org.eclipse.forkexample.calc/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,4 @@ +#Mon Mar 21 11:37:12 PDT 2011 +eclipse.preferences.version=1 +encoding//src/org/eclipse/example/calc/internal/operations/Square.java=UTF-8 +encoding/=UTF-8 diff --git a/org.eclipse.example.calc/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.forkexample.calc/.settings/org.eclipse.core.runtime.prefs similarity index 100% rename from org.eclipse.example.calc/.settings/org.eclipse.core.runtime.prefs rename to org.eclipse.forkexample.calc/.settings/org.eclipse.core.runtime.prefs diff --git a/org.eclipse.example.calc/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.forkexample.calc/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from org.eclipse.example.calc/.settings/org.eclipse.jdt.core.prefs rename to org.eclipse.forkexample.calc/.settings/org.eclipse.jdt.core.prefs diff --git a/org.eclipse.example.calc/META-INF/MANIFEST.MF b/org.eclipse.forkexample.calc/META-INF/MANIFEST.MF similarity index 90% rename from org.eclipse.example.calc/META-INF/MANIFEST.MF rename to org.eclipse.forkexample.calc/META-INF/MANIFEST.MF index 752f68c9..e242bda7 100644 --- a/org.eclipse.example.calc/META-INF/MANIFEST.MF +++ b/org.eclipse.forkexample.calc/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Calculator -Bundle-SymbolicName: org.eclipse.example.calc +Bundle-SymbolicName: org.eclipse.forkexample.calc Bundle-Version: 0.1.0.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/org.eclipse.forkexample.calc/SwingCalculatorUI.launch b/org.eclipse.forkexample.calc/SwingCalculatorUI.launch new file mode 100644 index 00000000..54162627 --- /dev/null +++ b/org.eclipse.forkexample.calc/SwingCalculatorUI.launch @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/org.eclipse.example.calc/build.properties b/org.eclipse.forkexample.calc/build.properties similarity index 100% rename from org.eclipse.example.calc/build.properties rename to org.eclipse.forkexample.calc/build.properties diff --git a/org.eclipse.example.calc/pom.xml b/org.eclipse.forkexample.calc/pom.xml similarity index 100% rename from org.eclipse.example.calc/pom.xml rename to org.eclipse.forkexample.calc/pom.xml diff --git a/org.eclipse.example.calc/readme.txt b/org.eclipse.forkexample.calc/readme.txt similarity index 100% rename from org.eclipse.example.calc/readme.txt rename to org.eclipse.forkexample.calc/readme.txt diff --git a/org.eclipse.example.calc/src/org/eclipse/example/calc/BinaryOperation.java b/org.eclipse.forkexample.calc/src/org/eclipse/example/calc/BinaryOperation.java similarity index 88% rename from org.eclipse.example.calc/src/org/eclipse/example/calc/BinaryOperation.java rename to org.eclipse.forkexample.calc/src/org/eclipse/example/calc/BinaryOperation.java index 5e0348ef..a60f4d64 100644 --- a/org.eclipse.example.calc/src/org/eclipse/example/calc/BinaryOperation.java +++ b/org.eclipse.forkexample.calc/src/org/eclipse/example/calc/BinaryOperation.java @@ -7,15 +7,16 @@ * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ package org.eclipse.example.calc; - /** * Binary operation interface */ public interface BinaryOperation extends Operation { /** + * hier fehlt eine beschreibung immer noch * @param arg1 first parameter * @param arg2 second parameter - * @return result of binary operation - */ + * + * @return result of binary operation + */ public float perform(float arg1, float arg2); } diff --git a/org.eclipse.example.calc/src/org/eclipse/example/calc/Operation.java b/org.eclipse.forkexample.calc/src/org/eclipse/example/calc/Operation.java similarity index 100% rename from org.eclipse.example.calc/src/org/eclipse/example/calc/Operation.java rename to org.eclipse.forkexample.calc/src/org/eclipse/example/calc/Operation.java diff --git a/org.eclipse.example.calc/src/org/eclipse/example/calc/Operations.java b/org.eclipse.forkexample.calc/src/org/eclipse/example/calc/Operations.java similarity index 100% rename from org.eclipse.example.calc/src/org/eclipse/example/calc/Operations.java rename to org.eclipse.forkexample.calc/src/org/eclipse/example/calc/Operations.java diff --git a/org.eclipse.example.calc/src/org/eclipse/example/calc/UnaryOperation.java b/org.eclipse.forkexample.calc/src/org/eclipse/example/calc/UnaryOperation.java similarity index 100% rename from org.eclipse.example.calc/src/org/eclipse/example/calc/UnaryOperation.java rename to org.eclipse.forkexample.calc/src/org/eclipse/example/calc/UnaryOperation.java diff --git a/org.eclipse.forkexample.calc/src/org/eclipse/example/calc/internal/.gitignore b/org.eclipse.forkexample.calc/src/org/eclipse/example/calc/internal/.gitignore new file mode 100644 index 00000000..e69de29b diff --git a/org.eclipse.example.calc/src/org/eclipse/example/calc/internal/Calculator.java b/org.eclipse.forkexample.calc/src/org/eclipse/example/calc/internal/Calculator.java similarity index 96% rename from org.eclipse.example.calc/src/org/eclipse/example/calc/internal/Calculator.java rename to org.eclipse.forkexample.calc/src/org/eclipse/example/calc/internal/Calculator.java index fe825b0b..4d8f4942 100644 --- a/org.eclipse.example.calc/src/org/eclipse/example/calc/internal/Calculator.java +++ b/org.eclipse.forkexample.calc/src/org/eclipse/example/calc/internal/Calculator.java @@ -36,6 +36,9 @@ public Calculator(TextProvider textProvider) { } 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(); diff --git a/org.eclipse.example.calc/src/org/eclipse/example/calc/internal/TextProvider.java b/org.eclipse.forkexample.calc/src/org/eclipse/example/calc/internal/TextProvider.java similarity index 100% rename from org.eclipse.example.calc/src/org/eclipse/example/calc/internal/TextProvider.java rename to org.eclipse.forkexample.calc/src/org/eclipse/example/calc/internal/TextProvider.java diff --git a/org.eclipse.example.calc/src/org/eclipse/example/calc/internal/operations/AbstractOperation.java b/org.eclipse.forkexample.calc/src/org/eclipse/example/calc/internal/operations/AbstractOperation.java similarity index 100% rename from org.eclipse.example.calc/src/org/eclipse/example/calc/internal/operations/AbstractOperation.java rename to org.eclipse.forkexample.calc/src/org/eclipse/example/calc/internal/operations/AbstractOperation.java diff --git a/org.eclipse.example.calc/src/org/eclipse/example/calc/internal/operations/Equals.java b/org.eclipse.forkexample.calc/src/org/eclipse/example/calc/internal/operations/Equals.java similarity index 100% rename from org.eclipse.example.calc/src/org/eclipse/example/calc/internal/operations/Equals.java rename to org.eclipse.forkexample.calc/src/org/eclipse/example/calc/internal/operations/Equals.java diff --git a/org.eclipse.example.calc/src/org/eclipse/example/calc/internal/operations/Minus.java b/org.eclipse.forkexample.calc/src/org/eclipse/example/calc/internal/operations/Minus.java similarity index 100% rename from org.eclipse.example.calc/src/org/eclipse/example/calc/internal/operations/Minus.java rename to org.eclipse.forkexample.calc/src/org/eclipse/example/calc/internal/operations/Minus.java diff --git a/org.eclipse.example.calc/src/org/eclipse/example/calc/internal/operations/Plus.java b/org.eclipse.forkexample.calc/src/org/eclipse/example/calc/internal/operations/Plus.java similarity index 100% rename from org.eclipse.example.calc/src/org/eclipse/example/calc/internal/operations/Plus.java rename to org.eclipse.forkexample.calc/src/org/eclipse/example/calc/internal/operations/Plus.java diff --git a/org.eclipse.example.calc/src/org/eclipse/example/calc/internal/operations/Square.java b/org.eclipse.forkexample.calc/src/org/eclipse/example/calc/internal/operations/Square.java similarity index 100% rename from org.eclipse.example.calc/src/org/eclipse/example/calc/internal/operations/Square.java rename to org.eclipse.forkexample.calc/src/org/eclipse/example/calc/internal/operations/Square.java diff --git a/org.eclipse.example.calc/src/org/eclipse/example/calc/internal/ui/swing/CalculatorUI.java b/org.eclipse.forkexample.calc/src/org/eclipse/example/calc/internal/ui/swing/CalculatorUI.java similarity index 99% rename from org.eclipse.example.calc/src/org/eclipse/example/calc/internal/ui/swing/CalculatorUI.java rename to org.eclipse.forkexample.calc/src/org/eclipse/example/calc/internal/ui/swing/CalculatorUI.java index 128a27f9..6d112b38 100644 --- a/org.eclipse.example.calc/src/org/eclipse/example/calc/internal/ui/swing/CalculatorUI.java +++ b/org.eclipse.forkexample.calc/src/org/eclipse/example/calc/internal/ui/swing/CalculatorUI.java @@ -34,7 +34,7 @@ public class CalculatorUI extends JFrame implements TextProvider, private static final long serialVersionUID = 1L; private Calculator calculator; - +// test private JTextField display; private JPanel buttonsPanel;