[Magicmap-commits] magicmapclient/src/net/sf/magicmap/client/views MapView.java,1.16,1.17 OutlineView.java,1.7,1.8

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

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

Modified Files:
	MapView.java OutlineView.java 
Log Message:
added support for info objects and rfid antennas and tags

Index: OutlineView.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/views/OutlineView.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** OutlineView.java	26 Feb 2006 10:20:57 -0000	1.7
--- OutlineView.java	28 Feb 2006 11:23:16 -0000	1.8
***************
*** 60,63 ****
--- 60,66 ----
  	private OutlineNode nodeLocations;
  	private OutlineNode nodeGeoPoints;
+ 	private OutlineNode nodeInfoObjects;
+ 	private OutlineNode nodeRFIDAntennas;
+ 	private OutlineNode nodeRFIDTags;
  	
  	
***************
*** 87,90 ****
--- 90,96 ----
  		//TODO internationalize
  		nodeGeoPoints = new OutlineNode("Geokoordinaten");
+ 		nodeInfoObjects = new OutlineNode("Infoobjekte");
+ 		nodeRFIDAntennas = new OutlineNode("RFID Antennen");
+ 		nodeRFIDTags = new OutlineNode("RFID Tags");
  
  		treeroot.add(nodeMaps);
***************
*** 93,96 ****
--- 99,105 ----
  		treeroot.add(nodeLocations);
  		treeroot.add(nodeGeoPoints);
+ 		treeroot.add(nodeInfoObjects);
+ 		treeroot.add(nodeRFIDAntennas);
+ 		treeroot.add(nodeRFIDTags);
      
  		tree = new JTree(treemodel);
***************
*** 172,175 ****
--- 181,197 ----
  				index = getAlphabeticalIndex(nodeGeoPoints, on);
  				treemodel.insertNodeInto(on, nodeGeoPoints, index);
+ 				break;
+ 			case NodeModel.NODETYPE_INFO:
+ 				index = getAlphabeticalIndex(nodeInfoObjects, on);
+ 				treemodel.insertNodeInto(on, nodeInfoObjects, index);
+ 				break;
+ 			case NodeModel.NODETYPE_RFID_ANTENNA:
+ 				index = getAlphabeticalIndex(nodeRFIDAntennas, on);
+ 				treemodel.insertNodeInto(on, nodeRFIDAntennas, index);
+ 				break;
+ 			case NodeModel.NODETYPE_RFID_TAG:
+ 				index = getAlphabeticalIndex(nodeRFIDTags, on);
+ 				treemodel.insertNodeInto(on, nodeRFIDTags, index);
+ 				break;
  		}
  		
***************
*** 214,217 ****
--- 236,242 ----
  			this.nodeLocations.removeAllChildren();
  			this.nodeGeoPoints.removeAllChildren();
+ 			this.nodeInfoObjects.removeAllChildren();
+ 			this.nodeRFIDAntennas.removeAllChildren();
+ 			this.nodeRFIDTags.removeAllChildren();
  			treemodel.reload();
  		}
***************
*** 295,298 ****
--- 320,329 ----
  			case NodeModel.NODETYPE_GEOPOS :
  				return findOutlineNode(nodeGeoPoints, node);
+ 			case NodeModel.NODETYPE_INFO:
+ 				return findOutlineNode(nodeInfoObjects, node);
+ 			case NodeModel.NODETYPE_RFID_ANTENNA:
+ 				return findOutlineNode(nodeRFIDAntennas, node);
+ 			case NodeModel.NODETYPE_RFID_TAG:
+ 				return findOutlineNode(nodeRFIDTags, node);
  			default :
  				return null;
***************
*** 351,354 ****
--- 382,391 ----
  			case NodeModel.NODETYPE_GEOPOS :
  				return getOutlineNodePath(nodeGeoPoints, node);
+ 			case NodeModel.NODETYPE_INFO:
+ 				return getOutlineNodePath(nodeInfoObjects, node);
+ 			case NodeModel.NODETYPE_RFID_ANTENNA:
+ 				return getOutlineNodePath(nodeRFIDAntennas, node);
+ 			case NodeModel.NODETYPE_RFID_TAG:
+ 				return getOutlineNodePath(nodeRFIDTags, node);
  			default :
  				return null;

Index: MapView.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/views/MapView.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** MapView.java	26 Feb 2006 10:20:57 -0000	1.16
--- MapView.java	28 Feb 2006 11:23:16 -0000	1.17
***************
*** 79,83 ****
--- 79,86 ----
    private Icon                        accessPointIcon;
    private Icon						  geoPosIcon;
+   private Icon						  infoIcon;
    private Icon                        locationIcon;
+   private Icon						  rfidAntennaIcon;
+   private Icon						  rfidTagIcon;
    private Icon                        clientAnchorIcon;
    private Icon                        accessPointAnchorIcon;
***************
*** 136,140 ****
--- 139,146 ----
      this.accessPointIcon = GUIBuilder.getToolIcon(GUIConstants.ICON_ACCESSPOINT);
      this.geoPosIcon = GUIBuilder.getToolIcon(GUIConstants.ICON_GEOPOS);
+     this.infoIcon = GUIBuilder.getToolIcon(GUIConstants.ICON_INFO);
      this.locationIcon = GUIBuilder.getToolIcon(GUIConstants.ICON_LOCATION);
+     this.rfidAntennaIcon = GUIBuilder.getToolIcon(GUIConstants.ICON_RFID_ANTENNA);
+     this.rfidTagIcon = GUIBuilder.getToolIcon(GUIConstants.ICON_RFID_TAG);
      this.clientAnchorIcon = GUIBuilder.getToolIcon(GUIConstants.ICON_CLIENT_ANCHOR);
      this.accessPointAnchorIcon = GUIBuilder.getToolIcon(GUIConstants.ICON_ACCESSPOINT_ANCHOR);
***************
*** 147,151 ****
     */
    public String getName(){
!     return GUIUtils.i18n("map", false);
    }
  
--- 153,157 ----
     */
    public String getName(){
!     return GUIUtils.i18n("map", false); // + " - " + Controller.getInstance().getCurrentMap().name;
    }
  
***************
*** 175,178 ****
--- 181,190 ----
        case NodeModel.NODETYPE_GEOPOS :
            return geoPosIcon;
+       case NodeModel.NODETYPE_INFO :
+           return infoIcon;
+       case NodeModel.NODETYPE_RFID_ANTENNA:
+     	  return rfidAntennaIcon;
+       case NodeModel.NODETYPE_RFID_TAG:
+     	  return rfidTagIcon;
        case NodeModel.NODETYPE_LOCATION :
          if (!showLocations){
***************
*** 770,774 ****
          v = addVertex(node);
          // Mehr ist nicht zuu tun, die Katen gehen vom Client aus.
!       }
      if (v != null){
        if (node.isFix()){
--- 782,793 ----
          v = addVertex(node);
          // Mehr ist nicht zuu tun, die Katen gehen vom Client aus.
!     } else if (node.getType() == NodeModel.NODETYPE_INFO) {
!           v = addVertex(node);
!           // Mehr ist nicht zuu tun, die Katen gehen vom Client aus.
!     } else if (node.getType() == NodeModel.NODETYPE_RFID_ANTENNA) {
!     	v = addVertex(node);
!     } else if (node.getType() == NodeModel.NODETYPE_RFID_TAG) {
!     	v = addVertex(node);
!     }
      if (v != null){
        if (node.isFix()){