diff --git a/app/src/processing/app/contrib/ContributionManagerDialog.java b/app/src/processing/app/contrib/ContributionManagerDialog.java index 105dfc973..edc022378 100644 --- a/app/src/processing/app/contrib/ContributionManagerDialog.java +++ b/app/src/processing/app/contrib/ContributionManagerDialog.java @@ -26,7 +26,6 @@ import java.awt.event.*; import java.io.File; import java.io.IOException; import java.lang.management.ManagementFactory; -import java.net.SocketTimeoutException; import java.util.*; import javax.swing.*; @@ -38,6 +37,7 @@ import processing.app.*; import processing.app.ui.Editor; import processing.app.ui.Toolkit; + /** * This class is the main Contribution Manager Dialog. * It contains all the contributions tab and the update tab. @@ -47,9 +47,9 @@ public class ContributionManagerDialog { static final int TAB_WIDTH = 100; static final int TAB_HEIGHT = 34; static final int AUTHOR_WIDTH = 240; - static final int STATUS_WIDTH = 60; + static final int STATUS_WIDTH = 60; static final int FILTER_WIDTH = 180; - + JFrame dialog; JTabbedPane tabbedPane; String title; @@ -249,12 +249,12 @@ public class ContributionManagerDialog { dialog.setLocationRelativeTo(null); } - + private void makeAndSetTabComponents() { - + String[] tabTitles = { "Tools","Libraries","Modes","Examples","Updates"}; tabLabels = new JLabel[4]; - + for(int i = 0 ; i < 4; i++){ final int temp = i; tabLabels[i] = new JLabel(tabTitles[i]){ @@ -266,7 +266,7 @@ public class ContributionManagerDialog { temp == 3 ? 6 : 0, 0, 0)); super.paintComponent(g); - + } }; tabLabels[i].setForeground(Color.WHITE); @@ -278,7 +278,7 @@ public class ContributionManagerDialog { tabLabels[i].setFont(Toolkit.getSansFont(14, Font.BOLD)); tabbedPane.setTabComponentAt(i, tabLabels[i]); } - + updateTabPanel = new JPanel(){ @Override protected void paintComponent(Graphics g) { @@ -288,7 +288,7 @@ public class ContributionManagerDialog { 6, 0, 0)); super.paintComponent(g); - + } };; updateTabLabel = new JLabel("Updates"); diff --git a/app/src/processing/app/contrib/ContributionTab.java b/app/src/processing/app/contrib/ContributionTab.java index b67af1c2a..d4623b02b 100644 --- a/app/src/processing/app/contrib/ContributionTab.java +++ b/app/src/processing/app/contrib/ContributionTab.java @@ -19,12 +19,11 @@ with this program; if not, write to the Free Software Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + package processing.app.contrib; import java.awt.Color; -import java.awt.ComponentOrientation; import java.awt.Dimension; -import java.awt.FlowLayout; import java.awt.Font; import java.awt.event.*; import java.util.*; @@ -220,7 +219,7 @@ public class ContributionTab { .addGroup(layout.createParallelGroup(GroupLayout.Alignment.CENTER) .addComponent(categoryChooser) .addComponent(filterField)) - .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED) + .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED) .addGroup(layout.createParallelGroup(GroupLayout.Alignment.CENTER) .addComponent(loaderLabel) .addComponent(contributionListPanel)) @@ -229,7 +228,7 @@ public class ContributionTab { GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)); layout.linkSize(SwingConstants.VERTICAL, categoryChooser, filterField); layout.setHonorsVisibility(contributionListPanel, false); - + panel.setBackground(Color.WHITE); panel.setBorder(null); } @@ -314,9 +313,9 @@ public class ContributionTab { .addGroup(layout .createParallelGroup(GroupLayout.Alignment.CENTER) .addComponent(errorMessage) - .addComponent(tryAgainButton, statusPanel.BUTTON_WIDTH, - statusPanel.BUTTON_WIDTH, - statusPanel.BUTTON_WIDTH)) + .addComponent(tryAgainButton, StatusPanel.BUTTON_WIDTH, + StatusPanel.BUTTON_WIDTH, + StatusPanel.BUTTON_WIDTH)) .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE) .addComponent(closeButton)); @@ -426,16 +425,16 @@ public class ContributionTab { public FilterField () { super(""); - + filterLabel = new JLabel("Filter"); filterLabel.setFont(Toolkit.getSansFont(14, Font.PLAIN)); filterLabel.setOpaque(false); - + setFont(Toolkit.getSansFont(14, Font.PLAIN)); searchIcon = Toolkit.getLibIcon("manager/search.png"); setOpaque(false); setBorder(BorderFactory.createMatteBorder(0, 33, 0, 0, searchIcon)); - + GroupLayout fl = new GroupLayout(this); setLayout(fl); fl.setHorizontalGroup(fl.createSequentialGroup().addComponent(filterLabel)); @@ -445,7 +444,7 @@ public class ContributionTab { .addComponent(filterLabel) .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE)); - + filters = new ArrayList(); addFocusListener(new FocusListener() { diff --git a/app/src/processing/app/contrib/StatusPanel.java b/app/src/processing/app/contrib/StatusPanel.java index 7e577973a..01a398495 100644 --- a/app/src/processing/app/contrib/StatusPanel.java +++ b/app/src/processing/app/contrib/StatusPanel.java @@ -27,7 +27,6 @@ import java.awt.Font; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import javax.swing.BorderFactory; import javax.swing.GroupLayout; import javax.swing.Icon; import javax.swing.ImageIcon; @@ -40,14 +39,12 @@ import javax.swing.SwingConstants; import javax.swing.event.HyperlinkEvent; import javax.swing.event.HyperlinkListener; -import processing.app.Base; import processing.app.ui.Toolkit; import processing.app.Platform; class StatusPanel extends JPanel { - - final int BUTTON_WIDTH = 150; + static final int BUTTON_WIDTH = 150; JTextPane label; JButton installButton; @@ -66,9 +63,9 @@ class StatusPanel extends JPanel { setBackground(new Color(0xebebeb)); // setBorder(BorderFactory.createMatteBorder(2, 0, 0, 0, Color.BLACK)); this.contributionTab = contributionTab; - + iconLabel = new JLabel(); - + label = new JTextPane(); label.setEditable(false); label.setOpaque(false); diff --git a/app/src/processing/app/contrib/UpdateContributionTab.java b/app/src/processing/app/contrib/UpdateContributionTab.java index 3531bbe58..752c38418 100644 --- a/app/src/processing/app/contrib/UpdateContributionTab.java +++ b/app/src/processing/app/contrib/UpdateContributionTab.java @@ -22,20 +22,16 @@ import javax.swing.JTable; import javax.swing.LayoutStyle; import javax.swing.ListSelectionModel; import javax.swing.SwingConstants; -import javax.swing.UIManager; import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.DefaultTableModel; import javax.swing.table.JTableHeader; import javax.swing.table.TableCellRenderer; -import javax.swing.table.TableModel; -import javax.swing.table.TableRowSorter; import processing.app.Base; -import processing.app.contrib.ContributionListPanel.MyColumnHeaderRenderer; -import processing.app.Platform; import processing.app.ui.Editor; import processing.app.ui.Toolkit; + public class UpdateContributionTab extends ContributionTab { public UpdateContributionTab(ContributionType type,ContributionManagerDialog contributionManagerDialog) { @@ -174,7 +170,7 @@ public class UpdateContributionTab extends ContributionTab { return this; } }); - + GroupLayout layout = new GroupLayout(this); layout.setHorizontalGroup(layout.createParallelGroup().addComponent(scrollPane)); @@ -217,7 +213,7 @@ public class UpdateContributionTab extends ContributionTab { }); } - + class StatusRendere extends DefaultTableCellRenderer { @Override public Component getTableCellRendererComponent(JTable table, @@ -335,7 +331,7 @@ public class UpdateContributionTab extends ContributionTab { .addComponent(updateButton)); updateButton.setVisible(true); } - + @Override public void update(ContributionPanel panel) { if (contributionListPanel.getNoOfRows() > 0) {