[Grapevine-cvs-commits] cvs: grapevine /raisen/grapevine incoming-untrusted.xml transaction-routing.xml validate-prospective-neighbour.xml /test-client VectorSpace.java

[blackh <gra...@li...>]

blackh		Sun Nov 30 03:29:01 2003 EDT

  Modified files:              
    /grapevine/raisen/grapevine	incoming-untrusted.xml 
                               	transaction-routing.xml 
                               	validate-prospective-neighbour.xml 
    /grapevine/test-client	VectorSpace.java 
  Log:
  Debugs off + improvement to plotting.
  
  
Index: grapevine/test-client/VectorSpace.java
diff -u grapevine/test-client/VectorSpace.java:1.3 grapevine/test-client/VectorSpace.java:1.4
--- grapevine/test-client/VectorSpace.java:1.3	Sat Jun 14 01:27:38 2003
+++ grapevine/test-client/VectorSpace.java	Sun Nov 30 03:29:00 2003
@@ -15,6 +15,8 @@
  */
 public class VectorSpace extends JPanel {
 
+  private static final Color nodeColour = new Color(0,128,0);
+
   private Vector vertices = new Vector();
   private Vector edges = new Vector();
   
@@ -34,7 +36,7 @@
   
   public void paintVertex(Graphics g, Vertex v) 
   {
-    g.setColor(v.getColor());
+    g.setColor(nodeColour);
     Point p = getPoint(v.getLocation());
     
     g.drawLine(p.x - 1, p.y - 2, p.x + 1, p.y - 2);
@@ -42,6 +44,13 @@
     g.drawLine(p.x - 2, p.y - 1, p.x - 2, p.y + 1);
     g.drawLine(p.x + 2, p.y - 1, p.x + 2, p.y + 1);
   }
+
+  public void labelVertex(Graphics g, Vertex v)
+  {
+    Point p = getPoint(v.getLocation());
+    g.setColor(Color.blue);
+    g.drawString(v.getLocation().getBase64().substring(0,4), p.x + 3, p.y);
+  }
   
   public void paintEdge(Graphics g, Edge v) 
   {
@@ -112,10 +121,12 @@
   
   public void paint(Graphics g) 
   {
-    for (int i = 0; i < vertices.size(); i++)
-      paintVertex(g, (Vertex) vertices.elementAt(i));
     for (int i = 0; i < edges.size(); i++)
       paintEdge(g, (Edge) edges.elementAt(i));
+    for (int i = 0; i < vertices.size(); i++)
+      paintVertex(g, (Vertex) vertices.elementAt(i));
+    for (int i = 0; i < vertices.size(); i++)
+      labelVertex(g, (Vertex) vertices.elementAt(i));
   }
   
   public void addVertex(Vertex v)