From ff3f9705cd17892d9b912ebd11f650e41411f9ac Mon Sep 17 00:00:00 2001 From: Anatoli Drumi Date: Wed, 24 Jun 2026 15:39:42 +0300 Subject: [PATCH] Route console output through the Log class --- core/src/main/java/org/jivesoftware/Restarter.java | 2 +- core/src/main/java/org/jivesoftware/Spark.java | 2 +- core/src/main/java/org/jivesoftware/resource/Default.java | 2 +- core/src/main/java/org/jivesoftware/resource/SparkRes.java | 2 +- .../spark/component/browser/EmbeddedBrowserViewer.java | 4 +++- .../main/java/org/jivesoftware/spark/ui/ChatPrinter.java | 2 +- .../main/java/org/jivesoftware/spark/ui/ShakeWindow.java | 2 +- .../org/jivesoftware/spark/ui/history/HistoryMessage.java | 4 +++- .../org/jivesoftware/spark/ui/history/XMLHistoryFile.java | 4 +++- .../filetransfer/transfer/ui/ReceiveFileTransfer.java | 2 +- .../jivesoftware/spark/plugin/apple/AppleProperties.java | 4 +++- .../spark/plugin/flashing/FlashingPreferences.java | 4 +++- .../java/org/jivesoftware/spark/roar/RoarProperties.java | 4 +++- .../org/jivesoftware/spellchecker/SpellcheckManager.java | 6 +++--- .../org/jivesoftware/spellchecker/SpellcheckerPlugin.java | 4 +++- .../jivesoftware/spellchecker/SpellcheckerPreferences.java | 4 +++- 16 files changed, 34 insertions(+), 18 deletions(-) diff --git a/core/src/main/java/org/jivesoftware/Restarter.java b/core/src/main/java/org/jivesoftware/Restarter.java index 0450cc1e2..eeac1186c 100644 --- a/core/src/main/java/org/jivesoftware/Restarter.java +++ b/core/src/main/java/org/jivesoftware/Restarter.java @@ -48,7 +48,7 @@ public class Restarter { Thread.sleep(2000); } catch (InterruptedException e) { - e.printStackTrace(); + return; } try { diff --git a/core/src/main/java/org/jivesoftware/Spark.java b/core/src/main/java/org/jivesoftware/Spark.java index bc307cc97..4eedb5653 100644 --- a/core/src/main/java/org/jivesoftware/Spark.java +++ b/core/src/main/java/org/jivesoftware/Spark.java @@ -144,7 +144,7 @@ public final class Spark { dialog.invoke(); }); } catch (Exception ex) { - ex.printStackTrace(); + Log.error(ex); } } diff --git a/core/src/main/java/org/jivesoftware/resource/Default.java b/core/src/main/java/org/jivesoftware/resource/Default.java index 65501aed7..de590a00f 100644 --- a/core/src/main/java/org/jivesoftware/resource/Default.java +++ b/core/src/main/java/org/jivesoftware/resource/Default.java @@ -160,7 +160,7 @@ public class Default { } catch ( IOException e ) { - e.printStackTrace(); + Log.error(e); } } diff --git a/core/src/main/java/org/jivesoftware/resource/SparkRes.java b/core/src/main/java/org/jivesoftware/resource/SparkRes.java index 962b2818d..ae060af47 100644 --- a/core/src/main/java/org/jivesoftware/resource/SparkRes.java +++ b/core/src/main/java/org/jivesoftware/resource/SparkRes.java @@ -380,7 +380,7 @@ public class SparkRes { prb.load(resourceAsStream); } } catch (IOException e) { - e.printStackTrace(); + Log.error(e); } } diff --git a/core/src/main/java/org/jivesoftware/spark/component/browser/EmbeddedBrowserViewer.java b/core/src/main/java/org/jivesoftware/spark/component/browser/EmbeddedBrowserViewer.java index 832ed121c..eaeb15a2b 100644 --- a/core/src/main/java/org/jivesoftware/spark/component/browser/EmbeddedBrowserViewer.java +++ b/core/src/main/java/org/jivesoftware/spark/component/browser/EmbeddedBrowserViewer.java @@ -15,6 +15,8 @@ */ package org.jivesoftware.spark.component.browser; +import org.jivesoftware.spark.util.log.Log; + import java.awt.BorderLayout; import java.net.MalformedURLException; @@ -43,7 +45,7 @@ public class EmbeddedBrowserViewer extends BrowserViewer { UIManager.setLookAndFeel(laf); } catch (UnsupportedLookAndFeelException e) { - e.printStackTrace(); + Log.error(e); } // browser.addContentListener(this); } diff --git a/core/src/main/java/org/jivesoftware/spark/ui/ChatPrinter.java b/core/src/main/java/org/jivesoftware/spark/ui/ChatPrinter.java index 01dd5bb9b..f656f1121 100644 --- a/core/src/main/java/org/jivesoftware/spark/ui/ChatPrinter.java +++ b/core/src/main/java/org/jivesoftware/spark/ui/ChatPrinter.java @@ -247,7 +247,7 @@ public class ChatPrinter implements Printable { } catch(java.awt.print.PrinterException pe) { - System.err.printf("Error: %s!\n",pe.toString()); + Log.error("Error printing document", pe); } } diff --git a/core/src/main/java/org/jivesoftware/spark/ui/ShakeWindow.java b/core/src/main/java/org/jivesoftware/spark/ui/ShakeWindow.java index 2bb973df9..cbc44ad8b 100644 --- a/core/src/main/java/org/jivesoftware/spark/ui/ShakeWindow.java +++ b/core/src/main/java/org/jivesoftware/spark/ui/ShakeWindow.java @@ -16,6 +16,7 @@ package org.jivesoftware.spark.ui; import org.jivesoftware.spark.SparkManager; +import org.jivesoftware.spark.util.log.Log; import javax.swing.Timer; import javax.swing.JFrame; @@ -126,7 +127,6 @@ public class ShakeWindow { long now = System.currentTimeMillis()/1000L; long diff = now-startTime; - System.out.println(diff); if(diff > seconds) { moveTimer.stop(); diff --git a/core/src/main/java/org/jivesoftware/spark/ui/history/HistoryMessage.java b/core/src/main/java/org/jivesoftware/spark/ui/history/HistoryMessage.java index 1cc626123..0ffabdedb 100644 --- a/core/src/main/java/org/jivesoftware/spark/ui/history/HistoryMessage.java +++ b/core/src/main/java/org/jivesoftware/spark/ui/history/HistoryMessage.java @@ -1,5 +1,7 @@ package org.jivesoftware.spark.ui.history; +import org.jivesoftware.spark.util.log.Log; + import java.text.MessageFormat; import java.text.SimpleDateFormat; import java.util.Calendar; @@ -160,7 +162,7 @@ public class HistoryMessage { try { return dateFormat.parse(dateToParse); } catch (Exception e) { - e.printStackTrace(); + Log.error(e); } return Calendar.getInstance().getTime(); } diff --git a/core/src/main/java/org/jivesoftware/spark/ui/history/XMLHistoryFile.java b/core/src/main/java/org/jivesoftware/spark/ui/history/XMLHistoryFile.java index 905cabdcf..0d1076a78 100644 --- a/core/src/main/java/org/jivesoftware/spark/ui/history/XMLHistoryFile.java +++ b/core/src/main/java/org/jivesoftware/spark/ui/history/XMLHistoryFile.java @@ -1,5 +1,7 @@ package org.jivesoftware.spark.ui.history; +import org.jivesoftware.spark.util.log.Log; + import java.io.IOException; import java.io.InputStream; import java.util.*; @@ -98,7 +100,7 @@ public class XMLHistoryFile extends AbstractHistoryFile { doc.getDocumentElement().normalize(); return doc; } catch (ParserConfigurationException | SAXException | IOException e) { - e.printStackTrace(); + Log.error(e); } return null; } diff --git a/core/src/main/java/org/jivesoftware/sparkimpl/plugin/filetransfer/transfer/ui/ReceiveFileTransfer.java b/core/src/main/java/org/jivesoftware/sparkimpl/plugin/filetransfer/transfer/ui/ReceiveFileTransfer.java index b84465133..18ace7845 100644 --- a/core/src/main/java/org/jivesoftware/sparkimpl/plugin/filetransfer/transfer/ui/ReceiveFileTransfer.java +++ b/core/src/main/java/org/jivesoftware/sparkimpl/plugin/filetransfer/transfer/ui/ReceiveFileTransfer.java @@ -776,7 +776,7 @@ public class ReceiveFileTransfer extends JPanel { URL url = new URL(filePath); uri = url.toURI(); } catch (MalformedURLException | URISyntaxException ex) { - ex.printStackTrace(); + Log.error(ex); } } else { uri = new File(filePath).toURI(); diff --git a/plugins/apple/src/main/java/com/jivesoftware/spark/plugin/apple/AppleProperties.java b/plugins/apple/src/main/java/com/jivesoftware/spark/plugin/apple/AppleProperties.java index e394e0a61..541b449eb 100644 --- a/plugins/apple/src/main/java/com/jivesoftware/spark/plugin/apple/AppleProperties.java +++ b/plugins/apple/src/main/java/com/jivesoftware/spark/plugin/apple/AppleProperties.java @@ -15,6 +15,8 @@ */ package com.jivesoftware.spark.plugin.apple; +import org.jivesoftware.spark.util.log.Log; + import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -59,7 +61,7 @@ public class AppleProperties { try { props.store(new FileOutputStream(getConfigFile()), "Storing Apple/Growl properties"); } catch (Exception e) { - e.printStackTrace(); + Log.error(e); } } diff --git a/plugins/flashing/src/main/java/org/jivesoftware/spark/plugin/flashing/FlashingPreferences.java b/plugins/flashing/src/main/java/org/jivesoftware/spark/plugin/flashing/FlashingPreferences.java index 7593c2443..db3194f8d 100644 --- a/plugins/flashing/src/main/java/org/jivesoftware/spark/plugin/flashing/FlashingPreferences.java +++ b/plugins/flashing/src/main/java/org/jivesoftware/spark/plugin/flashing/FlashingPreferences.java @@ -15,6 +15,8 @@ */ package org.jivesoftware.spark.plugin.flashing; +import org.jivesoftware.spark.util.log.Log; + import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -53,7 +55,7 @@ public class FlashingPreferences { try { props.store(new FileOutputStream(getConfigFile()), ""); } catch (Exception e) { - e.printStackTrace(); + Log.error(e); } } diff --git a/plugins/roar/src/main/java/org/jivesoftware/spark/roar/RoarProperties.java b/plugins/roar/src/main/java/org/jivesoftware/spark/roar/RoarProperties.java index 06469bc8d..8d3d6c1e1 100644 --- a/plugins/roar/src/main/java/org/jivesoftware/spark/roar/RoarProperties.java +++ b/plugins/roar/src/main/java/org/jivesoftware/spark/roar/RoarProperties.java @@ -15,6 +15,8 @@ */ package org.jivesoftware.spark.roar; +import org.jivesoftware.spark.util.log.Log; + import java.awt.Color; import java.io.File; import java.io.FileInputStream; @@ -99,7 +101,7 @@ public class RoarProperties { try { props.store(new FileOutputStream(getConfigFile()), "Storing ROAR properties"); } catch (Exception e) { - e.printStackTrace(); + Log.error(e); } } diff --git a/plugins/spelling/src/main/java/org/jivesoftware/spellchecker/SpellcheckManager.java b/plugins/spelling/src/main/java/org/jivesoftware/spellchecker/SpellcheckManager.java index e444aa0b2..f49cd94f9 100644 --- a/plugins/spelling/src/main/java/org/jivesoftware/spellchecker/SpellcheckManager.java +++ b/plugins/spelling/src/main/java/org/jivesoftware/spellchecker/SpellcheckManager.java @@ -60,7 +60,7 @@ public class SpellcheckManager { checker = new SpellChecker(getDictionary(language)); } catch (Exception e) { - e.printStackTrace(); + Log.error(e); } } @@ -82,7 +82,7 @@ public class SpellcheckManager { "personalDictionary.dict"); dict = new OpenOfficeSpellDictionary(dictionary, personalDictionary); } catch (IOException e) { - e.printStackTrace(); + Log.error(e); } return dict; } @@ -123,7 +123,7 @@ public class SpellcheckManager { } } } catch (Exception e) { - e.printStackTrace(); + Log.error(e); } } } diff --git a/plugins/spelling/src/main/java/org/jivesoftware/spellchecker/SpellcheckerPlugin.java b/plugins/spelling/src/main/java/org/jivesoftware/spellchecker/SpellcheckerPlugin.java index bdb246261..3f4ac83f0 100644 --- a/plugins/spelling/src/main/java/org/jivesoftware/spellchecker/SpellcheckerPlugin.java +++ b/plugins/spelling/src/main/java/org/jivesoftware/spellchecker/SpellcheckerPlugin.java @@ -15,6 +15,8 @@ */ package org.jivesoftware.spellchecker; +import org.jivesoftware.spark.util.log.Log; + import org.jivesoftware.spark.SparkManager; import org.jivesoftware.spark.plugin.Plugin; @@ -41,7 +43,7 @@ public class SpellcheckerPlugin implements Plugin { listener = new SpellcheckChatRoomListener(); SparkManager.getChatManager().addChatRoomListener(listener); } catch (Exception e) { - e.printStackTrace(); + Log.error(e); } } diff --git a/plugins/spelling/src/main/java/org/jivesoftware/spellchecker/SpellcheckerPreferences.java b/plugins/spelling/src/main/java/org/jivesoftware/spellchecker/SpellcheckerPreferences.java index 3351b6908..6dd61b041 100644 --- a/plugins/spelling/src/main/java/org/jivesoftware/spellchecker/SpellcheckerPreferences.java +++ b/plugins/spelling/src/main/java/org/jivesoftware/spellchecker/SpellcheckerPreferences.java @@ -15,6 +15,8 @@ */ package org.jivesoftware.spellchecker; +import org.jivesoftware.spark.util.log.Log; + import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -51,7 +53,7 @@ public class SpellcheckerPreferences { try { props.store(new FileOutputStream(getConfigFile()), ""); } catch (Exception e) { - e.printStackTrace(); + Log.error(e); } }