From c3b61418d2ad1e84abd0ee2c81993a2e368a8cc8 Mon Sep 17 00:00:00 2001
From: dev <dev@robertfoss.se>
Date: Sun, 31 Jul 2011 08:21:28 +0000
Subject: [PATCH] Removed 'Logs' tab.

---
 src/net/i2p/itoopie/Main.java                 |  6 +--
 src/net/i2p/itoopie/gui/ConfigurationTab.java | 41 +++++++++++--------
 src/net/i2p/itoopie/gui/Main.java             |  4 --
 3 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/src/net/i2p/itoopie/Main.java b/src/net/i2p/itoopie/Main.java
index 3b60e9ba4..46f16e0e8 100644
--- a/src/net/i2p/itoopie/Main.java
+++ b/src/net/i2p/itoopie/Main.java
@@ -99,7 +99,7 @@ public class Main {
         // Popup Main window.
         WindowHandler.toggleFrames();
 
-        //testStuff(); // Delete Me
+        testStuff(); // Delete Me
     }
     
     @SuppressWarnings("static-access")
@@ -266,9 +266,8 @@ public class Main {
         } catch (InvalidParametersException e) {
         	System.out.println("Bad parameters sent..");
         }
+        
         */
-        
-        
         // Test reading all router info
 		System.out.println("\nGetRouterInfo");
         try {
@@ -284,6 +283,7 @@ public class Main {
 			System.out.println("Connection failed..");
 			e.printStackTrace();
 		}
+
         
         // Test restart - worked at one point :) Possibly now as well.
         /*
diff --git a/src/net/i2p/itoopie/gui/ConfigurationTab.java b/src/net/i2p/itoopie/gui/ConfigurationTab.java
index 2fc314966..c29f97e68 100644
--- a/src/net/i2p/itoopie/gui/ConfigurationTab.java
+++ b/src/net/i2p/itoopie/gui/ConfigurationTab.java
@@ -214,24 +214,29 @@ public class ConfigurationTab extends TabLogoPanel {
 	}
 	
 	private void populateSettings(){
-		try {
-			EnumMap<NETWORK_SETTING, Object> em = GetNetworkSetting.execute(NETWORK_SETTING.TCP_PORT, NETWORK_SETTING.UDP_PORT, 
-					NETWORK_SETTING.UPNP, NETWORK_SETTING.BW_IN, NETWORK_SETTING.BW_OUT, NETWORK_SETTING.BW_SHARE);
-			
-			txtTCPPort.setText((String) em.get(NETWORK_SETTING.TCP_PORT));
-			txtUDPPort.setText((String) em.get(NETWORK_SETTING.UDP_PORT));
-			boolean upnpValue = Boolean.parseBoolean((String) em.get(NETWORK_SETTING.UPNP));
-			chkbxUPNP.setSelected(upnpValue);
-			txtDownload.setText((String) em.get(NETWORK_SETTING.BW_IN));
-			txtUpload.setText((String) em.get(NETWORK_SETTING.BW_OUT));
-			txtShare.setText((String) em.get(NETWORK_SETTING.BW_SHARE));
-			StatusHandler.setStatus(SETTINGS_READ);
-			
-		} catch (InvalidPasswordException e) {
-			StatusHandler.setDefaultStatus(DEFAULT_STATUS.INVALID_PASSWORD);
-		} catch (JSONRPC2SessionException e) {
-			StatusHandler.setDefaultStatus(DEFAULT_STATUS.NOT_CONNECTED);
-		}
+		SwingUtilities.invokeLater(new Runnable(){
+			@Override
+			public void run(){
+				try {
+					EnumMap<NETWORK_SETTING, Object> em = GetNetworkSetting.execute(NETWORK_SETTING.TCP_PORT, NETWORK_SETTING.UDP_PORT, 
+							NETWORK_SETTING.UPNP, NETWORK_SETTING.BW_IN, NETWORK_SETTING.BW_OUT, NETWORK_SETTING.BW_SHARE);
+					
+					txtTCPPort.setText((String) em.get(NETWORK_SETTING.TCP_PORT));
+					txtUDPPort.setText((String) em.get(NETWORK_SETTING.UDP_PORT));
+					boolean upnpValue = Boolean.parseBoolean((String) em.get(NETWORK_SETTING.UPNP));
+					chkbxUPNP.setSelected(upnpValue);
+					txtDownload.setText((String) em.get(NETWORK_SETTING.BW_IN));
+					txtUpload.setText((String) em.get(NETWORK_SETTING.BW_OUT));
+					txtShare.setText((String) em.get(NETWORK_SETTING.BW_SHARE));
+					StatusHandler.setStatus(SETTINGS_READ);
+					
+				} catch (InvalidPasswordException e) {
+					StatusHandler.setDefaultStatus(DEFAULT_STATUS.INVALID_PASSWORD);
+				} catch (JSONRPC2SessionException e) {
+					StatusHandler.setDefaultStatus(DEFAULT_STATUS.NOT_CONNECTED);
+				}
+			}
+		});
 	}
 
 	/**
diff --git a/src/net/i2p/itoopie/gui/Main.java b/src/net/i2p/itoopie/gui/Main.java
index 7ff56b82f..c7b3407d7 100644
--- a/src/net/i2p/itoopie/gui/Main.java
+++ b/src/net/i2p/itoopie/gui/Main.java
@@ -90,10 +90,6 @@ public class Main {
 		TabLogoPanel configTab = new ConfigurationTab("itoopie-opaque12");
 		tabbedPane.addTab(Transl._("Configuration"), null, configTab, null);
 		tabbedPane.addChangeListener(new TabChangeListener(configTab));
-
-		
-		JPanel logPanel = new LogoPanel("itoopie-opaque12");
-		tabbedPane.addTab(Transl._("Logs"), null, logPanel, null);
 		
 		
 		TabLogoPanel aboutTab = new AboutTab("itoopie-opaque12");