Changeset 722

Timestamp:

01/20/14 14:47:39 (10 years ago)

Author:

jts21

Message:

Change tutorial in response to user feedback (now deletion is explained earlier, and explain how to pickup items and place them back down

Location:

trunk/src/org/expeditee

Files:

• actions/Javascript2.java (modified) (3 diffs)
• actions/Misc.java (modified) (1 diff)
• assets/resources/framesets/javascript/1.exp (modified) (3 diffs)
• assets/resources/framesets/javascript/3.exp (added)
• assets/resources/framesets/javascript/4.exp (added)
• assets/resources/framesets/javascript/frame.inf (modified) (1 diff)
• assets/resources/framesets/tutorials/1.exp (modified) (9 diffs)
• assets/resources/framesets/tutorials/11.exp (modified) (2 diffs)
• assets/resources/framesets/tutorials/13.exp (modified) (5 diffs)
• assets/resources/framesets/tutorials/14.exp (modified) (10 diffs)
• assets/resources/framesets/tutorials/15.exp (modified) (8 diffs)
• assets/resources/framesets/tutorials/2.exp (modified) (3 diffs)
• assets/resources/framesets/tutorials/20.exp (added)
• assets/resources/framesets/tutorials/21.exp (added)
• assets/resources/framesets/tutorials/22.exp (added)
• assets/resources/framesets/tutorials/25.exp (added)
• assets/resources/framesets/tutorials/3.exp (modified) (6 diffs)
• assets/resources/framesets/tutorials/4.exp (modified) (3 diffs)
• assets/resources/framesets/tutorials/6.exp (modified) (6 diffs)
• assets/resources/framesets/tutorials/7.exp (modified) (8 diffs)
• assets/resources/framesets/tutorials/8.exp (modified) (6 diffs)
• assets/resources/framesets/tutorials/frame.inf (modified) (1 diff)
• gui/Frame.java (modified) (2 diffs)
• items/PermissionPair.java (modified) (1 diff)

trunk/src/org/expeditee/actions/Javascript2.java

@@ -157 +157 @@
                                 String text = ((Text)i).getText();
                                 int lineNumber = 0;
-                                for(String line : text.trim().split("[\\n|\\r]+")) {
+                                for(String line : text.trim().split("[\\n\\r]+")) {
                                         sb.append(line).append("\n");
                                         lines.add(new CodeLine((Text)i, lineNumber++, line));
@@ -194 +194 @@
                 errorFrame.addAllItems(ItemUtils.CopyItems(toAdd));
                 String errorItemText = cl.item.getText().trim();
-                String[] errorItemLines = errorItemText.split("[\\n|\\r]+");
+                String[] errorItemLines = errorItemText.split("[\\n\\r]+");
                 int errorLinePos = 0;
                 int x = cl.item.getX();
@@ -209 +209 @@
                 errorItem = errorFrame.addText(x, y, errorItemLines[cl.line], null);
                 errorItem.setBackgroundColor(Color.RED);
-                for(String line : message.split("[\\n|\\r]+")) {
+                for(String line : message.split("[\\n\\r]+")) {
                         errorItem.setTooltip("text: " + line);
                 }

trunk/src/org/expeditee/actions/Misc.java

@@ -1493 +1493 @@
                 }).start();
         }
+        
+        public static void getIDs(Frame f) {
+                for(Item i : f.getAllItems()) {
+                        System.out.println(i + " (" + i.getID() + ")");
+                }
+        }
 }

trunk/src/org/expeditee/assets/resources/framesets/javascript/1.exp

@@ -1 @@
-V 4
+V 11
 U jts21A
 D 20Jan2014[09:35]
 M jts21A
-d 20Jan2014[10:26]
-Z
+d 20Jan2014[11:57]
+Z
+
+S T 72
+s 20Jan2014[11:56.12]
+d 50 50 50 100
+P 638 64
+T @a:runJSFrame
+Q 0
+o jts21A
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+w 974
+h -1.0
 
 S T 3
@@ -35 +50 @@
 h -1.0
 
-S P 25
-s 20Jan2014[10:26.15]
-d 100 0 0 100
-P 869 136
-e 100 59 59 100
-Q 0
-o jts21A
-v S
-h 2.0
-l 37 35
+S P 56
+s 20Jan2014[10:26.15]
+d 100 0 0 100
+P 877 132
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 58 67
 c 21 24
 
-S P 36
-s 20Jan2014[10:26.15]
-d 100 0 0 100
-P 38 136
-e 100 59 59 100
-Q 0
-o jts21A
-v S
-h 2.0
-l 37 38
+S P 57
+s 20Jan2014[10:26.15]
+d 100 0 0 100
+P 46 132
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 58 59
 c 21 23
 
-S T 42
+S T 60
 s 20Jan2014[10:26.22]
-P 63 171
+P 71 167
 T __FUNCTIONS__ = true
 Q 0
@@ -73 +88 @@
 h -1.0
 
-S T 39
+S T 79
+s 20Jan2014[11:23.38]
+d 50 50 50 100
+P 71 197
+T @javaClassNames
+F 3
+X runJSFrame
+Q 0
+o jts21A
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+w 974
+h -1.0
+
+S T 78
 s 20Jan2014[09:31.15]
-P 74 212
+d 50 50 50 100
+P 71 227
 T @loadTutorialFrame
 F 2
-Q 0
-o jts21A
-v S
-f tr18
-t -1.0
-b 0.0
-m 0.0
-w 974
-h -1.0
-
-S P 27
-s 20Jan2014[10:26.15]
-d 100 0 0 100
-P 38 634
-e 100 59 59 100
-Q 0
-o jts21A
-v S
-h 2.0
-l 38 34
-c 22 23
-
-S P 33
-s 20Jan2014[10:26.15]
-d 100 0 0 100
-P 869 634
-e 100 59 59 100
-Q 0
-o jts21A
-v S
-h 2.0
-l 34 35
-c 22 24
-
-Z
-
-L 37 1
-s 25 36
-
-L 35 1
-s 33 25
-
-L 38 1
-s 36 27
-
-L 34 1
-s 27 33
+X runJSFrame
+Q 0
+o jts21A
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+w 974
+h -1.0
+
+S T 64
+s 20Jan2014[11:51.12]
+d 50 50 50 100
+P 71 257
+T @setCompleted
+F 4
+X runJSFrame
+Q 0
+o jts21A
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+w 974
+h -1.0
+
+S P 65
+s 20Jan2014[10:26.15]
+d 100 0 0 100
+P 46 630
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 59 68
+c 23 22
+
+S P 66
+s 20Jan2014[10:26.15]
+d 100 0 0 100
+P 877 630
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 67 68
+c 24 22
+
+Z
+
+L 58 1
+s 56 57
+
+L 67 1
+s 66 56
+
+L 59 1
+s 57 65
+
+L 68 1
+s 65 66
 
 Z
 
 C 21 3
-s 25 36
+s 56 57
 
 C 24 2
-s 33 25
+s 66 56
 
 C 23 2
-s 36 27
+s 57 65
 
 C 22 3
-s 27 33
-
-Z
-
-ActiveTime:00:00:34
+s 65 66
+
+Z
+
+ActiveTime:00:02:11
 DarkTime:00:00:00
-26:02:635 101 130 Md
-26:02:742 118 151 Mu
-26:02:978 163 227 Md
-26:03:074 163 227 Mu
-26:04:200 38 120 kI
-26:04:240 44 120 kF
-26:04:432 51 120 kSpace
-26:04:968 56 120 kBackspace
-26:05:088 51 120 kShift
-26:05:232 51 120 k9
-26:05:512 56 120 kT
-26:05:568 64 120 kY
-26:05:728 73 120 kP
-26:05:784 85 120 kE
-26:05:912 95 120 kO
-26:05:992 105 120 kF
-26:06:088 113 120 kSpace
-26:06:616 118 120 kShift
-26:06:808 118 120 kMinus
-26:06:936 127 120 kMinus
-26:07:736 136 120 kF
-26:07:848 146 120 kU
-26:08:008 159 120 kN
-26:08:056 172 120 kC
-26:08:312 185 120 kT
-26:08:456 197 120 kI
-26:08:504 203 120 kO
-26:08:656 217 120 kN
-26:08:728 230 120 kS
-26:09:504 240 120 kMinus
-26:09:624 249 120 kMinus
-26:10:632 258 120 kSpace
-26:11:176 264 120 kEquals
-26:11:288 278 120 kEquals
-26:11:368 292 120 kSpace
-26:11:576 298 120 kQuote
-26:12:008 302 120 kU
-26:12:152 313 120 kN
-26:12:224 325 120 kD
-26:12:368 336 120 kE
-26:12:512 346 120 kF
-26:12:664 353 120 kI
-26:12:760 359 120 kN
-26:12:840 370 120 kE
-26:13:000 379 120 kD
-26:13:296 391 120 kQuote
-26:13:600 395 120 kShift
-26:13:856 395 120 k0
-26:15:514 39 135 Rd
-26:15:619 80 160 Ru
-26:16:611 869 634 Md
-26:16:698 869 634 Mu
-26:17:635 77 160 Md
-26:17:714 77 160 Mu
-26:19:484 38 136 Md
-26:19:554 38 136 Mu
-26:20:139 139 206 Md
-26:20:223 135 208 Mu
-26:20:691 91 203 Md
-26:20:778 91 203 Mu
-26:22:208 67 170 kShift
-26:22:688 63 171 kMinus
-26:22:824 72 171 kMinus
-26:23:232 81 171 kF
-26:23:376 91 171 kU
-26:23:544 104 171 kN
-26:23:616 117 171 kC
-26:23:832 130 171 kT
-26:23:936 142 171 kI
-26:24:000 148 171 kO
-26:24:128 162 171 kN
-26:24:216 175 171 kS
-26:24:384 185 171 kMinus
-26:24:520 194 171 kMinus
-26:24:864 203 171 kSpace
-26:25:088 208 171 kSpace
-26:25:456 214 171 kBackspace
-26:25:616 208 171 kEquals
-26:25:648 223 171 kSpace
-26:29:800 228 171 kT
-26:29:888 235 171 kR
-26:29:952 243 171 kU
-26:30:048 255 171 kE
-26:32:744 209 204 kCtrl
-26:32:955 209 204 Ld
-26:33:034 209 204 Lu
+57:11:936 134 254 Md
+57:12:045 134 254 Mu
+57:12:542 132 238 Md
+57:12:653 132 238 Mu
+57:12:894 490 265 Rd
+57:12:901 490 265 Ld
+57:13:902 189 256 Md
+57:14:011 186 252 Mu
+57:14:414 188 235 Md
+57:14:517 188 235 Mu
+57:14:814 170 213 Md
+57:14:907 168 208 Mu
+57:15:222 169 193 Md
+57:15:325 169 193 Mu
+57:15:606 488 219 Ld
+57:15:612 488 219 Rd
+57:19:822 464 106 Ld
+57:19:909 464 106 Lu

trunk/src/org/expeditee/assets/resources/framesets/javascript/frame.inf

@@ -1 @@
-Javascript2
+Javascript4

trunk/src/org/expeditee/assets/resources/framesets/tutorials/1.exp

@@ -1 @@
-V 30
-p 14
+V 51
+p 41
 U jts21A
 D 20Jan2014[09:27]
 M jts21A
-d 20Jan2014[11:10]
+d 20Jan2014[14:41]
 Z
 
@@ -22 +22 @@
 h -1.0
 
-S T 15
+S T 231
 s 20Jan2014[09:27.35]
-P 27 130
+P 30 126
 T 1. Links and actions
 F 2
@@ -37 +37 @@
 h -1.0
 
-S T 21
-s 20Jan2014[09:55.20]
-P 27 166
-T 2. Text
-F 4
+S T 241
+s 20Jan2014[10:29.32]
+P 30 169
+T 2. Deletion
+F 11
 Q 0
 o jts21A
@@ -55 +55 @@
 s 20Jan2014[11:09.57]
 d 0 0 100 100
-P 772 194
-e 100 100 100 100
-Q 0
-o jts21A
-v S
-h 2.0
-l 127 133
+P 941 194
+e 100 100 100 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 146 127
 c 119 122
 
@@ -76 +76 @@
 c 119 121
 
-S T 47
-s 20Jan2014[10:29.32]
-P 27 202
-T 3. Deletion
-F 11
+S T 228
+s 20Jan2014[09:55.20]
+P 30 212
+T 3. Text
+F 4
 Q 0
 o jts21A
@@ -93 +93 @@
 S T 136
 s 20Jan2014[11:09.59]
-d 0 70 0 100
 P 477 233
 T // TODO: Remove these
@@ -99 +98 @@
 o jts21A
 v S
-t -1.0
-b 0.0
-m 0.0
-h -1.0
-
-S T 28
-s 20Jan2014[09:55.35]
-P 506 318
-T x: 27
-Q 0
-o jts21A
-v S
-f tr18
-t -1.0
-b 0.0
-m 0.0
-w 974
-h -1.0
-
-S T 70
-s 20Jan2014[10:23.03]
-P 508 353
-T color: 
-Q 0
-o jts21A
-v S
-f tr18
-t -1.0
-b 0.0
-m 0.0
-w 974
-h -1.0
-
-S T 82
-s 20Jan2014[11:08.51]
-P 503 390
-T Permission: 1 4
-Q 0
-o jts21A
-v S
-f tr18
-t -1.0
-b 0.0
-m 0.0
-w 974
-h -1.0
+f tr18
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+
+S T 233
+s 20Jan2014[14:10.00]
+P 477 274
+T color:
+T tooltip:
+Q 0
+o jts21A
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+w 974
+h -1.0
+
+S T 211
+s 20Jan2014[11:42.15]
+d 0 70 0 100
+P 477 336
+T // use data field to detect duplicated items
+Q 0
+o jts21A
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+
+S T 215
+s 20Jan2014[11:44.07]
+d 0 70 0 100
+P 477 377
+T // use specific item (id value) to detect movement
+Q 0
+o jts21A
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+
+S T 244
+s 20Jan2014[14:12.11]
+P 487 458
+T getIDs
+X getIDs
+Q 0
+o jts21A
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+w 974
+h -1.0
+
+S P 145
+s 20Jan2014[11:09.57]
+d 0 0 100 100
+P 941 554
+e 100 100 100 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 146 147
+c 122 120
 
 S P 125
 s 20Jan2014[11:09.57]
 d 0 0 100 100
-P 453 559
-e 100 100 100 100
-Q 0
-o jts21A
-v S
-h 2.0
-l 128 132
-c 120 121
-
-S P 131
-s 20Jan2014[11:09.57]
-d 0 0 100 100
-P 772 559
-e 100 100 100 100
-Q 0
-o jts21A
-v S
-h 2.0
-l 132 133
-c 120 122
-
-Z
+P 453 554
+e 100 100 100 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 128 147
+c 121 120
+
+Z
+
+L 146 1
+s 145 123
 
 L 127 1
 s 123 124
 
-L 133 1
-s 131 123
-
 L 128 1
 s 124 125
 
-L 132 1
-s 125 131
+L 147 1
+s 125 145
 
 Z
@@ -190 +206 @@
 
 C 122 2
-s 131 123
+s 145 123
 
 C 121 2
@@ -196 +212 @@
 
 C 120 3
-s 125 131
-
-Z
-
-ActiveTime:00:02:15
-DarkTime:00:00:00
-10:30:476 951 24 Rd
-10:30:491 951 24 Ld
-10:32:181 403 79 Rd
-10:32:185 403 79 Md
-10:33:290 329 342 kAlt
+s 125 145
+
+Z
+
+ActiveTime:00:07:14
+DarkTime:00:18:30

trunk/src/org/expeditee/assets/resources/framesets/tutorials/11.exp

@@ -1 @@
-V 48
+V 69
 U jts21A
 D 20Jan2014[10:30]
 M jts21A
-d 20Jan2014[11:10]
+d 20Jan2014[14:13]
 Z
 
@@ -57 +57 @@
 Z
 
-ActiveTime:00:06:22
-DarkTime:00:00:00
-10:21:373 215 371 Ld
-10:21:484 215 371 Lu
+ActiveTime:00:09:44
+DarkTime:00:03:35
+13:50:514 963 552 Rd
+13:50:617 963 552 Ru
+13:51:776 22 176 Rd
+13:51:784 22 176 Md
+13:52:882 31 181 Rd
+13:52:969 31 181 Ru
+13:53:882 991 625 Md
+13:53:977 991 625 Mu
+13:54:228 917 582 Rd
+13:54:236 917 582 Md
+13:54:874 406 490 Ld
+13:54:929 406 490 Lu

trunk/src/org/expeditee/assets/resources/framesets/tutorials/13.exp

@@ -1 @@
-V 22
+V 23
 U jts21A
 D 20Jan2014[10:35]
 M jts21A
-d 20Jan2014[10:57]
+d 20Jan2014[11:22]
 Z
 
@@ -134 +134 @@
 s 20Jan2014[10:39.02]
 P 31 347
-T frame.addRectangle(650, 250, 300, 200, 1, java.awt.Color.RED, new java.awt.Color(255, 150, 150))
+T frame.addRectangle(650, 250, 300, 200, 1, Item.COLOR_WHEEL[0], Item.FILL_COLOR_WHEEL[0])
 Q 0
 o jts21A
@@ -246 +246 @@
 v S
 h 2.0
-l 256 257
+l 257 256
 c 114 116
 
@@ -322 +322 @@
 v S
 h 2.0
-l 51 238
+l 238 51
 c 118 120
 
@@ -379 +379 @@
 Z
 
-ActiveTime:00:10:16
+ActiveTime:00:12:05
 DarkTime:00:00:00
-57:37:958 222 38 Rd
-57:38:029 222 38 Ru
-57:40:062 399 562 Rd
-57:40:077 399 562 Md
-57:40:567 378 600 Md
-57:40:638 378 600 Mu
-57:41:177 372 617 Md
-57:41:246 372 617 Mu
-57:42:287 928 583 Md
-57:42:382 928 583 Mu
-57:42:966 927 592 Md
-57:43:061 927 592 Mu
-57:43:958 45 557 Md
-57:44:045 45 558 Mu
-57:44:486 51 582 Md
-57:44:581 51 583 Mu
-57:45:415 765 497 Md
-57:45:494 765 497 Mu
-57:46:718 765 518 Md
-57:46:813 765 518 Mu
-57:47:638 80 130 Md
-57:47:709 80 130 Mu
-57:48:374 69 158 Md
-57:48:453 70 158 Mu
-57:49:174 78 155 Md
-57:49:269 81 155 Mu
-57:49:550 86 153 Md
-57:49:645 86 152 Mu
-57:50:094 70 98 Md
-57:50:196 70 104 Mu
-57:50:854 64 125 Md
-57:50:973 64 125 Mu
-57:51:446 58 79 Md
-57:51:533 58 79 Mu
-57:52:046 75 100 Rd
-57:52:052 75 100 Md
-57:52:590 60 68 Md
-57:52:693 60 71 Mu
-57:53:207 53 86 Md
-57:53:301 51 86 Mu
-57:54:283 466 125 kY
-57:54:539 476 125 kShift
-57:54:843 476 125 kSemicolon
-57:55:227 481 125 k5
-57:55:379 492 125 k5
-57:55:902 503 125 Md
-57:56:061 503 125 Mu
-57:56:515 608 127 kRight
+22:00:216 423 317 kAlt
+22:00:916 403 344 Md
+22:01:939 566 344 Rd
+22:07:960 521 345 kAlt
+22:16:520 405 346 kShift
+22:16:728 405 346 kI
+22:16:920 410 347 kT
+22:17:024 417 347 kE
+22:17:144 426 347 kM
+22:17:520 443 347 kPeriod
+22:17:968 448 347 kShift
+22:18:120 448 347 kC
+22:18:272 461 347 kO
+22:18:440 472 347 kL
+22:18:608 477 347 kO
+22:18:664 488 347 kR
+22:18:840 496 347 kShift
+22:18:968 496 347 kW
+22:19:082 513 347 kH
+22:19:168 524 347 kE
+22:19:296 534 347 kE
+22:19:416 543 347 kL
+22:19:928 549 347 kOpen Bracket
+22:20:752 554 347 k0
+22:20:848 565 347 kClose Bracket
+22:24:712 501 338 kBackspace
+22:24:848 488 347 kBackspace
+22:25:008 477 347 kBackspace
+22:25:104 472 347 kBackspace
+22:25:272 461 347 kShift
+22:25:576 461 347 kO
+22:25:728 475 347 kL
+22:25:880 485 347 kO
+22:25:912 499 347 kR
+22:26:192 511 347 kMinus
+22:27:184 520 347 kRight
+22:27:536 537 347 kDelete
+22:27:832 537 347 kDelete
+22:27:976 537 347 kDelete
+22:28:616 537 347 kDelete
+22:28:776 537 347 kShift
+22:28:984 537 347 kH
+22:29:112 551 347 kE
+22:29:264 561 347 kE
+22:29:368 571 347 kL
+22:42:750 617 342 Md
+22:44:043 910 348 Rd
+22:46:528 619 344 kShift
+22:46:896 619 344 kI
+22:47:328 625 347 kBackspace
+22:47:576 619 347 kLeft
+22:47:792 614 347 kShift
+22:48:056 614 347 kI
+22:48:216 619 347 kT
+22:48:312 626 347 kE
+22:48:440 636 347 kM
+22:48:664 653 347 kPeriod
+22:48:816 658 347 kShift
+22:49:384 658 347 kF
+22:49:624 668 347 kI
+22:49:872 673 347 kL
+22:50:008 684 347 kL
+22:50:216 694 347 kMinus
+22:50:344 703 347 kC
+22:50:552 715 347 kO
+22:50:712 729 347 kL
+22:50:856 739 347 kO
+22:50:960 753 347 kR
+22:51:096 765 347 kMinus
+22:51:192 774 347 kW
+22:51:352 791 347 kH
+22:51:440 805 347 kE
+22:51:600 815 347 kE
+22:51:680 825 347 kL
+22:52:192 835 347 kOpen Bracket
+22:52:368 841 347 k0
+22:52:456 852 347 kClose Bracket
+22:53:819 874 143 Ld
+22:53:882 874 143 Lu

trunk/src/org/expeditee/assets/resources/framesets/tutorials/14.exp

@@ -1 @@
-V 16
+V 17
 U jts21A
 D 20Jan2014[10:38]
 M jts21A
-d 20Jan2014[11:03]
+d 20Jan2014[12:27]
 Z
 
@@ -165 +165 @@
 h 2.0
 l 161 165
-c 153 154
+c 154 153
 
 S P 164
@@ -176 +176 @@
 v S
 h 2.0
-l 165 166
-c 153 155
+l 166 165
+c 155 153
 
 S P 174
@@ -189 +189 @@
 h 2.0
 l 175 190
-c 120 121
+c 121 120
 
 S P 189
@@ -200 +200 @@
 v S
 h 2.0
-l 190 191
-c 120 122
+l 191 190
+c 122 120
 
 S T 194
@@ -258 +258 @@
 s 20Jan2014[10:45.06]
 P 21 509
-T frame.addText(70, 455, "Un-delete the shape, then click here to finish this tutorial", "runJSFrame", "Tutorials15")
+T frame.addText(70, 455, "Un-delete the shape, then click here to continue", "runJSFrame", "Tutorials15")
 Q 0
 o jts21A
@@ -279 +279 @@
 h 2.0
 l 180 296
-c 76 77
+c 77 76
 
 S P 295
@@ -290 +290 @@
 v S
 h 2.0
-l 296 297
-c 76 78
+l 297 296
+c 78 76
 
 S T 308
@@ -366 +366 @@
 v S
 h 2.0
-l 306 307
+l 307 306
 c 166 168
 
@@ -471 +471 @@
 Z
 
-ActiveTime:00:05:15
+ActiveTime:00:05:25
 DarkTime:00:00:00
-03:26:211 221 505 kLeft
-03:26:491 208 509 kRight
-03:26:811 219 509 kBackspace
-03:26:923 208 509 kBackspace
-03:27:427 198 509 k5
-03:27:562 208 509 k5
-03:28:493 284 554 Ld
-03:28:580 284 554 Lu
+27:08:343 583 503 kDelete
+27:08:495 582 509 kDelete
+27:08:646 582 509 kDelete
+27:08:790 582 509 kDelete
+27:08:934 582 509 kDelete
+27:09:070 582 509 kDelete
+27:09:198 582 509 kDelete
+27:09:858 582 509 kDelete
+27:09:898 582 509 kDelete
+27:09:938 582 509 kDelete
+27:09:978 582 509 kDelete
+27:10:018 582 509 kDelete
+27:10:058 582 509 kDelete
+27:10:098 582 509 kDelete
+27:10:139 582 509 kDelete
+27:10:178 582 509 kDelete
+27:10:342 582 509 kDelete
+27:10:494 582 509 kDelete
+27:10:647 582 509 kDelete
+27:10:975 582 509 kDelete
+27:11:375 582 509 kC
+27:11:510 592 509 kO
+27:11:671 602 509 kN
+27:11:782 614 509 kT
+27:11:846 621 509 kI
+27:11:998 626 509 kN
+27:12:174 638 509 kU
+27:12:223 649 509 kE
+27:14:569 747 353 Ld
+27:14:640 747 353 Lu

trunk/src/org/expeditee/assets/resources/framesets/tutorials/15.exp

@@ -1 @@
-V 11
+V 14
 U jts21A
 D 20Jan2014[10:56]
 M jts21A
-d 20Jan2014[11:04]
+d 20Jan2014[14:12]
 Z
 
@@ -176 +176 @@
 v S
 h 2.0
-l 104 105
+l 105 104
 c 286 288
 
@@ -200 +200 @@
 v S
 h 2.0
-l 108 109
+l 109 108
 c 282 284
 
@@ -272 +272 @@
 s 20Jan2014[11:00.26]
 P 33 460
-T var thisTutorial = frame.getItemWithID(47)
-Q 0
-o jts21A
-v S
-f tr18
-t -1.0
-b 0.0
-m 0.0
-w 974
-h -1.0
-
-S T 171
-s 20Jan2014[11:00.26]
-P 37 500
-T thisTutorial.setColor(java.awt.Color.GREEN)
+T setCompleted(frame.getItemWithID(241))
 Q 0
 o jts21A
@@ -307 +293 @@
 h 2.0
 l 116 73
-c 61 62
+c 62 61
 
 S P 72
@@ -318 +304 @@
 v S
 h 2.0
-l 73 74
-c 61 63
+l 74 73
+c 63 61
 
 S T 75
@@ -394 +380 @@
 v S
 h 2.0
-l 40 41
+l 41 40
 c 290 292
 
@@ -499 +485 @@
 Z
 
-ActiveTime:00:02:42
+ActiveTime:00:02:56
 DarkTime:00:00:00
-04:10:435 681 589 kRight
-04:10:666 685 594 kLeft
-04:11:050 680 594 kDelete
-04:11:170 680 594 kDelete
-04:11:282 680 594 kDelete
-04:11:418 680 594 kDelete
-04:11:786 680 594 kS
-04:11:994 689 594 kH
-04:12:066 700 594 kA
-04:12:170 710 594 kP
-04:12:242 722 594 kE
-04:13:237 629 646 Ld
-04:13:324 629 646 Lu
+12:52:338 269 412 Ld
+12:52:449 269 412 Lu

trunk/src/org/expeditee/assets/resources/framesets/tutorials/2.exp

@@ -1 @@
-V 18
+V 25
 U jts21A
 D 20Jan2014[09:28]
 M jts21A
-d 20Jan2014[10:57]
+d 20Jan2014[14:41]
 Z
 
@@ -64 +64 @@
 h -1.0
 
-S T 140
-s 20Jan2014[09:29.37]
+S T 163
+s 20Jan2014[09:29.47]
 P 70 270
-T Click on the action below to continue
-Q 0
-o jts21A
-v S
-f tr18
-t -1.0
-b 0.0
-m 0.0
-w 974
-h -1.0
-
-S T 145
-s 20Jan2014[09:29.47]
-P 100 306
-T Click here
+T Click here to continue
 F 3
 X runJSFrame
@@ -100 +86 @@
 Z
 
-ActiveTime:00:04:25
+ActiveTime:00:05:09
 DarkTime:00:00:00
-57:30:094 112 57 Rd
-57:30:213 112 57 Ru
-57:30:499 404 77 kRight
+41:30:598 193 300 Rd
+41:30:613 193 300 Md
+41:30:942 206 357 Ld
+41:31:039 202 353 Lu

trunk/src/org/expeditee/assets/resources/framesets/tutorials/3.exp

@@ -1 @@
-V 22
+V 29
 U jts21A
 D 20Jan2014[09:29]
 M jts21A
-d 20Jan2014[11:00]
+d 20Jan2014[14:41]
 Z
 
@@ -53 +53 @@
 S T 6
 s 20Jan2014[09:30.27]
-P 82 183
+P 84 183
 T var frame = loadTutorialFrame(1)
 Q 0
@@ -67 +67 @@
 S T 135
 s 20Jan2014[09:40.10]
-P 85 219
-T var thisTutorial = frame.getItemWithID(15)
+P 84 229
+T setCompleted(frame.getItemWithID(231))
 Q 0
 o jts21A
@@ -79 +79 @@
 h -1.0
 
-S T 136
-s 20Jan2014[09:40.42]
-P 88 257
-T thisTutorial.setColor(java.awt.Color.GREEN)
-Q 0
-o jts21A
-v S
-f tr18
-t -1.0
-b 0.0
-m 0.0
-w 974
-h -1.0
-
-S T 139
+S T 152
 s 20Jan2014[09:43.31]
-P 90 296
+P 84 275
 T frame = loadTutorialFrame(2)
 Q 0
@@ -107 +93 @@
 h -1.0
 
-S T 143
+S T 153
 s 20Jan2014[09:43.49]
-P 93 345
-T frame.addText(70, 342, "Click the background of the frame to return to the tutorials list", null)
+P 84 321
+T frame.addText(70, 306, "Click the background of the frame to return to the tutorials list", null)
 Q 0
 o jts21A
@@ -127 +113 @@
 Z
 
-ActiveTime:00:07:29
+ActiveTime:00:08:24
 DarkTime:00:00:00
-00:25:022 69 151 Rd
-00:25:117 69 151 Ru
-00:26:029 956 395 Rd
-00:26:101 956 395 Ru
-00:27:005 155 498 Ld
-00:27:093 155 498 Lu
+41:20:515 422 222 kLeft
+41:20:819 410 229 kRight
+41:21:083 421 229 kBackspace
+41:21:211 410 229 kBackspace
+41:21:331 399 229 k2
+41:22:075 410 229 k3
+41:22:139 421 229 k1
+41:24:214 335 402 Ld
+41:24:317 335 402 Lu

trunk/src/org/expeditee/assets/resources/framesets/tutorials/4.exp

@@ -1 @@
-V 34
+V 85
 U jts21A
 D 20Jan2014[10:03]
 M jts21A
-d 20Jan2014[10:57]
+d 20Jan2014[14:40]
 Z
 
@@ -39 +39 @@
 P 70 181
 T Type some text on this frame, and then click here
-F 6
+F 25
 X runJSFrame
 Q 0
@@ -57 +57 @@
 Z
 
-ActiveTime:00:05:28
-DarkTime:00:00:00
-57:31:814 84 65 Rd
-57:31:925 84 65 Ru
-57:32:163 264 86 kRight
+ActiveTime:00:16:03
+DarkTime:00:01:37
+40:50:990 942 570 Rd
+40:51:103 910 556 Ru
+40:52:022 26 187 Md
+40:52:117 26 187 Mu
+40:52:463 93 218 Md
+40:52:471 93 218 Rd
+40:52:982 168 248 Ld
+40:53:077 168 248 Lu

trunk/src/org/expeditee/assets/resources/framesets/tutorials/6.exp

@@ -1 @@
-V 16
+V 40
 U jts21A
 D 20Jan2014[10:06]
 M jts21A
-d 20Jan2014[10:57]
+d 20Jan2014[14:35]
 Z
 
@@ -10 +10 @@
 d 0 0 100 100
 P 15 55
-T Type some text on this frame, and then click here
+T Move the above item, then click here
 Q 0
 o jts21A
@@ -21 +21 @@
 h -1.0
 
-S T 4
+S T 399
 s 20Jan2014[10:05.48]
 d 50 50 50 100
-P 56 188
+P 54 92
 T @functions
 F Javascript1
@@ -37 +37 @@
 h -1.0
 
-S T 12
+S T 400
 s 20Jan2014[10:07.15]
-P 53 238
+P 47 123
 T var frame = loadTutorialFrame(4)
 Q 0
@@ -51 +51 @@
 h -1.0
 
-S T 15
-s 20Jan2014[10:10.58]
-P 57 274
-T var numText = frame.getTextItems().size()
-Q 0
-o jts21A
-v S
-f tr18
-t -1.0
-b 0.0
-m 0.0
-w 974
-h -1.0
-
-S T 18
-s 20Jan2014[10:11.11]
-P 64 313
-T if(numText > 3)
-Q 0
-o jts21A
-v S
-f tr18
-t -1.0
-b 0.0
-m 0.0
-w 974
-h -1.0
-
-S P 59
+S T 401
+s 20Jan2014[14:19.47]
+P 49 149
+T var iterator = frame.getTextItems().iterator()
+Q 0
+o jts21A
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+w 974
+h -1.0
+
+S T 509
+s 20Jan2014[14:22.39]
+P 55 175
+T var success = false
+Q 0
+o jts21A
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+w 974
+h -1.0
+
+S T 506
+s 20Jan2014[14:20.02]
+P 48 219
+T while(iterator.hasNext())
+Q 0
+o jts21A
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+w 974
+h -1.0
+
+S P 486
+s 20Jan2014[14:20.16]
+d 100 0 0 100
+P 874 233
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 488 517
+c 331 334
+
+S P 487
+s 20Jan2014[14:20.16]
+d 100 0 0 100
+P 50 233
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 488 489
+c 331 333
+
+S T 490
+s 20Jan2014[14:20.18]
+P 67 262
+T var t = iterator.next()
+Q 0
+o jts21A
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+w 974
+h -1.0
+
+S T 491
+s 20Jan2014[14:20.59]
+P 74 296
+T if(t.getData() != null && t.getData().contains("itemToMove") && (t.getX() != 70 || t.getY() != 217))
+Q 0
+o jts21A
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+w 974
+h -1.0
+
+S P 522
+s 20Jan2014[14:22.19]
+d 0 0 100 100
+P 271 311
+e 59 59 100 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 524 530
+c 459 462
+
+S P 523
+s 20Jan2014[14:22.19]
+d 0 0 100 100
+P 98 311
+e 59 59 100 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 524 525
+c 459 461
+
+S T 526
+s 20Jan2014[14:22.21]
+P 125 335
+T success = true
+Q 0
+o jts21A
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+w 974
+h -1.0
+
+S T 527
+s 20Jan2014[14:22.26]
+P 132 364
+T break
+Q 0
+o jts21A
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+w 974
+h -1.0
+
+S P 528
+s 20Jan2014[14:22.19]
+d 0 0 100 100
+P 98 382
+e 59 59 100 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 525 531
+c 461 460
+
+S P 529
+s 20Jan2014[14:22.19]
+d 0 0 100 100
+P 271 382
+e 59 59 100 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 530 531
+c 462 460
+
+S P 502
+s 20Jan2014[14:20.16]
+d 100 0 0 100
+P 50 388
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 489 532
+c 333 332
+
+S P 516
+s 20Jan2014[14:20.16]
+d 100 0 0 100
+P 874 388
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 517 532
+c 334 332
+
+S T 515
+s 20Jan2014[14:22.47]
+P 19 423
+T if(success)
+Q 0
+o jts21A
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+w 974
+h -1.0
+
+S P 360
 s 20Jan2014[10:11.19]
 d 100 0 0 100
-P 1008 328
-e 100 59 59 100
-Q 0
-o jts21A
-v S
-h 2.0
-l 61 70
+P 1007 443
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 511 369
 c 31 34
 
-S P 60
+S P 510
 s 20Jan2014[10:11.19]
 d 100 0 0 100
-P 21 328
-e 100 59 59 100
-Q 0
-o jts21A
-v S
-h 2.0
-l 61 62
+P 19 443
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 511 512
 c 31 33
 
-S T 75
+S T 364
 s 20Jan2014[10:13.52]
-P 35 368
-T frame.addText(70, 217, "Items can be duplicated by right clicking them", null)
-Q 0
-o jts21A
-v S
-f tr18
-t -1.0
-b 0.0
-m 0.0
-w 974
-h -1.0
-
-S T 71
+P 34 465
+T var t = frame.addText(70, 310, "Items can be duplicated by right clicking them", null)
+Q 0
+o jts21A
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+w 974
+h -1.0
+
+S T 365
+s 20Jan2014[14:14.45]
+P 35 495
+T t.setData("itemToDupe")
+Q 0
+o jts21A
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+w 974
+h -1.0
+
+S T 366
 s 20Jan2014[10:07.15]
-P 35 408
-T frame.addText(70, 253, "Duplicate your text item a few times, then click here", "runJSFrame", "Tutorials7")
-Q 0
-o jts21A
-v S
-f tr18
-t -1.0
-b 0.0
-m 0.0
-w 974
-h -1.0
-
-S P 64
+P 29 530
+T frame.addText(70, 346, "Duplicate the above item, then click here", "runJSFrame", "Tutorials7")
+Q 0
+o jts21A
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+w 974
+h -1.0
+
+S P 367
 s 20Jan2014[10:11.19]
 d 100 0 0 100
-P 21 452
-e 100 59 59 100
-Q 0
-o jts21A
-v S
-h 2.0
-l 62 69
+P 19 549
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 512 370
 c 33 32
 
-S P 68
+S P 368
 s 20Jan2014[10:11.19]
 d 100 0 0 100
-P 1008 452
-e 100 59 59 100
-Q 0
-o jts21A
-v S
-h 2.0
-l 70 69
+P 1007 549
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 369 370
 c 34 32
 
-S T 179
+S T 359
 s 20Jan2014[10:23.22]
-P 51 476
+P 41 572
 T else
 Q 0
@@ -169 +363 @@
 h -1.0
 
-S P 196
+S P 350
 s 20Jan2014[10:23.24]
 d 100 0 0 100
-P 963 501
-e 100 59 59 100
-Q 0
-o jts21A
-v S
-h 2.0
-l 200 212
+P 933 584
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 352 357
 c 192 195
 
-S P 197
+S P 351
 s 20Jan2014[10:23.24]
 d 100 0 0 100
-P 59 501
-e 100 59 59 100
-Q 0
-o jts21A
-v S
-h 2.0
-l 200 201
+P 29 584
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 352 353
 c 192 194
 
-S T 209
+S T 354
 s 20Jan2014[10:23.26]
-P 91 529
-T org.expeditee.gui.MessageBay.errorMessage("You need to create some text to continue")
-Q 0
-o jts21A
-v S
-f tr18
-t -1.0
-b 0.0
-m 0.0
-w 974
-h -1.0
-
-S P 198
+P 61 612
+T org.expeditee.gui.MessageBay.errorMessage("You need to move the text item to continue")
+Q 0
+o jts21A
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+w 974
+h -1.0
+
+S P 355
 s 20Jan2014[10:23.24]
 d 100 0 0 100
-P 59 567
-e 100 59 59 100
-Q 0
-o jts21A
-v S
-h 2.0
-l 201 211
+P 29 650
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 353 358
 c 194 193
 
-S P 210
+S P 356
 s 20Jan2014[10:23.24]
 d 100 0 0 100
-P 963 567
-e 100 59 59 100
-Q 0
-o jts21A
-v S
-h 2.0
-l 212 211
+P 933 650
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 357 358
 c 195 193
 
 Z
 
-L 61 1
-s 59 60
-
-L 70 1
-s 68 59
-
-L 62 1
-s 60 64
-
-L 69 1
-s 64 68
-
-L 200 1
-s 196 197
-
-L 212 1
-s 210 196
-
-L 201 1
-s 197 198
-
-L 211 1
-s 198 210
+L 488 1
+s 486 487
+
+L 517 1
+s 516 486
+
+L 489 1
+s 487 502
+
+L 524 1
+s 522 523
+
+L 530 1
+s 529 522
+
+L 525 1
+s 523 528
+
+L 531 1
+s 528 529
+
+L 532 1
+s 502 516
+
+L 511 1
+s 360 510
+
+L 369 1
+s 368 360
+
+L 512 1
+s 510 367
+
+L 370 1
+s 367 368
+
+L 352 1
+s 350 351
+
+L 357 1
+s 356 350
+
+L 353 1
+s 351 355
+
+L 358 1
+s 355 356
 
 Z
 
+C 331 3
+s 486 487
+
+C 334 2
+s 516 486
+
+C 333 2
+s 487 502
+
+C 459 3
+s 522 523
+
+C 462 2
+s 529 522
+
+C 461 2
+s 523 528
+
+C 460 3
+s 528 529
+
+C 332 3
+s 502 516
+
 C 31 3
-s 59 60
+s 360 510
 
 C 34 2
-s 68 59
+s 368 360
 
 C 33 2
-s 60 64
+s 510 367
 
 C 32 3
-s 64 68
+s 367 368
 
 C 192 3
-s 196 197
+s 350 351
 
 C 195 2
-s 210 196
+s 356 350
 
 C 194 2
-s 197 198
+s 351 355
 
 C 193 3
-s 198 210
+s 355 356
 
 Z
 
-ActiveTime:00:04:21
+ActiveTime:00:11:14
 DarkTime:00:00:00
-57:32:636 181 68 Rd
-57:32:741 181 68 Ru
-57:33:067 264 117 kRight
+35:05:047 26 131 Rd
+35:05:150 26 131 Ru
+35:06:759 951 400 Rd
+35:06:886 951 400 Ru
+35:07:519 691 414 Ld
+35:07:614 691 414 Lu

trunk/src/org/expeditee/assets/resources/framesets/tutorials/7.exp

@@ -1 @@
-V 14
+V 26
 U jts21A
 D 20Jan2014[10:12]
 M jts21A
-d 20Jan2014[10:57]
+d 20Jan2014[14:39]
 Z
 
-S T 3
+S T 226
 s 20Jan2014[10:12]
 d 0 0 100 100
 P 15 55
-T Click the background of the frame to return to the tutorials list
+T Duplicate the above item, then click here
 Q 0
 o jts21A
@@ -21 +21 @@
 h -1.0
 
-S T 10
+S T 229
 s 20Jan2014[10:15.56]
 d 50 50 50 100
-P 38 183
+P 19 85
 T @functions
 F Javascript1
@@ -37 +37 @@
 h -1.0
 
-S T 11
-s 20Jan2014[10:15.56]
-P 35 233
+S T 230
+s 20Jan2014[10:15.56]
+P 19 117
 T var frame = loadTutorialFrame(4)
 Q 0
@@ -51 +51 @@
 h -1.0
 
-S T 12
-s 20Jan2014[10:15.56]
-P 39 269
-T var numText = frame.getTextItems().size()
-Q 0
-o jts21A
-v S
-f tr18
-t -1.0
-b 0.0
-m 0.0
-w 974
-h -1.0
-
-S T 13
-s 20Jan2014[10:15.56]
-P 46 308
-T if(numText > 6)
-Q 0
-o jts21A
-v S
-f tr18
-t -1.0
-b 0.0
-m 0.0
-w 974
-h -1.0
-
-S P 16
-s 20Jan2014[10:15.56]
-d 100 0 0 100
-P 998 323
-e 100 59 59 100
-Q 0
-o jts21A
-v S
-h 2.0
-l 20 105
+S T 231
+s 20Jan2014[14:35.06]
+P 13 147
+T var iterator = frame.getTextItems().iterator()
+Q 0
+o jts21A
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+w 974
+h -1.0
+
+S T 232
+s 20Jan2014[14:35.06]
+P 15 181
+T var count = 0
+Q 0
+o jts21A
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+w 974
+h -1.0
+
+S T 271
+s 20Jan2014[14:35.06]
+P 14 208
+T while(iterator.hasNext())
+Q 0
+o jts21A
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+w 974
+h -1.0
+
+S P 197
+s 20Jan2014[14:35.06]
+d 100 0 0 100
+P 16 222
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 269 199
+c 610 612
+
+S P 268
+s 20Jan2014[14:35.06]
+d 100 0 0 100
+P 840 222
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 269 270
+c 610 611
+
+S T 237
+s 20Jan2014[14:35.06]
+P 34 246
+T var t = iterator.next()
+Q 0
+o jts21A
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+w 974
+h -1.0
+
+S T 257
+s 20Jan2014[14:35.06]
+P 33 272
+T if(t.getData() != null && t.getData().contains("itemToDupe"))
+Q 0
+o jts21A
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+w 974
+h -1.0
+
+S P 258
+s 20Jan2014[14:35.06]
+d 0 0 100 100
+P 242 291
+e 59 59 100 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 260 266
+c 614 615
+
+S P 259
+s 20Jan2014[14:35.06]
+d 0 0 100 100
+P 63 291
+e 59 59 100 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 260 261
+c 614 616
+
+S T 262
+s 20Jan2014[14:37.48]
+P 95 321
+T count++
+Q 0
+o jts21A
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+w 974
+h -1.0
+
+S P 263
+s 20Jan2014[14:35.06]
+d 0 0 100 100
+P 63 344
+e 59 59 100 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 261 265
+c 616 617
+
+S P 264
+s 20Jan2014[14:35.06]
+d 0 0 100 100
+P 242 344
+e 59 59 100 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 265 266
+c 615 617
+
+S P 212
+s 20Jan2014[14:35.06]
+d 100 0 0 100
+P 16 355
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 199 255
+c 612 613
+
+S P 254
+s 20Jan2014[14:35.06]
+d 100 0 0 100
+P 840 355
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 255 270
+c 611 613
+
+S T 195
+s 20Jan2014[14:35.29]
+P 11 409
+T if(count > 1)
+Q 0
+o jts21A
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+w 974
+h -1.0
+
+S P 184
+s 20Jan2014[10:15.56]
+d 100 0 0 100
+P 11 422
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 187 185
+c 173 175
+
+S P 186
+s 20Jan2014[10:15.56]
+d 100 0 0 100
+P 998 422
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 187 194
 c 173 174
 
-S P 17
-s 20Jan2014[10:15.56]
-d 100 0 0 100
-P 3 323
-e 100 59 59 100
-Q 0
-o jts21A
-v S
-h 2.0
-l 20 21
-c 173 175
-
-S T 14
-s 20Jan2014[10:15.56]
-P 17 363
-T frame.addText(70, 289, "You can move items by middle clicking them,\nand you can also cut text regions from Text items by middle-click-dragging the text,\nor copy regions by right-click-dragging", null)
-Q 0
-o jts21A
-v S
-f tr18
-t -1.0
-b 0.0
-m 0.0
-w 974
-h -1.0
-
-S T 15
-s 20Jan2014[10:15.56]
-P 17 420
-T frame.addText(70, 367, "Have a go at moving items and cutting / copying from Text items", null)
-Q 0
-o jts21A
-v S
-f tr18
-t -1.0
-b 0.0
-m 0.0
-w 974
-h -1.0
-
-S T 37
+S T 188
+s 20Jan2014[10:15.56]
+P 25 448
+T frame.addText(70, 382, "You can also cut text regions from Text items by middle-click-dragging the text,\nor copy regions by right-click-dragging", null)
+Q 0
+o jts21A
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+w 974
+h -1.0
+
+S T 189
+s 20Jan2014[10:15.56]
+P 25 505
+T frame.addText(70, 439, "Have a go at cutting / copying text from Text items", null)
+Q 0
+o jts21A
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+w 974
+h -1.0
+
+S T 190
 s 20Jan2014[10:20.28]
-P 27 460
-T frame.addText(70, 403, "Then click here to finish this tutorial", "runJSFrame", "Tutorials8")
-Q 0
-o jts21A
-v S
-f tr18
-t -1.0
-b 0.0
-m 0.0
-w 974
-h -1.0
-
-S P 18
-s 20Jan2014[10:15.56]
-d 100 0 0 100
-P 3 509
-e 100 59 59 100
-Q 0
-o jts21A
-v S
-h 2.0
-l 21 104
+P 35 545
+T frame.addText(70, 475, "Then click here to finish this tutorial", "runJSFrame", "Tutorials8")
+Q 0
+o jts21A
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+w 974
+h -1.0
+
+S P 191
+s 20Jan2014[10:15.56]
+d 100 0 0 100
+P 11 561
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 185 193
 c 175 176
 
-S P 103
-s 20Jan2014[10:15.56]
-d 100 0 0 100
-P 998 509
-e 100 59 59 100
-Q 0
-o jts21A
-v S
-h 2.0
-l 105 104
+S P 192
+s 20Jan2014[10:15.56]
+d 100 0 0 100
+P 998 561
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 194 193
 c 174 176
 
-S T 47
+S T 183
 s 20Jan2014[10:24.12]
-P 47 560
+P 23 581
 T else
 Q 0
@@ -182 +348 @@
 w 974
 h -1.0
-
-S P 123
-s 20Jan2014[10:24.20]
-d 100 0 0 100
-P 920 576
-e 100 59 59 100
-Q 0
-o jts21A
-v S
-h 2.0
-l 124 122
-c 230 231
 
 S P 125
 s 20Jan2014[10:24.20]
 d 100 0 0 100
-P 16 576
-e 100 59 59 100
-Q 0
-o jts21A
-v S
-h 2.0
-l 124 119
+P 16 592
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 181 119
 c 230 232
+
+S P 180
+s 20Jan2014[10:24.20]
+d 100 0 0 100
+P 915 592
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 181 182
+c 230 231
 
 S T 98
 s 20Jan2014[10:24.20]
 P 49 621
-T org.expeditee.gui.MessageBay.errorMessage("You need to duplicate some text to continue")
+T org.expeditee.gui.MessageBay.errorMessage("You need to duplicate the item to continue")
 Q 0
 o jts21A
@@ -236 +402 @@
 s 20Jan2014[10:24.20]
 d 100 0 0 100
-P 920 642
-e 100 59 59 100
-Q 0
-o jts21A
-v S
-h 2.0
-l 122 120
+P 915 642
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 182 120
 c 231 233
 
 Z
 
-L 20 1
-s 16 17
-
-L 105 1
-s 103 16
-
-L 21 1
-s 17 18
-
-L 104 1
-s 18 103
-
-L 124 1
-s 123 125
-
-L 122 1
-s 121 123
+L 269 1
+s 268 197
+
+L 199 1
+s 197 212
+
+L 270 1
+s 254 268
+
+L 260 1
+s 258 259
+
+L 266 1
+s 264 258
+
+L 261 1
+s 259 263
+
+L 265 1
+s 263 264
+
+L 255 1
+s 212 254
+
+L 187 1
+s 186 184
+
+L 185 1
+s 184 191
+
+L 194 1
+s 192 186
+
+L 193 1
+s 191 192
+
+L 181 1
+s 180 125
 
 L 119 1
 s 125 118
 
+L 182 1
+s 121 180
+
 L 120 1
 s 118 121
@@ -273 +463 @@
 Z
 
+C 610 3
+s 268 197
+
+C 612 2
+s 197 212
+
+C 611 2
+s 254 268
+
+C 614 3
+s 258 259
+
+C 615 2
+s 264 258
+
+C 616 2
+s 259 263
+
+C 617 3
+s 263 264
+
+C 613 3
+s 212 254
+
 C 173 3
-s 16 17
+s 186 184
+
+C 175 2
+s 184 191
 
 C 174 2
-s 103 16
-
-C 175 2
-s 17 18
+s 192 186
 
 C 176 3
-s 18 103
+s 191 192
 
 C 230 3
-s 123 125
-
-C 231 2
-s 121 123
+s 180 125
 
 C 232 2
 s 125 118
 
+C 231 2
+s 121 180
+
 C 233 3
 s 118 121
@@ -299 +513 @@
 Z
 
-ActiveTime:00:04:20
+ActiveTime:00:07:36
 DarkTime:00:00:00
-57:33:494 158 54 Rd
-57:33:597 158 54 Ru
-57:33:979 286 140 kRight
+39:47:724 476 500 kBackspace
+39:48:384 472 505 kBackspace
+39:48:431 463 505 kBackspace
+39:48:465 446 505 kBackspace
+39:48:506 436 505 kBackspace
+39:48:547 429 505 kBackspace
+39:48:588 424 505 kBackspace
+39:48:629 418 505 kBackspace
+39:48:670 408 505 kBackspace
+39:48:711 396 505 kBackspace
+39:48:752 391 505 kBackspace
+39:48:793 381 505 kBackspace
+39:48:834 370 505 kBackspace
+39:49:003 353 505 kBackspace
+39:49:443 348 505 kSpace
+39:49:571 353 505 kDelete
+39:49:715 353 505 kDelete
+39:49:851 353 505 kDelete
+39:49:995 353 505 kDelete
+39:50:331 353 505 kCtrl
+39:50:467 353 505 kRight
+39:50:731 421 505 kRight
+39:50:979 430 505 kRight
+39:51:251 435 505 kRight
+39:51:900 510 505 kT
+39:51:915 517 505 kE
+39:52:139 526 505 kX
+39:52:283 536 505 kT
+39:52:355 543 505 kSpace
+39:55:407 398 378 Ld
+39:55:493 398 378 Lu

trunk/src/org/expeditee/assets/resources/framesets/tutorials/8.exp

@@ -1 @@
-V 7
+V 15
 U jts21A
 D 20Jan2014[10:21]
 M jts21A
-d 20Jan2014[10:57]
+d 20Jan2014[14:40]
 Z
 
@@ -53 +53 @@
 S T 9
 s 20Jan2014[10:21.59]
-P 43 276
+P 45 276
 T var frame = loadTutorialFrame(1)
 Q 0
@@ -67 +67 @@
 S T 10
 s 20Jan2014[10:21.59]
-P 46 312
-T var thisTutorial = frame.getItemWithID(21)
+P 45 322
+T setCompleted(frame.getItemWithID(228))
 Q 0
 o jts21A
@@ -79 +79 @@
 h -1.0
 
-S T 11
-s 20Jan2014[10:21.59]
-P 49 350
-T thisTutorial.setColor(java.awt.Color.GREEN)
-Q 0
-o jts21A
-v S
-f tr18
-t -1.0
-b 0.0
-m 0.0
-w 974
-h -1.0
-
-S T 14
+S T 49
 s 20Jan2014[10:22.36]
-P 54 401
+P 45 364
 T frame = loadTutorialFrame(4)
 Q 0
@@ -107 +93 @@
 h -1.0
 
-S T 15
+S T 50
 s 20Jan2014[10:22.36]
-P 57 450
-T frame.addText(70, 439, "Click the background of the frame to return to the tutorials list", null)
+P 45 415
+T frame.addText(70, 511, "Click the background of the frame to return to the tutorials list", null)
 Q 0
 o jts21A
@@ -127 +113 @@
 Z
 
-ActiveTime:00:00:40
+ActiveTime:00:02:46
 DarkTime:00:00:00
-57:34:422 153 53 Rd
-57:34:557 153 52 Ru
-57:34:859 243 125 kRight
+40:10:083 238 410 kRight
+40:10:699 248 415 kLeft
+40:11:003 243 415 kBackspace
+40:11:131 232 415 kBackspace
+40:11:387 222 415 kBackspace
+40:11:523 211 415 k5
+40:11:627 222 415 k1
+40:11:811 232 415 k1
+40:12:510 281 497 Ld
+40:12:597 281 497 Lu

trunk/src/org/expeditee/assets/resources/framesets/tutorials/frame.inf

@@ -1 @@
-Tutorials17
+Tutorials27

trunk/src/org/expeditee/gui/Frame.java

@@ -1687 +1687 @@
          *            Color to fill the rectangle with
          */
-        public void addRectangle(int x, int y, int width, int height, float borderThickness, Color borderColor, Color fillColor) {
+        public List<Item> addRectangle(int x, int y, int width, int height, float borderThickness, Color borderColor, Color fillColor) {
                 List<Item> rectComponents = new ArrayList<Item>();
                 Item[] corners = new Item[4];
@@ -1729 +1729 @@
                 this.addAllItems(rectComponents);
                 FrameMouseActions.anchor(rectComponents);
-
-                rectComponents.clear();
+                return rectComponents;
+                // rectComponents.clear();
         }
 

trunk/src/org/expeditee/items/PermissionPair.java

@@ -57 +57 @@
         {
                 
-                if (UserSettings.UserName.equals(username)) {
+                if (UserSettings.UserName.get().equals(username)) {
                         return ownerPermission;
                 }