JBoss Rich Faces SVN: r1525 - branches/3.0.2/sandbox-samples/calendar-sample/src/main/webapp/pages.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2007-07-06 12:01:55 -0400 (Fri, 06 Jul 2007)
New Revision: 1525
Modified:
branches/3.0.2/sandbox-samples/calendar-sample/src/main/webapp/pages/index.jsp
Log:
small fix
Modified: branches/3.0.2/sandbox-samples/calendar-sample/src/main/webapp/pages/index.jsp
===================================================================
--- branches/3.0.2/sandbox-samples/calendar-sample/src/main/webapp/pages/index.jsp 2007-07-06 16:01:01 UTC (rev 1524)
+++ branches/3.0.2/sandbox-samples/calendar-sample/src/main/webapp/pages/index.jsp 2007-07-06 16:01:55 UTC (rev 1525)
@@ -10,13 +10,13 @@
<h:form>
<calendar:calendar id="calendar" data="#{calendarDataModel}" locale="#{calendarBean.locale}">
<f:facet name="header">
-
+ {nextMonthControl} | {previousMonthControl}
</f:facet>
<f:facet name="weekNumber">
<h:outputText style="font-weight: bold;" value="{weekNumber}" />
</f:facet>
<f:facet name="weekDay">
- <h:outputText style="font-style: italic;" value="{weekDay}" />
+ <h:outputText style="font-style: italic;" value="{weekDayLabel}" />
</f:facet>
<h:panelGrid>
17 years, 5 months
JBoss Rich Faces SVN: r1524 - branches/3.0.2/sandbox/calendar/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2007-07-06 12:01:01 -0400 (Fri, 06 Jul 2007)
New Revision: 1524
Modified:
branches/3.0.2/sandbox/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js
Log:
Merged with calendar-prototype.js changes;
Today date bug fixed;
Some addons, improvments and optimisation;
Modified: branches/3.0.2/sandbox/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js
===================================================================
--- branches/3.0.2/sandbox/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js 2007-07-06 15:57:52 UTC (rev 1523)
+++ branches/3.0.2/sandbox/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js 2007-07-06 16:01:01 UTC (rev 1524)
@@ -2,12 +2,12 @@
window.LOG = {warn:function(){}};
}
-if (!window.Richfaces) window.Richfaces={};
+//if (!window.Richfaces) window.Richfaces={};
Object.extend(Event, {
findElementByAttr : function(event, tagName, attribute, value, flag) {
var element = Event.findElement(event, tagName);
- while (!element[attribute] || (flag ? element[attribute].indexOf(value)==0 : element[attribute]!=value) )
+ while (!element[attribute] || (flag ? element[attribute].indexOf(value)!=0 : element[attribute]!=value) )
{
element = element.parentNode;
}
@@ -95,9 +95,14 @@
// weekDayLabels - collection of week day labels keyed by week day numbers
// minDaysInFirstWeek - locale-specific constant defining number of days in the first week
// firstWeekDay - (0..6) locale-specific constant defining number of the first week day
+ // showWeekDaysBar - show WeekDays Bar [default value is true]
+ // showWeeksBar - show Weeks numbers bar [default value is true]
this.id = id;
this.params = parameters;
+ if (!this.showWeekDaysBar) this.showWeekDaysBar = true;
+ if (!this.showWeeksBar) this.showWeeksBar = true;
+
this.currentDate = this.params.currentDate;
this.selectedDate = this.params.selectedDate;
@@ -124,30 +129,38 @@
var htmlTextFooter = '</table><div id="div_'+this.params.dayListTableId+'_selected_date"></div>\n';
// days bar creation
- var htmlTextWeekDayBar = '<tr id="'+this.params.weekDayBarId+'"><td style="border-top:0px"></td>';
- var weekDayCounter = this.params.firstWeekDay;
- for (var i=0;i<7;i++)
- {
- var weekDayHtml = this.params.weekDayMarkup( {weekDay: this.params.weekDayLabels[weekDayCounter]} );
- if (weekDayCounter==6) weekDayCounter=0; else weekDayCounter++;
+ var htmlTextWeekDayBar='';
+ if (this.params.showWeekDaysBar)
+ {
+ var htmlTextWeekDayBar = '<tr id="'+this.params.weekDayBarId+'">';
+ if (this.params.showWeeksBar) htmlTextWeekDayBar+='<td style="border-top:0px"></td>';
+ var weekDayCounter = this.params.firstWeekDay;
+ for (var i=0;i<7;i++)
+ {
+ var weekDayHtml = this.params.weekDayMarkup( {weekDayLabel: this.params.weekDayLabels[weekDayCounter], weekDayNumber:weekDayCounter} );
+ if (weekDayCounter==6) weekDayCounter=0; else weekDayCounter++;
- htmlTextWeekDayBar+='<td id="'+this.params.weekDayBarId+i+'" class="'+(i==this.firstWeekendDayNumber || i==this.secondWeekendDayNumber ? "Weekendclass" : "Dayclass")+'">'+weekDayHtml+'</td>';
+ htmlTextWeekDayBar+='<td class="'+(i==this.firstWeekendDayNumber || i==this.secondWeekendDayNumber ? "Weekendclass" : "Dayclass")+'">'+weekDayHtml+'</td>';
+ }
+ htmlTextWeekDayBar+='</tr>\n';
}
- htmlTextWeekDayBar+='</tr>\n';
// week & weekNumber creation
- var htmlTextWeek="";
+ var htmlTextWeek='';
var p=0;
for (k=1;k<7;k++)
{
-
- var weekNumberHtml = this.params.weekNumberMarkup( {weekNumber: k} );
-
- htmlTextWeek+='<tr><td id="'+this.params.weekNumberBarId+k+'">'+weekNumberHtml+'</td>';
+ htmlTextWeek+='<tr id="'+this.params.weekNumberBarId+k+'">';
+ if (this.params.showWeeksBar)
+ {
+ var weekNumberHtml = this.params.weekNumberMarkup( {weekNumber: k} );
+ htmlTextWeek+='<td>'+weekNumberHtml+'</td>';
+ }
for (var i=0;i<7;i++)
{
- htmlTextWeek+='<td id="'+this.params.dayListTableId+'_cell'+(p++)+'" style="vertical-align:top"></td>';
+ htmlTextWeek+='<td id="'+this.params.dayListTableId+'_cell'+p+'" style="vertical-align:top"></td>';
+ p++;
}
htmlTextWeek+='</tr>';
}
@@ -156,10 +169,9 @@
var obj=$(id);
obj.component = this;
obj.innerHTML = htmlTextHeader+htmlControlsHeader+htmlTextWeekDayBar+htmlTextWeek+htmlTextFooter;
-
+
this.prepareEvents();
-
- this.submitFunction = this.params.submitFunction.bind(this);
+ this.submitFunction = this.params.submitFunction.bind(this);
},
isWeekend: function(weekday) {
@@ -210,7 +222,7 @@
if (obj)
{
var daydata = this.days[parseInt(obj.id.substr(idstr.length))];
- if (daydata && daydata._month==0 && Element.hasClassName(obj,daydata._className)) Element.replaceClassName(obj,daydata._className, daydata._hoverClassName);
+ if (daydata._month==0 && Element.hasClassName(obj,daydata._className)) Element.replaceClassName(obj,daydata._className, daydata._hoverClassName);
}
},
@@ -220,7 +232,7 @@
if (obj)
{
var daydata = this.days[parseInt(obj.id.substr(idstr.length))];
- if (daydata && daydata._month==0 && Element.hasClassName(obj,daydata._hoverClassName)) Element.replaceClassName(obj,daydata._hoverClassName, daydata._className);
+ if (daydata._month==0 && Element.hasClassName(obj,daydata._hoverClassName)) Element.replaceClassName(obj,daydata._hoverClassName, daydata._className);
}
},
@@ -278,19 +290,18 @@
var dateDiv = $("div_"+this.params.dayListTableId);
dateDiv.innerHTML = currentYear + "/" + (currentMonth+1);
-
var wd = getDay(this.currentDate, this.params.firstWeekDay);
var currentMonthDays = daysInMonthByDate(this.currentDate);
var previousMonthDays = daysInMonth(currentYear, currentMonth-1);
- var wn = weekNumber(currentYear, currentMonth, this.params.minDaysInFirstWeek, this.params.firstWeekDay) /// fix it
var p=0;
this.days = [];
var dayCounter = previousMonthDays - wd + 1;
+
// previuos month days
if (wd>0) while (dayCounter<=previousMonthDays) {this.days.push({day:dayCounter, _isWeekend: this.isWeekend(p), _month:-1, _className:"Disableddayclass"}); dayCounter++; p++; }
dayCounter = 1;
-
+
// current month days
if (this.daysData && this.daysData.index[currentYear+'-'+currentMonth]!=undefined)
{
@@ -314,6 +325,7 @@
{
flag = this.isWeekend(p%7);
obj = this.daysData.days[idx];
+ obj.day = dayCounter;
obj._isWeekend = flag;
obj._month = 0;
if (flag) {obj._className = "Weekenddayclass"; obj._hoverClassName = "Hoveredweekclass";}
@@ -338,30 +350,36 @@
// next month days
var ld = 7-p%7;
if (ld!=7) while (dayCounter<=ld) { this.days.push({day:dayCounter++, _isWeekend: this.isWeekend(p%7), _month:1, _className:"Disableddayclass"}); }
-
+
// render
p=0;
var element;
var dataobj;
+ var wn;
+ if (this.params.showWeeksBar) wn = weekNumber(currentYear, currentMonth, this.params.minDaysInFirstWeek, this.params.firstWeekDay); /// fix it
this.selectedDayElement=null;
+
for (var k=1;k<7;k++)
{
//
dataobj = this.days[p];
- var obj = $(this.params.weekNumberBarId+k).parentNode;
-
- if (k!=1 && currentMonth==11 && dataobj && dataobj.day>27)
+ var obj = $(this.params.weekNumberBarId+k);
+ element = obj.firstChild;
+
+ // week number update
+ if (this.params.showWeeksBar)
{
- if (getFirstWeek(currentYear+1, this.params.minDaysInFirstWeek, this.params.firstWeekDay).weekNumber==1) wn=1;
+ if (k!=1 && currentMonth==11 && dataobj && dataobj.day>27)
+ {
+ if (getFirstWeek(currentYear+1, this.params.minDaysInFirstWeek, this.params.firstWeekDay).weekNumber==1) wn=1;
+ }
+ element.innerHTML = (dataobj) ? this.params.weekNumberMarkup( {weekNumber: wn++} ) : "";
+ if (k==1&&wn>52) wn=1;
+ element = element.nextSibling;
}
-
- element = obj.firstChild;
- element.innerHTML = (dataobj) ? this.params.weekNumberMarkup( {weekNumber: wn++} ) : "";
-
- if (k==1&&wn>52) wn=1;
-
- while (element=element.nextSibling)
+
+ while (element)
{
// TODO fix start/stop event's calls
this.stopCellEvents(element);
@@ -369,7 +387,7 @@
if (dataobj) {
element.data=dataobj.day;
element.innerHTML = this.params.dayListMarkup( dataobj );
- element.className = dataobj._className + (todayflag /*&& dataobj._month==0 */&& dataobj.day==todaydate ? " Todayclass" : "");
+ element.className = dataobj._className + (todayflag && dataobj._month==0 && dataobj.day==todaydate ? " Todayclass" : "");
if (selectedflag && dataobj._month==0 && dataobj.day==selecteddate) { this.selectedDateElement = element; element.className+=" Selecteddayclass"; }
this.setCellEvents(element);
p++;
@@ -377,9 +395,11 @@
//element.data="";
element.innerHTML = "";
}
+
dataobj = this.days[p];
+ element=element.nextSibling;
}
- }
+ }
},
nextMonth: function() {
@@ -425,15 +445,15 @@
});
Calendar.getDayView = function(context) {
- return Richfaces.eval("day", context);
+ return Richfaces.evalSimpleMacro("day", context);
};
Calendar.getWeekNumberView = function(context) {
- return Richfaces.eval("weekNumber", context);
+ return Richfaces.evalSimpleMacro("weekNumber", context);
};
Calendar.getWeekDayView = function(context) {
- return Richfaces.eval("weekDay", context);
+ return Richfaces.evalSimpleMacro("weekDayLabel", context);
};
Calendar.getControl = function(context, attributes, text, functionName) {
@@ -444,7 +464,7 @@
if (attributes) {
Object.extend(attr, attributes);
}
- return new E('button',attr,[new T(text)]).getContent(context);
+ return new E('button',attr,[new T(text)]);
};
Calendar.nextYearControl = function(context) {
@@ -493,4 +513,4 @@
])
])
]
- );
+ );
\ No newline at end of file
17 years, 5 months
JBoss Rich Faces SVN: r1523 - branches/3.0.2/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/json.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2007-07-06 11:57:52 -0400 (Fri, 06 Jul 2007)
New Revision: 1523
Modified:
branches/3.0.2/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/json/json-dom.js
Log:
some updates
Modified: branches/3.0.2/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/json/json-dom.js
===================================================================
--- branches/3.0.2/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/json/json-dom.js 2007-07-06 15:08:58 UTC (rev 1522)
+++ branches/3.0.2/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/json/json-dom.js 2007-07-06 15:57:52 UTC (rev 1523)
@@ -79,17 +79,19 @@
this.value = text;
};
+
//ET.prototype = new JSNode();
ET.prototype.getContent = function(context) {
var value = this.value;
- if (typeof value == "function")
- value = value(context);
-
+ if (value && value.getContent) {
+ value = value.getContent(context);
+ }
+
if (value) return value;
return "";
};
-
+
// Text node
T = function(text) {
this.value = text;
@@ -98,8 +100,9 @@
T.prototype = new JSNode();
T.prototype.getContent = function(context) {
var value = this.value;
- if (typeof value == "function")
- value = value(context);
+ if (value && value.getContent) {
+ value = value.getContent(context);
+ }
if (value) return this.xmlEscape(value);
17 years, 5 months
JBoss Rich Faces SVN: r1521 - trunk/docs/userguide/en/src/main/docbook/modules.
by richfaces-svn-commits＠lists.jboss.org
Author: vkorluzhenko
Date: 2007-07-06 10:31:09 -0400 (Fri, 06 Jul 2007)
New Revision: 1521
Modified:
trunk/docs/userguide/en/src/main/docbook/modules/RFCfaq.xml
Log:
http://jira.jboss.org/jira/browse/RF-389
Modified: trunk/docs/userguide/en/src/main/docbook/modules/RFCfaq.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/modules/RFCfaq.xml 2007-07-06 14:06:29 UTC (rev 1520)
+++ trunk/docs/userguide/en/src/main/docbook/modules/RFCfaq.xml 2007-07-06 14:31:09 UTC (rev 1521)
@@ -112,101 +112,87 @@
</section>
<section id="Organizewizards">
- <?dbhtml filename="Howtoorganizewizards"?>
+ <?dbhtml filename="Organizewizards"?>
<title>How to organize wizards using the <rich:modalPanel> component?</title>
<para>It's necessary to put <emphasis role="bold"
- ><a4j:include></emphasis> inside the <emphasis
+ ><a4j:include></emphasis> inside the <emphasis
role="bold"><rich:modalPanel></emphasis> and perform
navigation inside it, as it's shown in the example below:</para>
<programlisting role="XML"><![CDATA[...
- <rich:modalPanel id="mp" minHeight="200" minWidth="450" height="200" width="500" zindex="2000">
- <f:facet name="header">
- <h:outputText value="Modal Panel Title" />
- </f:facet>
- <a4j:include viewId="/pages/include/first.xhtml"/>
- <a href="javascript:Richfaces.hideModalPanel('mp')">hide this panel</a>
+ <f:verbatim>
+ <a href="javascript:Richfaces.showModalPanel('_panel',{left:'auto', top:'auto'})">Show Modal Panel</a>
+ </f:verbatim>
+ <rich:modalPanel id="_panel">
+ <a4j:outputPanel id="view" >
+ <a4j:include viewId="/pages/included1.xhtml"></a4j:include>
+ </a4j:outputPanel>
</rich:modalPanel>
...
+
+faces-config.xml:
+...
+
+ <navigation-rule>
+ <from-view-id>/pages/included1.xhtml</from-view-id>
+ <navigation-case>
+ <from-outcome>included2</from-outcome>
+ <to-view-id>/pages/included2.xhtml</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+...
+
+included1.xhtml:
+...
+ <h:form>
+ <h:outputText value="Go to the step 2"/>
+ <a4j:commandButton value="next" action="included2" reRender="view"/>
+ </h:form>
+...
+
+included2.xhtml
+
+...
+ <h:form>
+ <h:outputText value="Close window"/>
+ <h:commandButton type="button" value="Close" onclick="javascript:Richfaces.hideModalPanel('_panel')"/>
+ </h:form>
+...
+
]]></programlisting>
- <para>For more information, follow the <ulink
- url="http://labs.jboss.com/wiki/ModalPanelWizards"
- >link</ulink>.</para>
+ <para>For information, follow the <ulink
+ url="http://labs.jboss.com/wiki/ModalPanelWizards"
+ >link</ulink>.</para>
</section>
<section>
<?dbhtml filename="Howtopreventmodalpanelfromclosure"?>
<title>How to prevent modalPanel from closing when the validation inside fails?</title>
- <para>Simple code is placed below to provide such kind of behavior.</para>
- <programlisting role="XML"><![CDATA[...
- <ui:define name="body">
- <f:verbatim>
- <a href="javascript:Richfaces.showModalPanel('_panel',{left:'auto', top:'auto'})">Show Modal Panel</a>
- </f:verbatim>
- <rich:modalPanel id="_panel">
- <f:facet name="header">
- <h:outputText value="test"></h:outputText>
- </f:facet>
- <h:form id="mpform">
- <a4j:outputPanel ajaxRendered="true">
- <h:messages id="error"></h:messages>
- </a4j:outputPanel>
- <h:inputText value="#{bean.property}" required="true"></h:inputText>
- <a4j:commandLink value="click" oncomplete="windowclose();" reRender="test" />
- </h:form>
- </rich:modalPanel>
- <script type="text/javascript">
- ...
- </script>
- </ui:define>
-...
-]]></programlisting>
+ <para>The answer could be found <ulink
+ url="http://labs.jboss.com/wiki/ModalPanelValidation"
+ >here</ulink>.</para>
</section>
<section>
<?dbhtml filename="HowtousesuggestionBox"?>
- <title>How to use suggestionBox inside the modalPanel content? When I use it the
- popup suggestion list doesn't show since it is behind the
- modalPanel.</title>
- <para>First of all to solve this problem you should use the latest versions of
- Ajax4JSF 1.1.2-SNAPSHOT and Richfaces 3.0.2-SNAPSHOT.</para>
+ <title>Why when I use suggestionBox inside the modalPanel content the popup
+ suggestion list doesn't show since it is behind the modalPanel.</title>
+ <para>To solve this problem you should use the latest versions of Ajax4JSF
+ 1.1.2-SNAPSHOT and Richfaces 3.0.2-SNAPSHOT.</para>
<para> Nightly builds are available <ulink
url="http://maven.exadel.com/org/richfaces/richfaces/3.0.2-SNAPSHOT/"
>here</ulink> for RichFaces and <ulink
url="http://maven.exadel.com/org/ajax4jsf/ajax4jsf/1.1.2-SNAPSHOT/"
>here</ulink> for Ajax.</para>
- <para>Also the example of using <emphasis role="bold"
- ><rich:suggestionBox></emphasis> inside the <emphasis
- role="bold"><rich:modalPanel></emphasis> content is
- placed below.</para>
- <programlisting role="XML"><![CDATA[...
- <ui:define name="body">
- <a href="javascript:Richfaces.showModalPanel('panel',{left:'auto', top:'auto'})">Show</a>
- <rich:modalPanel id="panel">
- <h:form>
- <h:inputText value="#{bean.property}" id="test" size="50" required="true"></h:inputText>
- <rich:suggestionbox width="200" height="200" for="test"
- suggestionAction="#{bean.autocomplete}" var="cap" ajaxSingle="false" limitToList="false" reRender="panel1">
- <h:column>
- <h:outputText value="#{cap.text}"></h:outputText>
- </h:column>
- </rich:suggestionbox>
- <a4j:log>....</a4j:log>
- </h:form>
- </rich:modalPanel>
- </ui:define>
-...
-]]></programlisting>
- <para>In this case the popup suggestion list is above the modalPanel.</para>
</section>
<section>
<?dbhtml filename="DoesRichFacesworkwithfacelets"?>
<title>Does RichFaces work with facelets?</title>
<para>Main <ulink url="http://livedemo.exadel.com/richfaces-demo/"> demo</ulink> of
- RichFaces is a facelets based application. So, the answer is yes.</para>
+ RichFaces is a facelets based application. Full Facelets support is one of the main features. So, the answer is yes.</para>
</section>
- <!-- <section>
+ <!-- <section>
<?dbhtml filename="RerenderingPartPage.html"?>
<title>How to reRender only particular row(s) of dataTable?</title>
<para> If you use <emphasis role="bold"><rich:dataTable></emphasis>
@@ -231,23 +217,38 @@
<?dbhtml filename="Isitpossibletocustomizelookofdatascroller"?>
<title>Is it possible to customize the look of dataScroller (the forward/back
buttons) and replace them with an images?</title>
- <para>The answer is yes. Use facets: "first_disabled",
- "last_disabled", "next_disabled",
- "previous_disabled",
+ <para>The answer is yes. </para>
+ <para>Component provides two controllers groups for switching:</para>
+ <itemizedlist>
+ <listitem>Page numbers for switching onto a particular page</listitem>
+ <listitem>The controls of fast switching: "first",
+ "last", "next",
+ "previous", "fastforward",
+ "fastrewind"</listitem>
+ </itemizedlist>
+ <para>The controls of fast switching are created adding the facets component with
+ the corresponding name:</para>
+ <programlisting role="XML"><![CDATA[ ...
+ <rich:datascroller for="table" maxPages="10">
+ <f:facet name="first">
+ <h:outputText value="First"/>
+ </f:facet>
+ <f:facet name="last">
+ <h:outputText value="Last"/>
+ </f:facet>
+ </rich:datascroller>
+...
+]]></programlisting>
+ <para> There are also facets used to create the disabled states:
+ "first_disabled", "last_disabled",
+ "next_disabled", "previous_disabled",
"fastforward_disabled",
- "fastrewind_disabled".</para>
+ "fastrewind_disabled". </para>
</section>
<section>
- <?dbhtml filename="HowtocustomizesimpleTogglePanel"?>
- <title>How to customize simpleTogglePanel? I need to change an icon for a toggler.</title>
- <para>To customize an icon for a toggler, use "openMarker" and
- "closeMarker" facets.</para>
- </section>
-
- <section>
<?dbhtml filename="Howtoredirecttoanotherpage"?>
- <title><rich:dropDown> component: How to redirect to another page?</title>
+ <title>How to place a simple links inside menu?</title>
<para>If you want to navigate outside, when application uses an external URL, you
should use the following approach:</para>
<programlisting role="XML"><![CDATA[...
@@ -264,15 +265,14 @@
...
]]></programlisting>
<para>Also online demo <emphasis role="bold"
- ><rich:dropDownMenu></emphasis> component is available
- <ulink
+ ><rich:dropDownMenu></emphasis> component is available <ulink
url="http://livedemo.exadel.com/richfaces-demo/richfaces/dropDownMenu.jsf"
>here</ulink>.</para>
</section>
<section>
<?dbhtml filename="CanthedropDownMenubeincludedintreenodes"?>
- <title>Can dropDownMenu be included in tree nodes?</title>
+ <title>Can I use dropDownMenu as context menu?</title>
<para>The <emphasis role="bold"><rich:dropDownMenu></emphasis> is
designed keeping in mind that it should not be used for a contextMenu
purpose. We have a <emphasis role="bold"
@@ -290,14 +290,19 @@
<section>
<?dbhtml filename="Howtoaddalinktothetreenode"?>
- <title>How to add a link to the tree node?</title>
+ <title>How to add a simple link to the tree node?</title>
<para>Simple code is placed below:</para>
<programlisting role="XML"><![CDATA[...
- <rich:tree value="#{bean.data}" var="data">
- <rich:treeNode type="text" nodeClass="customNode" acceptedTypes="file2" onselected="return false;">
- <h:commandLink value="#{data.linkValue}" action="#{data.someAction}"/>
- </rich:treeNode>
- </rich:tree>
+ <rich:tree …>
+ …
+ <rich:treeNode submitMode="none"
+ onclick="document.location.href='http://labs.jboss.com/jbossrichfaces/'">
+ <h:outputLink value="http://labs.jboss.com/jbossrichfaces/">
+ <h:outputText value="RichFaces Home Page"></h:outputText>
+ </h:outputLink>
+ </rich: treeNode>
+ …
+</rich:tree …>
...
]]></programlisting>
</section>
@@ -306,8 +311,8 @@
<?dbhtml filename="Isitpossibletoplacetabsvertically"?>
<title>Is it possible to place tabs upright in the tabPanel?</title>
<para>It's not possible to place tabs upright in the tabPanel. For this
- purporse it's necessary to use togglePanel. Toggle controls can be
- placed anywhere in the layout.</para>
+ purporse use togglePanel. Toggle controls can be placed anywhere in the
+ layout.</para>
</section>
<section>
@@ -332,7 +337,7 @@
<section>
<?dbhtml filename="Howtoremembercurrentselectedtab"?>
- <title>How to remember the current selected tab?</title>
+ <title>How to define the currently selected tab?</title>
<para> Simple code is placed below:</para>
<programlisting role="XML"><![CDATA[...
<rich:tabPanel selectedTab="t2">
@@ -381,18 +386,20 @@
url="http://www.jboss.com/index.html?module=bb&op=viewtopic&t=103494"
>here</ulink>.</para>
</section>
-
+
<section>
<?dbhtml filename="Isthereawaytocapturetherowdata"?>
<title>Is there a way to capture the rowdata of dataTable and subTable?</title>
- <para> For necessary information you can see discussion about this problem on the <ulink
- url="http://jboss.com/index.html?module=bb&op=viewtopic&t=111965"
- >RichFaces Users Forum</ulink></para>
+ <para> For necessary information you can see discussion about this problem on the
+ <ulink
+ url="http://jboss.com/index.html?module=bb&op=viewtopic&t=111965"
+ >RichFaces Users Forum</ulink></para>
</section>
-
+
<section>
<?dbhtml filename="Isitpossibletouse thedatascroller"?>
- <title>Is it possible to use datascroller without its table border and styles (to show only links)?</title>
+ <title>Is it possible to use datascroller without its table border and styles (to
+ show only links)?</title>
<para> It' necessary to redefine rich* classes for example like this:</para>
<programlisting role="JAVA"><![CDATA[.rich-datascr-button {
border: 0px;
@@ -408,7 +415,7 @@
<?dbhtml filename="subTableincombinationwithdataTable"?>
<title>How to use subTable in combination with dataTable?</title>
<para>The answer could be found <ulink
- url="http://www.jboss.com/index.html?module=bb&op=viewtopic&p=4059044#..."
- >here</ulink>.</para>
+ url="http://www.jboss.com/index.html?module=bb&op=viewtopic&p=4059044#..."
+ >here</ulink>.</para>
</section>
-</chapter>
+ </chapter>
17 years, 5 months
JBoss Rich Faces SVN: r1520 - branches/3.0.2/sandbox/scrollable-grid/src/main/java/org/richfaces/event/sort.
by richfaces-svn-commits＠lists.jboss.org
Author: maksimkaszynski
Date: 2007-07-06 10:06:29 -0400 (Fri, 06 Jul 2007)
New Revision: 1520
Modified:
branches/3.0.2/sandbox/scrollable-grid/src/main/java/org/richfaces/event/sort/MultiColumnSortListener.java
Log:
fixed unsupported op exception
Modified: branches/3.0.2/sandbox/scrollable-grid/src/main/java/org/richfaces/event/sort/MultiColumnSortListener.java
===================================================================
--- branches/3.0.2/sandbox/scrollable-grid/src/main/java/org/richfaces/event/sort/MultiColumnSortListener.java 2007-07-06 13:14:42 UTC (rev 1519)
+++ branches/3.0.2/sandbox/scrollable-grid/src/main/java/org/richfaces/event/sort/MultiColumnSortListener.java 2007-07-06 14:06:29 UTC (rev 1520)
@@ -5,6 +5,7 @@
import java.util.Arrays;
import java.util.Iterator;
+import java.util.LinkedList;
import java.util.List;
import javax.faces.context.FacesContext;
@@ -53,7 +54,7 @@
fields = new SortField[] {new SortField(name, columnIndex, Boolean.TRUE)};
} else {
- List newFields = Arrays.asList(fields);
+ List newFields = new LinkedList(Arrays.asList(fields));
SortField newField = null;
for (Iterator iterator = newFields.iterator(); iterator.hasNext() && newField == null; ) {
17 years, 5 months
JBoss Rich Faces SVN: r1519 - branches/3.0.2/sandbox/calendar/src/main/resources/org/richfaces/renderkit/html/css.
by richfaces-svn-commits＠lists.jboss.org
Author: akushunin
Date: 2007-07-06 09:14:42 -0400 (Fri, 06 Jul 2007)
New Revision: 1519
Modified:
branches/3.0.2/sandbox/calendar/src/main/resources/org/richfaces/renderkit/html/css/calendar.xcss
Log:
added skin parameters
Modified: branches/3.0.2/sandbox/calendar/src/main/resources/org/richfaces/renderkit/html/css/calendar.xcss
===================================================================
--- branches/3.0.2/sandbox/calendar/src/main/resources/org/richfaces/renderkit/html/css/calendar.xcss 2007-07-06 12:18:56 UTC (rev 1518)
+++ branches/3.0.2/sandbox/calendar/src/main/resources/org/richfaces/renderkit/html/css/calendar.xcss 2007-07-06 13:14:42 UTC (rev 1519)
@@ -131,4 +131,95 @@
}
]]>
</f:verbatim>
+
+ <u:selector name=".calendar_exterior">
+ <u:style name="border-color" skin="panelBorderColor"/>
+ </u:selector>
+
+ <u:selector name=".calendar_header">
+ <u:style name="border-bottom" skin="panelBorderColor"/>
+ <u:style name="background" skin="additionalBackgroundColor"/>
+ <u:style name="font-size" skin="generalSizeFont"/>
+ <u:style name="font-family" skin="generalFamilyFont"/>
+ </u:selector>
+
+ <u:selector name=".calendar_cell">
+ <u:style name="border-bottom" skin="panelBorderColor"/>
+ <u:style name="border-right" skin="panelBorderColor"/>
+ <u:style name="background-color" skin="generalBackgroundColor"/>
+ <u:style name="font-size" skin="generalSizeFont"/>
+ <u:style name="font-family" skin="generalFamilyFont"/>
+ </u:selector>
+
+ <u:selector name=".calendar_tool">
+ <u:style name="border-bottom" skin="panelBorderColor"/>
+ <u:style name="background-color" skin="headerBackgroundColor"/>
+ <u:style name="font-size" skin="headerSizeFont"/>
+ <u:style name="font-family" skin="headerFamilyFont"/>
+ <u:style name="color" skin="headerTextColor"/>
+ </u:selector>
+
+ <u:selector name=".calendar_month">
+ <u:style name="border-bottom" skin="panelBorderColor"/>
+ <u:style name="background-color" skin="headerBackgroundColor"/>
+ <u:style name="font-size" skin="headerSizeFont"/>
+ <u:style name="font-family" skin="headerFamilyFont"/>
+ <u:style name="color" skin="headerTextColor"/>
+ </u:selector>
+
+ <u:selector name=".calendar_days">
+ <u:style name="border-bottom" skin="panelBorderColor"/>
+ <u:style name="border-right" skin="panelBorderColor"/>
+ <u:style name="background" skin="additionalBackgroundColor"/>
+ <u:style name="font-size" skin="generalSizeFont"/>
+ <u:style name="font-family" skin="generalFamilyFont"/>
+ </u:selector>
+
+/* background-color : #f5f5f5; unknown parameter - need to add*/
+ <u:selector name=".calendar_week">
+ <u:style name="border-bottom" skin="panelBorderColor"/>
+ <u:style name="border-right" skin="panelBorderColor"/>
+ <u:style name="font-size" skin="generalSizeFont"/>
+ <u:style name="font-family" skin="generalFamilyFont"/>
+ </u:selector>
+
+/*
+.calendar_holly{
+ background-color : #ffebda; /*unknown parameter - need to add
+ color : #ff7800; /*unknown parameter - need to add
+}
+*/
+/*
+.calendar_current{
+ background-color : #ff7800; /*unknown parameter - need to add
+ color : #ffebda; /*unknown parameter - need to add
+ font-weight : bold;
+}
+*/
+/*
+.calendar_spec{
+ background-color : #e4f5e2; /*unknown parameter - need to add
+}
+*/
+ <u:selector name=".calendar_select">
+ <u:style name="background-color" skin="headerBackgroundColor"/>
+ <u:style name="color" skin="headerTextColor"/>
+ </u:selector>
+
+ <u:selector name=".calendar_toolfooter">
+ <u:style name="border-top" skin="panelBorderColor"/>
+ <u:style name="border-right" skin="panelBorderColor"/>
+ <u:style name="background" skin="additionalBackgroundColor"/>
+ <u:style name="font-size" skin="generalSizeFont"/>
+ <u:style name="font-family" skin="generalFamilyFont"/>
+ </u:selector>
+
+ <u:selector name=".calendar_footer">
+ <u:style name="border-top" skin="panelBorderColor"/>
+ <u:style name="border-right" skin="panelBorderColor"/>
+ <u:style name="background" skin="additionalBackgroundColor"/>
+ <u:style name="font-size" skin="generalSizeFont"/>
+ <u:style name="font-family" skin="generalFamilyFont"/>
+ </u:selector>
+
</f:template>
\ No newline at end of file
17 years, 5 months
JBoss Rich Faces SVN: r1518 - branches/3.0.2/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2007-07-06 08:18:56 -0400 (Fri, 06 Jul 2007)
New Revision: 1518
Modified:
branches/3.0.2/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/ScrollableGrid.js
Log:
RF 395
Modified: branches/3.0.2/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/ScrollableGrid.js
===================================================================
--- branches/3.0.2/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/ScrollableGrid.js 2007-07-06 12:09:11 UTC (rev 1517)
+++ branches/3.0.2/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/ScrollableGrid.js 2007-07-06 12:18:56 UTC (rev 1518)
@@ -81,11 +81,24 @@
if(this.scroll_si.value !=''){
var options = this.scroll_si.value.split(',');
this.restoreScrollState(options[0],options[1],options[2]);
- }
- Event.observe(document.body, "submit",this.restoreScrollPos.bindAsEventListener(this));
+ }
+
+ var form = this.getForm($(this.client_id));
+ Event.observe(form, "submit",this.restoreScrollPos.bindAsEventListener(this));
}
},
+ getForm: function(element){
+ var node = element;
+ if(node){
+ while(node.tagName.toUpperCase() != 'FORM'){
+ node = node.parentNode;
+ }
+ }
+
+ return node;
+ },
+
onSortComplete : function(request, event, data){
var options = request.getJSON("options");
Utils.AJAX.updateRows(options,request,
17 years, 5 months
JBoss Rich Faces SVN: r1517 - in branches/3.0.2/richfaces-samples/datascroller-sample/src/main: webapp/pages and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: A.Skokov
Date: 2007-07-06 08:09:11 -0400 (Fri, 06 Jul 2007)
New Revision: 1517
Modified:
branches/3.0.2/richfaces-samples/datascroller-sample/src/main/java/org/richfaces/TestBean.java
branches/3.0.2/richfaces-samples/datascroller-sample/src/main/webapp/pages/index.jsp
Log:
http://jira.jboss.com/jira/browse/RF-409
Modified: branches/3.0.2/richfaces-samples/datascroller-sample/src/main/java/org/richfaces/TestBean.java
===================================================================
--- branches/3.0.2/richfaces-samples/datascroller-sample/src/main/java/org/richfaces/TestBean.java 2007-07-06 12:09:05 UTC (rev 1516)
+++ branches/3.0.2/richfaces-samples/datascroller-sample/src/main/java/org/richfaces/TestBean.java 2007-07-06 12:09:11 UTC (rev 1517)
@@ -27,7 +27,7 @@
import org.richfaces.event.DataScrollerEvent;
public class TestBean {
-
+
private ArrayList data;
private ArrayList data1;
private ArrayList data2;
@@ -38,9 +38,11 @@
public boolean renderIfSinglePage;
public int rows;
public int maxpage;
+ private int actionCount;
+ private int eventCount;
-
- public TestBean () {
+
+ public TestBean () {
renderIfSinglePage=true;
renderIfSinglePage=true;
@@ -48,31 +50,45 @@
maxpage=10;
data = new ArrayList();
- for (int i = 0; i < 10; i++) data.add(new Entry(null,i));
+ for (int i = 0; i < 10; i++) {
+ data.add(new Entry(null, i));
+ }
data1 = new ArrayList();
- for (int i = 0; i < 11; i++) data1.add(new Entry(null,i));
+ for (int i = 0; i < 11; i++) {
+ data1.add(new Entry(null, i));
+ }
data2 = new ArrayList();
- for (int i = 0; i < 12; i++) data2.add(new Entry(null,i));
+ for (int i = 0; i < 12; i++) {
+ data2.add(new Entry(null, i));
+ }
data3 = new ArrayList();
- for (int i = 0; i < 13; i++) data3.add(new Entry(null,i));
+ for (int i = 0; i < 13; i++) {
+ data3.add(new Entry(null, i));
+ }
data4 = new ArrayList();
- for (int i = 0; i < 14; i++) data4.add(new Entry(null,i));
+ for (int i = 0; i < 14; i++) {
+ data4.add(new Entry(null, i));
+ }
data5 = new ArrayList();
- for (int i = 0; i < 15; i++) data5.add(new Entry(null,i));
+ for (int i = 0; i < 15; i++) {
+ data5.add(new Entry(null, i));
+ }
data6 = new ArrayList();
- for (int i = 0; i < 16; i++) data6.add(new Entry(null,i));
+ for (int i = 0; i < 16; i++) {
+ data6.add(new Entry(null, i));
+ }
}
-
-
- public void setRenderIfSinglePage(boolean renderIfSinglePage){
+
+
+ public void setRenderIfSinglePage(boolean renderIfSinglePage){
this.renderIfSinglePage = renderIfSinglePage;
}
@@ -80,17 +96,17 @@
return this.renderIfSinglePage;
}
- public void setRows(int rows){
-
+ public void setRows(int rows){
+
this.rows = rows;
}
public int getRows() {
-
+
return this.rows;
}
- public void setMaxpage(int maxpage){
+ public void setMaxpage(int maxpage){
this.maxpage = maxpage;
}
@@ -101,15 +117,16 @@
public void onAction(ActionEvent actionEvent) {
System.out.println("TestBean.onAction() " + actionEvent);
+ actionCount++;
}
-
-
+
+
public void doScroll(DataScrollerEvent event) {
String oldScrolVal = event.getOldScrolVal();
String newScrolVal = event.getNewScrolVal();
System.out.println("Old Value = " + oldScrolVal + " " + "New Value = " + newScrolVal);
-
+ eventCount++;
}
@@ -174,10 +191,23 @@
return data6;
}
-
-
public void setData6(ArrayList data) {
this.data6 = data;
}
+ public int getActionCount() {
+ return actionCount;
+ }
+
+ public void setActionCount(int actionCount) {
+ this.actionCount = actionCount;
+ }
+
+ public int getEventCount() {
+ return eventCount;
+ }
+
+ public void setEventCount(int eventCount) {
+ this.eventCount = eventCount;
+ }
}
Modified: branches/3.0.2/richfaces-samples/datascroller-sample/src/main/webapp/pages/index.jsp
===================================================================
--- branches/3.0.2/richfaces-samples/datascroller-sample/src/main/webapp/pages/index.jsp 2007-07-06 12:09:05 UTC (rev 1516)
+++ branches/3.0.2/richfaces-samples/datascroller-sample/src/main/webapp/pages/index.jsp 2007-07-06 12:09:11 UTC (rev 1517)
@@ -13,13 +13,13 @@
<body>
<f:view>
<h:form>
-
+
<h:selectOneRadio binding="#{skinBean.component}" />
<h:commandLink action="#{skinBean.change}" value="set skin" />
<br/><br/>
-
+
<h:outputText value="Data Table test" />
<br />
@@ -37,7 +37,7 @@
<h:outputText value="#{data.number1}" />
<f:facet name="footer">
<h:outputText value="Number 1 end" />
- </f:facet>
+ </f:facet>
</h:column>
<h:column>
<f:facet name="header">
@@ -46,7 +46,7 @@
<h:outputText value="#{data.number2}" />
<f:facet name="footer">
<h:outputText value="Number 2 end" />
- </f:facet>
+ </f:facet>
</h:column>
<h:column>
<f:facet name="header">
@@ -55,28 +55,35 @@
<h:outputText value="#{data.number3}" />
<f:facet name="footer">
<h:outputText value="Number 3 end" />
- </f:facet>
+ </f:facet>
</h:column>
<f:facet name="footer">
- <ds:datascroller for="master" rendered="true" fastStep="2" actionListener="#{testBean.onAction}" renderIfSinglePage="#{testBean.renderIfSinglePage}" scrollerListener="#{testBean.doScroll}" maxPages="#{testBean.maxpage}"/>
+ <ds:datascroller for="master" reRender="actionCount, eventCount" rendered="true" fastStep="2" actionListener="#{testBean.onAction}" renderIfSinglePage="#{testBean.renderIfSinglePage}" scrollerListener="#{testBean.doScroll}" maxPages="#{testBean.maxpage}"/>
</f:facet>
</h:dataTable>
- <br />
+ <br />
+ <h:outputText value="Actions:" style="font-weight: bold;" />
+ <h:outputText id="actionCount" value="#{testBean.actionCount}" />
+ <br />
+ <h:outputText value="Events:" style="font-weight: bold;" />
+ <h:outputText id="eventCount" value="#{testBean.eventCount}" />
+ <br />
- <h:panelGrid columns="2" border="0">
+ <h:panelGrid columns="2" border="0">
+
<h:outputText value="render if single page" style="font-weight: bold;" />
- <h:inputText value="#{testBean.renderIfSinglePage}"/>
-
+ <h:inputText value="#{testBean.renderIfSinglePage}"/>
+
<h:outputText value="Rows" style="font-weight: bold;" />
- <h:inputText value="#{testBean.rows}"/>
-
+ <h:inputText value="#{testBean.rows}"/>
+
<h:outputText value="Max page" style="font-weight: bold;" />
- <h:inputText value="#{testBean.maxpage}"/>
+ <h:inputText value="#{testBean.maxpage}"/>
- </h:panelGrid>
+ </h:panelGrid>
<h:commandLink value="apply" />
17 years, 5 months
JBoss Rich Faces SVN: r1516 - in trunk/framework: api/src/main/java/org/ajax4jsf/resource and 3 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-07-06 08:09:05 -0400 (Fri, 06 Jul 2007)
New Revision: 1516
Added:
trunk/framework/test/src/test/resources/org/ajax4jsf/resource/
Removed:
trunk/framework/test/src/test/resources/org/ajax4jsf/framework/
Modified:
trunk/framework/api/src/main/java/org/ajax4jsf/renderkit/AjaxRenderer.java
trunk/framework/api/src/main/java/org/ajax4jsf/renderkit/HeaderResourceProducer.java
trunk/framework/api/src/main/java/org/ajax4jsf/resource/ResourceComponent.java
trunk/framework/api/src/main/java/org/ajax4jsf/resource/ResourceContext.java
trunk/framework/api/src/main/java/org/ajax4jsf/resource/ResourceNotFoundException.java
trunk/framework/api/src/main/java/org/ajax4jsf/resource/ResourceProduser.java
trunk/framework/api/src/main/java/org/ajax4jsf/resource/ResourceRenderer.java
trunk/framework/test/
trunk/framework/test/src/test/java/org/ajax4jsf/resource/CSSTemplateTestCase.java
Log:
Tests fixed
Modified: trunk/framework/api/src/main/java/org/ajax4jsf/renderkit/AjaxRenderer.java
===================================================================
--- trunk/framework/api/src/main/java/org/ajax4jsf/renderkit/AjaxRenderer.java 2007-07-06 12:08:29 UTC (rev 1515)
+++ trunk/framework/api/src/main/java/org/ajax4jsf/renderkit/AjaxRenderer.java 2007-07-06 12:09:05 UTC (rev 1516)
@@ -1,4 +1,4 @@
-package org.ajax4jsf.framework.renderer;
+package org.ajax4jsf.renderkit;
import java.io.IOException;
import java.util.Set;
Modified: trunk/framework/api/src/main/java/org/ajax4jsf/renderkit/HeaderResourceProducer.java
===================================================================
--- trunk/framework/api/src/main/java/org/ajax4jsf/renderkit/HeaderResourceProducer.java 2007-07-06 12:08:29 UTC (rev 1515)
+++ trunk/framework/api/src/main/java/org/ajax4jsf/renderkit/HeaderResourceProducer.java 2007-07-06 12:09:05 UTC (rev 1516)
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-package org.ajax4jsf.framework.renderer;
+package org.ajax4jsf.renderkit;
import java.util.LinkedHashSet;
Modified: trunk/framework/api/src/main/java/org/ajax4jsf/resource/ResourceComponent.java
===================================================================
--- trunk/framework/api/src/main/java/org/ajax4jsf/resource/ResourceComponent.java 2007-07-06 12:08:29 UTC (rev 1515)
+++ trunk/framework/api/src/main/java/org/ajax4jsf/resource/ResourceComponent.java 2007-07-06 12:09:05 UTC (rev 1516)
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-package org.ajax4jsf.framework.resource;
+package org.ajax4jsf.resource;
import java.util.Date;
Modified: trunk/framework/api/src/main/java/org/ajax4jsf/resource/ResourceContext.java
===================================================================
--- trunk/framework/api/src/main/java/org/ajax4jsf/resource/ResourceContext.java 2007-07-06 12:08:29 UTC (rev 1515)
+++ trunk/framework/api/src/main/java/org/ajax4jsf/resource/ResourceContext.java 2007-07-06 12:09:05 UTC (rev 1516)
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-package org.ajax4jsf.framework.resource;
+package org.ajax4jsf.resource;
import java.io.IOException;
import java.io.InputStream;
Modified: trunk/framework/api/src/main/java/org/ajax4jsf/resource/ResourceNotFoundException.java
===================================================================
--- trunk/framework/api/src/main/java/org/ajax4jsf/resource/ResourceNotFoundException.java 2007-07-06 12:08:29 UTC (rev 1515)
+++ trunk/framework/api/src/main/java/org/ajax4jsf/resource/ResourceNotFoundException.java 2007-07-06 12:09:05 UTC (rev 1516)
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-package org.ajax4jsf.framework.resource;
+package org.ajax4jsf.resource;
import javax.faces.FacesException;
Modified: trunk/framework/api/src/main/java/org/ajax4jsf/resource/ResourceProduser.java
===================================================================
--- trunk/framework/api/src/main/java/org/ajax4jsf/resource/ResourceProduser.java 2007-07-06 12:08:29 UTC (rev 1515)
+++ trunk/framework/api/src/main/java/org/ajax4jsf/resource/ResourceProduser.java 2007-07-06 12:09:05 UTC (rev 1516)
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-package org.ajax4jsf.framework.resource;
+package org.ajax4jsf.resource;
/**
Modified: trunk/framework/api/src/main/java/org/ajax4jsf/resource/ResourceRenderer.java
===================================================================
--- trunk/framework/api/src/main/java/org/ajax4jsf/resource/ResourceRenderer.java 2007-07-06 12:08:29 UTC (rev 1515)
+++ trunk/framework/api/src/main/java/org/ajax4jsf/resource/ResourceRenderer.java 2007-07-06 12:09:05 UTC (rev 1516)
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-package org.ajax4jsf.framework.resource;
+package org.ajax4jsf.resource;
import java.io.IOException;
import java.util.Map;
Property changes on: trunk/framework/test
___________________________________________________________________
Name: svn:ignore
- target
+ target
.settings
.classpath
.project
Modified: trunk/framework/test/src/test/java/org/ajax4jsf/resource/CSSTemplateTestCase.java
===================================================================
--- trunk/framework/test/src/test/java/org/ajax4jsf/resource/CSSTemplateTestCase.java 2007-07-06 12:08:29 UTC (rev 1515)
+++ trunk/framework/test/src/test/java/org/ajax4jsf/resource/CSSTemplateTestCase.java 2007-07-06 12:09:05 UTC (rev 1516)
@@ -70,7 +70,7 @@
}
public void testCallWithContext() throws Exception {
- String templatePath = "org/ajax4jsf/framework/resource/call.xml";
+ String templatePath = "org/ajax4jsf/resource/call.xml";
TemplateCSSResource resource = new TemplateCSSResource(templatePath);
ResourceContext context = new FacesResourceContext(facesContext);
try {
@@ -87,7 +87,7 @@
}
public void testCallWithContextAndParam() throws Exception {
- String templatePath = "org/ajax4jsf/framework/resource/callWithParam.xml";
+ String templatePath = "org/ajax4jsf/resource/callWithParam.xml";
TemplateCSSResource resource = new TemplateCSSResource(templatePath);
ResourceContext context = new FacesResourceContext(facesContext);
try {
@@ -105,7 +105,7 @@
* Test method for 'org.ajax4jsf.resource.TemplateCSSResource.send(ResourceContext)'
*/
public void testSend() throws IOException {
- String templatePath = "org/ajax4jsf/framework/resource/styles.xml";
+ String templatePath = "org/ajax4jsf/resource/styles.xml";
TemplateCSSResource resource = new TemplateCSSResource(templatePath);
ResourceContext context = new FacesResourceContext(facesContext);
try {
@@ -122,7 +122,7 @@
* Test method for 'org.ajax4jsf.resource.TemplateCSSResource.TemplateCSSResource(String)'
*/
public void testTemplateCSSResource() throws IOException {
- String templatePath = "org/ajax4jsf/framework/resource/styles.xml";
+ String templatePath = "org/ajax4jsf/resource/styles.xml";
TemplateCSSResource resource = new TemplateCSSResource(templatePath);
assertEquals(templatePath,resource.getKey());
InternetResource resource2 = InternetResourceBuilder.getInstance().createResource(this,resource.getKey());
@@ -149,7 +149,7 @@
*/
public void testGetContentType() {
- String templatePath = "org/ajax4jsf/framework/resource/styles.xml";
+ String templatePath = "org/ajax4jsf/resource/styles.xml";
TemplateCSSResource resource = new TemplateCSSResource(templatePath);
assertEquals("text/css",resource.getContentType(null));
}
@@ -158,7 +158,7 @@
* Test method for 'org.ajax4jsf.resource.InternetResourceBase.getUri(FacesContext, Object)'
*/
public void testGetUri() {
- String templatePath = "org/ajax4jsf/framework/resource/styles.xml";
+ String templatePath = "org/ajax4jsf/resource/styles.xml";
TemplateCSSResource resource = new TemplateCSSResource(templatePath);
// System.out.println(resource.getUri(facesContext,null));
String expextedUri = request.getContextPath()+"/"+WebXml.RESOURCE_URI_PREFIX+resource.getKey();
@@ -177,7 +177,7 @@
* Test method for 'org.ajax4jsf.resource.InternetResourceBase.sendHeaders(ResourceContext)'
*/
public void testSendHeaders() {
- String templatePath = "org/ajax4jsf/framework/resource/styles.xml";
+ String templatePath = "org/ajax4jsf/resource/styles.xml";
TemplateCSSResource resource = new TemplateCSSResource(templatePath);
ResourceContext context = new FacesResourceContext(facesContext);
resource.sendHeaders(context);
Copied: trunk/framework/test/src/test/resources/org/ajax4jsf/resource (from rev 1512, trunk/framework/test/src/test/resources/org/ajax4jsf/framework/resource)
17 years, 5 months