WIP: Classloader prototype

artifact-all-dependencies/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.adoptopenjdk</groupId>
         <artifactId>icedtea-web-parent</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
@@ -49,6 +49,11 @@
                                     <pattern>inet.ipaddr</pattern>
                                     <shadedPattern>net.adoptopenjdk.icedteaweb.shaded.inet.ipaddr</shadedPattern>
                                 </relocation>
+                                <relocation>
+                                    <pattern>com.google.code.gson</pattern>
+                                    <shadedPattern>net.adoptopenjdk.icedteaweb.shaded.com.google.code.gson
+                                    </shadedPattern>
+                                </relocation>
                                 <relocation>
                                     <pattern>org.ccil.cowan.tagsoup</pattern>
                                     <shadedPattern>net.adoptopenjdk.icedteaweb.shaded.tagsoup</shadedPattern>

artifact-no-dependencies/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.adoptopenjdk</groupId>
         <artifactId>icedtea-web-parent</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 

clients/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.adoptopenjdk</groupId>
         <artifactId>icedtea-web-parent</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 

common/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.adoptopenjdk</groupId>
         <artifactId>icedtea-web-parent</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 

common/src/main/java/net/adoptopenjdk/icedteaweb/image/ImageGallery.java

@@ -0,0 +1,31 @@
+package net.adoptopenjdk.icedteaweb.image;
+
+import net.adoptopenjdk.icedteaweb.jdk89access.SunMiscLauncher;
+
+import javax.swing.ImageIcon;
+
+public enum ImageGallery {
+    INFO("net/adoptopenjdk/icedteaweb/image/info64.png"),
+    QUESTION("net/adoptopenjdk/icedteaweb/image/question64.png"),
+    WARNING("net/adoptopenjdk/icedteaweb/image/warn64.png"),
+    ERROR("net/adoptopenjdk/icedteaweb/image/error64.png"),
+    INFO_SMALL("net/adoptopenjdk/icedteaweb/image/info32.png"),
+    QUESTION_SMALL("net/adoptopenjdk/icedteaweb/image/question32.png"),
+    WARNING_SMALL("net/adoptopenjdk/icedteaweb/image/warn32.png"),
+    ERROR_SMALL("net/adoptopenjdk/icedteaweb/image/error32.png"),
+    LOGIN("net/adoptopenjdk/icedteaweb/image/login64.png");
+
+    private String path;
+
+    ImageGallery(String path) {
+        this.path = path;
+    }
+
+    public String path() {
+        return path;
+    }
+
+    public ImageIcon asImageIcon() {
+        return SunMiscLauncher.getSecureImageIcon(path);
+    }
+}

common/src/main/java/net/adoptopenjdk/icedteaweb/ui/ApplicationStyleConstants.java

@@ -0,0 +1,15 @@
+package net.adoptopenjdk.icedteaweb.ui;
+
+import java.awt.Color;
+
+public interface ApplicationStyleConstants {
+    /*
+     * primary = use for text message decoration
+     * secondary = use for background decoration
+     */
+    public static final Color PRIMARY_WARNING_COLOR = new Color(255, 124, 0);
+    public static final Color SECONDARY_WARNING_COLOR = new Color(255, 152, 0);
+    public static final Color PRIMARY_ERROR_COLOR = new Color(211, 47, 47);
+    public static final Color SECONDARY_ERROR_COLOR = new Color(244, 67, 54);
+
+}

common/src/main/java/net/adoptopenjdk/icedteaweb/ui/dialogs/DialogButton.java

@@ -0,0 +1,68 @@
+package net.adoptopenjdk.icedteaweb.ui.dialogs;
+
+import net.adoptopenjdk.icedteaweb.Assert;
+
+import javax.swing.JButton;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.function.Consumer;
+import java.util.function.Supplier;
+
+public class DialogButton<R> {
+
+    private final String text;
+
+    private final Supplier<R> onAction;
+
+    private final String description;
+
+    private boolean enabled = true;
+
+    private List<Consumer<Boolean>> enabledObservers = new CopyOnWriteArrayList<>();
+
+    public DialogButton(final String text, final Supplier<R> onAction) {
+        this(text, onAction, null);
+    }
+
+    public DialogButton(final String text, final Supplier<R> onAction, final String description) {
+        this.text = Assert.requireNonBlank(text, "text");
+        this.onAction = Assert.requireNonNull(onAction, "onAction");
+        this.description = description;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public Supplier<R> getOnAction() {
+        return onAction;
+    }
+
+    public void setEnabled(final boolean enabled) {
+        this.enabled = enabled;
+        enabledObservers.forEach(o -> o.accept(enabled));
+    }
+
+    public boolean isEnabled() {
+        return enabled;
+    }
+
+    public JButton createButton(Consumer<R> actionResultConsumer) {
+        final JButton button = new JButton(getText());
+        if (getDescription() != null) {
+            button.setToolTipText(getDescription());
+        }
+        button.addActionListener(e -> {
+            final R result = getOnAction().get();
+            Optional.ofNullable(actionResultConsumer).ifPresent(c -> c.accept(result));
+        });
+        enabledObservers.add(b -> button.setEnabled(b));
+        button.setEnabled(isEnabled());
+        return button;
+    }
+}

common/src/main/java/net/adoptopenjdk/icedteaweb/ui/dialogs/DialogWithResult.java

@@ -0,0 +1,62 @@
+package net.adoptopenjdk.icedteaweb.ui.dialogs;
+
+import javax.swing.JDialog;
+import javax.swing.JPanel;
+import javax.swing.SwingUtilities;
+import java.awt.Dialog;
+import java.awt.Dimension;
+import java.util.concurrent.CompletableFuture;
+
+public abstract class DialogWithResult<R> extends JDialog {
+
+    private R result;
+
+    public DialogWithResult() {
+        this((Dialog) null);
+    }
+
+    public DialogWithResult(final Dialog owner) {
+        super(owner, true);
+        setModalityType(ModalityType.APPLICATION_MODAL);
+        setResizable(true);
+        setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
+    }
+
+    protected abstract String createTitle();
+
+    protected abstract JPanel createContentPane();
+
+    protected void close(final R result) {
+        this.result = result;
+        this.setVisible(false);
+        this.dispose();
+    }
+
+    public Dimension getPreferredSize() {
+        return new Dimension(800, super.getPreferredSize().height);
+    }
+
+    public R showAndWait() {
+        if (SwingUtilities.isEventDispatchThread()) {
+            setTitle(createTitle());
+            getContentPane().removeAll();
+            getContentPane().add(createContentPane());
+            pack();
+            setLocationRelativeTo(null);
+            setVisible(true);
+            return result;
+        } else {
+            final CompletableFuture<R> result = new CompletableFuture<>();
+            try {
+                SwingUtilities.invokeAndWait(() -> {
+                    pack();
+                    final R r = showAndWait();
+                    result.complete(r);
+                });
+                return result.get();
+            } catch (Exception e) {
+                throw new RuntimeException("Error in handling dialog!", e);
+            }
+        }
+    }
+}

common/src/main/java/net/adoptopenjdk/icedteaweb/ui/swing/SwingUtils.java

@@ -36,6 +36,7 @@
 import net.adoptopenjdk.icedteaweb.logging.Logger;
 import net.adoptopenjdk.icedteaweb.logging.LoggerFactory;
 
+import javax.swing.JLabel;
 import javax.swing.JWindow;
 import javax.swing.SwingUtilities;
 import java.awt.Component;
@@ -179,4 +180,15 @@ public void run() {
         }
         return window;
     }
+
+    /**
+     * Some Swing components such as {@link JLabel} needs their text to be wrapped as HTML to get word wrap working.
+     * This method allows to wrap a given text with an html tag.
+     *
+     * @param s string to be wrapped to html tag
+     * @return
+     */
+    public static String htmlWrap(String s) {
+        return "<html>" + s + "</html>";
+    }
 }

common/src/main/java/net/adoptopenjdk/icedteaweb/ui/swing/dialogresults/AccessWarningPaneComplexReturn.java

@@ -34,7 +34,6 @@
 package net.adoptopenjdk.icedteaweb.ui.swing.dialogresults;
 
 import java.util.EnumSet;
-import java.util.Objects;
 
 public class AccessWarningPaneComplexReturn implements DialogResult {
 
@@ -82,97 +81,6 @@ public static String allValues() {
         }
     }
 
-    public static class ShortcutResult {
-
-        public static ShortcutResult readValue(String s) {
-            if (s.trim().isEmpty()) {
-                return null;
-            }
-            String[] sq = s.split(",");
-            ShortcutResult sr = new ShortcutResult(Boolean.valueOf(sq[3]));
-            sr.browser = sq[0];
-            sr.fixHref = Boolean.parseBoolean(sq[1]);
-            if (!sq[2].equalsIgnoreCase("null")) {
-                sr.shortcutType = Shortcut.valueOf(sq[2]);
-            }
-            return sr;
-        }
-
-        public String writeValue() {
-            StringBuilder sb = new StringBuilder();
-            sb.append(browser).append(",")
-                    .append(fixHref).append(",")
-                    .append(shortcutType).append(",")
-                    .append(create).append(",");
-            return sb.toString();
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (!(obj instanceof ShortcutResult)) {
-                return false;
-            }
-            ShortcutResult sr = (ShortcutResult) obj;
-            return this.create == sr.create && this.fixHref == sr.fixHref
-                    && this.browser.equals(sr.browser) && this.shortcutType == sr.shortcutType;
-        }
-
-        @Override
-        public int hashCode() {
-            int hash = 3;
-            hash = 89 * hash + Objects.hashCode(this.browser);
-            hash = 89 * hash + (this.fixHref ? 1 : 0);
-            hash = 89 * hash + Objects.hashCode(this.shortcutType);
-            hash = 89 * hash + (this.create ? 1 : 0);
-            return hash;
-        }
-
-        private String browser = "not_found_browser";
-        private boolean fixHref = false;
-        private Shortcut shortcutType = null;
-        private final boolean create;
-
-        ShortcutResult(String browser, boolean fixHref, Shortcut shortcutType, boolean create) {
-            this.browser = browser;
-            this.fixHref = fixHref;
-            this.shortcutType = shortcutType;
-            this.create = create;
-        }
-
-        public ShortcutResult(boolean create) {
-            this.create = create;
-        }
-
-        public boolean isCreate() {
-            return create;
-        }
-
-        public String getBrowser() {
-            return browser;
-        }
-
-        public Shortcut getShortcutType() {
-            return shortcutType;
-        }
-
-        public boolean isFixHref() {
-            return fixHref;
-        }
-
-        public void setBrowser(String browser) {
-            this.browser = browser;
-        }
-
-        public void setFixHref(boolean fixHref) {
-            this.fixHref = fixHref;
-        }
-
-        public void setShortcutType(Shortcut shortcutType) {
-            this.shortcutType = shortcutType;
-        }
-
-    }
-
     private final YesNo regularReturn;
     private ShortcutResult desktop;
     private ShortcutResult menu;