1.1 --- a/tasklist.usertasks/doc/processes.ics Thu May 05 14:35:38 2005 +0000
1.2 +++ b/tasklist.usertasks/doc/processes.ics Thu May 05 14:36:42 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:88
1.8 +PERCENT-COMPLETE:87
1.9 X-NETBEANS-PROGRESS-COMPUTED:yes
1.10 -X-NETBEANS-EFFORT:4440
1.11 +X-NETBEANS-EFFORT:4500
1.12 X-NETBEANS-EFFORT-COMPUTED:yes
1.13 X-NETBEANS-SPENT-TIME:130
1.14 X-NETBEANS-SPENT-TIME-COMPUTED:yes
1.15 -LAST-MODIFIED:20050405T183742Z
1.16 +LAST-MODIFIED:20050505T122516Z
1.17 COMPLETED:19700101T000000Z
1.18 END:VTODO
1.19
1.20 @@ -22,13 +22,13 @@
1.21 UID:nb1099827812695.413@timpc/145.254.144.151
1.22 CREATED:20041107T114332Z
1.23 SUMMARY:UserTask
1.24 -PERCENT-COMPLETE:100
1.25 +PERCENT-COMPLETE:80
1.26 X-NETBEANS-PROGRESS-COMPUTED:yes
1.27 -X-NETBEANS-EFFORT:240
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-COMPUTED:yes
1.32 -LAST-MODIFIED:20050405T183542Z
1.33 +LAST-MODIFIED:20050505T122516Z
1.34 COMPLETED:19700101T000000Z
1.35 RELATED-TO:nb1094753798137.164@timpc/145.254.152.118
1.36 END:VTODO
1.37 @@ -40,8 +40,8 @@
1.38 PERCENT-COMPLETE:100
1.39 X-NETBEANS-EFFORT:60
1.40 X-NETBEANS-SPENT-TIME:0
1.41 -LAST-MODIFIED:20050405T183542Z
1.42 -COMPLETED:20050116T122120Z
1.43 +LAST-MODIFIED:20050505T122516Z
1.44 +COMPLETED:20050505T122516Z
1.45 URL:file:/C:/tasklist/trunk/tasklist/usertasks/src/org/netbeans/modules/tas
1.46 klist/usertasks/model/UserTask.java
1.47 X-NETBEANS-LINE:295
1.48 @@ -56,7 +56,7 @@
1.49 PERCENT-COMPLETE:100
1.50 X-NETBEANS-EFFORT:60
1.51 X-NETBEANS-SPENT-TIME:0
1.52 -LAST-MODIFIED:20050405T183542Z
1.53 +LAST-MODIFIED:20050505T122254Z
1.54 COMPLETED:20050116T122319Z
1.55 URL:file:/C:/tasklist/trunk/tasklist/usertasks/src/org/netbeans/modules/tas
1.56 klist/usertasks/model/UserTask.java
1.57 @@ -71,11 +71,26 @@
1.58 PERCENT-COMPLETE:100
1.59 X-NETBEANS-EFFORT:60
1.60 X-NETBEANS-SPENT-TIME:0
1.61 -LAST-MODIFIED:20050405T183542Z
1.62 +LAST-MODIFIED:20050505T122254Z
1.63 COMPLETED:20050116T122731Z
1.64 URL:file:/C:/tasklist/trunk/tasklist/usertasks/src/org/netbeans/modules/tas
1.65 klist/usertasks/model/UserTask.java
1.66 -X-NETBEANS-LINE:1238
1.67 +X-NETBEANS-LINE:1234
1.68 +RELATED-TO:nb1099827812695.413@timpc/145.254.144.151
1.69 +END:VTODO
1.70 +
1.71 +BEGIN:VTODO
1.72 +UID:nb1115235297550.113@timpc/169.254.180.13
1.73 +CREATED:20050504T193457Z
1.74 +SUMMARY:update UserTask.hashCode
1.75 +PERCENT-COMPLETE:0
1.76 +X-NETBEANS-EFFORT:60
1.77 +X-NETBEANS-SPENT-TIME:0
1.78 +LAST-MODIFIED:20050505T122254Z
1.79 +COMPLETED:19700101T000000Z
1.80 +URL:file:/C:/tasklist/trunk/tasklist/usertasks/src/org/netbeans/modules/tas
1.81 + klist/usertasks/model/UserTask.java
1.82 +X-NETBEANS-LINE:1152
1.83 RELATED-TO:nb1099827812695.413@timpc/145.254.144.151
1.84 END:VTODO
1.85
1.86 @@ -86,7 +101,7 @@
1.87 PERCENT-COMPLETE:100
1.88 X-NETBEANS-EFFORT:60
1.89 X-NETBEANS-SPENT-TIME:0
1.90 -LAST-MODIFIED:20050405T183542Z
1.91 +LAST-MODIFIED:20050505T122254Z
1.92 COMPLETED:20050116T122412Z
1.93 URL:file:/C:/tasklist/trunk/tasklist/usertasks/src/org/netbeans/modules/tas
1.94 klist/usertasks/model/UserTask.java
1.95 @@ -101,7 +116,7 @@
1.96 PERCENT-COMPLETE:100
1.97 X-NETBEANS-EFFORT:2940
1.98 X-NETBEANS-SPENT-TIME:0
1.99 -LAST-MODIFIED:20050405T183542Z
1.100 +LAST-MODIFIED:20050505T122254Z
1.101 COMPLETED:20050405T181936Z
1.102 URL:file:/C:/tasklist/trunk/tasklist/usertasks/src/org/netbeans/modules/tas
1.103 klist/usertasks/UserTaskTreeTableNode.java
1.104 @@ -117,7 +132,7 @@
1.105 PERCENT-COMPLETE:0
1.106 X-NETBEANS-EFFORT:60
1.107 X-NETBEANS-SPENT-TIME:128
1.108 -LAST-MODIFIED:20050405T183542Z
1.109 +LAST-MODIFIED:20050505T122254Z
1.110 COMPLETED:19700101T000000Z
1.111 URL:file:/C:/tasklist/trunk/tasklist/usertasks/src/org/netbeans/modules/tas
1.112 klist/usertasks/UserTaskTreeTableNode.java
1.113 @@ -136,7 +151,7 @@
1.114 X-NETBEANS-EFFORT-COMPUTED:yes
1.115 X-NETBEANS-SPENT-TIME:0
1.116 X-NETBEANS-SPENT-TIME-COMPUTED:yes
1.117 -LAST-MODIFIED:20050405T183542Z
1.118 +LAST-MODIFIED:20050505T122254Z
1.119 COMPLETED:19700101T000000Z
1.120 RELATED-TO:nb1094753798137.164@timpc/145.254.152.118
1.121 END:VTODO
1.122 @@ -148,7 +163,7 @@
1.123 PERCENT-COMPLETE:100
1.124 X-NETBEANS-EFFORT:60
1.125 X-NETBEANS-SPENT-TIME:0
1.126 -LAST-MODIFIED:20050405T183542Z
1.127 +LAST-MODIFIED:20050505T122254Z
1.128 COMPLETED:20050117T184814Z
1.129 URL:file:/C:/tasklist/trunk/tasklist/usertasks/src/org/netbeans/modules/tas
1.130 klist/usertasks/EditTaskPanel.java
1.131 @@ -163,7 +178,7 @@
1.132 PERCENT-COMPLETE:100
1.133 X-NETBEANS-EFFORT:60
1.134 X-NETBEANS-SPENT-TIME:0
1.135 -LAST-MODIFIED:20050405T183542Z
1.136 +LAST-MODIFIED:20050505T122254Z
1.137 COMPLETED:20050117T184815Z
1.138 RELATED-TO:nb1094753880034.181@timpc/145.254.152.118
1.139 END:VTODO
1.140 @@ -175,7 +190,7 @@
1.141 PERCENT-COMPLETE:0
1.142 X-NETBEANS-EFFORT:60
1.143 X-NETBEANS-SPENT-TIME:2
1.144 -LAST-MODIFIED:20050405T183756Z
1.145 +LAST-MODIFIED:20050505T122254Z
1.146 COMPLETED:19700101T000000Z
1.147 URL:file:/C:/tasklist/trunk/tasklist/usertasks/src/org/netbeans/modules/tas
1.148 klist/usertasks/UserTaskNode.java
1.149 @@ -196,7 +211,7 @@
1.150 X-NETBEANS-EFFORT-COMPUTED:yes
1.151 X-NETBEANS-SPENT-TIME:0
1.152 X-NETBEANS-SPENT-TIME-COMPUTED:yes
1.153 -LAST-MODIFIED:20050405T183542Z
1.154 +LAST-MODIFIED:20050505T122254Z
1.155 COMPLETED:19700101T000000Z
1.156 RELATED-TO:nb1094753798137.164@timpc/145.254.152.118
1.157 END:VTODO
1.158 @@ -208,7 +223,7 @@
1.159 PERCENT-COMPLETE:0
1.160 X-NETBEANS-EFFORT:60
1.161 X-NETBEANS-SPENT-TIME:0
1.162 -LAST-MODIFIED:20050405T183542Z
1.163 +LAST-MODIFIED:20050505T122254Z
1.164 COMPLETED:19700101T000000Z
1.165 URL:file:/C:/tasklist/trunk/tasklist/usertasks/src/org/netbeans/modules/tas
1.166 klist/usertasks/filter/UserTaskProperties.java
1.167 @@ -223,7 +238,7 @@
1.168 PERCENT-COMPLETE:0
1.169 X-NETBEANS-EFFORT:60
1.170 X-NETBEANS-SPENT-TIME:0
1.171 -LAST-MODIFIED:20050405T183542Z
1.172 +LAST-MODIFIED:20050505T122254Z
1.173 COMPLETED:19700101T000000Z
1.174 URL:file:/C:/tasklist/trunk/tasklist/usertasks/src/org/netbeans/modules/tas
1.175 klist/usertasks/filter/UserTaskProperties.java
1.176 @@ -238,7 +253,7 @@
1.177 PERCENT-COMPLETE:0
1.178 X-NETBEANS-EFFORT:60
1.179 X-NETBEANS-SPENT-TIME:0
1.180 -LAST-MODIFIED:20050405T183542Z
1.181 +LAST-MODIFIED:20050505T122254Z
1.182 COMPLETED:19700101T000000Z
1.183 URL:file:/C:/tasklist/trunk/tasklist/usertasks/src/org/netbeans/modules/tas
1.184 klist/usertasks/filter/UserTaskProperties.java
1.185 @@ -253,7 +268,7 @@
1.186 PERCENT-COMPLETE:0
1.187 X-NETBEANS-EFFORT:60
1.188 X-NETBEANS-SPENT-TIME:0
1.189 -LAST-MODIFIED:20050405T183542Z
1.190 +LAST-MODIFIED:20050505T122254Z
1.191 COMPLETED:19700101T000000Z
1.192 URL:file:/C:/tasklist/trunk/tasklist/usertasks/src/org/netbeans/modules/tas
1.193 klist/usertasks/filter/UserTaskFilter.java
1.194 @@ -268,7 +283,7 @@
1.195 PERCENT-COMPLETE:0
1.196 X-NETBEANS-EFFORT:60
1.197 X-NETBEANS-SPENT-TIME:0
1.198 -LAST-MODIFIED:20050405T183542Z
1.199 +LAST-MODIFIED:20050505T122254Z
1.200 COMPLETED:19700101T000000Z
1.201 URL:file:/C:/tasklist/trunk/tasklist/usertasks/src/org/netbeans/modules/tas
1.202 klist/usertasks/filter/UserTaskFilter.java
1.203 @@ -283,7 +298,7 @@
1.204 PERCENT-COMPLETE:0
1.205 X-NETBEANS-EFFORT:60
1.206 X-NETBEANS-SPENT-TIME:0
1.207 -LAST-MODIFIED:20050405T183542Z
1.208 +LAST-MODIFIED:20050505T122254Z
1.209 COMPLETED:19700101T000000Z
1.210 URL:file:/C:/tasklist/trunk/tasklist/usertasks/src/org/netbeans/modules/tas
1.211 klist/usertasks/filter/Bundle.properties
1.212 @@ -301,7 +316,7 @@
1.213 X-NETBEANS-EFFORT-COMPUTED:yes
1.214 X-NETBEANS-SPENT-TIME:0
1.215 X-NETBEANS-SPENT-TIME-COMPUTED:yes
1.216 -LAST-MODIFIED:20050405T183542Z
1.217 +LAST-MODIFIED:20050505T122254Z
1.218 COMPLETED:19700101T000000Z
1.219 RELATED-TO:nb1094753798137.164@timpc/145.254.152.118
1.220 END:VTODO
1.221 @@ -313,7 +328,7 @@
1.222 PERCENT-COMPLETE:100
1.223 X-NETBEANS-EFFORT:60
1.224 X-NETBEANS-SPENT-TIME:0
1.225 -LAST-MODIFIED:20050405T183542Z
1.226 +LAST-MODIFIED:20050505T122254Z
1.227 COMPLETED:20050117T184916Z
1.228 URL:file:/C:/tasklist/trunk/tasklist/usertasks/src/org/netbeans/modules/tas
1.229 klist/usertasks/UserTasksTreeTableModel.java
1.230 @@ -329,7 +344,7 @@
1.231 PERCENT-COMPLETE:100
1.232 X-NETBEANS-EFFORT:60
1.233 X-NETBEANS-SPENT-TIME:0
1.234 -LAST-MODIFIED:20050405T183542Z
1.235 +LAST-MODIFIED:20050505T122254Z
1.236 COMPLETED:20050117T184917Z
1.237 URL:file:/C:/tasklist/trunk/tasklist/usertasks/src/org/netbeans/modules/tas
1.238 klist/usertasks/UserTasksTreeTableModel.java
1.239 @@ -344,7 +359,7 @@
1.240 PERCENT-COMPLETE:100
1.241 X-NETBEANS-EFFORT:60
1.242 X-NETBEANS-SPENT-TIME:0
1.243 -LAST-MODIFIED:20050405T183542Z
1.244 +LAST-MODIFIED:20050505T122254Z
1.245 COMPLETED:20050117T184918Z
1.246 URL:file:/C:/tasklist/trunk/tasklist/usertasks/src/org/netbeans/modules/tas
1.247 klist/usertasks/UserTasksTreeTableModel.java
1.248 @@ -359,7 +374,7 @@
1.249 PERCENT-COMPLETE:100
1.250 X-NETBEANS-EFFORT:60
1.251 X-NETBEANS-SPENT-TIME:0
1.252 -LAST-MODIFIED:20050405T183542Z
1.253 +LAST-MODIFIED:20050505T122254Z
1.254 COMPLETED:20050117T184921Z
1.255 URL:file:/C:/tasklist/trunk/tasklist/usertasks/src/org/netbeans/modules/tas
1.256 klist/usertasks/UserTasksTreeTableModel.java
1.257 @@ -374,7 +389,7 @@
1.258 PERCENT-COMPLETE:100
1.259 X-NETBEANS-EFFORT:60
1.260 X-NETBEANS-SPENT-TIME:0
1.261 -LAST-MODIFIED:20050405T183542Z
1.262 +LAST-MODIFIED:20050505T122254Z
1.263 COMPLETED:20050117T184926Z
1.264 URL:file:/C:/tasklist/trunk/tasklist/usertasks/src/org/netbeans/modules/tas
1.265 klist/usertasks/UserTasksTreeTable.java
1.266 @@ -405,7 +420,7 @@
1.267 X-NETBEANS-EFFORT-COMPUTED:yes
1.268 X-NETBEANS-SPENT-TIME:0
1.269 X-NETBEANS-SPENT-TIME-COMPUTED:yes
1.270 -LAST-MODIFIED:20050405T183543Z
1.271 +LAST-MODIFIED:20050505T122254Z
1.272 COMPLETED:19700101T000000Z
1.273 RELATED-TO:nb1094753798137.164@timpc/145.254.152.118
1.274 END:VTODO
1.275 @@ -417,7 +432,7 @@
1.276 PERCENT-COMPLETE:100
1.277 X-NETBEANS-EFFORT:60
1.278 X-NETBEANS-SPENT-TIME:0
1.279 -LAST-MODIFIED:20050405T183542Z
1.280 +LAST-MODIFIED:20050505T122254Z
1.281 COMPLETED:20050117T185740Z
1.282 URL:file:/C:/tasklist/trunk/tasklist/usertasks/src/org/netbeans/modules/tas
1.283 klist/usertasks/translators/ICalExportFormat.java
1.284 @@ -432,7 +447,7 @@
1.285 PERCENT-COMPLETE:100
1.286 X-NETBEANS-EFFORT:60
1.287 X-NETBEANS-SPENT-TIME:0
1.288 -LAST-MODIFIED:20050405T183542Z
1.289 +LAST-MODIFIED:20050505T122254Z
1.290 COMPLETED:20050117T190240Z
1.291 URL:file:/C:/tasklist/trunk/tasklist/usertasks/src/org/netbeans/modules/tas
1.292 klist/usertasks/translators/ICalImportFormat.java
1.293 @@ -447,7 +462,7 @@
1.294 PERCENT-COMPLETE:100
1.295 X-NETBEANS-EFFORT:60
1.296 X-NETBEANS-SPENT-TIME:0
1.297 -LAST-MODIFIED:20050405T183542Z
1.298 +LAST-MODIFIED:20050505T122254Z
1.299 COMPLETED:20050118T184030Z
1.300 URL:file:/C:/tasklist/trunk/tasklist/usertasks/src/org/netbeans/modules/tas
1.301 klist/usertasks/translators/XmlExportFormat.java
1.302 @@ -462,7 +477,7 @@
1.303 PERCENT-COMPLETE:100
1.304 X-NETBEANS-EFFORT:60
1.305 X-NETBEANS-SPENT-TIME:0
1.306 -LAST-MODIFIED:20050405T183542Z
1.307 +LAST-MODIFIED:20050505T122254Z
1.308 COMPLETED:20050118T184031Z
1.309 URL:file:/C:/tasklist/trunk/tasklist/usertasks/src/org/netbeans/modules/tas
1.310 klist/usertasks/translators/XmlImportFormat.java
1.311 @@ -477,7 +492,7 @@
1.312 PERCENT-COMPLETE:100
1.313 X-NETBEANS-EFFORT:60
1.314 X-NETBEANS-SPENT-TIME:0
1.315 -LAST-MODIFIED:20050405T183543Z
1.316 +LAST-MODIFIED:20050505T122254Z
1.317 COMPLETED:20050118T184034Z
1.318 URL:file:/C:/tasklist/trunk/tasklist/usertasks/src/org/netbeans/modules/tas
1.319 klist/usertasks/translators/usertasks-1_1.dtd
2.1 --- a/tasklist.usertasks/javahelp/org/netbeans/modules/tasklist/usertasks/docs/content/usertasks.html Thu May 05 14:35:38 2005 +0000
2.2 +++ b/tasklist.usertasks/javahelp/org/netbeans/modules/tasklist/usertasks/docs/content/usertasks.html Thu May 05 14:36:42 2005 +0000
2.3 @@ -52,7 +52,9 @@
2.4 position (filename and line
2.5 number)
2.6 or a URL. Then, when you select the "Go to Task" action on the task,
2.7 -the given position is shown in the source editor or a browser window.
2.8 +the given position is shown in the source editor or a browser window. A
2.9 +task associated with a file will also be shown on the error stripe in
2.10 +the editor.<br>
2.11 </p>
2.12 <p>You can customize which task properties are shown in the list,
2.13 change the sorting order, etc. See the <a href="table-operation.html">Using
3.1 --- a/tasklist.usertasks/manifest.mf Thu May 05 14:35:38 2005 +0000
3.2 +++ b/tasklist.usertasks/manifest.mf Thu May 05 14:36:42 2005 +0000
3.3 @@ -1,6 +1,6 @@
3.4 Manifest-Version: 1.0
3.5 OpenIDE-Module: org.netbeans.modules.tasklist.usertasks/2
3.6 -OpenIDE-Module-Implementation-Version: 46
3.7 +OpenIDE-Module-Implementation-Version: 47
3.8 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/tasklist/usertasks/Bundle.properties
3.9 OpenIDE-Module-Layer: org/netbeans/modules/tasklist/usertasks/mf-layer.xml
3.10
4.1 --- a/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/DateSelectionPanel.java Thu May 05 14:35:38 2005 +0000
4.2 +++ b/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/DateSelectionPanel.java Thu May 05 14:36:42 2005 +0000
4.3 @@ -24,8 +24,6 @@
4.4 * remember the format each time.... Well, the panel "works for me now" so I
4.5 * move on to the next phase in my project, but one should really:
4.6 *
4.7 - * @todo The panel is too big...
4.8 - *
4.9 * @author Trond Norbye
4.10 */
4.11 public class DateSelectionPanel extends javax.swing.JPanel
5.1 --- a/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/UserTaskNode.java Thu May 05 14:35:38 2005 +0000
5.2 +++ b/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/UserTaskNode.java Thu May 05 14:36:42 2005 +0000
5.3 @@ -73,6 +73,7 @@
5.4 import org.openide.util.datatransfer.PasteType;
5.5 import org.netbeans.modules.tasklist.usertasks.model.UserTask;
5.6 import org.netbeans.modules.tasklist.usertasks.model.UserTaskList;
5.7 +import org.openide.nodes.Node;
5.8
5.9 /**
5.10 * Node for a user task
5.11 @@ -434,7 +435,7 @@
5.12 * @return an appropriate paste type, or null if not appropriate
5.13 */
5.14 public static PasteType createTodoPasteType(
5.15 - UserTaskNode target, Transferable t) {
5.16 + Node target, Transferable t) {
5.17 // UTUtils.LOGGER.fine("entering");
5.18 if (t.isDataFlavorSupported(ExTransferable.multiFlavor)) {
5.19 try {
5.20 @@ -552,7 +553,7 @@
5.21 */
5.22 private static final class TodoPaste extends PasteType {
5.23 private final Transferable t;
5.24 - private final UserTaskNode target;
5.25 + private final Node target;
5.26
5.27 /**
5.28 * Creates a paste type for a UserTask
5.29 @@ -560,7 +561,7 @@
5.30 * @param t a transferable object
5.31 * @param target parent for the pasted task
5.32 */
5.33 - public TodoPaste(UserTaskNode target, Transferable t) {
5.34 + public TodoPaste(Node target, Transferable t) {
5.35 this.t = t;
5.36 this.target = target;
5.37 }
5.38 @@ -622,7 +623,10 @@
5.39 ut.setLine(item.getLine());
5.40 ut.setPriority(item.getPriority());
5.41 }
5.42 - target.pasteTask(ut);
5.43 + if (target instanceof UserTaskNode)
5.44 + ((UserTaskNode) target).pasteTask(ut);
5.45 + else
5.46 + ((UserTaskListNode) target).pasteTask(ut);
5.47 }
5.48 }
5.49 }
6.1 --- a/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/UserTaskView.java Thu May 05 14:35:38 2005 +0000
6.2 +++ b/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/UserTaskView.java Thu May 05 14:36:42 2005 +0000
6.3 @@ -165,6 +165,25 @@
6.4 return defview;
6.5 }
6.6
6.7 + /**
6.8 + * Returns all opened views.
6.9 + *
6.10 + * @return array of all opened views
6.11 + */
6.12 + public static UserTaskView[] getAll() {
6.13 + synchronized(UserTaskView.class) {
6.14 + WeakReference[] r = (WeakReference[]) views.toArray(
6.15 + new WeakReference[views.size()]);
6.16 + List views = new ArrayList();
6.17 + for (int i = 0; i < r.length; i++) {
6.18 + UserTaskView v = (UserTaskView) r[i].get();
6.19 + if (v != null)
6.20 + views.add(v);
6.21 + }
6.22 + return (UserTaskView[]) views.toArray(new UserTaskView[views.size()]);
6.23 + }
6.24 + }
6.25 +
6.26 /**
6.27 * Return the currently active user task view, or null
6.28 *
7.1 --- a/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/actions/MoveDownAction.java Thu May 05 14:35:38 2005 +0000
7.2 +++ b/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/actions/MoveDownAction.java Thu May 05 14:36:42 2005 +0000
7.3 @@ -53,6 +53,9 @@
7.4 UserTaskNode n = (UserTaskNode) activatedNodes[0];
7.5 UserTask ut = n.getTask();
7.6
7.7 + if (ut.getList() == null)
7.8 + return false;
7.9 +
7.10 UserTaskObjectList list;
7.11 if (ut.getParent() == null)
7.12 list = ut.getList().getSubtasks();
8.1 --- a/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/actions/MoveUpAction.java Thu May 05 14:35:38 2005 +0000
8.2 +++ b/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/actions/MoveUpAction.java Thu May 05 14:36:42 2005 +0000
8.3 @@ -53,6 +53,9 @@
8.4 UserTaskNode n = (UserTaskNode) activatedNodes[0];
8.5 UserTask ut = n.getTask();
8.6
8.7 + if (ut.getList() == null)
8.8 + return false;
8.9 +
8.10 UserTaskObjectList list;
8.11 if (ut.getParent() == null)
8.12 list = ut.getList().getSubtasks();
9.1 --- a/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/mf-layer.xml Thu May 05 14:35:38 2005 +0000
9.2 +++ b/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/mf-layer.xml Thu May 05 14:36:42 2005 +0000
9.3 @@ -149,6 +149,28 @@
9.4 <folder name="AnnotationTypes">
9.5 <file name="DoneTaskAnnotation.xml" url="DoneTaskAnnotation.xml"/>
9.6 <file name="DoneTaskNoHighlightAnnotation.xml" url="DoneTaskNoHighlightAnnotation.xml"/>
9.7 + <folder name="StatusForAnnotationType">
9.8 + <file name="org.netbeans.modules.tasklist.usertasks.UserTaskDone">
9.9 + <attr name="status" stringvalue="ok" />
9.10 + <attr name="color" stringvalue="65280" />
9.11 + <attr name="browseable" boolvalue="true" />
9.12 + </file>
9.13 + <file name="org.netbeans.modules.tasklist.usertasks.UserTaskDoneNoHighlight">
9.14 + <attr name="status" stringvalue="ok" />
9.15 + <attr name="color" stringvalue="65280" />
9.16 + <attr name="browseable" boolvalue="true" />
9.17 + </file>
9.18 + <file name="Task">
9.19 + <attr name="status" stringvalue="ok" />
9.20 + <attr name="color" stringvalue="16711680" />
9.21 + <attr name="browseable" boolvalue="true" />
9.22 + </file>
9.23 + <file name="TaskNoHighlight">
9.24 + <attr name="status" stringvalue="ok" />
9.25 + <attr name="color" stringvalue="16711680" />
9.26 + <attr name="browseable" boolvalue="true" />
9.27 + </file>
9.28 + </folder>
9.29 </folder>
9.30 </folder>
9.31
10.1 --- a/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/model/UserTask.java Thu May 05 14:35:38 2005 +0000
10.2 +++ b/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/model/UserTask.java Thu May 05 14:36:42 2005 +0000
10.3 @@ -1149,6 +1149,10 @@
10.4 edited = ed;
10.5 }
10.6
10.7 + public int hashCode() {
10.8 + return summary.hashCode() + details.hashCode() + priority;
10.9 + }
10.10 +
10.11 /**
10.12 * Create an identical copy of a task (a deep copy, e.g. the
10.13 * list of subtasks will be cloned as well
11.1 --- a/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/model/UserTaskList.java Thu May 05 14:35:38 2005 +0000
11.2 +++ b/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/model/UserTaskList.java Thu May 05 14:36:42 2005 +0000
11.3 @@ -48,9 +48,6 @@
11.4
11.5 /**
11.6 * This class represents the tasklist itself
11.7 - * @todo The tasks that had a due time while the IDE was shut down will not
11.8 - * store it's "alarm-sent-property" unless the tasklist is touched after
11.9 - * the file is beeing parsed... I'll fix this as soon as possible...
11.10 *
11.11 * @author Tor Norbye
11.12 * @author Trond Norbye
11.13 @@ -60,7 +57,7 @@
11.14 /**
11.15 * Callback for the UserTaskList.process method
11.16 */
11.17 - private static interface UserTaskProcessor {
11.18 + public static interface UserTaskProcessor {
11.19 /**
11.20 * This method will be called for each user task.
11.21 *
11.22 @@ -104,7 +101,6 @@
11.23 * Present the user with a dialog that shows information of the task that
11.24 * expired...
11.25 *
11.26 - * @todo Replace the UserTaskDuePanel with the EditTaskPanel????
11.27 * @param task the task to show
11.28 */
11.29 private void showExpiredTask(UserTask task) {
11.30 @@ -117,9 +113,9 @@
11.31
11.32 String title = NbBundle.getMessage(UserTaskList.class, "TaskDueLabel"); // NOI18N
11.33 DialogDescriptor d = new DialogDescriptor(panel, title);
11.34 - d.setModal(false);
11.35 + d.setModal(true);
11.36 d.setMessageType(NotifyDescriptor.PLAIN_MESSAGE);
11.37 - d.setOptionType(NotifyDescriptor.OK_CANCEL_OPTION);
11.38 + d.setOptions(new Object[] {DialogDescriptor.OK_OPTION});
11.39 java.awt.Dialog dlg = DialogDisplayer.getDefault().createDialog(d);
11.40 dlg.pack();
11.41 dlg.show();
11.42 @@ -312,7 +308,6 @@
11.43 ret.dontSave = true;
11.44 try {
11.45 io.read(ret, is);
11.46 - ret.orderNextTimeout();
11.47 } catch (IOException e) {
11.48 // NOTE the exception text should be localized!
11.49 DialogDisplayer.getDefault().notify(new Message(e.getMessage(),
11.50 @@ -322,6 +317,8 @@
11.51 ret.needSave = false;
11.52 ret.dontSave = false;
11.53
11.54 + ret.orderNextTimeout();
11.55 +
11.56 if (ret.expiredTask) {
11.57 // One (or more) tasks expired while the IDE was closed...
11.58 // save the list as soon as possible...
11.59 @@ -384,7 +381,7 @@
11.60 * @param p a callback that will be called for each task
11.61 * @param list a list of user tasks
11.62 */
11.63 - public void processDepthFirst(UserTaskProcessor p, UserTaskObjectList list) {
11.64 + public static void processDepthFirst(UserTaskProcessor p, UserTaskObjectList list) {
11.65 for (int i = 0; i < list.size(); i++) {
11.66 UserTask ut = list.getUserTask(i);
11.67 processDepthFirst(p, ut.getSubtasks());
11.68 @@ -568,6 +565,8 @@
11.69 * it should save itself soon. Eventually calls save
11.70 */
11.71 public void markChanged() {
11.72 + if (dontSave)
11.73 + return;
11.74 orderNextTimeout();
11.75 needSave = true;
11.76 save();
12.1 --- a/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/renderers/DateTableCellRenderer.java Thu May 05 14:35:38 2005 +0000
12.2 +++ b/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/renderers/DateTableCellRenderer.java Thu May 05 14:36:42 2005 +0000
12.3 @@ -44,11 +44,6 @@
12.4 }*/
12.5 }
12.6
12.7 - // TODO: not used
12.8 - public Component getCustomEditor() {
12.9 - return new DateSelectionPanel(new Date());
12.10 - }
12.11 -
12.12 public Component getTableCellRendererComponent(javax.swing.JTable table,
12.13 Object value, boolean isSelected, boolean hasFocus,
12.14 int row, int column) {
13.1 --- a/tasklist.usertasks/test/qa-functional/testCases.html Thu May 05 14:35:38 2005 +0000
13.2 +++ b/tasklist.usertasks/test/qa-functional/testCases.html Thu May 05 14:36:42 2005 +0000
13.3 @@ -95,13 +95,8 @@
13.4 <li>Move it down.</li>
13.5 <li>"Music/Pop" still selected.</li>
13.6 </ol>
13.7 - <li>[TestTable.testShowTask]</li>
13.8 + <li>-</li>
13.9 <ol>
13.10 - <li>test10.ics</li>
13.11 - <li>Select a task</li>
13.12 - <li>RMB, "Show Task"</li>
13.13 - <li>Close the dialog<br>
13.14 - </li>
13.15 </ol>
13.16 <li>Expanded nodes/selection/started task/scrollbar positions should
13.17 be restored after NB
13.18 @@ -118,25 +113,7 @@
13.19 <li>Check selection, expanded nodes and started task, scrollbar
13.20 positions.</li>
13.21 </ol>
13.22 - <li>-</li>
13.23 - <li>[TestTable.testCategoryInplace] Table cell editor for the
13.24 -category should contain all available categories.<br>
13.25 - </li>
13.26 - <ol>
13.27 - <li>test13.ics</li>
13.28 - <li>Select the category cell for the task "Colors"</li>
13.29 - <li>Open the combobox <br>
13.30 - </li>
13.31 - <li>The content of the combobox must be "CatA, CatB"</li>
13.32 - </ol>
13.33 - <li>[TestTable.testStartTaskFillsOwner]</li>
13.34 - <ol>
13.35 - <li>test14.ics</li>
13.36 - <li>Select the task "Colors/R"</li>
13.37 - <li>Start the task</li>
13.38 - <li>The owner field should be filled with the current user's name</li>
13.39 - </ol>
13.40 - <li>[TestTable.testDeleteAction]<br>
13.41 + <li><br>
13.42 </li>
13.43 </ol>
13.44 </body>
14.1 --- a/tasklist.usertasks/test/unit/src/org/netbeans/modules/tasklist/usertasks/model/UserTaskTest.java Thu May 05 14:35:38 2005 +0000
14.2 +++ b/tasklist.usertasks/test/unit/src/org/netbeans/modules/tasklist/usertasks/model/UserTaskTest.java Thu May 05 14:36:42 2005 +0000
14.3 @@ -39,4 +39,11 @@
14.4 assertEquals(d.hours, 1);
14.5 assertEquals(d.minutes, 0);
14.6 }
14.7 +
14.8 + public void testHashCode() {
14.9 + UserTaskList list = new UserTaskList();
14.10 + UserTask a = new UserTask("A", list);
14.11 + UserTask b = new UserTask("B", list);
14.12 + assertTrue(a.hashCode() != b.hashCode());
14.13 + }
14.14 }