1.1 --- a/o.n.tasklistapi/manifest.mf Tue Apr 15 19:51:02 2003 +0000
1.2 +++ b/o.n.tasklistapi/manifest.mf Wed Apr 16 03:49:55 2003 +0000
1.3 @@ -1,3 +1,4 @@
1.4 +Manifest-Version: 1.0
1.5 OpenIDE-Module: org.netbeans.api.tasklist/1
1.6 OpenIDE-Module-Specification-Version: 1.1
1.7 OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
2.1 --- a/suggestions_framework/manifest.mf Tue Apr 15 19:51:02 2003 +0000
2.2 +++ b/suggestions_framework/manifest.mf Wed Apr 16 03:49:55 2003 +0000
2.3 @@ -1,4 +1,5 @@
2.4 -OpenIDE-Module-Specification-Version: 1.4
2.5 +Manifest-Version: 1.0
2.6 +OpenIDE-Module-Specification-Version: 1.5
2.7 OpenIDE-Module: org.netbeans.modules.tasklist.suggestions/1
2.8 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/tasklist/suggestions/Bundle.properties
2.9 OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
3.1 --- a/suggestions_framework/src/org/netbeans/modules/tasklist/suggestions/FixAction.java Tue Apr 15 19:51:02 2003 +0000
3.2 +++ b/suggestions_framework/src/org/netbeans/modules/tasklist/suggestions/FixAction.java Wed Apr 16 03:49:55 2003 +0000
3.3 @@ -212,7 +212,11 @@
3.4 //manager.register(itemType, null, itemList);
3.5
3.6 continue;
3.7 - } // else: fixButton - go ahead and fix
3.8 + } else if (pressedButton != fixButton) {
3.9 + // For example if you Escape or close the window.
3.10 + // See issue 32149.
3.11 + continue;
3.12 + }
3.13
3.14 /* Removed - see comment above declaration
3.15 if (noConfirmButton.isSelected()) {
4.1 --- a/suggestions_framework/src/org/netbeans/modules/tasklist/suggestions/SuggestionImpl.java Tue Apr 15 19:51:02 2003 +0000
4.2 +++ b/suggestions_framework/src/org/netbeans/modules/tasklist/suggestions/SuggestionImpl.java Wed Apr 16 03:49:55 2003 +0000
4.3 @@ -19,6 +19,7 @@
4.4 import org.openide.loaders.DataObject;
4.5 import org.openide.nodes.Node;
4.6 import org.openide.text.Line;
4.7 +import org.openide.text.DataEditorSupport;
4.8
4.9 import org.netbeans.api.tasklist.*;
4.10
4.11 @@ -28,7 +29,7 @@
4.12 /** Class which represents a task in the
4.13 * tasklist.
4.14 * @author Tor Norbye */
4.15 -final public class SuggestionImpl extends Task implements Node.Cookie {
4.16 +public class SuggestionImpl extends Task implements Node.Cookie {
4.17
4.18 //private String action;
4.19 private String filename = null;
4.20 @@ -43,7 +44,7 @@
4.21 to improve search speeds. Don't muck with it. */
4.22 transient boolean scantag;
4.23
4.24 - SuggestionImpl() {
4.25 + protected SuggestionImpl() {
4.26 }
4.27
4.28 public SuggestionImpl(String summary, SuggestionType stype,
4.29 @@ -73,9 +74,11 @@
4.30 Line l = getLine();
4.31 if (l == null) {
4.32 basename = "";
4.33 - } else if ((l.getDataObject() != null) &&
4.34 - (l.getDataObject().getPrimaryFile() != null)) {
4.35 - basename = l.getDataObject().getPrimaryFile().getNameExt();
4.36 + } else {
4.37 + DataObject dobj = DataEditorSupport.findDataObject(l);
4.38 + if ((dobj != null) && (dobj.getPrimaryFile() != null)) {
4.39 + basename = dobj.getPrimaryFile().getNameExt();
4.40 + }
4.41 }
4.42 }
4.43 return basename;
5.1 --- a/suggestions_framework/src/org/netbeans/modules/tasklist/suggestions/SuggestionList.java Tue Apr 15 19:51:02 2003 +0000
5.2 +++ b/suggestions_framework/src/org/netbeans/modules/tasklist/suggestions/SuggestionList.java Wed Apr 16 03:49:55 2003 +0000
5.3 @@ -37,7 +37,7 @@
5.4 */
5.5
5.6
5.7 -final public class SuggestionList extends TaskList {
5.8 +public class SuggestionList extends TaskList {
5.9
5.10 /** Construct a new SuggestionManager instance. */
5.11 public SuggestionList() {
6.1 --- a/suggestions_framework/src/org/netbeans/modules/tasklist/suggestions/SuggestionNode.java Tue Apr 15 19:51:02 2003 +0000
6.2 +++ b/suggestions_framework/src/org/netbeans/modules/tasklist/suggestions/SuggestionNode.java Wed Apr 16 03:49:55 2003 +0000
6.3 @@ -40,6 +40,8 @@
6.4 import org.netbeans.modules.tasklist.core.editors.PriorityPropertyEditor;
6.5 import org.netbeans.modules.tasklist.core.filter.FilterAction;
6.6 import org.openide.text.Line;
6.7 +import org.openide.loaders.DataObject;
6.8 +import org.openide.text.DataEditorSupport;
6.9
6.10
6.11 /**
6.12 @@ -48,16 +50,16 @@
6.13 * @author Tor Norbye
6.14 */
6.15
6.16 -class SuggestionNode extends TaskNode {
6.17 +public class SuggestionNode extends TaskNode {
6.18
6.19 // Leaf
6.20 - SuggestionNode(SuggestionImpl item) {
6.21 + protected SuggestionNode(SuggestionImpl item) {
6.22 super(item);
6.23 init(item);
6.24 }
6.25
6.26 // Non-leaf/parent
6.27 - SuggestionNode(SuggestionImpl item, List subtasks) {
6.28 + protected SuggestionNode(SuggestionImpl item, List subtasks) {
6.29 super(item, subtasks);
6.30 init(item);
6.31 }
6.32 @@ -249,8 +251,9 @@
6.33 }
6.34 Line l = item.getLine();
6.35 if (l != null) {
6.36 - if (l.getDataObject() != null)
6.37 - return l.getDataObject().getCookie(cl);
6.38 + DataObject dao = DataEditorSupport.findDataObject(l);
6.39 + if (dao != null)
6.40 + return dao.getCookie(cl);
6.41 else
6.42 return null;
6.43 }
7.1 --- a/tasklist.bugs/manifest.mf Tue Apr 15 19:51:02 2003 +0000
7.2 +++ b/tasklist.bugs/manifest.mf Wed Apr 16 03:49:55 2003 +0000
7.3 @@ -1,3 +1,4 @@
7.4 +Manifest-Version: 1.0
7.5 OpenIDE-Module-Specification-Version: 0.9
7.6 OpenIDE-Module: org.netbeans.modules.tasklist.bugs/1
7.7 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/tasklist/bugs/Bundle.properties
8.1 --- a/tasklist.core/manifest.mf Tue Apr 15 19:51:02 2003 +0000
8.2 +++ b/tasklist.core/manifest.mf Wed Apr 16 03:49:55 2003 +0000
8.3 @@ -1,3 +1,4 @@
8.4 +Manifest-Version: 1.0
8.5 OpenIDE-Module-Specification-Version: 1.6
8.6 OpenIDE-Module: org.netbeans.modules.tasklist.core/1
8.7 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/tasklist/core/Bundle.properties
9.1 --- a/tasklist.docscan/manifest.mf Tue Apr 15 19:51:02 2003 +0000
9.2 +++ b/tasklist.docscan/manifest.mf Wed Apr 16 03:49:55 2003 +0000
9.3 @@ -1,4 +1,5 @@
9.4 -OpenIDE-Module-Specification-Version: 1.5
9.5 +Manifest-Version: 1.0
9.6 +OpenIDE-Module-Specification-Version: 1.6
9.7 OpenIDE-Module: org.netbeans.modules.tasklist.docscan/1
9.8 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/tasklist/docscan/Bundle.properties
9.9 OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
10.1 --- a/tasklist.editor/manifest.mf Tue Apr 15 19:51:02 2003 +0000
10.2 +++ b/tasklist.editor/manifest.mf Wed Apr 16 03:49:55 2003 +0000
10.3 @@ -1,4 +1,5 @@
10.4 -OpenIDE-Module-Specification-Version: 1.2
10.5 +Manifest-Version: 1.0
10.6 +OpenIDE-Module-Specification-Version: 1.3
10.7 OpenIDE-Module: org.netbeans.modules.tasklist.editor/1
10.8 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/tasklist/editor/Bundle.properties
10.9 OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
11.1 --- a/tasklist.editor/src/org/netbeans/modules/tasklist/editor/NewTaskEditorAction.java Tue Apr 15 19:51:02 2003 +0000
11.2 +++ b/tasklist.editor/src/org/netbeans/modules/tasklist/editor/NewTaskEditorAction.java Wed Apr 16 03:49:55 2003 +0000
11.3 @@ -30,6 +30,7 @@
11.4 import org.openide.loaders.DataObject;
11.5 import org.openide.text.Line;
11.6 import org.openide.util.NbBundle;
11.7 +import org.openide.text.DataEditorSupport;
11.8
11.9
11.10
11.11 @@ -75,7 +76,7 @@
11.12 }
11.13
11.14 Line lineObj = NbEditorUtilities.getLine(doc, caret.getDot(), false);
11.15 - DataObject dob = lineObj.getDataObject();
11.16 + DataObject dob = DataEditorSupport.findDataObject(lineObj);
11.17 FileObject fo = dob.getPrimaryFile();
11.18 File file = FileUtil.toFile(fo);
11.19 String filename;
12.1 --- a/tasklist.html/manifest.mf Tue Apr 15 19:51:02 2003 +0000
12.2 +++ b/tasklist.html/manifest.mf Wed Apr 16 03:49:55 2003 +0000
12.3 @@ -1,3 +1,4 @@
12.4 +Manifest-Version: 1.0
12.5 OpenIDE-Module-Specification-Version: 1.2
12.6 OpenIDE-Module: org.netbeans.modules.tasklist.html/1
12.7 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/tasklist/html/Bundle.properties
13.1 --- a/tasklist.pmd/manifest.mf Tue Apr 15 19:51:02 2003 +0000
13.2 +++ b/tasklist.pmd/manifest.mf Wed Apr 16 03:49:55 2003 +0000
13.3 @@ -1,4 +1,5 @@
13.4 -OpenIDE-Module-Specification-Version: 1.1
13.5 +Manifest-Version: 1.0
13.6 +OpenIDE-Module-Specification-Version: 1.2
13.7 OpenIDE-Module: org.netbeans.modules.tasklist.pmd/1
13.8 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/tasklist/pmd/Bundle.properties
13.9 OpenIDE-Module-Layer: org/netbeans/modules/tasklist/pmd/mf-layer.xml
14.1 --- a/tasklist.pmd/src/org/netbeans/modules/tasklist/pmd/ImportPerformer.java Tue Apr 15 19:51:02 2003 +0000
14.2 +++ b/tasklist.pmd/src/org/netbeans/modules/tasklist/pmd/ImportPerformer.java Wed Apr 16 03:49:55 2003 +0000
14.3 @@ -25,6 +25,7 @@
14.4 import org.openide.nodes.*;
14.5 import org.openide.loaders.DataObject;
14.6 import org.openide.text.Line;
14.7 +import org.openide.text.DataEditorSupport;
14.8 import org.openide.util.NbBundle;
14.9
14.10 import org.netbeans.modules.tasklist.core.TLUtils;
14.11 @@ -60,7 +61,7 @@
14.12 return true;
14.13 }
14.14 public Object getConfirmation(Suggestion s) {
14.15 - DataObject dao = line.getDataObject();
14.16 + DataObject dao = DataEditorSupport.findDataObject(line);
14.17 int linenumber = line.getLineNumber();
14.18 String filename = dao.getPrimaryFile().getNameExt();
14.19 String ruleDesc = violation.getRule().getDescription();
15.1 --- a/tasklist.pmd/src/org/netbeans/modules/tasklist/pmd/RemovePerformer.java Tue Apr 15 19:51:02 2003 +0000
15.2 +++ b/tasklist.pmd/src/org/netbeans/modules/tasklist/pmd/RemovePerformer.java Wed Apr 16 03:49:55 2003 +0000
15.3 @@ -28,6 +28,7 @@
15.4 import org.openide.ErrorManager;
15.5 import org.openide.loaders.DataObject;
15.6 import org.openide.text.Line;
15.7 +import org.openide.text.DataEditorSupport;
15.8 import org.openide.util.NbBundle;
15.9 import org.openide.src.*;
15.10
15.11 @@ -100,7 +101,7 @@
15.12 }
15.13 }
15.14
15.15 - DataObject dobj = line.getDataObject();
15.16 + DataObject dobj = DataEditorSupport.findDataObject(line);
15.17 SourceCookie sc = (SourceCookie)dobj.getCookie(SourceCookie.class);
15.18 if (sc == null) {
15.19 return null; // shouldn't happen
15.20 @@ -165,7 +166,7 @@
15.21 }
15.22 }
15.23
15.24 - DataObject dobj = line.getDataObject();
15.25 + DataObject dobj = DataEditorSupport.findDataObject(line);
15.26 SourceCookie sc = (SourceCookie)dobj.getCookie(SourceCookie.class);
15.27 if (sc == null) {
15.28 return null; // shouldn't happen
15.29 @@ -322,7 +323,7 @@
15.30 return true;
15.31 }
15.32 public Object getConfirmation(Suggestion s) {
15.33 - DataObject dao = line.getDataObject();
15.34 + DataObject dao = DataEditorSupport.findDataObject(line);
15.35 int linenumber = line.getLineNumber();
15.36 String filename = dao.getPrimaryFile().getNameExt();
15.37 String ruleDesc = violation.getRule().getDescription();
16.1 --- a/tasklist.pmd/src/org/netbeans/modules/tasklist/pmd/ViolationProvider.java Tue Apr 15 19:51:02 2003 +0000
16.2 +++ b/tasklist.pmd/src/org/netbeans/modules/tasklist/pmd/ViolationProvider.java Wed Apr 16 03:49:55 2003 +0000
16.3 @@ -41,6 +41,7 @@
16.4 import org.openide.text.Line;
16.5 import org.openide.util.NbBundle;
16.6 import org.openide.util.Utilities;
16.7 +import org.openide.text.DataEditorSupport;
16.8
16.9 import org.netbeans.modules.tasklist.core.TLUtils;
16.10
16.11 @@ -172,7 +173,7 @@
16.12 return true;
16.13 }
16.14 public Object getConfirmation(Suggestion s) {
16.15 - DataObject dao = line.getDataObject();
16.16 + DataObject dao = DataEditorSupport.findDataObject(line);
16.17 int linenumber = line.getLineNumber();
16.18 String filename = dao.getPrimaryFile().getNameExt();
16.19 String ruleDesc = violation.getRule().getDescription();
17.1 --- a/tasklist.usertasks/manifest.mf Tue Apr 15 19:51:02 2003 +0000
17.2 +++ b/tasklist.usertasks/manifest.mf Wed Apr 16 03:49:55 2003 +0000
17.3 @@ -1,3 +1,4 @@
17.4 +Manifest-Version: 1.0
17.5 OpenIDE-Module-Specification-Version: 1.3
17.6 OpenIDE-Module: org.netbeans.modules.tasklist.usertasks/1
17.7 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/tasklist/usertasks/Bundle.properties