JBoss Tools SVN: r12490 - in trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces: src/org/jboss/tools/jsf/vpe/richfaces/template and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: sdzmitrovich
Date: 2008-12-09 11:04:22 -0500 (Tue, 09 Dec 2008)
New Revision: 12490
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/calendar/calendar.css
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesCalendarTemplate.java
Log:
JBIDE-3349
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/calendar/calendar.css
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/calendar/calendar.css 2008-12-09 14:24:24 UTC (rev 12489)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/calendar/calendar.css 2008-12-09 16:04:22 UTC (rev 12490)
@@ -1,13 +1,9 @@
.rich-calendar-input {
- cursor: pointer;
- vertical-align: middle;
- text-align: left;
}
.rich-calendar-button {
cursor: pointer;
vertical-align: middle;
- text-align: left;
}
.rich-calendar-exterior {
@@ -55,15 +51,17 @@
}
.rich-calendar-days {
- background: #F1EEE9 none repeat scroll 0%;
- border-bottom: 1px solid #C4C0B9; /*panelBorderColor*/
- border-right: 0px solid #C4C0B9; /*panelBorderColor*/
- font-size: 11px; /*generalSizeFont*/
- font-family: Arial, Verdana, sans-serif;
+
+ border-bottom: 1px solid;
+ border-right: 0 solid;
vertical-align: middle;
text-align: center;
height: 22px;
- vertical-align: middle;
+ border-bottom-color: #C4C0B9;
+ border-right-color: #C4C0B9;
+ background: #F1EEE9;
+ font-size: 11px;
+ font-family: Arial, Verdana, sans-serif;
}
.rich-calendar-weekends {
@@ -71,15 +69,18 @@
}
.rich-calendar-week {
- background: #F1EEE9 none repeat scroll 0%;
- font-family: Arial, Verdana, sans-serif;
- font-size: 11px;
- padding: 0pt;
- border-bottom: 1px solid #C4C0B9;
- border-right: 1px solid #C4C0B9;
+
+ border-bottom: 1px solid;
+ border-right: 1px solid;
+ vertical-align: middle;
text-align: center;
- vertical-align: middle;
width: 25px;
+ background: #F1EEE9;
+ border-bottom-color: #C4C0B9;
+ background-color: #F1EEE9;
+ border-right-color: #C4C0B9;
+ font-size: 11px;
+ font-family: Arial, Verdana, sans-serif;
}
.rich-calendar-cell {
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-12-09 14:24:24 UTC (rev 12489)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesCalendarTemplate.java 2008-12-09 16:04:22 UTC (rev 12490)
@@ -142,10 +142,16 @@
static final String ATTR_MONTH_LABELS = "monthLabels"; //$NON-NLS-1$
static final String ATTR_ENABLE_MANUAL_INPUT = "enableManualInput"; //$NON-NLS-1$
static final String ATTR_TODAY_CONTROL_MODE = "todayControlMode"; //$NON-NLS-1$
-
- static final String NAME_OPTIONAL_FACET_FOOTER = "optionalFooter"; //$NON-NLS-1$
- static final String NAME_OPTIONAL_FACET_HEADER = "optionalHeader"; //$NON-NLS-1$
+ static final String NAME_FACET_OPTIONAL_FOOTER = "optionalFooter"; //$NON-NLS-1$
+ static final String NAME_FACET_OPTIONAL_HEADER = "optionalHeader"; //$NON-NLS-1$
+
+ static final String NAME_FACET_WEEK_DAY = "weekDay"; //$NON-NLS-1$
+ static final String NAME_FACET_WEEK_NUMBER = "weekNumber"; //$NON-NLS-1$
+
+ static final boolean FACET_SEARCH_ORDER = true; // it means that facet will
+ // be look for from end
+
final private static String DEFAULT_INPUT_STYLE = "vertical-align: middle;";//$NON-NLS-1$
final private static String POSITION_RELATIVE_STYLE = "position: relative;";//$NON-NLS-1$
final private static String POSITION_ABSOLUTE_STYLE = "position: absolute;";//$NON-NLS-1$
@@ -238,7 +244,7 @@
ComponentUtil.setCSSLink(pageContext, STYLE_PATH, "calendar"); //$NON-NLS-1$
nsIDOMElement wrapper = visualDocument.createElement(HTML.TAG_SPAN);
- VpeCreationData creationData = new VpeCreationData(wrapper,true);
+ VpeCreationData creationData = new VpeCreationData(wrapper, true);
nsIDOMElement calendar;
nsIDOMElement calendarWithPopup;
@@ -306,22 +312,23 @@
nsIDOMElement optionalHeader = null;
nsIDOMElement header = null;
- nsIDOMElement calendarBody = createCalendarBody(visualDocument);
+ nsIDOMElement calendarBody = createCalendarBody(visualDocument,
+ creationData, sourceElement);
nsIDOMElement footer = null;
nsIDOMElement optionalFooter = null;
-
- Element optionalHeaderFacet = ComponentUtil.getFacetElement(sourceElement,
- NAME_OPTIONAL_FACET_HEADER,true);
-
+
+ Element optionalHeaderFacet = ComponentUtil.getFacetElement(
+ sourceElement, NAME_FACET_OPTIONAL_HEADER, FACET_SEARCH_ORDER);
+
if (optionalHeaderFacet != null) {
optionalHeader = createCustomBlock(visualDocument,
optionalHeaderFacet, creationData, CSS_R_C_HEADER_OPTIONAL);
tableHeight += DEFAULT_OPTIONAL_CELL_HEIGHT;
}
-
+
if (showHeader) {
Element headerFacet = ComponentUtil.getFacetElement(sourceElement,
- RichFaces.NAME_FACET_HEADER,true);
+ RichFaces.NAME_FACET_HEADER, FACET_SEARCH_ORDER);
if (headerFacet != null) {
header = createCustomBlock(visualDocument, headerFacet,
creationData, CSS_R_C_HEADER);
@@ -346,10 +353,11 @@
}
if (showFooter) {
Element footerFacet = ComponentUtil.getFacetElement(sourceElement,
- RichFaces.NAME_FACET_FOOTER,true);
+ RichFaces.NAME_FACET_FOOTER, FACET_SEARCH_ORDER);
if (footerFacet != null) {
- footer = createCustomBlock(visualDocument, footerFacet, creationData, CSS_R_C_FOOTER);
+ footer = createCustomBlock(visualDocument, footerFacet,
+ creationData, CSS_R_C_FOOTER);
} else {
List<Cell> footerContent = new ArrayList<Cell>();
@@ -365,10 +373,10 @@
footerContent);
}
}
-
- Element optionalFooterFacet = ComponentUtil.getFacetElement(sourceElement,
- NAME_OPTIONAL_FACET_FOOTER,true);
-
+
+ Element optionalFooterFacet = ComponentUtil.getFacetElement(
+ sourceElement, NAME_FACET_OPTIONAL_FOOTER, FACET_SEARCH_ORDER);
+
if (optionalFooterFacet != null) {
optionalFooter = createCustomBlock(visualDocument,
optionalFooterFacet, creationData, CSS_R_C_FOOTER_OPTIONAL);
@@ -378,7 +386,7 @@
if (optionalHeader != null) {
tbody.appendChild(optionalHeader);
}
-
+
if (null != header) {
tbody.appendChild(header);
}
@@ -386,7 +394,7 @@
if (null != footer) {
tbody.appendChild(footer);
}
-
+
if (optionalFooter != null) {
tbody.appendChild(optionalFooter);
}
@@ -397,45 +405,12 @@
}
/**
- * Creates the calendar optional header or footer.
*
* @param visualDocument
- * the visual document
- * @param creationData
- * the creation data
- * @param facetBody
- * the facet body
- * @param isHeader
- * the is header
- *
- * @return the element
- */
- private nsIDOMElement createCalendarOptionalHeaderOrFooter(
- nsIDOMDocument visualDocument, VpeCreationData creationData,
- Element facetBody, boolean isHeader) {
- nsIDOMElement tr = visualDocument.createElement(HTML.TAG_TR);
- nsIDOMElement td = visualDocument.createElement(HTML.TAG_TD);
- td.setAttribute(HTML.ATTR_COLSPAN, Constants.EMPTY + COLUMN);
- tr.appendChild(td);
-
- if (isHeader) {
- td.setAttribute(HTML.ATTR_CLASS, CSS_R_C_HEADER_OPTIONAL);
- } else {
- td.setAttribute(HTML.ATTR_CLASS, CSS_R_C_FOOTER_OPTIONAL);
- }
-
- VpeChildrenInfo child = new VpeChildrenInfo(td);
- child.addSourceChild(facetBody);
- creationData.addChildrenInfo(child);
- return tr;
- }
-
- /**
- *
- * @param visualDocument
* @return Node of the visual tree.
*/
- private nsIDOMElement createCalendarBody(nsIDOMDocument visualDocument) {
+ private nsIDOMElement createCalendarBody(nsIDOMDocument visualDocument,
+ VpeCreationData creationData, Element sourceElement) {
nsIDOMElement tbody = visualDocument.createElement(HTML.TAG_TBODY);
@@ -443,13 +418,17 @@
// Create week days row
if (showWeekDaysBar) {
+
+ Element weekDayFacet = ComponentUtil.getFacetElement(sourceElement,
+ NAME_FACET_WEEK_DAY, FACET_SEARCH_ORDER);
+
for (int i = 0; i < COLUMN; i++) {
nsIDOMElement td = visualDocument.createElement(HTML.TAG_TD);
if ((i == 0) && (showWeeksBar)) {
td.setAttribute(HTML.ATTR_CLASS, WEEK_DAY_HTML_CLASS_ATTR);
- nsIDOMElement br = visualDocument
- .createElement(HTML.TAG_BR);
- td.appendChild(br);
+// nsIDOMElement br = visualDocument
+// .createElement(HTML.TAG_BR);
+// td.appendChild(br);
weekDaysTR.appendChild(td);
} else if (i > 0) {
@@ -462,10 +441,21 @@
td.setAttribute(HTML.ATTR_CLASS,
WEEK_DAY_HTML_CLASS_ATTR);
}
- nsIDOMText text = visualDocument
- .createTextNode(i == 0 ? Constants.EMPTY
- : weekDays[dayIndex]);
- td.appendChild(text);
+
+ if (weekDayFacet != null) {
+
+ VpeChildrenInfo childrenInfo = new VpeChildrenInfo(td);
+ childrenInfo.addSourceChild(weekDayFacet);
+ creationData.addChildrenInfo(childrenInfo);
+
+ } else {
+ nsIDOMNode weekDayNode = visualDocument
+ .createTextNode(i == 0 ? Constants.EMPTY
+ : weekDays[dayIndex]);
+
+ td.appendChild(weekDayNode);
+ }
+
weekDaysTR.appendChild(td);
}
}
@@ -483,6 +473,9 @@
calendar.add(Calendar.DAY_OF_MONTH, -(calendar
.get(Calendar.DAY_OF_WEEK) - calendar.getFirstDayOfWeek()));
+ Element weekNumberFacet = ComponentUtil.getFacetElement(sourceElement,
+ NAME_FACET_WEEK_NUMBER, FACET_SEARCH_ORDER);
+
// for number of week
for (int i = NUM_WEEK_ON_PAGE; i > 0; i--) {
@@ -493,9 +486,19 @@
nsIDOMElement weekTD = visualDocument
.createElement(HTML.TAG_TD);
weekTD.setAttribute(HTML.ATTR_CLASS, CSS_R_C_WEEK);
- nsIDOMText weekText = visualDocument.createTextNode(String
- .valueOf(calendar.get(Calendar.WEEK_OF_YEAR)));
- weekTD.appendChild(weekText);
+
+ if (weekNumberFacet != null) {
+
+ VpeChildrenInfo childrenInfo = new VpeChildrenInfo(weekTD);
+ childrenInfo.addSourceChild(weekNumberFacet);
+ creationData.addChildrenInfo(childrenInfo);
+
+ } else {
+ nsIDOMText weekText = visualDocument.createTextNode(String
+ .valueOf(calendar.get(Calendar.WEEK_OF_YEAR)));
+ weekTD.appendChild(weekText);
+ }
+
tr.appendChild(weekTD);
}
@@ -647,17 +650,17 @@
} else {
if (sourceElement.hasAttribute(RichFaces.ATTR_BUTTON_ICON))
- buttonIcon = ComponentUtil.getAbsoluteWorkspacePath(sourceElement
- .getAttribute(RichFaces.ATTR_BUTTON_ICON),
- pageContext);
+ buttonIcon = ComponentUtil.getAbsoluteWorkspacePath(
+ sourceElement.getAttribute(RichFaces.ATTR_BUTTON_ICON),
+ pageContext);
else {
buttonIcon = Constants.FILE_PREFIX
- + ComponentUtil
- .getAbsoluteResourcePath(DEFAULT_BUTTON_ICON);
+ + ComponentUtil
+ .getAbsoluteResourcePath(DEFAULT_BUTTON_ICON);
}
}
buttonIcon = buttonIcon.replace('\\', '/');
-
+
// buttonClass
buttonClass = sourceElement.getAttribute(RichFaces.ATTR_BUTTON_CLASS);
@@ -736,12 +739,12 @@
currentDayControl = sdf.format(calendar.getTime());
// cellWidth
- cellWidth = ComponentUtil.parseSizeAttribute(sourceElement, ATTR_CELL_WIDTH,
- DEFAULT_CELL_WIDTH);
+ cellWidth = ComponentUtil.parseSizeAttribute(sourceElement,
+ ATTR_CELL_WIDTH, DEFAULT_CELL_WIDTH);
// cellHeight
- cellHeight = ComponentUtil.parseSizeAttribute(sourceElement, ATTR_CELL_HEIGHT,
- DEFAULT_CELL_HEIGHT);
+ cellHeight = ComponentUtil.parseSizeAttribute(sourceElement,
+ ATTR_CELL_HEIGHT, DEFAULT_CELL_HEIGHT);
// tableWidth
tableWidth = (showWeeksBar ? DEFAULT_CELL_WIDTH : 0) + cellWidth
@@ -762,7 +765,8 @@
DIRECTIONS_BOTTOM_RIGHT);
// zindex
- zindex = ComponentUtil.parseNumberAttribute(sourceElement, RichFaces.ATTR_ZINDEX, 3);
+ zindex = ComponentUtil.parseNumberAttribute(sourceElement,
+ RichFaces.ATTR_ZINDEX, 3);
// horizontalOffset
horizontalOffset = ComponentUtil.parseNumberAttribute(sourceElement,
@@ -1025,7 +1029,6 @@
return months;
}
-
/**
*
* @param visualDocument
17 years, 4 months
JBoss Tools SVN: r12488 - trunk/seam/docs/reference/en/images/crud_database_application.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2008-12-09 09:24:04 -0500 (Tue, 09 Dec 2008)
New Revision: 12488
Modified:
trunk/seam/docs/reference/en/images/crud_database_application/crud_database_application_14.png
trunk/seam/docs/reference/en/images/crud_database_application/crud_database_application_19.png
trunk/seam/docs/reference/en/images/crud_database_application/crud_database_application_20.png
Log:
https://jira.jboss.org/jira/browse/JBDS-503- updating the screens;
Modified: trunk/seam/docs/reference/en/images/crud_database_application/crud_database_application_14.png
===================================================================
(Binary files differ)
Modified: trunk/seam/docs/reference/en/images/crud_database_application/crud_database_application_19.png
===================================================================
(Binary files differ)
Modified: trunk/seam/docs/reference/en/images/crud_database_application/crud_database_application_20.png
===================================================================
(Binary files differ)
17 years, 4 months
JBoss Tools SVN: r12487 - trunk/seam/docs/reference/en/images/seam_wizards.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2008-12-09 09:23:46 -0500 (Tue, 09 Dec 2008)
New Revision: 12487
Modified:
trunk/seam/docs/reference/en/images/seam_wizards/seam_wizards_15.png
trunk/seam/docs/reference/en/images/seam_wizards/seam_wizards_2.png
trunk/seam/docs/reference/en/images/seam_wizards/seam_wizards_5.png
Log:
https://jira.jboss.org/jira/browse/JBDS-503- updating the screens;
Modified: trunk/seam/docs/reference/en/images/seam_wizards/seam_wizards_15.png
===================================================================
(Binary files differ)
Modified: trunk/seam/docs/reference/en/images/seam_wizards/seam_wizards_2.png
===================================================================
(Binary files differ)
Modified: trunk/seam/docs/reference/en/images/seam_wizards/seam_wizards_5.png
===================================================================
(Binary files differ)
17 years, 4 months
JBoss Tools SVN: r12486 - trunk/seam/docs/reference/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2008-12-09 09:22:38 -0500 (Tue, 09 Dec 2008)
New Revision: 12486
Modified:
trunk/seam/docs/reference/en/modules/crud_application_walkthrough.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-503 - updating the chapter;
Modified: trunk/seam/docs/reference/en/modules/crud_application_walkthrough.xml
===================================================================
--- trunk/seam/docs/reference/en/modules/crud_application_walkthrough.xml 2008-12-09 11:22:48 UTC (rev 12485)
+++ trunk/seam/docs/reference/en/modules/crud_application_walkthrough.xml 2008-12-09 14:22:38 UTC (rev 12486)
@@ -16,32 +16,7 @@
<section>
<title>Using CRUD Application</title>
<para>To run your CRUD Application you should do the following steps:</para>
- <itemizedlist>
- <listitem>
- <para>Start JBoss Application Server if it was not started before. </para>
- </listitem>
- </itemizedlist>
- <para>On<emphasis>
- <property> JBossServer View </property>
- </emphasis> right click on the <emphasis>
- <property>JBoss Application Server</property>
- </emphasis> and select <emphasis>
- <property> Start </property>
- </emphasis></para>
-
- <figure>
- <title>Start the Server</title>
- <mediaobject>
- <imageobject>
- <imagedata
- fileref="images/crud_application_walkthrough/crud_application_walkthrough_1.png"
- scale="70"/>
- </imageobject>
- </mediaobject>
- </figure>
-
-
<itemizedlist>
<listitem>
<para>Run a project on the Server. </para>
@@ -60,7 +35,7 @@
<mediaobject>
<imageobject>
<imagedata
- fileref="images/crud_application_walkthrough/crud_application_walkthrough_2.png"
+ fileref="images/crud_application_walkthrough/crud_application_walkthrough_1.png"
scale="70"/>
</imageobject>
</mediaobject>
17 years, 4 months
JBoss Tools SVN: r12485 - trunk/documentation/guides/GettingStartedGuide/en/images/first_seam.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2008-12-09 06:22:48 -0500 (Tue, 09 Dec 2008)
New Revision: 12485
Modified:
trunk/documentation/guides/GettingStartedGuide/en/images/first_seam/first_seam14.png
trunk/documentation/guides/GettingStartedGuide/en/images/first_seam/first_seam17.png
trunk/documentation/guides/GettingStartedGuide/en/images/first_seam/first_seam18.png
trunk/documentation/guides/GettingStartedGuide/en/images/first_seam/first_seam35.png
Log:
https://jira.jboss.org/jira/browse/JBDS-503 - updating the screens;
Modified: trunk/documentation/guides/GettingStartedGuide/en/images/first_seam/first_seam14.png
===================================================================
(Binary files differ)
Modified: trunk/documentation/guides/GettingStartedGuide/en/images/first_seam/first_seam17.png
===================================================================
(Binary files differ)
Modified: trunk/documentation/guides/GettingStartedGuide/en/images/first_seam/first_seam18.png
===================================================================
(Binary files differ)
Modified: trunk/documentation/guides/GettingStartedGuide/en/images/first_seam/first_seam35.png
===================================================================
(Binary files differ)
17 years, 4 months
JBoss Tools SVN: r12484 - trunk/documentation/guides/GettingStartedGuide/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2008-12-09 06:22:10 -0500 (Tue, 09 Dec 2008)
New Revision: 12484
Modified:
trunk/documentation/guides/GettingStartedGuide/en/modules/first_seam.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-503 - updating the chapter;
Modified: trunk/documentation/guides/GettingStartedGuide/en/modules/first_seam.xml
===================================================================
--- trunk/documentation/guides/GettingStartedGuide/en/modules/first_seam.xml 2008-12-09 10:38:12 UTC (rev 12483)
+++ trunk/documentation/guides/GettingStartedGuide/en/modules/first_seam.xml 2008-12-09 11:22:10 UTC (rev 12484)
@@ -314,10 +314,21 @@
<para>Now let's examine the project and its structure. Go back to the Package Explorer view in
JBoss Developer Studio.</para>
- <para>It seems like it's not much for project but this shell application contains a login
+ <para>It seems like it's not much for project but this shell application contains a login
screen with default login logic, a menu template that can be further modified, and other
layout templates.</para>
+ <para>It's important to note that the business logic will reside in the <emphasis>
+ <property>src/hot</property>
+ </emphasis> folder, by default. And, the package naming conventions that were used in <property>New Seam
+ project wizard</property> could have been changed to something different from <emphasis>
+ <property>org.domain.workshop.session</property>.
+ </emphasis> Also, notice that there is a default <property>Authenticator. java</property>
+ file. This is where custom security logic can be added. Seam has a nice declarative security
+ model that we will explore in a bit more detail later on. The <emphasis>
+ <property>src/main</property>
+ </emphasis> folder is a model directory. It stores the project's JPA entity beans.</para>
+
<figure>
<title>Project Structure</title>
<mediaobject>
@@ -326,17 +337,8 @@
</imageobject>
</mediaobject>
</figure>
-
- <para>It’s important to note that the business logic will reside in the <emphasis>
- <property>src/action</property>
- </emphasis> folder, by default. And, the package naming conventions that were used in Seam
- project setup wizard could have been changed to something different from <emphasis>
- <property>org.domain.workshop.session</property>
- </emphasis>. Also, notice that there is a default <property>Authenticator. java</property>
- file. This is where custom security logic can be added. Seam has a nice declarative security
- model that we will explore in a bit more detail later on. The <emphasis>
- <property>src/model</property>
- </emphasis> folder will store the project’s JPA entity beans. The view tier of the
+
+ <para>The view tier of the
application is also important. Seam uses facelets and there is a built-in facelets GUI
editor that has some nice WYSIWYG and component drag/drop functionality. Try this out by
opening <property>home.xhtml</property> from <property>WebContent</property> folder.</para>
17 years, 4 months
JBoss Tools SVN: r12483 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates.
by jbosstools-commits＠lists.jboss.org
Author: sdzmitrovich
Date: 2008-12-09 05:38:12 -0500 (Tue, 09 Dec 2008)
New Revision: 12483
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml
Log:
corrected panelGrid
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml 2008-12-09 10:36:47 UTC (rev 12482)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml 2008-12-09 10:38:12 UTC (rev 12483)
@@ -667,7 +667,7 @@
<vpe:tag name="h:column" case-sensitive="yes">
<vpe:if
- test="parentname()='h:dataTable'|parentname()='x:dataTable'|parentname()='t:dataTable'|parentname()='t:newspaperTable'|parentname()='t:tree'">
+ test="parentname()='h:dataTable'|parentname()='h:panelGrid'|parentname()='x:dataTable'|parentname()='t:dataTable'|parentname()='t:newspaperTable'|parentname()='t:tree'">
<!-- Gavr --><!-- added x: 8.02.05 -->
<vpe:template children="yes" modify="yes">
<vpe:column title="{tagstring()}" />
17 years, 4 months
JBoss Tools SVN: r12482 - in trunk: jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: sdzmitrovich
Date: 2008-12-09 05:36:47 -0500 (Tue, 09 Dec 2008)
New Revision: 12482
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/calendar/calendar.css
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
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeCreationData.java
Log:
JBIDE-3349
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/calendar/calendar.css
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/calendar/calendar.css 2008-12-09 00:55:14 UTC (rev 12481)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/calendar/calendar.css 2008-12-09 10:36:47 UTC (rev 12482)
@@ -146,8 +146,14 @@
}
.rich-calendar-header-optional {
- background: #D4CFC7;
- text-align: center;
+ border-bottom: 1px solid;
+ padding: 7px;
+ height: 22px;
+ font-weight: bold;
+ border-bottom-color: #C4C0B9;
+ background-color: #F1EEE9;
+ font-size: 11px;
+ font-family: Arial, Verdana, sans-serif;
}
.rich-calendar-footer-optional {
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-12-09 00:55:14 UTC (rev 12481)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/ComponentUtil.java 2008-12-09 10:36:47 UTC (rev 12482)
@@ -170,7 +170,47 @@
}
return null;
}
+
+
+ /**
+ *
+ * @param parentElement
+ * @param facetName
+ * @param order
+ * - indicate what facet should take first or last.
+ * @return
+ */
+ public static Element getFacetElement(Element parentElement,
+ String facetName, boolean last) {
+ NodeList children = parentElement.getChildNodes();
+
+ if (children != null) {
+
+ int index = last ? children.getLength()-1 : 0;
+ int step = last ? -1 : 1;
+ int stopIndex = last ? -1 : children.getLength();
+
+ while (index != stopIndex) {
+
+ Node child = children.item(index);
+
+ if ((child.getNodeType() == Node.ELEMENT_NODE)
+ && RichFaces.TAG_FACET.equals(child.getLocalName())
+ && facetName.equals(((Element) child)
+ .getAttribute(RichFaces.ATTR_NAME))) {
+ return (Element) child;
+ }
+
+ index += step;
+
+ }
+
+ }
+
+ return null;
+ }
+
/**
* Returns true if "rendered" attribute of source element does not contain
* "false" value.
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-12-09 00:55:14 UTC (rev 12481)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesCalendarTemplate.java 2008-12-09 10:36:47 UTC (rev 12482)
@@ -50,7 +50,7 @@
public class RichFacesCalendarTemplate extends VpeAbstractTemplate implements
VpeToggableTemplate {
- private static final WeakHashMap<Node, Object> expandedComboBoxes = new WeakHashMap<Node, Object>();
+ private static final WeakHashMap<Node, Object> expandedCalendars = new WeakHashMap<Node, Object>();
final static int COLUMN = 8;
final static String FILL_WIDTH = "100%"; //$NON-NLS-1$
@@ -116,8 +116,9 @@
final static String UNDEFINED = "undefined"; //$NON-NLS-1$
final static int DEFAULT_CELL_WIDTH = 25;
final static int DEFAULT_CELL_HEIGHT = 22;
+ final static int DEFAULT_OPTIONAL_CELL_HEIGHT = 26;
- final static int JOINT_POINT_BOTTOM = 7;
+ final static int JOINT_POINT_BOTTOM = 5;
final static int JOINT_POINT_TOP = -17;
final static String TOP = "top"; //$NON-NLS-1$
final static String LEFT = "left"; //$NON-NLS-1$
@@ -141,6 +142,9 @@
static final String ATTR_MONTH_LABELS = "monthLabels"; //$NON-NLS-1$
static final String ATTR_ENABLE_MANUAL_INPUT = "enableManualInput"; //$NON-NLS-1$
static final String ATTR_TODAY_CONTROL_MODE = "todayControlMode"; //$NON-NLS-1$
+
+ static final String NAME_OPTIONAL_FACET_FOOTER = "optionalFooter"; //$NON-NLS-1$
+ static final String NAME_OPTIONAL_FACET_HEADER = "optionalHeader"; //$NON-NLS-1$
final private static String DEFAULT_INPUT_STYLE = "vertical-align: middle;";//$NON-NLS-1$
final private static String POSITION_RELATIVE_STYLE = "position: relative;";//$NON-NLS-1$
@@ -234,7 +238,7 @@
ComponentUtil.setCSSLink(pageContext, STYLE_PATH, "calendar"); //$NON-NLS-1$
nsIDOMElement wrapper = visualDocument.createElement(HTML.TAG_SPAN);
- VpeCreationData creationData = new VpeCreationData(wrapper);
+ VpeCreationData creationData = new VpeCreationData(wrapper,true);
nsIDOMElement calendar;
nsIDOMElement calendarWithPopup;
@@ -300,16 +304,27 @@
nsIDOMElement tbody = visualDocument.createElement(HTML.TAG_TBODY);
+ nsIDOMElement optionalHeader = null;
nsIDOMElement header = null;
nsIDOMElement calendarBody = createCalendarBody(visualDocument);
nsIDOMElement footer = null;
-
+ nsIDOMElement optionalFooter = null;
+
+ Element optionalHeaderFacet = ComponentUtil.getFacetElement(sourceElement,
+ NAME_OPTIONAL_FACET_HEADER,true);
+
+ if (optionalHeaderFacet != null) {
+ optionalHeader = createCustomBlock(visualDocument,
+ optionalHeaderFacet, creationData, CSS_R_C_HEADER_OPTIONAL);
+ tableHeight += DEFAULT_OPTIONAL_CELL_HEIGHT;
+ }
+
if (showHeader) {
- Element headerFacet = ComponentUtil.getFacet(sourceElement,
- RichFaces.NAME_FACET_HEADER);
+ Element headerFacet = ComponentUtil.getFacetElement(sourceElement,
+ RichFaces.NAME_FACET_HEADER,true);
if (headerFacet != null) {
- header = createCalendarOptionalHeaderOrFooter(visualDocument,
- creationData, headerFacet, true);
+ header = createCustomBlock(visualDocument, headerFacet,
+ creationData, CSS_R_C_HEADER);
} else {
List<Cell> headerContent = new ArrayList<Cell>();
@@ -330,12 +345,11 @@
}
}
if (showFooter) {
- Element footerFacet = ComponentUtil.getFacet(sourceElement,
- RichFaces.NAME_FACET_FOOTER);
+ Element footerFacet = ComponentUtil.getFacetElement(sourceElement,
+ RichFaces.NAME_FACET_FOOTER,true);
if (footerFacet != null) {
- footer = createCalendarOptionalHeaderOrFooter(visualDocument,
- creationData, footerFacet, false);
+ footer = createCustomBlock(visualDocument, footerFacet, creationData, CSS_R_C_FOOTER);
} else {
List<Cell> footerContent = new ArrayList<Cell>();
@@ -351,7 +365,20 @@
footerContent);
}
}
+
+ Element optionalFooterFacet = ComponentUtil.getFacetElement(sourceElement,
+ NAME_OPTIONAL_FACET_FOOTER,true);
+
+ if (optionalFooterFacet != null) {
+ optionalFooter = createCustomBlock(visualDocument,
+ optionalFooterFacet, creationData, CSS_R_C_FOOTER_OPTIONAL);
+ tableHeight += DEFAULT_OPTIONAL_CELL_HEIGHT;
+ }
+ if (optionalHeader != null) {
+ tbody.appendChild(optionalHeader);
+ }
+
if (null != header) {
tbody.appendChild(header);
}
@@ -359,6 +386,10 @@
if (null != footer) {
tbody.appendChild(footer);
}
+
+ if (optionalFooter != null) {
+ tbody.appendChild(optionalFooter);
+ }
table.appendChild(tbody);
@@ -749,14 +780,14 @@
public void toggle(VpeVisualDomBuilder builder, Node sourceNode,
String toggleId) {
if (isExpanded(sourceNode)) {
- expandedComboBoxes.remove(sourceNode);
+ expandedCalendars.remove(sourceNode);
} else {
- expandedComboBoxes.put(sourceNode, null);
+ expandedCalendars.put(sourceNode, null);
}
}
private boolean isExpanded(Node sourceNode) {
- return expandedComboBoxes.containsKey(sourceNode);
+ return expandedCalendars.containsKey(sourceNode);
}
/**
@@ -994,9 +1025,36 @@
return months;
}
+
/**
*
* @param visualDocument
+ * @param customChild
+ * @param creationData
+ * @param blockClass
+ * @param content
+ * @return
+ */
+ private nsIDOMElement createCustomBlock(nsIDOMDocument visualDocument,
+ Node customChild, VpeCreationData creationData, String blockClass) {
+
+ nsIDOMElement blockTr = visualDocument.createElement(HTML.TAG_TR);
+ nsIDOMElement blockTd = visualDocument.createElement(HTML.TAG_TD);
+ blockTd.setAttribute(HTML.ATTR_COLSPAN, String.valueOf(COLUMN));
+ blockTd.setAttribute(HTML.ATTR_CLASS, blockClass);
+ blockTr.appendChild(blockTd);
+
+ VpeChildrenInfo childrenInfo = new VpeChildrenInfo(blockTd);
+ childrenInfo.addSourceChild(customChild);
+
+ creationData.addChildrenInfo(childrenInfo);
+
+ return blockTr;
+ }
+
+ /**
+ *
+ * @param visualDocument
* @param style
* @param arrayContent
* @param arrayContentStyles
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeCreationData.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeCreationData.java 2008-12-09 00:55:14 UTC (rev 12481)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeCreationData.java 2008-12-09 10:36:47 UTC (rev 12482)
@@ -34,6 +34,12 @@
public VpeCreationData(nsIDOMNode node) {
this.node = node;
}
+
+ public VpeCreationData(nsIDOMNode node, boolean initializeChildren) {
+ this.node = node;
+ if (initializeChildren)
+ this.childrenInfoList = new ArrayList<VpeChildrenInfo>();
+ }
public nsIDOMNode getNode() {
return node;
17 years, 4 months
JBoss Tools SVN: r12481 - branches/jbosstools-3.0.0.CR1.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-12-08 19:55:14 -0500 (Mon, 08 Dec 2008)
New Revision: 12481
Added:
branches/jbosstools-3.0.0.CR1/archives/
branches/jbosstools-3.0.0.CR1/as/
branches/jbosstools-3.0.0.CR1/birt/
branches/jbosstools-3.0.0.CR1/common/
branches/jbosstools-3.0.0.CR1/documentation/
branches/jbosstools-3.0.0.CR1/drools/
branches/jbosstools-3.0.0.CR1/esb/
branches/jbosstools-3.0.0.CR1/examples/
branches/jbosstools-3.0.0.CR1/flow/
branches/jbosstools-3.0.0.CR1/freemarker/
branches/jbosstools-3.0.0.CR1/hibernatetools/
branches/jbosstools-3.0.0.CR1/i18n/
branches/jbosstools-3.0.0.CR1/jbpm/
branches/jbosstools-3.0.0.CR1/jmx/
branches/jbosstools-3.0.0.CR1/jsf/
branches/jbosstools-3.0.0.CR1/jst/
branches/jbosstools-3.0.0.CR1/labs/
branches/jbosstools-3.0.0.CR1/portlet/
branches/jbosstools-3.0.0.CR1/seam/
branches/jbosstools-3.0.0.CR1/smooks/
branches/jbosstools-3.0.0.CR1/struts/
branches/jbosstools-3.0.0.CR1/tests/
branches/jbosstools-3.0.0.CR1/tptp/
branches/jbosstools-3.0.0.CR1/vpe/
branches/jbosstools-3.0.0.CR1/ws/
Log:
Branch for JBossTools 3.0.0.CR1 release has been created
Copied: branches/jbosstools-3.0.0.CR1/archives (from rev 12480, trunk/archives)
Copied: branches/jbosstools-3.0.0.CR1/as (from rev 12480, trunk/as)
Copied: branches/jbosstools-3.0.0.CR1/birt (from rev 12480, trunk/birt)
Copied: branches/jbosstools-3.0.0.CR1/common (from rev 12480, trunk/common)
Copied: branches/jbosstools-3.0.0.CR1/documentation (from rev 12480, trunk/documentation)
Copied: branches/jbosstools-3.0.0.CR1/drools (from rev 12480, trunk/drools)
Copied: branches/jbosstools-3.0.0.CR1/esb (from rev 12480, trunk/esb)
Copied: branches/jbosstools-3.0.0.CR1/examples (from rev 12480, trunk/examples)
Copied: branches/jbosstools-3.0.0.CR1/flow (from rev 12480, trunk/flow)
Copied: branches/jbosstools-3.0.0.CR1/freemarker (from rev 12480, trunk/freemarker)
Copied: branches/jbosstools-3.0.0.CR1/hibernatetools (from rev 12480, trunk/hibernatetools)
Copied: branches/jbosstools-3.0.0.CR1/i18n (from rev 12480, trunk/i18n)
Copied: branches/jbosstools-3.0.0.CR1/jbpm (from rev 12480, trunk/jbpm)
Copied: branches/jbosstools-3.0.0.CR1/jmx (from rev 12480, trunk/jmx)
Copied: branches/jbosstools-3.0.0.CR1/jsf (from rev 12480, trunk/jsf)
Copied: branches/jbosstools-3.0.0.CR1/jst (from rev 12480, trunk/jst)
Copied: branches/jbosstools-3.0.0.CR1/labs (from rev 12480, trunk/labs)
Copied: branches/jbosstools-3.0.0.CR1/portlet (from rev 12480, trunk/portlet)
Copied: branches/jbosstools-3.0.0.CR1/seam (from rev 12480, trunk/seam)
Copied: branches/jbosstools-3.0.0.CR1/smooks (from rev 12480, trunk/smooks)
Copied: branches/jbosstools-3.0.0.CR1/struts (from rev 12480, trunk/struts)
Copied: branches/jbosstools-3.0.0.CR1/tests (from rev 12480, trunk/tests)
Copied: branches/jbosstools-3.0.0.CR1/tptp (from rev 12480, trunk/tptp)
Copied: branches/jbosstools-3.0.0.CR1/vpe (from rev 12480, trunk/vpe)
Copied: branches/jbosstools-3.0.0.CR1/ws (from rev 12480, trunk/ws)
17 years, 4 months