/hg/release/icedtea-web-1.6: 3 new changesets
jvanek at icedtea.classpath.org
jvanek at icedtea.classpath.org
Thu Nov 12 17:04:02 UTC 2015
changeset a27404e97867 in /hg/release/icedtea-web-1.6
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.6?cmd=changeset;node=a27404e97867
author: Jiri Vanek <jvanek at redhat.com>
date: Thu Nov 12 15:48:22 2015 +0100
fixed build and runtime with jdk9
changeset 104317f48096 in /hg/release/icedtea-web-1.6
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.6?cmd=changeset;node=104317f48096
author: Jiri Vanek <jvanek at redhat.com>
date: Thu Nov 12 17:19:20 2015 +0100
Added desktop integration dialog
changeset a83c72313001 in /hg/release/icedtea-web-1.6
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.6?cmd=changeset;node=a83c72313001
author: Jiri Vanek <jvanek at redhat.com>
date: Thu Nov 12 18:03:47 2015 +0100
Added parser to read ico images
diffstat:
ChangeLog | 49 +
netx/net/sourceforge/jnlp/NetxPanel.java | 2 +-
netx/net/sourceforge/jnlp/controlpanel/DesktopShortcutPanel.java | 42 +-
netx/net/sourceforge/jnlp/controlpanel/desktopintegrationeditor/Blinker.java | 103 ++
netx/net/sourceforge/jnlp/controlpanel/desktopintegrationeditor/FreeDesktopIntegrationEditorFrame.java | 509 ++++++++++
netx/net/sourceforge/jnlp/controlpanel/desktopintegrationeditor/JListUtils.java | 380 +++++++
netx/net/sourceforge/jnlp/controlpanel/desktopintegrationeditor/Panels.java | 152 ++
netx/net/sourceforge/jnlp/controlpanel/desktopintegrationeditor/PreviewSelectionJTextPane.java | 155 +++
netx/net/sourceforge/jnlp/resources/Messages.properties | 33 +
netx/net/sourceforge/jnlp/security/dialogs/SecurityDialogPanel.java | 2 +-
netx/net/sourceforge/jnlp/tools/ico/impl/IcoException.java | 46 +
netx/net/sourceforge/jnlp/tools/ico/impl/IcoHeader.java | 87 +
netx/net/sourceforge/jnlp/tools/ico/impl/IcoHeaderEntry.java | 143 ++
netx/net/sourceforge/jnlp/tools/ico/impl/ImageInputStreamIco.java | 170 +++
netx/net/sourceforge/jnlp/util/XDesktopEntry.java | 2 +-
netx/net/sourceforge/jnlp/util/logging/ConsoleOutputPaneModel.java | 15 +-
netx/sun/applet/AppletViewerPanelAccess.java | 33 +
tests/netx/unit/net/sourceforge/jnlp/security/dialogs/apptrustwarningpanel/AppTrustWarningPanelTest.java | 3 +-
18 files changed, 1908 insertions(+), 18 deletions(-)
diffs (truncated from 2128 to 500 lines):
diff -r 6001830b0e1d -r a83c72313001 ChangeLog
--- a/ChangeLog Tue Oct 27 14:13:36 2015 +0100
+++ b/ChangeLog Thu Nov 12 18:03:47 2015 +0100
@@ -1,3 +1,52 @@
+2015-11-12 Jiri Vanek <jvanek at redhat.com>
+
+ Added parser to read ico images
+ * netx/net/sourceforge/jnlp/controlpanel/desktopintegrationeditor/JListUtils.java:
+ When reading images, also ico is attempted to parse.
+ * netx/net/sourceforge/jnlp/tools/ico/impl/IcoException.java: new class,
+ exception for special cases in ico parsing
+ * netx/net/sourceforge/jnlp/tools/ico/impl/IcoHeader.java: new class, parser
+ and holder of parsed information of header of ico file
+ * netx/net/sourceforge/jnlp/tools/ico/impl/IcoHeaderEntry.java: new class,
+ parser and holder of parsed information of headers of individual images stored
+ in header of ico file
+ * netx/net/sourceforge/jnlp/tools/ico/impl/ImageInputStreamIco.java: parser
+ of icon files from ImageInputStream
+
+2015-11-12 Jiri Vanek <jvanek at redhat.com>
+
+ Added desktop integration dialog
+ * netx/net/sourceforge/jnlp/controlpanel/DesktopShortcutPanel.java: added linux-only
+ button to sow FreeDesktopIntegrationEditorFrame
+ * netx/net/sourceforge/jnlp/controlpanel/desktopintegrationeditor/Blinker.java:
+ new class, blink colors on selected component
+ * netx/net/sourceforge/jnlp/controlpanel/desktopintegrationeditor/FreeDesktopIntegrationEditorFrame.java:
+ new class, window to allow managing generated icons, jnlpfiles and shortcuts
+ * netx/net/sourceforge/jnlp/controlpanel/desktopintegrationeditor/JListUtils.java:
+ new class, provides models, extensions, renderers and listeners for FreeDesktopIntegrationEditorFrame
+ * netx/net/sourceforge/jnlp/controlpanel/desktopintegrationeditor/Panels.java:
+ new class, provides various encapsulated parts of FreeDesktopIntegrationEditorFrame
+ * netx/net/sourceforge/jnlp/controlpanel/desktopintegrationeditor/PreviewSelectionJTextPane.java:
+ new class, impelmetation of preview for FreeDesktopIntegrationEditorFrame
+ * netx/net/sourceforge/jnlp/resources/Messages.properties: added Control
+ Panel - desktop integration manager DIM family
+ * netx/net/sourceforge/jnlp/security/dialogs/SecurityDialogPanel.java: htmlWrap
+ made public
+ * netx/net/sourceforge/jnlp/util/XDesktopEntry.java: findFreedesktopOrgDesktopPathCatch
+ made public
+ * netx/net/sourceforge/jnlp/util/logging/ConsoleOutputPaneModel.java: replacing of chars by html
+ entities extracted to new method escapeHtmlForJTextPane
+ * tests/netx/unit/net/sourceforge/jnlp/security/dialogs/apptrustwarningpanel/AppTrustWarningPanelTest.java:
+ htmlwrap moved to use SecurityDialogPanel's implementation
+
+2015-11-12 Jiri Vanek <jvanek at redhat.com>
+
+ fixed build and runtime with jdk9
+ * netx/net/sourceforge/jnlp/NetxPanel.java: (init) setting doInit to true
+ replaced by call to setDoInitIfExists
+ * netx/sun/applet/AppletViewerPanelAccess.java: added new function of
+ (setDoInitIfExists) which sets doInit if exists
+
2015-10-27 Jiri Vanek <jvanek at redhat.com>
itweb-settings, debugging panel made aware about legacy log and client apps log
diff -r 6001830b0e1d -r a83c72313001 netx/net/sourceforge/jnlp/NetxPanel.java
--- a/netx/net/sourceforge/jnlp/NetxPanel.java Tue Oct 27 14:13:36 2015 +0100
+++ b/netx/net/sourceforge/jnlp/NetxPanel.java Thu Nov 12 18:03:47 2015 +0100
@@ -204,7 +204,7 @@
}
public void init(PluginBridge bridge) throws LaunchException {
- doInit = true;
+ setDoInitIfExists(true);
dispatchAppletEvent(APPLET_LOADING, null);
status = APPLET_LOAD;
diff -r 6001830b0e1d -r a83c72313001 netx/net/sourceforge/jnlp/controlpanel/DesktopShortcutPanel.java
--- a/netx/net/sourceforge/jnlp/controlpanel/DesktopShortcutPanel.java Tue Oct 27 14:13:36 2015 +0100
+++ b/netx/net/sourceforge/jnlp/controlpanel/DesktopShortcutPanel.java Thu Nov 12 18:03:47 2015 +0100
@@ -1,5 +1,5 @@
/* DesktopShortcutPanel.java -- Display option for adding desktop shortcut.
-Copyright (C) 2010 Red Hat
+Copyright (C) 2015 Red Hat
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -15,40 +15,42 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
package net.sourceforge.jnlp.controlpanel;
import java.awt.Component;
import java.awt.Dimension;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import javax.swing.Box;
+import javax.swing.JButton;
import javax.swing.JComboBox;
import javax.swing.JLabel;
+import javax.swing.SwingUtilities;
import net.sourceforge.jnlp.ShortcutDesc;
import net.sourceforge.jnlp.config.DeploymentConfiguration;
+import net.sourceforge.jnlp.controlpanel.desktopintegrationeditor.FreeDesktopIntegrationEditorFrame;
+import net.sourceforge.jnlp.runtime.JNLPRuntime;
import net.sourceforge.jnlp.runtime.Translator;
/**
* This class provides the panel that allows the user to set whether they want
* to create a desktop shortcut for javaws.
- *
- * @author Andrew Su (asu at redhat.com, andrew.su at utoronto.ca)
- *
*/
public class DesktopShortcutPanel extends NamedBorderPanel implements ItemListener {
private final DeploymentConfiguration config;
+ private FreeDesktopIntegrationEditorFrame integrationManagment;
/**
* Create a new instance of the desktop shortcut settings panel.
- *
- * @param config
- * Loaded DeploymentConfiguration file.
+ *
+ * @param config Loaded DeploymentConfiguration file.
*/
public DesktopShortcutPanel(DeploymentConfiguration config) {
super(Translator.R("CPHeadDesktopIntegration"), new GridBagLayout());
@@ -57,7 +59,6 @@
addComponents();
}
-
public static ComboItem deploymentJavawsShortcutToComboItem(String i) {
return new ComboItem(ShortcutDesc.deploymentJavawsShortcutToString(i), i);
}
@@ -69,6 +70,27 @@
GridBagConstraints c = new GridBagConstraints();
JLabel description = new JLabel("<html>" + Translator.R("CPDesktopIntegrationDescription") + "<hr /></html>");
JComboBox<ComboItem> shortcutComboOptions = new JComboBox<>();
+ JButton manageIntegrationsButton = new JButton(Translator.R("CPDesktopIntegrationShowIntegrations"));
+ if (JNLPRuntime.isWindows()) {
+ manageIntegrationsButton.setToolTipText(Translator.R("CPDesktopIntegrationLinuxOnly"));
+ manageIntegrationsButton.setEnabled(false);
+ }
+ manageIntegrationsButton.addActionListener(new ActionListener() {
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ SwingUtilities.invokeLater(new Runnable() {
+
+ @Override
+ public void run() {
+ if (integrationManagment == null) {
+ integrationManagment = new FreeDesktopIntegrationEditorFrame();
+ }
+ integrationManagment.setVisible(true);
+ }
+ });
+ }
+ });
ComboItem[] items = {deploymentJavawsShortcutToComboItem(ShortcutDesc.CREATE_NEVER),
deploymentJavawsShortcutToComboItem(ShortcutDesc.CREATE_ALWAYS),
deploymentJavawsShortcutToComboItem(ShortcutDesc.CREATE_ASK_USER),
@@ -92,6 +114,8 @@
add(description, c);
c.gridy = 1;
add(shortcutComboOptions, c);
+ c.gridy = 2;
+ add(manageIntegrationsButton, c);
// This is to keep it from expanding vertically if resized.
Component filler = Box.createRigidArea(new Dimension(1, 1));
diff -r 6001830b0e1d -r a83c72313001 netx/net/sourceforge/jnlp/controlpanel/desktopintegrationeditor/Blinker.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/netx/net/sourceforge/jnlp/controlpanel/desktopintegrationeditor/Blinker.java Thu Nov 12 18:03:47 2015 +0100
@@ -0,0 +1,103 @@
+/* Copyright (C) 2015 Red Hat, Inc.
+
+ This file is part of IcedTea.
+
+ IcedTea is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, version 2.
+
+ IcedTea is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with IcedTea; see the file COPYING. If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301 USA.
+
+ Linking this library statically or dynamically with other modules is
+ making a combined work based on this library. Thus, the terms and
+ conditions of the GNU General Public License cover the whole
+ combination.
+
+ As a special exception, the copyright holders of this library give you
+ permission to link this library with independent modules to produce an
+ executable, regardless of the license terms of these independent
+ modules, and to copy and distribute the resulting executable under
+ terms of your choice, provided that you also meet, for each linked
+ independent module, the terms and conditions of the license of that
+ module. An independent module is a module which is not derived from
+ or based on this library. If you modify this library, you may extend
+ this exception to your version of the library, but you are not
+ obligated to do so. If you do not wish to do so, delete this
+ exception statement from your version.
+ */
+package net.sourceforge.jnlp.controlpanel.desktopintegrationeditor;
+
+import java.awt.Color;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import javax.swing.JComponent;
+import javax.swing.SwingUtilities;
+import javax.swing.Timer;
+
+public class Blinker {
+
+ private boolean blinking;
+ private final JComponent compToBlink;
+
+ public Blinker(JComponent compToBlink) {
+ this.compToBlink = compToBlink;
+ }
+
+ public void blink() {
+ if (blinking) {
+ return;
+ }
+ blinking = true;
+ Timer t = new Timer(100, new BlinkBody());
+ t.setInitialDelay(0);
+ t.start();
+ }
+
+ class BlinkBody implements ActionListener {
+
+ int counter = 0;
+ Color base;
+ Color invert;
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ counter++;
+ if (counter == 1) {
+ base = compToBlink.getBackground();
+ invert = new Color(Math.min(255, base.getRed() * 2), Math.max(0, base.getGreen() / 2), 255 - base.getBlue());
+ }
+ if (counter == 5) {
+ ((Timer) e.getSource()).stop();
+ SwingUtilities.invokeLater(new Runnable() {
+
+ @Override
+ public void run() {
+ compToBlink.setBackground(base);
+ blinking = false;
+ }
+ });
+ return;
+ }
+ SwingUtilities.invokeLater(new Runnable() {
+
+ @Override
+ public void run() {
+ if (compToBlink.getBackground().equals(base)) {
+ compToBlink.setBackground(invert);
+ } else {
+ compToBlink.setBackground(base);
+ }
+ }
+ });
+ }
+
+ }
+}
diff -r 6001830b0e1d -r a83c72313001 netx/net/sourceforge/jnlp/controlpanel/desktopintegrationeditor/FreeDesktopIntegrationEditorFrame.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/netx/net/sourceforge/jnlp/controlpanel/desktopintegrationeditor/FreeDesktopIntegrationEditorFrame.java Thu Nov 12 18:03:47 2015 +0100
@@ -0,0 +1,509 @@
+/* Copyright (C) 2015 Red Hat, Inc.
+
+ This file is part of IcedTea.
+
+ IcedTea is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, version 2.
+
+ IcedTea is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with IcedTea; see the file COPYING. If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301 USA.
+
+ Linking this library statically or dynamically with other modules is
+ making a combined work based on this library. Thus, the terms and
+ conditions of the GNU General Public License cover the whole
+ combination.
+
+ As a special exception, the copyright holders of this library give you
+ permission to link this library with independent modules to produce an
+ executable, regardless of the license terms of these independent
+ modules, and to copy and distribute the resulting executable under
+ terms of your choice, provided that you also meet, for each linked
+ independent module, the terms and conditions of the license of that
+ module. An independent module is a module which is not derived from
+ or based on this library. If you modify this library, you may extend
+ this exception to your version of the library, but you are not
+ obligated to do so. If you do not wish to do so, delete this
+ exception statement from your version.
+ */
+package net.sourceforge.jnlp.controlpanel.desktopintegrationeditor;
+
+import java.awt.BorderLayout;
+import java.awt.GridLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.util.ArrayList;
+import java.util.List;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JSplitPane;
+import javax.swing.JTextPane;
+import javax.swing.ListModel;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import net.sourceforge.jnlp.config.PathsAndFiles;
+import net.sourceforge.jnlp.security.dialogs.SecurityDialogPanel;
+import net.sourceforge.jnlp.util.XDesktopEntry;
+import net.sourceforge.jnlp.util.logging.ConsoleOutputPaneModel;
+
+import static net.sourceforge.jnlp.runtime.Translator.R;
+
+public class FreeDesktopIntegrationEditorFrame extends JFrame {
+
+ //gui
+ private final javax.swing.JLabel title = new JLabel();
+ private final javax.swing.JCheckBox selectRelativeRecordsFromOtherColumns = new JCheckBox();
+ private final javax.swing.JButton removeSelectedButton = new JButton();
+ private final javax.swing.JButton cleanAll = new JButton();
+ private final javax.swing.JButton closeButton = new JButton();
+ private final javax.swing.JButton reloadsListButton = new JButton();
+ private final javax.swing.JButton selectAll = new JButton();
+
+ //important ones
+ private final javax.swing.JList menuList = new JListUtils.CustomRendererJList();
+ private final javax.swing.JList desktopList = new JListUtils.CustomValidatingRendererJList();
+ private final javax.swing.JList generatedList = new JListUtils.CustomRendererJList();
+ private final javax.swing.JList iconsList = new JListUtils.CustomRendererWithIconJList();
+
+ PreviewSelectionJTextPane previewPane = new PreviewSelectionJTextPane(iconsList, menuList, desktopList, generatedList);
+ //gui end
+
+ private final Blinker blinker;
+
+ private void setListeners() {
+ removeSelectedButton.addActionListener(new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent evt) {
+ FreeDesktopIntegrationEditorFrame.this.removeSelected();
+ }
+ });
+
+ closeButton.addActionListener(new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent evt) {
+ dispose();
+ }
+ });
+
+ reloadsListButton.addActionListener(new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent evt) {
+ populateLists();
+ }
+ });
+
+ selectAll.addActionListener(new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent evt) {
+ selectAll();
+ }
+ });
+
+ cleanAll.addActionListener(new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent evt) {
+ cleanAll();
+ }
+ });
+
+ }
+
+ private void setTexts() {
+ this.setTitle(R("DIMtitle"));
+ closeButton.setText(R("ButClose"));
+ removeSelectedButton.setText(R("DIMremoveSelected"));
+ selectRelativeRecordsFromOtherColumns.setText(R("DIMselectRelativeRecordsFromOtherColumns"));
+ reloadsListButton.setText(R("DIMreloadLists"));
+ selectAll.setText(R("DIMselectAll"));
+ cleanAll.setText(R("DIMclearSelection"));
+ title.setText(SecurityDialogPanel.htmlWrap("<p>" + R("DIMdescription") + "</p>"));
+ }
+
+ private JPanel createMainControls() {
+ JPanel mainControls = new JPanel(new GridLayout(1, 2));
+ mainControls.add(closeButton);
+ mainControls.add(removeSelectedButton);
+ return mainControls;
+ }
+
+ private JPanel createMiddleToolBox() {
+ JPanel middleToolBox = new JPanel(new GridLayout(1, 2));
+ middleToolBox.add(selectRelativeRecordsFromOtherColumns);
+ middleToolBox.add(reloadsListButton);
+ middleToolBox.add(selectAll);
+ middleToolBox.add(cleanAll);
+ return middleToolBox;
+ }
+
+ private JPanel createPreviewPanel(JTextPane previewPane) {
+ JPanel previewPanel = new JPanel(new BorderLayout());
+ JScrollPane jScrollPane2 = new JScrollPane();
+ jScrollPane2.setViewportView(previewPane);
+ previewPanel.add(jScrollPane2, BorderLayout.CENTER);
+ createMiddleToolBox();
+ previewPanel.add(createMiddleToolBox(), BorderLayout.PAGE_START);
+ return previewPanel;
+ }
+
+ private JSplitPane createListsLayout() {
+ JPanel menusPanel = Panels.createMenuPanel(menuList, new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent evt) {
+ selectSomeRelatives(menuList.getSelectedValuesList(), iconsList);
+ }
+ }, new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent evt) {
+ selectSomeRelatives(menuList.getSelectedValuesList(), generatedList);
+ }
+ }
+ );
+ JPanel desktopsPanel = Panels.createDesktopPanel(desktopList, new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent evt) {
+ selectSomeRelatives(desktopList.getSelectedValuesList(), iconsList);
+ }
+ }, new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent evt) {
+ selectSomeRelatives(desktopList.getSelectedValuesList(), generatedList);
+ }
+ }
+ );
+ JPanel iconsPanel = Panels.createIconsPanel(iconsList, new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent evt) {
+ findOrphans(iconsList, allItemsAsFiles(menuList), allItemsAsFiles(desktopList));
+ }
+ });
+ JPanel generatedsPanel = Panels.createGeneratedPanel(generatedList, new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent evt) {
+ findOrphans(generatedList, allItemsAsFiles(menuList), allItemsAsFiles(desktopList));
+ }
+ });
+ return Panels.createQuadroSplit(expectedWidth, menusPanel, desktopsPanel, iconsPanel, generatedsPanel);
+ }
+
+ private void setLayout() {
+ createMainControls();
+ getContentPane().add(createMainControls(), BorderLayout.PAGE_END);
+ JSplitPane splitListsAndPreview = new JSplitPane(JSplitPane.VERTICAL_SPLIT);
+ splitListsAndPreview.setLeftComponent(createListsLayout());
+ splitListsAndPreview.setRightComponent(createPreviewPanel(previewPane));
+ getContentPane().add(splitListsAndPreview, BorderLayout.CENTER);
+ getContentPane().add(title, BorderLayout.PAGE_START);
+ splitListsAndPreview.setDividerLocation(expectedHeight / 2);
+ }
+
+ public static void main(String args[]) {
+
More information about the distro-pkg-dev
mailing list