diff --git a/app/src/processing/app/contrib/ContributionListPanel.java b/app/src/processing/app/contrib/ContributionListPanel.java index af02f4886..095372783 100644 --- a/app/src/processing/app/contrib/ContributionListPanel.java +++ b/app/src/processing/app/contrib/ContributionListPanel.java @@ -298,12 +298,12 @@ public class ContributionListPanel extends JPanel implements Scrollable, Contrib label.setBorder(BorderFactory.createEmptyBorder(2, 17, 0, 0)); label.setFont(Toolkit.getSansFont(14, Font.PLAIN)); if (contribution.isInstalled()) { - icon = Toolkit.getLibIcon("manager/up-to-date.png"); + icon = Toolkit.getLibIcon("manager/up-to-date-" + ContributionManagerDialog.iconVer + "x.png"); if (contribListing.hasUpdates(contribution)) { - icon = Toolkit.getLibIcon("manager/update-available.png"); + icon = Toolkit.getLibIcon("manager/update-available-" + ContributionManagerDialog.iconVer + "x.png"); } if (!contribution.isCompatible(Base.getRevision())) { - icon = Toolkit.getLibIcon("manager/incompatible.png"); + icon = Toolkit.getLibIcon("manager/incompatible-" + ContributionManagerDialog.iconVer + "x.png"); } } label.setIcon(icon); diff --git a/app/src/processing/app/contrib/ContributionManagerDialog.java b/app/src/processing/app/contrib/ContributionManagerDialog.java index 2bb5c91b4..6ea58417f 100644 --- a/app/src/processing/app/contrib/ContributionManagerDialog.java +++ b/app/src/processing/app/contrib/ContributionManagerDialog.java @@ -49,6 +49,7 @@ public class ContributionManagerDialog { static final int AUTHOR_WIDTH = 240; static final int STATUS_WIDTH = 60; static final int FILTER_WIDTH = 180; + static final int ICON_WIDTH = 45; JFrame dialog; JTabbedPane tabbedPane; @@ -75,12 +76,13 @@ public class ContributionManagerDialog { private JLabel updateTabLabel; static Font myFont; + static int iconVer = Toolkit.highResDisplay() ? 2 : 1; public ContributionManagerDialog() { myFont = Toolkit.getSansFont(14, Font.PLAIN); // GraphicsEnvironment.getLocalGraphicsEnvironment().registerFont(myFont); - numberLabel = new JLabel(Toolkit.getLibIcon("manager/notification.png"), SwingConstants.CENTER); + numberLabel = new JLabel(Toolkit.getLibIcon("manager/notification-" + iconVer + "x.png"), SwingConstants.CENTER); toolsContributionTab = new ContributionTab(ContributionType.TOOL, this); librariesContributionTab = new ContributionTab(ContributionType.LIBRARY, this); modesContributionTab = new ContributionTab(ContributionType.MODE, this); diff --git a/app/src/processing/app/contrib/StatusPanel.java b/app/src/processing/app/contrib/StatusPanel.java index 84c231776..7110e6931 100644 --- a/app/src/processing/app/contrib/StatusPanel.java +++ b/app/src/processing/app/contrib/StatusPanel.java @@ -86,7 +86,7 @@ class StatusPanel extends JPanel { } }); installButton = new JButton("Install", - Toolkit.getLibIcon("manager/install.png")); + Toolkit.getLibIcon("manager/install-" + ContributionManagerDialog.iconVer + "x.png")); installButton.setFont(Toolkit.getSansFont(14, Font.PLAIN)); installButton.setHorizontalAlignment(SwingConstants.LEFT); // installButton.setContentAreaFilled(false); @@ -108,7 +108,7 @@ class StatusPanel extends JPanel { updateLabel.setFont(Toolkit.getSansFont(14, Font.PLAIN)); updateLabel.setHorizontalAlignment(SwingConstants.CENTER); updateButton = new JButton("Update", - Toolkit.getLibIcon("manager/update.png")); + Toolkit.getLibIcon("manager/update-" + ContributionManagerDialog.iconVer + "x.png")); updateButton.setFont(Toolkit.getSansFont(14, Font.PLAIN)); updateButton.setHorizontalAlignment(SwingConstants.LEFT); // updateButton.setAlignmentX(SwingConstants.LEFT); @@ -126,7 +126,7 @@ class StatusPanel extends JPanel { }); removeButton = new JButton("Remove", - Toolkit.getLibIcon("manager/remove.png")); + Toolkit.getLibIcon("manager/remove-" + ContributionManagerDialog.iconVer + "x.png")); removeButton.setFont(Toolkit.getSansFont(14, Font.BOLD)); removeButton.setHorizontalAlignment(SwingConstants.LEFT); // removeButton.setContentAreaFilled(false); @@ -151,7 +151,8 @@ class StatusPanel extends JPanel { layout.setHorizontalGroup(layout .createSequentialGroup() - .addComponent(iconLabel, 50, 50, 50) + .addGap((ContributionManagerDialog.STATUS_WIDTH - ContributionManagerDialog.ICON_WIDTH)) + .addComponent(iconLabel, ContributionManagerDialog.ICON_WIDTH, ContributionManagerDialog.ICON_WIDTH, ContributionManagerDialog.ICON_WIDTH) .addGap(0) .addComponent(label, labelWidth, labelWidth, labelWidth) .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED, diff --git a/app/src/processing/app/contrib/UpdateContributionTab.java b/app/src/processing/app/contrib/UpdateContributionTab.java index b0a7eda51..bf58a35c6 100644 --- a/app/src/processing/app/contrib/UpdateContributionTab.java +++ b/app/src/processing/app/contrib/UpdateContributionTab.java @@ -281,12 +281,12 @@ public class UpdateContributionTab extends ContributionTab { } Icon icon = null; if (entry.isInstalled()) { - icon = Toolkit.getLibIcon("manager/up-to-date.png"); + icon = Toolkit.getLibIcon("manager/up-to-date-" + ContributionManagerDialog.iconVer + "x.png"); if (contribListing.hasUpdates(entry)) { - icon = Toolkit.getLibIcon("manager/update-available.png"); + icon = Toolkit.getLibIcon("manager/update-available-" + ContributionManagerDialog.iconVer + "x.png"); } if (!entry.isCompatible(Base.getRevision())) { - icon = Toolkit.getLibIcon("manager/incompatible.png"); + icon = Toolkit.getLibIcon("manager/incompatible-" + ContributionManagerDialog.iconVer + "x.png"); } } dtm diff --git a/app/src/processing/app/syntax/JEditTextArea.java b/app/src/processing/app/syntax/JEditTextArea.java index 1ca163ca2..b06b53258 100644 --- a/app/src/processing/app/syntax/JEditTextArea.java +++ b/app/src/processing/app/syntax/JEditTextArea.java @@ -2429,8 +2429,10 @@ public class JEditTextArea extends JComponent // if (focusedComponent != JEditTextArea.this) return; if (!hasFocus()) { // System.out.println("requesting focus in window"); - requestFocusInWindow(); - return; + // The following condition check fixes #3649 [manindra, 08/20/15] + if(!requestFocusInWindow()) { + return; + } } // isPopupTrigger() is handled differently across platforms, diff --git a/java/src/processing/mode/java/pdex/ASTGenerator.java b/java/src/processing/mode/java/pdex/ASTGenerator.java index 651334e74..27eb67424 100644 --- a/java/src/processing/mode/java/pdex/ASTGenerator.java +++ b/java/src/processing/mode/java/pdex/ASTGenerator.java @@ -3520,18 +3520,17 @@ public class ASTGenerator { log("SuggestionsMap is null or empty, won't be able to trim class names"); return true; } - final String processingInclude = "include.processing"; - final String processingExclude = "exclude.processing"; - final String jdkInclude = "include.jdk"; + final String include = "include"; + final String exclude = "exclude"; if (impName.startsWith("processing")) { - if (JavaMode.suggestionsMap.get(processingInclude).contains(impName)) { + if (JavaMode.suggestionsMap.get(include).contains(impName)) { return false; - } else if (JavaMode.suggestionsMap.get(processingExclude).contains(impName)) { + } else if (JavaMode.suggestionsMap.get(exclude).contains(impName)) { return true; } } else if (impName.startsWith("java")) { - if (JavaMode.suggestionsMap.get(jdkInclude).contains(impName)) { + if (JavaMode.suggestionsMap.get(include).contains(impName)) { return false; } } diff --git a/java/suggestions.txt b/java/suggestions.txt index ff86167a2..ae9f8642e 100644 --- a/java/suggestions.txt +++ b/java/suggestions.txt @@ -1,48 +1,48 @@ #List of suggestions to include/exclude in code completion -#.