Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgkessler2010-12-17 13:54:23 -0500
committergkessler2010-12-17 13:54:23 -0500
commit11cce1aede47278533c9c6c0561ea8a6b09a2bf4 (patch)
tree537a804cd22004076463555ca7a89799b12aa9c5
parentf4d1ecb0a547af13e9c1cceda18d88d9cec01825 (diff)
downloadwebtools.jsf-11cce1aede47278533c9c6c0561ea8a6b09a2bf4.tar.gz
webtools.jsf-11cce1aede47278533c9c6c0561ea8a6b09a2bf4.tar.xz
webtools.jsf-11cce1aede47278533c9c6c0561ea8a6b09a2bf4.zip
[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
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/FaceletTagRegistry.java3
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/TagModelLoader.java9
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/WPETabbedPropertySheetPage.java2
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));
}
/**

Back to the top