From 5223085614b5a01baaf633eb17cf6f1f9e30197d Mon Sep 17 00:00:00 2001 From: Obique Date: Mon, 3 Nov 2014 15:00:35 -0600 Subject: [PATCH] Removed the ControlAPI dependency --- .classpath | 1 - lib/ControlAPI.jar | Bin 5875 -> 0 bytes src/services/CoreManager.java | 2 +- 3 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 lib/ControlAPI.jar diff --git a/.classpath b/.classpath index 0890e7f4e..c58af554b 100644 --- a/.classpath +++ b/.classpath @@ -2,7 +2,6 @@ - diff --git a/lib/ControlAPI.jar b/lib/ControlAPI.jar deleted file mode 100644 index a6681c4cc02ec6b522a6f18b5ac18895cceaf707..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5875 zcma)A2Q*x3yB1{#Lqv!cqUY$nmtYJ>v{A!o(TSEYddn!oh#tL{h&~uybQ8T35-p-f zlteGVyrz3&52!NDcRA|N2Z8i_CmWBn53Sh!ef zU>!MbWpzbfH92)}u;^=Hlw?#B1T~1aonA;8k{lSvkS9 ztSqeT+^t-AEF8>ST_q2kr(^&CfCWI^9l)jtNSM_*Fa5C?k&ek-{2_I|{G%x@_s2cI z;ikBWrnu~h<%t3G1d}`9t|9F6ewVLHCzi>wA^!B?9ps7tF!6m~HmE&< zU*H+uTGCzCf<~*=*8&0rdC+`(bVy_@JQkjE1D6UeQYBCU*9UIO#v$Q2|6$n9VQ&?F zHUEx(Wyth@F#L;|-z!IraR_<$r3dZTT6bXAUeGIehh9uEK`v;7Dv||c@`B2AKGHfq zBC$GS)Hxp+X1j?04MaWMTxR9aKel{$IPdDe7C?Wxwln+*Yx0}CT!h)-fRH-f&g)*| z;mXKHi!;=?kh|ljYCpW2h#c*USXwnF(TMZuB7-ApvWqp>SB$33EfU|1`<-;C;#MDg zTA>H=)H|N&jel5LgC)pR(1;uv@|>VPHO*}(>Pjx@)#Ca0qqzgp7)?0t$HpZMRi?;C z-Js?J+CyS(s5ssBg1t~rKd#P98Vtg2d6ludKHF&W!WgUghKAm}#N+}A-}}ESvLx+( zO;DK6zF&>F!9p<*7yfl({@G6OSpO5itB#FY03JKwo!~jh07JfIf{f$mI)Ka>hwR3N zOX}-9OJelN3!_PdEC(aEk=t)uy4$K}4&I@`inMT+qw=H((V z5Lo7xkQ9an`Cx~n+h1#3cU@ENhYc5*Jql_)hDx^0sTT_%o=}oUbF&PCMwOZY+Jc5XGI5G9XjcfqP{J5(Wi=H2!~h`+p+?ndXlYV0K9JgjK@iBF5B-2KW%qy@?cL z6q@p0bhxXwVuD+I;q2#>)-pzmlX!$vZBk^_B%>0l&|O@**oE(H;*LC;}b_ZOmFnv|JGv^Z{kRNLMbUz@M;*gG4JHpRMIk;mA^2PNyu(G}-wFs_V` zt&6uXd=q=;Fm`~5SPszw^2ZRrD#`usehFEoBQ^%UDuWyL-R|?^-Ib@mnU-S@=J--7 z0Ata93v4GYVPIO9ts^03M9i1!m={2&DG%{moCy)OlYOqPNi$>The2{{vU*fqXvgtE zJ_RH3UbPbg&r}~^21V!$3FyOZcV&+4kw>lE;b?idT0g2_fKdt7;e*kZ2>7 zma&AkS-~Sgz>6CpO(jw}7PGqBRXR8pa5JfodZ{d($?}gt=o~|rZWgVv*e;=r5M4KE zlno2_5?%fhL@O{!fX12{k>+Y#{-}y!lN2cNHhNZ%+%QUsFX+r^4>KzQ9r=!Ri(20D z7}3i)!HlzfNS#2*Vw3buzms{R?hPwlKZCY6LDs8$G`qVeGM(0e;d`@de%8AFJM9g7 z6CNV){6OtSDiLFAqAGzs5a}s*cd^f9@h)95HxbkPW&>wU&Qe2~VNc}-%Wa3n1VoaK z1rep217lZq!dy%dRkCIM+{MCr%W`RP24&h^c!70E9#5*`~cm1ecP)3aO$5`;DbSN;LDetjtRJ8($ z(Tx;a&MQf7`ma2|ybojpgUXpA=8nPr|np}A|XkCe&FK^)MS2z}+!(o$K2krhbXZ0e%b zc<|M%_7eMADK|iRqaUx7A^`X|rLg~_QvTWy)y$mCZ2o&c%+PhzzVn#epU2C9puZ$g zK{F3Kjx=Hinq8|09>rY&lWxtB>FERC)_;VY!_g0Kh=mr=6yvIMB^P-;c$g$O+hkFIj@oKa z=MlE_d9!5&oJkfoCYFPDd0F)SxdQYNar5w=AMnP0pO|q3l(Z*=y*Y|0FnyAh56oLF zO*k^@thy)3I})SUOO%Rr{I3Xw_fm3*Dd24Agr@{h3>z$YZSM;l}L| zsRrXvrc}-!Hn(v;rdt`#Q@~|CeB~KD2UGZ&893-7NANmu`b7L)uO8 zTcZ`{_u2{XeVwmKy*O6DReG)pQqA_O`;)Hwxx8$eaP#-Im%&Y~k}Vm1P}t&Y1P{EC zaMBINtR7x(m|Y^-tV?|UeT$7)8v7ujxd@EiETPWGda#r-@nVUv8fBpg2eC?yrnid| z+w|_Zmq+c@%dR@?rPS4=3IwWP)A?wExOoAF)fi>ogqfsnarWVK1&9ZM)5eg zG#+?lQ@|PbrVpnl{LI#ZBDI#wgw~stpdh-vP!(Leh@Q8S93yC)+T&pIllrK$1-J5q z4?uOa%jeTG5z!Iic%t?s(5F0lo*KQ{q)W3z-)MD0f?U#zMM>nK_7gtA zwNEGH3-Y59>8F=Xw>U5pv=afLZzw40qg%}Yqao*g*eIHQ+J~R{$7Yf}gAy?u(1y2L z_zI%#Q=AOM1TK$pQg!ameF_2*(iCuzoSi6ednnI5Tl7&V5NPdD8n(a3o|{MbkePq> zj5Dqo%z}3+-!Dc=Oz|8#;#$c|MSMv9yn%2`G0vp)Ji)gv;@R%p42AB6+N|~J%mm68 zK+(AL`Ud884xZx=^Xet6hqI3BYkPn#YADMh?h>*%Sii+DI2zeN++1I*FV?L(^(^DL z=p%~L7P(WWF&99NaJqti(8x0#P(jygn!yisT`1f>_k~7;VZa?U!-ynn?&TBnn`SI0 zv>SS{nNR8cgM6GR)H-FufnL+{R&*y?GJ4EIA^&!ed@n|d9lm+qO;zffvLh~w2#L#-%II~b$IZu zwCFeK2a=4&;x;D$b7vU4{zaT|HIN0jQPiE<1E-&u#}M3ag7$@D{JxAcRES=-c9Re} zun)})aW&)Bu2C+>4J6{s^sa7cwap;{rPunhHx02vO+F4aGkS!1cm{t*rf*HRhsjpg z?G(#8Or+Jsg_(yU%WR*%Xj8ufsHL*~{MGwnyoI+_E0kq4g09aw2?=1qt6g!NO6B4m z(!Zb(Um|_Xu|tvXs(V^{N)lQ5WS-}CKrbOr2o!eE0tSXaxCmJ&tPLd&rxF1&b74F% z+7Ay#_R+X(-W6Fi)9{u4w!Gc4W>QAjW4%bvmm`5hK5+&pncd8eE1HD)ujx%4%v4Gl#VkK0q8 zRm*mJ_w}NejCLL7A72gx<+?qrkoF)_^g40V@vbCG^|5ErCfRwZ70O&oXv7|7-wr z_MtQPWHPtT^8Fp{?Z>LVD8a|IUi;}3!DsIcr+Qsl%J8+nn&s6vsW!u2b@)sDNd3NL zTnJr%Gq#;5>*H*ET(~B-JVdx&lEvj|)oPnjquV@4I{d;#=|N4{E^ib;z=!gC4!7S& zR|{`=yw8w75XzddZOA@{CtgrE>`-dNYy==yizupP=4|MeJID(N%Lbwd0S!QDgs>+UztQe7uoSH=nYlt(QuSGy18=>pDa+cWCt4gCw z4coL-&z!`9b#kh3X?a7RO?Da5W8%@?podEf9$`wZeTfvuPFp)TCDAcr6{o&O(a@I` zROZEuwQy)2jZTtG)6287_0hpP`hBy9XU()qc9QM9cp_>69fhOP@aW^{Am*2vO6%0` z7`FVv%3_UYUyuThfKk|+MtQ5F#mH!jOFlS6x{*B*lxF1>e5Uk;zh}n+h_s9I>qxbmxi8mYY)FsWqit~$^&Y3wR{Sn7=oIgjI zaC!sRhg!QPo7E?@_cPyY0qp&>l_EZi5JuDwHNTBKIcRvpMFl$2%dbSI$`VGJ^;>?e!T#MV zBDgAzd7imAKee)exy7`TbTE)A3?Fi)&U1V3$=az#B1P{U;E;+Cs}T*#(>^q{t*m65 zx3;$N!s0eHPK$b>M{R6*=9`qC9TNL!3Vc|fRTo-nd2?%2h++0-sqA}6Q|n&D)A<`E z5$?9r`<~4Z0akw|)hW1pL|pW)nG^<~)-vb{DQh}lXhNcP?Tz|L6{6ZD@JEa1<>&uQ zA__A37OUachPO>AHVMj}{uq}~upCMnehM@C;;RG4QPb<4@gan<+Xc{cq0cCkM2t$A?Z>vWNcWpmvC_fT`G z4a>ehQfTjt=Gs<(oOyt13-K2t+;RmM8I!Jk>KOiSI9lS3aYLdn`cg$0Hid!`VkZt+ zZm#4WpC&&(u!K^)+|LxmtSduD>XF0>dq+t6L@s5O@~NuR59ZLmAfvl;^gt8AX|Mor zr8sp`ROTGtjK_ucB(;toW?i-aX2bM)4J slI*AAe|_s(BESAP*An>|!FPTY3`7O*s^P}MBDgwquiEc0^6R_*0-if4X8-^I diff --git a/src/services/CoreManager.java b/src/services/CoreManager.java index 84ff32f66..1d9eff4f5 100644 --- a/src/services/CoreManager.java +++ b/src/services/CoreManager.java @@ -1,6 +1,6 @@ package services; -import me.joshlarson.control.Manager; +import resources.control.Manager; public class CoreManager extends Manager {