Index: org/gudy/azureus2/ui/swt/views/stats/VivaldiView.java
===================================================================
RCS file: /cvsroot/azureus/azureus2/org/gudy/azureus2/ui/swt/views/stats/VivaldiView.java,v
retrieving revision 1.9
diff -u -r1.9 VivaldiView.java
--- org/gudy/azureus2/ui/swt/views/stats/VivaldiView.java	16 Jan 2008 05:54:08 -0000	1.9
+++ org/gudy/azureus2/ui/swt/views/stats/VivaldiView.java	29 Feb 2008 14:56:32 -0000
@@ -34,19 +34,29 @@
 import com.aelitis.azureus.core.dht.DHT;
 import com.aelitis.azureus.plugins.dht.DHTPlugin;
 
-public class VivaldiView extends AbstractIView {
-  
-  DHT dht;  
+public class VivaldiView 
+  extends AbstractIView
+  implements TableStructureModificationListener
+{
+  public static final int DHT_TYPE_MAIN   = DHT.NW_MAIN;
+  public static final int DHT_TYPE_CVS    = DHT.NW_CVS;
+  public static final int DHT_TYPE_MAIN_V6  = DHT.NW_MAIN_V6;
+
+  DHT dht;
   Composite panel;
   VivaldiPanel drawPanel;
 	private final boolean autoAlpha;
+  private final int dht_type;
   
-  public VivaldiView() {
+
+  public VivaldiView(int dht_type) {
+    this.dht_type = dht_type;
   	autoAlpha = false;
     init();
   }
   
   public VivaldiView(boolean autoAlpha) {
+    this.dht_type = DHT_TYPE_MAIN;
   	this.autoAlpha = autoAlpha;
 		init();
   }
@@ -62,11 +74,17 @@
        
       DHT[] dhts = ((DHTPlugin)dht_pi.getPlugin()).getDHTs();
     
-      if (dhts.length == 0){
-    	  return;
+      for (int i=0;i<dhts.length;i++){
+        if ( dhts[i].getTransport().getNetwork() == dht_type ){
+          dht = dhts[i];
+          break;
+        }
+      }
+    
+      if ( dht == null ){
+        return;
       }
       
-      dht = dhts[dhts.length-1];
     } catch(Exception e) {
       Debug.printStackTrace( e );
     }
@@ -95,11 +125,21 @@
   }
   
   public String getData() {
-    return "VivaldiView.title.full";
+    return( getFullTitle());
   }
 
   public String getFullTitle() {
-    return MessageText.getString("VivaldiView.title.full"); //$NON-NLS-1$
+    if ( dht_type == DHT_TYPE_MAIN ){
+
+      return( "VivaldiView.title.full" );
+
+    }else if ( dht_type == DHT_TYPE_CVS ){
+
+      return( "VivaldiView.title.fullcvs" );
+    }else{
+
+      return( "VivaldiView.title.full_v6" );
+    }
   }
   
 	public void delete() {
Index: org/gudy/azureus2/ui/swt/views/stats/StatsView.java
===================================================================
RCS file: /cvsroot/azureus/azureus2/org/gudy/azureus2/ui/swt/views/stats/StatsView.java,v
retrieving revision 1.23
diff -u -r1.23 StatsView.java
--- org/gudy/azureus2/ui/swt/views/stats/StatsView.java	28 Jun 2007 23:08:24 -0000	1.23
+++ org/gudy/azureus2/ui/swt/views/stats/StatsView.java	29 Feb 2008 14:56:32 -0000
@@ -58,13 +58,13 @@
   TabItem itemStats;
   TabItem itemCache;
   TabItem[] itemDHTs;
-  TabItem itemVivaldi;
+  TabItem[] itemVivaldis;
   
   ActivityView viewActivity;
   TransferStatsView viewStats;
   CacheView viewCache;
   DHTView[] viewDHTs;
-  IView viewVivaldi;
+  IView[] viewVivaldis;
   UpdateThread updateThread;
   
   public StatsView(GlobalManager manager,AzureusCore core) {
@@ -114,22 +114,28 @@
     folder.setBackground(Colors.background);
     
     List	dhts = new ArrayList();
+    List  vivaldis = new ArrayList();
 
     dhts.add( new DHTView( DHTView.DHT_TYPE_MAIN ));  
+    vivaldis.add( new VivaldiView( VivaldiView.DHT_TYPE_MAIN ));  
 
     if ( NetworkAdmin.getSingleton().hasIPV6Potential()){
   
     	dhts.add(  new DHTView( DHTView.DHT_TYPE_MAIN_V6 ));
+    	vivaldis.add(  new VivaldiView( VivaldiView.DHT_TYPE_MAIN_V6 ));
     }
     
     if( Constants.isCVSVersion()){
     	
        	dhts.add(  new DHTView( DHTView.DHT_TYPE_CVS ));
+       	vivaldis.add(  new VivaldiView( VivaldiView.DHT_TYPE_CVS ));
     }
     
     viewDHTs = new DHTView[dhts.size()];
+    viewVivaldis = new IView[vivaldis.size()];
     
     dhts.toArray( viewDHTs );
+    vivaldis.toArray( viewVivaldis );
     
     itemActivity = new TabItem(folder, SWT.NULL);
     itemStats = new TabItem(folder, SWT.NULL);
@@ -140,8 +146,12 @@
     for (int i=0;i<itemDHTs.length;i++){
     	itemDHTs[i] = new TabItem(folder, SWT.NULL);
     }
-  
-    itemVivaldi = new TabItem(folder,SWT.NULL);
+
+    itemVivaldis = new TabItem[viewVivaldis.length];
+
+    for (int i=0;i<itemVivaldis.length;i++){
+      itemVivaldis[i] = new TabItem(folder,SWT.NULL);
+    }
 
     viewActivity = new ActivityView(manager);
     viewStats = new TransferStatsView(manager,core);
@@ -150,17 +160,14 @@
  
     
     
-    viewVivaldi = new VivaldiView();
-    
     Messages.setLanguageText(itemActivity, viewActivity.getData());
     Messages.setLanguageText(itemStats, viewStats.getData());
     Messages.setLanguageText(itemCache, viewCache.getData());
     
     for (int i=0;i<viewDHTs.length;i++){
     	Messages.setLanguageText(itemDHTs[i], viewDHTs[i].getData());
+    	Messages.setLanguageText(itemVivaldis[i], viewVivaldis[i].getData());
     }
-       
-    Messages.setLanguageText(itemVivaldi, viewVivaldi.getData());
     
     TabItem items[] = {itemActivity};
     folder.setSelection(items);
@@ -179,8 +186,10 @@
     	itemDHTs[i].setControl(viewDHTs[i].getComposite());
     }
     
-    viewVivaldi.initialize(folder);
-    itemVivaldi.setControl(viewVivaldi.getComposite());
+    for (int i=0;i<viewVivaldis.length;i++){
+    	viewVivaldis[i].initialize(folder);
+    	itemVivaldis[i].setControl(viewVivaldis[i].getComposite());
+    }
     
     folder.addSelectionListener(new SelectionListener() {
       public void widgetSelected(SelectionEvent e) {
@@ -193,7 +202,9 @@
     
     refresh();
     viewActivity.getComposite().layout(true);
-    viewVivaldi.getComposite().layout(true);
+    for (int i=0;i<viewVivaldis.length;i++){
+      viewVivaldis[i].getComposite().layout(true);
+    }
     
     updateThread = new UpdateThread(); 
     updateThread.setDaemon(true);
@@ -229,7 +240,12 @@
     	  return;
       }
       
-      if (viewVivaldi != null && !itemVivaldi.isDisposed())  viewVivaldi.refresh();
+      if ( index-3-viewDHTs.length < viewVivaldis.length ){
+        if ( !itemVivaldis[index-3-viewDHTs.length].isDisposed()){
+          viewVivaldis[index-3-viewDHTs.length].refresh();
+        }
+        return;
+      }
   
     } catch (Exception e) {
     	Debug.printStackTrace( e );
Index: org/gudy/azureus2/internat/MessagesBundle.properties
===================================================================
RCS file: /cvsroot/azureus/azureus2/org/gudy/azureus2/internat/MessagesBundle.properties,v
retrieving revision 1.955
diff -u -r1.955 MessagesBundle.properties
--- org/gudy/azureus2/internat/MessagesBundle.properties	28 Feb 2008 05:10:46 -0000	1.955
+++ org/gudy/azureus2/internat/MessagesBundle.properties	29 Feb 2008 14:56:31 -0000
@@ -1604,6 +1604,8 @@
 MyTrackerView.category=Category
 MainWindow.menu.file.open.torrentfortracking=Torrent File... (Tracking Only)
 VivaldiView.title.full=Vivaldi
+VivaldiView.title.fullcvs=Vivaldi CVS
+VivaldiView.title.full_v6=Vivaldi IPv6
 MyTrackerView.date_added=Added
 ConfigView.section.tracker.portbackup=Backup ports (';' separated)
 ConfigView.label.playfilespeech=Speak when a file is finished