/hg/icedtea-web: ConsoleOutputPane formatting fixes & cleanup
gitne at icedtea.classpath.org
gitne at icedtea.classpath.org
Thu Jun 26 15:24:11 UTC 2014
changeset 1c5922c7b7b0 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=1c5922c7b7b0
author: Jacob Wisor <gitne at gmx.de>
date: Thu Jun 26 17:22:11 2014 +0200
ConsoleOutputPane formatting fixes & cleanup
2014-06-26 Jacob Wisor <gitne at gmx.de>
* netx/net/sourceforge/jnlp/util/logging/ConsoleOutputPane.java: Formatting
fixes & cleanup
Made final classes, members, and variables final
diffstat:
ChangeLog | 8 +-
netx/net/sourceforge/jnlp/util/logging/ConsoleOutputPane.java | 596 +++++----
2 files changed, 312 insertions(+), 292 deletions(-)
diffs (truncated from 1033 to 500 lines):
diff -r c807bb1f0df7 -r 1c5922c7b7b0 ChangeLog
--- a/ChangeLog Thu Jun 26 15:59:18 2014 +0200
+++ b/ChangeLog Thu Jun 26 17:22:11 2014 +0200
@@ -1,3 +1,9 @@
+2014-06-26 Jacob Wisor <gitne at gmx.de>
+
+ * netx/net/sourceforge/jnlp/util/logging/ConsoleOutputPane.java: Formatting
+ fixes & cleanup
+ Made final classes, members, and variables final
+
2014-06-26 Jacob Wisor <gitne at gmx.de>
* netx/net/sourceforge/jnlp/resources/Messages_pl.properties: Add new PL
@@ -5,7 +11,7 @@
2014-06-25 Andrew Azores <aazores at redhat.com>
- * netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java
+ * netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java:
(setupLayout) use SwingUtilities.getWindowAncestor() rather than manually
searching
diff -r c807bb1f0df7 -r 1c5922c7b7b0 netx/net/sourceforge/jnlp/util/logging/ConsoleOutputPane.java
--- a/netx/net/sourceforge/jnlp/util/logging/ConsoleOutputPane.java Thu Jun 26 15:59:18 2014 +0200
+++ b/netx/net/sourceforge/jnlp/util/logging/ConsoleOutputPane.java Thu Jun 26 17:22:11 2014 +0200
@@ -1,6 +1,8 @@
package net.sourceforge.jnlp.util.logging;
import java.awt.Color;
+import java.awt.BorderLayout;
+import java.awt.EventQueue;
import java.awt.Toolkit;
import java.awt.datatransfer.Clipboard;
import java.awt.datatransfer.StringSelection;
@@ -17,9 +19,22 @@
import java.util.regex.Pattern;
import javax.swing.ButtonGroup;
+import javax.swing.DefaultComboBoxModel;
+import javax.swing.GroupLayout;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JComboBox;
+import javax.swing.JEditorPane;
import javax.swing.JFrame;
+import javax.swing.JLabel;
import javax.swing.JMenuItem;
+import javax.swing.JPanel;
import javax.swing.JPopupMenu;
+import javax.swing.JRadioButton;
+import javax.swing.JScrollPane;
+import javax.swing.JTextField;
+import javax.swing.JTextPane;
+import javax.swing.LayoutStyle;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import javax.swing.text.BadLocationException;
@@ -32,17 +47,17 @@
import net.sourceforge.jnlp.runtime.Translator;
import net.sourceforge.jnlp.util.logging.headers.ObservableMessagesProvider;
-public class ConsoleOutputPane extends javax.swing.JPanel implements Observer {
+public class ConsoleOutputPane extends JPanel implements Observer {
private boolean canChange = true;
@Override
- public synchronized void update(Observable o, Object arg) {
+ public synchronized void update(final Observable o, final Object arg) {
boolean force = false;
- if ( arg!= null && arg instanceof Boolean && ((Boolean)arg).booleanValue()) {
+ if (arg instanceof Boolean && ((Boolean)arg).booleanValue()) {
force = true;
}
- if (force){
+ if (force) {
refreshPane();
return;
}
@@ -50,7 +65,7 @@
statistics.setText(model.createStatisticHint());
return;
}
- boolean passed = model.shouldUpdate();
+ final boolean passed = model.shouldUpdate();
if (!passed) {
statistics.setText(model.createStatisticHint());
@@ -62,15 +77,64 @@
} else {
refreshPane();
}
+ }
- }
- private ConsoleOutputPaneModel model;
+ private final ConsoleOutputPaneModel model;
private int lastPostion; //index of search
- private DefaultHighlighter.DefaultHighlightPainter searchHighligh = new DefaultHighlighter.DefaultHighlightPainter(Color.blue);
+ private final DefaultHighlighter.DefaultHighlightPainter searchHighligh = new DefaultHighlighter.DefaultHighlightPainter(Color.blue);
private Object lastSearchTag;
- public ConsoleOutputPane(ObservableMessagesProvider dataProvider) {
+ public ConsoleOutputPane(final ObservableMessagesProvider dataProvider) {
model = new ConsoleOutputPaneModel(dataProvider);
+ // Create final JComponents members
+ jPanel2 = new JPanel();
+ showHeaders = new JCheckBox();
+ showUser = new JCheckBox();
+ sortCopyAll = new JCheckBox();
+ showOrigin = new JCheckBox();
+ showLevel = new JCheckBox();
+ showDate = new JCheckBox();
+ showThread1 = new JCheckBox();
+ showThread2 = new JCheckBox();
+ showMessage = new JCheckBox();
+ showOut = new JCheckBox();
+ showErr = new JCheckBox();
+ showJava = new JCheckBox();
+ showPlugin = new JCheckBox();
+ showPreInit = new JCheckBox();
+ sortByLabel = new JLabel();
+ regExLabel = new JCheckBox();
+ sortBy = new JComboBox<>();
+ searchLabel = new JLabel();
+ autorefresh = new JCheckBox();
+ refresh = new JButton();
+ apply = new JButton();
+ regExFilter = new JTextField();
+ copyPlain = new JButton();
+ copyRich = new JButton();
+ next = new JButton();
+ previous = new JButton();
+ search = new JTextField();
+ caseSensitive = new JCheckBox();
+ showIncomplete = new JCheckBox();
+ highLight = new JCheckBox();
+ wordWrap = new JCheckBox();
+ showDebug = new JCheckBox();
+ showInfo = new JCheckBox();
+ showItw = new JCheckBox();
+ showApp = new JCheckBox();
+ showCode = new JCheckBox();
+ statistics = new JLabel();
+ showPostInit = new JCheckBox();
+ showComplete = new JCheckBox();
+ match = new JRadioButton();
+ notMatch = new JRadioButton();
+ revertSort = new JCheckBox();
+ mark = new JCheckBox();
+ jScrollPane1 = new JScrollPane();
+ jEditorPane1 = new JTextPane();
+ showHide = new JButton();
+ insertChars = new JPopupMenu();
initComponents();
regExFilter.setText(ConsoleOutputPaneModel.defaultPattern.pattern());
if (!LogConfig.getLogConfig().isEnableHeaders()) {
@@ -92,24 +156,24 @@
regExFilter.getDocument().addDocumentListener(new DocumentListener() {
@Override
- public void insertUpdate(DocumentEvent e) {
+ public final void insertUpdate(final DocumentEvent e) {
colorize();
}
@Override
- public void removeUpdate(DocumentEvent e) {
+ public final void removeUpdate(final DocumentEvent e) {
colorize();
}
@Override
- public void changedUpdate(DocumentEvent e) {
+ public final void changedUpdate(final DocumentEvent e) {
colorize();
}
- private void colorize() {
+ private final void colorize() {
try {
- String s = regExFilter.getText();
- Pattern p = Pattern.compile(s);
+ final String s = regExFilter.getText();
+ final Pattern p = Pattern.compile(s);
model.lastValidPattern = p;
regExLabel.setForeground(Color.green);
} catch (Exception ex) {
@@ -120,11 +184,11 @@
regExFilter.addMouseListener(new MouseAdapter() {
@Override
- public void mouseClicked(final MouseEvent e) {
- java.awt.EventQueue.invokeLater(new Runnable() {
+ public final void mouseClicked(final MouseEvent e) {
+ EventQueue.invokeLater(new Runnable() {
@Override
- public void run() {
+ public final void run() {
try {
if (e.getButton() != MouseEvent.BUTTON3) {
insertChars.setVisible(false);
@@ -142,14 +206,14 @@
regExFilter.addKeyListener(new KeyAdapter() {
@Override
- public void keyPressed(final KeyEvent e) {
+ public final void keyPressed(final KeyEvent e) {
if (e.getKeyCode() != KeyEvent.VK_CONTEXT_MENU) {
return;
}
- java.awt.EventQueue.invokeLater(new Runnable() {
+ EventQueue.invokeLater(new Runnable() {
@Override
- public void run() {
+ public final void run() {
try{
insertChars.setLocation(regExFilter.getLocationOnScreen());
insertChars.setVisible(!insertChars.isVisible());
@@ -161,31 +225,31 @@
}
});
- ButtonGroup matches = new ButtonGroup();
+ final ButtonGroup matches = new ButtonGroup();
matches.add(match);
matches.add(notMatch);
showHideActionPerformed(null);
updateModel();
refreshPane();
-
}
- private ActionListener createDefaultAction() {
+ private final ActionListener createDefaultAction() {
return new ActionListener() {
@Override
- public void actionPerformed(java.awt.event.ActionEvent evt) {
+ public final void actionPerformed(final ActionEvent evt) {
refreshAction();
}
};
}
- ActionListener defaultActionSingleton = createDefaultAction();
- private ActionListener getDefaultActionSingleton() {
+ final ActionListener defaultActionSingleton = createDefaultAction();
+
+ private final ActionListener getDefaultActionSingleton() {
return defaultActionSingleton;
}
- private synchronized void refreshPane() {
+ private synchronized final void refreshPane() {
if (highLight.isSelected()) {
jEditorPane1.setContentType("text/html");
} else {
@@ -196,20 +260,20 @@
}
/**
* when various threads update (and it can be)underlying jeditorpane
- * simultanouskly, then it can lead to unpredictible issues synchroisation
- * is doen in invoe later
+ * simultaneously, then it can lead to unpredictable issues synchronization
+ * is done in invoke later
*/
- private AtomicBoolean done = new AtomicBoolean(true);
+ private final AtomicBoolean done = new AtomicBoolean(true);
- private synchronized void updatePane(final boolean reset) {
+ private synchronized final void updatePane(final boolean reset) {
if (!done.get()) {
return;
}
done.set(false);
- java.awt.EventQueue.invokeLater(new Runnable() {
+ EventQueue.invokeLater(new Runnable() {
@Override
- public void run() {
+ public final void run() {
try {
refreshPaneBody(reset);
} catch (Exception ex) {
@@ -221,11 +285,11 @@
});
}
- private void refreshPaneBody(final boolean reset) throws BadLocationException, IOException {
+ private final void refreshPaneBody(final boolean reset) throws BadLocationException, IOException {
if (reset) {
jEditorPane1.setText(model.importList(0));
} else {
- String s = model.importList();
+ final String s = model.importList();
if (highLight.isSelected()) {
HTMLDocument orig = (HTMLDocument) jEditorPane1.getDocument();
if (revertSort.isSelected()) {
@@ -249,57 +313,9 @@
statistics.setText(model.createStatisticHint());
}
- private void initComponents() {
-
- jPanel2 = new javax.swing.JPanel();
- showHeaders = new javax.swing.JCheckBox();
- showUser = new javax.swing.JCheckBox();
- sortCopyAll = new javax.swing.JCheckBox();
- showOrigin = new javax.swing.JCheckBox();
- showLevel = new javax.swing.JCheckBox();
- showDate = new javax.swing.JCheckBox();
- showThread1 = new javax.swing.JCheckBox();
- showThread2 = new javax.swing.JCheckBox();
- showMessage = new javax.swing.JCheckBox();
- showOut = new javax.swing.JCheckBox();
- showErr = new javax.swing.JCheckBox();
- showJava = new javax.swing.JCheckBox();
- showPlugin = new javax.swing.JCheckBox();
- showPreInit = new javax.swing.JCheckBox();
- sortByLabel = new javax.swing.JLabel();
- regExLabel = new javax.swing.JCheckBox();
- sortBy = new javax.swing.JComboBox<>();
- searchLabel = new javax.swing.JLabel();
- autorefresh = new javax.swing.JCheckBox();
- refresh = new javax.swing.JButton();
- apply = new javax.swing.JButton();
- regExFilter = new javax.swing.JTextField();
- //this is crucial, otherwie PalinDocument implementatin is repalcing all \n by space
- ((PlainDocument) regExFilter.getDocument()).getDocumentProperties().remove("filterNewlines");
- copyPlain = new javax.swing.JButton();
- copyRich = new javax.swing.JButton();
- next = new javax.swing.JButton();
- previous = new javax.swing.JButton();
- search = new javax.swing.JTextField();
- caseSensitive = new javax.swing.JCheckBox();
- showIncomplete = new javax.swing.JCheckBox();
- highLight = new javax.swing.JCheckBox();
- wordWrap = new javax.swing.JCheckBox();
- showDebug = new javax.swing.JCheckBox();
- showInfo = new javax.swing.JCheckBox();
- showItw = new javax.swing.JCheckBox();
- showApp = new javax.swing.JCheckBox();
- showCode = new javax.swing.JCheckBox();
- statistics = new javax.swing.JLabel();
- showPostInit = new javax.swing.JCheckBox();
- showComplete = new javax.swing.JCheckBox();
- match = new javax.swing.JRadioButton();
- notMatch = new javax.swing.JRadioButton();
- revertSort = new javax.swing.JCheckBox();
- mark = new javax.swing.JCheckBox();
- jScrollPane1 = new javax.swing.JScrollPane();
- jEditorPane1 = new javax.swing.JTextPane();
- showHide = new javax.swing.JButton();
+ private final void initComponents() {
+ //this is crucial, otherwie PlainDocument implementatin is repalcing all \n by space
+ ((PlainDocument)regExFilter.getDocument()).getDocumentProperties().remove("filterNewlines");
sortCopyAll.setSelected(true);
sortCopyAll.setText(Translator.R("COPsortCopyAllDate"));
@@ -363,7 +379,7 @@
regExLabel.setText(Translator.R("COPregex") + ":");
regExLabel.addActionListener(getDefaultActionSingleton());
- sortBy.setModel(new javax.swing.DefaultComboBoxModel<>(new String[] {
+ sortBy.setModel(new DefaultComboBoxModel<>(new String[] {
Translator.R("COPAsArrived"),
Translator.R("COPuser"),
Translator.R("COPorigin"),
@@ -384,10 +400,10 @@
refresh.addActionListener(getDefaultActionSingleton());
apply.setText(Translator.R("COPApply"));
- apply.addActionListener(new java.awt.event.ActionListener() {
+ apply.addActionListener(new ActionListener() {
@Override
- public void actionPerformed(java.awt.event.ActionEvent evt) {
+ public final void actionPerformed(final ActionEvent evt) {
model.usedPattern = model.lastValidPattern;
refreshAction();
}
@@ -396,37 +412,37 @@
regExFilter.setText(".*");
copyPlain.setText(Translator.R("COPCopyAllPlain"));
- copyPlain.addActionListener(new java.awt.event.ActionListener() {
+ copyPlain.addActionListener(new ActionListener() {
@Override
- public void actionPerformed(java.awt.event.ActionEvent evt) {
+ public final void actionPerformed(final ActionEvent evt) {
copyPlainActionPerformed(evt);
}
});
copyRich.setText(Translator.R("COPCopyAllRich"));
- copyRich.addActionListener(new java.awt.event.ActionListener() {
+ copyRich.addActionListener(new ActionListener() {
@Override
- public void actionPerformed(java.awt.event.ActionEvent evt) {
+ public final void actionPerformed(final ActionEvent evt) {
copyRichActionPerformed(evt);
}
});
next.setText(Translator.R("COPnext"));
- next.addActionListener(new java.awt.event.ActionListener() {
+ next.addActionListener(new ActionListener() {
@Override
- public void actionPerformed(java.awt.event.ActionEvent evt) {
+ public final void actionPerformed(final ActionEvent evt) {
nextActionPerformed(evt);
}
});
previous.setText(Translator.R("COPprevious"));
- previous.addActionListener(new java.awt.event.ActionListener() {
+ previous.addActionListener(new ActionListener() {
@Override
- public void actionPerformed(java.awt.event.ActionEvent evt) {
+ public final void actionPerformed(final ActionEvent evt) {
previousActionPerformed(evt);
}
});
@@ -489,81 +505,81 @@
revertSort.addActionListener(getDefaultActionSingleton());
mark.setText(Translator.R("COPmark"));
- mark.addActionListener(new java.awt.event.ActionListener() {
+ mark.addActionListener(new ActionListener() {
@Override
- public void actionPerformed(java.awt.event.ActionEvent evt) {
+ public final void actionPerformed(final ActionEvent evt) {
markActionPerformed(evt);
}
});
- javax.swing.GroupLayout jPanel2Layout = new javax.swing.GroupLayout(jPanel2);
+ final GroupLayout jPanel2Layout = new GroupLayout(jPanel2);
jPanel2.setLayout(jPanel2Layout);
jPanel2Layout.setHorizontalGroup(
jPanel2Layout.createParallelGroup(
- javax.swing.GroupLayout.Alignment.LEADING).
+ GroupLayout.Alignment.LEADING).
addGroup(
jPanel2Layout.createSequentialGroup().addContainerGap().addGroup(
- jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING).
+ jPanel2Layout.createParallelGroup(GroupLayout.Alignment.LEADING).
addGroup(
jPanel2Layout.createSequentialGroup().
- addComponent(showHeaders).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED).
- addComponent(showUser).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED).
- addComponent(showOrigin).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED).
- addComponent(showLevel).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED).
- addComponent(showDate).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED).
- addComponent(showCode).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED).
- addComponent(showThread1).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ addComponent(showHeaders).addPreferredGap(LayoutStyle.ComponentPlacement.RELATED).
+ addComponent(showUser).addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED).
+ addComponent(showOrigin).addPreferredGap(LayoutStyle.ComponentPlacement.RELATED).
+ addComponent(showLevel).addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED).
+ addComponent(showDate).addPreferredGap(LayoutStyle.ComponentPlacement.RELATED).
+ addComponent(showCode).addPreferredGap(LayoutStyle.ComponentPlacement.RELATED).
+ addComponent(showThread1).addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
.addComponent(showThread2)).
addGroup(jPanel2Layout.createSequentialGroup().addGroup(
- jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING).addGroup(
- javax.swing.GroupLayout.Alignment.LEADING, jPanel2Layout.createSequentialGroup()
- .addComponent(previous).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED).
- addComponent(mark).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED).
- addComponent(next).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 15, Short.MAX_VALUE).
- addComponent(wordWrap).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED).
- addComponent(highLight).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED).
- addComponent(sortCopyAll).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED).
- addComponent(copyRich).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED).
- addComponent(copyPlain)).addGroup(javax.swing.GroupLayout.Alignment.LEADING, jPanel2Layout.createSequentialGroup().
- addComponent(searchLabel).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED).
- addComponent(search, javax.swing.GroupLayout.DEFAULT_SIZE, 438, Short.MAX_VALUE).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED).
+ jPanel2Layout.createParallelGroup(GroupLayout.Alignment.TRAILING).addGroup(
+ GroupLayout.Alignment.LEADING, jPanel2Layout.createSequentialGroup()
+ .addComponent(previous).addPreferredGap(LayoutStyle.ComponentPlacement.RELATED).
+ addComponent(mark).addPreferredGap(LayoutStyle.ComponentPlacement.RELATED).
+ addComponent(next).addPreferredGap(LayoutStyle.ComponentPlacement.RELATED, 15, Short.MAX_VALUE).
+ addComponent(wordWrap).addPreferredGap(LayoutStyle.ComponentPlacement.RELATED).
+ addComponent(highLight).addPreferredGap(LayoutStyle.ComponentPlacement.RELATED).
+ addComponent(sortCopyAll).addPreferredGap(LayoutStyle.ComponentPlacement.RELATED).
+ addComponent(copyRich).addPreferredGap(LayoutStyle.ComponentPlacement.RELATED).
+ addComponent(copyPlain)).addGroup(GroupLayout.Alignment.LEADING, jPanel2Layout.createSequentialGroup().
+ addComponent(searchLabel).addPreferredGap(LayoutStyle.ComponentPlacement.RELATED).
+ addComponent(search, GroupLayout.DEFAULT_SIZE, 438, Short.MAX_VALUE).addPreferredGap(LayoutStyle.ComponentPlacement.RELATED).
addComponent(caseSensitive)).addGroup(
- javax.swing.GroupLayout.Alignment.LEADING, jPanel2Layout.createSequentialGroup().
- addComponent(showMessage).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED).
More information about the distro-pkg-dev
mailing list