From fa0228029277442cb381d22c5f0f9b87927880e5 Mon Sep 17 00:00:00 2001 From: bancika Date: Sun, 30 Jan 2011 23:45:25 +0000 Subject: [PATCH] code cleanup --- .../DIYLC/library/main.jar | Bin 82510 -> 82531 bytes .../AbstractSinglePointComponent.java | 36 ------------------ .../components/connectivity/CopperTrace.java | 7 ---- .../components/connectivity/CurvedTrace.java | 2 - .../diylc/components/connectivity/Jumper.java | 10 ++--- .../components/connectivity/SolderPad.java | 2 - .../components/connectivity/TraceCut.java | 3 -- .../src/org/diylc/components/misc/BOM.java | 1 - .../src/org/diylc/components/misc/Image.java | 1 - .../src/org/diylc/components/misc/Label.java | 1 - .../components/misc/ProjectInformation.java | 1 - .../passive/RadialElectrolytic.java | 1 - 12 files changed, 3 insertions(+), 62 deletions(-) delete mode 100644 diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/components/AbstractSinglePointComponent.java diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/library/main.jar b/ diy-layout-creator --username bancika@gmail.com/DIYLC/library/main.jar index 455d9cf01691162bff26e380845ab0eaa5e3f85c..c3af2439a0ce526a870cdd7d2b71cfd5969c1be1 100644 GIT binary patch delta 3001 zcmZWrdpuOz9^Y#ikGvlfc{JlhhP)=P48zPhw^80bRVMVh2RVd_(3wmnR1CZ9n7Nfl z3Ac!flJY3MnNpd(Cf6(*g3!17t-XcPZ&P z2>fW0(-lof8sv2QB>1eQ!RO0`_!CtC43Z`pbp}fy!~kaqmEboBlfVvwEy)4G4iX!O z@-kAJEX2e)z9fjfiq$d@PinLh7@@O_(5nn8q#(c3D4F1=7NwHmIE|4>R?{TAI439> zC7hH-kY0HNu|R7{+UO~ug!ieO8aGqw$}eK-aku6W@=)X&pVlhtNq_H8jc=duzfb;ciA0Y@X|{hhOEK3x^CY$3 zz)j7gZ-wTmmlyT^Gtiy4 zj*=cK%xlPMFTIMIrfiYN`sU03miwxhADv&F?w%QsyDrwfxn2+w zo+{wcJW@w5axa&M4u_saKXrT=JNSI>g{mGBR@L@i|5#Us|A$u;la#W1ydt04NZ*kg zZ1L*Y&WJzG#tHfx3L`UP7sayE!>gCc6m;lC@AT_$rXsW#jg#8m1=G$lSX!^oi$F`w%+nrgo_AOkaLjRCw|(FR)Cn^V>iVS!nviEJ(N8 zG3$=0MWe~aa~hOfRv0)cAM20cm@c}cxBXLT3KqdSQk0_OL7Dqz zQ+z>PV%}z%@(x>5-ZP)pnw*pcPV#yD!hY@E;?JCHDx>%p6JQb?)_29t{_#f2ryW?v za8Dp*w4X)!^e#2!lvOc}F;+Pq6^FhV9yvM{Rrasr-XiZ>53QU3%(`)+%%emY*|0n# z`)0!A#*V`UlW8Lnz9m~vEEvz-?kCF&S>tHQ56=|70~LDrGB>c{W9rp+f>H;#yHmMZua{^4V@F>! zy}3I;bI$vs(WV7S2n$2`frcG*K?(`{0eOLW3r(!pD04LHv|7+64-#n*Z0zwG=p17j zSr6`A;W{MCGuSy`k~^OCU2s>vfxk3~K^wb_%g>l-W zEtg8vKV(((cs9GOP2z>esjZTd*Ql58@RX86ao8gzr6wDQPF!9R+(@@SIe(*{Mn&r zclJATuBe8)QtMp{Vvojo(c%RUZW?r1Y?Xd+(lhS1p?n5sovGnr@qSADa3JN>j-Yk* z1z=C}>vUoEt4^FyC^h(n-zBKd~qe3}|Eb$3~@6631Ft(6J zD?&Y^au7g_yJkl8+`{T`!l!eqi-;d@yh@Bq+HHvOtL^||%v>uBI!l|hj6iWv`eu^JbkidnFMT6x@5Jxo}^mH`a7 zqlzdcU%mC{l-eLe>i292q zxO*C#7lQ!ETUkpm-5U5S&AOqm32WdDEuJ<&k3@Dt6LhqQ+sevG6O(fW@Fiduq1NU6 zlO~T%*Z_5?soLV&F76NQG*=l5w3Wn#LCxC>YM81W_ytY#lEWTOi``Jn@|h8BXmDLx zjGXxiBm{9IBM6JQ;3bdz1Obnj;xv!`-(}h18TAWlKoyQGf_N(< z$l_U97$MVc8H{BQ77%VV+j(s0PQ%?sv)pwN({5E_PQpFl*YUv^cL)EUo4e=7N=EI0 z7A%h35`2ZF`(}8weV;bAVF_Lw{0sy^Ei#GFgh|R+G34=>tB|)&BlwnTIdpxRuCk9i zewd};KOXoa#i$OrNj z`wM^YqfDTViJ3r?*lkzF>wsZNp@G1Mj- zXEdzW2~hD}X0mX)vVEGCM|<0qFn5+DWIfdW>i$WS#ZIz-HY`ph)V%v=X_G9VMeH_^ zYBSt{pVjmDS*6da4P#(BLJnKyEZJzNGoHzP@CRS$4CYbci9bUY;+pJ_8toGr;y`4A=h}a!yk-9MRJBiMP%M zdQ!_}0JcH~SYX*~Nh!`jHeLx}3>siypV^Y7t8sAloXRx2i32DwLkwh*`2=f?-RA&J Y$i9HA35{SKuqD3&RhcSte0Ruy01BihzW@LL delta 3068 zcmZWqc|4Tc8-LF*Ll`1k3`Ql_Hkpxij3L=RqOlV-;kL<|a#0%jDa$3xTi!}2tx^hQ z``OYWmD0YT!W8!=bkk4Q4fj2-(w+O8KhAf~_j$h0Jm)#jJZB)4d@q$O!*dlAmqOrY zN-R%CkMvb6&paKjSLtvaScgZ#84Yx0U;jPK&S)u5T<|`1XGeFglLj24%Jnp zhY}F?N%@f=zLsgCKrCMHfWR0vXTttp?OHL&Z`a8n_!)!!WVp{^7Letq#JDz&AqLMg z#1W)?9)d8?t0Yydl?AA1pt-DSfS0<{{AuMS${FN41u@|gqAqBam@@-?2cEw z>T^IiT&c)+7!&8ae$4jXWg!3B{Y3*BW5pULfX$!+MuLFW@79VAJ?9k zy%C&;u~G+2$pZo1+c+B&bbKSm1jcIwnJLjVxy!=k87=o^12Q!d%FeI7Qsh8h?AoUA z%AR~Jqdq@{_tdOD#p6-1Q$ui|ROHfocIC3=eyM#7q4JKkN49Pld24Bs6eTsH^GA)B z`{B|6Q_p=LqODH*)*3}7IOHVkim5P9j(Mmm@&0^sXIy#EUS4!)d2mAMP1iPo(q*j1 zu(0buS^1l|iFw08g=?65b(_Mi;)>Yo(4I6y-+@0UYvgYyo7B9JDezNBT9o-NzPFEZ zW2=7M(}#YCecX#i(I=^+9nAU#U(`-zZ@;oGSfyw3(khhYH~-`4ZT+3ztpTi|+b3=w z?vAc2)Xxmv!sz8FpT1n+)pD}8*i}%IdpxUQ(`0;UU@rr`+u$F(gafyB_bvXP;>s zzohoRTNqo=V3O!uJldQ^+0;e*h3fRUN%_$;HPaBXoBy@)TbVaZWUEsHH>6by9PYp3 zUXt5uXLm;mi#X#l;Yi)!q2JGozkJk~HlkH|uLIVEpUy`-yG zy2XLoY}eSc{Y!EDx%GEtNJ>=$w%VF1OR60ULN91OHO_wKJ-pSz*2kV&AQfn@!3~R7 z@=~MKsaY@griEFwc~RZ;_MeK>6u3}-IqBS2v2Uk;SG1P2V$k4?uy`%4&GE?-XQfTQ zrs|P1nh&xVL9XYLF4Ru1_UKM4`CODzCcCS%hNQXSu!r`;EP3_MZ$=W;&vqAA*wnOh zPUHty7-trTYDK$vO)dH~wYDm2BH>MXv;nqs0|S-B+9C5xZIf2-?va>pjm;pdj1Tx z&v%jim&e$h-7FWDi~T{F4*L5=X-X<3!3PIohx}tR#`$%(LOE&KGsyS3DT&X`YI*Ai z#F!J>6cS@?kK=O!1Kpho{uFOe8jiL7K`)7Y82^D3+;hTm2)}zVDFk{ZY$mWVxm5z6 zyVbkXTZpm9%@K%0|5h|t5~AnPLj*rudYr(VGCC2rvV2?y+RxMt0*JW{hQxSnZi*uO zmR)~N=;w9T6Z`9rmJ|EQZa%RO?0-Y(I6_rI=Qn6YAo{x+5&zw7JvPQLKfgd-oa!RPn&>sRFO9alV1*2(;?+Onk^w9A&4^>LClEPa&|enXN-+% zTU%g1@TuOaYCQ%EOME0!ws+N5S08 z0PGJe&(v%OeO!B&ib2!xF55;u1@k#!*5%ijvWNM;BnW*56K5WR&gXMZvF*`tL&A zDTNA*YX!84k_Efm^y|d$?Iqq#<|028S%!Nu(XKK{tlsKd+(kZ1^ED&n16 zj(eM9H1=$f^x1fJ`|5Dc5ZlfMDlp@0$VD~aoHlls4U~wZCe8HcE905|ghv%UYEgmp z>`C3Nah>dS3|Ipl^yljevZB3*RYLpF-C4U$=ReAD_TJ~aAMneqpN}90BI%xZ1l{SF z7Y8haxkYmD7%#eK$@3hb1<6iGTJ_J8(l$U7k_I+7NfY9y&_ct7(!`}feh=i$1|g3% z+ssCN0l96z!<$E=X69p>+*#g|i}U-3=lI=RK!-7oL4J62j(^LYt=u%^b!Wcu+W+_G z3t7KwdI&F~D}LQZBIjI=32cEijNN1lXkweF0Nq2 { - - private static final long serialVersionUID = 1L; - - protected Point point = new Point(0, 0); - - @Override - public int getControlPointCount() { - return 1; - } - - @Override - public Point getControlPoint(int index) { - return point; - } - - @Override - public void setControlPoint(Point point, int index) { - this.point.setLocation(point); - } - - @Deprecated - @Override - public Void getValue() { - return null; - } - - @Deprecated - @Override - public void setValue(Void value) { - } -} diff --git a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/connectivity/CopperTrace.java b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/connectivity/CopperTrace.java index 2fcec7de..48ba8738 100644 --- a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/connectivity/CopperTrace.java +++ b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/connectivity/CopperTrace.java @@ -72,43 +72,36 @@ public class CopperTrace extends AbstractLeadedComponent { return false; } - @Deprecated public Color getBodyColor() { return super.getBodyColor(); } - @Deprecated @Override public Color getBorderColor() { // TODO Auto-generated method stub return super.getBorderColor(); } - @Deprecated @Override public Byte getAlpha() { return super.getAlpha(); } - @Deprecated @Override public Size getLength() { return super.getLength(); } - @Deprecated @Override public Size getWidth() { return super.getWidth(); } - @Deprecated @Override public Void getValue() { return null; } - @Deprecated @Override public void setValue(Void value) { } diff --git a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/connectivity/CurvedTrace.java b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/connectivity/CurvedTrace.java index f5db6e5e..85b29c90 100644 --- a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/connectivity/CurvedTrace.java +++ b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/connectivity/CurvedTrace.java @@ -46,7 +46,6 @@ public class CurvedTrace extends AbstractCurvedComponent { this.size = size; } - @Deprecated @Override public Void getValue() { return null; @@ -56,7 +55,6 @@ public class CurvedTrace extends AbstractCurvedComponent { public void setValue(Void value) { } - @Deprecated @Override public Byte getAlpha() { return super.getAlpha(); diff --git a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/connectivity/Jumper.java b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/connectivity/Jumper.java index 13d9139f..d0268c10 100644 --- a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/connectivity/Jumper.java +++ b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/connectivity/Jumper.java @@ -22,6 +22,9 @@ public class Jumper extends AbstractLeadedComponent { @Override public void drawIcon(Graphics2D g2d, int width, int height) { + g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(3)); + g2d.setColor(COLOR.darker()); + g2d.drawLine(1, height - 2, width - 2, 1); g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1)); g2d.setColor(COLOR); g2d.drawLine(1, height - 2, width - 2, 1); @@ -34,42 +37,35 @@ public class Jumper extends AbstractLeadedComponent { || componentState == ComponentState.DRAGGING ? SELECTION_COLOR : COLOR; } - @Deprecated public Color getBodyColor() { return super.getBodyColor(); } - @Deprecated @Override public Color getBorderColor() { return super.getBorderColor(); } - @Deprecated @Override public Byte getAlpha() { return super.getAlpha(); } - @Deprecated @Override public Size getLength() { return super.getLength(); } - @Deprecated @Override public Size getWidth() { return super.getWidth(); } - @Deprecated @Override public Void getValue() { return null; } - @Deprecated @Override public void setValue(Void value) { } diff --git a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/connectivity/SolderPad.java b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/connectivity/SolderPad.java index e24f3691..729e34a0 100644 --- a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/connectivity/SolderPad.java +++ b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/connectivity/SolderPad.java @@ -67,7 +67,6 @@ public class SolderPad extends AbstractComponent { this.size = size; } - @Deprecated @Override public String getName() { return super.getName(); @@ -116,7 +115,6 @@ public class SolderPad extends AbstractComponent { this.type = type; } - @Deprecated @Override public Void getValue() { return null; diff --git a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/connectivity/TraceCut.java b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/connectivity/TraceCut.java index 57772ae8..3d098a7a 100644 --- a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/connectivity/TraceCut.java +++ b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/connectivity/TraceCut.java @@ -86,13 +86,11 @@ public class TraceCut extends AbstractComponent { this.point.setLocation(point); } - @Deprecated @Override public Void getValue() { return null; } - @Deprecated @Override public void setValue(Void value) { } @@ -124,7 +122,6 @@ public class TraceCut extends AbstractComponent { this.borderColor = borderColor; } - @Deprecated @Override public String getName() { return super.getName(); diff --git a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/misc/BOM.java b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/misc/BOM.java index 883d638b..f9463ff7 100644 --- a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/misc/BOM.java +++ b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/misc/BOM.java @@ -159,7 +159,6 @@ public class BOM extends AbstractComponent { this.size = size; } - @Deprecated @Override public Void getValue() { return null; diff --git a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/misc/Image.java b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/misc/Image.java index 1b470654..ef093ac1 100644 --- a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/misc/Image.java +++ b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/misc/Image.java @@ -112,7 +112,6 @@ public class Image extends AbstractTransparentComponent { return super.getName(); } - @Deprecated @Override public Void getValue() { return null; diff --git a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/misc/Label.java b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/misc/Label.java index b8164540..600120ce 100644 --- a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/misc/Label.java +++ b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/misc/Label.java @@ -128,7 +128,6 @@ public class Label extends AbstractComponent { return super.getName(); } - @Deprecated @Override public Void getValue() { return null; diff --git a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/misc/ProjectInformation.java b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/misc/ProjectInformation.java index 83d69a65..28c09c1a 100644 --- a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/misc/ProjectInformation.java +++ b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/misc/ProjectInformation.java @@ -96,7 +96,6 @@ public class ProjectInformation extends AbstractComponent { this.point.setLocation(point); } - @Deprecated @Override public Void getValue() { return null; diff --git a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/RadialElectrolytic.java b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/RadialElectrolytic.java index 35ba2d13..6fb233e6 100644 --- a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/RadialElectrolytic.java +++ b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/RadialElectrolytic.java @@ -118,7 +118,6 @@ public class RadialElectrolytic extends AbstractLeadedComponent { return null; } - @Deprecated @Override public Size getWidth() { return super.getWidth();