From d2c3cf21fe30ce486688fea0db9cd4aa8c1409e0 Mon Sep 17 00:00:00 2001 From: sabine12345 Date: Thu, 30 Jun 2016 20:07:52 +0200 Subject: [PATCH 01/59] package angabe fehlte --- src/FileHandling/Loader.java | 11 ++++++----- src/FileHandling/Store.java | 9 +++++---- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/FileHandling/Loader.java b/src/FileHandling/Loader.java index 6310243..3894d99 100644 --- a/src/FileHandling/Loader.java +++ b/src/FileHandling/Loader.java @@ -1,5 +1,6 @@ - -public class Loader { - //haaaayyyy - //hallo :D -} +package FileHandling; + +public class Loader { + //haaaayyyy + //hallo :D +} diff --git a/src/FileHandling/Store.java b/src/FileHandling/Store.java index f89b2c3..a295fd4 100644 --- a/src/FileHandling/Store.java +++ b/src/FileHandling/Store.java @@ -1,4 +1,5 @@ - -public class Store { - -} +package FileHandling; + +public class Store { + +} From fee7ec7db1c5fce9850a3d210cf4224d9911723e Mon Sep 17 00:00:00 2001 From: sabine12345 Date: Thu, 30 Jun 2016 21:10:14 +0200 Subject: [PATCH 02/59] excercise objekt und compilable methode erstellt vk objekte und methoden werden nicht gefunden --- src/FileHandling/Excercise.java | 45 +++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 src/FileHandling/Excercise.java diff --git a/src/FileHandling/Excercise.java b/src/FileHandling/Excercise.java new file mode 100644 index 0000000..f72acde --- /dev/null +++ b/src/FileHandling/Excercise.java @@ -0,0 +1,45 @@ +package FileHandling; + +import static org.junit.Assert.*; +import vk.core.api; +import vk.core.internal; + +public class Excercise { + + private boolean status; + private CompilationUnit input; + + public Excercise(){ + + } + + public boolean compilable(String className, String classContent){ + + input = new CompilationUnit(className, classContent, true ); + + status = testingInput_NoCompileErrors(); +// status = testingInput_CompileErrors(); + + + return status; + } + + public boolean testingInput_NoCompileErrors(){ + JavaStingCompiler compiler = CompilerFactory.getCompiler(input); + input.compileAndRunTests(); + CompilerResult result = compiler.getCompilerResult(); + assertFalse(TestHelpers.getErrorMessages(compiler, result), result.hasCompileErrors()); + + return status = true; + } + +/* public boolean testingInput_CompileErrors() { + JavaStringCompiler compiler = CompilerFactory.getCompiler(input); + compiler.compileAndRunTests(); + CompilerResult result = compiler.getCompilerResult(); + assertTrue(result.hasCompileErrors()); + + return status = false; + }*/ + +} From 82a9f4e8f7f50b5367a77294b53f2c7141ed4133 Mon Sep 17 00:00:00 2001 From: sabine12345 Date: Thu, 30 Jun 2016 21:25:35 +0200 Subject: [PATCH 03/59] gitignore --- .gitignore | 220 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 220 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..20518f3 --- /dev/null +++ b/.gitignore @@ -0,0 +1,220 @@ +################# +## Eclipse +################# + +*.pydevproject +.project +.metadata +bin/ +tmp/ +*.tmp +*.bak +*.swp +*~.nib +local.properties +.classpath +.settings/ +.loadpath + +# External tool builders +.externalToolBuilders/ + +# Locally stored "Eclipse launch configurations" +*.launch + +# CDT-specific +.cproject + +# PDT-specific +.buildpath + + +################# +## Visual Studio +################# + +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. + +# User-specific files +*.suo +*.user +*.sln.docstates + +# Build results + +[Dd]ebug/ +[Rr]elease/ +x64/ +build/ +[Bb]in/ +[Oo]bj/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +*_i.c +*_p.c +*.ilk +*.meta +*.obj +*.pch +*.pdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.log +*.scc + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opensdf +*.sdf +*.cachefile + +# Visual Studio profiler +*.psess +*.vsp +*.vspx + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# NCrunch +*.ncrunch* +.*crunch*.local.xml + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.Publish.xml +*.pubxml +*.publishproj + +# NuGet Packages Directory +## TODO: If you have NuGet Package Restore enabled, uncomment the next line +#packages/ + +# Windows Azure Build Output +csx +*.build.csdef + +# Windows Store app package directory +AppPackages/ + +# Others +sql/ +*.Cache +ClientBin/ +[Ss]tyle[Cc]op.* +~$* +*~ +*.dbmdl +*.[Pp]ublish.xml +*.pfx +*.publishsettings + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file to a newer +# Visual Studio version. Backup files are not needed, because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm + +# SQL Server files +App_Data/*.mdf +App_Data/*.ldf + +############# +## Windows detritus +############# + +# Windows image file caches +Thumbs.db +ehthumbs.db + +# Folder config file +Desktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Mac crap +.DS_Store + + +############# +## Python +############# + +*.py[cod] + +# Packages +*.egg +*.egg-info +dist/ +build/ +eggs/ +parts/ +var/ +sdist/ +develop-eggs/ +.installed.cfg + +# Installer logs +pip-log.txt + +# Unit test / coverage reports +.coverage +.tox + +#Translations +*.mo + +#Mr Developer +.mr.developer.cfg + +#gradle +.gradle +/build \ No newline at end of file From 0a8c014034a82dcfaca1e95e7dbaf2f49f22d83d Mon Sep 17 00:00:00 2001 From: sabine12345 Date: Thu, 30 Jun 2016 21:42:08 +0200 Subject: [PATCH 04/59] gitignore aktualisiert, exercise ebenfalls --- .gitignore | 223 +------------------------------- build.gradle | 1 + src/FileHandling/Excercise.java | 28 ++-- 3 files changed, 17 insertions(+), 235 deletions(-) diff --git a/.gitignore b/.gitignore index 20518f3..6ebc66e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,220 +1,7 @@ -################# -## Eclipse -################# - -*.pydevproject -.project -.metadata -bin/ -tmp/ -*.tmp -*.bak -*.swp -*~.nib -local.properties .classpath -.settings/ -.loadpath - -# External tool builders -.externalToolBuilders/ - -# Locally stored "Eclipse launch configurations" -*.launch - -# CDT-specific -.cproject - -# PDT-specific -.buildpath - - -################# -## Visual Studio -################# - -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. - -# User-specific files -*.suo -*.user -*.sln.docstates - -# Build results - -[Dd]ebug/ -[Rr]elease/ -x64/ -build/ -[Bb]in/ -[Oo]bj/ - -# MSTest test Results -[Tt]est[Rr]esult*/ -[Bb]uild[Ll]og.* - -*_i.c -*_p.c -*.ilk -*.meta -*.obj -*.pch -*.pdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.tmp_proj -*.log -*.vspscc -*.vssscc -.builds -*.pidb -*.log -*.scc - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opensdf -*.sdf -*.cachefile - -# Visual Studio profiler -*.psess -*.vsp -*.vspx - -# Guidance Automation Toolkit -*.gpState - -# ReSharper is a .NET coding add-in -_ReSharper*/ -*.[Rr]e[Ss]harper - -# TeamCity is a build add-in -_TeamCity* - -# DotCover is a Code Coverage Tool -*.dotCover - -# NCrunch -*.ncrunch* -.*crunch*.local.xml - -# Installshield output folder -[Ee]xpress/ - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish/ - -# Publish Web Output -*.Publish.xml -*.pubxml -*.publishproj - -# NuGet Packages Directory -## TODO: If you have NuGet Package Restore enabled, uncomment the next line -#packages/ - -# Windows Azure Build Output -csx -*.build.csdef - -# Windows Store app package directory -AppPackages/ - -# Others -sql/ -*.Cache -ClientBin/ -[Ss]tyle[Cc]op.* -~$* -*~ -*.dbmdl -*.[Pp]ublish.xml -*.pfx -*.publishsettings - -# RIA/Silverlight projects -Generated_Code/ - -# Backup & report files from converting an old project file to a newer -# Visual Studio version. Backup files are not needed, because we have git ;-) -_UpgradeReport_Files/ -Backup*/ -UpgradeLog*.XML -UpgradeLog*.htm - -# SQL Server files -App_Data/*.mdf -App_Data/*.ldf - -############# -## Windows detritus -############# - -# Windows image file caches -Thumbs.db -ehthumbs.db - -# Folder config file -Desktop.ini - -# Recycle Bin used on file shares -$RECYCLE.BIN/ - -# Mac crap -.DS_Store - - -############# -## Python -############# - -*.py[cod] - -# Packages -*.egg -*.egg-info -dist/ -build/ -eggs/ -parts/ -var/ -sdist/ -develop-eggs/ -.installed.cfg - -# Installer logs -pip-log.txt - -# Unit test / coverage reports -.coverage -.tox - -#Translations -*.mo - -#Mr Developer -.mr.developer.cfg - -#gradle +.project .gradle -/build \ No newline at end of file +build +.settings +local.* +/bin/ diff --git a/build.gradle b/build.gradle index 5a1ab7b..c042263 100644 --- a/build.gradle +++ b/build.gradle @@ -2,6 +2,7 @@ // Apply the java plugin to add support for Java apply plugin: 'java' +apply plugin: 'eclipse' // In this section you declare where to find the dependencies of your project repositories { diff --git a/src/FileHandling/Excercise.java b/src/FileHandling/Excercise.java index f72acde..c1682b5 100644 --- a/src/FileHandling/Excercise.java +++ b/src/FileHandling/Excercise.java @@ -17,29 +17,23 @@ public boolean compilable(String className, String classContent){ input = new CompilationUnit(className, classContent, true ); - status = testingInput_NoCompileErrors(); -// status = testingInput_CompileErrors(); - + status = testingInput(); return status; } - public boolean testingInput_NoCompileErrors(){ + public boolean testingInput(){ JavaStingCompiler compiler = CompilerFactory.getCompiler(input); input.compileAndRunTests(); CompilerResult result = compiler.getCompilerResult(); - assertFalse(TestHelpers.getErrorMessages(compiler, result), result.hasCompileErrors()); - return status = true; - } - -/* public boolean testingInput_CompileErrors() { - JavaStringCompiler compiler = CompilerFactory.getCompiler(input); - compiler.compileAndRunTests(); - CompilerResult result = compiler.getCompilerResult(); - assertTrue(result.hasCompileErrors()); + if(result.hasCompileErrors == true) status = true; //keine compilerfehler - return status = false; - }*/ - -} + else{ + TestHelpers.getErrorMessages(compiler, result); + status = false; + } + + return status; + } + } From 0ea5bfdf24e8a81c656a02354a7dd29793489ab6 Mon Sep 17 00:00:00 2001 From: sabine12345 Date: Thu, 30 Jun 2016 21:45:34 +0200 Subject: [PATCH 05/59] gitignore --- .gitignore | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 6ebc66e..0c737fd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,2 @@ -.classpath -.project -.gradle -build -.settings -local.* -/bin/ +bin +.classpath \ No newline at end of file From 008dedf3f8db293aaf19b3fbe7e9097802a2760e Mon Sep 17 00:00:00 2001 From: Chunk3r Date: Mon, 4 Jul 2016 11:56:56 +0200 Subject: [PATCH 06/59] =?UTF-8?q?urspr=C3=BCngliche=20gitignore=20wieder?= =?UTF-8?q?=20eingef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 220 ++++++++++++++++++++++++++++++ bin/application/logik/Logik.class | Bin 781 -> 1047 bytes src/application/logik/Logik.java | 11 ++ 3 files changed, 231 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..20518f3 --- /dev/null +++ b/.gitignore @@ -0,0 +1,220 @@ +################# +## Eclipse +################# + +*.pydevproject +.project +.metadata +bin/ +tmp/ +*.tmp +*.bak +*.swp +*~.nib +local.properties +.classpath +.settings/ +.loadpath + +# External tool builders +.externalToolBuilders/ + +# Locally stored "Eclipse launch configurations" +*.launch + +# CDT-specific +.cproject + +# PDT-specific +.buildpath + + +################# +## Visual Studio +################# + +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. + +# User-specific files +*.suo +*.user +*.sln.docstates + +# Build results + +[Dd]ebug/ +[Rr]elease/ +x64/ +build/ +[Bb]in/ +[Oo]bj/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +*_i.c +*_p.c +*.ilk +*.meta +*.obj +*.pch +*.pdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.log +*.scc + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opensdf +*.sdf +*.cachefile + +# Visual Studio profiler +*.psess +*.vsp +*.vspx + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# NCrunch +*.ncrunch* +.*crunch*.local.xml + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.Publish.xml +*.pubxml +*.publishproj + +# NuGet Packages Directory +## TODO: If you have NuGet Package Restore enabled, uncomment the next line +#packages/ + +# Windows Azure Build Output +csx +*.build.csdef + +# Windows Store app package directory +AppPackages/ + +# Others +sql/ +*.Cache +ClientBin/ +[Ss]tyle[Cc]op.* +~$* +*~ +*.dbmdl +*.[Pp]ublish.xml +*.pfx +*.publishsettings + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file to a newer +# Visual Studio version. Backup files are not needed, because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm + +# SQL Server files +App_Data/*.mdf +App_Data/*.ldf + +############# +## Windows detritus +############# + +# Windows image file caches +Thumbs.db +ehthumbs.db + +# Folder config file +Desktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Mac crap +.DS_Store + + +############# +## Python +############# + +*.py[cod] + +# Packages +*.egg +*.egg-info +dist/ +build/ +eggs/ +parts/ +var/ +sdist/ +develop-eggs/ +.installed.cfg + +# Installer logs +pip-log.txt + +# Unit test / coverage reports +.coverage +.tox + +#Translations +*.mo + +#Mr Developer +.mr.developer.cfg + +#gradle +.gradle +/build \ No newline at end of file diff --git a/bin/application/logik/Logik.class b/bin/application/logik/Logik.class index 0b15209015f93e0893619adbdc1b4fea77739228..e052c9e95bec371526883dfe39492e4f4fae9bcf 100644 GIT binary patch delta 327 zcmW+xJ4?f06g@YuFA1$?F&PAFTeXd^q7=G2I24>x+&|k7siuk4L~-ii;N&0*g8w4u zAP)WjCx4Ga^~U8qxaVHZy|VLc%le;JM0t0WSr!g;tRx1%l1mxCs-pD zXL3NOMwuL*AIXb>Jc)VDjnaHNREOjE@r{ff$?3=9k=3<~TFOpFZT6E}))RBvXSEYGCM$hz5;$%K)UkwFfqf{8&M E06+x_1ONa4 diff --git a/src/application/logik/Logik.java b/src/application/logik/Logik.java index 9367eaf..a4cb555 100644 --- a/src/application/logik/Logik.java +++ b/src/application/logik/Logik.java @@ -29,4 +29,15 @@ private boolean isCompileable(){ return false; } + private void countdown(long minuten){ + long t1 = 0; + long t2 = System.nanoTime(); + long deltaT = t2 - t1; + while(minuten-deltaT != 0){ + + } + } + + + } From e2d8fea1bea2208e230470ec7f44b601d3b257bf Mon Sep 17 00:00:00 2001 From: Chunk3r Date: Mon, 4 Jul 2016 12:27:54 +0200 Subject: [PATCH 07/59] added comments --- bin/application/daten/Katalog.class | Bin 282 -> 0 bytes bin/application/daten/Text.class | Bin 273 -> 0 bytes bin/application/logik/Logik.class | Bin 1047 -> 949 bytes src/application/daten/Katalog.java | 5 ----- src/application/daten/Text.java | 5 ----- src/application/logik/Logik.java | 21 +++++++-------------- 6 files changed, 7 insertions(+), 24 deletions(-) delete mode 100644 bin/application/daten/Katalog.class delete mode 100644 bin/application/daten/Text.class delete mode 100644 src/application/daten/Katalog.java delete mode 100644 src/application/daten/Text.java diff --git a/bin/application/daten/Katalog.class b/bin/application/daten/Katalog.class deleted file mode 100644 index 3d62888147c76147b716f15224fa7920bec4e05c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 282 zcmZ`!u}%U(5PfspadI9)?2MHiP`HhqhQ`Fk3l8nGYfZz!c&8Q|v{SDf*!pFTlrUWL7c0wdsov_fZUUkE zWSj|8LT5Cd6VhkD&;>f^mB`Q~3@YRFY`3X(`@yxGXMYp diff --git a/bin/application/daten/Text.class b/bin/application/daten/Text.class deleted file mode 100644 index 4094823c7cb08768fa43f0d0611c1e75be9707c0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 273 zcmZuryKcfj5S%qO28Wj@5G@^~$Tf69G)So|C_waUbAm(WjGP1Iw^Bt)!3X4{qU@oR zG&4K1+MW6N{k{R1q8B3|4ETI5OwP`fR_)knt2X+>#Rv(#BVSn+Z1-xF9d+&q^_j88 z%?Y*fWJ?GaaKz4`3sFtF#;rlehoQz5^UY)NVqME&=CyK F{R5`bIM4t9 diff --git a/bin/application/logik/Logik.class b/bin/application/logik/Logik.class index e052c9e95bec371526883dfe39492e4f4fae9bcf..ca95a624274860552e6d4200f80a16ab3a979efd 100644 GIT binary patch delta 354 zcmYk1%}T>S6ot=BGENdx8&i{1Z4*;}ss-t$(5{6(fh(6mLQ(u9ir~tnTgwQ7OLs0^ zh@zn2(pT_Ziq|2an>%Ob-t*lvx7L&Nz9z5l0D9<1aE5677>(PXb%{BK>V9^fbq}(m zQFmAr$AyJZrEFx?P(w7E!w?22nIcBWTq!TFP7WIb4L1 zP|&guC0$=)E*|f`chCLZbKZ94M*Ov_+7U^ShbPF8o_A}PP?66 zvmFLE?U10B%GUZ1l|%spA(c>o&`ab1Zx8CD!wts=GTIvAIny131KY|Y3$4q&(Ne9FM9HhU2&vl zZZo_;%h7W@n&(|biKww3u%o{mvuck!#M&fET&X+}Lz$}x>n-?P8QA9;&O3#pX&S2! Hq`%59mmxC@ diff --git a/src/application/daten/Katalog.java b/src/application/daten/Katalog.java deleted file mode 100644 index f379ef7..0000000 --- a/src/application/daten/Katalog.java +++ /dev/null @@ -1,5 +0,0 @@ -package application.daten; - -public class Katalog { - -} diff --git a/src/application/daten/Text.java b/src/application/daten/Text.java deleted file mode 100644 index e9ec0f6..0000000 --- a/src/application/daten/Text.java +++ /dev/null @@ -1,5 +0,0 @@ -package application.daten; - -public class Text { - -} diff --git a/src/application/logik/Logik.java b/src/application/logik/Logik.java index 1882dbd..700578a 100644 --- a/src/application/logik/Logik.java +++ b/src/application/logik/Logik.java @@ -5,33 +5,26 @@ public class Logik implements LogikZuGui{ @Override - public void save() { - // TODO Auto-generated method stub + public void save() { //Tests und Programmcode in Dateien speichern + } @Override - public void loadKatalog() { - // TODO Auto-generated method stub + public void loadKatalog() { //Den katalog laden und tddt entsprechend einrichten + } @Override - public void nextStep() { - if(isCompileable()){ + public void nextStep() { //wenn der code kompiliert wird zum n�chsten schritt gewechselt + if(){ } } - private boolean isCompileable(){ - if(){ - return true; - } - return false; - } - - private void countdown(long minuten){ + private void countdown(long minuten){ //wenn aktiviert wird long t1 = 0; long t2 = System.nanoTime(); long deltaT = t2 - t1; From 59f9115f2d47bc05605ffd9105dc71c45b0456b8 Mon Sep 17 00:00:00 2001 From: Chunk3r Date: Mon, 4 Jul 2016 12:33:59 +0200 Subject: [PATCH 08/59] minor fixes --- src/application/logik/Logik.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/application/logik/Logik.java b/src/application/logik/Logik.java index 700578a..d174ef6 100644 --- a/src/application/logik/Logik.java +++ b/src/application/logik/Logik.java @@ -17,14 +17,14 @@ public void loadKatalog() { //Den katalog laden und tddt entsprechend einrichten } @Override - public void nextStep() { //wenn der code kompiliert wird zum n�chsten schritt gewechselt + public void nextStep() { //wenn der code kompiliert, wird zum n�chsten schritt gewechselt if(){ } } - private void countdown(long minuten){ //wenn aktiviert wird + private void countdown(long minuten){ //wenn aktiviert, wird long t1 = 0; long t2 = System.nanoTime(); long deltaT = t2 - t1; From a9f8e1cc83741dba442e5a525e95ee3a1f58e5f6 Mon Sep 17 00:00:00 2001 From: Chunk3r Date: Thu, 7 Jul 2016 08:58:14 +0200 Subject: [PATCH 09/59] update --- .gitignore | 20 ++++++++++++-------- bin/.gitignore | 3 --- bin/application/logik/Logik.class | Bin 949 -> 923 bytes src/application/logik/Logik.java | 6 ++++-- 4 files changed, 16 insertions(+), 13 deletions(-) delete mode 100644 bin/.gitignore diff --git a/.gitignore b/.gitignore index c7741a0..5d73d26 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,12 @@ -/FileHandling/ - -/application/ - -/tests/ - -/bin/ -src/vk \ No newline at end of file +FileHandling/ +application/ +tests/ +bin/ +src/vk +bin/application/logik/Logik.class +*.class +*.class +*.classpath +.classpath +.project +.settings/ \ No newline at end of file diff --git a/bin/.gitignore b/bin/.gitignore deleted file mode 100644 index fc20ac5..0000000 --- a/bin/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/application/ -/FileHandling/ -/tests/ diff --git a/bin/application/logik/Logik.class b/bin/application/logik/Logik.class index ca95a624274860552e6d4200f80a16ab3a979efd..d94215631e48871b5835e489a7391abbba8b8fe3 100644 GIT binary patch literal 923 zcmah`T~8B16g{)ucDu_K3P=$_0Y7O~8Vv~#8Xq8j1dBeDVB~GsPH+7<&ukjN1meTqy?5rGbLO7=>*)JW083c(;0R30PAArpG&)V{ak``T z>J1w`xB}%}xi9OnOm^xow|7-!JQM_G&Vg+8pZ2wYP-Ja9(Xo0alUA$=ete+1k?yGn z0)>Y<(dLmrZlSs<;I5`E6(EOF2p@rm5rK&_u>por@*yx5!b4GDq@fe_qTk+D-3_@N zQ+2G7Ml#-%U2W^Zp=;jgp1@S&oLBQrZcpwLJ`|_2^;{ZB8w84pIxtP6I#zf(#0)MA zgb|;+nzlQfj-;GnOTdrPeqvhb+k{jLYt_vF^SI{W>OTfH-}Q`Yhq#U#mRu(3hHg`p z9BTqzTPJ;^$RJob=AI4rX;(|dMs5g{nnp%@>#{Q#D`=+uZltVL0ztO2MY}CZlapVb zAFNZ1HmAFcL#$S^d!Sr9L|FTQ;n#;Kf5GS{-Z>a&9A<|_xx|m~e}Pq)@s%-w3M;Po znD2I0^X!D6kTsW10lC%z@Z$f0<7Wb=j)BXhx6}Ex&lvrRORr9p1C9Vbu88SVB>q6% z!4=FBYHfJW@qF9suYAMYa=wzESIgdP#Z&%=kAHq!%3S6~g${r~hfoi5DAD5z_h?;N t%I+oy^j7#LZc)JD$pW(+5oJ`F<%tVWW9Gp+R)jc0$#q?J-(l_G?q6q~nHc~8 literal 949 zcmah{U2hUW6g>k=7Zz$;DqyuAOZ|dsB$_5otnoopO)BaGl|YnU3 znl`#{7-o0*9&dzP^%~DRyCN_yrWh8_fV>(#9!Z9&ds0brpCMhVw;7y=x+^@SkuShS zmSLtTm3TH9bVR(vJE34GHg&+mHjkyPCr!t^kwb=s<{8sAiF(NQ2%Zl$?>^y%)A|fq zCB~*@MC9T;4Leb=6~{WxqRh~Fp<*%A;hyOFfgVIMOyv7ftZDw>uJ7eq`^xaKFD%B_ z$~U?%l)qYAz3Fd_BSH_!FJFu!GKE<9Ya?RcZhUmp^DvJKR`3Etsn$H%qGe*KdYjgn zT%bqFboE0c-40a{C;c+?ab)PEx1yM%szE2S z-L(UFA1O(pKym7*iD}9Ull&ZJsG|Lk!8ekcdVd4+r+^H|2dI3b9Zv6DI>q2kMyGHQmuPb<_#K?&tmGbi!s14zoT-Wpcctu#-1`qde^@2y z#Da3-)*_KFkzdP1yMi)S6Z-Y!zsiIjs8Ihh4M?GcE0m=PF^j8|W$3<#Ym~XTPTb`C OA*LP2q1&}&_4+U5%C1uY diff --git a/src/application/logik/Logik.java b/src/application/logik/Logik.java index d174ef6..9c72e1c 100644 --- a/src/application/logik/Logik.java +++ b/src/application/logik/Logik.java @@ -3,7 +3,9 @@ import FileHandling.Exercise; public class Logik implements LogikZuGui{ - + + Exercise e = new Exercise(); + @Override public void save() { //Tests und Programmcode in Dateien speichern @@ -18,7 +20,7 @@ public void loadKatalog() { //Den katalog laden und tddt entsprechend einrichten @Override public void nextStep() { //wenn der code kompiliert, wird zum n�chsten schritt gewechselt - if(){ + if(e.codeCompiles()){ } From 1a83c182cbf7a2a1a96686d3db3cd88fdde9d092 Mon Sep 17 00:00:00 2001 From: Chunk3r Date: Thu, 7 Jul 2016 09:02:29 +0200 Subject: [PATCH 10/59] Delete gradle.prefs --- .settings/gradle.prefs | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 .settings/gradle.prefs diff --git a/.settings/gradle.prefs b/.settings/gradle.prefs deleted file mode 100644 index d7f5f65..0000000 --- a/.settings/gradle.prefs +++ /dev/null @@ -1,12 +0,0 @@ -{ - "1.0": { - "project_path": ":", - "project_dir": "G:\\Dokumente\\GitHub\\programmierpraktikum-abschlussprojekt-the-fellowship-of-the-string", - "connection_project_dir": "G:\\Dokumente\\GitHub\\programmierpraktikum-abschlussprojekt-the-fellowship-of-the-string", - "connection_gradle_user_home": null, - "connection_gradle_distribution": "GRADLE_DISTRIBUTION(WRAPPER)", - "connection_java_home": null, - "connection_jvm_arguments": "", - "connection_arguments": "" - } -} \ No newline at end of file From 8fffc1c28a742bfc1e126bd8b5aa95049c968e3e Mon Sep 17 00:00:00 2001 From: Chunk3r Date: Thu, 7 Jul 2016 09:02:35 +0200 Subject: [PATCH 11/59] Delete org.eclipse.buildship.core.prefs --- .settings/org.eclipse.buildship.core.prefs | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 .settings/org.eclipse.buildship.core.prefs diff --git a/.settings/org.eclipse.buildship.core.prefs b/.settings/org.eclipse.buildship.core.prefs deleted file mode 100644 index 3cf92ff..0000000 --- a/.settings/org.eclipse.buildship.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -GRADLE_BUILD_COMMANDS=org.eclipse.jdt.core.javabuilder -GRADLE_FILTERS=1.0-projectRelativePath-matches-false-false-build,1.0-projectRelativePath-matches-false-false-.gradle -GRADLE_NATURES=org.eclipse.jdt.core.javanature -eclipse.preferences.version=1 From b678b27f4421420d470a79ec23f0dde0ec4aefd4 Mon Sep 17 00:00:00 2001 From: Chunk3r Date: Thu, 7 Jul 2016 09:02:46 +0200 Subject: [PATCH 12/59] Delete Main.class --- bin/application/Main.class | Bin 379 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 bin/application/Main.class diff --git a/bin/application/Main.class b/bin/application/Main.class deleted file mode 100644 index 474bd380c3480a0b10c4bc9f6b87cb0ad51de1ee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 379 zcmZutu};G<5Pg@XO%n=*7O}GxkjTPT#Dc^WU?}Rsn_eqpBZRCj)U!$}Wy|z7U+AI{^v;bn z&4r*dIhqT?%lbhl=pY`Ti=JSZ8LMyB%UruVl~-CY%IZQ@bLEWBe~MxAXr4T`={x1j zCH(~lll$z~f7Uo-%W3PWTuJTtA6k&i>a{EMmGRcGf61vIf|n@>7oYI>KG_uZ{|Nbw*lQa{!~o+juk}ZO From 16cf039a5e5a7a5cff82e97f80493417493c1812 Mon Sep 17 00:00:00 2001 From: Chunk3r Date: Thu, 7 Jul 2016 09:02:53 +0200 Subject: [PATCH 13/59] Delete Logik.class --- bin/application/logik/Logik.class | Bin 923 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 bin/application/logik/Logik.class diff --git a/bin/application/logik/Logik.class b/bin/application/logik/Logik.class deleted file mode 100644 index d94215631e48871b5835e489a7391abbba8b8fe3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 923 zcmah`T~8B16g{)ucDu_K3P=$_0Y7O~8Vv~#8Xq8j1dBeDVB~GsPH+7<&ukjN1meTqy?5rGbLO7=>*)JW083c(;0R30PAArpG&)V{ak``T z>J1w`xB}%}xi9OnOm^xow|7-!JQM_G&Vg+8pZ2wYP-Ja9(Xo0alUA$=ete+1k?yGn z0)>Y<(dLmrZlSs<;I5`E6(EOF2p@rm5rK&_u>por@*yx5!b4GDq@fe_qTk+D-3_@N zQ+2G7Ml#-%U2W^Zp=;jgp1@S&oLBQrZcpwLJ`|_2^;{ZB8w84pIxtP6I#zf(#0)MA zgb|;+nzlQfj-;GnOTdrPeqvhb+k{jLYt_vF^SI{W>OTfH-}Q`Yhq#U#mRu(3hHg`p z9BTqzTPJ;^$RJob=AI4rX;(|dMs5g{nnp%@>#{Q#D`=+uZltVL0ztO2MY}CZlapVb zAFNZ1HmAFcL#$S^d!Sr9L|FTQ;n#;Kf5GS{-Z>a&9A<|_xx|m~e}Pq)@s%-w3M;Po znD2I0^X!D6kTsW10lC%z@Z$f0<7Wb=j)BXhx6}Ex&lvrRORr9p1C9Vbu88SVB>q6% z!4=FBYHfJW@qF9suYAMYa=wzESIgdP#Z&%=kAHq!%3S6~g${r~hfoi5DAD5z_h?;N t%I+oy^j7#LZc)JD$pW(+5oJ`F<%tVWW9Gp+R)jc0$#q?J-(l_G?q6q~nHc~8 From 77b315e5ec166d6b5205bfd01173e83be17b4bb3 Mon Sep 17 00:00:00 2001 From: Chunk3r Date: Thu, 7 Jul 2016 09:03:00 +0200 Subject: [PATCH 14/59] Delete LogikZuGui.class --- bin/application/logik/LogikZuGui.class | Bin 181 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 bin/application/logik/LogikZuGui.class diff --git a/bin/application/logik/LogikZuGui.class b/bin/application/logik/LogikZuGui.class deleted file mode 100644 index 069d88d97bf456869ddf7c93b4bde4e0b2f88b44..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 181 zcmYL@F%E)26h!9>0z#n&@BrGljc3q86AKaxyDx6Y;)W%<5YJ}e0X&rPZ(?FI)6Be? z_viTnutt$$M3{5eSyQn$u2t66=BoBVPyMzxDPqE`;enOqwpNF8qbpB{?>uNiv{)Vq zg>`({v1e%$vQ|HQ>2*iQOV{5jy)jm@(?4|;fC)hWas-HEWQ+u1Ed6;FToMz}5%Mnu C)+qh} From b8153082733aafad70beed19c81cf1ed98c477ae Mon Sep 17 00:00:00 2001 From: Chunk3r Date: Thu, 7 Jul 2016 09:03:07 +0200 Subject: [PATCH 15/59] Delete TestMain.class --- bin/tests/TestMain.class | Bin 787 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 bin/tests/TestMain.class diff --git a/bin/tests/TestMain.class b/bin/tests/TestMain.class deleted file mode 100644 index 285a8c779487b3cca1c94b92b3f2c1052d072358..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 787 zcmcJNOKTf36orrc_QbEcaoV&Sb?0p2O;>dYl+Zw6l0xGIvXsZNEi)q-jmFSre^nuY zcHeFOPwAB(m=G`8MK^aO%{hmAKkl#J_dfu<$D1;83=Jn!m-Yr!FNM-&6c}1Fu@Jpj z=t=MMa3&+iP&!dsxl@LG_vn_PaArobj4DHOtNmoHu@&qwJl<$4Qxh-bh({)wt5`T? zG@n~DjAfF3;6ZgTm0TrrV;whkay-i@pGQJ#eWjsIVSG{cSr?hF^)eVxlyRwCWh zjQCinxO?ra(vu^uQl9CN94k#7kB#Myy7Lyk0TTqMpk6}}4TerP+>X7<=zA>9kOHo< zWGL-G(4-9Q&_p7>6;}EC`mx}qDkaR}Q}%u0>R%Y%e#x{`iM-GYl`1lR^jMY*$yW+} zQ~e5FF?{}8_9F!2d-~`9eYA}2U;0gHy}r+B1%-t%k|6C2?!ogxoZdC uQTw^nG^u(G$kn1+TdD8@ZMreMq`x`ruT>rTK2JN?kyhQA_L}@T9R30B{m`xe From dab5cabf46ca8dd3ca2db6d3c998f57c46f8a1b4 Mon Sep 17 00:00:00 2001 From: Chunk3r Date: Thu, 7 Jul 2016 09:03:16 +0200 Subject: [PATCH 16/59] Delete .classpath --- .classpath | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 .classpath diff --git a/.classpath b/.classpath deleted file mode 100644 index 545249e..0000000 --- a/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - From bda593ffc88221c10603edfbb153c59cdc068424 Mon Sep 17 00:00:00 2001 From: Chunk3r Date: Thu, 7 Jul 2016 09:03:25 +0200 Subject: [PATCH 17/59] Delete .project --- .project | 43 ------------------------------------------- 1 file changed, 43 deletions(-) delete mode 100644 .project diff --git a/.project b/.project deleted file mode 100644 index a84d914..0000000 --- a/.project +++ /dev/null @@ -1,43 +0,0 @@ - - - programmierpraktikum-abschlussprojekt-the-fellowship-of-the-string - Project programmierpraktikum-abschlussprojekt-the-fellowship-of-the-string created by Buildship. - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.buildship.core.gradleprojectbuilder - - - - - - org.eclipse.buildship.core.gradleprojectnature - org.eclipse.jdt.core.javanature - - - - 1467051762729 - - 26 - - org.eclipse.ui.ide.multiFilter - 1.0-projectRelativePath-matches-false-false-build - - - - 1467051762738 - - 26 - - org.eclipse.ui.ide.multiFilter - 1.0-projectRelativePath-matches-false-false-.gradle - - - - From 3c9303aaa676155c3e43f276301c66b078238089 Mon Sep 17 00:00:00 2001 From: Chunk3r Date: Thu, 7 Jul 2016 09:34:08 +0200 Subject: [PATCH 18/59] Update Logik.java --- src/application/logik/Logik.java | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/application/logik/Logik.java b/src/application/logik/Logik.java index 88fd8c4..f08b94d 100644 --- a/src/application/logik/Logik.java +++ b/src/application/logik/Logik.java @@ -19,28 +19,21 @@ public void loadKatalog() { //Den katalog laden und tddt entsprechend einrichten } @Override - public void nextStep() { //wenn der code kompiliert, wird zum n�chsten schritt gewechselt + public void nextStep() { //wenn der code kompiliert, wird zum nächsten schritt gewechselt if(e.codeCompiles()){ } } -<<<<<<< HEAD + private void countdown(long minuten){ //wenn aktiviert, wird long t1 = 0; long t2 = System.nanoTime(); long deltaT = t2 - t1; while(minuten-deltaT != 0){ -======= - private boolean isCompileable(){ - if(true){ - return true; ->>>>>>> refs/remotes/origin/master } } - - } From ddbdfac49f8269cb73f96fc9cd1318f31b753ec3 Mon Sep 17 00:00:00 2001 From: Chunk3r Date: Thu, 7 Jul 2016 11:34:09 +0200 Subject: [PATCH 19/59] bug fixed --- build.gradle | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index a6fba54..d4761fd 100644 --- a/build.gradle +++ b/build.gradle @@ -3,10 +3,9 @@ // Apply the java plugin to add support for Java apply plugin: 'java' apply plugin: 'eclipse' -<<<<<<< HEAD -======= + apply plugin: 'maven' ->>>>>>> refs/remotes/origin/master + // In this section you declare where to find the dependencies of your project repositories { From 8494619ab4a2cadc37df71af2291dfaf60ee96cb Mon Sep 17 00:00:00 2001 From: Chunk3r Date: Tue, 12 Jul 2016 14:30:54 +0200 Subject: [PATCH 20/59] Delete Code.java --- src/FileHandling/Code.java | 47 -------------------------------------- 1 file changed, 47 deletions(-) delete mode 100644 src/FileHandling/Code.java diff --git a/src/FileHandling/Code.java b/src/FileHandling/Code.java deleted file mode 100644 index 19885cb..0000000 --- a/src/FileHandling/Code.java +++ /dev/null @@ -1,47 +0,0 @@ -package FileHandling; - - -import vk.core.api.CompilationUnit; -import vk.core.api.CompilerFactory; - -import vk.core.api.CompilerResult; - -import vk.core.api.JavaStringCompiler; - -import vk.core.api.TestHelpers; -import vk.core.api.TestResult; -import vk.core.internal.InternalResult; - -public class Code { - - private String code; - private String className; - private CompilationUnit compilationUnitCode; - private boolean compilable; - - - public Code(String className,String code){ - this.code=code; - this.className=className; - this.compilationUnitCode = new CompilationUnit(className, code, false ); - this.compilable = testingCompilationUnit(); - - } - - public boolean testingCompilationUnit(){ - JavaStringCompiler compiler = CompilerFactory.getCompiler(compilationUnitCode); - compiler.compileAndRunTests(); - CompilerResult result = compiler.getCompilerResult(); - - if(result.hasCompileErrors() == true) compilable = true; - - else{ - TestHelpers.getErrorMessages(compiler, result); - compilable = false; - } - - return compilable; - } - - -} From b2b641a6adffd9cc8637acdcb188d4040e724620 Mon Sep 17 00:00:00 2001 From: Chunk3r Date: Tue, 12 Jul 2016 14:31:05 +0200 Subject: [PATCH 21/59] Delete CodeList.java --- src/FileHandling/CodeList.java | 29 ----------------------------- 1 file changed, 29 deletions(-) delete mode 100644 src/FileHandling/CodeList.java diff --git a/src/FileHandling/CodeList.java b/src/FileHandling/CodeList.java deleted file mode 100644 index 227a6de..0000000 --- a/src/FileHandling/CodeList.java +++ /dev/null @@ -1,29 +0,0 @@ -package FileHandling; - -import java.util.ArrayList; - -public class CodeList extends ArrayList{ - - /** - * - */ - private static final long serialVersionUID = 1L; - private boolean compilable; - - - public CodeList(){ - super(); - } - - public boolean compilable(){ - - Code[] codeArray = (Code[]) this.toArray(); - - for(int i = 0; i< codeArray.length; i++){ - compilable = codeArray[i].testingCompilationUnit(); - - if(compilable == false) return false; - } - return true; - } -} From b8b367cc8447c7439e2a6821227709f1699c940e Mon Sep 17 00:00:00 2001 From: Chunk3r Date: Tue, 12 Jul 2016 14:31:14 +0200 Subject: [PATCH 22/59] Delete Excercise.java --- src/FileHandling/Excercise.java | 39 --------------------------------- 1 file changed, 39 deletions(-) delete mode 100644 src/FileHandling/Excercise.java diff --git a/src/FileHandling/Excercise.java b/src/FileHandling/Excercise.java deleted file mode 100644 index c1682b5..0000000 --- a/src/FileHandling/Excercise.java +++ /dev/null @@ -1,39 +0,0 @@ -package FileHandling; - -import static org.junit.Assert.*; -import vk.core.api; -import vk.core.internal; - -public class Excercise { - - private boolean status; - private CompilationUnit input; - - public Excercise(){ - - } - - public boolean compilable(String className, String classContent){ - - input = new CompilationUnit(className, classContent, true ); - - status = testingInput(); - - return status; - } - - public boolean testingInput(){ - JavaStingCompiler compiler = CompilerFactory.getCompiler(input); - input.compileAndRunTests(); - CompilerResult result = compiler.getCompilerResult(); - - if(result.hasCompileErrors == true) status = true; //keine compilerfehler - - else{ - TestHelpers.getErrorMessages(compiler, result); - status = false; - } - - return status; - } - } From f8b56e6c6558ebe056f1951d72daacfe475d7a48 Mon Sep 17 00:00:00 2001 From: Chunk3r Date: Tue, 12 Jul 2016 14:31:22 +0200 Subject: [PATCH 23/59] Delete Exercise.java --- src/FileHandling/Exercise.java | 34 ---------------------------------- 1 file changed, 34 deletions(-) delete mode 100644 src/FileHandling/Exercise.java diff --git a/src/FileHandling/Exercise.java b/src/FileHandling/Exercise.java deleted file mode 100644 index 401f185..0000000 --- a/src/FileHandling/Exercise.java +++ /dev/null @@ -1,34 +0,0 @@ -package FileHandling; - -public class Exercise { - - private String description; - private CodeList klassen; - private TestList tests; - private boolean baby,timer; - - - public Exercise(String description,CodeList klassen,TestList tests,boolean baby,boolean timer){ - this.description=description; - this.klassen=klassen; - this.tests=tests; - this.baby=baby; - this.timer=timer; - } - - public Exercise(){ - - - } - public boolean codeCompiles(){ - - return this.klassen.compilable(); - - } - - public boolean testsRunning(){ - - return this.tests.allPassing(); - } - -} From f5fa0ad288d843ae279841478df7f1f84576dd91 Mon Sep 17 00:00:00 2001 From: Chunk3r Date: Tue, 12 Jul 2016 14:31:38 +0200 Subject: [PATCH 24/59] Delete Loader.java --- src/FileHandling/Loader.java | 82 ------------------------------------ 1 file changed, 82 deletions(-) delete mode 100644 src/FileHandling/Loader.java diff --git a/src/FileHandling/Loader.java b/src/FileHandling/Loader.java deleted file mode 100644 index efa4c39..0000000 --- a/src/FileHandling/Loader.java +++ /dev/null @@ -1,82 +0,0 @@ -<<<<<<< HEAD -package FileHandling; - -public class Loader { - //haaaayyyy - //hallo :D -} -======= -package FileHandling; -import org.xml.sax.*; - -import javafx.scene.Scene; -import javafx.scene.control.Button; -import javafx.scene.control.Label; -import javafx.scene.control.TextField; -import javafx.stage.Stage; - -import org.w3c.dom.*; - -import java.io.IOException; - -import javax.xml.parsers.*; - - -public class Loader { - - public Exercise loadExcercise(){ - Stage loadStage= new Stage(); - TextField fileName=new TextField("Katalogdatei"); - Label anzeige=new Label(""); - - - - - Button laden=new Button("Katalog laden"); - laden.setOnAction(e-> laden(fileName.getText(),anzeige,loadStage)); - - return null; - } - - private void laden(String filename,Label anzeige,Stage stage) { - try { - Document xmldoc=loadDoc(filename); - Scene choiseScreen=katalogView(xmldoc); - - } catch (SAXException | IOException e) { - anzeige.setText("Datei nicht vorhanden oder nicht kompatibel"); - e.printStackTrace(); - } - - - } - - - private Scene katalogView(Document xmldoc) { - - return null; - } - - private Document loadDoc(String fileLocation) throws SAXException, IOException{ - DocumentBuilderFactory factory=DocumentBuilderFactory.newInstance(); - Document toReturn; - factory.setIgnoringComments(true); - factory.setValidating(true); - - - DocumentBuilder builder; - try { - builder = factory.newDocumentBuilder(); - return builder.parse(new InputSource(fileLocation)); - } catch (ParserConfigurationException e) { - e.printStackTrace(); - return null; - } - - - - - - } -} ->>>>>>> refs/remotes/origin/master From 7509e7081a4d9829db7e2404309ae7c340e01f9c Mon Sep 17 00:00:00 2001 From: Chunk3r Date: Tue, 12 Jul 2016 14:31:48 +0200 Subject: [PATCH 25/59] Delete Store.java --- src/FileHandling/Store.java | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 src/FileHandling/Store.java diff --git a/src/FileHandling/Store.java b/src/FileHandling/Store.java deleted file mode 100644 index 44d5e5d..0000000 --- a/src/FileHandling/Store.java +++ /dev/null @@ -1,13 +0,0 @@ -<<<<<<< HEAD -package FileHandling; - -public class Store { - -} -======= -package FileHandling; - -public class Store { - -} ->>>>>>> refs/remotes/origin/master From ae6094cb6478ce506f174e6b6d2b145c1d8cd8e3 Mon Sep 17 00:00:00 2001 From: Chunk3r Date: Tue, 12 Jul 2016 14:32:05 +0200 Subject: [PATCH 26/59] Delete Test.java --- src/FileHandling/Test.java | 39 -------------------------------------- 1 file changed, 39 deletions(-) delete mode 100644 src/FileHandling/Test.java diff --git a/src/FileHandling/Test.java b/src/FileHandling/Test.java deleted file mode 100644 index ffda0a8..0000000 --- a/src/FileHandling/Test.java +++ /dev/null @@ -1,39 +0,0 @@ -package FileHandling; - -import vk.core.api.CompilationUnit; -import vk.core.api.CompilerFactory; -import vk.core.api.CompilerResult; -import vk.core.api.JavaStringCompiler; -import vk.core.api.TestResult; -import vk.core.internal.InternalResult; - -public class Test { - private String testCode; - private CompilationUnit compilationUnitTest; - - public Test(String testCode, String testName){ - this.testCode=testCode; - this.compilationUnitTest= new CompilationUnit(testName, testCode, true); - } - - public boolean oneTestFailing(){ - JavaStringCompiler compiler = CompilerFactory.getCompiler(compilationUnitTest); - compiler.compileAndRunTests(); - TestResult result = compiler.getTestResult(); - int fails = result.getNumberOfFailedTests(); - - if(fails == 1) return true; - return false; //mehr als ein test schl�gt fehl sollte nicht sein im tddt kreislauf - } - - public boolean allTestsPassing(){ - JavaStringCompiler compiler = CompilerFactory.getCompiler(compilationUnitTest); - compiler.compileAndRunTests(); - TestResult result = compiler.getTestResult(); - int fails = result.getNumberOfFailedTests(); - - if(fails == 0) return true; - return false; - - } -} From 9bcea7202408a9573800a6d17c4d3e680c93b0d5 Mon Sep 17 00:00:00 2001 From: Chunk3r Date: Tue, 12 Jul 2016 14:32:13 +0200 Subject: [PATCH 27/59] Delete TestList.java --- src/FileHandling/TestList.java | 26 -------------------------- 1 file changed, 26 deletions(-) delete mode 100644 src/FileHandling/TestList.java diff --git a/src/FileHandling/TestList.java b/src/FileHandling/TestList.java deleted file mode 100644 index 817c6f8..0000000 --- a/src/FileHandling/TestList.java +++ /dev/null @@ -1,26 +0,0 @@ -package FileHandling; - -import java.util.ArrayList; - -public class TestList extends ArrayList{ - - private static final long serialVersionUID = 1L; - private boolean running; - - - public TestList(){ - super(); - } - - public boolean allPassing(){ - - Test[] codeArray = (Test[]) this.toArray(); - - for(int i = 0; i< codeArray.length; i++){ - running = codeArray[i].oneTestFailing(); - - if(running == false) return false; - } - return true; - } -} From 2432ea5c361634a104e339a6777cefb664ef4a1c Mon Sep 17 00:00:00 2001 From: Chunk3r Date: Tue, 12 Jul 2016 14:32:21 +0200 Subject: [PATCH 28/59] Delete excercises.dtd --- src/FileHandling/excercises.dtd | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 src/FileHandling/excercises.dtd diff --git a/src/FileHandling/excercises.dtd b/src/FileHandling/excercises.dtd deleted file mode 100644 index 1108bc0..0000000 --- a/src/FileHandling/excercises.dtd +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file From 79f08828962956806e7e8f518d2dd67393764ae0 Mon Sep 17 00:00:00 2001 From: Chunk3r Date: Tue, 12 Jul 2016 14:32:30 +0200 Subject: [PATCH 29/59] Delete .classpath --- src/GUI/.classpath | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 src/GUI/.classpath diff --git a/src/GUI/.classpath b/src/GUI/.classpath deleted file mode 100644 index 233be1d..0000000 --- a/src/GUI/.classpath +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - From 49405ba0574f62f9cd9a6fa310d0b4b989cf1b1f Mon Sep 17 00:00:00 2001 From: Chunk3r Date: Tue, 12 Jul 2016 14:32:39 +0200 Subject: [PATCH 30/59] Delete .project --- src/GUI/.project | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 src/GUI/.project diff --git a/src/GUI/.project b/src/GUI/.project deleted file mode 100644 index c6f81a5..0000000 --- a/src/GUI/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - Test - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - - From a964a3be7df8bf6495029075fc2be35d48dd7d62 Mon Sep 17 00:00:00 2001 From: Chunk3r Date: Tue, 12 Jul 2016 14:32:52 +0200 Subject: [PATCH 31/59] Delete Controller.class --- src/GUI/Controller.class | Bin 648 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 src/GUI/Controller.class diff --git a/src/GUI/Controller.class b/src/GUI/Controller.class deleted file mode 100644 index fa5e81cc81a099cebad4dc55a51eca82cc716f37..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 648 zcmaJ;T}vB56g_vdNz6KF{H~@=tr|f^Tom6FL6khj7OF_`ZL=M9bTg~Fvl{#-{sNy1 zMZpJuKz~%}osC*bp$yEubI!fzp1b?=*W(j_b%yecfwwLoU5WC~YdO%od@ruy{ytcj9l7P-`nKKV{vHOb!CpBY6AQ%7mwO z9HF{zg7ADVxOgSwED2>x*~;2Z-(Dn>6>D4I4Qc`vcx6lre8h~vEan8N@C2HuvG|`B z!jNt9qd=edpF3wVG=#=~*C$j|x~tN@QQqT-6;o+mA$Q@(?j{m>naR|&;xJ1w!(V%V ze}=<{y@4>uuM$U*qwMYOV From c9bf0624f00bf978113cf2944e99bfdabc7c5beb Mon Sep 17 00:00:00 2001 From: Chunk3r Date: Tue, 12 Jul 2016 14:33:00 +0200 Subject: [PATCH 32/59] Delete Controller.java --- src/GUI/Controller.java | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 src/GUI/Controller.java diff --git a/src/GUI/Controller.java b/src/GUI/Controller.java deleted file mode 100644 index 6dcabe8..0000000 --- a/src/GUI/Controller.java +++ /dev/null @@ -1,23 +0,0 @@ -package GUI; - -import javafx.fxml.FXML; -import javafx.scene.control.*; - -public class Controller { - - - @FXML private TextArea Area1; - @FXML private TextArea Area2; - - @FXML protected void SwitchArea() { - if (Area1.isDisable()) { - Area1.setDisable(false); - Area2.setDisable(true); - Area1.requestFocus(); - } else { - Area2.setDisable(false); - Area1.setDisable(true); - Area2.requestFocus(); - } - } -} From cac8ea50911e7f882f2bbd66024a657492da3157 Mon Sep 17 00:00:00 2001 From: Chunk3r Date: Tue, 12 Jul 2016 14:33:07 +0200 Subject: [PATCH 33/59] Delete GUIMain.class --- src/GUI/GUIMain.class | Bin 900 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 src/GUI/GUIMain.class diff --git a/src/GUI/GUIMain.class b/src/GUI/GUIMain.class deleted file mode 100644 index 704c9581db1470217b791db80525f9177a3ba765..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 900 zcmY*XYi|-k6g>kAONXtrpp>dbOMUQYS>G>=iD|4cLM6o-jh_ZOrQ0mKWOq^gS$?67 zCdSYHDC3<4yJeG|xpU{7Gk4CNKYxGx0`LG0jzwJNFmQ$AD%Mgca$Li8j&+oDZ0NYb zk-|-mTez);vW|+5Dns(QIqe}`7(+b zatbgt;p|#urY%NJ?}%Y3+J4tPmOU~i)tAAxEqtHI<;pn|!(@Xzk2o`2nkakH4{c&7 zO`V;0eyZchz}(+!l1P45xU$LI`PgbUU2z~i>Yq(PB=VnezL069BvOca82Z^3o^*n+ ziDzy`&84gPG6;>GYkx=$(;-vykKC{H91VJ@>WhP^Hq*F7t2LS#&57y>*mnvTmT63e zNsa|%k)v2a*J++YPZ5it95LElghr|i7jcQ!3jUT((rDhOP7u#(6C_TN{0+VJ6RA&| qCs^36ZB4*y6Qm=tJQ74%CV?zg>Et2_mPj&BS&igZ=r2$l!|FetE6QvD From c5d82cc6c042de8cab00329147823487c001b983 Mon Sep 17 00:00:00 2001 From: Chunk3r Date: Tue, 12 Jul 2016 14:33:15 +0200 Subject: [PATCH 34/59] Delete GUIMain.java --- src/GUI/GUIMain.java | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 src/GUI/GUIMain.java diff --git a/src/GUI/GUIMain.java b/src/GUI/GUIMain.java deleted file mode 100644 index 97e896a..0000000 --- a/src/GUI/GUIMain.java +++ /dev/null @@ -1,22 +0,0 @@ -package GUI; - -import javafx.application.Application; -import javafx.fxml.FXMLLoader; -import javafx.scene.Scene; -import javafx.scene.layout.Pane; -import javafx.stage.Stage; - - -public class GUIMain extends Application{ - - public static void main(String[] args){ - launch(args); - } - - public void start(Stage stage) throws Exception { - Pane root = (Pane) FXMLLoader.load(getClass().getResource("ProPra.fxml")); - Scene scene = new Scene(root); - stage.setScene(scene); - stage.show(); - } -} From 3ba7b64f848c98bf534a4147615108e59031724c Mon Sep 17 00:00:00 2001 From: Chunk3r Date: Tue, 12 Jul 2016 14:33:24 +0200 Subject: [PATCH 35/59] Delete ProPra.fxml --- src/GUI/ProPra.fxml | 50 --------------------------------------------- 1 file changed, 50 deletions(-) delete mode 100644 src/GUI/ProPra.fxml diff --git a/src/GUI/ProPra.fxml b/src/GUI/ProPra.fxml deleted file mode 100644 index f003b38..0000000 --- a/src/GUI/ProPra.fxml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - -