1.1 --- a/docbook.project/src/org/netbeans/modules/docbook/project/DbFileFilterNode.java Fri Aug 29 07:06:18 2014 +0200
1.2 +++ b/docbook.project/src/org/netbeans/modules/docbook/project/DbFileFilterNode.java Thu Oct 23 15:10:15 2014 +0200
1.3 @@ -100,7 +100,7 @@
1.4 nm : cachedName;
1.5 FileObject ob = ((DataNode) getOriginal()).getDataObject().getPrimaryFile();
1.6 try {
1.7 - String nue = ob.getFileSystem().getStatus().annotateName(nm,
1.8 + String nue = ob.getFileSystem().getDecorator().annotateName(nm,
1.9 Collections.singleton(ob));
1.10 result = nue.replace(nm, result);
1.11 } catch (FileStateInvalidException ex) {
1.12 @@ -121,22 +121,13 @@
1.13 }
1.14 if (result != null) {
1.15 try {
1.16 - FileSystem.Status stat =
1.17 - ob.getFileSystem().getStatus();
1.18 - if (stat instanceof FileSystem.HtmlStatus) {
1.19 - FileSystem.HtmlStatus hstat = (FileSystem.HtmlStatus) stat;
1.20 -
1.21 - String old = result;
1.22 - result = hstat.annotateNameHtml (
1.23 - result, Collections.singleton(ob));
1.24 -
1.25 - if (main) result = "<b>" + (result == null ? old : result);
1.26 -
1.27 - //Make sure the super string was really modified
1.28 - if (!super.getDisplayName().equals(result)) {
1.29 - return result;
1.30 - }
1.31 - }
1.32 + String x = ob.getFileSystem().getDecorator().annotateNameHtml(
1.33 + result, Collections.singleton(ob));
1.34 + if (main) result = "<b>" + (x == null ? result : x);
1.35 + //Make sure the super string was really modified
1.36 + if (result != null && !super.getDisplayName().equals(result)) {
1.37 + return result;
1.38 + }
1.39 } catch (FileStateInvalidException ex) {
1.40 ErrorManager.getDefault().notify(ex);
1.41 }
2.1 --- a/enode/src/org/netbeans/modules/enode/SubMenuCache.java Fri Aug 29 07:06:18 2014 +0200
2.2 +++ b/enode/src/org/netbeans/modules/enode/SubMenuCache.java Thu Oct 23 15:10:15 2014 +0200
2.3 @@ -165,7 +165,7 @@
2.4 if (LOGGABLE) log.fine("scanFolder(" + folder.getPath() + ") START");
2.5 String displayName = folder.getName();
2.6 try {
2.7 - displayName = folder.getFileSystem ().getStatus ().annotateName(folder.getName(), Collections.singleton(folder));
2.8 + displayName = folder.getFileSystem ().getDecorator ().annotateName(folder.getName(), Collections.singleton(folder));
2.9 } catch (Exception x) {
2.10 log.log(Level.SEVERE, "", x);
2.11 }
3.1 --- a/eview/src/org/netbeans/modules/eview/ComboBoxControlFactory.java Fri Aug 29 07:06:18 2014 +0200
3.2 +++ b/eview/src/org/netbeans/modules/eview/ComboBoxControlFactory.java Thu Oct 23 15:10:15 2014 +0200
3.3 @@ -131,7 +131,7 @@
3.4 if (child.isData()) {
3.5 String displayName = child.getName();
3.6 try {
3.7 - displayName = child.getFileSystem ().getStatus ().annotateName(child.getName(), Collections.singleton(child));
3.8 + displayName = child.getFileSystem ().getDecorator ().annotateName(child.getName(), Collections.singleton(child));
3.9 } catch (Exception x) {
3.10 log.log(Level.WARNING, "display name cannot be annotated " + displayName, x); // NOI18N
3.11 }
4.1 --- a/eview/src/org/netbeans/modules/eview/Configuration.java Fri Aug 29 07:06:18 2014 +0200
4.2 +++ b/eview/src/org/netbeans/modules/eview/Configuration.java Thu Oct 23 15:10:15 2014 +0200
4.3 @@ -150,7 +150,7 @@
4.4 if (LOGGABLE) log.fine("scanFolder(" + folder.getPath() + ") START");
4.5 container.displayName = folder.getName();
4.6 try {
4.7 - container.displayName = folder.getFileSystem ().getStatus ().annotateName(folder.getName(), Collections.singleton(folder));
4.8 + container.displayName = folder.getFileSystem ().getDecorator ().annotateName(folder.getName(), Collections.singleton(folder));
4.9 } catch (Exception x) {
4.10 log.log(Level.WARNING, container.displayName, x);
4.11 }
5.1 --- a/group/src/org/netbeans/modules/group/GroupNode.java Fri Aug 29 07:06:18 2014 +0200
5.2 +++ b/group/src/org/netbeans/modules/group/GroupNode.java Thu Oct 23 15:10:15 2014 +0200
5.3 @@ -106,7 +106,7 @@
5.4 ? defaultDisplayName
5.5 : ""}); //NOI18N
5.6 try {
5.7 - displayName = fileObject.getFileSystem().getStatus().annotateName(
5.8 + displayName = fileObject.getFileSystem().getDecorator().annotateName(
5.9 displayName,
5.10 dataObject.files());
5.11
6.1 --- a/javahints/nbproject/project.xml Fri Aug 29 07:06:18 2014 +0200
6.2 +++ b/javahints/nbproject/project.xml Thu Oct 23 15:10:15 2014 +0200
6.3 @@ -199,10 +199,26 @@
6.4 </run-dependency>
6.5 </dependency>
6.6 <dependency>
6.7 + <code-name-base>org.netbeans.modules.java.source.base</code-name-base>
6.8 + <build-prerequisite/>
6.9 + <compile-dependency/>
6.10 + <run-dependency>
6.11 + <specification-version>1.2</specification-version>
6.12 + </run-dependency>
6.13 + </dependency>
6.14 + <dependency>
6.15 <code-name-base>org.netbeans.modules.java.source</code-name-base>
6.16 <build-prerequisite/>
6.17 <compile-dependency/>
6.18 <run-dependency>
6.19 + <specification-version>0.142</specification-version>
6.20 + </run-dependency>
6.21 + </dependency>
6.22 + <dependency>
6.23 + <code-name-base>org.netbeans.modules.java.completion</code-name-base>
6.24 + <build-prerequisite/>
6.25 + <compile-dependency/>
6.26 + <run-dependency>
6.27 <implementation-version/>
6.28 </run-dependency>
6.29 </dependency>
7.1 --- a/javahints/src/org/netbeans/modules/javahints/Excluded.java Fri Aug 29 07:06:18 2014 +0200
7.2 +++ b/javahints/src/org/netbeans/modules/javahints/Excluded.java Thu Oct 23 15:10:15 2014 +0200
7.3 @@ -30,7 +30,8 @@
7.4 import javax.lang.model.element.Element;
7.5 import static org.netbeans.spi.editor.hints.ErrorDescriptionFactory.createErrorDescription;
7.6 import com.sun.source.tree.Tree;
7.7 -import static org.netbeans.modules.editor.java.Utilities.isExcludeMethods;
7.8 +import static org.netbeans.modules.java.completion.Utilities.isExcludeMethods;
7.9 +import static org.netbeans.modules.java.completion.Utilities.isExcluded;
7.10 import com.sun.source.tree.Tree.Kind;
7.11 import com.sun.source.util.TreePath;
7.12 import java.util.Collections;
7.13 @@ -116,7 +117,7 @@
7.14 default:
7.15 return null;
7.16 }
7.17 - if (fqn == null || fqn.length() == 0 || !Utilities.isExcluded(fqn)) {
7.18 + if (fqn == null || fqn.length() == 0 || !isExcluded(fqn)) {
7.19 return null;
7.20 }
7.21 CompilationUnitTree cu = ci.getCompilationUnit();
8.1 --- a/python.project/nbproject/project.xml Fri Aug 29 07:06:18 2014 +0200
8.2 +++ b/python.project/nbproject/project.xml Thu Oct 23 15:10:15 2014 +0200
8.3 @@ -11,7 +11,15 @@
8.4 <compile-dependency/>
8.5 <run-dependency>
8.6 <release-version>1</release-version>
8.7 - <specification-version>1.12.0.1</specification-version>
8.8 + <specification-version>1.40</specification-version>
8.9 + </run-dependency>
8.10 + </dependency>
8.11 + <dependency>
8.12 + <code-name-base>org.netbeans.api.progress.nb</code-name-base>
8.13 + <build-prerequisite/>
8.14 + <compile-dependency/>
8.15 + <run-dependency>
8.16 + <specification-version>1.40</specification-version>
8.17 </run-dependency>
8.18 </dependency>
8.19 <dependency>
8.20 @@ -46,7 +54,7 @@
8.21 <compile-dependency/>
8.22 <run-dependency>
8.23 <release-version>1</release-version>
8.24 - <specification-version>1.31</specification-version>
8.25 + <specification-version>1.62</specification-version>
8.26 </run-dependency>
8.27 </dependency>
8.28 <dependency>
8.29 @@ -55,7 +63,7 @@
8.30 <compile-dependency/>
8.31 <run-dependency>
8.32 <release-version>1</release-version>
8.33 - <specification-version>1.13.1</specification-version>
8.34 + <specification-version>1.62</specification-version>
8.35 </run-dependency>
8.36 </dependency>
8.37 <dependency>
8.38 @@ -64,7 +72,16 @@
8.39 <compile-dependency/>
8.40 <run-dependency>
8.41 <release-version>1</release-version>
8.42 - <specification-version>1.42</specification-version>
8.43 + <specification-version>1.79</specification-version>
8.44 + </run-dependency>
8.45 + </dependency>
8.46 + <dependency>
8.47 + <code-name-base>org.netbeans.modules.projectuiapi.base</code-name-base>
8.48 + <build-prerequisite/>
8.49 + <compile-dependency/>
8.50 + <run-dependency>
8.51 + <release-version>1</release-version>
8.52 + <specification-version>1.78</specification-version>
8.53 </run-dependency>
8.54 </dependency>
8.55 <dependency>
8.56 @@ -129,7 +146,15 @@
8.57 <build-prerequisite/>
8.58 <compile-dependency/>
8.59 <run-dependency>
8.60 - <specification-version>7.19</specification-version>
8.61 + <specification-version>9.0</specification-version>
8.62 + </run-dependency>
8.63 + </dependency>
8.64 + <dependency>
8.65 + <code-name-base>org.openide.filesystems.nb</code-name-base>
8.66 + <build-prerequisite/>
8.67 + <compile-dependency/>
8.68 + <run-dependency>
8.69 + <specification-version>9.0</specification-version>
8.70 </run-dependency>
8.71 </dependency>
8.72 <dependency>
8.73 @@ -157,6 +182,14 @@
8.74 </run-dependency>
8.75 </dependency>
8.76 <dependency>
8.77 + <code-name-base>org.openide.util.base</code-name-base>
8.78 + <build-prerequisite/>
8.79 + <compile-dependency/>
8.80 + <run-dependency>
8.81 + <specification-version>9.2</specification-version>
8.82 + </run-dependency>
8.83 + </dependency>
8.84 + <dependency>
8.85 <code-name-base>org.openide.util.lookup</code-name-base>
8.86 <build-prerequisite/>
8.87 <compile-dependency/>
9.1 --- a/python.project/src/org/netbeans/modules/python/project/ui/PackageRootNode.java Fri Aug 29 07:06:18 2014 +0200
9.2 +++ b/python.project/src/org/netbeans/modules/python/project/ui/PackageRootNode.java Thu Oct 23 15:10:15 2014 +0200
9.3 @@ -70,6 +70,7 @@
9.4 import org.openide.filesystems.FileStatusListener;
9.5 import org.openide.filesystems.FileSystem;
9.6 import org.openide.filesystems.FileUtil;
9.7 +import org.openide.filesystems.StatusDecorator;
9.8 import org.openide.loaders.DataFolder;
9.9 import org.openide.loaders.DataObject;
9.10 import org.openide.nodes.AbstractNode;
9.11 @@ -155,7 +156,7 @@
9.12 String s = super.getDisplayName ();
9.13
9.14 try {
9.15 - s = file.getFileSystem ().getStatus ().annotateName (s, files);
9.16 + s = file.getFileSystem ().getDecorator ().annotateName (s, files);
9.17 } catch (FileStateInvalidException e) {
9.18 ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, e);
9.19 }
9.20 @@ -165,17 +166,14 @@
9.21
9.22 public @Override String getHtmlDisplayName() {
9.23 try {
9.24 - FileSystem.Status stat = file.getFileSystem().getStatus();
9.25 - if (stat instanceof FileSystem.HtmlStatus) {
9.26 - FileSystem.HtmlStatus hstat = (FileSystem.HtmlStatus) stat;
9.27 + StatusDecorator stat = file.getFileSystem().getDecorator();
9.28
9.29 - String result = hstat.annotateNameHtml (
9.30 - super.getDisplayName(), files);
9.31 + String result = stat.annotateNameHtml (
9.32 + super.getDisplayName(), files);
9.33
9.34 - //Make sure the super string was really modified
9.35 - if (!super.getDisplayName().equals(result)) {
9.36 - return result;
9.37 - }
9.38 + //Make sure the super string was really modified
9.39 + if (result != null && !super.getDisplayName().equals(result)) {
9.40 + return result;
9.41 }
9.42 } catch (FileStateInvalidException e) {
9.43 ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, e);
10.1 --- a/python.project/src/org/netbeans/modules/python/project/ui/PackageViewChildren.java Fri Aug 29 07:06:18 2014 +0200
10.2 +++ b/python.project/src/org/netbeans/modules/python/project/ui/PackageViewChildren.java Thu Oct 23 15:10:15 2014 +0200
10.3 @@ -88,6 +88,8 @@
10.4 import org.openide.filesystems.FileStateInvalidException;
10.5 import org.openide.filesystems.FileSystem;
10.6 import org.openide.filesystems.FileUtil;
10.7 +import org.openide.filesystems.FileUIUtils;
10.8 +import org.openide.filesystems.StatusDecorator;
10.9 import org.openide.loaders.ChangeableDataFilter;
10.10 import org.openide.loaders.DataFilter;
10.11 import org.openide.loaders.DataFolder;
10.12 @@ -925,9 +927,10 @@
10.13 try {
10.14 FileObject fo = dataFolder.getPrimaryFile();
10.15 Set<FileObject> set = new NonRecursiveFolderSet(fo);
10.16 - FileSystem.Status status = fo.getFileSystem().getStatus();
10.17 - if (status instanceof FileSystem.HtmlStatus) {
10.18 - name = ((FileSystem.HtmlStatus) status).annotateNameHtml(name, set);
10.19 + StatusDecorator status = fo.getFileSystem().getDecorator();
10.20 + String htmlName = status.annotateNameHtml(name, set);
10.21 + if (htmlName != null) {
10.22 + name = htmlName;
10.23 } else {
10.24 // #89138: return null if the name starts with '<' and status is not HtmlStatus
10.25 if (name.startsWith("<")) {
10.26 @@ -968,7 +971,7 @@
10.27 try {
10.28 FileObject fo = dataFolder.getPrimaryFile();
10.29 Set<FileObject> set = new NonRecursiveFolderSet(fo);
10.30 - img = fo.getFileSystem ().getStatus ().annotateIcon (img, type, set);
10.31 + img = FileUIUtils.getImageDecorator(fo.getFileSystem ()).annotateIcon (img, type, set);
10.32 } catch (FileStateInvalidException e) {
10.33 // no fs, do nothing
10.34 }
10.35 @@ -982,7 +985,7 @@
10.36 try {
10.37 FileObject fo = dataFolder.getPrimaryFile();
10.38 Set<FileObject> set = new NonRecursiveFolderSet(fo);
10.39 - img = fo.getFileSystem ().getStatus ().annotateIcon (img, type, set);
10.40 + img = FileUIUtils.getImageDecorator(fo.getFileSystem ()).annotateIcon (img, type, set);
10.41 } catch (FileStateInvalidException e) {
10.42 // no fs, do nothing
10.43 }
11.1 --- a/python.testrunner/nbproject/project.xml Fri Aug 29 07:06:18 2014 +0200
11.2 +++ b/python.testrunner/nbproject/project.xml Thu Oct 23 15:10:15 2014 +0200
11.3 @@ -11,6 +11,7 @@
11.4 <compile-dependency/>
11.5 <run-dependency>
11.6 <release-version>1</release-version>
11.7 + <specification-version>1.40</specification-version>
11.8 </run-dependency>
11.9 </dependency>
11.10 <dependency>
11.11 @@ -53,8 +54,16 @@
11.12 <build-prerequisite/>
11.13 <compile-dependency/>
11.14 <run-dependency>
11.15 - <release-version>1</release-version>
11.16 - <specification-version>1.26</specification-version>
11.17 + <release-version>2</release-version>
11.18 + <specification-version>2.0</specification-version>
11.19 + </run-dependency>
11.20 + </dependency>
11.21 + <dependency>
11.22 + <code-name-base>org.netbeans.modules.gsf.testrunner.ui</code-name-base>
11.23 + <build-prerequisite/>
11.24 + <compile-dependency/>
11.25 + <run-dependency>
11.26 + <specification-version>1.0</specification-version>
11.27 </run-dependency>
11.28 </dependency>
11.29 <dependency>
11.30 @@ -63,7 +72,7 @@
11.31 <compile-dependency/>
11.32 <run-dependency>
11.33 <release-version>1</release-version>
11.34 - <specification-version>1.24</specification-version>
11.35 + <specification-version>1.62</specification-version>
11.36 </run-dependency>
11.37 </dependency>
11.38 <dependency>
11.39 @@ -72,7 +81,7 @@
11.40 <compile-dependency/>
11.41 <run-dependency>
11.42 <release-version>1</release-version>
11.43 - <specification-version>1.14</specification-version>
11.44 + <specification-version>1.49</specification-version>
11.45 </run-dependency>
11.46 </dependency>
11.47 <dependency>
11.48 @@ -145,7 +154,7 @@
11.49 <build-prerequisite/>
11.50 <compile-dependency/>
11.51 <run-dependency>
11.52 - <specification-version>7.9</specification-version>
11.53 + <specification-version>9.0</specification-version>
11.54 </run-dependency>
11.55 </dependency>
11.56 <dependency>
11.57 @@ -193,7 +202,15 @@
11.58 <build-prerequisite/>
11.59 <compile-dependency/>
11.60 <run-dependency>
11.61 - <specification-version>8.0</specification-version>
11.62 + <specification-version>9.0</specification-version>
11.63 + </run-dependency>
11.64 + </dependency>
11.65 + <dependency>
11.66 + <code-name-base>org.openide.util.base</code-name-base>
11.67 + <build-prerequisite/>
11.68 + <compile-dependency/>
11.69 + <run-dependency>
11.70 + <specification-version>9.0</specification-version>
11.71 </run-dependency>
11.72 </dependency>
11.73 <dependency>
12.1 --- a/python.testrunner/src/org/netbeans/modules/python/testrunner/PyUnitRunner.java Fri Aug 29 07:06:18 2014 +0200
12.2 +++ b/python.testrunner/src/org/netbeans/modules/python/testrunner/PyUnitRunner.java Thu Oct 23 15:10:15 2014 +0200
12.3 @@ -52,6 +52,7 @@
12.4 import org.netbeans.api.project.ProjectUtils;
12.5 import org.netbeans.modules.gsf.testrunner.api.TestSession;
12.6 import org.netbeans.modules.gsf.testrunner.api.TestSession.SessionType;
12.7 +import org.netbeans.modules.gsf.testrunner.ui.api.Manager;
12.8 import org.netbeans.modules.python.api.PythonExecution;
12.9 import org.netbeans.modules.python.api.PythonPlatform;
12.10 import org.netbeans.modules.python.editor.codecoverage.PythonCoverageProvider;
12.11 @@ -62,7 +63,7 @@
12.12 import org.openide.filesystems.FileObject;
12.13 import org.openide.filesystems.FileUtil;
12.14 import org.openide.modules.InstalledFileLocator;
12.15 -import org.openide.util.Utilities;
12.16 +import org.openide.util.BaseUtilities;
12.17
12.18 /**
12.19 * Test runner implmentation for running PyUnit tests
12.20 @@ -255,7 +256,7 @@
12.21 File pwd = FileUtil.toFile(project.getProjectDirectory());
12.22
12.23 desc.setDisplayName(name);
12.24 - desc.setScriptArgs(Utilities.escapeParameters(additionalArgs.toArray(new String[additionalArgs.size()])));
12.25 + desc.setScriptArgs(BaseUtilities.escapeParameters(additionalArgs.toArray(new String[additionalArgs.size()])));
12.26 desc.setWorkingDirectory(pwd.getAbsolutePath());
12.27 desc.setCommand(platform.getInterpreterCommand());
12.28 desc.setScript(getScript(RUNNER_SCRIPT_NAME).getAbsolutePath());
12.29 @@ -282,10 +283,10 @@
12.30 desc.getDisplayName(), desc.getJavaPath(), desc.getPath(), desc.getScript(),
12.31 desc.getScriptArgs(), desc.getWorkingDirectory()});
12.32 }
12.33 -
12.34 - final TestSession session = new TestSession(name,
12.35 + Manager.getInstance().setNodeFactory(new PythonTestRunnerNodeFactory());
12.36 + final TestSession session = new TestSession(name,
12.37 project,
12.38 - debug ? SessionType.DEBUG : SessionType.TEST, new PythonTestRunnerNodeFactory());
12.39 + debug ? SessionType.DEBUG : SessionType.TEST);
12.40
12.41 TestExecutionManager.getInstance().start(desc, new PyUnitHandlerFactory(), session);
12.42 }
13.1 --- a/python.testrunner/src/org/netbeans/modules/python/testrunner/PythonTestRunnerNodeFactory.java Fri Aug 29 07:06:18 2014 +0200
13.2 +++ b/python.testrunner/src/org/netbeans/modules/python/testrunner/PythonTestRunnerNodeFactory.java Thu Oct 23 15:10:15 2014 +0200
13.3 @@ -43,9 +43,9 @@
13.4 package org.netbeans.modules.python.testrunner;
13.5
13.6 import org.netbeans.api.project.Project;
13.7 -import org.netbeans.modules.gsf.testrunner.api.TestRunnerNodeFactory;
13.8 +import org.netbeans.modules.gsf.testrunner.ui.api.TestRunnerNodeFactory;
13.9 import org.netbeans.modules.gsf.testrunner.api.Testcase;
13.10 -import org.netbeans.modules.gsf.testrunner.api.TestsuiteNode;
13.11 +import org.netbeans.modules.gsf.testrunner.ui.api.TestsuiteNode;
13.12 import org.netbeans.modules.python.testrunner.ui.PythonCallstackFrameNode;
13.13 import org.netbeans.modules.python.testrunner.ui.PythonTestMethodNode;
13.14 import org.netbeans.modules.python.testrunner.ui.PythonTestsuiteNode;
14.1 --- a/python.testrunner/src/org/netbeans/modules/python/testrunner/TestExecutionManager.java Fri Aug 29 07:06:18 2014 +0200
14.2 +++ b/python.testrunner/src/org/netbeans/modules/python/testrunner/TestExecutionManager.java Thu Oct 23 15:10:15 2014 +0200
14.3 @@ -53,7 +53,7 @@
14.4 import javax.swing.event.ChangeListener;
14.5 import org.netbeans.api.extexecution.ExecutionDescriptor;
14.6 import org.netbeans.api.extexecution.ExecutionService;
14.7 -import org.netbeans.modules.gsf.testrunner.api.Manager;
14.8 +import org.netbeans.modules.gsf.testrunner.ui.api.Manager;
14.9 import org.netbeans.modules.gsf.testrunner.api.RerunHandler;
14.10 import org.netbeans.modules.gsf.testrunner.api.RerunType;
14.11 import org.netbeans.modules.gsf.testrunner.api.TestSession;
15.1 --- a/python.testrunner/src/org/netbeans/modules/python/testrunner/ui/BaseTestMethodNodeAction.java Fri Aug 29 07:06:18 2014 +0200
15.2 +++ b/python.testrunner/src/org/netbeans/modules/python/testrunner/ui/BaseTestMethodNodeAction.java Thu Oct 23 15:10:15 2014 +0200
15.3 @@ -45,7 +45,7 @@
15.4 import java.util.Collection;
15.5 import java.util.logging.Logger;
15.6 import org.netbeans.api.project.Project;
15.7 -import org.netbeans.modules.gsf.testrunner.api.TestNodeAction;
15.8 +import org.netbeans.modules.gsf.testrunner.ui.api.TestNodeAction;
15.9 import org.netbeans.modules.gsf.testrunner.api.Testcase;
15.10 import org.netbeans.modules.python.project.PythonProject;
15.11 import org.netbeans.modules.python.project.spi.TestRunner;
16.1 --- a/python.testrunner/src/org/netbeans/modules/python/testrunner/ui/OutputUtils.java Fri Aug 29 07:06:18 2014 +0200
16.2 +++ b/python.testrunner/src/org/netbeans/modules/python/testrunner/ui/OutputUtils.java Thu Oct 23 15:10:15 2014 +0200
16.3 @@ -52,7 +52,7 @@
16.4 import org.netbeans.editor.BaseDocument;
16.5 import org.netbeans.modules.gsf.spi.GsfUtilities;
16.6 import org.netbeans.modules.gsf.testrunner.api.Report;
16.7 -import org.netbeans.modules.gsf.testrunner.api.TestsuiteNode;
16.8 +import org.netbeans.modules.gsf.testrunner.ui.api.TestsuiteNode;
16.9 import org.netbeans.modules.python.api.FileLocation;
16.10 import org.openide.filesystems.FileObject;
16.11 import org.openide.filesystems.FileUtil;
17.1 --- a/python.testrunner/src/org/netbeans/modules/python/testrunner/ui/PyUnitHandlerFactory.java Fri Aug 29 07:06:18 2014 +0200
17.2 +++ b/python.testrunner/src/org/netbeans/modules/python/testrunner/ui/PyUnitHandlerFactory.java Thu Oct 23 15:10:15 2014 +0200
17.3 @@ -49,7 +49,7 @@
17.4 import java.util.logging.Logger;
17.5 import java.util.regex.Matcher;
17.6 import java.util.regex.Pattern;
17.7 -import org.netbeans.modules.gsf.testrunner.api.Manager;
17.8 +import org.netbeans.modules.gsf.testrunner.ui.api.Manager;
17.9 import org.netbeans.modules.gsf.testrunner.api.TestSession;
17.10 import org.netbeans.modules.gsf.testrunner.api.TestSuite;
17.11 import org.netbeans.modules.gsf.testrunner.api.Testcase;
18.1 --- a/python.testrunner/src/org/netbeans/modules/python/testrunner/ui/PythonCallstackFrameNode.java Fri Aug 29 07:06:18 2014 +0200
18.2 +++ b/python.testrunner/src/org/netbeans/modules/python/testrunner/ui/PythonCallstackFrameNode.java Thu Oct 23 15:10:15 2014 +0200
18.3 @@ -44,8 +44,8 @@
18.4
18.5 package org.netbeans.modules.python.testrunner.ui;
18.6 import javax.swing.Action;
18.7 -import org.netbeans.modules.gsf.testrunner.api.CallstackFrameNode;
18.8 -import org.netbeans.modules.gsf.testrunner.api.DiffViewAction;
18.9 +import org.netbeans.modules.gsf.testrunner.ui.api.CallstackFrameNode;
18.10 +import org.netbeans.modules.gsf.testrunner.ui.api.DiffViewAction;
18.11 import org.netbeans.modules.gsf.testrunner.api.Trouble.ComparisonFailure;
18.12 import org.openide.util.actions.SystemAction;
18.13
19.1 --- a/python.testrunner/src/org/netbeans/modules/python/testrunner/ui/PythonTestMethodNode.java Fri Aug 29 07:06:18 2014 +0200
19.2 +++ b/python.testrunner/src/org/netbeans/modules/python/testrunner/ui/PythonTestMethodNode.java Thu Oct 23 15:10:15 2014 +0200
19.3 @@ -48,10 +48,10 @@
19.4 import java.util.List;
19.5 import javax.swing.Action;
19.6 import org.netbeans.api.project.Project;
19.7 -import org.netbeans.modules.gsf.testrunner.api.DiffViewAction;
19.8 -import org.netbeans.modules.gsf.testrunner.api.Locator;
19.9 +import org.netbeans.modules.gsf.testrunner.ui.api.DiffViewAction;
19.10 +import org.netbeans.modules.gsf.testrunner.ui.api.Locator;
19.11 import org.netbeans.modules.gsf.testrunner.api.Testcase;
19.12 -import org.netbeans.modules.gsf.testrunner.api.TestMethodNode;
19.13 +import org.netbeans.modules.gsf.testrunner.ui.api.TestMethodNode;
19.14 import org.openide.nodes.Node;
19.15 import org.openide.util.NbBundle;
19.16 import org.openide.util.lookup.Lookups;
20.1 --- a/python.testrunner/src/org/netbeans/modules/python/testrunner/ui/PythonTestsuiteNode.java Fri Aug 29 07:06:18 2014 +0200
20.2 +++ b/python.testrunner/src/org/netbeans/modules/python/testrunner/ui/PythonTestsuiteNode.java Thu Oct 23 15:10:15 2014 +0200
20.3 @@ -47,9 +47,9 @@
20.4 import java.util.ArrayList;
20.5 import java.util.List;
20.6 import javax.swing.Action;
20.7 -import org.netbeans.modules.gsf.testrunner.api.Locator;
20.8 +import org.netbeans.modules.gsf.testrunner.ui.api.Locator;
20.9 import org.netbeans.modules.gsf.testrunner.api.Testcase;
20.10 -import org.netbeans.modules.gsf.testrunner.api.TestsuiteNode;
20.11 +import org.netbeans.modules.gsf.testrunner.ui.api.TestsuiteNode;
20.12 import org.netbeans.modules.python.project.spi.TestRunner.TestType;
20.13 import org.openide.nodes.Node;
20.14 import org.openide.util.NbBundle;
21.1 --- a/python.testrunner/src/org/netbeans/modules/python/testrunner/ui/TestRecognizerHandler.java Fri Aug 29 07:06:18 2014 +0200
21.2 +++ b/python.testrunner/src/org/netbeans/modules/python/testrunner/ui/TestRecognizerHandler.java Thu Oct 23 15:10:15 2014 +0200
21.3 @@ -47,7 +47,7 @@
21.4 import java.util.logging.Logger;
21.5 import java.util.regex.Matcher;
21.6 import java.util.regex.Pattern;
21.7 -import org.netbeans.modules.gsf.testrunner.api.Manager;
21.8 +import org.netbeans.modules.gsf.testrunner.ui.api.Manager;
21.9 import org.netbeans.modules.gsf.testrunner.api.TestSession;
21.10
21.11 /**
22.1 --- a/python.testrunner/src/org/netbeans/modules/python/testrunner/ui/TestRunnerInputProcessorFactory.java Fri Aug 29 07:06:18 2014 +0200
22.2 +++ b/python.testrunner/src/org/netbeans/modules/python/testrunner/ui/TestRunnerInputProcessorFactory.java Thu Oct 23 15:10:15 2014 +0200
22.3 @@ -48,7 +48,7 @@
22.4 import java.util.logging.Logger;
22.5 import org.netbeans.api.extexecution.ExecutionDescriptor;
22.6 import org.netbeans.api.extexecution.input.InputProcessor;
22.7 -import org.netbeans.modules.gsf.testrunner.api.Manager;
22.8 +import org.netbeans.modules.gsf.testrunner.ui.api.Manager;
22.9 import org.netbeans.modules.gsf.testrunner.api.TestSession;
22.10 import org.openide.util.Exceptions;
22.11 import org.openide.util.NbBundle;
23.1 --- a/python.testrunner/src/org/netbeans/modules/python/testrunner/ui/TestRunnerLineConvertor.java Fri Aug 29 07:06:18 2014 +0200
23.2 +++ b/python.testrunner/src/org/netbeans/modules/python/testrunner/ui/TestRunnerLineConvertor.java Thu Oct 23 15:10:15 2014 +0200
23.3 @@ -47,10 +47,11 @@
23.4 import java.util.logging.Logger;
23.5 import org.netbeans.api.extexecution.print.ConvertedLine;
23.6 import org.netbeans.api.extexecution.print.LineConvertor;
23.7 -import org.netbeans.modules.gsf.testrunner.api.Manager;
23.8 +import org.netbeans.modules.gsf.testrunner.ui.api.Manager;
23.9 import org.netbeans.modules.gsf.testrunner.api.RerunHandler;
23.10 import org.netbeans.modules.gsf.testrunner.api.TestSession;
23.11 import org.netbeans.modules.python.api.PythonLineConvertorFactory;
23.12 +import org.netbeans.modules.python.testrunner.PythonTestRunnerNodeFactory;
23.13
23.14 /**
23.15 *
23.16 @@ -71,7 +72,8 @@
23.17
23.18 public synchronized void refreshSession() {
23.19 RerunHandler handler = this.session.getRerunHandler();
23.20 - this.session = new TestSession(session.getName(), session.getProject(), session.getSessionType(), session.getNodeFactory());
23.21 + Manager.getInstance().setNodeFactory(new PythonTestRunnerNodeFactory());
23.22 + this.session = new TestSession(session.getName(), session.getProject(), session.getSessionType());
23.23 session.setRerunHandler(handler);
23.24 }
23.25
24.1 --- a/scanondemand/nbproject/project.xml Fri Aug 29 07:06:18 2014 +0200
24.2 +++ b/scanondemand/nbproject/project.xml Thu Oct 23 15:10:15 2014 +0200
24.3 @@ -6,11 +6,10 @@
24.4 <code-name-base>org.netbeans.modules.scanondemand</code-name-base>
24.5 <module-dependencies>
24.6 <dependency>
24.7 - <code-name-base>org.netbeans.modules.parsing.api</code-name-base>
24.8 + <code-name-base>org.netbeans.modules.parsing.indexing</code-name-base>
24.9 <build-prerequisite/>
24.10 <compile-dependency/>
24.11 <run-dependency>
24.12 - <release-version>1</release-version>
24.13 <implementation-version/>
24.14 </run-dependency>
24.15 </dependency>
25.1 --- a/spi.actions.support/src/org/netbeans/modules/actions/support/GeneralAction.java Fri Aug 29 07:06:18 2014 +0200
25.2 +++ b/spi.actions.support/src/org/netbeans/modules/actions/support/GeneralAction.java Thu Oct 23 15:10:15 2014 +0200
25.3 @@ -208,7 +208,7 @@
25.4 }
25.5
25.6 try {
25.7 - String actionName = fo.getFileSystem().getStatus().annotateName(
25.8 + String actionName = fo.getFileSystem().getDecorator().annotateName(
25.9 fo.getNameExt(), Collections.singleton(fo)
25.10 );
25.11 return actionName;
26.1 --- a/vcscore/src/org/netbeans/modules/vcscore/versioning/impl/FolderNode.java Fri Aug 29 07:06:18 2014 +0200
26.2 +++ b/vcscore/src/org/netbeans/modules/vcscore/versioning/impl/FolderNode.java Thu Oct 23 15:10:15 2014 +0200
26.3 @@ -188,7 +188,7 @@
26.4 String s;
26.5 try {
26.6 Set target = Collections.singleton(file);
26.7 - s = file.getFileSystem().getStatus().annotateName(file.getNameExt(), target);
26.8 + s = file.getFileSystem().getDecorator().annotateName(file.getNameExt(), target);
26.9 } catch (FileStateInvalidException exc) {
26.10 s = super.getDisplayName();
26.11 }
26.12 @@ -198,10 +198,7 @@
26.13 public String getHtmlDisplayName() {
26.14 try {
26.15 Set target = Collections.singleton(file);
26.16 - FileSystem.Status fsStatus = file.getFileSystem().getStatus();
26.17 - if (fsStatus instanceof FileSystem.HtmlStatus) {
26.18 - return ((FileSystem.HtmlStatus) fsStatus).annotateNameHtml(file.getNameExt(), target);
26.19 - }
26.20 + return file.getFileSystem().getDecorator().annotateNameHtml(file.getNameExt(), target);
26.21 } catch (FileStateInvalidException exc) {
26.22 // null bellow
26.23 }
27.1 --- a/zeroadmin/src/org/netbeans/modules/zeroadmin/XMLBufferFileSystem.java Fri Aug 29 07:06:18 2014 +0200
27.2 +++ b/zeroadmin/src/org/netbeans/modules/zeroadmin/XMLBufferFileSystem.java Thu Oct 23 15:10:15 2014 +0200
27.3 @@ -72,7 +72,7 @@
27.4 * to be encoded using UTF-8 encoding.
27.5 * @author Jesse Glick, adapted by David Strupl
27.6 */
27.7 -public class XMLBufferFileSystem extends AbstractFileSystem implements AbstractFileSystem.Attr, AbstractFileSystem.Change, AbstractFileSystem.Info, AbstractFileSystem.List, AbstractFileSystem.Transfer, FileSystem.Status, FileChangeListener {
27.8 +public class XMLBufferFileSystem extends AbstractFileSystem implements AbstractFileSystem.Attr, AbstractFileSystem.Change, AbstractFileSystem.Info, AbstractFileSystem.List, AbstractFileSystem.Transfer, StatusDecorator, FileChangeListener {
27.9
27.10 private Document doc;
27.11 private Date time;
27.12 @@ -1065,6 +1065,11 @@
27.13 public String annotateName(String name, java.util.Set files) {
27.14 return name;
27.15 }
27.16 +
27.17 + public String annotateNameHtml(String name, java.util.Set files) {
27.18 + return name;
27.19 + }
27.20 +
27.21
27.22 private static void storeData (byte[] bdata, PrintWriter pw) throws IOException {
27.23 char[] cdata = new char[BUFFSIZE];