[235493] [WPE] Selecting "crumb trail" node navigator in property sheet fails when on QuickEdit tab

[326547]  URISyntaxException in org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.TagModelLoader

3 files changed, 5 insertions, 9 deletions

diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/FaceletTagRegistry.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/FaceletTagRegistry.java
index 559f953e3..877c68158 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/FaceletTagRegistry.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/FaceletTagRegistry.java
@@ -182,7 +182,8 @@ public final class FaceletTagRegistry extends AbstractTagRegistry implements
         {
             for (final IFaceletTagRecord taglib : tagDesc.getTagLibraries())
             {
-                initialize(taglib, fireEvent);
+            	if (taglib.getURI() != null)
+            		initialize(taglib, fireEvent);
             }
 
             _listener = new MyTaglibListener();
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/TagModelLoader.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/TagModelLoader.java
index 2ec287de9..fa3421dad 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/TagModelLoader.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/TagModelLoader.java
@@ -222,14 +222,9 @@ public class TagModelLoader
                     }
                     if (foundEntry != null)
                     {
-                        final java.net.URI uri = new java.net.URI(foundEntry.getURI());
-                        URL url = URIUtil.toURL(uri);
+                        final java.net.URI uri = URIUtil.fromString(foundEntry.getURI());
+                        final URL url = URIUtil.toURL(uri);
                         return url.openStream();
-//                        final String uriString = foundEntry.getURI();
-//                        if (URIUtil.isFileURI(uriString))
-//                        {
-//                            return new File(URIUtil.toFile(uriString));
-//                        }
                     }
                 }
             }
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/WPETabbedPropertySheetPage.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/WPETabbedPropertySheetPage.java
index 688398747..75b91cb5c 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/WPETabbedPropertySheetPage.java
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/WPETabbedPropertySheetPage.java
@@ -92,7 +92,7 @@ public class WPETabbedPropertySheetPage extends TabbedPropertySheetPage {
 		getEditor().setFocus();
 		_hiearchAction.refresh(selectedNode, innerNode);
 		this.getSite().getActionBars().getToolBarManager().update(true);
-		super.selectionChanged(null, new StructuredSelection(selectedNode));
+		super.selectionChanged(getEditor(), new StructuredSelection(selectedNode));
 	}
 
 	/**