[Arianne-commits] stendhal/src/games/stendhal/client/gui/styled/swing StyledJPanel.java, 1.9, 1.10 StyledJButton.java, 1.7, 1.8 StyledJPopupMenu.java, 1.13, 1.14

[Astrid S. <ast...@us...>]

Update of /cvsroot/arianne/stendhal/src/games/stendhal/client/gui/styled/swing
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv17559/src/games/stendhal/client/gui/styled/swing

Modified Files:
	StyledJPopupMenu.java 
Added Files:
	StyledJPanel.java StyledJButton.java 
Log Message:
switching client back to WT

--- NEW FILE: StyledJButton.java ---
/*
 * @(#) src/games/stendhal/client/gui/styled/swing/StyledJButton.java
 *
 * $Id: StyledJButton.java,v 1.8 2008/06/13 16:06:40 astridemma Exp $
 */

package games.stendhal.client.gui.styled.swing;

//
//

import games.stendhal.client.gui.styled.Style;
import games.stendhal.client.sprite.Sprite;

import java.awt.Color;
import java.awt.Font;
import java.awt.Graphics;

import javax.swing.JButton;
import javax.swing.border.Border;

/**
 * A styled JButton.
 */
public class StyledJButton extends JButton {
	/*
	 * Style used.
	 */
	private Style style;
	private static final long serialVersionUID = -1607102841664745919L;

	/**
	 * Create a styled JButton.
	 * 
	 * 
	 */
	public StyledJButton(Style style) {
		this.style = style;

		applyStyle(style, this);
	}

	//
	// StyledJButton
	//

	/**
	 * Apply style information to a component.
	 * 
	 */
	protected void applyStyle(Style style, JButton panel) {
		Border border = style.getBorder();
		Font font = style.getFont();
		Color color = style.getForeground();

		if (border != null) {
			panel.setBorder(border);
		}

		if (font != null) {
			panel.setFont(font);
		}

		if (color != null) {
			panel.setForeground(color);
		}

		setContentAreaFilled(false);
	}

	//
	// JComponent
	//

	/**
	 * Paint the component background.
	 * 
	 * 
	 */
	@Override
	protected void paintComponent(Graphics g) {
		Sprite texture = style.getBackground();

		if (texture != null) {
			int twidth;
			int theight;
			int width;
			int height;
			int x;
			int y;

			twidth = texture.getWidth();
			theight = texture.getHeight();

			width = getWidth();
			height = getHeight();

			for (x = 0; x < width; x += twidth) {
				for (y = 0; y < height; y += theight) {
					texture.draw(g, x, y);
				}
			}
		}

		super.paintComponent(g);
	}
}

--- NEW FILE: StyledJPanel.java ---
/*
 * @(#) src/games/stendhal/client/gui/styled/swing/StyledJPanel.java
 *
 * $Id: StyledJPanel.java,v 1.10 2008/06/13 16:06:40 astridemma Exp $
 */

package games.stendhal.client.gui.styled.swing;

//
//

import games.stendhal.client.gui.styled.Style;
import games.stendhal.client.sprite.Sprite;

import java.awt.Font;
import java.awt.Graphics;

import javax.swing.JPanel;
import javax.swing.border.Border;

/**
 * A styled JPanel.
 */
public class StyledJPanel extends JPanel {
	private static final long serialVersionUID = -1607102841664745919L;

	/*
	 * Style used.
	 */
	private Style style;

	/**
	 * Create a styled JPanel.
	 * 
	 * 
	 */
	public StyledJPanel(Style style) {
		this.style = style;

		applyStyle(style, this);
	}

	//
	// StyledJPanel
	//

	/**
	 * Apply style information to a component.
	 * 
	 */
	protected void applyStyle(Style style, JPanel panel) {
		Border border = style.getBorder();
		Font font = style.getFont();

		if (border != null) {
			panel.setBorder(border);
		}

		if (font != null) {
			panel.setFont(font);
		}
	}

	//
	// JComponent
	//

	/**
	 * Paint the component background.
	 * 
	 * 
	 */
	@Override
	protected void paintComponent(Graphics g) {
		Sprite texture = style.getBackground();

		if (texture != null) {
			int twidth;
			int theight;
			int width;
			int height;
			int x;
			int y;

			twidth = texture.getWidth();
			theight = texture.getHeight();

			width = getWidth();
			height = getHeight();

			for (x = 0; x < width; x += twidth) {
				for (y = 0; y < height; y += theight) {
					texture.draw(g, x, y);
				}
			}
		} else {
			super.paintComponent(g);
		}
	}
}

Index: StyledJPopupMenu.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/gui/styled/swing/StyledJPopupMenu.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** StyledJPopupMenu.java	24 Mar 2008 16:44:54 -0000	1.13
--- StyledJPopupMenu.java	13 Jun 2008 16:06:40 -0000	1.14
***************
*** 23,28 ****
   * A styled JPopupMenu.
   */
- @SuppressWarnings("serial")
  public class StyledJPopupMenu extends JPopupMenu {
  
  	/*
--- 23,28 ----
   * A styled JPopupMenu.
   */
  public class StyledJPopupMenu extends JPopupMenu {
+ 	private static final long serialVersionUID = -1607102841664745919L;
  
  	/*
***************
*** 148,151 ****
  		}
  	}
- 
  }
--- 148,150 ----