Author: dmaliarevich
Date: 2008-06-24 06:09:10 -0400 (Tue, 24 Jun 2008)
New Revision: 8914
Added:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/tabPanel/active.gif
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/tabPanel/disabled.gif
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/tabPanel/inactive.gif
Removed:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/tabPanel/activeBackground.gif
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/tabPanel/inactiveBackground.gif
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/tabPanel/tabPanel.css
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTabPanelTemplate.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTabTemplate.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1697, style classes were changed, resolving tab
labels from bundle was added.
Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/tabPanel/active.gif
===================================================================
(Binary files differ)
Property changes on:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/tabPanel/active.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/tabPanel/activeBackground.gif
===================================================================
(Binary files differ)
Added:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/tabPanel/disabled.gif
===================================================================
(Binary files differ)
Property changes on:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/tabPanel/disabled.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Added:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/tabPanel/inactive.gif
===================================================================
(Binary files differ)
Property changes on:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/tabPanel/inactive.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/tabPanel/inactiveBackground.gif
===================================================================
(Binary files differ)
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/tabPanel/tabPanel.css
===================================================================
---
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/tabPanel/tabPanel.css 2008-06-24
08:33:46 UTC (rev 8913)
+++
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/tabPanel/tabPanel.css 2008-06-24
10:09:10 UTC (rev 8914)
@@ -60,6 +60,7 @@
}
.rich-tab-active {
+ background-image: url(active.gif);
background-repeat: repeat-x;
background-position: top;
cursor: default;
@@ -69,6 +70,7 @@
}
.rich-tab-inactive {
+ background-image: url(inactive.gif);
background-repeat: repeat-x;
background-position: top;
cursor: default;
@@ -76,6 +78,7 @@
}
.rich-tab-disabled {
+ background-image: url(disabled.gif);
background-repeat: repeat-x;
background-position: top;
cursor: default;
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTabPanelTemplate.java
===================================================================
---
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTabPanelTemplate.java 2008-06-24
08:33:46 UTC (rev 8913)
+++
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTabPanelTemplate.java 2008-06-24
10:09:10 UTC (rev 8914)
@@ -99,7 +99,8 @@
nsIDOMElement td = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_TD);
tr.appendChild(td);
td.setAttribute(HtmlComponentUtil.HTML_ALIGN_ATTR, getHeaderAlignment(sourceElement));
-
+ td.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, ComponentUtil
+ .getAttribute(sourceElement, HEADER_CLASS));
nsIDOMElement inerTable =
visualDocument.createElement(HtmlComponentUtil.HTML_TAG_TABLE);
td.appendChild(inerTable);
inerTable.setAttribute(HtmlComponentUtil.HTML_BORDER_ATTR, ZERO);
@@ -139,13 +140,12 @@
addSpacer(visualDocument, inerTr, headerSpacing);
}
- nsIDOMElement headerTd = RichFacesTabTemplate.encodeHeader(creationData,
+ nsIDOMElement headerTd = RichFacesTabTemplate.encodeHeader(
+ pageContext,
+ creationData,
(Element) child,
- visualDocument, inerTr, active,
- ComponentUtil.getAttribute(sourceElement,
- HEADER_CLASS)
- + SPACE
- + ComponentUtil.getAttribute(sourceElement,
+ visualDocument, inerTr, active,
+ ComponentUtil.getAttribute(sourceElement,
TAB_CLASS),
ComponentUtil.getAttribute(sourceElement,
ACTIVE_TAB_CLASS)
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTabTemplate.java
===================================================================
---
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTabTemplate.java 2008-06-24
08:33:46 UTC (rev 8913)
+++
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTabTemplate.java 2008-06-24
10:09:10 UTC (rev 8914)
@@ -20,6 +20,8 @@
import org.jboss.tools.vpe.editor.template.VpeCreationData;
import org.mozilla.interfaces.nsIDOMDocument;
import org.mozilla.interfaces.nsIDOMElement;
+import org.mozilla.interfaces.nsIDOMText;
+import org.w3c.dom.Attr;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -31,8 +33,6 @@
public static final String TAB_BODY_ATTR = "tabbodyattr"; //$NON-NLS-1$
private final static String SPACER_FILE_PATH = "common/spacer.gif";
//$NON-NLS-1$
- private final static String ACTIVE_BKG_FILE_PATH =
"tabPanel/activeBackground.gif"; //$NON-NLS-1$
- private final static String INACTIVE_BKG_FILE_PATH =
"tabPanel/inactiveBackground.gif"; //$NON-NLS-1$
private final static String BORDER_FILE_PATH = "tabPanel/border.gif";
//$NON-NLS-1$
private final static String VPE_USER_TOGGLE_ID = "vpe-user-toggle-id";
//$NON-NLS-1$
@@ -115,7 +115,7 @@
td.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR,
ComponentUtil.getAttribute(sourceElement, HtmlComponentUtil.HTML_STYLE_ATTR)
+ STYLE_SEMICOLUMN + contentStyle);
-
+
List<Node> children = ComponentUtil.getChildren(sourceElement, true);
VpeChildrenInfo bodyInfo = new VpeChildrenInfo(td);
for (Node child : children) {
@@ -138,7 +138,7 @@
headerTable.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR,
HtmlComponentUtil.CSS_DISPLAY
+ ":" + DISABLED_ELEMENT_STYLE + STYLE_SEMICOLUMN); //$NON-NLS-1$
- headerTable.appendChild(encodeHeader(creationData, (Element)sourceNode, visualDocument,
table, false, EMPTY, EMPTY, EMPTY, EMPTY,EMPTY));
+ headerTable.appendChild(encodeHeader(pageContext, creationData, (Element)sourceNode,
visualDocument, table, false, EMPTY, EMPTY, EMPTY, EMPTY,EMPTY));
nsIDOMElement bodyTable =
visualDocument.createElement(HtmlComponentUtil.HTML_TAG_TABLE);
bodyTable.setAttribute(HtmlComponentUtil.HTML_BORDER_ATTR, ZERO);
bodyTable.setAttribute(HtmlComponentUtil.HTML_CELLPADDING_ATTR, ZERO);
@@ -162,7 +162,9 @@
* @param inactiveTabClass
* @param disabledTabClass
*/
- public static nsIDOMElement encodeHeader(VpeCreationData creationData,
+ public static nsIDOMElement encodeHeader(
+ VpePageContext pageContext,
+ VpeCreationData creationData,
Element sourceElement,
nsIDOMDocument visualDocument,
nsIDOMElement parentTr,
@@ -240,7 +242,6 @@
+ SPACE + CSS_LABEL
+ SPACE + CSS_DISABLED
+ SPACE + disabledTabClass;
- String bgImgPath = ComponentUtil.getAbsoluteResourcePath(INACTIVE_BKG_FILE_PATH);
if(!TRUE.equalsIgnoreCase(sourceElement.getAttribute(DISABLED))) {
if(active) {
@@ -248,7 +249,6 @@
+ SPACE + CSS_LABEL
+ SPACE + CSS_ACTIVE
+ SPACE + activeTabClass;
- bgImgPath = ComponentUtil.getAbsoluteResourcePath(ACTIVE_BKG_FILE_PATH);
} else {
styleClass = CSS_HEADER
+ SPACE + CSS_LABEL
@@ -256,27 +256,25 @@
+ SPACE + inactiveTabClass;
}
}
-
- styleClass += SPACE + headerClass;
+ String tabStyleClass = ComponentUtil.getAttribute(sourceElement,
HtmlComponentUtil.HTML_STYLECLASS_ATTR);
+ styleClass += SPACE + headerClass + SPACE + tabStyleClass;
mainTd.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, styleClass);
- String style = "background-image: url(file:///" //$NON-NLS-1$
- + bgImgPath.replace('\\', '/') + ");"; //$NON-NLS-1$
- mainTd.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, style);
-
mainTd.setAttribute(VPE_USER_TOGGLE_ID, toggleId);
Node labelFacet = ComponentUtil.getFacet(sourceElement, LABEL, true);
- String labelAttr = sourceElement.getAttribute(LABEL);
if (null != labelFacet) {
VpeChildrenInfo child = new VpeChildrenInfo(mainTd);
child.addSourceChild(labelFacet);
creationData.addChildrenInfo(child);
- } else if (null != labelAttr) {
- mainTd.appendChild(visualDocument.createTextNode(labelAttr));
+ } else if (sourceElement.hasAttribute(LABEL)) {
+ Attr labelAttr = sourceElement.getAttributeNode(LABEL);
+ if (null != labelAttr) {
+ String bundleValue = ComponentUtil.getBundleValue(pageContext, labelAttr);
+ mainTd.appendChild(visualDocument.createTextNode(bundleValue));
+ }
} else {
char space = 160;
- labelAttr = EMPTY + space;
- mainTd.appendChild(visualDocument.createTextNode(labelAttr));
+ mainTd.appendChild(visualDocument.createTextNode(EMPTY + space));
}
encodeSpacer(mainTr, visualDocument);
return headerTd;