[Arianne-commits] stendhal/src/games/stendhal/client/gui/buddies WhereBuddyAction.java, NONE, 1.1 BuddyPanelControler.java, 1.6, 1.7 BuddyLabelPopMenu.java, 1.1, 1.2 WhereBuddyMenuItem.java, 1.1, NONE TalkBuddyMenuItem.java, 1.1, NONE RemoveBuddyMenuItem.java, 1.1, NONE LeaveMessageBuddyMenuItem.java, 1.1, NONE WhereBuddyMessageAction.java, 1.1, NONE

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

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

Modified Files:
	BuddyPanelControler.java BuddyLabelPopMenu.java 
Added Files:
	WhereBuddyAction.java 
Removed Files:
	WhereBuddyMenuItem.java TalkBuddyMenuItem.java 
	RemoveBuddyMenuItem.java LeaveMessageBuddyMenuItem.java 
	WhereBuddyMessageAction.java 
Log Message:
removed unnecessary subclassing

--- WhereBuddyMessageAction.java DELETED ---

Index: BuddyLabelPopMenu.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/gui/buddies/BuddyLabelPopMenu.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BuddyLabelPopMenu.java	13 Oct 2008 18:36:14 -0000	1.1
--- BuddyLabelPopMenu.java	13 Oct 2008 21:33:08 -0000	1.2
***************
*** 2,5 ****
--- 2,7 ----
  
  
+ import javax.swing.JMenuItem;
+ 
  import games.stendhal.client.gui.styled.Style;
  import games.stendhal.client.gui.styled.swing.StyledJPopupMenu;
***************
*** 16,20 ****
  		}
  		
! 		RemoveBuddyMenuItem removeBuddyMenuItem = new RemoveBuddyMenuItem(buddyName);
  		this.add(removeBuddyMenuItem);
  		removeBuddyMenuItem.addActionListener(new RemovebuddyAction(buddyName));
--- 18,22 ----
  		}
  		
! 		JMenuItem removeBuddyMenuItem = new JMenuItem("Remove");
  		this.add(removeBuddyMenuItem);
  		removeBuddyMenuItem.addActionListener(new RemovebuddyAction(buddyName));
***************
*** 22,26 ****
  
  	private void createOfflineMenu(final String buddyName) {
! 		LeaveMessageBuddyMenuItem leaveMessageBuddyMenuItem = new LeaveMessageBuddyMenuItem(buddyName);
  		this.add(leaveMessageBuddyMenuItem);
  		leaveMessageBuddyMenuItem.addActionListener(new LeaveBuddyMessageAction(buddyName));
--- 24,28 ----
  
  	private void createOfflineMenu(final String buddyName) {
! 		JMenuItem leaveMessageBuddyMenuItem = new JMenuItem("Leave Message");
  		this.add(leaveMessageBuddyMenuItem);
  		leaveMessageBuddyMenuItem.addActionListener(new LeaveBuddyMessageAction(buddyName));
***************
*** 29,40 ****
  
  	private void createOnlineMenu(final String buddyName) {
! 		TalkBuddyMenuItem talkBuddyMenuItem = new TalkBuddyMenuItem(buddyName);
  		this.add(talkBuddyMenuItem);
  		talkBuddyMenuItem.addActionListener(new TalkBuddyAction(buddyName));
  		
  		
! 		WhereBuddyMenuItem whereBuddyMenuItem = new WhereBuddyMenuItem(buddyName);
  		this.add(whereBuddyMenuItem);
! 		whereBuddyMenuItem.addActionListener(new WhereBuddyMessageAction(buddyName));
  		
  	}
--- 31,42 ----
  
  	private void createOnlineMenu(final String buddyName) {
! 		JMenuItem talkBuddyMenuItem = new JMenuItem("Talk");
  		this.add(talkBuddyMenuItem);
  		talkBuddyMenuItem.addActionListener(new TalkBuddyAction(buddyName));
  		
  		
! 		JMenuItem whereBuddyMenuItem = new JMenuItem("Where");
  		this.add(whereBuddyMenuItem);
! 		whereBuddyMenuItem.addActionListener(new WhereBuddyAction(buddyName));
  		
  	}

--- WhereBuddyMenuItem.java DELETED ---

--- NEW FILE: WhereBuddyAction.java ---
package games.stendhal.client.gui.buddies;

import games.stendhal.client.actions.SlashActionRepository;

import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;

public class WhereBuddyAction implements ActionListener {

	private final String buddyName;

	public WhereBuddyAction(final String buddyName) {
		this.buddyName = buddyName;
	}

	public void actionPerformed(final ActionEvent e) {
		final String [] args = new String [1];
		args[0] = buddyName;
		
		SlashActionRepository.get("where").execute(args, null);
	

	}

}

--- LeaveMessageBuddyMenuItem.java DELETED ---

Index: BuddyPanelControler.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/gui/buddies/BuddyPanelControler.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** BuddyPanelControler.java	13 Oct 2008 18:36:14 -0000	1.6
--- BuddyPanelControler.java	13 Oct 2008 21:33:08 -0000	1.7
***************
*** 20,24 ****
  		buddyPanel.addBuddy(buddyName, false);
  		buddyPanel.validate();
! 
  	}
  
--- 20,24 ----
  		buddyPanel.addBuddy(buddyName, false);
  		buddyPanel.validate();
! 	
  	}
  

--- TalkBuddyMenuItem.java DELETED ---

--- RemoveBuddyMenuItem.java DELETED ---