Open links using java.awt.Desktop

Redande · Redande · commit 33383b0d6890 · 2018-12-19T18:04:32.000+02:00
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/actions/OpenProfileAction.java b/tmc-plugin/src/fi/helsinki/cs/tmc/actions/OpenProfileAction.java
@@ -1,17 +1,18 @@
 package fi.helsinki.cs.tmc.actions;
 
 import fi.helsinki.cs.tmc.ui.ConvenientDialogDisplayer;
+import fi.helsinki.cs.tmc.utilities.BrowserOpener;
 
 import java.awt.event.ActionEvent;
-import java.net.MalformedURLException;
-import java.net.URL;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import javax.swing.AbstractAction;
 
 import org.openide.awt.ActionID;
 import org.openide.awt.ActionReference;
 import org.openide.awt.ActionReferences;
 import org.openide.awt.ActionRegistration;
-import org.openide.awt.HtmlBrowser;
 import org.openide.util.NbBundle;
 
 @ActionID(category = "TMC",
@@ -26,10 +27,10 @@ public class OpenProfileAction extends AbstractAction {
     @Override
     public void actionPerformed(ActionEvent e) {
         try {
-            HtmlBrowser.URLDisplayer.getDefault().showURLExternal(new URL("https://tmc.mooc.fi/participants/me"));
-        } catch (MalformedURLException ex) {
+            BrowserOpener.openUrl(URI.create("https://tmc.mooc.fi/participants/me"));
+        } catch (URISyntaxException | IOException ex) {
             ConvenientDialogDisplayer.getDefault().displayError("Failed to open browser.\n" + ex.getMessage());
         }
     }
-    
+
 }
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/ui/AboutDialog.java b/tmc-plugin/src/fi/helsinki/cs/tmc/ui/AboutDialog.java
@@ -1,14 +1,16 @@
 package fi.helsinki.cs.tmc.ui;
 
-import java.net.MalformedURLException;
-import java.net.URL;
+import fi.helsinki.cs.tmc.utilities.BrowserOpener;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import javax.swing.event.HyperlinkEvent;
 
-import org.openide.awt.HtmlBrowser;
 import org.openide.windows.WindowManager;
 
 public class AboutDialog extends javax.swing.JDialog {
-    
+
     public static void display() {
         AboutDialog dialog = new AboutDialog();
         dialog.setTitle("About");
@@ -19,14 +21,14 @@ public static void display() {
     public AboutDialog() {
         super(WindowManager.getDefault().getMainWindow(), false);
         initComponents();
-        
+
         this.setDefaultCloseOperation(DISPOSE_ON_CLOSE);
-        
+
         this.infoTextPane.addHyperlinkListener((HyperlinkEvent e) -> {
             if (e.getEventType() == HyperlinkEvent.EventType.ACTIVATED) {
                 try {
-                    HtmlBrowser.URLDisplayer.getDefault().showURLExternal(new URL("https://mooc.fi/tmc"));
-                } catch (MalformedURLException ex) {
+                    BrowserOpener.openUrl(URI.create("https://mooc.fi/tmc"));
+                } catch (URISyntaxException | IOException ex) {
                     ConvenientDialogDisplayer.getDefault().displayError("Failed to open browser.\n" + ex.getMessage());
                 }
             }
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/ui/CodeReviewDialog.java b/tmc-plugin/src/fi/helsinki/cs/tmc/ui/CodeReviewDialog.java
@@ -1,51 +1,52 @@
 package fi.helsinki.cs.tmc.ui;
 
 import fi.helsinki.cs.tmc.core.domain.Review;
+import fi.helsinki.cs.tmc.utilities.BrowserOpener;
 
 import java.awt.Dimension;
 import java.awt.Toolkit;
 import java.awt.event.ActionListener;
-import java.net.MalformedURLException;
-import java.util.logging.Level;
+import java.io.IOException;
+import java.net.URISyntaxException;
 import java.util.logging.Logger;
+
 import org.apache.commons.lang3.StringUtils;
-import org.openide.awt.HtmlBrowser;
 
 public class CodeReviewDialog extends javax.swing.JDialog {
+
     private static final Logger log = Logger.getLogger(CodeReviewDialog.class.getName());
-    
+
     private Review review;
     private ActionListener okListener;
-    
+
     public CodeReviewDialog(Review review) {
         this.review = review;
         this.okListener = null;
-        
+
         initComponents();
-        
+
         // Set location according to screen dimensions
         Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
         this.setLocation(screenSize.width / 2 - (this.getWidth() / 2), screenSize.height / 2 - (this.getHeight() / 2));
-        
-        
+
         this.setLocationByPlatform(true);
-        
+
         this.setTitle("Code review - " + review.getExerciseName());
         titleLabel.setText("Code review - " + review.getExerciseName());
         reviewedByLabel.setText("Reviewed by " + review.getReviewerName());
         reviewArea.setText(review.getReviewBody());
         markAsReadCheckBox.setSelected(true);
         pointsLabel.setText(getPointsAwardedText(review));
     }
-    
+
     public void setOkListener(ActionListener okListener) {
         this.okListener = okListener;
     }
-    
+
     public boolean getMarkAsRead() {
         return markAsReadCheckBox.isSelected();
     }
-    
+
     private String getPointsAwardedText(Review review) {
         StringBuilder sb = new StringBuilder();
         if (!review.getPoints().isEmpty()) {
@@ -56,12 +57,12 @@ private String getPointsAwardedText(Review review) {
         }
         return sb.toString();
     }
-    
+
     private void openInBrowser() {
         try {
-            HtmlBrowser.URLDisplayer.getDefault().showURLExternal(review.getUrl().toURL());
-        } catch (MalformedURLException ex) {
-            log.log(Level.WARNING, "Malformed URL: " + ex.getMessage(), ex);
+            BrowserOpener.openUrl(review.getUrl());
+        } catch (URISyntaxException | IOException ex) {
+            ConvenientDialogDisplayer.getDefault().displayError("Failed to open browser.\n" + ex.getMessage());
         }
     }
 
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/ui/PastebinResponseDialog.java b/tmc-plugin/src/fi/helsinki/cs/tmc/ui/PastebinResponseDialog.java
@@ -2,14 +2,19 @@
 
 import static fi.helsinki.cs.tmc.ui.Boxer.hbox;
 import static fi.helsinki.cs.tmc.ui.Boxer.hglue;
+
+import fi.helsinki.cs.tmc.utilities.BrowserOpener;
+
 import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.Toolkit;
 import java.awt.datatransfer.Clipboard;
 import java.awt.datatransfer.StringSelection;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.net.URL;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.logging.Logger;
 import javax.swing.AbstractAction;
 import javax.swing.BorderFactory;
@@ -20,46 +25,45 @@
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JTextField;
-import org.openide.awt.HtmlBrowser;
 
 public class PastebinResponseDialog extends JDialog {
 
     private static final Logger log = Logger.getLogger(PastebinResponseDialog.class.getName());
 
     public PastebinResponseDialog(final String pasteUrl) {
         setTitle("Pastebin notification");
-        
+
         // Set location according to screen dimensions
         Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
         this.setLocation(screenSize.width / 2 - (this.getWidth() / 2), screenSize.height / 2 - (this.getHeight() / 2));
-        
+
         JPanel contentPane = new JPanel();
         contentPane.setBorder(BorderFactory.createEmptyBorder(8, 8, 8, 8));
         contentPane.setLayout(new BoxLayout(contentPane, BoxLayout.Y_AXIS));
         setContentPane(contentPane);
-        
+
         getContentPane().add(leftAligned(new JLabel("Code submitted to TMC pastebin.")));
         addVSpace(8);
         JButton viewPasteButton = new JButton(new AbstractAction("View paste") {
             @Override
-                public void actionPerformed(ActionEvent ev) {
-                    try {
-                        HtmlBrowser.URLDisplayer.getDefault().showURLExternal(new URL(pasteUrl));
-                    } catch (Exception ex) {
-                        ConvenientDialogDisplayer.getDefault().displayError("Failed to open browser.\n" + ex.getMessage());
-                    }
+            public void actionPerformed(ActionEvent ev) {
+                try {
+                    BrowserOpener.openUrl(URI.create(pasteUrl));
+                } catch (URISyntaxException | IOException ex) {
+                    ConvenientDialogDisplayer.getDefault().displayError("Failed to open browser.\n" + ex.getMessage());
                 }
+            }
         });
-        
+
         getContentPane().add(leftAligned(viewPasteButton));
         addVSpace(8);
-        
+
         final JTextField pasteUrlField = new JTextField(pasteUrl);
         pasteUrlField.setEditable(false);
         getContentPane().add(leftAligned(pasteUrlField));
-        
+
         addVSpace(8);
-        
+
         JButton okButton = new JButton("OK");
         okButton.addActionListener(new ActionListener() {
             @Override
@@ -69,28 +73,27 @@ public void actionPerformed(ActionEvent e) {
             }
         });
         getContentPane().add(hbox(hglue(), okButton));
-        
+
         JButton copyToClipboardButton = new JButton("Copy to clipboard");
         copyToClipboardButton.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
-                StringSelection stringSelection = new StringSelection(pasteUrl);  
+                StringSelection stringSelection = new StringSelection(pasteUrl);
                 Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
                 clipboard.setContents(stringSelection, stringSelection);
             }
         });
         getContentPane().add(hbox(hglue(), copyToClipboardButton));
-        
+
         pack();
-        
-        
 
     }
+
     //brutishly borrowed from SuccessfulSubmissionDialog
     private void addVSpace(int height) {
         add(Box.createVerticalStrut(height));
     }
-    
+
     private Box leftAligned(Component component) {
         return hbox(component, hglue());
     }
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/ui/SubmissionResultWaitingDialog.java b/tmc-plugin/src/fi/helsinki/cs/tmc/ui/SubmissionResultWaitingDialog.java
@@ -1,19 +1,21 @@
 package fi.helsinki.cs.tmc.ui;
 
 import fi.helsinki.cs.tmc.coreimpl.ManualProgressObserver;
+import fi.helsinki.cs.tmc.utilities.BrowserOpener;
+
+import com.google.common.base.Optional;
 
 import java.awt.event.ActionEvent;
 import java.awt.Frame;
+import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.concurrent.atomic.AtomicReference;
 import javax.swing.AbstractAction;
 import javax.swing.JDialog;
 import javax.swing.SwingUtilities;
 
-import com.google.common.base.Optional;
-
-import org.openide.awt.HtmlBrowser;
 import org.openide.util.Cancellable;
 import org.openide.util.Exceptions;
 import org.openide.windows.WindowManager;
@@ -75,8 +77,8 @@ public void showSubmissionButton(URI showSubmissionUrl) {
             @Override
             public void actionPerformed(ActionEvent ae) {
                 try {
-                    HtmlBrowser.URLDisplayer.getDefault().showURLExternal(showSubmissionUrl.toURL());
-                } catch (Exception ex) {
+                    BrowserOpener.openUrl(showSubmissionUrl);
+                } catch (URISyntaxException | IOException ex) {
                     ConvenientDialogDisplayer.getDefault().displayError("Failed to open browser.\n" + ex.getMessage());
                 }
             }
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/ui/SuccessfulSubmissionDialog.java b/tmc-plugin/src/fi/helsinki/cs/tmc/ui/SuccessfulSubmissionDialog.java
@@ -6,16 +6,17 @@
 import fi.helsinki.cs.tmc.core.domain.submission.FeedbackQuestion;
 import fi.helsinki.cs.tmc.ui.feedback.FeedbackQuestionPanel;
 import fi.helsinki.cs.tmc.ui.feedback.FeedbackQuestionPanelFactory;
+import fi.helsinki.cs.tmc.utilities.BrowserOpener;
 
 import com.google.common.base.Optional;
 
 import java.awt.Component;
 import java.awt.Font;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.net.MalformedURLException;
+import java.io.IOException;
 import java.net.URI;
-import java.net.URL;
+import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Logger;
@@ -30,7 +31,6 @@
 
 import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.openide.awt.HtmlBrowser;
 
 import static fi.helsinki.cs.tmc.ui.Boxer.hbox;
 import static fi.helsinki.cs.tmc.ui.Boxer.hglue;
@@ -135,8 +135,8 @@ private void addModelSolutionButton(SubmissionResult result) {
                 @Override
                 public void actionPerformed(ActionEvent ev) {
                     try {
-                        HtmlBrowser.URLDisplayer.getDefault().showURLExternal(new URL(solutionUrl));
-                    } catch (MalformedURLException ex) {
+                        BrowserOpener.openUrl(URI.create(solutionUrl));
+                    } catch (URISyntaxException | IOException ex) {
                         ConvenientDialogDisplayer.getDefault().displayError("Failed to open browser.\n" + ex.getMessage());
                     }
                 }
@@ -205,8 +205,8 @@ private void addShowSubmissionButton(JPanel buttonPane, Optional<URI> submission
             @Override
             public void actionPerformed(ActionEvent ae) {
                 try {
-                    HtmlBrowser.URLDisplayer.getDefault().showURLExternal(submissionUrl.get().toURL());
-                } catch (MalformedURLException ex) {
+                    BrowserOpener.openUrl(submissionUrl.get());
+                } catch (URISyntaxException | IOException ex) {
                     ConvenientDialogDisplayer.getDefault().displayError("Failed to open browser.\n" + ex.getMessage());
                 }
             }
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/utilities/BrowserOpener.java b/tmc-plugin/src/fi/helsinki/cs/tmc/utilities/BrowserOpener.java
@@ -0,0 +1,20 @@
+package fi.helsinki.cs.tmc.utilities;
+
+import java.awt.Desktop;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.net.URI;
+
+import org.openide.awt.HtmlBrowser;
+
+public class BrowserOpener {
+
+    public static void openUrl(URI url) throws URISyntaxException, IOException {
+        if (Desktop.isDesktopSupported()) {
+            Desktop desktop = Desktop.getDesktop();
+            desktop.browse(url);
+        } else {
+            HtmlBrowser.URLDisplayer.getDefault().showURLExternal(url.toURL());
+        }
+    }
+}
