summaryrefslogtreecommitdiff
path: root/BKUApplet/src
diff options
context:
space:
mode:
authorclemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>2009-11-10 15:30:16 +0000
committerclemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>2009-11-10 15:30:16 +0000
commitcaca721368d8c24559b1cd5ea2018884b4874f6b (patch)
treed9e1e07cc52120a39001d03db5813390c1d6264c /BKUApplet/src
parentd05668097eb126b4a8a7a88a17c1a8e6b7778521 (diff)
downloadmocca-caca721368d8c24559b1cd5ea2018884b4874f6b.tar.gz
mocca-caca721368d8c24559b1cd5ea2018884b4874f6b.tar.bz2
mocca-caca721368d8c24559b1cd5ea2018884b4874f6b.zip
Removed switchFocusListener due to problem with viewer/help dialogs on Firefox/Mac
git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@539 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
Diffstat (limited to 'BKUApplet/src')
-rw-r--r--BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java5
-rw-r--r--BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/viewer/URLFontLoader.java8
2 files changed, 5 insertions, 8 deletions
diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
index 2094e55c..895fdbb5 100644
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
@@ -187,9 +187,6 @@ public class BKUApplet extends JApplet {
log.warn("failed to load help URL: " + ex.getMessage() + ", disabling help");
}
- SwitchFocusListener switchFocusListener = new SwitchFocusListener(
- getAppletContext(), "focusToBrowser()");
-
// Note: We need a panel in order to be able to set the background
// properly.
// Setting the background without a panel has side effects with the
@@ -212,7 +209,7 @@ public class BKUApplet extends JApplet {
URLFontLoader fontProvider = new URLFontLoader(getCodeBase());
fontProvider.loadInBackground();
BKUGUIFacade gui = createGUI(contentPanel, getLocale(), guiStyle,
- backgroundImgURL, fontProvider, helpListener, switchFocusListener);
+ backgroundImgURL, fontProvider, helpListener, null);
worker = createBKUWorker(this, gui);
} catch (MalformedURLException ex) {
diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/viewer/URLFontLoader.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/viewer/URLFontLoader.java
index f914aed7..49615887 100644
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/viewer/URLFontLoader.java
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/viewer/URLFontLoader.java
@@ -41,13 +41,13 @@ public class URLFontLoader extends SwingWorker<Font, Object> implements FontProv
public URLFontLoader(URL codebase) throws MalformedURLException {
this.fontURL = new URL(codebase, SANSMONO_FONT_RESOURCE);
if (log.isDebugEnabled()) {
- log.debug(Thread.currentThread() + " setting font load URL: " + fontURL);
+ log.debug("[" + Thread.currentThread().getName() + "] setting font load URL: " + fontURL);
}
}
public void loadInBackground() {
if (log.isDebugEnabled()) {
- log.debug(Thread.currentThread() + " scheduling font loading in background: " + fontURL);
+ log.debug("[" + Thread.currentThread().getName() + "] scheduling font loading in background: " + fontURL);
}
this.execute();
}
@@ -55,7 +55,7 @@ public class URLFontLoader extends SwingWorker<Font, Object> implements FontProv
@Override
protected Font doInBackground() throws MalformedURLException, FontFormatException, IOException {
if (log.isDebugEnabled()) {
- log.debug(Thread.currentThread() + " loading font in background...");
+ log.debug("[" + Thread.currentThread().getName() + "] loading font in background...");
}
return Font.createFont(Font.TRUETYPE_FONT, fontURL.openStream());
}
@@ -67,7 +67,7 @@ public class URLFontLoader extends SwingWorker<Font, Object> implements FontProv
*/
@Override
public Font getFont() throws FontProviderException {
- log.debug(Thread.currentThread() + " get font");
+ log.debug("[" + Thread.currentThread().getName() + "] get font (EDT?)");
try {
return get();
} catch (InterruptedException ex) {