- Due date is painted in red if the deadline was not met.
- Bugfix (not in IZ): Tooltip for a task with a summary that contains multiple lines shows the whole text in one line.
- New field for a task: start date.
- More documentation.
1.1 --- a/tasklist.usertasks/doc/processes.ics Mon Aug 29 20:07:51 2005 +0000
1.2 +++ b/tasklist.usertasks/doc/processes.ics Tue Aug 30 10:49:38 2005 +0000
1.3 @@ -8,13 +8,13 @@
1.4 SUMMARY:Adding a field to UserTask
1.5 DESCRIPTION:Steps that should be accomplished to add a new field to the Use
1.6 rTask class that is visible to the user
1.7 -PERCENT-COMPLETE:87
1.8 +PERCENT-COMPLETE:99
1.9 X-NETBEANS-PROGRESS-COMPUTED:yes
1.10 -X-NETBEANS-EFFORT:4500
1.11 +X-NETBEANS-EFFORT:7380
1.12 X-NETBEANS-EFFORT-COMPUTED:yes
1.13 -X-NETBEANS-SPENT-TIME:130
1.14 +X-NETBEANS-SPENT-TIME:5
1.15 X-NETBEANS-SPENT-TIME-COMPUTED:yes
1.16 -LAST-MODIFIED:20050505T122516Z
1.17 +LAST-MODIFIED:20050525T183238Z
1.18 COMPLETED:19700101T000000Z
1.19 END:VTODO
1.20
1.21 @@ -22,29 +22,44 @@
1.22 UID:nb1099827812695.413@timpc/145.254.144.151
1.23 CREATED:20041107T114332Z
1.24 SUMMARY:UserTask
1.25 -PERCENT-COMPLETE:80
1.26 +PERCENT-COMPLETE:100
1.27 X-NETBEANS-PROGRESS-COMPUTED:yes
1.28 X-NETBEANS-EFFORT:300
1.29 X-NETBEANS-EFFORT-COMPUTED:yes
1.30 -X-NETBEANS-SPENT-TIME:0
1.31 +X-NETBEANS-SPENT-TIME:3
1.32 X-NETBEANS-SPENT-TIME-COMPUTED:yes
1.33 -LAST-MODIFIED:20050505T122516Z
1.34 +LAST-MODIFIED:20050525T183238Z
1.35 COMPLETED:19700101T000000Z
1.36 RELATED-TO:nb1094753798137.164@timpc/145.254.152.118
1.37 END:VTODO
1.38
1.39 BEGIN:VTODO
1.40 +UID:nb1116157827968.450@timpc/169.254.180.13
1.41 +CREATED:20050515T115027Z
1.42 +SUMMARY:create PROP_... field
1.43 +PERCENT-COMPLETE:100
1.44 +X-NETBEANS-EFFORT:60
1.45 +X-NETBEANS-SPENT-TIME:0
1.46 +LAST-MODIFIED:20050525T183238Z
1.47 +COMPLETED:20050515T115059Z
1.48 +URL:file:/C:/tasklist/trunk/tasklist/usertasks/src/org/netbeans/modules/tas
1.49 + klist/usertasks/model/UserTask.java
1.50 +X-NETBEANS-LINE:226
1.51 +RELATED-TO:nb1099827812695.413@timpc/145.254.144.151
1.52 +END:VTODO
1.53 +
1.54 +BEGIN:VTODO
1.55 UID:nb1099827822640.415@timpc/145.254.144.151
1.56 CREATED:20040909T181651Z
1.57 SUMMARY:create the field. Don't forget initial values
1.58 PERCENT-COMPLETE:100
1.59 X-NETBEANS-EFFORT:60
1.60 -X-NETBEANS-SPENT-TIME:0
1.61 -LAST-MODIFIED:20050505T122516Z
1.62 -COMPLETED:20050505T122516Z
1.63 +X-NETBEANS-SPENT-TIME:3
1.64 +LAST-MODIFIED:20050525T183238Z
1.65 +COMPLETED:20050515T113732Z
1.66 URL:file:/C:/tasklist/trunk/tasklist/usertasks/src/org/netbeans/modules/tas
1.67 klist/usertasks/model/UserTask.java
1.68 -X-NETBEANS-LINE:295
1.69 +X-NETBEANS-LINE:297
1.70 X-NETBEANS-OWNER:tim
1.71 RELATED-TO:nb1099827812695.413@timpc/145.254.144.151
1.72 END:VTODO
1.73 @@ -56,11 +71,11 @@
1.74 PERCENT-COMPLETE:100
1.75 X-NETBEANS-EFFORT:60
1.76 X-NETBEANS-SPENT-TIME:0
1.77 -LAST-MODIFIED:20050505T122254Z
1.78 -COMPLETED:20050116T122319Z
1.79 +LAST-MODIFIED:20050525T183238Z
1.80 +COMPLETED:20050515T114040Z
1.81 URL:file:/C:/tasklist/trunk/tasklist/usertasks/src/org/netbeans/modules/tas
1.82 klist/usertasks/model/UserTask.java
1.83 -X-NETBEANS-LINE:295
1.84 +X-NETBEANS-LINE:297
1.85 RELATED-TO:nb1099827812695.413@timpc/145.254.144.151
1.86 END:VTODO
1.87
1.88 @@ -71,11 +86,11 @@
1.89 PERCENT-COMPLETE:100
1.90 X-NETBEANS-EFFORT:60
1.91 X-NETBEANS-SPENT-TIME:0
1.92 -LAST-MODIFIED:20050505T122254Z
1.93 -COMPLETED:20050116T122731Z
1.94 +LAST-MODIFIED:20050525T183238Z
1.95 +COMPLETED:20050515T114114Z
1.96 URL:file:/C:/tasklist/trunk/tasklist/usertasks/src/org/netbeans/modules/tas
1.97 klist/usertasks/model/UserTask.java
1.98 -X-NETBEANS-LINE:1234
1.99 +X-NETBEANS-LINE:1242
1.100 RELATED-TO:nb1099827812695.413@timpc/145.254.144.151
1.101 END:VTODO
1.102
1.103 @@ -83,65 +98,67 @@
1.104 UID:nb1115235297550.113@timpc/169.254.180.13
1.105 CREATED:20050504T193457Z
1.106 SUMMARY:update UserTask.hashCode
1.107 -PERCENT-COMPLETE:0
1.108 -X-NETBEANS-EFFORT:60
1.109 -X-NETBEANS-SPENT-TIME:0
1.110 -LAST-MODIFIED:20050505T122254Z
1.111 -COMPLETED:19700101T000000Z
1.112 -URL:file:/C:/tasklist/trunk/tasklist/usertasks/src/org/netbeans/modules/tas
1.113 - klist/usertasks/model/UserTask.java
1.114 -X-NETBEANS-LINE:1152
1.115 -RELATED-TO:nb1099827812695.413@timpc/145.254.144.151
1.116 -END:VTODO
1.117 -
1.118 -BEGIN:VTODO
1.119 -UID:nb1099827838152.421@timpc/145.254.144.151
1.120 -CREATED:20040909T183923Z
1.121 -SUMMARY:create a UserTask.PROP_... constant
1.122 PERCENT-COMPLETE:100
1.123 X-NETBEANS-EFFORT:60
1.124 X-NETBEANS-SPENT-TIME:0
1.125 -LAST-MODIFIED:20050505T122254Z
1.126 -COMPLETED:20050116T122412Z
1.127 +LAST-MODIFIED:20050525T183238Z
1.128 +COMPLETED:20050515T114120Z
1.129 URL:file:/C:/tasklist/trunk/tasklist/usertasks/src/org/netbeans/modules/tas
1.130 klist/usertasks/model/UserTask.java
1.131 -X-NETBEANS-LINE:190
1.132 +X-NETBEANS-LINE:1161
1.133 RELATED-TO:nb1099827812695.413@timpc/145.254.144.151
1.134 END:VTODO
1.135
1.136 BEGIN:VTODO
1.137 -UID:nb1105272585861.79@timpc/145.254.146.17
1.138 -CREATED:20050109T120945Z
1.139 -SUMMARY:update UserTaskTreeTableNode.getValueAt
1.140 -PERCENT-COMPLETE:100
1.141 -X-NETBEANS-EFFORT:2940
1.142 -X-NETBEANS-SPENT-TIME:0
1.143 -LAST-MODIFIED:20050505T122254Z
1.144 -COMPLETED:20050405T181936Z
1.145 -URL:file:/C:/tasklist/trunk/tasklist/usertasks/src/org/netbeans/modules/tas
1.146 - klist/usertasks/UserTaskTreeTableNode.java
1.147 -X-NETBEANS-LINE:146
1.148 -RELATED-TO:nb1094753798137.164@timpc/145.254.152.118
1.149 -END:VTODO
1.150 -
1.151 -BEGIN:VTODO
1.152 UID:nb1105268256075.77@timpc/127.0.0.1
1.153 CREATED:20050109T105736Z
1.154 SUMMARY:update UserTaskTreeTableNode
1.155 -PRIORITY:5
1.156 -PERCENT-COMPLETE:0
1.157 -X-NETBEANS-EFFORT:60
1.158 -X-NETBEANS-SPENT-TIME:128
1.159 -LAST-MODIFIED:20050505T122254Z
1.160 +PERCENT-COMPLETE:100
1.161 +X-NETBEANS-PROGRESS-COMPUTED:yes
1.162 +X-NETBEANS-EFFORT:5880
1.163 +X-NETBEANS-EFFORT-COMPUTED:yes
1.164 +X-NETBEANS-SPENT-TIME:0
1.165 +X-NETBEANS-SPENT-TIME-COMPUTED:yes
1.166 +LAST-MODIFIED:20050525T183238Z
1.167 COMPLETED:19700101T000000Z
1.168 URL:file:/C:/tasklist/trunk/tasklist/usertasks/src/org/netbeans/modules/tas
1.169 klist/usertasks/UserTaskTreeTableNode.java
1.170 -X-NETBEANS-LINE:19
1.171 +X-NETBEANS-LINE:20
1.172 X-NETBEANS-OWNER:tim
1.173 RELATED-TO:nb1094753798137.164@timpc/145.254.152.118
1.174 END:VTODO
1.175
1.176 BEGIN:VTODO
1.177 +UID:nb1116157696319.447@timpc/169.254.180.13
1.178 +CREATED:20050109T120945Z
1.179 +SUMMARY:update UserTaskTreeTableNode.getValueAt
1.180 +PERCENT-COMPLETE:100
1.181 +X-NETBEANS-EFFORT:2940
1.182 +X-NETBEANS-SPENT-TIME:0
1.183 +LAST-MODIFIED:20050525T183238Z
1.184 +COMPLETED:20050515T114740Z
1.185 +URL:file:/C:/tasklist/trunk/tasklist/usertasks/src/org/netbeans/modules/tas
1.186 + klist/usertasks/UserTaskTreeTableNode.java
1.187 +X-NETBEANS-LINE:147
1.188 +RELATED-TO:nb1105268256075.77@timpc/127.0.0.1
1.189 +END:VTODO
1.190 +
1.191 +BEGIN:VTODO
1.192 +UID:nb1116157713233.449@timpc/169.254.180.13
1.193 +CREATED:20050109T120945Z
1.194 +SUMMARY:update UserTaskTreeTableNode.setValueAt
1.195 +PERCENT-COMPLETE:100
1.196 +X-NETBEANS-EFFORT:2940
1.197 +X-NETBEANS-SPENT-TIME:0
1.198 +LAST-MODIFIED:20050525T183238Z
1.199 +COMPLETED:20050515T114852Z
1.200 +URL:file:/C:/tasklist/trunk/tasklist/usertasks/src/org/netbeans/modules/tas
1.201 + klist/usertasks/UserTaskTreeTableNode.java
1.202 +X-NETBEANS-LINE:201
1.203 +RELATED-TO:nb1105268256075.77@timpc/127.0.0.1
1.204 +END:VTODO
1.205 +
1.206 +BEGIN:VTODO
1.207 UID:nb1094753880034.181@timpc/145.254.152.118
1.208 CREATED:20040909T181800Z
1.209 SUMMARY:update the EditTaskPanel
1.210 @@ -151,7 +168,7 @@
1.211 X-NETBEANS-EFFORT-COMPUTED:yes
1.212 X-NETBEANS-SPENT-TIME:0
1.213 X-NETBEANS-SPENT-TIME-COMPUTED:yes
1.214 -LAST-MODIFIED:20050505T122254Z
1.215 +LAST-MODIFIED:20050525T183238Z
1.216 COMPLETED:19700101T000000Z
1.217 RELATED-TO:nb1094753798137.164@timpc/145.254.152.118
1.218 END:VTODO
1.219 @@ -163,11 +180,11 @@
1.220 PERCENT-COMPLETE:100
1.221 X-NETBEANS-EFFORT:60
1.222 X-NETBEANS-SPENT-TIME:0
1.223 -LAST-MODIFIED:20050505T122254Z
1.224 -COMPLETED:20050117T184814Z
1.225 +LAST-MODIFIED:20050525T183238Z
1.226 +COMPLETED:20050515T123019Z
1.227 URL:file:/C:/tasklist/trunk/tasklist/usertasks/src/org/netbeans/modules/tas
1.228 klist/usertasks/EditTaskPanel.java
1.229 -X-NETBEANS-LINE:238
1.230 +X-NETBEANS-LINE:237
1.231 RELATED-TO:nb1094753880034.181@timpc/145.254.152.118
1.232 END:VTODO
1.233
1.234 @@ -178,8 +195,11 @@
1.235 PERCENT-COMPLETE:100
1.236 X-NETBEANS-EFFORT:60
1.237 X-NETBEANS-SPENT-TIME:0
1.238 -LAST-MODIFIED:20050505T122254Z
1.239 -COMPLETED:20050117T184815Z
1.240 +LAST-MODIFIED:20050525T183238Z
1.241 +COMPLETED:20050515T123236Z
1.242 +URL:file:/C:/tasklist/trunk/tasklist/usertasks/src/org/netbeans/modules/tas
1.243 + klist/usertasks/EditTaskPanel.java
1.244 +X-NETBEANS-LINE:332
1.245 RELATED-TO:nb1094753880034.181@timpc/145.254.152.118
1.246 END:VTODO
1.247
1.248 @@ -187,14 +207,14 @@
1.249 UID:nb1094755062895.197@timpc/145.254.152.118
1.250 CREATED:20040909T183742Z
1.251 SUMMARY:update UserTaskNode.createSheet
1.252 -PERCENT-COMPLETE:0
1.253 +PERCENT-COMPLETE:100
1.254 X-NETBEANS-EFFORT:60
1.255 X-NETBEANS-SPENT-TIME:2
1.256 -LAST-MODIFIED:20050505T122254Z
1.257 -COMPLETED:19700101T000000Z
1.258 +LAST-MODIFIED:20050525T183238Z
1.259 +COMPLETED:20050515T115233Z
1.260 URL:file:/C:/tasklist/trunk/tasklist/usertasks/src/org/netbeans/modules/tas
1.261 klist/usertasks/UserTaskNode.java
1.262 -X-NETBEANS-LINE:390
1.263 +X-NETBEANS-LINE:397
1.264 X-NETBEANS-OWNER:tim
1.265 RELATED-TO:nb1094753798137.164@timpc/145.254.152.118
1.266 X-NETBEANS-WORK-PERIOD;START=20050405T183631Z:1
1.267 @@ -205,13 +225,13 @@
1.268 CREATED:20041107T114253Z
1.269 SUMMARY:Update filters
1.270 PRIORITY:1
1.271 -PERCENT-COMPLETE:0
1.272 +PERCENT-COMPLETE:100
1.273 X-NETBEANS-PROGRESS-COMPUTED:yes
1.274 X-NETBEANS-EFFORT:360
1.275 X-NETBEANS-EFFORT-COMPUTED:yes
1.276 X-NETBEANS-SPENT-TIME:0
1.277 X-NETBEANS-SPENT-TIME-COMPUTED:yes
1.278 -LAST-MODIFIED:20050505T122254Z
1.279 +LAST-MODIFIED:20050525T183238Z
1.280 COMPLETED:19700101T000000Z
1.281 RELATED-TO:nb1094753798137.164@timpc/145.254.152.118
1.282 END:VTODO
1.283 @@ -220,11 +240,11 @@
1.284 UID:nb1099827790894.408@timpc/145.254.144.151
1.285 CREATED:20040909T184007Z
1.286 SUMMARY:create UserTaskProperties.PROPID_... constant
1.287 -PERCENT-COMPLETE:0
1.288 +PERCENT-COMPLETE:100
1.289 X-NETBEANS-EFFORT:60
1.290 X-NETBEANS-SPENT-TIME:0
1.291 -LAST-MODIFIED:20050505T122254Z
1.292 -COMPLETED:19700101T000000Z
1.293 +LAST-MODIFIED:20050525T183238Z
1.294 +COMPLETED:20050515T115306Z
1.295 URL:file:/C:/tasklist/trunk/tasklist/usertasks/src/org/netbeans/modules/tas
1.296 klist/usertasks/filter/UserTaskProperties.java
1.297 X-NETBEANS-LINE:35
1.298 @@ -235,14 +255,14 @@
1.299 UID:nb1099827797393.410@timpc/145.254.144.151
1.300 CREATED:20041107T114120Z
1.301 SUMMARY:create UserTaskProperties.PROP_... field
1.302 -PERCENT-COMPLETE:0
1.303 +PERCENT-COMPLETE:100
1.304 X-NETBEANS-EFFORT:60
1.305 X-NETBEANS-SPENT-TIME:0
1.306 -LAST-MODIFIED:20050505T122254Z
1.307 -COMPLETED:19700101T000000Z
1.308 +LAST-MODIFIED:20050525T183238Z
1.309 +COMPLETED:20050515T115537Z
1.310 URL:file:/C:/tasklist/trunk/tasklist/usertasks/src/org/netbeans/modules/tas
1.311 klist/usertasks/filter/UserTaskProperties.java
1.312 -X-NETBEANS-LINE:141
1.313 +X-NETBEANS-LINE:142
1.314 RELATED-TO:nb1099827773790.406@timpc/145.254.144.151
1.315 END:VTODO
1.316
1.317 @@ -250,14 +270,14 @@
1.318 UID:nb1099827803452.412@timpc/145.254.144.151
1.319 CREATED:20041107T114154Z
1.320 SUMMARY:Update UserTaskProperties.getProperty()
1.321 -PERCENT-COMPLETE:0
1.322 +PERCENT-COMPLETE:100
1.323 X-NETBEANS-EFFORT:60
1.324 X-NETBEANS-SPENT-TIME:0
1.325 -LAST-MODIFIED:20050505T122254Z
1.326 -COMPLETED:19700101T000000Z
1.327 +LAST-MODIFIED:20050525T183238Z
1.328 +COMPLETED:20050515T115555Z
1.329 URL:file:/C:/tasklist/trunk/tasklist/usertasks/src/org/netbeans/modules/tas
1.330 klist/usertasks/filter/UserTaskProperties.java
1.331 -X-NETBEANS-LINE:174
1.332 +X-NETBEANS-LINE:186
1.333 RELATED-TO:nb1099827773790.406@timpc/145.254.144.151
1.334 END:VTODO
1.335
1.336 @@ -265,14 +285,14 @@
1.337 UID:nb1099828582442.437@timpc/145.254.144.151
1.338 CREATED:20041107T115515Z
1.339 SUMMARY:update UserTaskFilter.PROPS
1.340 -PERCENT-COMPLETE:0
1.341 +PERCENT-COMPLETE:100
1.342 X-NETBEANS-EFFORT:60
1.343 X-NETBEANS-SPENT-TIME:0
1.344 -LAST-MODIFIED:20050505T122254Z
1.345 -COMPLETED:19700101T000000Z
1.346 +LAST-MODIFIED:20050525T183238Z
1.347 +COMPLETED:20050515T115618Z
1.348 URL:file:/C:/tasklist/trunk/tasklist/usertasks/src/org/netbeans/modules/tas
1.349 klist/usertasks/filter/UserTaskFilter.java
1.350 -X-NETBEANS-LINE:45
1.351 +X-NETBEANS-LINE:47
1.352 RELATED-TO:nb1099827773790.406@timpc/145.254.144.151
1.353 END:VTODO
1.354
1.355 @@ -280,14 +300,14 @@
1.356 UID:nb1099828639584.438@timpc/145.254.144.151
1.357 CREATED:20041107T115719Z
1.358 SUMMARY:Update UserTaskFilter.createConditions
1.359 -PERCENT-COMPLETE:0
1.360 +PERCENT-COMPLETE:100
1.361 X-NETBEANS-EFFORT:60
1.362 X-NETBEANS-SPENT-TIME:0
1.363 -LAST-MODIFIED:20050505T122254Z
1.364 -COMPLETED:19700101T000000Z
1.365 +LAST-MODIFIED:20050525T183238Z
1.366 +COMPLETED:20050515T115646Z
1.367 URL:file:/C:/tasklist/trunk/tasklist/usertasks/src/org/netbeans/modules/tas
1.368 klist/usertasks/filter/UserTaskFilter.java
1.369 -X-NETBEANS-LINE:103
1.370 +X-NETBEANS-LINE:106
1.371 RELATED-TO:nb1099827773790.406@timpc/145.254.144.151
1.372 END:VTODO
1.373
1.374 @@ -295,14 +315,14 @@
1.375 UID:nb1099828927859.439@timpc/145.254.144.151
1.376 CREATED:20041107T120207Z
1.377 SUMMARY:Update Bundle.properties. Add LBL_...Property
1.378 -PERCENT-COMPLETE:0
1.379 +PERCENT-COMPLETE:100
1.380 X-NETBEANS-EFFORT:60
1.381 X-NETBEANS-SPENT-TIME:0
1.382 -LAST-MODIFIED:20050505T122254Z
1.383 -COMPLETED:19700101T000000Z
1.384 +LAST-MODIFIED:20050525T183238Z
1.385 +COMPLETED:20050515T115705Z
1.386 URL:file:/C:/tasklist/trunk/tasklist/usertasks/src/org/netbeans/modules/tas
1.387 klist/usertasks/filter/Bundle.properties
1.388 -X-NETBEANS-LINE:198
1.389 +X-NETBEANS-LINE:61
1.390 RELATED-TO:nb1099827773790.406@timpc/145.254.144.151
1.391 END:VTODO
1.392
1.393 @@ -312,27 +332,42 @@
1.394 SUMMARY:UserTaskTreeTableModel
1.395 PERCENT-COMPLETE:100
1.396 X-NETBEANS-PROGRESS-COMPUTED:yes
1.397 -X-NETBEANS-EFFORT:240
1.398 +X-NETBEANS-EFFORT:300
1.399 X-NETBEANS-EFFORT-COMPUTED:yes
1.400 X-NETBEANS-SPENT-TIME:0
1.401 X-NETBEANS-SPENT-TIME-COMPUTED:yes
1.402 -LAST-MODIFIED:20050505T122254Z
1.403 +LAST-MODIFIED:20050525T183238Z
1.404 COMPLETED:19700101T000000Z
1.405 RELATED-TO:nb1094753798137.164@timpc/145.254.152.118
1.406 END:VTODO
1.407
1.408 BEGIN:VTODO
1.409 +UID:nb1116157325396.447@timpc/169.254.180.13
1.410 +CREATED:20040909T183923Z
1.411 +SUMMARY:create a PROP_... constant
1.412 +PERCENT-COMPLETE:100
1.413 +X-NETBEANS-EFFORT:60
1.414 +X-NETBEANS-SPENT-TIME:0
1.415 +LAST-MODIFIED:20050525T183238Z
1.416 +COMPLETED:20050515T114300Z
1.417 +URL:file:/C:/tasklist/trunk/tasklist/usertasks/src/org/netbeans/modules/tas
1.418 + klist/usertasks/UserTasksTreeTableModel.java
1.419 +X-NETBEANS-LINE:57
1.420 +RELATED-TO:nb1099827852262.422@timpc/145.254.144.151
1.421 +END:VTODO
1.422 +
1.423 +BEGIN:VTODO
1.424 UID:nb1099827887363.424@timpc/145.254.144.151
1.425 CREATED:20041107T114447Z
1.426 SUMMARY:Update COMPARATORS
1.427 PERCENT-COMPLETE:100
1.428 X-NETBEANS-EFFORT:60
1.429 X-NETBEANS-SPENT-TIME:0
1.430 -LAST-MODIFIED:20050505T122254Z
1.431 -COMPLETED:20050117T184916Z
1.432 +LAST-MODIFIED:20050525T183238Z
1.433 +COMPLETED:20050515T115743Z
1.434 URL:file:/C:/tasklist/trunk/tasklist/usertasks/src/org/netbeans/modules/tas
1.435 klist/usertasks/UserTasksTreeTableModel.java
1.436 -X-NETBEANS-LINE:143
1.437 +X-NETBEANS-LINE:145
1.438 X-NETBEANS-OWNER:tim
1.439 RELATED-TO:nb1099827852262.422@timpc/145.254.144.151
1.440 END:VTODO
1.441 @@ -344,11 +379,11 @@
1.442 PERCENT-COMPLETE:100
1.443 X-NETBEANS-EFFORT:60
1.444 X-NETBEANS-SPENT-TIME:0
1.445 -LAST-MODIFIED:20050505T122254Z
1.446 -COMPLETED:20050117T184917Z
1.447 +LAST-MODIFIED:20050525T183238Z
1.448 +COMPLETED:20050515T115813Z
1.449 URL:file:/C:/tasklist/trunk/tasklist/usertasks/src/org/netbeans/modules/tas
1.450 klist/usertasks/UserTasksTreeTableModel.java
1.451 -X-NETBEANS-LINE:124
1.452 +X-NETBEANS-LINE:145
1.453 RELATED-TO:nb1099827852262.422@timpc/145.254.144.151
1.454 END:VTODO
1.455
1.456 @@ -359,11 +394,11 @@
1.457 PERCENT-COMPLETE:100
1.458 X-NETBEANS-EFFORT:60
1.459 X-NETBEANS-SPENT-TIME:0
1.460 -LAST-MODIFIED:20050505T122254Z
1.461 -COMPLETED:20050117T184918Z
1.462 +LAST-MODIFIED:20050525T183238Z
1.463 +COMPLETED:20050515T120410Z
1.464 URL:file:/C:/tasklist/trunk/tasklist/usertasks/src/org/netbeans/modules/tas
1.465 klist/usertasks/UserTasksTreeTableModel.java
1.466 -X-NETBEANS-LINE:162
1.467 +X-NETBEANS-LINE:185
1.468 RELATED-TO:nb1099827852262.422@timpc/145.254.144.151
1.469 END:VTODO
1.470
1.471 @@ -374,11 +409,11 @@
1.472 PERCENT-COMPLETE:100
1.473 X-NETBEANS-EFFORT:60
1.474 X-NETBEANS-SPENT-TIME:0
1.475 -LAST-MODIFIED:20050505T122254Z
1.476 -COMPLETED:20050117T184921Z
1.477 +LAST-MODIFIED:20050525T183238Z
1.478 +COMPLETED:20050515T120510Z
1.479 URL:file:/C:/tasklist/trunk/tasklist/usertasks/src/org/netbeans/modules/tas
1.480 klist/usertasks/UserTasksTreeTableModel.java
1.481 -X-NETBEANS-LINE:181
1.482 +X-NETBEANS-LINE:206
1.483 RELATED-TO:nb1099827852262.422@timpc/145.254.144.151
1.484 END:VTODO
1.485
1.486 @@ -389,11 +424,11 @@
1.487 PERCENT-COMPLETE:100
1.488 X-NETBEANS-EFFORT:60
1.489 X-NETBEANS-SPENT-TIME:0
1.490 -LAST-MODIFIED:20050505T122254Z
1.491 -COMPLETED:20050117T184926Z
1.492 +LAST-MODIFIED:20050525T183238Z
1.493 +COMPLETED:20050515T120630Z
1.494 URL:file:/C:/tasklist/trunk/tasklist/usertasks/src/org/netbeans/modules/tas
1.495 klist/usertasks/UserTasksTreeTable.java
1.496 -X-NETBEANS-LINE:163
1.497 +X-NETBEANS-LINE:232
1.498 X-NETBEANS-OWNER:tim
1.499 RELATED-TO:nb1094753798137.164@timpc/145.254.152.118
1.500 END:VTODO
1.501 @@ -416,11 +451,11 @@
1.502 SUMMARY:Update export/import
1.503 PERCENT-COMPLETE:100
1.504 X-NETBEANS-PROGRESS-COMPUTED:yes
1.505 -X-NETBEANS-EFFORT:300
1.506 +X-NETBEANS-EFFORT:240
1.507 X-NETBEANS-EFFORT-COMPUTED:yes
1.508 X-NETBEANS-SPENT-TIME:0
1.509 X-NETBEANS-SPENT-TIME-COMPUTED:yes
1.510 -LAST-MODIFIED:20050505T122254Z
1.511 +LAST-MODIFIED:20050525T183238Z
1.512 COMPLETED:19700101T000000Z
1.513 RELATED-TO:nb1094753798137.164@timpc/145.254.152.118
1.514 END:VTODO
1.515 @@ -432,11 +467,11 @@
1.516 PERCENT-COMPLETE:100
1.517 X-NETBEANS-EFFORT:60
1.518 X-NETBEANS-SPENT-TIME:0
1.519 -LAST-MODIFIED:20050505T122254Z
1.520 -COMPLETED:20050117T185740Z
1.521 +LAST-MODIFIED:20050525T183238Z
1.522 +COMPLETED:20050515T120909Z
1.523 URL:file:/C:/tasklist/trunk/tasklist/usertasks/src/org/netbeans/modules/tas
1.524 klist/usertasks/translators/ICalExportFormat.java
1.525 -X-NETBEANS-LINE:335
1.526 +X-NETBEANS-LINE:339
1.527 RELATED-TO:nb1099828053311.429@timpc/145.254.144.151
1.528 END:VTODO
1.529
1.530 @@ -447,11 +482,11 @@
1.531 PERCENT-COMPLETE:100
1.532 X-NETBEANS-EFFORT:60
1.533 X-NETBEANS-SPENT-TIME:0
1.534 -LAST-MODIFIED:20050505T122254Z
1.535 -COMPLETED:20050117T190240Z
1.536 +LAST-MODIFIED:20050525T194134Z
1.537 +COMPLETED:20050515T121108Z
1.538 URL:file:/C:/tasklist/trunk/tasklist/usertasks/src/org/netbeans/modules/tas
1.539 klist/usertasks/translators/ICalImportFormat.java
1.540 -X-NETBEANS-LINE:506
1.541 +X-NETBEANS-LINE:513
1.542 RELATED-TO:nb1099828053311.429@timpc/145.254.144.151
1.543 END:VTODO
1.544
1.545 @@ -462,8 +497,8 @@
1.546 PERCENT-COMPLETE:100
1.547 X-NETBEANS-EFFORT:60
1.548 X-NETBEANS-SPENT-TIME:0
1.549 -LAST-MODIFIED:20050505T122254Z
1.550 -COMPLETED:20050118T184030Z
1.551 +LAST-MODIFIED:20050525T183238Z
1.552 +COMPLETED:20050515T121411Z
1.553 URL:file:/C:/tasklist/trunk/tasklist/usertasks/src/org/netbeans/modules/tas
1.554 klist/usertasks/translators/XmlExportFormat.java
1.555 X-NETBEANS-LINE:233
1.556 @@ -471,32 +506,17 @@
1.557 END:VTODO
1.558
1.559 BEGIN:VTODO
1.560 -UID:nb1099828142079.433@timpc/145.254.144.151
1.561 -CREATED:20041107T114902Z
1.562 -SUMMARY:update XmlImportFormat
1.563 -PERCENT-COMPLETE:100
1.564 -X-NETBEANS-EFFORT:60
1.565 -X-NETBEANS-SPENT-TIME:0
1.566 -LAST-MODIFIED:20050505T122254Z
1.567 -COMPLETED:20050118T184031Z
1.568 -URL:file:/C:/tasklist/trunk/tasklist/usertasks/src/org/netbeans/modules/tas
1.569 - klist/usertasks/translators/XmlImportFormat.java
1.570 -X-NETBEANS-LINE:108
1.571 -RELATED-TO:nb1099828053311.429@timpc/145.254.144.151
1.572 -END:VTODO
1.573 -
1.574 -BEGIN:VTODO
1.575 UID:nb1099828158613.434@timpc/145.254.144.151
1.576 CREATED:20041107T114918Z
1.577 SUMMARY:update usertasks.dtd
1.578 PERCENT-COMPLETE:100
1.579 X-NETBEANS-EFFORT:60
1.580 X-NETBEANS-SPENT-TIME:0
1.581 -LAST-MODIFIED:20050505T122254Z
1.582 -COMPLETED:20050118T184034Z
1.583 +LAST-MODIFIED:20050525T183238Z
1.584 +COMPLETED:20050515T121405Z
1.585 URL:file:/C:/tasklist/trunk/tasklist/usertasks/src/org/netbeans/modules/tas
1.586 - klist/usertasks/translators/usertasks-1_1.dtd
1.587 -X-NETBEANS-LINE:45
1.588 + klist/usertasks/translators/usertasks-1_2.dtd
1.589 +X-NETBEANS-LINE:1
1.590 RELATED-TO:nb1099828053311.429@timpc/145.254.144.151
1.591 END:VTODO
1.592
2.1 --- a/tasklist.usertasks/javahelp/org/netbeans/modules/tasklist/usertasks/docs/content/actions.html Mon Aug 29 20:07:51 2005 +0000
2.2 +++ b/tasklist.usertasks/javahelp/org/netbeans/modules/tasklist/usertasks/docs/content/actions.html Tue Aug 30 10:49:38 2005 +0000
2.3 @@ -3,33 +3,72 @@
2.4 <head>
2.5 <meta http-equiv="content-type"
2.6 content="text/html; charset=ISO-8859-1">
2.7 - <title>Actions</title>
2.8 + <title>Available Actions</title>
2.9 </head>
2.10 <body>
2.11 -<h2>Available actions<br>
2.12 -</h2>
2.13 -<h3><img src="menu.gif" title="" alt="Local Menu"
2.14 - style="width: 231px; height: 467px;"></h3>
2.15 -<h3>New Subtask...</h3>
2.16 +<h2>Available Actions</h2>
2.17 +<table cellpadding="2" cellspacing="2" border="0"
2.18 + style="text-align: left; width: 100%;">
2.19 + <tbody>
2.20 + <tr>
2.21 + <td style="vertical-align: top;">
2.22 + <h3>Toolbar</h3>
2.23 + <img
2.24 + src="file:///C:/tasklist/trunk/tasklist/usertasks/javahelp/org/netbeans/modules/tasklist/usertasks/docs/content/toolbar.gif"
2.25 + title="" alt="Toolbar" style="height: 230px; width: 150px;"></td>
2.26 + <td style="vertical-align: top;">
2.27 + <h3>Task's local menu</h3>
2.28 + <h3><img
2.29 + src="file:///C:/tasklist/trunk/tasklist/usertasks/javahelp/org/netbeans/modules/tasklist/usertasks/docs/content/menu.gif"
2.30 + title="" alt="Local Menu" style="width: 231px; height: 467px;"></h3>
2.31 + </td>
2.32 + <td style="vertical-align: top;">
2.33 + <h3>Task List's local menu</h3>
2.34 + <img src="listMenu.gif" title="" alt="Task List Menu"
2.35 + style="width: 219px; height: 247px;"><br>
2.36 + </td>
2.37 + <td style="vertical-align: top; width: 90%;"><br>
2.38 + </td>
2.39 + </tr>
2.40 + </tbody>
2.41 +</table>
2.42 +<br>
2.43 +<h3>New Subtask... (<img src="newTask.gif" title="" alt="New Task"
2.44 + style="width: 16px; height: 16px;">)<br>
2.45 +</h3>
2.46 creates a new subtask of the selected task and opens a <a
2.47 href="newTaskDialog.html">dialog</a> to edit
2.48 the task.<br>
2.49 <h3>New Task List...</h3>
2.50 creates a new task list in the file system.<br>
2.51 -<h3>Start</h3>
2.52 -starts the task<br>
2.53 -<h3>Pause</h3>
2.54 +<h3>Start (<img
2.55 + src="file:///C:/tasklist/trunk/tasklist/usertasks/javahelp/org/netbeans/modules/tasklist/usertasks/docs/content/startTask.gif"
2.56 + title="" alt="Start a task" style="width: 16px; height: 16px;">)</h3>
2.57 +starts the task. The small icon (<img
2.58 + src="file:///C:/tasklist/trunk/tasklist/usertasks/javahelp/org/netbeans/modules/tasklist/usertasks/docs/content/startedBadge.gif"
2.59 + title="" alt="Started" style="width: 8px; height: 8px;">) marks the
2.60 +task that you are currently working on. Started task will remain
2.61 +started after a NetBeans restart. The owner of a started task will be
2.62 +set to the name of the current user if it was empty.
2.63 +<h3>Pause (<img src="pause.gif" title="" alt="Pause"
2.64 + style="width: 16px; height: 16px;">)<br>
2.65 +</h3>
2.66 stops the task if it is currently running.<br>
2.67 <h3>Show Task</h3>
2.68 shows a dialog where the task's properties could be edited.<br>
2.69 -<h3>Go To Source</h3>
2.70 +<h3>Go To Source (<img src="showSource.gif" title="" alt="Go To Source"
2.71 + style="width: 16px; height: 16px;">)<br>
2.72 +</h3>
2.73 shows the file assciated with this task in the editor.<br>
2.74 <h3>Cut, Copy, Paste, Delete </h3>
2.75 These work just the way you would expect it. Select a tasks. Then use
2.76 the toolbar - or context
2.77 menu or keyboard shortcut - actions to invoke cut,
2.78 copy, paste or delete.<br>
2.79 -<h3>Move Up/Move Down</h3>
2.80 +<h3>Move Up (<img src="moveUp.gif" title="" alt="Move Up"
2.81 + style="width: 16px; height: 16px;">)/Move Down (<img src="moveDown.gif"
2.82 + title="" alt="Move Down" style="width: 16px; height: 16px;">)<br>
2.83 +</h3>
2.84 move the selected task up or down.<br>
2.85 <h3> Import </h3>
2.86 You can import certain <a href="translators.html">types of data</a>
2.87 @@ -40,10 +79,14 @@
2.88 <h3>Export </h3>
2.89 You can create an <a href="translators.html">HTML or XML</a> version
2.90 of your task list. <br>
2.91 -<h3>Search/Filter...</h3>
2.92 +<h3>Search/Filter... (<img src="filterAction.gif" title=""
2.93 + alt="Search/Filter..." style="width: 16px; height: 16px;">)<br>
2.94 +</h3>
2.95 shows a <a href="filter.html">dialog</a> where filters could be
2.96 defined.<br>
2.97 -<h3>Remove Filter</h3>
2.98 +<h3>Remove Filter (<img src="removefilter.png" title=""
2.99 + alt="Remove Filter" style="width: 16px; height: 16px;">)<br>
2.100 +</h3>
2.101 removes the currently active filter.<br>
2.102 <span style="font-weight: bold;"></span>
2.103 <h3>Purge Completed</h3>
3.1 --- a/tasklist.usertasks/javahelp/org/netbeans/modules/tasklist/usertasks/docs/content/addTask.html Mon Aug 29 20:07:51 2005 +0000
3.2 +++ b/tasklist.usertasks/javahelp/org/netbeans/modules/tasklist/usertasks/docs/content/addTask.html Tue Aug 30 10:49:38 2005 +0000
3.3 @@ -7,6 +7,17 @@
3.4 </head>
3.5 <body>
3.6 <h2>How to Add a Task to the Source</h2>
3.7 +You can associate
3.8 +a line in a file with a
3.9 +task. The task selected in the table will also be highlighted in the
3.10 +editor with the
3.11 +yellow
3.12 +background:<br>
3.13 +<br>
3.14 +<img
3.15 + src="file:///C:/tasklist/trunk/tasklist/usertasks/javahelp/org/netbeans/modules/tasklist/usertasks/docs/content/editor.gif"
3.16 + title="" alt="Selected task in the editor"
3.17 + style="width: 686px; height: 92px;"><br>
3.18 <br>
3.19 There are 2 possibilities to add a task to the source:<br>
3.20 <ol>
3.21 @@ -20,14 +31,20 @@
3.22 style="width: 608px; height: 585px;"><br>
3.23 <br>
3.24 </li>
3.25 - <li>There is a special bridge module between the user tasks module
3.26 + <li>There is a special bridge module between the User Tasks module
3.27 and the editor: Task List Editor Support. Install it and open the local
3.28 menu over the left editor margin:<br>
3.29 <br>
3.30 <img src="editorSupport.gif" title=""
3.31 alt="Adding a task from the editor"
3.32 - style="width: 420px; height: 206px;"><br>
3.33 + style="height: 206px; width: 363px;"><br>
3.34 + <br>
3.35 </li>
3.36 </ol>
3.37 +<hr>Comments & requests to <a
3.38 + href="mailto:dev@tasklist.netbeans.org"><code>dev@tasklist.netbeans.org</code></a>.
3.39 +Further information at <a href="http://tasklist.netbeans.org/"><code>http://tasklist.netbeans.org</code></a>.
3.40 +<ol>
3.41 +</ol>
3.42 </body>
3.43 </html>
4.1 --- a/tasklist.usertasks/javahelp/org/netbeans/modules/tasklist/usertasks/docs/content/filter.html Mon Aug 29 20:07:51 2005 +0000
4.2 +++ b/tasklist.usertasks/javahelp/org/netbeans/modules/tasklist/usertasks/docs/content/filter.html Tue Aug 30 10:49:38 2005 +0000
4.3 @@ -6,7 +6,8 @@
4.4 <title>Filtering/Searching for Tasks</title>
4.5 </head>
4.6 <body>
4.7 -<h2> Searching for Tasks </h2>
4.8 +<h2> Searching for Tasks/Filtering Tasks<br>
4.9 +</h2>
4.10 To search for a particular task, or to only show
4.11 tasks matching a given set of criteria, use the
4.12 "Search/Filter..." context menu action. This will
5.1 --- a/tasklist.usertasks/javahelp/org/netbeans/modules/tasklist/usertasks/docs/content/newTaskDialog.html Mon Aug 29 20:07:51 2005 +0000
5.2 +++ b/tasklist.usertasks/javahelp/org/netbeans/modules/tasklist/usertasks/docs/content/newTaskDialog.html Tue Aug 30 10:49:38 2005 +0000
5.3 @@ -35,5 +35,9 @@
5.4 <br>
5.5 <img src="workPeriods.jpeg" title="" alt="Work Periods Tab"
5.6 style="width: 608px; height: 576px;"><br>
5.7 +<br>
5.8 +<hr>Comments & requests to <a
5.9 + href="mailto:dev@tasklist.netbeans.org"><code>dev@tasklist.netbeans.org</code></a>.
5.10 +Further information at <a href="http://tasklist.netbeans.org/"><code>http://tasklist.netbeans.org</code></a>.<br>
5.11 </body>
5.12 </html>
6.1 --- a/tasklist.usertasks/javahelp/org/netbeans/modules/tasklist/usertasks/docs/content/options.html Mon Aug 29 20:07:51 2005 +0000
6.2 +++ b/tasklist.usertasks/javahelp/org/netbeans/modules/tasklist/usertasks/docs/content/options.html Tue Aug 30 10:49:38 2005 +0000
6.3 @@ -38,8 +38,7 @@
6.4 <li><b>Collect Work Periods:</b> if
6.5 this option is switched on, the time periods when you work on a task
6.6 are collected and shown in the tab "Work Periods" in the <a
6.7 - href="newTaskDialog.html">"Show Task" dialog</a>.<br>
6.8 - </li>
6.9 + href="newTaskDialog.html">"Show Task" dialog</a>.</li>
6.10 <li><b>Tasklist File</b>: Name of file where the tasks are stored.
6.11 Default: {userdir}/tasklist.ics. </li>
6.12 <li> <b>Hours Per Day: </b>number of working hours per day<br>
7.1 --- a/tasklist.usertasks/javahelp/org/netbeans/modules/tasklist/usertasks/docs/content/table-operation.html Mon Aug 29 20:07:51 2005 +0000
7.2 +++ b/tasklist.usertasks/javahelp/org/netbeans/modules/tasklist/usertasks/docs/content/table-operation.html Tue Aug 30 10:49:38 2005 +0000
7.3 @@ -33,41 +33,56 @@
7.4 straight above the vertical scrollbar (see image below). You may select
7.5 multiple tasks and change some properties of the selected tasks at
7.6 once. The view also remembers selected tasks and scrollbar positions.
7.7 +Different icons are used for undone (<img
7.8 + src="file:///C:/tasklist/trunk/tasklist/usertasks/javahelp/org/netbeans/modules/tasklist/usertasks/docs/content/task.gif"
7.9 + title="" alt="Task" style="width: 16px; height: 16px;">) and done (<img
7.10 + src="file:///C:/tasklist/trunk/tasklist/usertasks/javahelp/org/netbeans/modules/tasklist/usertasks/docs/content/doneItem.gif"
7.11 + title="" alt="Done item" style="width: 16px; height: 16px;">) tasks.
7.12 +The same icons are used in
7.13 +the editor if a line is associated with the task.
7.14 <p><img src="table.gif" title="" alt="Table"><br>
7.15 </p>
7.16 -<h3>Summary column</h3>
7.17 -<p>Different icons are used for undone (<img src="task.gif" title=""
7.18 - alt="Task" style="width: 16px; height: 16px;">) and done (<img
7.19 - src="doneItem.gif" title="" alt="Done item"
7.20 - style="width: 16px; height: 16px;">) tasks. The same icons are used in
7.21 -the editor if a line is associated with the task.<br>
7.22 -</p>
7.23 -<h3>Effort column</h3>
7.24 -Effort cells are painted
7.25 +<h3>Available columns:</h3>
7.26 +<ul>
7.27 + <li>Summary - Summary for
7.28 +the task.</li>
7.29 + <li>Priority - Contains the
7.30 +priority of the task.</li>
7.31 + <li>Done - Shows whether
7.32 +a particular task is done. A task is done when it's percent
7.33 +complete value is 100%.</li>
7.34 + <li>Percent Complete - Shows
7.35 +completion status of a task.</li>
7.36 + <li>Effort - Effort cells are
7.37 +painted
7.38 in red using a bold font if the sum of the spent time and the remaining
7.39 effort exceeds
7.40 -the planed effort.<br>
7.41 -<h3>Completed column</h3>
7.42 -This columns contains the date when a particular task was completed. It
7.43 -will be filled automatically if you mark a task as done.<br>
7.44 -<h3>Associating a line with a task</h3>
7.45 -You can <a href="addTask.html">associate</a> a line in a file with a
7.46 -task. Selected task will also be highlighted in the editor with the
7.47 -yellow
7.48 -background:<br>
7.49 -<p><img src="editor.gif" title="" alt="Selected task in the editor"
7.50 - style="width: 686px; height: 92px;"><br>
7.51 -</p>
7.52 -<h3>Starting/stopping a task</h3>
7.53 -A task can be started by choosing "<a href="actions.html">Start</a>"
7.54 -from the local menu or by clicking on the icon in the local toolbar (<img
7.55 - src="startTask.gif" title="" alt="Start a task"
7.56 - style="width: 16px; height: 16px;">). The small icon (<img
7.57 - src="startedBadge.gif" title="" alt="Started"
7.58 - style="width: 8px; height: 8px;">) marks the
7.59 -task that you are currently working on. Started task will remain
7.60 -started after a NetBeans restart. The owner of a started task will be
7.61 -set to the name of the current user if it was empty.<br>
7.62 +the planed effort.</li>
7.63 + <li>Rem. Effort - Remaining
7.64 +effort. This value is computed as Effort * (1 - Percent Complete)</li>
7.65 + <li>Spent Time - Shows the
7.66 +time that was spent working on this task.</li>
7.67 + <li>Details - Here you can
7.68 +write a longer description of the task</li>
7.69 + <li>File - Contains URL
7.70 +associated with the task.</li>
7.71 + <li>Line - Contains the line
7.72 +number in the associated file.</li>
7.73 + <li>Category - A possible
7.74 +category for the task. </li>
7.75 + <li>Created - The date when
7.76 +the task was created. </li>
7.77 + <li>Edited - The date when
7.78 +the task was last edited. </li>
7.79 + <li>Completed - This columns
7.80 +contains the date when a particular task was completed. It
7.81 +will be filled automatically if you mark a task as done.</li>
7.82 + <li>Due date - Due date is
7.83 +painted in red if the deadline was not met.</li>
7.84 + <li>Start - Planned start
7.85 +date for the task.<br>
7.86 + </li>
7.87 +</ul>
7.88 <hr>Comments & requests to <a
7.89 href="mailto:dev@tasklist.netbeans.org"><code>dev@tasklist.netbeans.org</code></a>.
7.90 Further information at <a href="http://tasklist.netbeans.org/"><code>http://tasklist.netbeans.org</code></a>.
8.1 --- a/tasklist.usertasks/javahelp/org/netbeans/modules/tasklist/usertasks/docs/content/translators.html Mon Aug 29 20:07:51 2005 +0000
8.2 +++ b/tasklist.usertasks/javahelp/org/netbeans/modules/tasklist/usertasks/docs/content/translators.html Tue Aug 30 10:49:38 2005 +0000
8.3 @@ -10,7 +10,8 @@
8.4 <br>
8.5 <ul>
8.6 <li>Import of an iCalendar file. Just choose the source file and
8.7 -press "Finish". All the tasks in the current task list will be replaced.<br>
8.8 +press "Finish". All the tasks in the current task list will be replaced
8.9 +by imported ones.<br>
8.10 <br>
8.11 <img src="importICal.gif" title="" alt="Import iCalendar"
8.12 style="width: 826px; height: 548px;"><br>
9.1 --- a/tasklist.usertasks/javahelp/org/netbeans/modules/tasklist/usertasks/docs/content/usertasks.html Mon Aug 29 20:07:51 2005 +0000
9.2 +++ b/tasklist.usertasks/javahelp/org/netbeans/modules/tasklist/usertasks/docs/content/usertasks.html Tue Aug 30 10:49:38 2005 +0000
9.3 @@ -19,34 +19,28 @@
9.4 <body>
9.5 <h2> User Tasks View </h2>
9.6 <p>The <a href="http://tasklist.netbeans.org">User Tasks</a>
9.7 -module lets you record your own todo list. Tasks have properties like
9.8 -priority, description, date created, last modification date, etc. You
9.9 -can choose which properties are visible in the tasklist, and sort by
9.10 -any column. The task list is stored in a standard format which can be
9.11 -read by other calendar applications, such as Evolution, Korganizer, and
9.12 -others. <br>
9.13 -</p>
9.14 -<p>You can also <a href="translators.html">export</a> the tasklist to
9.15 +module allows you to record tasks for yourself.
9.16 +For example, "Bring ethernet cable to work tomorrow", or
9.17 +if you're looking at some code, "Refactor the Engine class".
9.18 +Tasks have properties like
9.19 +priority, description, date created, last modification date, etc.</p>
9.20 +<p>These "todo items" are recorded into a tasklist file which is
9.21 +stored in a standard format, which means you can open the file
9.22 +in other calendar tools such as Gnome's Evolution, KDE's
9.23 +Korganizer, and many commercial tools as well. You can also <a
9.24 + href="translators.html">export</a> the tasklist to
9.25 HTML or XML. To show the user
9.26 tasks window, click this icon in the
9.27 tasklist toolbar: <img src="taskView.gif"> or choose "Window", "User
9.28 Tasks" from the main menu.
9.29 </p>
9.30 -<p>The user task list allows you to record tasks for yourself.
9.31 -For example, "Bring ethernet cable to work tomorrow", or
9.32 -if you're looking at some code, "Refactor the Engine class".
9.33 -These "todo items" are recorded into a tasklist file which is
9.34 -stored in a standard format, which means you can open the file
9.35 -in other calendar tools such as Gnome's Evolution, KDE's
9.36 -Korganizer, and many commercial tools as well.
9.37 -</p>
9.38 -<p>Recurring tasks, like "Mom's birthday tomorrow!" are not supported
9.39 -yet but task # <a
9.40 +Recurring tasks, like "Mom's birthday tomorrow!" are not supported
9.41 +yet but issue # <a
9.42 href="http://tasklist.netbeans.org/issues/show_bug.cgi?id=26455">26445</a>
9.43 is tracking it.<br>
9.44 -</p>
9.45 <p>You can search for tasks/filter them using the <a href="filter.html">filter
9.46 -dialog</a>.<br>
9.47 +dialog</a>. Different other <a href="actions.html">actions</a> for
9.48 +tasks are also defined.<br>
9.49 </p>
9.50 <p>Tasks can have an <a href="addTask.html">associated</a> file
9.51 position (filename and line
9.52 @@ -70,7 +64,8 @@
9.53 you can change its location. You can however use multiple tasklists.
9.54 This allows you to have one (or more) tasklist per project, for
9.55 example. To create a new tasklist, use the "New From Template"
9.56 -feature in the IDE, and drill into "TaskList" and select iCalendar.
9.57 +feature in the IDE, and drill into "Other" and select "Empty Task
9.58 +List".
9.59 When you've picked a name and a location,
9.60 a new empty tasklist is created and shown.
9.61 </p>
10.1 --- a/tasklist.usertasks/manifest.mf Mon Aug 29 20:07:51 2005 +0000
10.2 +++ b/tasklist.usertasks/manifest.mf Tue Aug 30 10:49:38 2005 +0000
10.3 @@ -1,6 +1,6 @@
10.4 Manifest-Version: 1.0
10.5 OpenIDE-Module: org.netbeans.modules.tasklist.usertasks/2
10.6 -OpenIDE-Module-Implementation-Version: 47
10.7 +OpenIDE-Module-Implementation-Version: 48
10.8 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/tasklist/usertasks/Bundle.properties
10.9 OpenIDE-Module-Layer: org/netbeans/modules/tasklist/usertasks/mf-layer.xml
10.10
11.1 --- a/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/Bundle.properties Mon Aug 29 20:07:51 2005 +0000
11.2 +++ b/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/Bundle.properties Tue Aug 30 10:49:38 2005 +0000
11.3 @@ -134,6 +134,7 @@
11.4 Completed=Completed\:
11.5 WordPeriods=Work Periods
11.6 SpentTimeToday=Spent time today\:
11.7 +LBL_Start=&Start\:
11.8
11.9 ## DurationPanel
11.10 Minutes=Minutes
11.11 @@ -177,8 +178,10 @@
11.12 HNT_spentTimeComputed=Should the spent time be computed automatically
11.13 LBL_ownerProperty=Owner
11.14 HNT_ownerProperty=A person that owns this task
11.15 -LBL_completedDateProperty=Completed Date
11.16 +LBL_completedDateProperty=Completed
11.17 HNT_completedDateProperty=Date when this task was completed
11.18 +LBL_startProperty=Start
11.19 +HNT_startProperty=Date & time when the task should be started
11.20 EffortFormat={0,choice,0#|1#1 day|1<{0} days}{1,choice,0#|1# 1 hour|1< {1} hours}{2,choice,0#|1# 1 minute|1< {2} minutes}
11.21
11.22 ## UserTaskListNode
11.23 @@ -205,12 +208,7 @@
11.24 ColumnCompletedDate=Completed
11.25 ColumnDue=Due
11.26 ColumnOwner=Owner
11.27 -
11.28 -## DoneTaskAnnotation.xml
11.29 -HINT_TASK_doneTransparent=Done Tasks (without highlighting)
11.30 -
11.31 -## DoneTaskNoHighlightAnnotation.xml
11.32 -HINT_TASK_done=Done Tasks
11.33 +ColumnStart=Start
11.34
11.35 ## UserTaskListTreeTableNode
11.36 TaskList=Task List
12.1 --- a/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/EditTaskPanel.form Mon Aug 29 20:07:51 2005 +0000
12.2 +++ b/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/EditTaskPanel.form Tue Aug 30 10:49:38 2005 +0000
12.3 @@ -17,6 +17,10 @@
12.4 </Property>
12.5 </Properties>
12.6 <AuxValues>
12.7 + <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="true"/>
12.8 + <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
12.9 + <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
12.10 + <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
12.11 <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,2,7,0,0,2,-109"/>
12.12 </AuxValues>
12.13
12.14 @@ -350,18 +354,18 @@
12.15 <EventHandler event="itemStateChanged" listener="java.awt.event.ItemListener" parameters="java.awt.event.ItemEvent" handler="dueCheckBoxItemStateChanged"/>
12.16 </Events>
12.17 <AuxValues>
12.18 - <AuxValue name="generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
12.19 + <AuxValue name="generateMnemonicsCode" type="java.lang.Boolean" value="true"/>
12.20 </AuxValues>
12.21 <Constraints>
12.22 <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
12.23 - <GridBagConstraints gridX="0" gridY="0" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="11" insetsLeft="0" insetsBottom="0" insetsRight="12" anchor="17" weightX="0.0" weightY="0.0"/>
12.24 + <GridBagConstraints gridX="0" gridY="1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="11" insetsLeft="0" insetsBottom="0" insetsRight="12" anchor="17" weightX="0.0" weightY="0.0"/>
12.25 </Constraint>
12.26 </Constraints>
12.27 </Component>
12.28 <Container class="javax.swing.JPanel" name="jPanel1">
12.29 <Constraints>
12.30 <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
12.31 - <GridBagConstraints gridX="3" gridY="7" gridWidth="0" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="17" weightX="1.0" weightY="1.0"/>
12.32 + <GridBagConstraints gridX="3" gridY="8" gridWidth="0" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="17" weightX="1.0" weightY="1.0"/>
12.33 </Constraint>
12.34 </Constraints>
12.35
12.36 @@ -375,7 +379,7 @@
12.37 </Properties>
12.38 <Constraints>
12.39 <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
12.40 - <GridBagConstraints gridX="0" gridY="4" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="11" insetsLeft="0" insetsBottom="0" insetsRight="12" anchor="17" weightX="0.0" weightY="0.0"/>
12.41 + <GridBagConstraints gridX="0" gridY="5" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="11" insetsLeft="0" insetsBottom="0" insetsRight="12" anchor="17" weightX="0.0" weightY="0.0"/>
12.42 </Constraint>
12.43 </Constraints>
12.44 </Component>
12.45 @@ -387,21 +391,21 @@
12.46 </Properties>
12.47 <Constraints>
12.48 <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
12.49 - <GridBagConstraints gridX="0" gridY="5" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="11" insetsLeft="0" insetsBottom="0" insetsRight="12" anchor="17" weightX="0.0" weightY="0.0"/>
12.50 + <GridBagConstraints gridX="0" gridY="6" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="11" insetsLeft="0" insetsBottom="0" insetsRight="12" anchor="17" weightX="0.0" weightY="0.0"/>
12.51 </Constraint>
12.52 </Constraints>
12.53 </Component>
12.54 <Component class="javax.swing.JLabel" name="jLabelLastEdited">
12.55 <Constraints>
12.56 <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
12.57 - <GridBagConstraints gridX="1" gridY="4" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="11" insetsLeft="0" insetsBottom="0" insetsRight="12" anchor="17" weightX="0.0" weightY="0.0"/>
12.58 + <GridBagConstraints gridX="1" gridY="5" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="11" insetsLeft="0" insetsBottom="0" insetsRight="12" anchor="17" weightX="0.0" weightY="0.0"/>
12.59 </Constraint>
12.60 </Constraints>
12.61 </Component>
12.62 <Component class="javax.swing.JLabel" name="jLabelCreated">
12.63 <Constraints>
12.64 <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
12.65 - <GridBagConstraints gridX="1" gridY="5" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="11" insetsLeft="0" insetsBottom="0" insetsRight="12" anchor="17" weightX="0.0" weightY="0.0"/>
12.66 + <GridBagConstraints gridX="1" gridY="6" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="11" insetsLeft="0" insetsBottom="0" insetsRight="12" anchor="17" weightX="0.0" weightY="0.0"/>
12.67 </Constraint>
12.68 </Constraints>
12.69 </Component>
12.70 @@ -417,7 +421,7 @@
12.71 </Properties>
12.72 <Constraints>
12.73 <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
12.74 - <GridBagConstraints gridX="0" gridY="1" gridWidth="3" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="11" insetsLeft="0" insetsBottom="0" insetsRight="12" anchor="17" weightX="0.0" weightY="0.0"/>
12.75 + <GridBagConstraints gridX="0" gridY="2" gridWidth="3" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="11" insetsLeft="0" insetsBottom="0" insetsRight="12" anchor="17" weightX="0.0" weightY="0.0"/>
12.76 </Constraint>
12.77 </Constraints>
12.78
12.79 @@ -486,7 +490,7 @@
12.80 </Properties>
12.81 <Constraints>
12.82 <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
12.83 - <GridBagConstraints gridX="0" gridY="2" gridWidth="3" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="11" insetsLeft="0" insetsBottom="0" insetsRight="12" anchor="17" weightX="0.0" weightY="0.0"/>
12.84 + <GridBagConstraints gridX="0" gridY="3" gridWidth="3" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="11" insetsLeft="0" insetsBottom="0" insetsRight="12" anchor="17" weightX="0.0" weightY="0.0"/>
12.85 </Constraint>
12.86 </Constraints>
12.87
12.88 @@ -574,7 +578,7 @@
12.89 </Properties>
12.90 <Constraints>
12.91 <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
12.92 - <GridBagConstraints gridX="0" gridY="3" gridWidth="3" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="11" insetsLeft="0" insetsBottom="0" insetsRight="12" anchor="10" weightX="0.0" weightY="0.0"/>
12.93 + <GridBagConstraints gridX="0" gridY="4" gridWidth="3" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="11" insetsLeft="0" insetsBottom="0" insetsRight="12" anchor="10" weightX="0.0" weightY="0.0"/>
12.94 </Constraint>
12.95 </Constraints>
12.96
12.97 @@ -643,7 +647,7 @@
12.98 </AuxValues>
12.99 <Constraints>
12.100 <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
12.101 - <GridBagConstraints gridX="0" gridY="6" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="11" insetsLeft="0" insetsBottom="0" insetsRight="12" anchor="17" weightX="0.0" weightY="0.0"/>
12.102 + <GridBagConstraints gridX="0" gridY="7" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="11" insetsLeft="0" insetsBottom="0" insetsRight="12" anchor="17" weightX="0.0" weightY="0.0"/>
12.103 </Constraint>
12.104 </Constraints>
12.105 </Component>
12.106 @@ -653,7 +657,7 @@
12.107 </AuxValues>
12.108 <Constraints>
12.109 <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
12.110 - <GridBagConstraints gridX="1" gridY="6" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="11" insetsLeft="0" insetsBottom="0" insetsRight="12" anchor="17" weightX="0.0" weightY="0.0"/>
12.111 + <GridBagConstraints gridX="1" gridY="7" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="11" insetsLeft="0" insetsBottom="0" insetsRight="12" anchor="17" weightX="0.0" weightY="0.0"/>
12.112 </Constraint>
12.113 </Constraints>
12.114 </Component>
12.115 @@ -663,7 +667,35 @@
12.116 </Properties>
12.117 <Constraints>
12.118 <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
12.119 - <GridBagConstraints gridX="1" gridY="0" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="11" insetsLeft="0" insetsBottom="0" insetsRight="12" anchor="17" weightX="0.0" weightY="0.0"/>
12.120 + <GridBagConstraints gridX="1" gridY="1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="11" insetsLeft="0" insetsBottom="0" insetsRight="12" anchor="17" weightX="0.0" weightY="0.0"/>
12.121 + </Constraint>
12.122 + </Constraints>
12.123 + </Component>
12.124 + <Component class="javax.swing.JCheckBox" name="jCheckBoxStart">
12.125 + <Properties>
12.126 + <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
12.127 + <ResourceString bundle="org/netbeans/modules/tasklist/usertasks/Bundle.properties" key="LBL_Start" replaceFormat="NbBundle.getMessage(EditTaskPanel.class, "{key}")); // NOI18N("/>
12.128 + </Property>
12.129 + </Properties>
12.130 + <Events>
12.131 + <EventHandler event="itemStateChanged" listener="java.awt.event.ItemListener" parameters="java.awt.event.ItemEvent" handler="jCheckBoxStartItemStateChanged"/>
12.132 + </Events>
12.133 + <AuxValues>
12.134 + <AuxValue name="generateMnemonicsCode" type="java.lang.Boolean" value="true"/>
12.135 + </AuxValues>
12.136 + <Constraints>
12.137 + <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
12.138 + <GridBagConstraints gridX="0" gridY="0" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
12.139 + </Constraint>
12.140 + </Constraints>
12.141 + </Component>
12.142 + <Component class="com.toedter.calendar.JDateChooser" name="jDateChooserStart">
12.143 + <Properties>
12.144 + <Property name="enabled" type="boolean" value="false"/>
12.145 + </Properties>
12.146 + <Constraints>
12.147 + <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
12.148 + <GridBagConstraints gridX="1" gridY="0" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
12.149 </Constraint>
12.150 </Constraints>
12.151 </Component>
13.1 --- a/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/EditTaskPanel.java Mon Aug 29 20:07:51 2005 +0000
13.2 +++ b/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/EditTaskPanel.java Tue Aug 30 10:49:38 2005 +0000
13.3 @@ -124,8 +124,6 @@
13.4 private ListCellRenderer priorityRenderer = new PriorityListCellRenderer();
13.5 private DurationPanel durationPanel = new DurationPanel();
13.6 private DependenciesPanel dp;
13.7 - //private com.toedter.calendar.JDateChooser dueChooser =
13.8 - // new com.toedter.calendar.JDateChooser();
13.9
13.10 /**
13.11 * Creates new form NewTodoItemPanel.
13.12 @@ -204,6 +202,7 @@
13.13 }
13.14 detailsTextArea.setText(item.getDetails());
13.15 setDueDate(item.getDueDate());
13.16 + setStart(item.getStart());
13.17
13.18 // Initialize the Categories list
13.19 String[] categories = item.getList().getCategories();
13.20 @@ -307,6 +306,7 @@
13.21 }
13.22
13.23 task.setDueDate(getDueDate());
13.24 + task.setStart(getStart());
13.25 task.setProgressComputed(jRadioButtonComputeProgress.isSelected());
13.26 if (!task.isProgressComputed()) {
13.27 task.setPercentComplete(
13.28 @@ -356,6 +356,28 @@
13.29 }
13.30
13.31 /**
13.32 + * Returns the value of the start date
13.33 + *
13.34 + * @return start date
13.35 + */
13.36 + private long getStart() {
13.37 + long ret;
13.38 + if (jCheckBoxStart.isSelected()) {
13.39 + ret = jDateChooserStart.getDate().getTime();
13.40 + Calendar c = Calendar.getInstance();
13.41 + c.setTimeInMillis(ret);
13.42 + c.set(Calendar.HOUR_OF_DAY, 0);
13.43 + c.set(Calendar.MINUTE, 0);
13.44 + c.set(Calendar.SECOND, 0);
13.45 + c.set(Calendar.MILLISECOND, 0);
13.46 + ret = c.getTimeInMillis();
13.47 + } else {
13.48 + ret = -1;
13.49 + }
13.50 + return ret;
13.51 + }
13.52 +
13.53 + /**
13.54 * TODO - preserve this setting from run to run! (Unless you change
13.55 * the default!)
13.56 *
13.57 @@ -384,6 +406,23 @@
13.58 }
13.59
13.60 /**
13.61 + * Set the start date field
13.62 + *
13.63 + * @param d the date
13.64 + */
13.65 + private void setStart(long d) {
13.66 + if (d != -1) {
13.67 + jDateChooserStart.setDate(new Date(d));
13.68 + jCheckBoxStart.setSelected(true);
13.69 + enableStartChooser(true);
13.70 + } else {
13.71 + jDateChooserStart.setDate(new Date());
13.72 + jCheckBoxStart.setSelected(false);
13.73 + enableStartChooser(false);
13.74 + }
13.75 + }
13.76 +
13.77 + /**
13.78 * Changes associated file position in the dialog
13.79 *
13.80 * @param n line number
13.81 @@ -448,7 +487,8 @@
13.82 * WARNING: Do NOT modify this code. The content of this method is
13.83 * always regenerated by the Form Editor.
13.84 */
13.85 - private void initComponents() {//GEN-BEGIN:initComponents
13.86 + // <editor-fold defaultstate="collapsed" desc=" Generated Code ">//GEN-BEGIN:initComponents
13.87 + private void initComponents() {
13.88 java.awt.GridBagConstraints gridBagConstraints;
13.89
13.90 addButtonGroup = new javax.swing.ButtonGroup();
13.91 @@ -500,6 +540,8 @@
13.92 jLabel2 = new javax.swing.JLabel();
13.93 jLabelCompleted = new javax.swing.JLabel();
13.94 jDateChooserDue = new com.toedter.calendar.JDateChooser();
13.95 + jCheckBoxStart = new javax.swing.JCheckBox();
13.96 + jDateChooserStart = new com.toedter.calendar.JDateChooser();
13.97 jPanelDependencies = new javax.swing.JPanel();
13.98 jPanel8 = new javax.swing.JPanel();
13.99 jScrollPane1 = new javax.swing.JScrollPane();
13.100 @@ -544,7 +586,7 @@
13.101 gridBagConstraints.insets = new java.awt.Insets(11, 0, 0, 0);
13.102 jPanelGeneral.add(detailsScrollPane, gridBagConstraints);
13.103
13.104 - addLabel.setText(NbBundle.getMessage(EditTaskPanel.class, "AddTo")); // NOI18N();
13.105 + org.openide.awt.Mnemonics.setLocalizedText(addLabel, NbBundle.getMessage(EditTaskPanel.class, "AddTo")); // NOI18N();
13.106 gridBagConstraints = new java.awt.GridBagConstraints();
13.107 gridBagConstraints.gridx = 0;
13.108 gridBagConstraints.gridy = 6;
13.109 @@ -565,7 +607,7 @@
13.110
13.111 detailsLabel.setLabelFor(detailsTextArea);
13.112 /*
13.113 - detailsLabel.setText(NbBundle.getMessage(EditTaskPanel.class, "DetailsLabel")); // NOI18N);
13.114 + org.openide.awt.Mnemonics.setLocalizedText(detailsLabel, NbBundle.getMessage(EditTaskPanel.class, "DetailsLabel")); // NOI18N);
13.115 */
13.116 gridBagConstraints = new java.awt.GridBagConstraints();
13.117 gridBagConstraints.gridx = 0;
13.118 @@ -611,7 +653,7 @@
13.119 jPanelGeneral.add(priorityComboBox, gridBagConstraints);
13.120
13.121 /*
13.122 - fileCheckBox.setText(NbBundle.getMessage(EditTaskPanel.class, "AssociatedFile")); // NOI18N);
13.123 + org.openide.awt.Mnemonics.setLocalizedText(fileCheckBox, NbBundle.getMessage(EditTaskPanel.class, "AssociatedFile")); // NOI18N);
13.124 */
13.125 fileCheckBox.setBorder(new javax.swing.border.EmptyBorder(new java.awt.Insets(0, 0, 0, 0)));
13.126 fileCheckBox.addItemListener(new java.awt.event.ItemListener() {
13.127 @@ -629,7 +671,7 @@
13.128
13.129 categoryLabel.setLabelFor(categoryCombo);
13.130 /*
13.131 - categoryLabel.setText(NbBundle.getMessage(EditTaskPanel.class, "CategoryLabel")); // NOI18N);
13.132 + org.openide.awt.Mnemonics.setLocalizedText(categoryLabel, NbBundle.getMessage(EditTaskPanel.class, "CategoryLabel")); // NOI18N);
13.133 */
13.134 gridBagConstraints = new java.awt.GridBagConstraints();
13.135 gridBagConstraints.gridx = 0;
13.136 @@ -662,7 +704,7 @@
13.137
13.138 lineLabel.setLabelFor(lineTextField);
13.139 /*
13.140 - lineLabel.setText(NbBundle.getMessage(EditTaskPanel.class, "LineLabel")); // NOI18N);
13.141 + org.openide.awt.Mnemonics.setLocalizedText(lineLabel, NbBundle.getMessage(EditTaskPanel.class, "LineLabel")); // NOI18N);
13.142 */
13.143 gridBagConstraints = new java.awt.GridBagConstraints();
13.144 gridBagConstraints.gridx = 2;
13.145 @@ -681,7 +723,7 @@
13.146 jPanelGeneral.add(jPanel2, gridBagConstraints);
13.147
13.148 /*
13.149 - addSourceButton.setText(NbBundle.getMessage(EditTaskPanel.class, "AddToSource")); // NOI18N();
13.150 + org.openide.awt.Mnemonics.setLocalizedText(addSourceButton, NbBundle.getMessage(EditTaskPanel.class, "AddToSource")); // NOI18N();
13.151 */
13.152 gridBagConstraints = new java.awt.GridBagConstraints();
13.153 gridBagConstraints.gridx = 1;
13.154 @@ -695,7 +737,7 @@
13.155
13.156 prioLabel.setLabelFor(priorityComboBox);
13.157 /*
13.158 - prioLabel.setText(NbBundle.getMessage(EditTaskPanel.class, "PriorityLabel")); // NOI18N);
13.159 + org.openide.awt.Mnemonics.setLocalizedText(prioLabel, NbBundle.getMessage(EditTaskPanel.class, "PriorityLabel")); // NOI18N);
13.160 */
13.161 gridBagConstraints = new java.awt.GridBagConstraints();
13.162 gridBagConstraints.gridx = 0;
13.163 @@ -726,7 +768,7 @@
13.164
13.165 jPanel3.setBorder(new javax.swing.border.EmptyBorder(new java.awt.Insets(11, 11, 12, 12)));
13.166 /*
13.167 - dueCheckBox.setText(NbBundle.getMessage(EditTaskPanel.class, "DueDateCb")); // NOI18N();
13.168 + org.openide.awt.Mnemonics.setLocalizedText(dueCheckBox, NbBundle.getMessage(EditTaskPanel.class, "DueDateCb")); // NOI18N();
13.169 */
13.170 dueCheckBox.addItemListener(new java.awt.event.ItemListener() {
13.171 public void itemStateChanged(java.awt.event.ItemEvent evt) {
13.172 @@ -736,14 +778,14 @@
13.173
13.174 gridBagConstraints = new java.awt.GridBagConstraints();
13.175 gridBagConstraints.gridx = 0;
13.176 - gridBagConstraints.gridy = 0;
13.177 + gridBagConstraints.gridy = 1;
13.178 gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
13.179 gridBagConstraints.insets = new java.awt.Insets(11, 0, 0, 12);
13.180 jPanel3.add(dueCheckBox, gridBagConstraints);
13.181
13.182 gridBagConstraints = new java.awt.GridBagConstraints();
13.183 gridBagConstraints.gridx = 3;
13.184 - gridBagConstraints.gridy = 7;
13.185 + gridBagConstraints.gridy = 8;
13.186 gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER;
13.187 gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
13.188 gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
13.189 @@ -751,32 +793,32 @@
13.190 gridBagConstraints.weighty = 1.0;
13.191 jPanel3.add(jPanel1, gridBagConstraints);
13.192
13.193 - jLabel6.setText(org.openide.util.NbBundle.getMessage(EditTaskPanel.class, "LastEditedLabel")); // NOI18N);
13.194 + org.openide.awt.Mnemonics.setLocalizedText(jLabel6, org.openide.util.NbBundle.getMessage(EditTaskPanel.class, "LastEditedLabel")); // NOI18N);
13.195 gridBagConstraints = new java.awt.GridBagConstraints();
13.196 gridBagConstraints.gridx = 0;
13.197 - gridBagConstraints.gridy = 4;
13.198 + gridBagConstraints.gridy = 5;
13.199 gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
13.200 gridBagConstraints.insets = new java.awt.Insets(11, 0, 0, 12);
13.201 jPanel3.add(jLabel6, gridBagConstraints);
13.202
13.203 - jLabel5.setText(org.openide.util.NbBundle.getMessage(EditTaskPanel.class, "CreatedLabel")); // NOI18N);
13.204 + org.openide.awt.Mnemonics.setLocalizedText(jLabel5, org.openide.util.NbBundle.getMessage(EditTaskPanel.class, "CreatedLabel")); // NOI18N);
13.205 gridBagConstraints = new java.awt.GridBagConstraints();
13.206 gridBagConstraints.gridx = 0;
13.207 - gridBagConstraints.gridy = 5;
13.208 + gridBagConstraints.gridy = 6;
13.209 gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
13.210 gridBagConstraints.insets = new java.awt.Insets(11, 0, 0, 12);
13.211 jPanel3.add(jLabel5, gridBagConstraints);
13.212
13.213 gridBagConstraints = new java.awt.GridBagConstraints();
13.214 gridBagConstraints.gridx = 1;
13.215 - gridBagConstraints.gridy = 4;
13.216 + gridBagConstraints.gridy = 5;
13.217 gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
13.218 gridBagConstraints.insets = new java.awt.Insets(11, 0, 0, 12);
13.219 jPanel3.add(jLabelLastEdited, gridBagConstraints);
13.220
13.221 gridBagConstraints = new java.awt.GridBagConstraints();
13.222 gridBagConstraints.gridx = 1;
13.223 - gridBagConstraints.gridy = 5;
13.224 + gridBagConstraints.gridy = 6;
13.225 gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
13.226 gridBagConstraints.insets = new java.awt.Insets(11, 0, 0, 12);
13.227 jPanel3.add(jLabelCreated, gridBagConstraints);
13.228 @@ -820,7 +862,7 @@
13.229
13.230 gridBagConstraints = new java.awt.GridBagConstraints();
13.231 gridBagConstraints.gridx = 0;
13.232 - gridBagConstraints.gridy = 1;
13.233 + gridBagConstraints.gridy = 2;
13.234 gridBagConstraints.gridwidth = 3;
13.235 gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
13.236 gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
13.237 @@ -873,7 +915,7 @@
13.238
13.239 gridBagConstraints = new java.awt.GridBagConstraints();
13.240 gridBagConstraints.gridx = 0;
13.241 - gridBagConstraints.gridy = 2;
13.242 + gridBagConstraints.gridy = 3;
13.243 gridBagConstraints.gridwidth = 3;
13.244 gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
13.245 gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
13.246 @@ -916,7 +958,7 @@
13.247
13.248 gridBagConstraints = new java.awt.GridBagConstraints();
13.249 gridBagConstraints.gridx = 0;
13.250 - gridBagConstraints.gridy = 3;
13.251 + gridBagConstraints.gridy = 4;
13.252 gridBagConstraints.gridwidth = 3;
13.253 gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
13.254 gridBagConstraints.insets = new java.awt.Insets(11, 0, 0, 12);
13.255 @@ -925,14 +967,14 @@
13.256 org.openide.awt.Mnemonics.setLocalizedText(jLabel2, org.openide.util.NbBundle.getBundle(EditTaskPanel.class).getString("Completed"));
13.257 gridBagConstraints = new java.awt.GridBagConstraints();
13.258 gridBagConstraints.gridx = 0;
13.259 - gridBagConstraints.gridy = 6;
13.260 + gridBagConstraints.gridy = 7;
13.261 gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
13.262 gridBagConstraints.insets = new java.awt.Insets(11, 0, 0, 12);
13.263 jPanel3.add(jLabel2, gridBagConstraints);
13.264
13.265 gridBagConstraints = new java.awt.GridBagConstraints();
13.266 gridBagConstraints.gridx = 1;
13.267 - gridBagConstraints.gridy = 6;
13.268 + gridBagConstraints.gridy = 7;
13.269 gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
13.270 gridBagConstraints.insets = new java.awt.Insets(11, 0, 0, 12);
13.271 jPanel3.add(jLabelCompleted, gridBagConstraints);
13.272 @@ -940,11 +982,31 @@
13.273 jDateChooserDue.setEnabled(false);
13.274 gridBagConstraints = new java.awt.GridBagConstraints();
13.275 gridBagConstraints.gridx = 1;
13.276 - gridBagConstraints.gridy = 0;
13.277 + gridBagConstraints.gridy = 1;
13.278 gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
13.279 gridBagConstraints.insets = new java.awt.Insets(11, 0, 0, 12);
13.280 jPanel3.add(jDateChooserDue, gridBagConstraints);
13.281
13.282 + org.openide.awt.Mnemonics.setLocalizedText(jCheckBoxStart, NbBundle.getMessage(EditTaskPanel.class, "LBL_Start")); // NOI18N();
13.283 + jCheckBoxStart.addItemListener(new java.awt.event.ItemListener() {
13.284 + public void itemStateChanged(java.awt.event.ItemEvent evt) {
13.285 + jCheckBoxStartItemStateChanged(evt);
13.286 + }
13.287 + });
13.288 +
13.289 + gridBagConstraints = new java.awt.GridBagConstraints();
13.290 + gridBagConstraints.gridx = 0;
13.291 + gridBagConstraints.gridy = 0;
13.292 + gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
13.293 + jPanel3.add(jCheckBoxStart, gridBagConstraints);
13.294 +
13.295 + jDateChooserStart.setEnabled(false);
13.296 + gridBagConstraints = new java.awt.GridBagConstraints();
13.297 + gridBagConstraints.gridx = 1;
13.298 + gridBagConstraints.gridy = 0;
13.299 + gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
13.300 + jPanel3.add(jDateChooserStart, gridBagConstraints);
13.301 +
13.302 jTabbedPane.addTab(org.openide.util.NbBundle.getMessage(EditTaskPanel.class, "TimeRelated"), jPanel3);
13.303
13.304 jPanelDependencies.setLayout(new java.awt.BorderLayout());
13.305 @@ -983,7 +1045,18 @@
13.306
13.307 add(jTabbedPane, java.awt.BorderLayout.CENTER);
13.308
13.309 - }//GEN-END:initComponents
13.310 + }
13.311 + // </editor-fold>//GEN-END:initComponents
13.312 +
13.313 + private void jCheckBoxStartItemStateChanged(java.awt.event.ItemEvent evt) {//GEN-FIRST:event_jCheckBoxStartItemStateChanged
13.314 + if (evt.getID() == ItemEvent.ITEM_STATE_CHANGED) {
13.315 + boolean enable = false;
13.316 + if (evt.getStateChange() == ItemEvent.SELECTED) {
13.317 + enable = true;
13.318 + }
13.319 + enableStartChooser(enable);
13.320 + }
13.321 + }//GEN-LAST:event_jCheckBoxStartItemStateChanged
13.322
13.323 private void jRadioButtonSpentItemStateChanged(java.awt.event.ItemEvent evt) {//GEN-FIRST:event_jRadioButtonSpentItemStateChanged
13.324 durationPanelSpent.setEnabled(jRadioButtonSpent.isSelected());
13.325 @@ -1107,7 +1180,19 @@
13.326 jDateChooserDue.getComponent(i).setEnabled(enable);
13.327 }
13.328 }
13.329 +
13.330 + /**
13.331 + * Bugfix for JDateChooser.setEnabled
13.332 + *
13.333 + * @param enable true = enabled
13.334 + */
13.335 + private void enableStartChooser(boolean enable) {
13.336 + for (int i = 0; i < jDateChooserStart.getComponentCount(); i++) {
13.337 + jDateChooserStart.getComponent(i).setEnabled(enable);
13.338 + }
13.339 + }
13.340
13.341 + // <editor-fold defaultstate="collapsed" desc=" Generated Code: Variables declarations ">
13.342 // Variables declaration - do not modify//GEN-BEGIN:variables
13.343 private javax.swing.ButtonGroup addButtonGroup;
13.344 private javax.swing.JLabel addLabel;
13.345 @@ -1128,9 +1213,11 @@
13.346 private javax.swing.JRadioButton endToggle;
13.347 private javax.swing.JCheckBox fileCheckBox;
13.348 private javax.swing.JTextField fileTextField;
13.349 + private javax.swing.JCheckBox jCheckBoxStart;
13.350 private javax.swing.JComboBox jComboBoxOwner;
13.351 private javax.swing.JComboBox jComboBoxProgress;
13.352 private com.toedter.calendar.JDateChooser jDateChooserDue;
13.353 + private com.toedter.calendar.JDateChooser jDateChooserStart;
13.354 private javax.swing.JLabel jLabel1;
13.355 private javax.swing.JLabel jLabel2;
13.356 private javax.swing.JLabel jLabel3;
13.357 @@ -1165,4 +1252,5 @@
13.358 private javax.swing.JLabel prioLabel;
13.359 private javax.swing.JComboBox priorityComboBox;
13.360 // End of variables declaration//GEN-END:variables
13.361 + // </editor-fold>
13.362 }
14.1 --- a/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/UserTaskNode.java Mon Aug 29 20:07:51 2005 +0000
14.2 +++ b/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/UserTaskNode.java Tue Aug 30 10:49:38 2005 +0000
14.3 @@ -386,6 +386,13 @@
14.4 p.setDisplayName(NbBundle.getMessage(UserTaskNode.class, "LBL_ownerProperty")); // NOI18N
14.5 p.setShortDescription(NbBundle.getMessage(UserTaskNode.class, "HNT_ownerProperty")); // NOI18N
14.6 ss.put(p);
14.7 +
14.8 + p = new PropertySupport.Reflection(item, Date.class, "getStartDate", "setStartDate"); // NOI18N
14.9 + p.setPropertyEditorClass(DateEditor.class);
14.10 + p.setName(UserTask.PROP_START);
14.11 + p.setDisplayName(NbBundle.getMessage(UserTaskNode.class, "LBL_startProperty")); // NOI18N
14.12 + p.setShortDescription(NbBundle.getMessage(UserTaskNode.class, "HNT_startProperty")); // NOI18N
14.13 + ss.put(p);
14.14 } catch (NoSuchMethodException nsme) {
14.15 ErrorManager.getDefault().notify(nsme);
14.16 }
15.1 --- a/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/UserTasksTreeTable.java Mon Aug 29 20:07:51 2005 +0000
15.2 +++ b/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/UserTasksTreeTable.java Tue Aug 30 10:49:38 2005 +0000
15.3 @@ -40,6 +40,7 @@
15.4 import org.netbeans.modules.tasklist.usertasks.editors.PriorityTableCellEditor;
15.5 import org.netbeans.modules.tasklist.usertasks.renderers.CategoryTableCellRenderer;
15.6 import org.netbeans.modules.tasklist.usertasks.renderers.DateTableCellRenderer;
15.7 +import org.netbeans.modules.tasklist.usertasks.renderers.DueDateTableCellRenderer;
15.8 import org.netbeans.modules.tasklist.usertasks.renderers.DurationTableCellRenderer;
15.9 import org.netbeans.modules.tasklist.usertasks.renderers.EffortTableCellRenderer;
15.10 import org.netbeans.modules.tasklist.usertasks.renderers.LineTableCellRenderer;
15.11 @@ -64,6 +65,8 @@
15.12
15.13 /**
15.14 * TT for user tasks
15.15 + *
15.16 + * @author tl
15.17 */
15.18 public class UserTasksTreeTable extends NodesTreeTable {
15.19 private UserTask selected;
15.20 @@ -221,6 +224,11 @@
15.21 setCellEditor(new OwnerTableCellEditor());
15.22 tcm.getColumn(UserTasksTreeTableModel.OWNER).
15.23 setCellRenderer(new OwnerTableCellRenderer());
15.24 +
15.25 + tcm.getColumn(UserTasksTreeTableModel.DUE_DATE).setCellRenderer(
15.26 + new DueDateTableCellRenderer());
15.27 +
15.28 + tcm.getColumn(UserTasksTreeTableModel.START).setCellRenderer(dcr);
15.29 }
15.30
15.31 /**
15.32 @@ -290,6 +298,7 @@
15.33
15.34 if (node instanceof UserTaskTreeTableNode) {
15.35 result = ((UserTaskTreeTableNode) node).getUserTask().getDetails();
15.36 + result = UTUtils.prepareForTooltip(result);
15.37 if (result.length() == 0)
15.38 result = null;
15.39 } else if (node instanceof UserTaskListTreeTableNode) {
16.1 --- a/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/actions/GoToUserTaskAction.java Mon Aug 29 20:07:51 2005 +0000
16.2 +++ b/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/actions/GoToUserTaskAction.java Tue Aug 30 10:49:38 2005 +0000
16.3 @@ -25,6 +25,7 @@
16.4 * task.
16.5 *
16.6 * @author Tor Norbye
16.7 + * @author tl
16.8 */
16.9 public class GoToUserTaskAction extends CookieAction {
16.10
17.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
17.2 +++ b/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/annotations/Bundle.properties Tue Aug 30 10:49:38 2005 +0000
17.3 @@ -0,0 +1,23 @@
17.4 +# Sun Public License Notice
17.5 +#
17.6 +# The contents of this file are subject to the Sun Public License
17.7 +# Version 1.0 (the "License"). You may not use this file except in
17.8 +# compliance with the License. A copy of the License is available at
17.9 +# http://www.sun.com/
17.10 +#
17.11 +# The Original Code is NetBeans. The Initial Developer of the Original
17.12 +# Code is Sun Microsystems, Inc. Portions Copyright 1997-2005 Sun
17.13 +# Microsystems, Inc. All Rights Reserved.
17.14 +
17.15 +## UTAnnotation.xml hint
17.16 +HINT_TASK=User Tasks
17.17 +
17.18 +## UTNoHighlightAnnotation.xml
17.19 +HINT_TASK_transparent=User Tasks (without highlighting)
17.20 +
17.21 +## UTDoneAnnotation.xml
17.22 +HINT_TASK_doneTransparent=Done User Tasks (without highlighting)
17.23 +
17.24 +## UTDoneNoHighlightAnnotation.xml
17.25 +HINT_TASK_done=Done User Tasks
17.26 +
18.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
18.2 +++ b/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/annotations/UTAnnotation.java Tue Aug 30 10:49:38 2005 +0000
18.3 @@ -0,0 +1,126 @@
18.4 +/*
18.5 + * Sun Public License Notice
18.6 + *
18.7 + * The contents of this file are subject to the Sun Public License
18.8 + * Version 1.0 (the "License"). You may not use this file except in
18.9 + * compliance with the License. A copy of the License is available at
18.10 + * http://www.sun.com/
18.11 + *
18.12 + * The Original Code is NetBeans. The Initial Developer of the Original
18.13 + * Code is Sun Microsystems, Inc. Portions Copyright 1997-2003 Sun
18.14 + * Microsystems, Inc. All Rights Reserved.
18.15 + */
18.16 +
18.17 +package org.netbeans.modules.tasklist.usertasks.annotations;
18.18 +
18.19 +import org.openide.text.Annotation;
18.20 +import org.netbeans.modules.tasklist.usertasks.model.UserTask;
18.21 +import org.netbeans.modules.tasklist.usertasks.*;
18.22 +
18.23 +/**
18.24 + * Annotation which shows tasks in the editor
18.25 + *
18.26 + * @author tl
18.27 + */
18.28 +public class UTAnnotation extends Annotation {
18.29 + protected UserTask task = null;
18.30 + private boolean highlight = false;
18.31 + private UserTaskView view;
18.32 + private boolean done;
18.33 +
18.34 + /**
18.35 + * Construct a new TaskAnnotation which shows both a gutter
18.36 + * icon and a line highlight.
18.37 + */
18.38 + public UTAnnotation(UserTask task) {
18.39 + this(task, true);
18.40 + }
18.41 +
18.42 + /**
18.43 + * Construct a new TaskAnnotation.
18.44 + * @param task The task to show the annotation for
18.45 + * @param highlight When true, show a highlight for the task,
18.46 + * not just a gutter icon.
18.47 + */
18.48 + public UTAnnotation(UserTask task, boolean highlight) {
18.49 + this.done = task.isDone();
18.50 + this.task = task;
18.51 + this.highlight = highlight;
18.52 + }
18.53 +
18.54 + /**
18.55 + * Constructs annotation that is capable to locate
18.56 + * task in other tasks views (implementing TaskSelector).
18.57 + *
18.58 + * @param task
18.59 + * @param view
18.60 + */
18.61 + public UTAnnotation(UserTask task, UserTaskView view) {
18.62 + this.task = task;
18.63 + this.view = view;
18.64 + highlight = true;
18.65 + }
18.66 +
18.67 + /**
18.68 + * Changes the icon depending on the done attribute.
18.69 + *
18.70 + * @param done the task was done
18.71 + */
18.72 + public void setDone(boolean done) {
18.73 + if (this.done != done) {
18.74 + String old = getAnnotationType();
18.75 + this.done = done;
18.76 + firePropertyChange(PROP_ANNOTATION_TYPE, old, getAnnotationType());
18.77 + }
18.78 + }
18.79 +
18.80 + /**
18.81 + * Highlights the task/removes the highlighting.
18.82 + *
18.83 + * @param highlight true = highlight
18.84 + */
18.85 + public void setHighlight(boolean highlight) {
18.86 + if (this.highlight != highlight) {
18.87 + String old = getAnnotationType();
18.88 + this.highlight = highlight;
18.89 + firePropertyChange(PROP_ANNOTATION_TYPE, old, getAnnotationType());
18.90 + }
18.91 + }
18.92 +
18.93 + public String getAnnotationType () {
18.94 + // THE TYPE IS DEFINED IN THE TASKLIST CORE MODULE!
18.95 + if (!done) {
18.96 + if (highlight) {
18.97 + return "org-netbeans-modules-tasklist-usertasks-UTNoHighlight"; // NOI18N
18.98 + } else {
18.99 + return "org-netbeans-modules-tasklist-usertasks-UT"; // NOI18N
18.100 + }
18.101 + } else {
18.102 + if (!highlight)
18.103 + return "org-netbeans-modules-tasklist-usertasks-UTDoneNoHighlight"; // NOI18N
18.104 + else
18.105 + return "org-netbeans-modules-tasklist-usertasks-UTDone"; // NOI18N
18.106 + }
18.107 + }
18.108 +
18.109 + public String getShortDescription () {
18.110 + // Use details summary, if available
18.111 + showTask();
18.112 +
18.113 + if (task.getDetails().length() > 0) {
18.114 + return task.getSummary() + "\n\n" + task.getDetails(); // NOI18N
18.115 + } else {
18.116 + return task.getSummary();
18.117 + }
18.118 + }
18.119 +
18.120 + /** Show the task for this annotation in its view */
18.121 + protected void showTask() {
18.122 + if (view != null) view.select(task);
18.123 + }
18.124 +
18.125 + /** Return the task associated with this annotation */
18.126 + public UserTask getTask() {
18.127 + return task;
18.128 + }
18.129 +}
19.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
19.2 +++ b/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/annotations/UTAnnotation.xml Tue Aug 30 10:49:38 2005 +0000
19.3 @@ -0,0 +1,25 @@
19.4 +<?xml version="1.0"?>
19.5 +<!--
19.6 + Sun Public License Notice
19.7 +
19.8 +The contents of this file are subject to the Sun Public License
19.9 +Version 1.0 (the "License"). You may not use this file except in
19.10 +compliance with the License. A copy of the License is available at
19.11 +http://www.sun.com/
19.12 +
19.13 +The Original Code is NetBeans. The Initial Developer of the Original
19.14 +Code is Sun Microsystems, Inc. Portions Copyright 1997-2001 Sun
19.15 +Microsystems, Inc. All Rights Reserved.
19.16 +-->
19.17 +
19.18 +<!DOCTYPE type PUBLIC "-//NetBeans//DTD annotation type 1.0//EN" "http://www.netbeans.org/dtds/annotation-type-1_0.dtd">
19.19 +<type
19.20 + name='org-netbeans-modules-tasklist-usertasks-UT'
19.21 + description_key='HINT_TASK'
19.22 + localizing_bundle='org.netbeans.modules.tasklist.usertasks.annotations.Bundle'
19.23 + visible='true'
19.24 + glyph='nbresloc:/org/netbeans/modules/tasklist/usertasks/annotations/taskGlyph.gif'
19.25 + highlight='0xFBE564'
19.26 + type='line'
19.27 + actions='TaskAnnotationActions'
19.28 +/>
20.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
20.2 +++ b/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/annotations/UTDoneAnnotation.xml Tue Aug 30 10:49:38 2005 +0000
20.3 @@ -0,0 +1,24 @@
20.4 +<?xml version="1.0"?>
20.5 +<!--
20.6 + Sun Public License Notice
20.7 +
20.8 +The contents of this file are subject to the Sun Public License
20.9 +Version 1.0 (the "License"). You may not use this file except in
20.10 +compliance with the License. A copy of the License is available at
20.11 +http://www.sun.com/
20.12 +
20.13 +The Original Code is NetBeans. The Initial Developer of the Original
20.14 +Code is Sun Microsystems, Inc. Portions Copyright 1997-2001 Sun
20.15 +Microsystems, Inc. All Rights Reserved.
20.16 +-->
20.17 +
20.18 +<!DOCTYPE type PUBLIC "-//NetBeans//DTD annotation type 1.0//EN" "http://www.netbeans.org/dtds/annotation-type-1_0.dtd">
20.19 +<type
20.20 + name='org-netbeans-modules-tasklist-usertasks-UTDone'
20.21 + description_key='HINT_TASK_done'
20.22 + localizing_bundle='org.netbeans.modules.tasklist.usertasks.annotations.Bundle'
20.23 + visible='true'
20.24 + glyph='nbresloc:/org/netbeans/modules/tasklist/usertasks/annotations/doneGlyph.gif'
20.25 + highlight='0xFBE564'
20.26 + type='line'
20.27 +/>
20.28 \ No newline at end of file
21.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
21.2 +++ b/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/annotations/UTDoneNoHighlightAnnotation.xml Tue Aug 30 10:49:38 2005 +0000
21.3 @@ -0,0 +1,22 @@
21.4 +<?xml version="1.0"?>
21.5 +<!--
21.6 + Sun Public License Notice
21.7 +
21.8 +The contents of this file are subject to the Sun Public License
21.9 +Version 1.0 (the "License"). You may not use this file except in
21.10 +compliance with the License. A copy of the License is available at
21.11 +http://www.sun.com/
21.12 +
21.13 +The Original Code is NetBeans. The Initial Developer of the Original
21.14 +Code is Sun Microsystems, Inc. Portions Copyright 1997-2001 Sun
21.15 +Microsystems, Inc. All Rights Reserved.
21.16 +-->
21.17 +
21.18 +<!DOCTYPE type PUBLIC "-//NetBeans//DTD annotation type 1.0//EN" "http://www.netbeans.org/dtds/annotation-type-1_0.dtd">
21.19 +<type
21.20 + name='org-netbeans-modules-tasklist-usertasks-UTDoneNoHighlight'
21.21 + description_key='HINT_TASK_doneTransparent'
21.22 + localizing_bundle='org.netbeans.modules.tasklist.usertasks.annotations.Bundle'
21.23 + visible='true'
21.24 + glyph='nbresloc:/org/netbeans/modules/tasklist/usertasks/annotations/doneGlyph.gif'
21.25 +/>
21.26 \ No newline at end of file
22.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
22.2 +++ b/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/annotations/UTNoHighlightAnnotation.xml Tue Aug 30 10:49:38 2005 +0000
22.3 @@ -0,0 +1,22 @@
22.4 +<?xml version="1.0"?>
22.5 +<!--
22.6 + Sun Public License Notice
22.7 +
22.8 +The contents of this file are subject to the Sun Public License
22.9 +Version 1.0 (the "License"). You may not use this file except in
22.10 +compliance with the License. A copy of the License is available at
22.11 +http://www.sun.com/
22.12 +
22.13 +The Original Code is NetBeans. The Initial Developer of the Original
22.14 +Code is Sun Microsystems, Inc. Portions Copyright 1997-2001 Sun
22.15 +Microsystems, Inc. All Rights Reserved.
22.16 +-->
22.17 +
22.18 +<!DOCTYPE type PUBLIC "-//NetBeans//DTD annotation type 1.0//EN" "http://www.netbeans.org/dtds/annotation-type-1_0.dtd">
22.19 +<type
22.20 + name='org-netbeans-modules-tasklist-usertasks-UTNoHighlight'
22.21 + description_key='HINT_TASK_transparent'
22.22 + localizing_bundle='org.netbeans.modules.tasklist.usertasks.annotations.Bundle'
22.23 + visible='true'
22.24 + glyph='nbresloc:/org/netbeans/modules/tasklist/usertasks/annotations/taskGlyph.gif'
22.25 +/>
23.1 --- a/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/filter/Bundle.properties Mon Aug 29 20:07:51 2005 +0000
23.2 +++ b/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/filter/Bundle.properties Tue Aug 30 10:49:38 2005 +0000
23.3 @@ -56,3 +56,5 @@
23.4 HNT_detailsProperty=Full description of the task
23.5 LBL_completedDateProperty=Completed Date
23.6 HNT_completedDateProperty=Date when this task was completed
23.7 +LBL_startProperty=Start
23.8 +HNT_startProperty=Date & time when the task should be started
24.1 --- a/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/filter/UserTaskFilter.java Mon Aug 29 20:07:51 2005 +0000
24.2 +++ b/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/filter/UserTaskFilter.java Tue Aug 30 10:49:38 2005 +0000
24.3 @@ -25,6 +25,8 @@
24.4
24.5 /**
24.6 * Filter for user tasks
24.7 + *
24.8 + * @author tl
24.9 */
24.10 public class UserTaskFilter extends Filter {
24.11 private static final SuggestionProperty[] PROPS = new SuggestionProperty[] {
24.12 @@ -42,7 +44,8 @@
24.13 UserTaskProperties.PROP_EFFORT,
24.14 UserTaskProperties.PROP_REMAINING_EFFORT,
24.15 UserTaskProperties.PROP_SPENT_TIME,
24.16 - UserTaskProperties.PROP_OWNER
24.17 + UserTaskProperties.PROP_OWNER,
24.18 + UserTaskProperties.PROP_START
24.19 };
24.20
24.21 /**
24.22 @@ -55,14 +58,14 @@
24.23 }
24.24
24.25 public UserTaskFilter(UserTaskFilter rhs) {
24.26 - super(rhs);
24.27 + super(rhs);
24.28 }
24.29
24.30 private UserTaskFilter() { // for deconvertization
24.31 }
24.32
24.33 public Object clone() {
24.34 - return new UserTaskFilter(this);
24.35 + return new UserTaskFilter(this);
24.36 }
24.37
24.38 public SuggestionProperty[] getProperties() {
24.39 @@ -102,6 +105,8 @@
24.40 return applyConditions(property, DurationFilterCondition.createConditions());
24.41 } else if (property.equals(UserTaskProperties.PROP_OWNER)) {
24.42 return applyConditions(property, StringFilterCondition.createConditions());
24.43 + } else if (property.equals(UserTaskProperties.PROP_START)) {
24.44 + return applyConditions(property, DateFilterCondition.createConditions());
24.45 } else {
24.46 throw new InternalError("Wrong index"); // NOI18N
24.47 }
25.1 --- a/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/filter/UserTaskProperties.java Mon Aug 29 20:07:51 2005 +0000
25.2 +++ b/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/filter/UserTaskProperties.java Tue Aug 30 10:49:38 2005 +0000
25.3 @@ -37,6 +37,7 @@
25.4 public static final String PROPID_SPENT_TIME = "spentTime"; // NOI18N
25.5 public static final String PROPID_OWNER = "owner"; // NOI18N
25.6 public static final String PROPID_COMPLETED_DATE = "completedDate"; // NOI18N
25.7 + public static final String PROPID_START = "start"; // NOI18N
25.8
25.9 public static SuggestionProperty PROP_SUMMARY =
25.10 new SuggestionProperty(PROPID_SUMMARY, String.class) {
25.11 @@ -150,6 +151,17 @@
25.12 }
25.13 };
25.14
25.15 + public static final SuggestionProperty PROP_START =
25.16 + new SuggestionProperty(PROPID_START, Date.class) {
25.17 + public Object getValue(Object obj) {
25.18 + long start = ((UserTask) obj).getStart();
25.19 + if (start == -1)
25.20 + return null;
25.21 + else
25.22 + return new Date(start);
25.23 + }
25.24 + };
25.25 +
25.26 public static SuggestionProperty getProperty(String propID) {
25.27 if (propID.equals(PROPID_CATEGORY)) {
25.28 return PROP_CATEGORY;
25.29 @@ -185,6 +197,8 @@
25.30 return PROP_SUMMARY;
25.31 } else if (propID.equals(PROPID_DETAILS)) {
25.32 return PROP_DETAILS;
25.33 + } else if (propID.equals(PROPID_START)) {
25.34 + return PROP_START;
25.35 } else {
25.36 throw new IllegalArgumentException("Unresolved property id " + propID); // NOI18N
25.37 }
26.1 --- a/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/mf-layer.xml Mon Aug 29 20:07:51 2005 +0000
26.2 +++ b/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/mf-layer.xml Tue Aug 30 10:49:38 2005 +0000
26.3 @@ -96,6 +96,14 @@
26.4 <attr name="hint.originalPublicID"
26.5 stringvalue="-//NetBeans org.netbeans.modules.tasklist.usertasks//DTD User Tasks 1.0//EN"/>
26.6 </file>
26.7 + <file name="DTD_User_Tasks_1_1" url="translators/usertasks-1_1.dtd">
26.8 + <attr name="hint.originalPublicID"
26.9 + stringvalue="-//NetBeans org.netbeans.modules.tasklist.usertasks//DTD User Tasks 1.1//EN"/>
26.10 + </file>
26.11 + <file name="DTD_User_Tasks_1_2" url="translators/usertasks-1_2.dtd">
26.12 + <attr name="hint.originalPublicID"
26.13 + stringvalue="-//NetBeans org.netbeans.modules.tasklist.usertasks//DTD User Tasks 1.2//EN"/>
26.14 + </file>
26.15 </folder>
26.16 <folder name="NetBeans_org_netbeans_modules_tasklist">
26.17 <file name="DTD_UserTaskFilter_1_0" url="filter/utfilter-1_0.dtd">
26.18 @@ -140,27 +148,29 @@
26.19
26.20 <folder name="Editors">
26.21 <folder name="AnnotationTypes">
26.22 - <file name="DoneTaskAnnotation.xml" url="DoneTaskAnnotation.xml"/>
26.23 - <file name="DoneTaskNoHighlightAnnotation.xml" url="DoneTaskNoHighlightAnnotation.xml"/>
26.24 + <file name="UTDoneAnnotation.xml" url="annotations/UTDoneAnnotation.xml"/>
26.25 + <file name="UTDoneNoHighlightAnnotation.xml" url="annotations/UTDoneNoHighlightAnnotation.xml"/>
26.26 + <file name="UTAnnotation.xml" url="annotations/UTAnnotation.xml"/>
26.27 + <file name="UTNoHighlightAnnotation.xml" url="annotations/UTNoHighlightAnnotation.xml"/>
26.28 <folder name="StatusForAnnotationType">
26.29 - <file name="org.netbeans.modules.tasklist.usertasks.UserTaskDone">
26.30 + <file name="org-netbeans-modules-tasklist-usertasks-UserTaskDone">
26.31 <attr name="status" stringvalue="ok" />
26.32 - <attr name="color" stringvalue="65280" />
26.33 + <attr name="color" stringvalue="0x00FF00" />
26.34 <attr name="browseable" boolvalue="true" />
26.35 </file>
26.36 - <file name="org.netbeans.modules.tasklist.usertasks.UserTaskDoneNoHighlight">
26.37 + <file name="org-netbeans-modules-tasklist-usertasks-UTDoneNoHighlight">
26.38 <attr name="status" stringvalue="ok" />
26.39 - <attr name="color" stringvalue="65280" />
26.40 + <attr name="color" stringvalue="0x00FF00" />
26.41 <attr name="browseable" boolvalue="true" />
26.42 </file>
26.43 - <file name="Task">
26.44 + <file name="org-netbeans-modules-tasklist-usertasks-UT">
26.45 <attr name="status" stringvalue="ok" />
26.46 - <attr name="color" stringvalue="16711680" />
26.47 + <attr name="color" stringvalue="0xFF0000" />
26.48 <attr name="browseable" boolvalue="true" />
26.49 </file>
26.50 - <file name="TaskNoHighlight">
26.51 + <file name="org-netbeans-modules-tasklist-usertasks-UTNoHighlight">
26.52 <attr name="status" stringvalue="ok" />
26.53 - <attr name="color" stringvalue="16711680" />
26.54 + <attr name="color" stringvalue="0xFF0000" />
26.55 <attr name="browseable" boolvalue="true" />
26.56 </file>
26.57 </folder>
27.1 --- a/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/model/UserTask.java Mon Aug 29 20:07:51 2005 +0000
27.2 +++ b/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/model/UserTask.java Tue Aug 30 10:49:38 2005 +0000
27.3 @@ -41,6 +41,7 @@
27.4 import org.openide.util.NbBundle;
27.5 import org.netbeans.modules.tasklist.core.util.ObjectList;
27.6 import org.netbeans.modules.tasklist.usertasks.*;
27.7 +import org.netbeans.modules.tasklist.usertasks.annotations.UTAnnotation;
27.8
27.9
27.10 /**
27.11 @@ -222,6 +223,7 @@
27.12 public static final String PROP_OWNER = "owner"; // NOI18N
27.13 public static final String PROP_COMPLETED_DATE = "completedDate"; // NOI18N
27.14 public static final String PROP_WORK_PERIODS = "workPeriods"; // NOI18N
27.15 + public static final String PROP_START = "start"; // NOI18N
27.16
27.17 // ATTENTION: if you add new fields here do not forget to update copyFrom
27.18
27.19 @@ -311,9 +313,9 @@
27.20
27.21 private PropertyChangeListener lineListener;
27.22
27.23 - // SECTION The following 4 attributes should be used/updated together.
27.24 + // <editor-fold defaultstate="collapsed" desc="These 4 attributes should be used/updated together: url, annotation, line, linenumber">
27.25 /** annotation for this task. != null if line != null */
27.26 - private UserTaskAnnotation annotation = null;
27.27 + private UTAnnotation annotation = null;
27.28
27.29 /** URL associated with this task. */
27.30 private URL url = null;
27.31 @@ -326,12 +328,18 @@
27.32 * -1 = no line information
27.33 */
27.34 private int linenumber = -1;
27.35 - // END SECTION The following 4 attributes should be used/updated together.
27.36 + // </editor-fold>
27.37
27.38 private List dependencies = new ArrayList();
27.39 private String owner = ""; // NOI18N
27.40 private long completedDate = 0;
27.41
27.42 + /**
27.43 + * Start date/time for the task as returned by System.currentTimeMillis or -1
27.44 + * if undefined
27.45 + */
27.46 + private long start = -1;
27.47 +
27.48 // <WorkPeriod>
27.49 private ObjectList workPeriods = new ObjectList();
27.50 // ATTENTION: if you add new fields here do not forget to update copyFrom
27.51 @@ -693,7 +701,8 @@
27.52
27.53 /**
27.54 * Get the "Deadline" for this task
27.55 - * @return the "deadline"
27.56 + *
27.57 + * @return the "deadline" or null
27.58 */
27.59 public Date getDueDate() {
27.60 return dueDate;
27.61 @@ -1101,7 +1110,7 @@
27.62 *
27.63 * @return annotation
27.64 */
27.65 - public UserTaskAnnotation getAnnotation() {
27.66 + public UTAnnotation getAnnotation() {
27.67 return annotation;
27.68 }
27.69
27.70 @@ -1205,8 +1214,7 @@
27.71
27.72 setSummary(from.getSummary());
27.73 setPriority(from.getPriority());
27.74 - setIcon(from.getIcon());
27.75 - setType(from.getType());
27.76 +
27.77 setDetails(from.getDetails());
27.78 setDueDate(from.getDueDate());
27.79 setDueAlarmSent(from.isDueAlarmSent());
27.80 @@ -1243,6 +1251,8 @@
27.81 dependencies.addAll(from.dependencies);
27.82 owner = from.owner;
27.83 completedDate = from.completedDate;
27.84 + start = from.start;
27.85 +
27.86 workPeriods.clear();
27.87 for (int i = 0; i < from.workPeriods.size(); i++) {
27.88 WorkPeriod wp = (WorkPeriod) from.workPeriods.get(i);
27.89 @@ -1601,56 +1611,6 @@
27.90 }
27.91
27.92 /**
27.93 - * Set the icon for the task. May be null; if so the default icon will
27.94 - * be shown.
27.95 - * <p>
27.96 - *
27.97 - * @param icon The icon to be shown with the task.
27.98 - *
27.99 - * @deprecated use SuggestionAgent#setIcon
27.100 - */
27.101 - protected void setIcon(final Image icon) {
27.102 - Image old = getIcon();
27.103 - if (old == icon) return;
27.104 - this.icon = icon;
27.105 - firePropertyChange(PROP_ICON, old, icon);
27.106 - }
27.107 -
27.108 - /**
27.109 - * Get the icon for the task. May be null if no icon
27.110 - * has been specified; if so the default will be used.
27.111 - * <p>
27.112 - *
27.113 - * @return The icon for the task.
27.114 - */
27.115 - public Image getIcon() {
27.116 - return icon;
27.117 - }
27.118 -
27.119 - /**
27.120 - * Set the type associated with this suggestion.
27.121 - * Should not be null.
27.122 - * <p>
27.123 - *
27.124 - * @param type The type name for this suggestion
27.125 - *
27.126 - * @deprecated should be constant since contruction time
27.127 - */
27.128 - protected void setType(final String type) {
27.129 - this.type = type;
27.130 - }
27.131 -
27.132 - /**
27.133 - * Get the type associated with this suggestion.
27.134 - * <p>
27.135 - *
27.136 - * @return The type name for this suggestion
27.137 - */
27.138 - public String getType() {
27.139 - return type;
27.140 - }
27.141 -
27.142 - /**
27.143 * Listen to changes in bean properties.
27.144 * @param l listener to be notified of changes
27.145 *
27.146 @@ -1697,8 +1657,8 @@
27.147 *
27.148 * @return created annotation
27.149 */
27.150 - private UserTaskAnnotation createAnnotation() {
27.151 - UserTaskAnnotation ann = new UserTaskAnnotation(this, false);
27.152 + private UTAnnotation createAnnotation() {
27.153 + UTAnnotation ann = new UTAnnotation(this, false);
27.154 return ann;
27.155 }
27.156
27.157 @@ -1765,4 +1725,50 @@
27.158 }
27.159 return sum;
27.160 }
27.161 +
27.162 + /**
27.163 + * Returns the start time for this task.
27.164 + *
27.165 + * @return start time as returned by System.currentTimeMillis or -1 if
27.166 + * undefined
27.167 + */
27.168 + public long getStart() {
27.169 + return start;
27.170 + }
27.171 +
27.172 + /**
27.173 + * Returns the start time for this task.
27.174 + *
27.175 + * @return start time or null if undefined
27.176 + */
27.177 + public Date getStartDate() {
27.178 + if (start == -1)
27.179 + return null;
27.180 + else
27.181 + return new Date(start);
27.182 + }
27.183 +
27.184 + /**
27.185 + * Sets the start time for this task.
27.186 + *
27.187 + * @param start time as returned by System.currentTimeMillis or -1 if
27.188 + * undefined
27.189 + */
27.190 + public void setStart(long start) {
27.191 + long old = this.start;
27.192 + this.start = start;
27.193 + firePropertyChange("start", new Long(old), new Long(start)); // NOI18N
27.194 + }
27.195 +
27.196 + /**
27.197 + * Sets the start time for this task.
27.198 + *
27.199 + * @param start time or null if undefined
27.200 + */
27.201 + public void setStartDate(Date start) {
27.202 + if (start == null)
27.203 + setStart(-1);
27.204 + else
27.205 + setStart(start.getTime());
27.206 + }
27.207 }
27.208 \ No newline at end of file
28.1 --- a/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/renderers/DateTableCellRenderer.java Mon Aug 29 20:07:51 2005 +0000
28.2 +++ b/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/renderers/DateTableCellRenderer.java Tue Aug 30 10:49:38 2005 +0000
28.3 @@ -22,6 +22,8 @@
28.4
28.5 /**
28.6 * A table cell renderer for the Date class.
28.7 + *
28.8 + * @author tl
28.9 */
28.10 public class DateTableCellRenderer extends DefaultTableCellRenderer {
28.11 private static SimpleDateFormat format = new SimpleDateFormat();
28.12 @@ -49,14 +51,17 @@
28.13 int row, int column) {
28.14 super.getTableCellRendererComponent(table, value, isSelected, hasFocus,
28.15 row, column);
28.16 - if (value == null)
28.17 - setText(""); // NOI18N
28.18 - else {
28.19 +
28.20 + if (value instanceof Date) {
28.21 + setText(format.format((Date) value));
28.22 + } else if (value instanceof Long) {
28.23 long v = ((Long) value).longValue();
28.24 if (v == 0)
28.25 setText(""); // NOI18N
28.26 else
28.27 setText(format.format(new Date(v)));
28.28 + } else {
28.29 + setText(""); // NOI18N
28.30 }
28.31 return this;
28.32 }
29.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
29.2 +++ b/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/renderers/DueDateTableCellRenderer.java Tue Aug 30 10:49:38 2005 +0000
29.3 @@ -0,0 +1,62 @@
29.4 +package org.netbeans.modules.tasklist.usertasks.renderers;
29.5 +
29.6 +import java.awt.Color;
29.7 +import java.awt.Component;
29.8 +import java.awt.Font;
29.9 +import java.util.Date;
29.10 +import org.netbeans.modules.tasklist.usertasks.Settings;
29.11 +import org.netbeans.modules.tasklist.usertasks.UserTaskTreeTableNode;
29.12 +import org.netbeans.modules.tasklist.usertasks.model.Duration;
29.13 +import org.netbeans.modules.tasklist.usertasks.model.UserTask;
29.14 +import org.netbeans.modules.tasklist.usertasks.treetable.TreeTableRenderer;
29.15 +
29.16 +/**
29.17 + * Renderer for the due date
29.18 + *
29.19 + * @author tl
29.20 + */
29.21 +public class DueDateTableCellRenderer extends DateTableCellRenderer implements
29.22 +TreeTableRenderer {
29.23 + private Font boldFont, normalFont;
29.24 +
29.25 + /**
29.26 + * Constructor
29.27 + */
29.28 + public DueDateTableCellRenderer() {
29.29 + }
29.30 +
29.31 + protected Duration getDuration(Object obj) {
29.32 + UserTask ut = (UserTask) obj;
29.33 + if (ut == null) {
29.34 + return null;
29.35 + } else {
29.36 + return new Duration(ut.getEffort(),
29.37 + Settings.getDefault().getHoursPerDay(),
29.38 + Settings.getDefault().getDaysPerWeek());
29.39 + }
29.40 + }
29.41 +
29.42 + public Component getTreeTableCellRendererComponent(
29.43 + org.netbeans.modules.tasklist.usertasks.treetable.TreeTable table,
29.44 + Object node, Object value, boolean isSelected, boolean hasFocus,
29.45 + int row, int column) {
29.46 + if (normalFont == null || !normalFont.equals(table.getFont())) {
29.47 + normalFont = table.getFont();
29.48 + boldFont = normalFont.deriveFont(Font.BOLD);
29.49 + }
29.50 + setForeground(null);
29.51 + super.getTableCellRendererComponent(table, value, isSelected, hasFocus,
29.52 + row, column);
29.53 + if (node instanceof UserTaskTreeTableNode) {
29.54 + UserTaskTreeTableNode n = (UserTaskTreeTableNode) node;
29.55 + UserTask ut = (UserTask) n.getUserTask();
29.56 + Date due = ut.getDueDate();
29.57 + boolean b = !ut.isDone() && due != null &&
29.58 + due.getTime() >= System.currentTimeMillis();
29.59 + setFont(b ? normalFont : boldFont);
29.60 + if (!isSelected && !b)
29.61 + setForeground(Color.RED);
29.62 + }
29.63 + return this;
29.64 + }
29.65 +}
30.1 --- a/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/translators/ICalExportFormat.java Mon Aug 29 20:07:51 2005 +0000
30.2 +++ b/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/translators/ICalExportFormat.java Tue Aug 30 10:49:38 2005 +0000
30.3 @@ -208,7 +208,11 @@
30.4 writer.write(datestring);
30.5 writer.write("\r\n"); // NOI18N
30.6
30.7 - // dtstart -- not yet implemented
30.8 + if (task.getStart() != -1) {
30.9 + writer.write("DTSTART:"); // NOI18N
30.10 + writer.write(sdf.format(new Date(task.getStart())));
30.11 + writer.write("\r\n"); // NOI18N
30.12 + }
30.13
30.14 // due -- not yet implemented
30.15
30.16 @@ -248,7 +252,7 @@
30.17 // attendee -- not implemented
30.18
30.19 // Others not implemented:
30.20 - // dtstart, geo, location, organizer, percent, recurid, seq, status,
30.21 + // geo, location, organizer, percent, recurid, seq, status,
30.22 // due, duration (both cannot occur)
30.23
30.24 // Optional ones not implemented:
30.25 @@ -389,6 +393,7 @@
30.26 writer.write("X-NETBEANS-DUE-SIGNALED:true\r\n"); // NOI18N
30.27 }
30.28 }
30.29 +
30.30 // AssociatedTime associatedTime = task.getAssociatedTime();
30.31 // if (associatedTime != null) {
30.32 // Date d = associatedTime.getStartTime();
31.1 --- a/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/translators/ICalImportFormat.java Mon Aug 29 20:07:51 2005 +0000
31.2 +++ b/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/translators/ICalImportFormat.java Tue Aug 30 10:49:38 2005 +0000
31.3 @@ -276,7 +276,8 @@
31.4
31.5 boolean done = false;
31.6 while (!done) {
31.7 - processContentLine();
31.8 + if (!processContentLine())
31.9 + break;
31.10 name = getTagName();
31.11 if (name == null) {
31.12 break;
31.13 @@ -313,10 +314,9 @@
31.14
31.15 /** Read (doing all the ical unfolding) the next content line.
31.16 * Side effects the reader object and the lineno.
31.17 - * @return The next content line, or null if there is some
31.18 - * I/O problem preventing us from continuing (e.g. EOF).
31.19 + * @return true if something was read. false for EOF.
31.20 */
31.21 - private void processContentLine() throws IOException {
31.22 + private boolean processContentLine() throws IOException {
31.23 // ignore it - and locate the next field
31.24
31.25 // Reuse string buffers for improved efficiency
31.26 @@ -339,7 +339,7 @@
31.27 int ci = reader.read();
31.28 if (ci == -1) {
31.29 // End of stream
31.30 - return;
31.31 + return nsb.length() != 0;
31.32 }
31.33 char c = (char)ci;
31.34 // See section 4.3.11 in rfc 2445
31.35 @@ -422,7 +422,7 @@
31.36 } else { // includes case where prevChar==-1: EOF
31.37 // No, this is a new content line so
31.38 // consider ourselves done with this line
31.39 - return;
31.40 + return true;
31.41 }
31.42 default:
31.43 sb.append(c);
31.44 @@ -498,6 +498,13 @@
31.45 } catch (ParseException e) {
31.46 ErrorManager.getDefault().notify(e);
31.47 }
31.48 + } else if (name.equals("DTSTART")) { // NOI18N
31.49 + try {
31.50 + Date d = formatter.parse(value);
31.51 + task.setStart(d.getTime());
31.52 + } catch (ParseException e) {
31.53 + ErrorManager.getDefault().notify(e);
31.54 + }
31.55 } else if (name.equals("PERCENT-COMPLETE")) { // NOI18N
31.56 try {
31.57 int complete = Integer.parseInt(value);
32.1 --- a/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/translators/XmlExportFormat.java Mon Aug 29 20:07:51 2005 +0000
32.2 +++ b/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/translators/XmlExportFormat.java Tue Aug 30 10:49:38 2005 +0000
32.3 @@ -231,6 +231,10 @@
32.4
32.5 if (task.getOwner().length() != 0)
32.6 node.setAttribute("owner", task.getOwner()); // NOI18N
32.7 +
32.8 + if (task.getStart() != -1)
32.9 + node.setAttribute("start", // NOI18N
32.10 + dateToString(new Date(task.getStart())));
32.11
32.12 Element summary = doc.createElement("summary"); // NOI18N
32.13 node.appendChild(summary);
33.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
33.2 +++ b/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/translators/usertasks-1_2.dtd Tue Aug 30 10:49:38 2005 +0000
33.3 @@ -0,0 +1,60 @@
33.4 +<?xml version="1.0" encoding="UTF-8"?>
33.5 +
33.6 +<!--
33.7 + Sun Public License Notice
33.8 +
33.9 +The contents of this file are subject to the Sun Public License
33.10 +Version 1.0 (the "License"). You may not use this file except in
33.11 +compliance with the License. A copy of the License is available at
33.12 +http://www.sun.com/
33.13 +
33.14 +The Original Code is NetBeans. The Initial Developer of the Original
33.15 +Code is Sun Microsystems, Inc. Portions Copyright 1997-2003 Sun
33.16 +Microsystems, Inc. All Rights Reserved.
33.17 +-->
33.18 +
33.19 +<!--
33.20 + Description: export format for user tasks
33.21 +-->
33.22 +
33.23 +<!ELEMENT tasks (task)*>
33.24 +
33.25 +<!--
33.26 + due, created, completed, start and modified - date format: YYYY-MM-DDThh:mm:ssTZD
33.27 + (see http://www.w3.org/TR/NOTE-datetime)
33.28 + line - 1 = the first line in a file
33.29 + effort - effort in minutes
33.30 + spent - spent time in minutes
33.31 +-->
33.32 +<!ELEMENT task (summary, details?, work-periods?, (task)*)>
33.33 +<!ATTLIST task
33.34 + priority (high|medium-high|medium|medium-low|low) "medium"
33.35 + category CDATA #IMPLIED
33.36 + progress CDATA #REQUIRED
33.37 + progress-computed (yes|no) "no"
33.38 + effort CDATA #REQUIRED
33.39 + effort-computed (yes|no) "no"
33.40 + due CDATA #IMPLIED
33.41 + file CDATA #IMPLIED
33.42 + line CDATA #IMPLIED
33.43 + created CDATA #REQUIRED
33.44 + modified CDATA #REQUIRED
33.45 + completed CDATA #IMPLIED
33.46 + spent-time CDATA #REQUIRED
33.47 + spent-time-computed (yes|no) "no"
33.48 + owner CDATA #IMPLIED
33.49 + start CDATA #IMPLIED
33.50 +>
33.51 +
33.52 +<!ELEMENT details (#PCDATA)>
33.53 +<!ELEMENT work-periods (period)+>
33.54 +
33.55 +<!ELEMENT period EMPTY>
33.56 +
33.57 +<!--
33.58 + duration - duration of a work period in minutes
33.59 +-->
33.60 +<!ATTLIST period
33.61 + start CDATA #REQUIRED
33.62 + duration CDATA #REQUIRED
33.63 +>
34.1 --- a/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/treetable/TreeTable.java Mon Aug 29 20:07:51 2005 +0000
34.2 +++ b/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/treetable/TreeTable.java Tue Aug 30 10:49:38 2005 +0000
34.3 @@ -771,7 +771,8 @@
34.4 public Component prepareRenderer(TableCellRenderer renderer, int row, int column) {
34.5 if (renderer instanceof TreeTableRenderer) {
34.6 Object node = getNodeForRow(row);
34.7 - Object value = getTreeTableModel().getValueAt(node, column);
34.8 + Object value = getTreeTableModel().getValueAt(node,
34.9 + convertColumnIndexToModel(column));
34.10 boolean isSelected = isCellSelected(row, column);
34.11 boolean rowIsAnchor = (selectionModel.getAnchorSelectionIndex() == row);
34.12 boolean colIsAnchor =
35.1 --- a/tasklist.usertasks/test/unit/src/org/netbeans/modules/tasklist/usertasks/model/UserTaskListTest.java Mon Aug 29 20:07:51 2005 +0000
35.2 +++ b/tasklist.usertasks/test/unit/src/org/netbeans/modules/tasklist/usertasks/model/UserTaskListTest.java Tue Aug 30 10:49:38 2005 +0000
35.3 @@ -47,8 +47,9 @@
35.4 super (name);
35.5 }
35.6
35.7 - public static void main (String args []) {
35.8 - junit.textui.TestRunner.run (UserTaskListTest.class);
35.9 + public static void main (String args []) throws Exception {
35.10 + openList("C:\\Dokumente und Einstellungen\\tim\\Desktop\\drmtasks.ics");
35.11 + //junit.textui.TestRunner.run (UserTaskListTest.class);
35.12 }
35.13
35.14 public static Test suite () {
35.15 @@ -306,8 +307,8 @@
35.16 // TODO: xCal test - run output out and back in through xCal, then
35.17 // do a second check
35.18
35.19 - private UserTaskList openList(String name) throws Exception {
35.20 - File data = new File(getClass().getResource("data").getFile()); // NOI18N
35.21 + private static UserTaskList openList(String name) throws Exception {
35.22 + File data = new File(UserTaskListTest.class.getResource("data").getFile()); // NOI18N
35.23 LocalFileSystem lfs = new LocalFileSystem();
35.24 lfs.setRootDirectory(data);
35.25 Repository.getDefault().addFileSystem(lfs);
36.1 --- a/tasklist.usertasks/test/unit/src/org/netbeans/modules/tasklist/usertasks/model/UserTaskTest.java Mon Aug 29 20:07:51 2005 +0000
36.2 +++ b/tasklist.usertasks/test/unit/src/org/netbeans/modules/tasklist/usertasks/model/UserTaskTest.java Tue Aug 30 10:49:38 2005 +0000
36.3 @@ -13,13 +13,17 @@
36.4
36.5 package org.netbeans.modules.tasklist.usertasks.model;
36.6
36.7 +import java.util.Date;
36.8 import junit.framework.Test;
36.9 import junit.framework.TestCase;
36.10 import junit.framework.TestSuite;
36.11 -
36.12 +import org.netbeans.modules.tasklist.core.util.ObjectList;
36.13 +import org.netbeans.modules.tasklist.usertasks.Settings;
36.14
36.15 /**
36.16 * Tests for o.n.m.t.u.UserTask
36.17 + *
36.18 + * @author tl
36.19 */
36.20 public class UserTaskTest extends TestCase {
36.21
36.22 @@ -46,4 +50,53 @@
36.23 UserTask b = new UserTask("B", list);
36.24 assertTrue(a.hashCode() != b.hashCode());
36.25 }
36.26 +
36.27 + public void testGetSetStart() {
36.28 + UserTaskList list = new UserTaskList();
36.29 + UserTask a = new UserTask("A", list);
36.30 + assertEquals(-1, a.getStart());
36.31 + assertEquals(null, a.getStartDate());
36.32 +
36.33 + long d = System.currentTimeMillis();
36.34 + a.setStart(d);
36.35 + assertEquals(d, a.getStartDate().getTime());
36.36 +
36.37 + Date dd = new Date();
36.38 + a.setStartDate(dd);
36.39 + assertEquals(dd, a.getStartDate());
36.40 +
36.41 + a.setStartDate(null);
36.42 + assertEquals(a.getStartDate(), null);
36.43 + }
36.44 +
36.45 + public void testMoveUpDown() {
36.46 + UserTaskList list = new UserTaskList();
36.47 + UserTask a = new UserTask("A", list);
36.48 + UserTask b = new UserTask("B", list);
36.49 +
36.50 + list.getSubtasks().add(a);
36.51 + list.getSubtasks().add(b);
36.52 +
36.53 + b.moveUp();
36.54 + assertEquals(list.getSubtasks().getUserTask(0).getSummary(), "B");
36.55 + b.moveDown();
36.56 + assertEquals(list.getSubtasks().getUserTask(0).getSummary(), "A");
36.57 + }
36.58 +
36.59 + public void testStartStop() throws InterruptedException {
36.60 + UserTaskList list = new UserTaskList();
36.61 + UserTask a = new UserTask("A", list);
36.62 + list.getSubtasks().add(a);
36.63 +
36.64 + Settings.getDefault().setCollectWorkPeriods(true);
36.65 + a.start();
36.66 + Thread.sleep(65 * 1000);
36.67 + a.stop();
36.68 +
36.69 + ObjectList wp = a.getWorkPeriods();
36.70 + assertEquals(1, wp.size());
36.71 +
36.72 + UserTask.WorkPeriod w = (UserTask.WorkPeriod) wp.get(0);
36.73 + assertEquals(1, w.getDuration());
36.74 + }
36.75 }