From: Astrid S. <ast...@us...> - 2009-05-10 21:43:01
|
Update of /cvsroot/arianne/stendhal/src/games/stendhal/client/gui/imageviewer In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv4665/src/games/stendhal/client/gui/imageviewer Modified Files: ImageViewPanel.java ImageViewWindow.java Log Message: bye cycle Index: ImageViewPanel.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/gui/imageviewer/ImageViewPanel.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** ImageViewPanel.java 26 Feb 2009 21:19:35 -0000 1.10 --- ImageViewPanel.java 10 May 2009 21:42:50 -0000 1.11 *************** *** 28,43 **** private final URL url; private final String alt; ! private final ImageViewWindow imw; ! ! ! ! public ImageViewPanel(final ImageViewWindow imw, final URL url, final String alt) { super(WoodStyle.getInstance()); this.url = url; this.alt = alt; - this.imw = imw; - initImage(); ! initComponents(); } --- 28,37 ---- private final URL url; private final String alt; ! public ImageViewPanel(final URL url, final String alt, final Dimension maxSize) { super(WoodStyle.getInstance()); this.url = url; this.alt = alt; initImage(); ! initComponents(maxSize); } *************** *** 57,63 **** /** * Creates and adds components to draw the image. */ ! private void initComponents() { ! final Dimension max = imw.genMaxSize(); int width = image.getWidth(null); int height = image.getHeight(null); --- 51,58 ---- /** * Creates and adds components to draw the image. + * @param maxSize TODO */ ! private void initComponents(final Dimension maxSize) { ! final Dimension max = maxSize; int width = image.getWidth(null); int height = image.getHeight(null); Index: ImageViewWindow.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/gui/imageviewer/ImageViewWindow.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** ImageViewWindow.java 4 Mar 2009 00:46:48 -0000 1.12 --- ImageViewWindow.java 10 May 2009 21:42:50 -0000 1.13 *************** *** 42,46 **** public void init() { ! final ImageViewPanel ivp = new ImageViewPanel(this, url, alt); setContent(ivp); j2DClient.get().addWindow(this); --- 42,46 ---- public void init() { ! final ImageViewPanel ivp = new ImageViewPanel(url, alt, genMaxSize()); setContent(ivp); j2DClient.get().addWindow(this); |