don't bother testing filenames as URLs unless they contain ://

core/.settings/org.eclipse.jdt.core.prefs

@@ -1,4 +1,4 @@
-#Tue Sep 22 10:13:08 EDT 2009
+#Thu Jan 07 13:47:10 EST 2010
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
 org.eclipse.jdt.core.compiler.compliance=1.5
@@ -16,7 +16,7 @@ org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=18
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=36
 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=18
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=18
@@ -75,7 +75,7 @@ org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
 org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
 org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
 org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.indentation.size=2
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
@@ -248,6 +248,8 @@ org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=true
+org.eclipse.jdt.core.formatter.join_wrapped_lines=true
 org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
 org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
@@ -259,6 +261,6 @@ org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body
 org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
 org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
 org.eclipse.jdt.core.formatter.tabulation.char=space
-org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.tabulation.size=2
 org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
 org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

core/.settings/org.eclipse.jdt.ui.prefs

@@ -1,5 +1,5 @@
-#Tue Sep 22 10:13:08 EDT 2009
+#Thu Jan 07 13:47:10 EST 2010
 eclipse.preferences.version=1
-formatter_profile=_fry (4 spaces)
+formatter_profile=_fry
 formatter_settings_version=11
 org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates/>

core/src/processing/core/PApplet.java

@@ -3,7 +3,7 @@
 /*
   Part of the Processing project - http://processing.org
 
-  Copyright (c) 2004-09 Ben Fry and Casey Reas
+  Copyright (c) 2004-10 Ben Fry and Casey Reas
   Copyright (c) 2001-04 Massachusetts Institute of Technology
 
   This library is free software; you can redistribute it and/or
@@ -35,7 +35,6 @@ import java.util.*;
 import java.util.regex.*;
 import java.util.zip.*;
 
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.imageio.ImageIO;
 import javax.swing.JFileChooser;
 import javax.swing.SwingUtilities;
@@ -4463,24 +4462,26 @@ public class PApplet extends Applet
 
     // safe to check for this as a url first. this will prevent online
     // access logs from being spammed with GET /sketchfolder/http://blahblah
-    try {
-      URL url = new URL(filename);
-      stream = url.openStream();
-      return stream;
+    if (filename.indexOf("://") != -1) {  // at least smells like URL
+      try {
+        URL url = new URL(filename);
+        stream = url.openStream();
+        return stream;
 
-    } catch (MalformedURLException mfue) {
-      // not a url, that's fine
+      } catch (MalformedURLException mfue) {
+        // not a url, that's fine
 
-    } catch (FileNotFoundException fnfe) {
-      // Java 1.5 likes to throw this when URL not available. (fix for 0119)
-      // http://dev.processing.org/bugs/show_bug.cgi?id=403
+      } catch (FileNotFoundException fnfe) {
+        // Java 1.5 likes to throw this when URL not available. (fix for 0119)
+        // http://dev.processing.org/bugs/show_bug.cgi?id=403
 
-    } catch (IOException e) {
-      // changed for 0117, shouldn't be throwing exception
-      e.printStackTrace();
-      //System.err.println("Error downloading from URL " + filename);
-      return null;
-      //throw new RuntimeException("Error downloading from URL " + filename);
+      } catch (IOException e) {
+        // changed for 0117, shouldn't be throwing exception
+        e.printStackTrace();
+        //System.err.println("Error downloading from URL " + filename);
+        return null;
+        //throw new RuntimeException("Error downloading from URL " + filename);
+      }
     }
 
     // Moved this earlier than the getResourceAsStream() checks, because

core/todo.txt

@@ -1,6 +1,12 @@
 0175 core (private) 
+X changed createInputRaw() to only bother checking URLs if :// present
+
 _ inconsistent anti-aliasing with OpenGL
 _   http://dev.processing.org/bugs/show_bug.cgi?id=1413
+_ modify PVector to include better methods for chaining operations
+_   http://dev.processing.org/bugs/show_bug.cgi?id=1415
+
+_ add java.io.Reader (and Writer?) to imports
 
 _ consider bringing back text/image using cache/names
 _   fonts might not be as bad