Merge remote-tracking branch 'arduino/master' into ide-1.5.x

Conflicts:
	.gitignore
	app/lib/commons-logging-1.0.4.jar
	build/build.xml
	build/windows/launcher/config_debug.xml
	libraries/Esplora/examples/Beginners/EsploraJoystickMouse/EsploraJoystickMouse.ino

Author: cmaglie

.gitignore

@@ -32,7 +32,7 @@ build/linux/libastylej*
 test-bin
 *.iml
 .idea
-
-hardware/arduino/avr/libraries/Bridge/examples/XivelyClient/passwords.h
 .DS_Store
-
+build/windows/launch4j-*
+build/windows/launcher/launch4j
+build/windows/WinAVR-*.zip

app/src/processing/app/Sketch.java

@@ -2066,9 +2066,10 @@ static public String sanitizeName(String origName) {
     for (int i = 0; i < c.length; i++) {
       if (((c[i] >= '0') && (c[i] <= '9')) ||
           ((c[i] >= 'a') && (c[i] <= 'z')) ||
-          ((c[i] >= 'A') && (c[i] <= 'Z'))) {
+          ((c[i] >= 'A') && (c[i] <= 'Z')) ||
+          ((i > 0) && (c[i] == '-')) ||
+          ((i > 0) && (c[i] == '.'))) {
         buffer.append(c[i]);
-
       } else {
         buffer.append('_');
       }

app/src/processing/app/SketchCode.java

@@ -87,7 +87,7 @@ public SketchCode(File file, String extension) {
 
   protected void makePrettyName() {
     prettyName = file.getName();
-    int dot = prettyName.indexOf('.');
+    int dot = prettyName.lastIndexOf('.');
     prettyName = prettyName.substring(0, dot);
   }
 

build/build.xml

@@ -37,6 +37,9 @@
     <equals arg1="${platform}" arg2="linux64"/>
   </condition>
 
+  <condition property="launch4j-download-unpack-target-name" value="launch4j-windows"><os family="windows" /></condition>
+  <property name="launch4j-download-unpack-target-name" value="launch4j-linux"/>
+
   <!-- Libraries required for running arduino -->
   <fileset dir=".." id="runtime.jars">
     <include name="core/core.jar" />
@@ -655,6 +658,7 @@
 
   <target name="windows-build"
 	  depends="revision-check, windows-checkos, subprojects-build"
+	  depends="revision-check, windows-checkos, subprojects-build" 
 	  description="Build windows version">
     <mkdir dir="windows/work" />
 

libraries/Esplora/examples/Beginners/EsploraJoystickMouse/EsploraJoystickMouse.ino

@@ -17,6 +17,10 @@
 
  Created on 22 Dec 2012
  by Tom Igoe
+ Updated 8 March 2014
+ by Scott Fitzgerald
+ 
+ http://arduino.cc/en/Reference/EsploraReadJoystickSwitch
 
  This example is in the public domain.
  */
@@ -41,10 +45,16 @@ void loop()
   Serial.print("\tButton: ");                  // print a tab character and a label for the button
   Serial.print(button);                        // print the button value
 
-  int mouseX = map( xValue, -512, 512, 10, -10); // map the X value to a range of movement for the mouse X
-  int mouseY = map( yValue, -512, 512, -10, 10); // map the Y value to a range of movement for the mouse Y
+  int mouseX = map(xValue, -512, 512, 10, -10);  // map the X value to a range of movement for the mouse X
+  int mouseY = map(yValue, -512, 512, -10, 10);  // map the Y value to a range of movement for the mouse Y
   Mouse.move(mouseX, mouseY, 0);                 // move the mouse
 
+  if (button == 0) {                           // if the joystick button is pressed
+    Mouse.press();                             // send a mouse click
+  } else {
+    Mouse.release();                           // if it's not pressed, release the mouse button 
+  }
+
   delay(10);                                  // a short delay before moving again
 }