From d70a84d6da68f24e361a57db0fdafb31c5a85a37 Mon Sep 17 00:00:00 2001 From: RobertBColton Date: Sun, 23 Aug 2015 20:42:30 -0400 Subject: [PATCH] Cleanup Fix line endings and switch to free icons. --- README.md | 6 +++--- src/main/java/org/dockfx/DockNode.java | 12 ++++-------- src/main/java/org/dockfx/DockPane.java | 2 +- src/main/resources/org/dockfx/bottom.png | Bin 407 -> 775 bytes src/main/resources/org/dockfx/center.png | Bin 467 -> 945 bytes src/main/resources/org/dockfx/demo/docknode.png | Bin 519 -> 550 bytes src/main/resources/org/dockfx/left.png | Bin 403 -> 820 bytes src/main/resources/org/dockfx/right.png | Bin 441 -> 837 bytes src/main/resources/org/dockfx/top.png | Bin 403 -> 772 bytes 9 files changed, 8 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index fcb6d78..9f28c3e 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # DockFX - - + +
@@ -27,7 +27,7 @@ Features to be added in a to be determined future version: You can obtain a binary of the latest jar from the [releases](https://github.com/RobertBColton/DockFX/releases) page. The library itself includes a demo as the main class for testing purposes. This demo is always included for the time being as it is very small and not expected to get much bigger. An HTML readme file is included next to the jar but does not need to be distributed with the library. The library and the demo will also work regardless of whether the readme HTML file exists. You should be able to add the library to your class path and use it like any normal library. ## Compiling from Source -The project was originally written in the Eclipse IDE but is also configured for Apache Maven. The project will continue to facilitate development with both command line tools and the Eclipse IDE. +The project was originally written in the Eclipse IDE but is also configured for Apache Maven. The project will continue to facilitate development with both command line tools and the Eclipse IDE. Default icons are included from the [Calico icon set](https://github.com/enigma-dev/Calico-Icon) for the dock indicators and title bar. ## Contributing Adaptations of the project are welcome but you are encouraged to send fixes upstream to the master repository. I use the [Google Java style conventions](https://github.com/google/styleguide) which you can download an Eclipse plugin for. After importing the Eclipse formatter you can use CTRL+SHIFT+F to run the formatter on your code. It is requested that commits sent to this repository follow these conventions. Please see the following [link](https://github.com/HPI-Information-Systems/Metanome/wiki/Installing-the-google-styleguide-settings-in-intellij-and-eclipse) for instructions on configuring the Google style conventions with the Eclipse or IntelliJ IDE. diff --git a/src/main/java/org/dockfx/DockNode.java b/src/main/java/org/dockfx/DockNode.java index 595bc28..3dc097d 100644 --- a/src/main/java/org/dockfx/DockNode.java +++ b/src/main/java/org/dockfx/DockNode.java @@ -106,12 +106,10 @@ protected void invalidated() { } stage.setMaximized(get()); - - // TODO: This is a work around to fill the screen bounds and not - // overlap the task bar when the window is undecorated as in - // Visual Studio. Perhaps file a bug against JavaFX, though - // a similar work around needs applied for JFrame in Swing. - // http://bugs.java.com/bugdatabase/view_bug.do?bug_id=4737788 + + // TODO: This is a work around to fill the screen bounds and not overlap the task bar when + // the window is undecorated as in Visual Studio. A similar work around needs applied for + // JFrame in Swing. http://bugs.java.com/bugdatabase/view_bug.do?bug_id=4737788 // Bug report filed: // https://bugs.openjdk.java.net/browse/JDK-8133330 if (this.get()) { @@ -777,7 +775,5 @@ public void handle(MouseEvent event) { event.consume(); } } - } - } diff --git a/src/main/java/org/dockfx/DockPane.java b/src/main/java/org/dockfx/DockPane.java index 5e6ed98..858537e 100644 --- a/src/main/java/org/dockfx/DockPane.java +++ b/src/main/java/org/dockfx/DockPane.java @@ -292,7 +292,7 @@ public final Timeline getDockAreaStrokeTimeline() { * @return The URL of the default style sheet used by DockFX. */ public final static String getDefaultUserAgentStyleheet() { - return DockPane.class.getResource("Default.css").toExternalForm(); + return DockPane.class.getResource("default.css").toExternalForm(); } /** diff --git a/src/main/resources/org/dockfx/bottom.png b/src/main/resources/org/dockfx/bottom.png index 6fd515adc3d4038c069f1daa452b26d098facd8d..2c895cfc6c31c1c454447d8b4258c3fc6be7ebc2 100644 GIT binary patch literal 775 zcmV+i1Ni)jP)<~zYhg)VLCMtP-aSmX00_w8?0yyS{sbkwP@;cZ7Sd%(6f@P;-qNg;!Zm`cr7`-<8S(GhT`WewBwkMeWdNZ0^SA7ZUD}Kc#^_ZT8MM|> zfDnK&hI3=x0EkFq6cB3BZ_bJ$j9;9^0su%P61c9rCR2mKAhF(9H7^6`GJxy4jE;`3 z3BYk2#A8mCfr!xG-;d)sD5b0iXqa1RO*9%MpUXD_07N1Yz}DUCg&6VG+t-VFiA02C zGKtoDO%erzL3+0J_%qO2uZsuXCM^%*@%XxUkj-T404iTmI2;E2&w!=BpYC<%r%@t- znWtabKhi@wUu5RVdz6AxW4lNf7PQK=$JEyq@(n%=no(vqnPAPCcs-_;eZM5~NgZ{D>4 z3yUQSIN&we$t_sjcjp(^JN2bZe?^J zG%heMHD!e|WdHyH6-h)vR7gwhkt>sfFc?MmZ`C3rk=RINWNai7iA7c-v6aY3EE0*l zn=fhF?1a#zrCqak=1g9flg#i%k*bBPS_m@=)j-GwrK~MnRN!TWqEyH^A;AjqlUyLn zOPmJ>-h0?c?$fbjcA(qp}Uf?BOv?d8< zL>3UqkIcV(HNTc;yibzKu9q`*j@ZgBIfXi&N7*f>?CD+AfA~Y6NhH_fY&Z3^xbemH zRqf=1IXsHb$}f7d2N&%M_w}PO?yt&YTzPvQl92bqWT8Vp4+-~E9b!}71;vnXKh+`V zERxgaQLM|m;a+-S&QA54UT!XlUhbh=pPh#Qz&Cc#lBJ@!Yw`d9002ovPDHLkV1jJl BtiS*O diff --git a/src/main/resources/org/dockfx/center.png b/src/main/resources/org/dockfx/center.png index 9a14e210d8da3f0acb70a63accf65017c19e8e14..260f6d03ba10c4af836cb3b7973869a06eb34165 100644 GIT binary patch literal 945 zcmV;i15W&jP) z@#h&-u*>3p@a^GUUoQ4gWTbo5@`zht3iJ7)#CZbG*o$ zW2#hLw@lbFJQ00_iKzmGJ9lv$7uRucN-j&nuyde?7yG+Wlrt0GuyfN;KrRo!2p8i; z_6&3pjf4XevW0mLetm`EeK9&amIlUVvNpqCT;Tc5QBIA2#kHBsj8FZ_yW5Y|0f)_fsGIpbB_U$4%ZgDTmLr2aBB?9>F$27^=BK;dWd7*C&r+)gI zsf^8YPj|9)b2mSX{zdZUZDPG$4D_$#s?W^fozKWbE-(SgN9*xrVRFu@5a{S^gOsIp%ns)xk!`PV&#;hQ!w*nr7 zDiQ&_HQ4J(0jPqgCy#iny{PKvD}7%gRTS7e_)NfuP*oy@RA=Q7(r1^Urtudtgll14QqWr)`5&(O|@pQq%FMQV)0K&Q*giP$5%!g8Hjic z_6+tm>gylVrV?pTPJq2HKihbeaOpu;TFtEOj*J3NkO()5x6TH&5lzm&Hl(I=m*(7gliEv=YYRD%^Oy>d&EP(w- z&gv)cY-xQ{7r3!apLgKEr=#~i6N2bZe?^J zG%heMHD!e|WdHyHQAtEWR5(wyRV|OiAQbH1I=iy6vbGY5#3GTEwMZm#ZRJX2Eplb$ z-q5$DU(hzW9GOfWkD1{m>_<^OIw7@Cnu8^{;YM82-1gct;H3z78R4kxm zKV^f2kkUQJ37@$bl?{;k4e-tbtQ{IP)Y1_Hm2f400pAo7iAfzjWLrG54F#DWGrlRG zzpW+3`LSWG8{UEah$ia5shTvT-=t6rX8}~)V7T_PoEvhyNdcd$lN`O7S$5kz|Hmv> zh8%BF=<%}Z%+cYEj-uT**-X6API1mt5xuEdVsV2Hvz)3EeEr#-iV%JJJ%VwQa(tsG zx?D@j+8>z|cW^Naovv51Q{cDO`*1A(%{j~Ol&6K+=NVVye zGGMxfI#TMWkD9_chafIA23tc2jlMAkHvAu;gF9iM4(g?2%r7xayn8u@%EbTx002ov JPDHLkV1fjT#LoZ# diff --git a/src/main/resources/org/dockfx/demo/docknode.png b/src/main/resources/org/dockfx/demo/docknode.png index b4aaad9a45c9abbee2d47611a6963101b64a8023..4a73651182083b41f84252ad6361c1abd34a8a64 100644 GIT binary patch delta 524 zcmV+n0`vWc1f~R#C4X~5NmK|32nc)#WQYI&010qNS#tmY4#WTe4#WYKD-Ig~000?u zMObuGZ)S9NVRB^vcXxL#X>MzCV_|S*E^l&Yo9;Xs0004_NklA*qI43$%Wt9OppOUW?eu> z!OFwzz+~4tIWeG3JKor!9)^q*3fx{@<<0(UO4TBgkPJ!Oo4n79M=vo~f!efs7&5-J z#M#ac0Htb?>FHZNl|P3EeLYCIj@4?(UQWClvz|2uIDc}YN~P~|FCd1xIVraxe^$^2 zxJ~Rl$?)tf7v(a;`8)vmAkUYum^4rlg`0&KWX?bEz1EM)w|e%@+FDPwR}1TX3IM)V z&dH=x=Lz5{ik9E)9&R_Tnpu-jdvM|bil4AMOu|oj-_>kA`6c~d>?c_%_a$62OA`P9 O002ovP6b4+LSTZ6Y3R5B delta 492 zcmVeSaefwW^{L9a%BKPWN%_+AW3au zXJt}lVPtu6$z?nM00EgvL_t&-8KuF`i;ZC%#^KNN_Mn)f%tDevel8Uo4J*k?DQ0aJ z^A9LnrL3%3C~WN5$YQc$H%pW$gGLQyL1JpkIcMJYd*7ZXj(=uhYBblCY_k!WV(Rv* zE5Kgh6mT4DOhTq<5={b0C|KH*y>MjD_7lily?8WXo6EOe-t~XF`RI)cGQXXsxIg=y z5wo`GiE-Y3S{hPhDtQ-w9NM{sDkc8u-IpO%f6#8G$P~7>QW$vub;x=+B2i=t%b8+& zVx09-h$>T9PJa}W*Pk(vkYVP=SQ%7gX+6s4|5yBQ}3^T_6XQZDbP)D!Ze~6lLmUAW=M>U1X#;wvB}kA8Ff` zm9{0iph*ptWm9B|kQRacb9XMV+Jj3ES&Qu-6qzdYWb)ec!?sT%?T|XKumYZ?f?HY_L`B!3db7F`NE)>w68%fgn# zhOqLHCQWF9h$wBOyta{$YPGKweYtmLEc(9A`@)V%PUf6*&zb-HXXeg<|6M$QD|bJg zjdk4~n zmAwu#i}BCzhkyHlB>=#m{5o6JOP7(ND!*Z*h)5iu4nS48aJU%&Gb`5yMnPBFbF>*} zu0F;A0C+g`g-odI+nwa;%SlGZXV|zd!Tvq1Jb5v}$oLE$Z3%jJudZplSRw!_O8`Bc z%|!hs21e$IEKjhdV?7anC69*F1oe%yZD?ojj#kLpsDB883lhmOFf-nzrt=>R+ysje ziZYU#&Ks-+k`pIHgReicrDHv6hA4eKTVp#}JXS3W`RfB$LS!09j(t z6t5=~Luvpt`Y{YcMCk7BE(6G9GNk9yH7`IdPTZ@tiu`{7kcc<1DC&4#+LD`AG*oU2Ra%8proBDw)J3D*dhiAV&K=o75DGW% zy#}D~=uUq8^f9DrdDd(dtt&k+<_@# oFe55um;OW|o;UUPxBf->1qGS`RaB}?uK)l507*qoM6N<$f`ck?MF0Q* delta 389 zcmV;00eb$l29pDj7k?KB1^@s65h0H)00004XF*Lt006O%3;baP00009a7bBm000ib z000ib0l1NC?EnA(7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%heMHD!e|WdHyH5lKWr zR7gw3l_9T#FcgLPTeHZ@N^E6iWo;!ASvxt2oSj5gVv$JX*?(?Vc#MqKvUJ%=zTAei z_vGAAD84RUS}0?o&H1Hzw1w0Sgd%DPS)-B$Txjr0gH`Geu26FMgh`y30QL3;_BsWy zsS}!Zg1L-O&Lfl^JhJH_>K>JGOC`8=V5;*h2J@jU)MSR5tQ)PH@yB{@TCP|O+HP35 z25xRZ*N+}Y41SZZNAzmYc2NV`dqmL$H&;0 z27#jq=-I~xu>^EB-QdG}kZurI8>HTYY$Kw*d&)ARy##xTCOC2r-YII3H^DEyrr8n@ j?9}+0oAB%ZmWtvIVi| zK~zYI)s@X}Okotpe|M%-Vy2xU5sKERG%cZoMl38yXxJcZ#DCVuQb_mmA&AHLd9X3_qY%bHS-JM50nXj)bz)1b*l_2QdH$PiWCt^12h1rDrXP00$^rQG%#i{?pgrN zIC1GA0fO?|h$pFRyg&Gvk|?{kt>N+DH18&7Sid^Mp6zWs8k}Nea)z$9X7=_ht=W|T zP|?7P>M7W{xs_z9g(o9FNG#6K)tx1gTEc^&?|6;Pw10Q3W!KjB+TK|L)kw8*3f{i| zQrl<{41gHEC?j*8iC8o|JdB7$Qjtt1>FDTS;ME7Zy0fSmq9AIOIlF%NVva6pKX)g#s<b&itCT8(>8 z$LloNV03h}Zj-awEX}Efcw&Ldb*>6CGU>)ZOd9}16l4A-=iNNV_HE$C^O;y{ssyL^ zZ-Ua-cm>rahlk@h7{;6NPk553OQ2@FoBBf6a(^e9BEu;BERfIV$-8-6*Tv1bL_q+bZ@e2sR6K!*l4uSvx002ovPDHLk FV1o7he=h(4 delta 428 zcmV;d0aO0P2Dt-}7k?KB1^@s65h0H)00004XF*Lt006O%3;baP00009a7bBm000ib z000ib0l1NC?EnA(7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%heMHD!e|WdHyHH%UZ6 zR7gv`l`FS{Fc5_KTeZl@NGvikG8TzMVk;|=wUx+7ED~8cH-8%fO=$x(rFYKxPQq(v zhww;#E}qs<TWTgOfJxPP`IjYpILoo`LH44T*ku6r7%;>Rc0bBm%Axb7!|n|`G5yC;GMX>Oj; zfNTP15=>ya-!x$C;aJ#N>VCKDP=m&jWTWF47A*CLg~=DL6i|opd(O_=5yK z1t<3JAf3%|`~D0*1)~Rdl3B=c>)uO(YXThD-Aix8SD~u}pi2Oe4eNRK?gs#U{XMu^ zn40;9tA$ukDV~^~$JIh>bTh6NZa#Hzwcu~>rYI2YXhlr60^loGAR-KG>8vW{3Fxtb zhzUcdXoYOeqQOgv21CH1_OMy$Wuu>gztVo3`NK$j|T<`=Ei)aJF5iIuc= z!r?vJtk|kxaBBy{{b7Q|EN@=F$6avPH_%3V;5)Oa6zd8Zj_ryN59P?trs(ixIK6ix z1Dyp-`UBl9^Q>(NSQRLM^EamD!qGmDo0O}6%_E037GdPG^fD3M5@wXP>Dts)iL2*8Kx@s=(9mB2IF5r`bZr2w4T2Dl$8j77rIhsn4Q)$}35UaE(wXKJ1cSi_ zj>~<&;(aMCEC4}BCX=h8K`a`p1Moy%Ee#6!LLGp2Rjif&j>Si}n-WpFdR)Hk5b(0000P)N2bZe?^J zG%heMHD!e|WdHyH5lKWrR7gwhj-j)JAP|T7x2_tAL@SXcxu}tuGplR-@6l zk43p--lB&ywtGAC&F=odPZ*ZAcQ77p-HLIbObb#Y4M^2Mtt<#>K-30!t=|X@l~5~O z!Hr80m4hJ0!o_uq2e!UI`&__2=9T*l+D!q~jv$*6YCF6-BFq3>_W>d|{zD{{L{Tb9 zMZ(WfSS1kov!4iECM$u+qX>KC?_LVOwN#$+GaT9lJ}o2lKCLZzC8ZqihWbB@+<4hM}XriF~S4 xa?T%wqbinHvfE{^PQCnW{mZjO