From ef5da1cd45d5909c9ec1475682acb588d63577d4 Mon Sep 17 00:00:00 2001
From: pesckal <pkalauskas@gmail.com>
Date: Sun, 18 Sep 2011 01:01:07 +0000
Subject: [PATCH] Restored error message for reading .properties file

---
 app/src/processing/app/Base.java                | 9 +++++----
 app/src/processing/app/ContributionListing.java | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java
index b62f9fe08..37e6e09fe 100644
--- a/app/src/processing/app/Base.java
+++ b/app/src/processing/app/Base.java
@@ -2440,12 +2440,13 @@ public class Base {
     HashMap<String,String> outgoing = new HashMap<String,String>();
     if (inputFile.exists()) {
       String lines[] = PApplet.loadStrings(inputFile);
-      readSettings(lines, outgoing);
+      readSettings(inputFile.toString(), lines, outgoing);
     }
     return outgoing;
   }
   
-  static public void readSettings(String lines[], HashMap<String, String> exports) {
+  static public void readSettings(String fileName, String lines[],
+                                  HashMap<String, String> exports) {
     for (int i = 0; i < lines.length; i++) {
       int hash = lines[i].indexOf('#');
       String line = (hash == -1) ?
@@ -2454,8 +2455,8 @@ public class Base {
 
       int equals = line.indexOf('=');
       if (equals == -1) {
-        System.err.println("ignoring illegal line in properties file");
-        //System.err.println("ignoring illegal line in " + inputFile);
+        if (fileName != null)
+        System.err.println("ignoring illegal line in " + fileName);
         System.err.println("  " + line);
         continue;
       }
diff --git a/app/src/processing/app/ContributionListing.java b/app/src/processing/app/ContributionListing.java
index 564f2b195..b64d4f5e3 100644
--- a/app/src/processing/app/ContributionListing.java
+++ b/app/src/processing/app/ContributionListing.java
@@ -446,7 +446,7 @@ public class ContributionListing {
           System.arraycopy(lines, start, strings, 0, length);
           
           HashMap<String,String> exports = new HashMap<String,String>();
-          Base.readSettings(strings, exports);
+          Base.readSettings(null, strings, exports);
           
           Type kind = Contribution.Type.toType(type);
           outgoing.add(new AdvertisedContribution(kind, exports));