thomas
/
LED-Cube
關注 1
收藏 0
複製 0
程式碼 問題 0 合併請求 0 版本發佈 0 Wiki 活動
瀏覽代碼

Tried fixing HelperUtility...

Thomas Buck 12 年之前
父節點
f58bf4fafb
當前提交
389809f437
共有 22 個檔案被更改，包括 53 行新增 和 46 行删除
統一視圖 顯示文件統計
  1. 12
    7
      Cube Control/HelperUtility.java
  2. 2
    2
      Cube Control/doc/AFrame.html
  3. 2
    2
      Cube Control/doc/Animation.html
  4. 2
    2
      Cube Control/doc/AnimationUtility.html
  5. 2
    2
      Cube Control/doc/HelperUtility.html
  6. 2
    2
      Cube Control/doc/Led3D.html
  7. 2
    2
      Cube Control/doc/allclasses-frame.html
  8. 2
    2
      Cube Control/doc/allclasses-noframe.html
  9. 2
    2
      Cube Control/doc/constant-values.html
  10. 2
    2
      Cube Control/doc/cubeWorker.html
  11. 2
    2
      Cube Control/doc/deprecated-list.html
  12. 2
    2
      Cube Control/doc/frame.html
  13. 2
    2
      Cube Control/doc/help-doc.html
  14. 2
    2
      Cube Control/doc/index-all.html
  15. 1
    1
      Cube Control/doc/index.html
  16. 2
    2
      Cube Control/doc/layerEditFrame.html
  17. 2
    2
      Cube Control/doc/overview-tree.html
  18. 2
    2
      Cube Control/doc/package-frame.html
  19. 2
    2
      Cube Control/doc/package-summary.html
  20. 2
    2
      Cube Control/doc/package-tree.html
  21. 2
    2
      Cube Control/doc/serialized-form.html
  22. 2
    0
      Cube Control/serialHelper.c

+ 12
- 7
Cube Control/HelperUtility.java 查看文件

80 
 				}
 80 
 				}
81 
 			}
 81 
 			}
82 
 			Process p = Runtime.getRuntime().exec(helperName);
 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 
 			String line;
 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 
 			while ((line = br.readLine()) != null) {
 98 
 			while ((line = br.readLine()) != null) {
94 
 				ret = ret + line + "\n";
 99 
 				ret = ret + line + "\n";

+ 2
- 2
Cube Control/doc/AFrame.html 查看文件

2 
 <!--NewPage-->
 2 
 <!--NewPage-->
3 
 <HTML>
 3 
 <HTML>
4 
 <HEAD>
 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 
 <TITLE>
 6 
 <TITLE>
7 
 AFrame
 7 
 AFrame
8 
 </TITLE>
 8 
 </TITLE>
9
9
10 
-<META NAME="date" CONTENT="2011-12-05">
10 
+<META NAME="date" CONTENT="2011-12-06">
11
11
12 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 12 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
13
13

+ 2
- 2
Cube Control/doc/Animation.html 查看文件

2 
 <!--NewPage-->
 2 
 <!--NewPage-->
3 
 <HTML>
 3 
 <HTML>
4 
 <HEAD>
 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 
 <TITLE>
 6 
 <TITLE>
7 
 Animation
 7 
 Animation
8 
 </TITLE>
 8 
 </TITLE>
9
9
10 
-<META NAME="date" CONTENT="2011-12-05">
10 
+<META NAME="date" CONTENT="2011-12-06">
11
11
12 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 12 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
13
13

+ 2
- 2
Cube Control/doc/AnimationUtility.html 查看文件

2 
 <!--NewPage-->
 2 
 <!--NewPage-->
3 
 <HTML>
 3 
 <HTML>
4 
 <HEAD>
 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 
 <TITLE>
 6 
 <TITLE>
7 
 AnimationUtility
 7 
 AnimationUtility
8 
 </TITLE>
 8 
 </TITLE>
9
9
10 
-<META NAME="date" CONTENT="2011-12-05">
10 
+<META NAME="date" CONTENT="2011-12-06">
11
11
12 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 12 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
13
13

+ 2
- 2
Cube Control/doc/HelperUtility.html 查看文件

2 
 <!--NewPage-->
 2 
 <!--NewPage-->
3 
 <HTML>
 3 
 <HTML>
4 
 <HEAD>
 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 
 <TITLE>
 6 
 <TITLE>
7 
 HelperUtility
 7 
 HelperUtility
8 
 </TITLE>
 8 
 </TITLE>
9
9
10 
-<META NAME="date" CONTENT="2011-12-05">
10 
+<META NAME="date" CONTENT="2011-12-06">
11
11
12 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 12 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
13
13

+ 2
- 2
Cube Control/doc/Led3D.html 查看文件

2 
 <!--NewPage-->
 2 
 <!--NewPage-->
3 
 <HTML>
 3 
 <HTML>
4 
 <HEAD>
 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 
 <TITLE>
 6 
 <TITLE>
7 
 Led3D
 7 
 Led3D
8 
 </TITLE>
 8 
 </TITLE>
9
9
10 
-<META NAME="date" CONTENT="2011-12-05">
10 
+<META NAME="date" CONTENT="2011-12-06">
11
11
12 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 12 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
13
13

+ 2
- 2
Cube Control/doc/allclasses-frame.html 查看文件

2 
 <!--NewPage-->
 2 
 <!--NewPage-->
3 
 <HTML>
 3 
 <HTML>
4 
 <HEAD>
 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 
 <TITLE>
 6 
 <TITLE>
7 
 All Classes
 7 
 All Classes
8 
 </TITLE>
 8 
 </TITLE>
9
9
10 
-<META NAME="date" CONTENT="2011-12-05">
10 
+<META NAME="date" CONTENT="2011-12-06">
11
11
12 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 12 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
13
13

+ 2
- 2
Cube Control/doc/allclasses-noframe.html 查看文件

2 
 <!--NewPage-->
 2 
 <!--NewPage-->
3 
 <HTML>
 3 
 <HTML>
4 
 <HEAD>
 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 
 <TITLE>
 6 
 <TITLE>
7 
 All Classes
 7 
 All Classes
8 
 </TITLE>
 8 
 </TITLE>
9
9
10 
-<META NAME="date" CONTENT="2011-12-05">
10 
+<META NAME="date" CONTENT="2011-12-06">
11
11
12 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 12 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
13
13

+ 2
- 2
Cube Control/doc/constant-values.html 查看文件

2 
 <!--NewPage-->
 2 
 <!--NewPage-->
3 
 <HTML>
 3 
 <HTML>
4 
 <HEAD>
 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 
 <TITLE>
 6 
 <TITLE>
7 
 Constant Field Values
 7 
 Constant Field Values
8 
 </TITLE>
 8 
 </TITLE>
9
9
10 
-<META NAME="date" CONTENT="2011-12-05">
10 
+<META NAME="date" CONTENT="2011-12-06">
11
11
12 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 12 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
13
13

+ 2
- 2
Cube Control/doc/cubeWorker.html 查看文件

2 
 <!--NewPage-->
 2 
 <!--NewPage-->
3 
 <HTML>
 3 
 <HTML>
4 
 <HEAD>
 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 
 <TITLE>
 6 
 <TITLE>
7 
 cubeWorker
 7 
 cubeWorker
8 
 </TITLE>
 8 
 </TITLE>
9
9
10 
-<META NAME="date" CONTENT="2011-12-05">
10 
+<META NAME="date" CONTENT="2011-12-06">
11
11
12 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 12 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
13
13

+ 2
- 2
Cube Control/doc/deprecated-list.html 查看文件

2 
 <!--NewPage-->
 2 
 <!--NewPage-->
3 
 <HTML>
 3 
 <HTML>
4 
 <HEAD>
 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 
 <TITLE>
 6 
 <TITLE>
7 
 Deprecated List
 7 
 Deprecated List
8 
 </TITLE>
 8 
 </TITLE>
9
9
10 
-<META NAME="date" CONTENT="2011-12-05">
10 
+<META NAME="date" CONTENT="2011-12-06">
11
11
12 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 12 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
13
13

+ 2
- 2
Cube Control/doc/frame.html 查看文件

2 
 <!--NewPage-->
 2 
 <!--NewPage-->
3 
 <HTML>
 3 
 <HTML>
4 
 <HEAD>
 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 
 <TITLE>
 6 
 <TITLE>
7 
 Frame
 7 
 Frame
8 
 </TITLE>
 8 
 </TITLE>
9
9
10 
-<META NAME="date" CONTENT="2011-12-05">
10 
+<META NAME="date" CONTENT="2011-12-06">
11
11
12 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 12 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
13
13

+ 2
- 2
Cube Control/doc/help-doc.html 查看文件

2 
 <!--NewPage-->
 2 
 <!--NewPage-->
3 
 <HTML>
 3 
 <HTML>
4 
 <HEAD>
 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 
 <TITLE>
 6 
 <TITLE>
7 
 API Help
 7 
 API Help
8 
 </TITLE>
 8 
 </TITLE>
9
9
10 
-<META NAME="date" CONTENT="2011-12-05">
10 
+<META NAME="date" CONTENT="2011-12-06">
11
11
12 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 12 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
13
13

+ 2
- 2
Cube Control/doc/index-all.html 查看文件

2 
 <!--NewPage-->
 2 
 <!--NewPage-->
3 
 <HTML>
 3 
 <HTML>
4 
 <HEAD>
 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 
 <TITLE>
 6 
 <TITLE>
7 
 Index
 7 
 Index
8 
 </TITLE>
 8 
 </TITLE>
9
9
10 
-<META NAME="date" CONTENT="2011-12-05">
10 
+<META NAME="date" CONTENT="2011-12-06">
11
11
12 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="./stylesheet.css" TITLE="Style">
 12 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="./stylesheet.css" TITLE="Style">
13
13

+ 1
- 1
Cube Control/doc/index.html 查看文件

2 
 <!--NewPage-->
 2 
 <!--NewPage-->
3 
 <HTML>
 3 
 <HTML>
4 
 <HEAD>
 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 
 <TITLE>
 6 
 <TITLE>
7 
 Generated Documentation (Untitled)
 7 
 Generated Documentation (Untitled)
8 
 </TITLE>
 8 
 </TITLE>

+ 2
- 2
Cube Control/doc/layerEditFrame.html 查看文件

2 
 <!--NewPage-->
 2 
 <!--NewPage-->
3 
 <HTML>
 3 
 <HTML>
4 
 <HEAD>
 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 
 <TITLE>
 6 
 <TITLE>
7 
 layerEditFrame
 7 
 layerEditFrame
8 
 </TITLE>
 8 
 </TITLE>
9
9
10 
-<META NAME="date" CONTENT="2011-12-05">
10 
+<META NAME="date" CONTENT="2011-12-06">
11
11
12 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 12 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
13
13

+ 2
- 2
Cube Control/doc/overview-tree.html 查看文件

2 
 <!--NewPage-->
 2 
 <!--NewPage-->
3 
 <HTML>
 3 
 <HTML>
4 
 <HEAD>
 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 
 <TITLE>
 6 
 <TITLE>
7 
 Class Hierarchy
 7 
 Class Hierarchy
8 
 </TITLE>
 8 
 </TITLE>
9
9
10 
-<META NAME="date" CONTENT="2011-12-05">
10 
+<META NAME="date" CONTENT="2011-12-06">
11
11
12 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 12 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
13
13

+ 2
- 2
Cube Control/doc/package-frame.html 查看文件

2 
 <!--NewPage-->
 2 
 <!--NewPage-->
3 
 <HTML>
 3 
 <HTML>
4 
 <HEAD>
 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 
 <TITLE>
 6 
 <TITLE>
7 
 &lt;Unnamed&gt;
 7 
 &lt;Unnamed&gt;
8 
 </TITLE>
 8 
 </TITLE>
9
9
10 
-<META NAME="date" CONTENT="2011-12-05">
10 
+<META NAME="date" CONTENT="2011-12-06">
11
11
12 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 12 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
13
13

+ 2
- 2
Cube Control/doc/package-summary.html 查看文件

2 
 <!--NewPage-->
 2 
 <!--NewPage-->
3 
 <HTML>
 3 
 <HTML>
4 
 <HEAD>
 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 
 <TITLE>
 6 
 <TITLE>
7
7
8 
 </TITLE>
 8 
 </TITLE>
9
9
10 
-<META NAME="date" CONTENT="2011-12-05">
10 
+<META NAME="date" CONTENT="2011-12-06">
11
11
12 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 12 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
13
13

+ 2
- 2
Cube Control/doc/package-tree.html 查看文件

2 
 <!--NewPage-->
 2 
 <!--NewPage-->
3 
 <HTML>
 3 
 <HTML>
4 
 <HEAD>
 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 
 <TITLE>
 6 
 <TITLE>
7 
  Class Hierarchy
 7 
  Class Hierarchy
8 
 </TITLE>
 8 
 </TITLE>
9
9
10 
-<META NAME="date" CONTENT="2011-12-05">
10 
+<META NAME="date" CONTENT="2011-12-06">
11
11
12 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 12 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
13
13

+ 2
- 2
Cube Control/doc/serialized-form.html 查看文件

2 
 <!--NewPage-->
 2 
 <!--NewPage-->
3 
 <HTML>
 3 
 <HTML>
4 
 <HEAD>
 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 
 <TITLE>
 6 
 <TITLE>
7 
 Serialized Form
 7 
 Serialized Form
8 
 </TITLE>
 8 
 </TITLE>
9
9
10 
-<META NAME="date" CONTENT="2011-12-05">
10 
+<META NAME="date" CONTENT="2011-12-06">
11
11
12 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 12 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
13
13

+ 2
- 0
Cube Control/serialHelper.c 查看文件

122
122
123 
 		} else {
 123 
 		} else {
124 
 			printf("Unrecognized Option: %s\n", argv[1]);
 124 
 			printf("Unrecognized Option: %s\n", argv[1]);
125 
+			usage(argv[0]);
126 
+			return 1;
125 
 		}
 127 
 		}
126
128
127 
 		free(fileData);
 129 
 		free(fileData);

Write Preview
Loading…
取消
儲存