Attachment #120455 for bug #213562

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 213562
Collapse All | Expand All

Lines 43-49 Link Here

(-)a/api.java.classpath/nbproject/project.xml (-1 / +1 lines)
43	<build-prerequisite/>	43	<build-prerequisite/>
44	<compile-dependency/>	44	<compile-dependency/>
45	<run-dependency>	45	<run-dependency>
46	<specification-version>8.0</specification-version>	46	<specification-version>8.25</specification-version>
47	</run-dependency>	47	</run-dependency>
48	</dependency>	48	</dependency>
49	<dependency>	49	<dependency>

Lines 311-317 Link Here

(-)a/api.java.classpath/src/org/netbeans/api/java/classpath/ClassPath.java (-2 / +2 lines)
311	//todo: Ignore non file urls, we can try to url->fileobject->url	311	//todo: Ignore non file urls, we can try to url->fileobject->url
312	//if it becomes a file.	312	//if it becomes a file.
313	if ("file".equals(url.getProtocol())) { //NOI18N	313	if ("file".equals(url.getProtocol())) { //NOI18N
314	file = FileUtil.normalizeFile(new File(url.toURI()));	314	file = FileUtil.normalizeFile(Utilities.toFile(url.toURI()));
315	}	315	}
316	} catch (IllegalArgumentException e) {	316	} catch (IllegalArgumentException e) {
317	LOG.log(Level.WARNING, "Unexpected URL <{0}>: {1}", new Object[] {url, e});	317	LOG.log(Level.WARNING, "Unexpected URL <{0}>: {1}", new Object[] {url, e});
Lines 800-806 Link Here
800	} else {	800	} else {
801	String fileState = null;	801	String fileState = null;
802	try {	802	try {
803	final File file = new File(this.url.toURI());	803	final File file = Utilities.toFile(this.url.toURI());
804	fileState = "(exists: " + file.exists() + //NOI18N	804	fileState = "(exists: " + file.exists() + //NOI18N
805	" file: " + file.isFile() + //NOI18N	805	" file: " + file.isFile() + //NOI18N
806	" directory: "+ file.isDirectory() + //NOI18N	806	" directory: "+ file.isDirectory() + //NOI18N

Lines 50-55 Link Here

(-)a/api.java.classpath/src/org/netbeans/modules/java/classpath/SimplePathResourceImplementation.java (-1 / +2 lines)
50	import org.netbeans.spi.java.classpath.ClassPathImplementation;	50	import org.netbeans.spi.java.classpath.ClassPathImplementation;
51		51
52	import java.net.URL;	52	import java.net.URL;
		53	import org.openide.util.Utilities;
53		54
54		55
55	/**	56	/**
Lines 91-97 Link Here
91	if (rootS.matches("file:.+[.]jar/?")) {	92	if (rootS.matches("file:.+[.]jar/?")) {
92	boolean dir = false;	93	boolean dir = false;
93	try {	94	try {
94	dir = new File (root.toURI()).isDirectory();	95	dir = Utilities.toFile(root.toURI()).isDirectory();
95	} catch (URISyntaxException use) {	96	} catch (URISyntaxException use) {
96	//pass - handle as non dir	97	//pass - handle as non dir
97	}	98	}




import org.netbeans.spi.java.classpath.PathResourceImplementation;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.util.Utilities;

public class ClassPathTest extends NbTestCase {


        assertNotNull("Cannot find file",FileUtil.toFileObject(root_3));
        TestClassPathImplementation impl = new TestClassPathImplementation();
	ClassPath cp = ClassPathFactory.createClassPath (impl);
        impl.addResource(Utilities.toURI(root_1).toURL());
        cp.addPropertyChangeListener (impl);
        impl.addResource (Utilities.toURI(root_2).toURL());
        impl.assertEvents(ClassPath.PROP_ENTRIES, ClassPath.PROP_ROOTS);
        assertTrue (cp.getRoots().length==2);
        impl.removeResource (Utilities.toURI(root_2).toURL());
        impl.assertEvents(ClassPath.PROP_ENTRIES, ClassPath.PROP_ROOTS);
        assertTrue (cp.getRoots().length==1);
        FileObject fo = cp.getRoots()[0];

        cp.addPropertyChangeListener(impl);
        File d = new File(getBaseDir(), "d");
        d.mkdir();
        pri.changeRoots(new URL[] {Utilities.toURI(d).toURL()});
        impl.assertEvents(ClassPath.PROP_ENTRIES, ClassPath.PROP_ROOTS);
        assertEquals(Collections.singletonList(FileUtil.toFileObject(d)), Arrays.asList(cp.getRoots()));
    }

            final String path = tk.nextToken();
            final File f = FileUtil.normalizeFile(new File (path));
            if (f.canRead()) {
                roots.add(Utilities.toURI(f).toURL());
            }
        }
        final ClassLoader bootLoader = new URLClassLoader(roots.toArray(new URL[roots.size()]), null);

            if (!f.canRead()) {
                continue;
            }
            URL url = Utilities.toURI(f).toURL();
            roots2.add(url);
            if (FileUtil.isArchiveFile(url)) {
                url = FileUtil.getArchiveRoot(url);

    }

    public void testJVMPathConversion() throws Exception {
        String root = Utilities.toURI(getWorkDir()).toString();
        ClassPath cp = ClassPathSupport.createClassPath(
                new URL(root + "folder/"),
                new URL("jar:" + root + "file.zip!/"),




import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.util.ChangeSupport;
import org.openide.util.Utilities;

/**
 *

        assertEquals(Collections.singletonList(sr2), Arrays.asList(res.getRoots()));
        assertFalse(res.preferSources());
        
        res = SourceForBinaryQuery.findSourceRoots2(Utilities.toURI(getWorkDir()).toURL());
        assertNotNull(res);
        assertEquals(0, res.getRoots().length);
        assertTrue(res.preferSources());        

        assertEquals(Collections.singletonList(sr2), Arrays.asList(res.getRoots()));
        assertTrue(res.preferSources());
        
        res = SourceForBinaryQuery.findSourceRoots2(Utilities.toURI(getWorkDir()).toURL());
        assertNotNull(res);
        assertEquals(0, res.getRoots().length);
        assertTrue(res.preferSources());        

        assertEquals(Collections.singletonList(sr2), Arrays.asList(res.getRoots()));
        assertFalse(res.preferSources());
        
        res = SourceForBinaryQuery.findSourceRoots2(Utilities.toURI(getWorkDir()).toURL());
        assertNotNull(res);
        assertEquals(0, res.getRoots().length);
        assertTrue(res.preferSources());        

        assertEquals(Collections.singletonList(sr2), Arrays.asList(res.getRoots()));
        assertTrue(res.preferSources());
        
        res = SourceForBinaryQuery.findSourceRoots2(Utilities.toURI(getWorkDir()).toURL());
        assertNotNull(res);
        assertEquals(0, res.getRoots().length);
        assertTrue(res.preferSources());                

Lines 45-50 Link Here

(-)a/api.java.classpath/test/unit/src/org/netbeans/modules/java/classpath/SimplePathResourceImplementationTest.java (-1 / +2 lines)
45	import java.io.File;	45	import java.io.File;
46	import java.net.URL;	46	import java.net.URL;
47	import org.netbeans.junit.NbTestCase;	47	import org.netbeans.junit.NbTestCase;
		48	import org.openide.util.Utilities;
48		49
49	/**	50	/**
50	*	51	*
Lines 101-107 Link Here
101	final File wd = getWorkDir();	102	final File wd = getWorkDir();
102	final File strangeFolder = new File(wd,"strange.jar"); //NOI18N	103	final File strangeFolder = new File(wd,"strange.jar"); //NOI18N
103	strangeFolder.mkdirs();	104	strangeFolder.mkdirs();
104	SimplePathResourceImplementation.verify(strangeFolder.toURI().toURL(),null);	105	SimplePathResourceImplementation.verify(Utilities.toURI(strangeFolder).toURL(),null);
105	} catch (IllegalArgumentException e) {	106	} catch (IllegalArgumentException e) {
106	assertTrue("Verify should not fail for .jar folder",false);	107	assertTrue("Verify should not fail for .jar folder",false);
107	}	108	}

Lines 308-314 Link Here

(-)a/apisupport.ant/nbproject/project.xml (-1 / +1 lines)
308	<build-prerequisite/>	308	<build-prerequisite/>
309	<compile-dependency/>	309	<compile-dependency/>
310	<run-dependency>	310	<run-dependency>
311	<specification-version>8.14</specification-version>	311	<specification-version>8.25</specification-version>
312	</run-dependency>	312	</run-dependency>
313	</dependency>	313	</dependency>
314	<dependency>	314	<dependency>

Lines 73-78 Link Here

(-)a/apisupport.ant/src/org/netbeans/modules/apisupport/project/NbModuleProviderImpl.java (-1 / +2 lines)
73	import org.openide.filesystems.FileUtil;	73	import org.openide.filesystems.FileUtil;
74	import org.openide.filesystems.XMLFileSystem;	74	import org.openide.filesystems.XMLFileSystem;
75	import org.openide.modules.SpecificationVersion;	75	import org.openide.modules.SpecificationVersion;
		76	import org.openide.util.Utilities;
76		77
77	class NbModuleProviderImpl implements NbModuleProvider {	78	class NbModuleProviderImpl implements NbModuleProvider {
78		79
Lines 196-202 Link Here
196	if (layer != null) {	197	if (layer != null) {
197	File layerXml = new File(getClassesDirectory(), layer);	198	File layerXml = new File(getClassesDirectory(), layer);
198	if (layerXml.isFile()) {	199	if (layerXml.isFile()) {
199	otherLayerURLs.add(layerXml.toURI().toURL());	200	otherLayerURLs.add(Utilities.toURI(layerXml).toURL());
200	}	201	}
201	}	202	}
202	// TODO cache	203	// TODO cache

Lines 55-60 Link Here

(-)a/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/AntArtifactProviderImpl.java (-1 / +2 lines)
55	import org.netbeans.spi.project.support.ant.AntProjectHelper;	55	import org.netbeans.spi.project.support.ant.AntProjectHelper;
56	import org.netbeans.spi.project.support.ant.PropertyEvaluator;	56	import org.netbeans.spi.project.support.ant.PropertyEvaluator;
57	import org.netbeans.spi.project.support.ant.PropertyUtils;	57	import org.netbeans.spi.project.support.ant.PropertyUtils;
		58	import org.openide.util.Utilities;
58		59
59	/**	60	/**
60	* Provide the module JAR as an exported artifact that other projects could import.	61	* Provide the module JAR as an exported artifact that other projects could import.
Lines 104-110 Link Here
104	throw new AssertionError(e);	105	throw new AssertionError(e);
105	}	106	}
106	} else {	107	} else {
107	return new URI[] {jar.toURI()};	108	return new URI[] {Utilities.toURI(jar)};
108	}	109	}
109	// XXX should it add in class path extensions?	110	// XXX should it add in class path extensions?
110	}	111	}




import org.openide.filesystems.FileObject;
import org.openide.util.Exceptions;
import org.openide.util.Parameters;
import org.openide.util.Utilities;

/**
 *

                //Try project sources
                final FileObject srcDir = project.getSourceDirectory();                
                if (srcDir != null && srcDir.toURI().equals(key)) {
                    binRoot = Utilities.toURI(project.getClassesDirectory()).toURL();
                }
                
                //Try project generated sources
                if (binRoot == null) {
                    final File genSrcDir = project.getGeneratedClassesDirectory();
                    if (genSrcDir != null && Utilities.toURI(genSrcDir).equals(key)) {
                        binRoot = Utilities.toURI(project.getClassesDirectory()).toURL();
                    }
                }
                

                    for (final String testKind : project.supportedTestTypes()) {
                        final FileObject testSrcDir = project.getTestSourceDirectory(testKind);
                        if (testSrcDir != null && testSrcDir.toURI().equals(key)) {
                            binRoot = Utilities.toURI(project.getTestClassesDirectory(testKind)).toURL();
                            break;
                        }
                        final File testGenSrcDir = project.getTestGeneratedClassesDirectory(testKind);
                        if (testGenSrcDir != null && Utilities.toURI(testGenSrcDir).equals(key)) {
                            binRoot = Utilities.toURI(project.getTestClassesDirectory(testKind)).toURL();
                            break;
                        }
                    }

Lines 70-75 Link Here

(-)a/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/GlobalJavadocForBinaryImpl.java (-1 / +2 lines)
70	import org.netbeans.spi.java.queries.JavadocForBinaryQueryImplementation;	70	import org.netbeans.spi.java.queries.JavadocForBinaryQueryImplementation;
71	import org.openide.filesystems.FileUtil;	71	import org.openide.filesystems.FileUtil;
72	import org.openide.filesystems.URLMapper;	72	import org.openide.filesystems.URLMapper;
		73	import org.openide.util.Utilities;
73	import org.openide.util.lookup.ServiceProvider;	74	import org.openide.util.lookup.ServiceProvider;
74		75
75	/**	76	/**
Lines 98-104 Link Here
98	Util.err.log(binaryRoot + " is not an archive file."); // NOI18N	99	Util.err.log(binaryRoot + " is not an archive file."); // NOI18N
99	return null;	100	return null;
100	}	101	}
101	File binaryRootF = new File(URI.create(jar.toExternalForm()));	102	File binaryRootF = Utilities.toFile(URI.create(jar.toExternalForm()));
102	// XXX this will only work for modules following regular naming conventions:	103	// XXX this will only work for modules following regular naming conventions:
103	String n = binaryRootF.getName();	104	String n = binaryRootF.getName();
104	if (!n.endsWith(".jar")) { // NOI18N	105	if (!n.endsWith(".jar")) { // NOI18N




import org.openide.filesystems.FileUtil;
import org.openide.filesystems.URLMapper;
import org.openide.util.ChangeSupport;
import org.openide.util.Utilities;
import org.openide.xml.XMLUtil;
import org.w3c.dom.Document;
import org.w3c.dom.Element;

            String cnb = name.substring(0, name.length() - 4).replace('-', '.');
            NbPlatform supposedPlaf = null;
            for (NbPlatform plaf : NbPlatform.getPlatformsOrNot()) {
                String plafS = Utilities.toURI(plaf.getDestDir()).toURL().toExternalForm();
                Matcher m = Pattern.compile("jar:\\Q" + plafS + "\\E[^/]+/(?:modules|lib|core)/([^/]+)[.]jar!/").matcher(binaryRootS);
                if (m.matches()) {
                    supposedPlaf = plaf;

        @Override
        protected String resolveRelativePath(URL sourceRoot) throws IOException {
            // TODO C.P cache root + cnb -> relpath? dig into library wrappers?
            File srPath = Utilities.toFile(URI.create(sourceRoot.toExternalForm()));
            File moduleSrc = new File(srPath, "src");    // NOI18N
            if (moduleSrc.exists()) {   // src root is module project root directly
                return "src/";    // NOI18N

Lines 60-65 Link Here

(-)a/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/JavadocForBinaryImpl.java (-1 / +2 lines)
60	import org.netbeans.spi.java.queries.JavadocForBinaryQueryImplementation;	60	import org.netbeans.spi.java.queries.JavadocForBinaryQueryImplementation;
61	import org.openide.filesystems.FileUtil;	61	import org.openide.filesystems.FileUtil;
62	import org.openide.filesystems.URLMapper;	62	import org.openide.filesystems.URLMapper;
		63	import org.openide.util.Utilities;
63		64
64	/**	65	/**
65	* Defines Javadoc locations for built modules with built javadoc.	66	* Defines Javadoc locations for built modules with built javadoc.
Lines 134-140 Link Here
134	URL jar = FileUtil.getArchiveFile(binaryRoot);	135	URL jar = FileUtil.getArchiveFile(binaryRoot);
135	if (jar == null)	136	if (jar == null)
136	return null; // not a class-path-extension	137	return null; // not a class-path-extension
137	File binaryRootF = new File(URI.create(jar.toExternalForm()));	138	File binaryRootF = Utilities.toFile(URI.create(jar.toExternalForm()));
138	// XXX this will only work for modules following regular naming conventions:	139	// XXX this will only work for modules following regular naming conventions:
139	String n = binaryRootF.getName();	140	String n = binaryRootF.getName();
140	if (!n.endsWith(".jar")) { // NOI18N	141	if (!n.endsWith(".jar")) { // NOI18N

Lines 69-74 Link Here

(-)a/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/ModuleProjectClassPathExtender.java (-1 / +2 lines)
69	import org.openide.filesystems.FileUtil;	69	import org.openide.filesystems.FileUtil;
70	import org.openide.util.Exceptions;	70	import org.openide.util.Exceptions;
71	import org.openide.util.NbBundle;	71	import org.openide.util.NbBundle;
		72	import org.openide.util.Utilities;
72		73
73	/**	74	/**
74	* Adds module dependencies that seem to correspond to some more visible artifact.	75	* Adds module dependencies that seem to correspond to some more visible artifact.
Lines 199-205 Link Here
199	// XXX handle >1 args	200	// XXX handle >1 args
200	String displayName = artifactElements.length > 0 ? artifactElements[0].toString() : "<nothing>";	201	String displayName = artifactElements.length > 0 ? artifactElements[0].toString() : "<nothing>";
201	if (artifactElements.length > 0 && "file".equals(artifactElements[0].getScheme())) { // NOI18N	202	if (artifactElements.length > 0 && "file".equals(artifactElements[0].getScheme())) { // NOI18N
202	displayName = new File(artifactElements[0]).getAbsolutePath();	203	displayName = Utilities.toFile(artifactElements[0]).getAbsolutePath();
203	}	204	}
204	Exceptions.attachLocalizedMessage(e, NbBundle.getMessage(ModuleProjectClassPathExtender.class, "ERR_jar", displayName));	205	Exceptions.attachLocalizedMessage(e, NbBundle.getMessage(ModuleProjectClassPathExtender.class, "ERR_jar", displayName));
205	throw e;	206	throw e;

Lines 66-71 Link Here

(-)a/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/SubprojectProviderImpl.java (-1 / +2 lines)
66	import org.openide.ErrorManager;	66	import org.openide.ErrorManager;
67	import org.openide.filesystems.FileObject;	67	import org.openide.filesystems.FileObject;
68	import org.openide.filesystems.FileUtil;	68	import org.openide.filesystems.FileUtil;
		69	import org.openide.util.Utilities;
69	import org.openide.xml.XMLUtil;	70	import org.openide.xml.XMLUtil;
70	import org.w3c.dom.Element;	71	import org.w3c.dom.Element;
71		72
Lines 163-169 Link Here
163	continue;	164	continue;
164	}	165	}
165	File jar = project.getHelper().resolveFile(piece);	166	File jar = project.getHelper().resolveFile(piece);
166	Project owner = FileOwnerQuery.getOwner(jar.toURI());	167	Project owner = FileOwnerQuery.getOwner(Utilities.toURI(jar));
167	if (owner != null) {	168	if (owner != null) {
168	s.add(owner);	169	s.add(owner);
169	}	170	}




import org.netbeans.spi.java.queries.MultipleRootsUnitTestForSourceQueryImplementation;
import org.netbeans.spi.project.support.ant.AntProjectHelper;
import org.openide.filesystems.FileObject;
import org.openide.util.Utilities;

public class UnitTestForSourceQueryImpl implements MultipleRootsUnitTestForSourceQueryImplementation {


            File f = helper.resolveFile(val);
            if (! f.exists()) {
                // #143633: need not to exist, ensure proper URI ending with a slash
                URI u = Utilities.toURI(f);
                String path = u.getPath();
                if (! path.endsWith("/"))
                    path = path.concat("/");

                }
            }

            return new URL[] {Utilities.toURI(f).toURL()};
        } catch (MalformedURLException e) {
            throw new AssertionError(e);
        }

Lines 57-62 Link Here

(-)a/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/UpdateTrackingFileOwnerQuery.java (-1 / +2 lines)
57	import org.openide.ErrorManager;	57	import org.openide.ErrorManager;
58	import org.openide.filesystems.FileObject;	58	import org.openide.filesystems.FileObject;
59	import org.openide.filesystems.FileUtil;	59	import org.openide.filesystems.FileUtil;
		60	import org.openide.util.Utilities;
60		61
61	/**	62	/**
62	* Associated built module files with their owning project.	63	* Associated built module files with their owning project.
Lines 73-79 Link Here
73	return null; // #65700	74	return null; // #65700
74	}	75	}
75	if (file.getScheme().equals("file")) { // NOI18N	76	if (file.getScheme().equals("file")) { // NOI18N
76	return getOwner(new File(file));	77	return getOwner(Utilities.toFile(file));
77	} else {	78	} else {
78	return null;	79	return null;
79	}	80	}

Lines 62-67 Link Here

(-)a/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/ClusterUtils.java (-1 / +2 lines)
62	import org.netbeans.modules.apisupport.project.ui.customizer.SuiteProperties;	62	import org.netbeans.modules.apisupport.project.ui.customizer.SuiteProperties;
63	import org.netbeans.spi.project.support.ant.PropertyEvaluator;	63	import org.netbeans.spi.project.support.ant.PropertyEvaluator;
64	import org.netbeans.spi.project.support.ant.PropertyUtils;	64	import org.netbeans.spi.project.support.ant.PropertyUtils;
		65	import org.openide.util.Utilities;
65		66
66	/**	67	/**
67	* Utility methods for cluster-related tasks.	68	* Utility methods for cluster-related tasks.
Lines 183-189 Link Here
183	File cd = evaluateClusterPathEntry(path, root, eval, nbPlatformRoot);	184	File cd = evaluateClusterPathEntry(path, root, eval, nbPlatformRoot);
184	boolean isPlaf = cd.getParentFile().equals(nbPlatformRoot);	185	boolean isPlaf = cd.getParentFile().equals(nbPlatformRoot);
185	Project prj = null;	186	Project prj = null;
186	Project _prj = FileOwnerQuery.getOwner(cd.toURI());	187	Project _prj = FileOwnerQuery.getOwner(Utilities.toURI(cd));
187	if (_prj != null) {	188	if (_prj != null) {
188	// Must be actual cluster output of a suite or standalone module to qualify. See also: #168804, #180475	189	// Must be actual cluster output of a suite or standalone module to qualify. See also: #168804, #180475
189	SuiteProvider prov = _prj.getLookup().lookup(SuiteProvider.class);	190	SuiteProvider prov = _prj.getLookup().lookup(SuiteProvider.class);




import org.openide.util.MutexException;
import org.openide.util.NbBundle.Messages;
import org.openide.util.NbCollections;
import org.openide.util.Utilities;
import org.openide.xml.EntityCatalog;
import org.openide.xml.XMLUtil;
import org.w3c.dom.Document;

                String res;
                Document doc;
                try {
                    doc = XMLUtil.parse(new InputSource(Utilities.toURI(xml).toString()), false, false, null, EntityCatalog.getDefault());
                    if (xpe == null) {
                        xpe = XPathFactory.newInstance().newXPath().compile("module/param[@name='jar']/text()");
                    }

            try {
                xmlFilesParsed++;
                timeSpentInXmlParsing -= System.currentTimeMillis();
                doc = XMLUtil.parse(new InputSource(Utilities.toURI(tracking).toString()), false, false, null, null);
                timeSpentInXmlParsing += System.currentTimeMillis();
            } catch (SAXException e) {
                throw (IOException) new IOException(e.toString()).initCause(e);

        try {
            xmlFilesParsed++;
            timeSpentInXmlParsing -= System.currentTimeMillis();
            doc = XMLUtil.parse(new InputSource(Utilities.toURI(projectXml).toString()), false, true, null, null);
            timeSpentInXmlParsing += System.currentTimeMillis();
        } catch (SAXException e) {
            throw (IOException) new IOException(projectXml + ": " + e.toString()).initCause(e); // NOI18N

Lines 86-91 Link Here

(-)a/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/NbPlatform.java (-1 / +2 lines)
86	import org.openide.util.MutexException;	86	import org.openide.util.MutexException;
87	import org.openide.util.NbBundle;	87	import org.openide.util.NbBundle;
88	import org.openide.util.NbBundle.Messages;	88	import org.openide.util.NbBundle.Messages;
		89	import org.openide.util.Utilities;
89		90
90	/**	91	/**
91	* Represents one NetBeans platform, i.e. installation of the NB platform or IDE	92	* Represents one NetBeans platform, i.e. installation of the NB platform or IDE
Lines 657-663 Link Here
657	File loc = getDestDir();	658	File loc = getDestDir();
658	if (loc.getName().equals("netbeans") && loc.getParentFile().getName().equals("nbbuild")) { // NOI18N	659	if (loc.getName().equals("netbeans") && loc.getParentFile().getName().equals("nbbuild")) { // NOI18N
659	try {	660	try {
660	defaultSourceRoots = new URL[] {loc.getParentFile().getParentFile().toURI().toURL()};	661	defaultSourceRoots = new URL[] {Utilities.toURI(loc.getParentFile().getParentFile()).toURL()};
661	} catch (MalformedURLException e) {	662	} catch (MalformedURLException e) {
662	assert false : e;	663	assert false : e;
663	}	664	}

Lines 83-88 Link Here

(-)a/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/PlatformLayersCacheManager.java (-1 / +2 lines)
83	import org.openide.util.NbBundle.Messages;	83	import org.openide.util.NbBundle.Messages;
84	import org.openide.util.Parameters;	84	import org.openide.util.Parameters;
85	import org.openide.util.RequestProcessor;	85	import org.openide.util.RequestProcessor;
		86	import org.openide.util.Utilities;
86		87
87	/**	88	/**
88	*	89	*
Lines 507-513 Link Here
507	}	508	}
508	List<URL> urll = new ArrayList<URL>(2);	509	List<URL> urll = new ArrayList<URL>(2);
509	try {	510	try {
510	URI juri = jar.toURI();	511	URI juri = Utilities.toURI(jar);
511	if (layer != null) {	512	if (layer != null) {
512	urll.add(new URL("jar:" + juri + "!/" + layer));	513	urll.add(new URL("jar:" + juri + "!/" + layer));
513		514

Lines 54-59 Link Here

(-)a/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/SourceRootsSupport.java (-1 / +2 lines)
54	import java.util.List;	54	import java.util.List;
55	import org.netbeans.modules.apisupport.project.api.Util;	55	import org.netbeans.modules.apisupport.project.api.Util;
56	import org.openide.ErrorManager;	56	import org.openide.ErrorManager;
		57	import org.openide.util.Utilities;
57		58
58		59
59	/**	60	/**
Lines 124-130 Link Here
124	if (!u.getProtocol().equals("file")) { // NOI18N	125	if (!u.getProtocol().equals("file")) { // NOI18N
125	continue;	126	continue;
126	}	127	}
127	File dir = new File(URI.create(u.toExternalForm()));	128	File dir = Utilities.toFile(URI.create(u.toExternalForm()));
128	if (dir.isDirectory()) {	129	if (dir.isDirectory()) {
129	try {	130	try {
130	if (ModuleList.isNetBeansOrg(dir)) {	131	if (ModuleList.isNetBeansOrg(dir)) {

Lines 57-62 Link Here

(-)a/apisupport.ant/src/org/netbeans/modules/apisupport/project/universe/TestEntry.java (-1 / +2 lines)
57	import org.netbeans.spi.project.SubprojectProvider;	57	import org.netbeans.spi.project.SubprojectProvider;
58	import org.openide.filesystems.FileObject;	58	import org.openide.filesystems.FileObject;
59	import org.openide.filesystems.FileUtil;	59	import org.openide.filesystems.FileUtil;
		60	import org.openide.util.Utilities;
60		61
61	/**	62	/**
62	* Representation of jarfile with tests	63	* Representation of jarfile with tests
Lines 130-136 Link Here
130	public URL getSrcDir() throws IOException {	131	public URL getSrcDir() throws IOException {
131	String nborgPath = getNetBeansOrgPath();	132	String nborgPath = getNetBeansOrgPath();
132	if (nborgPath != null) {	133	if (nborgPath != null) {
133	return new File(getNBRoot(),nborgPath).toURI().toURL();	134	return Utilities.toURI(new File(getNBRoot(),nborgPath)).toURL();
134	}	135	}
135	File prjDir = getTestDistRoot();	136	File prjDir = getTestDistRoot();
136	if (prjDir == null)	137	if (prjDir == null)

Lines 83-88 Link Here

(-)a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ProjectXMLManagerTest.java (-1 / +2 lines)
83	import org.xml.sax.SAXException;	83	import org.xml.sax.SAXException;
84	import static org.netbeans.modules.apisupport.project.universe.TestModuleDependency.UNIT;	84	import static org.netbeans.modules.apisupport.project.universe.TestModuleDependency.UNIT;
85	import static org.netbeans.modules.apisupport.project.universe.TestModuleDependency.QA_FUNCTIONAL;	85	import static org.netbeans.modules.apisupport.project.universe.TestModuleDependency.QA_FUNCTIONAL;
		86	import org.openide.util.Utilities;
86		87
87	/**	88	/**
88	* Tests ProjectXMLManager class.	89	* Tests ProjectXMLManager class.
Lines 308-314 Link Here
308	public Element run() {	309	public Element run() {
309	Element data = null;	310	Element data = null;
310	try {	311	try {
311	Document doc = XMLUtil.parse(new InputSource(projectXML.toURI().toString()),	312	Document doc = XMLUtil.parse(new InputSource(Utilities.toURI(projectXML).toString()),
312	false, true, null, null);	313	false, true, null, null);
313	Element project = doc.getDocumentElement();	314	Element project = doc.getDocumentElement();
314	Element config = XMLUtil.findElement(project, "configuration", null); // NOI18N	315	Element config = XMLUtil.findElement(project, "configuration", null); // NOI18N




import org.openide.filesystems.XMLFileSystem;
import org.openide.loaders.DataObject;
import org.openide.nodes.Node;
import org.openide.util.Utilities;

/**
 * Test writing changes to layers.


    private FileSystem createCachedFS(LayerCacheManager m, File xf) throws IOException {
        ByteArrayOutputStream os = new ByteArrayOutputStream();
        m.store(null, Collections.singletonList(Utilities.toURI(xf).toURL()), os);
        return m.load(null, ByteBuffer.wrap(os.toByteArray()).order(ByteOrder.LITTLE_ENDIAN));
    }


            assertFalse(cf.exists());
            assertTrue(cf.createNewFile());
            OutputStream os = new BufferedOutputStream(new FileOutputStream(cf));
            URL url = xf.getName().endsWith(".jar") ? new URL("jar:" + Utilities.toURI(xf) + "!/" + LAYER_PATH_IN_JAR) : Utilities.toURI(xf).toURL();
            urll.set(0, url);
            m.store(null, urll, os);
            os.close();

                new File(getDataDir(), "layers/a-layer.xml")
                ));

        FileSystem xfs0 = new XMLFileSystem(Utilities.toURI(files.get(0)).toURL());
        FileSystem xfs1 = new XMLFileSystem(Utilities.toURI(files.get(1)).toURL());
        FileSystem mfs = new MultiFileSystem(xfs0, xfs1);
        assertNotNull(xfs1.findResource("Menu/A Folder"));
        assertNotNull(mfs.findResource("Menu/File"));

        File la = new File(getDataDir(), "layers/a-layer.xml");

        FileSystem cfs = createCachedFS(m, lb);
        FileSystem xfs = new XMLFileSystem(Utilities.toURI(la).toURL());
        FileSystem mfs = new MultiFileSystem(cfs, xfs);
        assertNotNull(mfs.findResource("Menu/File"));
        assertNotNull(mfs.findResource("Menu/A Folder"));


        List<URL> urls = new ArrayList<URL>(NUM_LAYERS);
        for (File f : files) {
            urls.add(Utilities.toURI(f).toURL());
        }
        XMLFileSystem[] xfss = new XMLFileSystem[NUM_LAYERS];



        List<URL> urls = new ArrayList<URL>(NUM_LAYERS);
        for (File f : files) {
            urls.add(new URL("jar:" + Utilities.toURI(f) + "!/" + LAYER_PATH_IN_JAR));
        }
        XMLFileSystem[] xfss = new XMLFileSystem[NUM_LAYERS];


        cmf.add(cmf.createLayerEntry("link-to-localized.shadow", null, null, null, Collections.singletonMap("originalFile", "test-module2-localized-action.instance")));
        File dummyDir = new File(getWorkDir(), "dummy");
        dummyDir.mkdir();
        cmf.add(cmf.createLayerEntry("link-to-url.shadow", null, null, null, Collections.singletonMap("originalFile", Utilities.toURI(dummyDir).toURL())));
        cmf.run();
        FileSystem fs = LayerUtils.getEffectiveSystemFilesystem(module2);


Lines 48-53 Link Here

(-)a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/BinaryForSourceImplTest.java (-2 / +3 lines)
48	import org.netbeans.api.java.queries.BinaryForSourceQuery;	48	import org.netbeans.api.java.queries.BinaryForSourceQuery;
49	import org.netbeans.modules.apisupport.project.NbModuleProject;	49	import org.netbeans.modules.apisupport.project.NbModuleProject;
50	import org.netbeans.modules.apisupport.project.TestBase;	50	import org.netbeans.modules.apisupport.project.TestBase;
		51	import org.openide.util.Utilities;
51		52
52	/**	53	/**
53	*	54	*
Lines 82-88 Link Here
82	final File classesF = file(projectFolder, classesPath);	83	final File classesF = file(projectFolder, classesPath);
83	final File srcF = file(projectFolder, srcPath);	84	final File srcF = file(projectFolder, srcPath);
84	assertEquals("right binary root for " + srcPath, //NOI18N	85	assertEquals("right binary root for " + srcPath, //NOI18N
85	Collections.singletonList(classesF.toURI().toURL()),	86	Collections.singletonList(Utilities.toURI(classesF).toURL()),
86	Arrays.asList(BinaryForSourceQuery.findBinaryRoots(srcF.toURI().toURL()).getRoots()));	87	Arrays.asList(BinaryForSourceQuery.findBinaryRoots(Utilities.toURI(srcF).toURL()).getRoots()));
87	}	88	}
88	}	89	}

Lines 54-59 Link Here

(-)a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/GlobalJavadocForBinaryImplTest.java (-1 / +2 lines)
54	import org.netbeans.modules.apisupport.project.universe.NbPlatform;	54	import org.netbeans.modules.apisupport.project.universe.NbPlatform;
55	import org.openide.filesystems.FileUtil;	55	import org.openide.filesystems.FileUtil;
56	import org.openide.filesystems.test.TestFileUtils;	56	import org.openide.filesystems.test.TestFileUtils;
		57	import org.openide.util.Utilities;
57		58
58	public class GlobalJavadocForBinaryImplTest extends TestBase {	59	public class GlobalJavadocForBinaryImplTest extends TestBase {
59		60
Lines 65-71 Link Here
65	File nbDocZip = generateNbDocZip();	66	File nbDocZip = generateNbDocZip();
66	URL nbDocZipURL = FileUtil.urlForArchiveOrDir(nbDocZip);	67	URL nbDocZipURL = FileUtil.urlForArchiveOrDir(nbDocZip);
67	NbPlatform.getDefaultPlatform().addJavadocRoot(nbDocZipURL);	68	NbPlatform.getDefaultPlatform().addJavadocRoot(nbDocZipURL);
68	doTestFindJavadoc(file("openide.loaders/src").toURI().toURL(), nbDocZipURL);	69	doTestFindJavadoc(Utilities.toURI(file("openide.loaders/src")).toURL(), nbDocZipURL);
69	doTestFindJavadoc(FileUtil.urlForArchiveOrDir(file("nbbuild/netbeans/platform/modules/org-openide-loaders.jar")), nbDocZipURL);	70	doTestFindJavadoc(FileUtil.urlForArchiveOrDir(file("nbbuild/netbeans/platform/modules/org-openide-loaders.jar")), nbDocZipURL);
70	}	71	}
71	private void doTestFindJavadoc(URL binRoot, URL nbDocZipURL) throws Exception {	72	private void doTestFindJavadoc(URL binRoot, URL nbDocZipURL) throws Exception {

Lines 62-67 Link Here

(-)a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/SourceForBinaryImplTest.java (-1 / +2 lines)
62	import org.netbeans.spi.project.support.ant.PropertyUtils;	62	import org.netbeans.spi.project.support.ant.PropertyUtils;
63	import org.openide.filesystems.FileObject;	63	import org.openide.filesystems.FileObject;
64	import org.openide.filesystems.FileUtil;	64	import org.openide.filesystems.FileUtil;
		65	import org.openide.util.Utilities;
65		66
66	/**	67	/**
67	* Test functionality of SourceForBinaryImpl.	68	* Test functionality of SourceForBinaryImpl.
Lines 141-147 Link Here
141	File srcF = PropertyUtils.resolveFile(nbRootFile(), srcS);	142	File srcF = PropertyUtils.resolveFile(nbRootFile(), srcS);
142	FileObject src = FileUtil.toFileObject(srcF);	143	FileObject src = FileUtil.toFileObject(srcF);
143	assertNotNull("have " + srcF, src);	144	assertNotNull("have " + srcF, src);
144	URL u = FileUtil.getArchiveRoot(jarF.toURI().toURL());	145	URL u = FileUtil.getArchiveRoot(Utilities.toURI(jarF).toURL());
145	assertEquals("right results for " + u,	146	assertEquals("right results for " + u,
146	Collections.singletonList(src),	147	Collections.singletonList(src),
147	trimGenerated(Arrays.asList(SourceForBinaryQuery.findSourceRoots(u).getRoots())));	148	trimGenerated(Arrays.asList(SourceForBinaryQuery.findSourceRoots(u).getRoots())));

Lines 59-64 Link Here

(-)a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/SubprojectProviderImplTest.java (-1 / +2 lines)
59	import org.netbeans.spi.project.support.ant.PropertyUtils;	59	import org.netbeans.spi.project.support.ant.PropertyUtils;
60	import org.openide.filesystems.FileObject;	60	import org.openide.filesystems.FileObject;
61	import org.openide.filesystems.FileUtil;	61	import org.openide.filesystems.FileUtil;
		62	import org.openide.util.Utilities;
62		63
63	/**	64	/**
64	* Test subprojects.	65	* Test subprojects.
Lines 147-153 Link Here
147	if (!f.isAbsolute()) {	148	if (!f.isAbsolute()) {
148	f = file(sp);	149	f = file(sp);
149	}	150	}
150	expected.add(f.toURI().toString());	151	expected.add(Utilities.toURI(f).toString());
151	}	152	}
152	SortedSet<String> actual = new TreeSet<String>();	153	SortedSet<String> actual = new TreeSet<String>();
153	for (Project sp : spp.getSubprojects()) {	154	for (Project sp : spp.getSubprojects()) {




import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.filesystems.URLMapper;
import org.openide.util.Utilities;

/**
 * Test for UnitTestForSourceQuery

        srcRoot = nbRoot().getFileObject("apisupport.project/src");
        testRoots = UnitTestForSourceQuery.findUnitTests(srcRoot);
        assertEquals("Test root defined", 1, testRoots.length);
        assertTrue("Test root exists", Utilities.toFile(URI.create(testRoots[0].toExternalForm())).exists());
        assertEquals("Test root", URLMapper.findFileObject(testRoots[0]), nbRoot().getFileObject("apisupport.project/test/unit/src"));
        assertEquals("One test for this project", 1, UnitTestForSourceQuery.findUnitTests(nbRoot().getFileObject("openide.windows/src")).length);
    }

        testRoot = nbRoot().getFileObject("apisupport.project/test/unit/src");
        srcRoots = UnitTestForSourceQuery.findSources(testRoot);
        assertEquals("Source root defined", 1, srcRoots.length);
        assertTrue("Source root exists", Utilities.toFile(URI.create(srcRoots[0].toExternalForm())).exists());
        assertEquals("Source root", URLMapper.findFileObject(srcRoots[0]), nbRoot().getFileObject("apisupport.project/src"));
    }        


Lines 52-57 Link Here

(-)a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/UpdateTrackingFileOwnerQueryTest.java (-1 / +2 lines)
52	import org.netbeans.spi.project.support.ant.PropertyUtils;	52	import org.netbeans.spi.project.support.ant.PropertyUtils;
53	import org.openide.filesystems.FileObject;	53	import org.openide.filesystems.FileObject;
54	import org.openide.filesystems.FileUtil;	54	import org.openide.filesystems.FileUtil;
		55	import org.openide.util.Utilities;
55		56
56	/**	57	/**
57	* Test that project association by module inclusion list works.	58	* Test that project association by module inclusion list works.
Lines 100-106 Link Here
100	assertEquals("correct owner by FileObject of " + file, p, FileOwnerQuery.getOwner(fileFO));	101	assertEquals("correct owner by FileObject of " + file, p, FileOwnerQuery.getOwner(fileFO));
101	}	102	}
102	assertEquals("correct owner by URI of " + file, p, FileOwnerQuery.getOwner(	103	assertEquals("correct owner by URI of " + file, p, FileOwnerQuery.getOwner(
103	PropertyUtils.resolveFile(nbRootFile(), file).toURI()));	104	Utilities.toURI(PropertyUtils.resolveFile(nbRootFile(), file))));
104	}	105	}
105		106
106	}	107	}

Lines 62-67 Link Here

(-)a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/spi/BrandingSupportTest.java (-1 / +2 lines)
62	import org.netbeans.modules.apisupport.project.universe.NbPlatform;	62	import org.netbeans.modules.apisupport.project.universe.NbPlatform;
63	import org.openide.filesystems.FileObject;	63	import org.openide.filesystems.FileObject;
64	import org.openide.filesystems.FileUtil;	64	import org.openide.filesystems.FileUtil;
		65	import org.openide.util.Utilities;
65		66
66	/**	67	/**
67	*	68	*
Lines 138-144 Link Here
138	File newSource = createNewSource(bFile);	139	File newSource = createNewSource(bFile);
139	assertEquals(0,instance.getBrandedFiles().size());	140	assertEquals(0,instance.getBrandedFiles().size());
140		141
141	bFile.setBrandingSource(newSource.toURI().toURL());	142	bFile.setBrandingSource(Utilities.toURI(newSource).toURL());
142	assertTrue(bFile.isModified());	143	assertTrue(bFile.isModified());
143		144
144	assertEquals(0,instance.getBrandedFiles().size());	145	assertEquals(0,instance.getBrandedFiles().size());

Lines 256-262 Link Here

(-)a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/suite/BuildZipDistributionTest.java (-1 / +1 lines)
256	private void run(File nbexec, String... args) throws Exception {	256	private void run(File nbexec, String... args) throws Exception {
257		257
258	URL tu = MainCallback.class.getProtectionDomain().getCodeSource().getLocation();	258	URL tu = MainCallback.class.getProtectionDomain().getCodeSource().getLocation();
259	File testf = new File(tu.toURI());	259	File testf = Utilities.toFile(tu.toURI());
260	assertTrue("file found: " + testf, testf.exists());	260	assertTrue("file found: " + testf, testf.exists());
261		261
262	LinkedList<String> allArgs = new LinkedList<String>(Arrays.asList(args));	262	LinkedList<String> allArgs = new LinkedList<String>(Arrays.asList(args));

Lines 64-70 Link Here

(-)a/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/universe/TestEntryTest.java (-2 / +2 lines)
64	assertNotNull("TestEntry for aisupport/project tests",entry);	64	assertNotNull("TestEntry for aisupport/project tests",entry);
65	assertNotNull("Nbroot wasn't found.", entry.getNBRoot());	65	assertNotNull("Nbroot wasn't found.", entry.getNBRoot());
66	URL srcDir = entry.getSrcDir();	66	URL srcDir = entry.getSrcDir();
67	assertEquals(new File(nbRootFile(),"apisupport.project/test/unit/src").toURI().toURL(),srcDir);	67	assertEquals(Utilities.toURI(new File(nbRootFile(),"apisupport.project/test/unit/src")).toURL(),srcDir);
68	}	68	}
69		69
70	public void testGetSourcesFromExternalModule() throws IOException {	70	public void testGetSourcesFromExternalModule() throws IOException {
Lines 73-79 Link Here
73	assertNotNull("TestEntry for suite tests",entry);	73	assertNotNull("TestEntry for suite tests",entry);
74	assertNull("Nbroot was found.", entry.getNBRoot());	74	assertNull("Nbroot was found.", entry.getNBRoot());
75	URL srcDir = entry.getSrcDir();	75	URL srcDir = entry.getSrcDir();
76	assertEquals(resolveEEPFile("/suite4/module1/test/unit/src").toURI().toURL().toExternalForm(),srcDir.toExternalForm());	76	assertEquals(Utilities.toURI(resolveEEPFile("/suite4/module1/test/unit/src")).toURL().toExternalForm(),srcDir.toExternalForm());
77	}	77	}
78		78
79	public void testNullsOnShortUNCPath144758() throws IOException {	79	public void testNullsOnShortUNCPath144758() throws IOException {

Lines 259-265 Link Here

(-)a/apisupport.project/nbproject/project.xml (-1 / +1 lines)
259	<build-prerequisite/>	259	<build-prerequisite/>
260	<compile-dependency/>	260	<compile-dependency/>
261	<run-dependency>	261	<run-dependency>
262	<specification-version>8.6</specification-version>	262	<specification-version>8.25</specification-version>
263	</run-dependency>	263	</run-dependency>
264	</dependency>	264	</dependency>
265	<dependency>	265	<dependency>

Lines 72-77 Link Here

(-)a/apisupport.project/src/org/netbeans/modules/apisupport/project/api/LayerHandle.java (-1 / +2 lines)
72	import org.openide.filesystems.MultiFileSystem;	72	import org.openide.filesystems.MultiFileSystem;
73	import org.openide.filesystems.XMLFileSystem;	73	import org.openide.filesystems.XMLFileSystem;
74	import org.openide.util.Parameters;	74	import org.openide.util.Parameters;
		75	import org.openide.util.Utilities;
75	import org.xml.sax.SAXException;	76	import org.xml.sax.SAXException;
76		77
77	/**	78	/**
Lines 219-225 Link Here
219	}	220	}
220	if (generated != null && generated.isFile()) {	221	if (generated != null && generated.isFile()) {
221	try {	222	try {
222	layers.add(new XMLFileSystem(generated.toURI().toString()));	223	layers.add(new XMLFileSystem(Utilities.toURI(generated).toString()));
223	} catch (SAXException x) {	224	} catch (SAXException x) {
224	Logger.getLogger(DualLayers.class.getName()).log(Level.INFO, "could not load " + generated, x);	225	Logger.getLogger(DualLayers.class.getName()).log(Level.INFO, "could not load " + generated, x);
225	}	226	}

Lines 63-68 Link Here

(-)a/apisupport.project/src/org/netbeans/modules/apisupport/project/api/ManifestManager.java (-1 / +2 lines)
63	import java.util.logging.Logger;	63	import java.util.logging.Logger;
64	import org.netbeans.api.annotations.common.NonNull;	64	import org.netbeans.api.annotations.common.NonNull;
65	import org.openide.modules.Dependency;	65	import org.openide.modules.Dependency;
		66	import org.openide.util.Utilities;
66		67
67	// XXX a lot of code in this method is more or less duplicated from	68	// XXX a lot of code in this method is more or less duplicated from
68	// org.netbeans.core.modules.Module class. Do not forgot to refactor this as	69	// org.netbeans.core.modules.Module class. Do not forgot to refactor this as
Lines 210-216 Link Here
210	if (piece.isEmpty()) {	211	if (piece.isEmpty()) {
211	continue;	212	continue;
212	}	213	}
213	File ext = new File(jar.getParentFile().toURI().resolve(piece.trim()));	214	File ext = Utilities.toFile(Utilities.toURI(jar.getParentFile()).resolve(piece.trim()));
214	if (ext.isFile()) {	215	if (ext.isFile()) {
215	ManifestManager mm2 = getInstanceFromJAR(ext);	216	ManifestManager mm2 = getInstanceFromJAR(ext);
216	List<String> toks = new ArrayList<String>(Arrays.asList(mm.provTokens));	217	List<String> toks = new ArrayList<String>(Arrays.asList(mm.provTokens));

Lines 416-422 Link Here

(-)a/apisupport.project/src/org/netbeans/modules/apisupport/project/spi/BrandingSupport.java (-2 / +2 lines)
416	private void loadBrandedFiles(final BrandableModule mEntry,	416	private void loadBrandedFiles(final BrandableModule mEntry,
417	final File file) throws IOException {	417	final File file) throws IOException {
418	String entryPath = PropertyUtils.relativizeFile(getModuleEntryDirectory(mEntry),file);	418	String entryPath = PropertyUtils.relativizeFile(getModuleEntryDirectory(mEntry),file);
419	BrandedFile bf = new BrandedFile(mEntry, file.toURI().toURL(), entryPath);	419	BrandedFile bf = new BrandedFile(mEntry, Utilities.toURI(file).toURL(), entryPath);
420	brandedFiles.add(bf);	420	brandedFiles.add(bf);
421	}	421	}
422		422
Lines 565-571 Link Here
565	this.moduleEntry = moduleEntry;	565	this.moduleEntry = moduleEntry;
566	this.entryPath = entry;	566	this.entryPath = entry;
567	if (source == null) {	567	if (source == null) {
568	brandingSource = moduleEntry.getJarLocation().toURI().toURL();	568	brandingSource = Utilities.toURI(moduleEntry.getJarLocation()).toURL();
569	brandingSource = new URL("jar:" + brandingSource + "!/" + entryPath); // NOI18N	569	brandingSource = new URL("jar:" + brandingSource + "!/" + entryPath); // NOI18N
570	} else {	570	} else {
571	brandingSource = source;	571	brandingSource = source;

Lines 63-68 Link Here

(-)a/apisupport.project/src/org/netbeans/modules/apisupport/project/spi/LayerUtil.java (-1 / +2 lines)
63	import org.openide.filesystems.FileStateInvalidException;	63	import org.openide.filesystems.FileStateInvalidException;
64	import org.openide.filesystems.FileSystem;	64	import org.openide.filesystems.FileSystem;
65	import org.openide.filesystems.XMLFileSystem;	65	import org.openide.filesystems.XMLFileSystem;
		66	import org.openide.util.Utilities;
66		67
67	/**	68	/**
68	* Utilities useful for {@link NbModuleProvider#getEffectiveSystemFilesystem}.	69	* Utilities useful for {@link NbModuleProvider#getEffectiveSystemFilesystem}.
Lines 103-109 Link Here
103	String layer = mm.getLayer();	104	String layer = mm.getLayer();
104	String generatedLayer = mm.getGeneratedLayer();	105	String generatedLayer = mm.getGeneratedLayer();
105	List<URL> urls = new ArrayList<URL>(2);	106	List<URL> urls = new ArrayList<URL>(2);
106	URI juri = jar.toURI();	107	URI juri = Utilities.toURI(jar);
107	for (String path : new String[] {layer, generatedLayer}) {	108	for (String path : new String[] {layer, generatedLayer}) {
108	if (path != null) {	109	if (path != null) {
109	urls.add(new URL("jar:" + juri + "!/" + path));	110	urls.add(new URL("jar:" + juri + "!/" + path));

Lines 60-65 Link Here

(-)a/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/BasicBrandingPanel.java (-1 / +2 lines)
60	import org.netbeans.modules.apisupport.project.api.UIUtil;	60	import org.netbeans.modules.apisupport.project.api.UIUtil;
61	import org.openide.util.Exceptions;	61	import org.openide.util.Exceptions;
62	import org.openide.util.NbBundle;	62	import org.openide.util.NbBundle;
		63	import org.openide.util.Utilities;
63		64
64	/**	65	/**
65	* Represents <em>Application</em> panel in branding editor.	66	* Represents <em>Application</em> panel in branding editor.
Lines 324-330 Link Here
324	if (ret == JFileChooser.APPROVE_OPTION) {	325	if (ret == JFileChooser.APPROVE_OPTION) {
325	File file = chooser.getSelectedFile();	326	File file = chooser.getSelectedFile();
326	try {	327	try {
327	res = file.toURI().toURL();	328	res = Utilities.toURI(file).toURL();
328	preview.setImage(new ImageIcon(res));	329	preview.setImage(new ImageIcon(res));
329	setModified();	330	setModified();
330	} catch (MalformedURLException ex) {	331	} catch (MalformedURLException ex) {

Lines 61-66 Link Here

(-)a/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/SplashBrandingPanel.java (-1 / +2 lines)
61	import org.netbeans.modules.apisupport.project.spi.BrandingSupport.BrandedFile;	61	import org.netbeans.modules.apisupport.project.spi.BrandingSupport.BrandedFile;
62	import org.openide.ErrorManager;	62	import org.openide.ErrorManager;
63	import org.openide.util.NbBundle;	63	import org.openide.util.NbBundle;
		64	import org.openide.util.Utilities;
64		65
65	/**	66	/**
66	* Represents <em>Splash branding parameters</em> panel in branding editor.	67	* Represents <em>Splash branding parameters</em> panel in branding editor.
Lines 524-530 Link Here
524	if (ret == JFileChooser.APPROVE_OPTION) {	525	if (ret == JFileChooser.APPROVE_OPTION) {
525	File file = chooser.getSelectedFile();	526	File file = chooser.getSelectedFile();
526	try {	527	try {
527	splashSource = file.toURI().toURL();	528	splashSource = Utilities.toURI(file).toURL();
528	Image oldImage = splashImage.image;	529	Image oldImage = splashImage.image;
529	splashImage.setSplashImageIcon(splashSource);	530	splashImage.setSplashImageIcon(splashSource);
530	Image newImage = splashImage.image;	531	Image newImage = splashImage.image;




package org.netbeans.modules.autoupdate.pluginimporter;

import java.io.File;
import java.io.IOException;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;

import org.netbeans.api.autoupdate.UpdateUnit;
import org.netbeans.api.autoupdate.UpdateUnitProvider;
import org.netbeans.api.autoupdate.UpdateUnitProviderFactory;
import org.openide.filesystems.FileUtil;
import org.openide.modules.ModuleInstall;
import org.openide.util.NbPreferences;
import org.openide.util.RequestProcessor;

        String user = System.getProperty ("netbeans.user"); // NOI18N
        File userDir = null;
        if (user != null) {
            userDir = FileUtil.normalizeFile(new File(user));
            if (userDir.getPath ().startsWith ("\\\\")) { // NOI18N
                // Do not use URI.normalize for UNC paths because of http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4723726 (URI.normalize() ruins URI built from UNC File)
                try {
                    userDir = userDir.getCanonicalFile ();
                } catch (IOException ex) {
                    // fallback when getCanonicalFile fails
                    userDir = userDir.getAbsoluteFile ();
                }
            } else {
                userDir = new File (userDir.toURI ().normalize ()).getAbsoluteFile ();
            }
        }

        return userDir;

Lines 189-197 Link Here

(-)a/autoupdate.services/libsrc/org/netbeans/updater/UpdateTracking.java (-1 / +2 lines)
189	String user = System.getProperty ("netbeans.user");	189	String user = System.getProperty ("netbeans.user");
190	File userDir = null;	190	File userDir = null;
191	if (user != null) {	191	if (user != null) {
		192	// XXX cannot use FileUtil.normalizeFile from here
192	userDir = new File (user);	193	userDir = new File (user);
193	if (userDir.getPath ().startsWith ("\\\\")) {	194	if (userDir.getPath ().startsWith ("\\\\")) {
194	// Do not use URI.normalize for UNC paths because of http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4723726 (URI.normalize() ruins URI built from UNC File)	195	// Could use URI.normalize but only on userDir.getPath().toUri() in JDK 7 (#4723726 breaks UNC for userDir.toURI())
195	try {	196	try {
196	userDir = userDir.getCanonicalFile ();	197	userDir = userDir.getCanonicalFile ();
197	} catch (IOException ex) {	198	} catch (IOException ex) {

Lines 79-85 Link Here

(-)a/core.startup/nbproject/project.xml (-1 / +1 lines)
79	<build-prerequisite/>	79	<build-prerequisite/>
80	<compile-dependency/>	80	<compile-dependency/>
81	<run-dependency>	81	<run-dependency>
82	<specification-version>8.23</specification-version>	82	<specification-version>8.25</specification-version>
83	</run-dependency>	83	</run-dependency>
84	</dependency>	84	</dependency>
85	<dependency>	85	<dependency>

Lines 60-65 Link Here

(-)a/core.startup/src/org/netbeans/core/startup/CLICoreBridge.java (-1 / +2 lines)
60	import org.openide.filesystems.XMLFileSystem;	60	import org.openide.filesystems.XMLFileSystem;
61	import org.openide.util.Exceptions;	61	import org.openide.util.Exceptions;
62	import org.openide.util.Lookup;	62	import org.openide.util.Lookup;
		63	import org.openide.util.Utilities;
63	import org.openide.util.lookup.Lookups;	64	import org.openide.util.lookup.Lookups;
64		65
65	/**	66	/**
Lines 117-123 Link Here
117	for (Module m : moduleSystem.getManager().getModules()) {	118	for (Module m : moduleSystem.getManager().getModules()) {
118	for (File f : m.getAllJars()) {	119	for (File f : m.getAllJars()) {
119	try {	120	try {
120	urls.add(f.toURI().toURL());	121	urls.add(Utilities.toURI(f).toURL());
121	}	122	}
122	catch (MalformedURLException ex) {	123	catch (MalformedURLException ex) {
123	Exceptions.printStackTrace(ex);	124	Exceptions.printStackTrace(ex);

Lines 72-77 Link Here

(-)a/core.startup/src/org/netbeans/core/startup/ModuleSystem.java (-1 / +2 lines)
72	import org.openide.filesystems.FileUtil;	72	import org.openide.filesystems.FileUtil;
73	import org.openide.modules.ModuleInfo;	73	import org.openide.modules.ModuleInfo;
74	import org.openide.util.Exceptions;	74	import org.openide.util.Exceptions;
		75	import org.openide.util.Utilities;
75		76
76	/** Controller of the IDE's whole module system.	77	/** Controller of the IDE's whole module system.
77	* Contains higher-level convenience methods to	78	* Contains higher-level convenience methods to
Lines 213-219 Link Here
213	/* #121777 */ jarURL.getPath().startsWith("/")) {	214	/* #121777 */ jarURL.getPath().startsWith("/")) {
214	LOG.log(Level.FINE, "Considering JAR: {0}", jarURL);	215	LOG.log(Level.FINE, "Considering JAR: {0}", jarURL);
215	try {	216	try {
216	if (ignoredJars.contains(new File(jarURL.toURI()))) {	217	if (ignoredJars.contains(Utilities.toFile(jarURL.toURI()))) {
217	LOG.log(Level.FINE, "ignoring JDK/JRE manifest: {0}", manifestUrl);	218	LOG.log(Level.FINE, "ignoring JDK/JRE manifest: {0}", manifestUrl);
218	continue MANIFESTS;	219	continue MANIFESTS;
219	}	220	}




import org.openide.filesystems.Repository;
import org.openide.filesystems.URLMapper;
import org.openide.util.Exceptions;
import org.openide.util.Utilities;
import org.openide.util.lookup.ServiceProvider;

@ServiceProvider(service=URLMapper.class)

                        archiveFile = jfs.getJarFile();
                        if (isRoot(archiveFile)) {
                            try {
                                return new URL("jar:" + Utilities.toURI(archiveFile) + "!/" +
                                    new URI(null, fo.getPath(), null).getRawSchemeSpecificPart() +
                                    (fo.isFolder() && !fo.isRoot() ? "/" : "")); // NOI18N
                            } catch (URISyntaxException syntax) {
                                return new URL("jar:" + Utilities.toURI(archiveFile) + "!/" + fo.getPath()
                                        + ((fo.isFolder() && !fo.isRoot()) ? "/" : "")); // NOI18N
                            }
                        }




import org.netbeans.junit.RandomlyFails;
import org.openide.filesystems.FileUtil;
import org.openide.filesystems.JarFileSystem;
import org.openide.util.Utilities;
import org.openide.util.test.TestFileUtils;

/**

        out.putNextEntry(entry);
        out.write (RESOURCE.getBytes());
        out.close();
        return Utilities.toURI(jarFile).toURL();
    }
    
    public void testURLMapper () throws Exception {

        assertTrue ("".equals(rootFo.getPath()));
        assertTrue (rootFo.getFileSystem() instanceof JarFileSystem);
        File jarFile = ((JarFileSystem)rootFo.getFileSystem()).getJarFile();
        assertTrue (jarFileURL.equals(Utilities.toURI(jarFile).toURL()));
    }
    
    public void testFunnyZipEntryNames() throws Exception { // #181671

        jos.write("content".getBytes());
        jos.close();
        
        FileObject docxFO = URLMapper.findFileObject(Utilities.toURI(docx).toURL());
        assertNotNull(docxFO);
        assertTrue(FileUtil.isArchiveFile(docxFO));
        

        jos.putNextEntry(entry);
        jos.write(baos.toByteArray());
        jos.close();
        FileObject metaJarFO = URLMapper.findFileObject(Utilities.toURI(metaJar).toURL());
        assertNotNull(metaJarFO);
        assertTrue(FileUtil.isArchiveFile(metaJarFO));
        FileObject metaRoot = FileUtil.getArchiveRoot(metaJarFO);

        JarOutputStream jos = new JarOutputStream(new FileOutputStream(jar));
        jos.putNextEntry(new ZipEntry("has spaces"));
        jos.close();
        URL source = new URL("jar:" + Utilities.toURI(jar).toURL() + "!/has%20spaces");
        source.toURI();
        FileObject file = URLMapper.findFileObject(source);
        assertNotNull(file);
        assertEquals(source, URLMapper.findURL(file, URLMapper.INTERNAL));
        assertEquals(0, source.openConnection().getContentLength());
        ProxyURLStreamHandlerFactory.register();
        assertEquals(0, new URL("jar:" + Utilities.toURI(jar).toURL() + "!/has%20spaces").openConnection().getContentLength());
    }

}




import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileRenameEvent;
import org.openide.filesystems.FileUtil;
import org.openide.util.Utilities;

/**
 *


        {
            List<URL> list = new ArrayList<URL>();
            list.add(Utilities.toURI(f1).toURL());
            list.add(Utilities.toURI(f3).toURL());
            fs.setURLs (list);
        }
        

        
        {
            List<URL> list = new ArrayList<URL>();
            list.add(Utilities.toURI(f2).toURL());
            list.add(Utilities.toURI(f3).toURL());
            fs.setURLs (list);
        }
        String v2 = (String) file.getAttribute("value");

Lines 62-67 Link Here

(-)a/core.startup/test/unit/src/org/netbeans/core/startup/layers/CacheManagerTestBaseHid.java (-1 / +2 lines)
62	import org.openide.filesystems.FileSystem;	62	import org.openide.filesystems.FileSystem;
63	import org.openide.filesystems.FileUtil;	63	import org.openide.filesystems.FileUtil;
64	import org.openide.filesystems.MultiFileSystem;	64	import org.openide.filesystems.MultiFileSystem;
		65	import org.openide.util.Utilities;
65	import org.openide.util.test.TestFileUtils;	66	import org.openide.util.test.TestFileUtils;
66	/** Test layer cache managers generally.	67	/** Test layer cache managers generally.
67	* @author Jesse Glick	68	* @author Jesse Glick
Lines 111-117 Link Here
111	}	112	}
112		113
113	protected URL loadResource(String name) throws IOException {	114	protected URL loadResource(String name) throws IOException {
114	return new URL(new URL(getDataDir().toURI().toURL(), "layers/"), name);	115	return new URL(new URL(Utilities.toURI(getDataDir()).toURL(), "layers/"), name);
115	}	116	}
116		117
117	public void testCacheManager() throws Exception {	118	public void testCacheManager() throws Exception {

Lines 215-221 Link Here

(-)a/java.api.common/nbproject/project.xml (-1 / +1 lines)
215	<build-prerequisite/>	215	<build-prerequisite/>
216	<compile-dependency/>	216	<compile-dependency/>
217	<run-dependency>	217	<run-dependency>
218	<specification-version>8.0</specification-version>	218	<specification-version>8.25</specification-version>
219	</run-dependency>	219	</run-dependency>
220	</dependency>	220	</dependency>
221	<dependency>	221	<dependency>




import org.openide.util.Mutex;
import org.openide.util.NbBundle;
import org.openide.util.Parameters;
import org.openide.util.Utilities;
import org.openide.util.WeakListeners;
import org.w3c.dom.Document;
import org.w3c.dom.Element;

                            if (prop != null) {
                                File f = helper.getAntProjectHelper().resolveFile(prop);
                                try {
                                    URL url = Utilities.toURI(f).toURL();
                                    if (!f.exists()) {
                                        url = new URL(url.toExternalForm() + "/"); // NOI18N
                                    } else if (f.isFile()) {

                    if (prop != null) {
                        File f = helper.getAntProjectHelper().resolveFile(prop);
                        try {
                            URL url = Utilities.toURI(f).toURL();
                            if (!f.exists()) {
                                url = new URL(url.toExternalForm() + "/"); // NOI18N
                            } else if (f.isFile()) {

                                    rootName = MessageFormat.format(
                                            newRootNameTemplate, new Object[] {names[names.length - 1], rootIndex});
                                }
                                File f = FileUtil.normalizeFile(Utilities.toFile(URI.create(newRoot.toExternalForm())));
                                File projDir = FileUtil.toFile(helper.getAntProjectHelper().getProjectDirectory());
                                String path = f.getAbsolutePath();
                                String prjPath = projDir.getAbsolutePath() + File.separatorChar;




import org.netbeans.spi.project.support.ant.EditableProperties;
import org.openide.filesystems.FileUtil;
import org.openide.util.Parameters;
import org.openide.util.Utilities;

/**
 * Support for reading/writting classpath like properties.

                    AntArtifact artifact = (AntArtifact)ret[0];
                    URI uri = (URI)ret[1];
                    File usedFile = antProjectHelper.resolveFile(evaluator.evaluate(pe[i]));
                    File artifactFile = Utilities.toFile(Utilities.toURI(artifact.getScriptLocation()).resolve(uri).normalize());
                    File artifactFile = null;
                    if(uri.isAbsolute()) {
                        artifactFile = new File(uri);
                    } else {
                        artifactFile = new File(artifact.getScriptLocation().getParent(), uri.getPath());
                    }
                    artifactFile = FileUtil.normalizeFile(artifactFile);
                    //File artifactFile = new File (artifact.getScriptLocation().toURI().resolve(uri).normalize());
                    /* End of UNC workaround */
                    if (usedFile.equals(artifactFile)) {
                        item = Item.create( artifact, uri, pe[i]);
                    }




import org.openide.filesystems.FileRenameEvent;
import org.openide.filesystems.FileUtil;
import org.openide.util.Exceptions;
import org.openide.util.Utilities;
import org.openide.util.WeakListeners;

/**

                    if (matcher == null) {
                        matcher = new PathMatcher(
                                evaluator.getProperty(ProjectProperties.INCLUDES),
                                evaluator.getProperty(ProjectProperties.EXCLUDES), Utilities.toFile(URI.create(root.toExternalForm())));
                                new File(URI.create(root.toExternalForm())));
                    }
                    return matcher.matches(resource, true);
                }

                            if (root.equals(apSourcesDir)) {
                                continue;
                            }
                            result.add(ClassPathSupport.createResource(Utilities.toURI(root).toURL()));
                        }
                    }
                }

Lines 107-112 Link Here

(-)a/java.api.common/src/org/netbeans/modules/java/api/common/project/ui/LibrariesNode.java (-1 / +2 lines)
107	import org.netbeans.spi.java.project.support.ui.PackageView;	107	import org.netbeans.spi.java.project.support.ui.PackageView;
108	import org.netbeans.spi.project.libraries.support.LibrariesSupport;	108	import org.netbeans.spi.project.libraries.support.LibrariesSupport;
109	import org.openide.util.Exceptions;	109	import org.openide.util.Exceptions;
		110	import org.openide.util.Utilities;
110	import org.openide.util.lookup.Lookups;	111	import org.openide.util.lookup.Lookups;
111		112
112	/**	113	/**
Lines 903-909 Link Here
903	}	904	}
904	else {	905	else {
905	//No MimeResolver fallback	906	//No MimeResolver fallback
906	return FileUtil.isArchiveFile(f.toURI().toURL());	907	return FileUtil.isArchiveFile(Utilities.toURI(f).toURL());
907	}	908	}
908	} catch (MalformedURLException mue) {	909	} catch (MalformedURLException mue) {
909	Exceptions.printStackTrace(mue);	910	Exceptions.printStackTrace(mue);

Lines 77-82 Link Here

(-)a/java.api.common/src/org/netbeans/modules/java/api/common/project/ui/ProjectNode.java (-1 / +2 lines)
77	import org.openide.filesystems.FileObject;	77	import org.openide.filesystems.FileObject;
78	import org.openide.util.Exceptions;	78	import org.openide.util.Exceptions;
79	import org.openide.util.Lookup;	79	import org.openide.util.Lookup;
		80	import org.openide.util.Utilities;
80		81
81		82
82		83
Lines 235-241 Link Here
235	File scriptLocation = this.antArtifact.getScriptLocation();	236	File scriptLocation = this.antArtifact.getScriptLocation();
236	Set<URL> urls = new HashSet<URL>();	237	Set<URL> urls = new HashSet<URL>();
237	try {	238	try {
238	URL artifactURL = scriptLocation.toURI().resolve(this.artifactLocation).normalize().toURL();	239	URL artifactURL = Utilities.toURI(scriptLocation).resolve(this.artifactLocation).normalize().toURL();
239	if (FileUtil.isArchiveFile(artifactURL)) {	240	if (FileUtil.isArchiveFile(artifactURL)) {
240	artifactURL = FileUtil.getArchiveRoot(artifactURL);	241	artifactURL = FileUtil.getArchiveRoot(artifactURL);
241	}	242	}

Lines 89-94 Link Here

(-)a/java.api.common/src/org/netbeans/modules/java/api/common/project/ui/customizer/EditMediator.java (-1 / +2 lines)
89	import org.openide.util.Exceptions;	89	import org.openide.util.Exceptions;
90	import org.openide.util.NbBundle;	90	import org.openide.util.NbBundle;
91	import org.openide.util.NbPreferences;	91	import org.openide.util.NbPreferences;
		92	import org.openide.util.Utilities;
92		93
93	/**	94	/**
94	* Visual classpath customizer support.	95	* Visual classpath customizer support.
Lines 368-374 Link Here
368	String path = libraryPath.getText(0, libraryPath.getLength());	369	String path = libraryPath.getText(0, libraryPath.getLength());
369	if (path != null && path.length() > 0) {	370	if (path != null && path.length() > 0) {
370	File fil = PropertyUtils.resolveFile(FileUtil.toFile(helper.getProjectDirectory()), path);	371	File fil = PropertyUtils.resolveFile(FileUtil.toFile(helper.getProjectDirectory()), path);
371	librariesFolder = FileUtil.normalizeFile(fil).toURI().toURL();	372	librariesFolder = Utilities.toURI(FileUtil.normalizeFile(fil)).toURL();
372	manager = LibraryManager.forLocation(librariesFolder);	373	manager = LibraryManager.forLocation(librariesFolder);
373	} else {	374	} else {
374	empty = true;	375	empty = true;




import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.util.NbBundle;
import org.openide.util.Utilities;

/** Handles adding, removing, reordering of source roots.
 *

        URL[] rootURLs = roots.getRootURLs();
        Object[][] data = new Object[rootURLs.length] [2];
        for (int i=0; i< rootURLs.length; i++) {
            data[i][0] = Utilities.toFile(URI.create (rootURLs[i].toExternalForm()));
            data[i][1] = roots.getRootDisplayName(rootLabels[i], rootProps[i]);
        }
        return new SourceRootsModel(data);

                    rootsFromRelatedSourceRoots.add (normalizedFile);
                    continue;
                }
                if ((p=FileOwnerQuery.getOwner(Utilities.toURI(normalizedFile)))!=null && !p.getProjectDirectory().equals(project.getProjectDirectory())) {
                    final Sources sources = p.getLookup().lookup(Sources.class);
                    if (sources == null) {
                        rootsFromOtherProjects.add (normalizedFile);

                File f = (File) value;
                String message = f.getAbsolutePath();
                if (projectConflict) {
                    Project p = FileOwnerQuery.getOwner(Utilities.toURI(f));
                    if (p!=null) {
                        ProjectInformation pi = ProjectUtils.getInformation(p);
                        String projectName = pi.getDisplayName();

Lines 86-91 Link Here

(-)a/java.api.common/src/org/netbeans/modules/java/api/common/project/ui/wizards/FolderList.java (-1 / +2 lines)
86	import org.openide.filesystems.FileUtil;	86	import org.openide.filesystems.FileUtil;
87	import org.openide.util.Cancellable;	87	import org.openide.util.Cancellable;
88	import org.openide.util.NbBundle;	88	import org.openide.util.NbBundle;
		89	import org.openide.util.Utilities;
89		90
90		91
91	/**	92	/**
Lines 383-389 Link Here
383		384
384	public static boolean isValidRoot (File file, File[] relatedRoots, File projectFolder) {	385	public static boolean isValidRoot (File file, File[] relatedRoots, File projectFolder) {
385	Project p;	386	Project p;
386	if ((p = FileOwnerQuery.getOwner(file.toURI()))!=null	387	if ((p = FileOwnerQuery.getOwner(Utilities.toURI(file)))!=null
387	&& !file.getAbsolutePath().startsWith(projectFolder.getAbsolutePath()+File.separatorChar)) {	388	&& !file.getAbsolutePath().startsWith(projectFolder.getAbsolutePath()+File.separatorChar)) {
388	final Sources sources = p.getLookup().lookup(Sources.class);	389	final Sources sources = p.getLookup().lookup(Sources.class);
389	if (sources == null) {	390	if (sources == null) {

Lines 69-74 Link Here

(-)a/java.api.common/src/org/netbeans/modules/java/api/common/queries/AnnotationProcessingQueryImpl.java (-1 / +2 lines)
69	import org.openide.filesystems.FileObject;	69	import org.openide.filesystems.FileObject;
70	import org.openide.modules.SpecificationVersion;	70	import org.openide.modules.SpecificationVersion;
71	import org.openide.util.ChangeSupport;	71	import org.openide.util.ChangeSupport;
		72	import org.openide.util.Utilities;
72	import org.openide.util.WeakListeners;	73	import org.openide.util.WeakListeners;
73		74
74	/**	75	/**
Lines 174-180 Link Here
174	File output = helper.resolveFile(prop);	175	File output = helper.resolveFile(prop);
175		176
176	try {	177	try {
177	return output.toURI().toURL();	178	return Utilities.toURI(output).toURL();
178	} catch (MalformedURLException ex) {	179	} catch (MalformedURLException ex) {
179	Logger.getLogger(AnnotationProcessingQueryImpl.class.getName()).log(Level.FINE, null, ex);	180	Logger.getLogger(AnnotationProcessingQueryImpl.class.getName()).log(Level.FINE, null, ex);
180	return null;	181	return null;

Lines 60-65 Link Here

(-)a/java.api.common/src/org/netbeans/modules/java/api/common/queries/BinaryForSourceQueryImpl.java (-1 / +2 lines)
60	import org.netbeans.spi.project.support.ant.PropertyEvaluator;	60	import org.netbeans.spi.project.support.ant.PropertyEvaluator;
61	import org.openide.filesystems.FileUtil;	61	import org.openide.filesystems.FileUtil;
62	import org.openide.util.ChangeSupport;	62	import org.openide.util.ChangeSupport;
		63	import org.openide.util.Utilities;
63		64
64	/**	65	/**
65	*	66	*
Lines 114-120 Link Here
114	}	115	}
115	String buildGeneratedDirS = eval.getProperty("build.generated.sources.dir");	116	String buildGeneratedDirS = eval.getProperty("build.generated.sources.dir");
116	if (buildGeneratedDirS != null) { // #105645	117	if (buildGeneratedDirS != null) { // #105645
117	String parent = helper.resolveFile(buildGeneratedDirS).toURI().toString();	118	String parent = Utilities.toURI(helper.resolveFile(buildGeneratedDirS)).toString();
118	if (sourceRoot.toString().startsWith(parent)) {	119	if (sourceRoot.toString().startsWith(parent)) {
119	result = new R(sourceProps);	120	result = new R(sourceProps);
120	cache.put(sourceRoot, result);	121	cache.put(sourceRoot, result);

Lines 64-69 Link Here

(-)a/java.api.common/src/org/netbeans/modules/java/api/common/queries/CompiledSourceForBinaryQueryImpl.java (-1 / +2 lines)
64	import org.netbeans.spi.project.support.ant.PropertyEvaluator;	64	import org.netbeans.spi.project.support.ant.PropertyEvaluator;
65	import org.openide.util.ChangeSupport;	65	import org.openide.util.ChangeSupport;
66	import org.openide.util.Exceptions;	66	import org.openide.util.Exceptions;
		67	import org.openide.util.Utilities;
67		68
68	/**	69	/**
69	* Default implementation of {@link SourceForBinaryQueryImplementation}.	70	* Default implementation of {@link SourceForBinaryQueryImplementation}.
Lines 134-140 Link Here
134	String outDir = evaluator.getProperty(binaryProperty);	135	String outDir = evaluator.getProperty(binaryProperty);
135	if (outDir != null) {	136	if (outDir != null) {
136	File f = helper.resolveFile(outDir);	137	File f = helper.resolveFile(outDir);
137	URL url = f.toURI().toURL();	138	URL url = Utilities.toURI(f).toURL();
138	if (!f.exists() && !f.getPath().toLowerCase().endsWith(".jar")) { // NOI18N	139	if (!f.exists() && !f.getPath().toLowerCase().endsWith(".jar")) { // NOI18N
139	// non-existing	140	// non-existing
140	assert !url.toExternalForm().endsWith("/") : f; // NOI18N	141	assert !url.toExternalForm().endsWith("/") : f; // NOI18N




import org.netbeans.spi.project.support.ant.PropertyEvaluator;
import org.openide.util.ChangeSupport;
import org.openide.util.Exceptions;
import org.openide.util.Utilities;
import org.openide.util.WeakListeners;

/**

                if (javadocDir != null) {
                    File f = helper.resolveFile(javadocDir);
                    try {
                        URL url = Utilities.toURI(f).toURL();
                        if (!f.exists()) {
                            assert !url.toExternalForm().endsWith("/") : f; // NOI18N
                            url = new URL(url.toExternalForm() + "/"); // NOI18N

            String outDir = evaluator.getProperty(binaryProperty);
            if (outDir != null) {
                File f = helper.resolveFile(outDir);
                URL url = Utilities.toURI(f).toURL();
                if (!f.exists() && !f.getPath().toLowerCase().endsWith(".jar")) { // NOI18N
                    assert !url.toExternalForm().endsWith("/") : f; // NOI18N
                    url = new URL(url.toExternalForm() + "/"); // NOI18N

Lines 67-72 Link Here

(-)a/java.api.common/src/org/netbeans/modules/java/api/common/queries/QuerySupport.java (-1 / +2 lines)
67	import org.netbeans.spi.queries.SharabilityQueryImplementation2;	67	import org.netbeans.spi.queries.SharabilityQueryImplementation2;
68	import org.openide.loaders.CreateFromTemplateAttributesProvider;	68	import org.openide.loaders.CreateFromTemplateAttributesProvider;
69	import org.openide.util.Parameters;	69	import org.openide.util.Parameters;
		70	import org.openide.util.Utilities;
70	import org.openide.util.WeakListeners;	71	import org.openide.util.WeakListeners;
71	import org.w3c.dom.Element;	72	import org.w3c.dom.Element;
72		73
Lines 208-214 Link Here
208	final SharabilityQueryImplementation2 sq2 = createSharabilityQuery2(helper, evaluator, srcRoots, testRoots, additionalSourceRoots);	209	final SharabilityQueryImplementation2 sq2 = createSharabilityQuery2(helper, evaluator, srcRoots, testRoots, additionalSourceRoots);
209	return new SharabilityQueryImplementation() {	210	return new SharabilityQueryImplementation() {
210	@Override public int getSharability(File file) {	211	@Override public int getSharability(File file) {
211	return sq2.getSharability(file.toURI()).ordinal();	212	return sq2.getSharability(Utilities.toURI(file)).ordinal();
212	}	213	}
213	};	214	};
214	}	215	}

Lines 299-305 Link Here

(-)a/java.j2seproject/nbproject/project.xml (-1 / +1 lines)
299	<build-prerequisite/>	299	<build-prerequisite/>
300	<compile-dependency/>	300	<compile-dependency/>
301	<run-dependency>	301	<run-dependency>
302	<specification-version>8.6</specification-version>	302	<specification-version>8.25</specification-version>
303	</run-dependency>	303	</run-dependency>
304	</dependency>	304	</dependency>
305	<dependency>	305	<dependency>

Lines 73-78 Link Here

(-)a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEProjectOperations.java (-1 / +2 lines)
73	import org.openide.util.Exceptions;	73	import org.openide.util.Exceptions;
74	import org.openide.util.Lookup;	74	import org.openide.util.Lookup;
75	import org.openide.util.NbBundle;	75	import org.openide.util.NbBundle;
		76	import org.openide.util.Utilities;
76		77
77	/**	78	/**
78	*	79	*
Lines 334-340 Link Here
334	if (libraryPath != null) {	335	if (libraryPath != null) {
335	File prjRoot = FileUtil.toFile(project.getProjectDirectory());	336	File prjRoot = FileUtil.toFile(project.getProjectDirectory());
336	libraryFile = PropertyUtils.resolveFile(prjRoot, libraryPath);	337	libraryFile = PropertyUtils.resolveFile(prjRoot, libraryPath);
337	if (FileOwnerQuery.getOwner(libraryFile.toURI()) == project &&	338	if (FileOwnerQuery.getOwner(Utilities.toURI(libraryFile)) == project &&
338	libraryFile.getAbsolutePath().startsWith(prjRoot.getAbsolutePath())) {	339	libraryFile.getAbsolutePath().startsWith(prjRoot.getAbsolutePath())) {
339	//do not update the relative path if within the project..	340	//do not update the relative path if within the project..
340	libraryWithinProject = true;	341	libraryWithinProject = true;

Lines 70-75 Link Here

(-)a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/LibrariesNodeFactory.java (-1 / +2 lines)
70	import org.openide.nodes.Node;	70	import org.openide.nodes.Node;
71	import org.openide.util.ChangeSupport;	71	import org.openide.util.ChangeSupport;
72	import org.openide.util.NbBundle;	72	import org.openide.util.NbBundle;
		73	import org.openide.util.Utilities;
73		74
74	/**	75	/**
75	*	76	*
Lines 118-124 Link Here
118	URL[] testRoots = testSources.getRootURLs();	119	URL[] testRoots = testSources.getRootURLs();
119	boolean addTestSources = false;	120	boolean addTestSources = false;
120	for (int i = 0; i < testRoots.length; i++) {	121	for (int i = 0; i < testRoots.length; i++) {
121	File f = new File(URI.create(testRoots[i].toExternalForm()));	122	File f = Utilities.toFile(URI.create(testRoots[i].toExternalForm()));
122	if (f.exists()) {	123	if (f.exists()) {
123	addTestSources = true;	124	addTestSources = true;
124	break;	125	break;

Lines 69-74 Link Here

(-)a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/CustomizerLibraries.java (-1 / +2 lines)
69	import org.openide.util.Exceptions;	69	import org.openide.util.Exceptions;
70	import org.openide.util.HelpCtx;	70	import org.openide.util.HelpCtx;
71	import org.openide.util.NbBundle;	71	import org.openide.util.NbBundle;
		72	import org.openide.util.Utilities;
72		73
73	/** Customizer for general project attributes.	74	/** Customizer for general project attributes.
74	*	75	*
Lines 230-236 Link Here
230	try {	231	try {
231	File base = FileUtil.toFile(uiProperties.getProject().getProjectDirectory());	232	File base = FileUtil.toFile(uiProperties.getProject().getProjectDirectory());
232	File location = FileUtil.normalizeFile(PropertyUtils.resolveFile(base, loc));	233	File location = FileUtil.normalizeFile(PropertyUtils.resolveFile(base, loc));
233	URL url = location.toURI().toURL();	234	URL url = Utilities.toURI(location).toURL();
234	man = LibraryManager.forLocation(url);	235	man = LibraryManager.forLocation(url);
235	} catch (MalformedURLException ex) {	236	} catch (MalformedURLException ex) {
236	Exceptions.printStackTrace(ex);	237	Exceptions.printStackTrace(ex);

Lines 67-72 Link Here

(-)a/java.j2seproject/test/unit/src/org/netbeans/modules/java/j2seproject/J2SEProjectGeneratorTest.java (-2 / +3 lines)
67	import org.openide.filesystems.FileUtil;	67	import org.openide.filesystems.FileUtil;
68	import org.openide.modules.SpecificationVersion;	68	import org.openide.modules.SpecificationVersion;
69	import org.openide.util.Lookup;	69	import org.openide.util.Lookup;
		70	import org.openide.util.Utilities;
70	import org.openide.util.test.MockLookup;	71	import org.openide.util.test.MockLookup;
71		72
72	/**	73	/**
Lines 154-161 Link Here
154	AntProjectHelper helper = J2SEProjectGenerator.createProject(proj, "test-project-ext-src", new File[] {srcRoot}, new File[] {testRoot}, "manifest.mf", null, null);	155	AntProjectHelper helper = J2SEProjectGenerator.createProject(proj, "test-project-ext-src", new File[] {srcRoot}, new File[] {testRoot}, "manifest.mf", null, null);
155	final Project expected = FileOwnerQuery.getOwner(helper.getProjectDirectory());	156	final Project expected = FileOwnerQuery.getOwner(helper.getProjectDirectory());
156	assertNotNull(expected);	157	assertNotNull(expected);
157	assertEquals(expected, FileOwnerQuery.getOwner(srcRoot.toURI()));	158	assertEquals(expected, FileOwnerQuery.getOwner(Utilities.toURI(srcRoot)));
158	assertEquals(expected, FileOwnerQuery.getOwner(testRoot.toURI()));	159	assertEquals(expected, FileOwnerQuery.getOwner(Utilities.toURI(testRoot)));
159	}	160	}
160		161
161	public void testProjectBuilder() throws Exception {	162	public void testProjectBuilder() throws Exception {




import org.openide.filesystems.test.TestFileUtils;
import org.openide.modules.SpecificationVersion;
import org.openide.util.Lookup;
import org.openide.util.Utilities;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
import org.openide.util.test.MockLookup;

        assertEquals(1,cpRoots.length);
        URI projectURI = URI.create(output.getProject().getProjectDirectory().toURL().toExternalForm());
        URI expected = projectURI.resolve(output.getArtifactLocations()[0]);
        assertEquals(expected,Utilities.toURI(this.helper.resolveFile(cpRoots[0])));
        ProjectClassPathModifier.removeAntArtifacts(new AntArtifact[] {output}, new URI[] {output.getArtifactLocations()[0]},this.src, ClassPath.COMPILE);
        cp = this.eval.getProperty("javac.classpath");
        assertNotNull (cp);

    @RandomlyFails // NB-Core-Build #3223; javac.classpath="" after addition
    public void testProjectLibrary() throws Exception {
        assertEquals(Collections.emptyList(), getPrjLibRefs());
        URL base = Utilities.toURI(getWorkDir()).toURL();
        helper.setLibrariesLocation(".."+File.separatorChar+"defs.properties");
        Library lib = LibraryManager.forLocation(new URL(base, "defs.properties")).createLibrary("j2se", "test",
                Collections.singletonMap("classpath", Collections.singletonList(new URL(base, "stuff/"))));




import org.netbeans.modules.java.j2seproject.J2SEProjectGenerator;
import org.netbeans.modules.java.j2seproject.SourceRootsTest;
import org.openide.util.Mutex;
import org.openide.util.Utilities;
import org.openide.util.test.MockLookup;

public class SourcePathImplementationTest extends NbTestCase {

        src2.mkdir();
        AntProjectHelper h = J2SEProjectGenerator.createProject(new File(getWorkDir(), "prj"), "test", new File[] {src1, src2}, new File[0], null, null, null);
        Project p = ProjectManager.getDefault().findProject(h.getProjectDirectory());
        FileOwnerQuery.markExternalOwner(Utilities.toURI(src1), p, FileOwnerQuery.EXTERNAL_ALGORITHM_TRANSIENT);
        ClassPath cp = ClassPath.getClassPath(FileUtil.toFileObject(src1), ClassPath.SOURCE);
        assertNotNull(cp);        
        assertEquals(2, cp.getRoots().length);
        ClassPath.Entry cpe2 = cp.entries().get(1);
        assertEquals(Utilities.toURI(src2).toURL(), cpe2.getURL());
        assertTrue(cpe2.includes("stuff/"));
        assertTrue(cpe2.includes("whatever/"));
        class L implements PropertyChangeListener {

Lines 240-246 Link Here

(-)a/java.project/nbproject/project.xml (-1 / +1 lines)
240	<build-prerequisite/>	240	<build-prerequisite/>
241	<compile-dependency/>	241	<compile-dependency/>
242	<run-dependency>	242	<run-dependency>
243	<specification-version>8.0</specification-version>	243	<specification-version>8.25</specification-version>
244	</run-dependency>	244	</run-dependency>
245	</dependency>	245	</dependency>
246	<dependency>	246	<dependency>

Lines 63-68 Link Here

(-)a/java.project/src/org/netbeans/api/java/project/classpath/ProjectClassPathModifier.java (-1 / +2 lines)
63	import org.openide.filesystems.FileUtil;	63	import org.openide.filesystems.FileUtil;
64	import org.openide.filesystems.URLMapper;	64	import org.openide.filesystems.URLMapper;
65	import org.openide.util.Parameters;	65	import org.openide.util.Parameters;
		66	import org.openide.util.Utilities;
66		67
67	/**	68	/**
68	* An API for project's classpaths modification.	69	* An API for project's classpaths modification.
Lines 194-200 Link Here
194	}	195	}
195	final FileObject fo;	196	final FileObject fo;
196	if (urlToAdd.isAbsolute()) {	197	if (urlToAdd.isAbsolute()) {
197	fo = FileUtil.toFileObject(new File(urlToAdd));	198	fo = FileUtil.toFileObject(Utilities.toFile(urlToAdd));
198	} else {	199	} else {
199	File f = PropertyUtils.resolveFile(projectFolderFile, LibrariesSupport.convertURIToFilePath(urlToAdd));	200	File f = PropertyUtils.resolveFile(projectFolderFile, LibrariesSupport.convertURIToFilePath(urlToAdd));
200	fo = FileUtil.toFileObject(f);	201	fo = FileUtil.toFileObject(f);

Lines 70-75 Link Here

(-)a/java.project/src/org/netbeans/modules/java/project/ExtraProjectSourceForBinaryQueryImpl.java (-1 / +2 lines)
70	import org.openide.filesystems.URLMapper;	70	import org.openide.filesystems.URLMapper;
71	import org.openide.util.ChangeSupport;	71	import org.openide.util.ChangeSupport;
72	import org.openide.util.Exceptions;	72	import org.openide.util.Exceptions;
		73	import org.openide.util.Utilities;
73		74
74	/**	75	/**
75	*	76	*
Lines 164-170 Link Here
164	// #138349 - ignore non existing paths or entries with undefined IDE variables	165	// #138349 - ignore non existing paths or entries with undefined IDE variables
165	if (src.exists()) {	166	if (src.exists()) {
166	try {	167	try {
167	URL url = src.toURI().toURL();	168	URL url = Utilities.toURI(src).toURL();
168	if (FileUtil.isArchiveFile(url)) {	169	if (FileUtil.isArchiveFile(url)) {
169	url = FileUtil.getArchiveRoot(url);	170	url = FileUtil.getArchiveRoot(url);
170	}	171	}

Lines 65-70 Link Here

(-)a/java.project/src/org/netbeans/spi/java/project/classpath/support/ProjectClassPathImplementation.java (-1 / +2 lines)
65	import org.openide.filesystems.FileObject;	65	import org.openide.filesystems.FileObject;
66	import org.openide.filesystems.FileUtil;	66	import org.openide.filesystems.FileUtil;
67	import org.openide.filesystems.URLMapper;	67	import org.openide.filesystems.URLMapper;
		68	import org.openide.util.Utilities;
68	import org.openide.util.WeakListeners;	69	import org.openide.util.WeakListeners;
69		70
70	/**	71	/**
Lines 150-156 Link Here
150	//Logging for issue #181155, #186213	151	//Logging for issue #181155, #186213
151	String foStatus;	152	String foStatus;
152	try {	153	try {
153	final FileObject fo = URLMapper.findFileObject(f.toURI().toURL());	154	final FileObject fo = URLMapper.findFileObject(Utilities.toURI(f).toURL());
154	foStatus = fo == null ? "not exist" : fo.isValid() ? fo.isFolder() ? "valid folder" : "valid file" : "invalid"; //NOI18N	155	foStatus = fo == null ? "not exist" : fo.isValid() ? fo.isFolder() ? "valid folder" : "valid file" : "invalid"; //NOI18N
155	} catch (MalformedURLException ex) {	156	} catch (MalformedURLException ex) {
156	foStatus = "malformed"; //NOI18N	157	foStatus = "malformed"; //NOI18N

Lines 82-87 Link Here

(-)a/java.project/src/org/netbeans/spi/java/project/support/ui/MakeSharableVisualPanel2.java (-1 / +2 lines)
82	import org.openide.util.Exceptions;	82	import org.openide.util.Exceptions;
83	import org.openide.util.NbBundle.Messages;	83	import org.openide.util.NbBundle.Messages;
84	import org.openide.util.NbCollections;	84	import org.openide.util.NbCollections;
		85	import org.openide.util.Utilities;
85		86
86	final class MakeSharableVisualPanel2 extends JPanel {	87	final class MakeSharableVisualPanel2 extends JPanel {
87		88
Lines 360-366 Link Here
360	File libraryFile = helper.resolveFile(location);	361	File libraryFile = helper.resolveFile(location);
361	File prjDir = FileUtil.toFile(helper.getProjectDirectory());	362	File prjDir = FileUtil.toFile(helper.getProjectDirectory());
362	boolean absoluteLibrary = LibrariesSupport.convertFilePathToURI(location).isAbsolute();	363	boolean absoluteLibrary = LibrariesSupport.convertFilePathToURI(location).isAbsolute();
363	LibraryManager newmanager = LibraryManager.forLocation(libraryFile.toURI().toURL());	364	LibraryManager newmanager = LibraryManager.forLocation(Utilities.toURI(libraryFile).toURL());
364	LibraryManager oldmanager = LibraryManager.getDefault(); //TODO once we support moving from one place to another, change this	365	LibraryManager oldmanager = LibraryManager.getDefault(); //TODO once we support moving from one place to another, change this
365	for (String lib : libraries) {	366	for (String lib : libraries) {
366	Library library = oldmanager.getLibrary(lib);	367	Library library = oldmanager.getLibrary(lib);




import org.openide.util.NbBundle.Messages;
import org.openide.util.NbCollections;
import org.openide.util.NbPreferences;
import org.openide.util.Utilities;

/**
 * Utility methods related to sharable libraries UI.

            assert loc != null;
            File mainPropertiesFile = helper.resolveFile(loc);
            try {
                LibraryManager man = LibraryManager.forLocation(Utilities.toURI(mainPropertiesFile).toURL());
                Map<String, List<URI>> volumes = new HashMap<String, List<URI>>();
                LibraryTypeProvider provider = LibrariesSupport.getLibraryTypeProvider(library.getType());
                assert provider != null;

                                String str = PropertyUtils.relativizeFile(mainPropertiesFile.getParentFile(), path);
                                if (str == null) {
                                    // the relative path cannot be established, different drives?
                                    uri = Utilities.toURI(path);
                                } else {
                                    uri = LibrariesSupport.convertFilePathToURI(str);
                                }
                            } else {
                                File path = FileUtil.toFile(fo);
                                uri = Utilities.toURI(path);
                            }
                            if (FileUtil.isArchiveFile(fo)) {
                                uri = appendJarFolder(uri, jarFolder);




import org.netbeans.modules.java.source.usages.BuildArtifactMapperImpl;
import org.netbeans.modules.parsing.api.indexing.IndexingManager;
import org.netbeans.spi.project.support.ant.PropertyUtils;
import org.openide.util.Utilities;

/**
 *

                File f = PropertyUtils.resolveFile(p.getBaseDir().getAbsoluteFile(), path);
                
                try {
                    Boolean built = BuildArtifactMapperImpl.ensureBuilt(Utilities.toURI(f).toURL(), getProject(), false, true);

                    if (built == null) {
                        noBin = true;


                    try {
                        p.log("Forcing rescan of: " + f.getAbsolutePath(), Project.MSG_VERBOSE);
                        IndexingManager.getDefault().refreshIndex(Utilities.toURI(f).toURL(), null, false);
                    } catch (MalformedURLException ex) {
                        p.log(ex.getMessage(), ex, Project.MSG_VERBOSE);
                    }

Lines 58-63 Link Here

(-)a/java.source.ant/antsrc/org/netbeans/modules/java/source/ant/TranslateClassPath.java (-2 / +3 lines)
58	import org.openide.filesystems.FileObject;	58	import org.openide.filesystems.FileObject;
59	import org.openide.filesystems.FileUtil;	59	import org.openide.filesystems.FileUtil;
60	import org.openide.filesystems.URLMapper;	60	import org.openide.filesystems.URLMapper;
		61	import org.openide.util.Utilities;
61		62
62	/**	63	/**
63	*	64	*
Lines 148-155 Link Here
148	continue;	149	continue;
149	}	150	}
150		151
151	final Boolean bamiResult = clean ? BuildArtifactMapperImpl.clean(sourceFile.toURI().toURL())	152	final Boolean bamiResult = clean ? BuildArtifactMapperImpl.clean(Utilities.toURI(sourceFile).toURL())
152	: BuildArtifactMapperImpl.ensureBuilt(sourceFile.toURI().toURL(), getProject(), true, true);	153	: BuildArtifactMapperImpl.ensureBuilt(Utilities.toURI(sourceFile).toURL(), getProject(), true, true);
153	if (bamiResult == null) {	154	if (bamiResult == null) {
154	appendEntry = true;	155	appendEntry = true;
155	continue;	156	continue;

Lines 156-162 Link Here

(-)a/java.source.ant/nbproject/project.xml (-1 / +1 lines)
156	<build-prerequisite/>	156	<build-prerequisite/>
157	<compile-dependency/>	157	<compile-dependency/>
158	<run-dependency>	158	<run-dependency>
159	<specification-version>8.0</specification-version>	159	<specification-version>8.25</specification-version>
160	</run-dependency>	160	</run-dependency>
161	</dependency>	161	</dependency>
162	<dependency>	162	<dependency>

Lines 105-110 Link Here

(-)a/java.source.ant/src/org/netbeans/modules/java/source/ant/ProjectRunnerImpl.java (-1 / +2 lines)
105	import org.netbeans.api.project.ProjectManager;	105	import org.netbeans.api.project.ProjectManager;
106	import org.openide.loaders.DataObject;	106	import org.openide.loaders.DataObject;
107	import org.openide.util.Lookup;	107	import org.openide.util.Lookup;
		108	import org.openide.util.Utilities;
108	import org.openide.util.lookup.AbstractLookup;	109	import org.openide.util.lookup.AbstractLookup;
109	import org.openide.util.lookup.InstanceContent;	110	import org.openide.util.lookup.InstanceContent;
110		111
Lines 484-490 Link Here
484	continue;	485	continue;
485	}	486	}
486		487
487	BuildArtifactMapperImpl.clean(sourceFile.toURI().toURL());	488	BuildArtifactMapperImpl.clean(Utilities.toURI(sourceFile).toURL());
488	}	489	}
489	}	490	}
490	}	491	}

Lines 383-389 Link Here

(-)a/java.source/nbproject/project.xml (-1 / +1 lines)
383	<build-prerequisite/>	383	<build-prerequisite/>
384	<compile-dependency/>	384	<compile-dependency/>
385	<run-dependency>	385	<run-dependency>
386	<specification-version>8.4</specification-version>	386	<specification-version>8.25</specification-version>
387	</run-dependency>	387	</run-dependency>
388	</dependency>	388	</dependency>
389	<dependency>	389	<dependency>

Lines 178-184 Link Here

(-)a/java.source/src/org/netbeans/api/java/source/ModificationResult.java (-1 / +1 lines)
178	for (List<Difference> ds:diffs.values()) {	178	for (List<Difference> ds:diffs.values()) {
179	for (Difference d: ds) {	179	for (Difference d: ds) {
180	if (d.getKind() == Difference.Kind.CREATE) {	180	if (d.getKind() == Difference.Kind.CREATE) {
181	newFiles.add(new File(((CreateChange) d).getFileObject().toUri()));	181	newFiles.add(org.openide.util.Utilities.toFile(((CreateChange) d).getFileObject().toUri()));
182	}	182	}
183	}	183	}
184	}	184	}

Lines 970-976 Link Here

(-)a/java.source/src/org/netbeans/api/java/source/SourceUtils.java (-1 / +1 lines)
970	Iterable<? extends URL> mainClasses = ExecutableFilesIndex.DEFAULT.getMainClasses(rootURL);	970	Iterable<? extends URL> mainClasses = ExecutableFilesIndex.DEFAULT.getMainClasses(rootURL);
971	List<ElementHandle<TypeElement>> classes = new LinkedList<ElementHandle<TypeElement>>();	971	List<ElementHandle<TypeElement>> classes = new LinkedList<ElementHandle<TypeElement>>();
972	for (URL mainClass : mainClasses) {	972	for (URL mainClass : mainClasses) {
973	File mainFo = new File (URI.create(mainClass.toExternalForm()));	973	File mainFo = Utilities.toFile(URI.create(mainClass.toExternalForm()));
974	if (mainFo.exists()) {	974	if (mainFo.exists()) {
975	classes.addAll(JavaCustomIndexer.getRelatedTypes(mainFo, rootFile));	975	classes.addAll(JavaCustomIndexer.getRelatedTypes(mainFo, rootFile));
976	}	976	}

Lines 108-113 Link Here

(-)a/java.source/src/org/netbeans/api/java/source/WorkingCopy.java (-1 / +2 lines)
108	import org.openide.loaders.DataFolder;	108	import org.openide.loaders.DataFolder;
109	import org.openide.loaders.DataObject;	109	import org.openide.loaders.DataObject;
110	import org.openide.util.NbBundle;	110	import org.openide.util.NbBundle;
		111	import org.openide.util.Utilities;
111		112
112	/**XXX: extends CompilationController now, finish method delegation	113	/**XXX: extends CompilationController now, finish method delegation
113	*	114	*
Lines 696-702 Link Here
696	return scratchFolder.createData("out", "java");	697	return scratchFolder.createData("out", "java");
697	}	698	}
698		699
699	File pack = new File(sourceFile.toUri()).getParentFile();	700	File pack = Utilities.toFile(sourceFile.toUri()).getParentFile();
700		701
701	while (FileUtil.toFileObject(pack) == null) {	702	while (FileUtil.toFileObject(pack) == null) {
702	pack = pack.getParentFile();	703	pack = pack.getParentFile();




import static org.openide.util.ImageUtilities.assignToolTipToImage;
import static org.openide.util.ImageUtilities.loadImage;
import static org.openide.util.NbBundle.getMessage;
import org.openide.util.Utilities;

/**
 * The node representation of Java source files.

                    URL u = entry.getURL();
                    String item = u.toExternalForm(); // fallback
                    if (u.getProtocol().equals("file")) { // NOI18N
                        item = Utilities.toFile(URI.create(item)).getAbsolutePath();
                    } else if (u.getProtocol().equals("jar") && item.endsWith("!/")) { // NOI18N
                        URL embedded = FileUtil.getArchiveFile(u);
                        assert embedded != null : u;
                        if (embedded.getProtocol().equals("file")) { // NOI18N
                            item = Utilities.toFile(URI.create(embedded.toExternalForm())).getAbsolutePath();
                        }
                    }
                    if (sb.length() > 0) {




import org.netbeans.modules.java.source.indexing.JavaIndex;
import org.openide.util.Exceptions;
import org.openide.util.Parameters;
import org.openide.util.Utilities;

/**
 *

                return sourceRoot;
            }
            final File aptFolder = JavaIndex.getAptFolder(sourceRoot, true);
            final URL result = Utilities.toURI(aptFolder).toURL();
            emittedAptFolders.put(result,sourceRoot);
            return result;
        } catch (MalformedURLException e) {

        if (sourceRoot != null) {
            try {
                final File result = JavaIndex.getClassFolder(sourceRoot);
                return Utilities.toURI(result).toURL();
            } catch (IOException ex) {
                Exceptions.printStackTrace(ex);
            }




import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.util.Exceptions;
import org.openide.util.Utilities;

/**
 *

                            context.getRoot()
                        });
                } else if (FileUtil.isParentOf(context.getRoot(), resource)) {
                    updated.add(Utilities.toFile(url.toURI()));
                }
            } catch (URISyntaxException ex) {
                Exceptions.printStackTrace(ex);

        }

        try {
            File sourceRootFile = Utilities.toFile(context.getRootURI().toURI());

            if (!context.checkForEditorModifications()) { // #187514, see also #152222 and JavaCustomIndexer
                BuildArtifactMapperImpl.classCacheUpdated(context.getRootURI(), sourceRootFile, Collections.<File>emptyList(), updated, true);


            for (Indexable d : deleted) {
                try {
                    deletedFiles.add(Utilities.toFile(d.getURL().toURI()));
                } catch (URISyntaxException ex) {
                    Exceptions.printStackTrace(ex);
                }
            }

            try {
                File sourceRootFile = Utilities.toFile(context.getRootURI().toURI());

                BuildArtifactMapperImpl.classCacheUpdated(context.getRootURI(), sourceRootFile, deletedFiles, Collections.<File>emptyList(), true);
            } catch (URISyntaxException ex) {

Lines 347-353 Link Here

(-)a/java.source/src/org/netbeans/modules/java/source/indexing/JavaCustomIndexer.java (-2 / +2 lines)
347	return Collections.<CompileTuple>emptySet();	347	return Collections.<CompileTuple>emptySet();
348	}	348	}
349	try {	349	try {
350	final File root = new File (URI.create(rootURL.toString()));	350	final File root = Utilities.toFile(URI.create(rootURL.toString()));
351	return VirtualSourceProviderQuery.translate(virtualSources, root);	351	return VirtualSourceProviderQuery.translate(virtualSources, root);
352	} catch (IllegalArgumentException e) {	352	} catch (IllegalArgumentException e) {
353	//Called on non local fs => not supported, log and ignore.	353	//Called on non local fs => not supported, log and ignore.
Lines 426-432 Link Here
426	for (String fileName : readRSFile(file)) {	426	for (String fileName : readRSFile(file)) {
427	File f = new File (aptFolder, fileName);	427	File f = new File (aptFolder, fileName);
428	if (f.exists() && FileObjects.JAVA.equals(FileObjects.getExtension(f.getName()))) {	428	if (f.exists() && FileObjects.JAVA.equals(FileObjects.getExtension(f.getName()))) {
429	sourceRelativeURLPairs.add(Pair.of(fileName,f.toURI().toURL()));	429	sourceRelativeURLPairs.add(Pair.of(fileName,Utilities.toURI(f).toURL()));
430	}	430	}
431	fmTx.delete(f);	431	fmTx.delete(f);
432	}	432	}

Lines 65-70 Link Here

(-)a/java.source/src/org/netbeans/modules/java/source/indexing/JavaIndex.java (-1 / +2 lines)
65	import org.openide.filesystems.FileObject;	65	import org.openide.filesystems.FileObject;
66	import org.openide.filesystems.FileUtil;	66	import org.openide.filesystems.FileUtil;
67	import org.openide.filesystems.URLMapper;	67	import org.openide.filesystems.URLMapper;
		68	import org.openide.util.Utilities;
68		69
69	/**	70	/**
70	*	71	*
Lines 107-113 Link Here
107	}	108	}
108		109
109	public static File getClassFolder(File root) throws IOException {	110	public static File getClassFolder(File root) throws IOException {
110	return getClassFolder(root.toURI().toURL()); //XXX	111	return getClassFolder(Utilities.toURI(root).toURL()); //XXX
111	}	112	}
112		113
113	public static File getClassFolder(URL url) throws IOException {	114	public static File getClassFolder(URL url) throws IOException {




import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.filesystems.URLMapper;
import org.openide.util.Utilities;


/** Global cache for Archives (zip files and folders).

    private static Archive create( URL root, boolean cacheFile ) {
        String protocol = root.getProtocol();
        if ("file".equals(protocol)) {
            File f = Utilities.toFile(URI.create(root.toExternalForm()));
            if (f.isDirectory()) {
                return new FolderArchive (f);
            }

            URL inner = FileUtil.getArchiveFile(root);
            protocol = inner.getProtocol();
            if ("file".equals(protocol)) {
                File f = Utilities.toFile(URI.create(inner.toExternalForm()));
                if (f.isFile()) {
                    return new CachingArchive( f, cacheFile );
                }




     * @return the relative path
     */
    public static @NonNull String getRelativePath (@NonNull final URL root, @NonNull final URL fo) throws URISyntaxException {
        final String path = getRelativePath(Utilities.toFile(root.toURI()), Utilities.toFile(fo.toURI()));
        return path.replace(File.separatorChar, '/');   //NOI18N
    }
    

        @Override
        public URI toUri () {
            if (this.uriCache == null) {
                this.uriCache = Utilities.toURI(f);
            }
            return this.uriCache;
        }

        
        @Override
        public URI getArchiveURI () {
            return Utilities.toURI(this.archiveFile);
        }
        
        @Override

        
        @Override
        public URI getArchiveURI () {
            return Utilities.toURI(new File (this.zipFile.getName()));
        }
        
        @Override




import org.openide.filesystems.FileUtil;
import org.openide.filesystems.URLMapper;
import org.openide.util.Exceptions;
import org.openide.util.Utilities;

/**
 *

                for (File f : content) {
                    if ((kinds == null || kinds.contains(FileObjects.getKind(FileObjects.getExtension(f.getName())))) &&
                        f.isFile() &&
                        (entry == null || entry.includes(Utilities.toURI(f).toURL()))) {
                        result.add(FileObjects.fileFileObject(f,this.root,filter, encoding));
                    }
                }

            return FileObjects.fileFileObject(file,this.root,null,encoding);
        }
        try {
            final URL srcRoot = getBaseSourceRoot(Utilities.toURI(this.root).toURL());
            if (srcRoot != null && JavaIndex.hasSourceCache(srcRoot, false)) {
                if ("file".equals(srcRoot.getProtocol())) {         //NOI18N
                    final File folder = Utilities.toFile(srcRoot.toURI());
                    file = new File (folder,path);
                    if (file.exists()) {
                        return FileObjects.fileFileObject(file,folder,null,encoding);




import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.util.Exceptions;
import org.openide.util.Utilities;

/**
 *

                final URL classFolder = AptCacheForSourceQuery.getClassFolder(entry.getURL());
                if (classFolder != null) {
                    try {
                        return Utilities.toFile(classFolder.toURI());
                    } catch (URISyntaxException ex) {
                        Exceptions.printStackTrace(ex);
                    }

                        final URL classFolder = AptCacheForSourceQuery.getClassFolder(entry.getURL());
                        if (classFolder != null) {
                            try {
                                return Utilities.toFile(classFolder.toURI());
                            } catch (URISyntaxException ex) {
                                Exceptions.printStackTrace(ex);
                            }




import org.netbeans.modules.java.source.usages.Pair;
import org.openide.util.Exceptions;
import org.openide.util.Parameters;
import org.openide.util.Utilities;

/**
 *

                }
                apt = true;
            }
            final File sourceRoot = Utilities.toFile(sourceRootURL.toURI());
            final File classCache = apt ?
                Utilities.toFile(AptCacheForSourceQuery.getClassFolder(sourceRootURL).toURI()):
                JavaIndex.getClassFolder(sourceRoot);
            if (!genSources.isEmpty()) {
                final File sourceFile = Utilities.toFile(forSource.toURI());
                final String relativePath = FileObjects.stripExtension(FileObjects.getRelativePath(sourceRoot, sourceFile));
                final File cacheFile = new File (classCache, relativePath+'.'+FileObjects.RAPT);
                if (!cacheFile.getParentFile().exists()) {

                final StringBuilder sb = readResources(resFile, currentResources);
                boolean changed = false;
                for (javax.tools.FileObject file : genResources) {
                    String resPath = FileObjects.getRelativePath(Utilities.toURI(classCache).toURL(), file.toUri().toURL());
                    if (currentResources.add(resPath)) {
                        sb.append(resPath);
                        sb.append('\n');    //NOI18N

Lines 62-67 Link Here

(-)a/java.source/src/org/netbeans/modules/java/source/parsing/SourceFileManager.java (-1 / +2 lines)
62	import org.openide.filesystems.FileObject;	62	import org.openide.filesystems.FileObject;
63	import org.openide.filesystems.FileUtil;	63	import org.openide.filesystems.FileUtil;
64	import org.openide.filesystems.URLMapper;	64	import org.openide.filesystems.URLMapper;
		65	import org.openide.util.Utilities;
65		66
66	/**	67	/**
67	*	68	*
Lines 158-164 Link Here
158	if (rootFile == null) {	159	if (rootFile == null) {
159	return null;	160	return null;
160	}	161	}
161	return FileObjects.nbFileObject(new File(rootFile,FileObjects.convertFolder2Package(rp, File.separatorChar)).toURI().toURL(), roots[0]); //Todo: wrap to protect from write	162	return FileObjects.nbFileObject(Utilities.toURI(new File(rootFile,FileObjects.convertFolder2Package(rp, File.separatorChar))).toURL(), roots[0]); //Todo: wrap to protect from write
162	}	163	}
163	else {	164	else {
164	return SourceFileObject.create (fileRootPair[0], fileRootPair[1]); //Todo: wrap to protect from write	165	return SourceFileObject.create (fileRootPair[0], fileRootPair[1]); //Todo: wrap to protect from write

Lines 80-85 Link Here

(-)a/java.source/src/org/netbeans/modules/java/source/parsing/SourceFileObject.java (-1 / +2 lines)
80	import org.openide.filesystems.JarFileSystem;	80	import org.openide.filesystems.JarFileSystem;
81	import org.openide.loaders.DataObject;	81	import org.openide.loaders.DataObject;
82	import org.openide.text.NbDocument;	82	import org.openide.text.NbDocument;
		83	import org.openide.util.Utilities;
83		84
84	/**	85	/**
85	*	86	*
Lines 341-347 Link Here
341	public @Override String toString () {	342	public @Override String toString () {
342	final URI uri = toUri();	343	final URI uri = toUri();
343	try {	344	try {
344	final File file = new File (uri);	345	final File file = Utilities.toFile(uri);
345	return file.getAbsolutePath();	346	return file.getAbsolutePath();
346	} catch (IllegalArgumentException iae) {	347	} catch (IllegalArgumentException iae) {
347	return uri.toString();	348	return uri.toString();




import org.openide.filesystems.URLMapper;
import org.openide.util.Exceptions;
import org.openide.util.Parameters;
import org.openide.util.Utilities;




            final URL innerURL = FileUtil.getArchiveFile(root);
            if ("file".equals(innerURL.getProtocol())) {  //NOI18N
                //Fast way
                final File archive = Utilities.toFile(URI.create(innerURL.toExternalForm()));
                if (archive.canRead()) {
                    if (!isUpToDate(ROOT,archive.lastModified())) {
                        writer.clear();

            }
        } else if ("file".equals(mainP)) {    //NOI18N
            //Fast way
            final File rootFile = Utilities.toFile(URI.create(root.toExternalForm()));
            if (rootFile.isDirectory()) {
                String path = rootFile.getAbsolutePath ();
                if (path.charAt(path.length()-1) != File.separatorChar) {

                    } catch (InvalidClassFormatException icf) {
                        LOGGER.log(Level.WARNING, "Invalid class file format: {0}!/{1}",
                                new Object[]{
                                    Utilities.toURI(new File(zipFile.getName())),
                                    ze.getName()});     //NOI18N
                    } catch (IOException x) {
                        Exceptions.attachMessage(x, "While scanning: " + ze.getName());                                         //NOI18N




import org.openide.util.NbBundle;
import org.openide.util.NbPreferences;
import org.openide.util.RequestProcessor;
import org.openide.util.Utilities;
import org.openide.util.WeakSet;

/**

            File f = FileUtil.archiveOrDirForURL(u);

            try {
                if (FileUtil.isArchiveFile(Utilities.toURI(f).toURL())) {
                    continue;
                }
            

            }
            b.append("../"); // NOI18N
        }
        URI u = Utilities.toURI(base).relativize(Utilities.toURI(file));
        assert !u.isAbsolute() : u + " from " + basedir + " and " + file + " with common root " + base;
        b.append(u.getPath());
        if (b.charAt(b.length() - 1) == '/') {




import org.openide.util.LookupEvent;
import org.openide.util.LookupListener;
import org.openide.util.Parameters;
import org.openide.util.Utilities;
import org.openide.util.WeakListeners;

/**

                   l = p.second;
               }
               try {
                   final File file = Utilities.toFile(indexable.getURL().toURI());
                   l.add(file);
                   file2indexables.put(file, indexable);
               } catch (URISyntaxException use) {

            assert root != null;
            assert file2indexables != null;
            this.root = root;
            String _rootURL = Utilities.toURI(root).toURL().toString();
            if (!_rootURL.endsWith("/")) {   //NOI18N
                _rootURL = _rootURL + '/';    //NOI18N
            }

Lines 75-80 Link Here

(-)a/java.source/test/unit/src/org/netbeans/api/java/source/ElementHandleTest.java (-1 / +2 lines)
75	import org.openide.filesystems.FileObject;	75	import org.openide.filesystems.FileObject;
76	import org.openide.filesystems.FileUtil;	76	import org.openide.filesystems.FileUtil;
77	import org.openide.util.Lookup;	77	import org.openide.util.Lookup;
		78	import org.openide.util.Utilities;
78	import org.openide.util.lookup.Lookups;	79	import org.openide.util.lookup.Lookups;
79	import org.openide.util.lookup.ProxyLookup;	80	import org.openide.util.lookup.ProxyLookup;
80		81
Lines 719-725 Link Here
719	if (!f.exists()) {	720	if (!f.exists()) {
720	continue;	721	continue;
721	}	722	}
722	URL url = f.toURI().toURL();	723	URL url = Utilities.toURI(f).toURL();
723	if (FileUtil.isArchiveFile(url)) {	724	if (FileUtil.isArchiveFile(url)) {
724	url = FileUtil.getArchiveRoot(url);	725	url = FileUtil.getArchiveRoot(url);
725	}	726	}

Lines 77-82 Link Here

(-)a/java.source/test/unit/src/org/netbeans/api/java/source/JavaSourceTaskFactoryTest.java (-1 / +2 lines)
77	import org.openide.filesystems.FileObject;	77	import org.openide.filesystems.FileObject;
78	import org.openide.filesystems.FileUtil;	78	import org.openide.filesystems.FileUtil;
79	import org.openide.util.Lookup;	79	import org.openide.util.Lookup;
		80	import org.openide.util.Utilities;
80	import org.openide.util.lookup.ProxyLookup;	81	import org.openide.util.lookup.ProxyLookup;
81		82
82	/**	83	/**
Lines 372-378 Link Here
372	if (!f.exists()) {	373	if (!f.exists()) {
373	continue;	374	continue;
374	}	375	}
375	URL url = f.toURI().toURL();	376	URL url = Utilities.toURI(f).toURL();
376	if (FileUtil.isArchiveFile(url)) {	377	if (FileUtil.isArchiveFile(url)) {
377	url = FileUtil.getArchiveRoot(url);	378	url = FileUtil.getArchiveRoot(url);
378	}	379	}

Lines 2347-2353 Link Here

(-)a/java.source/test/unit/src/org/netbeans/api/java/source/JavaSourceTest.java (-2 / +2 lines)
2347	if (!f.exists()) {	2347	if (!f.exists()) {
2348	continue;	2348	continue;
2349	}	2349	}
2350	URL url = f.toURI().toURL();	2350	URL url = org.openide.util.Utilities.toURI(f).toURL();
2351	if (FileUtil.isArchiveFile(url)) {	2351	if (FileUtil.isArchiveFile(url)) {
2352	url = FileUtil.getArchiveRoot(url);	2352	url = FileUtil.getArchiveRoot(url);
2353	}	2353	}
Lines 2366-2372 Link Here
2366	if (!root.exists()) {	2366	if (!root.exists()) {
2367	root.mkdirs();	2367	root.mkdirs();
2368	}	2368	}
2369	return ClassPathSupport.createClassPath(new URL[] {root.toURI().toURL()});	2369	return ClassPathSupport.createClassPath(new URL[] {org.openide.util.Utilities.toURI(root).toURL()});
2370	}	2370	}
2371		2371
2372	private FileObject createTestFile (FileObject srcRoot, String relativeName, String content) throws IOException {	2372	private FileObject createTestFile (FileObject srcRoot, String relativeName, String content) throws IOException {

Lines 123-129 Link Here

(-)a/java.source/test/unit/src/org/netbeans/api/java/source/ScanUtilsTest.java (-2 / +2 lines)
123	if (!f.exists()) {	123	if (!f.exists()) {
124	continue;	124	continue;
125	}	125	}
126	URL url = f.toURI().toURL();	126	URL url = org.openide.util.Utilities.toURI(f).toURL();
127	if (FileUtil.isArchiveFile(url)) {	127	if (FileUtil.isArchiveFile(url)) {
128	url = FileUtil.getArchiveRoot(url);	128	url = FileUtil.getArchiveRoot(url);
129	}	129	}
Lines 142-148 Link Here
142	if (!root.exists()) {	142	if (!root.exists()) {
143	root.mkdirs();	143	root.mkdirs();
144	}	144	}
145	return ClassPathSupport.createClassPath(new URL[] {root.toURI().toURL()});	145	return ClassPathSupport.createClassPath(new URL[] {org.openide.util.Utilities.toURI(root).toURL()});
146	}	146	}
147		147
148	static class ScannerBlock implements Runnable {	148	static class ScannerBlock implements Runnable {

Lines 73-78 Link Here

(-)a/java.source/test/unit/src/org/netbeans/api/java/source/TestUtilities.java (-1 / +2 lines)
73	import org.netbeans.spi.java.classpath.support.ClassPathSupport;	73	import org.netbeans.spi.java.classpath.support.ClassPathSupport;
74	import org.openide.filesystems.FileObject;	74	import org.openide.filesystems.FileObject;
75	import org.openide.filesystems.FileUtil;	75	import org.openide.filesystems.FileUtil;
		76	import org.openide.util.Utilities;
76		77
77	/**	78	/**
78	* Utilities to aid unit testing java.source module.	79	* Utilities to aid unit testing java.source module.
Lines 161-167 Link Here
161	if (!f.exists()) {	162	if (!f.exists()) {
162	continue;	163	continue;
163	}	164	}
164	URL url = f.toURI().toURL();	165	URL url = Utilities.toURI(f).toURL();
165	if (FileUtil.isArchiveFile(url)) {	166	if (FileUtil.isArchiveFile(url)) {
166	url = FileUtil.getArchiveRoot(url);	167	url = FileUtil.getArchiveRoot(url);
167	}	168	}

Lines 55-60 Link Here

(-)a/java.source/test/unit/src/org/netbeans/api/java/source/TestUtilitiesTest.java (-1 / +2 lines)
55	import org.openide.filesystems.FileObject;	55	import org.openide.filesystems.FileObject;
56	import org.openide.filesystems.FileUtil;	56	import org.openide.filesystems.FileUtil;
57	import org.openide.filesystems.URLMapper;	57	import org.openide.filesystems.URLMapper;
		58	import org.openide.util.Utilities;
58		59
59	/**	60	/**
60	*	61	*
Lines 78-84 Link Here
78	sourceDir.mkdirs();	79	sourceDir.mkdirs();
79	boot = TestUtilities.createBootClassPath ();	80	boot = TestUtilities.createBootClassPath ();
80	compile = ClassPathSupport.createClassPath(new URL[0]);	81	compile = ClassPathSupport.createClassPath(new URL[0]);
81	source = ClassPathSupport.createClassPath(new URL[]{sourceDir.toURI().toURL()});	82	source = ClassPathSupport.createClassPath(new URL[]{Utilities.toURI(sourceDir).toURL()});
82	TestUtilities.setCacheFolder(cache);	83	TestUtilities.setCacheFolder(cache);
83	IndexingManager.getDefault().refreshIndexAndWait(sourceDir.toURL(), null);	84	IndexingManager.getDefault().refreshIndexAndWait(sourceDir.toURL(), null);
84	assertTrue(TestUtilities.waitScanFinished(10, TimeUnit.SECONDS));	85	assertTrue(TestUtilities.waitScanFinished(10, TimeUnit.SECONDS));

Lines 65-70 Link Here

(-)a/java.source/test/unit/src/org/netbeans/api/java/source/UiUtilsTest.java (-1 / +2 lines)
65	import java.util.Collections;	65	import java.util.Collections;
66	import java.util.List;	66	import java.util.List;
67	import java.util.StringTokenizer;	67	import java.util.StringTokenizer;
		68	import org.openide.util.Utilities;
68		69
69	/**	70	/**
70	* @author Tomas Zezula	71	* @author Tomas Zezula
Lines 159-165 Link Here
159	while (tk.hasMoreTokens()) {	160	while (tk.hasMoreTokens()) {
160	String token = tk.nextToken();	161	String token = tk.nextToken();
161	File f = new File(token);	162	File f = new File(token);
162	URL url = f.toURI().toURL();	163	URL url = Utilities.toURI(f).toURL();
163	if (FileUtil.isArchiveFile(url)) {	164	if (FileUtil.isArchiveFile(url)) {
164	url = FileUtil.getArchiveRoot(url);	165	url = FileUtil.getArchiveRoot(url);
165	} else if (!f.exists()) {	166	} else if (!f.exists()) {




import org.openide.filesystems.FileStateInvalidException;
import org.openide.filesystems.FileUtil;
import org.openide.util.SharedClassObject;
import org.openide.util.Utilities;

/**
 *

        URL url = null;
        try {
            if (isArchiveFile(f)) {
                url = FileUtil.getArchiveRoot(Utilities.toURI(f).toURL());
            } else {
                url = Utilities.toURI(f).toURL();
                String surl = url.toExternalForm();
                if (!surl.endsWith("/")) {
                    url = new URL(surl+"/");




import org.openide.filesystems.FileUtil;
import org.openide.util.Exceptions;
import org.openide.util.SharedClassObject;
import org.openide.util.Utilities;

/**
 *

        URL url = null;
        try {
            if (isArchiveFile(f)) {
                url = FileUtil.getArchiveRoot(Utilities.toURI(f).toURL());
            } else {
                url = Utilities.toURI(f).toURL();
                String surl = url.toExternalForm();
                if (!surl.endsWith("/")) {
                    url = new URL(surl+"/");




import org.netbeans.spi.java.classpath.support.ClassPathSupport;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.util.Utilities;

/**
 * Tests imports matching and its correct adding/removing. Just generator

            "\n" +
            "public abstract class Test implements Entry, Map {\n" +
            "}\n";
        final TransactionContext ctx = TransactionContext.beginStandardTransaction(true, Utilities.toURI(getWorkDir()).toURL());
        try {
            ClasspathInfo cpInfo = ClasspathInfoAccessor.getINSTANCE().create (ClassPathSupport.createClassPath(System.getProperty("sun.boot.class.path")), ClassPath.EMPTY, ClassPathSupport.createClassPath(getSourcePath()), null, true, false, false, true);
            JavaSource src = JavaSource.create(cpInfo, FileUtil.toFileObject(testFile));

            "public abstract class Entry implements Map.Entry, Map {\n" +
            "}\n";

        final TransactionContext ctx = TransactionContext.beginStandardTransaction(true, Utilities.toURI(getWorkDir()).toURL());
        try {
            ClasspathInfo cpInfo = ClasspathInfoAccessor.getINSTANCE().create (ClassPathSupport.createClassPath(System.getProperty("sun.boot.class.path")), ClassPath.EMPTY, ClassPathSupport.createClassPath(getSourcePath()), null, true, false, false, true);
            JavaSource src = JavaSource.create(cpInfo, FileUtil.toFileObject(testFile));

Lines 152-158 Link Here

(-)a/java.source/test/unit/src/org/netbeans/api/java/source/performance/Utilities.java (-1 / +1 lines)
152	if (!root.exists()) {	152	if (!root.exists()) {
153	root.mkdirs();	153	root.mkdirs();
154	}	154	}
155	return ClassPathSupport.createClassPath(new URL[]{root.toURI().toURL()});	155	return ClassPathSupport.createClassPath(new URL[]{org.openide.util.Utilities.toURI(root).toURL()});
156	}	156	}
157		157
158	public static String projectOpen(String path, String tmpFile) {	158	public static String projectOpen(String path, String tmpFile) {




import java.io.File;
import java.net.URI;
import java.net.MalformedURLException;
import org.openide.util.Utilities;

/**
 * @author Rastislav Komara (<a href="mailto:moonko@netbeans.orgm">RKo</a>)

        }
        URI uri2;
        try {
            uri2 = URI.create(Utilities.toURI(file).toURL().toExternalForm());
        } catch (Exception e) {
//            fail(e.getMessage());
            e.printStackTrace(getLog());

        }
        URI uri3;
        try {
            uri3 = Utilities.toURI(file);
        } catch (Exception e) {
            //            fail(e.getMessage());
            e.printStackTrace(getLog());

Lines 57-62 Link Here

(-)a/java.source/test/unit/src/org/netbeans/modules/java/source/classpath/SourcePathTest.java (-2 / +3 lines)
57	import org.netbeans.spi.java.classpath.ClassPathImplementation;	57	import org.netbeans.spi.java.classpath.ClassPathImplementation;
58	import org.netbeans.spi.java.classpath.PathResourceImplementation;	58	import org.netbeans.spi.java.classpath.PathResourceImplementation;
59	import org.netbeans.spi.java.classpath.support.ClassPathSupport;	59	import org.netbeans.spi.java.classpath.support.ClassPathSupport;
		60	import org.openide.util.Utilities;
60		61
61	/**	62	/**
62	*	63	*
Lines 82-89 Link Here
82		83
83	final ClassPathImplementation baseImpl = ClassPathSupport.createClassPathImplementation(	84	final ClassPathImplementation baseImpl = ClassPathSupport.createClassPathImplementation(
84	Arrays.asList(new PathResourceImplementation[] {	85	Arrays.asList(new PathResourceImplementation[] {
85	ClassPathSupport.createResource(r1.toURI().toURL()),	86	ClassPathSupport.createResource(Utilities.toURI(r1).toURL()),
86	ClassPathSupport.createResource(r2.toURI().toURL())	87	ClassPathSupport.createResource(Utilities.toURI(r2).toURL())
87	}));	88	}));
88	final ClassPath base = ClassPathFactory.createClassPath(baseImpl);	89	final ClassPath base = ClassPathFactory.createClassPath(baseImpl);
89		90

Lines 61-66 Link Here

(-)a/java.source/test/unit/src/org/netbeans/modules/java/source/parsing/CachingFileManagerTest.java (-1 / +2 lines)
61	import org.netbeans.modules.java.source.usages.Pair;	61	import org.netbeans.modules.java.source.usages.Pair;
62	import org.netbeans.spi.java.classpath.support.ClassPathSupport;	62	import org.netbeans.spi.java.classpath.support.ClassPathSupport;
63	import org.openide.filesystems.FileUtil;	63	import org.openide.filesystems.FileUtil;
		64	import org.openide.util.Utilities;
64		65
65	/**	66	/**
66	*	67	*
Lines 102-108 Link Here
102	} finally {	103	} finally {
103	out.close();	104	out.close();
104	}	105	}
105	final URL archiveRoot = FileUtil.getArchiveRoot(archiveFile.toURI().toURL());	106	final URL archiveRoot = FileUtil.getArchiveRoot(Utilities.toURI(archiveFile).toURL());
106	final URI expectedURI = new URL (archiveRoot.toExternalForm()+"org/me/resources/test.txt").toURI();	107	final URI expectedURI = new URL (archiveRoot.toExternalForm()+"org/me/resources/test.txt").toURI();
107	doTestGetFileForInput(ClassPathSupport.createClassPath(archiveRoot),	108	doTestGetFileForInput(ClassPathSupport.createClassPath(archiveRoot),
108	Arrays.asList(	109	Arrays.asList(

Lines 78-83 Link Here

(-)a/java.source/test/unit/src/org/netbeans/modules/java/source/parsing/ClasspathInfoTest.java (-1 / +2 lines)
78	import org.openide.filesystems.FileLock;	78	import org.openide.filesystems.FileLock;
79	import org.openide.filesystems.FileObject;	79	import org.openide.filesystems.FileObject;
80	import org.openide.filesystems.FileUtil;	80	import org.openide.filesystems.FileUtil;
		81	import org.openide.util.Utilities;
81		82
82	/**	83	/**
83	*	84	*
Lines 108-114 Link Here
108	IndexUtil.setCacheFolder(cacheFolder);	109	IndexUtil.setCacheFolder(cacheFolder);
109	TestUtil.copyFiles( TestUtil.getJdkDir(), workDir, TestUtil.RT_JAR );	110	TestUtil.copyFiles( TestUtil.getJdkDir(), workDir, TestUtil.RT_JAR );
110	rtJar = FileUtil.normalizeFile(new File( workDir, TestUtil.RT_JAR ));	111	rtJar = FileUtil.normalizeFile(new File( workDir, TestUtil.RT_JAR ));
111	URL url = FileUtil.getArchiveRoot (rtJar.toURI().toURL());	112	URL url = FileUtil.getArchiveRoot (Utilities.toURI(rtJar).toURL());
112	this.bootPath = ClassPathSupport.createClassPath (new URL[] {url});	113	this.bootPath = ClassPathSupport.createClassPath (new URL[] {url});
113	this.classPath = ClassPathSupport.createClassPath(new URL[0]);	114	this.classPath = ClassPathSupport.createClassPath(new URL[0]);
114	}	115	}




import javax.tools.StandardLocation;
import org.netbeans.junit.NbTestCase;
import org.netbeans.modules.java.source.TestUtil;
import org.openide.util.Utilities;

/** Base class for testing file managers. This class basically tests itself.
 *

        // Create archive provider
        archiveProvider = CachingArchiveProvider.getDefault();

        rtJarArchive = archiveProvider.getArchive(Utilities.toURI(rtFile).toURL(), true);
        rtFolderArchive = archiveProvider.getArchive(Utilities.toURI(rtFolder).toURL(), true);
        srcZipArchive = archiveProvider.getArchive(Utilities.toURI(srcFile).toURL(), true);
        srcFolderArchive = archiveProvider.getArchive(Utilities.toURI(srcFolder).toURL(), true);
    }

    protected JavaFileManagerDescripton[] getDescriptions() throws IOException {

Lines 60-65 Link Here

(-)a/java.source/test/unit/src/org/netbeans/modules/java/source/parsing/FileObjectsTest.java (-1 / +2 lines)
60	import org.netbeans.modules.java.preprocessorbridge.spi.JavaFileFilterImplementation;	60	import org.netbeans.modules.java.preprocessorbridge.spi.JavaFileFilterImplementation;
61	import org.openide.filesystems.FileObject;	61	import org.openide.filesystems.FileObject;
62	import org.openide.filesystems.FileUtil;	62	import org.openide.filesystems.FileUtil;
		63	import org.openide.util.Utilities;
63		64
64	/**	65	/**
65	*	66	*
Lines 148-154 Link Here
148	assertFalse("OutputStream should exist for existing file",true);	149	assertFalse("OutputStream should exist for existing file",true);
149	}	150	}
150	File nonExistring = new File (new File(new File (workDir,"test"),"foo"),"nonexisting.java");	151	File nonExistring = new File (new File(new File (workDir,"test"),"foo"),"nonexisting.java");
151	final javax.tools.FileObject nonExistingFo = FileObjects.nbFileObject(nonExistring.toURI().toURL(), wd);	152	final javax.tools.FileObject nonExistingFo = FileObjects.nbFileObject(Utilities.toURI(nonExistring).toURL(), wd);
152	assertEquals ("test.foo.nonexisting",((InferableJavaFileObject)nonExistingFo).inferBinaryName());	153	assertEquals ("test.foo.nonexisting",((InferableJavaFileObject)nonExistingFo).inferBinaryName());
153	try {	154	try {
154	final InputStream in = nonExistingFo.openInputStream();	155	final InputStream in = nonExistingFo.openInputStream();

Lines 50-55 Link Here

(-)a/java.source/test/unit/src/org/netbeans/modules/java/source/parsing/PerfJavacIntefaceGCTest.java (-1 / +2 lines)
50	import org.netbeans.modules.java.source.TestUtil;	50	import org.netbeans.modules.java.source.TestUtil;
51	import org.netbeans.spi.java.classpath.support.ClassPathSupport;	51	import org.netbeans.spi.java.classpath.support.ClassPathSupport;
52	import org.openide.filesystems.FileUtil;	52	import org.openide.filesystems.FileUtil;
		53	import org.openide.util.Utilities;
53	/** Tests whether the JavacInterface gets GCed after some operations	54	/** Tests whether the JavacInterface gets GCed after some operations
54	*	55	*
55	* @author Petr Hrebejk	56	* @author Petr Hrebejk
Lines 80-86 Link Here
80	workDir = getWorkDir();	81	workDir = getWorkDir();
81	TestUtil.copyFiles( workDir, TestUtil.RT_JAR, "jdk/JTable.java" );	82	TestUtil.copyFiles( workDir, TestUtil.RT_JAR, "jdk/JTable.java" );
82	rtJar = new File( workDir, TestUtil.RT_JAR );	83	rtJar = new File( workDir, TestUtil.RT_JAR );
83	URL url = FileUtil.getArchiveRoot (rtJar.toURI().toURL());	84	URL url = FileUtil.getArchiveRoot (Utilities.toURI(rtJar).toURL());
84	this.bootPath = ClassPathSupport.createClassPath (new URL[] {url});	85	this.bootPath = ClassPathSupport.createClassPath (new URL[] {url});
85	this.classPath = ClassPathSupport.createClassPath(new URL[0]);	86	this.classPath = ClassPathSupport.createClassPath(new URL[0]);
86	}	87	}

Lines 50-55 Link Here

(-)a/java.source/test/unit/src/org/netbeans/modules/java/source/parsing/PerfResolveTest.java (-1 / +2 lines)
50	import org.netbeans.modules.java.source.TestUtil;	50	import org.netbeans.modules.java.source.TestUtil;
51	import org.netbeans.spi.java.classpath.support.ClassPathSupport;	51	import org.netbeans.spi.java.classpath.support.ClassPathSupport;
52	import org.openide.filesystems.FileUtil;	52	import org.openide.filesystems.FileUtil;
		53	import org.openide.util.Utilities;
53	/** Tests for basic JDK operations	54	/** Tests for basic JDK operations
54	*	55	*
55	* @author Petr Hrebejk	56	* @author Petr Hrebejk
Lines 79-85 Link Here
79	workDir = getWorkDir();	80	workDir = getWorkDir();
80	TestUtil.copyFiles( workDir, TestUtil.RT_JAR, "jdk/JTable.java" );	81	TestUtil.copyFiles( workDir, TestUtil.RT_JAR, "jdk/JTable.java" );
81	rtJar = new File( workDir, TestUtil.RT_JAR );	82	rtJar = new File( workDir, TestUtil.RT_JAR );
82	URL url = FileUtil.getArchiveRoot (rtJar.toURI().toURL());	83	URL url = FileUtil.getArchiveRoot (Utilities.toURI(rtJar).toURL());
83	this.bootPath = ClassPathSupport.createClassPath (new URL[] {url});	84	this.bootPath = ClassPathSupport.createClassPath (new URL[] {url});
84	this.classPath = ClassPathSupport.createClassPath(new URL[0]);	85	this.classPath = ClassPathSupport.createClassPath(new URL[0]);
85	}	86	}




import org.openide.filesystems.FileUtil;
import org.openide.loaders.DataObject;
import org.openide.util.SharedClassObject;
import org.openide.util.Utilities;

/**
 * Test different formating options

        URL url = null;
        try {
            if (isArchiveFile(f)) {
                url = FileUtil.getArchiveRoot(Utilities.toURI(f).toURL());
            } else {
                url = Utilities.toURI(f).toURL();
                String surl = url.toExternalForm();
                if (!surl.endsWith("/")) {
                    url = new URL(surl + "/");




import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.util.Exceptions;
import org.openide.util.Utilities;

/**
 *

        final Index index = IndexManager.createIndex(FileUtil.toFile(indexDir), DocumentUtil.createAnalyzer());
        BinaryAnalyser a = new BinaryAnalyser(new IndexWriter(index), getWorkDir());

        assertEquals(Result.FINISHED, a.start(FileUtil.getArchiveRoot(Utilities.toURI(binaryAnalyzerDataDir).toURL()), new AtomicBoolean(), new AtomicBoolean()));

        a.finish();



        setLowMemory(true);
        assertEquals(Result.FINISHED, 
                a.start(FileUtil.getArchiveRoot(Utilities.toURI(binaryAnalyzerDataDir).toURL()), new AtomicBoolean(), new AtomicBoolean()));

        a.finish();





import org.netbeans.junit.NbTestCase;
import org.openide.filesystems.*;
import org.openide.util.Exceptions;
import org.openide.util.Utilities;

/**
 *

                    holdsLock.countDown();
                    try {
                        inListener.await();
                        ClassIndexManager.getDefault().getUsagesQuery(Utilities.toURI(root).toURL(), true);
                    } catch (InterruptedException ie) {
                        Exceptions.printStackTrace(ie);
                    } catch (MalformedURLException ex) {

            };
            worker.start();
            holdsLock.await();
            ClassIndexManager.getDefault().getUsagesQuery(Utilities.toURI(root).toURL(), true);
        } finally {
            FileUtil.removeRecursiveListener(dl, cache);
        }

Lines 59-64 Link Here

(-)a/java.source/test/unit/src/org/netbeans/modules/java/source/usages/VirtualSourceProviderQueryTest.java (-1 / +2 lines)
59	import org.netbeans.modules.parsing.spi.indexing.Indexable;	59	import org.netbeans.modules.parsing.spi.indexing.Indexable;
60	import org.openide.filesystems.FileObject;	60	import org.openide.filesystems.FileObject;
61	import org.openide.filesystems.FileUtil;	61	import org.openide.filesystems.FileUtil;
		62	import org.openide.util.Utilities;
62		63
63	/**	64	/**
64	*	65	*
Lines 79-85 Link Here
79	public void testVirtualSourceProvider () throws Exception {	80	public void testVirtualSourceProvider () throws Exception {
80	final File root = new File (getWorkDir(),"src"); //NOI18N	81	final File root = new File (getWorkDir(),"src"); //NOI18N
81	root.mkdir();	82	root.mkdir();
82	final Indexable[] data = prepareData(root.toURI().toURL());	83	final Indexable[] data = prepareData(Utilities.toURI(root).toURL());
83	final Iterable<? extends CompileTuple> res = VirtualSourceProviderQuery.translate(Arrays.asList(data), root);	84	final Iterable<? extends CompileTuple> res = VirtualSourceProviderQuery.translate(Arrays.asList(data), root);
84	assertEquals(new String[] {"a","b","c","d"}, res); //NOI18N	85	assertEquals(new String[] {"a","b","c","d"}, res); //NOI18N
85	}	86	}

Lines 79-85 Link Here

(-)a/masterfs/nbproject/project.xml (-1 / +1 lines)
79	<build-prerequisite/>	79	<build-prerequisite/>
80	<compile-dependency/>	80	<compile-dependency/>
81	<run-dependency>	81	<run-dependency>
82	<specification-version>8.3</specification-version>	82	<specification-version>8.25</specification-version>
83	</run-dependency>	83	</run-dependency>
84	</dependency>	84	</dependency>
85	<dependency>	85	<dependency>




import java.net.URISyntaxException;
import org.netbeans.modules.masterfs.filebasedfs.fileobjects.BaseFileObj;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.filesystems.URLMapper;

import java.io.File;

import java.util.logging.Logger;
import org.netbeans.modules.masterfs.filebasedfs.fileobjects.FileObjectFactory;
import org.netbeans.modules.masterfs.filebasedfs.fileobjects.RootObj;
import org.openide.util.Utilities;

//TODO: JDK problems with URL, URI, File conversion for UNC
/*
There must be consistently called conversion from FileUtil and URLMapper.
new File (URI.create (fo.getURL ().toExternalForm ())) is typical scenario that leads to this
bug: java.lang.IllegalArgumentException: URI has an authority component
        at java.io.File.<init>(File.java:326)


Maybe there would be also possible to return a little special URL from FileBasedURLMapper that
would get special subclass of URLStreamHandler in constructor. This subclass of URLStreamHandler
would provided external form (method toExternalForm) that would be suitable for above mentioned 
conversion from URL to File. 
        
Known problems :
1/     at java.io.File.<init>(File.java:326)
     at org.netbeans.modules.javacore.parser.ASTProvider.getClassPath(ASTProvider.java:477)
     at org.netbeans.lib.gjast.ASParser$BridgeContext.getClassPath(ASParser.java:421)

2/
       at java.io.File.<init>(File.java:326)
       at org.netbeans.modules.javacore.scanning.FileScanner.<init>(FileScanner.java:85)
catch] at org.netbeans.modules.javacore.JMManager.scanFiles(JMManager.java:1112)

3/ org.netbeans.modules.javacore.parser.ECRequestDescImpl.getFileName(FileObject fo,StringBuffer buf)
    at java.io.File.<init>(File.java:326)
     
    
    
    
*/

public final class FileBasedURLMapper extends URLMapper {
    private static final Logger LOG = Logger.getLogger(FileBasedURLMapper.class.getName());

        FileObject retVal = null;
        File file;
        try {
            file = Utilities.toFile(url.toURI());
        } catch (URISyntaxException e) {
            LOG.log(Level.INFO, "URL=" + url, e); // NOI18N
            return null;


    /** #171330 - Method taken from java.io.File.toURI. We know whether given
     * FileObject is a file or folder, so we can eliminate File.isDirectory
     * disk touch which is needed in file.toURI().
     * @see Utilities#toURI
     */
    private static URI toURI(final File file, boolean isDirectory) {
        return toURI(file.getAbsolutePath(), isDirectory, File.separatorChar);
    }

        return p;
    }

    static File url2F(final URL url) throws URISyntaxException {
        File file;
        if (url.getHost() == null || url.getHost().length() == 0) {
            file = new File(url.toURI());
        } else {
            file = new File("\\\\" + url.getHost() + url.getPath().replace('/', '\\')); // NOI18N
        }
        return file;
    }
}

Lines 49-54 Link Here

(-)a/masterfs/test/unit/src/org/netbeans/modules/masterfs/GlobalSharabilityQueryImplTest.java (-1 / +2 lines)
49	import org.netbeans.api.queries.SharabilityQuery;	49	import org.netbeans.api.queries.SharabilityQuery;
50	import org.netbeans.spi.queries.SharabilityQueryImplementation2;	50	import org.netbeans.spi.queries.SharabilityQueryImplementation2;
51	import org.openide.util.Lookup;	51	import org.openide.util.Lookup;
		52	import org.openide.util.Utilities;
52	import org.openide.util.lookup.AbstractLookup;	53	import org.openide.util.lookup.AbstractLookup;
53	import org.openide.util.lookup.InstanceContent;	54	import org.openide.util.lookup.InstanceContent;
54	import org.openide.util.lookup.ProxyLookup;	55	import org.openide.util.lookup.ProxyLookup;
Lines 89-95 Link Here
89	};	90	};
90		91
91	for (int i = 0; i < all.length; i++) {	92	for (int i = 0; i < all.length; i++) {
92	boolean isNotSharable = sq.getSharability(all[i].toURI()) == SharabilityQuery.Sharability.NOT_SHARABLE;	93	boolean isNotSharable = sq.getSharability(Utilities.toURI(all[i])) == SharabilityQuery.Sharability.NOT_SHARABLE;
93	boolean isNotVisible = !vq.isVisible(all[i].getName());	94	boolean isNotVisible = !vq.isVisible(all[i].getName());
94	assertEquals(isNotSharable, isNotVisible);	95	assertEquals(isNotSharable, isNotVisible);
95	}	96	}

Lines 705-712 Link Here

(-)a/masterfs/test/unit/src/org/netbeans/modules/masterfs/filebasedfs/BaseFileObjectTestHid.java (-3 / +3 lines)
705	assertNotNull(A);	705	assertNotNull(A);
706	assertNotNull(root.getFileObject("a"));	706	assertNotNull(root.getFileObject("a"));
707	assertSame(root.getFileObject("A"), root.getFileObject("a"));	707	assertSame(root.getFileObject("A"), root.getFileObject("a"));
708	assertSame(URLMapper.findFileObject(testa.toURI().toURL()),	708	assertSame(URLMapper.findFileObject(Utilities.toURI(testa).toURL()),
709	URLMapper.findFileObject(testA.toURI().toURL()));	709	URLMapper.findFileObject(Utilities.toURI(testA).toURL()));
710		710
711	//but	711	//but
712	root.getChildren();	712	root.getChildren();
Lines 860-866 Link Here
860	assertTrue(testFile2.exists());	860	assertTrue(testFile2.exists());
861		861
862		862
863	assertEquals(FileUtil.normalizeFile(testFile).toURI().toURL(), FileUtil.normalizeFile(testFile2).toURI().toURL());	863	assertEquals(Utilities.toURI(FileUtil.normalizeFile(testFile)).toURL(), Utilities.toURI(FileUtil.normalizeFile(testFile2)).toURL());
864	}	864	}
865		865
866	@RandomlyFails // NB-Core-Build #7927 (from FileBasedFileSystemWithUninitializedExtensionsTest): Didn't receive a FileEvent on the parent.	866	@RandomlyFails // NB-Core-Build #7927 (from FileBasedFileSystemWithUninitializedExtensionsTest): Didn't receive a FileEvent on the parent.




import org.openide.filesystems.URLMapper;
import org.openide.filesystems.FileUtil;
import java.net.URL;
import org.openide.util.Utilities;

/**
 * @author Radek Matous

        assertEquals("/data/services/web/com_resource/", uri.getPath());
    }
    
    public void testReverseUNCPath() throws Exception {
        if (!Utilities.isWindows()) {
            return;
        }
        assertEquals("C:\\some\\random path", uri2File(new URI("file:/C:/some/random%20path/")).getAbsolutePath());
        assertEquals("C:\\some\\random path", uri2File(new URI("file:///C:/some/random%20path/")).getAbsolutePath());
        assertEquals("\\\\server\\share\\some\\random path", uri2File(new URI("file://server/share/some/random%20path/")).getAbsolutePath());
    }    

    private File uri2File(URI urI) throws Exception {
        return FileBasedURLMapper.url2F(urI.toURL());
    }
}

Lines 510-517 Link Here

(-)a/masterfs/test/unit/src/org/netbeans/modules/masterfs/filebasedfs/fileobjects/FolderObjTest.java (-2 / +2 lines)
510	assertNotNull(A);	510	assertNotNull(A);
511	assertNotNull(testRoot.getFileObject("a"));	511	assertNotNull(testRoot.getFileObject("a"));
512	assertSame(testRoot.getFileObject("A"), testRoot.getFileObject("a"));	512	assertSame(testRoot.getFileObject("A"), testRoot.getFileObject("a"));
513	assertSame(URLMapper.findFileObject(testa.toURI().toURL()),	513	assertSame(URLMapper.findFileObject(Utilities.toURI(testa).toURL()),
514	URLMapper.findFileObject(testA.toURI().toURL()));	514	URLMapper.findFileObject(Utilities.toURI(testA).toURL()));
515		515
516	//but	516	//but
517	testRoot.getChildren();	517	testRoot.getChildren();

Lines 372-378 Link Here

(-)a/maven/nbproject/project.xml (-1 / +1 lines)
372	<build-prerequisite/>	372	<build-prerequisite/>
373	<compile-dependency/>	373	<compile-dependency/>
374	<run-dependency>	374	<run-dependency>
375	<specification-version>8.13</specification-version>	375	<specification-version>8.25</specification-version>
376	</run-dependency>	376	</run-dependency>
377	</dependency>	377	</dependency>
378	<dependency>	378	<dependency>




import org.openide.util.NbBundle.Messages;
import org.openide.util.NbCollections;
import org.openide.util.RequestProcessor;
import org.openide.util.Utilities;
import org.openide.util.lookup.Lookups;
import org.openide.util.lookup.ProxyLookup;


    public URI[] getGeneratedSourceRoots(boolean test) {
        URI uri = FileUtilities.getDirURI(getProjectDirectory(), test ? "target/generated-test-sources" : "target/generated-sources"); //NOI18N
        Set<URI> uris = new HashSet<URI>();
        File[] roots = Utilities.toFile(uri).listFiles();
        if (roots != null) {
            for (File root : roots) {
                if (!test && root.getName().startsWith("test-")) {

                }
                File[] kids = root.listFiles();
                if (kids != null && /* #190626 */kids.length > 0) {
                    uris.add(Utilities.toURI(root));
                } else {
                    watcher.addWatchedPath(Utilities.toURI(root));
                }
            }
        }
        if (test) { // MCOMPILER-167
            roots = Utilities.toFile(FileUtilities.getDirURI(getProjectDirectory(), "target/generated-sources")).listFiles();
            if (roots != null) {
                for (File root : roots) {
                    if (root.getName().startsWith("test-")) {
                        File[] kids = root.listFiles();
                        if (kids != null && kids.length > 0) {
                            uris.add(Utilities.toURI(root));
                        } else {
                            watcher.addWatchedPath(Utilities.toURI(root));
                        }
                    }
                }

    public File[] getOtherRoots(boolean test) {
        URI uri = FileUtilities.getDirURI(getProjectDirectory(), test ? "src/test" : "src/main"); //NOI18N
        Set<File> toRet = new HashSet<File>();
        File fil = Utilities.toFile(uri);
        if (fil.exists()) {
            File[] fls = fil.listFiles(new FilenameFilter() {


        }
        URI[] res = getResources(test);
        for (URI rs : res) {
            File fl = Utilities.toFile(rs);
            //in node view we need only the existing ones, if anything else needs all,
            // a new method is probably necessary..
            if (fl.exists()) {




import org.openide.util.NbBundle;
import org.openide.util.NbBundle.Messages;
import org.openide.util.RequestProcessor;
import org.openide.util.Utilities;

/**
 * openhook implementation, register global classpath and also

        // the project root.
        uris.addAll(Arrays.asList(project.getGeneratedSourceRoots(false)));
        uris.addAll(Arrays.asList(project.getGeneratedSourceRoots(true)));
        URI rootUri = Utilities.toURI(FileUtil.toFile(project.getProjectDirectory()));
        File rootDir = Utilities.toFile(rootUri);
        for (URI uri : uris) {
            if (FileUtilities.getRelativePath(rootDir, Utilities.toFile(uri)) == null) {
                toRet.add(uri);
            }
        }

            }
        } else {
            try {
                MavenFileOwnerQueryImpl.getInstance().registerCoordinates(groupId, artifactId, version, Utilities.toURI(basedir).toURL());
            } catch (MalformedURLException x) {
                LOGGER.log(Level.FINE, null, x);
            }

Lines 63-68 Link Here

(-)a/maven/src/org/netbeans/modules/maven/SubprojectProviderImpl.java (-1 / +2 lines)
63	import org.openide.filesystems.FileObject;	63	import org.openide.filesystems.FileObject;
64	import org.openide.filesystems.FileUtil;	64	import org.openide.filesystems.FileUtil;
65	import org.openide.util.ChangeSupport;	65	import org.openide.util.ChangeSupport;
		66	import org.openide.util.Utilities;
66	import org.openide.util.WeakListeners;	67	import org.openide.util.WeakListeners;
67		68
68	/**	69	/**
Lines 117-123 Link Here
117	for (Artifact ar : compileArtifacts) {	118	for (Artifact ar : compileArtifacts) {
118	File f = ar.getFile();	119	File f = ar.getFile();
119	if (f != null) {	120	if (f != null) {
120	Project p = MavenFileOwnerQueryImpl.getInstance().getOwner(f.toURI());	121	Project p = MavenFileOwnerQueryImpl.getInstance().getOwner(Utilities.toURI(f));
121	if (p != null) {	122	if (p != null) {
122	resultset.add(p);	123	resultset.add(p);
123	}	124	}




import org.openide.util.NbBundle.Messages;
import org.openide.util.RequestProcessor;
import static org.netbeans.modules.maven.actions.Bundle.*;
import org.openide.util.Utilities;

/**
 *

                File base;
                if (libRoot != null) {
                    try {
                        base = Utilities.toFile(libRoot.toURI());
                        //getLocation() points to a file
                        base = base.getParentFile();
                        nonDefaultLibBase = base;


    private static URI getJarUri(Artifact a, File copyTo, File nonDefaultLibBase, ClassifierType type) throws IOException {
        File res = a.getFile();
        URI uri = Utilities.toURI(res);
        String jarPath = null;
        if (copyTo != null) {
            res = new File(copyTo, a.getFile().getName());




        if (uri == null) {
            return null;
        }
        File fil = FileUtil.normalizeFile(Utilities.toFile(uri));
        return FileUtil.toFileObject(fil);
    }
    

        if (str != null) {
            File fil = new File(str);
            fil = FileUtil.normalizeFile(fil);
            return Utilities.toURI(fil);
        }
        return null;
    }

       pth = pth.replaceFirst("^\\./", ""); //NOI18N
       pth = pth.replaceFirst("^\\.\\\\", ""); //NOI18N
       File src = FileUtilities.resolveFilePath(root, pth);
       return Utilities.toURI(FileUtil.normalizeFile(src));
   }
    
   public static URI getDirURI(@NonNull FileObject root, @NonNull String path) {

            }
            b.append("../"); // NOI18N
        }
        URI u = Utilities.toURI(base).relativize(Utilities.toURI(file));
        assert !u.isAbsolute() : u + " from " + basedir + " and " + file + " with common root " + base;
        b.append(u.getPath());
        if (b.charAt(b.length() - 1) == '/') {




import org.openide.util.RequestProcessor;
import static org.netbeans.modules.maven.api.Bundle.*;
import org.openide.util.NbBundle.Messages;
import org.openide.util.Utilities;

/**
 * an instance resides in project lookup, allows to get notified on project and 


        @Override
        public void fileFolderCreated(FileEvent fe) {
            fireChange(Utilities.toURI(FileUtil.toFile(fe.getFile())));
        }

        @Override
        public void fileDataCreated(FileEvent fe) {
            fireChange(Utilities.toURI(FileUtil.toFile(fe.getFile())));
        }

        @Override
        public void fileChanged(FileEvent fe) {
            fireChange(Utilities.toURI(FileUtil.toFile(fe.getFile())));
        }

        @Override
        public void fileDeleted(FileEvent fe) {
            fireChange(Utilities.toURI(FileUtil.toFile(fe.getFile())));
        }

        @Override
        public void fileRenamed(FileRenameEvent fe) {
            fireChange(Utilities.toURI(FileUtil.toFile(fe.getFile())));
        }

        @Override

    public void addWatchedPath(URI uri) {
        //#110599
        boolean addListener = false;
        File fil = Utilities.toFile(uri);
        synchronized (files) {
            if (!files.contains(fil)) {
                addListener = true;

    public void removeWatchedPath(URI uri) {
        //#110599
        boolean removeListener = false;
        File fil = Utilities.toFile(uri);
        synchronized (files) {
            boolean rem = files.remove(fil);
            if (rem && !files.contains(fil)) {

Lines 60-65 Link Here

(-)a/maven/src/org/netbeans/modules/maven/classpath/AbstractProjectClassPathImpl.java (-1 / +2 lines)
60	import org.netbeans.spi.java.classpath.FilteringPathResourceImplementation;	60	import org.netbeans.spi.java.classpath.FilteringPathResourceImplementation;
61	import org.netbeans.spi.java.classpath.PathResourceImplementation;	61	import org.netbeans.spi.java.classpath.PathResourceImplementation;
62	import org.openide.filesystems.FileUtil;	62	import org.openide.filesystems.FileUtil;
		63	import org.openide.util.Utilities;
63		64
64	/**	65	/**
65	*	66	*
Lines 169-175 Link Here
169	for (int i = 0; i < pieces.length; i++) {	170	for (int i = 0; i < pieces.length; i++) {
170	try {	171	try {
171	// XXX would be cleaner to take a File[] if that is what these all are anyway!	172	// XXX would be cleaner to take a File[] if that is what these all are anyway!
172	final URL entry = FileUtil.urlForArchiveOrDir(new File(pieces[i]));	173	final URL entry = FileUtil.urlForArchiveOrDir(Utilities.toFile(pieces[i]));
173	if (entry != null) {	174	if (entry != null) {
174	result.add(new FilteringPathResourceImplementation() {	175	result.add(new FilteringPathResourceImplementation() {
175	@Override public boolean includes(URL root, String resource) {	176	@Override public boolean includes(URL root, String resource) {

Lines 64-69 Link Here

(-)a/maven/src/org/netbeans/modules/maven/classpath/ClassPathProviderImpl.java (-1 / +2 lines)
64	import org.netbeans.spi.project.ProjectServiceProvider;	64	import org.netbeans.spi.project.ProjectServiceProvider;
65	import org.openide.filesystems.FileObject;	65	import org.openide.filesystems.FileObject;
66	import org.openide.filesystems.FileUtil;	66	import org.openide.filesystems.FileUtil;
		67	import org.openide.util.Utilities;
67		68
68	/**	69	/**
69	* Defines class path for maven2 projects..	70	* Defines class path for maven2 projects..
Lines 218-224 Link Here
218	}	219	}
219		220
220	URI web = project.getWebAppDirectory();	221	URI web = project.getWebAppDirectory();
221	FileObject fo = FileUtil.toFileObject(new File(web));	222	FileObject fo = FileUtil.toFileObject(Utilities.toFile(web));
222	if (fo != null && (fo.equals(file) \|\| FileUtil.isParentOf(fo, file))) {	223	if (fo != null && (fo.equals(file) \|\| FileUtil.isParentOf(fo, file))) {
223	return TYPE_WEB;	224	return TYPE_WEB;
224	}	225	}

Lines 49-54 Link Here

(-)a/maven/src/org/netbeans/modules/maven/classpath/CompileClassPathImpl.java (-1 / +2 lines)
49	import org.apache.maven.artifact.Artifact;	49	import org.apache.maven.artifact.Artifact;
50	import org.netbeans.modules.maven.NbMavenProjectImpl;	50	import org.netbeans.modules.maven.NbMavenProjectImpl;
51	import org.openide.filesystems.FileUtil;	51	import org.openide.filesystems.FileUtil;
		52	import org.openide.util.Utilities;
52		53
53	/**	54	/**
54	*	55	*
Lines 71-77 Link Here
71	for (Artifact art : arts) {	72	for (Artifact art : arts) {
72	if (art.getFile() != null) {	73	if (art.getFile() != null) {
73	File fil = FileUtil.normalizeFile(art.getFile());	74	File fil = FileUtil.normalizeFile(art.getFile());
74	lst.add(fil.toURI());	75	lst.add(Utilities.toURI(fil));
75	} else {	76	} else {
76	//NOPMD //null means dependencies were not resolved..	77	//NOPMD //null means dependencies were not resolved..
77	}	78	}




import static org.netbeans.modules.maven.classpath.Bundle.*;
import org.netbeans.spi.project.ProjectServiceProvider;
import org.openide.util.NbBundle.Messages;
import org.openide.util.Utilities;

/**
 * Implementation of Sources interface for maven projects.

                }
            }
            if (create && existing.isEmpty()) {
                File root = Utilities.toFile(virtuals.get(0));
                FileObject fo=null;
                try {
                    fo = FileUtil.createFolder(root);

    private boolean checkSourceGroupCache(@NullAllowed File rootF, String name, String displayName, Map<String, SourceGroup> groups, NbMavenProject watcher) {
        FileObject root;
        if (rootF != null) {
            watcher.addWatchedPath(Utilities.toURI(rootF));
            root = FileUtil.toFileObject(rootF);
        } else {
            root = null;

        List<File> checked = new ArrayList<File>();
        for (boolean test : new boolean[] {false, true}) {
            for (URI u : project().getGeneratedSourceRoots(test)) {
                File file = FileUtil.normalizeFile(Utilities.toFile(u));
                FileObject folder = FileUtil.toFileObject(file);
                changed |= checkGeneratedGroupCache(folder, file, file.getName(), test);
                checked.add(file);

        URI[] res = project().getResources(test);
        Set<File> resources = new HashSet<File>();
        for (URI ur : res) {
            resources.add(Utilities.toFile(ur));
        }

        for (File f : roots) {




import org.apache.maven.model.Dependency;
import org.netbeans.modules.maven.NbMavenProjectImpl;
import org.openide.filesystems.FileUtil;
import org.openide.util.Utilities;

/**
 *

                if (art.getClassifier() != null) {
                    assemblies.add(0, fil);
                } else {
                    lst.add(Utilities.toURI(fil));
                }
            } else {
              //NOPMD   //null means dependencies were not resolved..
            } 
        }
        for (File ass : assemblies) {
            lst.add(Utilities.toURI(ass));
        }
        URI[] uris = new URI[lst.size()];
        uris = lst.toArray(uris);




import org.apache.maven.project.MavenProject;
import org.netbeans.modules.maven.NbMavenProjectImpl;
import org.openide.filesystems.FileUtil;
import org.openide.util.Utilities;

/**
 * class path def for runtime..

            if (outputDirectory != null) {
                File fil = new File(outputDirectory);
                fil = FileUtil.normalizeFile(fil);
                lst.add(Utilities.toURI(fil));
            }
        }
        List<Artifact> arts = prj.getRuntimeArtifacts();
        for (Artifact art : arts) {
            if (art.getFile() != null) {
                File fil = FileUtil.normalizeFile(art.getFile());
                lst.add(Utilities.toURI(fil));
            } else {
              //NOPMD   //null means dependencies were not resolved..
            }

Lines 51-56 Link Here

(-)a/maven/src/org/netbeans/modules/maven/classpath/SourceClassPathImpl.java (-1 / +2 lines)
51	import java.util.Iterator;	51	import java.util.Iterator;
52	import java.util.List;	52	import java.util.List;
53	import org.netbeans.modules.maven.NbMavenProjectImpl;	53	import org.netbeans.modules.maven.NbMavenProjectImpl;
		54	import org.openide.util.Utilities;
54		55
55	/**	56	/**
56	*	57	*
Lines 84-90 Link Here
84	}	85	}
85	}	86	}
86	URI webSrc = getMavenProject().getWebAppDirectory();	87	URI webSrc = getMavenProject().getWebAppDirectory();
87	if (new File(webSrc).exists()) {	88	if (Utilities.toFile(webSrc).exists()) {
88	col.add(webSrc);	89	col.add(webSrc);
89	}	90	}
90	col.addAll(resources);	91	col.addAll(resources);




import org.apache.maven.artifact.Artifact;
import org.netbeans.modules.maven.NbMavenProjectImpl;
import org.openide.filesystems.FileUtil;
import org.openide.util.Utilities;

/**
 *

        for (Artifact art : arts) {
            if (art.getFile() != null) {
                File fil = FileUtil.normalizeFile(art.getFile());
                lst.add(Utilities.toURI(fil));
            } else { //NOPMD
                //null means dependencies were not resolved..
            } 
        }
        lst.add(0, Utilities.toURI(getMavenProject().getProjectWatcher().getOutputDirectory(false)));
        URI[] uris = new URI[lst.size()];
        uris = lst.toArray(uris);
        return uris;




import org.apache.maven.project.MavenProject;
import org.netbeans.modules.maven.NbMavenProjectImpl;
import org.openide.filesystems.FileUtil;
import org.openide.util.Utilities;


/**

            if (testOutputDirectory != null) {
                File fil = new File(testOutputDirectory);
                fil = FileUtil.normalizeFile(fil);
                lst.add(Utilities.toURI(fil));
            }
            String outputDirectory = build.getOutputDirectory();
            if (outputDirectory != null) {
                File fil = new File(outputDirectory);
                fil = FileUtil.normalizeFile(fil);
                lst.add(Utilities.toURI(fil));
            }
        }
        List<Artifact> arts = prj.getTestArtifacts();
        for (Artifact art : arts) {
            if (art.getFile() != null) {
                File fil = FileUtil.normalizeFile(art.getFile());
                lst.add(Utilities.toURI(fil));
            } else {
              //NOPMD   //null means dependencies were not resolved..
            }




import org.openide.filesystems.FileRenameEvent;
import org.openide.filesystems.FileUtil;
import org.openide.util.RequestProcessor;
import org.openide.util.Utilities;

/**
 * @author mkleint

                        continue;
                    }
                    URI uri = FileUtilities.getDirURI(project.getProjectDirectory(), dir);
                    File file = Utilities.toFile(uri);
                    if (!old.contains(file) && added.add(file)) { // if a given file is there multiple times, we get assertion back from FileUtil. there can be only one listener+file tuple
                        FileUtil.addFileChangeListener(this, file);
                    }

                continue;
            }
            URI uri = FileUtilities.getDirURI(prj.getProjectDirectory(), dir);
            FileObject fo = FileUtil.toFileObject(Utilities.toFile(uri));
            if (fo != null && FileUtil.isParentOf(fo, child)) {
                String path = FileUtil.getRelativePath(fo, child);
                //now check includes and excludes

Lines 97-102 Link Here

(-)a/maven/src/org/netbeans/modules/maven/cos/CosChecker.java (-1 / +2 lines)
97	import org.openide.util.ImageUtilities;	97	import org.openide.util.ImageUtilities;
98	import org.openide.util.NbBundle.Messages;	98	import org.openide.util.NbBundle.Messages;
99	import org.openide.util.RequestProcessor;	99	import org.openide.util.RequestProcessor;
		100	import org.openide.util.Utilities;
100	import org.openide.util.lookup.AbstractLookup;	101	import org.openide.util.lookup.AbstractLookup;
101	import org.openide.util.lookup.InstanceContent;	102	import org.openide.util.lookup.InstanceContent;
102		103
Lines 513-519 Link Here
513	File root = FileUtilities.resolveFilePath(base, add);	514	File root = FileUtilities.resolveFilePath(base, add);
514	if (root != null) {	515	if (root != null) {
515	try {	516	try {
516	URL url = root.toURI().toURL();	517	URL url = Utilities.toURI(root).toURL();
517	if (FileUtil.isArchiveFile(url)) {	518	if (FileUtil.isArchiveFile(url)) {
518	url = FileUtil.getArchiveRoot(url);	519	url = FileUtil.getArchiveRoot(url);
519	}	520	}

Lines 72-77 Link Here

(-)a/maven/src/org/netbeans/modules/maven/debug/Utils.java (-1 / +2 lines)
72	import org.openide.ErrorManager;	72	import org.openide.ErrorManager;
73	import org.openide.filesystems.FileObject;	73	import org.openide.filesystems.FileObject;
74	import org.openide.filesystems.FileUtil;	74	import org.openide.filesystems.FileUtil;
		75	import org.openide.util.Utilities;
75		76
76	/**	77	/**
77	* various debugger related utility methods.	78	* various debugger related utility methods.
Lines 242-248 Link Here
242	static URL fileToURL(File file) {	243	static URL fileToURL(File file) {
243	try {	244	try {
244	URL url;	245	URL url;
245	url = file.toURI().toURL();	246	url = Utilities.toURI(file).toURL();
246	if (FileUtil.isArchiveFile(url)) {	247	if (FileUtil.isArchiveFile(url)) {
247	url = FileUtil.getArchiveRoot(url);	248	url = FileUtil.getArchiveRoot(url);
248	}	249	}




import org.netbeans.modules.maven.indexer.api.RepositoryPreferences;
import org.openide.modules.Places;
import org.openide.util.NbCollections;
import org.openide.util.Utilities;
import org.openide.util.lookup.ServiceProvider;

/**


        @Override protected URL file() throws IOException {
            File f = new File(RepositorySystem.userMavenConfigurationHome, "archetype-catalog.xml"); //NOI18N
            return f.isFile() ? Utilities.toURI(f).toURL() : null;
        }

        @Override protected String repository() {

                    
                    if (catalog.exists()) {
                        try {
                            toRet.addAll(CatalogRepoProvider.getArchetypes(Utilities.toURI(catalog).toURL(), info.getRepositoryUrl()));
                        } catch (MalformedURLException ex) {
                            LOG.log(Level.INFO, null, ex);
                        }

Lines 312-318 Link Here

(-)a/maven/src/org/netbeans/modules/maven/nodes/DependencyNode.java (-2 / +2 lines)
312	if ( Artifact.SCOPE_SYSTEM.equals(art.getScope())) {	312	if ( Artifact.SCOPE_SYSTEM.equals(art.getScope())) {
313	return null;	313	return null;
314	}	314	}
315	URI uri = art.getFile().toURI();	315	URI uri = org.openide.util.Utilities.toURI(art.getFile());
316	return FileOwnerQuery.getOwner(uri);	316	return FileOwnerQuery.getOwner(uri);
317	}	317	}
318		318
Lines 1190-1196 Link Here
1190	for (Artifact art : context.lookupAll(Artifact.class)) {	1190	for (Artifact art : context.lookupAll(Artifact.class)) {
1191	File f = art.getFile();	1191	File f = art.getFile();
1192	if (f != null) {	1192	if (f != null) {
1193	Project p = FileOwnerQuery.getOwner(f.toURI());	1193	Project p = FileOwnerQuery.getOwner(org.openide.util.Utilities.toURI(f));
1194	if (p != null) {	1194	if (p != null) {
1195	projects.add(p);	1195	projects.add(p);
1196	}	1196	}

Lines 52-57 Link Here

(-)a/maven/src/org/netbeans/modules/maven/output/SiteOutputProcessor.java (-1 / +2 lines)
52	import org.openide.awt.StatusDisplayer;	52	import org.openide.awt.StatusDisplayer;
53	import org.openide.filesystems.FileUtil;	53	import org.openide.filesystems.FileUtil;
54	import org.openide.util.NbBundle.Messages;	54	import org.openide.util.NbBundle.Messages;
		55	import org.openide.util.Utilities;
55	import org.openide.windows.OutputEvent;	56	import org.openide.windows.OutputEvent;
56	import org.openide.windows.OutputListener;	57	import org.openide.windows.OutputListener;
57		58
Lines 110-116 Link Here
110	File html = new File(FileUtil.toFile(prj.getProjectDirectory()), "target/site/index.html");	111	File html = new File(FileUtil.toFile(prj.getProjectDirectory()), "target/site/index.html");
111	if (html.isFile()) {	112	if (html.isFile()) {
112	try {	113	try {
113	HtmlBrowser.URLDisplayer.getDefault().showURL(html.toURI().toURL());	114	HtmlBrowser.URLDisplayer.getDefault().showURL(Utilities.toURI(html).toURL());
114	} catch (MalformedURLException x) {	115	} catch (MalformedURLException x) {
115	assert false : x;	116	assert false : x;
116	}	117	}




import org.netbeans.spi.project.ProjectServiceProvider;
import org.openide.filesystems.FileUtil;
import org.openide.util.Exceptions;
import org.openide.util.Utilities;

/**
 *

        }
        if ("file".equals(url.getProtocol())) { //NOI18N
            try {
                File fil = Utilities.toFile(url.toURI());
                fil = FileUtil.normalizeFile(fil);
                Res toReturn = findFor(fil);
                if (toReturn != null) {


    private Res checkRoot(File root, URI source, URI test) {
        return checkRoot(root,
                         source != null ? FileUtil.normalizeFile(Utilities.toFile(source)) : null,
                         test != null ? FileUtil.normalizeFile(Utilities.toFile(test)) : null);
    }

    




import org.openide.util.ChangeSupport;
import org.openide.util.Lookup;
import org.openide.util.NbPreferences;
import org.openide.util.Utilities;
import org.openide.util.lookup.ServiceProvider;
import org.openide.util.lookup.ServiceProviders;


    public @Override Project getOwner(URI uri) {
        LOG.log(Level.FINEST, "getOwner of uri={0}", uri);
        if ("file".equals(uri.getScheme())) { //NOI18N
            File file = Utilities.toFile(uri);
            return getOwner(file);
        }
        return null;

            try {
                URI uri = new URI(ownerURI);
                if ("file".equals(uri.getScheme())) {
                    File pom = Utilities.toFile(uri.resolve("pom.xml"));
                    if (pom.isFile()) {
                        ModelReader reader = EmbedderFactory.getProjectEmbedder().lookupComponent(ModelReader.class);
                        Model model = reader.read(pom, Collections.singletonMap(ModelReader.IS_STRICT, false));

Lines 55-60 Link Here

(-)a/maven/src/org/netbeans/modules/maven/queries/MavenSharabilityQueryImpl.java (-1 / +2 lines)
55	import org.netbeans.spi.queries.SharabilityQueryImplementation2;	55	import org.netbeans.spi.queries.SharabilityQueryImplementation2;
56	import org.openide.filesystems.FileObject;	56	import org.openide.filesystems.FileObject;
57	import org.openide.filesystems.FileUtil;	57	import org.openide.filesystems.FileUtil;
		58	import org.openide.util.Utilities;
58		59
59	/**	60	/**
60	*	61	*
Lines 71-77 Link Here
71		72
72	public @Override SharabilityQuery.Sharability getSharability(URI uri) {	73	public @Override SharabilityQuery.Sharability getSharability(URI uri) {
73	//#119541 for the project's root, return MIXED right away.	74	//#119541 for the project's root, return MIXED right away.
74	File file = FileUtil.normalizeFile(new File(uri));	75	File file = FileUtil.normalizeFile(Utilities.toFile(uri));
75	FileObject fo = FileUtil.toFileObject(file);	76	FileObject fo = FileUtil.toFileObject(file);
76	if (fo != null && fo.equals(project.getProjectDirectory())) {	77	if (fo != null && fo.equals(project.getProjectDirectory())) {
77	return SharabilityQuery.Sharability.MIXED;	78	return SharabilityQuery.Sharability.MIXED;

Lines 58-63 Link Here

(-)a/maven/src/org/netbeans/modules/maven/queries/MavenSourceLevelImpl.java (-1 / +2 lines)
58	import org.openide.filesystems.FileObject;	58	import org.openide.filesystems.FileObject;
59	import org.openide.filesystems.FileUtil;	59	import org.openide.filesystems.FileUtil;
60	import org.openide.util.ChangeSupport;	60	import org.openide.util.ChangeSupport;
		61	import org.openide.util.Utilities;
61	import org.openide.util.WeakListeners;	62	import org.openide.util.WeakListeners;
62		63
63	/**	64	/**
Lines 80-86 Link Here
80	//#128609 something in jar?	81	//#128609 something in jar?
81	return null;	82	return null;
82	}	83	}
83	URI uri = file.toURI();	84	URI uri = Utilities.toURI(file);
84	assert "file".equals(uri.getScheme());	85	assert "file".equals(uri.getScheme());
85	String goal = "compile"; //NOI18N	86	String goal = "compile"; //NOI18N
86	for (URI testuri : project.getLookup().lookup(NbMavenProjectImpl.class).getSourceRoots(true)) {	87	for (URI testuri : project.getLookup().lookup(NbMavenProjectImpl.class).getSourceRoots(true)) {




import org.openide.ErrorManager;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.util.Utilities;

/**
 * JUnit tests queries.

                if (fl.equals(param)) {
                    return null;
                }
                URI uri = Utilities.toURI(fl);
                URL entry = uri.toURL();
                if  (!entry.toExternalForm().endsWith("/")) { //NOI18N
                    entry = new URL(entry.toExternalForm() + "/"); //NOI18N

                if (fl.equals(param)) {
                    return null;
                }
                URI uri = Utilities.toURI(fl);
                URL entry = uri.toURL();
                if  (!entry.toExternalForm().endsWith("/")) { //NOI18N
                    entry = new URL(entry.toExternalForm() + "/"); //NOI18N




import org.openide.filesystems.URLMapper;
import org.openide.util.Exceptions;
import org.openide.modules.InstalledFileLocator;
import org.openide.util.Utilities;
import org.openide.util.lookup.ServiceProvider;

/**

                    URL[] url;
                    if (path != null) {
                        url = new URL[1];
                        URL root = FileUtil.getArchiveRoot(Utilities.toURI(file).toURL());
                        if (!path.endsWith("/")) { //NOI18N
                            path = path + "/"; //NOI18N
                        }
                        url[0] = new URL(root, path);
                    } else {
                         url = new URL[1];
                        url[0] = FileUtil.getArchiveRoot(Utilities.toURI(file).toURL());
                    }
                    return url;
                }

                try {
                    File j2eeDoc = InstalledFileLocator.getDefault().locate("docs/javaee6-doc-api.zip", "org.netbeans.modules.j2ee.platform", false); // NOI18N
                    if (j2eeDoc != null) {
                        URL url = FileUtil.getArchiveRoot(Utilities.toURI(j2eeDoc).toURL());
                        url = new URL(url + "docs/api/"); //NOI18N
                        return new URL[]{url};
                    }




import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.filesystems.test.TestFileUtils;
import org.openide.util.Utilities;

public class ProjectOpenedHookImplTest extends NbTestCase {


            File repo = EmbedderFactory.getProjectEmbedder().getLocalRepositoryFile();
            File mArt = new File(repo, "g/m/0/m-0.jar");
            // XXX verify that p2 has not yet been loaded
            Project m = FileOwnerQuery.getOwner(Utilities.toURI(mArt));
            assertNotNull(m);
            assertEquals(d.getFileObject("p2/m"), m.getProjectDirectory());
            File p2Art = new File(repo, "g/p2/0/p2-0.pom");
            Project p2 = FileOwnerQuery.getOwner(Utilities.toURI(p2Art));
            assertNotNull(p2);
            assertEquals(d.getFileObject("p2"), p2.getProjectDirectory());
        } finally {

Lines 46-51 Link Here

(-)a/maven/test/unit/src/org/netbeans/modules/maven/queries/MavenAnnotationProcessingQueryImplTest.java (-1 / +2 lines)
46	import org.openide.filesystems.FileObject;	46	import org.openide.filesystems.FileObject;
47	import org.openide.filesystems.FileUtil;	47	import org.openide.filesystems.FileUtil;
48	import org.openide.filesystems.test.TestFileUtils;	48	import org.openide.filesystems.test.TestFileUtils;
		49	import org.openide.util.Utilities;
49		50
50	public class MavenAnnotationProcessingQueryImplTest extends NbTestCase {	51	public class MavenAnnotationProcessingQueryImplTest extends NbTestCase {
51		52
Lines 73-79 Link Here
73	assertEquals(expected,	74	assertEquals(expected,
74	"enabled=" + r.annotationProcessingEnabled() +	75	"enabled=" + r.annotationProcessingEnabled() +
75	" run=" + r.annotationProcessorsToRun() +	76	" run=" + r.annotationProcessorsToRun() +
76	" s=" + (sOD != null ? sOD.toString().replace(getWorkDir().toURI().toString(), ".../") : "-") +	77	" s=" + (sOD != null ? sOD.toString().replace(Utilities.toURI(getWorkDir()).toString(), ".../") : "-") +
77	" opts=" + opts);	78	" opts=" + opts);
78	}	79	}
79		80




import org.netbeans.modules.maven.NbMavenProjectImpl;
import org.netbeans.modules.maven.embedder.EmbedderFactory;
import org.openide.filesystems.FileUtil;
import org.openide.util.Utilities;
import org.openide.util.test.TestFileUtils;

public class MavenFileOwnerQueryImplTest extends NbTestCase {

        File repo = EmbedderFactory.getProjectEmbedder().getLocalRepositoryFile();
        File art10 = new File(repo, "test/prj/1.0/prj-1.0.jar");
        File art11 = new File(repo, "test/prj/1.1/prj-1.1.jar");
        assertEquals(null, foq.getOwner(Utilities.toURI(art10)));
        assertEquals(null, foq.getOwner(Utilities.toURI(art11)));
        foq.registerProject(p10);
        assertEquals(p10, foq.getOwner(Utilities.toURI(art10)));
        assertEquals(null, foq.getOwner(Utilities.toURI(art11)));
        foq.registerProject(p11);
        assertEquals(p10, foq.getOwner(Utilities.toURI(art10)));
        assertEquals(p11, foq.getOwner(Utilities.toURI(art11)));
    }
    
    public void testOldEntriesGetRemoved() throws Exception {

Lines 45-50 Link Here

(-)a/maven/test/unit/src/org/netbeans/modules/maven/queries/MavenSharabilityQueryImplTest.java (-1 / +2 lines)
45	import java.io.File;	45	import java.io.File;
46	import org.netbeans.api.queries.SharabilityQuery;	46	import org.netbeans.api.queries.SharabilityQuery;
47	import org.netbeans.junit.NbTestCase;	47	import org.netbeans.junit.NbTestCase;
		48	import org.openide.util.Utilities;
48	import org.openide.util.test.TestFileUtils;	49	import org.openide.util.test.TestFileUtils;
49		50
50	public class MavenSharabilityQueryImplTest extends NbTestCase {	51	public class MavenSharabilityQueryImplTest extends NbTestCase {
Lines 82-88 Link Here
82	assertSharability(SharabilityQuery.Sharability.NOT_SHARABLE, "prj/modules/mod/target");	83	assertSharability(SharabilityQuery.Sharability.NOT_SHARABLE, "prj/modules/mod/target");
83	}	84	}
84	private void assertSharability(SharabilityQuery.Sharability expected, String path) throws Exception {	85	private void assertSharability(SharabilityQuery.Sharability expected, String path) throws Exception {
85	assertEquals(path, expected, SharabilityQuery.getSharability(new File(getWorkDir(), path).toURI()));	86	assertEquals(path, expected, SharabilityQuery.getSharability(Utilities.toURI(new File(getWorkDir(), path))));
86	}	87	}
87		88
88	}	89	}

Lines 62-68 Link Here

(-)a/o.n.bootstrap/nbproject/project.xml (-1 / +1 lines)
62	<build-prerequisite/>	62	<build-prerequisite/>
63	<compile-dependency/>	63	<compile-dependency/>
64	<run-dependency>	64	<run-dependency>
65	<specification-version>8.0</specification-version>	65	<specification-version>8.25</specification-version>
66	</run-dependency>	66	</run-dependency>
67	</dependency>	67	</dependency>
68	<dependency>	68	<dependency>




    }

    final void addURL(URL location) throws IOException, URISyntaxException {
        File f = Utilities.toFile(location.toURI());
        assert f.exists() : "URL must be existing local file: " + location;

        List<Source> arr = new ArrayList<Source>(Arrays.asList(sources));

                    return this;
                }
            }
            return "jar:" + Utilities.toURI(new VFile()) + "!/"; // NOI18N
        }

        @Override

        File dir;
        
        DirSource(File file) throws MalformedURLException {
            super(Utilities.toURI(file).toURL());
            dir = file;
        }
        


        protected URL doGetResource(String name) throws MalformedURLException {
            File resFile = new File(dir, name);
            return resFile.exists() ? Utilities.toURI(resFile).toURL() : null;
        }
        
        protected byte[] readClass(String path) throws IOException {

            AGAIN: for (;;) try {
                final URI uri = new URI(filePath);
                if (uri.getScheme().equals("file")) {
                    jar = Utilities.toFile(uri).getPath();
                } else {
                    jar = null;
                }

            return new NbJarURLConnection (u, _src, _name, loader);
        }
        
        static File uri2File(URI uri) { // #207060: UNC; candidate for API (#46813)
            if (uri.getHost() == null) {
                return new File(uri);
            } else {
                return new File("\\\\" + uri.getHost() + uri.getPath().replace('/', '\\'));
            }
        }    

        @Override
        protected void parseURL(URL u, String spec, int start, int limit) {
            if (spec.startsWith("/")) {




import java.util.Map;
import junit.framework.AssertionFailedError;
import org.netbeans.junit.NbTestCase;
import org.openide.util.Utilities;
import org.openide.util.lookup.Lookups;
import org.openide.util.test.TestFileUtils;


        assertTrue(conn instanceof JarURLConnection);
        JarURLConnection jconn = (JarURLConnection) conn;
        assertEquals("package/re source++.txt", jconn.getEntryName());
        assertEquals(Utilities.toURI(jar).toURL(), jconn.getJarFileURL());
        assertEquals("bar", jconn.getMainAttributes().getValue("foo"));
        assertEquals(jar.getAbsolutePath(), jconn.getJarFile().getName());
    }

        File jar = new File(getWorkDir(), "default-package-resource.jar");
        TestFileUtils.writeZipFile(jar, "META-INF/MANIFEST.MF:Manifest-Version: 1.0\nfoo: bar\n\n", "package/re source++.txt:content");
        JarClassLoader jcl = new JarClassLoader(Collections.<File>emptyList(), new ProxyClassLoader[0]);
        jcl.addURL(Utilities.toURI(jar).toURL());
        URL url = jcl.getResource("package/re source++.txt");
        assertTrue(url.toString(), url.toString().endsWith("default-package-resource.jar!/package/re%20source++.txt"));
        URLConnection conn = url.openConnection();

        assertTrue(conn instanceof JarURLConnection);
        JarURLConnection jconn = (JarURLConnection) conn;
        assertEquals("package/re source++.txt", jconn.getEntryName());
        assertEquals(Utilities.toURI(jar).toURL(), jconn.getJarFileURL());
        assertEquals("bar", jconn.getMainAttributes().getValue("foo"));
        assertEquals(jar.getAbsolutePath(), jconn.getJarFile().getName());
    }




import java.util.jar.JarOutputStream;
import java.util.zip.ZipEntry;
import org.netbeans.junit.NbTestCase;
import org.openide.util.Utilities;

/**
 *

    }

    public void testNormalHandler() throws Exception {
        URL root = new URL("jar:" + Utilities.toURI(jar) + "!/");
        URL plain = new URL(root, "/fldr/plain.txt", ProxyURLStreamHandlerFactory.originalJarHandler());
        assertTrue("Contains the plain.txt part: " + plain, plain.toExternalForm().contains("fldr/plain.txt"));
        assertContent("Ahoj", plain);
    }

    public void testNbHandler() throws Exception {
        URL root = new URL("jar:" + Utilities.toURI(jar) + "!/");
        URL plain = new URL(root, "/fldr/plain.txt", new JarClassLoader.JarURLStreamHandler(null));
        assertTrue("Contains the plain.txt part: " + plain, plain.toExternalForm().contains("fldr/plain.txt"));
        assertContent("Ahoj", plain);

Lines 64-69 Link Here

(-)a/o.n.bootstrap/test/unit/src/org/netbeans/ModuleFactoryAlienTest.java (-1 / +2 lines)
64	import org.fakepkg.FakeIfceHidden;	64	import org.fakepkg.FakeIfceHidden;
65	import org.openide.modules.SpecificationVersion;	65	import org.openide.modules.SpecificationVersion;
66	import org.openide.util.Enumerations;	66	import org.openide.util.Enumerations;
		67	import org.openide.util.Utilities;
67	import org.openide.util.test.MockLookup;	68	import org.openide.util.test.MockLookup;
68		69
69	/** Verify contracts needed by Netigso.	70	/** Verify contracts needed by Netigso.
Lines 159-165 Link Here
159	both = b;	160	both = b;
160		161
161	AlienModule am = (AlienModule)m2;	162	AlienModule am = (AlienModule)m2;
162	am.loader.l = new URLClassLoader(new URL[] { am.jar.toURI().toURL() }, m1.getClassLoader());	163	am.loader.l = new URLClassLoader(new URL[] { Utilities.toURI(am.jar).toURL() }, m1.getClassLoader());
163		164
164	assertFalse("Finish without exception", m2.provides("false"));	165	assertFalse("Finish without exception", m2.provides("false"));
165		166

Lines 54-59 Link Here

(-)a/o.n.bootstrap/test/unit/src/org/netbeans/ModuleFactoryTest.java (-1 / +2 lines)
54	import java.util.Set;	54	import java.util.Set;
55	import java.util.jar.JarFile;	55	import java.util.jar.JarFile;
56	import java.util.jar.Manifest;	56	import java.util.jar.Manifest;
		57	import org.openide.util.Utilities;
57	import org.openide.util.test.MockLookup;	58	import org.openide.util.test.MockLookup;
58		59
59	/**	60	/**
Lines 89-95 Link Here
89	File j1 = new File(jars, "simple-module.jar");	90	File j1 = new File(jars, "simple-module.jar");
90	File j2 = new File(jars, "depends-on-simple-module.jar");	91	File j2 = new File(jars, "depends-on-simple-module.jar");
91	File j3 = new File(jars, "dep-on-two-modules.jar");	92	File j3 = new File(jars, "dep-on-two-modules.jar");
92	URLClassLoader l = new URLClassLoader(new URL[] {j1.toURI().toURL(), j2.toURI().toURL()});	93	URLClassLoader l = new URLClassLoader(new URL[] {Utilities.toURI(j1).toURL(), Utilities.toURI(j2).toURL()});
93	Manifest mani1, mani2;	94	Manifest mani1, mani2;
94	JarFile j = new JarFile(j1);	95	JarFile j = new JarFile(j1);
95	try {	96	try {




        }
        ClassLoader l = new URLClassLoader(new URL[] {
            // Order should be irrelevant:
            Utilities.toURI(jar).toURL(),
            Utilities.toURI(ljar).toURL(),
        });
        MockModuleInstaller installer = new MockModuleInstaller();
        MockEvents ev = new MockEvents();

            File j1 = new File(jars, "simple-module.jar");
            File j2 = new File(jars, "depends-on-simple-module.jar");
            File j3 = new File(jars, "dep-on-two-modules.jar");
            URLClassLoader l = new URLClassLoader(new URL[] {Utilities.toURI(j1).toURL(), Utilities.toURI(j2).toURL()});
            Manifest mani1, mani2;
            JarFile j = new JarFile(j1);
            try {

        assertNotNull(modules);
        mgr.mutexPrivileged().enterWriteAccess();
        try {
            ClassLoader l = new URLClassLoader(new URL[] {Utilities.toURI(mod1JAR).toURL(), Utilities.toURI(mod2JAR).toURL()});
            Module mod1 = mgr.createFixed(loadManifest(mod1JAR), null, l);
            mgr.enable(mod1);
            assertEquals(l, mod1.getClassLoader());

Lines 50-55 Link Here

(-)a/o.n.bootstrap/test/unit/src/org/netbeans/ModuleMixedOnClasspathTest.java (-1 / +2 lines)
50	import java.util.jar.JarFile;	50	import java.util.jar.JarFile;
51	import java.util.jar.Manifest;	51	import java.util.jar.Manifest;
52	import org.openide.util.Lookup;	52	import org.openide.util.Lookup;
		53	import org.openide.util.Utilities;
53	import org.openide.util.lookup.Lookups;	54	import org.openide.util.lookup.Lookups;
54	import org.openide.util.lookup.ProxyLookup;	55	import org.openide.util.lookup.ProxyLookup;
55		56
Lines 97-103 Link Here
97	File j1 = new File(jars, "simple-module.jar");	98	File j1 = new File(jars, "simple-module.jar");
98	File j2 = new File(jars, "depends-on-simple-module.jar");	99	File j2 = new File(jars, "depends-on-simple-module.jar");
99	File j3 = new File(jars, "dep-on-two-modules.jar");	100	File j3 = new File(jars, "dep-on-two-modules.jar");
100	URLClassLoader l = new URLClassLoader(new URL[] {j1.toURI().toURL()});	101	URLClassLoader l = new URLClassLoader(new URL[] {Utilities.toURI(j1).toURL()});
101	Manifest mani1, mani2;	102	Manifest mani1, mani2;
102	JarFile j = new JarFile(j1);	103	JarFile j = new JarFile(j1);
103	try {	104	try {




import org.fakepkg.FakeIfceHidden;
import org.openide.util.Enumerations;
import org.openide.util.Exceptions;
import org.openide.util.Utilities;

public class ProxyClassLoaderTest extends SetupHid {


        }

        File j1 = new File(jars, "simple-module.jar");
        ClassLoader l1 = new URLClassLoader(new URL[] { Utilities.toURI(j1).toURL() });

        Loader loader = new Loader("org.bar", "org.fakepkg");
        File jar = new File(jars, "depends-on-simple-module.jar");
        loader.l = new URLClassLoader(new URL[] { Utilities.toURI(jar).toURL() }, l1);


        Class<?> clazz = loader.loadClass("org.bar.SomethingElse");

Lines 79-85 Link Here

(-)a/o.n.bootstrap/test/unit/src/org/netbeans/ProxyURLStreamHandlerFactoryTest.java (-1 / +1 lines)
79	return;	79	return;
80	}	80	}
81	File uncFile = new File("\\\\computerName\\sharedFolder\\a\\b\\c\\d.txt");	81	File uncFile = new File("\\\\computerName\\sharedFolder\\a\\b\\c\\d.txt");
82	URI uri = uncFile.toURI();	82	URI uri = Utilities.toURI(uncFile);
83	String expectedURI = "file:////computerName/sharedFolder/a/b/c/d.txt";	83	String expectedURI = "file:////computerName/sharedFolder/a/b/c/d.txt";
84	assertEquals("Wrong URI from File.toURI.", expectedURI, uri.toString());	84	assertEquals("Wrong URI from File.toURI.", expectedURI, uri.toString());
85	URL url = uri.toURL();	85	URL url = uri.toURL();

Lines 47-52 Link Here

(-)a/o.n.bootstrap/test/unit/src/org/netbeans/URLsAreEqualTest.java (-1 / +2 lines)
47	import java.util.Collections;	47	import java.util.Collections;
48	import java.util.logging.Level;	48	import java.util.logging.Level;
49	import org.netbeans.junit.NbTestCase;	49	import org.netbeans.junit.NbTestCase;
		50	import org.openide.util.Utilities;
50	import org.openide.util.test.TestFileUtils;	51	import org.openide.util.test.TestFileUtils;
51		52
52	/**	53	/**
Lines 69-75 Link Here
69		70
70	File jar = new File(wd, "default-package-resource.jar");	71	File jar = new File(wd, "default-package-resource.jar");
71		72
72	URL orig = new URL("jar:" + jar.toURI() + "!/package/resource.txt");	73	URL orig = new URL("jar:" + Utilities.toURI(jar) + "!/package/resource.txt");
73	URLConnection conn = orig.openConnection();	74	URLConnection conn = orig.openConnection();
74	assertFalse("JDK connection: " + conn, conn.getClass().getName().startsWith("org.netbeans"));	75	assertFalse("JDK connection: " + conn, conn.getClass().getName().startsWith("org.netbeans"));
75		76




    
    private void run(File workDir, String... args) throws Exception {
        URL u = Lookup.class.getProtectionDomain().getCodeSource().getLocation();
        File f = Utilities.toFile(u.toURI());
        assertTrue("file found: " + f, f.exists());
        File nbexec = Utilities.isWindows() ? new File(f.getParent(), "nbexec.exe") : new File(f.getParent(), "nbexec");
        assertTrue("nbexec found: " + nbexec, nbexec.exists());

        URL tu = MainCallback.class.getProtectionDomain().getCodeSource().getLocation();
        File testf = Utilities.toFile(tu.toURI());
        assertTrue("file found: " + testf, testf.exists());
        
        LinkedList<String> allArgs = new LinkedList<String>(Arrays.asList(args));

Lines 54-60 Link Here

(-)a/openide.filesystems/nbproject/project.xml (-1 / +1 lines)
54	<build-prerequisite/>	54	<build-prerequisite/>
55	<compile-dependency/>	55	<compile-dependency/>
56	<run-dependency>	56	<run-dependency>
57	<specification-version>8.10</specification-version>	57	<specification-version>8.25</specification-version>
58	</run-dependency>	58	</run-dependency>
59	</dependency>	59	</dependency>
60	<dependency>	60	<dependency>




            }

            if ((fileURL != null) && "file".equals(fileURL.getProtocol())) {
                retVal = Utilities.toFile(URI.create(fileURL.toExternalForm()));
            }
            if (retVal != null) {
                retVal = normalizeFile(retVal);


        FileObject retVal = null;
        try {
            URL url = Utilities.toURI(file).toURL();

            if ((url.getAuthority() != null) &&
                    (Utilities.isWindows() || (Utilities.getOperatingSystem() == Utilities.OS_OS2))) {
                return null;
            }

            retVal = URLMapper.findFileObject(url);

            /*probably temporary piece of code to catch the cause of #46630*/

        }

        try {
            URL url = (Utilities.toURI(file).toURL());

            if (
                (url.getAuthority() != null) &&
                    (Utilities.isWindows() || (Utilities.getOperatingSystem() == Utilities.OS_OS2))
            ) {
                return null;
            }

            retVal = URLMapper.findFileObjects(url);
        } catch (MalformedURLException e) {
            retVal = null;

    private static File normalizeFileOnUnixAlike(File file) {
        // On Unix, do not want to traverse symlinks.
        // URI.normalize removes ../ and ./ sequences nicely.
        file = Utilities.toFile(Utilities.toURI(file).normalize()).getAbsoluteFile();
        while (file.getAbsolutePath().startsWith("/../")) { // NOI18N
            file = new File(file.getAbsolutePath().substring(3));
        }


        try {
            // URI.normalize removes ../ and ./ sequences nicely.            
            File absoluteFile = Utilities.toFile(Utilities.toURI(file).normalize());
            File canonicalFile = file.getCanonicalFile();
            String absolutePath = absoluteFile.getAbsolutePath();
            if (absolutePath.equals("/..")) { // NOI18N

            do {
                wasDir = entry.isDirectory();
                LOG.finest("urlForArchiveOrDir:toURI:entry");   //NOI18N
                u = Utilities.toURI(entry).toURL();
                isDir = entry.isDirectory();
            } while (wasDir ^ isDir);
            if (isArchiveFile(u) || entry.isFile() && entry.length() < 4) {

    public static File archiveOrDirForURL(URL entry) {
        String u = entry.toString();
        if (u.startsWith("jar:file:") && u.endsWith("!/")) { // NOI18N
            return Utilities.toFile(URI.create(u.substring(4, u.length() - 2)));
        } else if (u.startsWith("file:")) { // NOI18N
            return Utilities.toFile(URI.create(u));
        } else {
            return null;
        }




import org.openide.util.Lookup;
import org.openide.util.LookupEvent;
import org.openide.util.LookupListener;
import org.openide.util.Utilities;

/** Mapper from FileObject -> URL.
 * Should be registered in default lookup. For details see {@link Lookup#getDefault()}.

                    // XXX clumsy; see ArchiveURLMapper for possible cleaner style
                    String toReplace = "__EXCLAMATION_REPLACEMENT__";//NOI18N
                    retURL = new URL(
                            "jar:" + Utilities.toURI(new File(f,toReplace + fo.getPath())).toString().replaceFirst("/"+toReplace,"!/") + // NOI18N
                            ((fo.isFolder() && !fo.isRoot()) ? "/" : "")
                        ); // NOI18N
                } catch (MalformedURLException mfx) {

        }

        private static URL toURL(File fFile, FileObject fo) throws MalformedURLException {
            URL retVal = Utilities.toURI(fFile).toURL();
            if (retVal != null && fo.isFolder()) {
                // #155742,160333 - URL for folder must always end with slash
                final String urlDef = retVal.toExternalForm();

            try {
                URI uri = new URI(u.toExternalForm());

                return FileUtil.normalizeFile(Utilities.toFile(uri));
            } catch (URISyntaxException use) {
                // malformed URL
                return null;

Lines 74-79 Link Here

(-)a/openide.filesystems/src/org/openide/filesystems/XMLFileSystem.java (-1 / +2 lines)
74	import org.openide.util.Enumerations;	74	import org.openide.util.Enumerations;
75	import org.openide.util.Exceptions;	75	import org.openide.util.Exceptions;
76	import org.openide.util.NbBundle;	76	import org.openide.util.NbBundle;
		77	import org.openide.util.Utilities;
77	import org.openide.xml.XMLUtil;	78	import org.openide.xml.XMLUtil;
78	import org.xml.sax.Attributes;	79	import org.xml.sax.Attributes;
79	import org.xml.sax.InputSource;	80	import org.xml.sax.InputSource;
Lines 1119-1125 Link Here
1119		1120
1120	if ("file".equals(protocol)) { //NOI18N	1121	if ("file".equals(protocol)) { //NOI18N
1121	try {	1122	try {
1122	File f = new File(URI.create(url.toExternalForm()));	1123	File f = Utilities.toFile(URI.create(url.toExternalForm()));
1123	if (!f.equals(lastFile)) {	1124	if (!f.equals(lastFile)) {
1124	lastFile = f;	1125	lastFile = f;
1125	lastFileDate = new Date(f.lastModified());	1126	lastFileDate = new Date(f.lastModified());

Lines 48-53 Link Here

(-)a/openide.filesystems/test/unit/src/org/openide/filesystems/AttributesTestHidden.java (-1 / +2 lines)
48	import java.util.*;	48	import java.util.*;
49	import java.io.*;	49	import java.io.*;
50	import java.lang.reflect.Method;	50	import java.lang.reflect.Method;
		51	import org.openide.util.Utilities;
51		52
52	/**	53	/**
53	*	54	*
Lines 305-311 Link Here
305	).getBytes());	306	).getBytes());
306	fos.close();	307	fos.close();
307		308
308	XMLFileSystem xfs = new XMLFileSystem(f.toURI().toURL());	309	XMLFileSystem xfs = new XMLFileSystem(Utilities.toURI(f).toURL());
309	FileObject template = xfs.findResource("Templates/Other/special");	310	FileObject template = xfs.findResource("Templates/Other/special");
310	assertNotNull("template found", template);	311	assertNotNull("template found", template);
311	FileObject foTested = testedFS.getRoot().createData("copiedTemplate");	312	FileObject foTested = testedFS.getRoot().createData("copiedTemplate");




    }
    private void assertCorrectURL(String filename, String expectedURLPrefix, String expectedURLSuffix) throws Exception {
        File d = getWorkDir();
        assertEquals(expectedURLSuffix == null ? null : new URL(expectedURLPrefix + Utilities.toURI(d) + expectedURLSuffix),
                FileUtil.urlForArchiveOrDir(new File(d, filename)));
    }
    private void assertCorrectFile(String expectedFilename, String urlPrefix, String urlSuffix) throws Exception {
        assertEquals(expectedFilename == null ? null : new File(getWorkDir(), expectedFilename),
                FileUtil.archiveOrDirForURL(new URL(urlPrefix + Utilities.toURI(getWorkDir()) + urlSuffix)));
    }

    /** Tests translation from jar resource url to jar archive url. */

        };
        log.addHandler(handler);
        try {
            final boolean result = FileUtil.isArchiveFile(Utilities.toURI(testFile).toURL());
            assertTrue("The test.jar should be archive.",result);   //NOI18N
        } finally {
            log.removeHandler(handler);

Lines 182-188 Link Here

(-)a/openide.filesystems/test/unit/src/org/openide/filesystems/FileUtilTestHidden.java (-1 / +1 lines)
182	}	182	}
183		183
184	public void testIsArchiveFile() throws Exception {	184	public void testIsArchiveFile() throws Exception {
185	final String base = getWorkDir().toURI().toURL().toExternalForm();	185	final String base = Utilities.toURI(getWorkDir()).toURL().toExternalForm();
186	URL url = new URL(base + "test.jar"); //NOI18N	186	URL url = new URL(base + "test.jar"); //NOI18N
187	assertTrue("test.jar has to be an archive", FileUtil.isArchiveFile(url)); //NOI18N	187	assertTrue("test.jar has to be an archive", FileUtil.isArchiveFile(url)); //NOI18N
188	url = new URL(base + ".hidden.jar"); //NOI18N	188	url = new URL(base + ".hidden.jar"); //NOI18N

Lines 49-54 Link Here

(-)a/openide.filesystems/test/unit/src/org/openide/filesystems/MultiFileObjectTestHid.java (-1 / +2 lines)
49	import java.util.ArrayList;	49	import java.util.ArrayList;
50	import java.util.Arrays;	50	import java.util.Arrays;
51	import java.util.List;	51	import java.util.List;
		52	import org.openide.util.Utilities;
52		53
53	public class MultiFileObjectTestHid extends TestBaseHid {	54	public class MultiFileObjectTestHid extends TestBaseHid {
54	private static String[] resources = new String [] {	55	private static String[] resources = new String [] {
Lines 235-241 Link Here
235	+ " </folder>\n"	236	+ " </folder>\n"
236	+ " </folder>\n"	237	+ " </folder>\n"
237	+ "</filesystem>");	238	+ "</filesystem>");
238	XMLFileSystem xml = new XMLFileSystem(f.toURI().toURL());	239	XMLFileSystem xml = new XMLFileSystem(Utilities.toURI(f).toURL());
239	all.add(xml);	240	all.add(xml);
240	mfs.setDelegates(all.toArray(new FileSystem[0]));	241	mfs.setDelegates(all.toArray(new FileSystem[0]));
241		242

Lines 57-62 Link Here

(-)a/openide.filesystems/test/unit/src/org/openide/filesystems/TestUtilHid.java (-1 / +2 lines)
57	import java.util.Iterator;	57	import java.util.Iterator;
58	import java.util.Map;	58	import java.util.Map;
59	import java.util.StringTokenizer;	59	import java.util.StringTokenizer;
		60	import org.openide.util.Utilities;
60		61
61	/**	62	/**
62	* @author rm111737	63	* @author rm111737
Lines 176-182 Link Here
176		177
177	XMLFileSystem xfs = new XMLFileSystem ();	178	XMLFileSystem xfs = new XMLFileSystem ();
178	try {	179	try {
179	xfs.setXmlUrl(xmlFile.toURI().toURL());	180	xfs.setXmlUrl(Utilities.toURI(xmlFile).toURL());
180	} catch (Exception ex) {}	181	} catch (Exception ex) {}
181		182
182	return xfs;	183	return xfs;

Lines 50-55 Link Here

(-)a/openide.filesystems/test/unit/src/org/openide/filesystems/URLMapper50852Test.java (-1 / +2 lines)
50		50
51	import java.net.URL;	51	import java.net.URL;
52	import java.io.File;	52	import java.io.File;
		53	import org.openide.util.Utilities;
53		54
54	/**	55	/**
55	* Simulates issue 50852.	56	* Simulates issue 50852.
Lines 76-82 Link Here
76	*/	77	*/
77	protected void setUp() throws Exception {	78	protected void setUp() throws Exception {
78	File workdir = getWorkDir();	79	File workdir = getWorkDir();
79	testURL = workdir.toURI().toURL();	80	testURL = Utilities.toURI(workdir).toURL();
80	System.setProperty("org.openide.util.Lookup", "org.openide.filesystems.URLMapper50852Test$Lkp");	81	System.setProperty("org.openide.util.Lookup", "org.openide.filesystems.URLMapper50852Test$Lkp");
81	MAPPER_INSTANCE = new MyURLMapper ();	82	MAPPER_INSTANCE = new MyURLMapper ();
82	Lkp lkp = (Lkp)org.openide.util.Lookup.getDefault();	83	Lkp lkp = (Lkp)org.openide.util.Lookup.getDefault();




import java.util.zip.CRC32;
import java.util.zip.ZipEntry;
import org.netbeans.junit.NbTestCase;
import org.openide.util.Utilities;

/**
 * Test functionality of URLMapper.

        lfs.setRootDirectory(getWorkDir());
        Repository.getDefault().addFileSystem(lfs);
        
        URL uPlus = Utilities.toURI(plus).toURL();
        FileObject fo = URLMapper.findFileObject(uPlus);
        assertNotNull("File object found", fo);
        assertEquals("plus+plus", fo.getNameExt());

        FileObject rootFO = jfs.getRoot();
        FileObject textFO = jfs.findResource(textPath);
        assertNotNull("JAR contains a/b.txt", textFO);
        String rootS = "jar:" + Utilities.toURI(jar) + "!/";
        URL rootU = new URL(rootS);
        URL textU = new URL(rootS + textPath);
        assertEquals("correct FO -> URL for root", rootU, URLMapper.findURL(rootFO, URLMapper.EXTERNAL));




import java.util.jar.JarEntry;
import java.util.jar.JarOutputStream;
import org.openide.util.Enumerations;
import org.openide.util.Utilities;

public class XMLFileSystemTestHid extends TestBaseHid {
    /** Factory for all filesystems that want to use TCK in this class.

        
        resources = new String[] {"a/b/c","a/b1/c"};

        if (!FileSystemFactoryHid.switchXMLSystem(xfs, this, Utilities.toURI(createXMLLayer()).toURL())) {
            // OK, unsupported
            return;
        }

    @Override
    protected void setUp() throws Exception {
        File f = createXMLLayer();
        xfs = FileSystemFactoryHid.createXMLSystem(getName(), this, Utilities.toURI(f).toURL());
        this.testedFS = xfs;
        this.allTestedFS = new FileSystem[] { xfs };
        super.setUp();

        
        
        
        xfs = FileSystemFactoryHid.createXMLSystem(getName(), this, Utilities.toURI(f).toURL());
        
        FileObject fo = xfs.findResource ("TestModule/sample.txt");
        assertEquals ("Four bytes there", 4, fo.getSize ());
        registerDefaultListener (fo);
        
        if (!FileSystemFactoryHid.switchXMLSystem(xfs, this, Utilities.toURI(f2).toURL())) {
            // OK, unsupported
            return;
        }

        
        
        
        xfs = FileSystemFactoryHid.createXMLSystem(getName(), this, Utilities.toURI(f).toURL());
        
        FileObject fo = xfs.findResource ("TestModule/sample.txt");
        assertEquals ("Four bytes there", 4, fo.getSize ());
        registerDefaultListener (fo);
        
        if (!FileSystemFactoryHid.switchXMLSystem(xfs, this, Utilities.toURI(f2).toURL())) {
            // OK, unsupported
            return;
        }

        
        
        
        xfs = FileSystemFactoryHid.createXMLSystem(getName(), this, Utilities.toURI(f).toURL());
        
        FileObject fo = xfs.findResource ("TestModule/sample.txt");
        assertEquals("Old value is in the attribute", "old", fo.getAttribute("value"));
        registerDefaultListener (fo);
        
        if (!FileSystemFactoryHid.switchXMLSystem(xfs, this, Utilities.toURI(f2).toURL())) {
            // OK, unsupported
            return;
        }

        
        
        
        xfs = FileSystemFactoryHid.createXMLSystem(getName(), this, Utilities.toURI(f).toURL());
        
        FileObject fo = xfs.findResource("TestModule/sample.txt");
        assertEquals("Four bytes there", 4, fo.getSize());
        registerDefaultListener(fo);
        
        if (!FileSystemFactoryHid.switchXMLSystem(xfs, this, Utilities.toURI(f2).toURL())) {
            // OK, unsupported
            return;
        }

                f.lastModified() < f2.lastModified()
            );
        }
        xfs = FileSystemFactoryHid.createXMLSystem(getName(), this, Utilities.toURI(f).toURL());
        FileObject fo = xfs.findResource ("TestModule/sample.txt");
        assertNotNull(fo);
        assertEquals(fo.lastModified().getTime(), f.lastModified());        

                "</filesystem>\n"
                );

        xfs = FileSystemFactoryHid.createXMLSystem(getName(), this, Utilities.toURI(f).toURL());
        FileObject fo = xfs.findResource ("TestModule/sample.txt");
        assertNotNull(fo);
        

                + "    </folder>\n"
                + "</filesystem>");

        xfs = FileSystemFactoryHid.createXMLSystem(getName(), this, Utilities.toURI(f).toURL());
        final LocalFileSystem lfs = new LocalFileSystem();
        lfs.setRootDirectory(getWorkDir());
        MultiFileSystem mfs = new MultiFileSystem(lfs, xfs);

                );
        Count.cnt = 0;

        xfs = FileSystemFactoryHid.createXMLSystem(getName(), this, Utilities.toURI(f).toURL());
        /** the following is a fake implementation of filesystem that
         * allows us to prevent calls to fileObject.getAttributes()
         */

                "</filesystem>\n"
                );

        xfs = FileSystemFactoryHid.createXMLSystem(getName(), this, Utilities.toURI(f).toURL());
        FileObject fo = xfs.findResource ("TestModule/sample.txt");
        assertNotNull(fo);


                "</filesystem>\n"
                );

        xfs = FileSystemFactoryHid.createXMLSystem(getName(), this, Utilities.toURI(f).toURL());
        FileObject fo = xfs.findResource ("TestModule/sample.txt");
        assertNotNull(fo);


            "</filesystem>\n"
        );

        xfs = FileSystemFactoryHid.createXMLSystem(getName(), this, Utilities.toURI(f).toURL());
        FileObject fo = xfs.findResource ("TestModule/sample.txt");
        assertNotNull(fo);


            "</filesystem>\n"
        );

        xfs = FileSystemFactoryHid.createXMLSystem(getName(), this, Utilities.toURI(f).toURL());
        FileObject fo = xfs.findResource ("TestModule/sample.txt");
        assertNotNull(fo);

        XMLFileSystem realXMLFS = new XMLFileSystem(Utilities.toURI(f).toURL());
        FileObject realfo = realXMLFS.findResource("TestModule/sample.txt");
        assertNotNull(realfo);


            "</filesystem>\n"
        );

        xfs = FileSystemFactoryHid.createXMLSystem(getName(), this, Utilities.toURI(f).toURL());
        FileObject fo = xfs.findResource ("TestModule/sample.txt");
        FileObject snd = xfs.findResource ("TestModule/snd.txt");
        assertNotNull(fo);

                "</filesystem>\n"
                );

        xfs = FileSystemFactoryHid.createXMLSystem(getName(), this, Utilities.toURI(f).toURL());
        FileObject fo = xfs.findResource ("TestModule/sample.txt");
        assertNotNull(fo);


            )
        );

        URL url1 = new URL("jar:" + Utilities.toURI(jar1) + "!/layer.xml");
        URL url2 = new URL("jar:" + Utilities.toURI(jar2) + "!/layer.xml");

        FileSystem xfs1 = FileSystemFactoryHid.createXMLSystem(getName(), this, url1);
        FileObject fo1 = xfs1.findResource("dir/file");

        File f2 = changeOfAnAttributeInLayerIsFiredgenerateLayer("Folder", "java.awt.Button");
        File f3 = changeOfAnAttributeInLayerIsFiredgenerateLayer("NoChange", "nochange");

        fs.setXmlUrls (new URL[] { Utilities.toURI(f1).toURL(), Utilities.toURI(f3).toURL() } );
        
        FileObject file = fs.findResource("Folder/empty.xml");
        assertNotNull("File found in layer", file);

        assertAttr("The first value is list", file, "value", "java.awt.List");
        assertAttr("Imutable value is nochange", nochange, "value", "nochange");
        
        fs.setXmlUrls (new URL[] { Utilities.toURI(f2).toURL(), Utilities.toURI(f3).toURL() } );
        String v2 = (String) file.getAttribute("value");
        assertEquals("The second value is button", "java.awt.Button", v2);
        

        LocalFileSystem target = new LocalFileSystem();
        target.setRootDirectory(r);

        FileSystem source = FileSystemFactoryHid.createXMLSystem(getName(), this, Utilities.toURI(f).toURL());
        FileObject template = source.findResource("Templates/Other/special");
        assertNotNull("template found", template);
        FileObject foTested = target.getRoot().createData("copiedTemplate");

            w.close();
        }

        xfs = FileSystemFactoryHid.createXMLSystem(getName(), this, Utilities.toURI(f1).toURL(), Utilities.toURI(f2).toURL());


        FileObject just1 = xfs.findResource("just1/empty.xml");

        String layers2 = layers(just2);
        String layersB = layers(both);

        if (!layersR.contains(Utilities.toURI(f1).toString())) {
            fail("Missing " + Utilities.toURI(f1).toString() + "\ninside: " + layersR);
        }
        if (!layersR.contains(Utilities.toURI(f2).toString())) {
            fail("Missing " + Utilities.toURI(f2).toString() + "\ninside: " + layersR);
        }

        assertEquals(Utilities.toURI(f1).toString(), layers1);
        assertEquals(Utilities.toURI(f2).toString(), layers2);
        if (!layersB.contains(Utilities.toURI(f1).toString())) {
            fail("Missing " + f1 + "\ninside: " + layersB);
        }
        if (!layersB.contains(Utilities.toURI(f2).toString())) {
            fail("Missing " + f2 + "\ninside: " + layersB);
        }
    }

            + "</filesystem>");
        w.close();

        xfs = FileSystemFactoryHid.createXMLSystem(getName(), this, Utilities.toURI(layer).toURL());

        FileObject fo = xfs.findResource("f/empty.xml");
        assertNotNull("File found", fo);

        File f1 = writeFile("layer1.xml",
                "<filesystem>\n" +
                "<folder name='d'>\n" +
                "<file name='f' url='" + Utilities.toURI(c1) + "'/>" +
                "</folder>\n" +
                "</filesystem>\n"
                );
        File f2 = writeFile("layer2.xml",
                "<filesystem>\n" +
                "<folder name='d'>\n" +
                "<file name='f' url='" + Utilities.toURI(c2) + "'>" +
                "  <attr name='weight' intvalue='100'/>" +
                "</file>\n" +
                "</folder>\n" +
                "</filesystem>\n"
                );

        xfs = FileSystemFactoryHid.createXMLSystem(getName(), this, Utilities.toURI(f2).toURL(), Utilities.toURI(f1).toURL());
        FileObject fo = xfs.findResource("d/f");
        assertNotNull(fo);
        assertEquals(6, fo.getSize());
        xfs = FileSystemFactoryHid.createXMLSystem(getName(), this, Utilities.toURI(f1).toURL(), Utilities.toURI(f2).toURL());
        fo = xfs.findResource("d/f");
        assertNotNull(fo);
        assertEquals(6, fo.getSize());




import org.netbeans.junit.NbTestCase;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.XMLFileSystem;
import org.openide.util.Utilities;
import org.openide.util.lookup.ServiceProvider;
import org.openide.util.test.AnnotationProcessorTestUtils;
import org.openide.util.test.TestFileUtils;

        File j = TestFileUtils.writeZipFile(new File(getWorkDir(), "cp.jar"), "other/x1:x1");
        TestFileUtils.writeFile(new File(src, "p/resources/x2"), "x2");
        ByteArrayOutputStream err = new ByteArrayOutputStream();
        boolean status = AnnotationProcessorTestUtils.runJavac(src, null, dest, new File[] {j, Utilities.toFile(LayerBuilderTest.class.getProtectionDomain().getCodeSource().getLocation().toURI())}, err);
        String msgs = err.toString();
        assertTrue(msgs, status);
        assertTrue(msgs, msgs.contains("r1=x1") ^ AnnotationProcessorTestUtils.searchClasspathBroken());
        assertTrue(msgs, msgs.contains("r2=x2"));
        FileObject f = new XMLFileSystem(Utilities.toURI(new File(dest, "META-INF/generated-layer.xml")).toURL()).findResource("f");
        assertNotNull(f);
        assertEquals("other/x1", f.getAttribute("r1"));
        assertEquals("p/resources/x2", f.getAttribute("r2"));

        File j = TestFileUtils.writeZipFile(new File(getWorkDir(), "cp.jar"), "other/x1:x1");
        TestFileUtils.writeFile(new File(src, "p/resources/x2"), "x2");
        ByteArrayOutputStream err = new ByteArrayOutputStream();
        boolean status = AnnotationProcessorTestUtils.runJavac(src, null, dest, new File[] {j, Utilities.toFile(LayerBuilderTest.class.getProtectionDomain().getCodeSource().getLocation().toURI())}, err);
        String msgs = err.toString();
        assertFalse(msgs, status);
        assertTrue(msgs, msgs.contains("resourcez"));
        assertTrue(msgs, msgs.contains("r1=x1") ^ AnnotationProcessorTestUtils.searchClasspathBroken());
        AnnotationProcessorTestUtils.makeSource(src, "p.C", "@" + V.class.getCanonicalName() + "(r1=\"othr/x1\", r2=\"resources/x2\") public class C {}");
        err = new ByteArrayOutputStream();
        status = AnnotationProcessorTestUtils.runJavac(src, null, dest, new File[] {j, Utilities.toFile(LayerBuilderTest.class.getProtectionDomain().getCodeSource().getLocation().toURI())}, err);
        msgs = err.toString();
        assertFalse(msgs, status ^ AnnotationProcessorTestUtils.searchClasspathBroken());
        assertTrue(msgs, msgs.contains("othr") ^ AnnotationProcessorTestUtils.searchClasspathBroken());

Lines 154-160 Link Here

(-)a/openide.loaders/nbproject/project.xml (-1 / +1 lines)
154	<build-prerequisite/>	154	<build-prerequisite/>
155	<compile-dependency/>	155	<compile-dependency/>
156	<run-dependency>	156	<run-dependency>
157	<specification-version>8.4</specification-version>	157	<specification-version>8.25</specification-version>
158	</run-dependency>	158	</run-dependency>
159	</dependency>	159	</dependency>
160	<dependency>	160	<dependency>

Lines 1488-1494 Link Here

(-)a/openide.loaders/src/org/openide/loaders/DataFolder.java (-1 / +1 lines)
1488	}	1488	}
1489	try {	1489	try {
1490	URI uri = new URI(s);	1490	URI uri = new URI(s);
1491	File file = new File(uri);	1491	File file = Utilities.toFile(uri);
1492	list.add( file );	1492	list.add( file );
1493	} catch( java.net.URISyntaxException e ) {	1493	} catch( java.net.URISyntaxException e ) {
1494	// malformed URI	1494	// malformed URI

Lines 658-664 Link Here

(-)a/openide.loaders/src/org/openide/loaders/DataNode.java (-1 / +1 lines)
658	}	658	}
659	});	659	});
660	//linux	660	//linux
661	final String uriList = file.toURI().toString() + "\r\n";	661	final String uriList = Utilities.toURI(file).toString() + "\r\n";
662	t.put( new ExTransferable.Single( createUriListFlavor() ) {	662	t.put( new ExTransferable.Single( createUriListFlavor() ) {
663	public Object getData() {	663	public Object getData() {
664	return uriList;	664	return uriList;

Lines 56-61 Link Here

(-)a/openide.loaders/test/unit/src/org/openide/loaders/DataFolderPasteTypesTest.java (-1 / +2 lines)
56	import org.openide.filesystems.LocalFileSystem;	56	import org.openide.filesystems.LocalFileSystem;
57	import org.openide.filesystems.Repository;	57	import org.openide.filesystems.Repository;
58	import org.openide.nodes.Node;	58	import org.openide.nodes.Node;
		59	import org.openide.util.Utilities;
59	import org.openide.util.datatransfer.PasteType;	60	import org.openide.util.datatransfer.PasteType;
60		61
61	public class DataFolderPasteTypesTest extends NbTestCase {	62	public class DataFolderPasteTypesTest extends NbTestCase {
Lines 119-125 Link Here
119	DataFlavor flavor = new DataFlavor( "unsupported/flavor;class=java.lang.Object" );	120	DataFlavor flavor = new DataFlavor( "unsupported/flavor;class=java.lang.Object" );
120	FileObject testFO = FileUtil.createData( testFileSystem.getRoot(), "testFile.txt" );	121	FileObject testFO = FileUtil.createData( testFileSystem.getRoot(), "testFile.txt" );
121	File testFile = FileUtil.toFile( testFO );	122	File testFile = FileUtil.toFile( testFO );
122	String uriList = testFile.toURI() + "\r\n";	123	String uriList = Utilities.toURI(testFile) + "\r\n";
123	Transferable t = new MockTransferable( new DataFlavor[] {new DataFlavor("text/uri-list;class=java.lang.String")}, uriList );	124	Transferable t = new MockTransferable( new DataFlavor[] {new DataFlavor("text/uri-list;class=java.lang.String")}, uriList );
124		125
125	DataFolder.FolderNode node = (DataFolder.FolderNode)folderNode;	126	DataFolder.FolderNode node = (DataFolder.FolderNode)folderNode;

Lines 191-197 Link Here

(-)a/openide.loaders/test/unit/src/org/openide/loaders/DataShadowTest.java (-1 / +1 lines)
191	//If masterfs isn't reachable - second test crucial for URL,File, FileObject conversions	191	//If masterfs isn't reachable - second test crucial for URL,File, FileObject conversions
192	// not necessary to be able to convert - but at least no IllegalArgumentException is expected	192	// not necessary to be able to convert - but at least no IllegalArgumentException is expected
193	if ("file".equals(url.getProtocol())) {	193	if ("file".equals(url.getProtocol())) {
194	new File (URI.create(url.toExternalForm()));	194	Utilities.toFile(URI.create(url.toExternalForm()));
195	}	195	}
196	}	196	}
197		197




import org.openide.nodes.Children;
import org.netbeans.junit.*;
import org.openide.filesystems.LocalFileSystem;
import org.openide.util.Utilities;

public class DragAndDropDataNodeTest extends NbTestCase {



        assertTrue( t.isDataFlavorSupported( uriListFlavor ) );
        String uriList = (String) t.getTransferData( uriListFlavor );
        assertEquals( Utilities.toURI(tmpFile)+"\r\n", uriList );
    }

    public void testClipboardCut() throws ClassNotFoundException, IOException, UnsupportedFlavorException {


        assertTrue( t.isDataFlavorSupported( uriListFlavor ) );
        String uriList = (String) t.getTransferData( uriListFlavor );
        assertEquals( Utilities.toURI(tmpFile)+"\r\n", uriList );
    }
}




    <apidef name="actions">Actions API</apidef>
</apidefs>
<changes>
    <change id="File.URI">
        <api name="util"/>
        <summary>UNC-safe File / URI interconversion</summary>
        <version major="8" minor="25"/>
        <date year="2012" month="6" day="13"/>
        <author login="jglick"/>
        <compatibility addition="yes">
            <p>
                Use the Jackpot-format upgrade hint.
            </p>
        </compatibility>
        <description>
            <p>
                <code>Utilities</code> gets new methods <code>toURI(File)</code>
                and <code>toFile(URI)</code> which offer the UNC safety of NIO.2
                even on JDK 6.
            </p>
        </description>
        <class package="org.openide.util" name="Utilities"/>
        <issue number="213562"/>
    </change>
    <change id="exit-code">
        <api name="util"/>
        <summary>Exit with status code</summary>

Lines 1-5 Link Here

(-)a/openide.util/manifest.mf (-1 / +1 lines)
1	Manifest-Version: 1.0	1	Manifest-Version: 1.0
2	OpenIDE-Module: org.openide.util	2	OpenIDE-Module: org.openide.util
3	OpenIDE-Module-Localizing-Bundle: org/openide/util/Bundle.properties	3	OpenIDE-Module-Localizing-Bundle: org/openide/util/Bundle.properties
4	OpenIDE-Module-Specification-Version: 8.24	4	OpenIDE-Module-Specification-Version: 8.25
5		5

Line 0 Link Here

(-)a/openide.util/src/META-INF/upgrade/Utilities.hint (+9 lines)
	1	$f.toURI() :: $f instanceof java.io.File
	2	=>
	3	org.openide.util.Utilities.toURI($f)
	4	;;
	5
	6	new java.io.File($u) :: $u instanceof java.net.URI
	7	=>
	8	org.openide.util.Utilities.toFile($u)
	9	;;




import java.lang.ref.ReferenceQueue;
import java.lang.ref.SoftReference;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.net.MalformedURLException;

        new AsyncInitSupport(comp4Init, initJob);
    }

    /** JDK 7 */
    private static Method fileToPath, pathToUri, pathsGet, pathToFile;
    static {
        try {
            fileToPath = File.class.getMethod("toPath");
        } catch (NoSuchMethodException x) {
            // fine, JDK 6
        }
        if (fileToPath != null) {
            try {
                Class<?> path = Class.forName("java.nio.file.Path");
                pathToUri = path.getMethod("toUri");
                pathsGet = Class.forName("java.nio.file.Paths").getMethod("get", URI.class);
                pathToFile = path.getMethod("toFile");
            } catch (Exception x) {
                throw new ExceptionInInitializerError(x);
            }
        }
    }

    /**
     * Converts a file to a URI while being safe for UNC paths.
     * Unlike {@link File#toURI} the result works with {@link URI#normalize()}.
     * @param f a file
     * @return a {@code file}-protocol URI which may use the host field
     * @see java.nio.file.Path.toUri
     * @since 8.25
     */
    public static URI toURI(File f) {
        if (fileToPath != null) {
            try {
                return (URI) pathToUri.invoke(fileToPath.invoke(f));
            } catch (Exception x) {
                LOG.log(Level.WARNING, "could not convert " + f + " to URI", x);
            }
        }
        String path = f.getAbsolutePath();
        if (path.startsWith("\\\\")) { // UNC
            if (!path.endsWith("\\") && f.isDirectory()) {
                path += "\\";
            }
            try {
                return new URI("file", null, path.replace('\\', '/'), null);
            } catch (URISyntaxException x) {
                LOG.log(Level.WARNING, "could not convert " + f + " to URI", x);
            }
        }
        return f.toURI();
    }

    /**
     * Converts a URI to a file while being safe for UNC paths.
     * Unlike {@link File#File(URI)} UNC URIs with a host field are accepted.
     * @param u a {@code file}-protocol URI which may use the host field
     * @return a file
     * @see java.nio.file.Paths.get(java.net.URI)
     * @since 8.25
     */
    public static File toFile(URI u) throws IllegalArgumentException {
        if (pathsGet != null) {
            try {
                return (File) pathToFile.invoke(pathsGet.invoke(null, u));
            } catch (InvocationTargetException x) {
                Throwable cause = x.getCause();
                if (cause instanceof IllegalArgumentException) {
                    throw (IllegalArgumentException) cause;
                } else if (cause instanceof UnsupportedOperationException || cause != null && cause.getClass().getName().equals("java.nio.file.FileSystemNotFoundException")) {
                    throw new IllegalArgumentException(cause);
                } else {
                    LOG.log(Level.WARNING, "could not convert " + u + " to File", x);
                }
            } catch (Exception x) {
                LOG.log(Level.WARNING, "could not convert " + u + " to File", x);
            }
        }
        String host = u.getHost();
        if (host != null && !host.isEmpty() && "file".equals(u.getScheme())) {
            return new File("\\\\" + host + u.getPath().replace('/', '\\'));
        }
        return new File(u);
    }

    /**
     * Convert a file to a matching <code>file:</code> URL.
     * @param f a file (absolute only)

     * @see #toFile
     * @see <a href="http://www.netbeans.org/issues/show_bug.cgi?id=29711">Issue #29711</a>
     * @since 3.26
     * @deprecated Use {@link #toURI} and {@link URI#toURL} instead under JDK 1.4.
     *             ({@link File#toURL} is buggy in JDK 1.3 and the bugs are not fixed in JDK 1.4.)
     */
    @Deprecated

            throw new IllegalArgumentException("Relative path: " + f); // NOI18N
        }

        URI uri = toURI(f);

        return uri.toURL();
    }

     * @see #toURL
     * @see <a href="http://www.netbeans.org/issues/show_bug.cgi?id=29711">Issue #29711</a>
     * @since 3.26
     * @deprecated Use {@link URL#toURI} and {@link #toFile(URI)} instead under JDK 1.4.
     *             (There was no proper equivalent under JDK 1.3.)
     */
    @Deprecated

        }

        try {
            URI uri = u.toURI();

            return toFile(uri);
        } catch (URISyntaxException use) {
            // malformed URL
            return null;




import org.openide.util.NbBundle.Messages;
import org.openide.util.test.TestFileUtils;
import static org.netbeans.modules.openide.util.Bundle.*;
import org.openide.util.Utilities;

@Messages("k3=value #3")
public class NbBundleProcessorTest extends NbTestCase {

                "public static final Object X = new Object() {public String toString() {return Bundle.k();}};",
                "}");
        assertTrue(AnnotationProcessorTestUtils.runJavac(src, null, dest, null, null));
        ClassLoader l = new URLClassLoader(new URL[] {Utilities.toURI(dest).toURL()});
        assertEquals("v", l.loadClass("p.C").getField("X").get(null).toString());
    }


    public void testPackageKeys() throws Exception {
        AnnotationProcessorTestUtils.makeSource(src, "p.package-info", "@org.openide.util.NbBundle.Messages(\"k=v\")", "package p;");
        assertTrue(AnnotationProcessorTestUtils.runJavac(src, null, dest, null, null));
        ClassLoader l = new URLClassLoader(new URL[] {Utilities.toURI(dest).toURL()});
        Method m = l.loadClass("p.Bundle").getDeclaredMethod("k");
        m.setAccessible(true);
        assertEquals("v", m.invoke(null));

        AnnotationProcessorTestUtils.makeSource(src, "p.C2", "@org.openide.util.NbBundle.Messages(\"k2=v2\")", "public class C2 {public @Override String toString() {return Bundle.k2();}}");
        assertTrue(AnnotationProcessorTestUtils.runJavac(src, null, dest, null, null));
        assertTrue(AnnotationProcessorTestUtils.runJavac(src, null, dest, null, null));
        ClassLoader l = new URLClassLoader(new URL[] {Utilities.toURI(dest).toURL()});
        assertEquals("v1", l.loadClass("p.C1").newInstance().toString());
        assertEquals("v2", l.loadClass("p.C2").newInstance().toString());
        AnnotationProcessorTestUtils.makeSource(src, "p.C1", "@org.openide.util.NbBundle.Messages(\"k1=v3\")", "public class C1 {public @Override String toString() {return Bundle.k1();}}");
        assertTrue(AnnotationProcessorTestUtils.runJavac(src, "C1.java", dest, null, null));
        l = new URLClassLoader(new URL[] {Utilities.toURI(dest).toURL()});
        assertEquals("v3", l.loadClass("p.C1").newInstance().toString());
        assertEquals("v2", l.loadClass("p.C2").newInstance().toString());
        AnnotationProcessorTestUtils.makeSource(src, "p.C1", "@org.openide.util.NbBundle.Messages(\"k3=v4\")", "public class C1 {public @Override String toString() {return Bundle.k3();}}");
        assertTrue(AnnotationProcessorTestUtils.runJavac(src, "C1.java", dest, null, null));
        l = new URLClassLoader(new URL[] {Utilities.toURI(dest).toURL()});
        assertEquals("v4", l.loadClass("p.C1").newInstance().toString());
        assertEquals("v2", l.loadClass("p.C2").newInstance().toString());
    }

        AnnotationProcessorTestUtils.makeSource(src, "p.C3", "class C3 {C3() {new Runnable() {public @Override void run() {new Runnable() {public @Override void run() {}};}};}}");
        assertTrue(AnnotationProcessorTestUtils.runJavac(src, null, dest, null, null));
        assertTrue(AnnotationProcessorTestUtils.runJavac(src, null, dest, null, null));
        ClassLoader l = new URLClassLoader(new URL[] {Utilities.toURI(dest).toURL()});
        assertEquals("v1", l.loadClass("p.C1").newInstance().toString());
        assertEquals("v2", l.loadClass("p.C2").newInstance().toString());
        assertTrue(new File(dest, "p/C3.class").delete());

        assertTrue(new File(dest, "p/C3$1$1.class").isFile());
        AnnotationProcessorTestUtils.makeSource(src, "p.C1", "@org.openide.util.NbBundle.Messages(\"k1=v3\")", "public class C1 {public @Override String toString() {return Bundle.k1();}}");
        assertTrue(AnnotationProcessorTestUtils.runJavac(src, "C1.java", dest, null, null));
        l = new URLClassLoader(new URL[] {Utilities.toURI(dest).toURL()});
        assertEquals("v3", l.loadClass("p.C1").newInstance().toString());
        assertEquals("v2", l.loadClass("p.C2").newInstance().toString());
    }

        AnnotationProcessorTestUtils.makeSource(src, "p.package-info", "@org.openide.util.NbBundle.Messages(\"k2=v2\")", "package p;");
        assertTrue(AnnotationProcessorTestUtils.runJavac(src, null, dest, null, null));
        assertTrue(AnnotationProcessorTestUtils.runJavac(src, null, dest, null, null));
        ClassLoader l = new URLClassLoader(new URL[] {Utilities.toURI(dest).toURL()});
        assertEquals("v1v2", l.loadClass("p.C").newInstance().toString());
        assertTrue(new File(dest, "p/C.class").delete());
        assertTrue(AnnotationProcessorTestUtils.runJavac(src, "C.java", dest, null, null));
        l = new URLClassLoader(new URL[] {Utilities.toURI(dest).toURL()});
        assertEquals("v1v2", l.loadClass("p.C").newInstance().toString());
    }


Lines 388-394 Link Here

(-)a/openide.util/test/unit/src/org/openide/util/EditablePropertiesTest.java (-1 / +1 lines)
388		388
389	private String filenameOfTestProperties() {	389	private String filenameOfTestProperties() {
390	// #50987: never use URL.path for this purpose...	390	// #50987: never use URL.path for this purpose...
391	return new File(URI.create(EditablePropertiesTest.class.getResource("data/test.properties").toExternalForm())).getAbsolutePath();	391	return Utilities.toFile(URI.create(EditablePropertiesTest.class.getResource("data/test.properties").toExternalForm())).getAbsolutePath();
392	}	392	}
393		393
394	private EditableProperties loadTestProperties() throws IOException {	394	private EditableProperties loadTestProperties() throws IOException {




import java.awt.peer.TextFieldPeer;
import java.awt.peer.WindowPeer;
import java.io.File;
import java.net.URI;
import java.net.URL;
import java.util.ArrayList;
import java.util.Arrays;

        }
    }

    public void testFileURI() throws Exception {
        if (Utilities.isWindows()) {
            assertFileURI("C:\\some\\path #1", "file:/C:/some/path%20%231");
            assertEquals(new File("C:\\some\\path"), Utilities.toFile(new URI("file:/C:/some/path")));
            assertEquals(new File("C:\\some\\path"), Utilities.toFile(new URI("file:///C:/some/path")));
            assertEquals(new File("C:\\some\\path"), Utilities.toFile(new URI("file:/C:/some/path/")));
            assertFileURI("\\\\server\\share\\path", "file://server/share/path");
            assertEquals(new File("\\\\server\\share\\path"), Utilities.toFile(new URI("file:////server/share/path")));
        } else {
            assertFileURI("/some/path #1", "file:/some/path%20%231");
            assertEquals(new File("/some/path"), Utilities.toFile(new URI("file:/some/path")));
            assertEquals(new File("/some/path"), Utilities.toFile(new URI("file:///some/path")));
            assertEquals(new File("/some/path"), Utilities.toFile(new URI("file:/some/path/")));
        }
        String s = Utilities.toURI(getWorkDir()).toString();
        assertTrue(s, s.endsWith("/"));
        // XXX test that IllegalArgumentException is thrown where appropriate
    }
    private static void assertFileURI(String file, String uri) throws Exception {
        URI u = new URI(uri);
        File f = new File(file);
        assertEquals(u, Utilities.toURI(f));
        assertEquals(f, Utilities.toFile(u));
    }

    private static class CustomToolkitComponent extends Component {
        private Toolkit customToolkit;
        




import javax.xml.validation.Schema;
import javax.xml.validation.SchemaFactory;
import org.netbeans.junit.NbTestCase;
import org.openide.util.Utilities;
import org.openide.util.test.TestFileUtils;
import org.w3c.dom.CDATASection;
import org.w3c.dom.Document;

        File ent = new File(d, "ent.xml");
        TestFileUtils.writeFile(main, "<!DOCTYPE root [<!ENTITY ent SYSTEM 'ent.xml'>]> <root xmlns='some://where'>&ent;</root>");
        TestFileUtils.writeFile(ent, "<hello xmlns='some://where'>there</hello>");
        Document doc = XMLUtil.parse(new InputSource(Utilities.toURI(main).toString()), false, true, null, null);
        XMLUtil.validate(doc.getDocumentElement(), s);
        ByteArrayOutputStream baos = new ByteArrayOutputStream();
        XMLUtil.write(doc, baos, "UTF-8");

        // XXX #160806 reported a problem with "xml:base" being consider a no-NS attr; not yet caught by test
        // Try again with no xmlns specified in entity; should inherit from main.xml:
        TestFileUtils.writeFile(ent, "<hello>there</hello>");
        doc = XMLUtil.parse(new InputSource(Utilities.toURI(main).toString()), false, true, null, null);
        XMLUtil.validate(doc.getDocumentElement(), s);
        baos = new ByteArrayOutputStream();
        XMLUtil.write(doc, baos, "UTF-8");

Lines 218-224 Link Here

(-)a/parsing.api/nbproject/project.xml (-1 / +1 lines)
218	<build-prerequisite/>	218	<build-prerequisite/>
219	<compile-dependency/>	219	<compile-dependency/>
220	<run-dependency>	220	<run-dependency>
221	<specification-version>8.0</specification-version>	221	<specification-version>8.25</specification-version>
222	</run-dependency>	222	</run-dependency>
223	</dependency>	223	</dependency>
224	<dependency>	224	<dependency>




                    final File parentFile = FileUtil.toFile(newFile.getParent());
                    if (parentFile != null) {
                        try {
                            URL oldBinaryRoot = org.openide.util.Utilities.toURI(new File (parentFile, oldNameExt)).toURL();
                            eventQueue.record(
                                    FileEventLog.FileOp.DELETE,
                                    oldBinaryRoot,

            }
            try {
                if ("file".equals(tmp.getProtocol())) { //NOI18N
                    final File file = org.openide.util.Utilities.toFile(new URI(tmp.toString()));
                    msg = file.getAbsolutePath();
                }
            } catch (URISyntaxException ex) {

                        if (packedIndex != null ) {
                            unpack(packedIndex, downloadFolder);
                            packedIndex.delete();
                            if (patchDownloadedIndex(root,org.openide.util.Utilities.toURI(downloadFolder).toURL())) {
                                final FileObject df = CacheFolder.getDataFolder(root);
                                assert df != null;
                                final File dataFolder = FileUtil.toFile(df);

                if (sourcesListener != null) {
                    if (!sourceRoots.containsKey(root) && root.getProtocol().equals("file")) { //NOI18N
                        try {
                            File f = org.openide.util.Utilities.toFile(root.toURI());
                            safeAddRecursiveListener(sourcesListener, f, entry);
                            sourceRoots.put(root, f);
                        } catch (URISyntaxException use) {

                        try {
                            URI uri = archiveUrl != null ? archiveUrl.toURI() : root.toURI();
                            if (uri.getScheme().equals("file")) { //NOI18N
                                f = org.openide.util.Utilities.toFile(uri);
                            }
                        } catch (URISyntaxException use) {
                            LOGGER.log(Level.INFO, "Can't convert " + root + " to java.io.File; archiveUrl=" + archiveUrl, use); //NOI18N

                            @Override
                            public boolean accept(@NonNull final File pathname) {
                                try {
                                    return entry.includes(org.openide.util.Utilities.toURI(pathname).toURL());
                                } catch (MalformedURLException ex) {
                                    Exceptions.printStackTrace(ex);
                                    return true;




import org.netbeans.modules.editor.settings.storage.api.EditorSettings;
import org.openide.filesystems.FileObject;
import org.openide.loaders.DataObject;
import org.openide.util.Utilities;

/**
 *

                final Boolean isDirectoryFin = isDirectory;
                // Performance optimization for File.toURI() which calls this method
                // and the original implementation calls into native method
                return Utilities.toURI(new File(Utilities.toFile(root.toURI()), relativePath) {
                    
                    @Override
                    public File getAbsoluteFile() {

                            super.isDirectory() :
                            isDirectoryFin;
                    }
                }).toURL();
            } else {
                return new URL(root, relativePath);
            }




            }
            URI rootURI = root.toURI();
            File cacheRoot = getCacheRoot(root);
            URI cacheRootURI = org.openide.util.Utilities.toURI(cacheRoot);
            Queue<File> todo = new LinkedList<File>();
            
            todo.add(cacheRoot);

                
                if (f.isFile()) {
                    if (f.getName().endsWith(ERR_EXT)) {
                        String relative = cacheRootURI.relativize(org.openide.util.Utilities.toURI(f)).getRawPath();
                        
                        relative = relative.replaceAll("." + ERR_EXT + "$", ""); //NOI18N
                        result.add(rootURI.resolve(relative).toURL());
                    }
                    if (!onlyErrors && f.getName().endsWith(WARN_EXT)) {
                        String relative = cacheRootURI.relativize(org.openide.util.Utilities.toURI(f)).getRawPath();
                        
                        relative = relative.replaceAll("." + WARN_EXT + "$", ""); //NOI18N
                        result.add(rootURI.resolve(relative).toURL());




import org.netbeans.modules.parsing.lucene.support.DocumentIndex;
import org.netbeans.modules.parsing.lucene.support.IndexManager;
import org.openide.util.Exceptions;
import org.openide.util.Utilities;

/**
 *

                switch (mode) {
                    case CREATE:
                    {
                        final File file = Utilities.toFile(root.toURI());
                        file.mkdir();
                        li = IndexManager.createDocumentIndex(file);
                        indexes.put(root,li);

                    }
                    case IF_EXIST:
                    {
                        final File file = Utilities.toFile(root.toURI());
                        String[] children;
                        if (file.isDirectory() && (children=file.list())!= null && children.length > 0) {
                            li = IndexManager.createDocumentIndex(file);

Lines 58-63 Link Here

(-)a/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/lucene/LuceneIndexFactory.java (-1 / +2 lines)
58	import org.openide.filesystems.FileObject;	58	import org.openide.filesystems.FileObject;
59	import org.openide.filesystems.FileUtil;	59	import org.openide.filesystems.FileUtil;
60	import org.openide.util.Exceptions;	60	import org.openide.util.Exceptions;
		61	import org.openide.util.Utilities;
61		62
62	/**	63	/**
63	*	64	*
Lines 124-130 Link Here
124	assert indexFolder != null;	125	assert indexFolder != null;
125	final String indexVersion = Integer.toString(VERSION);	126	final String indexVersion = Integer.toString(VERSION);
126	final File luceneIndexFolder = new File (FileUtil.toFile(indexFolder),indexVersion);	127	final File luceneIndexFolder = new File (FileUtil.toFile(indexFolder),indexVersion);
127	URL result = luceneIndexFolder.toURI().toURL();	128	URL result = Utilities.toURI(luceneIndexFolder).toURL();
128	final String surl = result.toExternalForm();	129	final String surl = result.toExternalForm();
129	if (surl.charAt(surl.length()-1) != '/') { //NOI18N	130	if (surl.charAt(surl.length()-1) != '/') { //NOI18N
130	result = new URL(surl+'/'); //NOI18N	131	result = new URL(surl+'/'); //NOI18N

Lines 46-51 Link Here

(-)a/parsing.api/test/unit/src/org/netbeans/modules/parsing/impl/event/EventSupportTest.java (-1 / +2 lines)
46	import org.netbeans.junit.NbTestCase;	46	import org.netbeans.junit.NbTestCase;
47	import org.netbeans.modules.parsing.api.indexing.IndexingManager;	47	import org.netbeans.modules.parsing.api.indexing.IndexingManager;
48	import org.netbeans.modules.parsing.impl.indexing.IndexingManagerAccessor;	48	import org.netbeans.modules.parsing.impl.indexing.IndexingManagerAccessor;
		49	import org.openide.util.Utilities;
49		50
50	/**	51	/**
51	*	52	*
Lines 75-81 Link Here
75	final File src = new File (wd,"src");	76	final File src = new File (wd,"src");
76	src.mkdirs();	77	src.mkdirs();
77	try {	78	try {
78	IndexingManager.getDefault().refreshIndexAndWait(src.toURI().toURL(), null);	79	IndexingManager.getDefault().refreshIndexAndWait(Utilities.toURI(src).toURL(), null);
79	} catch (IllegalStateException ae) {	80	} catch (IllegalStateException ae) {
80	assertTrue("IllegalStateException not expected when EventSupport.releaseCompletionCondition called by IndexingManager.refreshIndexAndWait", false);	81	assertTrue("IllegalStateException not expected when EventSupport.releaseCompletionCondition called by IndexingManager.refreshIndexAndWait", false);
81	}	82	}




import org.netbeans.junit.NbTestCase;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.util.Utilities;

/**
 *

            final File base = getWorkDir();
            for (int i=1; i<=100; i++) {
                final File f = new File(base,String.format("archive%d.jar", i));    //NOI18N
                final URL u = Utilities.toURI(f).toURL();
                final Pair<Long,Map<Pair<String,Integer>,Integer>> state =
                        Pair.<Long,Map<Pair<String,Integer>,Integer>>of((long)i,indexers);
                expected.put(u, state);

            final File base = getWorkDir();
            for (int i=1; i<=100; i++) {
                final File f = new File(base,String.format("archive%d.jar", i));    //NOI18N
                final URL u = Utilities.toURI(f).toURL();
                final Pair<Long,Map<Pair<String,Integer>,Integer>> state =
                        Pair.<Long,Map<Pair<String,Integer>,Integer>>of((long)i,indexers);
                expected.put(u, state);

                        File f = new File(base,String.format("ar_bs.jar"));    //NOI18N
                        Pair<Long,Map<Pair<String,Integer>,Integer>> state =
                            Pair.<Long,Map<Pair<String,Integer>,Integer>>of(1L,indexers);
                        URL u = Utilities.toURI(f).toURL();
                        expected.put(u, state);
                        ArchiveTimeStamps.setLastModified(u,state);
                    } catch (IOException e) {

                        File f = new File(base,String.format("ar_as.jar"));    //NOI18N
                        Pair<Long,Map<Pair<String,Integer>,Integer>> state =
                            Pair.<Long,Map<Pair<String,Integer>,Integer>>of(1L,indexers);
                        URL u = Utilities.toURI(f).toURL();
                        expected.put(u, state);
                        ArchiveTimeStamps.setLastModified(u,state);
                    } catch (IOException e) {

                File f = new File(base,String.format("start.jar"));    //NOI18N
                Pair<Long,Map<Pair<String,Integer>,Integer>> state =
                    Pair.<Long,Map<Pair<String,Integer>,Integer>>of(1L,indexers);
                URL u = Utilities.toURI(f).toURL();
                expected.put(u, state);
                h.last = true;
                ArchiveTimeStamps.setLastModified(u,state);




        handler.reset();
        indexerFactory.indexer.setExpectedFile(new URL[0], new URL[0], new URL[0]);
        eindexerFactory.indexer.setExpectedFile(new URL[0],new URL[0], new URL[0]);
        File file = org.openide.util.Utilities.toFile(embeddedFiles[0].toURI());
        file.setLastModified(System.currentTimeMillis());
        globalPathRegistry_register(SOURCES,new ClassPath[]{cp1});
        assertTrue (handler.await());

        handler.reset();
        indexerFactory.indexer.setExpectedFile(new URL[0], new URL[0], new URL[0]);
        eindexerFactory.indexer.setExpectedFile(new URL[0],new URL[0], new URL[0]);
        file = org.openide.util.Utilities.toFile(embeddedFiles[0].toURI());
        file.setLastModified(System.currentTimeMillis());
        file = org.openide.util.Utilities.toFile(embeddedFiles[1].toURI());
        file.delete();
        srcRootWithFiles1.getFileSystem().refresh(true);
        

        final File container = f.getParentFile();
        File newFile = new File (container,"c.emb");
        indexerFactory.indexer.setExpectedFile(new URL[0], new URL[0], new URL[0]);
        eindexerFactory.indexer.setExpectedFile(new URL[]{org.openide.util.Utilities.toURI(newFile).toURL()}, new URL[0], new URL[0]);
        assertNotNull(FileUtil.createData(newFile));
        assertTrue(indexerFactory.indexer.awaitIndex(TIME));
        assertTrue(eindexerFactory.indexer.awaitIndex());

        newFile = new File (newFolder,"d.emb");
        File newFile2 = new File (newFolder,"e.emb");
        indexerFactory.indexer.setExpectedFile(new URL[0], new URL[0], new URL[0]);
        eindexerFactory.indexer.setExpectedFile(new URL[]{org.openide.util.Utilities.toURI(newFile).toURL(), org.openide.util.Utilities.toURI(newFile2).toURL()}, new URL[0], new URL[0]);
        newFolder.mkdirs();
        touchFile (newFile);
        touchFile (newFile2);

        
        File root = FileUtil.toFile(srcRootWithFiles1);
        File fdf = new File (root, "direct.emb");   //NOI18N
        eindexerFactory.indexer.setExpectedFile(new URL[]{org.openide.util.Utilities.toURI(fdf).toURL()}, new URL[0], new URL[0]);
        FileObject df = FileUtil.createData(fdf);
        assertNotNull(df);
        assertEquals(EMIME, df.getMIMEType());
        eindexerFactory.indexer.awaitIndex();

        File newfdf = new File (root, "new_direct.emb");   //NOI18N
        eindexerFactory.indexer.setExpectedFile(new URL[]{org.openide.util.Utilities.toURI(newfdf).toURL()}, new URL[]{org.openide.util.Utilities.toURI(fdf).toURL()}, new URL[0]);
        FileLock lock = df.lock();
        try {
            df.rename(lock, "new_direct", "emb");

        
        final File a = new File(srcRoot1File,"folder/a.foo");
        final File b = new File(srcRoot1File,"folder/b.emb");
        indexerFactory.indexer.setExpectedFile(new URL[]{org.openide.util.Utilities.toURI(a).toURL()}, new URL[0], new URL[0]);
        eindexerFactory.indexer.setExpectedFile(new URL[]{org.openide.util.Utilities.toURI(b).toURL()}, new URL[0], new URL[0]);
        FileUtil.runAtomicAction(new FileSystem.AtomicAction() {
            @Override
            public void run() throws IOException {

        //Unsee root - index should be donwloaded and no indexer should be called
        final URL rootURL = FileUtil.urlForArchiveOrDir(root);
        final ClassPath cp1 = ClassPathSupport.createClassPath(rootURL);
        IndexDownloaderImpl.expect(rootURL, org.openide.util.Utilities.toURI(index).toURL());
        indexerFactory.indexer.setExpectedFile(
                new URL[]{
                    org.openide.util.Utilities.toURI(a).toURL(),
                    org.openide.util.Utilities.toURI(b).toURL()},
                new URL[0],
                new URL[0]);
        globalPathRegistry_register(SOURCES,new ClassPath[]{cp1});

        touchFile(a);

        //Seen root - index should NOT be donwloaded and indexer should be called on modified file
        IndexDownloaderImpl.expect(rootURL, org.openide.util.Utilities.toURI(index).toURL());
        indexerFactory.indexer.setExpectedFile(
                new URL[]{
                    org.openide.util.Utilities.toURI(a).toURL(),
                    org.openide.util.Utilities.toURI(b).toURL(),  //Should be removed if timestamps maps
                },
                new URL[0],
                new URL[0]);

        //Simulate the index download error - indexer should be started
        globalPathRegistry_unregister(SOURCES, new ClassPath[]{cp1});
        RepositoryUpdater.getDefault().waitUntilFinished(TIME);
        FileObject fo = CacheFolder.getDataFolder(org.openide.util.Utilities.toURI(root).toURL());
        fo.delete();
        IndexDownloaderImpl.expect(rootURL, org.openide.util.Utilities.toURI(new File(workDir,"non_existent_index.zip")).toURL());
        indexerFactory.indexer.setExpectedFile(
                new URL[]{
                    org.openide.util.Utilities.toURI(a).toURL(),
                    org.openide.util.Utilities.toURI(b).toURL()},
                new URL[0],
                new URL[0]);
        globalPathRegistry_register(SOURCES,new ClassPath[]{cp1});

        //Test DownloadedIndexPatcher - votes false -> IndexDownloader should be called and then Indexers should be called
        globalPathRegistry_unregister(SOURCES, new ClassPath[]{cp1});
        RepositoryUpdater.getDefault().waitUntilFinished(TIME);
        fo = CacheFolder.getDataFolder(org.openide.util.Utilities.toURI(root).toURL());
        fo.delete();
        IndexDownloaderImpl.expect(rootURL, org.openide.util.Utilities.toURI(index).toURL());
        IndexPatcherImpl.expect(rootURL, false);
        indexerFactory.indexer.setExpectedFile(
                new URL[]{
                    org.openide.util.Utilities.toURI(a).toURL(),
                    org.openide.util.Utilities.toURI(b).toURL()},
                new URL[0],
                new URL[0]);
        globalPathRegistry_register(SOURCES,new ClassPath[]{cp1});

        //Test DownloadedIndexPatcher - votes true -> IndexDownloader should be called and NO Indexers should be called
        globalPathRegistry_unregister(SOURCES, new ClassPath[]{cp1});
        RepositoryUpdater.getDefault().waitUntilFinished(TIME);
        fo = CacheFolder.getDataFolder(org.openide.util.Utilities.toURI(root).toURL());
        fo.delete();
        IndexDownloaderImpl.expect(rootURL, org.openide.util.Utilities.toURI(index).toURL());
        IndexPatcherImpl.expect(rootURL, true);
        indexerFactory.indexer.setExpectedFile(
                new URL[]{
                    org.openide.util.Utilities.toURI(a).toURL(),
                    org.openide.util.Utilities.toURI(b).toURL()},
                new URL[0],
                new URL[0]);
        globalPathRegistry_register(SOURCES,new ClassPath[]{cp1});

        File af = FileUtil.toFile(a);
        File anf = new File (af.getParentFile(),"an.foo");  //NOI18N
        indexerFactory.indexer.setExpectedFile(
            new URL[]{org.openide.util.Utilities.toURI(anf).toURL()},
            new URL[]{org.openide.util.Utilities.toURI(af).toURL()},
            new URL[0]);
        FileLock l = a.lock();
        try {

        File bf = FileUtil.toFile(b);
        File bnf = new File (bf.getParentFile(),"bn.foo");  //NOI18N
        indexerFactory.indexer.setExpectedFile(
            new URL[]{org.openide.util.Utilities.toURI(bnf).toURL()},
            new URL[]{org.openide.util.Utilities.toURI(bf).toURL()},
            new URL[0]);
        l = b.lock();
        try {

Lines 37-43 Link Here

(-)a/parsing.lucene/nbproject/project.xml (-1 / +1 lines)
37	<build-prerequisite/>	37	<build-prerequisite/>
38	<compile-dependency/>	38	<compile-dependency/>
39	<run-dependency>	39	<run-dependency>
40	<specification-version>8.9</specification-version>	40	<specification-version>8.25</specification-version>
41	</run-dependency>	41	</run-dependency>
42	</dependency>	42	</dependency>
43	<dependency>	43	<dependency>

Lines 974-980 Link Here

(-)a/parsing.lucene/src/org/netbeans/modules/parsing/lucene/LuceneIndex.java (-1 / +1 lines)
974	private synchronized void hit() {	974	private synchronized void hit() {
975	if (!cachePolicy.hasMemCache()) {	975	if (!cachePolicy.hasMemCache()) {
976	try {	976	try {
977	final URL url = folder.toURI().toURL();	977	final URL url = Utilities.toURI(folder).toURL();
978	IndexCacheFactory.getDefault().getCache().put(url, this);	978	IndexCacheFactory.getDefault().getCache().put(url, this);
979	} catch (MalformedURLException e) {	979	} catch (MalformedURLException e) {
980	Exceptions.printStackTrace(e);	980	Exceptions.printStackTrace(e);

Lines 118-127 Link Here

(-)a/project.ant/antsrc/org/netbeans/modules/project/ant/task/RegenerateFilesTask.java (-2 / +2 lines)
118	assert projectFO != null;	118	assert projectFO != null;
119	}	119	}
120	GeneratedFilesHelper h = new GeneratedFilesHelper(projectFO);	120	GeneratedFilesHelper h = new GeneratedFilesHelper(projectFO);
121	if (buildXsl != null && h.refreshBuildScript(GeneratedFilesHelper.BUILD_XML_PATH, buildXsl.toURI().toURL(), true)) {	121	if (buildXsl != null && h.refreshBuildScript(GeneratedFilesHelper.BUILD_XML_PATH, org.openide.util.Utilities.toURI(buildXsl).toURL(), true)) {
122	log("Regenerating " + new File(projectDir, GeneratedFilesHelper.BUILD_XML_PATH.replace('/', File.separatorChar)).getAbsolutePath());	122	log("Regenerating " + new File(projectDir, GeneratedFilesHelper.BUILD_XML_PATH.replace('/', File.separatorChar)).getAbsolutePath());
123	}	123	}
124	if (buildImplXsl != null && h.refreshBuildScript(GeneratedFilesHelper.BUILD_IMPL_XML_PATH, buildImplXsl.toURI().toURL(), true)) {	124	if (buildImplXsl != null && h.refreshBuildScript(GeneratedFilesHelper.BUILD_IMPL_XML_PATH, org.openide.util.Utilities.toURI(buildImplXsl).toURL(), true)) {
125	log("Regenerating " + new File(projectDir, GeneratedFilesHelper.BUILD_IMPL_XML_PATH.replace('/', File.separatorChar)).getAbsolutePath());	125	log("Regenerating " + new File(projectDir, GeneratedFilesHelper.BUILD_IMPL_XML_PATH.replace('/', File.separatorChar)).getAbsolutePath());
126	}	126	}
127	} catch (IOException e) {	127	} catch (IOException e) {

Lines 170-176 Link Here

(-)a/project.ant/nbproject/project.xml (-1 / +1 lines)
170	<build-prerequisite/>	170	<build-prerequisite/>
171	<compile-dependency/>	171	<compile-dependency/>
172	<run-dependency>	172	<run-dependency>
173	<specification-version>8.4</specification-version>	173	<specification-version>8.25</specification-version>
174	</run-dependency>	174	</run-dependency>
175	</dependency>	175	</dependency>
176	<dependency>	176	<dependency>




import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.filesystems.URLMapper;
import org.openide.util.Utilities;

// XXX may also need displayName field (any default? or only in SimpleAntArtifact?)


        URL artifact;
        try {
            // XXX this should probably use something in PropertyUtils?
            artifact = Utilities.toURI(getScriptLocation()).resolve(artifactLocation).normalize().toURL();
        } catch (MalformedURLException e) {
            ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, e);
            return null;

     * @return the associated project, or null if there is none or it could not be located
     */
    public Project getProject() {
        return FileOwnerQuery.getOwner(Utilities.toURI(getScriptLocation()));
    }

    /**

Lines 54-59 Link Here

(-)a/project.ant/src/org/netbeans/api/project/ant/FileChooser.java (-1 / +2 lines)
54	import org.netbeans.modules.project.ant.ProjectLibraryProvider;	54	import org.netbeans.modules.project.ant.ProjectLibraryProvider;
55	import org.netbeans.spi.project.support.ant.AntProjectHelper;	55	import org.netbeans.spi.project.support.ant.AntProjectHelper;
56	import org.openide.filesystems.FileUtil;	56	import org.openide.filesystems.FileUtil;
		57	import org.openide.util.Utilities;
57		58
58		59
59	/**	60	/**
Lines 82-88 Link Here
82	if (lm != null) {	83	if (lm != null) {
83	URL u = lm.getLocation();	84	URL u = lm.getLocation();
84	if (u != null) {	85	if (u != null) {
85	File libBase = new File(URI.create(u.toExternalForm())).getParentFile();	86	File libBase = Utilities.toFile(URI.create(u.toExternalForm())).getParentFile();
86	accessory = new FileChooserAccessory(this, FileUtil.toFile(helper.getProjectDirectory()),	87	accessory = new FileChooserAccessory(this, FileUtil.toFile(helper.getProjectDirectory()),
87	libBase, copyAllowed);	88	libBase, copyAllowed);
88	setAccessory(accessory);	89	setAccessory(accessory);

Lines 335-341 Link Here

(-)a/project.ant/src/org/netbeans/modules/project/ant/AntBasedProjectFactorySingleton.java (-1 / +1 lines)
335	}	335	}
336	byte[] data = baos.toByteArray();	336	byte[] data = baos.toByteArray();
337	InputSource src = new InputSource(new ByteArrayInputStream(data));	337	InputSource src = new InputSource(new ByteArrayInputStream(data));
338	src.setSystemId(projectDiskFile.toURI().toString());	338	src.setSystemId(Utilities.toURI(projectDiskFile).toString());
339	try {	339	try {
340	// Document projectXml = XMLUtil.parse(src, false, true, Util.defaultErrorHandler(), null);	340	// Document projectXml = XMLUtil.parse(src, false, true, Util.defaultErrorHandler(), null);
341	DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();	341	DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();

Lines 69-74 Link Here

(-)a/project.ant/src/org/netbeans/modules/project/ant/FileChooserAccessory.java (-1 / +2 lines)
69	import org.openide.filesystems.FileUtil;	69	import org.openide.filesystems.FileUtil;
70	import org.openide.util.Exceptions;	70	import org.openide.util.Exceptions;
71	import org.openide.util.NbBundle.Messages;	71	import org.openide.util.NbBundle.Messages;
		72	import org.openide.util.Utilities;
72		73
73	/**	74	/**
74	* Accessory allowing to choose how file is referenced from a project - relative	75	* Accessory allowing to choose how file is referenced from a project - relative
Lines 343-349 Link Here
343		344
344	private boolean areCollocated(File base, Collection<File> files){	345	private boolean areCollocated(File base, Collection<File> files){
345	for(File file: files){	346	for(File file: files){
346	if (!CollocationQuery.areCollocated(base.toURI(), file.toURI())) {	347	if (!CollocationQuery.areCollocated(Utilities.toURI(base), Utilities.toURI(file))) {
347	return false;	348	return false;
348	}	349	}
349	}	350	}




    public ProjectLibraryArea loadArea(URL location) {
        if (location.getProtocol().equals("file") && location.getPath().endsWith(".properties")) { // NOI18N
            try {
                return new ProjectLibraryArea(Utilities.toFile(location.toURI()));
            } catch (URISyntaxException x) {
                Exceptions.printStackTrace(x);
            }

                }
            }
        }
        ProjectLibraryArea pla = loadArea(Utilities.toURI(pli.mainPropertiesFile).toURL());
        if (pla != null) {
        LP lp = getLibraries(pla);
        if (lp.libraries.remove(pli.name) != null) {

                        File normalizedFile = FileUtil.normalizeFile(new File(component.replace('/', File.separatorChar).replace('\\', File.separatorChar).replace("${base}", area.mainPropertiesFile.getParent())));
                        try {
                            URI u = LibrariesSupport.convertFilePathToURI(f);
                            if (FileUtil.isArchiveFile(Utilities.toURI(normalizedFile).toURL())) {
                                u = appendJarFolder(u, jarFolder);
                            } else if (!u.getPath().endsWith("/")) {  // NOI18N
                                u = new URI(u.toString() + "/");  // NOI18N

            List<URL> resolvedUrls = new ArrayList<URL>(uris.size());
            for (URI u : uris) {
                try {
                    resolvedUrls.add(LibrariesSupport.resolveLibraryEntryURI(Utilities.toURI(mainPropertiesFile).toURL(), u).toURL());
                } catch (MalformedURLException ex) {
                    Logger.getLogger(ProjectLibraryProvider.class.getName()).log(Level.INFO, "#184304: " + u, ex);
                }


        public URL getLocation() {
            try {
                return Utilities.toURI(mainPropertiesFile).toURL();
            } catch (MalformedURLException x) {
                throw new AssertionError(x);
            }

        Definitions defs = findDefinitions(helper);
        if (defs != null) {
            try {
                return LibraryManager.forLocation(Utilities.toURI(defs.mainPropertiesFile).toURL());
            } catch (MalformedURLException x) {
                Exceptions.printStackTrace(x);
            }

     */
    public static Library copyLibrary(final Library lib, final URL location, 
            final boolean generateLibraryUniqueName) throws IOException {
        final File libBaseFolder = Utilities.toFile(URI.create(location.toExternalForm())).getParentFile();
        FileObject sharedLibFolder = null;
        final Map<String, List<URI>> content = new HashMap<String, List<URI>>();
        String[] volumes = LibrariesSupport.getLibraryTypeProvider(lib.getType()).getSupportedVolumeTypes();

                URI u;
                FileObject newFO;
                String name;
                if (CollocationQuery.areCollocated(Utilities.toURI(libBaseFolder), libEntryFO.toURI())) {
                    // if the jar/folder is in relation to the library folder (parent+child/same vcs)
                    // don't replicate it but reference the original file.
                    newFO = libEntryFO;




import org.netbeans.api.project.ant.AntArtifact;
import org.netbeans.spi.project.ant.AntArtifactProvider;
import org.netbeans.spi.project.ant.AntArtifactQueryImplementation;
import org.openide.util.Utilities;

/**
 * Standard implementation of {@link AntArtifactQueryImplementation} which uses

    public StandardAntArtifactQueryImpl() {}
    
    public AntArtifact findArtifact(File file) {
        Project p = FileOwnerQuery.getOwner(Utilities.toURI(file));
        if (p == null) {
            return null;
        }

        for (int i = 0; i < artifacts.length; i++) {
            URI uris[] = artifacts[i].getArtifactLocations();
            for (int y = 0; y < uris.length; y++) {
                File testFile = Utilities.toFile(Utilities.toURI(artifacts[i].getScriptLocation()).resolve(uris[y]));
                if (file.equals(testFile)) {
                    return artifacts[i];
                }




import org.openide.util.MutexException;
import org.openide.util.RequestProcessor;
import org.openide.util.UserQuestionException;
import org.openide.util.Utilities;
import org.openide.util.WeakSet;
import org.openide.xml.XMLUtil;
import org.w3c.dom.Document;

        File f = FileUtil.toFile(xml);
        assert f != null;
        try {
            Document doc = XMLUtil.parse(new InputSource(Utilities.toURI(f).toString()), false, true, XMLUtil.defaultErrorHandler(), null);
            ProjectXMLCatalogReader.validate(doc.getDocumentElement());
            return doc;
        } catch (IOException e) {

        final SharabilityQueryImplementation2 sq2 = createSharabilityQuery2(eval, sourceRoots, buildDirectories);
        return new SharabilityQueryImplementation() {
            @Override public int getSharability(File file) {
                return sq2.getSharability(Utilities.toURI(file)).ordinal();
            }
        };
    }

Lines 327-333 Link Here

(-)a/project.ant/src/org/netbeans/spi/project/support/ant/GeneratedFilesHelper.java (-1 / +1 lines)
327	File projectXmlF = FileUtil.toFile(projectXml);	327	File projectXmlF = FileUtil.toFile(projectXml);
328	assert projectXmlF != null;	328	assert projectXmlF != null;
329	StreamSource projectXmlSource = new StreamSource(	329	StreamSource projectXmlSource = new StreamSource(
330	new ByteArrayInputStream(projectXmlData), projectXmlF.toURI().toString());	330	new ByteArrayInputStream(projectXmlData), Utilities.toURI(projectXmlF).toString());
331	ByteArrayOutputStream result = new ByteArrayOutputStream();	331	ByteArrayOutputStream result = new ByteArrayOutputStream();
332	t.transform(projectXmlSource, new StreamResult(result));	332	t.transform(projectXmlSource, new StreamResult(result));
333	if (BUILD_IMPL_XML_PATH.equals(path)) {	333	if (BUILD_IMPL_XML_PATH.equals(path)) {

Lines 81-86 Link Here

(-)a/project.ant/src/org/netbeans/spi/project/support/ant/PropertyUtils.java (-1 / +2 lines)
81	import org.openide.util.MutexException;	81	import org.openide.util.MutexException;
82	import org.openide.util.NbCollections;	82	import org.openide.util.NbCollections;
83	import org.openide.util.RequestProcessor;	83	import org.openide.util.RequestProcessor;
		84	import org.openide.util.Utilities;
84		85
85	/**	86	/**
86	* Support for working with Ant properties and property files.	87	* Support for working with Ant properties and property files.
Lines 434-440 Link Here
434	}	435	}
435	b.append("../"); // NOI18N	436	b.append("../"); // NOI18N
436	}	437	}
437	URI u = base.toURI().relativize(file.toURI());	438	URI u = Utilities.toURI(base).relativize(Utilities.toURI(file));
438	assert !u.isAbsolute() : u + " from " + basedir + " and " + file + " with common root " + base;	439	assert !u.isAbsolute() : u + " from " + basedir + " and " + file + " with common root " + base;
439	b.append(u.getPath());	440	b.append(u.getPath());
440	if (b.charAt(b.length() - 1) == '/') {	441	if (b.charAt(b.length() - 1) == '/') {




import org.openide.util.Mutex;
import org.openide.util.NbCollections;
import org.openide.util.Parameters;
import org.openide.util.Utilities;
import org.openide.xml.XMLUtil;
import org.w3c.dom.Document;
import org.w3c.dom.Element;

                    try {
                        scriptLocation = new URI(null, null, rel, null);
                    } catch (URISyntaxException ex) {
                        scriptLocation = Utilities.toURI(forProjDir).relativize(Utilities.toURI(scriptFile));
                    }
                    ref = new RawReference(forProjName, artifact.getType(), scriptLocation, artifact.getTargetName(), artifact.getCleanTargetName(), artifact.getID());
                } else {

                URI artFile = location;
                String refPath;
                if (artFile.isAbsolute()) {
                    refPath = Utilities.toFile(artFile).getAbsolutePath();
                    propertiesFile = AntProjectHelper.PRIVATE_PROPERTIES_PATH;
                } else {
                    refPath = "${" + forProjPathProp + "}/" + artFile.getPath(); // NOI18N

                FileUtil.toFile(p.getProjectDirectory()));
        if (libFile != null) {
            try {
                return LibraryManager.forLocation(Utilities.toURI(libFile).toURL());
            } catch (MalformedURLException e) {
                // ok, no project manager
                Logger.getLogger(ReferenceHelper.class.getName()).info(

            return lib;
        }
        File mainPropertiesFile = h.resolveFile(h.getLibrariesLocation());
        return copyLibrary(lib, Utilities.toURI(mainPropertiesFile).toURL());
    }
        
    /**

Lines 53-58 Link Here

(-)a/project.ant/src/org/netbeans/spi/project/support/ant/SharabilityQueryImpl.java (-1 / +2 lines)
53	import org.netbeans.api.queries.SharabilityQuery;	53	import org.netbeans.api.queries.SharabilityQuery;
54	import org.netbeans.modules.project.ant.ProjectLibraryProvider;	54	import org.netbeans.modules.project.ant.ProjectLibraryProvider;
55	import org.netbeans.spi.queries.SharabilityQueryImplementation2;	55	import org.netbeans.spi.queries.SharabilityQueryImplementation2;
		56	import org.openide.util.Utilities;
56	import org.openide.util.WeakListeners;	57	import org.openide.util.WeakListeners;
57		58
58	/**	59	/**
Lines 109-115 Link Here
109		110
110	@Override public SharabilityQuery.Sharability getSharability(URI uri) {	111	@Override public SharabilityQuery.Sharability getSharability(URI uri) {
111	// XXX might be more efficient to precompute URIs for includePaths and excludePaths	112	// XXX might be more efficient to precompute URIs for includePaths and excludePaths
112	String path = new File(uri).getAbsolutePath();	113	String path = Utilities.toFile(uri).getAbsolutePath();
113	if (contains(path, excludePaths, false)) {	114	if (contains(path, excludePaths, false)) {
114	return SharabilityQuery.Sharability.NOT_SHARABLE;	115	return SharabilityQuery.Sharability.NOT_SHARABLE;
115	}	116	}

Lines 51-56 Link Here

(-)a/project.ant/src/org/netbeans/spi/project/support/ant/SimpleAntArtifact.java (-1 / +2 lines)
51	import org.netbeans.api.project.ant.AntArtifact;	51	import org.netbeans.api.project.ant.AntArtifact;
52	import org.netbeans.modules.project.ant.AntBasedProjectFactorySingleton;	52	import org.netbeans.modules.project.ant.AntBasedProjectFactorySingleton;
53	import org.openide.ErrorManager;	53	import org.openide.ErrorManager;
		54	import org.openide.util.Utilities;
54		55
55	/**	56	/**
56	* A basic AntArtifact implementation.	57	* A basic AntArtifact implementation.
Lines 88-94 Link Here
88	}	89	}
89	File locF = new File(locationResolved);	90	File locF = new File(locationResolved);
90	if (locF.isAbsolute()) {	91	if (locF.isAbsolute()) {
91	return locF.toURI();	92	return Utilities.toURI(locF);
92	} else {	93	} else {
93	// Project-relative path.	94	// Project-relative path.
94	try {	95	try {




import org.openide.loaders.DataFolder;
import org.openide.loaders.InstanceDataObject;
import org.openide.util.NbCollections;
import org.openide.util.Utilities;
import org.openide.util.lookup.Lookups;
import org.openide.util.test.MockChangeListener;
import org.openide.util.test.MockLookup;

    protected void setUp() throws Exception {
        super.setUp();
        libraryProvider = new TestLibraryProvider();
        MockLookup.setLookup(Lookups.fixed(AntBasedTestUtil.testAntBasedProjectType(), AntBasedTestUtil.testCollocationQueryImplementation(Utilities.toURI(getWorkDir())), libraryProvider),
                // Filter out standard CQIs since they are bogus.
                Lookups.exclude(Lookups.metaInfServices(ProjectLibraryProviderTest.class.getClassLoader()), CollocationQueryImplementation.class));
        projdir = TestUtil.makeScratchDir(this).createFolder("prj");
        helper = ProjectGenerator.createProject(projdir, "test");
        project = ProjectManager.getDefault().findProject(projdir);
        close(OpenProjects.getDefault().getOpenProjects());
        base = Utilities.toURI(getWorkDir()).toURL();
        ProjectLibraryProvider.FIRE_CHANGES_SYNCH = true;
        registerTestLibraryTypeProvider();
    }

        } else {
            FileUtil.createData(f);
        }
        assertEquals(mode, SharabilityQuery.getSharability(Utilities.toURI(f)));
    }

    private void writeProperties(String path, String... properties) throws IOException {

        FileUtil.toFileObject(getWorkDir()).getFileSystem().refresh(false);
        LibraryImplementation l1 = LibrariesSupport.createLibraryImplementation("j2test", new String[]{"jars", "sources"});
        l1.setName("vino");
        l1.setContent("jars", Arrays.asList(new URL[]{Utilities.toURI(f).toURL(), Utilities.toURI(f1).toURL()}));
        l1.setContent("sources", Arrays.asList(new URL[]{new URL("jar:" + Utilities.toURI(f2).toURL() + "!/docs/api/")}));
        libraryProvider.set(l1);
        Library l = LibraryManager.getDefault().getLibrary("vino");
        assertNotNull(l);
        assertEquals(LibraryManager.getDefault(), l.getManager());
        URL u = Utilities.toURI(f3).toURL();
        Library result = ProjectLibraryProvider.copyLibrary(l, u, false);
        assertNotNull(result);
        assertEquals(u, result.getManager().getLocation());

        assertEquals("vino", result.getName());
        assertEquals("j2test", result.getType());
        //assertNotNull(LibrariesSupport.resolveLibraryEntryFileObject(u, result.getURIContent("jars").get(0)));
        assertEquals("jar:"+(Utilities.toURI(new File(this.getWorkDir(), "libraries/vino/bertie.jar")).toString())+"!/",
                LibrariesSupport.resolveLibraryEntryURI(u, result.getURIContent("jars").get(0)).toString());
        assertEquals("jar:"+(Utilities.toURI(new File(this.getWorkDir(), "libraries/vino/bertie.jar")).toString())+"!/",
                result.getContent("jars").get(0).toExternalForm());
        //assertNotNull(LibrariesSupport.resolveLibraryEntryFileObject(u, result.getContent("sources").get(0)));
        assertEquals("jar:"+(Utilities.toURI(new File(this.getWorkDir(), "libraries/vino/bertie-2.jar")))+"!/docs/api/",
                LibrariesSupport.resolveLibraryEntryURI(u, result.getURIContent("sources").get(0)).toString());
        assertEquals("jar:"+(Utilities.toURI(new File(this.getWorkDir(), "libraries/vino/bertie-2.jar")))+"!/docs/api/",
                result.getContent("sources").get(0).toExternalForm());
        // enable test collocation query:
        MockLookup.setLookup(Lookups.fixed(AntBasedTestUtil.testAntBasedProjectType(), AntBasedTestUtil.testCollocationQueryImplementation(Utilities.toURI(getWorkDir())), libraryProvider),
                // Filter out standard CQIs since they are bogus.
                Lookups.exclude(Lookups.metaInfServices(ProjectLibraryProviderTest.class.getClassLoader()), CollocationQueryImplementation.class));
        u = Utilities.toURI(f4).toURL();
        result = ProjectLibraryProvider.copyLibrary(l, u, false);
        assertNotNull(result);
        assertEquals(u, result.getManager().getLocation());

Lines 83-88 Link Here

(-)a/project.ant/test/unit/src/org/netbeans/spi/project/support/ant/AntBasedTestUtil.java (-1 / +2 lines)
83	import org.openide.filesystems.FileObject;	83	import org.openide.filesystems.FileObject;
84	import org.openide.util.ChangeSupport;	84	import org.openide.util.ChangeSupport;
85	import org.openide.util.Lookup;	85	import org.openide.util.Lookup;
		86	import org.openide.util.Utilities;
86	import org.openide.util.lookup.Lookups;	87	import org.openide.util.lookup.Lookups;
87	import org.openide.xml.XMLUtil;	88	import org.openide.xml.XMLUtil;
88	import org.w3c.dom.Document;	89	import org.w3c.dom.Document;
Lines 326-332 Link Here
326	if (!f.isFile()) {	327	if (!f.isFile()) {
327	return null;	328	return null;
328	}	329	}
329	return XMLUtil.parse(new InputSource(f.toURI().toString()), false, true, XMLUtil.defaultErrorHandler(), null);	330	return XMLUtil.parse(new InputSource(Utilities.toURI(f).toString()), false, true, XMLUtil.defaultErrorHandler(), null);
330	}	331	}
331		332
332	/**	333	/**

Lines 67-72 Link Here

(-)a/project.ant/test/unit/src/org/netbeans/spi/project/support/ant/AntProjectHelperTest.java (-2 / +3 lines)
67	import org.openide.filesystems.FileUtil;	67	import org.openide.filesystems.FileUtil;
68	import org.openide.filesystems.test.TestFileUtils;	68	import org.openide.filesystems.test.TestFileUtils;
69	import org.openide.util.Mutex;	69	import org.openide.util.Mutex;
		70	import org.openide.util.Utilities;
70	import org.openide.util.test.MockChangeListener;	71	import org.openide.util.test.MockChangeListener;
71	import org.openide.util.test.MockLookup;	72	import org.openide.util.test.MockLookup;
72	import org.openide.util.test.MockPropertyChangeListener;	73	import org.openide.util.test.MockPropertyChangeListener;
Lines 371-378 Link Here
371	File somethingElseF = new File(scratchF.getParentFile(), "nonexistent-file-path");	372	File somethingElseF = new File(scratchF.getParentFile(), "nonexistent-file-path");
372	assertEquals("absolute (nonexistent) path is left alone", somethingElseF, h.resolveFile(somethingElseF.getAbsolutePath()));	373	assertEquals("absolute (nonexistent) path is left alone", somethingElseF, h.resolveFile(somethingElseF.getAbsolutePath()));
373	assertEquals("absolute (nonexistent) path has no file object", null, h.resolveFileObject(somethingElseF.getAbsolutePath()));	374	assertEquals("absolute (nonexistent) path has no file object", null, h.resolveFileObject(somethingElseF.getAbsolutePath()));
374	assertEquals("URI already normalized (Unix-style)", h.resolveFile("../proj").toURI().normalize().toURL(), h.resolveFile("../proj").toURI().toURL());	375	assertEquals("URI already normalized (Unix-style)", Utilities.toURI(h.resolveFile("../proj")).normalize().toURL(), Utilities.toURI(h.resolveFile("../proj")).toURL());
375	assertEquals("URI already normalized (DOS-style)", h.resolveFile("..\\proj").toURI().normalize().toURL(), h.resolveFile("..\\proj").toURI().toURL());	376	assertEquals("URI already normalized (DOS-style)", Utilities.toURI(h.resolveFile("..\\proj")).normalize().toURL(), Utilities.toURI(h.resolveFile("..\\proj")).toURL());
376	}	377	}
377		378
378	/**	379	/**

Lines 55-60 Link Here

(-)a/project.ant/test/unit/src/org/netbeans/spi/project/support/ant/EditablePropertiesTest.java (-1 / +2 lines)
55	import java.net.URI;	55	import java.net.URI;
56	import java.net.URL;	56	import java.net.URL;
57	import org.netbeans.junit.NbTestCase;	57	import org.netbeans.junit.NbTestCase;
		58	import org.openide.util.Utilities;
58		59
59	// here because AntBasedTestUtil.countTextDiffs cannot be moved to openide.util	60	// here because AntBasedTestUtil.countTextDiffs cannot be moved to openide.util
60	public class EditablePropertiesTest extends NbTestCase {	61	public class EditablePropertiesTest extends NbTestCase {
Lines 183-189 Link Here
183		184
184	private String filenameOfTestProperties() {	185	private String filenameOfTestProperties() {
185	// #50987: never use URL.path for this purpose...	186	// #50987: never use URL.path for this purpose...
186	return new File(URI.create(EditablePropertiesTest.class.getResource("data/test.properties").toExternalForm())).getAbsolutePath();	187	return Utilities.toFile(URI.create(EditablePropertiesTest.class.getResource("data/test.properties").toExternalForm())).getAbsolutePath();
187	}	188	}
188		189
189	private EditableProperties loadTestProperties() throws IOException {	190	private EditableProperties loadTestProperties() throws IOException {




import org.netbeans.spi.queries.CollocationQueryImplementation;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.util.Utilities;
import org.openide.util.lookup.Lookups;
import org.openide.util.test.MockLookup;
import org.openide.xml.XMLUtil;

        super.setUp();
        ClassLoader l = ReferenceHelper.class.getClassLoader();
        MockLookup.setLookup(
            Lookups.fixed(AntBasedTestUtil.testAntBasedProjectType(), AntBasedTestUtil.testCollocationQueryImplementation(Utilities.toURI(getWorkDir()))),
            Lookups.singleton(l),
            Lookups.exclude(Lookups.metaInfServices(l), CollocationQueryImplementation.class));
        scratch = TestUtil.makeScratchDir(this);

        assertProjectLibraryManagers(null);
        File fooJar = new File(getWorkDir(), "foo.jar");
        File f = new File(getWorkDir(), "libs.properties");
        URL loc = Utilities.toURI(f).toURL();
        LibraryManager mgr = LibraryManager.forLocation(loc);
        assertEquals(loc, mgr.getLocation());
        Library fooLib = mgr.createLibrary("j2se", "foo",
                Collections.singletonMap("classpath", Arrays.asList(new URL("jar:" + Utilities.toURI(fooJar) + "!/"))));
        assertEquals(mgr, fooLib.getManager());
        try {
            r.createLibraryReference(fooLib, "classpath");

        File barDir = new File(getWorkDir(), "bar");
        barDir.mkdirs();
        String barref = r.createLibraryReference(mgr.createLibrary("j2se", "bar",
                Collections.singletonMap("classpath", Arrays.asList(Utilities.toURI(barDir).toURL()))), "classpath");
        assertEquals("${libs.bar.classpath}", barref);
        assertEquals(barDir.getAbsolutePath(), pev.evaluate(barref).replace('/', File.separatorChar));
        EditableProperties props = h.getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH);

Lines 53-58 Link Here

(-)a/project.ant/test/unit/src/org/netbeans/spi/project/support/ant/SharabilityQueryImplTest.java (-1 / +2 lines)
53	import org.netbeans.spi.queries.SharabilityQueryImplementation2;	53	import org.netbeans.spi.queries.SharabilityQueryImplementation2;
54	import org.openide.filesystems.FileObject;	54	import org.openide.filesystems.FileObject;
55	import org.openide.filesystems.FileUtil;	55	import org.openide.filesystems.FileUtil;
		56	import org.openide.util.Utilities;
56	import org.openide.util.test.MockLookup;	57	import org.openide.util.test.MockLookup;
57		58
58	/**	59	/**
Lines 94-100 Link Here
94	}	95	}
95		96
96	private URI file(String path) {	97	private URI file(String path) {
97	return new File(scratchF, path.replace('/', File.separatorChar)).toURI();	98	return Utilities.toURI(new File(scratchF, path.replace('/', File.separatorChar)));
98	}	99	}
99		100
100	public void testBasicIncludesExcludes() throws Exception {	101	public void testBasicIncludesExcludes() throws Exception {

Lines 54-59 Link Here

(-)a/project.ant/test/unit/src/org/netbeans/spi/project/support/ant/SimpleAntArtifactTest.java (-1 / +2 lines)
54	import org.netbeans.junit.NbTestCase;	54	import org.netbeans.junit.NbTestCase;
55	import org.openide.filesystems.FileObject;	55	import org.openide.filesystems.FileObject;
56	import org.openide.filesystems.FileUtil;	56	import org.openide.filesystems.FileUtil;
		57	import org.openide.util.Utilities;
57	import org.openide.util.test.MockLookup;	58	import org.openide.util.test.MockLookup;
58		59
59	/**	60	/**
Lines 111-117 Link Here
111	assertEquals("correct project", pm.findProject(sisterprojdir), art.getProject());	112	assertEquals("correct project", pm.findProject(sisterprojdir), art.getProject());
112		113
113	art = sisterh.createSimpleAntArtifact("jar", "build.jar.absolute", sisterh.getStandardPropertyEvaluator(), "dojar", "clean");	114	art = sisterh.createSimpleAntArtifact("jar", "build.jar.absolute", sisterh.getStandardPropertyEvaluator(), "dojar", "clean");
114	assertEquals("correct artifact location", (new File(getWorkDir().getAbsolutePath()+"/build/proj3.jar")).toURI(), art.getArtifactLocations()[0]);	115	assertEquals("correct artifact location", Utilities.toURI((new File(getWorkDir().getAbsolutePath()+"/build/proj3.jar"))), art.getArtifactLocations()[0]);
115	}	116	}
116		117
117	}	118	}

Lines 135-141 Link Here

(-)a/project.libraries/nbproject/project.xml (-1 / +1 lines)
135	<build-prerequisite/>	135	<build-prerequisite/>
136	<compile-dependency/>	136	<compile-dependency/>
137	<run-dependency>	137	<run-dependency>
138	<specification-version>8.0</specification-version>	138	<specification-version>8.25</specification-version>
139	</run-dependency>	139	</run-dependency>
140	</dependency>	140	</dependency>
141	<dependency>	141	<dependency>

Lines 63-68 Link Here

(-)a/project.libraries/src/org/netbeans/modules/project/libraries/ui/AllLibrariesCustomizer.java (-1 / +2 lines)
63	import org.openide.util.HelpCtx;	63	import org.openide.util.HelpCtx;
64	import org.openide.util.Lookup;	64	import org.openide.util.Lookup;
65	import org.openide.util.NbBundle.Messages;	65	import org.openide.util.NbBundle.Messages;
		66	import org.openide.util.Utilities;
66		67
67	class AllLibrariesCustomizer extends JPanel implements HelpCtx.Provider {	68	class AllLibrariesCustomizer extends JPanel implements HelpCtx.Provider {
68		69
Lines 155-161 Link Here
155	try {	156	try {
156	//#131452 prevent space in path problem when converting to URL.	157	//#131452 prevent space in path problem when converting to URL.
157	File loc = FileUtil.normalizeFile(new File((String) libraryManagerComboBox.getModel().getSelectedItem()));	158	File loc = FileUtil.normalizeFile(new File((String) libraryManagerComboBox.getModel().getSelectedItem()));
158	u = loc.toURI().toURL();	159	u = Utilities.toURI(loc).toURL();
159	} catch (MalformedURLException ex) {	160	} catch (MalformedURLException ex) {
160	Exceptions.printStackTrace(ex);	161	Exceptions.printStackTrace(ex);
161	}	162	}

Lines 327-333 Link Here

(-)a/project.libraries/src/org/netbeans/modules/project/libraries/ui/LibrariesCustomizer.java (-1 / +1 lines)
327	LibraryStorageArea area = nodes[0].getLookup().lookup(LibraryStorageArea.class);	327	LibraryStorageArea area = nodes[0].getLookup().lookup(LibraryStorageArea.class);
328	if (area != null && area != LibrariesModel.GLOBAL_AREA) {	328	if (area != null && area != LibrariesModel.GLOBAL_AREA) {
329	customizerContext = new LibraryCustomizerContextWrapper(impl, area);	329	customizerContext = new LibraryCustomizerContextWrapper(impl, area);
330	File f = new File(URI.create(area.getLocation().toExternalForm()));	330	File f = Utilities.toFile(URI.create(area.getLocation().toExternalForm()));
331	this.libraryLocation.setText(f.getPath());	331	this.libraryLocation.setText(f.getPath());
332	} else {	332	} else {
333	customizerContext = new LibraryCustomizerContextWrapper(impl, null);	333	customizerContext = new LibraryCustomizerContextWrapper(impl, null);




import org.netbeans.modules.project.libraries.DefaultLibraryImplementation;
import org.netbeans.spi.project.libraries.LibraryTypeProvider;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.filesystems.URLMapper;
import org.openide.util.Exceptions;
import org.openide.util.Parameters;
import org.openide.util.Utilities;

/**
 * SPI Support class.

        try {
            File f = new File(path);
            if (f.isAbsolute()) {
                return Utilities.toURI(f);
            } else {
                // create hierarchical relative URI (that is no schema)
                return new URI(null, null, path.replace('\\', '/'), null);

     */
    public static String convertURIToFilePath(URI uri) {
        if (uri.isAbsolute()) {
            return Utilities.toFile(uri).getPath();
            return new File(uri).getPath();
        } else {
            return uri.getPath().replace('/', File.separatorChar);
        }

            if (!"file".equals(libraryLocation.getProtocol())) { //NOI18N
                throw new IllegalArgumentException("not file: protocol - "+libraryLocation.toExternalForm()); //NOI18N
            }
            if (!libraryLocation.getPath().endsWith(".properties")) { //NOI18N
            if (!libLocation.getName().endsWith(".properties")) { //NOI18N
                throw new IllegalArgumentException("library location must be a file - "+libraryLocation.toExternalForm()); //NOI18N
            }
            URI resolved;
            try {
                resolved = libraryLocation.toURI().resolve(libraryEntry);
            } catch (URISyntaxException x) {
                throw new AssertionError(x);
            }
            if (libraryEntry.getPath().contains("!/")) {
                return URI.create("jar:" + resolved);
                jarFolder = libraryEntry.getRawPath().substring(libraryEntry.getRawPath().indexOf("!/")+2);
            }            
            URI resolvedPath = FileUtil.normalizeFile(new File(libBase, libEntryPath)).toURI();
            if (jarFolder != null) { // NOI18N
                return URI.create("jar:"+resolvedPath.toString()+"!/"+jarFolder); // NOI18N
            } else {
                return resolved;
                final boolean relativeEndsWithSlash = libEntryPath.endsWith("/");     //NOI18N
                final String suri = resolvedPath.toString();
                final boolean absoluteEndsWithSlash = suri.endsWith("/");  //NOI18N
                if (relativeEndsWithSlash && !absoluteEndsWithSlash) {
                    resolvedPath = URI.create (suri+'/');    //NOI18N
                }
                return resolvedPath;
            }
        }
    }




import org.netbeans.junit.NbTestCase;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.util.Utilities;

public class LibrariesSupportTest extends NbTestCase {


    public void testConvertFilePathToURI() throws Exception {
        String path = getWorkDirPath()+"/aa/bb/c c.ext".replace('/', File.separatorChar);
        URI u = LibrariesSupport.convertFilePathToURI(path);
        assertEquals(Utilities.toURI(FileUtil.normalizeFile(new File(path))), u);
        path = "../zz/re l.ext".replace('/', File.separatorChar);
        u = LibrariesSupport.convertFilePathToURI(path);
        assertEquals("../zz/re%20l.ext", u.toString());

     * Test of convertURLToFilePath method, of class LibrariesSupport.
     */
    public void testConvertURIToFilePath() throws Exception{
        URI u = Utilities.toURI(getWorkDir());
        String path = LibrariesSupport.convertURIToFilePath(u);
        assertEquals(getWorkDir().getPath(), path);
        u = new URI(null, null, "../zz/re l.ext", null);

        f.createNewFile();
        f2.createNewFile();
        FileObject fo = LibrariesSupport.resolveLibraryEntryFileObject(
                Utilities.toURI(f).toURL(),
                new URI(null, null, "bertie.jar", null));
        assertEquals(f2.getPath(), FileUtil.toFile(fo).getPath());
        fo = LibrariesSupport.resolveLibraryEntryFileObject(
                null, 
                Utilities.toURI(f2));
        assertEquals(f2.getPath(), FileUtil.toFile(fo).getPath());
    }


        f.createNewFile();
        f2.createNewFile();
        URI u = LibrariesSupport.resolveLibraryEntryURI(
                Utilities.toURI(f).toURL(),
                new URI(null, null, "ber tie.jar", null));
        assertEquals(Utilities.toURI(new File(f.getParentFile(), f2.getName())), u);
        u = LibrariesSupport.resolveLibraryEntryURI(
                Utilities.toURI(f).toURL(),
                Utilities.toURI(f2));
        assertEquals(Utilities.toURI(f2), u);
        u = LibrariesSupport.resolveLibraryEntryURI(
                Utilities.toURI(f).toURL(),
                new URI(null, null, "ber tie.jar!/main/ja va", null));
        assertEquals(new URI("jar:"+ (Utilities.toURI(new File(f.getParentFile(), f2.getName())).toString()) + "!/main/ja%20va"), u);
        u = LibrariesSupport.resolveLibraryEntryURI(
                Utilities.toURI(f).toURL(),
                new URI(null, null, "../"+getWorkDir().getName()+"/ber tie.jar!/main/ja va", null));
        assertEquals(new URI("jar:"+ (Utilities.toURI(new File(f.getParentFile(), f2.getName())).toString()) + "!/main/ja%20va"), u);
        u = LibrariesSupport.resolveLibraryEntryURI(
                Utilities.toURI(f).toURL(),
                new URI(null, null, "../a folder/", null));
        assertEquals(new URI(Utilities.toURI(new File(getWorkDir().getParentFile(), "a folder")).toString() + "/"), u);
        // UNC paths
        URI uncBaseURI = URI.create("file://computerName/sharedFolder/a/b/c/d.properties");
        URI uncEntryURI = URI.create("e/e.jar");
        URI expectedURI = URI.create("file://computerName/sharedFolder/a/b/c/e/e.jar");
        URI resolvedURI = LibrariesSupport.resolveLibraryEntryURI(uncBaseURI.toURL(), uncEntryURI);
        assertEquals("UNC entry wrongly resolved.", expectedURI, resolvedURI);
        uncEntryURI = new URI(null, null, "e/e.jar!/f f/f", null);
        expectedURI = URI.create("jar:file://computerName/sharedFolder/a/b/c/e/e.jar!/f%20f/f");
        resolvedURI = LibrariesSupport.resolveLibraryEntryURI(uncBaseURI.toURL(), uncEntryURI);
        assertEquals("UNC jar entry wrongly resolved.", expectedURI, resolvedURI);
        uncEntryURI = new URI(null, null, "e/e.jar!/", null);
        expectedURI = URI.create("jar:file://computerName/sharedFolder/a/b/c/e/e.jar!/");
        resolvedURI = LibrariesSupport.resolveLibraryEntryURI(uncBaseURI.toURL(), uncEntryURI);
        assertEquals("UNC jar entry wrongly resolved.", expectedURI, resolvedURI);   
    }

Lines 104-110 Link Here

(-)a/projectapi/nbproject/project.xml (-1 / +1 lines)
104	<build-prerequisite/>	104	<build-prerequisite/>
105	<compile-dependency/>	105	<compile-dependency/>
106	<run-dependency>	106	<run-dependency>
107	<specification-version>8.4</specification-version>	107	<specification-version>8.25</specification-version>
108	</run-dependency>	108	</run-dependency>
109	</dependency>	109	</dependency>
110	<dependency>	110	<dependency>

Lines 60-65 Link Here

(-)a/projectapi/src/org/netbeans/api/project/FileOwnerQuery.java (-1 / +2 lines)
60	import org.openide.util.Lookup;	60	import org.openide.util.Lookup;
61	import org.openide.util.LookupEvent;	61	import org.openide.util.LookupEvent;
62	import org.openide.util.LookupListener;	62	import org.openide.util.LookupListener;
		63	import org.openide.util.Utilities;
63		64
64	/**	65	/**
65	* Find the project which owns a file.	66	* Find the project which owns a file.
Lines 135-141 Link Here
135	try {	136	try {
136	URL u = new URL(schemaPart);	137	URL u = new URL(schemaPart);
137	// XXX bad to ever use new File(URL.getPath()):	138	// XXX bad to ever use new File(URL.getPath()):
138	uri = new File(u.getPath()).toURI();	139	uri = Utilities.toURI(new File(u.getPath()));
139	} catch (MalformedURLException ex2) {	140	} catch (MalformedURLException ex2) {
140	ex2.printStackTrace();	141	ex2.printStackTrace();
141	assert false : schemaPart;	142	assert false : schemaPart;

Lines 48-53 Link Here

(-)a/projectapi/src/org/netbeans/modules/projectapi/ProjectSharabilityQuery.java (-1 / +2 lines)
48	import org.netbeans.api.project.FileOwnerQuery;	48	import org.netbeans.api.project.FileOwnerQuery;
49	import org.netbeans.api.project.Project;	49	import org.netbeans.api.project.Project;
50	import org.netbeans.api.queries.SharabilityQuery;	50	import org.netbeans.api.queries.SharabilityQuery;
		51	import org.openide.util.Utilities;
51		52
52	/**	53	/**
53	* Delegates {@link SharabilityQuery} to implementations in project lookup.	54	* Delegates {@link SharabilityQuery} to implementations in project lookup.
Lines 60-66 Link Here
60	public ProjectSharabilityQuery() {}	61	public ProjectSharabilityQuery() {}
61		62
62	public @Override int getSharability(File file) {	63	public @Override int getSharability(File file) {
63	Project p = FileOwnerQuery.getOwner(file.toURI());	64	Project p = FileOwnerQuery.getOwner(Utilities.toURI(file));
64	if (p != null) {	65	if (p != null) {
65	org.netbeans.spi.queries.SharabilityQueryImplementation sqi = p.getLookup().lookup(org.netbeans.spi.queries.SharabilityQueryImplementation.class);	66	org.netbeans.spi.queries.SharabilityQueryImplementation sqi = p.getLookup().lookup(org.netbeans.spi.queries.SharabilityQueryImplementation.class);
66	if (sqi != null) {	67	if (sqi != null) {




import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.filesystems.test.TestFileUtils;
import org.openide.util.Utilities;
import org.openide.util.test.MockLookup;

/**

    
    public void testFileOwner() throws Exception {
        assertEquals("correct project from projfile FileObject", p, FileOwnerQuery.getOwner(projfile));
        URI u = Utilities.toURI(FileUtil.toFile(projfile));
        assertEquals("correct project from projfile URI " + u, p, FileOwnerQuery.getOwner(u));
        assertEquals("correct project from projfile2 FileObject", p, FileOwnerQuery.getOwner(projfile2));
        assertEquals("correct project from projfile2 URI", p, FileOwnerQuery.getOwner(Utilities.toURI(FileUtil.toFile(projfile2))));
        assertEquals("correct project from projdir FileObject", p, FileOwnerQuery.getOwner(projdir));
        assertEquals("correct project from projdir URI", p, FileOwnerQuery.getOwner(Utilities.toURI(FileUtil.toFile(projdir))));
        // Check that it loads the project even though we have not touched it yet:
        Project p2 = FileOwnerQuery.getOwner(subprojfile);
        Project subproj = ProjectManager.getDefault().findProject(subprojdir);
        assertEquals("correct project from subprojdir FileObject", subproj, p2);
        assertEquals("correct project from subprojdir URI", subproj, FileOwnerQuery.getOwner(Utilities.toURI(FileUtil.toFile(subprojdir))));
        assertEquals("correct project from subprojfile FileObject", subproj, FileOwnerQuery.getOwner(subprojfile));
        assertEquals("correct project from subprojfile URI", subproj, FileOwnerQuery.getOwner(Utilities.toURI(FileUtil.toFile(subprojfile))));
        assertEquals("no project from randomfile FileObject", null, FileOwnerQuery.getOwner(randomfile));
        assertEquals("no project from randomfile URI", null, FileOwnerQuery.getOwner(Utilities.toURI(FileUtil.toFile(randomfile))));
        assertEquals("no project in C:\\", null, FileOwnerQuery.getOwner(URI.create("file:/C:/")));
    }
    

Lines 215-221 Link Here

(-)a/projectui/nbproject/project.xml (-1 / +1 lines)
215	<build-prerequisite/>	215	<build-prerequisite/>
216	<compile-dependency/>	216	<compile-dependency/>
217	<run-dependency>	217	<run-dependency>
218	<specification-version>8.6</specification-version>	218	<specification-version>8.25</specification-version>
219	</run-dependency>	219	</run-dependency>
220	</dependency>	220	</dependency>
221	<dependency>	221	<dependency>

Lines 80-85 Link Here

(-)a/projectui/src/org/netbeans/modules/project/ui/ProjectChooserAccessory.java (-1 / +2 lines)
80	import org.openide.util.Exceptions;	80	import org.openide.util.Exceptions;
81	import org.openide.util.NbBundle;	81	import org.openide.util.NbBundle;
82	import org.openide.util.RequestProcessor;	82	import org.openide.util.RequestProcessor;
		83	import org.openide.util.Utilities;
83		84
84	/**	85	/**
85	* Special component on side of project filechooser.	86	* Special component on side of project filechooser.
Lines 393-399 Link Here
393	}	394	}
394	b.append("../"); // NOI18N	395	b.append("../"); // NOI18N
395	}	396	}
396	URI u = base.toURI().relativize(f2.toURI());	397	URI u = Utilities.toURI(base).relativize(Utilities.toURI(f2));
397	assert !u.isAbsolute() : u + " from " + f1 + " and " + f2 + " with common root " + base;	398	assert !u.isAbsolute() : u + " from " + f1 + " and " + f2 + " with common root " + base;
398	b.append(u.getPath());	399	b.append(u.getPath());
399	if (b.charAt(b.length() - 1) == '/') {	400	if (b.charAt(b.length() - 1) == '/') {

Lines 210-216 Link Here

(-)a/projectui/src/org/netbeans/modules/project/ui/zip/ExportZIP.java (-1 / +1 lines)
210	}	210	}
211	boolean kidMixed;	211	boolean kidMixed;
212	if (mixedSharability) {	212	if (mixedSharability) {
213	switch (SharabilityQuery.getSharability(kid.toURI())) {	213	switch (SharabilityQuery.getSharability(Utilities.toURI(kid))) {
214	case SHARABLE:	214	case SHARABLE:
215	kidMixed = false;	215	kidMixed = false;
216	break;	216	break;

Lines 82-87 Link Here

(-)a/projectui/src/org/netbeans/modules/project/ui/zip/ImportZIP.java (-1 / +2 lines)
82	import org.openide.util.Cancellable;	82	import org.openide.util.Cancellable;
83	import org.openide.util.NbBundle.Messages;	83	import org.openide.util.NbBundle.Messages;
84	import org.openide.util.RequestProcessor;	84	import org.openide.util.RequestProcessor;
		85	import org.openide.util.Utilities;
85		86
86	public class ImportZIP extends JPanel {	87	public class ImportZIP extends JPanel {
87		88
Lines 224-230 Link Here
224	return false;	225	return false;
225	}	226	}
226	try {	227	try {
227	if (!FileUtil.isArchiveFile(zip.toURI().toURL())) {	228	if (!FileUtil.isArchiveFile(Utilities.toURI(zip).toURL())) {
228	notifications.setErrorMessage(ERR_not_zip(zip));	229	notifications.setErrorMessage(ERR_not_zip(zip));
229	return false;	230	return false;
230	}	231	}

Lines 62-68 Link Here

(-)a/queries/nbproject/project.xml (-1 / +1 lines)
62	<build-prerequisite/>	62	<build-prerequisite/>
63	<compile-dependency/>	63	<compile-dependency/>
64	<run-dependency>	64	<run-dependency>
65	<specification-version>8.0</specification-version>	65	<specification-version>8.25</specification-version>
66	</run-dependency>	66	</run-dependency>
67	</dependency>	67	</dependency>
68	<dependency>	68	<dependency>




import org.netbeans.spi.queries.CollocationQueryImplementation2;
import org.openide.filesystems.FileUtil;
import org.openide.util.Lookup;
import org.openide.util.Utilities;

/**
 * Find out whether some files logically belong in one directory tree,

            throw new IllegalArgumentException("Parameter file2 was not "+  // NOI18N
                "normalized. Was "+file2+" instead of "+FileUtil.normalizeFile(file2));  // NOI18N
        }
        URI uri1 = Utilities.toURI(file1);
        URI uri2 = Utilities.toURI(file2);
        for (CollocationQueryImplementation2 cqi : implementations2.allInstances()) {
            if (cqi.areCollocated(uri1, uri2)) {
                return true;

            }
        }
        if ("file".equals(file1.getScheme()) && "file".equals(file2.getScheme())) { // NOI18N
            File f1 = FileUtil.normalizeFile(Utilities.toFile(file1));
            File f2 = FileUtil.normalizeFile(Utilities.toFile(file2));
            for (org.netbeans.spi.queries.CollocationQueryImplementation cqi : implementations.allInstances()) {
                if (cqi.areCollocated(f1, f2)) {
                    return true;

            throw new IllegalArgumentException("Parameter file was not "+  // NOI18N
                "normalized. Was "+file+" instead of "+FileUtil.normalizeFile(file));  // NOI18N
        }
        URI uri = Utilities.toURI(file);
        for (CollocationQueryImplementation2 cqi : implementations2.allInstances()) {
            URI root = cqi.findRoot(uri);
            if (root != null) {
                return Utilities.toFile(root);
            }
        }
        for (org.netbeans.spi.queries.CollocationQueryImplementation cqi : implementations.allInstances()) {

            }
        }
        if ("file".equals(file.getScheme())) { // NOI18N
            File f = FileUtil.normalizeFile(Utilities.toFile(file));
            for (org.netbeans.spi.queries.CollocationQueryImplementation cqi : implementations.allInstances()) {
                File root = cqi.findRoot(f);
                if (root != null) {
                    return Utilities.toURI(root);
                }
            }
        }

Lines 172-178 Link Here

(-)a/queries/src/org/netbeans/api/queries/SharabilityQuery.java (-2 / +2 lines)
172	URI uri = null;	172	URI uri = null;
173	for (SharabilityQueryImplementation2 sqi : implementations2.allInstances()) {	173	for (SharabilityQueryImplementation2 sqi : implementations2.allInstances()) {
174	if (uri == null) {	174	if (uri == null) {
175	uri = file.toURI();	175	uri = Utilities.toURI(file);
176	}	176	}
177	Sharability x = sqi.getSharability(uri);	177	Sharability x = sqi.getSharability(uri);
178	if (x != Sharability.UNKNOWN) {	178	if (x != Sharability.UNKNOWN) {
Lines 211-217 Link Here
211	}	211	}
212	}	212	}
213	if ("file".equals(uri.getScheme())) { // NOI18N	213	if ("file".equals(uri.getScheme())) { // NOI18N
214	File file = FileUtil.normalizeFile(new File(uri));	214	File file = FileUtil.normalizeFile(Utilities.toFile(uri));
215	for (org.netbeans.spi.queries.SharabilityQueryImplementation sqi : implementations.allInstances()) {	215	for (org.netbeans.spi.queries.SharabilityQueryImplementation sqi : implementations.allInstances()) {
216	int x = sqi.getSharability(file);	216	int x = sqi.getSharability(file);
217	if (x != UNKNOWN) {	217	if (x != UNKNOWN) {




import org.netbeans.junit.MockServices;
import org.netbeans.junit.NbTestCase;
import org.netbeans.spi.queries.CollocationQueryImplementation2;
import org.openide.util.Utilities;

/**
 *

        File proj2 = new File(base, "proj2");
        proj2.mkdirs();
        assertTrue("Must be collocated", CollocationQuery.areCollocated(proj1, proj3));
        assertTrue("Must be collocated", CollocationQuery.areCollocated(Utilities.toURI(proj1), Utilities.toURI(proj3)));
        assertTrue("Must be collocated", CollocationQuery.areCollocated(proj3, proj1));
        assertTrue("Must be collocated", CollocationQuery.areCollocated(Utilities.toURI(proj3), Utilities.toURI(proj1)));
        assertFalse("Cannot be collocated", CollocationQuery.areCollocated(proj1, proj2));
        assertFalse("Cannot be collocated", CollocationQuery.areCollocated(Utilities.toURI(proj1), Utilities.toURI(proj2)));
        assertFalse("Cannot be collocated", CollocationQuery.areCollocated(proj2, proj1));
        assertFalse("Cannot be collocated", CollocationQuery.areCollocated(Utilities.toURI(proj2), Utilities.toURI(proj1)));
        
        // folder does not exist:
        File proj4 = new File(base, "proj");
        assertFalse("Cannot be collocated", CollocationQuery.areCollocated(proj1, proj4));
        assertFalse("Cannot be collocated", CollocationQuery.areCollocated(Utilities.toURI(proj1), Utilities.toURI(proj4)));
        assertFalse("Cannot be collocated", CollocationQuery.areCollocated(proj4, proj1));
        assertFalse("Cannot be collocated", CollocationQuery.areCollocated(Utilities.toURI(proj4), Utilities.toURI(proj1)));
        proj4.mkdirs();
        assertFalse("Cannot be collocated", CollocationQuery.areCollocated(proj1, proj4));
        assertFalse("Cannot be collocated", CollocationQuery.areCollocated(Utilities.toURI(proj1), Utilities.toURI(proj4)));
        assertFalse("Cannot be collocated", CollocationQuery.areCollocated(proj4, proj1));
        assertFalse("Cannot be collocated", CollocationQuery.areCollocated(Utilities.toURI(proj4), Utilities.toURI(proj1)));
        
        // files do not exist:
        File file1 = new File(base, "file1.txt");
        File file2 = new File(base, "file1");
        assertFalse("Cannot be collocated", CollocationQuery.areCollocated(file1, file2));
        assertFalse("Cannot be collocated", CollocationQuery.areCollocated(Utilities.toURI(file1), Utilities.toURI(file2)));
        assertFalse("Cannot be collocated", CollocationQuery.areCollocated(file2, file1));
        assertFalse("Cannot be collocated", CollocationQuery.areCollocated(Utilities.toURI(file2), Utilities.toURI(file1)));
        
        // passing the same parameter
        assertTrue("A file must be collocated with itself", CollocationQuery.areCollocated(proj1, proj1));
        assertTrue("A file must be collocated with itself", CollocationQuery.areCollocated(Utilities.toURI(proj1), Utilities.toURI(proj1)));
    }

    public static class CollocationQueryImplementation2Impl implements CollocationQueryImplementation2 {

            if (uri1.equals(uri2)) {
                return true;
            }
            File file1 = Utilities.toFile(uri1);
            File file2 = Utilities.toFile(uri2);
            String f1 = file1.getPath();
            if ((file1.isDirectory() || !file1.exists()) && !f1.endsWith(File.separator)) {
                f1 += File.separatorChar;




import java.io.File;
import java.io.IOException;
import org.netbeans.junit.NbTestCase;
import org.openide.util.Utilities;

/**
 *

        File proj2 = new File(base, "proj2");
        proj2.mkdirs();
        assertTrue("Must be collocated", CollocationQuery.areCollocated(proj1, proj3));
        assertTrue("Must be collocated", CollocationQuery.areCollocated(Utilities.toURI(proj1), Utilities.toURI(proj3)));
        assertTrue("Must be collocated", CollocationQuery.areCollocated(proj3, proj1));
        assertTrue("Must be collocated", CollocationQuery.areCollocated(Utilities.toURI(proj3), Utilities.toURI(proj1)));
        assertFalse("Cannot be collocated", CollocationQuery.areCollocated(proj1, proj2));
        assertFalse("Cannot be collocated", CollocationQuery.areCollocated(Utilities.toURI(proj1), Utilities.toURI(proj2)));
        assertFalse("Cannot be collocated", CollocationQuery.areCollocated(proj2, proj1));
        assertFalse("Cannot be collocated", CollocationQuery.areCollocated(Utilities.toURI(proj2), Utilities.toURI(proj1)));
        
        // folder does not exist:
        File proj4 = new File(base, "proj");
        assertFalse("Cannot be collocated", CollocationQuery.areCollocated(proj1, proj4));
        assertFalse("Cannot be collocated", CollocationQuery.areCollocated(Utilities.toURI(proj1), Utilities.toURI(proj4)));
        assertFalse("Cannot be collocated", CollocationQuery.areCollocated(proj4, proj1));
        assertFalse("Cannot be collocated", CollocationQuery.areCollocated(Utilities.toURI(proj4), Utilities.toURI(proj1)));
        proj4.mkdirs();
        assertFalse("Cannot be collocated", CollocationQuery.areCollocated(proj1, proj4));
        assertFalse("Cannot be collocated", CollocationQuery.areCollocated(Utilities.toURI(proj1), Utilities.toURI(proj4)));
        assertFalse("Cannot be collocated", CollocationQuery.areCollocated(proj4, proj1));
        assertFalse("Cannot be collocated", CollocationQuery.areCollocated(Utilities.toURI(proj4), Utilities.toURI(proj1)));
        
        // files do not exist:
        File file1 = new File(base, "file1.txt");
        File file2 = new File(base, "file1");
        assertFalse("Cannot be collocated", CollocationQuery.areCollocated(file1, file2));
        assertFalse("Cannot be collocated", CollocationQuery.areCollocated(Utilities.toURI(file1), Utilities.toURI(file2)));
        assertFalse("Cannot be collocated", CollocationQuery.areCollocated(file2, file1));
        assertFalse("Cannot be collocated", CollocationQuery.areCollocated(Utilities.toURI(file2), Utilities.toURI(file1)));
        
        // passing the same parameter
        assertTrue("A file must be collocated with itself", CollocationQuery.areCollocated(proj1, proj1));
        assertTrue("A file must be collocated with itself", CollocationQuery.areCollocated(Utilities.toURI(proj1), Utilities.toURI(proj1)));
    }

}




import org.openide.filesystems.FileLock;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.util.Utilities;

/**
 *

    
    public static Test suite () throws Exception {
        URL url = FileEncodingQueryTest.class.getResource("data");        
        File dataFolder = Utilities.toFile(URI.create(url.toExternalForm()));
        assertTrue(dataFolder.isDirectory());
        File dataFile = new File (dataFolder, "data.properties");
        assertTrue (dataFile.exists());

    
    public void testLongUnicode () throws IOException {
        URL url = FileEncodingQueryTest.class.getResource("data");        
        File dataFolder = Utilities.toFile(URI.create(url.toExternalForm()));
        assertTrue(dataFolder.isDirectory());
        File dataFile = new File (dataFolder, "longUnicode.txt");
        assertTrue (dataFile.exists());

    
    public void testLongUnicode2 () throws IOException {
        URL url = FileEncodingQueryTest.class.getResource("data");        
        File dataFolder = Utilities.toFile(URI.create(url.toExternalForm()));
        assertTrue(dataFolder.isDirectory());
        File dataFile = new File (dataFolder, "longUnicode2.txt");
        assertTrue (dataFile.exists());




import org.netbeans.spi.queries.SharabilityQueryImplementation2;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.util.Utilities;

/**
 *

        File file = new File(home, "aFile.sharable");
        int sharability = SharabilityQuery.getSharability(file);
        assertEquals(SharabilityQuery.SHARABLE, sharability);
        URI uri = Utilities.toURI(file);
        Sharability sharability2 = SharabilityQuery.getSharability(uri);
        assertEquals(SharabilityQuery.Sharability.SHARABLE, sharability2);
        FileObject fo = FileUtil.toFileObject(getWorkDir()).createData("aFile", "sharable");

        File file = new File(home, "aFile.sharable2");
        int sharability = SharabilityQuery.getSharability(file);
        assertEquals(SharabilityQuery.SHARABLE, sharability);
        URI uri = Utilities.toURI(file);
        Sharability sharability2 = SharabilityQuery.getSharability(uri);
        assertEquals(SharabilityQuery.Sharability.SHARABLE, sharability2);
        FileObject fo = FileUtil.toFileObject(getWorkDir()).createData("aFile", "sharable2");

        File file = new File(home, "aFile.not_sharable");
        int sharability = SharabilityQuery.getSharability(file);
        assertEquals(SharabilityQuery.NOT_SHARABLE, sharability);
        URI uri = Utilities.toURI(file);
        Sharability sharability2 = SharabilityQuery.getSharability(uri);
        assertEquals(SharabilityQuery.Sharability.NOT_SHARABLE, sharability2);
        FileObject fo = FileUtil.toFileObject(getWorkDir()).createData("aFile", "not_sharable");

        File file = new File(home, "aFile.not_sharable2");
        int sharability = SharabilityQuery.getSharability(file);
        assertEquals(SharabilityQuery.NOT_SHARABLE, sharability);
        URI uri = Utilities.toURI(file);
        Sharability sharability2 = SharabilityQuery.getSharability(uri);
        assertEquals(SharabilityQuery.Sharability.NOT_SHARABLE, sharability2);
        FileObject fo = FileUtil.toFileObject(getWorkDir()).createData("aFile", "not_sharable2");

        File file = new File(home, "aFile.mixed");
        int sharability = SharabilityQuery.getSharability(file);
        assertEquals(SharabilityQuery.MIXED, sharability);
        URI uri = Utilities.toURI(file);
        Sharability sharability2 = SharabilityQuery.getSharability(uri);
        assertEquals(SharabilityQuery.Sharability.MIXED, sharability2);
        FileObject fo = FileUtil.toFileObject(getWorkDir()).createData("aFile", "mixed");

        File file = new File(home, "aFile.mixed2");
        int sharability = SharabilityQuery.getSharability(file);
        assertEquals(SharabilityQuery.MIXED, sharability);
        URI uri = Utilities.toURI(file);
        Sharability sharability2 = SharabilityQuery.getSharability(uri);
        assertEquals(SharabilityQuery.Sharability.MIXED, sharability2);
        FileObject fo = FileUtil.toFileObject(getWorkDir()).createData("aFile", "mixed2");

        File file = new File(home, "aFile.txt");
        int sharability = SharabilityQuery.getSharability(file);
        assertEquals(SharabilityQuery.UNKNOWN, sharability);
        URI uri = Utilities.toURI(file);
        Sharability sharability2 = SharabilityQuery.getSharability(uri);
        assertEquals(SharabilityQuery.Sharability.UNKNOWN, sharability2);
        FileObject fo = FileUtil.toFileObject(getWorkDir()).createData("aFile", "txt");

            exception = e;
        }
        assertNotNull(exception);
        URI uri = Utilities.toURI(file);
        exception = null;
        try {
            SharabilityQuery.getSharability(uri);





import java.io.File;
import org.netbeans.junit.NbTestCase;
import org.openide.util.Utilities;

/**
 * Test of ParentChildCollocationQuery impl.

        proj2.mkdirs();
        
        ParentChildCollocationQuery query = new ParentChildCollocationQuery();
        assertTrue("Must be collocated", query.areCollocated(Utilities.toURI(proj1), Utilities.toURI(proj3)));
        assertTrue("Must be collocated", query.areCollocated(Utilities.toURI(proj3), Utilities.toURI(proj1)));
        assertFalse("Cannot be collocated", query.areCollocated(Utilities.toURI(proj1), Utilities.toURI(proj2)));
        assertFalse("Cannot be collocated", query.areCollocated(Utilities.toURI(proj2), Utilities.toURI(proj1)));
        
        // folder does not exist:
        File proj4 = new File(base, "proj");
        assertFalse("Cannot be collocated", query.areCollocated(Utilities.toURI(proj1), Utilities.toURI(proj4)));
        assertFalse("Cannot be collocated", query.areCollocated(Utilities.toURI(proj4), Utilities.toURI(proj1)));
        proj4.mkdirs();
        assertFalse("Cannot be collocated", query.areCollocated(Utilities.toURI(proj1), Utilities.toURI(proj4)));
        assertFalse("Cannot be collocated", query.areCollocated(Utilities.toURI(proj4), Utilities.toURI(proj1)));
        
        // files do not exist:
        File file1 = new File(base, "file1.txt");
        File file2 = new File(base, "file1");
        assertFalse("Cannot be collocated", query.areCollocated(Utilities.toURI(file1), Utilities.toURI(file2)));
        assertFalse("Cannot be collocated", query.areCollocated(Utilities.toURI(file2), Utilities.toURI(file1)));
        
        // passing the same parameter
        assertTrue("A file must be collocated with itself", query.areCollocated(Utilities.toURI(proj1), Utilities.toURI(proj1)));
    }

}

Return to bug 213562

Lines 57-62 Link Here

(-)a/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/UnitTestForSourceQueryImpl.java (-2 / +3 lines)
57	import org.netbeans.spi.java.queries.MultipleRootsUnitTestForSourceQueryImplementation;	57	import org.netbeans.spi.java.queries.MultipleRootsUnitTestForSourceQueryImplementation;
58	import org.netbeans.spi.project.support.ant.AntProjectHelper;	58	import org.netbeans.spi.project.support.ant.AntProjectHelper;
59	import org.openide.filesystems.FileObject;	59	import org.openide.filesystems.FileObject;
		60	import org.openide.util.Utilities;
60		61
61	public class UnitTestForSourceQueryImpl implements MultipleRootsUnitTestForSourceQueryImplementation {	62	public class UnitTestForSourceQueryImpl implements MultipleRootsUnitTestForSourceQueryImplementation {
62		63
Lines 92-98 Link Here
92	File f = helper.resolveFile(val);	93	File f = helper.resolveFile(val);
93	if (! f.exists()) {	94	if (! f.exists()) {
94	// #143633: need not to exist, ensure proper URI ending with a slash	95	// #143633: need not to exist, ensure proper URI ending with a slash
95	URI u = f.toURI();	96	URI u = Utilities.toURI(f);
96	String path = u.getPath();	97	String path = u.getPath();
97	if (! path.endsWith("/"))	98	if (! path.endsWith("/"))
98	path = path.concat("/");	99	path = path.concat("/");
Lines 105-111 Link Here
105	}	106	}
106	}	107	}
107		108
108	return new URL[] {f.toURI().toURL()};	109	return new URL[] {Utilities.toURI(f).toURL()};
109	} catch (MalformedURLException e) {	110	} catch (MalformedURLException e) {
110	throw new AssertionError(e);	111	throw new AssertionError(e);
111	}	112	}

Lines 42-48 Link Here

(-)a/autoupdate.pluginimporter/src/org/netbeans/modules/autoupdate/pluginimporter/Installer.java (-13 / +2 lines)
42	package org.netbeans.modules.autoupdate.pluginimporter;	42	package org.netbeans.modules.autoupdate.pluginimporter;
43		43
44	import java.io.File;	44	import java.io.File;
45	import java.io.IOException;
46	import java.util.Arrays;	45	import java.util.Arrays;
47	import java.util.Collection;	46	import java.util.Collection;
48	import java.util.List;	47	import java.util.List;
Lines 54-59 Link Here
54	import org.netbeans.api.autoupdate.UpdateUnit;	53	import org.netbeans.api.autoupdate.UpdateUnit;
55	import org.netbeans.api.autoupdate.UpdateUnitProvider;	54	import org.netbeans.api.autoupdate.UpdateUnitProvider;
56	import org.netbeans.api.autoupdate.UpdateUnitProviderFactory;	55	import org.netbeans.api.autoupdate.UpdateUnitProviderFactory;
		56	import org.openide.filesystems.FileUtil;
57	import org.openide.modules.ModuleInstall;	57	import org.openide.modules.ModuleInstall;
58	import org.openide.util.NbPreferences;	58	import org.openide.util.NbPreferences;
59	import org.openide.util.RequestProcessor;	59	import org.openide.util.RequestProcessor;
Lines 190-207 Link Here
190	String user = System.getProperty ("netbeans.user"); // NOI18N	190	String user = System.getProperty ("netbeans.user"); // NOI18N
191	File userDir = null;	191	File userDir = null;
192	if (user != null) {	192	if (user != null) {
193	userDir = new File (user);	193	userDir = FileUtil.normalizeFile(new File(user));
194	if (userDir.getPath ().startsWith ("\\\\")) { // NOI18N
195	// Do not use URI.normalize for UNC paths because of http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4723726 (URI.normalize() ruins URI built from UNC File)
196	try {
197	userDir = userDir.getCanonicalFile ();
198	} catch (IOException ex) {
199	// fallback when getCanonicalFile fails
200	userDir = userDir.getAbsoluteFile ();
201	}
202	} else {
203	userDir = new File (userDir.toURI ().normalize ()).getAbsoluteFile ();
204	}
205	}	194	}
206		195
207	return userDir;	196	return userDir;

Lines 61-66 Link Here

(-)a/core.startup/test/unit/src/org/netbeans/core/startup/layers/ArchiveURLMapperTest.java (-6 / +7 lines)
61	import org.netbeans.junit.RandomlyFails;	61	import org.netbeans.junit.RandomlyFails;
62	import org.openide.filesystems.FileUtil;	62	import org.openide.filesystems.FileUtil;
63	import org.openide.filesystems.JarFileSystem;	63	import org.openide.filesystems.JarFileSystem;
		64	import org.openide.util.Utilities;
64	import org.openide.util.test.TestFileUtils;	65	import org.openide.util.test.TestFileUtils;
65		66
66	/**	67	/**
Lines 95-101 Link Here
95	out.putNextEntry(entry);	96	out.putNextEntry(entry);
96	out.write (RESOURCE.getBytes());	97	out.write (RESOURCE.getBytes());
97	out.close();	98	out.close();
98	return jarFile.toURI().toURL();	99	return Utilities.toURI(jarFile).toURL();
99	}	100	}
100		101
101	public void testURLMapper () throws Exception {	102	public void testURLMapper () throws Exception {
Lines 132-138 Link Here
132	assertTrue ("".equals(rootFo.getPath()));	133	assertTrue ("".equals(rootFo.getPath()));
133	assertTrue (rootFo.getFileSystem() instanceof JarFileSystem);	134	assertTrue (rootFo.getFileSystem() instanceof JarFileSystem);
134	File jarFile = ((JarFileSystem)rootFo.getFileSystem()).getJarFile();	135	File jarFile = ((JarFileSystem)rootFo.getFileSystem()).getJarFile();
135	assertTrue (jarFileURL.equals(jarFile.toURI().toURL()));	136	assertTrue (jarFileURL.equals(Utilities.toURI(jarFile).toURL()));
136	}	137	}
137		138
138	public void testFunnyZipEntryNames() throws Exception { // #181671	139	public void testFunnyZipEntryNames() throws Exception { // #181671
Lines 145-151 Link Here
145	jos.write("content".getBytes());	146	jos.write("content".getBytes());
146	jos.close();	147	jos.close();
147		148
148	FileObject docxFO = URLMapper.findFileObject(docx.toURI().toURL());	149	FileObject docxFO = URLMapper.findFileObject(Utilities.toURI(docx).toURL());
149	assertNotNull(docxFO);	150	assertNotNull(docxFO);
150	assertTrue(FileUtil.isArchiveFile(docxFO));	151	assertTrue(FileUtil.isArchiveFile(docxFO));
151		152
Lines 182-188 Link Here
182	jos.putNextEntry(entry);	183	jos.putNextEntry(entry);
183	jos.write(baos.toByteArray());	184	jos.write(baos.toByteArray());
184	jos.close();	185	jos.close();
185	FileObject metaJarFO = URLMapper.findFileObject(metaJar.toURI().toURL());	186	FileObject metaJarFO = URLMapper.findFileObject(Utilities.toURI(metaJar).toURL());
186	assertNotNull(metaJarFO);	187	assertNotNull(metaJarFO);
187	assertTrue(FileUtil.isArchiveFile(metaJarFO));	188	assertTrue(FileUtil.isArchiveFile(metaJarFO));
188	FileObject metaRoot = FileUtil.getArchiveRoot(metaJarFO);	189	FileObject metaRoot = FileUtil.getArchiveRoot(metaJarFO);
Lines 253-266 Link Here
253	JarOutputStream jos = new JarOutputStream(new FileOutputStream(jar));	254	JarOutputStream jos = new JarOutputStream(new FileOutputStream(jar));
254	jos.putNextEntry(new ZipEntry("has spaces"));	255	jos.putNextEntry(new ZipEntry("has spaces"));
255	jos.close();	256	jos.close();
256	URL source = new URL("jar:" + jar.toURI().toURL() + "!/has%20spaces");	257	URL source = new URL("jar:" + Utilities.toURI(jar).toURL() + "!/has%20spaces");
257	source.toURI();	258	source.toURI();
258	FileObject file = URLMapper.findFileObject(source);	259	FileObject file = URLMapper.findFileObject(source);
259	assertNotNull(file);	260	assertNotNull(file);
260	assertEquals(source, URLMapper.findURL(file, URLMapper.INTERNAL));	261	assertEquals(source, URLMapper.findURL(file, URLMapper.INTERNAL));
261	assertEquals(0, source.openConnection().getContentLength());	262	assertEquals(0, source.openConnection().getContentLength());
262	ProxyURLStreamHandlerFactory.register();	263	ProxyURLStreamHandlerFactory.register();
263	assertEquals(0, new URL("jar:" + jar.toURI().toURL() + "!/has%20spaces").openConnection().getContentLength());	264	assertEquals(0, new URL("jar:" + Utilities.toURI(jar).toURL() + "!/has%20spaces").openConnection().getContentLength());
264	}	265	}
265		266
266	}	267	}

Lines 69-74 Link Here

(-)a/java.api.common/src/org/netbeans/modules/java/api/common/classpath/SourcePathImplementation.java (-3 / +3 lines)
69	import org.openide.filesystems.FileRenameEvent;	69	import org.openide.filesystems.FileRenameEvent;
70	import org.openide.filesystems.FileUtil;	70	import org.openide.filesystems.FileUtil;
71	import org.openide.util.Exceptions;	71	import org.openide.util.Exceptions;
		72	import org.openide.util.Utilities;
72	import org.openide.util.WeakListeners;	73	import org.openide.util.WeakListeners;
73		74
74	/**	75	/**
Lines 146-153 Link Here
146	if (matcher == null) {	147	if (matcher == null) {
147	matcher = new PathMatcher(	148	matcher = new PathMatcher(
148	evaluator.getProperty(ProjectProperties.INCLUDES),	149	evaluator.getProperty(ProjectProperties.INCLUDES),
149	evaluator.getProperty(ProjectProperties.EXCLUDES),	150	evaluator.getProperty(ProjectProperties.EXCLUDES), Utilities.toFile(URI.create(root.toExternalForm())));
150	new File(URI.create(root.toExternalForm())));
151	}	151	}
152	return matcher.matches(resource, true);	152	return matcher.matches(resource, true);
153	}	153	}
Lines 192-198 Link Here
192	if (root.equals(apSourcesDir)) {	192	if (root.equals(apSourcesDir)) {
193	continue;	193	continue;
194	}	194	}
195	result.add(ClassPathSupport.createResource(root.toURI().toURL()));	195	result.add(ClassPathSupport.createResource(Utilities.toURI(root).toURL()));
196	}	196	}
197	}	197	}
198	}	198	}

Lines 71-76 Link Here

(-)a/java.j2seproject/test/unit/src/org/netbeans/modules/java/j2seproject/classpath/SourcePathImplementationTest.java (-2 / +3 lines)
71	import org.netbeans.modules.java.j2seproject.J2SEProjectGenerator;	71	import org.netbeans.modules.java.j2seproject.J2SEProjectGenerator;
72	import org.netbeans.modules.java.j2seproject.SourceRootsTest;	72	import org.netbeans.modules.java.j2seproject.SourceRootsTest;
73	import org.openide.util.Mutex;	73	import org.openide.util.Mutex;
		74	import org.openide.util.Utilities;
74	import org.openide.util.test.MockLookup;	75	import org.openide.util.test.MockLookup;
75		76
76	public class SourcePathImplementationTest extends NbTestCase {	77	public class SourcePathImplementationTest extends NbTestCase {
Lines 175-186 Link Here
175	src2.mkdir();	176	src2.mkdir();
176	AntProjectHelper h = J2SEProjectGenerator.createProject(new File(getWorkDir(), "prj"), "test", new File[] {src1, src2}, new File[0], null, null, null);	177	AntProjectHelper h = J2SEProjectGenerator.createProject(new File(getWorkDir(), "prj"), "test", new File[] {src1, src2}, new File[0], null, null, null);
177	Project p = ProjectManager.getDefault().findProject(h.getProjectDirectory());	178	Project p = ProjectManager.getDefault().findProject(h.getProjectDirectory());
178	FileOwnerQuery.markExternalOwner(src1.toURI(), p, FileOwnerQuery.EXTERNAL_ALGORITHM_TRANSIENT);	179	FileOwnerQuery.markExternalOwner(Utilities.toURI(src1), p, FileOwnerQuery.EXTERNAL_ALGORITHM_TRANSIENT);
179	ClassPath cp = ClassPath.getClassPath(FileUtil.toFileObject(src1), ClassPath.SOURCE);	180	ClassPath cp = ClassPath.getClassPath(FileUtil.toFileObject(src1), ClassPath.SOURCE);
180	assertNotNull(cp);	181	assertNotNull(cp);
181	assertEquals(2, cp.getRoots().length);	182	assertEquals(2, cp.getRoots().length);
182	ClassPath.Entry cpe2 = cp.entries().get(1);	183	ClassPath.Entry cpe2 = cp.entries().get(1);
183	assertEquals(src2.toURI().toURL(), cpe2.getURL());	184	assertEquals(Utilities.toURI(src2).toURL(), cpe2.getURL());
184	assertTrue(cpe2.includes("stuff/"));	185	assertTrue(cpe2.includes("stuff/"));
185	assertTrue(cpe2.includes("whatever/"));	186	assertTrue(cpe2.includes("whatever/"));
186	class L implements PropertyChangeListener {	187	class L implements PropertyChangeListener {

Lines 64-69 Link Here

(-)a/java.project/test/unit/src/org/netbeans/modules/java/project/JavaAntLoggerTest.java (-2 / +3 lines)
64	import org.openide.filesystems.FileUtil;	64	import org.openide.filesystems.FileUtil;
65	import org.openide.modules.InstalledFileLocator;	65	import org.openide.modules.InstalledFileLocator;
66	import org.openide.util.Lookup;	66	import org.openide.util.Lookup;
		67	import org.openide.util.Utilities;
67	import org.openide.util.test.MockLookup;	68	import org.openide.util.test.MockLookup;
68	import org.openide.windows.IOProvider;	69	import org.openide.windows.IOProvider;
69	import org.openide.windows.InputOutput;	70	import org.openide.windows.InputOutput;
Lines 148-155 Link Here
148	private FileObject src, testSrc;	149	private FileObject src, testSrc;
149		150
150	public void setSimpleAppDir(File simpleAppDir) throws Exception {	151	public void setSimpleAppDir(File simpleAppDir) throws Exception {
151	buildClasses = slashify(new File(simpleAppDir, "build" + File.separatorChar + "classes").toURI().toURL());	152	buildClasses = slashify(Utilities.toURI(new File(simpleAppDir, "build" + File.separatorChar + "classes")).toURL());
152	buildTestClasses = slashify(new File(simpleAppDir, "build" + File.separatorChar + "test" + File.separatorChar + "classes").toURI().toURL());	153	buildTestClasses = slashify(Utilities.toURI(new File(simpleAppDir, "build" + File.separatorChar + "test" + File.separatorChar + "classes")).toURL());
153	src = FileUtil.toFileObject(new File(simpleAppDir, "src"));	154	src = FileUtil.toFileObject(new File(simpleAppDir, "src"));
154	testSrc = FileUtil.toFileObject(new File(simpleAppDir, "test"));	155	testSrc = FileUtil.toFileObject(new File(simpleAppDir, "test"));
155	}	156	}

Lines 80-85 Link Here

(-)a/java.source/src/org/netbeans/modules/java/JavaNode.java (-2 / +3 lines)
80	import static org.openide.util.ImageUtilities.assignToolTipToImage;	80	import static org.openide.util.ImageUtilities.assignToolTipToImage;
81	import static org.openide.util.ImageUtilities.loadImage;	81	import static org.openide.util.ImageUtilities.loadImage;
82	import static org.openide.util.NbBundle.getMessage;	82	import static org.openide.util.NbBundle.getMessage;
		83	import org.openide.util.Utilities;
83		84
84	/**	85	/**
85	* The node representation of Java source files.	86	* The node representation of Java source files.
Lines 262-273 Link Here
262	URL u = entry.getURL();	263	URL u = entry.getURL();
263	String item = u.toExternalForm(); // fallback	264	String item = u.toExternalForm(); // fallback
264	if (u.getProtocol().equals("file")) { // NOI18N	265	if (u.getProtocol().equals("file")) { // NOI18N
265	item = new File(URI.create(item)).getAbsolutePath();	266	item = Utilities.toFile(URI.create(item)).getAbsolutePath();
266	} else if (u.getProtocol().equals("jar") && item.endsWith("!/")) { // NOI18N	267	} else if (u.getProtocol().equals("jar") && item.endsWith("!/")) { // NOI18N
267	URL embedded = FileUtil.getArchiveFile(u);	268	URL embedded = FileUtil.getArchiveFile(u);
268	assert embedded != null : u;	269	assert embedded != null : u;
269	if (embedded.getProtocol().equals("file")) { // NOI18N	270	if (embedded.getProtocol().equals("file")) { // NOI18N
270	item = new File(URI.create(embedded.toExternalForm())).getAbsolutePath();	271	item = Utilities.toFile(URI.create(embedded.toExternalForm())).getAbsolutePath();
271	}	272	}
272	}	273	}
273	if (sb.length() > 0) {	274	if (sb.length() > 0) {

Lines 703-709 Link Here

(-)a/java.source/src/org/netbeans/modules/java/source/parsing/FileObjects.java (-4 / +4 lines)
703	* @return the relative path	703	* @return the relative path
704	*/	704	*/
705	public static @NonNull String getRelativePath (@NonNull final URL root, @NonNull final URL fo) throws URISyntaxException {	705	public static @NonNull String getRelativePath (@NonNull final URL root, @NonNull final URL fo) throws URISyntaxException {
706	final String path = getRelativePath(new File(root.toURI()), new File(fo.toURI()));	706	final String path = getRelativePath(Utilities.toFile(root.toURI()), Utilities.toFile(fo.toURI()));
707	return path.replace(File.separatorChar, '/'); //NOI18N	707	return path.replace(File.separatorChar, '/'); //NOI18N
708	}	708	}
709		709
Lines 953-959 Link Here
953	@Override	953	@Override
954	public URI toUri () {	954	public URI toUri () {
955	if (this.uriCache == null) {	955	if (this.uriCache == null) {
956	this.uriCache = f.toURI();	956	this.uriCache = Utilities.toURI(f);
957	}	957	}
958	return this.uriCache;	958	return this.uriCache;
959	}	959	}
Lines 1283-1289 Link Here
1283		1283
1284	@Override	1284	@Override
1285	public URI getArchiveURI () {	1285	public URI getArchiveURI () {
1286	return this.archiveFile.toURI();	1286	return Utilities.toURI(this.archiveFile);
1287	}	1287	}
1288		1288
1289	@Override	1289	@Override
Lines 1361-1367 Link Here
1361		1361
1362	@Override	1362	@Override
1363	public URI getArchiveURI () {	1363	public URI getArchiveURI () {
1364	return new File (this.zipFile.getName()).toURI();	1364	return Utilities.toURI(new File (this.zipFile.getName()));
1365	}	1365	}
1366		1366
1367	@Override	1367	@Override

Lines 56-61 Link Here

(-)a/java.source/test/unit/src/org/netbeans/modules/java/source/parsing/FileManagerTest.java (-4 / +5 lines)
56	import javax.tools.StandardLocation;	56	import javax.tools.StandardLocation;
57	import org.netbeans.junit.NbTestCase;	57	import org.netbeans.junit.NbTestCase;
58	import org.netbeans.modules.java.source.TestUtil;	58	import org.netbeans.modules.java.source.TestUtil;
		59	import org.openide.util.Utilities;
59		60
60	/** Base class for testing file managers. This class basically tests itself.	61	/** Base class for testing file managers. This class basically tests itself.
61	*	62	*
Lines 97-106 Link Here
97	// Create archive provider	98	// Create archive provider
98	archiveProvider = CachingArchiveProvider.getDefault();	99	archiveProvider = CachingArchiveProvider.getDefault();
99		100
100	rtJarArchive = archiveProvider.getArchive(rtFile.toURI().toURL(), true);	101	rtJarArchive = archiveProvider.getArchive(Utilities.toURI(rtFile).toURL(), true);
101	rtFolderArchive = archiveProvider.getArchive(rtFolder.toURI().toURL(), true);	102	rtFolderArchive = archiveProvider.getArchive(Utilities.toURI(rtFolder).toURL(), true);
102	srcZipArchive = archiveProvider.getArchive(srcFile.toURI().toURL(), true);	103	srcZipArchive = archiveProvider.getArchive(Utilities.toURI(srcFile).toURL(), true);
103	srcFolderArchive = archiveProvider.getArchive(srcFolder.toURI().toURL(), true);	104	srcFolderArchive = archiveProvider.getArchive(Utilities.toURI(srcFolder).toURL(), true);
104	}	105	}
105		106
106	protected JavaFileManagerDescripton[] getDescriptions() throws IOException {	107	protected JavaFileManagerDescripton[] getDescriptions() throws IOException {

Lines 47-53 Link Here

(-)a/masterfs/src/org/netbeans/modules/masterfs/filebasedfs/FileBasedURLMapper.java (-44 / +5 lines)
47	import java.net.URISyntaxException;	47	import java.net.URISyntaxException;
48	import org.netbeans.modules.masterfs.filebasedfs.fileobjects.BaseFileObj;	48	import org.netbeans.modules.masterfs.filebasedfs.fileobjects.BaseFileObj;
49	import org.openide.filesystems.FileObject;	49	import org.openide.filesystems.FileObject;
50	import org.openide.filesystems.FileUtil;
51	import org.openide.filesystems.URLMapper;	50	import org.openide.filesystems.URLMapper;
52		51
53	import java.io.File;	52	import java.io.File;
Lines 58-95 Link Here
58	import java.util.logging.Logger;	57	import java.util.logging.Logger;
59	import org.netbeans.modules.masterfs.filebasedfs.fileobjects.FileObjectFactory;	58	import org.netbeans.modules.masterfs.filebasedfs.fileobjects.FileObjectFactory;
60	import org.netbeans.modules.masterfs.filebasedfs.fileobjects.RootObj;	59	import org.netbeans.modules.masterfs.filebasedfs.fileobjects.RootObj;
61	import org.openide.util.Exceptions;	60	import org.openide.util.Utilities;
62
63	//TODO: JDK problems with URL, URI, File conversion for UNC
64	/*
65	There must be consistently called conversion from FileUtil and URLMapper.
66	new File (URI.create (fo.getURL ().toExternalForm ())) is typical scenario that leads to this
67	bug: java.lang.IllegalArgumentException: URI has an authority component
68	at java.io.File.<init>(File.java:326)
69
70
71	Maybe there would be also possible to return a little special URL from FileBasedURLMapper that
72	would get special subclass of URLStreamHandler in constructor. This subclass of URLStreamHandler
73	would provided external form (method toExternalForm) that would be suitable for above mentioned
74	conversion from URL to File.
75
76	Known problems :
77	1/ at java.io.File.<init>(File.java:326)
78	at org.netbeans.modules.javacore.parser.ASTProvider.getClassPath(ASTProvider.java:477)
79	at org.netbeans.lib.gjast.ASParser$BridgeContext.getClassPath(ASParser.java:421)
80
81	2/
82	at java.io.File.<init>(File.java:326)
83	at org.netbeans.modules.javacore.scanning.FileScanner.<init>(FileScanner.java:85)
84	catch] at org.netbeans.modules.javacore.JMManager.scanFiles(JMManager.java:1112)
85
86	3/ org.netbeans.modules.javacore.parser.ECRequestDescImpl.getFileName(FileObject fo,StringBuffer buf)
87	at java.io.File.<init>(File.java:326)
88
89
90
91
92	*/
93		61
94	public final class FileBasedURLMapper extends URLMapper {	62	public final class FileBasedURLMapper extends URLMapper {
95	private static final Logger LOG = Logger.getLogger(FileBasedURLMapper.class.getName());	63	private static final Logger LOG = Logger.getLogger(FileBasedURLMapper.class.getName());
Lines 126-132 Link Here
126	FileObject retVal = null;	94	FileObject retVal = null;
127	File file;	95	File file;
128	try {	96	try {
129	file = FileUtil.normalizeFile(url2F(url));	97	file = Utilities.toFile(url.toURI());
130	} catch (URISyntaxException e) {	98	} catch (URISyntaxException e) {
131	LOG.log(Level.INFO, "URL=" + url, e); // NOI18N	99	LOG.log(Level.INFO, "URL=" + url, e); // NOI18N
132	return null;	100	return null;
Lines 155-161 Link Here
155		123
156	/** #171330 - Method taken from java.io.File.toURI. We know whether given	124	/** #171330 - Method taken from java.io.File.toURI. We know whether given
157	* FileObject is a file or folder, so we can eliminate File.isDirectory	125	* FileObject is a file or folder, so we can eliminate File.isDirectory
158	* disk touch which is needed in file.toURI(). */	126	* disk touch which is needed in file.toURI().
		127	* @see Utilities#toURI
		128	*/
159	private static URI toURI(final File file, boolean isDirectory) {	129	private static URI toURI(final File file, boolean isDirectory) {
160	return toURI(file.getAbsolutePath(), isDirectory, File.separatorChar);	130	return toURI(file.getAbsolutePath(), isDirectory, File.separatorChar);
161	}	131	}
Lines 182-194 Link Here
182	return p;	152	return p;
183	}	153	}
184		154
185	static File url2F(final URL url) throws URISyntaxException {
186	File file;
187	if (url.getHost() == null \|\| url.getHost().length() == 0) {
188	file = new File(url.toURI());
189	} else {
190	file = new File("\\\\" + url.getHost() + url.getPath().replace('/', '\\')); // NOI18N
191	}
192	return file;
193	}
194	}	155	}

Lines 85-90 Link Here

(-)a/maven/src/org/netbeans/modules/maven/classpath/MavenSourcesImpl.java (-4 / +5 lines)
85	import static org.netbeans.modules.maven.classpath.Bundle.*;	85	import static org.netbeans.modules.maven.classpath.Bundle.*;
86	import org.netbeans.spi.project.ProjectServiceProvider;	86	import org.netbeans.spi.project.ProjectServiceProvider;
87	import org.openide.util.NbBundle.Messages;	87	import org.openide.util.NbBundle.Messages;
		88	import org.openide.util.Utilities;
88		89
89	/**	90	/**
90	* Implementation of Sources interface for maven projects.	91	* Implementation of Sources interface for maven projects.
Lines 240-246 Link Here
240	}	241	}
241	}	242	}
242	if (create && existing.isEmpty()) {	243	if (create && existing.isEmpty()) {
243	File root = new File(virtuals.get(0));	244	File root = Utilities.toFile(virtuals.get(0));
244	FileObject fo=null;	245	FileObject fo=null;
245	try {	246	try {
246	fo = FileUtil.createFolder(root);	247	fo = FileUtil.createFolder(root);
Lines 265-271 Link Here
265	private boolean checkSourceGroupCache(@NullAllowed File rootF, String name, String displayName, Map<String, SourceGroup> groups, NbMavenProject watcher) {	266	private boolean checkSourceGroupCache(@NullAllowed File rootF, String name, String displayName, Map<String, SourceGroup> groups, NbMavenProject watcher) {
266	FileObject root;	267	FileObject root;
267	if (rootF != null) {	268	if (rootF != null) {
268	watcher.addWatchedPath(rootF.toURI());	269	watcher.addWatchedPath(Utilities.toURI(rootF));
269	root = FileUtil.toFileObject(rootF);	270	root = FileUtil.toFileObject(rootF);
270	} else {	271	} else {
271	root = null;	272	root = null;
Lines 299-305 Link Here
299	List<File> checked = new ArrayList<File>();	300	List<File> checked = new ArrayList<File>();
300	for (boolean test : new boolean[] {false, true}) {	301	for (boolean test : new boolean[] {false, true}) {
301	for (URI u : project().getGeneratedSourceRoots(test)) {	302	for (URI u : project().getGeneratedSourceRoots(test)) {
302	File file = FileUtil.normalizeFile(new File(u));	303	File file = FileUtil.normalizeFile(Utilities.toFile(u));
303	FileObject folder = FileUtil.toFileObject(file);	304	FileObject folder = FileUtil.toFileObject(file);
304	changed \|= checkGeneratedGroupCache(folder, file, file.getName(), test);	305	changed \|= checkGeneratedGroupCache(folder, file, file.getName(), test);
305	checked.add(file);	306	checked.add(file);
Lines 357-363 Link Here
357	URI[] res = project().getResources(test);	358	URI[] res = project().getResources(test);
358	Set<File> resources = new HashSet<File>();	359	Set<File> resources = new HashSet<File>();
359	for (URI ur : res) {	360	for (URI ur : res) {
360	resources.add(new File(ur));	361	resources.add(Utilities.toFile(ur));
361	}	362	}
362		363
363	for (File f : roots) {	364	for (File f : roots) {

Lines 50-55 Link Here

(-)a/maven/src/org/netbeans/modules/maven/classpath/PackagedClassPathImpl.java (-2 / +3 lines)
50	import org.apache.maven.model.Dependency;	50	import org.apache.maven.model.Dependency;
51	import org.netbeans.modules.maven.NbMavenProjectImpl;	51	import org.netbeans.modules.maven.NbMavenProjectImpl;
52	import org.openide.filesystems.FileUtil;	52	import org.openide.filesystems.FileUtil;
		53	import org.openide.util.Utilities;
53		54
54	/**	55	/**
55	*	56	*
Lines 83-96 Link Here
83	if (art.getClassifier() != null) {	84	if (art.getClassifier() != null) {
84	assemblies.add(0, fil);	85	assemblies.add(0, fil);
85	} else {	86	} else {
86	lst.add(fil.toURI());	87	lst.add(Utilities.toURI(fil));
87	}	88	}
88	} else {	89	} else {
89	//NOPMD //null means dependencies were not resolved..	90	//NOPMD //null means dependencies were not resolved..
90	}	91	}
91	}	92	}
92	for (File ass : assemblies) {	93	for (File ass : assemblies) {
93	lst.add(ass.toURI());	94	lst.add(Utilities.toURI(ass));
94	}	95	}
95	URI[] uris = new URI[lst.size()];	96	URI[] uris = new URI[lst.size()];
96	uris = lst.toArray(uris);	97	uris = lst.toArray(uris);

Lines 51-56 Link Here

(-)a/maven/src/org/netbeans/modules/maven/classpath/RuntimeClassPathImpl.java (-2 / +3 lines)
51	import org.apache.maven.project.MavenProject;	51	import org.apache.maven.project.MavenProject;
52	import org.netbeans.modules.maven.NbMavenProjectImpl;	52	import org.netbeans.modules.maven.NbMavenProjectImpl;
53	import org.openide.filesystems.FileUtil;	53	import org.openide.filesystems.FileUtil;
		54	import org.openide.util.Utilities;
54		55
55	/**	56	/**
56	* class path def for runtime..	57	* class path def for runtime..
Lines 81-94 Link Here
81	if (outputDirectory != null) {	82	if (outputDirectory != null) {
82	File fil = new File(outputDirectory);	83	File fil = new File(outputDirectory);
83	fil = FileUtil.normalizeFile(fil);	84	fil = FileUtil.normalizeFile(fil);
84	lst.add(fil.toURI());	85	lst.add(Utilities.toURI(fil));
85	}	86	}
86	}	87	}
87	List<Artifact> arts = prj.getRuntimeArtifacts();	88	List<Artifact> arts = prj.getRuntimeArtifacts();
88	for (Artifact art : arts) {	89	for (Artifact art : arts) {
89	if (art.getFile() != null) {	90	if (art.getFile() != null) {
90	File fil = FileUtil.normalizeFile(art.getFile());	91	File fil = FileUtil.normalizeFile(art.getFile());
91	lst.add(fil.toURI());	92	lst.add(Utilities.toURI(fil));
92	} else {	93	} else {
93	//NOPMD //null means dependencies were not resolved..	94	//NOPMD //null means dependencies were not resolved..
94	}	95	}

Lines 86-91 Link Here

(-)a/maven/src/org/netbeans/modules/maven/newproject/CatalogRepoProvider.java (-2 / +3 lines)
86	import org.netbeans.modules.maven.indexer.api.RepositoryPreferences;	86	import org.netbeans.modules.maven.indexer.api.RepositoryPreferences;
87	import org.openide.modules.Places;	87	import org.openide.modules.Places;
88	import org.openide.util.NbCollections;	88	import org.openide.util.NbCollections;
		89	import org.openide.util.Utilities;
89	import org.openide.util.lookup.ServiceProvider;	90	import org.openide.util.lookup.ServiceProvider;
90		91
91	/**	92	/**
Lines 167-173 Link Here
167		168
168	@Override protected URL file() throws IOException {	169	@Override protected URL file() throws IOException {
169	File f = new File(RepositorySystem.userMavenConfigurationHome, "archetype-catalog.xml"); //NOI18N	170	File f = new File(RepositorySystem.userMavenConfigurationHome, "archetype-catalog.xml"); //NOI18N
170	return f.isFile() ? f.toURI().toURL() : null;	171	return f.isFile() ? Utilities.toURI(f).toURL() : null;
171	}	172	}
172		173
173	@Override protected String repository() {	174	@Override protected String repository() {
Lines 210-216 Link Here
210		211
211	if (catalog.exists()) {	212	if (catalog.exists()) {
212	try {	213	try {
213	toRet.addAll(CatalogRepoProvider.getArchetypes(catalog.toURI().toURL(), info.getRepositoryUrl()));	214	toRet.addAll(CatalogRepoProvider.getArchetypes(Utilities.toURI(catalog).toURL(), info.getRepositoryUrl()));
214	} catch (MalformedURLException ex) {	215	} catch (MalformedURLException ex) {
215	LOG.log(Level.INFO, null, ex);	216	LOG.log(Level.INFO, null, ex);
216	}	217	}

Lines 165-171 Link Here

(-)a/o.n.bootstrap/src/org/netbeans/JarClassLoader.java (-13 / +5 lines)
165	}	165	}
166		166
167	final void addURL(URL location) throws IOException, URISyntaxException {	167	final void addURL(URL location) throws IOException, URISyntaxException {
168	File f = new File(location.toURI());	168	File f = Utilities.toFile(location.toURI());
169	assert f.exists() : "URL must be existing local file: " + location;	169	assert f.exists() : "URL must be existing local file: " + location;
170		170
171	List<Source> arr = new ArrayList<Source>(Arrays.asList(sources));	171	List<Source> arr = new ArrayList<Source>(Arrays.asList(sources));
Lines 464-470 Link Here
464	return this;	464	return this;
465	}	465	}
466	}	466	}
467	return "jar:" + new VFile().toURI() + "!/"; // NOI18N	467	return "jar:" + Utilities.toURI(new VFile()) + "!/"; // NOI18N
468	}	468	}
469		469
470	@Override	470	@Override
Lines 813-819 Link Here
813	File dir;	813	File dir;
814		814
815	DirSource(File file) throws MalformedURLException {	815	DirSource(File file) throws MalformedURLException {
816	super(file.toURI().toURL());	816	super(Utilities.toURI(file).toURL());
817	dir = file;	817	dir = file;
818	}	818	}
819		819
Lines 823-829 Link Here
823		823
824	protected URL doGetResource(String name) throws MalformedURLException {	824	protected URL doGetResource(String name) throws MalformedURLException {
825	File resFile = new File(dir, name);	825	File resFile = new File(dir, name);
826	return resFile.exists() ? resFile.toURI().toURL() : null;	826	return resFile.exists() ? Utilities.toURI(resFile).toURL() : null;
827	}	827	}
828		828
829	protected byte[] readClass(String path) throws IOException {	829	protected byte[] readClass(String path) throws IOException {
Lines 946-952 Link Here
946	AGAIN: for (;;) try {	946	AGAIN: for (;;) try {
947	final URI uri = new URI(filePath);	947	final URI uri = new URI(filePath);
948	if (uri.getScheme().equals("file")) {	948	if (uri.getScheme().equals("file")) {
949	jar = uri2File(uri).getPath();	949	jar = Utilities.toFile(uri).getPath();
950	} else {	950	} else {
951	jar = null;	951	jar = null;
952	}	952	}
Lines 981-994 Link Here
981	return new NbJarURLConnection (u, _src, _name, loader);	981	return new NbJarURLConnection (u, _src, _name, loader);
982	}	982	}
983		983
984	static File uri2File(URI uri) { // #207060: UNC; candidate for API (#46813)
985	if (uri.getHost() == null) {
986	return new File(uri);
987	} else {
988	return new File("\\\\" + uri.getHost() + uri.getPath().replace('/', '\\'));
989	}
990	}
991
992	@Override	984	@Override
993	protected void parseURL(URL u, String spec, int start, int limit) {	985	protected void parseURL(URL u, String spec, int start, int limit) {
994	if (spec.startsWith("/")) {	986	if (spec.startsWith("/")) {

Lines 50-55 Link Here

(-)a/o.n.bootstrap/test/unit/src/org/netbeans/JarURLStreamHandlerTest.java (-2 / +3 lines)
50	import java.util.jar.JarOutputStream;	50	import java.util.jar.JarOutputStream;
51	import java.util.zip.ZipEntry;	51	import java.util.zip.ZipEntry;
52	import org.netbeans.junit.NbTestCase;	52	import org.netbeans.junit.NbTestCase;
		53	import org.openide.util.Utilities;
53		54
54	/**	55	/**
55	*	56	*
Lines 83-96 Link Here
83	}	84	}
84		85
85	public void testNormalHandler() throws Exception {	86	public void testNormalHandler() throws Exception {
86	URL root = new URL("jar:" + jar.toURI() + "!/");	87	URL root = new URL("jar:" + Utilities.toURI(jar) + "!/");
87	URL plain = new URL(root, "/fldr/plain.txt", ProxyURLStreamHandlerFactory.originalJarHandler());	88	URL plain = new URL(root, "/fldr/plain.txt", ProxyURLStreamHandlerFactory.originalJarHandler());
88	assertTrue("Contains the plain.txt part: " + plain, plain.toExternalForm().contains("fldr/plain.txt"));	89	assertTrue("Contains the plain.txt part: " + plain, plain.toExternalForm().contains("fldr/plain.txt"));
89	assertContent("Ahoj", plain);	90	assertContent("Ahoj", plain);
90	}	91	}
91		92
92	public void testNbHandler() throws Exception {	93	public void testNbHandler() throws Exception {
93	URL root = new URL("jar:" + jar.toURI() + "!/");	94	URL root = new URL("jar:" + Utilities.toURI(jar) + "!/");
94	URL plain = new URL(root, "/fldr/plain.txt", new JarClassLoader.JarURLStreamHandler(null));	95	URL plain = new URL(root, "/fldr/plain.txt", new JarClassLoader.JarURLStreamHandler(null));
95	assertTrue("Contains the plain.txt part: " + plain, plain.toExternalForm().contains("fldr/plain.txt"));	96	assertTrue("Contains the plain.txt part: " + plain, plain.toExternalForm().contains("fldr/plain.txt"));
96	assertContent("Ahoj", plain);	97	assertContent("Ahoj", plain);

Lines 823-830 Link Here

(-)a/o.n.bootstrap/test/unit/src/org/netbeans/ModuleManagerTest.java (-4 / +4 lines)
823	}	823	}
824	ClassLoader l = new URLClassLoader(new URL[] {	824	ClassLoader l = new URLClassLoader(new URL[] {
825	// Order should be irrelevant:	825	// Order should be irrelevant:
826	jar.toURI().toURL(),	826	Utilities.toURI(jar).toURL(),
827	ljar.toURI().toURL(),	827	Utilities.toURI(ljar).toURL(),
828	});	828	});
829	MockModuleInstaller installer = new MockModuleInstaller();	829	MockModuleInstaller installer = new MockModuleInstaller();
830	MockEvents ev = new MockEvents();	830	MockEvents ev = new MockEvents();
Lines 2029-2035 Link Here
2029	File j1 = new File(jars, "simple-module.jar");	2029	File j1 = new File(jars, "simple-module.jar");
2030	File j2 = new File(jars, "depends-on-simple-module.jar");	2030	File j2 = new File(jars, "depends-on-simple-module.jar");
2031	File j3 = new File(jars, "dep-on-two-modules.jar");	2031	File j3 = new File(jars, "dep-on-two-modules.jar");
2032	URLClassLoader l = new URLClassLoader(new URL[] {j1.toURI().toURL(), j2.toURI().toURL()});	2032	URLClassLoader l = new URLClassLoader(new URL[] {Utilities.toURI(j1).toURL(), Utilities.toURI(j2).toURL()});
2033	Manifest mani1, mani2;	2033	Manifest mani1, mani2;
2034	JarFile j = new JarFile(j1);	2034	JarFile j = new JarFile(j1);
2035	try {	2035	try {
Lines 2648-2654 Link Here
2648	assertNotNull(modules);	2648	assertNotNull(modules);
2649	mgr.mutexPrivileged().enterWriteAccess();	2649	mgr.mutexPrivileged().enterWriteAccess();
2650	try {	2650	try {
2651	ClassLoader l = new URLClassLoader(new URL[] {mod1JAR.toURI().toURL(), mod2JAR.toURI().toURL()});	2651	ClassLoader l = new URLClassLoader(new URL[] {Utilities.toURI(mod1JAR).toURL(), Utilities.toURI(mod2JAR).toURL()});
2652	Module mod1 = mgr.createFixed(loadManifest(mod1JAR), null, l);	2652	Module mod1 = mgr.createFixed(loadManifest(mod1JAR), null, l);
2653	mgr.enable(mod1);	2653	mgr.enable(mod1);
2654	assertEquals(l, mod1.getClassLoader());	2654	assertEquals(l, mod1.getClassLoader());

Lines 93-105 Link Here

(-)a/o.n.bootstrap/test/unit/src/org/netbeans/nbexec/NbExecPassesCorrectlyQuotedArgsTest.java (-2 / +2 lines)
93		93
94	private void run(File workDir, String... args) throws Exception {	94	private void run(File workDir, String... args) throws Exception {
95	URL u = Lookup.class.getProtectionDomain().getCodeSource().getLocation();	95	URL u = Lookup.class.getProtectionDomain().getCodeSource().getLocation();
96	File f = new File(u.toURI());	96	File f = Utilities.toFile(u.toURI());
97	assertTrue("file found: " + f, f.exists());	97	assertTrue("file found: " + f, f.exists());
98	File nbexec = Utilities.isWindows() ? new File(f.getParent(), "nbexec.exe") : new File(f.getParent(), "nbexec");	98	File nbexec = Utilities.isWindows() ? new File(f.getParent(), "nbexec.exe") : new File(f.getParent(), "nbexec");
99	assertTrue("nbexec found: " + nbexec, nbexec.exists());	99	assertTrue("nbexec found: " + nbexec, nbexec.exists());
100		100
101	URL tu = MainCallback.class.getProtectionDomain().getCodeSource().getLocation();	101	URL tu = MainCallback.class.getProtectionDomain().getCodeSource().getLocation();
102	File testf = new File(tu.toURI());	102	File testf = Utilities.toFile(tu.toURI());
103	assertTrue("file found: " + testf, testf.exists());	103	assertTrue("file found: " + testf, testf.exists());
104		104
105	LinkedList<String> allArgs = new LinkedList<String>(Arrays.asList(args));	105	LinkedList<String> allArgs = new LinkedList<String>(Arrays.asList(args));

Lines 1008-1014 Link Here

(-)a/openide.filesystems/src/org/openide/filesystems/FileUtil.java (-22 / +8 lines)
1008	}	1008	}
1009		1009
1010	if ((fileURL != null) && "file".equals(fileURL.getProtocol())) {	1010	if ((fileURL != null) && "file".equals(fileURL.getProtocol())) {
1011	retVal = new File(URI.create(fileURL.toExternalForm()));	1011	retVal = Utilities.toFile(URI.create(fileURL.toExternalForm()));
1012	}	1012	}
1013	if (retVal != null) {	1013	if (retVal != null) {
1014	retVal = normalizeFile(retVal);	1014	retVal = normalizeFile(retVal);
Lines 1061-1073 Link Here
1061		1061
1062	FileObject retVal = null;	1062	FileObject retVal = null;
1063	try {	1063	try {
1064	URL url = file.toURI().toURL();	1064	URL url = Utilities.toURI(file).toURL();
1065
1066	if ((url.getAuthority() != null) &&
1067	(Utilities.isWindows() \|\| (Utilities.getOperatingSystem() == Utilities.OS_OS2))) {
1068	return null;
1069	}
1070
1071	retVal = URLMapper.findFileObject(url);	1065	retVal = URLMapper.findFileObject(url);
1072		1066
1073	/probably temporary piece of code to catch the cause of #46630/	1067	/probably temporary piece of code to catch the cause of #46630/
Lines 1111-1125 Link Here
1111	}	1105	}
1112		1106
1113	try {	1107	try {
1114	URL url = (file.toURI().toURL());	1108	URL url = (Utilities.toURI(file).toURL());
1115
1116	if (
1117	(url.getAuthority() != null) &&
1118	(Utilities.isWindows() \|\| (Utilities.getOperatingSystem() == Utilities.OS_OS2))
1119	) {
1120	return null;
1121	}
1122
1123	retVal = URLMapper.findFileObjects(url);	1109	retVal = URLMapper.findFileObjects(url);
1124	} catch (MalformedURLException e) {	1110	} catch (MalformedURLException e) {
1125	retVal = null;	1111	retVal = null;
Lines 1815-1821 Link Here
1815	private static File normalizeFileOnUnixAlike(File file) {	1801	private static File normalizeFileOnUnixAlike(File file) {
1816	// On Unix, do not want to traverse symlinks.	1802	// On Unix, do not want to traverse symlinks.
1817	// URI.normalize removes ../ and ./ sequences nicely.	1803	// URI.normalize removes ../ and ./ sequences nicely.
1818	file = new File(file.toURI().normalize()).getAbsoluteFile();	1804	file = Utilities.toFile(Utilities.toURI(file).normalize()).getAbsoluteFile();
1819	while (file.getAbsolutePath().startsWith("/../")) { // NOI18N	1805	while (file.getAbsolutePath().startsWith("/../")) { // NOI18N
1820	file = new File(file.getAbsolutePath().substring(3));	1806	file = new File(file.getAbsolutePath().substring(3));
1821	}	1807	}
Lines 1831-1837 Link Here
1831		1817
1832	try {	1818	try {
1833	// URI.normalize removes ../ and ./ sequences nicely.	1819	// URI.normalize removes ../ and ./ sequences nicely.
1834	File absoluteFile = new File(file.toURI().normalize());	1820	File absoluteFile = Utilities.toFile(Utilities.toURI(file).normalize());
1835	File canonicalFile = file.getCanonicalFile();	1821	File canonicalFile = file.getCanonicalFile();
1836	String absolutePath = absoluteFile.getAbsolutePath();	1822	String absolutePath = absoluteFile.getAbsolutePath();
1837	if (absolutePath.equals("/..")) { // NOI18N	1823	if (absolutePath.equals("/..")) { // NOI18N
Lines 2162-2168 Link Here
2162	do {	2148	do {
2163	wasDir = entry.isDirectory();	2149	wasDir = entry.isDirectory();
2164	LOG.finest("urlForArchiveOrDir:toURI:entry"); //NOI18N	2150	LOG.finest("urlForArchiveOrDir:toURI:entry"); //NOI18N
2165	u = entry.toURI().toURL();	2151	u = Utilities.toURI(entry).toURL();
2166	isDir = entry.isDirectory();	2152	isDir = entry.isDirectory();
2167	} while (wasDir ^ isDir);	2153	} while (wasDir ^ isDir);
2168	if (isArchiveFile(u) \|\| entry.isFile() && entry.length() < 4) {	2154	if (isArchiveFile(u) \|\| entry.isFile() && entry.length() < 4) {
Lines 2197-2205 Link Here
2197	public static File archiveOrDirForURL(URL entry) {	2183	public static File archiveOrDirForURL(URL entry) {
2198	String u = entry.toString();	2184	String u = entry.toString();
2199	if (u.startsWith("jar:file:") && u.endsWith("!/")) { // NOI18N	2185	if (u.startsWith("jar:file:") && u.endsWith("!/")) { // NOI18N
2200	return new File(URI.create(u.substring(4, u.length() - 2)));	2186	return Utilities.toFile(URI.create(u.substring(4, u.length() - 2)));
2201	} else if (u.startsWith("file:")) { // NOI18N	2187	} else if (u.startsWith("file:")) { // NOI18N
2202	return new File(URI.create(u));	2188	return Utilities.toFile(URI.create(u));
2203	} else {	2189	} else {
2204	return null;	2190	return null;
2205	}	2191	}

Lines 188-199 Link Here

(-)a/openide.filesystems/test/unit/src/org/openide/filesystems/FileUtilTest.java (-3 / +3 lines)
188	}	188	}
189	private void assertCorrectURL(String filename, String expectedURLPrefix, String expectedURLSuffix) throws Exception {	189	private void assertCorrectURL(String filename, String expectedURLPrefix, String expectedURLSuffix) throws Exception {
190	File d = getWorkDir();	190	File d = getWorkDir();
191	assertEquals(expectedURLSuffix == null ? null : new URL(expectedURLPrefix + d.toURI() + expectedURLSuffix),	191	assertEquals(expectedURLSuffix == null ? null : new URL(expectedURLPrefix + Utilities.toURI(d) + expectedURLSuffix),
192	FileUtil.urlForArchiveOrDir(new File(d, filename)));	192	FileUtil.urlForArchiveOrDir(new File(d, filename)));
193	}	193	}
194	private void assertCorrectFile(String expectedFilename, String urlPrefix, String urlSuffix) throws Exception {	194	private void assertCorrectFile(String expectedFilename, String urlPrefix, String urlSuffix) throws Exception {
195	assertEquals(expectedFilename == null ? null : new File(getWorkDir(), expectedFilename),	195	assertEquals(expectedFilename == null ? null : new File(getWorkDir(), expectedFilename),
196	FileUtil.archiveOrDirForURL(new URL(urlPrefix + getWorkDir().toURI() + urlSuffix)));	196	FileUtil.archiveOrDirForURL(new URL(urlPrefix + Utilities.toURI(getWorkDir()) + urlSuffix)));
197	}	197	}
198		198
199	/** Tests translation from jar resource url to jar archive url. */	199	/** Tests translation from jar resource url to jar archive url. */
Lines 262-268 Link Here
262	};	262	};
263	log.addHandler(handler);	263	log.addHandler(handler);
264	try {	264	try {
265	final boolean result = FileUtil.isArchiveFile(testFile.toURI().toURL());	265	final boolean result = FileUtil.isArchiveFile(Utilities.toURI(testFile).toURL());
266	assertTrue("The test.jar should be archive.",result); //NOI18N	266	assertTrue("The test.jar should be archive.",result); //NOI18N
267	} finally {	267	} finally {
268	log.removeHandler(handler);	268	log.removeHandler(handler);

Lines 57-62 Link Here

(-)a/openide.filesystems/test/unit/src/org/openide/filesystems/URLMapperTest.java (-2 / +3 lines)
57	import java.util.zip.CRC32;	57	import java.util.zip.CRC32;
58	import java.util.zip.ZipEntry;	58	import java.util.zip.ZipEntry;
59	import org.netbeans.junit.NbTestCase;	59	import org.netbeans.junit.NbTestCase;
		60	import org.openide.util.Utilities;
60		61
61	/**	62	/**
62	* Test functionality of URLMapper.	63	* Test functionality of URLMapper.
Lines 76-82 Link Here
76	lfs.setRootDirectory(getWorkDir());	77	lfs.setRootDirectory(getWorkDir());
77	Repository.getDefault().addFileSystem(lfs);	78	Repository.getDefault().addFileSystem(lfs);
78		79
79	URL uPlus = plus.toURI().toURL();	80	URL uPlus = Utilities.toURI(plus).toURL();
80	FileObject fo = URLMapper.findFileObject(uPlus);	81	FileObject fo = URLMapper.findFileObject(uPlus);
81	assertNotNull("File object found", fo);	82	assertNotNull("File object found", fo);
82	assertEquals("plus+plus", fo.getNameExt());	83	assertEquals("plus+plus", fo.getNameExt());
Lines 116-122 Link Here
116	FileObject rootFO = jfs.getRoot();	117	FileObject rootFO = jfs.getRoot();
117	FileObject textFO = jfs.findResource(textPath);	118	FileObject textFO = jfs.findResource(textPath);
118	assertNotNull("JAR contains a/b.txt", textFO);	119	assertNotNull("JAR contains a/b.txt", textFO);
119	String rootS = "jar:" + jar.toURI() + "!/";	120	String rootS = "jar:" + Utilities.toURI(jar) + "!/";
120	URL rootU = new URL(rootS);	121	URL rootU = new URL(rootS);
121	URL textU = new URL(rootS + textPath);	122	URL textU = new URL(rootS + textPath);
122	assertEquals("correct FO -> URL for root", rootU, URLMapper.findURL(rootFO, URLMapper.EXTERNAL));	123	assertEquals("correct FO -> URL for root", rootU, URLMapper.findURL(rootFO, URLMapper.EXTERNAL));

Lines 62-67 Link Here

(-)a/openide.filesystems/test/unit/src/org/openide/filesystems/XMLFileSystemTestHid.java (-40 / +41 lines)
62	import java.util.jar.JarEntry;	62	import java.util.jar.JarEntry;
63	import java.util.jar.JarOutputStream;	63	import java.util.jar.JarOutputStream;
64	import org.openide.util.Enumerations;	64	import org.openide.util.Enumerations;
		65	import org.openide.util.Utilities;
65		66
66	public class XMLFileSystemTestHid extends TestBaseHid {	67	public class XMLFileSystemTestHid extends TestBaseHid {
67	/** Factory for all filesystems that want to use TCK in this class.	68	/** Factory for all filesystems that want to use TCK in this class.
Lines 106-112 Link Here
106		107
107	resources = new String[] {"a/b/c","a/b1/c"};	108	resources = new String[] {"a/b/c","a/b1/c"};
108		109
109	if (!FileSystemFactoryHid.switchXMLSystem(xfs, this, createXMLLayer().toURI().toURL())) {	110	if (!FileSystemFactoryHid.switchXMLSystem(xfs, this, Utilities.toURI(createXMLLayer()).toURL())) {
110	// OK, unsupported	111	// OK, unsupported
111	return;	112	return;
112	}	113	}
Lines 119-125 Link Here
119	@Override	120	@Override
120	protected void setUp() throws Exception {	121	protected void setUp() throws Exception {
121	File f = createXMLLayer();	122	File f = createXMLLayer();
122	xfs = FileSystemFactoryHid.createXMLSystem(getName(), this, f.toURI().toURL());	123	xfs = FileSystemFactoryHid.createXMLSystem(getName(), this, Utilities.toURI(f).toURL());
123	this.testedFS = xfs;	124	this.testedFS = xfs;
124	this.allTestedFS = new FileSystem[] { xfs };	125	this.allTestedFS = new FileSystem[] { xfs };
125	super.setUp();	126	super.setUp();
Lines 151-163 Link Here
151		152
152		153
153		154
154	xfs = FileSystemFactoryHid.createXMLSystem(getName(), this, f.toURI().toURL());	155	xfs = FileSystemFactoryHid.createXMLSystem(getName(), this, Utilities.toURI(f).toURL());
155		156
156	FileObject fo = xfs.findResource ("TestModule/sample.txt");	157	FileObject fo = xfs.findResource ("TestModule/sample.txt");
157	assertEquals ("Four bytes there", 4, fo.getSize ());	158	assertEquals ("Four bytes there", 4, fo.getSize ());
158	registerDefaultListener (fo);	159	registerDefaultListener (fo);
159		160
160	if (!FileSystemFactoryHid.switchXMLSystem(xfs, this, f2.toURI().toURL())) {	161	if (!FileSystemFactoryHid.switchXMLSystem(xfs, this, Utilities.toURI(f2).toURL())) {
161	// OK, unsupported	162	// OK, unsupported
162	return;	163	return;
163	}	164	}
Lines 190-202 Link Here
190		191
191		192
192		193
193	xfs = FileSystemFactoryHid.createXMLSystem(getName(), this, f.toURI().toURL());	194	xfs = FileSystemFactoryHid.createXMLSystem(getName(), this, Utilities.toURI(f).toURL());
194		195
195	FileObject fo = xfs.findResource ("TestModule/sample.txt");	196	FileObject fo = xfs.findResource ("TestModule/sample.txt");
196	assertEquals ("Four bytes there", 4, fo.getSize ());	197	assertEquals ("Four bytes there", 4, fo.getSize ());
197	registerDefaultListener (fo);	198	registerDefaultListener (fo);
198		199
199	if (!FileSystemFactoryHid.switchXMLSystem(xfs, this, f2.toURI().toURL())) {	200	if (!FileSystemFactoryHid.switchXMLSystem(xfs, this, Utilities.toURI(f2).toURL())) {
200	// OK, unsupported	201	// OK, unsupported
201	return;	202	return;
202	}	203	}
Lines 230-242 Link Here
230		231
231		232
232		233
233	xfs = FileSystemFactoryHid.createXMLSystem(getName(), this, f.toURI().toURL());	234	xfs = FileSystemFactoryHid.createXMLSystem(getName(), this, Utilities.toURI(f).toURL());
234		235
235	FileObject fo = xfs.findResource ("TestModule/sample.txt");	236	FileObject fo = xfs.findResource ("TestModule/sample.txt");
236	assertEquals("Old value is in the attribute", "old", fo.getAttribute("value"));	237	assertEquals("Old value is in the attribute", "old", fo.getAttribute("value"));
237	registerDefaultListener (fo);	238	registerDefaultListener (fo);
238		239
239	if (!FileSystemFactoryHid.switchXMLSystem(xfs, this, f2.toURI().toURL())) {	240	if (!FileSystemFactoryHid.switchXMLSystem(xfs, this, Utilities.toURI(f2).toURL())) {
240	// OK, unsupported	241	// OK, unsupported
241	return;	242	return;
242	}	243	}
Lines 264-276 Link Here
264		265
265		266
266		267
267	xfs = FileSystemFactoryHid.createXMLSystem(getName(), this, f.toURI().toURL());	268	xfs = FileSystemFactoryHid.createXMLSystem(getName(), this, Utilities.toURI(f).toURL());
268		269
269	FileObject fo = xfs.findResource("TestModule/sample.txt");	270	FileObject fo = xfs.findResource("TestModule/sample.txt");
270	assertEquals("Four bytes there", 4, fo.getSize());	271	assertEquals("Four bytes there", 4, fo.getSize());
271	registerDefaultListener(fo);	272	registerDefaultListener(fo);
272		273
273	if (!FileSystemFactoryHid.switchXMLSystem(xfs, this, f2.toURI().toURL())) {	274	if (!FileSystemFactoryHid.switchXMLSystem(xfs, this, Utilities.toURI(f2).toURL())) {
274	// OK, unsupported	275	// OK, unsupported
275	return;	276	return;
276	}	277	}
Lines 300-306 Link Here
300	f.lastModified() < f2.lastModified()	301	f.lastModified() < f2.lastModified()
301	);	302	);
302	}	303	}
303	xfs = FileSystemFactoryHid.createXMLSystem(getName(), this, f.toURI().toURL());	304	xfs = FileSystemFactoryHid.createXMLSystem(getName(), this, Utilities.toURI(f).toURL());
304	FileObject fo = xfs.findResource ("TestModule/sample.txt");	305	FileObject fo = xfs.findResource ("TestModule/sample.txt");
305	assertNotNull(fo);	306	assertNotNull(fo);
306	assertEquals(fo.lastModified().getTime(), f.lastModified());	307	assertEquals(fo.lastModified().getTime(), f.lastModified());
Lines 325-331 Link Here
325	"</filesystem>\n"	326	"</filesystem>\n"
326	);	327	);
327		328
328	xfs = FileSystemFactoryHid.createXMLSystem(getName(), this, f.toURI().toURL());	329	xfs = FileSystemFactoryHid.createXMLSystem(getName(), this, Utilities.toURI(f).toURL());
329	FileObject fo = xfs.findResource ("TestModule/sample.txt");	330	FileObject fo = xfs.findResource ("TestModule/sample.txt");
330	assertNotNull(fo);	331	assertNotNull(fo);
331		332
Lines 349-355 Link Here
349	+ " </folder>\n"	350	+ " </folder>\n"
350	+ "</filesystem>");	351	+ "</filesystem>");
351		352
352	xfs = FileSystemFactoryHid.createXMLSystem(getName(), this, f.toURI().toURL());	353	xfs = FileSystemFactoryHid.createXMLSystem(getName(), this, Utilities.toURI(f).toURL());
353	final LocalFileSystem lfs = new LocalFileSystem();	354	final LocalFileSystem lfs = new LocalFileSystem();
354	lfs.setRootDirectory(getWorkDir());	355	lfs.setRootDirectory(getWorkDir());
355	MultiFileSystem mfs = new MultiFileSystem(lfs, xfs);	356	MultiFileSystem mfs = new MultiFileSystem(lfs, xfs);
Lines 376-382 Link Here
376	);	377	);
377	Count.cnt = 0;	378	Count.cnt = 0;
378		379
379	xfs = FileSystemFactoryHid.createXMLSystem(getName(), this, f.toURI().toURL());	380	xfs = FileSystemFactoryHid.createXMLSystem(getName(), this, Utilities.toURI(f).toURL());
380	/** the following is a fake implementation of filesystem that	381	/** the following is a fake implementation of filesystem that
381	* allows us to prevent calls to fileObject.getAttributes()	382	* allows us to prevent calls to fileObject.getAttributes()
382	*/	383	*/
Lines 499-505 Link Here
499	"</filesystem>\n"	500	"</filesystem>\n"
500	);	501	);
501		502
502	xfs = FileSystemFactoryHid.createXMLSystem(getName(), this, f.toURI().toURL());	503	xfs = FileSystemFactoryHid.createXMLSystem(getName(), this, Utilities.toURI(f).toURL());
503	FileObject fo = xfs.findResource ("TestModule/sample.txt");	504	FileObject fo = xfs.findResource ("TestModule/sample.txt");
504	assertNotNull(fo);	505	assertNotNull(fo);
505		506
Lines 524-530 Link Here
524	"</filesystem>\n"	525	"</filesystem>\n"
525	);	526	);
526		527
527	xfs = FileSystemFactoryHid.createXMLSystem(getName(), this, f.toURI().toURL());	528	xfs = FileSystemFactoryHid.createXMLSystem(getName(), this, Utilities.toURI(f).toURL());
528	FileObject fo = xfs.findResource ("TestModule/sample.txt");	529	FileObject fo = xfs.findResource ("TestModule/sample.txt");
529	assertNotNull(fo);	530	assertNotNull(fo);
530		531
Lines 549-555 Link Here
549	"</filesystem>\n"	550	"</filesystem>\n"
550	);	551	);
551		552
552	xfs = FileSystemFactoryHid.createXMLSystem(getName(), this, f.toURI().toURL());	553	xfs = FileSystemFactoryHid.createXMLSystem(getName(), this, Utilities.toURI(f).toURL());
553	FileObject fo = xfs.findResource ("TestModule/sample.txt");	554	FileObject fo = xfs.findResource ("TestModule/sample.txt");
554	assertNotNull(fo);	555	assertNotNull(fo);
555		556
Lines 579-589 Link Here
579	"</filesystem>\n"	580	"</filesystem>\n"
580	);	581	);
581		582
582	xfs = FileSystemFactoryHid.createXMLSystem(getName(), this, f.toURI().toURL());	583	xfs = FileSystemFactoryHid.createXMLSystem(getName(), this, Utilities.toURI(f).toURL());
583	FileObject fo = xfs.findResource ("TestModule/sample.txt");	584	FileObject fo = xfs.findResource ("TestModule/sample.txt");
584	assertNotNull(fo);	585	assertNotNull(fo);
585		586
586	XMLFileSystem realXMLFS = new XMLFileSystem(f.toURI().toURL());	587	XMLFileSystem realXMLFS = new XMLFileSystem(Utilities.toURI(f).toURL());
587	FileObject realfo = realXMLFS.findResource("TestModule/sample.txt");	588	FileObject realfo = realXMLFS.findResource("TestModule/sample.txt");
588	assertNotNull(realfo);	589	assertNotNull(realfo);
589		590
Lines 620-626 Link Here
620	"</filesystem>\n"	621	"</filesystem>\n"
621	);	622	);
622		623
623	xfs = FileSystemFactoryHid.createXMLSystem(getName(), this, f.toURI().toURL());	624	xfs = FileSystemFactoryHid.createXMLSystem(getName(), this, Utilities.toURI(f).toURL());
624	FileObject fo = xfs.findResource ("TestModule/sample.txt");	625	FileObject fo = xfs.findResource ("TestModule/sample.txt");
625	FileObject snd = xfs.findResource ("TestModule/snd.txt");	626	FileObject snd = xfs.findResource ("TestModule/snd.txt");
626	assertNotNull(fo);	627	assertNotNull(fo);
Lines 721-727 Link Here
721	"</filesystem>\n"	722	"</filesystem>\n"
722	);	723	);
723		724
724	xfs = FileSystemFactoryHid.createXMLSystem(getName(), this, f.toURI().toURL());	725	xfs = FileSystemFactoryHid.createXMLSystem(getName(), this, Utilities.toURI(f).toURL());
725	FileObject fo = xfs.findResource ("TestModule/sample.txt");	726	FileObject fo = xfs.findResource ("TestModule/sample.txt");
726	assertNotNull(fo);	727	assertNotNull(fo);
727		728
Lines 770-777 Link Here
770	)	771	)
771	);	772	);
772		773
773	URL url1 = new URL("jar:" + jar1.toURI() + "!/layer.xml");	774	URL url1 = new URL("jar:" + Utilities.toURI(jar1) + "!/layer.xml");
774	URL url2 = new URL("jar:" + jar2.toURI() + "!/layer.xml");	775	URL url2 = new URL("jar:" + Utilities.toURI(jar2) + "!/layer.xml");
775		776
776	FileSystem xfs1 = FileSystemFactoryHid.createXMLSystem(getName(), this, url1);	777	FileSystem xfs1 = FileSystemFactoryHid.createXMLSystem(getName(), this, url1);
777	FileObject fo1 = xfs1.findResource("dir/file");	778	FileObject fo1 = xfs1.findResource("dir/file");
Lines 901-907 Link Here
901	File f2 = changeOfAnAttributeInLayerIsFiredgenerateLayer("Folder", "java.awt.Button");	902	File f2 = changeOfAnAttributeInLayerIsFiredgenerateLayer("Folder", "java.awt.Button");
902	File f3 = changeOfAnAttributeInLayerIsFiredgenerateLayer("NoChange", "nochange");	903	File f3 = changeOfAnAttributeInLayerIsFiredgenerateLayer("NoChange", "nochange");
903		904
904	fs.setXmlUrls (new URL[] { f1.toURI().toURL(), f3.toURI().toURL() } );	905	fs.setXmlUrls (new URL[] { Utilities.toURI(f1).toURL(), Utilities.toURI(f3).toURL() } );
905		906
906	FileObject file = fs.findResource("Folder/empty.xml");	907	FileObject file = fs.findResource("Folder/empty.xml");
907	assertNotNull("File found in layer", file);	908	assertNotNull("File found in layer", file);
Lines 917-923 Link Here
917	assertAttr("The first value is list", file, "value", "java.awt.List");	918	assertAttr("The first value is list", file, "value", "java.awt.List");
918	assertAttr("Imutable value is nochange", nochange, "value", "nochange");	919	assertAttr("Imutable value is nochange", nochange, "value", "nochange");
919		920
920	fs.setXmlUrls (new URL[] { f2.toURI().toURL(), f3.toURI().toURL() } );	921	fs.setXmlUrls (new URL[] { Utilities.toURI(f2).toURL(), Utilities.toURI(f3).toURL() } );
921	String v2 = (String) file.getAttribute("value");	922	String v2 = (String) file.getAttribute("value");
922	assertEquals("The second value is button", "java.awt.Button", v2);	923	assertEquals("The second value is button", "java.awt.Button", v2);
923		924
Lines 952-958 Link Here
952	LocalFileSystem target = new LocalFileSystem();	953	LocalFileSystem target = new LocalFileSystem();
953	target.setRootDirectory(r);	954	target.setRootDirectory(r);
954		955
955	FileSystem source = FileSystemFactoryHid.createXMLSystem(getName(), this, f.toURI().toURL());	956	FileSystem source = FileSystemFactoryHid.createXMLSystem(getName(), this, Utilities.toURI(f).toURL());
956	FileObject template = source.findResource("Templates/Other/special");	957	FileObject template = source.findResource("Templates/Other/special");
957	assertNotNull("template found", template);	958	assertNotNull("template found", template);
958	FileObject foTested = target.getRoot().createData("copiedTemplate");	959	FileObject foTested = target.getRoot().createData("copiedTemplate");
Lines 1077-1083 Link Here
1077	w.close();	1078	w.close();
1078	}	1079	}
1079		1080
1080	xfs = FileSystemFactoryHid.createXMLSystem(getName(), this, f1.toURI().toURL(), f2.toURI().toURL());	1081	xfs = FileSystemFactoryHid.createXMLSystem(getName(), this, Utilities.toURI(f1).toURL(), Utilities.toURI(f2).toURL());
1081		1082
1082		1083
1083	FileObject just1 = xfs.findResource("just1/empty.xml");	1084	FileObject just1 = xfs.findResource("just1/empty.xml");
Lines 1089-1107 Link Here
1089	String layers2 = layers(just2);	1090	String layers2 = layers(just2);
1090	String layersB = layers(both);	1091	String layersB = layers(both);
1091		1092
1092	if (!layersR.contains(f1.toURI().toString())) {	1093	if (!layersR.contains(Utilities.toURI(f1).toString())) {
1093	fail("Missing " + f1.toURI().toString() + "\ninside: " + layersR);	1094	fail("Missing " + Utilities.toURI(f1).toString() + "\ninside: " + layersR);
1094	}	1095	}
1095	if (!layersR.contains(f2.toURI().toString())) {	1096	if (!layersR.contains(Utilities.toURI(f2).toString())) {
1096	fail("Missing " + f2.toURI().toString() + "\ninside: " + layersR);	1097	fail("Missing " + Utilities.toURI(f2).toString() + "\ninside: " + layersR);
1097	}	1098	}
1098		1099
1099	assertEquals(f1.toURI().toString(), layers1);	1100	assertEquals(Utilities.toURI(f1).toString(), layers1);
1100	assertEquals(f2.toURI().toString(), layers2);	1101	assertEquals(Utilities.toURI(f2).toString(), layers2);
1101	if (!layersB.contains(f1.toURI().toString())) {	1102	if (!layersB.contains(Utilities.toURI(f1).toString())) {
1102	fail("Missing " + f1 + "\ninside: " + layersB);	1103	fail("Missing " + f1 + "\ninside: " + layersB);
1103	}	1104	}
1104	if (!layersB.contains(f2.toURI().toString())) {	1105	if (!layersB.contains(Utilities.toURI(f2).toString())) {
1105	fail("Missing " + f2 + "\ninside: " + layersB);	1106	fail("Missing " + f2 + "\ninside: " + layersB);
1106	}	1107	}
1107	}	1108	}
Lines 1119-1125 Link Here
1119	+ "</filesystem>");	1120	+ "</filesystem>");
1120	w.close();	1121	w.close();
1121		1122
1122	xfs = FileSystemFactoryHid.createXMLSystem(getName(), this, layer.toURI().toURL());	1123	xfs = FileSystemFactoryHid.createXMLSystem(getName(), this, Utilities.toURI(layer).toURL());
1123		1124
1124	FileObject fo = xfs.findResource("f/empty.xml");	1125	FileObject fo = xfs.findResource("f/empty.xml");
1125	assertNotNull("File found", fo);	1126	assertNotNull("File found", fo);
Lines 1142-1166 Link Here
1142	File f1 = writeFile("layer1.xml",	1143	File f1 = writeFile("layer1.xml",
1143	"<filesystem>\n" +	1144	"<filesystem>\n" +
1144	"<folder name='d'>\n" +	1145	"<folder name='d'>\n" +
1145	"<file name='f' url='" + c1.toURI() + "'/>" +	1146	"<file name='f' url='" + Utilities.toURI(c1) + "'/>" +
1146	"</folder>\n" +	1147	"</folder>\n" +
1147	"</filesystem>\n"	1148	"</filesystem>\n"
1148	);	1149	);
1149	File f2 = writeFile("layer2.xml",	1150	File f2 = writeFile("layer2.xml",
1150	"<filesystem>\n" +	1151	"<filesystem>\n" +
1151	"<folder name='d'>\n" +	1152	"<folder name='d'>\n" +
1152	"<file name='f' url='" + c2.toURI() + "'>" +	1153	"<file name='f' url='" + Utilities.toURI(c2) + "'>" +
1153	" <attr name='weight' intvalue='100'/>" +	1154	" <attr name='weight' intvalue='100'/>" +
1154	"</file>\n" +	1155	"</file>\n" +
1155	"</folder>\n" +	1156	"</folder>\n" +
1156	"</filesystem>\n"	1157	"</filesystem>\n"
1157	);	1158	);
1158		1159
1159	xfs = FileSystemFactoryHid.createXMLSystem(getName(), this, f2.toURI().toURL(), f1.toURI().toURL());	1160	xfs = FileSystemFactoryHid.createXMLSystem(getName(), this, Utilities.toURI(f2).toURL(), Utilities.toURI(f1).toURL());
1160	FileObject fo = xfs.findResource("d/f");	1161	FileObject fo = xfs.findResource("d/f");
1161	assertNotNull(fo);	1162	assertNotNull(fo);
1162	assertEquals(6, fo.getSize());	1163	assertEquals(6, fo.getSize());
1163	xfs = FileSystemFactoryHid.createXMLSystem(getName(), this, f1.toURI().toURL(), f2.toURI().toURL());	1164	xfs = FileSystemFactoryHid.createXMLSystem(getName(), this, Utilities.toURI(f1).toURL(), Utilities.toURI(f2).toURL());
1164	fo = xfs.findResource("d/f");	1165	fo = xfs.findResource("d/f");
1165	assertNotNull(fo);	1166	assertNotNull(fo);
1166	assertEquals(6, fo.getSize());	1167	assertEquals(6, fo.getSize());

Lines 55-60 Link Here

(-)a/openide.loaders/test/unit/src/org/openide/loaders/DragAndDropDataNodeTest.java (-2 / +3 lines)
55	import org.openide.nodes.Children;	55	import org.openide.nodes.Children;
56	import org.netbeans.junit.*;	56	import org.netbeans.junit.*;
57	import org.openide.filesystems.LocalFileSystem;	57	import org.openide.filesystems.LocalFileSystem;
		58	import org.openide.util.Utilities;
58		59
59	public class DragAndDropDataNodeTest extends NbTestCase {	60	public class DragAndDropDataNodeTest extends NbTestCase {
60		61
Lines 89-95 Link Here
89		90
90	assertTrue( t.isDataFlavorSupported( uriListFlavor ) );	91	assertTrue( t.isDataFlavorSupported( uriListFlavor ) );
91	String uriList = (String) t.getTransferData( uriListFlavor );	92	String uriList = (String) t.getTransferData( uriListFlavor );
92	assertEquals( tmpFile.toURI()+"\r\n", uriList );	93	assertEquals( Utilities.toURI(tmpFile)+"\r\n", uriList );
93	}	94	}
94		95
95	public void testClipboardCut() throws ClassNotFoundException, IOException, UnsupportedFlavorException {	96	public void testClipboardCut() throws ClassNotFoundException, IOException, UnsupportedFlavorException {
Lines 110-115 Link Here
110		111
111	assertTrue( t.isDataFlavorSupported( uriListFlavor ) );	112	assertTrue( t.isDataFlavorSupported( uriListFlavor ) );
112	String uriList = (String) t.getTransferData( uriListFlavor );	113	String uriList = (String) t.getTransferData( uriListFlavor );
113	assertEquals( tmpFile.toURI()+"\r\n", uriList );	114	assertEquals( Utilities.toURI(tmpFile)+"\r\n", uriList );
114	}	115	}
115	}	116	}

Lines 51-56 Link Here

(-)a/openide.util/apichanges.xml (+21 lines)
51	<apidef name="actions">Actions API</apidef>	51	<apidef name="actions">Actions API</apidef>
52	</apidefs>	52	</apidefs>
53	<changes>	53	<changes>
		54	<change id="File.URI">
		55	<api name="util"/>
		56	<summary>UNC-safe File / URI interconversion</summary>
		57	<version major="8" minor="25"/>
		58	<date year="2012" month="6" day="13"/>
		59	<author login="jglick"/>
		60	<compatibility addition="yes">
		61	<p>
		62	Use the Jackpot-format upgrade hint.
		63	</p>
		64	</compatibility>
		65	<description>
		66	<p>
		67	<code>Utilities</code> gets new methods <code>toURI(File)</code>
		68	and <code>toFile(URI)</code> which offer the UNC safety of NIO.2
		69	even on JDK 6.
		70	</p>
		71	</description>
		72	<class package="org.openide.util" name="Utilities"/>
		73	<issue number="213562"/>
		74	</change>
54	<change id="exit-code">	75	<change id="exit-code">
55	<api name="util"/>	76	<api name="util"/>
56	<summary>Exit with status code</summary>	77	<summary>Exit with status code</summary>

Lines 72-77 Link Here

(-)a/openide.util/src/org/openide/util/Utilities.java (-6 / +89 lines)
72	import java.lang.ref.ReferenceQueue;	72	import java.lang.ref.ReferenceQueue;
73	import java.lang.ref.SoftReference;	73	import java.lang.ref.SoftReference;
74	import java.lang.reflect.Field;	74	import java.lang.reflect.Field;
		75	import java.lang.reflect.InvocationTargetException;
75	import java.lang.reflect.Method;	76	import java.lang.reflect.Method;
76	import java.lang.reflect.Modifier;	77	import java.lang.reflect.Modifier;
77	import java.net.MalformedURLException;	78	import java.net.MalformedURLException;
Lines 3022-3027 Link Here
3022	new AsyncInitSupport(comp4Init, initJob);	3023	new AsyncInitSupport(comp4Init, initJob);
3023	}	3024	}
3024		3025
		3026	/** JDK 7 */
		3027	private static Method fileToPath, pathToUri, pathsGet, pathToFile;
		3028	static {
		3029	try {
		3030	fileToPath = File.class.getMethod("toPath");
		3031	} catch (NoSuchMethodException x) {
		3032	// fine, JDK 6
		3033	}
		3034	if (fileToPath != null) {
		3035	try {
		3036	Class<?> path = Class.forName("java.nio.file.Path");
		3037	pathToUri = path.getMethod("toUri");
		3038	pathsGet = Class.forName("java.nio.file.Paths").getMethod("get", URI.class);
		3039	pathToFile = path.getMethod("toFile");
		3040	} catch (Exception x) {
		3041	throw new ExceptionInInitializerError(x);
		3042	}
		3043	}
		3044	}
		3045
		3046	/**
		3047	* Converts a file to a URI while being safe for UNC paths.
		3048	* Unlike {@link File#toURI} the result works with {@link URI#normalize()}.
		3049	* @param f a file
		3050	* @return a {@code file}-protocol URI which may use the host field
		3051	* @see java.nio.file.Path.toUri
		3052	* @since 8.25
		3053	*/
		3054	public static URI toURI(File f) {
		3055	if (fileToPath != null) {
		3056	try {
		3057	return (URI) pathToUri.invoke(fileToPath.invoke(f));
		3058	} catch (Exception x) {
		3059	LOG.log(Level.WARNING, "could not convert " + f + " to URI", x);
		3060	}
		3061	}
		3062	String path = f.getAbsolutePath();
		3063	if (path.startsWith("\\\\")) { // UNC
		3064	if (!path.endsWith("\\") && f.isDirectory()) {
		3065	path += "\\";
		3066	}
		3067	try {
		3068	return new URI("file", null, path.replace('\\', '/'), null);
		3069	} catch (URISyntaxException x) {
		3070	LOG.log(Level.WARNING, "could not convert " + f + " to URI", x);
		3071	}
		3072	}
		3073	return f.toURI();
		3074	}
		3075
		3076	/**
		3077	* Converts a URI to a file while being safe for UNC paths.
		3078	* Unlike {@link File#File(URI)} UNC URIs with a host field are accepted.
		3079	* @param u a {@code file}-protocol URI which may use the host field
		3080	* @return a file
		3081	* @see java.nio.file.Paths.get(java.net.URI)
		3082	* @since 8.25
		3083	*/
		3084	public static File toFile(URI u) throws IllegalArgumentException {
		3085	if (pathsGet != null) {
		3086	try {
		3087	return (File) pathToFile.invoke(pathsGet.invoke(null, u));
		3088	} catch (InvocationTargetException x) {
		3089	Throwable cause = x.getCause();
3090	if (cause instanceof IllegalArgumentException) {
3091	throw (IllegalArgumentException) cause;
3092	} else if (cause instanceof UnsupportedOperationException \|\| cause != null && cause.getClass().getName().equals("java.nio.file.FileSystemNotFoundException")) {
3093	throw new IllegalArgumentException(cause);
3094	} else {
3095	LOG.log(Level.WARNING, "could not convert " + u + " to File", x);
3096	}
3097	} catch (Exception x) {
3098	LOG.log(Level.WARNING, "could not convert " + u + " to File", x);
3099	}
3100	}
3101	String host = u.getHost();
3102	if (host != null && !host.isEmpty() && "file".equals(u.getScheme())) {
3103	return new File("\\\\" + host + u.getPath().replace('/', '\\'));
3104	}
3105	return new File(u);
3106	}
3107
3025	/**	3108	/**
3026	* Convert a file to a matching <code>file:</code> URL.	3109	* Convert a file to a matching <code>file:</code> URL.
3027	* @param f a file (absolute only)	3110	* @param f a file (absolute only)
Lines 3030-3036 Link Here
3030	* @see #toFile	3113	* @see #toFile
3031	* @see <a href="http://www.netbeans.org/issues/show_bug.cgi?id=29711">Issue #29711</a>	3114	* @see <a href="http://www.netbeans.org/issues/show_bug.cgi?id=29711">Issue #29711</a>
3032	* @since 3.26	3115	* @since 3.26
3033	* @deprecated Use {@link File#toURI} and {@link URI#toURL} instead under JDK 1.4.	3116	* @deprecated Use {@link #toURI} and {@link URI#toURL} instead under JDK 1.4.
3034	* ({@link File#toURL} is buggy in JDK 1.3 and the bugs are not fixed in JDK 1.4.)	3117	* ({@link File#toURL} is buggy in JDK 1.3 and the bugs are not fixed in JDK 1.4.)
3035	*/	3118	*/
3036	@Deprecated	3119	@Deprecated
Lines 3043-3049 Link Here
3043	throw new IllegalArgumentException("Relative path: " + f); // NOI18N	3126	throw new IllegalArgumentException("Relative path: " + f); // NOI18N
3044	}	3127	}
3045		3128
3046	URI uri = f.toURI();	3129	URI uri = toURI(f);
3047		3130
3048	return uri.toURL();	3131	return uri.toURL();
3049	}	3132	}
Lines 3059-3065 Link Here
3059	* @see #toURL	3142	* @see #toURL
3060	* @see <a href="http://www.netbeans.org/issues/show_bug.cgi?id=29711">Issue #29711</a>	3143	* @see <a href="http://www.netbeans.org/issues/show_bug.cgi?id=29711">Issue #29711</a>
3061	* @since 3.26	3144	* @since 3.26
3062	* @deprecated Use {@link URI#URI(String)} and {@link File#File(URI)} instead under JDK 1.4.	3145	* @deprecated Use {@link URL#toURI} and {@link #toFile(URI)} instead under JDK 1.4.
3063	* (There was no proper equivalent under JDK 1.3.)	3146	* (There was no proper equivalent under JDK 1.3.)
3064	*/	3147	*/
3065	@Deprecated	3148	@Deprecated
Lines 3069-3077 Link Here
3069	}	3152	}
3070		3153
3071	try {	3154	try {
3072	URI uri = new URI(u.toExternalForm());	3155	URI uri = u.toURI();
3073		3156
3074	return new File(uri);	3157	return toFile(uri);
3075	} catch (URISyntaxException use) {	3158	} catch (URISyntaxException use) {
3076	// malformed URL	3159	// malformed URL
3077	return null;	3160	return null;

Lines 54-59 Link Here

(-)a/openide.util/test/unit/src/org/netbeans/modules/openide/util/NbBundleProcessorTest.java (-9 / +10 lines)
54	import org.openide.util.NbBundle.Messages;	54	import org.openide.util.NbBundle.Messages;
55	import org.openide.util.test.TestFileUtils;	55	import org.openide.util.test.TestFileUtils;
56	import static org.netbeans.modules.openide.util.Bundle.*;	56	import static org.netbeans.modules.openide.util.Bundle.*;
		57	import org.openide.util.Utilities;
57		58
58	@Messages("k3=value #3")	59	@Messages("k3=value #3")
59	public class NbBundleProcessorTest extends NbTestCase {	60	public class NbBundleProcessorTest extends NbTestCase {
Lines 103-109 Link Here
103	"public static final Object X = new Object() {public String toString() {return Bundle.k();}};",	104	"public static final Object X = new Object() {public String toString() {return Bundle.k();}};",
104	"}");	105	"}");
105	assertTrue(AnnotationProcessorTestUtils.runJavac(src, null, dest, null, null));	106	assertTrue(AnnotationProcessorTestUtils.runJavac(src, null, dest, null, null));
106	ClassLoader l = new URLClassLoader(new URL[] {dest.toURI().toURL()});	107	ClassLoader l = new URLClassLoader(new URL[] {Utilities.toURI(dest).toURL()});
107	assertEquals("v", l.loadClass("p.C").getField("X").get(null).toString());	108	assertEquals("v", l.loadClass("p.C").getField("X").get(null).toString());
108	}	109	}
109		110
Lines 138-144 Link Here
138	public void testPackageKeys() throws Exception {	139	public void testPackageKeys() throws Exception {
139	AnnotationProcessorTestUtils.makeSource(src, "p.package-info", "@org.openide.util.NbBundle.Messages(\"k=v\")", "package p;");	140	AnnotationProcessorTestUtils.makeSource(src, "p.package-info", "@org.openide.util.NbBundle.Messages(\"k=v\")", "package p;");
140	assertTrue(AnnotationProcessorTestUtils.runJavac(src, null, dest, null, null));	141	assertTrue(AnnotationProcessorTestUtils.runJavac(src, null, dest, null, null));
141	ClassLoader l = new URLClassLoader(new URL[] {dest.toURI().toURL()});	142	ClassLoader l = new URLClassLoader(new URL[] {Utilities.toURI(dest).toURL()});
142	Method m = l.loadClass("p.Bundle").getDeclaredMethod("k");	143	Method m = l.loadClass("p.Bundle").getDeclaredMethod("k");
143	m.setAccessible(true);	144	m.setAccessible(true);
144	assertEquals("v", m.invoke(null));	145	assertEquals("v", m.invoke(null));
Lines 230-246 Link Here
230	AnnotationProcessorTestUtils.makeSource(src, "p.C2", "@org.openide.util.NbBundle.Messages(\"k2=v2\")", "public class C2 {public @Override String toString() {return Bundle.k2();}}");	231	AnnotationProcessorTestUtils.makeSource(src, "p.C2", "@org.openide.util.NbBundle.Messages(\"k2=v2\")", "public class C2 {public @Override String toString() {return Bundle.k2();}}");
231	assertTrue(AnnotationProcessorTestUtils.runJavac(src, null, dest, null, null));	232	assertTrue(AnnotationProcessorTestUtils.runJavac(src, null, dest, null, null));
232	assertTrue(AnnotationProcessorTestUtils.runJavac(src, null, dest, null, null));	233	assertTrue(AnnotationProcessorTestUtils.runJavac(src, null, dest, null, null));
233	ClassLoader l = new URLClassLoader(new URL[] {dest.toURI().toURL()});	234	ClassLoader l = new URLClassLoader(new URL[] {Utilities.toURI(dest).toURL()});
234	assertEquals("v1", l.loadClass("p.C1").newInstance().toString());	235	assertEquals("v1", l.loadClass("p.C1").newInstance().toString());
235	assertEquals("v2", l.loadClass("p.C2").newInstance().toString());	236	assertEquals("v2", l.loadClass("p.C2").newInstance().toString());
236	AnnotationProcessorTestUtils.makeSource(src, "p.C1", "@org.openide.util.NbBundle.Messages(\"k1=v3\")", "public class C1 {public @Override String toString() {return Bundle.k1();}}");	237	AnnotationProcessorTestUtils.makeSource(src, "p.C1", "@org.openide.util.NbBundle.Messages(\"k1=v3\")", "public class C1 {public @Override String toString() {return Bundle.k1();}}");
237	assertTrue(AnnotationProcessorTestUtils.runJavac(src, "C1.java", dest, null, null));	238	assertTrue(AnnotationProcessorTestUtils.runJavac(src, "C1.java", dest, null, null));
238	l = new URLClassLoader(new URL[] {dest.toURI().toURL()});	239	l = new URLClassLoader(new URL[] {Utilities.toURI(dest).toURL()});
239	assertEquals("v3", l.loadClass("p.C1").newInstance().toString());	240	assertEquals("v3", l.loadClass("p.C1").newInstance().toString());
240	assertEquals("v2", l.loadClass("p.C2").newInstance().toString());	241	assertEquals("v2", l.loadClass("p.C2").newInstance().toString());
241	AnnotationProcessorTestUtils.makeSource(src, "p.C1", "@org.openide.util.NbBundle.Messages(\"k3=v4\")", "public class C1 {public @Override String toString() {return Bundle.k3();}}");	242	AnnotationProcessorTestUtils.makeSource(src, "p.C1", "@org.openide.util.NbBundle.Messages(\"k3=v4\")", "public class C1 {public @Override String toString() {return Bundle.k3();}}");
242	assertTrue(AnnotationProcessorTestUtils.runJavac(src, "C1.java", dest, null, null));	243	assertTrue(AnnotationProcessorTestUtils.runJavac(src, "C1.java", dest, null, null));
243	l = new URLClassLoader(new URL[] {dest.toURI().toURL()});	244	l = new URLClassLoader(new URL[] {Utilities.toURI(dest).toURL()});
244	assertEquals("v4", l.loadClass("p.C1").newInstance().toString());	245	assertEquals("v4", l.loadClass("p.C1").newInstance().toString());
245	assertEquals("v2", l.loadClass("p.C2").newInstance().toString());	246	assertEquals("v2", l.loadClass("p.C2").newInstance().toString());
246	}	247	}
Lines 251-257 Link Here
251	AnnotationProcessorTestUtils.makeSource(src, "p.C3", "class C3 {C3() {new Runnable() {public @Override void run() {new Runnable() {public @Override void run() {}};}};}}");	252	AnnotationProcessorTestUtils.makeSource(src, "p.C3", "class C3 {C3() {new Runnable() {public @Override void run() {new Runnable() {public @Override void run() {}};}};}}");
252	assertTrue(AnnotationProcessorTestUtils.runJavac(src, null, dest, null, null));	253	assertTrue(AnnotationProcessorTestUtils.runJavac(src, null, dest, null, null));
253	assertTrue(AnnotationProcessorTestUtils.runJavac(src, null, dest, null, null));	254	assertTrue(AnnotationProcessorTestUtils.runJavac(src, null, dest, null, null));
254	ClassLoader l = new URLClassLoader(new URL[] {dest.toURI().toURL()});	255	ClassLoader l = new URLClassLoader(new URL[] {Utilities.toURI(dest).toURL()});
255	assertEquals("v1", l.loadClass("p.C1").newInstance().toString());	256	assertEquals("v1", l.loadClass("p.C1").newInstance().toString());
256	assertEquals("v2", l.loadClass("p.C2").newInstance().toString());	257	assertEquals("v2", l.loadClass("p.C2").newInstance().toString());
257	assertTrue(new File(dest, "p/C3.class").delete());	258	assertTrue(new File(dest, "p/C3.class").delete());
Lines 259-265 Link Here
259	assertTrue(new File(dest, "p/C3$1$1.class").isFile());	260	assertTrue(new File(dest, "p/C3$1$1.class").isFile());
260	AnnotationProcessorTestUtils.makeSource(src, "p.C1", "@org.openide.util.NbBundle.Messages(\"k1=v3\")", "public class C1 {public @Override String toString() {return Bundle.k1();}}");	261	AnnotationProcessorTestUtils.makeSource(src, "p.C1", "@org.openide.util.NbBundle.Messages(\"k1=v3\")", "public class C1 {public @Override String toString() {return Bundle.k1();}}");
261	assertTrue(AnnotationProcessorTestUtils.runJavac(src, "C1.java", dest, null, null));	262	assertTrue(AnnotationProcessorTestUtils.runJavac(src, "C1.java", dest, null, null));
262	l = new URLClassLoader(new URL[] {dest.toURI().toURL()});	263	l = new URLClassLoader(new URL[] {Utilities.toURI(dest).toURL()});
263	assertEquals("v3", l.loadClass("p.C1").newInstance().toString());	264	assertEquals("v3", l.loadClass("p.C1").newInstance().toString());
264	assertEquals("v2", l.loadClass("p.C2").newInstance().toString());	265	assertEquals("v2", l.loadClass("p.C2").newInstance().toString());
265	}	266	}
Lines 269-279 Link Here
269	AnnotationProcessorTestUtils.makeSource(src, "p.package-info", "@org.openide.util.NbBundle.Messages(\"k2=v2\")", "package p;");	270	AnnotationProcessorTestUtils.makeSource(src, "p.package-info", "@org.openide.util.NbBundle.Messages(\"k2=v2\")", "package p;");
270	assertTrue(AnnotationProcessorTestUtils.runJavac(src, null, dest, null, null));	271	assertTrue(AnnotationProcessorTestUtils.runJavac(src, null, dest, null, null));
271	assertTrue(AnnotationProcessorTestUtils.runJavac(src, null, dest, null, null));	272	assertTrue(AnnotationProcessorTestUtils.runJavac(src, null, dest, null, null));
272	ClassLoader l = new URLClassLoader(new URL[] {dest.toURI().toURL()});	273	ClassLoader l = new URLClassLoader(new URL[] {Utilities.toURI(dest).toURL()});
273	assertEquals("v1v2", l.loadClass("p.C").newInstance().toString());	274	assertEquals("v1v2", l.loadClass("p.C").newInstance().toString());
274	assertTrue(new File(dest, "p/C.class").delete());	275	assertTrue(new File(dest, "p/C.class").delete());
275	assertTrue(AnnotationProcessorTestUtils.runJavac(src, "C.java", dest, null, null));	276	assertTrue(AnnotationProcessorTestUtils.runJavac(src, "C.java", dest, null, null));
276	l = new URLClassLoader(new URL[] {dest.toURI().toURL()});	277	l = new URLClassLoader(new URL[] {Utilities.toURI(dest).toURL()});
277	assertEquals("v1v2", l.loadClass("p.C").newInstance().toString());	278	assertEquals("v1v2", l.loadClass("p.C").newInstance().toString());
278	}	279	}
279		280

Lines 112-117 Link Here

(-)a/openide.util/test/unit/src/org/openide/util/UtilitiesTest.java (+26 lines)
112	import java.awt.peer.TextFieldPeer;	112	import java.awt.peer.TextFieldPeer;
113	import java.awt.peer.WindowPeer;	113	import java.awt.peer.WindowPeer;
114	import java.io.File;	114	import java.io.File;
		115	import java.net.URI;
115	import java.net.URL;	116	import java.net.URL;
116	import java.util.ArrayList;	117	import java.util.ArrayList;
117	import java.util.Arrays;	118	import java.util.Arrays;
Lines 380-385 Link Here
380	}	381	}
381	}	382	}
382		383
		384	public void testFileURI() throws Exception {
		385	if (Utilities.isWindows()) {
		386	assertFileURI("C:\\some\\path #1", "file:/C:/some/path%20%231");
		387	assertEquals(new File("C:\\some\\path"), Utilities.toFile(new URI("file:/C:/some/path")));
		388	assertEquals(new File("C:\\some\\path"), Utilities.toFile(new URI("file:///C:/some/path")));
		389	assertEquals(new File("C:\\some\\path"), Utilities.toFile(new URI("file:/C:/some/path/")));
		390	assertFileURI("\\\\server\\share\\path", "file://server/share/path");
		391	assertEquals(new File("\\\\server\\share\\path"), Utilities.toFile(new URI("file:////server/share/path")));
		392	} else {
		393	assertFileURI("/some/path #1", "file:/some/path%20%231");
		394	assertEquals(new File("/some/path"), Utilities.toFile(new URI("file:/some/path")));
		395	assertEquals(new File("/some/path"), Utilities.toFile(new URI("file:///some/path")));
		396	assertEquals(new File("/some/path"), Utilities.toFile(new URI("file:/some/path/")));
		397	}
		398	String s = Utilities.toURI(getWorkDir()).toString();
		399	assertTrue(s, s.endsWith("/"));
		400	// XXX test that IllegalArgumentException is thrown where appropriate
		401	}
		402	private static void assertFileURI(String file, String uri) throws Exception {
		403	URI u = new URI(uri);
		404	File f = new File(file);
		405	assertEquals(u, Utilities.toURI(f));
		406	assertEquals(f, Utilities.toFile(u));
		407	}
		408
383	private static class CustomToolkitComponent extends Component {	409	private static class CustomToolkitComponent extends Component {
384	private Toolkit customToolkit;	410	private Toolkit customToolkit;
385		411

Lines 59-64 Link Here

(-)a/openide.util/test/unit/src/org/openide/xml/XMLUtilTest.java (-2 / +3 lines)
59	import javax.xml.validation.Schema;	59	import javax.xml.validation.Schema;
60	import javax.xml.validation.SchemaFactory;	60	import javax.xml.validation.SchemaFactory;
61	import org.netbeans.junit.NbTestCase;	61	import org.netbeans.junit.NbTestCase;
		62	import org.openide.util.Utilities;
62	import org.openide.util.test.TestFileUtils;	63	import org.openide.util.test.TestFileUtils;
63	import org.w3c.dom.CDATASection;	64	import org.w3c.dom.CDATASection;
64	import org.w3c.dom.Document;	65	import org.w3c.dom.Document;
Lines 454-460 Link Here
454	File ent = new File(d, "ent.xml");	455	File ent = new File(d, "ent.xml");
455	TestFileUtils.writeFile(main, "<!DOCTYPE root [<!ENTITY ent SYSTEM 'ent.xml'>]> <root xmlns='some://where'>&ent;</root>");	456	TestFileUtils.writeFile(main, "<!DOCTYPE root [<!ENTITY ent SYSTEM 'ent.xml'>]> <root xmlns='some://where'>&ent;</root>");
456	TestFileUtils.writeFile(ent, "<hello xmlns='some://where'>there</hello>");	457	TestFileUtils.writeFile(ent, "<hello xmlns='some://where'>there</hello>");
457	Document doc = XMLUtil.parse(new InputSource(main.toURI().toString()), false, true, null, null);	458	Document doc = XMLUtil.parse(new InputSource(Utilities.toURI(main).toString()), false, true, null, null);
458	XMLUtil.validate(doc.getDocumentElement(), s);	459	XMLUtil.validate(doc.getDocumentElement(), s);
459	ByteArrayOutputStream baos = new ByteArrayOutputStream();	460	ByteArrayOutputStream baos = new ByteArrayOutputStream();
460	XMLUtil.write(doc, baos, "UTF-8");	461	XMLUtil.write(doc, baos, "UTF-8");
Lines 467-473 Link Here
467	// XXX #160806 reported a problem with "xml:base" being consider a no-NS attr; not yet caught by test	468	// XXX #160806 reported a problem with "xml:base" being consider a no-NS attr; not yet caught by test
468	// Try again with no xmlns specified in entity; should inherit from main.xml:	469	// Try again with no xmlns specified in entity; should inherit from main.xml:
469	TestFileUtils.writeFile(ent, "<hello>there</hello>");	470	TestFileUtils.writeFile(ent, "<hello>there</hello>");
470	doc = XMLUtil.parse(new InputSource(main.toURI().toString()), false, true, null, null);	471	doc = XMLUtil.parse(new InputSource(Utilities.toURI(main).toString()), false, true, null, null);
471	XMLUtil.validate(doc.getDocumentElement(), s);	472	XMLUtil.validate(doc.getDocumentElement(), s);
472	baos = new ByteArrayOutputStream();	473	baos = new ByteArrayOutputStream();
473	XMLUtil.write(doc, baos, "UTF-8");	474	XMLUtil.write(doc, baos, "UTF-8");

Lines 962-968 Link Here

(-)a/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/RepositoryUpdater.java (-6 / +6 lines)
962	final File parentFile = FileUtil.toFile(newFile.getParent());	962	final File parentFile = FileUtil.toFile(newFile.getParent());
963	if (parentFile != null) {	963	if (parentFile != null) {
964	try {	964	try {
965	URL oldBinaryRoot = new File (parentFile, oldNameExt).toURI().toURL();	965	URL oldBinaryRoot = org.openide.util.Utilities.toURI(new File (parentFile, oldNameExt)).toURL();
966	eventQueue.record(	966	eventQueue.record(
967	FileEventLog.FileOp.DELETE,	967	FileEventLog.FileOp.DELETE,
968	oldBinaryRoot,	968	oldBinaryRoot,
Lines 3010-3016 Link Here
3010	}	3010	}
3011	try {	3011	try {
3012	if ("file".equals(tmp.getProtocol())) { //NOI18N	3012	if ("file".equals(tmp.getProtocol())) { //NOI18N
3013	final File file = new File(new URI(tmp.toString()));	3013	final File file = org.openide.util.Utilities.toFile(new URI(tmp.toString()));
3014	msg = file.getAbsolutePath();	3014	msg = file.getAbsolutePath();
3015	}	3015	}
3016	} catch (URISyntaxException ex) {	3016	} catch (URISyntaxException ex) {
Lines 4717-4723 Link Here
4717	if (packedIndex != null ) {	4717	if (packedIndex != null ) {
4718	unpack(packedIndex, downloadFolder);	4718	unpack(packedIndex, downloadFolder);
4719	packedIndex.delete();	4719	packedIndex.delete();
4720	if (patchDownloadedIndex(root,downloadFolder.toURI().toURL())) {	4720	if (patchDownloadedIndex(root,org.openide.util.Utilities.toURI(downloadFolder).toURL())) {
4721	final FileObject df = CacheFolder.getDataFolder(root);	4721	final FileObject df = CacheFolder.getDataFolder(root);
4722	assert df != null;	4722	assert df != null;
4723	final File dataFolder = FileUtil.toFile(df);	4723	final File dataFolder = FileUtil.toFile(df);
Lines 5592-5598 Link Here
5592	if (sourcesListener != null) {	5592	if (sourcesListener != null) {
5593	if (!sourceRoots.containsKey(root) && root.getProtocol().equals("file")) { //NOI18N	5593	if (!sourceRoots.containsKey(root) && root.getProtocol().equals("file")) { //NOI18N
5594	try {	5594	try {
5595	File f = new File(root.toURI());	5595	File f = org.openide.util.Utilities.toFile(root.toURI());
5596	safeAddRecursiveListener(sourcesListener, f, entry);	5596	safeAddRecursiveListener(sourcesListener, f, entry);
5597	sourceRoots.put(root, f);	5597	sourceRoots.put(root, f);
5598	} catch (URISyntaxException use) {	5598	} catch (URISyntaxException use) {
Lines 5608-5614 Link Here
5608	try {	5608	try {
5609	URI uri = archiveUrl != null ? archiveUrl.toURI() : root.toURI();	5609	URI uri = archiveUrl != null ? archiveUrl.toURI() : root.toURI();
5610	if (uri.getScheme().equals("file")) { //NOI18N	5610	if (uri.getScheme().equals("file")) { //NOI18N
5611	f = new File(uri);	5611	f = org.openide.util.Utilities.toFile(uri);
5612	}	5612	}
5613	} catch (URISyntaxException use) {	5613	} catch (URISyntaxException use) {
5614	LOGGER.log(Level.INFO, "Can't convert " + root + " to java.io.File; archiveUrl=" + archiveUrl, use); //NOI18N	5614	LOGGER.log(Level.INFO, "Can't convert " + root + " to java.io.File; archiveUrl=" + archiveUrl, use); //NOI18N
Lines 5669-5675 Link Here
5669	@Override	5669	@Override
5670	public boolean accept(@NonNull final File pathname) {	5670	public boolean accept(@NonNull final File pathname) {
5671	try {	5671	try {
5672	return entry.includes(pathname.toURI().toURL());	5672	return entry.includes(org.openide.util.Utilities.toURI(pathname).toURL());
5673	} catch (MalformedURLException ex) {	5673	} catch (MalformedURLException ex) {
5674	Exceptions.printStackTrace(ex);	5674	Exceptions.printStackTrace(ex);
5675	return true;	5675	return true;

Lines 54-59 Link Here

(-)a/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/Util.java (-2 / +3 lines)
54	import org.netbeans.modules.editor.settings.storage.api.EditorSettings;	54	import org.netbeans.modules.editor.settings.storage.api.EditorSettings;
55	import org.openide.filesystems.FileObject;	55	import org.openide.filesystems.FileObject;
56	import org.openide.loaders.DataObject;	56	import org.openide.loaders.DataObject;
		57	import org.openide.util.Utilities;
57		58
58	/**	59	/**
59	*	60	*
Lines 158-164 Link Here
158	final Boolean isDirectoryFin = isDirectory;	159	final Boolean isDirectoryFin = isDirectory;
159	// Performance optimization for File.toURI() which calls this method	160	// Performance optimization for File.toURI() which calls this method
160	// and the original implementation calls into native method	161	// and the original implementation calls into native method
161	return new File(new File(root.toURI()), relativePath) {	162	return Utilities.toURI(new File(Utilities.toFile(root.toURI()), relativePath) {
162		163
163	@Override	164	@Override
164	public File getAbsoluteFile() {	165	public File getAbsoluteFile() {
Lines 175-181 Link Here
175	super.isDirectory() :	176	super.isDirectory() :
176	isDirectoryFin;	177	isDirectoryFin;
177	}	178	}
178	}.toURI().toURL();	179	}).toURL();
179	} else {	180	} else {
180	return new URL(root, relativePath);	181	return new URL(root, relativePath);
181	}	182	}