From 83fd6932a2e346ae3ff42c148dc9c5cacbb18ee0 Mon Sep 17 00:00:00 2001
From: Akarshit Wal <akarshitwal@gmail.com>
Date: Thu, 20 Aug 2015 12:22:16 +0530
Subject: [PATCH 1/4] Icons are implemented

---
 app/src/processing/app/contrib/ContributionListPanel.java   | 6 +++---
 .../processing/app/contrib/ContributionManagerDialog.java   | 3 ++-
 app/src/processing/app/contrib/StatusPanel.java             | 6 +++---
 app/src/processing/app/contrib/UpdateContributionTab.java   | 6 +++---
 4 files changed, 11 insertions(+), 10 deletions(-)

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..91a2f8e49 100644
--- a/app/src/processing/app/contrib/ContributionManagerDialog.java
+++ b/app/src/processing/app/contrib/ContributionManagerDialog.java
@@ -75,12 +75,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 895d24138..2dcf9bc30 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);
@@ -107,7 +107,7 @@ class StatusPanel extends JPanel {
     updateLabel = new JLabel(" ");
     updateLabel.setFont(Toolkit.getSansFont(14, Font.PLAIN));
     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);
@@ -125,7 +125,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);
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

From 7ba8457e35220d7dc61953550c022b27308d64bf Mon Sep 17 00:00:00 2001
From: Manindra Moharana <mkmoharana29@gmail.com>
Date: Thu, 20 Aug 2015 20:56:50 -0700
Subject: [PATCH 2/4] fixes #3649

---
 app/src/processing/app/syntax/JEditTextArea.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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,

From 16bc17ae644908dde88cd7f29b86c02d9e31da29 Mon Sep 17 00:00:00 2001
From: Manindra Moharana <mkmoharana29@gmail.com>
Date: Thu, 20 Aug 2015 21:04:03 -0700
Subject: [PATCH 3/4] wrap up #2951

---
 .../mode/java/pdex/ASTGenerator.java          | 11 ++-
 java/suggestions.txt                          | 86 +++++++++----------
 2 files changed, 48 insertions(+), 49 deletions(-)

diff --git a/java/src/processing/mode/java/pdex/ASTGenerator.java b/java/src/processing/mode/java/pdex/ASTGenerator.java
index 93e5a07e0..5ab752705 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
 
-#<include/exclude>.<label>=<fully qualified class name>
+#<include/exclude>=<fully qualified class name>
 
-include.processing=processing.core.PApplet
-include.processing=processing.core.PFont
-include.processing=processing.core.PGraphics
-include.processing=processing.core.PImage
-include.processing=processing.core.PMatrix2D
-include.processing=processing.core.PMatrix3D
-include.processing=processing.core.PStyle
-include.processing=processing.core.PVector
-include.processing=processing.core.PShape
-include.processing=processing.core.PGraphicsJava2D
-include.processing=processing.core.PGraphics2D
-include.processing=processing.core.PGraphics3D
-include.processing=processing.data.FloatDict
-include.processing=processing.data.FloatList
-include.processing=processing.data.IntDict
-include.processing=processing.data.IntList
-include.processing=processing.data.JSONArray
-include.processing=processing.data.JSONObject
-include.processing=processing.data.StringDict
-include.processing=processing.data.StringList
-include.processing=processing.data.Table
-include.processing=processing.data.XML
-include.processing=processing.event.Event
-include.processing=processing.event.KeyEvent
-include.processing=processing.event.MouseEvent
-include.processing=processing.event.TouchEvent
-include.processing=processing.opengl.PShader
-include.processing=processing.opengl.PGL
+include=processing.core.PApplet
+include=processing.core.PFont
+include=processing.core.PGraphics
+include=processing.core.PImage
+include=processing.core.PMatrix2D
+include=processing.core.PMatrix3D
+include=processing.core.PStyle
+include=processing.core.PVector
+include=processing.core.PShape
+include=processing.core.PGraphicsJava2D
+include=processing.core.PGraphics2D
+include=processing.core.PGraphics3D
+include=processing.data.FloatDict
+include=processing.data.FloatList
+include=processing.data.IntDict
+include=processing.data.IntList
+include=processing.data.JSONArray
+include=processing.data.JSONObject
+include=processing.data.StringDict
+include=processing.data.StringList
+include=processing.data.Table
+include=processing.data.XML
+include=processing.event.Event
+include=processing.event.KeyEvent
+include=processing.event.MouseEvent
+include=processing.event.TouchEvent
+include=processing.opengl.PShader
+include=processing.opengl.PGL
 
-exclude.processing=processing.core.PGraphicsRetina2D
-exclude.processing=processing.core.PShapeOBJ
-exclude.processing=processing.core.PShapeSVG
-exclude.processing=processing.data.Sort
-exclude.processing=processing.opengl.FrameBuffer
-exclude.processing=processing.opengl.LinePath
-exclude.processing=processing.opengl.LinePath.PathIterator
-exclude.processing=processing.opengl.LineStroker
-exclude.processing=processing.opengl.PGraphicsOpenGL
+exclude=processing.core.PGraphicsRetina2D
+exclude=processing.core.PShapeOBJ
+exclude=processing.core.PShapeSVG
+exclude=processing.data.Sort
+exclude=processing.opengl.FrameBuffer
+exclude=processing.opengl.LinePath
+exclude=processing.opengl.LinePath.PathIterator
+exclude=processing.opengl.LineStroker
+exclude=processing.opengl.PGraphicsOpenGL
 
-include.jdk=java.util.ArrayList
-include.jdk=java.io.BufferedReader
-include.jdk=java.util.HashMap
-include.jdk=java.io.PrintWriter
-include.jdk=java.lang.String
\ No newline at end of file
+include=java.util.ArrayList
+include=java.io.BufferedReader
+include=java.util.HashMap
+include=java.io.PrintWriter
+include=java.lang.String
\ No newline at end of file

From 1689fbc83edec88a85f990b39aa040908be496f5 Mon Sep 17 00:00:00 2001
From: Akarshit Wal <akarshitwal@gmail.com>
Date: Fri, 21 Aug 2015 09:48:25 +0530
Subject: [PATCH 4/4] alignedleft :)

---
 app/src/processing/app/contrib/ContributionManagerDialog.java | 1 +
 app/src/processing/app/contrib/StatusPanel.java               | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/processing/app/contrib/ContributionManagerDialog.java b/app/src/processing/app/contrib/ContributionManagerDialog.java
index 2bb5c91b4..bad9956f8 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;
diff --git a/app/src/processing/app/contrib/StatusPanel.java b/app/src/processing/app/contrib/StatusPanel.java
index 84c231776..04b317868 100644
--- a/app/src/processing/app/contrib/StatusPanel.java
+++ b/app/src/processing/app/contrib/StatusPanel.java
@@ -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,