Browse Source

Fix a couple of missing Markers.

pull/419/head
Greg Holmes 9 years ago
parent
commit
58754384f1

+ 3
- 1
ui_swing/src/com/dmdirc/addons/ui_swing/components/LoggingSwingWorker.java View File

29
 import org.slf4j.Logger;
29
 import org.slf4j.Logger;
30
 import org.slf4j.LoggerFactory;
30
 import org.slf4j.LoggerFactory;
31
 
31
 
32
+import static com.dmdirc.util.LogUtils.APP_ERROR;
33
+
32
 /**
34
 /**
33
  * Logging swing worker.
35
  * Logging swing worker.
34
  *
36
  *
49
         } catch (InterruptedException ex) {
51
         } catch (InterruptedException ex) {
50
             //Ignore
52
             //Ignore
51
         } catch (ExecutionException ex) {
53
         } catch (ExecutionException ex) {
52
-            LOG.warn(ex.getMessage(), ex);
54
+            LOG.warn(APP_ERROR, ex.getMessage(), ex);
53
         }
55
         }
54
     }
56
     }
55
 
57
 

+ 3
- 1
ui_swing/src/com/dmdirc/addons/ui_swing/components/SupplierLoggingSwingWorker.java View File

30
 import org.slf4j.Logger;
30
 import org.slf4j.Logger;
31
 import org.slf4j.LoggerFactory;
31
 import org.slf4j.LoggerFactory;
32
 
32
 
33
+import static com.dmdirc.util.LogUtils.USER_ERROR;
34
+
33
 /**
35
 /**
34
  * {@link LoggingSwingWorker} that runs a {@link Supplier}.
36
  * {@link LoggingSwingWorker} that runs a {@link Supplier}.
35
  */
37
  */
96
         } catch (InterruptedException ex) {
98
         } catch (InterruptedException ex) {
97
             //Ignore
99
             //Ignore
98
         } catch (ExecutionException ex) {
100
         } catch (ExecutionException ex) {
99
-            LOG.warn(ex.getMessage(), ex);
101
+            LOG.warn(USER_ERROR, ex.getMessage(), ex);
100
         }
102
         }
101
     }
103
     }
102
 
104
 

+ 3
- 2
ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/prefs/PrefsCategoryLoader.java View File

30
 import com.dmdirc.config.prefs.PreferencesCategory;
30
 import com.dmdirc.config.prefs.PreferencesCategory;
31
 import com.dmdirc.config.prefs.PreferencesSetting;
31
 import com.dmdirc.config.prefs.PreferencesSetting;
32
 import com.dmdirc.config.prefs.PreferencesType;
32
 import com.dmdirc.config.prefs.PreferencesType;
33
-import com.dmdirc.util.LogUtils;
34
 
33
 
35
 import java.awt.Component;
34
 import java.awt.Component;
36
 import java.awt.MenuContainer;
35
 import java.awt.MenuContainer;
48
 import org.slf4j.Logger;
47
 import org.slf4j.Logger;
49
 import org.slf4j.LoggerFactory;
48
 import org.slf4j.LoggerFactory;
50
 
49
 
50
+import static com.dmdirc.util.LogUtils.USER_ERROR;
51
+
51
 /**
52
 /**
52
  * Loads a preferences panel for a specified preferences category in the background.
53
  * Loads a preferences panel for a specified preferences category in the background.
53
  */
54
  */
112
         } catch (InterruptedException ex) {
113
         } catch (InterruptedException ex) {
113
             panel = errorCategory;
114
             panel = errorCategory;
114
         } catch (ExecutionException ex) {
115
         } catch (ExecutionException ex) {
115
-            LOG.warn(LogUtils.USER_ERROR, "Error loading prefs panel", ex);
116
+            LOG.warn(USER_ERROR, "Error loading prefs panel", ex);
116
             panel = errorCategory;
117
             panel = errorCategory;
117
         }
118
         }
118
         return panel;
119
         return panel;

Loading…
Cancel
Save