perfsonar development work

Author: michael.bischoff
Date: 2009-12-09 18:59:04 -0500 (Wed, 09 Dec 2009)
New Revision: 5396

Modified:
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/data/HistoricalInterval.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/data/HistoricalSample.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/data/MeasurementSample.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/ui/BWCTLHistoryGraphPanel.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/ui/BWCTLHistoryMetadataPanelLooker.java
   branches/perfsonarui/src/org/perfsonar/perfsonarui/links/Driver.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/links/GeoSpatialPlacingAction.java
   branches/perfsonarui/src/org/perfsonar/perfsonarui/linkstatus/Driver.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PluginMainContainer.java
Log:
Adding unfinished pom(missing runtime dependencies)

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/data/HistoricalInterval.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/data/HistoricalInterval.java
       2009-12-09 22:39:24 UTC (rev 5395)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/data/HistoricalInterval.java
       2009-12-09 23:59:04 UTC (rev 5396)
@@ -58,7 +58,6 @@
                return tmp.toString();
        }
 
-       @Override
        public int compareTo(HistoricalInterval other) {
                if(this.getDuration()==other.getDuration()){
                        if(this.intervalStart==other.intervalStart) return 0;

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/data/HistoricalSample.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/data/HistoricalSample.java
 2009-12-09 22:39:24 UTC (rev 5395)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/data/HistoricalSample.java
 2009-12-09 23:59:04 UTC (rev 5396)
@@ -24,7 +24,6 @@
                return this.units;
        }
        
-       @Override
        public int compareTo(HistoricalSample other) {
                if(this.timestamp == other.timestamp) return 0;
                if(this.timestamp < other.timestamp) return -1;

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/data/MeasurementSample.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/data/MeasurementSample.java
        2009-12-09 22:39:24 UTC (rev 5395)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/data/MeasurementSample.java
        2009-12-09 23:59:04 UTC (rev 5396)
@@ -46,7 +46,6 @@
                return "0.0 - "+end+".0 : "+this.throughput;
        }
 
-       @Override
        public int compareTo(MeasurementSample o) {
                if(this.end == o.end) return 0;
                if(this.end < o.end) return -1;

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/ui/BWCTLHistoryGraphPanel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/ui/BWCTLHistoryGraphPanel.java
     2009-12-09 22:39:24 UTC (rev 5395)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/ui/BWCTLHistoryGraphPanel.java
     2009-12-09 23:59:04 UTC (rev 5396)
@@ -244,8 +244,6 @@
     }
     
     private class MyBarToolTipGenerator implements CategoryToolTipGenerator{
-
-               @Override
                public String generateToolTip(CategoryDataset arg0, int arg1, 
int arg2) {
                        DecimalFormat oneDecimal = new DecimalFormat("0.0");
                        DecimalFormat noDecimal = new DecimalFormat("0.0");
@@ -253,9 +251,7 @@
                        return "("+arg0.getRowKey(arg1)+") - 
"+oneDecimal.format(bw)+" Mbps ("+noDecimal.format(bw*1000*1000)+" 
bits/sec)";             
                }
     }
-
-       @Override
-       public void chartMouseClicked(ChartMouseEvent event) {
+  public void chartMouseClicked(ChartMouseEvent event) {
         if (event.getEntity() != null) {
             try{
                int timeIndex = -1;
@@ -279,7 +275,6 @@
         }
        }
 
-       @Override
        public void chartMouseMoved(ChartMouseEvent arg0) {
                // nothing on mouse moved
        }

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/ui/BWCTLHistoryMetadataPanelLooker.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/ui/BWCTLHistoryMetadataPanelLooker.java
    2009-12-09 22:39:24 UTC (rev 5395)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/ui/BWCTLHistoryMetadataPanelLooker.java
    2009-12-09 23:59:04 UTC (rev 5396)
@@ -211,8 +211,6 @@
     public HistoricalMetadata getMetadata() {
                return metadata;
        }
-
-       @Override
        public void update(Observable o, Object arg) {
                fireTableDataChanged();
        }

Modified: branches/perfsonarui/src/org/perfsonar/perfsonarui/links/Driver.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/links/Driver.java      
  2009-12-09 22:39:24 UTC (rev 5395)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/links/Driver.java      
  2009-12-09 23:59:04 UTC (rev 5396)
@@ -9,31 +9,21 @@
 
 package org.perfsonar.perfsonarui.links;
 
-import org.perfsonar.perfsonarui.*;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Image;
+import java.awt.geom.Point2D;
+import java.io.File;
+import java.util.ArrayList;
 
-import java.awt.*;
-import java.util.*;
-import java.awt.geom.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.awt.event.*;
-import javax.imageio.*;
-import java.io.*;
-import java.net.*;
+import javax.imageio.ImageIO;
+import javax.swing.JFrame;
 
-import org.perfsonar.perfsonarui.vertexedgegraph.*;
-import org.perfsonar.perfsonarui.mapprojection.*;
-import org.perfsonar.perfsonarui.*;
-import org.perfsonar.perfsonarui.plugins.*;
-import org.perfsonar.perfsonarui.ui.*;
-import org.perfsonar.perfsonarui.ui.actions.*;
-import org.perfsonar.perfsonarui.ui.panels.*;
-import org.perfsonar.perfsonarui.ma.*;
-import org.perfsonar.perfsonarui.playground.*;
-import org.jfree.data.xy.*;
+import org.perfsonar.perfsonarui.mapprojection.MapProjection;
+import org.perfsonar.perfsonarui.mapprojection.RobinsonProjection;
+import org.perfsonar.perfsonarui.vertexedgegraph.Vertex;
+import org.perfsonar.perfsonarui.vertexedgegraph.VertexEdgeGraph;
 
-import org.xbill.DNS.*;
-
 /**
 Driver class used to test the plugin without running it in the ui.  
 It's functionality changes depending on what needs to be tested

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/links/GeoSpatialPlacingAction.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/links/GeoSpatialPlacingAction.java
       2009-12-09 22:39:24 UTC (rev 5395)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/links/GeoSpatialPlacingAction.java
       2009-12-09 23:59:04 UTC (rev 5396)
@@ -9,36 +9,29 @@
 
 package org.perfsonar.perfsonarui.links;
 
-import java.awt.*;
-import java.awt.event.*;
-import java.util.*;
-import java.io.*;
-import javax.swing.*;
-import javax.swing.text.*;
-import java.text.*;
-import java.net.*;
-import java.awt.geom.*;
+import java.awt.Color;
+import java.awt.event.ActionEvent;
+import java.awt.geom.Point2D;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Random;
 
-import org.jfree.chart.plot.*;
-import org.jfree.data.xy.*;
-import org.jfree.chart.axis.*;
-import org.jfree.chart.renderer.xy.*;
-import org.jfree.chart.*;
-import org.jfree.data.statistics.*;
-import org.jfree.chart.renderer.category.*;
+import org.perfsonar.perfsonarui.AbstractUserData;
+import org.perfsonar.perfsonarui.mapprojection.MapProjection;
+import org.perfsonar.perfsonarui.mapprojection.RobinsonProjection;
+import org.perfsonar.perfsonarui.plugins.IPerfsonarRequest;
+import org.perfsonar.perfsonarui.plugins.IPerfsonarTab;
+import org.perfsonar.perfsonarui.ui.actions.PerfsonarRequestAction;
+import org.perfsonar.perfsonarui.vertexedgegraph.Vertex;
+import org.perfsonar.perfsonarui.vertexedgegraph.VertexEdgeGraph;
+import org.xbill.DNS.LOCRecord;
+import org.xbill.DNS.Lookup;
+import org.xbill.DNS.Name;
+import org.xbill.DNS.Record;
+import org.xbill.DNS.Type;
 
-import org.perfsonar.perfsonarui.vertexedgegraph.*;
-import org.perfsonar.perfsonarui.mapprojection.*;
-import org.perfsonar.perfsonarui.*;
-import org.perfsonar.perfsonarui.plugins.*;
-import org.perfsonar.perfsonarui.ui.*;
-import org.perfsonar.perfsonarui.ui.actions.*;
-import org.perfsonar.perfsonarui.ui.panels.*;
-import org.perfsonar.perfsonarui.ma.*;
-import org.perfsonar.perfsonarui.playground.*;
-
-import org.xbill.DNS.*;
-
 /**
 Performs a continuous live update.  This action will continuosly
 update the utilization data for each interface previously queried

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/linkstatus/Driver.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/linkstatus/Driver.java 
  2009-12-09 22:39:24 UTC (rev 5395)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/linkstatus/Driver.java 
  2009-12-09 23:59:04 UTC (rev 5396)
@@ -9,31 +9,21 @@
 
 package org.perfsonar.perfsonarui.linkstatus;
 
-import org.perfsonar.perfsonarui.*;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Image;
+import java.io.File;
 
-import java.awt.*;
-import java.util.*;
-import java.awt.geom.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.awt.event.*;
-import javax.imageio.*;
-import java.io.*;
-import java.net.*;
+import javax.imageio.ImageIO;
+import javax.swing.JFrame;
 
-import org.perfsonar.perfsonarui.vertexedgegraph.*;
-import org.perfsonar.perfsonarui.mapprojection.*;
-import org.perfsonar.perfsonarui.*;
-import org.perfsonar.perfsonarui.plugins.*;
-import org.perfsonar.perfsonarui.ui.*;
-import org.perfsonar.perfsonarui.ui.actions.*;
-import org.perfsonar.perfsonarui.ui.panels.*;
-import org.perfsonar.perfsonarui.ma.*;
-import org.perfsonar.perfsonarui.playground.*;
-import org.jfree.data.xy.*;
+import org.perfsonar.perfsonarui.mapprojection.MapProjection;
+import org.perfsonar.perfsonarui.mapprojection.RobinsonProjection;
+import org.perfsonar.perfsonarui.vertexedgegraph.Edge;
+import org.perfsonar.perfsonarui.vertexedgegraph.Vertex;
+import org.perfsonar.perfsonarui.vertexedgegraph.VertexDragListener;
+import org.perfsonar.perfsonarui.vertexedgegraph.VertexEdgeGraph;
 
-import org.xbill.DNS.*;
-
 /**
 Driver class used to test the plugin without running it in the ui.  
 It's functionality changes depending on what needs to be tested
@@ -54,7 +44,7 @@
                VertexEdgeGraph<Integer, Integer> graph = new 
VertexEdgeGraph<Integer, Integer>();
                for(int i = 0; i < n; i++)
                {
-                       Vertex vertex = new Vertex<Integer, Integer>(graph, 
i);
+      Vertex<Integer, Integer> vertex = new Vertex<Integer, Integer>(graph, 
i);
                        graph.addVertex(vertex);
                        new VertexDragListener<Integer, Integer>(vertex);
                }

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PluginMainContainer.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PluginMainContainer.java
      2009-12-09 22:39:24 UTC (rev 5395)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PluginMainContainer.java
      2009-12-09 23:59:04 UTC (rev 5396)
@@ -61,8 +61,8 @@
                UIManager.put("TaskPaneContainer.border", new 
BorderUIResource(BorderFactory.createMatteBorder(0,0,0,0,getBackground())));  
            
            UIManager.put(JXTaskPaneContainer.uiClassID, 
"org.perfsonar.perfsonarui.ui.PerfsonarTaskPaneContainerUI");  
            JXTaskPaneContainer container = new JXTaskPaneContainer();
-                 UIManager.put("TaskPaneContainer.backgroundPainter", new 
PainterUIResource(
-                     new MattePainter<JXTaskPaneContainer>(new 
GradientPaint(0f, 0f,
+    UIManager.put("TaskPaneContainer.backgroundPainter", new 
PainterUIResource<JXTaskPaneContainer>(
+                     new MattePainter(new GradientPaint(0f, 0f,
                              Color.white, 0f, 1f, getBackground()), true))); 
              
                container.setUI(new PerfsonarTaskPaneContainerUI());
                restoreSettings(oldValues);