[Arianne-commits] stendhal/src/games/stendhal/client/gui ItemPanel.java, 1.9, 1.10 SlotGrid.java, 1.4, 1.5 SlotWindow.java, 1.6, 1.7

[Kimmo R. <ki...@us...>]

Update of /cvsroot/arianne/stendhal/src/games/stendhal/client/gui
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv6564/src/games/stendhal/client/gui

Modified Files:
	ItemPanel.java SlotGrid.java SlotWindow.java 
Log Message:
Added inspector tracking to contained items


Index: SlotWindow.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/gui/SlotWindow.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** SlotWindow.java	31 Oct 2010 17:21:12 -0000	1.6
--- SlotWindow.java	14 Jan 2011 16:59:56 -0000	1.7
***************
*** 14,17 ****
--- 14,18 ----
  
  import games.stendhal.client.entity.IEntity;
+ import games.stendhal.client.entity.Inspector;
  import games.stendhal.client.entity.User;
  
***************
*** 19,22 ****
--- 20,25 ----
  import java.awt.geom.Rectangle2D;
  
+ import marauroa.common.game.RPObject;
+ 
  /**
   * A window for showing contents of an entity's slot in a grid of ItemPanels
***************
*** 61,64 ****
--- 64,76 ----
  	}
  	
+ 	/**
+ 	 * Set the inspector used for the contained entities.
+ 	 * 
+ 	 * @param inspector
+ 	 */
+ 	public void setInspector(Inspector inspector) {
+ 		content.setInspector(inspector);
+ 	}
+ 	
  	@Override
  	public void paint(Graphics g) {
***************
*** 99,103 ****
  			// monster and a fast double
  			// click on another monster
! 			if (parent.isUser()) {
  				// We don't want to close our own stuff
  				return true;
--- 111,116 ----
  			// monster and a fast double
  			// click on another monster
! 			RPObject root = parent.getRPObject().getBaseContainer();
! 			if (user.getRPObject().equals(root)) {
  				// We don't want to close our own stuff
  				return true;

Index: ItemPanel.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/gui/ItemPanel.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ItemPanel.java	24 Nov 2010 23:57:47 -0000	1.9
--- ItemPanel.java	14 Jan 2011 16:59:56 -0000	1.10
***************
*** 16,19 ****
--- 16,20 ----
  import games.stendhal.client.StendhalClient;
  import games.stendhal.client.entity.IEntity;
+ import games.stendhal.client.entity.Inspector;
  import games.stendhal.client.entity.User;
  import games.stendhal.client.gui.j2d.entity.EntityView;
***************
*** 77,80 ****
--- 78,83 ----
  	 */
  	private JPopupMenu popupMenu;
+ 	/** The inspector the included entity should use */
+ 	private Inspector inspector;
  	
  	/**
***************
*** 101,104 ****
--- 104,116 ----
  	
  	/**
+ 	 * Set the inspector the contained entity should use.
+ 	 * 
+ 	 * @param inspector
+ 	 */
+ 	void setInspector(Inspector inspector) {
+ 		this.inspector = inspector;
+ 	}
+ 	
+ 	/**
  	 * Set the slot entity.
  	 * 
***************
*** 122,125 ****
--- 134,138 ----
  			if (view != null) {
  				view.setContained(true);
+ 				view.setInspector(inspector);
  				if (parent.isUser()) {
  					setCursor(cursorRepository.get(view.getCursor()));

Index: SlotGrid.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/gui/SlotGrid.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SlotGrid.java	28 Dec 2010 19:11:51 -0000	1.4
--- SlotGrid.java	14 Jan 2011 16:59:56 -0000	1.5
***************
*** 15,18 ****
--- 15,19 ----
  import games.stendhal.client.entity.EntityChangeListener;
  import games.stendhal.client.entity.IEntity;
+ import games.stendhal.client.entity.Inspector;
  import games.stendhal.client.entity.factory.EntityFactory;
  
***************
*** 91,94 ****
--- 92,106 ----
  	
  	/**
+ 	 * Set the inspector the contained entities should use.
+ 	 * 
+ 	 * @param inspector
+ 	 */
+ 	void setInspector(Inspector inspector) {
+ 		for (ItemPanel panel : panels) {
+ 			panel.setInspector(inspector);
+ 		}
+ 	}
+ 	
+ 	/**
  	 * Rescans the content of the slot.
  	 */