From 4c8122ebbb17252ea14fdb7913b67f8590be84af Mon Sep 17 00:00:00 2001 From: magenoxx Date: Tue, 25 Jan 2011 20:38:56 +0300 Subject: [PATCH] Another fix for "NoSuchMethodError: mage.components.ImagePanel.(Ljava/awt/image/BufferedImage;I)V" --- Mage.Client/plugins/mage-card-plugin.jar | Bin 308039 -> 308039 bytes .../src/mage/components/ImagePanel.java | 6 +++--- .../java/org/mage/card/arcane/CardPanel.java | 2 +- .../card/utils/impl/ImageManagerImpl.java | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Mage.Client/plugins/mage-card-plugin.jar b/Mage.Client/plugins/mage-card-plugin.jar index 4017d036ba811cd2fb89303919fa5a6cca44acdc..896a78a3423ca0a591397486e413710160100413 100644 GIT binary patch delta 2710 zcmY+E2~bs47{~eU`&dK-Lm9xHK}=66k`OaV#SJ$C#SL<25VtgO!(v|)c{~;kL9Vj+ zSlp2Z^w8^)TA87wnc0|=jY}pfmLayLf8k5NT?X-6;tekeN69!CNGb^iklF*mq^`nnQr^m7!W3l~ zp-7oPxU7sPJg1A42vvhB(4nMJ*Nya1T?oO~-d}Ax4Bh`Tim(pC*U6cHLu@f67tljy z`Ky^t=0-Q=SAin_bw#+RnJW3T>TZc zzvg4qk^Q9KD7HiYzGScSebL@E-u(KA8D(3X9ThvfJY9)T4}*1jpckjD2pYoN9lVs& zd%iZen>ZV5!pM6%;;gX77l_VFpQW8!`>&qoMmjgkll|rm=M>T_a?b)WB<}%h|AJ;` z9&_tiS$~@=*FRKopSM?670LQxwZ((=U;C#>B+wA&H%JrRfBwf&I@bka-_1|ketisfcJ-(}G$?wtIug2BOFN(C zsOBy=p6266zRd4`j^gTr|43psKDk0&G!wu~YOmdLfV1S$EZt!ryJopTD=++d0Vipd zo{&e?w0_>Og%?NrKq4=K^w2_MYVAG{OA}}l{D2Qo^DsbncKP{(xC-Ga3;=gtR0o2d zo1O@Ue%z~lFx;YJ(LM`-QeMOjgEx555DIM^oID0%Iry7#5XFmtaERbVQY1X#;CG`y z$Ck8d5X1{hG)(67r?cQD$K0F?$gVrFaF;C?7r+s=6fTChkVgG&8FbS1YxmxUFkS>E zz!~21?<-*hXN9bRXeXL^a|$>+QE?L4n62a4$D6k8Y^DpKh=jm(3d|bYLNv!w3#m}t2n7GP-*5x`atCZ zPds^$GJ>bsG(<_H4l0Hz*QnF?VajrDFg09>;iP>L%2}QG5*ZVt6!EXq5~DEDpe!`2 z9f=q~^jwFp3Tl(qp{ve`X6m`lFG-D0!bMIkEx`v{f`g*fFOqO71%IB5dUa$ndQ;cg z$v8?}q*|GbK}6vkOteqIq2wQ(f}=_2q+lrNQzqh$zI307WK&{C}549yrZlyB|XHd-eY#CdgEl2Fi zmiCG3rM+^!)Lk|`euFLE#s?d44%Las!6|eURXM^h_|T@qHewX{OE*gU-HkYl{9(Dc zh`2u&V!mW;KF%in zG#}>^=NHH;_@F@Uw|AlFBl<5Y6n??eg);x-$-N^uSKD=fu@#I90IBd*$t zDa0SP;#y){nV3WH>oPH)$RDO+0HERmsLq=s*>SuJ7ieJ4tA?vX3<`ZlV`@o#7?suKc-q}QSL;w zyiU&=sWWRZn&K|ki0csys+G*I#U-R4)yg_^>SUdd>f|+f@08cM*2eQT_TMFspP6E%T~(V;tFadoY%`aF3`f*tSRJ1@4ve8TZP#j=f?I;h(-w>O(eq@0U7l zzdYuS{jy#}y?p%l){DoQ`W%pPiw{VDtBw8*az0~&?0dgK&N0;@saeGJi~N8_>EGNa z_wi$+eEh11fUh A_5c6? delta 2710 zcmY+F2~bsK6vsLD9Y7JKNCwbnkkeC&BE(eGaKnv2Q47*C8TDyaN-kLJiy)83q9MpN z7TJ_l9^f;tS!rcPk}XzaPBt#(ie-rH4c0y9ylG*E`JMAW%Xhx-yZ64XE1q3fJlz*W z8qm#&{#wk%?k1(#Ts*cyX*3sq=C3rFi~CHvUE&K5>Q2cl7(+;ehY5`kLO2VL5qy<# zgayiELXk3ua9Wv7xYrOR2vdVA(50l^Fp&JihERgPbAZ}$2nPLU6kQ#Q6Db&v6C61u zpQ4vk1*jPv=<@$`f9Eiz!EBFnKC2KP8*mQvWV_MrXN7pr;J=td?>fc2>e+{+pY_gQ zE;XKEeY~H=K>E><(^!YmBS^3Jf53T2lX>ElC(CxYxhhUhd4>|d!6y3?K|WlzE_ed7 zA!H4g-!*er~3>fmoe=QX#I(JpshfyqoL? z6m+`rm^)8M|6N14-@%F-yuJFWDE4pF*xV_vw(Vuk^X&-db(Xy`iT(07=QDfWu5zY4 z>#-2t-rHUNTz|gXY9#%ItNYmZx#7zB_x&)MfIERBNJOpuMzr zIA?YCdGIvv-S%f*`YD>bkNZ85+1`JKx@uN{#k9QkoeP|xh-MoE%^X_d0bOj2ya%{Q ztMrCE>ZXnIg&k}h9tH_)1RLQ1CtvY{IGRA4GZORz)D15a43a(pz*nIa27)ImH9=tH zMURBQC@CKY-*MGPp-{@k^2zWx8*O3G&B;kKAdZv2o(0it1V%t48;McS&&jVugMpRQ zMG(w}Ee7Uu`JE+jk#jCC1?14xIJm~jsTJ@BD}}4!c~1WI1?c4sUSA90Yy`!_hiv@z z5=`N$(2Wo?fOfh)8Qj>Y*aCNR$d&^$6uvF(g8lPuXD6p&gVm!a!Kl7dhbC>R1-|6d z_bLJ(Uigt$;R{x<42IEjruo-^i9>Vh!JUnm2H3;KpUn`(qeQgAST@r4!BJj#YCE7S zmCrf|(^<(o1c5H3ynX~e;3d-DhlhBRtslZ6E??CRQJic)2^%>y`V<^w<@^^A#md8H zU<4ac-+&j7vGP2Ox=-)?dVzA78_#i3=FzjRm3b)ql4#34l_7&j*)T%c#Qm=LDgB&$ z*`x%y45k-3JpWi&oc<#JsowH~5&S_>i)`qnEq+K@&qduqN+%m>W0X&M;`w8hDLl=# z2}%O3pklakj#j!9uDr+#ER0ZMxu`i(IbqPhM3#hTMgKQw3DKBfQd-PvPXY!Ky*J~d zI<>!Exj}C*vgYrzhidVooxK5sxL~45Dia(sx*mNx@mf$`p(wUQfZNh%-_# zmRO#OOC2<-L(}xdbTKv!=Mrnua31l;G>jllN=N$ClWtV2(~*85)X&rZNj9pX8M@eD zR$t7}$I@xbkdD0>xQLQxX5ylObSHtwW8W-LYqQWxJ&-9|>CMC^DQ9+;^3YQuGx-O;_dC2 zN!E?dg?z6a5?6O%2KhcEm`>c~pie1oB)_l}&BVS^OeL=0iOIz8cj6}E z@-ms@t1_8yvWoGfx2m|7=(`Iy5DRzVOT>PMzy3AxFTN&y9^}7@0oh(^KQLdlkXnM+vMQK4vyX{$55~rpQZYqy>h*C8>FtL0hg0* zXv8?8xl#IdH%eVllgwvnlDwWKnd6CO@eexa+ai8yiyU)Li}Z_ZmB*#2Re!8$oqdwG zdY{C*91Lia`7CX+?u|B?W1&r`+2r~I+aiRU|UCegGX?f-uIF6_tW{suYJ>}>!5 diff --git a/Mage.Common/src/mage/components/ImagePanel.java b/Mage.Common/src/mage/components/ImagePanel.java index b2d323aba8b..554442119ec 100644 --- a/Mage.Common/src/mage/components/ImagePanel.java +++ b/Mage.Common/src/mage/components/ImagePanel.java @@ -17,16 +17,16 @@ public class ImagePanel extends JPanel { public static final int SCALED = 1; public static final int ACTUAL = 2; - private Image image; + private BufferedImage image; private int style; private float alignmentX = 0.5f; private float alignmentY = 0.5f; - public ImagePanel(Image image) { + public ImagePanel(BufferedImage image) { this(image, TILED); } - public ImagePanel(Image image, int style) { + public ImagePanel(BufferedImage image, int style) { this.image = image; this.style = style; setLayout(new BorderLayout()); diff --git a/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/card/arcane/CardPanel.java b/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/card/arcane/CardPanel.java index 5c7ebb00267..42d4c7d5da5 100644 --- a/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/card/arcane/CardPanel.java +++ b/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/card/arcane/CardPanel.java @@ -127,7 +127,7 @@ public class CardPanel extends MagePermanent implements MouseListener, MouseMoti ptText.setGlow(Color.black, TEXT_GLOW_SIZE, TEXT_GLOW_INTENSITY); add(ptText); - Image sickness = ImageManagerImpl.getInstance().getSicknessImage(); + BufferedImage sickness = ImageManagerImpl.getInstance().getSicknessImage(); overlayPanel = new ImagePanel(sickness, ImagePanel.SCALED); overlayPanel.setOpaque(false); add(overlayPanel); diff --git a/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/utils/impl/ImageManagerImpl.java b/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/utils/impl/ImageManagerImpl.java index 11d98dd67be..ba668684683 100644 --- a/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/utils/impl/ImageManagerImpl.java +++ b/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/utils/impl/ImageManagerImpl.java @@ -24,7 +24,7 @@ public class ImageManagerImpl implements ImageManager { } @Override - public Image getSicknessImage() { + public BufferedImage getSicknessImage() { if (imageSickness == null) { Image image = getImageFromResourceTransparent("/sickness.png", Color.WHITE, new Rectangle(296, 265)); Toolkit tk = Toolkit.getDefaultToolkit(); @@ -53,5 +53,5 @@ public class ImageManagerImpl implements ImageManager { return resized; } - private static Image imageSickness = null; + private static BufferedImage imageSickness = null; }