[Arianne-commits] stendhal/src/games/stendhal/client/gui/wt EntitySlot.java, 1.65, 1.66 MoveableEntityContainer.java, 1.27, 1.28

[Martin F. <mar...@us...>]

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

Modified Files:
	EntitySlot.java MoveableEntityContainer.java 
Log Message:
move and rename the old WT interfaces

Index: MoveableEntityContainer.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/gui/wt/MoveableEntityContainer.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** MoveableEntityContainer.java	30 Mar 2008 21:28:24 -0000	1.27
--- MoveableEntityContainer.java	30 Mar 2008 21:35:30 -0000	1.28
***************
*** 15,21 ****
  import games.stendhal.client.GameScreen;
  import games.stendhal.client.entity.Entity;
  import games.stendhal.client.gui.j2d.entity.Entity2DView;
  import games.stendhal.client.gui.j2d.entity.StackableItem2DView;
- import games.stendhal.client.gui.wt.core.WtDraggable;
  
  import java.awt.Graphics;
--- 15,21 ----
  import games.stendhal.client.GameScreen;
  import games.stendhal.client.entity.Entity;
+ import games.stendhal.client.gui.IDraggable;
  import games.stendhal.client.gui.j2d.entity.Entity2DView;
  import games.stendhal.client.gui.j2d.entity.StackableItem2DView;
  
  import java.awt.Graphics;
***************
*** 27,31 ****
  
  /** this container is used to drag the entities around .*/
! public class MoveableEntityContainer implements WtDraggable {
  
  	/** current x-pos of the dragged item. */
--- 27,31 ----
  
  /** this container is used to drag the entities around .*/
! public class MoveableEntityContainer implements IDraggable {
  
  	/** current x-pos of the dragged item. */

Index: EntitySlot.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/gui/wt/EntitySlot.java,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** EntitySlot.java	30 Mar 2008 21:24:38 -0000	1.65
--- EntitySlot.java	30 Mar 2008 21:35:30 -0000	1.66
***************
*** 28,35 ****
  import games.stendhal.client.gui.DragDropSource;
  import games.stendhal.client.gui.DragDropTarget;
  import games.stendhal.client.gui.MouseHandlerAdapter;
  import games.stendhal.client.gui.j2d.entity.Entity2DView;
- import games.stendhal.client.gui.wt.core.WtDraggable;
- import games.stendhal.client.gui.wt.core.WtDropTarget;
  import games.stendhal.client.sprite.Sprite;
  import games.stendhal.client.sprite.SpriteStore;
--- 28,35 ----
  import games.stendhal.client.gui.DragDropSource;
  import games.stendhal.client.gui.DragDropTarget;
+ import games.stendhal.client.gui.IDraggable;
+ import games.stendhal.client.gui.IDropTarget;
  import games.stendhal.client.gui.MouseHandlerAdapter;
  import games.stendhal.client.gui.j2d.entity.Entity2DView;
  import games.stendhal.client.sprite.Sprite;
  import games.stendhal.client.sprite.SpriteStore;
***************
*** 55,59 ****
   */
  @SuppressWarnings("serial")
! public class EntitySlot extends JPanel implements WtDropTarget, DragDropOwner
  {
  	/**
--- 55,59 ----
   */
  @SuppressWarnings("serial")
! public class EntitySlot extends JPanel implements IDropTarget, DragDropOwner
  {
  	/**
***************
*** 113,117 ****
  
  	/** called when an object is dropped. */
! 	public boolean onDrop(final DropTargetDropEvent dsde, final WtDraggable droppedObject) {
  		if (parent == null) {
  			return false;
--- 113,117 ----
  
  	/** called when an object is dropped. */
! 	public boolean onDrop(final DropTargetDropEvent dsde, final IDraggable droppedObject) {
  		if (parent == null) {
  			return false;
***************
*** 256,260 ****
  	 * returns a draggable object.
  	 */
!     public WtDraggable getDragged(Point pt) {
  		if (view != null) {
  			return new MoveableEntityContainer(view.getEntity());
--- 256,260 ----
  	 * returns a draggable object.
  	 */
!     public IDraggable getDragged(Point pt) {
  		if (view != null) {
  			return new MoveableEntityContainer(view.getEntity());