-
Notifications
You must be signed in to change notification settings - Fork 12
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
af8f809
commit 85ca353
Showing
407 changed files
with
120,845 additions
and
5,650 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| <<<<<<< HEAD | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <projectDescription> | ||
| <name>BankAccount</name> | ||
| <comment></comment> | ||
| <projects> | ||
| </projects> | ||
| <buildSpec> | ||
| </buildSpec> | ||
| <natures> | ||
| </natures> | ||
| </projectDescription> | ||
| ======= | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <projectDescription> | ||
| <name>BankAccount</name> | ||
| <comment></comment> | ||
| <projects> | ||
| </projects> | ||
| <buildSpec> | ||
| <buildCommand> | ||
| <name>de.ovgu.featureide.core.extensibleFeatureProjectBuilder</name> | ||
| <arguments> | ||
| <dictionary> | ||
| <key>build</key> | ||
| <value>src</value> | ||
| </dictionary> | ||
| <dictionary> | ||
| <key>composer</key> | ||
| <value>de.ovgu.featureide.composer.ahead</value> | ||
| </dictionary> | ||
| <dictionary> | ||
| <key>equations</key> | ||
| <value>configs</value> | ||
| </dictionary> | ||
| <dictionary> | ||
| <key>source</key> | ||
| <value>features</value> | ||
| </dictionary> | ||
| </arguments> | ||
| </buildCommand> | ||
| <buildCommand> | ||
| <name>org.eclipse.jdt.core.javabuilder</name> | ||
| <arguments> | ||
| </arguments> | ||
| </buildCommand> | ||
| </buildSpec> | ||
| <natures> | ||
| <nature>org.eclipse.jdt.core.javanature</nature> | ||
| <nature>de.ovgu.featureide.core.featureProjectNature</nature> | ||
| </natures> | ||
| </projectDescription> | ||
| >>>>>>> master |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| <?xml version="1.0" encoding="UTF-8" standalone="no"?> | ||
| <featureModel> | ||
| <properties> | ||
| <<<<<<< HEAD | ||
| <graphics key="showhiddenfeatures" value="true"/> | ||
| ======= | ||
| <graphics key="autolayoutconstraints" value="false"/> | ||
| >>>>>>> master | ||
| <graphics key="legendautolayout" value="true"/> | ||
| <graphics key="showshortnames" value="false"/> | ||
| <graphics key="layout" value="horizontal"/> | ||
| <graphics key="showcollapsedconstraints" value="true"/> | ||
| <graphics key="legendhidden" value="false"/> | ||
| <graphics key="layoutalgorithm" value="1"/> | ||
| </properties> | ||
| <struct> | ||
| <and mandatory="true" name="BankAccount"> | ||
| <feature name="DailyLimit"/> | ||
| <feature name="Interest"/> | ||
| <<<<<<< HEAD | ||
| ======= | ||
| <feature name="Transaction"/> | ||
| >>>>>>> master | ||
| </and> | ||
| </struct> | ||
| </featureModel> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,10 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <classpath> | ||
| <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-16"> | ||
| <attributes> | ||
| <attribute name="module" value="true"/> | ||
| </attributes> | ||
| </classpathentry> | ||
| <classpathentry kind="src" path="src"/> | ||
| <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> | ||
| <classpathentry kind="output" path="bin"/> | ||
| </classpath> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| <<<<<<< HEAD | ||
| <<<<<<<< HEAD:BankAccountOO/.classpath | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <classpath> | ||
| <classpathentry kind="src" path="src"/> | ||
| <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> | ||
| <classpathentry kind="output" path="bin"/> | ||
| </classpath> | ||
| ======== | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <classpath> | ||
| <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"> | ||
| <attributes> | ||
| <attribute name="module" value="true"/> | ||
| </attributes> | ||
| </classpathentry> | ||
| <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> | ||
| <classpathentry kind="src" path="src"/> | ||
| <classpathentry kind="output" path="bin"/> | ||
| </classpath> | ||
| >>>>>>>> master:de.tu_bs.cs.isf.cbc.statistics.ui/.classpath | ||
| ======= | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <classpath> | ||
| <<<<<<<< HEAD:ElevatorCorC/.classpath | ||
| <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> | ||
| ======== | ||
| <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-16"> | ||
| <attributes> | ||
| <attribute name="module" value="true"/> | ||
| </attributes> | ||
| </classpathentry> | ||
| >>>>>>>> master:BankAccountOO/.classpath | ||
| <classpathentry kind="src" path="src"/> | ||
| <classpathentry kind="output" path="bin"/> | ||
| </classpath> | ||
| >>>>>>> master |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <projectDescription> | ||
| <<<<<<< HEAD | ||
| <name>BankAccountOO</name> | ||
| ======= | ||
| <<<<<<<< HEAD:EmailFeatureInteraction/.project | ||
| <name>EmailFeatureInteraction</name> | ||
| ======== | ||
| <name>BankAccountOO</name> | ||
| >>>>>>>> master:BankAccountOO/.project | ||
| >>>>>>> master | ||
| <comment></comment> | ||
| <projects> | ||
| </projects> | ||
| <buildSpec> | ||
| <buildCommand> | ||
| <<<<<<< HEAD | ||
| <name>de.ovgu.featureide.core.extensibleFeatureProjectBuilder</name> | ||
| <arguments> | ||
| <dictionary> | ||
| <key>build</key> | ||
| <value>src</value> | ||
| </dictionary> | ||
| <dictionary> | ||
| <key>composer</key> | ||
| <value>de.ovgu.featureide.composer.ahead</value> | ||
| </dictionary> | ||
| <dictionary> | ||
| <key>equations</key> | ||
| <value>configs</value> | ||
| </dictionary> | ||
| <dictionary> | ||
| <key>source</key> | ||
| <value>features</value> | ||
| </dictionary> | ||
| </arguments> | ||
| </buildCommand> | ||
| <buildCommand> | ||
| ======= | ||
| >>>>>>> master | ||
| <name>org.eclipse.jdt.core.javabuilder</name> | ||
| <arguments> | ||
| </arguments> | ||
| </buildCommand> | ||
| </buildSpec> | ||
| <natures> | ||
| <nature>org.eclipse.jdt.core.javanature</nature> | ||
| <<<<<<< HEAD | ||
| <nature>de.ovgu.featureide.core.featureProjectNature</nature> | ||
| ======= | ||
| >>>>>>> master | ||
| </natures> | ||
| </projectDescription> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| /.gitkeep | ||
| <<<<<<< HEAD | ||
| /Account_helper.java | ||
| ======= | ||
| /Account.java | ||
| /Application.java | ||
| >>>>>>> master |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <projectDescription> | ||
| <name>Banking-Evaluation</name> | ||
| <comment></comment> | ||
| <projects> | ||
| </projects> | ||
| <buildSpec> | ||
| <buildCommand> | ||
| <name>org.eclipse.xtext.ui.shared.xtextBuilder</name> | ||
| <arguments> | ||
| </arguments> | ||
| </buildCommand> | ||
| <buildCommand> | ||
| <name>org.eclipse.jdt.core.javabuilder</name> | ||
| <arguments> | ||
| </arguments> | ||
| </buildCommand> | ||
| <buildCommand> | ||
| <name>de.tu_bs.cs.isf.lattice.latticeProjectBuilder</name> | ||
| <arguments> | ||
| </arguments> | ||
| </buildCommand> | ||
| </buildSpec> | ||
| <natures> | ||
| <nature>org.eclipse.jdt.core.javanature</nature> | ||
| <nature>org.eclipse.xtext.ui.shared.xtextNature</nature> | ||
| <nature>de.tu_bs.cs.isf.lattice.LatticeNature</nature> | ||
| </natures> | ||
| </projectDescription> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <projectDescription> | ||
| <name>Banking-Evaluation</name> | ||
| <comment></comment> | ||
| <projects> | ||
| </projects> | ||
| <buildSpec> | ||
| <buildCommand> | ||
| <name>org.eclipse.xtext.ui.shared.xtextBuilder</name> | ||
| <arguments> | ||
| </arguments> | ||
| </buildCommand> | ||
| <buildCommand> | ||
| <name>org.eclipse.jdt.core.javabuilder</name> | ||
| <arguments> | ||
| </arguments> | ||
| </buildCommand> | ||
| <buildCommand> | ||
| <name>de.tu_bs.cs.isf.lattice.latticeProjectBuilder</name> | ||
| <arguments> | ||
| </arguments> | ||
| </buildCommand> | ||
| </buildSpec> | ||
| <natures> | ||
| <nature>org.eclipse.jdt.core.javanature</nature> | ||
| <nature>org.eclipse.xtext.ui.shared.xtextNature</nature> | ||
| <nature>de.tu_bs.cs.isf.lattice.LatticeNature</nature> | ||
| </natures> | ||
| </projectDescription> |
Oops, something went wrong.