[Arianne-commits] stendhal/src/games/stendhal/client/gui QuitDialog.java, 1.8, 1.9 j2DClient.java, 1.272, 1.273

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

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

Modified Files:
	QuitDialog.java j2DClient.java 
Log Message:
deleting StendhalUI to flatten hierarchy (Speculative Generality)

Index: QuitDialog.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/gui/QuitDialog.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** QuitDialog.java	12 Jul 2008 14:44:14 -0000	1.8
--- QuitDialog.java	4 Mar 2009 00:46:47 -0000	1.9
***************
*** 3,7 ****
  
  import games.stendhal.client.StendhalClient;
! import games.stendhal.client.StendhalUI;
  import games.stendhal.client.gui.styled.Style;
  import games.stendhal.client.gui.styled.WoodStyle;
--- 3,7 ----
  
  import games.stendhal.client.StendhalClient;
! import games.stendhal.client.gui.j2DClient;
  import games.stendhal.client.gui.styled.Style;
  import games.stendhal.client.gui.styled.WoodStyle;
***************
*** 77,81 ****
  		public void actionPerformed(final ActionEvent ev) {
  		
! 				StendhalUI.get().shutdown();
  		
  		}
--- 77,81 ----
  		public void actionPerformed(final ActionEvent ev) {
  		
! 				j2DClient.get().shutdown();
  		
  		}
***************
*** 99,104 ****
  		final Dimension psize = quitDialog.getPreferredSize();
  
! 		quitDialog.setBounds((StendhalUI.get().getWidth() - psize.width) / 2,
! 				(StendhalUI.get().getHeight() - psize.height) / 2, psize.width, psize.height);
  
  		quitDialog.validate();
--- 99,104 ----
  		final Dimension psize = quitDialog.getPreferredSize();
  
! 		quitDialog.setBounds((j2DClient.get().getWidth() - psize.width) / 2,
! 				(j2DClient.get().getHeight() - psize.height) / 2, psize.width, psize.height);
  
  		quitDialog.validate();

Index: j2DClient.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/gui/j2DClient.java,v
retrieving revision 1.272
retrieving revision 1.273
diff -C2 -d -r1.272 -r1.273
*** j2DClient.java	4 Mar 2009 00:22:59 -0000	1.272
--- j2DClient.java	4 Mar 2009 00:46:47 -0000	1.273
***************
*** 19,23 ****
  import games.stendhal.client.StaticGameLayers;
  import games.stendhal.client.StendhalClient;
- import games.stendhal.client.StendhalUI;
  import games.stendhal.client.UserContext;
  import games.stendhal.client.World;
--- 19,22 ----
***************
*** 80,84 ****
  
  /** The main class that create the screen and starts the arianne client. */
! public class j2DClient extends StendhalUI {
  
  
--- 79,106 ----
  
  /** The main class that create the screen and starts the arianne client. */
! public class j2DClient {
! 	/**
! 	 * A shared [singleton] copy.
! 	 */
! 	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;
! 	}
  
  
***************
*** 145,149 ****
  	private final IPerceptionListener perceptionListener = new PerceptionListenerImpl() {
  		int times;
- 		@Override
  		public void onSynced() {
  			setOffline(false);
--- 167,170 ----
***************
*** 155,159 ****
  		}
  		
- 		@Override
  		public void onUnsynced() {
  			times++;
--- 176,179 ----
***************
*** 168,171 ****
--- 188,196 ----
  	};
  
+ 	/**
+ 	 * The stendhal client.
+ 	 */
+ 	protected StendhalClient client;
+ 
  	private static final boolean newCode = (System.getProperty("stendhal.newgui") != null);
  
***************
*** 174,183 ****
  	 */
  	public j2DClient() {
! 		super(null);
  		setDefault(this);
  	}
  
  	public j2DClient(final StendhalClient client, final IGameScreen gameScreen, final UserContext userContext) {
! 		super(client);
  		this.userContext = userContext;
  		setDefault(this);
--- 199,208 ----
  	 */
  	public j2DClient() {
! 		
  		setDefault(this);
  	}
  
  	public j2DClient(final StendhalClient client, final IGameScreen gameScreen, final UserContext userContext) {
! 		this.client = client;
  		this.userContext = userContext;
  		setDefault(this);
***************
*** 241,250 ****
  		 */
  		mainFrame.getMainFrame().addWindowListener(new WindowAdapter() {
- 			@Override
  			public void windowOpened(final WindowEvent ev) {
  				chatText.getPlayerChatText().requestFocus();
  			}
  
- 			@Override
  			public void windowActivated(final WindowEvent ev) {
  				chatText.getPlayerChatText().requestFocus();
--- 266,273 ----
***************
*** 774,778 ****
  	 * Shutdown the client. Save state and tell the main loop to stop.
  	 */
- 	@Override
  	public void shutdown() {
  		gameRunning = false;
--- 797,800 ----
***************
*** 795,799 ****
  	 *             If an unsupported ManagedWindow is given.
  	 */
- 	@Override
  	public void addWindow(final ManagedWindow mw) {
  		if (mw instanceof InternalManagedDialog) {
--- 817,820 ----
***************
*** 812,816 ****
  	 * @return Returns <code>true</code> if down.
  	 */
- 	@Override
  	public boolean isAltDown() {
  		return altDown;
--- 833,836 ----
***************
*** 822,826 ****
  	 * @return Returns <code>true</code> if down.
  	 */
- 	@Override
  	public boolean isCtrlDown() {
  		return ctrlDown;
--- 842,845 ----
***************
*** 832,836 ****
  	 * @return Returns <code>true</code> if down.
  	 */
- 	@Override
  	public boolean isShiftDown() {
  		return shiftDown;
--- 851,854 ----
***************
*** 838,842 ****
  
  	//
! 	// StendhalUI
  	//
  
--- 856,860 ----
  
  	//
! 	// j2DClient
  	//
  
***************
*** 845,849 ****
  	 *
  	 */
- 	@Override
  	public void addEventLine(final EventLine line) {
  		gameLog.addLine(line);
--- 863,866 ----
***************
*** 853,857 ****
  	 * Initiate outfit selection by the user.
  	 */
- 	@Override
  	public void chooseOutfit() {
  		int outfit;
--- 870,873 ----
***************
*** 870,874 ****
  	}
  
- 	@Override
  	public void manageGuilds() {
  		final GuildManager gm = new GuildManager();
--- 886,889 ----
***************
*** 881,885 ****
  	 * @return The height.
  	 */
- 	@Override
  	public int getHeight() {
  		return (int) stendhal.screenSize.getHeight();
--- 896,899 ----
***************
*** 891,895 ****
  	 * @return The game screen.
  	 */
- 	@Override
  	public IGameScreen getScreen() {
  		return screen;
--- 905,908 ----
***************
*** 901,905 ****
  	 * @return The width.
  	 */
- 	@Override
  	public int getWidth() {
  		return (int) stendhal.screenSize.getWidth();
--- 914,917 ----
***************
*** 914,918 ****
  	 *            The text.
  	 */
- 	@Override
  	public void setChatLine(final String text) {
  		chatText.setChatLine(text);
--- 926,929 ----
***************
*** 932,936 ****
  	 *            The user's Y coordinate.
  	 */
- 	@Override
  	public void setPosition(final double x, final double y, final IGameScreen gameSreen) {
  		positionChangeListener.positionChanged(x, y);
--- 943,946 ----
***************
*** 943,947 ****
  	 *            <code>true</code> if offline.
  	 */
- 	@Override
  	public void setOffline(final boolean offline) {
  		screen.setOffline(offline);
--- 953,956 ----
***************
*** 1059,1063 ****
  
  
- 	@Override
  	public void requestQuit() {
  		quitDialog.requestQuit();
--- 1068,1071 ----
***************
*** 1069,1071 ****
--- 1077,1088 ----
  		return perceptionListener;
  	}
+ 
+ 	/**
+ 	 * Get the client.
+ 	 *
+ 	 * @return The client.
+ 	 */
+ 	public StendhalClient getClient() {
+ 		return client;
+ 	}
  }