JBoss Rich Faces SVN: r3128 - in trunk/docs/userguide/en/src/main: resources/images and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: euhvasko
Date: 2007-09-26 12:03:27 -0400 (Wed, 26 Sep 2007)
New Revision: 3128
Added:
trunk/docs/userguide/en/src/main/resources/images/dataTable2.png
trunk/docs/userguide/en/src/main/resources/images/panel3.png
trunk/docs/userguide/en/src/main/resources/images/slider5.png
Modified:
trunk/docs/userguide/en/src/main/docbook/included/dataTable.xml
trunk/docs/userguide/en/src/main/docbook/included/inputNumberSlider.xml
trunk/docs/userguide/en/src/main/docbook/included/panel.xml
Log:
http://jira.jboss.com/jira/browse/RF-1008 Edit screenshot for component
Modified: trunk/docs/userguide/en/src/main/docbook/included/dataTable.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/dataTable.xml 2007-09-26 12:43:17 UTC (rev 3127)
+++ trunk/docs/userguide/en/src/main/docbook/included/dataTable.xml 2007-09-26 16:03:27 UTC (rev 3128)
@@ -255,7 +255,7 @@
<title>DataTable class names</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/dataTable2.gif" scalefit="1"/>
+ <imagedata fileref="images/dataTable2.png" scalefit="1"/>
</imageobject>
</mediaobject>
</figure>
Modified: trunk/docs/userguide/en/src/main/docbook/included/inputNumberSlider.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/inputNumberSlider.xml 2007-09-26 12:43:17 UTC (rev 3127)
+++ trunk/docs/userguide/en/src/main/docbook/included/inputNumberSlider.xml 2007-09-26 16:03:27 UTC (rev 3128)
@@ -291,7 +291,7 @@
<title>Style classes</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/slider5.gif"/>
+ <imagedata fileref="images/slider5.png"/>
</imageobject>
</mediaobject>
</figure>
Modified: trunk/docs/userguide/en/src/main/docbook/included/panel.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/panel.xml 2007-09-26 12:43:17 UTC (rev 3127)
+++ trunk/docs/userguide/en/src/main/docbook/included/panel.xml 2007-09-26 16:03:27 UTC (rev 3128)
@@ -262,7 +262,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="images/panel3.gif"/>
+ <imagedata fileref="images/panel3.png"/>
</imageobject>
</mediaobject>
</figure>
Added: trunk/docs/userguide/en/src/main/resources/images/dataTable2.png
===================================================================
(Binary files differ)
Property changes on: trunk/docs/userguide/en/src/main/resources/images/dataTable2.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/docs/userguide/en/src/main/resources/images/panel3.png
===================================================================
(Binary files differ)
Property changes on: trunk/docs/userguide/en/src/main/resources/images/panel3.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/docs/userguide/en/src/main/resources/images/slider5.png
===================================================================
(Binary files differ)
Property changes on: trunk/docs/userguide/en/src/main/resources/images/slider5.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
16 years, 7 months
JBoss Rich Faces SVN: r3127 - branches/3.1.x/ui/tabPanel/src/main/java/org/richfaces/renderkit.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2007-09-26 08:43:17 -0400 (Wed, 26 Sep 2007)
New Revision: 3127
Modified:
branches/3.1.x/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabPanelRendererBase.java
Log:
RF-403 Tab panel should not apply tabs with the same names
Modified: branches/3.1.x/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabPanelRendererBase.java
===================================================================
--- branches/3.1.x/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabPanelRendererBase.java 2007-09-26 12:41:25 UTC (rev 3126)
+++ branches/3.1.x/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabPanelRendererBase.java 2007-09-26 12:43:17 UTC (rev 3127)
@@ -27,6 +27,7 @@
import java.util.Iterator;
import java.util.Map;
+import javax.faces.FacesException;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.event.ActionEvent;
@@ -55,6 +56,7 @@
public final static String ACTIVE_CELL_CLASSES = "dr-tbpnl-tbcell-act rich-tabhdr-cell-active";
public final static String INACTIVE_CELL_CLASSES = "dr-tbpnl-tbcell-inact rich-tabhdr-cell-inactive";
public final static String DISABLED_CELL_CLASSES = "dr-tbpnl-tbcell-dsbld rich-tabhdr-cell-disabled";
+ private final String TABS_WITH_SAME_NAMES_ERROR = "tabs with the same name not allowed";
protected Class getComponentClass() {
return UITabPanel.class;
@@ -309,7 +311,9 @@
boolean clientSide = UISwitchablePanel.CLIENT_METHOD.equals(pane.getSwitchType());
TabInfoCollector tabInfoCollector = getTabInfoCollector();
-
+
+ UITab prevTab = null;
+
for (Iterator iter = pane.getRenderedTabs(); iter.hasNext();) {
UITab tab = (UITab) iter.next();
boolean active = activeTab == tab;
@@ -318,12 +322,20 @@
if (!clientSide) {
clientSide = UISwitchablePanel.CLIENT_METHOD.equals(tab.getSwitchTypeOrDefault());
}
-
+
+ if(prevTab != null){
+ if(prevTab.getName().equals(tab.getName())){
+ throw new FacesException(TABS_WITH_SAME_NAMES_ERROR);
+ };
+ }
+
tab.encodeTab(context, active);
if (!tab.isDisabled()) {
tabs.add(tabInfoCollector.collectTabInfo(context, tab));
}
+
+ prevTab = tab;
}
// Store flag for exist client-side tabs.
16 years, 7 months
JBoss Rich Faces SVN: r3126 - trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2007-09-26 08:41:25 -0400 (Wed, 26 Sep 2007)
New Revision: 3126
Modified:
trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabPanelRendererBase.java
Log:
RF-403 Tab panel should not apply tabs with the same names
Modified: trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabPanelRendererBase.java
===================================================================
--- trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabPanelRendererBase.java 2007-09-26 12:26:00 UTC (rev 3125)
+++ trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabPanelRendererBase.java 2007-09-26 12:41:25 UTC (rev 3126)
@@ -27,6 +27,7 @@
import java.util.Iterator;
import java.util.Map;
+import javax.faces.FacesException;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.event.ActionEvent;
@@ -55,6 +56,7 @@
public final static String ACTIVE_CELL_CLASSES = "dr-tbpnl-tbcell-act rich-tabhdr-cell-active";
public final static String INACTIVE_CELL_CLASSES = "dr-tbpnl-tbcell-inact rich-tabhdr-cell-inactive";
public final static String DISABLED_CELL_CLASSES = "dr-tbpnl-tbcell-dsbld rich-tabhdr-cell-disabled";
+ private final String TABS_WITH_SAME_NAMES_ERROR = "tabs with the same name not allowed";
protected Class getComponentClass() {
return UITabPanel.class;
@@ -309,7 +311,9 @@
boolean clientSide = UISwitchablePanel.CLIENT_METHOD.equals(pane.getSwitchType());
TabInfoCollector tabInfoCollector = getTabInfoCollector();
-
+
+ UITab prevTab = null;
+
for (Iterator iter = pane.getRenderedTabs(); iter.hasNext();) {
UITab tab = (UITab) iter.next();
boolean active = activeTab == tab;
@@ -318,12 +322,20 @@
if (!clientSide) {
clientSide = UISwitchablePanel.CLIENT_METHOD.equals(tab.getSwitchTypeOrDefault());
}
-
+
+ if(prevTab != null){
+ if(prevTab.getName().equals(tab.getName())){
+ throw new FacesException(TABS_WITH_SAME_NAMES_ERROR);
+ };
+ }
+
tab.encodeTab(context, active);
if (!tab.isDisabled()) {
tabs.add(tabInfoCollector.collectTabInfo(context, tab));
}
+
+ prevTab = tab;
}
// Store flag for exist client-side tabs.
16 years, 7 months
JBoss Rich Faces SVN: r3124 - branches/3.1.x/ui/dataTable/src/main/templates/org/richfaces.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2007-09-26 07:47:12 -0400 (Wed, 26 Sep 2007)
New Revision: 3124
Modified:
branches/3.1.x/ui/dataTable/src/main/templates/org/richfaces/htmlDataTable.jspx
Log:
RF-986
Modified: branches/3.1.x/ui/dataTable/src/main/templates/org/richfaces/htmlDataTable.jspx
===================================================================
--- branches/3.1.x/ui/dataTable/src/main/templates/org/richfaces/htmlDataTable.jspx 2007-09-26 11:45:59 UTC (rev 3123)
+++ branches/3.1.x/ui/dataTable/src/main/templates/org/richfaces/htmlDataTable.jspx 2007-09-26 11:47:12 UTC (rev 3124)
@@ -17,7 +17,8 @@
<f:clientid var="clientId"/>
<table id="#{clientId}"
class="dr-table rich-table #{component.attributes['styleClass']}"
- x:passThruWithExclusions="value,name,type,id,class"
+ bgcolor="#{component.attributes['bgcolor']}"
+ x:passThruWithExclusions="value,name,type,id,class"
>
<f:call name="encodeTableStructure"/>
<tbody>
16 years, 7 months
JBoss Rich Faces SVN: r3123 - trunk/ui/dataTable/src/main/templates/org/richfaces.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2007-09-26 07:45:59 -0400 (Wed, 26 Sep 2007)
New Revision: 3123
Modified:
trunk/ui/dataTable/src/main/templates/org/richfaces/htmlDataTable.jspx
Log:
RF-986
Modified: trunk/ui/dataTable/src/main/templates/org/richfaces/htmlDataTable.jspx
===================================================================
--- trunk/ui/dataTable/src/main/templates/org/richfaces/htmlDataTable.jspx 2007-09-26 08:47:01 UTC (rev 3122)
+++ trunk/ui/dataTable/src/main/templates/org/richfaces/htmlDataTable.jspx 2007-09-26 11:45:59 UTC (rev 3123)
@@ -17,7 +17,8 @@
<f:clientid var="clientId"/>
<table id="#{clientId}"
class="dr-table rich-table #{component.attributes['styleClass']}"
- x:passThruWithExclusions="value,name,type,id,class"
+ bgcolor="#{component.attributes['bgcolor']}"
+ x:passThruWithExclusions="value,name,type,id,class"
>
<f:call name="encodeTableStructure"/>
<tbody>
16 years, 7 months
JBoss Rich Faces SVN: r3122 - branches/3.1.x/ui/tabPanel/src/main/java/org/richfaces/component.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2007-09-26 04:47:01 -0400 (Wed, 26 Sep 2007)
New Revision: 3122
Modified:
branches/3.1.x/ui/tabPanel/src/main/java/org/richfaces/component/UITabPanel.java
Log:
RF-843
Modified: branches/3.1.x/ui/tabPanel/src/main/java/org/richfaces/component/UITabPanel.java
===================================================================
--- branches/3.1.x/ui/tabPanel/src/main/java/org/richfaces/component/UITabPanel.java 2007-09-26 08:43:29 UTC (rev 3121)
+++ branches/3.1.x/ui/tabPanel/src/main/java/org/richfaces/component/UITabPanel.java 2007-09-26 08:47:01 UTC (rev 3122)
@@ -25,10 +25,12 @@
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
+import javax.faces.event.FacesEvent;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.Predicate;
import org.apache.commons.collections.iterators.FilterIterator;
+import org.richfaces.event.SwitchablePanelSwitchEvent;
/**
* JSF component class
@@ -183,4 +185,17 @@
public abstract void setHeaderClass(String value);
+ public void queueEvent(FacesEvent event) {
+ if (event instanceof SwitchablePanelSwitchEvent && this.equals(event.getComponent())) {
+
+ SwitchablePanelSwitchEvent switchEvent = (SwitchablePanelSwitchEvent) event;
+ UIComponent component = switchEvent.getEventSource();
+ if((component instanceof UITab) && ((UITab)component).isImmediate()){
+ setImmediate(true);
+ }else{
+ setImmediate(false);
+ }
+ }
+ super.queueEvent(event);
+ }
}
16 years, 7 months
JBoss Rich Faces SVN: r3121 - trunk/ui/tabPanel/src/main/java/org/richfaces/component.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2007-09-26 04:43:29 -0400 (Wed, 26 Sep 2007)
New Revision: 3121
Modified:
trunk/ui/tabPanel/src/main/java/org/richfaces/component/UITabPanel.java
Log:
RF-845
Modified: trunk/ui/tabPanel/src/main/java/org/richfaces/component/UITabPanel.java
===================================================================
--- trunk/ui/tabPanel/src/main/java/org/richfaces/component/UITabPanel.java 2007-09-26 00:12:41 UTC (rev 3120)
+++ trunk/ui/tabPanel/src/main/java/org/richfaces/component/UITabPanel.java 2007-09-26 08:43:29 UTC (rev 3121)
@@ -25,10 +25,12 @@
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
+import javax.faces.event.FacesEvent;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.Predicate;
import org.apache.commons.collections.iterators.FilterIterator;
+import org.richfaces.event.SwitchablePanelSwitchEvent;
/**
* JSF component class
@@ -183,4 +185,17 @@
public abstract void setHeaderClass(String value);
+ public void queueEvent(FacesEvent event) {
+ if (event instanceof SwitchablePanelSwitchEvent && this.equals(event.getComponent())) {
+
+ SwitchablePanelSwitchEvent switchEvent = (SwitchablePanelSwitchEvent) event;
+ UIComponent component = switchEvent.getEventSource();
+ if((component instanceof UITab) && ((UITab)component).isImmediate()){
+ setImmediate(true);
+ }else{
+ setImmediate(false);
+ }
+ }
+ super.queueEvent(event);
+ }
}
16 years, 7 months
JBoss Rich Faces SVN: r3120 - in branches/3.1.x/ui/tree/src/main/config: resources and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2007-09-25 20:12:41 -0400 (Tue, 25 Sep 2007)
New Revision: 3120
Added:
branches/3.1.x/ui/tree/src/main/config/resources/
branches/3.1.x/ui/tree/src/main/config/resources/resources-config.xml
Removed:
branches/3.1.x/ui/tree/src/main/config/resources/resources-config.xml
Log:
Add all tree images to resource-config.xml
Copied: branches/3.1.x/ui/tree/src/main/config/resources (from rev 3119, trunk/ui/tree/src/main/config/resources)
Deleted: branches/3.1.x/ui/tree/src/main/config/resources/resources-config.xml
===================================================================
--- trunk/ui/tree/src/main/config/resources/resources-config.xml 2007-09-26 00:04:05 UTC (rev 3119)
+++ branches/3.1.x/ui/tree/src/main/config/resources/resources-config.xml 2007-09-26 00:12:41 UTC (rev 3120)
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resource-config>
- <resource class="org.richfaces.renderkit.html.images.TreeLineCollapsedImage">
- <name>org.richfaces.renderkit.html.images.TreeLineCollapsedImage</name>
- </resource>
- <resource class="org.richfaces.renderkit.html.images.TreeLineExpandedImage">
- <name>org.richfaces.renderkit.html.images.TreeLineExpandedImage</name>
- </resource>
- <resource class="org.richfaces.renderkit.html.images.TreeLineImage">
- <name>org.richfaces.renderkit.html.images.TreeLineImage</name>
- </resource>
- <resource class="org.richfaces.renderkit.html.images.TreeLineLastImage">
- <name>org.richfaces.renderkit.html.images.TreeLineLastImage</name>
- </resource>
- <resource class="org.richfaces.renderkit.html.images.TreeLineNodeImage">
- <name>org.richfaces.renderkit.html.images.TreeLineNodeImage</name>
- </resource>
- <resource class="org.richfaces.renderkit.html.images.TreeMinusImage">
- <name>org.richfaces.renderkit.html.images.TreeMinusImage</name>
- </resource>
- <resource class="org.richfaces.renderkit.html.images.TreePlusImage">
- <name>org.richfaces.renderkit.html.images.TreePlusImage</name>
- </resource>
-</resource-config>
Copied: branches/3.1.x/ui/tree/src/main/config/resources/resources-config.xml (from rev 3119, trunk/ui/tree/src/main/config/resources/resources-config.xml)
===================================================================
--- branches/3.1.x/ui/tree/src/main/config/resources/resources-config.xml (rev 0)
+++ branches/3.1.x/ui/tree/src/main/config/resources/resources-config.xml 2007-09-26 00:12:41 UTC (rev 3120)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resource-config>
+ <resource class="org.richfaces.renderkit.html.images.TreeLineCollapsedImage">
+ <name>org.richfaces.renderkit.html.images.TreeLineCollapsedImage</name>
+ </resource>
+ <resource class="org.richfaces.renderkit.html.images.TreeLineExpandedImage">
+ <name>org.richfaces.renderkit.html.images.TreeLineExpandedImage</name>
+ </resource>
+ <resource class="org.richfaces.renderkit.html.images.TreeLineImage">
+ <name>org.richfaces.renderkit.html.images.TreeLineImage</name>
+ </resource>
+ <resource class="org.richfaces.renderkit.html.images.TreeLineLastImage">
+ <name>org.richfaces.renderkit.html.images.TreeLineLastImage</name>
+ </resource>
+ <resource class="org.richfaces.renderkit.html.images.TreeLineNodeImage">
+ <name>org.richfaces.renderkit.html.images.TreeLineNodeImage</name>
+ </resource>
+ <resource class="org.richfaces.renderkit.html.images.TreeMinusImage">
+ <name>org.richfaces.renderkit.html.images.TreeMinusImage</name>
+ </resource>
+ <resource class="org.richfaces.renderkit.html.images.TreePlusImage">
+ <name>org.richfaces.renderkit.html.images.TreePlusImage</name>
+ </resource>
+</resource-config>
16 years, 7 months
JBoss Rich Faces SVN: r3119 - in trunk/ui/tree/src/main/config: resources and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2007-09-25 20:04:05 -0400 (Tue, 25 Sep 2007)
New Revision: 3119
Added:
trunk/ui/tree/src/main/config/resources/
trunk/ui/tree/src/main/config/resources/resources-config.xml
Log:
add all tree images to resources-config.xml
Added: trunk/ui/tree/src/main/config/resources/resources-config.xml
===================================================================
--- trunk/ui/tree/src/main/config/resources/resources-config.xml (rev 0)
+++ trunk/ui/tree/src/main/config/resources/resources-config.xml 2007-09-26 00:04:05 UTC (rev 3119)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resource-config>
+ <resource class="org.richfaces.renderkit.html.images.TreeLineCollapsedImage">
+ <name>org.richfaces.renderkit.html.images.TreeLineCollapsedImage</name>
+ </resource>
+ <resource class="org.richfaces.renderkit.html.images.TreeLineExpandedImage">
+ <name>org.richfaces.renderkit.html.images.TreeLineExpandedImage</name>
+ </resource>
+ <resource class="org.richfaces.renderkit.html.images.TreeLineImage">
+ <name>org.richfaces.renderkit.html.images.TreeLineImage</name>
+ </resource>
+ <resource class="org.richfaces.renderkit.html.images.TreeLineLastImage">
+ <name>org.richfaces.renderkit.html.images.TreeLineLastImage</name>
+ </resource>
+ <resource class="org.richfaces.renderkit.html.images.TreeLineNodeImage">
+ <name>org.richfaces.renderkit.html.images.TreeLineNodeImage</name>
+ </resource>
+ <resource class="org.richfaces.renderkit.html.images.TreeMinusImage">
+ <name>org.richfaces.renderkit.html.images.TreeMinusImage</name>
+ </resource>
+ <resource class="org.richfaces.renderkit.html.images.TreePlusImage">
+ <name>org.richfaces.renderkit.html.images.TreePlusImage</name>
+ </resource>
+</resource-config>
Property changes on: trunk/ui/tree/src/main/config/resources/resources-config.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Date Revision Author
16 years, 7 months