November 2007 - richfaces-svn-commits

JBoss Rich Faces SVN: r4279 - in branches/3.1.x/sandbox/ui/listShuttle/src/main: java/org/richfaces/component and 2 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2007-11-26 21:52:02 -0500 (Mon, 26 Nov 2007) New Revision: 4279 Modified: branches/3.1.x/sandbox/ui/listShuttle/src/main/config/component/listShuttle.xml branches/3.1.x/sandbox/ui/listShuttle/src/main/java/org/richfaces/component/UIListShuttle.java branches/3.1.x/sandbox/ui/listShuttle/src/main/java/org/richfaces/model/ListShuttleDataModel.java branches/3.1.x/sandbox/ui/listShuttle/src/main/java/org/richfaces/renderkit/ListShuttleRendererBase.java Log: latest changes for listShuttle & orderingList Modified: branches/3.1.x/sandbox/ui/listShuttle/src/main/config/component/listShuttle.xml =================================================================== --- branches/3.1.x/sandbox/ui/listShuttle/src/main/config/component/listShuttle.xml 2007-11-27 02:51:55 UTC (rev 4278) +++ branches/3.1.x/sandbox/ui/listShuttle/src/main/config/component/listShuttle.xml 2007-11-27 02:52:02 UTC (rev 4279) @@ -60,6 +60,10 @@ <property hidden="true"> <name>value</name> </property> + <property elonly="true"> + <name>selection</name> + <description>Collection which stores a set of selected items</description> + </property> <property> <name>orderControlsVisible</name> Modified: branches/3.1.x/sandbox/ui/listShuttle/src/main/java/org/richfaces/component/UIListShuttle.java =================================================================== --- branches/3.1.x/sandbox/ui/listShuttle/src/main/java/org/richfaces/component/UIListShuttle.java 2007-11-27 02:51:55 UTC (rev 4278) +++ branches/3.1.x/sandbox/ui/listShuttle/src/main/java/org/richfaces/component/UIListShuttle.java 2007-11-27 02:52:02 UTC (rev 4279) @@ -7,8 +7,6 @@ import java.io.Serializable; import java.lang.reflect.Array; import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; import java.util.HashSet; import java.util.Iterator; import java.util.LinkedHashMap; @@ -29,9 +27,6 @@ import javax.faces.model.DataModel; import org.apache.commons.collections.map.CompositeMap; -import org.richfaces.component.UIOrderingBaseComponent.UpdateModelCommand; -import org.richfaces.component.UIOrderingList.SubmittedValue; -import org.richfaces.component.UIOrderingList.ValueHolder; import org.richfaces.model.ListShuttleDataModel; import org.richfaces.model.ListShuttleRowKey; @@ -45,7 +40,8 @@ public static final String COMPONENT_FAMILY = "org.richfaces.ListShuttle"; - public static final class SubmittedValue implements Serializable { + protected static final class SubmittedValue implements Serializable { + private static final Pattern ITEM_PATTERN = Pattern.compile("(s|t)(\\d+)(s?a?)"); /** * */ @@ -65,7 +61,7 @@ } private void convertAndStoreKey(String keyString, int i, boolean keySource) { - Matcher matcher = Pattern.compile("(s|t)(\\d+)(s?a?)").matcher(keyString); + Matcher matcher = ITEM_PATTERN.matcher(keyString); matcher.matches(); try { @@ -173,13 +169,19 @@ private boolean targetValueSet; public Object saveState(FacesContext context) { - // TODO Auto-generated method stub - return super.saveState(context); + Object[] state = new Object[2]; + + state[0] = super.saveState(context); + state[1] = saveIterationState(); + + return state; } - public void restoreState(FacesContext context, Object state) { - // TODO Auto-generated method stub - super.restoreState(context, state); + public void restoreState(FacesContext context, Object object) { + Object[] state = (Object[]) object; + + super.restoreState(context, state[0]); + restoreIterationState(state[1]); } public Object getLocalSourceValue() { @@ -200,6 +202,7 @@ } public void setSourceValue(Object sourceValue) { + setExtendedDataModel(null); this.sourceValue = sourceValue; this.sourceValueSet = true; } @@ -222,6 +225,7 @@ } public void setTargetValue(Object targetValue) { + setExtendedDataModel(null); this.targetValue = targetValue; this.targetValueSet = true; } @@ -263,6 +267,7 @@ targetValue = holder.targetValue; targetValueSet = holder.targetValueSet; + } public org.ajax4jsf.model.ExtendedDataModel createDataModel() { @@ -270,13 +275,20 @@ DataModel targetDataModel = createDataModel(getTargetValue()); if (isTranslatedRenderingState() || isTranslatedState()) { + Map sourceTranslationTable = null; + Map targetTranslationTable = null; + + if (submittedValueHolder != null) { + sourceTranslationTable = submittedValueHolder.sourceTranslationTable; + targetTranslationTable = submittedValueHolder.targetTranslationTable; + } + return new ListShuttleDataModel(sourceDataModel, targetDataModel, isTranslatedState(), - submittedValueHolder != null ? - new CompositeMap(submittedValueHolder.sourceTranslationTable, submittedValueHolder.targetTranslationTable) - : null); + sourceTranslationTable, + targetTranslationTable); } else { - return new ListShuttleDataModel(sourceDataModel, targetDataModel, false, null); + return new ListShuttleDataModel(sourceDataModel, targetDataModel, false, null, null); } } @@ -386,6 +398,8 @@ return; } + updateModel(context, updateActiveItemCommand); + updateModel(context, updateSelectionCommand); updateModel(context, updateSourceCommand); updateModel(context, updateTargetCommand); } @@ -457,18 +471,18 @@ // "submitted" value, and emit a ValueChangeEvent if appropriate if (isValid()) { Object rowKey = getRowKey(); -// -// Set selectionSet = new HashSet(); -// Set selectedItems = submittedValueHolder.selectedItems; -// for (Iterator iterator = selectedItems.iterator(); iterator -// .hasNext();) { -// setRowKey(context, iterator.next()); -// Object selectionItem = getRowData(); -// -// selectionSet.add(selectionItem); -// } -// -// setSelection(selectionSet); + + Set selectionSet = new HashSet(); + Set selectedItems = submittedValueHolder.selectedItems; + for (Iterator iterator = selectedItems.iterator(); iterator + .hasNext();) { + setRowKey(context, iterator.next()); + Object selectionItem = getRowData(); + + selectionSet.add(selectionItem); + } + + setSelection(selectionSet); // if (submittedValueHolder.activeItem != null) { // setRowKey(context, submittedValueHolder.activeItem); @@ -588,4 +602,8 @@ setTranslatedRenderingState(); } } + + public Object getTranslatedRowKey() { + return ((ListShuttleDataModel) getExtendedDataModel()).getTranslatedRowKey(); + } } Modified: branches/3.1.x/sandbox/ui/listShuttle/src/main/java/org/richfaces/model/ListShuttleDataModel.java =================================================================== --- branches/3.1.x/sandbox/ui/listShuttle/src/main/java/org/richfaces/model/ListShuttleDataModel.java 2007-11-27 02:51:55 UTC (rev 4278) +++ branches/3.1.x/sandbox/ui/listShuttle/src/main/java/org/richfaces/model/ListShuttleDataModel.java 2007-11-27 02:52:02 UTC (rev 4279) @@ -4,7 +4,9 @@ package org.richfaces.model; import java.io.IOException; +import java.util.Iterator; import java.util.Map; +import java.util.Map.Entry; import javax.faces.context.FacesContext; import javax.faces.model.DataModel; @@ -14,6 +16,7 @@ import org.ajax4jsf.model.Range; import org.ajax4jsf.model.SequenceDataModel; import org.ajax4jsf.model.SequenceRange; +import org.apache.commons.collections.map.CompositeMap; /** * @author Nick Belaevski @@ -30,6 +33,10 @@ private SequenceDataModel sourceModel; private SequenceDataModel targetModel; + private Map sourceTranslationTable; + + private Map targetTranslationTable; + protected static final class TranslatedRowKey { private Object rowKey; @@ -54,6 +61,30 @@ } }; + protected static final class MovedRowKey { + private Object rowKey; + + private boolean sourceKey; + + public MovedRowKey(Object key, boolean sourceKey) { + super(); + this.rowKey = key; + this.sourceKey = sourceKey; + } + + public Object getRowKey() { + return rowKey; + } + + public boolean isSourceKey() { + return sourceKey; + } + + public String toString() { + return rowKey.toString(); + } + }; + /* (non-Javadoc) * @see org.ajax4jsf.model.ExtendedDataModel#getRowKey() */ @@ -99,6 +130,12 @@ if (key instanceof TranslatedRowKey) { ListShuttleRowKey shuttleRowKey = (ListShuttleRowKey) ((TranslatedRowKey) key).getRowKey(); setShuttleRowKey(shuttleRowKey); + } else if (key instanceof MovedRowKey) { + MovedRowKey mrk = (MovedRowKey) key; + setRowKey(mrk.getRowKey()); + if (!this.translatedModel) { + useSource = Boolean.valueOf(mrk.isSourceKey()); + } } else { if (this.translatedModel) { if (rowKey != null) { @@ -113,10 +150,14 @@ } public ListShuttleDataModel(DataModel source, DataModel target, - boolean translatedModel, Map translationTable) { + boolean translatedModel, Map sourceTranslationTable, Map targetTranslationTable) { super(); this.translatedModel = translatedModel; - this.translationTable = translationTable; + this.sourceTranslationTable = sourceTranslationTable; + this.targetTranslationTable = targetTranslationTable; + if (sourceTranslationTable != null && targetTranslationTable != null) { + this.translationTable = new CompositeMap(sourceTranslationTable, targetTranslationTable); + } this.sourceModel = new org.ajax4jsf.model.SequenceDataModel(source); this.targetModel = new org.ajax4jsf.model.SequenceDataModel(target); @@ -128,39 +169,61 @@ public void walk(final FacesContext context, final DataVisitor visitor, Range range, Object argument) throws IOException { - this.sourceModel.walk(context, new DataVisitor() { - public void process(FacesContext context, Object rowKey, - Object argument) throws IOException { - - ListShuttleRowKey shuttleRowKey = new ListShuttleRowKey(rowKey, true); - Object translatedShuttleRowKey = translate(shuttleRowKey); - - if (translatedModel) { - visitor.process(context, new TranslatedRowKey( - shuttleRowKey, String.valueOf(translatedShuttleRowKey)), argument); - } else { - visitor.process(context, translatedShuttleRowKey, argument); + if (translationTable != null) { + //TODO is it ordered? + Iterator translations = this.translationTable.entrySet().iterator(); + while (translations.hasNext()) { + Entry translation = (Entry) translations.next(); + ListShuttleRowKey translatedKey = (ListShuttleRowKey) translation.getKey(); + ListShuttleRowKey sourceKey = (ListShuttleRowKey) translation.getValue(); + + if (translatedModel) { + visitor.process(context, new TranslatedRowKey( + translatedKey, String.valueOf(sourceKey)), argument); + } else { + visitor.process(context, new MovedRowKey(sourceKey, sourceTranslationTable.containsKey(translatedKey)), + argument); + } } - } - }, new SequenceRange(0, -1), argument); + } else { + this.sourceModel.walk(context, new DataVisitor() { + public void process(FacesContext context, Object rowKey, + Object argument) throws IOException { - this.targetModel.walk(context, new DataVisitor(){ - public void process(FacesContext context, Object rowKey, - Object argument) throws IOException { - - ListShuttleRowKey shuttleRowKey = new ListShuttleRowKey(rowKey, false); + ListShuttleRowKey shuttleRowKey = new ListShuttleRowKey(rowKey, true); Object translatedShuttleRowKey = translate(shuttleRowKey); - + if (translatedModel) { visitor.process(context, new TranslatedRowKey( shuttleRowKey, String.valueOf(translatedShuttleRowKey)), argument); } else { - visitor.process(context, translatedShuttleRowKey, argument); + visitor.process(context, new MovedRowKey(translatedShuttleRowKey, true), argument); } } - }, new SequenceRange(0, -1), argument); + }, new SequenceRange(0, -1), argument); + + this.targetModel.walk(context, new DataVisitor(){ + public void process(FacesContext context, Object rowKey, + Object argument) throws IOException { + + ListShuttleRowKey shuttleRowKey = new ListShuttleRowKey(rowKey, false); + Object translatedShuttleRowKey = translate(shuttleRowKey); + + if (translatedModel) { + visitor.process(context, new TranslatedRowKey( + shuttleRowKey, String.valueOf(translatedShuttleRowKey)), argument); + } else { + visitor.process(context, new MovedRowKey(translatedShuttleRowKey, false), argument); + } + } + }, new SequenceRange(0, -1), argument); + } } + public Object getTranslatedRowKey() { + return this.translate(getRowKey()); + } + /* (non-Javadoc) * @see javax.faces.model.DataModel#getRowCount() */ @@ -172,9 +235,9 @@ * @see javax.faces.model.DataModel#getRowData() */ public Object getRowData() { - if (isSource()) { + if (sourceModel.isRowAvailable()) { return sourceModel.getRowData(); - } else if (isTarget()) { + } else if (targetModel.isRowAvailable()) { return targetModel.getRowData(); } else { return null; @@ -200,13 +263,7 @@ * @see javax.faces.model.DataModel#isRowAvailable() */ public boolean isRowAvailable() { - if (isSource()) { - return sourceModel.isRowAvailable(); - } else if (isTarget()) { - return targetModel.isRowAvailable(); - } else { - return false; - } + return sourceModel.isRowAvailable() || targetModel.isRowAvailable(); } /* (non-Javadoc) Modified: branches/3.1.x/sandbox/ui/listShuttle/src/main/java/org/richfaces/renderkit/ListShuttleRendererBase.java =================================================================== --- branches/3.1.x/sandbox/ui/listShuttle/src/main/java/org/richfaces/renderkit/ListShuttleRendererBase.java 2007-11-27 02:51:55 UTC (rev 4278) +++ branches/3.1.x/sandbox/ui/listShuttle/src/main/java/org/richfaces/renderkit/ListShuttleRendererBase.java 2007-11-27 02:52:02 UTC (rev 4279) @@ -234,15 +234,21 @@ writer.endElement(HTML.DIV_ELEM); } + private boolean isEmpty(String s) { + return s == null || s.length() == 0; + } + protected void doDecode(FacesContext context, UIComponent component) { super.doDecode(context, component); String clientId = component.getClientId(context); Object object = context.getExternalContext().getRequestParameterValuesMap().get(clientId); if (object != null) { - UIListShuttle listShuttle = (UIListShuttle) component; String[] submittedValues = (String[]) object; - listShuttle.setSubmittedStrings(submittedValues); + if (submittedValues.length == 2 && !isEmpty(submittedValues[0]) && !isEmpty(submittedValues[1])) { + UIListShuttle listShuttle = (UIListShuttle) component; + listShuttle.setSubmittedStrings(submittedValues); + } } }

16 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r4278 - in branches/3.1.x/sandbox/samples/listShuttleDemo/src/main: webapp/pages and 1 other directory.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2007-11-26 21:51:55 -0500 (Mon, 26 Nov 2007) New Revision: 4278 Modified: branches/3.1.x/sandbox/samples/listShuttleDemo/src/main/java/org/richfaces/ListShuttleDemoBean.java branches/3.1.x/sandbox/samples/listShuttleDemo/src/main/webapp/pages/index.jsp Log: latest changes for listShuttle & orderingList Modified: branches/3.1.x/sandbox/samples/listShuttleDemo/src/main/java/org/richfaces/ListShuttleDemoBean.java =================================================================== --- branches/3.1.x/sandbox/samples/listShuttleDemo/src/main/java/org/richfaces/ListShuttleDemoBean.java 2007-11-27 02:51:23 UTC (rev 4277) +++ branches/3.1.x/sandbox/samples/listShuttleDemo/src/main/java/org/richfaces/ListShuttleDemoBean.java 2007-11-27 02:51:55 UTC (rev 4278) @@ -7,6 +7,8 @@ import java.util.List; import java.util.Random; +import javax.faces.context.FacesContext; + /** * @author Nick Belaevski * mailto:nbelaevski@exadel.com @@ -21,7 +23,7 @@ public ListShuttleDemoBean() { super(); - source = new ListShuttleOptionItem[10]; + source = new ListShuttleOptionItem[3]; for (int i = 0; i < source.length; i++) { source[i] = new ListShuttleOptionItem("Source Item " + i, new Random().nextInt(40)); } @@ -46,9 +48,9 @@ System.out.println("[]"); } else { System.out.print('['); - for (int i = 0; i < iMax; i++) { + for (int i = 0; i <= iMax; i++) { System.out.print(source[i]); - if (i != iMax - 1) { + if (i != iMax) { System.out.print(", "); } } @@ -68,4 +70,8 @@ this.target = target; } + public void startOver() { + FacesContext.getCurrentInstance().getExternalContext().getSessionMap().remove("listShuttleDemoBean"); + } + } Modified: branches/3.1.x/sandbox/samples/listShuttleDemo/src/main/webapp/pages/index.jsp =================================================================== --- branches/3.1.x/sandbox/samples/listShuttleDemo/src/main/webapp/pages/index.jsp 2007-11-27 02:51:23 UTC (rev 4277) +++ branches/3.1.x/sandbox/samples/listShuttleDemo/src/main/webapp/pages/index.jsp 2007-11-27 02:51:55 UTC (rev 4278) @@ -30,6 +30,7 @@ <h:commandButton value="Submit" /> <h:commandButton value="Submit Immediate" immediate="true" /> + <h:commandButton value="Start over" action="#{listShuttleDemoBean.startOver}" /> </h:form> </f:view> </body>

16 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r4277 - branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/component.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2007-11-26 21:51:23 -0500 (Mon, 26 Nov 2007) New Revision: 4277 Modified: branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/component/UIDataAdaptor.java Log: Added missing cache model reset for UIDataAdaptor Modified: branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/component/UIDataAdaptor.java =================================================================== --- branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/component/UIDataAdaptor.java 2007-11-27 02:18:51 UTC (rev 4276) +++ branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/component/UIDataAdaptor.java 2007-11-27 02:51:23 UTC (rev 4277) @@ -1451,4 +1451,13 @@ public void clearRequestKeysSet() { _ajaxRequestKeys = null; } + + public Object getValue() { + return super.getValue(); + } + + public void setValue(Object value) { + setExtendedDataModel(null); + super.setValue(value); + } }

16 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r4276 - in trunk/ui/calendar/design/calendar: icons and 1 other directory.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2007-11-26 21:18:51 -0500 (Mon, 26 Nov 2007) New Revision: 4276 Added: trunk/ui/calendar/design/calendar/calendar_div_more.html trunk/ui/calendar/design/calendar/icons/ trunk/ui/calendar/design/calendar/icons/close.gif trunk/ui/calendar/design/calendar/icons/separator.gif trunk/ui/calendar/design/calendar/icons/spacer.gif Log: Updated calendar design committed Added: trunk/ui/calendar/design/calendar/calendar_div_more.html =================================================================== --- trunk/ui/calendar/design/calendar/calendar_div_more.html (rev 0) +++ trunk/ui/calendar/design/calendar/calendar_div_more.html 2007-11-27 02:18:51 UTC (rev 4276) @@ -0,0 +1,403 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> + +<html> +<head> +<title>calendar</title> +<style> +.calendar_exterior{ + border : 1px solid #C0C0C0; /*panelBorderColor*/ +} +.calendar_btn{ + cursor : pointer; +} +.calendar_header{ + border-bottom : 1px solid #C0C0C0; /*panelBorderColor*/ + background : #C7D7EC; /*additionalBackgroundColor*/ + font-size : 11px; /*generalSizeFont*/ + font-family : verdana; /*generalFamilyFont*/ + padding : 7px; + height : 22px; +} + +.cell_size{ + width : 25px; + height : 22px; +} + +.calendar_cell{ + background-color : #FFFFFF; /*NEW ATTRIBUTE - tableBackgroundColor*/ + border-bottom : 1px solid #C0C0C0; /*panelBorderColor*/ + border-right : 1px solid #C0C0C0; /*panelBorderColor*/ + font-size : 11px; /*generalSizeFont*/ + font-family : verdana; /*generalFamilyFont*/ + padding : 0px; + vertical-align : middle; + text-align : center; +} + +.calendar_tool{ + border-bottom : 1px solid #C0C0C0; /*panelBorderColor*/ + background-color : #224986; /*headerBackgroundColor*/ + font-size : 11px; /*headerSizeFont*/ + font-family : verdana; /*headerFamilyFont*/ + color : #FFFFFF; /*headerTextColor*/ + font-weight : bold; + vertical-align : middle; + text-align : center; + width : 25px; + height : 22px; +} + +.calendar_month{ + border-bottom : 1px solid #C0C0C0; /*panelBorderColor*/ + background-color : #224986; /*headerBackgroundColor*/ + font-size : 11px; /*headerSizeFont*/ + font-family : verdana; /*headerFamilyFont*/ + color : #FFFFFF; /*headerTextColor*/ + font-weight : bold; + vertical-align : middle; + text-align : center; +} + +.calendar_days{ + border-bottom : 1px solid #C0C0C0; /*panelBorderColor*/ + border-right : 0px solid #C0C0C0; /*panelBorderColor*/ + background : #C7D7EC; /*additionalBackgroundColor*/ + font-size : 11px; /*generalSizeFont*/ + font-family : verdana; /*generalFamilyFont*/ + vertical-align : middle; + text-align : center; + height : 22px; +} + +.calendar_week{ + border-bottom : 1px solid #C0C0C0; /*panelBorderColor*/ + border-right : 1px solid #C0C0C0; /*panelBorderColor*/ + font-size : 11px; /*generalSizeFont*/ + font-family : verdana; /*generalFamilyFont*/ + background-color : #f5f5f5; /*NEW ATTRIBUTE - calendarwWeekBackgroundColor*/ + vertical-align : middle; + text-align : center; + width : 25px; +} + +.calendar_holly{ + background-color : #ffebda; /*NEW ATTRIBUTE - calendarHolidaysBackgroundColor*/ + color : #ff7800; /*NEW ATTRIBUTE - calendarHolidaysTextColor*/ +} + +.calendar_current{ + background-color : #ff7800; /*NEW ATTRIBUTE - calendarCurrentBackgroundColor*/ + color : #ffebda; /*NEW ATTRIBUTE - calendarCurrentTextColor*/ + font-weight : bold; +} + +.calendar_spec{ + background-color : #e4f5e2; /*NEW ATTRIBUTE - calendarSpecBackgroundColor*/ + color : #000000; /*NEW ATTRIBUTE - calendarSpecTextColor*/ +} + +.calendar_select{ + background-color : #224986; /*headerBackgroundColor*/ + color : #FFFFFF; /*headerTextColor*/ + font-weight : bold; +} + + +.right_cell{ + border-right : 0px; +} + +.bottom_cell{ + border-bottom : 0px; +} + +.calendar_toolfooter{ + background : #C7D7EC; /*additionalBackgroundColor*/ + font-size : 11px; /*generalSizeFont*/ + font-family : verdana; /*generalFamilyFont*/ + padding : 1px; +} + +.calendar_footer{ + border-top : 1px solid #C0C0C0; /*panelBorderColor*/ + border-right : 0px solid #C0C0C0; /*panelBorderColor*/ + background : #C7D7EC; /*additionalBackgroundColor*/ + font-size : 11px; /*generalSizeFont*/ + font-family : verdana; /*generalFamilyFont*/ + padding : 0px; +} + +.footer_btn{border : 0px solid #C7D7EC; padding : 1px 3px 1px 3px;white-space : nowrap;text-align : center;} +.footer_btn_over{background-color : #f5f5f5;border-top : 1px solid #FFFFFF; border-left : 1px solid #FFFFFF; border-right : 1px solid #C0C0C0; border-bottom : 1px solid #C0C0C0; padding : 0px 2px 0px 2px;white-space : nowrap;text-align : center;} +.footer_btn_press{background-color : #f5f5f5; border-bottom : 1px solid #FFFFFF; border-right : 1px solid #FFFFFF; border-left : 1px solid #C0C0C0; border-top : 1px solid #C0C0C0; padding : 0px 2px 0px 2px;white-space : nowrap;text-align : center;} + +.header_btn{border : 0px solid #C7D7EC; padding : 3px; white-space : nowrap;} +.header_btn_over{background-color : #f5f5f5; border-top : 1px solid #FFFFFF; border-left : 1px solid #FFFFFF; border-right : 1px solid #C0C0C0; border-bottom : 1px solid #C0C0C0; padding : 2px;white-space : nowrap;} +.header_btn_press{background-color : #f5f5f5; border-bottom : 1px solid #FFFFFF; border-right : 1px solid #FFFFFF; border-left : 1px solid #C0C0C0; border-top : 1px solid #C0C0C0; padding : 2px;white-space : nowrap;} + +.calendar_closetab{ +border-bottom : 1px solid #C0C0C0; /*panelBorderColor*/ +background : url(icons/separator.gif) center left no-repeat #224986; +padding : 0px 2px 0px 4px; +text-align : center; +} +</style> + +</head> + +<body bgcolor="#ffffff"> + + +<div> +<table border="0" cellpadding="0" cellspacing="0" class="calendar_exterior"> + + <tr> + <td colspan="7"> + <table border="0" cellpadding="0" cellspacing="0" width="100%"> + <tr> + <td class="calendar_tool calendar_btn"> + «« + </td> + <td class="calendar_tool calendar_btn"> + « + </td> + <td class="calendar_month calendar_btn"> + November, 2007 + </td> + <td class="calendar_tool calendar_btn"> + » + </td> + <td class="calendar_tool calendar_btn"> + »» + </td> + </tr> + </table> + </td> + <td class="calendar_closetab calendar_btn"> + <div class="header_btn" onmouseover="this.className='header_btn_over'" onmouseout="this.className='header_btn'" onmousedown="this.className='header_btn_press'"> + <img src="icons/close.gif" width="11" height="11" alt="Close" border="0"><br> + </div> + </td> + </tr> + <tr> + <td class="calendar_days"> + <br> + </td> + <td class="calendar_days"> + Sun + </td> + <td class="calendar_days"> + Mon + </td> + <td class="calendar_days"> + Tue + </td> + <td class="calendar_days"> + Wed + </td> + <td class="calendar_days"> + Thu + </td> + <td class="calendar_days"> + Fri + </td> + <td class="calendar_days right_cell"> + Sat + </td> + </tr> + + <tr> + <td class="calendar_week"> + 1 + </td> + <td class="cell_size calendar_cell calendar_holly"> + <br> + </td> + <td class="cell_size calendar_cell calendar_cell"> + <br> + </td> + <td class="cell_size calendar_cell calendar_btn"> + 1<br> + </td> + <td class="cell_size calendar_cell calendar_btn"> + 2<br> + </td> + <td class="cell_size calendar_cell calendar_btn"> + 3<br> + </td> + <td class="cell_size calendar_cell calendar_btn"> + 4<br> + </td> + <td class="cell_size calendar_cell calendar_holly right_cell calendar_btn"> + 5<br> + </td> + </tr> + + <tr> + <td class="calendar_week"> + 2 + </td> + <td class="cell_size calendar_cell calendar_holly calendar_btn"> + 6<br> + </td> + <td class="cell_size calendar_cell calendar_btn"> + 7<br> + </td> + <td class="cell_size calendar_cell calendar_current calendar_btn"> + 8<br> + </td> + <td class="cell_size calendar_cell calendar_btn"> + 9<br> + </td> + <td class="cell_size calendar_cell calendar_spec calendar_btn"> + 10<br> + </td> + <td class="cell_size calendar_cell calendar_spec calendar_btn"> + 11<br> + </td> + <td class="cell_size calendar_cell calendar_holly right_cell calendar_btn"> + 12<br> + </td> + </tr> + + <tr> + <td class="calendar_week"> + 3 + </td> + <td class="cell_size calendar_cell calendar_holly calendar_btn"> + 13<br> + </td> + <td class="cell_size calendar_cell calendar_btn"> + 14<br> + </td> + <td class="cell_size calendar_cell calendar_btn"> + 15<br> + </td> + <td class="cell_size calendar_cell calendar_spec calendar_btn"> + 16<br> + </td> + <td class="cell_size calendar_cell calendar_btn"> + 17<br> + </td> + <td class="cell_size calendar_cell calendar_btn"> + 18<br> + </td> + <td class="cell_size calendar_cell calendar_holly right_cell calendar_btn"> + 19<br> + </td> + </tr> + + <tr> + <td class="calendar_week"> + 4 + </td> + <td class="cell_size calendar_cell calendar_holly calendar_btn"> + 20<br> + </td> + <td class="cell_size calendar_cell calendar_btn"> + 21<br> + </td> + <td class="cell_size calendar_cell calendar_btn"> + 22<br> + </td> + <td class="cell_size calendar_cell calendar_btn"> + 23<br> + </td> + <td class="cell_size calendar_cell calendar_select calendar_btn"> + 24<br> + </td> + <td class="cell_size calendar_cell calendar_btn"> + 25<br> + </td> + <td class="cell_size calendar_cell calendar_holly right_cell calendar_btn"> + 26<br> + </td> + </tr> + + <tr> + <td class="calendar_week bottom_cell calendar_btn"> + 5 + </td> + <td class="cell_size calendar_cell calendar_holly bottom_cell calendar_btn"> + 27<br> + </td> + <td class="cell_size calendar_cell bottom_cell calendar_btn"> + 28<br> + </td> + <td class="cell_size calendar_cell calendar_spec bottom_cell calendar_btn"> + 29<br> + </td> + <td class="cell_size calendar_cell calendar_spec bottom_cell calendar_btn"> + 30<br> + </td> + <td class="cell_size calendar_cell bottom_cell"> + <br> + </td> + <td class="cell_size calendar_cell bottom_cell"> + <br> + </td> + <td class="cell_size calendar_cell calendar_holly right_cell bottom_cell"> + <br> + </td> + </tr> + <tr> + <td colspan="8" class="calendar_footer"> + <table border="0" cellpadding="0" cellspacing="0" width="100%"> + <tr> + <td class="calendar_toolfooter calendar_btn"> + <div class="footer_btn" onmouseover="this.className='footer_btn_over'" onmouseout="this.className='footer_btn'" onmousedown="this.className='footer_btn_press'"> + Clean<br> + </div> + </td> + <td> + <img src="icons/separator.gif" width="1" height="15" alt="" border="0"><br> + </td> + <td class="calendar_toolfooter calendar_btn"> + <div class="footer_btn_press" onmouseover="this.className='footer_btn_over'" onmouseout="this.className='footer_btn_press'" onmousedown="this.className='footer_btn_press'"> + 11:36 AM + </div> + </td> + <td> + <img src="icons/separator.gif" width="1" height="15" alt="" border="0"><br> + </td> + <td class="calendar_toolfooter calendar_btn"> + <img src="icons/spacer.gif" width="11" height="1" alt="" border="0"><br> + </td> + <td class="calendar_toolfooter" width="100%"> + + </td> + <td> + <img src="icons/separator.gif" width="1" height="15" alt="" border="0"><br> + </td> + <td class="calendar_toolfooter calendar_btn"> + <div class="footer_btn" onmouseover="this.className='footer_btn_over'" onmouseout="this.className='footer_btn'" onmousedown="this.className='footer_btn_press'"> + Today + </div> + </td> + <td> + <img src="icons/separator.gif" width="1" height="15" alt="" border="0"><br> + </td> + <td class="calendar_toolfooter calendar_btn"> + <div class="footer_btn" onmouseover="this.className='footer_btn_over'" onmouseout="this.className='footer_btn'" onmousedown="this.className='footer_btn_press'"> + Apply + </div> + </td> + </tr> + </table> + </td> + </tr> + + + +</table> + +</div> + + + + + + +</body> +</html> Added: trunk/ui/calendar/design/calendar/icons/close.gif =================================================================== (Binary files differ) Property changes on: trunk/ui/calendar/design/calendar/icons/close.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/ui/calendar/design/calendar/icons/separator.gif =================================================================== (Binary files differ) Property changes on: trunk/ui/calendar/design/calendar/icons/separator.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/ui/calendar/design/calendar/icons/spacer.gif =================================================================== (Binary files differ) Property changes on: trunk/ui/calendar/design/calendar/icons/spacer.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

16 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r4275 - management/design/fileUpload.

by richfaces-svn-commits＠lists.jboss.org

Author: SergeySmirnov Date: 2007-11-26 15:04:09 -0500 (Mon, 26 Nov 2007) New Revision: 4275 Modified: management/design/fileUpload/FileUpload vision.doc Log: async mode added Modified: management/design/fileUpload/FileUpload vision.doc =================================================================== (Binary files differ)

16 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r4274 - trunk.

by richfaces-svn-commits＠lists.jboss.org

Author: alexsmirnov Date: 2007-11-26 14:43:08 -0500 (Mon, 26 Nov 2007) New Revision: 4274 Modified: trunk/pom.xml Log: Set exact version of the maven-jar-plugin Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2007-11-26 19:26:38 UTC (rev 4273) +++ trunk/pom.xml 2007-11-26 19:43:08 UTC (rev 4274) @@ -1,4 +1,6 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> <artifactId>root</artifactId> @@ -7,25 +9,55 @@ <version>3.2.0-SNAPSHOT</version> <url>http://labs.jboss.com/jbossrichfaces</url> <properties> - <snapshotRepository>dav:https://snapshots.jboss.org/maven2</snapshotRepository> + <snapshotRepository> + dav:https://snapshots.jboss.org/maven2 + </snapshotRepository> </properties> <dependencies /> - <build> - <extensions> - <extension> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-webdav</artifactId> - <version>1.0-beta-2</version> - </extension> - </extensions> - </build> + <build> + <extensions> + <extension> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-webdav</artifactId> + <version>1.0-beta-2</version> + </extension> + </extensions> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>2.1</version> + <configuration> + <archive> + <index>true</index> + <manifest> + <addDefaultSpecificationEntries> + true + </addDefaultSpecificationEntries> + <addDefaultImplementationEntries> + true + </addDefaultImplementationEntries> + </manifest> + <manifestEntries> + <mode>development</mode> + <Build-Number> + ${buildNumber} + </Build-Number> + </manifestEntries> + </archive> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> <modules> <module>cdk</module> <module>framework</module> <module>ui</module> <module>docs</module> <module>ui/assembly</module> - <module>extensions</module> + <module>extensions</module> <module>samples</module> <!-- <module>sandbox</module> @@ -40,9 +72,7 @@ </snapshots> <id>maven-repository.dev.java.net</id> <name>Java.net Repository for Maven</name> - <url> - http://download.java.net/maven/1 - </url> + <url>http://download.java.net/maven/1</url> <layout>legacy</layout> </repository> </repositories> @@ -60,7 +90,7 @@ <uniqueVersion>true</uniqueVersion> <url>${snapshotRepository}</url> </snapshotRepository> - </distributionManagement> + </distributionManagement> <issueManagement> <system>JIRA</system> <url>http://jira.jboss.org/jira/browse/RF</url> @@ -129,41 +159,47 @@ </license> </licenses> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk</developerConnection> + <connection> + scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk + </connection> + <developerConnection> + scm:svn:https://svn.jboss.org/repos/richfaces/trunk + </developerConnection> <url>https://svn.jboss.org/repos/richfaces/trunk</url> </scm> - <profiles> - <profile> - <id>sandbox</id> - <modules> - <module>sandbox</module> - </modules> - </profile> - <profile> - <id>eclipse-custom-templates</id> -<build> - <plugins> - <plugin> - <artifactId>maven-eclipse-plugin</artifactId> - <groupId>org.apache.maven.plugins</groupId> - <configuration> - <additionalConfig> - <file> - <name>.settings/org.eclipse.jdt.ui.prefs</name> - <content> - <![CDATA[ + <profiles> + <profile> + <id>sandbox</id> + <modules> + <module>sandbox</module> + </modules> + </profile> + <profile> + <id>eclipse-custom-templates</id> + <build> + <plugins> + <plugin> + <artifactId>maven-eclipse-plugin</artifactId> + <groupId>org.apache.maven.plugins</groupId> + <configuration> + <additionalConfig> + <file> + <name> + .settings/org.eclipse.jdt.ui.prefs + </name> + <content> + <![CDATA[ eclipse.preferences.version=1 org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * $${tags}\r\n * <br /><br />\r\n * \r\n * Created $${date}\r\n * @author $${user}\r\n * @since ${project.artifact.selectedVersion.majorVersion}.${project.artifact.selectedVersion.minorVersion}\r\n */\r\n</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * License Agreement.\r\n *\r\n * JBoss RichFaces - Ajax4jsf Component Library\r\n *\r\n * Copyright (C) 2007 Exadel, Inc.\r\n *\r\n * This library is free software; you can redistribute it and/o! r\r\n * modify it under the terms of the GNU Lesser General Public\r\n * License version 2.1 as published by the Free Software Foundation.\r\n *\r\n * This library is distributed in the hope that it will be useful,\r\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\r\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\r\n * Lesser General Public License for more details.\r\n *\r\n * You should have received a copy of the GNU Lesser General Public\r\n * License along with this library; if not, write to the Free Software\r\n * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\r\n */\r\n</template></templates> ]]> - </content> - </file> - </additionalConfig> - </configuration> - </plugin> - </plugins> -</build> - </profile> + </content> + </file> + </additionalConfig> + </configuration> + </plugin> + </plugins> + </build> + </profile> <profile> <id>clover</id> <build> @@ -208,5 +244,5 @@ </plugins> </reporting> </profile> - </profiles> + </profiles> </project> \ No newline at end of file

16 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r4273 - in branches/3.1.x: samples/contextMenuDemo and 4 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: maksimkaszynski Date: 2007-11-26 14:26:38 -0500 (Mon, 26 Nov 2007) New Revision: 4273 Added: branches/3.1.x/samples/contextMenuDemo/ branches/3.1.x/samples/contextMenuDemo/pom.xml branches/3.1.x/samples/contextMenuDemo/src/ branches/3.1.x/ui/contextMenu/ branches/3.1.x/ui/contextMenu/pom.xml branches/3.1.x/ui/contextMenu/src/ Removed: branches/3.1.x/samples/contextMenuDemo/pom.xml branches/3.1.x/samples/contextMenuDemo/src/ branches/3.1.x/sandbox/samples/contextMenuDemo/ branches/3.1.x/sandbox/ui/contextMenu/ branches/3.1.x/ui/contextMenu/pom.xml branches/3.1.x/ui/contextMenu/src/ Modified: branches/3.1.x/samples/pom.xml branches/3.1.x/sandbox/ui/pom.xml branches/3.1.x/ui/pom.xml Log: Context Menu moved from sandbox to main pom Copied: branches/3.1.x/samples/contextMenuDemo (from rev 4251, branches/3.1.x/sandbox/samples/contextMenuDemo) Deleted: branches/3.1.x/samples/contextMenuDemo/pom.xml =================================================================== --- branches/3.1.x/sandbox/samples/contextMenuDemo/pom.xml 2007-11-26 10:09:53 UTC (rev 4251) +++ branches/3.1.x/samples/contextMenuDemo/pom.xml 2007-11-26 19:26:38 UTC (rev 4273) @@ -1,53 +0,0 @@ -<?xml version="1.0"?><project> - <parent> - <artifactId>samples</artifactId> - <groupId>org.richfaces.sandbox</groupId> - <version>3.1.3-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.sandbox.samples</groupId> - <artifactId>contextMenuDemo</artifactId> - <packaging>war</packaging> - <name>contextMenuDemo Maven Webapp</name> - <version>3.1.3-SNAPSHOT</version> - <dependencies> - <dependency> - <groupId>org.richfaces.samples</groupId> - <artifactId>skins</artifactId> - <version>3.1.3-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>core</artifactId> - <version>3.1.3-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>dataTable</artifactId> - <version>3.1.3-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.richfaces.sandbox.ui</groupId> - <artifactId>contextMenu</artifactId> - <version>3.1.3-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>componentControl</artifactId> - <version>3.1.3-SNAPSHOT</version> - </dependency> - </dependencies> - <build> - <finalName>contextMenuDemo</finalName> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - </plugins> - </build> -</project> \ No newline at end of file Copied: branches/3.1.x/samples/contextMenuDemo/pom.xml (from rev 4272, branches/3.1.x/sandbox/samples/contextMenuDemo/pom.xml) =================================================================== --- branches/3.1.x/samples/contextMenuDemo/pom.xml (rev 0) +++ branches/3.1.x/samples/contextMenuDemo/pom.xml 2007-11-26 19:26:38 UTC (rev 4273) @@ -0,0 +1,53 @@ +<?xml version="1.0"?><project> + <parent> + <artifactId>samples</artifactId> + <groupId>org.richfaces</groupId> + <version>3.1.3-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.samples</groupId> + <artifactId>contextMenuDemo</artifactId> + <packaging>war</packaging> + <name>contextMenuDemo Maven Webapp</name> + <version>3.1.3-SNAPSHOT</version> + <dependencies> + <dependency> + <groupId>org.richfaces.samples</groupId> + <artifactId>skins</artifactId> + <version>3.1.3-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>core</artifactId> + <version>3.1.3-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>dataTable</artifactId> + <version>3.1.3-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.richfaces.sandbox.ui</groupId> + <artifactId>contextMenu</artifactId> + <version>3.1.3-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>componentControl</artifactId> + <version>3.1.3-SNAPSHOT</version> + </dependency> + </dependencies> + <build> + <finalName>contextMenuDemo</finalName> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file Copied: branches/3.1.x/samples/contextMenuDemo/src (from rev 4272, branches/3.1.x/sandbox/samples/contextMenuDemo/src) Modified: branches/3.1.x/samples/pom.xml =================================================================== --- branches/3.1.x/samples/pom.xml 2007-11-26 18:56:23 UTC (rev 4272) +++ branches/3.1.x/samples/pom.xml 2007-11-26 19:26:38 UTC (rev 4273) @@ -426,6 +426,7 @@ <module>treeModelDemo</module> <module>local-value-demo</module> <module>orderingListDemo</module> + <module>contextMenuDemo</module>  Modified: branches/3.1.x/sandbox/ui/pom.xml =================================================================== --- branches/3.1.x/sandbox/ui/pom.xml 2007-11-26 18:56:23 UTC (rev 4272) +++ branches/3.1.x/sandbox/ui/pom.xml 2007-11-26 19:26:38 UTC (rev 4273) @@ -13,8 +13,7 @@ <modules> <module>panel2</module> <module>simpleTogglePanel2</module> - <module>contextMenu</module> <module>listShuttle</module> <module>state</module> - </modules> + </modules> </project> \ No newline at end of file Copied: branches/3.1.x/ui/contextMenu (from rev 4251, branches/3.1.x/sandbox/ui/contextMenu) Deleted: branches/3.1.x/ui/contextMenu/pom.xml =================================================================== --- branches/3.1.x/sandbox/ui/contextMenu/pom.xml 2007-11-26 10:09:53 UTC (rev 4251) +++ branches/3.1.x/ui/contextMenu/pom.xml 2007-11-26 19:26:38 UTC (rev 4273) @@ -1,55 +0,0 @@ -<?xml version="1.0"?><project> - <parent> - <artifactId>ui</artifactId> - <groupId>org.richfaces.sandbox</groupId> - <version>3.1.3-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.sandbox.ui</groupId> - <artifactId>contextMenu</artifactId> - <name>contextMenu</name> - <version>3.1.3-SNAPSHOT</version> - <build> - <plugins> - <plugin> - <groupId>org.richfaces.cdk</groupId> - <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.3-SNAPSHOT</version> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - <configuration> - <library> - <prefix>org.richfaces</prefix> - <taglib> - <shortName>contextMenu</shortName> - </taglib> - </library> - </configuration> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.richfaces.framework</groupId> - <artifactId>richfaces-impl</artifactId> - <version>3.1.3-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>menu-components</artifactId> - <version>3.1.3-SNAPSHOT</version> - </dependency> - </dependencies> -</project> \ No newline at end of file Copied: branches/3.1.x/ui/contextMenu/pom.xml (from rev 4272, branches/3.1.x/sandbox/ui/contextMenu/pom.xml) =================================================================== --- branches/3.1.x/ui/contextMenu/pom.xml (rev 0) +++ branches/3.1.x/ui/contextMenu/pom.xml 2007-11-26 19:26:38 UTC (rev 4273) @@ -0,0 +1,55 @@ +<?xml version="1.0"?><project> + <parent> + <artifactId>ui</artifactId> + <groupId>org.richfaces</groupId> + <version>3.1.3-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.ui</groupId> + <artifactId>contextMenu</artifactId> + <name>contextMenu</name> + <version>3.1.3-SNAPSHOT</version> + <build> + <plugins> + <plugin> + <groupId>org.richfaces.cdk</groupId> + <artifactId>maven-cdk-plugin</artifactId> + <version>3.1.3-SNAPSHOT</version> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>generate</goal> + </goals> + </execution> + </executions> + <configuration> + <library> + <prefix>org.richfaces</prefix> + <taglib> + <shortName>contextMenu</shortName> + </taglib> + </library> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl</artifactId> + <version>3.1.3-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>menu-components</artifactId> + <version>3.1.3-SNAPSHOT</version> + </dependency> + </dependencies> +</project> \ No newline at end of file Copied: branches/3.1.x/ui/contextMenu/src (from rev 4272, branches/3.1.x/sandbox/ui/contextMenu/src) Modified: branches/3.1.x/ui/pom.xml =================================================================== --- branches/3.1.x/ui/pom.xml 2007-11-26 18:56:23 UTC (rev 4272) +++ branches/3.1.x/ui/pom.xml 2007-11-26 19:26:38 UTC (rev 4273) @@ -90,6 +90,7 @@ <module>scrollableDataTable</module> <module>componentControl</module> <module>orderingList</module> + <module>contextMenu</module> <module>insert</module> </modules> <dependencies>

16 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r4271 - branches/3.1.x/sandbox/ui/contextMenu/src/main/resources/org/richfaces/renderkit/html/scripts.

by richfaces-svn-commits＠lists.jboss.org

Author: maksimkaszynski Date: 2007-11-26 13:21:51 -0500 (Mon, 26 Nov 2007) New Revision: 4271 Modified: branches/3.1.x/sandbox/ui/contextMenu/src/main/resources/org/richfaces/renderkit/html/scripts/context-menu.js Log: Allowed decoration of components context menu is attached to Modified: branches/3.1.x/sandbox/ui/contextMenu/src/main/resources/org/richfaces/renderkit/html/scripts/context-menu.js =================================================================== --- branches/3.1.x/sandbox/ui/contextMenu/src/main/resources/org/richfaces/renderkit/html/scripts/context-menu.js 2007-11-26 18:21:42 UTC (rev 4270) +++ branches/3.1.x/sandbox/ui/contextMenu/src/main/resources/org/richfaces/renderkit/html/scripts/context-menu.js 2007-11-26 18:21:51 UTC (rev 4271) @@ -15,7 +15,8 @@ Richfaces.ContextMenu.prototype = { - initialize: function(id, evaluator) { + initialize: function(id, evaluator, options) { + this.options = options || {}; this.id = id; this.evaluator = evaluator; $(id).component = this; @@ -31,6 +32,11 @@ element = element.parentNode; } } + + if (element) { + this.applyDecoration(element); + } + //Strip 'on' here var evnName = event.substr(2); var listener = this.show.bindAsEventListener(this, context); @@ -73,6 +79,16 @@ // do not destroy menu //var oldContext = this.context || {}; return true; + }, + + applyDecoration : function(element) { + + $(element).addClassName("rich-cm-attached"); + + /*var f = this.options.applyDecorations; + if (f) { + f(element); + }*/ } };

16 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r4270 - branches/3.1.x/sandbox/samples/contextMenuDemo/src/main/webapp/pages.

by richfaces-svn-commits＠lists.jboss.org

Author: maksimkaszynski Date: 2007-11-26 13:21:42 -0500 (Mon, 26 Nov 2007) New Revision: 4270 Modified: branches/3.1.x/sandbox/samples/contextMenuDemo/src/main/webapp/pages/index.jsp Log: Allowed decoration of components context menu is attached to Modified: branches/3.1.x/sandbox/samples/contextMenuDemo/src/main/webapp/pages/index.jsp =================================================================== --- branches/3.1.x/sandbox/samples/contextMenuDemo/src/main/webapp/pages/index.jsp 2007-11-26 18:19:48 UTC (rev 4269) +++ branches/3.1.x/sandbox/samples/contextMenuDemo/src/main/webapp/pages/index.jsp 2007-11-26 18:21:42 UTC (rev 4270) @@ -17,6 +17,9 @@ .footer { background-color: gray; } +.rich-cm-attached { + cursor:help; +} --> </style> </head> @@ -28,7 +31,7 @@ </a4j:outputPanel> </div> <h:form id="f"> - <h:panelGroup id="outputText" style="cursor: alias;"> + <h:panelGroup id="outputText"> Right Click Here <cm:contextMenu submitMode="server" id="m"> <mc:menuItem id="menuItem11" action="#{bean.action}" value="{param} ajax submit" submitMode="ajax" actionListener="#{bean.actionListener}">

16 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r4269 - branches/3.1.x/ui/componentControl/src/main/resources/org/richfaces/renderkit/html/script.

by richfaces-svn-commits＠lists.jboss.org

Author: maksimkaszynski Date: 2007-11-26 13:19:48 -0500 (Mon, 26 Nov 2007) New Revision: 4269 Modified: branches/3.1.x/ui/componentControl/src/main/resources/org/richfaces/renderkit/html/script/controlUtils.js Log: Component control allows invocation of multiple components Modified: branches/3.1.x/ui/componentControl/src/main/resources/org/richfaces/renderkit/html/script/controlUtils.js =================================================================== --- branches/3.1.x/ui/componentControl/src/main/resources/org/richfaces/renderkit/html/script/controlUtils.js 2007-11-26 16:21:42 UTC (rev 4268) +++ branches/3.1.x/ui/componentControl/src/main/resources/org/richfaces/renderkit/html/script/controlUtils.js 2007-11-26 18:19:48 UTC (rev 4269) @@ -6,14 +6,45 @@ Richfaces.componentControl = {}; } +Richfaces.componentControl.eachComponent = function(forAttr, callback) { + jQuery(forAttr) + .each(function() { + if (this.component) { + callback(this.component); + } + }); + +}; + +Richfaces.componentControl.applyDecorations = function (element, forAttr, decorationCode) { + if (decorationCode) { + decorationCode(element); + } + + Richfaces.componentControl.eachComponent(forAttr, function(component) { + if (component.applyDecoration) { + component.applyDecoration(element); + } + }); + +}; + Richfaces.componentControl.attachEvent = function(attachTo, aevent, forAttr, operation, params) { jQuery(attachTo).bind(Richfaces.effectEventOnOut(aevent), function(cevent) { - jQuery( forAttr)[0].component[operation](cevent, params); + Richfaces.componentControl.eachComponent(forAttr, function(component) { + component[operation](cevent, params); + }); + }).each(function() { + Richfaces.componentControl.applyDecorations(this, forAttr, function(element) { + //TODO: handle component decoration + }); }); }; Richfaces.componentControl.performOperation = function( cevent, forAttr, operation, params) { - jQuery( forAttr)[0].component[operation](cevent, params); + Richfaces.componentControl.eachComponent(forAttr, function(component) { + component[operation](cevent, params); + }); };

16 years, 5 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits November 2007