[jbosstools-commits] JBoss Tools SVN: r9357 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template.

[jbosstools-commits at lists.jboss.org]

Author: estherbin
Date: 2008-07-28 10:13:55 -0400 (Mon, 28 Jul 2008)
New Revision: 9357

Modified:
   trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesAbstractInplaceTemplate.java
   trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesInplaceInputTemplate.java
   trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesInplaceSelectTemplate.java
Log:
Fix bugs https://jira.jboss.org/jira/browse/JBIDE-2464

Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesAbstractInplaceTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesAbstractInplaceTemplate.java	2008-07-28 13:57:05 UTC (rev 9356)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesAbstractInplaceTemplate.java	2008-07-28 14:13:55 UTC (rev 9357)
@@ -44,7 +44,7 @@
     /**
      * 
      */
-    private static final String CONTROLS_VERTICAL_POSITION_DEFAULT_VALUE = "center";
+    protected static final String CONTROLS_VERTICAL_POSITION_DEFAULT_VALUE = "center";
 
     /**
      * 
@@ -290,7 +290,7 @@
      * 
      * @param source the source
      */
-    protected void prepareData(Element source) {
+    protected void prepareData(VpePageContext pageContext,Element source) {
         this.styleClass = source.getAttribute(RichFaces.ATTR_STYLE_CLASS);
         this.editClass = source.getAttribute("editClass");
         this.viewClass = source.getAttribute("viewClass");
@@ -304,7 +304,16 @@
         if (ComponentUtil.isBlank(this.sourceValue)) {
             this.sourceValue = DEFAULT_NULL_VALUE;
         }
+        if ((source.getAttributeNode("value") != null) && ComponentUtil.isNotBlank(this.sourceValue)
+                && (this.sourceValue != DEFAULT_NULL_VALUE) && this.sourceValue.startsWith("#{")) {
+            this.sourceValue = ComponentUtil.getBundleValue(pageContext, source.getAttributeNode("value"));
+        }
 
+        if ((source.getAttributeNode("defaultLabel") != null) && ComponentUtil.isNotBlank(this.defaultLabel)
+                && (this.defaultLabel != DEFAULT_NULL_VALUE) && this.defaultLabel.startsWith("#{")) {
+            this.defaultLabel = ComponentUtil.getBundleValue(pageContext, source.getAttributeNode("defaultLabel"));
+        }
+        
         this.showControls = Boolean.parseBoolean(source.getAttribute("showControls"));
         this.controlsVerticalPosition = source.getAttribute("controlsVerticalPosition");
         if (ComponentUtil.isBlank(this.controlsVerticalPosition) || !isInKeySet(controlsVerticalPositions, this.controlsVerticalPosition)) {

Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesInplaceInputTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesInplaceInputTemplate.java	2008-07-28 13:57:05 UTC (rev 9356)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesInplaceInputTemplate.java	2008-07-28 14:13:55 UTC (rev 9357)
@@ -18,7 +18,6 @@
 import org.jboss.tools.vpe.editor.context.VpePageContext;
 import org.jboss.tools.vpe.editor.template.VpeCreationData;
 import org.jboss.tools.vpe.editor.util.HTML;
-import org.jboss.tools.vpe.xulrunner.browser.util.DOMTreeDumper;
 import org.mozilla.interfaces.nsIDOMDocument;
 import org.mozilla.interfaces.nsIDOMElement;
 import org.w3c.dom.Element;
@@ -57,7 +56,7 @@
         // <span id="j_id5" class="rich-inplace rich-inplace-view" style="">
         ComponentUtil.setCSSLink(pageContext, getCssStyle(), getCssExtension());
         final Element source = (Element) sourceNode;
-        prepareData(source);
+        prepareData(pageContext,source);
         final nsIDOMElement rootSpan = createRootSpanTemplateMethod(source, visualDocument);
         final nsIDOMElement innerInput1 = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_INPUT);
 
@@ -98,7 +97,7 @@
         } else {
             innerInput1.setAttribute(HTML.ATTR_VALUE, this.sourceValue);
         }
-//      final DOMTreeDumper dumper = new DOMTreeDumper();
+//        final DOMTreeDumper dumper = new DOMTreeDumper();
 //        dumper.dumpToStream(System.err, rootSpan);
 
         return data;
@@ -166,14 +165,15 @@
      * 
      * @param source the source
      */
-    protected void prepareData(Element source) {
+    protected void prepareData(VpePageContext pageContext,Element source) {
         try {
             this.inputWidth = String.valueOf(ComponentUtil.parseWidthHeightValue(source.getAttribute("inputWidth")));
         } catch (NumberFormatException e) {
             this.inputWidth = DEFAULT_INPUT_WIDTH_VALUE;
         }
         this.controlsHorizontalPositions.put("right", this.inputWidth);
-        super.prepareData(source);
+        this.controlsHorizontalPositions.put(CONTROLS_VERTICAL_POSITION_DEFAULT_VALUE, "18px");
+        super.prepareData(pageContext,source);
 
     }
 

Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesInplaceSelectTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesInplaceSelectTemplate.java	2008-07-28 13:57:05 UTC (rev 9356)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesInplaceSelectTemplate.java	2008-07-28 14:13:55 UTC (rev 9357)
@@ -20,7 +20,6 @@
 import org.jboss.tools.vpe.editor.context.VpePageContext;
 import org.jboss.tools.vpe.editor.template.VpeCreationData;
 import org.jboss.tools.vpe.editor.util.HTML;
-import org.jboss.tools.vpe.xulrunner.browser.util.DOMTreeDumper;
 import org.mozilla.interfaces.nsIDOMDocument;
 import org.mozilla.interfaces.nsIDOMElement;
 import org.w3c.dom.Element;
@@ -60,7 +59,7 @@
         // <span id="j_id5" class="rich-inplace rich-inplace-view" style="">
         ComponentUtil.setCSSLink(pageContext, getCssStyle(), getCssExtension());
         final Element source = (Element) sourceNode;
-        prepareData(source);
+        prepareData(pageContext,source);
         final nsIDOMElement rootSpan = createRootSpanTemplateMethod(source, visualDocument);
 
         if (isToggle) {
@@ -291,8 +290,8 @@
      *            the source
      */
     @Override
-    protected void prepareData(Element source) {
-        super.prepareData(source);
+    protected void prepareData(VpePageContext pageContext,Element source) {
+        super.prepareData(pageContext,source);
 
     }