magicmap-commits

[Magicmap-commits] SF.net SVN: magicmap: [575] trunk/magicmapclient/src/net/sf/magicmap/client /gui/MainFrame.java

[<fle...@us...>]

Revision: 575
          http://svn.sourceforge.net/magicmap/?rev=575&view=rev
Author:   flederohr
Date:     2007-02-25 12:04:21 -0800 (Sun, 25 Feb 2007)

Log Message:
-----------
fixed Uncaught fetching image  error

Modified Paths:
--------------
    trunk/magicmapclient/src/net/sf/magicmap/client/gui/MainFrame.java

Modified: trunk/magicmapclient/src/net/sf/magicmap/client/gui/MainFrame.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/MainFrame.java	2007-02-25 19:44:05 UTC (rev 574)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/MainFrame.java	2007-02-25 20:04:21 UTC (rev 575)
@@ -5,13 +5,16 @@
 import java.awt.Cursor;
 import java.awt.Dimension;
 import java.awt.HeadlessException;
+import java.awt.Image;
 import java.awt.event.ActionEvent;
+import java.awt.image.VolatileImage;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.rmi.RemoteException;
 
 import javax.swing.AbstractAction;
+import javax.swing.ImageIcon;
 import javax.swing.JButton;
 import javax.swing.JComponent;
 import javax.swing.JFrame;
@@ -107,7 +110,7 @@
         // Hauptfenstereigenschaften setzen
         this.setSize(new Dimension(1024, 768));
         this.setTitle("MagicMap - Version " + Version.getVersion());
-        this.setIconImage(GUIBuilder.getToolIcon("MagicMap.png", ".").getImage());
+        this.setIconImage(new ImageIcon(this.getClass().getClassLoader().getResource("MagicMap.png")).getImage());
 
         //Menu erstellen
         this.menuBar = new JMenuBar();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Magicmap-commits] SF.net SVN: magicmap: [654] trunk/magicmapclient/src/net/sf/magicmap/client /gui/MainFrame.java

[<an...@us...>]

Revision: 654
          http://svn.sourceforge.net/magicmap/?rev=654&view=rev
Author:   anweiss
Date:     2007-05-30 07:44:25 -0700 (Wed, 30 May 2007)

Log Message:
-----------
made a new error message for unkown host exceptions

Modified Paths:
--------------
    trunk/magicmapclient/src/net/sf/magicmap/client/gui/MainFrame.java

Modified: trunk/magicmapclient/src/net/sf/magicmap/client/gui/MainFrame.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/MainFrame.java	2007-05-30 14:30:00 UTC (rev 653)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/MainFrame.java	2007-05-30 14:44:25 UTC (rev 654)
@@ -10,6 +10,7 @@
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.rmi.RemoteException;
+import java.rmi.UnknownHostException;
 
 import javax.swing.AbstractAction;
 import javax.swing.JButton;
@@ -330,16 +331,33 @@
         this.statusBar.setMessage(GUIUtils.i18n(GUIConstants.STATE_DISCONNECTED));
         this.statusBar.setInvisible(Controller.getInstance().isInvisible());
 
+        if (((AxisFault) e).getMessage().contains("UnknownHostException")) {
+            if (GUIUtils.showConnectError("UnknownHost")) {
+                connect();
+                return;
+            } else {
+                this.connectAction.actionPerformed(new ActionEvent(this, 0, ""));
+                return;
+            }
+        } else {
+            this.connectAction.actionPerformed(new ActionEvent(this, 0, ""));
+        }
         if (e instanceof AxisFault) {
             AxisFault f = (AxisFault) e;
-            if (GUIUtils.showAuthentificationError(f.getFaultString()))
+            if (GUIUtils.showAuthentificationError(f.getFaultString())) {
                 connect();
-            else
+                return;
+            } else {
                 this.connectAction.actionPerformed(new ActionEvent(this, 0, ""));
-        } else if (e instanceof RemoteException) if (GUIUtils.showConnectError())
-            connect();
-        else
-            this.connectAction.actionPerformed(new ActionEvent(this, 0, ""));
+            }
+        } else if (e instanceof RemoteException) {
+            if (GUIUtils.showConnectError()) {
+                connect();
+                return;
+            } else {
+                this.connectAction.actionPerformed(new ActionEvent(this, 0, ""));
+            }
+        }
     }
 
     /* (non-Javadoc)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.