/hg/icedtea-web: 5 new changesets
jvanek at icedtea.classpath.org
jvanek at icedtea.classpath.org
Fri Dec 20 06:16:34 PST 2013
changeset d0f55e869ad7 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=d0f55e869ad7
author: Jiri Vanek <jvanek at redhat.com>
date: Fri Dec 20 11:20:39 2013 +0100
singletons logic, logs and test cleanup/fixes
changeset f33f7b365330 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=f33f7b365330
author: Jiri Vanek <jvanek at redhat.com>
date: Fri Dec 20 12:08:51 2013 +0100
finished removal of legacy xulrunner api
changeset 416dccd16177 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=416dccd16177
author: Jiri Vanek <jvanek at redhat.com>
date: Fri Dec 20 12:47:12 2013 +0100
fixed CacheLRUWrapperTest
changeset ea3bbe6a9c84 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=ea3bbe6a9c84
author: Jiri Vanek <jvanek at redhat.com>
date: Fri Dec 20 12:57:58 2013 +0100
Minor formatting fix
changeset 17818bc7aba3 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=17818bc7aba3
author: Jiri Vanek <jvanek at redhat.com>
date: Fri Dec 20 15:23:08 2013 +0100
Rewritten java console
diffstat:
ChangeLog | 60 +
acinclude.m4 | 20 -
configure.ac | 1 -
netx/net/sourceforge/jnlp/Launcher.java | 3 +
netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java | 4 +-
netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java | 46 +-
netx/net/sourceforge/jnlp/util/logging/ConsoleOutputPane.java | 887 ++++++++++
netx/net/sourceforge/jnlp/util/logging/ConsoleOutputPaneModel.java | 386 ++++
netx/net/sourceforge/jnlp/util/logging/JavaConsole.java | 220 +-
netx/net/sourceforge/jnlp/util/logging/LogConfig.java | 24 +-
netx/net/sourceforge/jnlp/util/logging/OutputController.java | 140 +-
netx/net/sourceforge/jnlp/util/logging/headers/Header.java | 25 +-
netx/net/sourceforge/jnlp/util/logging/headers/ObservableMessagesProvider.java | 46 +
netx/net/sourceforge/jnlp/util/logging/headers/PluginHeader.java | 9 +-
tests/netx/unit/net/sourceforge/jnlp/cache/CacheLRUWrapperTest.java | 56 +-
tests/netx/unit/net/sourceforge/jnlp/cache/ResourceTrackerTest.java | 1 -
tests/netx/unit/net/sourceforge/jnlp/util/logging/JavaConsoleTest.java | 7 +-
tests/test-extensions/net/sourceforge/jnlp/util/logging/NoStdOutErrTest.java | 69 +-
18 files changed, 1748 insertions(+), 256 deletions(-)
diffs (truncated from 2563 to 500 lines):
diff -r 7c226ed27626 -r 17818bc7aba3 ChangeLog
--- a/ChangeLog Wed Dec 18 15:41:28 2013 +0100
+++ b/ChangeLog Fri Dec 20 15:23:08 2013 +0100
@@ -1,3 +1,63 @@
+2013-12-20 Jiri Vanek <jvanek at redhat.com>
+
+ Rewritten java console
+ * netx/net/sourceforge/jnlp/Launcher.java: fatal error from lunch can reach console
+ * netx/net/sourceforge/jnlp/util/logging/ConsoleOutputPane.java: new console,
+ controls
+ * netx/net/sourceforge/jnlp/util/logging/ConsoleOutputPaneModel.java: data
+ manager of new console.
+ * netx/net/sourceforge/jnlp/util/logging/JavaConsole.java: removed old gui,
+ now using multiple 1-n instances of ConsoleOutputPane with theirs models.
+ (addMessage) now receive MessageWithHeader object instead body and header.
+ * netx/net/sourceforge/jnlp/util/logging/headers/Header.java: have not null
+ defaults
+ * netx/net/sourceforge/jnlp/util/logging/headers/ObservableMessagesProvider.java:
+ abstraction of datasource for new console
+ * tests/netx/unit/net/sourceforge/jnlp/util/logging/JavaConsoleTest.java:
+ adapted.
+
+2013-12-20 Jiri Vanek <jvanek at redhat.com>
+
+ fixed CacheLRUWrapperTest
+ * netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java: (cacheDir) and
+ (cacheOrder) made package private for testing purposes.
+ * tests/netx/unit/net/sourceforge/jnlp/cache/CacheLRUWrapperTest.java:
+ True testing cache file is now prepared, tested, and removed.
+ the CacheLRUWrapper is using this testing repo.
+
+2013-12-20 Jiri Vanek <jvanek at redhat.com>
+
+ finished removal of legacy xulrunner api
+ * acinclude.m4: (IT_CHECK_XULRUNNER_API_VERSION) removed
+ * configure.ac: likewise
+
+2013-12-20 Jiri Vanek <jvanek at redhat.com>
+
+ singletons logic, logs and test cleanup/fixes
+ * netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java:
+ config singleton made properly synchronized via Holder pattern
+ (DeploymentConfigurationHolder).
+ * netx/net/sourceforge/jnlp/util/logging/JavaConsole.java: same,
+ (JavaConsoleHolder). Console gui initialized on show, not on creation.
+ Removed look and feel. (addMessage) gui update adapted.
+ * netx/net/sourceforge/jnlp/util/logging/LogConfig.java: made private,
+ singleton handled via LogConfigHolder.
+ * netx/net/sourceforge/jnlp/util/logging/OutputController.java: mentioned
+ issue with (getConfiguration), removed obsoleted (MessageWithLevel),
+ (messageQue) retyped to <MessageWithHeader>, (consume) adapted.
+ (consumerThread) made global variable, ist start moved to (startConsumer)
+ which is called after initialisation of config singleton. Logs queing
+ moved to (log) of (MessageWithHeader) signature. (FileLogHolder) and
+ (SystemLogHolder) created for holder pattern synchronization.
+ * netx/net/sourceforge/jnlp/util/logging/headers/Header.java: constructor
+ and (getCaller) adaptation.
+ * netx/net/sourceforge/jnlp/util/logging/headers/PluginHeader.java: fixed
+ (toString) for preinit messages.
+ * tests/netx/unit/net/sourceforge/jnlp/util/logging/JavaConsoleTest.java:
+ removed erroneous stdout.
+ * tests/test-extensions/net/sourceforge/jnlp/util/logging/NoStdOutErrTest.java:
+ is no longer throwing exceptions (was causing errors in junit) and synchronized.
+
2013-12-17 Jiri Vanek <jvanek at redhat.com>
JNLPRuntime.config changed to proper singleton.
diff -r 7c226ed27626 -r 17818bc7aba3 acinclude.m4
--- a/acinclude.m4 Wed Dec 18 15:41:28 2013 +0100
+++ b/acinclude.m4 Fri Dec 20 15:23:08 2013 +0100
@@ -520,26 +520,6 @@
PKG_CHECK_MODULES([GLIB2_V_216],[glib-2.0 >= 2.16],[],[AC_DEFINE([LEGACY_GLIB])])
])
-AC_DEFUN_ONCE([IT_CHECK_XULRUNNER_API_VERSION],
-[
- AC_MSG_CHECKING([for legacy xulrunner api])
- AC_LANG_PUSH(C++)
- CXXFLAGS_BACKUP=$CXXFLAGS
- CXXFLAGS=$CXXFLAGS" "$MOZILLA_CFLAGS
- AC_TRY_COMPILE([
- #include <npfunctions.h>
- const char* NP_GetMIMEDescription ()
- {return (char*) "yap!";}
- ],[],[
- AC_MSG_RESULT(no)
- ],[
- AC_MSG_RESULT(yes)
- AC_DEFINE([LEGACY_XULRUNNERAPI])
- ])
- CXXFLAGS=$CXXFLAGS_BACKUP
- AC_LANG_POP(C++)
-])
-
AC_DEFUN([IT_CHECK_WITH_GCJ],
[
AC_MSG_CHECKING([whether to compile ecj natively])
diff -r 7c226ed27626 -r 17818bc7aba3 configure.ac
--- a/configure.ac Wed Dec 18 15:41:28 2013 +0100
+++ b/configure.ac Fri Dec 20 15:23:08 2013 +0100
@@ -82,7 +82,6 @@
IT_CHECK_FOR_CLASS(SUN_APPLET_APPLETIMAGEREF, [sun.applet.AppletImageRef])
IT_CHECK_FOR_APPLETVIEWERPANEL_HOLE
IT_CHECK_GLIB_VERSION
-IT_CHECK_XULRUNNER_API_VERSION
#
# Find optional depedencies
diff -r 7c226ed27626 -r 17818bc7aba3 netx/net/sourceforge/jnlp/Launcher.java
--- a/netx/net/sourceforge/jnlp/Launcher.java Wed Dec 18 15:41:28 2013 +0100
+++ b/netx/net/sourceforge/jnlp/Launcher.java Fri Dec 20 15:23:08 2013 +0100
@@ -915,6 +915,9 @@
if (exitOnFailure) {
JNLPRuntime.exit(1);
}
+ } catch (Throwable ex) {
+ OutputController.getLogger().log(OutputController.Level.ERROR_ALL, ex);
+ throw new RuntimeException(ex);
}
}
diff -r 7c226ed27626 -r 17818bc7aba3 netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java
--- a/netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java Wed Dec 18 15:41:28 2013 +0100
+++ b/netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java Fri Dec 20 15:23:08 2013 +0100
@@ -73,14 +73,14 @@
/* location of cache directory */
private final String setCachePath = JNLPRuntime.getConfiguration().getProperty(DeploymentConfiguration.KEY_USER_CACHE_DIR);
- private final String cacheDir = new File(setCachePath != null ? setCachePath : System.getProperty("java.io.tmpdir")).getPath();
+ String cacheDir = new File(setCachePath != null ? setCachePath : System.getProperty("java.io.tmpdir")).getPath();
/*
* back-end of how LRU is implemented This file is to keep track of the most
* recently used items. The items are to be kept with key = (current time
* accessed) followed by folder of item. value = path to file.
*/
- private PropertiesFile cacheOrder = new PropertiesFile(
+ PropertiesFile cacheOrder = new PropertiesFile(
new File(cacheDir + File.separator + CACHE_INDEX_FILE_NAME));
public static final String CACHE_INDEX_FILE_NAME = "recently_used";
diff -r 7c226ed27626 -r 17818bc7aba3 netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java
--- a/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java Wed Dec 18 15:41:28 2013 +0100
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java Fri Dec 20 15:23:08 2013 +0100
@@ -90,8 +90,6 @@
/** the localized resource strings */
private static ResourceBundle resources;
- private static DeploymentConfiguration config;
-
/** the security manager */
private static JNLPSecurityManager security;
@@ -351,25 +349,39 @@
/**
+ * see https://en.wikipedia.org/wiki/Double-checked_locking#Usage_in_Java
+ * for cases how not to do lazy initialization
+ * and https://en.wikipedia.org/wiki/Initialization_on_demand_holder_idiom
+ * for ITW approach
+ */
+ private static class DeploymentConfigurationHolder {
+
+ private static final DeploymentConfiguration INSTANCE = initConfiguration();
+
+ private static DeploymentConfiguration initConfiguration() {
+ DeploymentConfiguration config = new DeploymentConfiguration();
+ try {
+ config.load();
+ config.copyTo(System.getProperties());
+ } catch (ConfigurationException ex) {
+ OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, getMessage("RConfigurationError"));
+ //mark this exceptionas we can die on it later
+ config.setLoadingException(ex);
+ } finally {
+ OutputController.getLogger().startConsumer();
+ }
+ return config;
+ }
+ }
+
+ /**
* Gets the Configuration associated with this runtime
+ *
* @return a {@link DeploymentConfiguration} object that can be queried to
* find relevant configuration settings
*/
- public synchronized static DeploymentConfiguration getConfiguration() {
- if (config == null){
- config = new DeploymentConfiguration();
- try{
- config.load();
- config.copyTo(System.getProperties());
- }catch(ConfigurationException ex){
- OutputController.getLogger().log(ex);
- //mark first occurence of exception so we can react later
- if (config.getLoadingException() == null){
- config.setLoadingException(ex);
- }
- }
- }
- return config;
+ public static DeploymentConfiguration getConfiguration() {
+ return DeploymentConfigurationHolder.INSTANCE;
}
/**
diff -r 7c226ed27626 -r 17818bc7aba3 netx/net/sourceforge/jnlp/util/logging/ConsoleOutputPane.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/netx/net/sourceforge/jnlp/util/logging/ConsoleOutputPane.java Fri Dec 20 15:23:08 2013 +0100
@@ -0,0 +1,887 @@
+package net.sourceforge.jnlp.util.logging;
+
+import java.awt.Color;
+import java.awt.Toolkit;
+import java.awt.datatransfer.Clipboard;
+import java.awt.datatransfer.StringSelection;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.io.IOException;
+import java.util.Observable;
+import java.util.Observer;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.regex.Pattern;
+import javax.swing.ButtonGroup;
+import javax.swing.JFrame;
+import javax.swing.JMenuItem;
+import javax.swing.JPopupMenu;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+import javax.swing.text.BadLocationException;
+import javax.swing.text.DefaultHighlighter;
+import javax.swing.text.Document;
+import javax.swing.text.PlainDocument;
+import javax.swing.text.html.HTMLDocument;
+import net.sourceforge.jnlp.runtime.JNLPRuntime;
+import net.sourceforge.jnlp.util.logging.headers.ObservableMessagesProvider;
+
+public class ConsoleOutputPane extends javax.swing.JPanel implements Observer {
+
+ @Override
+ public synchronized void update(Observable o, Object arg) {
+ if (!autorefresh.isSelected()) {
+ statistics.setText(model.createStatisticHint());
+ return;
+ }
+ boolean passed = model.shouldUpdate();
+
+ if (!passed) {
+ statistics.setText(model.createStatisticHint());
+ return;
+ }
+ if (sortBy.getSelectedIndex() == 0) {
+ //no sort, we can just update
+ updatePane(false);
+ } else {
+ refreshPane();
+ }
+
+ }
+ private ConsoleOutputPaneModel model;
+ private int lastPostion; //index of search
+ private DefaultHighlighter.DefaultHighlightPainter searchHighligh = new DefaultHighlighter.DefaultHighlightPainter(Color.blue);
+ private Object lastSearchTag;
+
+ public ConsoleOutputPane(ObservableMessagesProvider dataProvider) {
+ model = new ConsoleOutputPaneModel(dataProvider);
+ initComponents();
+ regExFilter.setText(ConsoleOutputPaneModel.defaultPattern.pattern());
+ if (!LogConfig.getLogConfig().isEnableHeaders()) {
+ showHeaders.setSelected(false);
+ }
+ if (JNLPRuntime.isWebstartApplication()) {
+ showPlugin.setSelected(false);
+ showPreInit.setSelected(false);
+ showPostInit.setSelected(false);
+ showIncomplete.setSelected(false);
+ showComplete.setSelected(false);
+
+ showPlugin.setEnabled(false);
+ showPreInit.setEnabled(false);
+ showPostInit.setEnabled(false);
+ showIncomplete.setEnabled(false);
+ showComplete.setEnabled(false);
+ }
+ regExFilter.getDocument().addDocumentListener(new DocumentListener() {
+
+ @Override
+ public void insertUpdate(DocumentEvent e) {
+ colorize();
+ }
+
+ @Override
+ public void removeUpdate(DocumentEvent e) {
+ colorize();
+ }
+
+ @Override
+ public void changedUpdate(DocumentEvent e) {
+ colorize();
+ }
+
+ private void colorize() {
+ try {
+ String s = regExFilter.getText();
+ Pattern p = Pattern.compile(s);
+ model.lastValidPattern = p;
+ regExLabel.setForeground(Color.green);
+ } catch (Exception ex) {
+ regExLabel.setForeground(Color.red);
+ }
+ }
+ });
+ regExFilter.addMouseListener(new MouseAdapter() {
+
+ @Override
+ public void mouseClicked(final MouseEvent e) {
+ java.awt.EventQueue.invokeLater(new Runnable() {
+
+ @Override
+ public void run() {
+ try {
+ if (e.getButton() != MouseEvent.BUTTON3) {
+ insertChars.setVisible(false);
+ return;
+ }
+ insertChars.setLocation(e.getXOnScreen(), e.getYOnScreen());
+ insertChars.setVisible(!insertChars.isVisible());
+ } catch (Exception ex) {
+ OutputController.getLogger().log(ex);
+ }
+ }
+ });
+ }
+ });
+ regExFilter.addKeyListener(new KeyAdapter() {
+
+ @Override
+ public void keyPressed(final KeyEvent e) {
+ if (e.getKeyCode() != KeyEvent.VK_CONTEXT_MENU) {
+ return;
+ }
+ java.awt.EventQueue.invokeLater(new Runnable() {
+
+ @Override
+ public void run() {
+ try{
+ insertChars.setLocation(regExFilter.getLocationOnScreen());
+ insertChars.setVisible(!insertChars.isVisible());
+ } catch (Exception ex) {
+ OutputController.getLogger().log(ex);
+ }
+ }
+ });
+ }
+ });
+
+ ButtonGroup matches = new ButtonGroup();
+ matches.add(match);
+ matches.add(notMatch);
+ showHideActionPerformed(null);
+ updateModel();
+ refreshPane();
+
+ }
+
+ private ActionListener createDefaultAction() {
+ return new ActionListener() {
+
+ @Override
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ refreshAction(evt);
+ }
+ };
+ }
+ ActionListener defaultActionSingleton = createDefaultAction();
+
+ private ActionListener getDefaultActionSingleton() {
+ return defaultActionSingleton;
+ }
+
+ private synchronized void refreshPane() {
+ if (highLight.isSelected()) {
+ jEditorPane1.setContentType("text/html");
+ } else {
+ jEditorPane1.setContentType("text/plain");
+ }
+ model.lastUpdateIndex = 0;
+ updatePane(true);
+ }
+ /**
+ * when various threads update (and it can be)underlying jeditorpane
+ * simultanouskly, then it can lead to unpredictible issues synchroisation
+ * is doen in invoe later
+ */
+ private AtomicBoolean done = new AtomicBoolean(true);
+
+ private synchronized void updatePane(final boolean reset) {
+ if (!done.get()) {
+ return;
+ }
+ done.set(false);
+ java.awt.EventQueue.invokeLater(new Runnable() {
+
+ @Override
+ public void run() {
+ try {
+ refreshPaneBody(reset);
+ } catch (Exception ex) {
+ OutputController.getLogger().log(ex);
+ } finally {
+ done.set(true);
+ }
+ }
+ });
+ }
+
+ private synchronized void refreshPaneBody(final boolean reset) throws BadLocationException, IOException {
+ if (reset) {
+ jEditorPane1.setText(model.importList(0));
+ } else {
+ String s = model.importList();
+ if (highLight.isSelected()) {
+ HTMLDocument orig = (HTMLDocument) jEditorPane1.getDocument();
+ if (revertSort.isSelected()) {
+ orig.insertAfterEnd(orig.getRootElements()[0].getElement(0)/*body*/, s);
+ } else {
+ orig.insertBeforeEnd(orig.getRootElements()[0], s);
+ }
+ } else {
+ if (revertSort.isSelected()) {
+ jEditorPane1.setText(s + jEditorPane1.getText());
+ } else {
+ jEditorPane1.setText(jEditorPane1.getText() + s);
+ }
+ }
+ }
+ jEditorPane1.setCaretPosition(0);
+ //jEditorPane1.repaint();
+ if (mark.isSelected()) {
+ markActionPerformed(null);
+ }
+ statistics.setText(model.createStatisticHint());
+ }
+
+ @SuppressWarnings("unchecked")
+ private void initComponents() {
+
+ jPanel2 = new javax.swing.JPanel();
+ showHeaders = new javax.swing.JCheckBox();
+ showUser = 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();
+ 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();
+
More information about the distro-pkg-dev
mailing list