1.1 --- a/suggestions_framework/build.xml Wed May 05 15:05:05 2004 +0000
1.2 +++ b/suggestions_framework/build.xml Wed May 05 15:38:22 2004 +0000
1.3 @@ -27,6 +27,7 @@
1.4 <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
1.5 <pathelement path="${tasklist/api.dir}/${nb.modules/autoload.dir}/tasklist-api.jar"/>
1.6 <pathelement path="${tasklist/core.dir}/${nb.modules/autoload.dir}/tasklist-core.jar"/>
1.7 + <pathelement location="${core/settings.dir}/${nb.modules.dir}/org-netbeans-modules-settings.jar"/>
1.8 </path>
1.9 </target>
1.10
2.1 --- a/suggestions_framework/src/org/netbeans/modules/tasklist/suggestions/SuggestionFilter.java Wed May 05 15:05:05 2004 +0000
2.2 +++ b/suggestions_framework/src/org/netbeans/modules/tasklist/suggestions/SuggestionFilter.java Wed May 05 15:38:22 2004 +0000
2.3 @@ -26,6 +26,7 @@
2.4 import org.openide.util.NbBundle;
2.5 import org.netbeans.modules.tasklist.client.SuggestionProperty;
2.6 import org.netbeans.modules.tasklist.client.SuggestionProperties;
2.7 +import org.netbeans.modules.tasklist.core.filter.FilterConvertor;
2.8
2.9 /**
2.10 * Filter for user tasks
2.11 @@ -64,6 +65,9 @@
2.12
2.13 public SuggestionFilter(SuggestionFilter rhs) { super(rhs); }
2.14
2.15 + private SuggestionFilter() { // for deconvertization reasons;
2.16 + }
2.17 +
2.18 public Object clone() { return new SuggestionFilter(this);}
2.19
2.20 public SuggestionProperty[] getProperties() { return PROPS;}
2.21 @@ -93,4 +97,25 @@
2.22
2.23 }
2.24
2.25 + private static class Convertor extends FilterConvertor {
2.26 +
2.27 + public Convertor() {
2.28 + super("SuggestionFilter");
2.29 + }
2.30 +
2.31 + public static SuggestionFilter.Convertor create() { return new SuggestionFilter.Convertor();}
2.32 +
2.33 + protected Filter createFilter() { return new SuggestionFilter();}
2.34 +
2.35 + protected SuggestionProperty getProperty(String propid) {
2.36 + SuggestionProperty sp = SuggestionImplProperties.getProperty(propid);
2.37 + if (sp == null)
2.38 + return super.getProperty(propid);
2.39 + else
2.40 + return sp;
2.41 + }
2.42 +
2.43 + }
2.44 +
2.45 +
2.46 }
3.1 --- a/suggestions_framework/src/org/netbeans/modules/tasklist/suggestions/mf-layer.xml Wed May 05 15:05:05 2004 +0000
3.2 +++ b/suggestions_framework/src/org/netbeans/modules/tasklist/suggestions/mf-layer.xml Wed May 05 15:38:22 2004 +0000
3.3 @@ -42,26 +42,66 @@
3.4
3.5 <!-- All actions, menu and toolbar registrations moved to suggestions-ui. -->
3.6
3.7 - <folder name="xml">
3.8 - <folder name="entities">
3.9 - <folder name="NetBeans" >
3.10 - <file name="DTD_suggestion_type_1_0" url="nbres:/org/netbeans/modules/tasklist/suggestions/suggestion-type-1_0.dtd"/>
3.11 - </folder>
3.12 - </folder>
3.13 - <folder name="lookups">
3.14 - <folder name="NetBeans" >
3.15 - <file name="DTD_suggestion_type_1_0.instance">
3.16 - <attr name="instanceClass" stringvalue="org.netbeans.modules.tasklist.suggestions.SuggestionTypeProcessor" />
3.17 - </file>
3.18 - </folder>
3.19 - </folder>
3.20 + <folder name="xml">
3.21 + <folder name="entities">
3.22 + <folder name="NetBeans" >
3.23 + <file name="DTD_suggestion_type_1_0" url="nbres:/org/netbeans/modules/tasklist/suggestions/suggestion-type-1_0.dtd"/>
3.24 + </folder>
3.25 +
3.26 + <folder name="NetBeans_org_netbeans_modules_tasklist">
3.27 + <file name="DTD_SuggestionFilter_1_0" url="sugfilter-1_0.dtd">
3.28 + <attr name="hint.originalPublicID"
3.29 + stringvalue="-//NetBeans org.netbeans.modules.tasklist//DTD SuggestionFilter 1.0//EN"/>
3.30 + </file>
3.31 + </folder>
3.32 </folder>
3.33
3.34 + <folder name="lookups">
3.35 + <folder name="NetBeans" >
3.36 + <file name="DTD_suggestion_type_1_0.instance">
3.37 + <attr name="instanceClass" stringvalue="org.netbeans.modules.tasklist.suggestions.SuggestionTypeProcessor" />
3.38 + </file>
3.39 + </folder>
3.40 +
3.41 + <folder name="NetBeans_org_netbeans_modules_tasklist">
3.42 + <file name="DTD_SuggestionFilter_1_0.instance">
3.43 + <attr name="instanceCreate" methodvalue="org.netbeans.api.settings.Factory.create"/>
3.44 + <attr name="settings.convertor" methodvalue="org.netbeans.modules.tasklist.suggestions.SuggestionFilter$Convertor.create"/>
3.45 + <attr name="settings.instanceClass" stringvalue="org.netbeans.modules.tasklist.suggestions.SuggestionFilter"/>
3.46 + <attr name="settings.instanceOf" stringvalue="org.netbeans.modules.tasklist.suggestions.SuggestionFilter"/>
3.47 + </file>
3.48 + </folder>
3.49 +
3.50 + </folder>
3.51 +
3.52 + <folder name="memory">
3.53 + <folder name="org">
3.54 + <folder name="netbeans">
3.55 + <folder name="modules">
3.56 + <folder name="tasklist">
3.57 + <folder name="suggestions">
3.58 + <file name="SuggestionFilter">
3.59 + <attr name="settings.providerPath"
3.60 + stringvalue="xml/lookups/NetBeans_org_netbeans_modules_tasklist/DTD_SuggestionFilter_1_0.instance"/>
3.61 + </file>
3.62 + </folder>
3.63 + </folder>
3.64 + </folder>
3.65 + </folder>
3.66 + </folder>
3.67 + </folder>
3.68 + </folder>
3.69 +
3.70 <folder name="TaskList">
3.71 <folder name="suggestions">
3.72 <file name="columns.settings" url="columns.xml">
3.73 <attr name="instanceClass" stringvalue="org.netbeans.modules.tasklist.core.columns.ColumnsConfiguration"/>
3.74 </file>
3.75 +
3.76 + <file name="filters.settings" url="suggestions_filters.xml">
3.77 + <attr name="instanceClass" stringvalue="org.netbeans.modules.tasklist.core.filter.FilterRepository"/>
3.78 + </file>
3.79 +
3.80 </folder>
3.81 <folder name="suggestionsscan">
3.82 <file name="columns.settings" url="scancolumns.xml">
4.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
4.2 +++ b/suggestions_framework/src/org/netbeans/modules/tasklist/suggestions/sugfilter-1_0.dtd Wed May 05 15:38:22 2004 +0000
4.3 @@ -0,0 +1,5 @@
4.4 +<?xml version="1.0" encoding="UTF-8"?>
4.5 +
4.6 +
4.7 +<!-- The contents of this file is completely irrelevant. Only its sole -->
4.8 +<!-- presence is important for the convertors API -->
5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
5.2 +++ b/suggestions_framework/src/org/netbeans/modules/tasklist/suggestions/suggestions_filters.xml Wed May 05 15:38:22 2004 +0000
5.3 @@ -0,0 +1,21 @@
5.4 +<?xml version="1.0"?>
5.5 +
5.6 +<!--
5.7 + Sun Public License Notice
5.8 +
5.9 +The contents of this file are subject to the Sun Public License
5.10 +Version 1.0 (the "License"). You may not use this file except in
5.11 +compliance with the License. A copy of the License is available at
5.12 +http://www.sun.com/
5.13 +
5.14 +The Original Code is NetBeans. The Initial Developer of the Original
5.15 +Code is Sun Microsystems, Inc. Portions Copyright 1997-2003 Sun
5.16 +Microsystems, Inc. All Rights Reserved.
5.17 +-->
5.18 +
5.19 +<!DOCTYPE settings PUBLIC "-//NetBeans org.netbeans.modules.tasklist//DTD Filters 1.0//EN"
5.20 + "http://tasklist.netbeans.org/dtd/filters-1_0.dtd">
5.21 +
5.22 +<Filters active="-1">
5.23 + <SuggestionFilter allTrue="true" dtd_public_id="-//NetBeans org.netbeans.modules.tasklist//DTD SuggestionFilter 1.0//EN" name="Default Filter"/>
5.24 +</Filters>
6.1 --- a/tasklist.core/src/org/netbeans/modules/tasklist/core/TaskListView.java Wed May 05 15:05:05 2004 +0000
6.2 +++ b/tasklist.core/src/org/netbeans/modules/tasklist/core/TaskListView.java Wed May 05 15:38:22 2004 +0000
6.3 @@ -134,6 +134,7 @@
6.4 private transient ObservableList tasklist = null;
6.5
6.6 transient protected FilterRepository filters = null;
6.7 + transient protected Filter activeFilter = null;
6.8
6.9 /** Annotation showing the current position */
6.10 transient protected TaskAnnotation taskMarker = null;
6.11 @@ -1235,7 +1236,7 @@
6.12 * @return The toggle filter or <code>null</code> if not defined.
6.13 */
6.14 public final Filter getFilter() {
6.15 - return getFilters().getActive();
6.16 + return activeFilter;
6.17 }
6.18
6.19 /**
6.20 @@ -1278,7 +1279,11 @@
6.21 * @param filter The filter to be set, or null, to remove filtering.
6.22 */
6.23 public void setFilter(Filter filter) {
6.24 - this.getFilters().setActive(filter); // this is often the same instance filter action doe snot clone
6.25 + if (filter == null || getFilters().contains(filter)) {
6.26 + getFilters().setActive(filter);
6.27 + }
6.28 +
6.29 + this.activeFilter = filter;
6.30 }
6.31
6.32 /**
7.1 --- a/tasklist.usertasks/build.xml Wed May 05 15:05:05 2004 +0000
7.2 +++ b/tasklist.usertasks/build.xml Wed May 05 15:38:22 2004 +0000
7.3 @@ -27,6 +27,7 @@
7.4 <pathelement location="${openide/loaders.dir}/${nb.lib.dir}/openide-loaders.jar"/>
7.5 <pathelement path="${tasklist/api.dir}/${nb.modules/autoload.dir}/tasklist-api.jar"/>
7.6 <pathelement path="${tasklist/core.dir}/${nb.modules/autoload.dir}/tasklist-core.jar"/>
7.7 + <pathelement location="${core/settings.dir}/${nb.modules.dir}/org-netbeans-modules-settings.jar"/>
7.8 </path>
7.9 </target>
7.10
8.1 --- a/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/Bundle.properties Wed May 05 15:05:05 2004 +0000
8.2 +++ b/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/Bundle.properties Wed May 05 15:38:22 2004 +0000
8.3 @@ -45,6 +45,13 @@
8.4 HNT_createdProperty=Date and time when the task was created
8.5 LBL_editedProperty=Last Edited
8.6 HNT_editedProperty=Date and time when the task was last edited
8.7 +LBL_effortProperty=Effort
8.8 +HNT_effortProperty=Effort spent on the task so far
8.9 +LBL_remainingEffortProperty=Rem. Effort
8.10 +HNT_remainingEffortProperty=Remaining effort
8.11 +LBL_spentTimeProperty=Spent Time
8.12 +HNT_spentTimeProperty=Time spent for this task
8.13 +
8.14
8.15 LBL_NewTodo=New &Task...
8.16 TITLE_add_todo=New Task
8.17 @@ -170,10 +177,6 @@
8.18 Effort2=Effort
8.19 EffortHint=Effort
8.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}
8.21 -RemainingEffort=Rem. Effort
8.22 -RemainingEffortHint=Remaining effort
8.23 -SpentTime=Spent Time
8.24 -SpentTimeHint=Time spent for this task
8.25
8.26 ## DurationPanel
8.27 Minutes=Minutes
9.1 --- a/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/mf-layer.xml Wed May 05 15:05:05 2004 +0000
9.2 +++ b/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/mf-layer.xml Wed May 05 15:38:22 2004 +0000
9.3 @@ -83,20 +83,61 @@
9.4 <file name="columns.settings" url="columns.xml">
9.5 <attr name="instanceClass" stringvalue="org.netbeans.modules.tasklist.core.columns.ColumnsConfiguration"/>
9.6 </file>
9.7 +
9.8 + <file name="filters.settings" url="usertasks_filters.xml">
9.9 + <attr name="instanceClass" stringvalue="org.netbeans.modules.tasklist.core.filter.FilterRepository"/>
9.10 + </file>
9.11 +
9.12 </folder>
9.13 </folder>
9.14
9.15
9.16 - <folder name="xml">
9.17 - <folder name="entities">
9.18 - <!--Entity registration-->
9.19 - <folder name="NetBeans_org_netbeans_modules_tasklist_usertasks">
9.20 - <file name="DTD_User_Tasks_1_0" url="translators/usertasks-1_0.dtd">
9.21 - <attr name="hint.originalPublicID"
9.22 - stringvalue="-//NetBeans org.netbeans.modules.tasklist.usertasks//DTD User Tasks 1.0//EN"/>
9.23 - </file>
9.24 - </folder>
9.25 - </folder>
9.26 + <folder name="xml">
9.27 + <folder name="entities">
9.28 + <!--Entity registration-->
9.29 + <folder name="NetBeans_org_netbeans_modules_tasklist_usertasks">
9.30 + <file name="DTD_User_Tasks_1_0" url="translators/usertasks-1_0.dtd">
9.31 + <attr name="hint.originalPublicID"
9.32 + stringvalue="-//NetBeans org.netbeans.modules.tasklist.usertasks//DTD User Tasks 1.0//EN"/>
9.33 + </file>
9.34 + </folder>
9.35 + <folder name="NetBeans_org_netbeans_modules_tasklist">
9.36 + <file name="DTD_UserTaskFilter_1_0" url="utfilter-1_0.dtd">
9.37 + <attr name="hint.originalPublicID"
9.38 + stringvalue="-//NetBeans org.netbeans.modules.tasklist//DTD UserTaskFilter 1.0//EN"/>
9.39 + </file>
9.40 +
9.41 + </folder>
9.42 </folder>
9.43 +
9.44 + <folder name="lookups">
9.45 + <folder name="NetBeans_org_netbeans_modules_tasklist">
9.46 + <file name="DTD_UserTaskFilter_1_0.instance">
9.47 + <attr name="instanceCreate" methodvalue="org.netbeans.api.settings.Factory.create"/>
9.48 + <attr name="settings.convertor" methodvalue="org.netbeans.modules.tasklist.usertasks.UserTaskFilter$Convertor.create"/>
9.49 + <attr name="settings.instanceClass" stringvalue="org.netbeans.modules.tasklist.usertasks.UserTaskFilter"/>
9.50 + <attr name="settings.instanceOf" stringvalue="org.netbeans.modules.tasklist.usertasks.UserTaskFilter"/>
9.51 + </file>
9.52 + </folder>
9.53 + </folder>
9.54 +
9.55 + <folder name="memory">
9.56 + <folder name="org">
9.57 + <folder name="netbeans">
9.58 + <folder name="modules">
9.59 + <folder name="tasklist">
9.60 + <folder name="usertasks">
9.61 + <file name="UserTaskFilter">
9.62 + <attr name="settings.providerPath"
9.63 + stringvalue="xml/lookups/NetBeans_org_netbeans_modules_tasklist/DTD_UserTaskFilter_1_0.instance"/>
9.64 + </file>
9.65 + </folder>
9.66 + </folder>
9.67 + </folder>
9.68 + </folder>
9.69 + </folder>
9.70 + </folder>
9.71 +
9.72 + </folder>
9.73 </filesystem>
9.74