Bitte übernehmen

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/<project>=UTF-8

org.eclipse.example.calc/bin/.settings/org.eclipse.core.resources.prefs

@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8

org.eclipse.example.calc.test/.classpath → org.eclipse.forkexample.calc.test/.classpath

@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="tst"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.example.calc"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.forkexample.calc"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="output" path="bin"/>

org.eclipse.example.calc.test/.project → org.eclipse.forkexample.calc.test/.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.example.calc.test</name>
+	<name>org.eclipse.forkexample.calc.test</name>
 	<comment></comment>
 	<projects>
 	</projects>

org.eclipse.example.calc.test/META-INF/MANIFEST.MF → 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)"

org.eclipse.forkexample.calc.test/org.eclipse.example.calc--All-Tests.launch

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
+    <stringAttribute key="bad_container_name" value="org.eclipse.example.calc--All-Tests"/>
+    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+        <listEntry value="/org.eclipse.forkexample.calc.test"/>
+    </listAttribute>
+    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+        <listEntry value="4"/>
+    </listAttribute>
+    <stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value="=org.eclipse.example.calc.test/tst"/>
+    <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+    <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+    <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+    <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>
+    <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.forkexample.calc.test"/>
+    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea"/>
+</launchConfiguration>

org.eclipse.example.calc.test/pom.xml → org.eclipse.forkexample.calc.test/pom.xml

@@ -24,7 +24,7 @@
   <version>0.1.0-SNAPSHOT</version>
 
   <name>Calculator Test (Incubation)</name>
-
+<!-- Hier soll auch ein Kommentar rein -->
   <build>
     <plugins>
       <plugin>

org.eclipse.example.calc.test/tst/org/eclipse/example/calc/OperationsTest.java → org.eclipse.forkexample.calc.test/tst/org/eclipse/example/calc/OperationsTest.java

@@ -20,6 +20,8 @@
 import org.junit.Before;
 import org.junit.Test;
 
+/** Ich wollte hier mal einen Kommentar reinschreiben **/
+
 public class OperationsTest {
 
 	private Square square;

org.eclipse.example.calc/.project → org.eclipse.forkexample.calc/.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.example.calc</name>
+	<name>org.eclipse.forkexample.calc</name>
 	<comment></comment>
 	<projects>
 	</projects>

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/<project>=UTF-8

org.eclipse.example.calc/META-INF/MANIFEST.MF → 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

org.eclipse.forkexample.calc/SwingCalculatorUI.launch

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
+    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+        <listEntry value="/org.eclipse.forkexample.calc/src/org/eclipse/example/calc/internal/ui/swing/CalculatorUI.java"/>
+    </listAttribute>
+    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+        <listEntry value="1"/>
+    </listAttribute>
+    <mapAttribute key="org.eclipse.debug.core.preferred_launchers">
+        <mapEntry key="[debug]" value="org.eclipse.jdt.launching.localJavaApplication"/>
+        <mapEntry key="[run]" value="org.eclipse.jdt.launching.localJavaApplication"/>
+    </mapAttribute>
+    <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.example.calc.internal.ui.swing.CalculatorUI"/>
+    <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.forkexample.calc"/>
+</launchConfiguration>

org.eclipse.example.calc/src/org/eclipse/example/calc/BinaryOperation.java → org.eclipse.forkexample.calc/src/org/eclipse/example/calc/BinaryOperation.java

@@ -9,11 +9,13 @@
 package org.eclipse.example.calc;
 
 /**
- * Binary operation interface
+ * Binary operation interface test
  */
 public interface BinaryOperation extends Operation {
-	/**
-	 * @param arg1 first parameter
+	/** 
+	 * 
+	 * BinaryOperation
+	 * @param arg1 first parameter 
 	 * @param arg2 second parameter
 	 * @return result of binary operation
 	 */

org.eclipse.example.calc/src/org/eclipse/example/calc/internal/Calculator.java → org.eclipse.forkexample.calc/src/org/eclipse/example/calc/internal/Calculator.java

@@ -36,10 +36,13 @@ public Calculator(TextProvider textProvider) {
 	}
 
 	private void setupDefaultOperations() {
+		// more operations to come
 		new Equals();
 		new Minus();
 		new Plus();
 		new Square();
+		// TODO: add some more
+		// commit and push
 	}
 
 	private void calculate(String cmdName) {

org.eclipse.example.calc/src/org/eclipse/example/calc/internal/ui/swing/CalculatorUI.java → 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;