example issues

rpoisel · rpoisel · commit 871bf24b9def · 2013-09-27T15:31:38.000Z
diff --git a/.project b/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>Baseprogram</name>
+	<name>BaseProgram</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/examples/BaseProgram/ReadData b/examples/BaseProgram/ReadData
@@ -0,0 +1,3 @@
+import base.Baseprogram;
+
+println("Integer: " + Baseprogram.readInt());
diff --git a/examples/Hello/Hello.pde b/examples/Hello/Hello.pde
diff --git a/examples/README b/examples/README
diff --git a/resources/build.properties b/resources/build.properties
@@ -72,7 +72,7 @@ ant.description=ProcessingLibs Ant build file.
 # Project details.
 # Give your library a name. The name must not contain spaces or special characters.
 
-project.name=Baseprogram
+project.name=BaseProgram
 
 # The name as the user will see it. This can contain spaces and special characters.
 
diff --git a/src/base/BaseProgram.java b/src/base/BaseProgram.java
@@ -42,18 +42,27 @@
  * 
  */
 
-public class Baseprogram
+public class BaseProgram
 {
 
 	public final static String VERSION = "##library.prettyVersion##";
 
+	/**
+	 * Open a dialog so that the user can enter an integer value
+	 * 
+	 * @return -1 in case of error, the entered number otherwise
+	 */
 	public static int readInt()
 	{
 		while (true)
 		{
 			try
 			{
-				String lInput = JOptionPane.showInputDialog("Bla");
+				String lInput = JOptionPane.showInputDialog("Please enter a number");
+				if (lInput == null)
+				{
+					return -1;
+				}
 				return Integer.parseInt(lInput);
 			}
 			catch (NumberFormatException pExc)

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+import base.Baseprogram;`
	`2`	`+`
	`3`	`+println("Integer: " + Baseprogram.readInt());`
Original file line number	Diff line number	Diff line change
`@@ -42,18 +42,27 @@`
`42`	`42`	`*`
`43`	`43`	`*/`
`44`	`44`
`45`		`-public class Baseprogram`
	`45`	`+public class BaseProgram`
`46`	`46`	`{`
`47`	`47`
`48`	`48`	`public final static String VERSION = "##library.prettyVersion##";`
`49`	`49`
	`50`	`+ /**`
	`51`	`+ * Open a dialog so that the user can enter an integer value`
	`52`	`+ *`
	`53`	`+ * @return -1 in case of error, the entered number otherwise`
	`54`	`+ */`
`50`	`55`	`public static int readInt()`
`51`	`56`	`{`
`52`	`57`	`while (true)`
`53`	`58`	`{`
`54`	`59`	`try`
`55`	`60`	`{`
`56`		`- String lInput = JOptionPane.showInputDialog("Bla");`
	`61`	`+ String lInput = JOptionPane.showInputDialog("Please enter a number");`
	`62`	`+ if (lInput == null)`
	`63`	`+ {`
	`64`	`+ return -1;`
	`65`	`+ }`
`57`	`66`	`return Integer.parseInt(lInput);`
`58`	`67`	`}`
`59`	`68`	`catch (NumberFormatException pExc)`