Move some repeated code into methods.

Author: Joe Wegner

app/src/cc/arduino/contributions/libraries/ui/ContributedLibraryTableCellJPanel.java

@@ -42,13 +42,14 @@ public class ContributedLibraryTableCellJPanel extends JPanel {
   final JPanel buttonsPanel;
   final JPanel inactiveButtonsPanel;
   final JLabel statusLabel;
+  private final String moreInfoLbl = tr("More info");
 
   public ContributedLibraryTableCellJPanel(JTable parentTable, Object value,
                                            boolean isSelected) {
     super();
     setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
 
-    moreInfoButton = new JButton(tr("More info"));
+    moreInfoButton = new JButton(moreInfoLbl);
     moreInfoButton.setVisible(false);
     installButton = new JButton(tr("Install"));
     int width = installButton.getPreferredSize().width;
@@ -197,16 +198,7 @@ public ContributedLibraryTableCellJPanel(JTable parentTable, Object value,
       desc += "<br />";
     }
     if (author != null && !author.isEmpty()) {
-      boolean accessibleIDE = PreferencesData.getBoolean("ide.accessible");
-      if (accessibleIDE) {
-        moreInfoButton.setVisible(true);
-        moreInfoButton.addActionListener(e -> {
-          Base.openURL(website);
-        });
-      }
-      else {
-        desc += format("<a href=\"{0}\">More info</a>", website);
-      }
+      desc = setButtonOrLink(moreInfoButton, desc, moreInfoLbl, website);
     }
 
     desc += "</body></html>";
@@ -233,6 +225,25 @@ public ContributedLibraryTableCellJPanel(JTable parentTable, Object value,
     }
   }
 
+  // same function as in ContributedPlatformTableCellJPanel - is there a utils file this can move to?
+  private String setButtonOrLink(JButton button, String desc, String label, String url) {
+    boolean accessibleIDE = PreferencesData.getBoolean("ide.accessible");
+    String retString = desc;
+
+    if (accessibleIDE) {
+      button.setVisible(true);
+      button.addActionListener(e -> {
+        Base.openURL(url);
+      });
+    }
+    else {
+      // if not accessible IDE, keep link the same EXCEPT that now the link text is translated!
+      retString += format("<a href=\"{0}\">{1}</a>", url, label);
+    }
+
+    return retString;
+  }
+
   // TODO Make this a method of Theme
   private JTextPane makeNewDescription() {
     if (getComponentCount() > 0) {

app/src/cc/arduino/contributions/packages/ui/ContributedPlatformTableCellJPanel.java

@@ -75,16 +75,18 @@ public class ContributedPlatformTableCellJPanel extends JPanel {
   final JPanel buttonsPanel;
   final JPanel inactiveButtonsPanel;
   final JLabel statusLabel;
+  private final String moreInfoLbl = tr("More Info");
+  private final String onlineHelpLbl = tr("Online Help");
 
   public ContributedPlatformTableCellJPanel() {
     super();
     setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
 
     {
       installButton = new JButton(tr("Install"));
-      moreInfoButton = new JButton(tr("More Info"));
+      moreInfoButton = new JButton(moreInfoLbl);
       moreInfoButton.setVisible(false);
-      onlineHelpButton = new JButton(tr("Online Help"));
+      onlineHelpButton = new JButton(onlineHelpLbl);
       onlineHelpButton.setVisible(false);
       int width = installButton.getPreferredSize().width;
       installButtonPlaceholder = Box.createRigidArea(new Dimension(width, 1));
@@ -163,6 +165,25 @@ public ContributedPlatformTableCellJPanel() {
     add(Box.createVerticalStrut(15));
   }
 
+  // same function as in ContributedLibraryTableCellJPanel - is there a utils file this can move to?
+  private String setButtonOrLink(JButton button, String desc, String label, String url) {
+    boolean accessibleIDE = PreferencesData.getBoolean("ide.accessible");
+    String retString = desc;
+
+    if (accessibleIDE) {
+      button.setVisible(true);
+      button.addActionListener(e -> {
+        Base.openURL(url);
+      });
+    }
+    else {
+      // if not accessible IDE, keep link the same EXCEPT that now the link text is translated!
+      retString += " " + format("<a href=\"{0}\">{1}</a>", url, label);
+    }
+
+    return retString;
+  }
+
   void update(JTable parentTable, Object value, boolean isSelected,
               boolean hasBuiltInRelease) {
     ContributedPlatformReleases releases = (ContributedPlatformReleases) value;
@@ -231,34 +252,16 @@ void update(JTable parentTable, Object value, boolean isSelected,
       help = selected.getParentPackage().getHelp();
     }
 
-    boolean accessibleIDE = PreferencesData.getBoolean("ide.accessible");
-
     if (help != null) {
       String url = help.getOnline();
       if (url != null && !url.isEmpty()) {
-        if (accessibleIDE) {
-          onlineHelpButton.setVisible(true);
-          onlineHelpButton.addActionListener(e -> {
-            Base.openURL(url);
-          });
-        }
-        else {
-          desc += " " + format("<a href=\"{0}\">Online help</a><br/>", url);
-        }
+        desc = setButtonOrLink(onlineHelpButton, desc, onlineHelpLbl, url);
       }
     }
 
     String url = selected.getParentPackage().getWebsiteURL();
     if (url != null && !url.isEmpty()) {
-      if (accessibleIDE) {
-        moreInfoButton.setVisible(true);
-        moreInfoButton.addActionListener(e -> {
-          Base.openURL(url);
-        });
-      }
-      else {
-        desc += " " + format("<a href=\"{0}\">More info</a>", url);
-      }
+      desc = setButtonOrLink(moreInfoButton, desc, moreInfoLbl, url);
     }
 
     desc += "</body></html>";