From b1c8641a63a67e3c64d948f9e8dce5c01e11e2dd Mon Sep 17 00:00:00 2001
From: mcentner <mcentner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Wed, 5 May 2010 15:29:01 +0000
Subject: Merged feature branch mocca-1.2.13-id@r724 back to trunk.

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@725 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../bku/online/applet/viewer/URLFontLoader.java    | 37 ++++++++++------------
 1 file changed, 17 insertions(+), 20 deletions(-)

(limited to 'BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/viewer')

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 49615887..d30080d0 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
@@ -16,17 +16,20 @@
  */
 package at.gv.egiz.bku.online.applet.viewer;
 
-import at.gv.egiz.bku.gui.viewer.FontProviderException;
-import at.gv.egiz.bku.gui.viewer.FontProvider;
 import java.awt.Font;
 import java.awt.FontFormatException;
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.concurrent.ExecutionException;
+
 import javax.swing.SwingWorker;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import at.gv.egiz.bku.gui.viewer.FontProvider;
+import at.gv.egiz.bku.gui.viewer.FontProviderException;
 
 /**
  *
@@ -34,29 +37,24 @@ import org.apache.commons.logging.LogFactory;
  */
 public class URLFontLoader extends SwingWorker<Font, Object> implements FontProvider {
 
-  protected static final Log log = LogFactory.getLog(URLFontLoader.class);
+  private final Logger log = LoggerFactory.getLogger(URLFontLoader.class);
+  
   protected URL fontURL;
   protected Font font;
 
   public URLFontLoader(URL codebase) throws MalformedURLException {
     this.fontURL = new URL(codebase, SANSMONO_FONT_RESOURCE);
-    if (log.isDebugEnabled()) {
-      log.debug("[" + Thread.currentThread().getName() + "] setting font load URL: " + fontURL);
-    }
+    log.debug("[{}] setting font load URL: {}.", Thread.currentThread().getName(), fontURL);
   }
 
   public void loadInBackground() {
-    if (log.isDebugEnabled()) {
-      log.debug("[" + Thread.currentThread().getName() + "] scheduling font loading in background: " + fontURL);
-    }
+    log.debug("[{}] scheduling font loading in background: {}.", Thread.currentThread().getName(), fontURL);
     this.execute();
   }
 
   @Override
   protected Font doInBackground() throws MalformedURLException, FontFormatException, IOException {
-    if (log.isDebugEnabled()) {
-      log.debug("[" + Thread.currentThread().getName() + "] loading font in background...");
-    }
+    log.debug("[{}] loading font in background.", Thread.currentThread().getName());
     return Font.createFont(Font.TRUETYPE_FONT, fontURL.openStream());
   }
 
@@ -67,16 +65,15 @@ public class URLFontLoader extends SwingWorker<Font, Object> implements FontProv
    */
   @Override
   public Font getFont() throws FontProviderException {
-    log.debug("[" + Thread.currentThread().getName() + "] get font (EDT?)");
+    log.debug("[{}] get font (EDT?)", Thread.currentThread().getName());
     try {
       return get();
     } catch (InterruptedException ex) {
-      log.error("font loader interrupted");
-//      Thread.currentThread().interrupt();
-      throw new FontProviderException("font loader interrupted", ex);
+      log.error("Font loader interrupted.");
+      throw new FontProviderException("Font loader interrupted.", ex);
     } catch (ExecutionException ex) {
-      log.error("failed to load font", ex.getCause());
-      throw new FontProviderException("failed to load font", ex.getCause());
+      log.error("Failed to load font. {}", ex.getCause());
+      throw new FontProviderException("Failed to load font.", ex.getCause());
     }
   }
 }
-- 
cgit v1.2.3