--- a/src/org/dancres/blitz/tools/dash/DashBoardFrame.java	Sat May 23 11:27:41 2009 +0100
+++ b/src/org/dancres/blitz/tools/dash/DashBoardFrame.java	Sat May 23 11:28:26 2009 +0100
@@ -1,12 +1,9 @@
 package org.dancres.blitz.tools.dash;
 
 import java.awt.BorderLayout;
-import java.awt.FlowLayout;
 import java.awt.Dimension;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
-import java.util.HashMap;
-import java.util.Map;
 
 import java.util.logging.Logger;
 import java.util.logging.Level;
@@ -15,10 +12,8 @@
 import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
-import javax.swing.JPanel;
 import javax.swing.UIManager;
 import javax.swing.plaf.metal.MetalLookAndFeel;
-import javax.swing.SwingUtilities;
 import javax.swing.ImageIcon;
 
 import org.dancres.blitz.remote.StatsAdmin;
@@ -32,10 +27,8 @@
 
     private StatsAdmin _admin; 
     private DashBoard _dashBoard;
-    private JLabel _status;
     private Thread _updater;
     private boolean _exitOnClose;
-    private StatsTableModel _allStats=new StatsTableModel();
     
     public DashBoardFrame(String title,StatsAdmin admin,boolean exitOnClose){
         super(title);
@@ -105,20 +98,12 @@
         return _dashBoard; 
     
     }
-    private JComponent createStatusBar(){
-        _status=new JLabel();
-        JPanel p=new JPanel();
-        p.setLayout( new FlowLayout(FlowLayout.LEFT));
-        p.add(_status);
-        p.setPreferredSize(new Dimension(740, 140));
-        return p;
-    }
+
     public void run(){
         while(!_updater.isInterrupted()){
             try{
                 //need to be configurable
                 Thread.sleep(1500);
-                Map lookup=new HashMap();
                 
                 Stat[] stats = _admin.getStats();
                 _dashBoard.update(stats);

--- a/src/org/dancres/blitz/tools/dash/graph/Chart.java	Sat May 23 11:27:41 2009 +0100
+++ b/src/org/dancres/blitz/tools/dash/graph/Chart.java	Sat May 23 11:28:26 2009 +0100
@@ -2,9 +2,7 @@
 
 import org.dancres.blitz.tools.dash.ColorScheme;
 
-import java.lang.*;
 import java.awt.*;
-import java.awt.event.*;
 import java.text.*;
 import javax.swing.*;
 
@@ -61,6 +59,7 @@
     private Rectangle chartRect= new Rectangle();
     private Rectangle zoomRect;
     private boolean  isShown=false; //at least one dataset visiable
+
     //public methods
     public Chart()
     {
@@ -70,12 +69,14 @@
         
         
     }
+
     synchronized public void addData(final String name,final double [] data,
                                      final String [] tags)
         throws ChartException
     {
         addData(name,data,tags,null);
     }
+
     synchronized public void addData(final String name,final double [] data,
                                      final String [] tags,final int [] dates)
         throws ChartException
@@ -85,6 +86,7 @@
         
         setDataAt(dsCounter++,name,data,tags,dates);
     }
+
     public void setDataAt(int index,final String name,final double [] data,
                           final String [] tags,final int [] dates)
         throws ChartException
@@ -110,11 +112,14 @@
         dataSet[ index ]=d;
     }
     public void setLabelEvery(int every) {labelEvery=every;}
+
     public static int getMaxSupportedDataSets() {return MAX_DATA_SETS;}
+
     public Dimension getMinimumSize()
     {
         return minSize;
     }
+
     public Dimension getPreferredSize()
     {
         if(currentSize==null)
@@ -122,6 +127,7 @@
         
         return currentSize;
     }
+
     public void setSize(Dimension d)
     {
         super.setSize(d);
@@ -135,6 +141,7 @@
         super.print(g);
         yOffset=ty;
     }
+
     public void enableData(final String name,final boolean yesno)
     {
         for( int i=0;i<dsCounter;i++)
@@ -148,14 +155,13 @@
                     }
             }
     }
+
     public void paint(Graphics g)
     {
         Dimension dim=getSize();
         g.setColor(Color.white);
         g.fillRect(0,0,dim.width,dim.height);
         
-        boolean isPrinting=g instanceof PrintGraphics;
-        
         if(dirtyCache)
             {
                 calcFactors();
@@ -204,6 +210,7 @@
                         legx+=strWidth+12;
                     }
             }
+
         //now calc the drawable area for the chart
         // draw zoomable area
         yoff=legy+15;
@@ -214,11 +221,14 @@
                 g.setColor(Color.lightGray);
                 g.fillRect(zoomRect.x,yoff,zoomRect.width,hi);
             }
+
         //border
         g.setColor(axisColor);
         g.drawRect(xoff,yoff,wid,hi);
+
         //cache for zooming
         chartRect.setBounds(xoff,yoff,wid,hi);
+
         //draw the points
         for(int i=0;i<ns;i++)
             {
@@ -249,14 +259,14 @@
                                 if(xpos>(prevx+25))
                                     {
                                         g.setColor(gridColor);
-                                        g.drawLine((int)xpos,(int)yoff,
-                                                   (int)xpos,(int)yoff+hi+2);
+                                        g.drawLine((int) xpos,yoff,
+                                                   (int) xpos,yoff+hi+2);
                                         g.setColor(axisColor);
                                         if(labelCounter%labelEvery==0 &&
                                            xpos>(lastLabelPos+labelWidth+10))
                                             {
                                                 xTagPosition[j]=(int)xpos-5;
-                                                g.drawString(dataSet[i].getTag(j),xTagPosition[j],(int)yoff+hi+20);
+                                                g.drawString(dataSet[i].getTag(j),xTagPosition[j],yoff+hi+20);
                                                 lastLabelPos=xpos;
                                             }
                                         else
@@ -400,6 +410,7 @@
         minValue=adjustMin(minValue);
     
     }
+
     private double adjustMax(double d)
     {
         double x=d;
@@ -410,12 +421,14 @@
         
         return Math.rint(x*10)/10;
     }
+
     private double adjustMin(double d)
     {
         double x=d;
         x-=0.05;
         return Math.rint(x*10)/10;
     }
+
     //private impl classes internal double-dispatch
     private interface IdDrawer
     {
@@ -439,6 +452,7 @@
                 g.drawRect(xpos,ypos,4,4);
         }
     }
+
     private class RoundRectDrawer
         implements IdDrawer
     {
@@ -456,6 +470,7 @@
                 g.drawRoundRect(xpos+1,ypos,4,4,4,4);
         }
     }
+
     private class XDrawer
         implements IdDrawer
     {
@@ -470,94 +485,5 @@
             g.drawLine(xpos+2+os,ypos-2+os,xpos-2+os,ypos+2+os);
         }
     }
-    //zoomer
-    private int dragStartXPos;
-    private int dragStartYPos;
-    private int lastXPos;
-    //private int lastYPos;
-    private boolean isDragging=false;
-    
-    private void setZoomEndPos(int xend)
-    {
-        Dimension d=getSize();
-        int s=dragStartXPos;
-        int e=xend;
-        if(s>e) //right to lseft highlight
-            {
-                s=xend;
-                e=dragStartXPos;
-            }
-        int oldstart=startAt;
-        int oldend=endAt;
-        calcNewStartAndEnd(s,e);
-        if(startAt<endAt)
-            {
-                calcFactors(); //recalculate the factors
-            }
-        else
-            {
-                startAt=oldstart;
-                endAt=oldend;
-            }
-        //
-        /*
-          double startFactor=(double)s/(double)d.width;
-          double endFactor=(double)e/(double)d.width;
-          int oldstart=startAt;
-          int oldend=endAt;
-          startAt+=(int)(endAt*startFactor);
-          endAt=(int)(endAt*endFactor);
-          if(startAt<endAt)
-          {
-          calcFactors(); //recalculate the factors
-          }
-          else
-          {
-          startAt=oldstart;
-          endAt=oldend;
-          }
-        */
-        repaint();
-    }
-    //calculate startAt, endAt based xTagPositions[]
-    private void calcNewStartAndEnd(int xStart,int xEnd)
-    {
-        //TEST
-        //System.out.println("xStart="+xStart+" End="+xEnd);
-        
-        int lowerBound=0;
-        int upperBound=0;
-        int xLower=0;
-        int xHigher=0;
-        int lowestXBound=Integer.MAX_VALUE;
-        int highestXBound=Integer.MAX_VALUE;
-        
-        int size=xTagPosition.length;
-        for(int i=0;i<size;i++)
-            {
-                if(xTagPosition[i]!=-1)
-                    {
-                
-                        xLower=xStart-xTagPosition[i];
-                        xLower=Math.abs(xLower);
-                        if(xLower<lowestXBound)
-                            {
-                                lowestXBound=xLower;
-                                lowerBound=i;
-                            }
-                        xHigher=xEnd-xTagPosition[i];
-                        xHigher=Math.abs(xHigher);
-                        if(xHigher<highestXBound)
-                            {
-                                highestXBound=xHigher;
-                                upperBound=i;
-                            }
-                    }
-            }
-        startAt=lowerBound;
-        endAt=upperBound;
-        
-    }
-    
 }