[Arianne-commits] stendhal/src/games/stendhal/client/gui ChatTextController.java, 1.3, 1.4 j2DClient.java, 1.256, 1.257 ChatCache.java, 1.1, 1.2 StendhalChatLineListener.java, 1.71, NONE

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

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

Modified Files:
	ChatTextController.java j2DClient.java ChatCache.java 
Removed Files:
	StendhalChatLineListener.java 
Log Message:
tearing j2dclient into its parts
deleted class stendhalchatlinelistener

Index: ChatTextController.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/gui/ChatTextController.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ChatTextController.java	17 Oct 2008 18:37:19 -0000	1.3
--- ChatTextController.java	18 Oct 2008 17:23:42 -0000	1.4
***************
*** 3,8 ****
--- 3,10 ----
  
  import games.stendhal.client.stendhal;
+ import games.stendhal.client.scripting.ChatLineParser;
  
  import java.awt.Component;
+ import java.awt.event.ActionEvent;
  import java.awt.event.ActionListener;
  import java.awt.event.KeyAdapter;
***************
*** 20,23 ****
--- 22,26 ----
  		playerChatText.setFocusTraversalKeysEnabled(false);
  		playerChatText.addKeyListener(new ChatTextKeyListener());
+ 		addActionListener(new ParserHandler());
  		cache = new ChatCache(CHAT_LOG_FILE);
  		cache.loadChatCache();
***************
*** 59,63 ****
--- 62,77 ----
  		
  	}
+ 	class ParserHandler implements ActionListener {
+ 
+ 		public void actionPerformed(final ActionEvent e) {
+ 			final String text = e.getActionCommand();
  
+ 			if (ChatLineParser.parseAndHandle(text)) {
+ 				clearLine();
+ 
+ 			}
+ 
+ 		}
+ 	}
  	public void addActionListener(final ActionListener l) {
  		playerChatText.addActionListener(l);

--- StendhalChatLineListener.java DELETED ---

Index: ChatCache.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/gui/ChatCache.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ChatCache.java	16 Oct 2008 13:10:31 -0000	1.1
--- ChatCache.java	18 Oct 2008 17:23:42 -0000	1.2
***************
*** 72,76 ****
  			fo.close();
  		} catch (final Exception ex) {
! 			StendhalChatLineListener.logger.error(ex, ex);
  		}
  	}
--- 72,76 ----
  			fo.close();
  		} catch (final Exception ex) {
! 			logger.error(ex, ex);
  		}
  	}

Index: j2DClient.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/gui/j2DClient.java,v
retrieving revision 1.256
retrieving revision 1.257
diff -C2 -d -r1.256 -r1.257
*** j2DClient.java	18 Oct 2008 13:14:55 -0000	1.256
--- j2DClient.java	18 Oct 2008 17:23:42 -0000	1.257
***************
*** 140,144 ****
  
  	private PositionChangeMulticaster positionChangeListener;
- 	private StendhalChatLineListener chatListener;
  	/**
  	 * Delayed direction release holder.
--- 140,143 ----
***************
*** 159,165 ****
  		super(client);
  		
! 			final String[] dim = stendhal.SCREEN_SIZE.split("x");
! 			SCREEN_WIDTH = Integer.parseInt(dim[0]);
! 			SCREEN_HEIGHT = Integer.parseInt(dim[1]);
  		
  		setDefault(this);
--- 158,164 ----
  		super(client);
  		
! 		final String[] dim = stendhal.SCREEN_SIZE.split("x");
! 		SCREEN_WIDTH = Integer.parseInt(dim[0]);
! 		SCREEN_HEIGHT = Integer.parseInt(dim[1]);
  		
  		setDefault(this);
***************
*** 206,215 ****
  		// register the slash actions in the client side command line parser
  		SlashActionRepository.register();
- 
- 		
- 
- 		chatListener = new StendhalChatLineListener(chatText);
- 		
- 		chatText.addActionListener(chatListener);
  		KeyAdapter tabcompletion = new ChatCompletionHelper(chatText, client.whoplayers);
  		chatText.addKeyListener(tabcompletion);
--- 205,208 ----