Browse Source

Tried fixing HelperUtility...

Thomas Buck 12 years ago
parent
commit
389809f437

+ 12
- 7
Cube Control/HelperUtility.java View File

@@ -80,15 +80,20 @@ public class HelperUtility {
80 80
 				}
81 81
 			}
82 82
 			Process p = Runtime.getRuntime().exec(helperName);
83
-			BufferedReader br = new BufferedReader(new InputStreamReader(p.getInputStream()));
83
+			BufferedReader br = new BufferedReader(new InputStreamReader(p.getInputStream()), 256);
84 84
 			String line;
85
-			boolean fin = false;
86
-
87
-			while ((line = br.readLine()) != null) {
88
-				ret = ret + line + "\n";
89
-			}
85
+			boolean fin;
90 86
 			
91
-			p.waitFor();
87
+			do {
88
+				fin = true;
89
+				try {
90
+					System.out.println("Returned " + p.waitFor());
91
+				} catch(InterruptedException e) {
92
+					// repeat
93
+					System.out.println("We got interrupted...");
94
+					fin = false;
95
+				}
96
+			} while (fin != true);
92 97
 
93 98
 			while ((line = br.readLine()) != null) {
94 99
 				ret = ret + line + "\n";

+ 2
- 2
Cube Control/doc/AFrame.html View File

@@ -2,12 +2,12 @@
2 2
 <!--NewPage-->
3 3
 <HTML>
4 4
 <HEAD>
5
-<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 21:22:38 CET 2011 -->
5
+<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 16:46:18 CET 2011 -->
6 6
 <TITLE>
7 7
 AFrame
8 8
 </TITLE>
9 9
 
10
-<META NAME="date" CONTENT="2011-12-05">
10
+<META NAME="date" CONTENT="2011-12-06">
11 11
 
12 12
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
13 13
 

+ 2
- 2
Cube Control/doc/Animation.html View File

@@ -2,12 +2,12 @@
2 2
 <!--NewPage-->
3 3
 <HTML>
4 4
 <HEAD>
5
-<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 21:22:38 CET 2011 -->
5
+<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 16:46:18 CET 2011 -->
6 6
 <TITLE>
7 7
 Animation
8 8
 </TITLE>
9 9
 
10
-<META NAME="date" CONTENT="2011-12-05">
10
+<META NAME="date" CONTENT="2011-12-06">
11 11
 
12 12
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
13 13
 

+ 2
- 2
Cube Control/doc/AnimationUtility.html View File

@@ -2,12 +2,12 @@
2 2
 <!--NewPage-->
3 3
 <HTML>
4 4
 <HEAD>
5
-<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 21:22:39 CET 2011 -->
5
+<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 16:46:18 CET 2011 -->
6 6
 <TITLE>
7 7
 AnimationUtility
8 8
 </TITLE>
9 9
 
10
-<META NAME="date" CONTENT="2011-12-05">
10
+<META NAME="date" CONTENT="2011-12-06">
11 11
 
12 12
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
13 13
 

+ 2
- 2
Cube Control/doc/HelperUtility.html View File

@@ -2,12 +2,12 @@
2 2
 <!--NewPage-->
3 3
 <HTML>
4 4
 <HEAD>
5
-<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 21:22:40 CET 2011 -->
5
+<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 16:46:19 CET 2011 -->
6 6
 <TITLE>
7 7
 HelperUtility
8 8
 </TITLE>
9 9
 
10
-<META NAME="date" CONTENT="2011-12-05">
10
+<META NAME="date" CONTENT="2011-12-06">
11 11
 
12 12
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
13 13
 

+ 2
- 2
Cube Control/doc/Led3D.html View File

@@ -2,12 +2,12 @@
2 2
 <!--NewPage-->
3 3
 <HTML>
4 4
 <HEAD>
5
-<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 21:22:40 CET 2011 -->
5
+<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 16:46:20 CET 2011 -->
6 6
 <TITLE>
7 7
 Led3D
8 8
 </TITLE>
9 9
 
10
-<META NAME="date" CONTENT="2011-12-05">
10
+<META NAME="date" CONTENT="2011-12-06">
11 11
 
12 12
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
13 13
 

+ 2
- 2
Cube Control/doc/allclasses-frame.html View File

@@ -2,12 +2,12 @@
2 2
 <!--NewPage-->
3 3
 <HTML>
4 4
 <HEAD>
5
-<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 21:22:40 CET 2011 -->
5
+<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 16:46:20 CET 2011 -->
6 6
 <TITLE>
7 7
 All Classes
8 8
 </TITLE>
9 9
 
10
-<META NAME="date" CONTENT="2011-12-05">
10
+<META NAME="date" CONTENT="2011-12-06">
11 11
 
12 12
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
13 13
 

+ 2
- 2
Cube Control/doc/allclasses-noframe.html View File

@@ -2,12 +2,12 @@
2 2
 <!--NewPage-->
3 3
 <HTML>
4 4
 <HEAD>
5
-<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 21:22:40 CET 2011 -->
5
+<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 16:46:20 CET 2011 -->
6 6
 <TITLE>
7 7
 All Classes
8 8
 </TITLE>
9 9
 
10
-<META NAME="date" CONTENT="2011-12-05">
10
+<META NAME="date" CONTENT="2011-12-06">
11 11
 
12 12
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
13 13
 

+ 2
- 2
Cube Control/doc/constant-values.html View File

@@ -2,12 +2,12 @@
2 2
 <!--NewPage-->
3 3
 <HTML>
4 4
 <HEAD>
5
-<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 21:22:40 CET 2011 -->
5
+<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 16:46:20 CET 2011 -->
6 6
 <TITLE>
7 7
 Constant Field Values
8 8
 </TITLE>
9 9
 
10
-<META NAME="date" CONTENT="2011-12-05">
10
+<META NAME="date" CONTENT="2011-12-06">
11 11
 
12 12
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
13 13
 

+ 2
- 2
Cube Control/doc/cubeWorker.html View File

@@ -2,12 +2,12 @@
2 2
 <!--NewPage-->
3 3
 <HTML>
4 4
 <HEAD>
5
-<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 21:22:39 CET 2011 -->
5
+<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 16:46:18 CET 2011 -->
6 6
 <TITLE>
7 7
 cubeWorker
8 8
 </TITLE>
9 9
 
10
-<META NAME="date" CONTENT="2011-12-05">
10
+<META NAME="date" CONTENT="2011-12-06">
11 11
 
12 12
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
13 13
 

+ 2
- 2
Cube Control/doc/deprecated-list.html View File

@@ -2,12 +2,12 @@
2 2
 <!--NewPage-->
3 3
 <HTML>
4 4
 <HEAD>
5
-<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 21:22:40 CET 2011 -->
5
+<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 16:46:20 CET 2011 -->
6 6
 <TITLE>
7 7
 Deprecated List
8 8
 </TITLE>
9 9
 
10
-<META NAME="date" CONTENT="2011-12-05">
10
+<META NAME="date" CONTENT="2011-12-06">
11 11
 
12 12
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
13 13
 

+ 2
- 2
Cube Control/doc/frame.html View File

@@ -2,12 +2,12 @@
2 2
 <!--NewPage-->
3 3
 <HTML>
4 4
 <HEAD>
5
-<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 21:22:39 CET 2011 -->
5
+<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 16:46:18 CET 2011 -->
6 6
 <TITLE>
7 7
 Frame
8 8
 </TITLE>
9 9
 
10
-<META NAME="date" CONTENT="2011-12-05">
10
+<META NAME="date" CONTENT="2011-12-06">
11 11
 
12 12
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
13 13
 

+ 2
- 2
Cube Control/doc/help-doc.html View File

@@ -2,12 +2,12 @@
2 2
 <!--NewPage-->
3 3
 <HTML>
4 4
 <HEAD>
5
-<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 21:22:40 CET 2011 -->
5
+<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 16:46:20 CET 2011 -->
6 6
 <TITLE>
7 7
 API Help
8 8
 </TITLE>
9 9
 
10
-<META NAME="date" CONTENT="2011-12-05">
10
+<META NAME="date" CONTENT="2011-12-06">
11 11
 
12 12
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
13 13
 

+ 2
- 2
Cube Control/doc/index-all.html View File

@@ -2,12 +2,12 @@
2 2
 <!--NewPage-->
3 3
 <HTML>
4 4
 <HEAD>
5
-<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 21:22:40 CET 2011 -->
5
+<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 16:46:20 CET 2011 -->
6 6
 <TITLE>
7 7
 Index
8 8
 </TITLE>
9 9
 
10
-<META NAME="date" CONTENT="2011-12-05">
10
+<META NAME="date" CONTENT="2011-12-06">
11 11
 
12 12
 <LINK REL ="stylesheet" TYPE="text/css" HREF="./stylesheet.css" TITLE="Style">
13 13
 

+ 1
- 1
Cube Control/doc/index.html View File

@@ -2,7 +2,7 @@
2 2
 <!--NewPage-->
3 3
 <HTML>
4 4
 <HEAD>
5
-<!-- Generated by javadoc on Mon Dec 05 21:22:40 CET 2011-->
5
+<!-- Generated by javadoc on Tue Dec 06 16:46:20 CET 2011-->
6 6
 <TITLE>
7 7
 Generated Documentation (Untitled)
8 8
 </TITLE>

+ 2
- 2
Cube Control/doc/layerEditFrame.html View File

@@ -2,12 +2,12 @@
2 2
 <!--NewPage-->
3 3
 <HTML>
4 4
 <HEAD>
5
-<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 21:22:40 CET 2011 -->
5
+<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 16:46:20 CET 2011 -->
6 6
 <TITLE>
7 7
 layerEditFrame
8 8
 </TITLE>
9 9
 
10
-<META NAME="date" CONTENT="2011-12-05">
10
+<META NAME="date" CONTENT="2011-12-06">
11 11
 
12 12
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
13 13
 

+ 2
- 2
Cube Control/doc/overview-tree.html View File

@@ -2,12 +2,12 @@
2 2
 <!--NewPage-->
3 3
 <HTML>
4 4
 <HEAD>
5
-<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 21:22:40 CET 2011 -->
5
+<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 16:46:20 CET 2011 -->
6 6
 <TITLE>
7 7
 Class Hierarchy
8 8
 </TITLE>
9 9
 
10
-<META NAME="date" CONTENT="2011-12-05">
10
+<META NAME="date" CONTENT="2011-12-06">
11 11
 
12 12
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
13 13
 

+ 2
- 2
Cube Control/doc/package-frame.html View File

@@ -2,12 +2,12 @@
2 2
 <!--NewPage-->
3 3
 <HTML>
4 4
 <HEAD>
5
-<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 21:22:40 CET 2011 -->
5
+<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 16:46:20 CET 2011 -->
6 6
 <TITLE>
7 7
 &lt;Unnamed&gt;
8 8
 </TITLE>
9 9
 
10
-<META NAME="date" CONTENT="2011-12-05">
10
+<META NAME="date" CONTENT="2011-12-06">
11 11
 
12 12
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
13 13
 

+ 2
- 2
Cube Control/doc/package-summary.html View File

@@ -2,12 +2,12 @@
2 2
 <!--NewPage-->
3 3
 <HTML>
4 4
 <HEAD>
5
-<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 21:22:40 CET 2011 -->
5
+<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 16:46:20 CET 2011 -->
6 6
 <TITLE>
7 7
 
8 8
 </TITLE>
9 9
 
10
-<META NAME="date" CONTENT="2011-12-05">
10
+<META NAME="date" CONTENT="2011-12-06">
11 11
 
12 12
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
13 13
 

+ 2
- 2
Cube Control/doc/package-tree.html View File

@@ -2,12 +2,12 @@
2 2
 <!--NewPage-->
3 3
 <HTML>
4 4
 <HEAD>
5
-<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 21:22:40 CET 2011 -->
5
+<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 16:46:20 CET 2011 -->
6 6
 <TITLE>
7 7
  Class Hierarchy
8 8
 </TITLE>
9 9
 
10
-<META NAME="date" CONTENT="2011-12-05">
10
+<META NAME="date" CONTENT="2011-12-06">
11 11
 
12 12
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
13 13
 

+ 2
- 2
Cube Control/doc/serialized-form.html View File

@@ -2,12 +2,12 @@
2 2
 <!--NewPage-->
3 3
 <HTML>
4 4
 <HEAD>
5
-<!-- Generated by javadoc (build 1.6.0_29) on Mon Dec 05 21:22:40 CET 2011 -->
5
+<!-- Generated by javadoc (build 1.6.0_29) on Tue Dec 06 16:46:20 CET 2011 -->
6 6
 <TITLE>
7 7
 Serialized Form
8 8
 </TITLE>
9 9
 
10
-<META NAME="date" CONTENT="2011-12-05">
10
+<META NAME="date" CONTENT="2011-12-06">
11 11
 
12 12
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
13 13
 

+ 2
- 0
Cube Control/serialHelper.c View File

@@ -122,6 +122,8 @@ int main(int argc, char *argv[]) {
122 122
 
123 123
 		} else {
124 124
 			printf("Unrecognized Option: %s\n", argv[1]);
125
+			usage(argv[0]);
126
+			return 1;
125 127
 		}
126 128
 
127 129
 		free(fileData);

Loading…
Cancel
Save