Merge pull request #9262 from joew46167/master

facchinm · web-flow · commit b4bcb304a3b8 · 2019-10-14T11:17:56.000+02:00
Add titles to rows in the manager tables
diff --git a/app/src/cc/arduino/contributions/libraries/ui/ContributedLibraryTableCellJPanel.java b/app/src/cc/arduino/contributions/libraries/ui/ContributedLibraryTableCellJPanel.java
@@ -3,21 +3,12 @@
 import static processing.app.I18n.format;
 import static processing.app.I18n.tr;
 
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.Insets;
+import java.awt.*;
 import java.util.Optional;
 
-import javax.swing.Box;
-import javax.swing.BoxLayout;
-import javax.swing.JButton;
-import javax.swing.JComboBox;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JTable;
-import javax.swing.JTextPane;
+import javax.swing.*;
 import javax.swing.border.EmptyBorder;
+import javax.swing.border.TitledBorder;
 import javax.swing.event.HyperlinkEvent;
 import javax.swing.text.Document;
 import javax.swing.text.html.HTMLDocument;
@@ -128,6 +119,9 @@ public ContributedLibraryTableCellJPanel(JTable parentTable, Object value,
       return;
 
     ContributedLibrary selected = releases.getSelected();
+    TitledBorder titledBorder = BorderFactory.createTitledBorder(selected.getName());
+    titledBorder.setTitleFont(getFont().deriveFont(Font.BOLD));
+    setBorder(titledBorder);
     Optional<ContributedLibrary> mayInstalled = releases.getInstalled();
 
     boolean installable, upgradable;
@@ -162,7 +156,7 @@ public ContributedLibraryTableCellJPanel(JTable parentTable, Object value,
     String desc = "<html><body>";
 
     // Library name...
-    desc += format("<b>{0}</b>", name);
+//    desc += format("<b>{0}</b>", name);
     if (mayInstalled.isPresent() && mayInstalled.get().isIDEBuiltIn()) {
       desc += " Built-In ";
     }
diff --git a/app/src/cc/arduino/contributions/packages/ui/ContributedPlatformTableCellJPanel.java b/app/src/cc/arduino/contributions/packages/ui/ContributedPlatformTableCellJPanel.java
@@ -32,20 +32,11 @@
 import static processing.app.I18n.format;
 import static processing.app.I18n.tr;
 
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.Insets;
-
-import javax.swing.Box;
-import javax.swing.BoxLayout;
-import javax.swing.JButton;
-import javax.swing.JComboBox;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JTable;
-import javax.swing.JTextPane;
+import java.awt.*;
+
+import javax.swing.*;
 import javax.swing.border.EmptyBorder;
+import javax.swing.border.TitledBorder;
 import javax.swing.event.HyperlinkEvent;
 import javax.swing.text.Document;
 import javax.swing.text.html.HTMLDocument;
@@ -196,6 +187,9 @@ void update(JTable parentTable, Object value, boolean isSelected,
     }
 
     ContributedPlatform selected = releases.getSelected();
+    TitledBorder titledBorder = BorderFactory.createTitledBorder(selected.getName());
+    titledBorder.setTitleFont(getFont().deriveFont(Font.BOLD));
+    setBorder(titledBorder);
     ContributedPlatform installed = releases.getInstalled();
 
     boolean removable, installable, upgradable;
@@ -221,7 +215,7 @@ void update(JTable parentTable, Object value, boolean isSelected,
     removeButtonPlaceholder.setVisible(!removable);
 
     String desc = "<html><body>";
-    desc += "<b>" + selected.getName() + "</b>";
+//    desc += "<b>" + selected.getName() + "</b>";
     if (installed != null && installed.isBuiltIn()) {
       desc += " Built-In ";
     }
