[Arianne-commits] stendhal/src/games/stendhal/tools/playerUpdate UpdatePlayerEntities.java, 1.2, 1.3

[Astrid Sawatzky <astridemma@us...>]

Update of /cvsroot/arianne/stendhal/src/games/stendhal/tools/playerUpdate
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv12176/src/games/stendhal/tools/playerUpdate

Modified Files:
	UpdatePlayerEntities.java 
Log Message:
code format and 1 method rename

Index: UpdatePlayerEntities.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/tools/playerUpdate/UpdatePlayerEntities.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** UpdatePlayerEntities.java	16 Mar 2009 16:16:44 -0000	1.2
--- UpdatePlayerEntities.java	16 Mar 2009 21:34:38 -0000	1.3
***************
*** 13,24 ****
  
  /**
!  * Loads all Players from the database, performs update operations and saves afterwards 
   * @author madmetzger
   */
  public class UpdatePlayerEntities {
  
!     private StendhalPlayerDatabase spdb;
  
!     public UpdatePlayerEntities() {
      	this.spdb = (StendhalPlayerDatabase) SingletonRepository.getPlayerDatabase();
      	MockStendlRPWorld.get();
--- 13,24 ----
  
  /**
!  * Loads all Players from the database, performs update operations and saves afterwards. 
   * @author madmetzger
   */
  public class UpdatePlayerEntities {
  
!     private final StendhalPlayerDatabase spdb;
  
!     private UpdatePlayerEntities() {
      	this.spdb = (StendhalPlayerDatabase) SingletonRepository.getPlayerDatabase();
      	MockStendlRPWorld.get();
***************
*** 26,38 ****
      
  	private void loadAndUpdatePlayers() {
!     	Iterator<RPObject> i = spdb.iterator();
!     	while(i.hasNext()) {
      		try {
! 	    		RPObject next = i.next();
! 	    		Player p = createPlayerFromRPO(next);
! 	    		updateAndSavePlayer(p);
! 			} catch (SQLException e) {
  				e.printStackTrace();
! 			} catch (IOException e) {
  				e.printStackTrace();
  			}
--- 26,38 ----
      
  	private void loadAndUpdatePlayers() {
!     	final Iterator<RPObject> i = spdb.iterator();
!     	while (i.hasNext()) {
      		try {
! 	    		final RPObject next = i.next();
! 	    		final Player p = createPlayerFromRPO(next);
! 	    		savePlayer(p);
! 			} catch (final SQLException e) {
  				e.printStackTrace();
! 			} catch (final IOException e) {
  				e.printStackTrace();
  			}
***************
*** 40,58 ****
      }
  
! 	public Player createPlayerFromRPO(RPObject next) {
! 		Player p = Player.create(next);
  		return p;
  	}
  
! 	public void updateAndSavePlayer(Player p)
  			throws SQLException, IOException {
! 		spdb.storeCharacter(spdb.getTransaction(),p.getName(),p.getName(),p);
  	}
      
!     public void doUpdate() {
  		this.loadAndUpdatePlayers();
  	}
      
! 	public static void main(String[] args) {
          new UpdatePlayerEntities().doUpdate();
      }
--- 40,58 ----
      }
  
! 	private Player createPlayerFromRPO(final RPObject next) {
! 		final Player p = Player.create(next);
  		return p;
  	}
  
! 	private void savePlayer(final Player p)
  			throws SQLException, IOException {
! 		spdb.storeCharacter(spdb.getTransaction(), p.getName(), p.getName(), p);
  	}
      
!     private void doUpdate() {
  		this.loadAndUpdatePlayers();
  	}
      
! 	public static void main(final String[] args) {
          new UpdatePlayerEntities().doUpdate();
      }

[Arianne-commits] stendhal/tests/games/stendhal/tools/playerUpdate - New directory

[MadMetzger <madmetzger@us...>]

Update of /cvsroot/arianne/stendhal/tests/games/stendhal/tools/playerUpdate
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv29791/tests/games/stendhal/tools/playerUpdate

Log Message:
Directory /cvsroot/arianne/stendhal/tests/games/stendhal/tools/playerUpdate added to the repository

[Arianne-commits] stendhal/tests/games/stendhal/tools/playerUpdate UpdatePlayerEntitiesTest.java, NONE, 1.1

[MadMetzger <madmetzger@us...>]

Update of /cvsroot/arianne/stendhal/tests/games/stendhal/tools/playerUpdate
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv29906/tests/games/stendhal/tools/playerUpdate

Added Files:
	UpdatePlayerEntitiesTest.java 
Log Message:
current state of updateplayerentities

--- NEW FILE: UpdatePlayerEntitiesTest.java ---
package games.stendhal.tools.playerUpdate;

import java.io.IOException;
import java.sql.SQLException;

import games.stendhal.server.core.engine.SingletonRepository;
import games.stendhal.server.core.engine.StendhalPlayerDatabase;
import games.stendhal.server.core.rule.EntityManager;
import games.stendhal.server.entity.item.Item;
import games.stendhal.server.entity.player.Player;
import games.stendhal.server.maps.MockStendlRPWorld;
import games.stendhal.tools.modifer.PlayerModifier;

import marauroa.common.game.RPObject;
import marauroa.common.game.RPSlot;

import org.junit.Before;
import org.junit.Test;

import utilities.PlayerTestHelper;

import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;

import static org.junit.Assert.*;

public class UpdatePlayerEntitiesTest {

	@Before
	public void setUp() throws Exception {
		MockStendlRPWorld.get();
	}

	@Test
	public void testDoUpdate() throws SQLException, IOException {
		StendhalPlayerDatabase spdb = (StendhalPlayerDatabase) SingletonRepository.getPlayerDatabase();
		EntityManager em = SingletonRepository.getEntityManager();
		PlayerModifier pm = new PlayerModifier();
		pm.setDatabase(spdb);
		Player p = PlayerTestHelper.createPlayer("madmetzger");
		p.equip((Item) em.getEntity("leather armor"), 1);
		p.getSlot("bag").getFirst().put("name","leather_armor_+1");
		pm.savePlayer(p);
		UpdatePlayerEntities updatePlayerEntities = new UpdatePlayerEntities();
		updatePlayerEntities.createPlayerFromRPO((RPObject)p);
		updatePlayerEntities.updateAndSavePlayer(p);
		Player loaded = pm.loadPlayer("madmetzger");
		assertThat(loaded.getSlot("bag").getFirst().get("name"),not(is("leather_armor_+1")));
	}

}

[Arianne-commits] stendhal/src/games/stendhal/tools/playerUpdate UpdatePlayerEntities.java, 1.1, 1.2

[MadMetzger <madmetzger@us...>]

Update of /cvsroot/arianne/stendhal/src/games/stendhal/tools/playerUpdate
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv29906/src/games/stendhal/tools/playerUpdate

Modified Files:
	UpdatePlayerEntities.java 
Log Message:
current state of updateplayerentities

Index: UpdatePlayerEntities.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/tools/playerUpdate/UpdatePlayerEntities.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** UpdatePlayerEntities.java	16 Mar 2009 09:06:42 -0000	1.1
--- UpdatePlayerEntities.java	16 Mar 2009 16:16:44 -0000	1.2
***************
*** 1,44 ****
! package games.stendhal.tools.playerUpdate;
! 
! import games.stendhal.server.core.engine.StendhalPlayerDatabase;
! import games.stendhal.server.entity.player.Player;
! 
! import java.io.IOException;
! import java.sql.SQLException;
! import java.util.Iterator;
! 
! import marauroa.common.game.RPObject;
! 
! /**
!  * Loads all Players from the database, performs update operations and saves afterwards. 
!  * @author madmetzger
!  */
! public class UpdatePlayerEntities {
! 
!     /**
!      * Loads a player from database.
!      * @return the player
!      */
!     public void loadAndUpdatePlayers() {
!         StendhalPlayerDatabase spdb = (StendhalPlayerDatabase) StendhalPlayerDatabase.getDatabase();
!         Iterator<RPObject> i = spdb.iterator();
!         while (i.hasNext()) {
!             Player player = Player.create(i.next());
!             try {
!                 spdb.storeCharacter(spdb.getTransaction(), player.getName(), player.getName(), player);
!             } catch (SQLException e) {
!                 e.printStackTrace();
!             } catch (IOException e) {
!                 e.printStackTrace();
!             }
!         }
!         spdb.close();
!     }
!     
!     public static void main(final String[] args) {
!         new UpdatePlayerEntities().loadAndUpdatePlayers();
!     }
! 
! }
  
   	  	 
--- 1,62 ----
! package games.stendhal.tools.playerUpdate;
! 
! import games.stendhal.server.core.engine.SingletonRepository;
! import games.stendhal.server.core.engine.StendhalPlayerDatabase;
! import games.stendhal.server.entity.player.Player;
! import games.stendhal.server.maps.MockStendlRPWorld;
! 
! import java.io.IOException;
! import java.sql.SQLException;
! import java.util.Iterator;
! 
! import marauroa.common.game.RPObject;
! 
! /**
!  * Loads all Players from the database, performs update operations and saves afterwards 
!  * @author madmetzger
!  */
! public class UpdatePlayerEntities {
! 
!     private StendhalPlayerDatabase spdb;
! 
!     public UpdatePlayerEntities() {
!     	this.spdb = (StendhalPlayerDatabase) SingletonRepository.getPlayerDatabase();
!     	MockStendlRPWorld.get();
!     }
!     
! 	private void loadAndUpdatePlayers() {
!     	Iterator<RPObject> i = spdb.iterator();
!     	while(i.hasNext()) {
!     		try {
! 	    		RPObject next = i.next();
! 	    		Player p = createPlayerFromRPO(next);
! 	    		updateAndSavePlayer(p);
! 			} catch (SQLException e) {
! 				e.printStackTrace();
! 			} catch (IOException e) {
! 				e.printStackTrace();
! 			}
!     	}
!     }
! 
! 	public Player createPlayerFromRPO(RPObject next) {
! 		Player p = Player.create(next);
! 		return p;
! 	}
! 
! 	public void updateAndSavePlayer(Player p)
! 			throws SQLException, IOException {
! 		spdb.storeCharacter(spdb.getTransaction(),p.getName(),p.getName(),p);
! 	}
!     
!     public void doUpdate() {
! 		this.loadAndUpdatePlayers();
! 	}
!     
! 	public static void main(String[] args) {
!         new UpdatePlayerEntities().doUpdate();
!     }
! 
! }
  
   	  	 

[Arianne-commits] stendhal/tests/utilities MockScreen.java, 1.12, 1.13

[Astrid Sawatzky <astridemma@us...>]

Update of /cvsroot/arianne/stendhal/tests/utilities
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv3961/tests/utilities

Modified Files:
	MockScreen.java 
Log Message:
removed deprecated methods from IGamescreen interface and its implementors

Index: MockScreen.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/tests/utilities/MockScreen.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** MockScreen.java	9 Jan 2009 11:25:41 -0000	1.12
--- MockScreen.java	16 Mar 2009 11:05:32 -0000	1.13
***************
*** 13,26 ****
  
  import java.awt.Color;
- import java.awt.Dimension;
- import java.awt.Font;
  import java.awt.Graphics;
  import java.awt.Graphics2D;
  import java.awt.Point;
  import java.awt.Rectangle;
- import java.awt.geom.Dimension2D;
  import java.awt.geom.Point2D;
  import java.awt.geom.Rectangle2D;
- import java.text.AttributedString;
  
  public class MockScreen implements IGameScreen {
--- 13,22 ----
***************
*** 81,88 ****
  	}
  
- 	public Point convertWorldToScreenView(final Point2D pos) {
- 		return null;
- 	}
- 
  	public Sprite createString(final String text, final NotificationType type) {
  
--- 77,80 ----
***************
*** 95,104 ****
  	}
  
- 	public Sprite createTextBox(final String text, final int width, final Color textColor,
- 			final Color fillColor, final boolean isTalking) {
- 
- 		return null;
- 	}
- 
  	public void draw() {
  	}
--- 87,90 ----
***************
*** 121,156 ****
  	}
  
- 	public AttributedString formatLine(final String line, final Font fontNormal, final Color colorNormal) {
- 		return null;
- 	}
- 
- 	public Dimension convertWorldToScreen(final Dimension2D d) {
- 	    return null;
-     }
- 
- 	public Dimension convertWorldXToScreenView(final Dimension s) {
- 	    return null;
-     }
- 
- 	public Dimension getScreenSize() {
- 	    return null;
-     }
- 
- 	public Point getScreenViewPos() {
- 	    return null;
-     }
- 
- 	public Dimension getScreenViewSize() {
- 	    return null;
-     }
- 
- 	public Point2D getViewPos() {
- 	    return null;
-     }
- 
- 	public Dimension getViewSize() {
- 	    return null;
-     }
- 
  	public Text getTextAt(final double x, final double y) {
  		return null;
--- 107,110 ----

[Arianne-commits] stendhal/src/games/stendhal/client IGameScreen.java, 1.13, 1.14 GameScreen.java, 1.124, 1.125

[Astrid Sawatzky <astridemma@us...>]

Update of /cvsroot/arianne/stendhal/src/games/stendhal/client
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv3961/src/games/stendhal/client

Modified Files:
	IGameScreen.java GameScreen.java 
Log Message:
removed deprecated methods from IGamescreen interface and its implementors

Index: IGameScreen.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/IGameScreen.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** IGameScreen.java	8 Mar 2009 10:05:28 -0000	1.13
--- IGameScreen.java	16 Mar 2009 11:05:32 -0000	1.14
***************
*** 9,13 ****
  
  import java.awt.Color;
- import java.awt.Font;
  import java.awt.Graphics;
  import java.awt.Graphics2D;
--- 9,12 ----
***************
*** 16,20 ****
  import java.awt.geom.Point2D;
  import java.awt.geom.Rectangle2D;
- import java.text.AttributedString;
  
  public interface IGameScreen {
--- 15,18 ----
***************
*** 401,424 ****
  
  	/**
- 	 * Formats a text by changing the color of words starting with
- 	 * #.
- 	 *
- 	 * @param line
- 	 *            the text
- 	 * @param fontNormal
- 	 *            the font
- 	 * @param colorNormal
- 	 *            normal color (for non-special text)
- 	 * @return the formatted string
- 	 */
- 	@Deprecated
- 	AttributedString formatLine(String line, Font fontNormal,
- 			Color colorNormal);
- 
- 	@Deprecated
- 	Sprite createTextBox(String text, int width,
- 			Color textColor, Color fillColor, boolean isTalking);
- 
- 	/**
  	 * Convert a world unit value to a screen unit value.
  	 *
--- 399,402 ----

Index: GameScreen.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/GameScreen.java,v
retrieving revision 1.124
retrieving revision 1.125
diff -C2 -d -r1.124 -r1.125
*** GameScreen.java	8 Mar 2009 10:05:28 -0000	1.124
--- GameScreen.java	16 Mar 2009 11:05:32 -0000	1.125
***************
*** 15,20 ****
  import games.stendhal.client.entity.IEntity;
  import games.stendhal.client.events.PositionChangeListener;
- import games.stendhal.client.gui.j2d.TextBoxFactory;
  import games.stendhal.client.gui.j2d.Text;
  import games.stendhal.client.gui.j2d.entity.Entity2DView;
  import games.stendhal.client.gui.j2d.entity.EntityView;
--- 15,20 ----
  import games.stendhal.client.entity.IEntity;
  import games.stendhal.client.events.PositionChangeListener;
  import games.stendhal.client.gui.j2d.Text;
+ import games.stendhal.client.gui.j2d.TextBoxFactory;
  import games.stendhal.client.gui.j2d.entity.Entity2DView;
  import games.stendhal.client.gui.j2d.entity.EntityView;
***************
*** 29,33 ****
  import java.awt.Canvas;
  import java.awt.Color;
- import java.awt.Font;
  import java.awt.Graphics;
  import java.awt.Graphics2D;
--- 29,32 ----
***************
*** 41,45 ****
  import java.awt.geom.Rectangle2D;
  import java.awt.image.BufferStrategy;
- import java.text.AttributedString;
  import java.util.Collections;
  import java.util.Comparator;
--- 40,43 ----
***************
*** 169,173 ****
  	}
  
! 	private TextBoxFactory textBoxFactory;
  
  	/**
--- 167,171 ----
  	}
  
! 	private final TextBoxFactory textBoxFactory;
  
  	/**
***************
*** 493,506 ****
  	}
  	
- 	public Sprite createTextBox(String text, final int width, final Color textColor,
- 			final Color fillColor, final boolean isTalking) {
- 		return textBoxFactory.createTextBox(text, width, textColor, fillColor, isTalking);
- 	}
- 	
- 	public AttributedString formatLine(final String line,
- 			final Font fontNormal, final Color colorNormal) {
- 		return textBoxFactory.formatLine(line, fontNormal, colorNormal);
- 	}
- 
  	/*
  	 * Draw the screen.
--- 491,494 ----

[Arianne-commits] stendhal/src/games/stendhal/client/gui/j2d TextBoxFactory.java, 1.1, 1.2

[Astrid Sawatzky <astridemma@us...>]

Update of /cvsroot/arianne/stendhal/src/games/stendhal/client/gui/j2d
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv3961/src/games/stendhal/client/gui/j2d

Modified Files:
	TextBoxFactory.java 
Log Message:
removed deprecated methods from IGamescreen interface and its implementors

Index: TextBoxFactory.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/gui/j2d/TextBoxFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TextBoxFactory.java	7 Mar 2009 18:22:23 -0000	1.1
--- TextBoxFactory.java	16 Mar 2009 11:05:32 -0000	1.2
***************
*** 26,36 ****
  	private Graphics2D graphics;
  	
! 	/** space to be left at the beginning and end of line in pixels */
  	private static final int MARGIN_WIDTH = 3;
! 	/** height of text lines in pixels */
  	private static final int LINE_HEIGHT = 16;
! 	/** space needed for the bubble "handle" in pixels */
  	private static final int BUBBLE_OFFSET = 10;
! 	/** the diameter of the arc of the rounded bubble corners */
  	private static final int ARC_DIAMETER = 2 * MARGIN_WIDTH;
  	
--- 26,36 ----
  	private Graphics2D graphics;
  	
! 	/** space to be left at the beginning and end of line in pixels. */
  	private static final int MARGIN_WIDTH = 3;
! 	/** height of text lines in pixels. */
  	private static final int LINE_HEIGHT = 16;
! 	/** space needed for the bubble "handle" in pixels. */
  	private static final int BUBBLE_OFFSET = 10;
! 	/** the diameter of the arc of the rounded bubble corners. */
  	private static final int ARC_DIAMETER = 2 * MARGIN_WIDTH;
  	
***************
*** 40,44 ****
  	
  	/**
! 	 * Creates a text box sprite
  	 * 
  	 * @param text the text inside the box
--- 40,44 ----
  	
  	/**
! 	 * Creates a text box sprite.
  	 * 
  	 * @param text the text inside the box
***************
*** 50,59 ****
  	 * @return sprite of the text box
  	 */
! 	public Sprite createTextBox(String text, final int width, final Color textColor,
  			final Color fillColor, final boolean isTalking) {
- 		text = text.trim();
  
  		// Format before splitting to get the coloring right
! 		final AttributedString formattedString = formatLine(text, graphics.getFont(), textColor);
  		// split it to max width long pieces
  		final List<AttributedCharacterIterator> formattedLines = splitFormatted(formattedString, width);
--- 50,58 ----
  	 * @return sprite of the text box
  	 */
! 	public Sprite createTextBox(final String text, final int width, final Color textColor,
  			final Color fillColor, final boolean isTalking) {
  
  		// Format before splitting to get the coloring right
! 		final AttributedString formattedString = formatLine(text.trim(), graphics.getFont(), textColor);
  		// split it to max width long pieces
  		final List<AttributedCharacterIterator> formattedLines = splitFormatted(formattedString, width);
***************
*** 92,96 ****
  	
  	 /**
! 	  * Draw a chat bubble  
  	  *
  	  * @param g2d 
--- 91,95 ----
  	
  	 /**
! 	  * Draw a chat bubble.  
  	  *
  	  * @param g2d 
***************
*** 177,181 ****
  	
  	/**
! 	 * split a text to lines with specified maximum width, preserving the line breaks in the original
  	 * 
  	 * @param text the text to be split
--- 176,180 ----
  	
  	/**
! 	 * splits a text to lines with specified maximum width, preserving the line breaks in the original.
  	 * 
  	 * @param text the text to be split

[Arianne-commits] stendhal/src/games/stendhal/tools/playerUpdate UpdatePlayerEntities.java, NONE, 1.1

[Astrid Sawatzky <astridemma@us...>]

Update of /cvsroot/arianne/stendhal/src/games/stendhal/tools/playerUpdate
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv30476/src/games/stendhal/tools/playerUpdate

Added Files:
	UpdatePlayerEntities.java 
Log Message:
applying patch provided by madmetzger
introducing class UpdatePlayerEntities.
loads all player rpobject and stores them back, by which the rpobject is updated to the newest version

--- NEW FILE: UpdatePlayerEntities.java ---
package games.stendhal.tools.playerUpdate;

import games.stendhal.server.core.engine.StendhalPlayerDatabase;
import games.stendhal.server.entity.player.Player;

import java.io.IOException;
import java.sql.SQLException;
import java.util.Iterator;

import marauroa.common.game.RPObject;

/**
 * Loads all Players from the database, performs update operations and saves afterwards. 
 * @author madmetzger
 */
public class UpdatePlayerEntities {

    /**
     * Loads a player from database.
     * @return the player
     */
    public void loadAndUpdatePlayers() {
        StendhalPlayerDatabase spdb = (StendhalPlayerDatabase) StendhalPlayerDatabase.getDatabase();
        Iterator<RPObject> i = spdb.iterator();
        while (i.hasNext()) {
            Player player = Player.create(i.next());
            try {
                spdb.storeCharacter(spdb.getTransaction(), player.getName(), player.getName(), player);
            } catch (SQLException e) {
                e.printStackTrace();
            } catch (IOException e) {
                e.printStackTrace();
            }
        }
        spdb.close();
    }
    
    public static void main(final String[] args) {
        new UpdatePlayerEntities().loadAndUpdatePlayers();
    }

}

 	  	 

[Arianne-commits] stendhal/src/games/stendhal/tools/playerUpdate - New directory

[Astrid Sawatzky <astridemma@us...>]

Update of /cvsroot/arianne/stendhal/src/games/stendhal/tools/playerUpdate
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv30450/src/games/stendhal/tools/playerUpdate

Log Message:
Directory /cvsroot/arianne/stendhal/src/games/stendhal/tools/playerUpdate added to the repository