[Magicmap-commits] magicmapclient/src/net/sf/magicmap/client/gui MainGUI.java,1.17,1.18 MapPanel.java,1.15,1.16

[Johannes Z. <jza...@us...>]

Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18597/src/net/sf/magicmap/client/gui

Modified Files:
	MainGUI.java MapPanel.java 
Log Message:
changed access to server communication for maps and geo points
added base rfid support

Index: MainGUI.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui/MainGUI.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** MainGUI.java	6 Mar 2006 10:46:57 -0000	1.17
--- MainGUI.java	6 Mar 2006 22:21:43 -0000	1.18
***************
*** 14,17 ****
--- 14,18 ----
  import java.io.StringWriter;
  import java.rmi.RemoteException;
+ import java.util.Iterator;
  import java.util.Locale;
  
***************
*** 47,50 ****
--- 48,52 ----
  import net.sf.magicmap.client.model.node.MapNode;
  import net.sf.magicmap.client.model.node.NodeModel;
+ import net.sf.magicmap.client.model.node.RFIDAntenna;
  import net.sf.magicmap.client.utils.Settings;
  import net.sf.magicmap.client.utils.Version;
***************
*** 116,119 ****
--- 118,122 ----
  	MapView                  mapView;
  	private MagicAction      invisibleAction;
+ 	private MagicAction		 rfidPollAction;
  	private MagicAction      simpleView;
  	private MagicAction      normalView;
***************
*** 123,128 ****
  	private static final int numberOfdataInvocationRateAction = 10;
  	private MagicAction[]    dataInvocationRateAction;
- 
- 	private Cursor cursor;
  	
  	/**
--- 126,129 ----
***************
*** 347,350 ****
--- 348,364 ----
  		};
  
+ 		rfidPollAction = new MagicAction("rfidpolling", GUIConstants.ICON_RFID_TAG, "rfidpollingtooltip") {
+ 			/**
+ 			 * serial version id
+ 			 */
+ 			private static final long serialVersionUID = 5676607442930257839L;
+ 			/* (non-Javadoc)
+ 			 * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
+ 			 */
+ 			public void actionPerformed(ActionEvent e) {
+ 				toogleRfidPolling();
+ 			}
+ 		};
+ 
      //    showAccessPoints = new MagicAction("showaccesspoints") {
      //
***************
*** 496,499 ****
--- 510,514 ----
  
  		invisibleAction.setEnabled(false);
+ 		rfidPollAction.setEnabled(false);
  		disconnectAction.setEnabled(false);
  		newMapAction.setEnabled(false);
***************
*** 654,657 ****
--- 669,674 ----
  		bar.addSeparator();
  		bar.add(GUIBuilder.createToolToggleButton(invisibleAction));
+ 		bar.addSeparator();
+ 		bar.add(GUIBuilder.createToolToggleButton(rfidPollAction));
  	}
  
***************
*** 684,688 ****
  		newMapAction.setEnabled(true);
  		loadMapAction.setEnabled(true);
! 		setCursor(cursor);
  //		Controller.getInstance().retrieveMapNames(MainGUI.this, false);
  		
--- 701,705 ----
  		newMapAction.setEnabled(true);
  		loadMapAction.setEnabled(true);
! 		setCursor(Cursor.DEFAULT_CURSOR);
  //		Controller.getInstance().retrieveMapNames(MainGUI.this, false);
  		
***************
*** 798,801 ****
--- 815,827 ----
  		expertView.setEnabled(true);
  		userDefinedView.setEnabled(true);
+ 
+ 		boolean rfidAntennaOnMap = false;
+ 		Iterator antennaIterator = Controller.getInstance().getRfidAntennas().iterator();
+ 		while (antennaIterator.hasNext()) {
+ 			if (((RFIDAntenna) antennaIterator.next()).getMap().equals(info.name)) {
+ 				rfidAntennaOnMap = true;
+ 			}
+ 		}
+ 		rfidPollAction.setEnabled(rfidAntennaOnMap);
  	}
  
***************
*** 809,812 ****
--- 835,847 ----
  		statusBar.setInvisible(Controller.getInstance().isInvisible());
  	}
+ 	
+ 
+ 	/**
+ 	 * Allows to activate the rfid polling
+ 	 */
+ 	protected void toogleRfidPolling() {
+ 		Controller.getInstance().setRfidPollingActive(!Controller.getInstance().isRfidPollingActive());
+ //		Controller.getInstance().
+ 	}
  
  	
***************
*** 815,819 ****
  	 */
  	protected void connect() {
- 		cursor = getCursor();
  		setCursor(new Cursor(Cursor.WAIT_CURSOR));
  		statusBar.setMessage(GUIUtils.i18n(GUIConstants.STATE_CONNECTING));
--- 850,853 ----
***************
*** 822,824 ****
--- 856,863 ----
  	}
  
+ 
+ 	public MagicAction getRfidPollAction() {
+ 		return rfidPollAction;
+ 	}
+ 
  }

Index: MapPanel.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui/MapPanel.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** MapPanel.java	28 Feb 2006 11:23:16 -0000	1.15
--- MapPanel.java	6 Mar 2006 22:21:43 -0000	1.16
***************
*** 38,41 ****
--- 38,42 ----
  import net.sf.magicmap.client.model.node.NodeModel;
  import net.sf.magicmap.client.model.node.RFIDAntenna;
+ import net.sf.magicmap.client.model.node.RFIDAntennaNode;
  import net.sf.magicmap.client.utils.Settings;
  import net.sf.magicmap.client.views.MapView;
***************
*** 275,279 ****
  		menu.addSeparator();
  		menu.add(GUIBuilder.createMenuItem(propertiesAction));
! 		deleteAction.setEnabled(node.getType() == NodeModel.NODETYPE_LOCATION);
  		renameAction.setEnabled(false);
  		propertiesAction.setEnabled(false);
--- 276,285 ----
  		menu.addSeparator();
  		menu.add(GUIBuilder.createMenuItem(propertiesAction));
! 		boolean deletionPossible = node.getType() == NodeModel.NODETYPE_LOCATION
! 		||
! //			node.getType() == NodeModel.NODETYPE_RFID_ANTENNA ||
! //			node.getType() == NodeModel.NODETYPE_INFO ||
! 			node.getType() == NodeModel.NODETYPE_GEOPOS;
! 		deleteAction.setEnabled(deletionPossible);
  		renameAction.setEnabled(false);
  		propertiesAction.setEnabled(false);
***************
*** 427,430 ****
--- 433,444 ----
        return;
      }
+     if (selectedNode.getType() == NodeModel.NODETYPE_RFID_ANTENNA) {
+         Controller.getInstance().getRfidAntennas().remove(((RFIDAntennaNode) selectedNode).getAntenna());
+         Controller.getInstance().deleteRfidAntenna(selectedNode.getName(), Controller.getInstance().getCurrentMap().name, this);
+         return;
+     }
+     if (selectedNode.getType() == NodeModel.NODETYPE_GEOPOS) {
+     	Controller.getInstance().deleteGeoPoint(selectedNode.getName(), Controller.getInstance().getCurrentMap().name, this);
+     }
    }