Changeset 731

Timestamp:

01/21/14 14:39:12 (10 years ago)

Author:

jts21

Message:

Fix deletion tutorial to use data instead of ID values (since ID values apparently change when an item is picked up and placed back down). Also modified Frame.addRectangle() so it correctly returns the components in the rectangle, so we can now also check that the rectangle in the deletion tutorial was deleted as well as the text items

Location:

trunk/src/org/expeditee

Files:

• assets/resources/framesets/javascript/3.exp (modified) (3 diffs)
• assets/resources/framesets/tutorials/1.exp (modified) (4 diffs)
• assets/resources/framesets/tutorials/11.exp (modified) (4 diffs)
• assets/resources/framesets/tutorials/12.exp (modified) (6 diffs)
• assets/resources/framesets/tutorials/13.exp (modified) (7 diffs)
• assets/resources/framesets/tutorials/14.exp (modified) (13 diffs)
• assets/resources/framesets/tutorials/15.exp (modified) (13 diffs)
• assets/resources/framesets/tutorials/4.exp (modified) (2 diffs)
• assets/resources/framesets/tutorials/6.exp (modified) (2 diffs)
• assets/resources/framesets/tutorials/frame.inf (modified) (1 diff)
• gui/Frame.java (modified) (1 diff)

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

@@ -1 @@
-V 9
+V 11
 U jts21A
 D 20Jan2014[11:23]
 M jts21A
-d 21Jan2014[10:15]
+d 21Jan2014[14:18]
 Z
 
@@ -147 +147 @@
 h -1.0
 
+S T 110
+s 21Jan2014[14:18.45]
+P 59 395
+T UserSettings = org.expeditee.settings.UserSettings
+Q 0
+o jts21A
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+w 974
+h -1.0
+
 S T 47
 s 20Jan2014[14:57.16]
-P 59 395
+P 59 424
 T List = java.util.LinkedList
 Q 0
@@ -161 +175 @@
 h -1.0
 
-Z
-
-Z
-
-Z
-
-ActiveTime:00:02:23
+S T 103
+s 21Jan2014[14:18.10]
+P 59 453
+T Color = java.awt.Color
+Q 0
+o jts21A
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+w 974
+h -1.0
+
+Z
+
+Z
+
+Z
+
+ActiveTime:00:02:45
 DarkTime:00:00:00
-15:31:186 125 277 kEscape
-15:31:498 59 308 kShift
-15:31:746 59 308 kW
-15:31:858 76 308 kI
-15:31:970 81 308 kD
-15:32:034 93 308 kG
-15:32:114 103 308 kE
-15:32:234 113 308 kT
-15:32:338 120 308 kSpace
-15:32:474 125 308 kEquals
-15:32:538 139 308 kSpace
-15:32:834 145 308 kO
-15:32:898 156 308 kR
-15:33:050 164 308 kG
-15:33:178 174 308 kPeriod
-15:33:290 179 308 kE
-15:33:522 188 308 kX
-15:33:730 198 308 kP
-15:33:770 210 308 kE
-15:33:914 219 308 kD
-15:34:058 231 308 kI
-15:34:130 236 308 kT
-15:34:274 243 308 kE
-15:34:418 253 308 kE
-15:34:530 263 308 kPeriod
-15:34:754 267 308 kI
-15:34:834 273 308 kT
-15:34:962 280 308 kE
-15:35:074 289 308 kM
-15:35:186 306 308 kS
-15:35:314 315 308 kPeriod
-15:35:466 320 308 kShift
-15:35:610 320 308 kW
-15:36:090 337 308 kBackspace
-15:36:186 320 308 kW
-15:36:330 335 308 kI
-15:36:410 340 308 kD
-15:36:530 352 308 kG
-15:36:674 362 308 kE
-15:36:810 371 308 kT
-15:37:314 379 308 kS
-15:37:474 388 308 kPeriod
-15:37:730 392 308 kShift
-15:37:922 392 308 kI
-15:38:098 398 308 kN
-15:38:274 410 308 kT
-15:38:482 417 308 kR
-15:38:674 425 308 kE
-15:38:946 434 308 kBackspace
-15:39:066 425 308 kBackspace
-15:39:130 417 308 kE
-15:39:266 426 308 kR
-15:39:386 434 308 kA
-15:39:650 444 308 kT
-15:39:970 451 308 kBackspace
-15:40:050 444 308 kC
-15:40:242 453 308 kT
-15:40:330 460 308 kI
-15:40:466 466 308 kV
-15:40:922 475 308 kE
-15:41:098 485 308 kShift
-15:41:226 485 308 kW
-15:41:402 502 308 kI
-15:41:474 507 308 kD
-15:41:594 519 308 kG
-15:41:650 529 308 kE
-15:41:770 538 308 kT
-15:42:702 618 534 Ld
-15:42:764 618 534 Lu
+18:44:655 269 351 kEscape
+18:45:007 59 395 kShift
+18:45:271 59 395 kU
+18:45:487 72 395 kS
+18:45:671 81 395 kE
+18:45:799 91 395 kR
+18:46:071 98 395 kShift
+18:46:159 98 395 kS
+18:46:343 108 395 kE
+18:46:463 118 395 kT
+18:46:599 125 395 kT
+18:46:759 132 395 kI
+18:46:879 137 395 kN
+18:46:945 149 395 kG
+18:47:079 159 395 kS
+18:47:279 168 395 kSpace
+18:47:375 174 395 kEquals
+18:47:935 188 395 kSpace
+18:48:151 193 395 kO
+18:48:231 204 395 kR
+18:48:423 212 395 kF
+18:48:503 219 395 kPeriod
+18:48:807 224 395 kBackspace
+18:48:943 219 395 kBackspace
+18:49:031 212 395 kG
+18:49:511 222 395 kPeriod
+18:49:647 227 395 kE
+18:49:783 237 395 kX
+18:49:927 247 395 kP
+18:49:991 258 395 kE
+18:50:135 268 395 kD
+18:50:255 279 395 kI
+18:50:343 285 395 kT
+18:50:487 292 395 kE
+18:50:623 301 395 kE
+18:50:743 311 395 kPeriod
+18:51:335 316 395 kS
+18:51:487 325 395 kE
+18:51:607 334 395 kT
+18:51:711 341 395 kT
+18:51:919 349 395 kI
+18:52:047 354 395 kN
+18:52:119 365 395 kG
+18:52:223 376 395 kS
+18:52:359 385 395 kPeriod
+18:52:719 390 395 kShift
+18:52:911 390 395 kU
+18:53:119 402 395 kS
+18:53:271 412 395 kE
+18:53:399 421 395 kR
+18:53:591 429 395 kShift
+18:53:655 429 395 kS
+18:53:815 439 395 kE
+18:53:951 448 395 kT
+18:54:095 455 395 kT
+18:54:263 462 395 kI
+18:54:343 468 395 kN
+18:54:391 479 395 kG
+18:54:559 490 395 kS
+18:55:506 278 625 Ld
+18:55:569 278 625 Lu

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

@@ -1 @@
-V 65
+V 68
 p 41
 U jts21A
 D 20Jan2014[09:27]
 M jts21A
-d 21Jan2014[11:31]
+d 21Jan2014[14:36]
 Z
 
@@ -150 +150 @@
 h -1.0
 
+S T 292
+s 20Jan2014[14:12.11]
+P 484 333
+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 T 313
 s 21Jan2014[11:16.53]
@@ -165 +180 @@
 h -1.0
 
-S T 292
-s 20Jan2014[14:12.11]
-P 484 333
-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 125
 s 20Jan2014[11:09.57]
@@ -234 +234 @@
 Z
 
-ActiveTime:00:08:39
+ActiveTime:00:08:47
 DarkTime:00:19:35
-31:16:627 521 284 Rd
-31:16:690 521 284 Ru
-31:17:402 89 339 Rd
-31:17:481 89 339 Ru
-31:18:090 89 286 Md
-31:18:169 89 286 Mu
-31:19:386 87 339 Ld
-31:19:457 87 339 Lu
+36:13:200 90 203 Ld
+36:13:279 90 203 Lu

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

@@ -1 @@
-V 76
+V 96
 U jts21A
 D 20Jan2014[10:30]
 M jts21A
-d 21Jan2014[10:55]
+d 21Jan2014[14:35]
 Z
 
@@ -21 +21 @@
 h -1.0
 
-S T 6
+S T 45
 s 20Jan2014[10:30.11]
-P 70 137
+P 70 138
 T Items can be deleted by hovering them and clicking the middle+right mouse buttons
+D itemToDelete
 Q 0
 o jts21A
@@ -35 +36 @@
 h -1.0
 
-S T 15
+S T 59
 s 20Jan2014[10:30.44]
-P 70 173
+P 70 174
 T Delete the above item, then click here to continue
 F 12
@@ -57 +58 @@
 Z
 
-ActiveTime:00:11:32
+ActiveTime:00:14:04
 DarkTime:00:03:35
-55:33:911 989 615 Md
-55:33:990 989 615 Mu
-55:35:055 715 618 Md
-55:35:102 715 618 Rd
-55:36:015 977 619 Rd
-55:36:111 975 619 Ru
-55:37:840 26 188 Md
-55:37:903 26 188 Mu
-55:38:376 44 210 Md
-55:38:384 44 210 Rd
-55:39:343 133 353 Ld
-55:39:406 133 353 Lu
+35:35:520 977 619 Rd
+35:35:623 977 619 Ru
+35:37:541 23 183 Md
+35:37:583 23 183 Mu
+35:38:153 42 226 Md
+35:38:161 42 226 Rd
+35:39:112 197 125 Rd
+35:39:127 197 125 Ld
+35:40:296 175 244 Rd
+35:40:303 175 244 Md
+35:40:937 111 278 Ld
+35:40:999 111 278 Lu

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

@@ -1 @@
-V 15
+V 19
 U jts21A
 D 20Jan2014[10:31]
 M jts21A
-d 21Jan2014[10:45]
+d 21Jan2014[14:12]
 Z
 
@@ -21 +21 @@
 h -1.0
 
-S T 7
+S T 83
 s 20Jan2014[10:31.23]
 d 50 50 50 100
-P 27 183
+P 23 86
 T @functions
 F Javascript1
@@ -37 +37 @@
 h -1.0
 
-S T 8
-s 20Jan2014[10:31.23]
-P 24 233
+S T 182
+s 20Jan2014[10:31.23]
+P 26 116
 T var frame = loadTutorialFrame(11)
 Q 0
@@ -51 +51 @@
 h -1.0
 
-S T 31
-s 20Jan2014[10:31.23]
-P 22 285
-T if(frame.getItemWithID(6) == null)
-Q 0
-o jts21A
-v S
-f tr18
-t -1.0
-b 0.0
-m 0.0
-w 974
-h -1.0
-
-S P 32
-s 20Jan2014[10:31.23]
-d 100 0 0 100
-P 1002 310
-e 100 59 59 100
-Q 0
-o jts21A
-v S
-h 2.0
-l 34 53
+S T 88
+s 21Jan2014[13:41.27]
+P 22 148
+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 89
+s 21Jan2014[13:41.27]
+P 29 187
+T var 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 90
+s 21Jan2014[13:41.27]
+P 28 229
+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 162
+s 21Jan2014[13:41.27]
+d 100 0 0 100
+P 973 280
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 164 181
+c 700 701
+
+S P 163
+s 21Jan2014[13:41.27]
+d 100 0 0 100
+P 32 280
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 164 165
+c 700 702
+
+S T 166
+s 21Jan2014[13:41.27]
+P 49 309
+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 167
+s 21Jan2014[13:41.27]
+P 53 346
+T if(t.getData() != null && t.getData().contains("itemToDelete") && (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 168
+s 21Jan2014[13:41.27]
+d 0 0 100 100
+P 252 375
+e 59 59 100 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 170 177
+c 704 705
+
+S P 169
+s 21Jan2014[13:41.27]
+d 0 0 100 100
+P 79 375
+e 59 59 100 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 170 171
+c 704 706
+
+S T 172
+s 21Jan2014[13:41.27]
+P 103 401
+T 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 173
+s 21Jan2014[13:41.27]
+P 109 434
+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 174
+s 21Jan2014[13:41.27]
+d 0 0 100 100
+P 79 446
+e 59 59 100 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 171 176
+c 706 707
+
+S P 175
+s 21Jan2014[13:41.27]
+d 0 0 100 100
+P 252 446
+e 59 59 100 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 176 177
+c 705 707
+
+S P 178
+s 21Jan2014[13:41.27]
+d 100 0 0 100
+P 32 467
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 165 180
+c 702 703
+
+S P 179
+s 21Jan2014[13:41.27]
+d 100 0 0 100
+P 973 467
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 180 181
+c 701 703
+
+S T 192
+s 21Jan2014[13:43.38]
+P 49 547
+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 151
+s 20Jan2014[10:31.23]
+d 100 0 0 100
+P 33 574
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 152 153
+c 280 282
+
+S P 154
+s 20Jan2014[10:31.23]
+d 100 0 0 100
+P 1023 574
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 152 158
 c 280 281
 
-S P 33
-s 20Jan2014[10:31.23]
-d 100 0 0 100
-P 12 310
-e 100 59 59 100
-Q 0
-o jts21A
-v S
-h 2.0
-l 34 35
-c 280 282
-
-S T 56
-s 20Jan2014[10:31.23]
-P 28 360
-T frame.addText(70, 209, "You can undo a delete by clicking the middle+right mouse buttons on the background", 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 55
-s 20Jan2014[10:31.23]
-P 28 438
-T frame.addText(70, 243, "Un-delete the item, then click here to continue", "runJSFrame", "Tutorials13")
-Q 0
-o jts21A
-v S
-f tr18
-t -1.0
-b 0.0
-m 0.0
-w 974
-h -1.0
-
-S P 38
-s 20Jan2014[10:31.23]
-d 100 0 0 100
-P 12 467
-e 100 59 59 100
-Q 0
-o jts21A
-v S
-h 2.0
-l 35 54
+S T 160
+s 20Jan2014[10:31.23]
+P 61 614
+T frame.addText(70, 210, "You can undo a delete by clicking the middle+right mouse buttons on the background", 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 161
+s 20Jan2014[10:31.23]
+P 60 680
+T frame.addText(70, 246, "Un-delete the item, then click here to continue", "runJSFrame", "Tutorials13")
+Q 0
+o jts21A
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+w 974
+h -1.0
+
+S P 155
+s 20Jan2014[10:31.23]
+d 100 0 0 100
+P 33 714
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 153 156
 c 282 283
 
-S P 52
-s 20Jan2014[10:31.23]
-d 100 0 0 100
-P 1002 467
-e 100 59 59 100
-Q 0
-o jts21A
-v S
-h 2.0
-l 53 54
+S P 157
+s 20Jan2014[10:31.23]
+d 100 0 0 100
+P 1023 714
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 158 156
 c 281 283
 
-S T 51
-s 20Jan2014[10:31.23]
-P 27 501
+S T 150
+s 20Jan2014[10:31.23]
+P 36 764
 T else
 Q 0
@@ -155 +349 @@
 h -1.0
 
-S P 42
-s 20Jan2014[10:31.23]
-d 100 0 0 100
-P 926 528
-e 100 59 59 100
-Q 0
-o jts21A
-v S
-h 2.0
-l 44 49
+S P 133
+s 20Jan2014[10:31.23]
+d 100 0 0 100
+P 931 795
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 135 140
 c 284 285
 
-S P 43
-s 20Jan2014[10:31.23]
-d 100 0 0 100
-P 22 528
-e 100 59 59 100
-Q 0
-o jts21A
-v S
-h 2.0
-l 44 45
+S P 134
+s 20Jan2014[10:31.23]
+d 100 0 0 100
+P 27 795
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 135 136
 c 284 286
 
-S T 59
-s 20Jan2014[10:31.23]
-P 58 568
+S T 137
+s 20Jan2014[10:31.23]
+P 63 835
 T org.expeditee.gui.MessageBay.errorMessage("You need to delete the item to continue")
 Q 0
@@ -193 +387 @@
 h -1.0
 
-S P 47
-s 20Jan2014[10:31.23]
-d 100 0 0 100
-P 22 594
-e 100 59 59 100
-Q 0
-o jts21A
-v S
-h 2.0
-l 45 50
+S P 138
+s 20Jan2014[10:31.23]
+d 100 0 0 100
+P 27 861
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 136 141
 c 286 287
 
-S P 48
-s 20Jan2014[10:31.23]
-d 100 0 0 100
-P 926 594
-e 100 59 59 100
-Q 0
-o jts21A
-v S
-h 2.0
-l 49 50
+S P 139
+s 20Jan2014[10:31.23]
+d 100 0 0 100
+P 931 861
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 140 141
 c 285 287
 
 Z
 
-L 34 1
-s 32 33
-
-L 53 1
-s 52 32
-
-L 35 1
-s 33 38
-
-L 54 1
-s 38 52
-
-L 44 1
-s 42 43
-
-L 49 1
-s 48 42
-
-L 45 1
-s 43 47
-
-L 50 1
-s 47 48
+L 164 1
+s 162 163
+
+L 181 1
+s 179 162
+
+L 165 1
+s 163 178
+
+L 170 1
+s 168 169
+
+L 177 1
+s 175 168
+
+L 171 1
+s 169 174
+
+L 176 1
+s 174 175
+
+L 180 1
+s 178 179
+
+L 152 1
+s 154 151
+
+L 153 1
+s 151 155
+
+L 158 1
+s 157 154
+
+L 156 1
+s 155 157
+
+L 135 1
+s 133 134
+
+L 140 1
+s 139 133
+
+L 136 1
+s 134 138
+
+L 141 1
+s 138 139
 
 Z
 
+C 700 3
+s 162 163
+
+C 701 2
+s 179 162
+
+C 702 2
+s 163 178
+
+C 704 3
+s 168 169
+
+C 705 2
+s 175 168
+
+C 706 2
+s 169 174
+
+C 707 3
+s 174 175
+
+C 703 3
+s 178 179
+
 C 280 3
-s 32 33
+s 154 151
+
+C 282 2
+s 151 155
 
 C 281 2
-s 52 32
-
-C 282 2
-s 33 38
+s 157 154
 
 C 283 3
-s 38 52
+s 155 157
 
 C 284 3
-s 42 43
+s 133 134
 
 C 285 2
-s 48 42
+s 139 133
 
 C 286 2
-s 43 47
+s 134 138
 
 C 287 3
-s 47 48
+s 138 139
 
 Z
 
-ActiveTime:00:02:54
+ActiveTime:00:05:39
 DarkTime:00:00:00
-45:00:385 397 552 Md
-45:00:512 397 552 Mu
-45:00:793 401 564 Md
-45:00:904 401 564 Mu
-45:01:545 975 366 Ld
-45:01:555 975 366 Rd
-45:02:782 640 626 kLeft
+12:10:091 1074 490 Rd
+12:10:162 1074 490 Ru
+12:11:732 12 124 Rd
+12:11:826 12 124 Ru
+12:12:595 1182 336 Ld
+12:12:714 1182 336 Lu

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

@@ -1 @@
-V 24
+V 31
 U jts21A
 D 20Jan2014[10:35]
 M jts21A
-d 21Jan2014[10:44]
+d 21Jan2014[14:34]
 Z
 
@@ -51 +51 @@
 h -1.0
 
-S T 259
-s 20Jan2014[10:35.17]
-P 14 161
-T if(frame.getItemWithID(6) != null)
-Q 0
-o jts21A
-v S
-f tr18
-t -1.0
-b 0.0
-m 0.0
-w 974
-h -1.0
-
-S P 240
-s 20Jan2014[10:35.17]
-d 100 0 0 100
-P 1014 175
-e 100 59 59 100
-Q 0
-o jts21A
-v S
-h 2.0
-l 242 298
+S T 359
+s 21Jan2014[14:12.11]
+P 27 157
+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 360
+s 21Jan2014[14:12.11]
+P 50 188
+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 361
+s 21Jan2014[14:12.11]
+P 65 223
+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 413
+s 21Jan2014[14:12.11]
+d 100 0 0 100
+P 974 234
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 415 432
+c 259 260
+
+S P 414
+s 21Jan2014[14:12.11]
+d 100 0 0 100
+P 33 234
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 415 416
+c 259 261
+
+S T 417
+s 21Jan2014[14:12.11]
+P 50 263
+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 418
+s 21Jan2014[14:12.11]
+P 54 300
+T if(t.getData() != null && t.getData().contains("itemToDelete"))
+Q 0
+o jts21A
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+w 974
+h -1.0
+
+S P 419
+s 21Jan2014[14:12.11]
+d 0 0 100 100
+P 253 329
+e 59 59 100 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 421 428
+c 263 264
+
+S P 420
+s 21Jan2014[14:12.11]
+d 0 0 100 100
+P 80 329
+e 59 59 100 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 421 422
+c 263 265
+
+S T 423
+s 21Jan2014[14:12.11]
+P 104 355
+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 424
+s 21Jan2014[14:12.11]
+P 110 388
+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 425
+s 21Jan2014[14:12.11]
+d 0 0 100 100
+P 80 400
+e 59 59 100 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 422 427
+c 265 266
+
+S P 426
+s 21Jan2014[14:12.11]
+d 0 0 100 100
+P 253 400
+e 59 59 100 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 428 427
+c 264 266
+
+S P 429
+s 21Jan2014[14:12.11]
+d 100 0 0 100
+P 33 421
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 416 431
+c 261 262
+
+S P 430
+s 21Jan2014[14:12.11]
+d 100 0 0 100
+P 974 421
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 432 431
+c 260 262
+
+S T 435
+s 21Jan2014[14:17.02]
+P 76 462
+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 634
+s 20Jan2014[10:35.17]
+d 100 0 0 100
+P 37 482
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 637 635
+c 113 115
+
+S P 636
+s 20Jan2014[10:35.17]
+d 100 0 0 100
+P 1034 482
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 637 669
 c 113 114
 
-S P 241
-s 20Jan2014[10:35.17]
-d 100 0 0 100
-P 16 175
-e 100 59 59 100
-Q 0
-o jts21A
-v S
-h 2.0
-l 242 243
-c 113 115
-
-S T 244
-s 20Jan2014[10:35.17]
-P 30 215
+S T 638
+s 20Jan2014[10:35.17]
+P 58 513
 T frame.addText(70, 277, "Shape deletion deletes all items within the shape,\nunless you are hovering the edge of the shape or holding shift", null)
 Q 0
@@ -103 +297 @@
 h -1.0
 
-S T 285
-s 20Jan2014[10:35.17]
-P 30 280
+S T 639
+s 20Jan2014[10:35.17]
+P 72 570
 T frame.addText(70, 332, "Delete all the items in the shape (by deleting the shape),", null)
 Q 0
@@ -117 +311 @@
 h -1.0
 
-S T 246
+S T 640
 s 20Jan2014[10:50.59]
-P 30 324
+P 72 604
 T frame.addText(70, 366, "Then click here to continue", "runJSFrame", "Tutorials14")
 Q 0
@@ -131 +325 @@
 h -1.0
 
-S T 247
-s 20Jan2014[10:39.02]
-P 30 368
-T frame.addRectangle(650, 250, 300, 200, 1, Item.COLOR_WHEEL[0], Item.FILL_COLOR_WHEEL[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 248
-s 20Jan2014[10:48.57]
-P 30 412
-T itemsInRectangle = []
-Q 0
-o jts21A
-v S
-f tr18
-t -1.0
-b 0.0
-m 0.0
-w 974
-h -1.0
-
-S T 249
+S T 641
+s 21Jan2014[14:24.36]
+P 71 647
+T var rect = frame.addRectangle(650, 250, 300, 200, 1, Color.RED, UserSettings.FillColorWheel.get()[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 766
+s 21Jan2014[14:31.58]
+P 71 683
+T iterator = rect.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 765
+s 21Jan2014[14:25.04]
+P 72 721
+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 754
+s 21Jan2014[14:25.17]
+d 0 0 100 100
+P 457 742
+e 59 59 100 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 756 764
+c 576 579
+
+S P 755
+s 21Jan2014[14:25.17]
+d 0 0 100 100
+P 81 742
+e 59 59 100 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 756 757
+c 576 578
+
+S T 759
+s 21Jan2014[14:25.36]
+P 122 771
+T var rect_part = 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 760
+s 21Jan2014[14:25.48]
+P 122 807
+T rect_part.setData("itemsToDelete")
+Q 0
+o jts21A
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+w 974
+h -1.0
+
+S P 761
+s 21Jan2014[14:25.17]
+d 0 0 100 100
+P 81 843
+e 59 59 100 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 757 763
+c 578 577
+
+S P 762
+s 21Jan2014[14:25.17]
+d 0 0 100 100
+P 457 843
+e 59 59 100 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 764 763
+c 579 577
+
+S T 653
 s 20Jan2014[10:49.06]
-P 30 456
-T itemsInRectangle.push(frame.addText(700, 300, "Delete", null).getID())
-Q 0
-o jts21A
-v S
-f tr18
-t -1.0
-b 0.0
-m 0.0
-w 974
-h -1.0
-
-S T 284
+P 66 875
+T frame.addText(700, 300, "Delete", null).setData("itemsToDelete")
+Q 0
+o jts21A
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+w 974
+h -1.0
+
+S T 665
+s 20Jan2014[10:49.29]
+P 69 930
+T frame.addText(780, 310, "the", null).setData("itemsToDelete")
+Q 0
+o jts21A
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+
+S T 666
 s 20Jan2014[10:49.27]
-P 30 500
-T itemsInRectangle.push(frame.addText(720, 370, "shape", null).getID())
-Q 0
-o jts21A
-v S
-f tr18
-t -1.0
-b 0.0
-m 0.0
-h -1.0
-
-S T 283
+P 69 979
+T frame.addText(720, 370, "shape", null).setData("itemsToDelete")
+Q 0
+o jts21A
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+
+S T 663
+s 20Jan2014[10:50.02]
+P 63 1029
+T frame.addText(790, 360, "enclosing", null).setData("itemsToDelete")
+Q 0
+o jts21A
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+
+S T 667
 s 20Jan2014[10:49.28]
-P 30 544
-T itemsInRectangle.push(frame.addText(740, 420, "us", null).getID())
-Q 0
-o jts21A
-v S
-f tr18
-t -1.0
-b 0.0
-m 0.0
-h -1.0
-
-S T 282
-s 20Jan2014[10:49.29]
-P 30 588
-T itemsInRectangle.push(frame.addText(780, 310, "the", null).getID())
-Q 0
-o jts21A
-v S
-f tr18
-t -1.0
-b 0.0
-m 0.0
-h -1.0
-
-S T 281
-s 20Jan2014[10:50.02]
-P 30 632
-T itemsInRectangle.push(frame.addText(790, 360, "enclosing", null).getID())
-Q 0
-o jts21A
-v S
-f tr18
-t -1.0
-b 0.0
-m 0.0
-h -1.0
-
-S P 254
-s 20Jan2014[10:35.17]
-d 100 0 0 100
-P 16 659
-e 100 59 59 100
-Q 0
-o jts21A
-v S
-h 2.0
-l 243 299
+P 76 1083
+T frame.addText(740, 420, "us", null).setData("itemsToDelete")
+Q 0
+o jts21A
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+
+S P 658
+s 20Jan2014[10:35.17]
+d 100 0 0 100
+P 37 1110
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 635 670
 c 115 116
 
-S P 297
-s 20Jan2014[10:35.17]
-d 100 0 0 100
-P 1014 659
-e 100 59 59 100
-Q 0
-o jts21A
-v S
-h 2.0
-l 298 299
+S P 668
+s 20Jan2014[10:35.17]
+d 100 0 0 100
+P 1034 1110
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 669 670
 c 114 116
 
-S T 296
-s 20Jan2014[10:35.17]
-P 23 692
+S T 521
+s 20Jan2014[10:35.17]
+P 41 1455
 T else
 Q 0
@@ -263 +547 @@
 h -1.0
 
-S P 287
-s 20Jan2014[10:35.17]
-d 100 0 0 100
-P 15 721
-e 100 59 59 100
-Q 0
-o jts21A
-v S
-h 2.0
-l 289 290
+S P 512
+s 20Jan2014[10:35.17]
+d 100 0 0 100
+P 37 1480
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 514 515
 c 117 119
 
-S P 288
-s 20Jan2014[10:35.17]
-d 100 0 0 100
-P 914 721
-e 100 59 59 100
-Q 0
-o jts21A
-v S
-h 2.0
-l 289 294
+S P 513
+s 20Jan2014[10:35.17]
+d 100 0 0 100
+P 936 1480
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 514 519
 c 117 118
 
-S T 291
-s 20Jan2014[10:35.17]
-P 41 754
+S T 516
+s 20Jan2014[10:35.17]
+P 63 1513
 T org.expeditee.gui.MessageBay.errorMessage("You need to un-delete the item to continue")
 Q 0
@@ -301 +585 @@
 h -1.0
 
-S P 292
-s 20Jan2014[10:35.17]
-d 100 0 0 100
-P 15 775
-e 100 59 59 100
-Q 0
-o jts21A
-v S
-h 2.0
-l 290 295
+S P 517
+s 20Jan2014[10:35.17]
+d 100 0 0 100
+P 37 1534
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 515 520
 c 119 120
 
-S P 293
-s 20Jan2014[10:35.17]
-d 100 0 0 100
-P 914 775
-e 100 59 59 100
-Q 0
-o jts21A
-v S
-h 2.0
-l 294 295
+S P 518
+s 20Jan2014[10:35.17]
+d 100 0 0 100
+P 936 1534
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 519 520
 c 118 120
 
 Z
 
-L 242 1
-s 240 241
-
-L 298 1
-s 297 240
-
-L 243 1
-s 241 254
-
-L 299 1
-s 254 297
-
-L 289 1
-s 288 287
-
-L 290 1
-s 287 292
-
-L 294 1
-s 293 288
-
-L 295 1
-s 292 293
+L 415 1
+s 413 414
+
+L 432 1
+s 430 413
+
+L 416 1
+s 414 429
+
+L 421 1
+s 419 420
+
+L 428 1
+s 426 419
+
+L 422 1
+s 420 425
+
+L 427 1
+s 425 426
+
+L 431 1
+s 429 430
+
+L 637 1
+s 636 634
+
+L 635 1
+s 634 658
+
+L 669 1
+s 668 636
+
+L 756 1
+s 754 755
+
+L 764 1
+s 762 754
+
+L 757 1
+s 755 761
+
+L 763 1
+s 761 762
+
+L 670 1
+s 658 668
+
+L 514 1
+s 513 512
+
+L 515 1
+s 512 517
+
+L 519 1
+s 518 513
+
+L 520 1
+s 517 518
 
 Z
 
+C 259 3
+s 413 414
+
+C 260 2
+s 430 413
+
+C 261 2
+s 414 429
+
+C 263 3
+s 419 420
+
+C 264 2
+s 426 419
+
+C 265 2
+s 420 425
+
+C 266 3
+s 425 426
+
+C 262 3
+s 429 430
+
 C 113 3
-s 240 241
+s 636 634
+
+C 115 2
+s 634 658
 
 C 114 2
-s 297 240
-
-C 115 2
-s 241 254
+s 668 636
+
+C 576 3
+s 754 755
+
+C 579 2
+s 762 754
+
+C 578 2
+s 755 761
+
+C 577 3
+s 761 762
 
 C 116 3
-s 254 297
+s 658 668
 
 C 117 3
-s 288 287
+s 513 512
 
 C 119 2
-s 287 292
+s 512 517
 
 C 118 2
-s 293 288
+s 518 513
 
 C 120 3
-s 292 293
+s 517 518
 
 Z
 
-ActiveTime:00:12:50
-DarkTime:00:00:00
-44:13:482 876 619 Md
-44:13:577 876 621 Mu
-44:14:265 866 706 Md
-44:14:368 866 706 Mu
-44:15:129 49 573 Md
-44:15:216 49 573 Mu
-44:15:873 44 638 Md
-44:15:992 44 638 Mu
-44:17:257 1011 564 Md
-44:17:344 1011 564 Mu
-44:19:143 1013 610 Md
-44:19:192 1010 610 Mu
-44:19:930 283 526 Md
-44:20:025 283 527 Mu
-44:20:490 287 561 Md
-44:20:593 287 561 Mu
-44:21:098 182 491 Md
-44:21:177 182 491 Mu
-44:22:170 186 522 Md
-44:22:265 186 522 Mu
-44:22:714 169 462 Md
-44:22:801 169 463 Mu
-44:23:194 171 486 Md
-44:23:281 171 486 Mu
-44:23:965 172 429 Md
-44:24:081 172 429 Mu
-44:24:682 164 442 Md
-44:24:785 164 442 Mu
-44:25:426 856 472 Ld
-44:25:436 856 472 Rd
-44:30:737 173 266 Md
-44:30:849 173 266 Mu
-44:31:802 171 274 Md
-44:31:921 171 274 Mu
-44:32:521 817 509 Ld
-44:32:537 817 509 Rd
-44:34:257 43 642 Md
-44:34:376 43 643 Mu
-44:34:913 35 651 Md
-44:35:016 35 651 Mu
-44:35:530 38 689 Md
-44:35:633 38 689 Mu
-44:36:065 35 733 Md
-44:36:192 35 733 Mu
-44:36:657 35 652 Md
-44:36:768 35 652 Mu
-44:37:265 35 687 Md
-44:37:360 35 687 Mu
-44:38:449 1012 609 Md
-44:38:537 1012 609 Mu
-44:40:241 1014 659 Md
-44:40:336 1014 659 Mu
-44:40:777 925 563 Ld
-44:40:793 925 563 Rd
-44:57:217 1243 398 Ld
-44:57:280 1243 398 Lu
+ActiveTime:00:22:16
+DarkTime:00:06:24
+34:45:909 185 445 kWindows
+34:48:649 539 669 Rd
+34:48:665 539 669 Md
+34:51:200 1227 661 Ld
+34:51:311 1227 661 Lu

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

@@ -1 @@
-V 18
+V 20
 U jts21A
 D 20Jan2014[10:38]
 M jts21A
-d 21Jan2014[10:45]
+d 21Jan2014[14:29]
 Z
 
@@ -21 +21 @@
 h -1.0
 
-S T 346
-s 20Jan2014[10:45.06]
+S T 490
+s 21Jan2014[14:27.24]
 d 50 50 50 100
-P 21 145
+P 56 122
 T @functions
 F Javascript1
@@ -37 +37 @@
 h -1.0
 
-S T 353
-s 20Jan2014[10:45.06]
-P 15 183
+S T 491
+s 21Jan2014[14:27.24]
+P 49 157
 T var frame = loadTutorialFrame(11)
 Q 0
@@ -51 +51 @@
 h -1.0
 
-S T 354
-s 20Jan2014[10:52.28]
-P 21 218
+S T 492
+s 21Jan2014[14:27.24]
+P 59 191
+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 493
+s 21Jan2014[14:27.24]
+P 82 222
 T var success = true
 Q 0
@@ -65 +79 @@
 h -1.0
 
-S T 355
-s 20Jan2014[10:52.53]
-P 25 257
-T for(i in itemsInRectangle)
-Q 0
-o jts21A
-v S
-f tr18
-t -1.0
-b 0.0
-m 0.0
-w 974
-h -1.0
-
-S P 123
-s 20Jan2014[10:53.10]
-d 100 0 0 100
-P 629 282
-e 100 59 59 100
-Q 0
-o jts21A
-v S
-h 2.0
-l 127 334
-c 119 122
-
-S P 124
-s 20Jan2014[10:53.10]
-d 100 0 0 100
-P 31 282
-e 100 59 59 100
-Q 0
-o jts21A
-v S
-h 2.0
-l 127 175
-c 119 121
-
-S T 136
-s 20Jan2014[10:53.15]
-P 51 314
-T if(frame.getItemWithID(itemsInRectangle[i]) != null)
-Q 0
-o jts21A
-v S
-f tr18
-t -1.0
-b 0.0
-m 0.0
-w 974
-h -1.0
-
-S P 336
-s 20Jan2014[10:53.35]
+S T 494
+s 21Jan2014[14:27.24]
+P 97 257
+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 383
+s 21Jan2014[14:27.24]
+d 100 0 0 100
+P 1023 271
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 496 518
+c 739 740
+
+S P 495
+s 21Jan2014[14:27.24]
+d 100 0 0 100
+P 104 271
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 496 497
+c 739 741
+
+S T 498
+s 21Jan2014[14:27.24]
+P 121 300
+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 499
+s 21Jan2014[14:27.24]
+P 125 337
+T if(t.getData() != null && t.getData().contains("itemsToDelete"))
+Q 0
+o jts21A
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+w 974
+h -1.0
+
+S P 500
+s 21Jan2014[14:27.24]
 d 0 0 100 100
-P 592 332
+P 324 366
 e 59 59 100 100
 Q 0
@@ -126 +154 @@
 v S
 h 2.0
-l 338 343
-c 152 155
-
-S P 337
-s 20Jan2014[10:53.35]
+l 502 509
+c 743 744
+
+S P 501
+s 21Jan2014[14:27.24]
 d 0 0 100 100
-P 62 332
+P 151 366
 e 59 59 100 100
 Q 0
@@ -138 +166 @@
 v S
 h 2.0
-l 338 339
-c 152 154
-
-S T 340
-s 20Jan2014[10:53.38]
-P 76 357
+l 502 503
+c 743 745
+
+S T 504
+s 21Jan2014[14:27.24]
+P 175 392
 T success = false
 Q 0
@@ -155 +183 @@
 h -1.0
 
-S P 341
-s 20Jan2014[10:53.35]
+S T 505
+s 21Jan2014[14:27.24]
+P 181 425
+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 506
+s 21Jan2014[14:27.24]
 d 0 0 100 100
-P 62 371
+P 151 437
 e 59 59 100 100
 Q 0
@@ -164 +206 @@
 v S
 h 2.0
-l 339 344
-c 154 153
-
-S P 342
-s 20Jan2014[10:53.35]
+l 503 508
+c 745 746
+
+S P 507
+s 21Jan2014[14:27.24]
 d 0 0 100 100
-P 592 371
+P 324 437
 e 59 59 100 100
 Q 0
@@ -176 +218 @@
 v S
 h 2.0
-l 343 344
-c 155 153
-
-S P 174
-s 20Jan2014[10:53.10]
-d 100 0 0 100
-P 31 390
-e 100 59 59 100
-Q 0
-o jts21A
-v S
-h 2.0
-l 175 335
-c 121 120
-
-S P 333
-s 20Jan2014[10:53.10]
-d 100 0 0 100
-P 629 390
-e 100 59 59 100
-Q 0
-o jts21A
-v S
-h 2.0
-l 334 335
-c 122 120
-
-S T 194
+l 508 509
+c 744 746
+
+S P 510
+s 21Jan2014[14:27.24]
+d 100 0 0 100
+P 104 462
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 497 517
+c 741 742
+
+S P 516
+s 21Jan2014[14:27.24]
+d 100 0 0 100
+P 1023 462
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 517 518
+c 740 742
+
+S T 585
 s 20Jan2014[10:55.02]
-P 21 418
+P 46 518
 T if(success)
 Q 0
@@ -217 +259 @@
 h -1.0
 
-S P 319
+S P 586
 s 20Jan2014[10:46.44]
 d 100 0 0 100
-P 24 433
-e 100 59 59 100
-Q 0
-o jts21A
-v S
-h 2.0
-l 330 322
+P 1030 543
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 588 593
+c 75 78
+
+S P 587
+s 20Jan2014[10:46.44]
+d 100 0 0 100
+P 46 543
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 588 589
 c 75 77
 
-S P 329
+S T 590
+s 20Jan2014[10:45.06]
+P 63 583
+T frame.addText(70, 400, "Similarly, un-deleting a shape will\nun-delete all the items that were deleted with it", 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 591
+s 20Jan2014[10:45.06]
+P 63 658
+T frame.addText(70, 455, "Un-delete the shape, then click here to continue", "runJSFrame", "Tutorials15")
+Q 0
+o jts21A
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+w 974
+h -1.0
+
+S P 592
 s 20Jan2014[10:46.44]
 d 100 0 0 100
-P 1024 433
-e 100 59 59 100
-Q 0
-o jts21A
-v S
-h 2.0
-l 330 331
-c 75 78
-
-S T 332
-s 20Jan2014[10:45.06]
-P 41 473
-T frame.addText(70, 400, "Similarly, un-deleting a shape will\nun-delete all the items that were deleted with it", 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 324
-s 20Jan2014[10:45.06]
-P 41 548
-T frame.addText(70, 455, "Un-delete the shape, then click here to continue", "runJSFrame", "Tutorials15")
-Q 0
-o jts21A
-v S
-f tr18
-t -1.0
-b 0.0
-m 0.0
-w 974
-h -1.0
-
-S P 325
+P 1030 686
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 593 595
+c 78 76
+
+S P 594
 s 20Jan2014[10:46.44]
 d 100 0 0 100
-P 24 576
-e 100 59 59 100
-Q 0
-o jts21A
-v S
-h 2.0
-l 322 328
+P 46 686
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 589 595
 c 77 76
 
-S P 326
-s 20Jan2014[10:46.44]
-d 100 0 0 100
-P 1024 576
-e 100 59 59 100
-Q 0
-o jts21A
-v S
-h 2.0
-l 331 328
-c 78 76
-
-S T 318
-s 20Jan2014[10:45.06]
-P 36 624
+S T 600
+s 20Jan2014[10:45.06]
+P 47 735
 T else
 Q 0
@@ -307 +349 @@
 h -1.0
 
-S P 309
-s 20Jan2014[10:45.06]
-d 100 0 0 100
-P 932 647
-e 100 59 59 100
-Q 0
-o jts21A
-v S
-h 2.0
-l 311 316
+S P 601
+s 20Jan2014[10:45.06]
+d 100 0 0 100
+P 945 762
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 603 608
 c 165 166
 
-S P 310
-s 20Jan2014[10:45.06]
-d 100 0 0 100
-P 28 647
-e 100 59 59 100
-Q 0
-o jts21A
-v S
-h 2.0
-l 311 312
+S P 602
+s 20Jan2014[10:45.06]
+d 100 0 0 100
+P 41 762
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 603 604
 c 165 167
 
-S T 313
-s 20Jan2014[10:45.06]
-P 60 675
+S T 605
+s 20Jan2014[10:45.06]
+P 73 790
 T org.expeditee.gui.MessageBay.errorMessage("You need to delete the shape to continue")
 Q 0
@@ -345 +387 @@
 h -1.0
 
-S P 314
-s 20Jan2014[10:45.06]
-d 100 0 0 100
-P 28 713
-e 100 59 59 100
-Q 0
-o jts21A
-v S
-h 2.0
-l 312 317
+S P 606
+s 20Jan2014[10:45.06]
+d 100 0 0 100
+P 41 828
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 604 609
 c 167 168
 
-S P 315
-s 20Jan2014[10:45.06]
-d 100 0 0 100
-P 932 713
-e 100 59 59 100
-Q 0
-o jts21A
-v S
-h 2.0
-l 316 317
+S P 607
+s 20Jan2014[10:45.06]
+d 100 0 0 100
+P 945 828
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 608 609
 c 166 168
 
 Z
 
-L 127 1
-s 123 124
-
-L 334 1
-s 333 123
-
-L 175 1
-s 124 174
-
-L 338 1
-s 336 337
-
-L 343 1
-s 342 336
-
-L 339 1
-s 337 341
-
-L 344 1
-s 341 342
-
-L 335 1
-s 174 333
-
-L 330 1
-s 329 319
-
-L 322 1
-s 319 325
-
-L 331 1
-s 326 329
-
-L 328 1
-s 325 326
-
-L 311 1
-s 309 310
-
-L 316 1
-s 315 309
-
-L 312 1
-s 310 314
-
-L 317 1
-s 314 315
+L 496 1
+s 383 495
+
+L 518 1
+s 516 383
+
+L 497 1
+s 495 510
+
+L 502 1
+s 500 501
+
+L 509 1
+s 507 500
+
+L 503 1
+s 501 506
+
+L 508 1
+s 506 507
+
+L 517 1
+s 510 516
+
+L 588 1
+s 586 587
+
+L 593 1
+s 592 586
+
+L 589 1
+s 587 594
+
+L 595 1
+s 594 592
+
+L 603 1
+s 601 602
+
+L 608 1
+s 607 601
+
+L 604 1
+s 602 606
+
+L 609 1
+s 606 607
 
 Z
 
-C 119 3
-s 123 124
-
-C 122 2
-s 333 123
-
-C 121 2
-s 124 174
-
-C 152 3
-s 336 337
-
-C 155 2
-s 342 336
-
-C 154 2
-s 337 341
-
-C 153 3
-s 341 342
-
-C 120 3
-s 174 333
+C 739 3
+s 383 495
+
+C 740 2
+s 516 383
+
+C 741 2
+s 495 510
+
+C 743 3
+s 500 501
+
+C 744 2
+s 507 500
+
+C 745 2
+s 501 506
+
+C 746 3
+s 506 507
+
+C 742 3
+s 510 516
 
 C 75 3
-s 329 319
+s 586 587
+
+C 78 2
+s 592 586
 
 C 77 2
-s 319 325
-
-C 78 2
-s 326 329
+s 587 594
 
 C 76 3
-s 325 326
+s 594 592
 
 C 165 3
-s 309 310
+s 601 602
 
 C 166 2
-s 315 309
+s 607 601
 
 C 167 2
-s 310 314
+s 602 606
 
 C 168 3
-s 314 315
+s 606 607
 
 Z
 
-ActiveTime:00:05:47
+ActiveTime:00:07:27
 DarkTime:00:00:00
-45:17:785 837 605 Md
-45:17:896 837 605 Mu
-45:18:441 861 676 Md
-45:18:536 861 676 Mu
-45:19:457 38 560 Md
-45:19:585 39 564 Mu
-45:20:008 51 621 Md
-45:20:130 64 626 Mu
-45:20:874 974 494 Md
-45:20:977 977 499 Mu
-45:21:694 997 538 Md
-45:21:816 997 538 Mu
-45:22:714 1024 473 Md
-45:22:825 1024 473 Mu
-45:23:441 1024 433 Md
-45:23:536 1024 433 Mu
-45:24:073 487 490 Md
-45:24:161 487 490 Mu
-45:24:633 492 468 Md
-45:24:729 492 468 Mu
-45:25:345 1000 510 Ld
-45:25:377 1000 510 Rd
-45:27:689 611 384 Md
-45:27:800 611 384 Mu
-45:28:241 629 390 Md
-45:28:328 629 390 Mu
-45:28:769 499 357 Md
-45:28:850 499 357 Mu
-45:30:025 491 360 Md
-45:30:129 491 360 Mu
-45:31:745 121 255 Md
-45:31:832 121 255 Mu
-45:32:354 119 252 Md
-45:32:472 119 252 Mu
-45:33:049 67 159 Md
-45:33:144 67 159 Mu
-45:33:409 65 136 Md
-45:33:488 65 136 Mu
-45:33:801 89 183 Md
-45:33:880 89 183 Mu
-45:34:441 162 157 Md
-45:34:464 162 157 Rd
-45:34:881 139 204 Md
-45:34:985 144 202 Mu
-45:35:346 149 182 Md
-45:35:448 146 184 Mu
-45:35:833 134 227 Md
-45:35:904 134 227 Mu
-45:36:241 147 210 Md
-45:36:304 147 210 Mu
-45:36:657 153 246 Md
-45:36:768 153 246 Mu
-45:37:073 164 242 Md
-45:37:184 164 242 Mu
-45:38:558 837 280 kRight
+29:57:129 49 173 Rd
+29:57:232 49 173 Ru
+29:58:401 1201 482 Rd
+29:58:480 1201 482 Ru
+29:59:032 1120 491 Ld
+29:59:152 1120 491 Lu

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

@@ -1 @@
-V 19
+V 23
 U jts21A
 D 20Jan2014[10:56]
 M jts21A
-d 21Jan2014[10:46]
+d 21Jan2014[14:35]
 Z
 
@@ -51 +51 @@
 h -1.0
 
-S T 90
-s 20Jan2014[10:56.12]
+S T 303
+s 21Jan2014[14:29.47]
 P 42 165
+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 304
+s 21Jan2014[14:29.58]
+P 47 199
+T var iterator = frame.getAllItems().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 305
+s 21Jan2014[14:29.58]
+P 70 230
 T var success = true
 Q 0
@@ -65 +93 @@
 h -1.0
 
-S T 265
-s 20Jan2014[10:56.12]
-P 42 201
-T for(i in itemsInRectangle)
-Q 0
-o jts21A
-v S
-f tr18
-t -1.0
-b 0.0
-m 0.0
-w 974
-h -1.0
-
-S P 231
-s 20Jan2014[10:56.12]
-d 100 0 0 100
-P 616 233
-e 100 59 59 100
-Q 0
-o jts21A
-v S
-h 2.0
-l 233 251
-c 281 282
-
-S P 232
-s 20Jan2014[10:56.12]
-d 100 0 0 100
-P 24 233
-e 100 59 59 100
-Q 0
-o jts21A
-v S
-h 2.0
-l 233 234
-c 281 283
-
-S T 235
-s 20Jan2014[10:56.12]
-P 44 265
-T if(frame.getItemWithID(itemsInRectangle[i]) == null)
-Q 0
-o jts21A
-v S
-f tr18
-t -1.0
-b 0.0
-m 0.0
-w 974
-h -1.0
-
-S P 254
-s 20Jan2014[10:56.12]
+S T 306
+s 21Jan2014[14:29.58]
+P 85 265
+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 311
+s 21Jan2014[14:29.58]
+d 100 0 0 100
+P 686 279
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 319 342
+c 676 677
+
+S P 312
+s 21Jan2014[14:29.58]
+d 100 0 0 100
+P 92 279
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 319 320
+c 676 678
+
+S T 307
+s 21Jan2014[14:29.58]
+P 109 308
+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 308
+s 21Jan2014[14:29.58]
+P 113 345
+T if(t.getData() != null && t.getData().contains("itemsToDelete"))
+Q 0
+o jts21A
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+w 974
+h -1.0
+
+S P 315
+s 21Jan2014[14:29.58]
 d 0 0 100 100
-P 61 286
+P 290 374
 e 59 59 100 100
 Q 0
@@ -126 +168 @@
 v S
 h 2.0
-l 263 256
-c 285 287
-
-S P 262
-s 20Jan2014[10:56.12]
+l 323 333
+c 680 681
+
+S P 316
+s 21Jan2014[14:29.58]
 d 0 0 100 100
-P 591 286
+P 139 374
 e 59 59 100 100
 Q 0
@@ -138 +180 @@
 v S
 h 2.0
-l 263 264
-c 285 286
-
-S T 257
-s 20Jan2014[10:56.12]
-P 76 321
-T 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 P 258
-s 20Jan2014[10:56.12]
+l 323 324
+c 680 682
+
+S T 330
+s 21Jan2014[14:30.09]
+P 163 409
+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 317
+s 21Jan2014[14:29.58]
 d 0 0 100 100
-P 61 332
+P 139 432
 e 59 59 100 100
 Q 0
@@ -164 +206 @@
 v S
 h 2.0
-l 256 261
-c 287 288
-
-S P 259
-s 20Jan2014[10:56.12]
+l 324 332
+c 682 683
+
+S P 331
+s 21Jan2014[14:29.58]
 d 0 0 100 100
-P 591 332
+P 290 432
 e 59 59 100 100
 Q 0
@@ -176 +218 @@
 v S
 h 2.0
-l 264 261
-c 286 288
-
-S P 245
-s 20Jan2014[10:56.12]
-d 100 0 0 100
-P 24 344
-e 100 59 59 100
-Q 0
-o jts21A
-v S
-h 2.0
-l 234 252
-c 283 284
-
-S P 250
-s 20Jan2014[10:56.12]
-d 100 0 0 100
-P 616 344
-e 100 59 59 100
-Q 0
-o jts21A
-v S
-h 2.0
-l 251 252
-c 282 284
-
-S T 267
-s 20Jan2014[10:56.12]
-P 31 370
-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 218
+l 333 332
+c 681 683
+
+S P 313
+s 21Jan2014[14:29.58]
+d 100 0 0 100
+P 92 448
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 320 341
+c 678 679
+
+S P 340
+s 21Jan2014[14:29.58]
+d 100 0 0 100
+P 686 448
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 342 341
+c 677 679
+
+S T 346
+s 20Jan2014[10:56.12]
+P 39 501
+T if(count == 13)
+Q 0
+o jts21A
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+w 974
+h -1.0
+
+S P 347
 s 20Jan2014[10:58.27]
 d 100 0 0 100
-P 1005 390
-e 100 59 59 100
-Q 0
-o jts21A
-v S
-h 2.0
-l 220 228
+P 1028 527
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 349 357
 c 60 63
 
-S P 219
+S P 348
 s 20Jan2014[10:58.27]
 d 100 0 0 100
-P 13 390
-e 100 59 59 100
-Q 0
-o jts21A
-v S
-h 2.0
-l 220 221
+P 36 527
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 349 350
 c 60 62
 
-S T 222
+S T 351
 s 20Jan2014[14:44.40]
-P 24 417
+P 47 554
 T frame.addText(70, 489, "You can also delete only the enclosing shape (keeping the enclosed items),\nby deleting while hovering it's edge, or by holding shift while deleting it", null)
 Q 0
@@ -255 +297 @@
 h -1.0
 
-S T 223
+S T 352
 s 20Jan2014[11:00.26]
-P 24 488
+P 47 625
 T frame.addText(70, 544, "Click the background of the frame to return to the tutorials list", null)
 Q 0
@@ -269 +311 @@
 h -1.0
 
-S T 224
+S T 353
 s 20Jan2014[11:00.26]
-P 24 538
+P 47 675
 T frame = loadTutorialFrame(1)
 Q 0
@@ -283 +325 @@
 h -1.0
 
-S T 225
+S T 354
 s 20Jan2014[11:00.26]
-P 24 588
+P 47 725
 T setCompleted(frame.getItemWithID(241))
 Q 0
@@ -297 +339 @@
 h -1.0
 
-S P 226
+S P 355
 s 20Jan2014[10:58.27]
 d 100 0 0 100
-P 13 604
-e 100 59 59 100
-Q 0
-o jts21A
-v S
-h 2.0
-l 221 229
+P 36 741
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 350 358
 c 62 61
 
-S P 227
+S P 356
 s 20Jan2014[10:58.27]
 d 100 0 0 100
-P 1005 604
-e 100 59 59 100
-Q 0
-o jts21A
-v S
-h 2.0
-l 228 229
+P 1028 741
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 357 358
 c 63 61
 
-S T 268
-s 20Jan2014[10:56.12]
-P 39 635
+S T 359
+s 20Jan2014[10:56.12]
+P 32 779
 T else
 Q 0
@@ -335 +377 @@
 h -1.0
 
-S P 200
-s 20Jan2014[10:56.12]
-d 100 0 0 100
-P 922 654
-e 100 59 59 100
-Q 0
-o jts21A
-v S
-h 2.0
-l 201 207
+S P 360
+s 20Jan2014[10:56.12]
+d 100 0 0 100
+P 928 813
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 362 367
 c 289 290
 
-S P 202
-s 20Jan2014[10:56.12]
-d 100 0 0 100
-P 18 654
-e 100 59 59 100
-Q 0
-o jts21A
-v S
-h 2.0
-l 201 203
+S P 361
+s 20Jan2014[10:56.12]
+d 100 0 0 100
+P 24 813
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 362 363
 c 289 291
 
-S T 204
-s 20Jan2014[10:56.12]
-P 45 685
+S T 364
+s 20Jan2014[10:56.12]
+P 51 844
 T org.expeditee.gui.MessageBay.errorMessage("You need to un-delete the shape to continue")
 Q 0
@@ -373 +415 @@
 h -1.0
 
-S P 205
-s 20Jan2014[10:56.12]
-d 100 0 0 100
-P 922 720
-e 100 59 59 100
-Q 0
-o jts21A
-v S
-h 2.0
-l 207 206
+S P 365
+s 20Jan2014[10:56.12]
+d 100 0 0 100
+P 928 879
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 367 368
 c 290 292
 
-S P 208
-s 20Jan2014[10:56.12]
-d 100 0 0 100
-P 18 720
-e 100 59 59 100
-Q 0
-o jts21A
-v S
-h 2.0
-l 203 206
+S P 366
+s 20Jan2014[10:56.12]
+d 100 0 0 100
+P 24 879
+e 100 59 59 100
+Q 0
+o jts21A
+v S
+h 2.0
+l 363 368
 c 291 292
 
 Z
 
-L 233 1
-s 231 232
-
-L 251 1
-s 250 231
-
-L 234 1
-s 232 245
-
-L 263 1
-s 262 254
-
-L 256 1
-s 254 258
-
-L 264 1
-s 259 262
-
-L 261 1
-s 258 259
-
-L 252 1
-s 245 250
-
-L 220 1
-s 218 219
-
-L 228 1
-s 227 218
-
-L 221 1
-s 219 226
-
-L 229 1
-s 226 227
-
-L 201 1
-s 200 202
-
-L 207 1
-s 205 200
-
-L 203 1
-s 202 208
-
-L 206 1
-s 208 205
+L 319 1
+s 311 312
+
+L 342 1
+s 340 311
+
+L 320 1
+s 312 313
+
+L 323 1
+s 315 316
+
+L 333 1
+s 331 315
+
+L 324 1
+s 316 317
+
+L 332 1
+s 317 331
+
+L 341 1
+s 313 340
+
+L 349 1
+s 347 348
+
+L 357 1
+s 356 347
+
+L 350 1
+s 348 355
+
+L 358 1
+s 355 356
+
+L 362 1
+s 360 361
+
+L 367 1
+s 365 360
+
+L 363 1
+s 361 366
+
+L 368 1
+s 366 365
 
 Z
 
-C 281 3
-s 231 232
-
-C 282 2
-s 250 231
-
-C 283 2
-s 232 245
-
-C 285 3
-s 262 254
-
-C 287 2
-s 254 258
-
-C 286 2
-s 259 262
-
-C 288 3
-s 258 259
-
-C 284 3
-s 245 250
+C 676 3
+s 311 312
+
+C 677 2
+s 340 311
+
+C 678 2
+s 312 313
+
+C 680 3
+s 315 316
+
+C 681 2
+s 331 315
+
+C 682 2
+s 316 317
+
+C 683 3
+s 317 331
+
+C 679 3
+s 313 340
 
 C 60 3
-s 218 219
+s 347 348
 
 C 63 2
-s 227 218
+s 356 347
 
 C 62 2
-s 219 226
+s 348 355
 
 C 61 3
-s 226 227
+s 355 356
 
 C 289 3
-s 200 202
+s 360 361
 
 C 290 2
-s 205 200
+s 365 360
 
 C 291 2
-s 202 208
+s 361 366
 
 C 292 3
-s 208 205
+s 366 365
 
 Z
 
-ActiveTime:00:05:42
+ActiveTime:00:07:08
 DarkTime:00:00:00
-45:40:114 841 626 Md
-45:40:209 839 627 Mu
-45:42:217 844 624 Md
-45:42:312 844 624 Mu
-45:42:642 877 608 Md
-45:42:705 877 608 Mu
-45:43:385 872 651 Md
-45:43:480 872 651 Mu
-45:44:353 56 544 Md
-45:44:448 56 545 Mu
-45:44:890 58 575 Md
-45:44:984 58 575 Mu
-45:46:058 997 528 Md
-45:46:170 997 528 Mu
-45:46:809 1003 555 Md
-45:46:904 1003 555 Mu
-45:47:681 864 644 Md
-45:47:738 864 644 Mu
-45:48:465 862 692 Md
-45:48:552 864 692 Mu
-45:49:353 48 577 Md
-45:49:440 48 578 Mu
-45:49:897 38 626 Md
-45:49:944 38 626 Mu
-45:50:865 1001 553 Md
-45:50:937 1001 553 Mu
-45:51:393 1010 597 Md
-45:51:464 1010 598 Mu
-45:52:801 168 424 Md
-45:52:873 168 424 Mu
-45:54:045 167 431 Md
-45:54:201 167 432 Mu
-45:54:642 818 523 Ld
-45:54:652 818 523 Rd
-45:56:562 467 434 Md
-45:56:681 467 434 Mu
-45:57:227 469 441 Md
-45:57:281 469 441 Mu
-45:57:617 738 541 Ld
-45:57:633 738 541 Rd
-46:01:489 1012 592 Md
-46:01:600 1012 592 Mu
-46:02:424 1005 568 Md
-46:02:536 1004 568 Mu
-46:02:993 922 490 Md
-46:03:089 922 490 Mu
-46:04:153 922 526 Md
-46:04:248 922 526 Mu
-46:05:105 70 343 Md
-46:05:192 70 343 Mu
-46:05:761 66 373 Md
-46:05:864 67 373 Mu
-46:06:618 545 228 Md
-46:06:713 545 228 Mu
-46:07:337 541 256 Md
-46:07:440 541 256 Mu
-46:13:698 589 255 Ld
-46:13:705 589 255 Rd
-46:14:939 108 295 Md
-46:15:033 108 295 Mu
-46:16:697 142 298 Md
-46:16:785 142 298 Mu
-46:18:425 608 338 Md
-46:18:552 608 338 Mu
-46:19:257 616 344 Md
-46:19:328 616 344 Mu
-46:19:905 302 298 Md
-46:19:985 302 298 Mu
-46:20:945 300 311 Md
-46:21:072 300 311 Mu
-46:21:786 592 295 Md
-46:21:897 589 293 Mu
-46:22:210 591 286 Md
-46:22:297 591 286 Mu
-46:23:241 193 172 Md
-46:23:360 193 172 Mu
-46:24:065 194 184 Md
-46:24:192 192 184 Mu
-46:24:953 129 123 Md
-46:25:124 131 129 Mu
-46:25:401 132 133 Md
-46:25:512 132 133 Mu
-46:25:913 487 171 Ld
-46:25:928 487 171 Rd
-46:27:353 74 231 Md
-46:27:472 74 231 Mu
-46:28:361 63 364 Md
-46:28:456 63 364 Mu
-46:28:962 55 269 Md
-46:29:041 55 269 Mu
-46:30:065 52 631 Md
-46:30:184 52 631 Mu
-46:41:902 1413 704 kRight
+35:15:133 150 559 kBackspace
+35:15:301 138 571 kBackspace
+35:15:925 132 571 kBackspace
+35:16:277 118 571 kEquals
+35:16:373 132 571 kEquals
+35:16:445 146 571 kSpace
+35:16:621 152 571 k1
+35:16:709 163 571 k3
+35:17:581 293 507 kWindows
+35:21:216 140 507 Rd
+35:21:231 140 507 Md
+35:21:976 136 560 Md
+35:22:062 135 556 Mu
+35:22:560 130 486 Md
+35:22:655 130 486 Mu
+35:23:393 558 742 Md
+35:23:480 558 742 Mu
+35:24:104 561 686 Md
+35:24:183 561 686 Mu
+35:24:944 66 820 Md
+35:25:031 66 820 Mu
+35:25:688 68 766 Md
+35:25:783 68 766 Mu
+35:26:721 224 903 Md
+35:26:832 224 903 Mu
+35:27:416 226 864 Md
+35:27:511 226 864 Mu
+35:28:008 264 922 Ld
+35:28:079 264 922 Lu

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

@@ -1 @@
-V 92
+V 101
 U jts21A
 D 20Jan2014[10:03]
 M jts21A
-d 21Jan2014[10:55]
+d 21Jan2014[14:36]
 Z
 
@@ -57 +57 @@
 Z
 
-ActiveTime:00:17:46
+ActiveTime:00:18:26
 DarkTime:00:01:37
-55:25:863 820 564 Rd
-55:25:952 809 558 Ru
-55:27:536 19 192 Md
-55:27:599 19 192 Mu
-55:30:912 57 221 Rd
-55:30:918 57 221 Md
-55:31:607 53 295 Ld
-55:31:687 53 295 Lu
+36:14:320 36 196 Md
+36:14:391 36 196 Mu
+36:14:824 748 285 Md
+36:14:832 748 285 Rd
+36:16:077 575 406 kWindows
+36:18:408 739 320 Ld
+36:18:511 739 320 Lu

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

@@ -1 @@
-V 41
+V 42
 U jts21A
 D 20Jan2014[10:06]
 M jts21A
-d 21Jan2014[10:43]
+d 21Jan2014[13:41]
 Z
 
@@ -527 +527 @@
 Z
 
-ActiveTime:00:12:25
+ActiveTime:00:12:44
 DarkTime:00:01:27
-40:45:481 874 388 Md
-40:45:569 874 388 Mu
-40:47:106 994 397 Md
-40:47:201 994 397 Mu
-40:48:169 195 208 Md
-40:48:265 193 208 Mu
-40:48:778 172 206 Md
-40:48:873 172 206 Mu
-40:49:500 318 248 Md
-40:49:562 316 249 Mu
-40:50:409 293 246 Md
-40:50:473 293 246 Mu
-40:51:753 83 409 Md
-40:51:841 83 409 Mu
-40:52:594 85 414 Md
-40:52:713 85 414 Mu
-40:53:911 108 453 Md
-40:53:970 108 453 Mu
-40:54:923 104 454 Md
-40:55:009 104 454 Mu
-40:56:099 123 489 Md
-40:56:202 121 490 Mu
-40:57:010 118 491 Md
-40:57:106 118 491 Mu
-40:58:594 40 569 Md
-40:58:673 40 569 Mu
-40:59:202 36 570 Md
-40:59:289 36 570 Mu
-40:59:810 47 614 Md
-40:59:889 47 614 Mu
-41:00:769 31 615 Md
-41:00:881 31 615 Mu
-41:01:242 60 608 Md
-41:01:354 60 608 Mu
-41:01:905 52 611 Md
-41:01:938 52 611 Mu
-41:46:703 216 506 kCtrl
-41:46:735 216 506 kAlt
-42:27:183 216 506 kWindows
-42:29:522 633 633 Md
-42:29:633 633 633 Mu
-42:30:225 651 728 Md
-42:30:288 651 728 Mu
-42:31:009 56 576 Md
-42:31:116 57 589 Mu
-42:31:649 63 658 Md
-42:31:744 62 658 Mu
-42:32:506 853 484 Md
-42:32:585 855 486 Mu
-42:33:265 869 527 Md
-42:33:385 869 527 Mu
-42:36:050 1021 486 Md
-42:36:120 1021 486 Mu
-42:37:594 1023 -400 kCtrl
-42:39:121 1004 473 Md
-42:39:192 1004 473 Mu
-42:39:658 529 497 Md
-42:39:769 528 497 Mu
-42:40:346 535 493 Md
-42:40:425 535 493 Mu
-42:41:330 216 526 Md
-42:41:393 216 526 Mu
-42:41:970 224 527 Md
-42:42:025 224 527 Mu
-42:44:106 250 562 Md
-42:44:201 250 563 Mu
-42:44:930 259 565 Md
-42:45:041 259 565 Mu
-42:49:994 153 725 Md
-42:50:073 154 725 Mu
-42:51:058 151 770 Md
-42:51:152 151 770 Mu
-42:51:641 68 627 Md
-42:51:728 68 627 Mu
-42:52:265 66 685 Md
-42:52:352 66 685 Mu
-42:53:577 999 591 Md
-42:53:688 999 591 Mu
-42:54:596 1000 638 Md
-42:54:688 1000 638 Mu
-42:55:322 467 575 Md
-42:55:433 467 575 Mu
-42:56:098 474 609 Md
-42:56:193 474 609 Mu
-42:56:866 159 533 Md
-42:56:992 160 537 Mu
-42:57:491 171 563 Md
-42:57:569 171 563 Mu
-42:57:945 165 566 Md
-42:58:052 159 565 Mu
-42:59:137 155 560 Md
-42:59:249 156 560 Mu
-42:59:897 90 411 Md
-42:59:984 90 411 Mu
-43:00:451 99 431 Md
-43:00:536 99 431 Mu
-43:01:681 973 392 Md
-43:01:776 973 392 Mu
-43:02:233 968 417 Md
-43:02:336 968 417 Mu
-43:02:994 204 354 Md
-43:03:065 204 354 Mu
-43:03:425 203 371 Md
-43:03:513 203 371 Mu
-43:03:931 137 371 Md
-43:04:025 137 371 Mu
-43:04:516 133 377 Md
-43:04:617 133 377 Mu
-43:05:354 132 346 Md
-43:05:457 132 346 Mu
-43:05:890 129 348 Md
-43:05:961 129 348 Mu
-43:06:546 115 290 Md
-43:06:617 115 290 Mu
-43:07:514 112 293 Md
-43:07:617 112 293 Mu
-43:10:873 123 163 Md
-43:10:986 119 165 Mu
-43:11:417 109 168 Md
-43:11:520 109 168 Mu
-43:11:921 103 150 Md
-43:12:000 103 150 Mu
-43:15:257 99 154 Md
-43:15:360 99 154 Mu
-43:16:985 89 162 Md
-43:17:096 89 162 Mu
-43:17:577 87 168 Md
-43:17:672 87 168 Mu
-43:20:065 1156 361 Ld
-43:20:120 1156 361 Lu
+41:22:392 993 417 Rd
+41:22:495 993 417 Ru
+41:27:080 18 131 Rd
+41:27:167 18 131 Ru
+41:28:248 552 161 Ld
+41:28:367 552 161 Lu

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

@@ -1 @@
-Tutorials45
+Tutorials47

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

@@ -1721 +1721 @@
                 new Constraint(corners[3], corners[0], this.getNextItemID(), Constraint.VERTICAL);
 
+                List<Item> rect = new ArrayList<Item>(rectComponents);
                 this.addAllItems(rectComponents);
                 FrameMouseActions.anchor(rectComponents);
-                return rectComponents;
+                return rect;
                 // rectComponents.clear();
         }