From: Hendrik B. <nh...@us...> - 2012-03-26 19:53:46
|
Update of /cvsroot/arianne/stendhal/src/games/stendhal/client/gui In directory vz-cvs-4.sog:/tmp/cvs-serv18254/src/games/stendhal/client/gui Modified Files: j2DClient.java Log Message: moved fields above methods Index: j2DClient.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/gui/j2DClient.java,v retrieving revision 1.402 retrieving revision 1.403 diff -C2 -d -r1.402 -r1.403 *** j2DClient.java 19 Jan 2012 23:36:09 -0000 1.402 --- j2DClient.java 26 Mar 2012 19:53:44 -0000 1.403 *************** *** 93,116 **** private static j2DClient sharedUI; - /** - * Get the default UI. - * @return the instance - */ - public static j2DClient get() { - return sharedUI; - } - - /** - * Set the shared [singleton] value. - * - * @param sharedUI - * The Stendhal UI. - */ - public static void setDefault(final j2DClient sharedUI) { - j2DClient.sharedUI = sharedUI; - ClientSingletonRepository.setUserInterface(sharedUI); - } - - private static final long serialVersionUID = 3356310866399084117L; --- 93,96 ---- *************** *** 155,159 **** private boolean offline; ! OutfitDialog outfitDialog; --- 135,139 ---- private boolean offline; ! OutfitDialog outfitDialog; *************** *** 167,170 **** --- 147,172 ---- private UserContext userContext; + + + /** + * Get the default UI. + * @return the instance + */ + public static j2DClient get() { + return sharedUI; + } + + /** + * Set the shared [singleton] value. + * + * @param sharedUI + * The Stendhal UI. + */ + public static void setDefault(final j2DClient sharedUI) { + j2DClient.sharedUI = sharedUI; + ClientSingletonRepository.setUserInterface(sharedUI); + } + + private final IPerceptionListener perceptionListener = new PerceptionListenerImpl() { int times; *************** *** 563,567 **** /** Time of receiving the last network activity */ long lastMessageHandle; ! /** * Start the game loop thread. --- 565,569 ---- /** Time of receiving the last network activity */ long lastMessageHandle; ! /** * Start the game loop thread. *************** *** 580,584 **** final GameObjects gameObjects = client.getGameObjects(); final StaticGameLayers gameLayers = client.getStaticGameLayers(); ! loop.runAllways(new GameLoop.PersistentTask() { public void run(long time, int delta) { --- 582,586 ---- final GameObjects gameObjects = client.getGameObjects(); final StaticGameLayers gameLayers = client.getStaticGameLayers(); ! loop.runAllways(new GameLoop.PersistentTask() { public void run(long time, int delta) { *************** *** 586,590 **** } }); ! loop.runAtQuit(new Runnable() { public void run() { --- 588,592 ---- } }); ! loop.runAtQuit(new Runnable() { public void run() { *************** *** 592,599 **** } }); ! lastMessageHandle = System.currentTimeMillis(); gameRunning = true; ! loop.start(); } --- 594,601 ---- } }); ! lastMessageHandle = System.currentTimeMillis(); gameRunning = true; ! loop.start(); } *************** *** 601,605 **** /** * Main game loop contents. Updates objects, and requests redraws. ! * * @param time current time * @param delta difference to previous calling time --- 603,607 ---- /** * Main game loop contents. Updates objects, and requests redraws. ! * * @param time current time * @param delta difference to previous calling time *************** *** 611,615 **** // Check logouts first, in case something goes wrong with the drawing // code ! if (!gameRunning) { logger.info("Request logout"); --- 613,617 ---- // Check logouts first, in case something goes wrong with the drawing // code ! if (!gameRunning) { logger.info("Request logout"); *************** *** 633,637 **** } } ! // Shows a offline icon if the connection is broken setOffline(!client.getConnectionState()); --- 635,639 ---- } } ! // Shows a offline icon if the connection is broken setOffline(!client.getConnectionState()); *************** *** 961,965 **** outfit = player.getInt("outfit"); } ! if (outfitDialog == null) { // Here we actually want to call new OutfitColor(). Modifying --- 963,967 ---- outfit = player.getInt("outfit"); } ! if (outfitDialog == null) { // Here we actually want to call new OutfitColor(). Modifying |