Author: echatellier Date: 2014-09-26 16:50:24 +0200 (Fri, 26 Sep 2014) New Revision: 4119 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4119 Log: Remove deprecated StatusBar Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/logging/console/LogConsole.java branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/logging/console/LogConsoleHandler.java branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/logging/console/LogMail.java branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/logging/console/LogConsoleUI.jaxx Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/logging/console/LogConsole.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/logging/console/LogConsole.java 2014-09-26 14:49:54 UTC (rev 4118) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/logging/console/LogConsole.java 2014-09-26 14:50:24 UTC (rev 4119) @@ -45,7 +45,6 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.widget.IconFactory; -import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.ui.logging.console.LogConsoleUI; /** @@ -165,8 +164,6 @@ uiUpdater = new UpdateUI(this); - handler.setStatusBar(getStatusBar()); - log.info(this); } Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/logging/console/LogConsoleHandler.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/logging/console/LogConsoleHandler.java 2014-09-26 14:49:54 UTC (rev 4118) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/logging/console/LogConsoleHandler.java 2014-09-26 14:50:24 UTC (rev 4119) @@ -47,7 +47,6 @@ import javax.swing.JEditorPane; import org.apache.commons.logging.Log; -import org.nuiton.widget.StatusBar; import fr.ifremer.isisfish.logging.LogLevel; import fr.ifremer.isisfish.logging.LogLevelUtil; @@ -85,9 +84,6 @@ /** a flag to block scroll bar adjustement events */ protected boolean dontAdjust = true; - /** the console status bar where to notify user events */ - protected StatusBar statusBar; - /** the dialog to send mail */ protected LogMail logMail; @@ -328,8 +324,7 @@ int levels = model.getLevels(); log.info("levels:" + model.levels + ", searchText:" + searchText); - long t0; - t0 = System.currentTimeMillis(); + LineReader parent; // we have a levels filter try { @@ -363,7 +358,6 @@ read(0); dontAdjust = true; model.fireStateChanged(); - getStatusBar().setStatus(t("filter loaded in %1$s ms : found %2$s lines.", (System.currentTimeMillis() - t0), reader.getNbLines())); } catch (IOException e) { log.warn("could not open reader [" + this.reader + "] for reason " + e.getMessage()); } @@ -435,18 +429,9 @@ propertyListeners.removePropertyChangeListener(propertyName, listener); } - public StatusBar getStatusBar() { - return statusBar; - } - - public void setStatusBar(StatusBar statusBar) { - this.statusBar = statusBar; - } - public void openLogMail() { if (logMail==null) { - logMail = new LogMail( - statusBar, + logMail = new LogMail( model.getFrom(), model.getLogFile(), model.getLogFile().getParentFile(), Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/logging/console/LogMail.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/logging/console/LogMail.java 2014-09-26 14:49:54 UTC (rev 4118) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/logging/console/LogMail.java 2014-09-26 14:50:24 UTC (rev 4119) @@ -62,7 +62,6 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.util.FileUtil; import org.nuiton.util.ZipUtil; -import org.nuiton.widget.StatusBar; import fr.ifremer.isisfish.ui.logging.console.LogMailUI; @@ -93,24 +92,21 @@ /** default from from mail send */ protected String from; - /** the console status bar where to notify user events */ - protected StatusBar statusBar; - - public LogMail(final StatusBar statusBar, String from, File logFile, File simulationFile, final String smtpServer) { + public LogMail(String from, File logFile, File simulationFile, final String smtpServer) { setTitle(t("isisfish.log.mail.send.title", simulationFile.getName())); this.from = from; this.logFile = logFile; this.simulationFile = simulationFile; this.smtpServer = smtpServer; - this.statusBar = statusBar; sendMail.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { try { sendMail(mailTo.getText(), content.getText(), sendAll.isSelected()); - statusBar.setStatus(t("isisfish.log.mail.send" , to)); } catch (Exception eee) { - statusBar.setStatus(t("isisfish.log.mail.failed", smtpServer)); + if (log.isErrorEnabled()) { + log.error("Can't send email", eee); + } } finally { dispose(); } Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/logging/console/LogConsoleUI.jaxx =================================================================== (Binary files differ)