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

Sprint 2 Release #202

Merged
merged 138 commits into from Mar 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
138 commits
Select commit Hold shift + click to select a range
2243941
Update attributes.java
jrlease-03 Feb 2, 2024
6e8f255
Merge branch 'develop' of https://github.com/mucsci-students/2024sp-4…
jrlease-03 Feb 2, 2024
c019373
Merge branch 'develop' of https://github.com/mucsci-students/2024sp-4…
jrlease-03 Feb 5, 2024
6564d36
removed class files and added gitignore
kuhaku4 Feb 15, 2024
d508064
Merge pull request #116 from mucsci-students/classRemove
CullenIsntHere Feb 15, 2024
4d1d299
added maven and javafx put everything in class
kuhaku4 Feb 15, 2024
d26f4d0
Merge branch 'develop' into classRemove
kuhaku4 Feb 16, 2024
3d1ae16
Merge pull request #149 from mucsci-students/classRemove
BasilrockMU Feb 16, 2024
cd25708
Bump junit:junit from 4.11 to 4.13.1 in /java2
dependabot[bot] Feb 16, 2024
ec33056
Merge pull request #150 from mucsci-students/dependabot/maven/java2/j…
CullenIsntHere Feb 16, 2024
1a2344a
Fixing JSON JAR reference
BasilrockMU Feb 16, 2024
cf0c67b
Merge pull request #151 from mucsci-students/FixingJSONJarDep
kuhaku4 Feb 16, 2024
d8022d2
added lib folder with json simple
kuhaku4 Feb 16, 2024
faadc5c
changed package header and pom java version
kuhaku4 Feb 19, 2024
729c800
Merge pull request #154 from mucsci-students/libAdd
BasilrockMU Feb 19, 2024
5e98d8c
changed relationship to be src->dest
kuhaku4 Feb 20, 2024
cfa7e19
Rework of inputHandler to use separate lines.
CullenIsntHere Feb 20, 2024
9f310b7
Merge pull request #155 from mucsci-students/relBugFix
CullenIsntHere Feb 20, 2024
ef24078
Fixed the bug with listoneclassrel,
CullenIsntHere Feb 20, 2024
b0d5e9e
Should work with new rel stuff.
CullenIsntHere Feb 20, 2024
2eb78b1
Merge branch 'develop' into InputFixing
CullenIsntHere Feb 20, 2024
9e493d7
Should be completely fixed totally real 100%
CullenIsntHere Feb 20, 2024
2cb637b
Fixed save and load.
CullenIsntHere Feb 20, 2024
063b688
Merge pull request #156 from mucsci-students/InputFixing
kuhaku4 Feb 20, 2024
29387c9
tiny bug fix in remove rel.
CullenIsntHere Feb 20, 2024
6df2ce8
Merge pull request #157 from mucsci-students/InputFixing
kuhaku4 Feb 20, 2024
27dcf52
added rel type and changed InputHandler for it
kuhaku4 Feb 22, 2024
13747da
InputHandler fix
kuhaku4 Feb 22, 2024
d4ecc37
Merge pull request #158 from mucsci-students/addRelationshipType
jrlease-03 Feb 22, 2024
ae81147
javafx added probably
kuhaku4 Feb 22, 2024
675650c
javaxjson
kuhaku4 Feb 22, 2024
f816ddd
Merge pull request #159 from mucsci-students/jarTest
BasilrockMU Feb 22, 2024
354d5da
InitialGUIWindow
BasilrockMU Feb 23, 2024
1182d29
Merge pull request #160 from mucsci-students/NewWindowFromInputHandler
kuhaku4 Feb 23, 2024
863c55b
Slight correction to GUI operation
BasilrockMU Feb 23, 2024
1630f98
Merge pull request #161 from mucsci-students/NewWindowFromInputHandler
kuhaku4 Feb 23, 2024
991add8
Merge branch 'develop' of https://github.com/mucsci-students/2024sp-4…
jrlease-03 Feb 23, 2024
ce7098e
added type to attributes
kuhaku4 Feb 25, 2024
d39277a
added methods and setup for params
kuhaku4 Feb 25, 2024
7aeef9e
Merge pull request #162 from mucsci-students/morebugfixes
jrlease-03 Feb 25, 2024
43a867e
save fix that fixes nothing
jrlease-03 Feb 25, 2024
315a61b
Merge branch 'develop' of https://github.com/mucsci-students/2024sp-4…
jrlease-03 Feb 25, 2024
34f8861
Merge pull request #163 from mucsci-students/Json-save-rework
kuhaku4 Feb 25, 2024
f67d7c2
save update
jrlease-03 Feb 26, 2024
b895991
Merge pull request #164 from mucsci-students/Json-save-rework
kuhaku4 Feb 26, 2024
c32e217
Wrote many param methods, as well as
CullenIsntHere Feb 27, 2024
65459c1
Fixed constructor.
CullenIsntHere Feb 27, 2024
6f1268a
Quick fix to comment.
CullenIsntHere Feb 27, 2024
073da36
Merge pull request #165 from mucsci-students/ParameterStuff
jrlease-03 Feb 27, 2024
7dd8209
Setting up basic model thing.
CullenIsntHere Feb 28, 2024
4763e3d
Setup stuff for all relationships.
CullenIsntHere Feb 28, 2024
4814719
Started using switch cases, got rem and add field.
CullenIsntHere Feb 28, 2024
e2661ae
New window
BasilrockMU Feb 29, 2024
583cd00
Done with fields, probably.
CullenIsntHere Feb 29, 2024
408cad5
Merge pull request #166 from mucsci-students/CreatedWindow
kuhaku4 Feb 29, 2024
5a6602c
Added all stuff for methods, probably.
CullenIsntHere Feb 29, 2024
347d475
All but save, load, exit, help setup.
CullenIsntHere Feb 29, 2024
70e8897
This should be everything but save, load, exit.
CullenIsntHere Feb 29, 2024
e72ae3b
tiny bug
CullenIsntHere Feb 29, 2024
46365d9
Should be everything.
CullenIsntHere Feb 29, 2024
ccb709a
Should've fixed rel, methods broke.
CullenIsntHere Feb 29, 2024
5fdddad
Merge pull request #167 from mucsci-students/Paraminput
kuhaku4 Feb 29, 2024
fb41b88
fixed load added clear for methods
kuhaku4 Feb 29, 2024
9a350b7
fixed pom probably too added gui start
kuhaku4 Feb 29, 2024
4500ecd
Merge pull request #168 from mucsci-students/loadnewchanges
BasilrockMU Feb 29, 2024
b4b614e
Here are new Window Operations for the about box.
BasilrockMU Mar 1, 2024
9eb8dc5
Merge pull request #169 from mucsci-students/BasicWindowOperations
kuhaku4 Mar 1, 2024
ce51a3d
Changed controller path, and added fxml
kuhaku4 Mar 1, 2024
21297c8
Merge pull request #170 from mucsci-students/quickfix
BasilrockMU Mar 1, 2024
629c8e4
The beginnings of showing a textarea that pops up
BasilrockMU Mar 1, 2024
6377a4a
Merge pull request #171 from mucsci-students/GUIClassBoxDisplay
kuhaku4 Mar 1, 2024
f38e108
added popup
kuhaku4 Mar 1, 2024
e821393
Merge pull request #172 from mucsci-students/guistarter
BasilrockMU Mar 1, 2024
d893e12
added relationship add to gui
kuhaku4 Mar 1, 2024
ed31ed4
Merge pull request #174 from mucsci-students/guirelationshipadd
BasilrockMU Mar 1, 2024
376473f
input scene added to controller
kuhaku4 Mar 2, 2024
7de255c
Merge pull request #175 from mucsci-students/fixedinputscene
BasilrockMU Mar 2, 2024
cc2f482
Fixed bugs in listoneclass.
CullenIsntHere Mar 3, 2024
9be865f
Comments and general housekeeping.
CullenIsntHere Mar 3, 2024
4e6c87e
Merge pull request #176 from mucsci-students/ModelBugs
kuhaku4 Mar 3, 2024
3e70439
Fixed list stuff bugs.
CullenIsntHere Mar 3, 2024
cab40bd
Merge pull request #177 from mucsci-students/ModelBugs
kuhaku4 Mar 3, 2024
4b52113
added save function to gui and parameters small
kuhaku4 Mar 3, 2024
5dcd0ac
added fix for params
kuhaku4 Mar 3, 2024
18601f9
added changes to gui to fit the project better
kuhaku4 Mar 3, 2024
a089b23
Merge pull request #178 from mucsci-students/paramfixes
BasilrockMU Mar 4, 2024
32bbef4
added getters for the containers in model
kuhaku4 Mar 4, 2024
1db5940
Merge pull request #179 from mucsci-students/paramfixes
BasilrockMU Mar 4, 2024
5dc4d60
fixes for text area in gui
kuhaku4 Mar 4, 2024
6e74557
maybe fixed
kuhaku4 Mar 4, 2024
d296e62
probably fixed
kuhaku4 Mar 4, 2024
d59bc22
Merge pull request #180 from mucsci-students/paramfixes
BasilrockMU Mar 4, 2024
277a518
definitly fixed rel adding
kuhaku4 Mar 4, 2024
fa7868d
Merge pull request #181 from mucsci-students/paramfixes
BasilrockMU Mar 4, 2024
b8745ef
added several functions for gui tested most of
kuhaku4 Mar 5, 2024
b477f42
Merge pull request #182 from mucsci-students/paramfixes
CullenIsntHere Mar 6, 2024
b7cfc5f
Added addParam, removeParam, clearParams.
CullenIsntHere Mar 6, 2024
1cb3ec7
Merge pull request #183 from mucsci-students/ModelParams/Helpdoc
kuhaku4 Mar 6, 2024
07b4da7
finished most of gui but javafx:run doesnt load
kuhaku4 Mar 6, 2024
d9e90cf
fixed gui text
kuhaku4 Mar 6, 2024
bc83fde
added spring-boot for creating jar
kuhaku4 Mar 6, 2024
9fc5e1f
fixed build jar
kuhaku4 Mar 6, 2024
77f57f6
Merge pull request #184 from mucsci-students/finishedGui
CullenIsntHere Mar 7, 2024
f657267
Bump org.springframework.boot:spring-boot from 2.6.6 to 2.7.18 in /java2
dependabot[bot] Mar 7, 2024
044baac
Should allow multi params.
CullenIsntHere Mar 7, 2024
85253fe
Merge pull request #185 from mucsci-students/dependabot/maven/java2/o…
kuhaku4 Mar 7, 2024
8ddb296
Merge pull request #186 from mucsci-students/MultiParam
kuhaku4 Mar 7, 2024
698c418
added param list add
kuhaku4 Mar 8, 2024
a3fafed
Merge pull request #187 from mucsci-students/multipleparamsgui
BasilrockMU Mar 8, 2024
45a1e70
Should fix params.
CullenIsntHere Mar 8, 2024
ba98ec8
Fix spacing error.
CullenIsntHere Mar 8, 2024
9820ddb
Merge pull request #188 from mucsci-students/paramfix
kuhaku4 Mar 8, 2024
eb62367
test changes
kuhaku4 Mar 9, 2024
4ed4830
fixed cli
kuhaku4 Mar 9, 2024
5e4e122
Merge pull request #190 from mucsci-students/alertsandtests
jrlease-03 Mar 9, 2024
462d8c9
fixed input handler
kuhaku4 Mar 9, 2024
3e45dc0
Merge pull request #191 from mucsci-students/alertsandtests
jrlease-03 Mar 9, 2024
b088ea9
added error msgs to gui
kuhaku4 Mar 9, 2024
7c2404c
Merge pull request #192 from mucsci-students/alertsandtests
jrlease-03 Mar 9, 2024
b403b1f
Set of attributesTests
BasilrockMU Mar 9, 2024
b4a6e65
added edit rel type
kuhaku4 Mar 9, 2024
a5dd70d
Merge pull request #193 from mucsci-students/AttributesTests
jrlease-03 Mar 9, 2024
c30e552
More tests. MAKE SURE NO FILES ARE DELETED
BasilrockMU Mar 9, 2024
02c575a
Merge branch 'develop' into releditadded
kuhaku4 Mar 9, 2024
14fec25
Merge pull request #194 from mucsci-students/releditadded
CullenIsntHere Mar 9, 2024
06ea24f
Merge pull request #195 from mucsci-students/SaveUMLTestPart1
kuhaku4 Mar 10, 2024
28fd420
added tests
kuhaku4 Mar 11, 2024
b0b87f9
Merge pull request #196 from mucsci-students/testsprint2
jrlease-03 Mar 11, 2024
5ae235b
final changes
kuhaku4 Mar 11, 2024
dbcdeb0
Merge pull request #198 from mucsci-students/quickfixsprint2
BasilrockMU Mar 11, 2024
9068a57
Last one for real
kuhaku4 Mar 11, 2024
9432eb7
last for real changes
kuhaku4 Mar 11, 2024
32af497
Merge pull request #199 from mucsci-students/quickfixsprint2
BasilrockMU Mar 11, 2024
f70d48f
I misspelt inheritance
kuhaku4 Mar 11, 2024
8a08d45
I mispelled words
kuhaku4 Mar 11, 2024
46880f2
Merge pull request #200 from mucsci-students/mispelledwords
BasilrockMU Mar 11, 2024
5e54a7f
didnt change the test file
kuhaku4 Mar 11, 2024
39e60b1
Merge pull request #201 from mucsci-students/mmmmmm
BasilrockMU Mar 11, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
28 changes: 28 additions & 0 deletions .gitignore
@@ -0,0 +1,28 @@
attributes.class
ClassBase.class
attributesTests.class
ClassContainer.class
ClassTesting.class
ExitUML.class
ExitUMLTests.class
InputHandler.class
LoadUML.class
Relationship.class
RelationshipContainer.class
RelationshipTests.class
saveUML.class
saveUMLTests.class
App.class
App$1.class
InputHandler$1.class
Relationship$Type.class
ClassBaseTest.class
ClassContainerTest.class
methodsTest.class
Relationship$Type.class
Model.class
methods.class
GLIUMLClassBox.class
Controller.class
App$1.class
App.class
7 changes: 7 additions & 0 deletions .vscode/settings.json
@@ -0,0 +1,7 @@
{
"java.configuration.updateBuildConfiguration": "interactive",
"java.project.referencedLibraries": [
"lib/**/*.jar",
"c:\\Users\\vasil\\OneDrive - Millersville University\\CSCI 420 Attempt 2\\json-simple-1.1.1.jar"
]
}
Binary file removed ClassBase.class
Binary file not shown.
Binary file removed ClassContainer.class
Binary file not shown.
Binary file removed ClassTesting.class
Binary file not shown.
78 changes: 0 additions & 78 deletions ClassTesting.java

This file was deleted.

Binary file removed ExitUML.class
Binary file not shown.
Binary file removed ExitUMLTests.class
Binary file not shown.
43 changes: 0 additions & 43 deletions ExitUMLTests.java

This file was deleted.

24 changes: 24 additions & 0 deletions HELP.md
@@ -0,0 +1,24 @@
Valid Types for Relationships: Aggregation, Compostion, Inheritence, Realization
Valid editTypes: Name, Type

add class <name> ' adds a class with given name.
remove class <name>, will remove a class with given name.
rename class <oldName> <newName>, will rename a class with oldName to newName.
add relationship <fromClass> <toClass> <relType>, will add a relationship between two classes.
edit relationship <fromClass> <toClass> <relType>, changes the type of relationship.
add method <className> <methodName> <methodType>, adds a methodName of type methodType to className.
edit method <className> <methodName> <editType> <newName>, edits method according to editType in className and methodName.
remove method <className> <methodName>, removed method methodName from className.
add params <className> <methodName> <paramName> <paramType>, adds param of paramType to paramName in methodName in className.
remove param <className> <methodName> <paramName>, removes param with paramName from methodName in className.
clear params <className> <methodName>, clears all params from methodName in className.
add field <className> <fieldName> <fieldType>, adds a fieldName of fieldType to className.
edit field <className> <fieldName> <editType> <newName>, edits field according to editType in className and methodName.
remove field <className> <fieldName>, removed fieldName from className.
list one class <className>, will list all fields and methods of className.
list all classes, will list all classes and all of their fields and methods and types.
list one classes relationships <className>, will list all of the relationship the class belongs to.
save <fileName>, saves the class with file name fileName, if none is chosen it uses a default name.
load <fileName>, loads a file fileName.
exit, closes the program.
help, displays the help text.
Binary file removed InputHandler.class
Binary file not shown.