From 1835c51b743d5cff17b485a352ef96e3dfe674a7 Mon Sep 17 00:00:00 2001 From: Matijn Woudt Date: Fri, 1 Oct 2010 12:58:55 +0200 Subject: [PATCH] Fix lots of stuff.. --- java/Graph Editor/bin/app/Main.class | Bin 719 -> 1208 bytes .../bin/controllers/SelectionController.class | Bin 3579 -> 7380 bytes .../bin/controllers/actions/AddNode.class | Bin 503 -> 1395 bytes .../bin/controllers/actions/DeleteNode.class | Bin 523 -> 2252 bytes .../Graph Editor/bin/interfaces/GraphFrame$1.class | Bin 736 -> 1940 bytes .../Graph Editor/bin/interfaces/GraphFrame$2.class | Bin 682 -> 0 bytes .../Graph Editor/bin/interfaces/GraphFrame$3.class | Bin 682 -> 0 bytes .../Graph Editor/bin/interfaces/GraphFrame$4.class | Bin 1025 -> 0 bytes .../Graph Editor/bin/interfaces/GraphFrame$5.class | Bin 682 -> 0 bytes .../Graph Editor/bin/interfaces/GraphFrame$6.class | Bin 1028 -> 0 bytes java/Graph Editor/bin/interfaces/GraphFrame.class | Bin 3448 -> 6603 bytes java/Graph Editor/bin/interfaces/GraphPanel.class | Bin 3697 -> 3919 bytes java/Graph Editor/bin/models/GraphEdge.class | Bin 768 -> 1127 bytes java/Graph Editor/bin/models/GraphModel.class | Bin 2587 -> 5955 bytes java/Graph Editor/bin/models/GraphVertex.class | Bin 1868 -> 2358 bytes .../src/controllers/SelectionController.java | 8 +- java/Graph Editor/src/interfaces/GraphFrame.java | 133 ++++++++------------- java/Graph Editor/src/models/GraphModel.java | 11 +- 18 files changed, 58 insertions(+), 94 deletions(-) rewrite java/Graph Editor/bin/app/Main.class (97%) rewrite java/Graph Editor/bin/controllers/SelectionController.class (99%) rewrite java/Graph Editor/bin/controllers/actions/AddNode.class (87%) rewrite java/Graph Editor/bin/controllers/actions/DeleteNode.class (87%) delete mode 100644 java/Graph Editor/bin/interfaces/GraphFrame$2.class delete mode 100644 java/Graph Editor/bin/interfaces/GraphFrame$3.class delete mode 100644 java/Graph Editor/bin/interfaces/GraphFrame$4.class delete mode 100644 java/Graph Editor/bin/interfaces/GraphFrame$5.class delete mode 100644 java/Graph Editor/bin/interfaces/GraphFrame$6.class rewrite java/Graph Editor/bin/interfaces/GraphFrame.class (98%) rewrite java/Graph Editor/bin/interfaces/GraphPanel.class (90%) rewrite java/Graph Editor/bin/models/GraphVertex.class (77%) diff --git a/java/Graph Editor/bin/app/Main.class b/java/Graph Editor/bin/app/Main.class dissimilarity index 97% index 75049c16eea77eec8a8a70c5c3b6722db6a29f90..ae19ac801c379f8d630b49707254aa8b7e35e076 100644 GIT binary patch literal 1208 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 JDgdaC{{wvuJ3asa literal 3579 zcwU88YkO4H6@GUv%w%#1m_WD%94ykA2{4LiD*;qupuq_V#-;>s9A-A*gt^2sXA-a% z@3v~|r5A1Og`&2!(pt4Ll=3`%`pFOd+JDfmQqglu`Mh?^>2aOcSvi#k7` z&{Z}Db#62eU6U!4aylP~O=#EC=P1{1b`^RWjz?t9)783YpUUgu)8hdew=%}Jis$6h z;t{1f#+|96?NwZ@kX&%Q&#cd-%X1DxJTjt-m0?d81`ddxtMj(!% zw?&XvSliTL3%6spLUc-dCT$8E63Hbp8YAi+3wPo!@>JGdnAVMp$?z4D6Qc4}3wL8L zZBS*z&vb8M37%FFNgu5gPHFcc$+|*!rj)hw6SnKfI@oOU&NyWfm06~|rMON@n9a)6 zPng0@j6JL^zb3`OWb<0>a&@6Jt3&x1hHyB7Lrv&46j=BgSXDi~)`Aw=n#g=nj~V)g z@PLJkV63)txdj02Gk(fej(c|Y?1(*M=n>AxEDU0kl)-}*I$)Ufm=`oj#j(e`Q3j-0@%-}plkB3tSD^5PA-6*oGN7JJ5d*g{1PC`qUohDik zKRN&;IP)049>z?kl8lY#&OfF!-8A1P{IuF0efaf7a3z;VmP_TMBvvz6wHy@ zA&Q#L+nm=R!{=qj-{tNkROUg>U0K>?*J1EAe_wEQTV+(|9(5XTsZ} zky#7R2~Uw3*~%AVcmdyy;6=9G;_A2XJ-oyum+S39w-P6W&{yz-2)@r=TGZASUd3zl zjqaPxgXafJB{%2rvSwGVPYe$??X*t3fgeTiLv~!_Wp3fe_z5#YJjrhZ{r-i-YI%!C zP4D~|-o(!=ye)ym7|4)$TXJIU7Z!eLh%P%%>L@NSm@rKLsf+KA3-K2vmG3M_Wng*f zR5ER>x0R+P9we;Io`~YN+;aU@-1hdy6H)w*c1K-jiUj53S)ppL)btCOmd{)ie_&@7 z^<2Z*2NwQ>55;#=u5F}cLiRtl@aJ%!&sS``RB^NVkRx~K`X=|~E^!}Qd2O`vza3Gu z$n(S>6fN>NnUS}N8Tq(SW|f(*=9fmZi*@|2=jtNyTR9G-u3|$< zT|u9Gwxn9GATFO<{*z#e`@CvgTH-MHe5CAHx6W32Rc9Mx*j5=+M^!h-xxHn^j=~XytwACt3 z`Bn#Z4+VB(#2*!7$Lij983K2c^gBrUo_XN08hFf5Db$VQp#bwvgTVOeP(F?K%!5!h z2!*d>!a#gud5FPfAdW8&ad;Vs$q+)N7`jk!`D2{8j+2w!r>-K$0-dU&(EUUeWzJ`1 zexCCxzFEanQayh9wzO99e2SA}qTx%vEDc~JZkM5r60Q3$VI3F!eb?}M3;vEbsrS?8 zTa;wI{~CU-aPfct3LW?r9T3ebejV5oaOop4z*ef4$X)DS;0TN40sj8WFy|xu9%Y_J z`A(1VmOF+gI6lLjw;A#~B;b8gP;Z^fHF7Qo(iS3;4k2>QV@EsTTe3LnMFsej`{Yf4MFn;^$5- z&dUz5}o9Dg7?kCthYxnN9x|_gV|PSr diff --git a/java/Graph Editor/bin/controllers/actions/AddNode.class b/java/Graph Editor/bin/controllers/actions/AddNode.class dissimilarity index 87% index 42fb6d0ddbe4328e94ef28bd355c1f9d0ba6d1e3..e6bcb45f37898c315deab9e595bb40f7de98e640 100644 GIT binary patch literal 1395 zcwU85T~8B16g|@}l$NDHTcCglC}3MY)-U`jqP2k0RAN%8QRBnX9m|^SuG!rpf5ZRb zgCsS_dJx#Cr zrek|r!7#QRgGZn+%)iz5^#jd&Z`w7jVH=KC*!6suuI^Bv?^=A*Fnxw0kGrOBRS1VL zb{=gou*VDoMFRA7+pp+WgZF&+z0~|wU%kSR^ti<(U$L!#VYbw%r+oTKo?sn@RH;q^ zEl+#s>hJc5)aM6u)VpTdroYZGmpKzCTVYU&gc3s-2^Dc98N!)tB?^WS6*2TjFvgHL z%@o5Z65`r~3Kat}+MQD|B>-YBH=KgxVi+u$Hs5a4ce(paI7MJ3r%ER2WEI6hQt|gp zk726xpI+o+xQO`(<`|~Wc$ta?Tw>^}asP>sPOr&iPxvL%gqX!*1UZJ`Q->;+uuK@b zVaOyyI`gWV=h=!7rm46LYHGj7{gxtbFpOooSI~=vOTzc-DorBUrijTBiJK}`krdKy ztGFXH^t-(7>~jerxYktM6(#Xj{+MpS^vY(OVge2Ly^2_$(->WzVGlFw^yjCWvAg*`IafVr3M{Y5%rj*-iPV` z6vhO4&`VK-q7eG%OA{pbG$OQ$vp5FncZj0bR1ufQ+~Ofpxo;SKafI}t%uRll zrRV8)lz>4+3KEDSi4=X(7{RnWlOUKOA&@&k$|y_I7*Lg|p3yp+`+`&x7nJWr6sBOj z+(bqs#lDG^W6HRE(-@JY33^;osV$Iziiy4j1bJG;S(J2NJE^?|G)3CalO@v~K+!hP zY8&WzTj>#QbW?k)mCPR#BnTQb6$<7^=RAQfbXB{KdjZK(pf;p@Y@_tbOtzyk)ULdb aLQuIJRE84|KK)a=+))~Cmu|>gn|}eTup4Ip delta 302 zcwYO=^_`jP)W2Q(7#J9g7-T1M)z!1vWaed-*fBClY4~L3m82G>B_^j9>$?{v7Gwk@ z=B4IXYlbm0usG+Zq;fGZGw|^+a53;RGB9gshH)_nG6=IX2r)85;-N?Yoz{UVH z66k&=1`Z&L5$GIlAjtz1aRt&$K$=r)I|HxwHU@!>U}d5}k`L%~pacU8P%#Hku^5mi Y22so)&LF|S0A@)7EdUuQ4b~?E0DxOK-2eap diff --git a/java/Graph Editor/bin/controllers/actions/DeleteNode.class b/java/Graph Editor/bin/controllers/actions/DeleteNode.class dissimilarity index 87% index cc3e2461de223c55c64e776795199e3738ab0fba..d48e1c1111e3ef407e3b93ae9add9b460a417536 100644 GIT binary patch literal 2252 zcwU86O;a035Pc&F1Y$AY1RTB%iG%6BG{9mZxmFAI5AYwz zF~^*8$swr!@tACP~MYpQZf<>=(~Y7s&x@j=?2p6S=GyWh-j?|yv?U;>9h_!N4Q z*^Fan(`jwzVrJ5@vYA|LL8rB&SFJps0Rx5^Tc$_jI&{;k95^He~;w%p!e#kWG zTx`iUU+go~(XXZzT5_b|vY9XPQ|OPEvQ1n(!pM4acb9IRT1@Tf9Fd-!%OGB!s=i}o zEN50>F#KN3$c92-o){tc(Q2R(Z3_NyWTO@e9~dxDA3`TS4C1mv?|aY;bfH_JX-_+a zU7acvtBr0-nC7iTW*xAkH6SkINVQfiDC7)Df~hV)m2szO^CYuD|P9yM?Y4I#uZ z9>i7FeBqcu8D4X1k!+Ghx=>+YGJ-}kl`10?!wmyB1tQ4JLVP2sT{w2zz%=d@cze1a z?+S@Rn8m#y?h>bb&%hi$p>o82xXa0hD@`l1MQxZi#aflj9%Xnd)G~h-g_&^7u80!jkg%EdFp`)yo zrxZocA|KK7mj*T@SwQZ!IGz~TEHK(Oa9ykzo*DRB;A_}r7fERD7)T<;oVhb8|7Ta2 zvfj!iti6o2Yb8zT3vUp6)xwFa**d2)jwwQ1H4iz&R*Fg zpu6WHUo^}kS) zZu4dRfPJB^#u6c_Mq~(75C5hXTL{#w0nZio;+s0MfGc+dhJ);(YN3I^M`+C zxa$pOPcS0qdP~mUU@k;!~v> ze61Za?}1_mo)K2MGsJN(^Y>Yy6DwXr0&lRk>6Zc%c|0nYLyXP4N~w)A#{^kkD{1$T z$5hE3^pZ{UD|@v}^u>97U2;`?lYmnMyj22JTLjuH0wq1x5rS;-_p}n-uf$oHjaklo zhKXjG=q_b)k6oTCNf;?6)Y$bBj(E&{fgg%U)vjm0B+^%m+{3;XIqF6Fo2?(qLYGQH L{l(Dd?y2;@6R*bK delta 300 zcwRdr*v-Oq>ff$?3=9lL46+ls8td6?GV?M^>=+rOG<-7iN>Yo`5|dMl_1%jS3o-%{ z^HOuHHNzMgSe)}yQn?tI8Tfb@xES~u8JIOR!?+j(8HCvxgcun_vFhYu5CJI_N=eO0 zElCXqlF22hDSkkc7#aA1mZkcY=1#uD=&8V308-A#AdbTYlP|Mq6aZbwz{yrTh^=mq= diff --git a/java/Graph Editor/bin/interfaces/GraphFrame$1.class b/java/Graph Editor/bin/interfaces/GraphFrame$1.class index a9874ab80ee8db59c0e16df169a688e618023fee..0a68b9c9e4b0b232c0443df662dfd2f860c31080 100644 GIT binary patch literal 1940 zcwUWE&vz456#gEGOfx)a#nKiig+i=pD@;>Q=~mCt!ohP~b6mQ1;o7}hkM~VNX7Hq7a+2Kn^1bif_uYHnZ~r{|6~H9E z)Np{I-*y7&-4~|xja#1B*_!i2O{TLNk_V>lRW*?xM0vp3oY6IgFF522@S{T4EysqPGXQDRgpo-t$QXV)0-JB{MXi;jv<`UaGK#* z#~e9^ah9P=n1qMkPV8%3sQ%dSAK9e8P?S!6K9IF=i!{gE&?B9!0^i}t#Kk9djNx4k z<1f{}^c9u2#&I4O$WZy%4(KN{uY4H71V=V5aZ!O6IWEOFyQIJ?98+=TWd&a4xQ1K= zUSXK}f5)pkmTRoiS5Y{kB0W0g4ZN>`I&1J%JdO`k7bO+0GWd{VHlFL00`nYm@m!~s z_(vS`;ZjdFmwwDqh_kM0SY$Y9x=!G^)vEM-quE=&F=JVa)X{3yGRG&lO`Y+g5>(P_ z`=2?kR+3d23eL7cI(88&YBW|E(wW!NRn=}_o#Rt%FlfTE@|G&-*-U45)fg#8Zgf*6 ze~05Ub>w#P)JLD=o`x@IY+kcBhfwyVEO$ojS_$1SIjoliCpFw>80uu=P0|cx(?^LF zs)X<=Y@wx0DV%>2|Yy7G(9Us9~=J} zeC!F1{1|fHR9N_rTD^dy6mg0b`WAXa{22P0D(rhC6_*_v-$Vb{PvB2+s)57J=-e*; zj_{EN^u$w)?&8k~G}`3JT|AHQ%Z(S&^d7D^qnTYaBF4=)<5rvTO~hDeV5G(P1;veK zxby_2J*=&_7nGs}n{COZJ=|?GvJs=)z`3@hj3g^DNo8Xqv~iPc0?p-%V wS^ApRx5}cTE!b3;?XXx~1HJvj!xO{jDVqmjX{)HwZ<5;G!A{6wVPWa@FEtC~u>b%7 delta 199 zcwU>r|A1BC)W2Q(7#J9g7}VJrm>3zvCr%XIsH)4TB9N6>mZ+bTn3t{}Tv=R_n#;o= z%^<_bz>->#SpuXqJT=26pJ&mS%+9LM#?GM3$RG;T%F4sQ$)GyfnzfM8dGcCTxnu@g z21W)ZparbVI~c?_0vSvUf!r;ar1Z0Up6fp=hh%hjKS+WdrK&{LS@?bp* V42nRSg+Ylyg+UFhpAiVb005FI95es` diff --git a/java/Graph Editor/bin/interfaces/GraphFrame$2.class b/java/Graph Editor/bin/interfaces/GraphFrame$2.class deleted file mode 100644 index b2418bc4b363356e0fac52cde0210c06ccff2b37..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcwPel00001 literal 682 zcwT)`T}vB56g}6ZS(C0Ne#QE&kcX(?mO!D^>Irr}Wr@#LIbg&g*g0QHxmF8L`GLMdoxE&rEF_NuLfHI+R zBko0%3O$ITsaC@Izd1IWr^KCv3Fiv2z|c{1Q)?0Z+O5o{mtv%h( zxtKZ7Nt)$K4^E{WX8izbgoUv|-RK*HW;-77Uecm;>afof{?fev{Z!<+%(2OPEAjaN zYBb#X_@__ssiMa0M@C=y?wH!n?jypTKbZdQH8YO$73V(2ETfRIW9KmM`2{qKE?v6nrFqmjpUuwHabeI%5WgVQKPH?HvwO7k-EfE@x&e2ZW7IJaNtwhhO3eGvp~(-_sFlm)WgJaWj! zb1r61bdqMd(!-v#qihghjW9nks2hEQ(CWlv-b-4PdJg+M;ZM!`KTbuS%N(1$w-TQZ zphm;3kAM0UpDJq1eqyx8cgNJaUmp>6pD^>_HM5TM73c1u$tYy(*g1Um{5)Dkm))W- ly_zdteBq6)qS1@dp#?1ZXiHwdj1~Ttv5Iw$3?GiX63@X`m~sFB diff --git a/java/Graph Editor/bin/interfaces/GraphFrame$4.class b/java/Graph Editor/bin/interfaces/GraphFrame$4.class deleted file mode 100644 index 93aa6413815df7c59ce0ec3d3e2bf1cf77ad7f69..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcwPel00001 literal 1025 zcwT)|e^1ju7=DgT%4&5JWw@~k;?!;^9Y~_dj0qvbm~2Q8F#6xEJ-3qXYT6F`S|%z+ z6F-0-%J|-G2?^D2^EGp z?h>xs@qDUQUFnMxpZV13k@Q06h+bVTd0#{=1NRt~+)yS_7z84UoiW+i+4j6WYLTL{ zV&OhkFY0YDG^f|QjPG+Pf|iLYYO28xQ!i%hq?A8K-GI$dxr(=i2G$r1?s;v`PZ(D1 zbe-ywlt-)nk?x8|ed<-^s^&A8@4`{!id|n_Z~j8sx{4yCE!`lDsY+KQgV0l&HW`X` zXGrY|CVINc)`Mofku7~Vo6F~T@B@$DU(R}n k5{`7%;y7}WRasB)RP$cfF%Fva&C+0O;F*qRng>1q0SK%8`2YX_ diff --git a/java/Graph Editor/bin/interfaces/GraphFrame$5.class b/java/Graph Editor/bin/interfaces/GraphFrame$5.class deleted file mode 100644 index c283b53ca60732efa58129c9913ef7c0355fb06d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcwPel00001 literal 682 zcwT)`T}vB56g}6(tchzAzv6doArDc(6(LZl2t`zc)fN;5-zJ+e8QILr?5Mx14@L07 zAK;HFy)!QOlKL?0nRCy%bMD>Ozt1lKcJVd97-2zaE6t5aWF8$GaW^F(6}lh&?B2@62B;9$JS!e;Bp;-<(T~KcOvfs>QcFXq*n!GhJKQ@S+59_8_LNq3 zpRnBik7nbNP(H|dvI@dfhyW8clu!>*MT1akJ3*bz^6Y-tmF7ZpQ%RVKvqYqq!YFqy z$g&GWSQ`CQtHXin!VmF_%b6L<9$~#5kDT++;kS6g^m)qFk936Ed3J9Sd8AyD`unrn z&c)23PSPw_x_>I|AnOHKBg~Hs>PBBDG~4lz_mUQ+Q-^(?@I>?e4^olmGRGI*TZzv& zsL^oiOKT3S>S{RIUflJIR2Zjq449u9wAa5au0z<}D4tWX|yTd_O$XC1@2!`2q zGImB}W9O*|L?U*n zONz~sh3i;8DY?eboLurWzQ;omv`kb{Q$4>9=(@P zcUX;MT>PqiE-6f(sOa~YCCegPp_g$*<8vsEv%El7`<5HuVEx4WZ&cro%*A8e_<>t* oPG|jq5o?2(O>AMAVcUGKZU_jvw; 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 diff --git a/java/Graph Editor/bin/interfaces/GraphPanel.class b/java/Graph Editor/bin/interfaces/GraphPanel.class dissimilarity index 90% index 48237bbe4117cf1d27712b7ff11db65780b98611..db66f63ed8768acc1167c7ebb6c00be75a24398c 100644 GIT binary patch literal 3919 zcwU88`(GSa75@&q%aY|1-cX|CQBwjemKK{nASDkVfyk1yBm|PwX4oB;A{yTJPChYxq|-h1vj=llJhb7$WC z&l@)Y^x*Gdlo@EW(~gy$G2>RQ`%u_x4jZT%$fR?QnRX`3)S?xt9~#}CJS%t0GMu!JRj}MW7(Y3pM;&X?>t#}uCpw9zl{A@CtSxhGguzkI?#4&K2 zfiTuva|hdRdJ!cM`1In4MgHarz_}I!xG5%DBLU9HuJaT zSgSZ9=*6Ben8dcXiKMU_wL*Kp!d{U!oV6BALZSfU4(X4X3m)K#q!*Yi(B4t92y19E zm^GJ%&6}KYJL#0dX*@*IlWVKKu9%Y5CV3cU7-z`W25$<} z(mPTk+E`pC6fDfR`g!QszgmJ>1zWZ@ackJJle3OEKdX=eK~_lq53*vY5!+fCo4}HC z18sysCkZM)lt@}RsZ3T@4vrgDFY2l}wWe%jy-)6n^9oD)UWh+prXzR+7s7ay<+R>d z;r;l4>vN1-(thiG@;Y^_Ws-CePlWL}8Qi$5@IgTxq?<`GOvvz*!iQE@r(|JPxcG>| zGnxwlCl>=Hwp=*%CBTp$n=Zsc%BRGB#d)2A=A&fhVO)}aW;l02f=WMsTH!PJtN~@` z_9qgo#UUMpQl1nFFDtwt6b7Q>`m2@)Uksz7Br0`wIJhU`x zJC-p2J%v{UYQ)a1rY?rp6uz$wr&H_@QRj7qyswT_s+|6T!VmF=d#{X{^W>;uwTX&5 zS`jHM5b_om5~jn{q8ndBa@+P5rEo+Cbzj70HhG7C`>a3X?%%og-ttZp z<9KE<8@CSHa+g;Z-c+}XEp{-u0RKZAw;+rP&NuO+rwkGP^98Htd>ipui6B1%YH3l& zU$Z<>#^?6V>!|OnHU3d+JeNmP=QV7}b20ilc1An%XnR$A=;F8qg z!3ED(Tjy)oc@vfLV8(YBa_34`i@zh7bnbgZr931lwJ50+}|B%<4hpp7fLIBPG8 z-{!|}^RVpGUJOZPKMr__bnC=`kYw> z)+_{_%;SC0K!CG2|C4#l6%=uU-a~iyl8yU{SZVfyHY1G;9hXVRxB(1BUZqa5LPj3v zV$o|@WSl_%Rh;Z^_LnWpAM&j87Q7@gLu@x zth*E#k+QsrL3!lysmtgkMV})@?!xC|(Jq4SauM^f(&b`xx4-N@zDnc;z_&6*@N=sc zF*f8FQ#!)+qm=If3~@e8-38!wHvu2uhzD>x%l;dFA5q&}zEE~i<;5%`9Jx}HSh~x@G0+tYV3?& z$1i30wG6+J;dg~jYtk9m9OoG8EGss}ik&a&xJEy_MlU-9zsDcEFsErFvQ|Y!oGS>g rz3$vbK1V=V7N=8G2UWh?D*O?D(pOX!{*1qPbr6tlHt<)S>EHeb9BpOz literal 3697 zcwU88`&%4m6@G`EWyofdKwxQz!EP=hy9=QqHdUx;g^+|~fe3+yw8jj(15C2)uDb&y zv9;Btt!*`0t(V4IqcvFXjqPF^8(S|`>;3*e_?yq;4?f=Nd%hW1$gYpiJ~MOXeBZgf z=RM!fYyWxiI)G06*+7+su#<7^{G^q%3mpgYR&M%;m9f(XbPXF%S##Ezj>5c?nd&&? z>#Kcz$E@q5JBB6-c7D#zYpA8*Sm`l4UvRRS(f)lJv_l%!^=2~#*UGqKR(jSB*7x<@ zasTAlB@MxuY|2h+s81-t4?ZArH?;*jZ6{rNqP?5XrqdE*Ya+S)R_GWh-$Kjk+ntQ# z?$yxPTETO4OoQG_F@yjbOw=N*AE5$BxEBwPFYqho9E1~ePk zqG7$N+?sbgdb8FAS*-VNBw%)i~ z;%Io22@~rKyqPesOrN;A_L&e`&|o0OU@I5I_BE-GfnOrtwXIwQw%N$kaPO{MLje})kLZ}~{pLSeknZl$2 zmQYt_U}8%6FQ6)(%TPEbPT@3_tmrN$iM+` zV)0=U7x57dA*WDk3UN6uSwC*#W0G|sZ>Qw_2@{`C4VXxiO%m%E7@HIOl?Nok9x`iPt7;odFwpEvOZJjL*0@99g^yK=Lj&as-3v%8!h{u~j+ z`U(x8ox`i2K-ua%shRT;V9P2(&fK#Tr&tbmXjubK8+eAN{A?~|xwMa$A1^Xi-7C@_ zQs#=d&*D1y#4FOh8aM0h z7H2;+@gw}05LmgKEq^8LmAsaz{6xFO#mgc56t5Zh8Jkq0R1-g!Y>k|#(is`cUz+%p z92!R6R;NS_exspt|Ip~su1GdBVV`Cu5wA~?ykqAgr4xFm*Q$tRWx68lyOp2f|4(D( zwt4I7q%Lb9sX3CJ%_r^sj+~ntR)mnf*vdQuyn?)MhJhN&Yxt#8g%B_Pt16jCHlNj8 zt3@5}8^P}szSmHDCANtASe^E_I_;xHG{&xCa}kkP{CVuShL-U~v<~>sLI2sMUqf^} z_!8d&Z6o7)`^X~VUBQyFoysO%X{$?GYR2_8r8VN!E3C(ZTq`~+gBqO2^&YU0eiP37F^ zd0ftUo1gPLl?QDD#bE;BC9qF5nnn^?S2+8P6Ocs1&-l zLtoyZuijC_Ll**CbKCXHuV3*3J~9~Cqc7mz_ORZ`Abw^|LFGr;(v{pEWRCLu(34ol zZJeOw0z#BN{=W@AxpMhQwWl_8Qf;ekVxZ4m(6zAM&TP(?C~}G<0VRWQhDp?B(sBoB z8YMw@lA5=&?*~ZCW2B@*=^WqhJwYv=`b^c5W8i8qYj;VAxs zQT!ESS_p@=28^qQ-6O|{7G9zprOWstTh@%f<4bs&t!}|d4%HRrx0C)B7*A&w2k{j= zL%v+Z!}uzt03OGAwNGdK9KOc9gNnE@RR0@M17FwviLuu?(LoN9ffO|czCpVD3wsQ- zRR4n`ui=~cme0mZ^dto9iA%4pVEa{k`x=Vl8^61V7dcli74d^2UM=D$Hq)$ diff --git a/java/Graph Editor/bin/models/GraphEdge.class b/java/Graph Editor/bin/models/GraphEdge.class index 78b97f900cd42fe54ce565eca40a7136c536acce..00399a94f1ea6ea1cda5a9349431aa7885de4eab 100644 GIT binary patch delta 510 zcwTK#Jx{`55Pq&N2(%*D099!%%7;+4I-9s?qKR?P#Dtg_L?A{Jjj}nQiSZ9~a&U0b zg#i*j5(nJf{1p!V1*2X|gNw^Och~3R`ks$`gypyImp%X+R!>$aN*Gz%Yu48r1g+>S zQX*2S5a@`I;3-w0eV$eb(T!HMcCc1G-mLB()(N3zz2ypBS*7Gs!{YR$#^j1)QiDRy z6|K^R^G-YMdGMMugVr;WJ#Hk#xXO&cI08@+=WcXB;*H8kn8Xy<2=`~q6pW@=xQA*z zK-2B=9fE<*r9`?r_iukbMTaTEvre%MkmQ;|tPPDllQ1yhvYNXkePr zRzp;uOYj^!tS~du)D+XG0$ITodJctw&UJKo@^MZVis98 zH9Z+A+~$z*Q=T*uX#ed(i=xIy80!BOA delta 176 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 diff --git a/java/Graph Editor/bin/models/GraphVertex.class b/java/Graph Editor/bin/models/GraphVertex.class dissimilarity index 77% index 444c754215890e1789bd6d7d73a5ff2ec64cb849..1bd8b8d12093e614c1d550491a0dd6285398891d 100644 GIT binary patch literal 2358 zcwTi>Yf~C$6n<7fV6%83#&{22Y5*Ik8gtVa4OXQwrVS}x`k`52g>7+hV2$Q?w0|Je zuldlU5^e70QmGefan%t@A z=f$j1v5hM~yb6YX(%gRMgR6o=&?c{4CXH!hcpyNQ*DACf$D^QLVsAe_eY9meQF&A65AT(8dMT?{OkT@PuU#~&%-dND@%FBnmT9jmxE1YG9m}fl;I@V#j0hQ7 z<{#7GL$4nbMA%u2igDcLusa(32n1<4tzibU#8ouRLeZuQ)4ctKhI!uhU7C5js9;zs z5VmG=x@8#^At8nZKjI1oJB~GciF*qCmT_gLEn8?5*hvjvF}8BWt0fJ~V)dTERx~`o zL$aK+*h4ZW8gsidg?zi|A}RpBvAl7rUzF^GO2s~9k8Y9K1;ak94@Wdq>#Jy*%TSQg zu*FWQw4W*x72hrg9kI_T4%yX^=8%4?Y@4U=>)mBkNJxM%59&@)voxm4rGg+WcN^By zUa-(yd(G-54ZdhP%}o@_*m~~gm-@MEjvJKPY&385IF_a1w4@ivRf5?U4ehTsW@@H< zQOOzGCMOTHv{Hgy!ZcOjq3_3o9_|sE^>7o2k$RTKL5jEmjs8QlO46v%=!<_s-$xNP zK>xjBGep4D11o{7Y7d|6eL!vodY)9QHd7uj8JCSd!NhV9}qDXuqNPmi&N||Eyd7VtanvHGcz}GCxhx ztTn{><80|?JZ~1#CweVGsY&qn-gGA9I1}P`K*;#IE9{~h>@vaLC)kxPu*(8=nm=d> zyDF;Zjxm&V+RWgM z6u2#YQ{!Y>pPOk}dSDKy6%JcWQym%=-$NB9W$_T559jFbZI1om`fwgN4`)-5cr;xE U{YZIlNs!(}P~$y36nRJg0TYr)`v3p{ delta 822 zcwTjq&uSA<6vn?h|2i|BhWwi*F|{UGZDwLJrO`%B8bVsFvF$K%u}_sj%;t;U$c->LWAC^W=iAx`&A;54o0;l9`M{EL>z%pSqp zC!GqSwA!=-X&A`xUz)2Hae==vCgY_K!xn>P08>2BU3D%j^Lu)XLn@qQ6;hXCp&7YRGphWterAdjPY|0~{{Yhm zDD7e4Z^(a))mt@8qfXxUDGBB4b=i((b5LCGa7^K~VzvT=v1_* z9JNy8*I-M{*RewHU}kIOm@s`XiQxv^fkO>q2_Fr=_z{`Wr?5(A){ePt4DV`C#gLQQ H^32UYL9=9q diff --git a/java/Graph Editor/src/controllers/SelectionController.java b/java/Graph Editor/src/controllers/SelectionController.java index 99210cd..d7bb51c 100644 --- a/java/Graph Editor/src/controllers/SelectionController.java +++ b/java/Graph Editor/src/controllers/SelectionController.java @@ -71,7 +71,6 @@ public class SelectionController implements MouseListener,MouseMotionListener,Ke } private void finishAddingEdge(){ - //this.getModel().addEdge(new GraphEdge(edgeObject1,this.getSelectedVertex())); frame.addAction(new AddEdge(edgeObject1,this.getSelectedVertex(),this)); isAddingEdge = false; } @@ -95,7 +94,7 @@ public class SelectionController implements MouseListener,MouseMotionListener,Ke finishAddingEdge(); } }else{ - isAddingEdge = false; // Didnt click object, cancel action + isAddingEdge = false; // Didn't click object, cancel action } } public GraphVertex getSelectedVertex() @@ -168,11 +167,9 @@ public class SelectionController implements MouseListener,MouseMotionListener,Ke } public void mouseEntered(MouseEvent arg0) { - // TODO Auto-generated method stub } public void mouseExited(MouseEvent arg0) { - // TODO Auto-generated method stub } public void mousePressed(MouseEvent arg0) { @@ -187,7 +184,6 @@ public class SelectionController implements MouseListener,MouseMotionListener,Ke public void mouseReleased(MouseEvent arg0) { if(selectedObject != null){ - //End Drag if(arg0.getX() != mouseClickX || arg0.getY() != mouseClickY){ int newX = this.getSelectedVertex().getX(); int newY = this.getSelectedVertex().getY(); @@ -213,7 +209,7 @@ public class SelectionController implements MouseListener,MouseMotionListener,Ke this.mouseX = arg0.getX(); this.mouseY = arg0.getY(); if(this.isAddingEdge){ - this.object.repaint();// Repaint the line to the mouse cursor. + this.object.repaint(); } } diff --git a/java/Graph Editor/src/interfaces/GraphFrame.java b/java/Graph Editor/src/interfaces/GraphFrame.java index 1951826..739642e 100644 --- a/java/Graph Editor/src/interfaces/GraphFrame.java +++ b/java/Graph Editor/src/interfaces/GraphFrame.java @@ -15,6 +15,7 @@ import javax.swing.undo.*; public class GraphFrame extends JFrame { private static final long serialVersionUID = -7929100929760152271L; + private SelectionController selectionController; private GraphPanel panel; private UndoManager undoManager; @@ -22,25 +23,17 @@ public class GraphFrame extends JFrame { private JMenu menuOptionFile; private JMenu menuOptionEdit; - private JMenuItem menuOptionFileClose; private JMenuItem menuOptionFileOpen; - private SelectionController selectionController; - private ActionListener onMenuFileClose; - private ActionListener onMenuFileOpen; + private JMenuItem menuOptionFileSave; + private JMenuItem menuOptionFileClose; private JMenuItem menuOptionEditUndo; - private JMenuItem menuOptionsEditRedo; + private JMenuItem menuOptionEditRedo; private JMenuItem menuOptionEditAddNode; private JMenuItem menuOptionEditAddEdge; private JMenuItem menuOptionEditRemoveNode; - private JMenuItem menuOptionFileSave; - private ActionListener onMenuFileSave; - private ActionListener onMenuEditUndo; - private ActionListener onMenuEditRedo; - private ActionListener onMenuEditAddNode; - private ActionListener onMenuEditAddEdge; - private ActionListener onMenuEditDeleteNode; + private ActionListener actionListener; public GraphFrame(GraphModel model){ @@ -72,69 +65,48 @@ public class GraphFrame extends JFrame { menuOptionEditRemoveNode = new JMenuItem("Delete Node",KeyEvent.VK_D); menuOptionEditRemoveNode.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_DELETE,Event.SHIFT_MASK)); - menuOptionsEditRedo = new JMenuItem("Herhalen",KeyEvent.VK_R); - menuOptionsEditRedo.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_R,Event.CTRL_MASK)); + menuOptionEditRedo = new JMenuItem("Herhalen",KeyEvent.VK_R); + menuOptionEditRedo.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_R,Event.CTRL_MASK)); menuOptionFileSave = new JMenuItem("Opslaan",KeyEvent.VK_S); menuOptionFileSave.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_S,Event.CTRL_MASK)); - onMenuFileSave = new ActionListener(){ - public void actionPerformed(ActionEvent arg0) { - saveFile(); - } - }; - - - onMenuFileClose = new ActionListener(){ - public void actionPerformed(ActionEvent arg0) { - System.exit(0); // TODO Werkt niet goed? - } - }; - onMenuFileOpen = new ActionListener(){ + actionListener = new ActionListener(){ public void actionPerformed(ActionEvent arg0) { - openFile(); - } - }; - onMenuEditUndo = new ActionListener(){ - public void actionPerformed(ActionEvent arg0) { - undoManager.undo(); - notifyUndoManagerChanged(); - } - }; - onMenuEditAddNode = new ActionListener(){ - public void actionPerformed(ActionEvent arg0) { - GraphFrame.this.undoManager.addEdit(new AddNode(GraphFrame.this.selectionController)); - notifyUndoManagerChanged(); - } - }; - onMenuEditAddEdge = new ActionListener(){ - public void actionPerformed(ActionEvent arg0) { - selectionController.doAddEdge(); - notifyUndoManagerChanged(); + if(arg0.getSource() == menuOptionFileSave) + saveFile(); + else if(arg0.getSource() == menuOptionFileClose) + System.exit(0); + else if(arg0.getSource() == menuOptionFileOpen) + openFile(); + else if(arg0.getSource() == menuOptionEditUndo) { + undoManager.undo(); + notifyUndoManagerChanged(); + } else if (arg0.getSource() == menuOptionEditRedo) { + undoManager.redo(); + notifyUndoManagerChanged(); + } else if(arg0.getSource() == menuOptionEditAddNode) { + GraphFrame.this.undoManager.addEdit(new AddNode(GraphFrame.this.selectionController)); + notifyUndoManagerChanged(); + } else if(arg0.getSource() == menuOptionEditAddEdge) { + selectionController.doAddEdge(); + notifyUndoManagerChanged(); + } else if(arg0.getSource() == menuOptionEditRemoveNode) { + undoManager.addEdit(new DeleteNode(selectionController)); + notifyUndoManagerChanged(); + } } }; - onMenuEditDeleteNode = new ActionListener(){ - public void actionPerformed(ActionEvent arg0){ - undoManager.addEdit(new DeleteNode(selectionController)); - notifyUndoManagerChanged(); - } - }; - onMenuEditRedo = new ActionListener(){ - public void actionPerformed(ActionEvent arg0){ - undoManager.redo(); - notifyUndoManagerChanged(); - } - }; + menuOptionFileOpen.addActionListener(actionListener); + menuOptionFileSave.addActionListener(actionListener); + menuOptionFileClose.addActionListener(actionListener); - menuOptionFileClose.addActionListener(onMenuFileClose); - menuOptionEditAddNode.addActionListener(onMenuEditAddNode); - menuOptionEditAddEdge.addActionListener(onMenuEditAddEdge); - menuOptionEditUndo.addActionListener(onMenuEditUndo); - menuOptionFileOpen.addActionListener(onMenuFileOpen); - menuOptionEditRemoveNode.addActionListener(onMenuEditDeleteNode); - menuOptionsEditRedo.addActionListener(onMenuEditRedo); - menuOptionFileSave.addActionListener(onMenuFileSave); + menuOptionEditAddNode.addActionListener(actionListener); + menuOptionEditAddEdge.addActionListener(actionListener); + menuOptionEditUndo.addActionListener(actionListener); + menuOptionEditRedo.addActionListener(actionListener); + menuOptionEditRemoveNode.addActionListener(actionListener); menuOptionFile.add(menuOptionFileOpen); menuOptionFile.add(menuOptionFileSave); @@ -145,7 +117,7 @@ public class GraphFrame extends JFrame { menuOptionEdit.add(menuOptionEditAddEdge); menuOptionEdit.addSeparator(); menuOptionEdit.add(menuOptionEditUndo); - menuOptionEdit.add(menuOptionsEditRedo); + menuOptionEdit.add(menuOptionEditRedo); menuOptionEdit.add(menuOptionEditRemoveNode); menubar.add(menuOptionFile); @@ -170,10 +142,10 @@ public class GraphFrame extends JFrame { } private void notifyUndoManagerChanged(){ - menuOptionsEditRedo.setEnabled(undoManager.canRedo()); + menuOptionEditRedo.setEnabled(undoManager.canRedo()); menuOptionEditUndo.setEnabled(undoManager.canUndo()); - menuOptionsEditRedo.setText(this.undoManager.getRedoPresentationName()); + menuOptionEditRedo.setText(this.undoManager.getRedoPresentationName()); menuOptionEditUndo.setText(this.undoManager.getUndoPresentationName()); } @@ -185,12 +157,9 @@ public class GraphFrame extends JFrame { this.undoManager.discardAllEdits(); notifyUndoManagerChanged(); } catch (Exception e) { - JOptionPane - .showMessageDialog( - this, - "An error occured trying to read the input file. \r\n" + e - .getMessage(), "Error", - JOptionPane.ERROR_MESSAGE); + JOptionPane.showMessageDialog(this, + "An error occured trying to read the input file. \r\n" + e.getMessage(), + "Error", JOptionPane.ERROR_MESSAGE); } } @@ -199,12 +168,14 @@ public class GraphFrame extends JFrame { final JFileChooser fc = new JFileChooser(); int returnVal = fc.showSaveDialog(this); if(returnVal == JFileChooser.APPROVE_OPTION){ - File file = fc.getSelectedFile(); - try{ - panel.getModel().writeToFile(file); - }catch(Exception e){ - JOptionPane.showMessageDialog(this, (String)("An error occured trying to save the current state to a file. \r\n" + e.getMessage()) , "Error",JOptionPane.ERROR_MESSAGE ); - } + File file = fc.getSelectedFile(); + try{ + panel.getModel().writeToFile(file); + }catch(Exception e){ + JOptionPane.showMessageDialog(this, + "An error occured trying to save the current state to a file. \r\n" + e.getMessage() , + "Error", JOptionPane.ERROR_MESSAGE); + } } } diff --git a/java/Graph Editor/src/models/GraphModel.java b/java/Graph Editor/src/models/GraphModel.java index 3bcd025..4aec25f 100644 --- a/java/Graph Editor/src/models/GraphModel.java +++ b/java/Graph Editor/src/models/GraphModel.java @@ -72,6 +72,7 @@ public class GraphModel extends Observable implements Observer{ } public void saveModel() throws IOException { + System.out.println("Saving model..."); PrintWriter pw = new PrintWriter(new FileWriter("file.graph")); pw.println(vertexes.size() + "," + edges.size()); for(int i=0; i < vertexes.size(); i++) { @@ -92,19 +93,15 @@ public class GraphModel extends Observable implements Observer{ //File IO Code public void writeToFile(File file) throws Exception - { - FileOutputStream fos = new FileOutputStream(file); - OutputStreamWriter out = new OutputStreamWriter(fos, "UTF-8"); + { + OutputStreamWriter out = new OutputStreamWriter(new FileOutputStream(file), "UTF-8"); out.write(vertexes.size() + " " + edges.size() + "\r\n"); for(int i=0; i < vertexes.size(); i++) out.write(vertexes.get(i).getX() + " " + vertexes.get(i).getY() + " " + vertexes.get(i).getWidth() + " " + vertexes.get(i).getHeight() +" "+ vertexes.get(i).getName() + "\r\n"); for(int i=0; i < edges.size(); i++) - out.write(vertexes.indexOf(edges.get(i).getEdge(false)) + " " + vertexes.indexOf(edges.get(i).getEdge(true)) + "\r\n"); - out.flush(); + out.write(vertexes.indexOf(edges.get(i).getEdge(true)) + " " + vertexes.indexOf(edges.get(i).getEdge(false)) + "\r\n"); out.close(); - fos.flush(); - fos.close(); } -- 2.11.4.GIT