Author: sdzmitrovich
Date: 2008-11-05 11:57:13 -0500 (Wed, 05 Nov 2008)
New Revision: 11527
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/ComponentUtil.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesCalendarTemplate.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2829
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/ComponentUtil.java
===================================================================
---
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/ComponentUtil.java 2008-11-05
14:54:55 UTC (rev 11526)
+++
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/ComponentUtil.java 2008-11-05
16:57:13 UTC (rev 11527)
@@ -27,6 +27,7 @@
import org.eclipse.ui.editors.text.ILocationProvider;
import org.jboss.tools.jsf.vpe.richfaces.template.util.RichFaces;
import org.jboss.tools.vpe.editor.context.VpePageContext;
+import org.jboss.tools.vpe.editor.util.Constants;
import org.jboss.tools.vpe.editor.util.ElService;
import org.jboss.tools.vpe.editor.util.FileUtil;
import org.jboss.tools.vpe.editor.util.HTML;
@@ -231,7 +232,7 @@
if (uri.isAbsolute() || (new File(resolvedValue)).exists())
return resolvedValue;
- return FileUtil.getFile(resolvedValue, file).getLocation().toOSString();
+ return Constants.FILE_PREFIX+FileUtil.getFile(resolvedValue,
file).getLocation().toOSString();
}
/**
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesCalendarTemplate.java
===================================================================
---
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesCalendarTemplate.java 2008-11-05
14:54:55 UTC (rev 11526)
+++
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesCalendarTemplate.java 2008-11-05
16:57:13 UTC (rev 11527)
@@ -341,8 +341,8 @@
List<Cell> footerContent = new ArrayList<Cell>();
if (showTodayControl)
footerContent.add(new Cell(TODAY_CONTROL,
- CSS_R_C_TOOLFOOTER,showTodayControl
- && showApplyButton ));
+ CSS_R_C_TOOLFOOTER, showTodayControl
+ && showApplyButton));
if (popup && showApplyButton)
footerContent.add(new Cell(APPLY_CONTROL,
CSS_R_C_TOOLFOOTER, false, true));
@@ -609,15 +609,17 @@
.getAttribute(RichFaces.ATTR_BUTTON_ICON_DISABLED),
pageContext);
else {
- buttonIcon = ComponentUtil
- .getAbsoluteResourcePath(DEFAULT_BUTTON_ICON_DISABLED);
+ buttonIcon = Constants.FILE_PREFIX
+ + ComponentUtil
+ .getAbsoluteResourcePath(DEFAULT_BUTTON_ICON_DISABLED);
}
} else {
if (sourceElement.hasAttribute(RichFaces.ATTR_BUTTON_ICON))
- buttonIcon = ComponentUtil.getAbsoluteWorkspacePath(
- sourceElement.getAttribute(RichFaces.ATTR_BUTTON_ICON),
- pageContext);
+ buttonIcon = Constants.FILE_PREFIX
+ + ComponentUtil.getAbsoluteWorkspacePath(sourceElement
+ .getAttribute(RichFaces.ATTR_BUTTON_ICON),
+ pageContext);
else {
buttonIcon = ComponentUtil
.getAbsoluteResourcePath(DEFAULT_BUTTON_ICON);