From efbfe4bcbad73d63eaa4b85c889bfd1e10576f5c Mon Sep 17 00:00:00 2001
From: Daniel Howe <daniel@rednoise.org>
Date: Tue, 29 Oct 2013 01:56:51 +0800
Subject: [PATCH] merged with upstream as per discussion in pull-request #2172

---
 app/src/processing/app/Mode.java                      | 5 ++---
 app/src/processing/app/contrib/LocalContribution.java | 2 +-
 app/src/processing/mode/java/JavaEditor.java          | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/src/processing/app/Mode.java b/app/src/processing/app/Mode.java
index ff5f9a33d..63210c2e6 100644
--- a/app/src/processing/app/Mode.java
+++ b/app/src/processing/app/Mode.java
@@ -1039,9 +1039,8 @@ public abstract class Mode {
   // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 
   /**
-   * Checks coreLibraries and contribLibraries in 'mode' for a library whose name is 'libName'  
-   * @param mode the mode to check
-   * @param libName the name of the library
+   * Checks coreLibraries and contribLibraries for a library with the specified name  
+   * @param libName the name of the library to find
    * @return the Library or null if not found
    */
   public Library findLibraryByName(String libName) {
diff --git a/app/src/processing/app/contrib/LocalContribution.java b/app/src/processing/app/contrib/LocalContribution.java
index 96867b2da..5327988a5 100644
--- a/app/src/processing/app/contrib/LocalContribution.java
+++ b/app/src/processing/app/contrib/LocalContribution.java
@@ -47,7 +47,7 @@ public abstract class LocalContribution extends Contribution {
   protected File folder;
   protected HashMap<String, String> properties;
   protected ClassLoader loader;
-  protected List<String> specifiedImports; // "mylib, mylib.util";
+  protected List<String> specifiedImports; // mylib,mylib.util;
 
   public LocalContribution(File folder) {
     this.folder = folder;
diff --git a/app/src/processing/mode/java/JavaEditor.java b/app/src/processing/mode/java/JavaEditor.java
index 502404c06..4b2aa1dcf 100644
--- a/app/src/processing/mode/java/JavaEditor.java
+++ b/app/src/processing/mode/java/JavaEditor.java
@@ -558,7 +558,7 @@ public class JavaEditor extends Editor {
     String[] list = lib.getSpecifiedImports(); // ask the library for its imports 
     if (list == null) {
       
-      // Default to old behavior and load every package in the primary jar
+      // Default to old behavior and load each package in the primary jar
       list = Base.packageListFromClassPath(lib.getJarPath());
     }