Mercurial > hg > release > icedtea-web-1.5
changeset 923:7467c864c3c2
Added clean button for Java Console
author | Jiri Vanek <jvanek@redhat.com> |
---|---|
date | Tue, 11 Mar 2014 18:30:34 +0100 |
parents | f0ffdf45c4dc |
children | 4d2b8cbf5259 |
files | ChangeLog netx/net/sourceforge/jnlp/resources/Messages.properties netx/net/sourceforge/jnlp/util/logging/ConsoleOutputPane.java netx/net/sourceforge/jnlp/util/logging/JavaConsole.java |
diffstat | 4 files changed, 36 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Mar 11 12:26:10 2014 +0100 +++ b/ChangeLog Tue Mar 11 18:30:34 2014 +0100 @@ -1,3 +1,12 @@ +2014-03-11 Jiri Vanek <jvanek@redhat.com> + + * netx/net/sourceforge/jnlp/resources/Messages.properties: added (ButClean) + key for new button + * netx/net/sourceforge/jnlp/util/logging/ConsoleOutputPane.java: (update) + method enhanced for possibility to force refresh + * netx/net/sourceforge/jnlp/util/logging/JavaConsole.java: added ButClean + button. (updateModel) overlaoded with force attribute. + 2014-03-11 Jiri Vanek <jvanek@redhat.com> * netx/policyeditor.1: Mentioned that it is more GUI then commandline tool
--- a/netx/net/sourceforge/jnlp/resources/Messages.properties Tue Mar 11 12:26:10 2014 +0100 +++ b/netx/net/sourceforge/jnlp/resources/Messages.properties Tue Mar 11 18:30:34 2014 +0100 @@ -551,6 +551,7 @@ CONSOLEmemoryMax = Max Memory CONSOLEmemoryTotal = Total Memory CONSOLEmemoryFree = Free Memory +CONSOLEClean=Clean all # Control Panel - DesktopShortcutPanel DSPNeverCreate=Never create
--- a/netx/net/sourceforge/jnlp/util/logging/ConsoleOutputPane.java Tue Mar 11 12:26:10 2014 +0100 +++ b/netx/net/sourceforge/jnlp/util/logging/ConsoleOutputPane.java Tue Mar 11 18:30:34 2014 +0100 @@ -33,6 +33,14 @@ @Override public synchronized void update(Observable o, Object arg) { + boolean force = false; + if ( arg!= null && arg instanceof Boolean && ((Boolean)arg).booleanValue()) { + force = true; + } + if (force){ + refreshPane(); + return; + } if (!autorefresh.isSelected()) { statistics.setText(model.createStatisticHint()); return;
--- a/netx/net/sourceforge/jnlp/util/logging/JavaConsole.java Tue Mar 11 12:26:10 2014 +0100 +++ b/netx/net/sourceforge/jnlp/util/logging/JavaConsole.java Tue Mar 11 18:30:34 2014 +0100 @@ -354,6 +354,19 @@ } }); + JButton cleanButton = new JButton(R("CONSOLEClean")); + buttonPanel.add(cleanButton); + cleanButton.addActionListener(new ActionListener() { + + @Override + public void actionPerformed(ActionEvent e) { + synchronized (rawData){ + rawData.clear(); + updateModel(true); + } + } + }); + initialized = true; } @@ -484,10 +497,13 @@ rawData.add(m); updateModel(); } - + private synchronized void updateModel() { + updateModel(null); + } + private synchronized void updateModel(Boolean force) { observable.setChanged(); - observable.notifyObservers(); + observable.notifyObservers(force); }