JBoss Rich Faces SVN: r13804 - in trunk: ui/scrollableDataTable/src/main/config/component and 3 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2009-04-23 13:06:33 -0400 (Thu, 23 Apr 2009)
New Revision: 13804
Added:
trunk/framework/api/src/main/java/org/richfaces/model/SelectionMode.java
Modified:
trunk/ui/scrollableDataTable/src/main/config/component/scrollable-data-table.xml
trunk/ui/scrollableDataTable/src/main/java/org/richfaces/component/UIScrollableDataTable.java
trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/SelectionRendererContributor.java
trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/Selection.js
Log:
RF-2282
Added: trunk/framework/api/src/main/java/org/richfaces/model/SelectionMode.java
===================================================================
--- trunk/framework/api/src/main/java/org/richfaces/model/SelectionMode.java (rev 0)
+++ trunk/framework/api/src/main/java/org/richfaces/model/SelectionMode.java 2009-04-23 17:06:33 UTC (rev 13804)
@@ -0,0 +1,36 @@
+/**
+ * License Agreement.
+ *
+ * Rich Faces - Natural Ajax for Java Server Faces (JSF)
+ *
+ * Copyright (C) 2007 Exadel, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+package org.richfaces.model;
+/**
+ *
+ * @author Konstantin Mishin
+ *
+ */
+public enum SelectionMode {
+ none,
+ single,
+ multi;
+
+ public boolean isSelectionEnabled() {
+ return !equals(none);
+ }
+
+}
Modified: trunk/ui/scrollableDataTable/src/main/config/component/scrollable-data-table.xml
===================================================================
--- trunk/ui/scrollableDataTable/src/main/config/component/scrollable-data-table.xml 2009-04-23 17:02:12 UTC (rev 13803)
+++ trunk/ui/scrollableDataTable/src/main/config/component/scrollable-data-table.xml 2009-04-23 17:06:33 UTC (rev 13804)
@@ -201,6 +201,13 @@
</description>
</property>
+ <property>
+ <name>selectionMode</name>
+ <classname>org.richfaces.model.SelectionMode</classname>
+ <description>SelectionMode is an enumeration of the possible selection modes. Default value is "multi"</description>
+ <defaultvalue>SelectionMode.multi</defaultvalue>
+ </property>
+
<property hidden="true" existintag="false" exist="false" >
<name>rowKey</name>
<classname>java.lang.Object</classname>
Modified: trunk/ui/scrollableDataTable/src/main/java/org/richfaces/component/UIScrollableDataTable.java
===================================================================
--- trunk/ui/scrollableDataTable/src/main/java/org/richfaces/component/UIScrollableDataTable.java 2009-04-23 17:02:12 UTC (rev 13803)
+++ trunk/ui/scrollableDataTable/src/main/java/org/richfaces/component/UIScrollableDataTable.java 2009-04-23 17:06:33 UTC (rev 13804)
@@ -64,6 +64,7 @@
import org.richfaces.model.Ordering;
import org.richfaces.model.ScrollableTableDataModel;
import org.richfaces.model.ScrollableTableDataRange;
+import org.richfaces.model.SelectionMode;
import org.richfaces.model.SortField;
import org.richfaces.model.SortField2;
import org.richfaces.model.SortOrder;
@@ -454,6 +455,13 @@
public abstract String getSortMode();
public abstract void setSortMode(String mode);
+ public abstract SelectionMode getSelectionMode();
+ public abstract void setSelectionMode(SelectionMode mode);
+
+ public boolean isSelectionEnabled() {
+ return getSelectionMode().isSelectionEnabled();
+ }
+
public abstract Object getActiveRowKey();
public abstract void setActiveRowKey(Object activeRowKey);
Modified: trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/SelectionRendererContributor.java
===================================================================
--- trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/SelectionRendererContributor.java 2009-04-23 17:02:12 UTC (rev 13803)
+++ trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/SelectionRendererContributor.java 2009-04-23 17:06:33 UTC (rev 13804)
@@ -64,83 +64,68 @@
final UIScrollableDataTable grid = (UIScrollableDataTable) component;
- ExternalContext externalContext = context.getExternalContext();
- Map<String, String> requestParamMap = externalContext.getRequestParameterMap();
- Application application = context.getApplication();
-
- String id = getSelectionInputName(context, grid);
-
- String value = (String) requestParamMap.get(id);
-
- Converter converter = application.createConverter(ClientSelection.class);
-
- ClientSelection _oldClientSelection =
- (ClientSelection) grid.getAttributes().get(CLIENT_SELECTION);
-
- final ClientSelection oldClientSelection =
- _oldClientSelection == null ?
- new ClientSelection() :
- _oldClientSelection;
-
- final ClientSelection clientSelection =
- (ClientSelection) converter.getAsObject(context, grid, value);
+ if (grid.isSelectionEnabled()) {
+ ExternalContext externalContext = context.getExternalContext();
+ Map<String, String> requestParamMap = externalContext
+ .getRequestParameterMap();
+ Application application = context.getApplication();
+ String id = getSelectionInputName(context, grid);
+ String value = (String) requestParamMap.get(id);
+ Converter converter = application
+ .createConverter(ClientSelection.class);
+ ClientSelection _oldClientSelection = (ClientSelection) grid
+ .getAttributes().get(CLIENT_SELECTION);
+ final ClientSelection oldClientSelection = _oldClientSelection == null ? new ClientSelection()
+ : _oldClientSelection;
+ final ClientSelection clientSelection = (ClientSelection) converter
+ .getAsObject(context, grid, value);
+ final ScrollableDataTableRendererState state = ScrollableDataTableRendererState
+ .createState(context, grid);
+ state.setRowIndex(ScrollableDataTableUtils.getClientRowIndex(grid));
+ final SimpleSelection simpleSelection = grid.getSelection() == null ? new SimpleSelection()
+ : (SimpleSelection) grid.getSelection();
+ if (clientSelection.isReset() || clientSelection.isSelectAll()) {
+ simpleSelection.clear();
+ simpleSelection.setSelectAll(clientSelection.isSelectAll());
+ }
+ try {
+ grid.walk(context, new DataVisitor() {
+ public void process(FacesContext context, Object rowKey,
+ Object argument) throws IOException {
-
-
-
- final ScrollableDataTableRendererState state =
- ScrollableDataTableRendererState.createState(context, grid);
-
- state.setRowIndex(ScrollableDataTableUtils.getClientRowIndex(grid));
-
- final SimpleSelection simpleSelection = grid.getSelection() == null ? new SimpleSelection()
- : (SimpleSelection) grid.getSelection();
+ int i = state.getRowIndex();
-
-
- if (clientSelection.isReset() || clientSelection.isSelectAll()) {
- simpleSelection.clear();
- simpleSelection.setSelectAll(clientSelection.isSelectAll());
- }
-
- try {
- grid.walk(context,
- new DataVisitor() {
- public void process(FacesContext context, Object rowKey,
- Object argument) throws IOException {
-
- int i = state.getRowIndex();
-
- if (shouldAddToSelection(i, oldClientSelection, clientSelection)) {
-
- simpleSelection.addKey(rowKey);
-
- } else if (shouldRemoveFromSelection(i, oldClientSelection, clientSelection)){
-
- simpleSelection.removeKey(rowKey);
-
- }
-
- if(i == clientSelection.getActiveRowIndex()) {
- grid.setActiveRowKey(rowKey);
- }
- state.nextRow();
-
+ if (shouldAddToSelection(i, oldClientSelection,
+ clientSelection)) {
+
+ simpleSelection.addKey(rowKey);
+
+ } else if (shouldRemoveFromSelection(i,
+ oldClientSelection, clientSelection)) {
+
+ simpleSelection.removeKey(rowKey);
+
}
- },
- state);
- } catch(IOException e) {
- throw new FacesException(e);
+
+ if (i == clientSelection.getActiveRowIndex()) {
+ grid.setActiveRowKey(rowKey);
+ }
+ state.nextRow();
+
+ }
+ }, state);
+ } catch (IOException e) {
+ throw new FacesException(e);
+ }
+ grid.setSelection(simpleSelection);
+ ValueExpression selectionBinding = grid
+ .getValueExpression("selection");
+ if (selectionBinding != null) {
+ selectionBinding.setValue(context.getELContext(),
+ simpleSelection);
+ }
+ ScrollableDataTableRendererState.restoreState(context);
}
-
- grid.setSelection(simpleSelection);
-
- ValueExpression selectionBinding = grid.getValueExpression("selection");
- if (selectionBinding != null) {
- selectionBinding.setValue(context.getELContext(), simpleSelection);
- }
-
- ScrollableDataTableRendererState.restoreState(context);
}
/*
@@ -183,19 +168,24 @@
public ScriptOptions buildOptions(FacesContext context,
UIComponent component) {
+ UIScrollableDataTable table = (UIScrollableDataTable) component;
ScriptOptions scriptOptions = new ScriptOptions(component);
- scriptOptions.addOption("selectionInput", getSelectionInputName(
- context, (UIScrollableDataTable) component));
- Map<String, Object> attributes = component.getAttributes();
- Object attribut = attributes.get("selectedClass");
- if (attribut == null) {
- attribut = "";
+ if (table.isSelectionEnabled()) {
+ scriptOptions.addOption("selectionInput", getSelectionInputName(
+ context, table));
+ Map<String, Object> attributes = component.getAttributes();
+ Object attribut = attributes.get("selectedClass");
+ if (attribut == null) {
+ attribut = "";
+ }
+ scriptOptions.addOption("selectedClass", attribut);
+ attribut = attributes.get("activeClass");
+ if (attribut == null) {
+ attribut = "";
+ }
+ scriptOptions.addOption("activeClass", attribut);
+ scriptOptions.addOption("selectionMode", table.getSelectionMode());
}
- scriptOptions.addOption("selectedClass", attribut);
- attribut = attributes.get("activeClass");
- if (attribut == null) {
- attribut = "";
- }scriptOptions.addOption("activeClass", attribut);
return scriptOptions;
}
@@ -205,8 +195,10 @@
UIScrollableDataTable grid = (UIScrollableDataTable) component;
- encodeSelection(context, grid);
- writeSelection(context, grid);
+ if (grid.isSelectionEnabled()) {
+ encodeSelection(context, grid);
+ writeSelection(context, grid);
+ }
}
Modified: trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/Selection.js
===================================================================
--- trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/Selection.js 2009-04-23 17:02:12 UTC (rev 13803)
+++ trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/Selection.js 2009-04-23 17:06:33 UTC (rev 13804)
@@ -206,6 +206,7 @@
this.selection = new ClientUI.controls.grid.Selection();
this.inputElement = grid.options.selectionInput;
+ this.isSingleMode = "single" == grid.options.selectionMode;
this.onselectionchange = grid.options.onselectionchange;
this.selectedClass = grid.options.selectedClass;
this.activeClass = grid.options.activeClass;
@@ -332,7 +333,7 @@
if (this.inFocus && activeRow != null) {
if(this.firstIndex != activeRow) {
rowIndex = (this.rowCount + activeRow - 1) % this.rowCount;
- if (!event.ctrlKey && !event.shiftKey) {
+ if (this.isSingleMode || (!event.ctrlKey && !event.shiftKey)) {
this.selectionFlag = "x";
range = [rowIndex, rowIndex];
this.setSelection(range);
@@ -357,7 +358,7 @@
if (this.inFocus && activeRow != null) {
rowIndex = (activeRow + 1) % this.rowCount;
if(this.firstIndex != rowIndex) {
- if (!event.ctrlKey && !event.shiftKey) {
+ if (this.isSingleMode || (!event.ctrlKey && !event.shiftKey)) {
this.selectionFlag = "x";
range = [rowIndex, rowIndex];
this.setSelection(range);
@@ -379,7 +380,7 @@
}
break;
case 65: case 97: // Ctrl-A
- if (this.inFocus && event.ctrlKey) {
+ if (this.inFocus && event.ctrlKey && !this.isSingleMode) {
this.selectionFlag = "a";
for (var i = 0; i < this.rowCount; i++) {
this.addRowToSelection(i);
@@ -404,7 +405,7 @@
this.shiftRow = null;
}
var range;
- if ( event.shiftKey && !event.ctrlKey && !event.altKey) {
+ if ( event.shiftKey && !event.ctrlKey && !event.altKey && !this.isSingleMode) {
this.firstIndex = Number($(this.prefix + ":n").rows[0].id.split(this.prefix)[1].split(":")[2]);;
this.selectionFlag = "x";
if(!this.shiftRow) {
@@ -420,19 +421,19 @@
}
range = [this.startRow, this.endRow];
this.setSelection(range);
- } else if (!event.shiftKey && event.ctrlKey && !event.altKey) {
+ } else if (!event.shiftKey && event.ctrlKey && !event.altKey && !this.isSingleMode) {
if (this.selection.isSelectedId(rowIndex)) {
this.removeRowFromSelection(rowIndex);
} else {
this.addRowToSelection(rowIndex);
}
- } else if (!event.shiftKey && !event.ctrlKey && !event.altKey) {
+ } else if (this.isSingleMode || (!event.shiftKey && !event.ctrlKey && !event.altKey)) {
this.selectionFlag = "x";
range = [rowIndex, rowIndex];
this.setSelection(range);
}
this.setActiveRow(rowIndex);
- if (event.shiftKey) {
+ if (event.shiftKey && !this.isSingleMode) {
if (window.getSelection) {
window.getSelection().removeAllRanges();
} else if (document.selection) {
15 years, 8 months
JBoss Rich Faces SVN: r13803 - in trunk/examples/photoalbum/web/src/main/webapp/includes: index and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2009-04-23 13:02:12 -0400 (Thu, 23 Apr 2009)
New Revision: 13803
Modified:
trunk/examples/photoalbum/web/src/main/webapp/includes/album/createAlbum.xhtml
trunk/examples/photoalbum/web/src/main/webapp/includes/index/login.xhtml
trunk/examples/photoalbum/web/src/main/webapp/includes/shelf/createShelf.xhtml
Log:
https://jira.jboss.org/jira/browse/RF-6842
Modified: trunk/examples/photoalbum/web/src/main/webapp/includes/album/createAlbum.xhtml
===================================================================
(Binary files differ)
Modified: trunk/examples/photoalbum/web/src/main/webapp/includes/index/login.xhtml
===================================================================
(Binary files differ)
Modified: trunk/examples/photoalbum/web/src/main/webapp/includes/shelf/createShelf.xhtml
===================================================================
(Binary files differ)
15 years, 8 months
JBoss Rich Faces SVN: r13802 - trunk/examples/photoalbum/ejb/src/main/java/org/richfaces/photoalbum/service.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2009-04-23 11:43:51 -0400 (Thu, 23 Apr 2009)
New Revision: 13802
Modified:
trunk/examples/photoalbum/ejb/src/main/java/org/richfaces/photoalbum/service/Constants.java
Log:
Modified: trunk/examples/photoalbum/ejb/src/main/java/org/richfaces/photoalbum/service/Constants.java
===================================================================
--- trunk/examples/photoalbum/ejb/src/main/java/org/richfaces/photoalbum/service/Constants.java 2009-04-23 15:43:46 UTC (rev 13801)
+++ trunk/examples/photoalbum/ejb/src/main/java/org/richfaces/photoalbum/service/Constants.java 2009-04-23 15:43:51 UTC (rev 13802)
@@ -54,6 +54,7 @@
//Errors(Internationalization pending)
public static final String FILE_MANAGER_COMPONENT = "fileManager";
+ public static final String YOU_CAN_T_ADD_IMAGES_TO_THAT_ALBUM_ERROR = "You can't add images to that album";
public static final String SHELF_RECENTLY_DELETED_ERROR = "This shelf was recently deleted. Refresh your browser to see actual data.";
public static final String IMAGE_RECENTLY_DELETED_ERROR = "This image was recently deleted. Refresh your browser to see actual data.";
public static final String ALBUM_RECENTLY_DELETED_ERROR = "This album was recently deleted. Refresh your browser to see actual data.";
15 years, 8 months
JBoss Rich Faces SVN: r13801 - in trunk/examples/photoalbum/web/src/main: resources and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2009-04-23 11:43:46 -0400 (Thu, 23 Apr 2009)
New Revision: 13801
Modified:
trunk/examples/photoalbum/web/src/main/java/org/richfaces/photoalbum/manager/Authenticator.java
trunk/examples/photoalbum/web/src/main/java/org/richfaces/photoalbum/manager/Controller.java
trunk/examples/photoalbum/web/src/main/resources/messages_en.properties
trunk/examples/photoalbum/web/src/main/webapp/WEB-INF/web.xml
trunk/examples/photoalbum/web/src/main/webapp/includes/image/imageInfo.xhtml
Log:
Modified: trunk/examples/photoalbum/web/src/main/java/org/richfaces/photoalbum/manager/Authenticator.java
===================================================================
--- trunk/examples/photoalbum/web/src/main/java/org/richfaces/photoalbum/manager/Authenticator.java 2009-04-23 14:39:22 UTC (rev 13800)
+++ trunk/examples/photoalbum/web/src/main/java/org/richfaces/photoalbum/manager/Authenticator.java 2009-04-23 15:43:46 UTC (rev 13801)
@@ -126,7 +126,7 @@
public void goToRegister(){
Contexts.getSessionContext().set("user", new User());
- Contexts.getConversationContext().set("avatarUpload", null);
+ Contexts.getConversationContext().set("avatarData", null);
setLoginFailed(false);
Events.instance().raiseEvent(Constants.START_REGISTER_EVENT);
}
Modified: trunk/examples/photoalbum/web/src/main/java/org/richfaces/photoalbum/manager/Controller.java
===================================================================
--- trunk/examples/photoalbum/web/src/main/java/org/richfaces/photoalbum/manager/Controller.java 2009-04-23 14:39:22 UTC (rev 13800)
+++ trunk/examples/photoalbum/web/src/main/java/org/richfaces/photoalbum/manager/Controller.java 2009-04-23 15:43:46 UTC (rev 13801)
@@ -202,15 +202,27 @@
pushEvent(Constants.ADD_ERROR_EVENT, Constants.FILE_UPLOAD_SHOW_ERROR);
return;
}
- Album a = model.getSelectedAlbum();
- if(model.getSelectedAlbum() == null){
- if(model.getSelectedUser() != null && model.getSelectedUser().getShelves().size() > 0 && model.getSelectedUser().getShelves().get(0).getAlbums().size() > 0)
- a = model.getSelectedUser().getShelves().get(0).getAlbums().get(0);
+ Album alb = null;
+ if(isUserAlbum(model.getSelectedAlbum())){
+ alb = model.getSelectedAlbum();
}
- model.resetModel(NavigationEnum.FILE_UPLOAD, a.getOwner(), a.getShelf(), a, model.getSelectedImage(), model.getImages());
+ if(alb == null){
+ if(user != null && user.getShelves().size() > 0 && user.getShelves().get(0).getAlbums().size() > 0)
+ for(Shelf s : user.getShelves()){
+ if(s.getAlbums().size() > 0){
+ alb = s.getAlbums().get(0);
+ break;
+ }
+ }
+ }
+ model.resetModel(NavigationEnum.FILE_UPLOAD, user, alb.getShelf(), alb, null, alb.getImages());
}
public void showFileUpload(Album album){
+ if(!isUserAlbum(album)){
+ showError(Constants.YOU_CAN_T_ADD_IMAGES_TO_THAT_ALBUM_ERROR);
+ return;
+ }
model.resetModel(NavigationEnum.FILE_UPLOAD, album.getShelf().getOwner(), album.getShelf(), album, null, album.getImages());
}
@@ -224,6 +236,7 @@
public void showUser(User user){
model.resetModel(NavigationEnum.USER_PREFS, user, null, null, null, null);
+ Contexts.getConversationContext().set("avatarData", null);
}
public void showUnvisitedImages(Shelf shelf){
Modified: trunk/examples/photoalbum/web/src/main/resources/messages_en.properties
===================================================================
--- trunk/examples/photoalbum/web/src/main/resources/messages_en.properties 2009-04-23 14:39:22 UTC (rev 13800)
+++ trunk/examples/photoalbum/web/src/main/resources/messages_en.properties 2009-04-23 15:43:46 UTC (rev 13801)
@@ -243,11 +243,11 @@
popular_tags=Popular tags
direct_link=Direct link
use_this_photo_like_current_album_cover=Use this image like current album cover
-allow_commennts=Allow commennts
+allow_commennts=Allow comments
terms_and_conditions=Terms And Conditions
privacy_statement=Privacy Statement
error_occurred=Error occurred
-error_occured_during_request=Error occured during request:
+error_occured_during_request=Error occur during request:
how_it_works=How it works?
no_results_found=No results found
options=Options
Modified: trunk/examples/photoalbum/web/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/examples/photoalbum/web/src/main/webapp/WEB-INF/web.xml 2009-04-23 14:39:22 UTC (rev 13800)
+++ trunk/examples/photoalbum/web/src/main/webapp/WEB-INF/web.xml 2009-04-23 15:43:46 UTC (rev 13801)
@@ -4,8 +4,6 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
version="2.5">
-
-
<listener>
<listener-class>
org.jboss.seam.servlet.SeamListener
@@ -15,18 +13,6 @@
<filter>
<filter-name>Seam Filter</filter-name>
<filter-class>org.jboss.seam.servlet.SeamFilter</filter-class>
- </filter>
-
- <filter-mapping>
- <filter-name>Seam Filter</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
-
-<!-- Ajax4jsf -->
- <filter>
- <display-name>Ajax4jsf Filter</display-name>
- <filter-name>ajax4jsf</filter-name>
- <filter-class>org.ajax4jsf.Filter</filter-class>
<init-param>
<param-name>createTempFiles</param-name>
<param-value>true</param-value>
@@ -38,8 +24,8 @@
</filter>
<filter-mapping>
- <filter-name>ajax4jsf</filter-name>
- <url-pattern>*.seam</url-pattern>
+ <filter-name>Seam Filter</filter-name>
+ <url-pattern>/*</url-pattern>
</filter-mapping>
<context-param>
@@ -79,11 +65,6 @@
<param-value>.xhtml</param-value>
</context-param>
- <context-param>
- <param-name>storeStrategy</param-name>
- <param-value>database</param-value>
- </context-param>
-
<context-param>
<param-name>facelets.LIBRARIES</param-name>
<param-value>/WEB-INF/tags/photoalbum-taglib.xml</param-value>
@@ -124,4 +105,4 @@
<auth-constraint />
</security-constraint>
-</web-app>
+</web-app>
\ No newline at end of file
Modified: trunk/examples/photoalbum/web/src/main/webapp/includes/image/imageInfo.xhtml
===================================================================
(Binary files differ)
15 years, 8 months
JBoss Rich Faces SVN: r13800 - trunk/docs/cdkguide/en/src/main/docbook/modules.
by richfaces-svn-commits＠lists.jboss.org
Author: artdaw
Date: 2009-04-23 10:39:22 -0400 (Thu, 23 Apr 2009)
New Revision: 13800
Modified:
trunk/docs/cdkguide/en/src/main/docbook/modules/ide.xml
Log:
spelling error
Modified: trunk/docs/cdkguide/en/src/main/docbook/modules/ide.xml
===================================================================
--- trunk/docs/cdkguide/en/src/main/docbook/modules/ide.xml 2009-04-23 14:38:17 UTC (rev 13799)
+++ trunk/docs/cdkguide/en/src/main/docbook/modules/ide.xml 2009-04-23 14:39:22 UTC (rev 13800)
@@ -68,7 +68,7 @@
that you have Web application, so it should be possible to run it on a server.
</para>
<para>
- Finally you need to make import. You can find the step-by-step tutorial at the
+ Finally you need to make import. You can find a step-by-step tutorial at the
<ulink url="http://help.eclipse.org/ganymede/topic/org.eclipse.platform.doc.user/task...">Eclipse documentation</ulink> page
or simply in the <emphasis><property>Help</property></emphasis> > <emphasis><property>Help Contents</property></emphasis> of the Eclipse.
As the result two projects should appear in the workspace:
15 years, 8 months
JBoss Rich Faces SVN: r13799 - in trunk/docs/realworld_app_guide/en/src/main: docbook/modules and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: artdaw
Date: 2009-04-23 10:38:17 -0400 (Thu, 23 Apr 2009)
New Revision: 13799
Added:
trunk/docs/realworld_app_guide/en/src/main/resources/images/modulesList.png
Modified:
trunk/docs/realworld_app_guide/en/src/main/docbook/master.xml
trunk/docs/realworld_app_guide/en/src/main/docbook/modules/application_overview.xml
trunk/docs/realworld_app_guide/en/src/main/docbook/modules/getting_started.xml
trunk/docs/realworld_app_guide/en/src/main/docbook/modules/hiw.xml
trunk/docs/realworld_app_guide/en/src/main/docbook/modules/intro.xml
Log:
https://jira.jboss.org/jira/browse/RF-5768 - Photo Album review
Modified: trunk/docs/realworld_app_guide/en/src/main/docbook/master.xml
===================================================================
--- trunk/docs/realworld_app_guide/en/src/main/docbook/master.xml 2009-04-23 14:26:05 UTC (rev 13798)
+++ trunk/docs/realworld_app_guide/en/src/main/docbook/master.xml 2009-04-23 14:38:17 UTC (rev 13799)
@@ -11,13 +11,18 @@
<book>
<bookinfo>
- <title>RichFaces Real World Application Tutorial</title>
-
+ <title>RichFaces Photo Album Application Guide</title>
+ <subtitle>This documentation is work in progress, thus some mistakes or incompleteness is possible</subtitle>
<author>
<firstname>Alex</firstname>
<surname>Tsebro</surname>
<email>atsebro(a)exadel.com</email>
- </author>
+ </author>
+ <author>
+ <firstname>Gleb</firstname>
+ <surname>Galkin</surname>
+ <email>ggalkin(a)exadel.com</email>
+ </author>
<copyright>
<year>2009</year>
<holder>Red Hat</holder>
@@ -33,8 +38,8 @@
</bookinfo>
<toc/>
&intro;
+ &getting_started;
&application_overview;
- &getting_started;
&hiw;
Modified: trunk/docs/realworld_app_guide/en/src/main/docbook/modules/application_overview.xml
===================================================================
--- trunk/docs/realworld_app_guide/en/src/main/docbook/modules/application_overview.xml 2009-04-23 14:26:05 UTC (rev 13798)
+++ trunk/docs/realworld_app_guide/en/src/main/docbook/modules/application_overview.xml 2009-04-23 14:38:17 UTC (rev 13799)
@@ -10,7 +10,7 @@
<title>Application Overview</title>
- <section><title>Used technologies</title>
+ <!-- section><title>Used technologies</title>
<para>
The Photo Album Demo application is not only a JSF application. It encompasses various technologies and frameworks:
</para>
@@ -23,7 +23,7 @@
<listitem><para><emphasis>RichFaces</emphasis>, a framework and library of Ajax-capable UI components for JSF framework that had been evolved from Ajax4JSF framework (merge of Ajax and JavaServer Faces technologies).</para></listitem>
</itemizedlist>
- </section>
+ </section-->
<section>
<title>General overview</title>
Modified: trunk/docs/realworld_app_guide/en/src/main/docbook/modules/getting_started.xml
===================================================================
--- trunk/docs/realworld_app_guide/en/src/main/docbook/modules/getting_started.xml 2009-04-23 14:26:05 UTC (rev 13798)
+++ trunk/docs/realworld_app_guide/en/src/main/docbook/modules/getting_started.xml 2009-04-23 14:38:17 UTC (rev 13799)
@@ -8,45 +8,111 @@
</keywordset>
</chapterinfo>
<title>Getting started</title>
-
<section>
<title>Environment Configuration</title>
<para>
- The working version of the application is available on-line at <ulink url="http://livedemo.exadel.com/realworld/">http://livedemo.exadel.com/realworld/</ulink>.
+ In order to download, build, modify, and deploy the Photo Album application
+ you need the following installed and configured:
</para>
- <para>
- Application sources are available at <ulink url="http://anonsvn.jboss.org/repos/richfaces/trunk/test-applications/realworld/">http://anonsvn.jboss.org/repos/richfaces/trunk/test-applications/realworld/</ulink>.
- </para>
- <para>
- In order to download the application sources and deploy them locally the following should be installed and configured on your computer:
- </para>
<itemizedlist>
- <listitem><para>JDK 1.5 and higher</para></listitem>
- <listitem><para>Maven 2.0.9</para></listitem>
- <listitem><para>JBDS (or another appropriate IDE)</para></listitem>
- <listitem><para>JBoss Server 4.2.3</para></listitem>
- <listitem><para>SVN client </para></listitem>
- <listitem><para>Browser</para></listitem>
+ <listitem>
+ <para>
+ <ulink url="http://java.sun.com/javase/downloads/index.jsp">JDK 1.5 and higher</ulink>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <ulink url="http://maven.apache.org/download.html">Maven 2.0.10</ulink>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <ulink url="http://www.jboss.org/tools">JBoss Tools</ulink>
+ (or <ulink url="http://www.eclipse.org/">Eclipse</ulink>)
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <ulink url="http://www.jboss.org/jbossas/downloads/">JBoss Server</ulink> (4.2.3.GA, 5.0.x.GA)
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <ulink url="http://subversion.tigris.org/">SVN client</ulink>
+ </para>
+ </listitem>
</itemizedlist>
</section>
<section>
<title>Installation</title>
- <para>Follow the next steps for downloading and installing the Real World demo.</para>
-
+ <para>
+ Once you have configured the environment you can install the Photo Album application:
+ </para>
<itemizedlist>
- <listitem><para><emphasis>Checkout the project using installed SVN client</emphasis>.
- URL of repository: <code>https://svn.jboss.org/repos/richfaces/trunk/test-applications/realworld/</code>;</para></listitem>
- <listitem><para><emphasis>Build the project</emphasis>.
- Open command line console, point to the folder with checkouted project and tell Maven: <code>mvn clean install eclipse:eclipse</code>;</para></listitem>
- <listitem><para><emphasis>Import the project into your IDE</emphasis>.
- Steps to follow for JBDS users: click <code>File</code> -> <code>Import</code> and select <code>Existing project into Workspace</code> as import source;
+ <listitem>
+ <para>
+ <emphasis>Checkout the project</emphasis>
+ </para>
+ <programlisting role="XML"><![CDATA[svn co http://anonsvn.jboss.org/repos/richfaces/trunk/examples/photoalbum/]]></programlisting>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>Build the project</emphasis>.
+ Open command line console,
+ point to the folder with checkouted project,
+ and tell Maven:
+ </para>
+ <programlisting role="XML"><![CDATA[mvn clean install eclipse:eclipse -Dwtpversion=1.5]]></programlisting>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>Import the project into your IDE</emphasis>.
+ You can just deploy Photo Album application on the server, but
+ the convenient way is to import the project into your IDE.
+ We recommend Eclipse with JBoss Tools since this bundle is more preferable to
+ ensure rapid development process with Seam and RichFaces.
+ You can find a step-by-step tutorial "Importing existing projects"
+ at the
+<ulink url="http://help.eclipse.org/ganymede/topic/org.eclipse.platform.doc.user/task...">Eclipse documentation</ulink> page
+or simply in the <emphasis>Help</emphasis> > <emphasis>Help Contents</emphasis> of the Eclipse.
+ <!--
+ Steps to follow for JBDS users:
+ click <code>File</code> -> <code>Import</code> and select <code>Existing project into Workspace</code> as import source;
in <code>Import Project</code> window click <code>Browse</code> button and point to the realworld project folder; сlick <code>OK</code>.
- Three SNAPSHOTS (<code>ear</code>, <code>ejb</code>, <code>web</code>) should appear in <code>Projects</code> area.
- Checkmark them all and click <code>Finish</code>. These projects appear in JBDS <code>Package Explorer</code> window.</para></listitem>
- <listitem><para><emphasis>Register the pass to project images</emphasis>. Open project <code>web.xml</code> file (<code>realworld-web-1.0-SNAPSHOT/src/main/webapp/WEB-INF/web.xml</code>) and change <code>uploadRoot</code> parameter value from <code>E:/Andrey/Upload/</code> to yours e.g. <code>D:/realworld/Upload/</code>.</para></listitem>
- <listitem><para><emphasis>Run realworld-ear-1.0-SNAPSHOT</emphasis> on the <code>JBoss 4.2. Server</code> under 3 Runtime (those who prefer manual job should deploy and start <code>realworld.ear</code> file).</para></listitem>
- <listitem><para>Browse to <code>http:/localhost:8080/realworld</code>.</para></listitem>
+ -->
+ As the result three modules of Photo Album project appear in the Workspace:
+ </para>
+ <figure>
+ <title>Modules of Photo Album in the Workspace</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/modulesList.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>Add JBoss AS</emphasis>.
+ Now you need to add JBoss Application Server runtime.
+
+ Detailed instructions on how you can do it are given in the
+ <ulink url="http://download.jboss.org/jbosstools/nightly-docs/en/as/html/runtimes_ser...">Runtimes and Servers in the JBoss AS plugin</ulink>
+ chapter from the <ulink url="http://download.jboss.org/jbosstools/nightly-docs/en/as/html/index.html">JBoss Server Manager Reference Guide</ulink>.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>Run photoalbum-ear-1.0-SNAPSHOT</emphasis> on the JBoss Application Server
+ you have just installed.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Browse to <code>http:/localhost:8080/photoalbum</code>.
+ </para>
+ </listitem>
</itemizedlist>
</section>
Modified: trunk/docs/realworld_app_guide/en/src/main/docbook/modules/hiw.xml
===================================================================
--- trunk/docs/realworld_app_guide/en/src/main/docbook/modules/hiw.xml 2009-04-23 14:26:05 UTC (rev 13798)
+++ trunk/docs/realworld_app_guide/en/src/main/docbook/modules/hiw.xml 2009-04-23 14:38:17 UTC (rev 13799)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<chapter id="patterns" xreflabel="patterns">
- <?dbhtml filename="getting_started.html"?>
+ <?dbhtml filename="patterns.html"?>
<chapterinfo>
<keywordset>
<keyword>RichFaces</keyword>
Modified: trunk/docs/realworld_app_guide/en/src/main/docbook/modules/intro.xml
===================================================================
--- trunk/docs/realworld_app_guide/en/src/main/docbook/modules/intro.xml 2009-04-23 14:26:05 UTC (rev 13798)
+++ trunk/docs/realworld_app_guide/en/src/main/docbook/modules/intro.xml 2009-04-23 14:38:17 UTC (rev 13799)
@@ -4,38 +4,66 @@
<title>Introduction</title>
<para>
- The Photo Album Demo
- is created to help you imagine the way web applications designed and developed with <property>RichFaces</property> can look like and behave.
+ The "Photo Album" web application is a desktop-like on-line photo manager.
+ It provides social services for uploading photos, storing and previewing them,
+ creating your own albums and sharing them with other users, searching albums,
+ photos or users, managing the environment.
+ Newcomers or not registered users can navigate through other users shelves and albums
+ in "Anonymous mode", but in this case no possibilities to create personal
+ shelves or albums or upload photos are available.
</para>
<para>
- The <property>RichFaces</property> is an opensource framework and library of Ajax-capable UI components for JavaServer Faces framework.
- The <property>RichFaces</property> is evolved from Ajax4JSF framework (integration of Ajax and JavaServer Faces technologies).
+ The "Photo Album" represents and implements strict "Shelves - Albums - Photos" hierarchy.
+ It means that photos are kept in albums and albums are stored on shelves, but albums can not contain another albums
+ or shelves and shelves can not keep another shelves and can not be stored in albums.
</para>
- <para>
- The <property>RichFaces</property> provides a set of benefits which distinguish it from a wide range of similar libraries and frameworks.
- All the <property>RichFaces</property> benefits and advantages are fully described in the
- "<ulink url="http://www.jboss.org/file-access/default/members/jbossrichfaces/freezone/...">Introduction to the RichFaces</ulink>" chapter of the
- "<ulink url="http://www.jboss.org/file-access/default/members/jbossrichfaces/freezone/...">RichFaces Developer Guide</ulink>".
- The "<emphasis role="bold">Photo Album Demo</emphasis>" covers some of the main ones and demonstrates:
- </para>
- <itemizedlist>
- <listitem><para><emphasis>Wide variety of UI components</emphasis> — the <property>RichFaces</property> provides a Lego-like way of building user interfaces for web applications;</para></listitem>
- <listitem><para><emphasis>Built-in Ajax capability</emphasis> — the <property>RichFaces</property> offers both component-wide and very flexible page-wide Ajax support with no need to write any JavaScript code; </para></listitem>
- <listitem><para><emphasis>Highly customizable look-and-feel</emphasis> — the <property>RichFaces</property> have special feature called
- "<ulink url="http://www.jboss.org/file-access/default/members/jbossrichfaces/freezone/...">Skinnability</ulink>").</para></listitem>
+ <para>
+ The Photo Album web application is designed and developed with RichFaces. This application demonstrates:
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <emphasis>wide variety of UI components</emphasis> — the <property>RichFaces</property> provides
+ a Lego-like way of building user interfaces for web applications;
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>built-in Ajax capability</emphasis> — the <property>RichFaces</property> offers
+ both component-wide and very flexible page-wide Ajax support with no need to write any JavaScript code;
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>highly customizable look-and-feel</emphasis> — the <property>RichFaces</property> have special feature called
+ <ulink url="http://www.jboss.org/file-access/default/members/jbossrichfaces/freezone/...">Skinnability</ulink>.
+ </para>
+ </listitem>
</itemizedlist>
<para>
- The "Photo Album Demo" is a desktop-like on-line photo manager.
- It provides social services for uploading photos, storing and previewing them, creating your own albums and sharing them with other users, searching albums, photos or users, managing the environment.
- Newcomers or not registered users can navigate through other users shelves and albums in "Anonymous mode", but in this case <property>no</property> possibilities to create personal shelves or albums or upload photos are available.
+ The Photo Album application also encompasses technologies and frameworks such as:
</para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <ulink url="https://facelets.dev.java.net/">Facelets</ulink>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <ulink url="http://java.sun.com/products/ejb/">Enterprise Java Beans (EJB) 3.0</ulink>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <ulink url="http://seamframework.org/">Seam framework</ulink>
+ </para>
+ </listitem>
+ </itemizedlist>
<para>
- The "Photo Album Demo" represents and implements strict "Shelves—Albums—Photos" hierarchy.
- It means that photos are kept in albums and albums are stored on shelves, but albums can not contain another albums or shelves and shelves can not keep another shelves and can not be stored in albums.
+ The application is available online at <ulink url="http://livedemo.exadel.com/realworld/">Photo Album</ulink> page.
</para>
- <para>
- The <property>RichFaces</property> "Photo Album Demo" is a blue print application. One of it main goal is to show patterns of the <property>RichFaces</property> components usage.
- </para>
+
</chapter>
Added: trunk/docs/realworld_app_guide/en/src/main/resources/images/modulesList.png
===================================================================
(Binary files differ)
Property changes on: trunk/docs/realworld_app_guide/en/src/main/resources/images/modulesList.png
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
15 years, 8 months
JBoss Rich Faces SVN: r13798 - in trunk/ui/editor/src: main/java/org/richfaces/convert/seamtext/tags and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2009-04-23 10:26:05 -0400 (Thu, 23 Apr 2009)
New Revision: 13798
Added:
trunk/ui/editor/src/main/java/org/richfaces/convert/seamtext/tags/EmptyHtmlTag.java
Modified:
trunk/ui/editor/src/main/java/org/richfaces/convert/seamtext/DefaultSeamTextConverter.java
trunk/ui/editor/src/main/java/org/richfaces/convert/seamtext/tags/HtmlTag.java
trunk/ui/editor/src/main/java/org/richfaces/convert/seamtext/tags/TagFactory.java
trunk/ui/editor/src/test/java/org/richfaces/seamparser/HtmlSeamParserTest.java
Log:
Editor: unnecessary images appear in editor after rerender in seamText mode.
https://jira.jboss.org/jira/browse/RF-6907
Modified: trunk/ui/editor/src/main/java/org/richfaces/convert/seamtext/DefaultSeamTextConverter.java
===================================================================
--- trunk/ui/editor/src/main/java/org/richfaces/convert/seamtext/DefaultSeamTextConverter.java 2009-04-23 14:07:45 UTC (rev 13797)
+++ trunk/ui/editor/src/main/java/org/richfaces/convert/seamtext/DefaultSeamTextConverter.java 2009-04-23 14:26:05 UTC (rev 13798)
@@ -59,7 +59,7 @@
}
try {
- return new HtmlToSeamSAXParser().convertHtmlToSeamText(value);
+ return HtmlToSeamSAXParser.convertHtmlToSeamText(value);
} catch (Exception e) {
FacesMessage message = new FacesMessage(
Added: trunk/ui/editor/src/main/java/org/richfaces/convert/seamtext/tags/EmptyHtmlTag.java
===================================================================
--- trunk/ui/editor/src/main/java/org/richfaces/convert/seamtext/tags/EmptyHtmlTag.java (rev 0)
+++ trunk/ui/editor/src/main/java/org/richfaces/convert/seamtext/tags/EmptyHtmlTag.java 2009-04-23 14:26:05 UTC (rev 13798)
@@ -0,0 +1,28 @@
+package org.richfaces.convert.seamtext.tags;
+
+public class EmptyHtmlTag extends HtmlTag {
+
+ private static final long serialVersionUID = 6885598850897971629L;
+
+ EmptyHtmlTag(String name) {
+ super(name);
+ }
+
+ @Override
+ public String print() {
+ final StringBuilder builder = new StringBuilder();
+ builder.append('<').append(getName());
+
+ if (!getAttributes().isEmpty()) {
+ builder.append(' ').append(printAttributes());
+ }
+ builder.append("/>");
+
+ return builder.toString();
+ }
+
+ @Override
+ public String printPlain() {
+ return print();
+ }
+}
Modified: trunk/ui/editor/src/main/java/org/richfaces/convert/seamtext/tags/HtmlTag.java
===================================================================
--- trunk/ui/editor/src/main/java/org/richfaces/convert/seamtext/tags/HtmlTag.java 2009-04-23 14:07:45 UTC (rev 13797)
+++ trunk/ui/editor/src/main/java/org/richfaces/convert/seamtext/tags/HtmlTag.java 2009-04-23 14:26:05 UTC (rev 13798)
@@ -1,7 +1,7 @@
package org.richfaces.convert.seamtext.tags;
import java.io.Serializable;
-import java.util.ArrayList;
+import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -15,6 +15,12 @@
private static final long serialVersionUID = -372761460000118889L;
+ public static final String HR = "hr";
+ public static final String BR = "br";
+ public static final String IMG = "img";
+ public static final String AREA = "area";
+ public static final String COL = "col";
+
public static final String A = "a";
public static final String H1 = "h1";
public static final String H2 = "h2";
@@ -57,7 +63,7 @@
setAttributes(attributes);
}
- public String printPlainStart(){
+ protected String printPlainStart(){
final StringBuilder builder = new StringBuilder();
builder.append('<').append(getName());
@@ -69,15 +75,15 @@
return builder.toString();
}
- public String printStartSuffix(){
+ protected String printStartSuffix(){
return ">";
}
- public String printStart(){
+ protected String printStart(){
return printPlainStart();
}
- private String printAttributes() {
+ protected String printAttributes() {
if (attributes == null) {
return "";
}
@@ -90,7 +96,7 @@
return builder.substring(0, builder.length() - 1);
}
- private String prepareValue(String value) {
+ protected String prepareValue(String value) {
return value.replace('"', '^');
}
@@ -98,7 +104,7 @@
res.append(child);
}
- public String printBody() {
+ protected String printBody() {
final StringBuilder res = new StringBuilder();
for (Object child : body) {
if (child instanceof HtmlTag) {
@@ -119,7 +125,7 @@
}
public void cleanBody() {
- body = new ArrayList<Object>();
+ body = new LinkedList<Object>();
}
public boolean isBodyEmpty() {
@@ -132,7 +138,7 @@
return true;
}
- public String printPlainEnd(){
+ protected String printPlainEnd(){
if (isEmpty) {
// return "/>";
}
@@ -143,7 +149,7 @@
return builder.toString();
}
- public String printEnd(){
+ protected String printEnd(){
return printPlainEnd();
}
Modified: trunk/ui/editor/src/main/java/org/richfaces/convert/seamtext/tags/TagFactory.java
===================================================================
--- trunk/ui/editor/src/main/java/org/richfaces/convert/seamtext/tags/TagFactory.java 2009-04-23 14:07:45 UTC (rev 13797)
+++ trunk/ui/editor/src/main/java/org/richfaces/convert/seamtext/tags/TagFactory.java 2009-04-23 14:26:05 UTC (rev 13798)
@@ -29,6 +29,12 @@
* */
private static final Collection<HtmlTag> TAGS = Arrays.asList(
getNewTagDefinition("root", "", ""),
+ new EmptyHtmlTag(HR),
+ new EmptyHtmlTag(BR),
+ new EmptyHtmlTag(IMG),
+ new EmptyHtmlTag(AREA),
+ new EmptyHtmlTag(COL),
+
new LineTag(H1, "+ "),
new LineTag(H2, "++ "),
new LineTag(H3, "+++ "),
@@ -54,7 +60,7 @@
new FormattingTag(DEL, SEAM_TWIDDLE),
new FormattingTag(SUP, SEAM_HAT),
new FormattingTag(U, SEAM_UNDERSCORE),
- new FormattingTag(TT, SEAM_MONOSPACE){
+ new FormattingTag(TT, SEAM_MONOSPACE) {
@Override
public boolean isFormating() {
Modified: trunk/ui/editor/src/test/java/org/richfaces/seamparser/HtmlSeamParserTest.java
===================================================================
--- trunk/ui/editor/src/test/java/org/richfaces/seamparser/HtmlSeamParserTest.java 2009-04-23 14:07:45 UTC (rev 13797)
+++ trunk/ui/editor/src/test/java/org/richfaces/seamparser/HtmlSeamParserTest.java 2009-04-23 14:26:05 UTC (rev 13798)
@@ -246,6 +246,20 @@
assertHtml2SeamConverting("<ul><li><ul><li /></ul></li></ul>");
}
+ public void testEmrtyTags() throws Exception {
+ final String html = "<br/>";
+ final String result = assertHtml2SeamConverting(html);
+
+ assertEquals(html, result);
+ }
+
+ public void testEmrtyTags02() throws Exception {
+ final String html = " <br/>Hello <hr/><img/><area/> World! <col/>";
+ final String result = assertHtml2SeamConverting(html);
+
+ assertTrue(result.contains(html));
+ }
+
public void testUglyTextFromWord() throws Exception {
final String str = "<p><meta content=\"text/html; charset=utf-8\" http-equiv=\"Content-Type\"/><meta content=\"Word.Document\" name=\"ProgId\"/><meta content=\"Microsoft Word 12\" name=\"Generator\"/><meta content=\"Microsoft Word 12\" name=\"Originator\"/><link href=\"file:///E:\\TEMP~1\\msohtmlclip1\\01\\clip_filelist.xml\" rel=\"File-List\"/><link href=\"file:///E:\\TEMP~1\\msohtmlclip1\\01\\clip_themedata.thmx\" rel=\"themeData\"/><link href=\"file:///E:\\TEMP~1\\msohtmlclip1\\01\\clip_colorschememapping.xml\" rel=\"colorSchemeMapping\"/>"
+ "<!--[if gte mso 9]><xml>\n"
15 years, 8 months
JBoss Rich Faces SVN: r13797 - trunk/framework/impl.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2009-04-23 10:07:45 -0400 (Thu, 23 Apr 2009)
New Revision: 13797
Modified:
trunk/framework/impl/pom.xml
Log:
commons-digester reverted to 1.8.1
Modified: trunk/framework/impl/pom.xml
===================================================================
--- trunk/framework/impl/pom.xml 2009-04-23 13:49:42 UTC (rev 13796)
+++ trunk/framework/impl/pom.xml 2009-04-23 14:07:45 UTC (rev 13797)
@@ -150,7 +150,7 @@
<dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
- <version>2.0</version>
+ <version>1.8.1</version>
<exclusions>
<exclusion>
<artifactId>commons-logging</artifactId>
15 years, 8 months
JBoss Rich Faces SVN: r13796 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: ochikvina
Date: 2009-04-23 09:49:42 -0400 (Thu, 23 Apr 2009)
New Revision: 13796
Modified:
trunk/docs/userguide/en/src/main/docbook/included/modalPanel.xml
Log:
https://jira.jboss.org/jira/browse/RF-6716 - adding the description for new method Richfaces.hideTopModalPanel();
Modified: trunk/docs/userguide/en/src/main/docbook/included/modalPanel.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/modalPanel.xml 2009-04-23 13:41:49 UTC (rev 13795)
+++ trunk/docs/userguide/en/src/main/docbook/included/modalPanel.xml 2009-04-23 13:49:42 UTC (rev 13796)
@@ -115,7 +115,7 @@
<tbody>
<row>
- <entry>RichFaces.showModalPanel (client
+ <entry>Richfaces.showModalPanel (client
Id)</entry>
<entry>Opens a window with a specified client
@@ -123,12 +123,18 @@
</row>
<row>
- <entry>RichFaces.hideModalPanel (client
+ <entry>Richfaces.hideModalPanel (client
Id)</entry>
<entry>Closes a window with a specified client
Id</entry>
</row>
+
+ <row>
+ <entry>Richfaces.hideTopModalPanel ()</entry>
+
+ <entry>Closes the current visible window at the top</entry>
+ </row>
</tbody>
</tgroup>
</table>
15 years, 8 months
JBoss Rich Faces SVN: r13795 - in trunk/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins: o2k7 and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2009-04-23 09:41:49 -0400 (Thu, 23 Apr 2009)
New Revision: 13795
Modified:
trunk/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/default/content.xcss
trunk/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/o2k7/content.xcss
trunk/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/richfaces/content.xcss
Log:
https://jira.jboss.org/jira/browse/RF-6613
Modified: trunk/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/default/content.xcss
===================================================================
--- trunk/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/default/content.xcss 2009-04-23 12:54:58 UTC (rev 13794)
+++ trunk/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/default/content.xcss 2009-04-23 13:41:49 UTC (rev 13795)
@@ -60,4 +60,32 @@
}
]]>
</f:verbatim>
+
+/* RF: custom styles */
+
+<f:verbatim><![CDATA[
+.bold-larger {
+ font-weight: bold;
+ font-size: larger;
+}
+.bold-smaller {
+ font-weight: bold;
+ font-size: smaller;
+}
+.red-bold {
+ font-weight: bold;
+ color: red;
+}
+.red-bold-larger {
+ font-weight: bold;
+ font-size: larger;
+ color: red;
+}
+.red-bold-smaller {
+ font-weight: bold;
+ font-size: smaller;
+ color: red;
+}
+]]>
+</f:verbatim>
</f:template>
Modified: trunk/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/o2k7/content.xcss
===================================================================
--- trunk/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/o2k7/content.xcss 2009-04-23 12:54:58 UTC (rev 13794)
+++ trunk/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/o2k7/content.xcss 2009-04-23 13:41:49 UTC (rev 13795)
@@ -59,4 +59,32 @@
}
]]>
</f:verbatim>
+
+/* RF: custom styles */
+
+<f:verbatim><![CDATA[
+.bold-larger {
+ font-weight: bold;
+ font-size: larger;
+}
+.bold-smaller {
+ font-weight: bold;
+ font-size: smaller;
+}
+.red-bold {
+ font-weight: bold;
+ color: red;
+}
+.red-bold-larger {
+ font-weight: bold;
+ font-size: larger;
+ color: red;
+}
+.red-bold-smaller {
+ font-weight: bold;
+ font-size: smaller;
+ color: red;
+}
+]]>
+</f:verbatim>
</f:template>
Modified: trunk/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/richfaces/content.xcss
===================================================================
--- trunk/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/richfaces/content.xcss 2009-04-23 12:54:58 UTC (rev 13794)
+++ trunk/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/richfaces/content.xcss 2009-04-23 13:41:49 UTC (rev 13795)
@@ -104,4 +104,32 @@
<u:style name="scrollbar-track-color" value="#F5F5F5"/>
</u:selector>
+/* RF: custom styles */
+
+<f:verbatim><![CDATA[
+.bold-larger {
+ font-weight: bold;
+ font-size: larger;
+}
+.bold-smaller {
+ font-weight: bold;
+ font-size: smaller;
+}
+.red-bold {
+ font-weight: bold;
+ color: red;
+}
+.red-bold-larger {
+ font-weight: bold;
+ font-size: larger;
+ color: red;
+}
+.red-bold-smaller {
+ font-weight: bold;
+ font-size: smaller;
+ color: red;
+}
+]]>
+</f:verbatim>
+
</f:template>
\ No newline at end of file
15 years, 8 months