Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added comments #32

Open
wants to merge 19 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions .project
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>gitsample-fork</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
</projectDescription>

This file was deleted.

Original file line number Diff line number Diff line change
@@ -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
15 changes: 0 additions & 15 deletions org.eclipse.example.calc/SwingCalculatorUI.launch

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
Original file line number Diff line number Diff line change
@@ -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)"
Expand Down
Original file line number Diff line number Diff line change
@@ -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>
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,12 @@
import org.junit.After;
import org.junit.Before;
import org.junit.Test;

/**
*
* testclass for @Operations
* <p>
* running
*/
public class OperationsTest {

private Square square;
Expand Down
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Expand Down
15 changes: 15 additions & 0 deletions org.eclipse.forkexample.calc/SwingCalculatorUI.launch
Original file line number Diff line number Diff line change
@@ -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>
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down