diff --git a/overview.png b/overview.png index c90860b..3b8cc8b 100644 Binary files a/overview.png and b/overview.png differ diff --git a/overview.uxf b/overview.uxf index 90ab774..0be0609 100644 --- a/overview.uxf +++ b/overview.uxf @@ -4,8 +4,8 @@ UMLClass - 1270 - 400 + 1220 + 760 90 30 @@ -16,8 +16,288 @@ lt=- UMLClass - 870 - 400 + 990 + 760 + 100 + 30 + + webhost +lt=- +layer=-1 + + + + UMLClass + + 1220 + 800 + 90 + 30 + + user +bg=#90CAF9 + + + + UMLClass + + 990 + 800 + 100 + 30 + + mispbridge +bg=#B39DDB +layer=-1 + + + + Relation + + 740 + 850 + 280 + 50 + + lt=<<<- +POST (Ride) +Generated by Loop + 260.0;20.0;10.0;20.0 + + + Relation + + 1070 + 890 + 200 + 40 + + lt=<<<- +GET (Request) +fg=#1E88E5 + 10.0;20.0;180.0;20.0 + + + UMLClass + + 660 + 800 + 100 + 30 + + mispclient +bg=#B39DDB +layer=-1 + + + + Relation + + 740 + 1000 + 280 + 50 + + lt=<<<- +GET (Ride)(Request) +(Data) + 260.0;20.0;10.0;20.0 + + + Relation + + 1070 + 1020 + 190 + 40 + + lt=<<<. +OK (Data) +fg=#1E88E5 + 170.0;20.0;10.0;20.0 + + + Relation + + 740 + 1060 + 280 + 40 + + lt=<<<. +OK (Ride) + 10.0;20.0;260.0;20.0 + + + UMLClass + + 460 + 800 + 80 + 30 + + app +bg=#90CAF9 + + + + Relation + + 510 + 930 + 180 + 40 + + lt=<<<- +GET (Request) +fg=#1E88E5 + 10.0;20.0;160.0;20.0 + + + Relation + + 510 + 980 + 180 + 40 + + lt=<<<. +OK (Data) +fg=#1E88E5 + 160.0;20.0;10.0;20.0 + + + Relation + + 740 + 910 + 280 + 40 + + lt=<<<. +OK (Ride)(Request) + 10.0;20.0;260.0;20.0 + + + UMLClass + + 460 + 760 + 300 + 30 + + localhost +lt=- + + + + UMLClass + + 430 + 730 + 910 + 400 + + +lt=.. +layer=-10 + + + + Relation + + 1250 + 820 + 30 + 310 + + lt=- +fg=#1E88E5 + 10.0;10.0;10.0;290.0 + + + Relation + + 490 + 820 + 30 + 310 + + lt=- +fg=#1E88E5 + 10.0;10.0;10.0;290.0 + + + UMLClass + + 1240 + 910 + 40 + 130 + + +bg=#F6F6F6 +transparency=0 +layer=4 + + + + UMLClass + + 480 + 950 + 40 + 50 + + +bg=#F6F6F6 +transparency=0 +layer=4 + + + + Relation + + 1030 + 820 + 30 + 310 + + lt=- +fg=#5E35B1 +layer=-4 + 10.0;10.0;10.0;290.0 + + + Relation + + 700 + 820 + 30 + 310 + + lt=- +fg=#5E35B1 +layer=-4 + 10.0;10.0;10.0;290.0 + + + UMLClass + + 1220 + 320 + 90 + 30 + + inet +lt=- + + + + UMLClass + + 820 + 320 120 30 @@ -27,9 +307,9 @@ lt=- UMLClass - 1040 - 400 - 110 + 990 + 320 + 100 30 webhost @@ -40,8 +320,8 @@ layer=-1 UMLClass - 1270 - 440 + 1220 + 360 90 30 @@ -52,9 +332,9 @@ bg=#90CAF9 UMLClass - 1040 - 440 - 110 + 990 + 360 + 100 30 mispbridge @@ -65,35 +345,35 @@ layer=-1 Relation - 800 - 490 - 270 + 740 + 410 + 280 50 lt=<<<- POST (Ride) Generated by Loop - 250.0;20.0;10.0;20.0 + 260.0;20.0;10.0;20.0 Relation - 1130 - 530 - 190 + 1070 + 450 + 200 40 lt=<<<- GET (Request) fg=#1E88E5 - 10.0;20.0;170.0;20.0 + 10.0;20.0;180.0;20.0 UMLClass - 710 - 440 - 110 + 660 + 360 + 100 30 mispclient @@ -104,46 +384,46 @@ layer=-1 Relation - 800 - 640 - 270 + 740 + 560 + 280 50 lt=<<<- GET (Ride)(Request) (Data) - 250.0;20.0;10.0;20.0 + 260.0;20.0;10.0;20.0 Relation - 1130 - 660 - 190 + 1070 + 580 + 200 40 lt=<<<. OK (Data) fg=#1E88E5 - 170.0;20.0;10.0;20.0 + 180.0;20.0;10.0;20.0 Relation - 800 - 700 - 270 + 740 + 620 + 280 40 lt=<<<. OK (Ride) - 10.0;20.0;250.0;20.0 + 10.0;20.0;260.0;20.0 UMLClass - 510 - 440 + 460 + 360 80 30 @@ -154,8 +434,8 @@ bg=#90CAF9 Relation - 550 - 570 + 500 + 490 190 40 @@ -167,8 +447,8 @@ fg=#1E88E5 Relation - 550 - 620 + 500 + 540 190 40 @@ -180,21 +460,21 @@ fg=#1E88E5 Relation - 800 - 550 - 270 + 740 + 470 + 280 40 lt=<<<. OK (Ride)(Request) - 10.0;20.0;250.0;20.0 + 10.0;20.0;260.0;20.0 UMLClass - 510 - 400 - 310 + 460 + 320 + 300 30 localhost @@ -204,8 +484,8 @@ lt=- UMLClass - 480 - 370 + 430 + 290 910 400 @@ -217,9 +497,9 @@ layer=-10 UMLClass - 1050 - 510 - 90 + 1000 + 430 + 80 40 Available @@ -231,9 +511,9 @@ transparency=0 UMLClass - 720 - 510 - 90 + 670 + 430 + 80 60 Available @@ -245,9 +525,9 @@ transparency=0 UMLClass - 1050 - 550 - 90 + 1000 + 470 + 80 110 Booked @@ -260,9 +540,9 @@ layer=1 UMLClass - 720 - 570 - 90 + 670 + 490 + 80 70 Booked @@ -274,9 +554,9 @@ transparency=0 UMLClass - 720 - 640 - 90 + 670 + 560 + 80 80 Loaded @@ -288,9 +568,9 @@ transparency=0 UMLClass - 1050 - 660 - 90 + 1000 + 580 + 80 60 Loaded @@ -302,8 +582,8 @@ transparency=0 Relation - 1300 - 460 + 1250 + 380 30 310 @@ -314,8 +594,8 @@ fg=#1E88E5 UMLClass - 870 - 440 + 820 + 360 120 30 @@ -329,8 +609,8 @@ bg=#F48FB1 Relation - 540 - 460 + 490 + 380 30 310 @@ -341,8 +621,8 @@ fg=#1E88E5 UMLClass - 1300 - 550 + 1250 + 470 20 130 @@ -355,8 +635,8 @@ layer=4 UMLClass - 540 - 590 + 490 + 510 20 50 @@ -369,8 +649,8 @@ layer=4 Relation - 1080 - 460 + 1030 + 380 30 310 @@ -382,8 +662,8 @@ layer=-4 Relation - 750 - 460 + 700 + 380 30 310 @@ -392,4 +672,88 @@ fg=#5E35B1 layer=-4 10.0;10.0;10.0;290.0 + + UMLClass + + 670 + 870 + 80 + 210 + + +bg=#F6F6F6 +transparency=0 +layer=4 + + + + UMLClass + + 1000 + 870 + 40 + 60 + + +bg=#F6F6F6 +transparency=0 +layer=4 + + + + UMLClass + + 1000 + 1020 + 40 + 60 + + +bg=#F6F6F6 +transparency=0 +layer=4 + + + + UMLClass + + 1040 + 910 + 40 + 130 + + +bg=#F6F6F6 +transparency=0 +layer=4 + + + + UMLClass + + 330 + 290 + 80 + 400 + + *overview* +valign=center +lt=.. +layer=-10 + + + + UMLClass + + 330 + 730 + 80 + 400 + + *threads* +valign=center +lt=.. +layer=-10 + + diff --git a/threads.png b/threads.png deleted file mode 100644 index 2f45eff..0000000 Binary files a/threads.png and /dev/null differ diff --git a/threads.uxf b/threads.uxf deleted file mode 100644 index c0d9977..0000000 --- a/threads.uxf +++ /dev/null @@ -1,263 +0,0 @@ - - - 10 - - UMLClass - - 320 - 250 - 120 - 30 - - ClientMock -bg=#F6F6F6 - - - - UMLClass - - 510 - 250 - 120 - 30 - - ClientServlet -bg=#F6F6F6 - - - - UMLClass - - 1440 - 220 - 120 - 30 - - BridgeMock -bg=#F6F6F6 - - - - UMLClass - - 1610 - 220 - 120 - 30 - - BridgeServlet -bg=#F6F6F6 - - - - Relation - - 430 - 250 - 100 - 30 - - lt=<<- - 80.0;10.0;10.0;10.0 - - - Relation - - 1550 - 220 - 80 - 30 - - lt=<<- - 60.0;10.0;10.0;10.0 - - - UMLClass - - 140 - 250 - 120 - 30 - - Main -bg=#F6F6F6 - - - - Relation - - 190 - 270 - 30 - 310 - - lt=- - 10.0;10.0;10.0;290.0 - - - Relation - - 560 - 270 - 30 - 310 - - lt=- - 10.0;10.0;10.0;290.0 - - - Relation - - 370 - 270 - 30 - 310 - - lt=- - 10.0;10.0;10.0;290.0 - - - Relation - - 1660 - 240 - 30 - 310 - - lt=- - 10.0;10.0;10.0;290.0 - - - Relation - - 1490 - 240 - 30 - 310 - - lt=- - 10.0;10.0;10.0;290.0 - - - Relation - - 190 - 370 - 210 - 40 - - lt=<- -new Thread - 190.0;20.0;10.0;20.0 - - - Relation - - 190 - 400 - 1330 - 60 - - lt=<- -new Thread - 1310.0;10.0;10.0;40.0 - - - Relation - - 370 - 370 - 220 - 40 - - lt=- -Instance - 200.0;20.0;10.0;20.0 - - - Relation - - 1490 - 390 - 200 - 40 - - lt=- -Instance - 180.0;20.0;10.0;20.0 - - - UMLClass - - 300 - 150 - 350 - 600 - - Client Thread -layer=-10 - - - - UMLClass - - 1400 - 120 - 350 - 600 - - Bridge Thread -layer=-10 - - - - UMLClass - - 880 - 530 - 200 - 470 - - GET(Ride) -Thread -layer=-10 - - - - UMLClass - - 680 - 530 - 200 - 470 - - POST(Ride) -Thread -layer=-10 - - - - Relation - - 560 - 380 - 320 - 170 - - lt=<- -new Thread - 220.0;150.0;220.0;10.0;10.0;10.0 - - - Relation - - 560 - 380 - 510 - 170 - - lt=<- -new Thread - 410.0;150.0;410.0;10.0;10.0;10.0 - -