[Arianne-commits] stendhal/src/games/stendhal/client/gui/j2d/entity Sheep2DView.java, 1.5, 1.6 Pet2DView.java, 1.5, 1.6

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

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

Modified Files:
	Sheep2DView.java Pet2DView.java 
Log Message:
move around ifs and elses for better readability

Index: Sheep2DView.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/gui/j2d/entity/Sheep2DView.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Sheep2DView.java	30 Jan 2008 21:23:48 -0000	1.5
--- Sheep2DView.java	31 Jan 2008 22:50:26 -0000	1.6
***************
*** 64,72 ****
  	protected void buildActions(final List<String> list) {
  		super.buildActions(list);
! 		if (!User.isNull() && User.get().hasSheep() && User.get().getSheepID()==((Sheep) entity).getID().getObjectID()) {
! 			list.add(ActionType.LEAVE_SHEEP.getRepresentation());
! 		}
! 		if (!User.isNull() && !User.get().hasSheep()) {
! 			list.add(ActionType.OWN.getRepresentation());
  		}
  	}
--- 64,73 ----
  	protected void buildActions(final List<String> list) {
  		super.buildActions(list);
! 		if (!User.isNull()) {
! 			if (!User.get().hasSheep()) {
! 				list.add(ActionType.OWN.getRepresentation());
! 			} else if (User.get().getSheepID() == ((Sheep) entity).getID().getObjectID()) {
! 				list.add(ActionType.LEAVE_SHEEP.getRepresentation());
! 			}
  		}
  	}

Index: Pet2DView.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/gui/j2d/entity/Pet2DView.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Pet2DView.java	30 Jan 2008 21:23:48 -0000	1.5
--- Pet2DView.java	31 Jan 2008 22:50:27 -0000	1.6
***************
*** 64,72 ****
  	protected void buildActions(final List<String> list) {
  		super.buildActions(list);
! 		if (!User.isNull() && User.get().hasPet()&& User.get().getPetID()==((Pet) entity).getID().getObjectID()) {
! 			list.add(ActionType.LEAVE_PET.getRepresentation());
! 		}
! 		if (!User.isNull() && !User.get().hasPet()) {
! 			list.add(ActionType.OWN.getRepresentation());
  		}
  	}
--- 64,74 ----
  	protected void buildActions(final List<String> list) {
  		super.buildActions(list);
! 		if (!User.isNull()) {
! 			if (!User.get().hasPet()) {
! 				list.add(ActionType.OWN.getRepresentation());
! 			} else if (User.get().getPetID() == ((Pet) entity).getID().getObjectID()) {
! 				list.add(ActionType.LEAVE_PET.getRepresentation());
! 			}
! 
  		}
  	}