[Magicmap-commits] magicmapclient/src/net/sf/magicmap/client/views MapView.java,1.6,1.7 OutlineView.java,1.1,1.2

[Florian L. <fle...@us...>]

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

Modified Files:
	MapView.java OutlineView.java 
Log Message:
- fixed not-showing-right-Measurement-bug in MapView
- fixed update tree in OutlineView
- implemented alphabetical-orderd-input-method for OutlineView
- fixed remove-all-nodes-method in OutlineView when loading a new map
- implemented scrollpane for OutlineView

Index: OutlineView.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/views/OutlineView.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** OutlineView.java	16 Jan 2005 16:01:32 -0000	1.1
--- OutlineView.java	2 Jun 2005 00:13:12 -0000	1.2
***************
*** 13,16 ****
--- 13,17 ----
  import javax.swing.JLabel;
  import javax.swing.JPanel;
+ import javax.swing.JScrollPane;
  import javax.swing.JTree;
  import javax.swing.border.EmptyBorder;
***************
*** 46,51 ****
      super();
      this.setFrameIcon(GUIBuilder.getToolIcon(GUIConstants.ICON_OUTLINE));
-     this.model = null;
-     this.tree = null;
    }
  
--- 47,50 ----
***************
*** 57,67 ****
    }
  
-   public void expandAll(JTree tree){
-     int row = 0;
-     while (row < tree.getRowCount()){
-       tree.expandRow(row);
-       row++;
-     }
-   }
  
    /* (non-Javadoc)
--- 56,59 ----
***************
*** 71,96 ****
      RelativeLayout layout = new RelativeLayout();
      RelativePanelBuilder builder = new RelativePanelBuilder(layout);
! 
!     this.treeroot = new OutlineNode("ROOT");
!     this.treemodel = new DefaultTreeModel(treeroot);
      nodeAccessPoints = new OutlineNode(GUIUtils.i18n("accesspoints"));
      nodeClients = new OutlineNode(GUIUtils.i18n("clients"));
      nodeLocations = new OutlineNode(GUIUtils.i18n("locations"));
!     this.treeroot.add(nodeAccessPoints);
!     this.treeroot.add(nodeClients);
!     this.treeroot.add(nodeLocations);
      tree = new JTree(treemodel);
      tree.setRootVisible(false);
      tree.setCellRenderer(new OutlineRenderer());
      tree.setBorder(new EmptyBorder(new Insets(3, 3, 3, 3)));
!     builder.add(tree, "tree");
      builder.setTopTopDistance("tree", null, 0);
      builder.setBottomBottomDistance("tree", null, 0);
      builder.setLeftLeftDistance("tree", null, 0);
      builder.setRightRightDistance("tree", null, 0);
! 
      JPanel panel = builder.getPanel();
      panel.setMinimumSize(new Dimension(200, -1));
!     panel.setMaximumSize(new Dimension(-1, -1));
      return panel;
    }
--- 63,96 ----
      RelativeLayout layout = new RelativeLayout();
      RelativePanelBuilder builder = new RelativePanelBuilder(layout);
!     
!     treeroot = new OutlineNode("ROOT");
!     treemodel = new DefaultTreeModel(treeroot);
!  
      nodeAccessPoints = new OutlineNode(GUIUtils.i18n("accesspoints"));
      nodeClients = new OutlineNode(GUIUtils.i18n("clients"));
      nodeLocations = new OutlineNode(GUIUtils.i18n("locations"));
! 
!     treeroot.add(nodeAccessPoints);
!     treeroot.add(nodeClients);
!     treeroot.add(nodeLocations);
! 
      tree = new JTree(treemodel);
      tree.setRootVisible(false);
      tree.setCellRenderer(new OutlineRenderer());
      tree.setBorder(new EmptyBorder(new Insets(3, 3, 3, 3)));
!     
!     JComponent pane = new JScrollPane(tree,JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
!     pane.setBorder(new EmptyBorder(new Insets(0, 0, 0, 0)));
!     
!     builder.add(pane, "tree");
      builder.setTopTopDistance("tree", null, 0);
      builder.setBottomBottomDistance("tree", null, 0);
      builder.setLeftLeftDistance("tree", null, 0);
      builder.setRightRightDistance("tree", null, 0);
!     
      JPanel panel = builder.getPanel();
      panel.setMinimumSize(new Dimension(200, -1));
!     panel.setMaximumSize(new Dimension(-1,-1));
!     
      return panel;
    }
***************
*** 196,216 ****
     */
    public void nodeAddedEvent(Node node){
      switch (node.getType()) {
        case NodeModel.NODETYPE_ACCESSPOINT :
!         nodeAccessPoints.add(new OutlineNode(node));
!         //treemodel.nodeChanged(nodeAccessPoints);
          break;
!       case NodeModel.NODETYPE_CLIENT :
!         nodeClients.add(new OutlineNode(node));
!         //treemodel.nodeChanged(nodeClients);
          break;
        case NodeModel.NODETYPE_LOCATION :
!         nodeLocations.add(new OutlineNode(node));
!         //treemodel.nodeChanged(nodeLocations);
          break;
      }
!     if (tree != null){
!       expandAll(tree);
!     }
    }
  
--- 196,218 ----
     */
    public void nodeAddedEvent(Node node){
+     OutlineNode on = new OutlineNode(node);
+     int index = 0;
      switch (node.getType()) {
        case NodeModel.NODETYPE_ACCESSPOINT :
!         index = getAlphabeticalIndex(nodeAccessPoints,on);
!     	treemodel.insertNodeInto(on,nodeAccessPoints,index);
          break;
!       case NodeModel.NODETYPE_CLIENT :   
!         index = getAlphabeticalIndex(nodeClients,on);
!         treemodel.insertNodeInto(on,nodeClients,index);
          break;
        case NodeModel.NODETYPE_LOCATION :
!         index = getAlphabeticalIndex(nodeLocations,on);
!         treemodel.insertNodeInto(on,nodeLocations,index);
          break;
      }
!     for (int i=0; i<tree.getRowCount();i++)
!         if(tree.isShowing()&& tree.isCollapsed(i))
!             tree.expandRow(i);
    }
  
***************
*** 230,233 ****
--- 232,236 ----
        this.nodeClients.removeAllChildren();
        this.nodeLocations.removeAllChildren();
+       treemodel.reload();
      }
    }
***************
*** 243,246 ****
--- 246,257 ----
  
    }
+   
+   private int getAlphabeticalIndex(OutlineNode parent,OutlineNode node){
+       int index=0;
+       while((parent.getChildCount() > index) && (((OutlineNode)(node)).getNode().getDisplayName().compareToIgnoreCase(((OutlineNode)(parent.getChildAt(index))).getNode().getDisplayName()) > 0)){
+           ++index;
+       }
+       return index;
+   }
  
  }
\ No newline at end of file

Index: MapView.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/views/MapView.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** MapView.java	31 May 2005 12:48:38 -0000	1.6
--- MapView.java	2 Jun 2005 00:13:12 -0000	1.7
***************
*** 1071,1074 ****
--- 1071,1076 ----
      if (v == null){
        Controller.getInstance().setMeasurementViewLocal(true);
+       Controller.getInstance().getMeasurementView().setTitle(
+               GUIUtils.i18n("measurement") + " " + Controller.getInstance().getClient().getDisplayName());
        return;
      }
***************
*** 1078,1081 ****
--- 1080,1085 ----
          Controller.getInstance().setMeasurementViewLocal(false);
          Controller.getInstance().buildOtherMeasurement((AccessPointSeerNode) node);
+       } else {
+           Controller.getInstance().setMeasurementViewLocal(true);
        }
        Controller.getInstance().getMeasurementView().setTitle(
***************
*** 1084,1087 ****
--- 1088,1093 ----
      } else{
        Controller.getInstance().setMeasurementViewLocal(true);
+       Controller.getInstance().getMeasurementView().setTitle(
+               GUIUtils.i18n("measurement") + " " + Controller.getInstance().getClient().getDisplayName());
      }