sem/Greenify
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
209 Commits 4 Branches 6 Tags
80d5e42c00b9e22539539b80fae6608aca01303b
Commit Graph

16 Commits

Author SHA1 Message Date
cugurlu
479ed8e7f2 Add new tests 2019-03-16 14:18:40 +01:00
cugurlu
928c6f89a6 Edit common classes 2019-03-16 14:16:29 +01:00
cugurlu
2b04ce2306 Fix build.gradle files 2019-03-16 14:06:46 +01:00
Sem van der Hoeven
ad4e49f65c Merge branch 'master' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template 
Sourcetree needed to merge this?
 2019-03-14 19:26:17 +01:00
Sem van der Hoeven
e9bee87a38 FIX::edited correct names in fxml files 
changed the controller names to use the greenify packages

ADD::added button to add a vegetarian meal

only the button
 2019-03-14 19:23:30 +01:00
cugurlu
a5b4a2e8f0 Update build.gradle in common 2019-03-14 13:43:03 +01:00
cugurlu
80bc87922c Update build.gradle in common 2019-03-14 12:05:41 +01:00
Sem van der Hoeven
a265c286eb FIX::fixed package names and imports 
changed gogreen to greenify

FIX::made user tostring test succeed

added toString method to user
 2019-03-12 22:53:43 +01:00
cugurlu
d02393400e Fix names of directories 2019-03-12 10:27:30 +01:00
Sem van der Hoeven
5877e307d5 ADD:: added javadoc comments where needed for the checkstyle 
EDIT:: edited some lines to fit the checkstyle

fixed some indentation warnings and line length warnings
 2019-03-11 16:44:55 +01:00
Sem van der Hoeven
29229e457c Revert "Revert "MERGE::Merge branch 'fix_gradle_build_file'"" 
This reverts commit 7af5470a8e.
 2019-03-11 16:03:00 +01:00
Sem van der Hoeven
7af5470a8e Revert "MERGE::Merge branch 'fix_gradle_build_file'" 
This reverts commit 309337f26d, reversing
changes made to d902c7401d.
 2019-03-11 15:59:38 +01:00
Sem van der Hoeven
2e1becbe32 REMOVE::removed settings.gradle file in src folder 
this messed with the paths for the main settings.gradle file
 2019-03-09 14:12:44 +01:00
Sem van der Hoeven
fa73f6fb4d EDIT:: Reimported project 
reimported project to fix the errors in client application

FIX:: fixed the "location is not set" error in client application when loading fxml file

reimporting the project made it work, as it now has a submodule folder structure

EDIT:: edited settings.gradle file to include the modules in the new structure

EDIT: edited client build.gradle and server build.gradle files to pick the right common folder
(changed complie(:Common) to compile(:src:Common))
 2019-03-09 13:33:15 +01:00
Sem van der Hoeven
cab6d9aeeb FIX:: fixed Client application class 
The class was not seeing some imports from the same package, and some getters and setters for User.java were not written, so I wrote those and fixed the imports

FIX:: fixed packages

Everything now isn't in several subpackages in the Client, Common and Server package anymore, but straight in their respectable packages. Also fixed the package names

BUG FIX: fixed Client Application class not being able to see GetBean method

Don't really know how it got fixed, but resolving the import issues also fixed this bug.

EDIT::changed main class in build.gradle file to Client.Application

---------------
I now only get a bug where the fxmlloader can't see the fxml files, and thus I can't start the application. I get the error message "location not set" although I used fxmlloader.setLocation.
 2019-03-07 20:46:51 +01:00
Sem van der Hoeven
aa79365784 apparently the changes that were supposed to be made weren't committed in my previous commit, so here is the right one 
REMOVE:: removed the .gradle and build folders from the Client, Server and Common folders, also moved the contents that was in the src folders of these folders, to the folders themselves and deleted the src folders

EDIT:: edited the build.gradle file, build should now work

combined the build.gradle files in the Client, Server and Common folders into the build.gradle file in the root
 2019-03-06 21:22:29 +01:00