[rfc][icedtea-web] manager for desktop integration
Jacob Wisor
gitne at gmx.de
Wed Oct 28 12:23:10 UTC 2015
On 10/27/2015 at 04:11 PM Jiri Vanek wrote:
> […]
Some detailed nits:
> diff -r 56bfa957a6b8 netx/net/sourceforge/jnlp/controlpanel/DesktopShortcutPanel.java
> --- a/netx/net/sourceforge/jnlp/controlpanel/DesktopShortcutPanel.java Tue Oct 27 14:13:23 2015 +0100
> +++ b/netx/net/sourceforge/jnlp/controlpanel/DesktopShortcutPanel.java Tue Oct 27 15:59:17 2015 +0100
> @@ -1,54 +1,59 @@
> /* DesktopShortcutPanel.java -- Display option for adding desktop shortcut.
> -Copyright (C) 2010 Red Hat
> + Copyright (C) 2010 Red Hat
Please change to 2015. ;-)
> -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
> -the Free Software Foundation; either version 2 of the License, or
> -(at your option) any later version.
> + 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
> + the Free Software Foundation; either version 2 of the License, or
> + (at your option) any later version.
>
> -This program 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.
> + This program 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 this program; if not, write to the Free Software
> -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
> + You should have received a copy of the GNU General Public License
> + along with this program; if not, write to the Free Software
> + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
There is actually no need to indent the license header by one space...
> */
> -
> 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.JOptionPane;
> +import javax.swing.SwingUtilities;
> import net.sourceforge.jnlp.ShortcutDesc;
>
> import net.sourceforge.jnlp.config.DeploymentConfiguration;
> +import net.sourceforge.jnlp.controlpanel.desktopintegrationeditor.LinuxIntegrationEditorFrame;
If you want to have different IntegrationEditorFrames per platform then we
probably should also have an abstract base IntegrationEditorFrame class. This is
a perfect example for using abstract classes. Platform specific
IntegrationEditorFrames should then extend and implement the abstract base
class. The adequate class should be chosen at runtime. This approach would also
make any strange dialog boxes about unimplemented features on any specific
platform obsolete. The rule of thumb with UIs is: If its not implemented then
simply do not show the UI. Do not bother the user with pop ups.
> +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)
> - *
Nah, just leave it and yourself.
> + *
> + *
Or, dump one more line please.
> */
> public class DesktopShortcutPanel extends NamedBorderPanel implements ItemListener {
>
> private final DeploymentConfiguration config;
> + private LinuxIntegrationEditorFrame 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 +62,6 @@
> addComponents();
> }
>
> -
> public static ComboItem deploymentJavawsShortcutToComboItem(String i) {
> return new ComboItem(ShortcutDesc.deploymentJavawsShortcutToString(i), i);
> }
> @@ -69,6 +73,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"));
> + manageIntegrationsButton.addActionListener(new ActionListener() {
> +
> + @Override
> + public void actionPerformed(ActionEvent e) {
> + SwingUtilities.invokeLater(new Runnable() {
> +
> + @Override
> + public void run() {
> + if (JNLPRuntime.isWindows()) {
> + JOptionPane.showMessageDialog(DesktopShortcutPanel.this, Translator.R("CPDesktopIntegrationLinuxOnly"));
No wired message dialog boxes, please. Instead, as described above, stick to the
abstract-concrete class model and do not show the IntegrationEditorFrame and
button on unsupported platforms.
Besides, when it comes to naming LinuxIntegrationEditorFrame, I think
FreedesktopIntegrationEditorFrame would be a better fitting name would, since
this does not only apply to Linux but all Freedesktop implementations.
> + } else {
> + if (integrationManagment == null) {
> + integrationManagment = new LinuxIntegrationEditorFrame();
> + }
> + integrationManagment.setVisible(true);
> + }
> + }
> + });
> + }
> + });
> ComboItem[] items = {deploymentJavawsShortcutToComboItem(ShortcutDesc.CREATE_NEVER),
> deploymentJavawsShortcutToComboItem(ShortcutDesc.CREATE_ALWAYS),
> deploymentJavawsShortcutToComboItem(ShortcutDesc.CREATE_ASK_USER),
> @@ -92,6 +117,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 56bfa957a6b8 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 Tue Oct 27 15:59:17 2015 +0100
> @@ -0,0 +1,98 @@
> +/* 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 javax.swing.JComponent;
> +import javax.swing.SwingUtilities;
> +
> +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;
> + new Thread(new BlinkThreadBody()) {
> +
> + }.start();
Why the empty block? Drop the braces before .start().
> + }
> +
> + class BlinkThreadBody implements Runnable {
> +
> + public BlinkThreadBody() {
> + }
> +
> + @Override
> + public void run() {
> + final Color base = compToBlink.getBackground();
> + for (int i = 0; i < 5; i++) {
> + try {
> + Thread.sleep(100);
Again, no thread sleeps please. If you want to implement blinking or any other
periodic events then use the Timer/TimerTask or ScheduledThreadPoolExecutor classes.
> + SwingUtilities.invokeLater(new Runnable() {
> +
> + @Override
> + public void run() {
> + if (compToBlink.getBackground().equals(base)) {
> + compToBlink.setBackground(Color.YELLOW);
Ugh, very unwise. What if the default background color is yellow? Or white? Then
things get very quickly unreadable. Please, never use hard coded colors in the
UI. You can try calculating acceptable contrasts from user's default colors but
this may prove difficult. You can also use the user's default highlight colors
for background and text. The later is definitely preferable.
Can you use the <blink> element?
> + } else {
> + compToBlink.setBackground(base);
> + }
> + }
> + });
> + } catch (InterruptedException ex) {
> +
Err, we definitely need code here to stop blinking and reset to default colors
if anything goes wrong to restore readability! Or, of not here then definitely
in a finally block, which would probably be best.
> + }
> + }
> + SwingUtilities.invokeLater(new Runnable() {
> +
> + @Override
> + public void run() {
> + compToBlink.setBackground(base);
> + blinking = false;
> + }
> + });
I do not think this invokeLater() is really necessary.
> + }
> + }
> +}
> diff -r 56bfa957a6b8 netx/net/sourceforge/jnlp/controlpanel/desktopintegrationeditor/JListUtils.java
> --- /dev/null Thu Jan 01 00:00:00 1970 +0000
> +++ b/netx/net/sourceforge/jnlp/controlpanel/desktopintegrationeditor/JListUtils.java Tue Oct 27 15:59:17 2015 +0100
> @@ -0,0 +1,321 @@
> +/* 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.Component;
> +import java.awt.Image;
> +import java.awt.image.BufferedImage;
> +import java.io.File;
> +import java.io.FilenameFilter;
> +import java.util.HashMap;
> +import java.util.Map;
> +import javax.imageio.ImageIO;
> +import javax.swing.DefaultListCellRenderer;
> +import javax.swing.Icon;
> +import javax.swing.ImageIcon;
> +import javax.swing.JLabel;
> +import javax.swing.JList;
> +
> +import javax.swing.ListModel;
> +import javax.swing.event.ListDataListener;
> +import net.sourceforge.jnlp.config.InfrastructureFileDescriptor;
> +import net.sourceforge.jnlp.util.XDesktopEntry;
> +
> +public class JListUtils {
> +
> + private static Map<File, Icon> iconCache = new HashMap<>();
> + private static Map<File, String> texFilesCache = new HashMap<>();
Spelling mistake?
> + private static Map<File, Long> stamps = new HashMap<>();
> +
> + public static class InfrastructureFileDescriptorBasedList extends FileBasedList {
> +
> + private final InfrastructureFileDescriptor source;
> +
> + public InfrastructureFileDescriptorBasedList(InfrastructureFileDescriptor source, String mask) {
> + super(source.getFile(), mask);
> + this.source = source;
> + }
> +
> + public InfrastructureFileDescriptorBasedList(InfrastructureFileDescriptor source) {
> + super(source.getFile());
> + this.source = source;
> + }
> +
> + public InfrastructureFileDescriptor getSource() {
> + return source;
> + }
> +
> + @Override
> + protected File getFile() {
> + return source.getFile();
> + }
> +
> + @Override
> + public String toString() {
> + return source.toString();
> + }
> +
> +
> +
Wow, so many empty lines!
> + }
> +
> + public static class FileBasedList implements ListModel {
FileBasedList is a terrible name. This sounds very generic although obviously
this class' purpose is very specific.
> +
> + private final File directory;
> + private File[] list;
> + private final String mask;
> +
> + public FileBasedList(File file) {
> + this(file, ".*");
Please document why you call with mask = ".*" here.
> + }
> +
> + protected File getFile() {
> + return directory;
> + }
> +
> + @Override
> + public String toString() {
> + return getFile().getAbsolutePath();
> + }
> +
> +
> +
Even more empty lines.
> + public FileBasedList(File file, final String mask) {
Please Javadoc this constructor, since I am having difficulties to understand
why it is needed and why it is called in FileBasedList(File file) with mask = ".*".
> + directory = file;
> + this.mask = mask;
> + }
> +
> + private File[] populateList() {
> + list = getFile().listFiles(new FilenameFilter() {
> +
> + @Override
> + public boolean accept(File dir, String name) {
> + return (name.matches(mask));
Why do we need to hold a reference to an instance of the mask for the entire
lifetime of FileBasedList?
> + }
> + });
> + return list;
> + }
> +
> + @Override
> + public int getSize() {
> + if (list == null) {
> + populateList();
> + }
> + return list.length;
> + }
> +
> + @Override
> + public Object getElementAt(int index) {
> + if (list == null) {
> + populateList();
> + }
> + return list[index];
> + }
> +
> + @Override
> + public void addListDataListener(ListDataListener l) {
> +
> + }
> +
> + @Override
> + public void removeListDataListener(ListDataListener l) {
> +
> + }
> +
More empty lines.
> + }
> +
> + public static class CustomFileList extends JList<File> {
> +
> + public CustomFileList() {
> + this.setCellRenderer(new FileCellRenderer());
> + }
> +
> + }
> +
> + public static class CustomValidatingFileList extends JList<File> {
> +
> + public CustomValidatingFileList() {
> + this.setCellRenderer(new ValidatingFileCellRenderer());
> + }
> +
> + }
> +
> + public static class CustomGraphicalFileList extends JList<File> {
> +
> + public CustomGraphicalFileList() {
> + setCellRenderer(new IconisedCellRenderer());
> + }
> +
> + }
> +
> + private static class FileCellRenderer extends DefaultListCellRenderer {
> +
> + @Override
> + public Component getListCellRendererComponent(
> + JList list, Object value, int index,
> + boolean isSelected, boolean cellHasFocus) {
> +
> + File f = (File) value;
> + JLabel label = (JLabel) super.getListCellRendererComponent(
> + list, value, index, isSelected, cellHasFocus);
> + label.setText(f.getName());
> + return label;
> + }
> + }
> +
> + private static class ValidatingFileCellRenderer extends FileCellRenderer {
> +
> + @Override
> + public Component getListCellRendererComponent(
> + JList list, Object value, int index,
> + boolean isSelected, boolean cellHasFocus) {
> + JLabel l = (JLabel) super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
> + File f = (File) value;
> + String s = processTexFilesCache(f);
Spelling mistake or TexMex? :-D
> + if (!isSelected) {
> + if (isJavaws(s)) {
> + l.setBackground(new Color(0, 200, 0));
Do not use hard coded colors.
> +
> + } else if (isBrowser(s)) {
> + l.setBackground(new Color(100, 150, 0));
Do not use hard coded colors.
> + } else {
> + l.setBackground(new Color(255, 200, 200));
Do not use hard coded colors.
> + }
> + } else {
> + if (isJavaws(s)) {
> + l.setForeground(new Color(0, 200, 0));
Do not use hard coded colors.
> +
> + } else if (isBrowser(s)) {
> + l.setForeground(new Color(100, 150, 0));
Do not use hard coded colors.
> + } else {
> + l.setForeground(new Color(255, 200, 200));
Do not use hard coded colors.
> + }
> + }
> + return l;
> +
Ugh, empty lines again.
> + }
> +
> + private boolean isJavaws(String s) {
> + return haveString(s, "javaws");
> +
> + }
> +
> + private boolean isBrowser(String s) {
> + String[] browsers = XDesktopEntry.BROWSERS;
> + for (String browser : browsers) {
> + if (haveString(s, browser)) {
> + return true;
> + }
> + }
> + return false;
> + }
> +
> + private boolean haveString(String s, String i) {
> + return s.matches("(?sm).*^.*Exec.*=.*" + i + ".*$.*");
This regex should probably be stored pre-compiled in a static final variable.
> + }
> + }
> +
> + private static class IconisedCellRenderer extends DefaultListCellRenderer {
> +
> + @Override
> + public Component getListCellRendererComponent(
> + JList list, Object value, int index,
> + boolean isSelected, boolean cellHasFocus) {
> +
> + File f = (File) value;
> + JLabel label = (JLabel) super.getListCellRendererComponent(
> + list, value, index, isSelected, cellHasFocus);
> + label.setIcon(processIconCache(f));
> + label.setText(f.getName());
> + label.setHorizontalTextPosition(JLabel.RIGHT);
Probably works for ltr scripts only. Please work around this or test with rtl
scripts.
> + return label;
> + }
> +
> + }
> +
> + private static Icon processIconCache(File f) {
Although private, it needs Javadoc. What does it do?
> + Icon i = iconCache.get(f);
> + if (i == null) {
> + i = updateIconCache(f, i);
> + } else {
> + if (f.lastModified() != stamps.get(f)) {
What about read I/O errors here?
> + i = updateIconCache(f, i);
> + }
> + }
> + return i;
> + }
> +
> + private static Icon updateIconCache(File f, Icon i) {
Although private, it needs Javadoc. What does it do?
> + i = createImageIcon(f, f.getAbsolutePath());
> + if (i != null) {
> + iconCache.put(f, i);
> + stamps.put(f, f.lastModified());
What about read I/O errors here?
> + }
> + return i;
> + }
> +
> + private static String processTexFilesCache(File f) {
Again, what does it do?
Spelling mistake?
> + String s = texFilesCache.get(f);
> + if (s == null) {
> + s = updateTextCache(f, s);
> + } else {
> + if (f.lastModified() != stamps.get(f)) {
What about read I/O errors here?
> + s = updateTextCache(f, s);
> + }
> + }
> + return s;
> + }
> +
> + private static String updateTextCache(File f, String s) {
> + s = LinuxIntegrationEditorFrame.fileToString(f, false);
> + if (s != null) {
> + texFilesCache.put(f, s);
> + stamps.put(f, f.lastModified());
What about read I/O errors here?
> + }
> + return s;
> + }
> +
> + protected static ImageIcon createImageIcon(File f, String description) {
> + try {
> + BufferedImage i = ImageIO.read(f);
> + return new ImageIcon(i.getScaledInstance(50, 50, Image.SCALE_SMOOTH));
> + } catch (Exception ex) {
> + //not worthy to log it. No image is there and so be it.
> + return null;
> + }
> + }
> +}
> diff -r 56bfa957a6b8 netx/net/sourceforge/jnlp/controlpanel/desktopintegrationeditor/LinuxIntegrationEditorFrame.java
> --- /dev/null Thu Jan 01 00:00:00 1970 +0000
> +++ b/netx/net/sourceforge/jnlp/controlpanel/desktopintegrationeditor/LinuxIntegrationEditorFrame.java Tue Oct 27 15:59:17 2015 +0100
> @@ -0,0 +1,512 @@
> +/* 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 LinuxIntegrationEditorFrame extends JFrame {
> +
> + //gui
> + private final javax.swing.JLabel title = new JLabel();
> + private final javax.swing.JCheckBox selectRelatives = new JCheckBox();
:-D Your variable naming gets funny sometimes. I was not aware that UI
components could have relatives. Well sure, there are parent and child
components but I do not think what you had in mind.
> + 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.CustomFileList();
> + private final javax.swing.JList desktopList = new JListUtils.CustomValidatingFileList();
> + private final javax.swing.JList generatedList = new JListUtils.CustomFileList();
> + private final javax.swing.JList iconsList = new JListUtils.CustomGraphicalFileList();
> +
> + 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) {
> + 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"));
> + selectRelatives.setText(R("DIMselectRelatives"));
Yey, property keys get funny names too! :-D
> + 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(selectRelatives);
> + 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[]) {
> +
> + java.awt.EventQueue.invokeLater(new Runnable() {
> + @Override
> + public void run() {
> + new LinuxIntegrationEditorFrame().setVisible(true);
> + }
> + });
> + }
> +
> + private boolean selecting = false;
> + private final int expectedWidth = 800;
> + private final int expectedHeight = 600;
Why fixed sizes? Why 800 and 600? Why not just compact UI components and let the
layout engine decide?
> + public LinuxIntegrationEditorFrame() {
> + setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
> + this.setSize(expectedWidth, expectedHeight);
> + populateLists();
> + setTexts();
> + setListeners();
> + setLayout();
> + selectRelatives.setSelected(true);
> +
> + ListSelectionListener generatePreviewListener = new GeneratePreviewListener();
> +
> + iconsList.addListSelectionListener(generatePreviewListener);
> + desktopList.addListSelectionListener(generatePreviewListener);
> + menuList.addListSelectionListener(generatePreviewListener);
> + generatedList.addListSelectionListener(generatePreviewListener);
> + blinker = new Blinker(selectRelatives);
> +
> + }
> +
> + private void populateLists() {
> + menuList.setModel(new JListUtils.InfrastructureFileDescriptorBasedList(PathsAndFiles.MENUS_DIR));
> + desktopList.setModel(new JListUtils.FileBasedList(new File(XDesktopEntry.findFreedesktopOrgDesktopPathCatch()), "(?i)^.*\\.desktop$") {
Again, the regex should be pre-compiled here too. And, I think "(?i)\\.desktop$"
should suffice if a substring match is applied.
> + @Override
> + public String toString() {
> + return R("DIMguessedDesktop");
> + }
> + });
> + iconsList.setModel(new JListUtils.InfrastructureFileDescriptorBasedList(PathsAndFiles.ICONS_DIR));
> + generatedList.setModel(new JListUtils.InfrastructureFileDescriptorBasedList(PathsAndFiles.GEN_JNLPS_DIR));
> + }
> +
> + private void cleanAll() {
> + selecting = true;
> + try {
> + clearAll();
> + } finally {
> + selecting = false;
> + }
> + }
> +
> + private void clearAll() {
> + desktopList.clearSelection();
> + menuList.clearSelection();
> + generatedList.clearSelection();
> + iconsList.clearSelection();
> + previewPane.setText(R("DIMselectionPreview"));
> + }
> +
> + private void removeSelected() {
> + int a = getTotal(
> + objectListToFileList(iconsList.getSelectedValuesList()),
> + objectListToFileList(menuList.getSelectedValuesList()),
> + objectListToFileList(desktopList.getSelectedValuesList()),
> + objectListToFileList(generatedList.getSelectedValuesList())
> + );
> + if (a <= 0) {
> + return;
> + }
> + int x = JOptionPane.showConfirmDialog(this, R("DIMaskBeforeDelete", a));
> + if (x == JOptionPane.OK_OPTION || x == JOptionPane.YES_OPTION) {
> + removeSeleccted(
> + objectListToFileList(iconsList.getSelectedValuesList()),
> + objectListToFileList(menuList.getSelectedValuesList()),
> + objectListToFileList(desktopList.getSelectedValuesList()),
> + objectListToFileList(generatedList.getSelectedValuesList())
> + );
> + populateLists();
> + }
> +
Empty line.
> + }
> +
> + private void selectAll() {
> + selecting = true;
> + try {
> + selectAll(menuList);
> + selectAll(desktopList);
> + selectAll(iconsList);
> + selectAll(generatedList);
> + } finally {
> + selecting = false;
> + }
> + previewPane.generatePreview();
> + }
> +
> + public List<File> allItemsAsFiles(JList l) {
> + return allItemsAsFiles(l.getModel());
> + }
> +
> + public List<File> allItemsAsFiles(ListModel l) {
> + List<File> r = new ArrayList<>(l.getSize());
> + for (int i = 0; i < l.getSize(); i++) {
> + r.add((File) l.getElementAt(i));
> +
> + }
> + return r;
> + }
> +
> + private List<File> objectListToFileList(List l) {
> + List<File> r = new ArrayList(l.size());
> + for (Object l1 : l) {
> + r.add((File) l1);
> + }
> + return r;
Very very combersome. :-( I do not think this is what ListModel and
ListCellRenderer was intended for or how it was intended to be used. The model
should hold data and the renderer should translate the data to visible UI. So
there is no need for double list handling. Besides, you may want to take a look
at ArrayList.addAll() or new ArrayList<File>(List.toArray(new File[0])). These
are definitely much faster.
> + }
> +
> + private void removeSeleccted(List<File>... a) {
Spelling mistake?
> + for (List<File> list : a) {
> + for (File file : list) {
> + file.delete();
> +
> + }
> + }
> + }
> +
> + private int getTotal(List<File>... a) {
> + int i = 0;
> + for (List<File> list : a) {
> + for (File file : list) {
> + i++;
Ugh, why not use List.size() (in combination with List.here?
And, although improbable but theoretically possible i may overflow. ;-)
> + }
> + }
> + return i;
> + }
> +
> + private void findOrphans(JList possibleOrphans, List<File>... whereItCanBe) {
> + selecting = true;
> + if (selectRelatives.isSelected()) {
> + clearAll();
> + blinker.blink();
> + }
> + try {
> + possibleOrphans.clearSelection();
> + List<File> l = allItemsAsFiles(possibleOrphans);
> + for (int i = 0; i < l.size(); i++) {
> + File file = l.get(i);
> + boolean found = false;
> + for (List<File> lf : whereItCanBe) {
> + if (found) {
> + break;
> + }
> + for (File f : lf) {
> + String s = fileToString(f, false);
> + if (s.contains(file.getAbsolutePath())) {
> + found = true;
> + break;
> + }
> + }
> + }
> + if (!found) {
> + possibleOrphans.setSelectedIndex(i);
> + }
> + }
> + } finally {
> + selecting = false;
> + }
> + previewPane.generatePreview();
> + }
> +
> + private void selectSomeRelatives(List selected, JList target) {
> + selecting = true;
> + try {
> + selectFileFromShortcuts(selected, target);
> + } finally {
> + selecting = false;
> + }
> + previewPane.generatePreview();
> + }
> +
> + private void selectAll(JList list) {
> + int start = 0;
> + int end = list.getModel().getSize() - 1;
> + if (end >= 0) {
> + list.setSelectionInterval(start, end);
> + }
> + }
> +
> + private class GeneratePreviewListener implements ListSelectionListener {
> +
> + public GeneratePreviewListener() {
> + }
> +
> + @Override
> + public void valueChanged(ListSelectionEvent e) {
> + if (selecting) {
> + return;
> + }
> + try {
> + selecting = true;
> + if (selectRelatives.isSelected()) {
> + blinker.blink();
> + selectRelatives(e.getSource());
> +
> + }
> + } finally {
> + selecting = false;
> + }
> +
> + previewPane.generatePreview();
> + }
> + }
> +
> + private void selectRelatives(Object source) {
> + if (source instanceof JList) {
> + int[] indexes = ((JList) (source)).getSelectedIndices();
> + clearAll();
> + ((JList) (source)).setSelectedIndices(indexes);
> + }
> +
> + for (int x = 1; x < 3; x++) {
> + //we dont wont recurse, so sending copies in
> + selectShortcutsByFiles(
> + objectListToFileList(iconsList.getSelectedValuesList()),
> + objectListToFileList(generatedList.getSelectedValuesList())
> + );
> + selectFilesByShortcuts(
> + objectListToFileList(menuList.getSelectedValuesList()),
> + objectListToFileList(desktopList.getSelectedValuesList())
> + );
> + }
> + }
> +
> + static String fileToString(File f, boolean escape) {
> + try (BufferedReader bufferedReader = new BufferedReader(new FileReader(f))) {
> +
> + StringBuilder sb = new StringBuilder();
> +
> + while (true) {
> + String line = bufferedReader.readLine();
> + if (line == null) {
> + return sb.toString();
> + }
> + if (escape) {
> + line = ConsoleOutputPaneModel.escapeHtmlForJTextPane(line);
> + }
> + sb.append(line).append("\n");
> + }
> +
> + } catch (Exception ex) {
> + return ex.toString();
> + }
> + }
> +
> + private void selectShortcutsByFiles(List<File> icons, List<File> jnlps) {
> + selectShortcutsWithFiles(icons, desktopList);
> + selectShortcutsWithFiles(icons, menuList);
> + selectShortcutsWithFiles(jnlps, desktopList);
> + selectShortcutsWithFiles(jnlps, menuList);
> + }
> +
> + private void selectFilesByShortcuts(List<File> menu, List<File> desktop) {
> + selectFileFromShortcuts(desktop, iconsList);
> + selectFileFromShortcuts(desktop, generatedList);
> + selectFileFromShortcuts(menu, iconsList);
> + selectFileFromShortcuts(menu, generatedList);
> + }
> +
> + private void selectShortcutsWithFiles(List<File> icons, JList list) {
> + for (int i = 0; i < list.getModel().getSize(); i++) {
> + File item = (File) list.getModel().getElementAt(i);
> + String s = fileToString(item, false);
> + for (File icon : icons) {
> + if (s.contains(icon.getAbsolutePath())) {
> + list.setSelectedIndex(i);
> + }
> + }
> +
> + }
> + }
> +
> + private void selectFileFromShortcuts(List<File> shortcuts, JList files) {
> + for (File shortcut : shortcuts) {
> + String s = fileToString(shortcut, false);
> + for (int i = 0; i < files.getModel().getSize(); i++) {
> + File item = (File) files.getModel().getElementAt(i);
> + if (s.contains(item.getAbsolutePath())) {
> + files.setSelectedIndex(i);
> + }
> +
> + }
> + }
> +
> + }
> +}
> diff -r 56bfa957a6b8 netx/net/sourceforge/jnlp/controlpanel/desktopintegrationeditor/Panels.java
> --- /dev/null Thu Jan 01 00:00:00 1970 +0000
> +++ b/netx/net/sourceforge/jnlp/controlpanel/desktopintegrationeditor/Panels.java Tue Oct 27 15:59:17 2015 +0100
> @@ -0,0 +1,151 @@
> +/* 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.event.ActionListener;
> +import javax.swing.JButton;
> +import javax.swing.JLabel;
> +import javax.swing.JList;
> +import javax.swing.JPanel;
> +import javax.swing.JScrollPane;
> +import javax.swing.JSplitPane;
> +import net.sourceforge.jnlp.security.dialogs.SecurityDialogPanel;
> +
> +import static net.sourceforge.jnlp.runtime.Translator.R;
> +
> +public class Panels {
> +
> + public static JPanel createGeneratedPanel(JList list, ActionListener findOrphans) {
> + return createIconsOrGeneratedPanel(list, findOrphans, R("DIMgeneratedJnlps"), bold(R("DIMgeneratedJnlpsTooltip")));
> + }
> +
> + public static JPanel createIconsPanel(JList list, ActionListener findOrphans) {
> + return createIconsOrGeneratedPanel(list, findOrphans, R("DIMicons"), bold(R("DIMiconsTooltip")));
> + }
> +
> + private static JPanel createIconsOrGeneratedPanel(JList list, ActionListener findOrphans, String title, String tooltip) {
> + JPanel iconsPanel = new JPanel(new BorderLayout());
> + JLabel l = new JLabel(title);
> + l.setToolTipText(createToolTip(tooltip, list));
> + iconsPanel.add(l, BorderLayout.PAGE_START);
> + JScrollPane scrollIcons = new JScrollPane();
> + scrollIcons.setViewportView(list);
> + iconsPanel.add(scrollIcons, BorderLayout.CENTER);
> + JPanel iconsToolPanel = new JPanel(new BorderLayout());
> + JButton findOrphansButton = new JButton(R("DIMorphans"));
> + findOrphansButton.addActionListener(findOrphans);
> + iconsToolPanel.add(findOrphansButton, BorderLayout.CENTER);
> + iconsPanel.add(iconsToolPanel, BorderLayout.PAGE_END);
> + return iconsPanel;
> + }
> +
> + public static JPanel createMenuPanel(JList list, ActionListener findIcons, ActionListener findGenerated) {
> + return createDesktopOrMenuPanel(list, findIcons, findGenerated, R("DIMmenuItems"), bold(R("DIMmenuItemsTooltip")));
> + }
> +
> + public static JPanel createDesktopPanel(JList list, ActionListener findIcons, ActionListener findGenerated) {
> + StringBuilder sb = new StringBuilder();
> + sb.append(R("DIMdesktopItemsTooltipL1")).append("<br>")
> + .append(R("DIMdesktopItemsTooltipL2")).append(":" + "<ul>" + "<li>")
> + .append(R("DIMdesktopItemsTooltipL3")).append("</li>" + "<li>")
> + .append(R("DIMdesktopItemsTooltipL4")).append("</li>" + "<li>")
> + .append(R("DIMdesktopItemsTooltipL5")).append("</li>" + "</ul>")
> + .append(bold(R("DIMdesktopItemsTooltipL6")));
> + return createDesktopOrMenuPanel(list, findIcons, findGenerated, R("DIMdesktopItems"), sb.toString());
> + }
> +
> + private static JPanel createDesktopOrMenuPanel(JList list, ActionListener findIcons, ActionListener findGenerated, String title, String tooltip) {
> + JPanel desktopPanel = new JPanel(new BorderLayout());
> + JLabel l = new JLabel(title);
> + l.setToolTipText(createToolTip(tooltip, list));
> + desktopPanel.add(l, BorderLayout.PAGE_START);
> + JScrollPane scrollDesktop = new JScrollPane();
> + scrollDesktop.setViewportView(list);
> + desktopPanel.add(scrollDesktop, BorderLayout.CENTER);
> + JPanel desktopToolPanel = createDesktopOrMenuToolBox(findIcons, findGenerated);
> + desktopPanel.add(desktopToolPanel, BorderLayout.PAGE_END);
> + return desktopPanel;
> + }
> +
> + private static String createToolTip(String tooltip, JList list) {
> + if (tooltip != null) {
> + JListUtils.FileBasedList model = (JListUtils.FileBasedList) (list.getModel());
> + StringBuilder sb = new StringBuilder();
> + sb.append("<ul><li>")
> + .append(model.getFile()).append("</li><br>" + "<li>")
> + .append(model.toString()).append("</li><br>" + "<li>")
> + .append(tooltip).append("</ul>");
> + String tt = SecurityDialogPanel.htmlWrap(sb.toString());
> + return tt;
> + }
> + return null;
> + }
> +
> + private static JPanel createDesktopOrMenuToolBox(ActionListener findIcons, ActionListener findGenerated) {
> + JPanel desktopToolPanel = new JPanel(new BorderLayout());
> + JButton desktopFindGeneratedButton = new JButton(R("DIMgeneratedButton"));
> + desktopFindGeneratedButton.setToolTipText(R("DIMgeneratedButtonTooltip"));
> + desktopFindGeneratedButton.addActionListener(findGenerated);
> + JButton desktopFindIconsButton = new JButton(R("DIMiconsButton"));
> + desktopFindIconsButton.setToolTipText(R("DIMiconsButtonTooltip"));
> + desktopFindIconsButton.addActionListener(findIcons);
> + desktopToolPanel.add(desktopFindGeneratedButton, BorderLayout.LINE_END);
> + desktopToolPanel.add(desktopFindIconsButton, BorderLayout.LINE_START);
> + return desktopToolPanel;
> + }
> +
> + static JSplitPane createQuadroSplit(int width, JPanel menusPanel, JPanel desktopsPanel, JPanel iconsPanel, JPanel generatedsPanel) {
> + JSplitPane splitAllAndGenerated = new JSplitPane();
> + JSplitPane splitIconsAndLists = new JSplitPane();
> + JSplitPane splitLists = new JSplitPane();
> + splitLists.setLeftComponent(menusPanel);
> + splitLists.setRightComponent(desktopsPanel);
> + splitIconsAndLists.setRightComponent(splitLists);
> + splitIconsAndLists.setLeftComponent(iconsPanel);
> + splitAllAndGenerated.setLeftComponent(splitIconsAndLists);
> + splitAllAndGenerated.setRightComponent(generatedsPanel);
> + splitAllAndGenerated.setDividerLocation(width / 5 * 4);
> + splitIconsAndLists.setDividerLocation(width / 4);
> + splitLists.setDividerLocation(width / 4);
> + return splitAllAndGenerated;
> + }
> +
> + private static String bold(String s) {
> + return "<b>" + s + "</b>";
> + }
> +
> +}
> diff -r 56bfa957a6b8 netx/net/sourceforge/jnlp/controlpanel/desktopintegrationeditor/PreviewSelectionJTextPane.java
> --- /dev/null Thu Jan 01 00:00:00 1970 +0000
> +++ b/netx/net/sourceforge/jnlp/controlpanel/desktopintegrationeditor/PreviewSelectionJTextPane.java Tue Oct 27 15:59:17 2015 +0100
> @@ -0,0 +1,155 @@
> +/* 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.io.File;
> +import java.util.List;
> +import javax.swing.JList;
> +import javax.swing.JTextPane;
> +import javax.swing.text.html.HTMLEditorKit;
> +import net.sourceforge.jnlp.util.logging.OutputController;
> +
> +import static net.sourceforge.jnlp.runtime.Translator.R;
> +
> +public class PreviewSelectionJTextPane extends JTextPane {
> +
> + private final JList iconsList;
> + private final JList menuList;
> + private final JList desktopList;
> + private final JList generatedList;
> +
> + public PreviewSelectionJTextPane(JList iconsList, JList menuList, JList desktopList, JList generatedList) {
> + this.iconsList = iconsList;
> + this.menuList = menuList;
> + this.desktopList = desktopList;
> + this.generatedList = generatedList;
> + this.setEditorKit(new HTMLEditorKit());
> + this.setEditable(false);
> + }
> +
> + private StringBuilder getMenus() {
> + return getTextFiles(menuList.getSelectedValuesList());
> + }
> +
> + private StringBuilder getDesktops() {
> + return getTextFiles(desktopList.getSelectedValuesList());
> + }
> +
> + private StringBuilder getGenerated() {
> + return getTextFiles(generatedList.getSelectedValuesList());
> + }
> +
> + private StringBuilder getHeader(boolean i, boolean d, boolean m, boolean g) {
> + StringBuilder sb = new StringBuilder();
> + if (i || d || m || g) {
> + sb.append("<tr>");
> + }
> + if (i) {
> + sb.append("<th>").append(R("DIMicons")).append(":</th>");
> + }
> + if (d) {
> + sb.append("<th>").append(R("DIMdesktopItems")).append(":</th>");
> + }
> + if (m) {
> + sb.append("<th>").append(R("DIMmenuItems")).append(":</th>");
> + }
> + if (g) {
> + sb.append("<th>").append(R("DIMgeneratedJnlps")).append(":</th>");
> + }
> +
> + if (i || d || m || g) {
> + sb.append("</tr>");
> + }
> + return sb;
> + }
> +
> + public void generatePreview() {
> + try {
> + StringBuilder sb = new StringBuilder("<html><table>");
> + sb.append(getHeader(iconsList.getSelectedIndices().length > 0,
> + menuList.getSelectedIndices().length > 0,
> + desktopList.getSelectedIndices().length > 0,
> + generatedList.getSelectedIndices().length > 0)).append("<tr>");
> + if (iconsList.getSelectedIndices().length > 0) {
> + sb.append("<td>").append(getIcons()).append("</td>");
> + }
> + if (menuList.getSelectedIndices().length > 0) {
> + sb.append("<td>").append(getMenus()).append("</td>");
> + }
> + if (desktopList.getSelectedIndices().length > 0) {
> + sb.append("<td>").append(getDesktops()).append("</td>");
> + }
> + if (generatedList.getSelectedIndices().length > 0) {
> + sb.append("<td>").append(getGenerated()).append("</td>");
> + }
> + sb.append("</tr></table></html>");
> + this.setText(sb.toString());
> +
> + } catch (Exception ex) {
> + OutputController.getLogger().log(ex);
> + }
> +
> + }
> +
> + private StringBuilder getIcons() {
> + StringBuilder s = new StringBuilder();
> + try {
> + List l = iconsList.getSelectedValuesList();
> + for (Object l1 : l) {
> + File f = (File) l1;
> + s.append("<small>").append(f.getAbsolutePath()).append("</small><br>");
> + s.append("<img src='").append(f.toURI().toURL()).append("'></img><br>");
> +
> + }
> + } catch (Exception ex) {
> + OutputController.getLogger().log(ex);
> + }
> + return s;
> + }
> +
> + private StringBuilder getTextFiles(List selectedValuesList) {
> + StringBuilder s = new StringBuilder();
> + for (Object i : selectedValuesList) {
> + File f = (File) i;
> + s.append("<small>").append(f.getAbsolutePath()).append("</small><br>");
> + s.append("<pre>").append(LinuxIntegrationEditorFrame.fileToString(f, true)).append("</pre><br>");
> +
> + }
> + return s;
> +
> + }
> +
> +}
> diff -r 56bfa957a6b8 netx/net/sourceforge/jnlp/resources/Messages.properties
> --- a/netx/net/sourceforge/jnlp/resources/Messages.properties Tue Oct 27 14:13:23 2015 +0100
> +++ b/netx/net/sourceforge/jnlp/resources/Messages.properties Tue Oct 27 15:59:17 2015 +0100
> @@ -568,6 +568,8 @@
> CPSecurityDescription=Use this to configure security settings.
> CPDebuggingDescription=Enable options here to help with debugging
> CPDesktopIntegrationDescription=Set whether or not to allow creation of desktop shortcut.
> +CPDesktopIntegrationShowIntegrations=Show desktop and menu integrations window
> +CPDesktopIntegrationLinuxOnly=Desktop integration manager avaiable only for Linux. Sorry
> CPJVMPluginArguments=Set JVM arguments for plugin.
> CPJVMitwExec=Set JVM for IcedTea-Web \u2014 working best with OpenJDK
> CPJVMitwExecValidation=Validate JVM for IcedTea-Web
> @@ -1000,6 +1002,36 @@
> CVCPColPath=Path
> CVCPColName=Name
>
> +# Control Panel - desktop integration manager
> +DIMtitle=System integration shortcuts IcedTea-Web manager
Too long. How about "IcedTea-Web Shortcut Manager". Please note that all words
in English titles always start with a capital letter.
> +DIMremoveSelected=Remove selected
Shorten to "Remove". By design UIs are supposed to operate on selected stuff.
> +DIMselectRelatives=Select relatives
I do not think you mean realtives here. I assume you mean related items.
> +DIMreloadLists=Reload lists
This could be probably shortened to just "Reload".
> +DIMselectAll=Select all
> +DIMclearSelection=Clear selction
Unselect or Deselect.
> +DIMdescription=In this window you can manage shorctuts and theirs resources (cached images and generated stuff) icedtea-web created for desktop integration
Should be even simpler:
"Manage the shorctuts and resources (cached images, etc) IcedTea-Web created for
desktop integration"
> +DIMguessedDesktop=Desktop folder as well guessed as possible.
??? I have no clue what this is supposed to mean, and so most users will not
either. However, I am assuming this is some text on a label describing some
other UI component actually displaying the desktop folder as detected by
IcedTea-Web. Labels should not contain lengthy or verbose explanations. Keep it
short and simple: "Desktop Folder:". Spare explanations for tool tips.
> +DIMselectionPreview=Selection preview
If this is a title or label then shorten it to "Preview" or "Preview:", repectively.
> +DIMaskBeforeDelete={0} Files will be delted. Are you sure?
"Are you sure you want to delete {0,number,integer} files?" Note that the number
has to be localized. Besides, you really have to check your spelling.
> +DIMgeneratedJnlps=Generated jnlps
Acronyms of names are always all caps and no dots in English: "JNLPs".
> +DIMgeneratedJnlpsTooltip=All files in this list should be generated by icedtea-web!
Tool tips do not describe what /should/ happen with exclamation marks but
explain in simple present tense what a certain control does or what function it
initiates. <- Like this sence. ;-) Please also make sure that whenever you refer
to IcedTea-Web as a product name, you stick to the name's "marketing" style of
writing. Because it is a name, it would be even better to insert it via a
MessageFormat argument from a String constant.
I think it would be nice if the tool tip key names would follow the camel case
style of eg JToolTip, hence you would end up with a key name like
DIMgeneratedJNLPsToolTip.
> +DIMicons=Icons
> +DIMiconsTooltip=All files in this list should be icons cached by icedtea-web!
See DIMgeneratedJnlpsTooltip.
> +DIMorphans=Orphans
I am not sure ordinary users will understand what this is supposed to mean.
> +DIMmenuItems=Menu items
"Menu Items"
If it is a label to another interactive UI component then please do not forget
the trailing colon.
> +DIMmenuItemsTooltip=All shortcuts in this list should be generated by icedtea-web!
See DIMgeneratedJnlpsTooltip.
> +DIMdesktopItems=Desktop items
"Desktop Items"
If it is a label to another interactive UI component then please do not forget
the trailing colon.
> +DIMdesktopItemsTooltipL1=Not all your shortcuts on your were generated by icedtea-web!
See DIMgeneratedJnlpsTooltip.
"IcedTea-Web could not create all shortcuts."
> +DIMdesktopItemsTooltipL2=For your convenience:
I am not sure why this tool tip message ends with a colon and what the purpose
shall it serve... I would guess that you should rather drop it entirely.
> +DIMdesktopItemsTooltipL3=red items are probably not from icedtea-web
See DIMgeneratedJnlpsTooltip.
Tooltips should also contain complete sentences. In effect, tool tips are
supposed to work like micro online documentation or help.
> +DIMdesktopItemsTooltipL4=dark green items are browser shorctus, so they were probably been generated by icedtea-web
See DIMgeneratedJnlpsTooltip and DIMdesktopItemsTooltipL3.
Besides, I think you meant "...have been generated...". The tense you used here
does not exist. Again, check your spelling please.
> +DIMdesktopItemsTooltipL5=green items are javaws shortcuts, so they are wery likely icedtea-web's
See DIMgeneratedJnlpsTooltip and DIMdesktopItemsTooltipL3.
> +DIMdesktopItemsTooltipL6=In all cases, be careful what you delete, and verify connections with `select relatvves` mode
See DIMdesktopItemsTooltipL3.
I do not think this tool tip message is helpful at all, even more confusing.
This message makes me assume that there is a design problem with your UI or your
approach to create shortcuts based on images in the cache. Remember, the user
should never be able to break anything unless it is a very complex (and costly
to reverse) operation or a irreversible operation by definition. Please also
refrain from using ` U+0060 GRAVE ACCENT as quotation marks. See
http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html for some decent explanation.
> +DIMgeneratedButton=generated
Buttons always (with very few exceptions) employ commands. I am not sure what
the function of this button is but the command form of "generated" is
"Generate". But, if that button is for generating or creating shortcuts from
selected image files then you probably want to label the button "Create" or
"Create Shortcut".
> +DIMgeneratedButtonTooltip=Will select related generated stuff.
See DIMgeneratedJnlpsTooltip and DIMdesktopItemsTooltipL3.
Please refrain from using the word stuff in descriptions and explanations. So,
turn it into something like "Selects related items."
> +DIMiconsButton=icons
Buttons employ commands. "Icons" is not a verb so you cannot put it on a button.
And, do not think there is any reason to make an exception here. So, think about
what this button does and then label it accordingly.
> +DIMiconsButtonTooltip=Will select related cached icons.
See DIMgeneratedButtonTooltip.
> +
> # Control Panel - Misc.
> CPJRESupport=IcedTea-Web currently does not support the use of multiple JREs.
> CPInvalidPort=Invalid port number given.\n[Valid port numbers are 1-65535]
> diff -r 56bfa957a6b8 netx/net/sourceforge/jnlp/security/dialogs/SecurityDialogPanel.java
> --- a/netx/net/sourceforge/jnlp/security/dialogs/SecurityDialogPanel.java Tue Oct 27 14:13:23 2015 +0100
> +++ b/netx/net/sourceforge/jnlp/security/dialogs/SecurityDialogPanel.java Tue Oct 27 15:59:17 2015 +0100
> @@ -81,7 +81,7 @@
> * @param s string to be wrapped to html tag
> * @return
> */
> - protected String htmlWrap(String s) {
> + public static String htmlWrap(String s) {
> return "<html>" + s + "</html>";
> }
>
> diff -r 56bfa957a6b8 netx/net/sourceforge/jnlp/security/dialogs/apptrustwarningpanel/AppTrustWarningPanel.java
> --- a/netx/net/sourceforge/jnlp/security/dialogs/apptrustwarningpanel/AppTrustWarningPanel.java Tue Oct 27 14:13:23 2015 +0100
> +++ b/netx/net/sourceforge/jnlp/security/dialogs/apptrustwarningpanel/AppTrustWarningPanel.java Tue Oct 27 15:59:17 2015 +0100
> @@ -207,7 +207,7 @@
> titleLabel.setFont(new Font(titleLabel.getFont().getName(), Font.BOLD, 18));
>
> String infoLabelText = getInfoPanelText();
> - JEditorPane infoLabel = new JEditorPane("text/html", RememberPanel.htmlWrap(infoLabelText));
> + JEditorPane infoLabel = new JEditorPane("text/html", htmlWrap(infoLabelText));
> infoLabel.setBackground(infoPanel.getBackground());
> infoLabel.setEditable(false);
> infoLabel.addHyperlinkListener(new HyperlinkListener() {
> diff -r 56bfa957a6b8 netx/net/sourceforge/jnlp/security/dialogs/apptrustwarningpanel/MatchingALACAttributePanel.java
> --- a/netx/net/sourceforge/jnlp/security/dialogs/apptrustwarningpanel/MatchingALACAttributePanel.java Tue Oct 27 14:13:23 2015 +0100
> +++ b/netx/net/sourceforge/jnlp/security/dialogs/apptrustwarningpanel/MatchingALACAttributePanel.java Tue Oct 27 15:59:17 2015 +0100
> @@ -85,7 +85,7 @@
>
> @Override
> protected String getTopPanelText() {
> - return RememberPanel.htmlWrap(Translator.R("ALACAMatchingMainTitle", title, codebase, remoteUrls));
> + return htmlWrap(Translator.R("ALACAMatchingMainTitle", title, codebase, remoteUrls));
> }
>
> @Override
> diff -r 56bfa957a6b8 netx/net/sourceforge/jnlp/security/dialogs/apptrustwarningpanel/PartiallySignedAppTrustWarningPanel.java
> --- a/netx/net/sourceforge/jnlp/security/dialogs/apptrustwarningpanel/PartiallySignedAppTrustWarningPanel.java Tue Oct 27 14:13:23 2015 +0100
> +++ b/netx/net/sourceforge/jnlp/security/dialogs/apptrustwarningpanel/PartiallySignedAppTrustWarningPanel.java Tue Oct 27 15:59:17 2015 +0100
> @@ -142,7 +142,7 @@
>
> @Override
> protected String getTopPanelText() {
> - return RememberPanel.htmlWrap(R(getTopPanelTextKey()));
> + return htmlWrap(R(getTopPanelTextKey()));
> }
>
> @Override
> @@ -159,12 +159,12 @@
> text += "<br>" + R("SUnsignedRejectedBefore", rememberedEntry.getLocalisedTimeStamp());
> }
> }
> - return RememberPanel.htmlWrap(text);
> + return htmlWrap(text);
> }
>
> @Override
> protected String getQuestionPanelText() {
> - return RememberPanel.htmlWrap(R(getQuestionPanelTextKey()));
> + return htmlWrap(R(getQuestionPanelTextKey()));
> }
>
> @Override
> diff -r 56bfa957a6b8 netx/net/sourceforge/jnlp/security/dialogs/apptrustwarningpanel/UnsignedAppletTrustWarningPanel.java
> --- a/netx/net/sourceforge/jnlp/security/dialogs/apptrustwarningpanel/UnsignedAppletTrustWarningPanel.java Tue Oct 27 14:13:23 2015 +0100
> +++ b/netx/net/sourceforge/jnlp/security/dialogs/apptrustwarningpanel/UnsignedAppletTrustWarningPanel.java Tue Oct 27 15:59:17 2015 +0100
> @@ -84,7 +84,7 @@
>
> @Override
> protected String getTopPanelText() {
> - return RememberPanel.htmlWrap(R(getTopPanelTextKey()));
> + return htmlWrap(R(getTopPanelTextKey()));
> }
>
> @Override
> @@ -99,12 +99,12 @@
> text += "<br>" + R("SUnsignedRejectedBefore", rememberedEntry.getLocalisedTimeStamp());
> }
> }
> - return RememberPanel.htmlWrap(text);
> + return htmlWrap(text);
> }
>
> @Override
> protected String getQuestionPanelText() {
> - return RememberPanel.htmlWrap(R(getQuestionPanelTextKey()));
> + return htmlWrap(R(getQuestionPanelTextKey()));
> }
>
> public static void main(String[] args) throws Exception {
> diff -r 56bfa957a6b8 netx/net/sourceforge/jnlp/security/dialogs/remember/RememberPanel.java
> --- a/netx/net/sourceforge/jnlp/security/dialogs/remember/RememberPanel.java Tue Oct 27 14:13:23 2015 +0100
> +++ b/netx/net/sourceforge/jnlp/security/dialogs/remember/RememberPanel.java Tue Oct 27 15:59:17 2015 +0100
> @@ -49,6 +49,7 @@
> import javax.swing.JPanel;
> import javax.swing.JRadioButton;
> import static net.sourceforge.jnlp.runtime.Translator.R;
> +import net.sourceforge.jnlp.security.dialogs.SecurityDialogPanel;
> import net.sourceforge.jnlp.util.logging.OutputController;
>
> public class RememberPanel extends JPanel implements RemeberActionProvider {
> @@ -79,7 +80,7 @@
> private JPanel createCheckBoxPanel() {
> JPanel checkBoxPanel = new JPanel(new BorderLayout());
>
> - permanencyCheckBox = new JCheckBox(htmlWrap(R("SRememberOption")));
> + permanencyCheckBox = new JCheckBox(SecurityDialogPanel.htmlWrap(R("SRememberOption")));
> permanencyCheckBox.addActionListener(permanencyListener());
> checkBoxPanel.add(permanencyCheckBox, BorderLayout.SOUTH);
>
> @@ -94,7 +95,7 @@
> applyToAppletButton.setSelected(true);
> applyToAppletButton.setEnabled(false); // Start disabled until 'Remember this option' is selected
>
> - applyToCodeBaseButton = new JRadioButton(htmlWrap(R("SRememberCodebase", codebase)));
> + applyToCodeBaseButton = new JRadioButton(SecurityDialogPanel.htmlWrap(R("SRememberCodebase", codebase)));
> applyToCodeBaseButton.setEnabled(false);
>
> group.add(applyToAppletButton);
> @@ -106,10 +107,7 @@
> return matchOptionsPanel;
> }
>
> - public static String htmlWrap(String text) {
> - return "<html>" + text + "</html>";
> - }
> -
> +
> // Toggles whether 'match applet' or 'match codebase' options are greyed out
> protected ActionListener permanencyListener() {
> return new ActionListener() {
> diff -r 56bfa957a6b8 netx/net/sourceforge/jnlp/util/XDesktopEntry.java
> --- a/netx/net/sourceforge/jnlp/util/XDesktopEntry.java Tue Oct 27 14:13:23 2015 +0100
> +++ b/netx/net/sourceforge/jnlp/util/XDesktopEntry.java Tue Oct 27 15:59:17 2015 +0100
> @@ -528,7 +528,7 @@
> return fPath;
> }
>
> - private static String findFreedesktopOrgDesktopPathCatch() {
> + public static String findFreedesktopOrgDesktopPathCatch() {
> try {
> return findFreedesktopOrgDesktopPath();
> } catch (Exception ex) {
> diff -r 56bfa957a6b8 netx/net/sourceforge/jnlp/util/logging/ConsoleOutputPaneModel.java
> --- a/netx/net/sourceforge/jnlp/util/logging/ConsoleOutputPaneModel.java Tue Oct 27 14:13:23 2015 +0100
> +++ b/netx/net/sourceforge/jnlp/util/logging/ConsoleOutputPaneModel.java Tue Oct 27 15:59:17 2015 +0100
> @@ -205,11 +205,7 @@
> }
> String line = (createLine(messageWithHeader));
> if (mark) {
> - line = line.replaceAll("<", "<");
> - line = line.replaceAll(">", ">");
> - line = line.replaceAll("\n", "<br/>\n");
> - line = line.replaceAll(" ", " ");//small trick, html is reducting row of spaces to single space. This handles it and stimm allow line wrap
> - line = line.replaceAll("\t", " ");
> + line = escapeHtmlForJTextPane(line);
> }
> sb.append(line);
> if (mark) {
> @@ -229,6 +225,15 @@
>
> }
>
> + public static String escapeHtmlForJTextPane(String line) {
> + line = line.replaceAll("<", "<");
> + line = line.replaceAll(">", ">");
> + line = line.replaceAll("\n", "<br/>\n");
> + line = line.replaceAll(" ", " ");//small trick, html is reducting row of spaces to single space. This handles it and stimm allow line wrap
> + line = line.replaceAll("\t", " ");
Please chain String.replaceAll().
> + return line;
> + }
> +
> String createLine(MessageWithHeader m) {
> StringBuilder sb = new StringBuilder();
> if (showHeaders) {
> diff -r 56bfa957a6b8 tests/netx/unit/net/sourceforge/jnlp/security/dialogs/apptrustwarningpanel/AppTrustWarningPanelTest.java
> --- a/tests/netx/unit/net/sourceforge/jnlp/security/dialogs/apptrustwarningpanel/AppTrustWarningPanelTest.java Tue Oct 27 14:13:23 2015 +0100
> +++ b/tests/netx/unit/net/sourceforge/jnlp/security/dialogs/apptrustwarningpanel/AppTrustWarningPanelTest.java Tue Oct 27 15:59:17 2015 +0100
> @@ -13,6 +13,7 @@
> import net.sourceforge.jnlp.security.dialogs.remember.RememberPanel;
> import net.sourceforge.jnlp.browsertesting.browsers.firefox.FirefoxProfilesOperator;
> import net.sourceforge.jnlp.config.PathsAndFiles;
> +import net.sourceforge.jnlp.security.dialogs.SecurityDialogPanel;
> import org.junit.AfterClass;
> import static org.junit.Assert.assertEquals;
> import static org.junit.Assert.assertFalse;
> @@ -137,7 +138,7 @@
> public void testHtmlWrap() throws Exception {
> final String testText = "This is some text";
> final String expectedResult = "<html>This is some text</html>";
> - final String actualResult = RememberPanel.htmlWrap(testText);
> + final String actualResult = SecurityDialogPanel.htmlWrap(testText);
> assertEquals("htmlWrap should properly wrap text with HTML tags", expectedResult, actualResult);
> }
Phew, I can't type anymore. Maybe I'll find some additinal time to do some more
review later.
Regards,
Jacob
More information about the distro-pkg-dev
mailing list