Skip to content

Commit c3fff7e

Browse files
committed
Log4j: remove show logs option as LF5 is no longer available with reload4j
git-svn-id: https://svn.code.sf.net/p/davmail/code/trunk@3655 3d1905a2-6b24-0410-a738-b14d5a86fcbd
1 parent 1f00fd3 commit c3fff7e

8 files changed

Lines changed: 0 additions & 39 deletions

src/java/davmail/ui/tray/AwtGatewayTray.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -208,9 +208,6 @@ protected void createAndShowGUI() {
208208
defaultItem.addActionListener(settingsListener);
209209
popup.add(defaultItem);
210210

211-
MenuItem logItem = new MenuItem(BundleMessage.format("UI_SHOW_LOGS"));
212-
logItem.addActionListener(e -> DavGatewayTray.showLogs());
213-
popup.add(logItem);
214211

215212
// create an action exitListener to listen for exit action executed on the tray icon
216213
ActionListener exitListener = e -> {

src/java/davmail/ui/tray/DavGatewayTray.java

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@
2323
import davmail.exchange.NetworkDownException;
2424
import org.apache.log4j.Level;
2525
import org.apache.log4j.Logger;
26-
import org.apache.log4j.lf5.LF5Appender;
27-
import org.apache.log4j.lf5.LogLevel;
28-
import org.apache.log4j.lf5.viewer.LogBrokerMonitor;
2926

3027
import javax.imageio.ImageIO;
3128
import java.awt.*;
@@ -436,23 +433,4 @@ public static void dispose() {
436433
}
437434
}
438435

439-
/**
440-
* Open logging window.
441-
*/
442-
public static void showLogs() {
443-
Logger rootLogger = Logger.getRootLogger();
444-
LF5Appender lf5Appender = (LF5Appender) rootLogger.getAppender("LF5Appender");
445-
if (lf5Appender == null) {
446-
LogBrokerMonitor logBrokerMonitor = new LogBrokerMonitor(LogLevel.getLog4JLevels()) {
447-
@Override
448-
protected void closeAfterConfirm() {
449-
hide();
450-
}
451-
};
452-
lf5Appender = new LF5Appender(logBrokerMonitor);
453-
lf5Appender.setName("LF5Appender");
454-
rootLogger.addAppender(lf5Appender);
455-
}
456-
lf5Appender.getLogBrokerMonitor().show();
457-
}
458436
}

src/java/davmail/ui/tray/FrameGatewayTray.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -182,10 +182,6 @@ protected void buildMenu() {
182182
defaultItem.addActionListener(settingsListener);
183183
menu.add(defaultItem);
184184

185-
JMenuItem logItem = new JMenuItem(BundleMessage.format("UI_SHOW_LOGS"));
186-
logItem.addActionListener(e -> DavGatewayTray.showLogs());
187-
menu.add(logItem);
188-
189185
// create an action exitListener to listen for exit action executed on the tray icon
190186
ActionListener exitListener = e -> {
191187
try {

src/java/davmail/ui/tray/OSXFrameGatewayTray.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,6 @@ protected void buildMenu() {
3737
menuBar.add(menu);
3838
mainFrame.setJMenuBar(menuBar);
3939

40-
JMenuItem logItem = new JMenuItem(BundleMessage.format("UI_SHOW_LOGS"));
41-
logItem.addActionListener(e -> DavGatewayTray.showLogs());
42-
menu.add(logItem);
4340
}
4441

4542

src/java/davmail/ui/tray/SwtGatewayTray.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -295,10 +295,6 @@ public void run() {
295295
defaultItem.addListener(SWT.Selection, event -> SwingUtilities.invokeLater(
296296
() -> openSettingsFrame()));
297297

298-
MenuItem logItem = new MenuItem(popup, SWT.PUSH);
299-
logItem.setText(BundleMessage.format("UI_SHOW_LOGS"));
300-
logItem.addListener(SWT.Selection, event -> SwingUtilities.invokeLater(DavGatewayTray::showLogs));
301-
302298
MenuItem exitItem = new MenuItem(popup, SWT.PUSH);
303299
exitItem.setText(BundleMessage.format("UI_EXIT"));
304300
exitItem.addListener(SWT.Selection, event -> DavGateway.stop());

src/java/davmailmessages.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,6 @@ UI_SERVER_CERTIFICATE=Exchange Server Certificate
258258
UI_SERVER_CERTIFICATE_HASH=Server certificate hash:
259259
UI_SERVER_CERTIFICATE_HASH_HELP=Manually accepted server certificate hash
260260
UI_SETTINGS=Settings...
261-
UI_SHOW_LOGS=Show logs...
262261
UI_SMTP_PORT=Local SMTP port:
263262
UI_SMTP_PORT_HELP=Local SMTP server port to configure in mail client
264263
UI_TAB_ADVANCED=Advanced

src/java/davmailmessages_fr.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,6 @@ UI_SERVER_CERTIFICATE=Certificat Serveur Exchange
221221
UI_SERVER_CERTIFICATE_HASH=Hash du certificat serveur :
222222
UI_SERVER_CERTIFICATE_HASH_HELP=Hash du certificat accepté manuellement
223223
UI_SETTINGS=Configuration...
224-
UI_SHOW_LOGS=Afficher les traces...
225224
UI_SMTP_PORT=Port SMTP local :
226225
UI_SMTP_PORT_HELP=Port SMTP local à configurer dans le client de messagerie
227226
UI_TAB_ADVANCED=Avancé

src/java/davmailmessages_it.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,6 @@ UI_SERVER_CERTIFICATE=Certificato Server Exchange
231231
UI_SERVER_CERTIFICATE_HASH=Certificato Server Hash:
232232
UI_SERVER_CERTIFICATE_HASH_HELP=Hash del certificato accettato manualmente
233233
UI_SETTINGS=Impostazioni...
234-
UI_SHOW_LOGS=Mostra i file di registro...
235234
UI_SMTP_PORT=Porta SMTP locale:
236235
UI_SMTP_PORT_HELP=Porta SMTP locale per configurare il client di posta elettronica
237236
UI_TAB_ADVANCED=Avanzato

0 commit comments

Comments
 (0)