Lines 71-76
Link Here
|
71 |
import org.openide.filesystems.FileObject; |
71 |
import org.openide.filesystems.FileObject; |
72 |
import org.openide.filesystems.FileRenameEvent; |
72 |
import org.openide.filesystems.FileRenameEvent; |
73 |
import org.openide.loaders.DataObject; |
73 |
import org.openide.loaders.DataObject; |
|
|
74 |
import org.openide.util.Utilities; |
74 |
import org.netbeans.modules.web.jsps.parserapi.JspParserAPI; |
75 |
import org.netbeans.modules.web.jsps.parserapi.JspParserAPI; |
75 |
import org.netbeans.modules.web.jsps.parserapi.PageInfo; |
76 |
import org.netbeans.modules.web.jsps.parserapi.PageInfo; |
76 |
import org.netbeans.editor.*; |
77 |
import org.netbeans.editor.*; |
Lines 778-784
Link Here
|
778 |
File f = InstalledFileLocator.getDefault().locate("docs/jstl11-doc.zip", "org.netbeans.modules.web.core.syntax", false); //NoI18N |
779 |
File f = InstalledFileLocator.getDefault().locate("docs/jstl11-doc.zip", "org.netbeans.modules.web.core.syntax", false); //NoI18N |
779 |
if (f != null){ |
780 |
if (f != null){ |
780 |
try { |
781 |
try { |
781 |
URL urll = f.toURL(); |
782 |
URL urll = Utilities.toURI(f).toURL(); |
782 |
urll = FileUtil.getArchiveRoot(urll); |
783 |
urll = FileUtil.getArchiveRoot(urll); |
783 |
url = urll.toString(); |
784 |
url = urll.toString(); |
784 |
} catch (java.net.MalformedURLException e){ |
785 |
} catch (java.net.MalformedURLException e){ |
Lines 807-813
Link Here
|
807 |
f = InstalledFileLocator.getDefault().locate("docs/jsf12-tlddoc.zip", "org.netbeans.modules.web.core.syntax", false); //NoI18N |
808 |
f = InstalledFileLocator.getDefault().locate("docs/jsf12-tlddoc.zip", "org.netbeans.modules.web.core.syntax", false); //NoI18N |
808 |
if (f != null){ |
809 |
if (f != null){ |
809 |
try { |
810 |
try { |
810 |
URL urll = f.toURL(); |
811 |
URL urll = Utilities.toURI(f).toURL(); |
811 |
urll = FileUtil.getArchiveRoot(urll); |
812 |
urll = FileUtil.getArchiveRoot(urll); |
812 |
url = urll.toString(); |
813 |
url = urll.toString(); |
813 |
helpMap.put("http://java.sun.com/jsf/html", url + "h/"); |
814 |
helpMap.put("http://java.sun.com/jsf/html", url + "h/"); |
Lines 820-826
Link Here
|
820 |
f = InstalledFileLocator.getDefault().locate("docs/struts-tags.zip", "org.netbeans.modules.web.core.syntax", false); |
821 |
f = InstalledFileLocator.getDefault().locate("docs/struts-tags.zip", "org.netbeans.modules.web.core.syntax", false); |
821 |
if (f != null){ |
822 |
if (f != null){ |
822 |
try { |
823 |
try { |
823 |
URL urll = f.toURL(); |
824 |
URL urll = Utilities.toURI(f).toURL(); |
824 |
urll = FileUtil.getArchiveRoot(urll); |
825 |
urll = FileUtil.getArchiveRoot(urll); |
825 |
url = urll.toString(); |
826 |
url = urll.toString(); |
826 |
helpMap.put("http://jakarta.apache.org/struts/tags-bean", url + "bean/"); |
827 |
helpMap.put("http://jakarta.apache.org/struts/tags-bean", url + "bean/"); |
Lines 917-923
Link Here
|
917 |
File f = InstalledFileLocator.getDefault().locate(helpFiles, "org.netbeans.modules.web.core.syntax", true); //NoI18N |
918 |
File f = InstalledFileLocator.getDefault().locate(helpFiles, "org.netbeans.modules.web.core.syntax", true); //NoI18N |
918 |
if (f != null){ |
919 |
if (f != null){ |
919 |
try { |
920 |
try { |
920 |
URL urll = f.toURL(); |
921 |
URL urll = Utilities.toURI(f).toURL(); |
921 |
urll = FileUtil.getArchiveRoot(urll); |
922 |
urll = FileUtil.getArchiveRoot(urll); |
922 |
url = urll.toString(); |
923 |
url = urll.toString(); |
923 |
} catch (java.net.MalformedURLException e){ |
924 |
} catch (java.net.MalformedURLException e){ |