Added option to limit number of found suggestions.
1.1 --- a/suggestions_framework/src/org/netbeans/modules/tasklist/suggestions/SuggestionsScanner.java Thu Jan 08 17:11:51 2004 +0000
1.2 +++ b/suggestions_framework/src/org/netbeans/modules/tasklist/suggestions/SuggestionsScanner.java Thu Jan 08 18:10:28 2004 +0000
1.3 @@ -78,6 +78,7 @@
1.4 private static Reference memoryReference;
1.5 private volatile boolean interrupted;
1.6 private int suggestionsCounter;
1.7 + private int usabilityLimit = 503;
1.8
1.9 private SuggestionsScanner() {
1.10 manager = (SuggestionManagerImpl) Lookup.getDefault().lookup(SuggestionManager.class);
1.11 @@ -425,7 +426,7 @@
1.12
1.13 /** Stop scannig after discovering limit suggestions */
1.14 private int getCountLimit() {
1.15 - return 303;
1.16 + return usabilityLimit;
1.17 }
1.18
1.19 private static int countFolders(FileObject projectFolder) {
1.20 @@ -452,6 +453,11 @@
1.21 return true;
1.22 }
1.23
1.24 + /** Set treshold meaning to stop the scanner. */
1.25 + public void setUsabilityLimit(int usabilityLimit) {
1.26 + this.usabilityLimit = usabilityLimit;
1.27 + }
1.28 +
1.29 /**
1.30 * Handles scan method emmited progress callbacks.
1.31 * Implementation can interrupt scanning thread
2.1 --- a/suggestions_framework/src/org/netbeans/modules/tasklist/suggestions/mf-layer.xml Thu Jan 08 17:11:51 2004 +0000
2.2 +++ b/suggestions_framework/src/org/netbeans/modules/tasklist/suggestions/mf-layer.xml Thu Jan 08 18:10:28 2004 +0000
2.3 @@ -81,10 +81,12 @@
2.4
2.5 <folder name="UI">
2.6 <folder name="Services">
2.7 - <folder name="Editing">
2.8 - <file name="org-netbeans-modules-tasklist-suggestion-Settings.shadow">
2.9 - <attr name="originalFile" stringvalue="Services/Hidden/org-netbeans-modules-tasklist-suggestions-settings-ManagerSettings.instance"/>
2.10 - </file>
2.11 + <folder name="IDEConfiguration">
2.12 + <folder name="System">
2.13 + <file name="org-netbeans-modules-tasklist-suggestion-Settings.shadow">
2.14 + <attr name="originalFile" stringvalue="Services/Hidden/org-netbeans-modules-tasklist-suggestions-settings-ManagerSettings.instance"/>
2.15 + </file>
2.16 + </folder>
2.17 </folder>
2.18 </folder>
2.19 </folder>
3.1 --- a/suggestions_framework/src/org/netbeans/modules/tasklist/suggestions/settings/ManagerSettings.java Thu Jan 08 17:11:51 2004 +0000
3.2 +++ b/suggestions_framework/src/org/netbeans/modules/tasklist/suggestions/settings/ManagerSettings.java Thu Jan 08 18:10:28 2004 +0000
3.3 @@ -47,6 +47,7 @@
3.4 public static final String AFTER_SAVE_SCAN_DELAY = "saveScanDelay";
3.5
3.6
3.7 +
3.8 /** Delay to wait after a file has been shown before we rescan */
3.9 private int showScanDelay = DEFAULT_SHOW_SCAN_DELAY;
3.10
4.1 --- a/tasklist.docscan/src/org/netbeans/modules/tasklist/docscan/Settings.java Thu Jan 08 17:11:51 2004 +0000
4.2 +++ b/tasklist.docscan/src/org/netbeans/modules/tasklist/docscan/Settings.java Thu Jan 08 18:10:28 2004 +0000
4.3 @@ -32,6 +32,11 @@
4.4 public static final String PROP_SCAN_TAGS = "taskTags"; //NOI18N
4.5 static final String PROP_MODIFICATION_TIME = "modificationTime"; // NOI18N
4.6
4.7 + /** Defines how many suggestions make sence. */
4.8 + public static final String PROP_USABILITY_LIMIT = "usabilityLimit"; // NOI18N
4.9 + private final static int DEFAULT_USABILITY_LIMIT = 300;
4.10 +
4.11 +
4.12 /** Return the signleton */
4.13 public static Settings getDefault() {
4.14 return (Settings) findObject(Settings.class, true);
4.15 @@ -85,6 +90,21 @@
4.16 }
4.17
4.18
4.19 + public void setUsabilityLimit(int limit) {
4.20 + if (limit > 1000) limit = 1000;
4.21 + if (limit <=0) limit = DEFAULT_USABILITY_LIMIT;
4.22 + putProperty(PROP_USABILITY_LIMIT, new Integer(limit));
4.23 + }
4.24 +
4.25 + public int getUsabilityLimit() {
4.26 + Integer limit = (Integer) getProperty(PROP_USABILITY_LIMIT);
4.27 + if (limit == null) {
4.28 + return DEFAULT_USABILITY_LIMIT;
4.29 + } else {
4.30 + return limit.intValue();
4.31 + }
4.32 + }
4.33 +
4.34 public TaskTags getTaskTags() {
4.35 if (tags == null) {
4.36 TaskTags d = (TaskTags) getProperty(PROP_SCAN_TAGS);
5.1 --- a/tasklist.docscan/src/org/netbeans/modules/tasklist/docscan/SettingsBeanInfo.java Thu Jan 08 17:11:51 2004 +0000
5.2 +++ b/tasklist.docscan/src/org/netbeans/modules/tasklist/docscan/SettingsBeanInfo.java Thu Jan 08 18:10:28 2004 +0000
5.3 @@ -55,6 +55,7 @@
5.4 new PropertyDescriptor(Settings.PROP_SCAN_TAGS,
5.5 Settings.class),
5.6 new PropertyDescriptor(Settings.PROP_MODIFICATION_TIME, Settings.class),
5.7 + new PropertyDescriptor(Settings.PROP_USABILITY_LIMIT, Settings.class),
5.8 };
5.9
5.10 desc[i].setDisplayName(NbBundle.getMessage(
5.11 @@ -72,6 +73,9 @@
5.12 "HINT_SCAN_TAGS")); //NOI18N
5.13 desc[i++].setHidden(true);
5.14
5.15 + desc[i].setDisplayName("Usability Limit");
5.16 + desc[i].setExpert(true);
5.17 + desc[i++].setShortDescription("Stops TODOs search at given limit.");
5.18 } catch (IntrospectionException ex) {
5.19 ex.printStackTrace();
5.20 throw new InternalError();
6.1 --- a/tasklist.docscan/src/org/netbeans/modules/tasklist/docscan/SourceTasksScanner.java Thu Jan 08 17:11:51 2004 +0000
6.2 +++ b/tasklist.docscan/src/org/netbeans/modules/tasklist/docscan/SourceTasksScanner.java Thu Jan 08 18:10:28 2004 +0000
6.3 @@ -148,6 +148,7 @@
6.4 }
6.5
6.6 SuggestionsScanner c = SuggestionsScanner.getDefault();
6.7 + c.setUsabilityLimit(Settings.getDefault().getUsabilityLimit());
6.8 bg.cancellable = c;
6.9 c.scan(projectFolders, list, view);
6.10 }
7.1 --- a/tasklist.docscan/src/org/netbeans/modules/tasklist/docscan/SourceTasksView.java Thu Jan 08 17:11:51 2004 +0000
7.2 +++ b/tasklist.docscan/src/org/netbeans/modules/tasklist/docscan/SourceTasksView.java Thu Jan 08 18:10:28 2004 +0000
7.3 @@ -487,7 +487,11 @@
7.4 button.setToolTipText("Selects folder to be scanned.");
7.5 button.addActionListener(new ActionListener() {
7.6 public void actionPerformed(ActionEvent e) {
7.7 - showFolderSelectorPopup();
7.8 + if (recentFolders.size() > 0) {
7.9 + showFolderSelectorPopup();
7.10 + } else {
7.11 + handleSelectFolder();
7.12 + }
7.13 }
7.14 });
7.15 adjustHeight(button);