Author: nbelaevski Date: 2007-11-20 09:26:53 -0500 (Tue, 20 Nov 2007) New Revision: 4104 Added: branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/model/ branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/model/TranslatedSequenceDataModel.java Removed: branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/component/TranslatedSequenceDataModel.java Modified: branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingList.java Log: model refactored Deleted: branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/component/TranslatedSequenceDataModel.java =================================================================== --- branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/component/TranslatedSequenceDataModel.java 2007-11-20 13:40:10 UTC (rev 4103) +++ branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/component/TranslatedSequenceDataModel.java 2007-11-20 14:26:53 UTC (rev 4104) @@ -1,109 +0,0 @@ -/** - * - */ -package org.richfaces.component; - -import java.io.IOException; - -import javax.faces.context.FacesContext; -import javax.faces.model.DataModel; - -import org.ajax4jsf.model.DataVisitor; -import org.ajax4jsf.model.Range; -import org.ajax4jsf.model.SequenceDataModel; - -/** - * @author Nick Belaevski - * mailto:nbelaevski@exadel.com - * created 07.11.2007 - * - */ -public class TranslatedSequenceDataModel extends SequenceDataModel { - - protected static final class TranslatedRowKey { - private Integer key; - private String asString; - - public TranslatedRowKey(Integer key, String asString) { - super(); - this.key = key; - this.asString = asString; - } - - public Integer getKey() { - return key; - } - - public String getAsString() { - return asString; - } - - public String toString() { - return getAsString(); - } - }; - - private int[] translationTable; - private boolean translatedModel; - - private Object rowKey; - - public TranslatedSequenceDataModel(DataModel wrapped, - boolean translatedModel, int[] translationTable) { - super(wrapped); - this.translatedModel = translatedModel; - this.translationTable = translationTable; - } - - public TranslatedSequenceDataModel(DataModel wrapped) { - super(wrapped); - } - - private int translate(int i) { - if (translationTable != null) { - return translationTable[i]; - } else { - return i; - } - } - - public Object getTranslatedRowKey() { - return super.getRowKey(); - } - - public Object getRowKey() { - return rowKey; - } - - public void setRowKey(Object key) { - this.rowKey = key; - - if (key instanceof TranslatedRowKey) { - super.setRowKey(((TranslatedRowKey) key).getKey()); - } else { - if (this.translatedModel) { - if (rowKey != null) { - int iKey = ((Integer) key).intValue(); - super.setRowKey(new Integer(translate(iKey))); - } else { - super.setRowKey(null); - } - } else { - super.setRowKey(key); - } - } - } - - public void walk(FacesContext context, DataVisitor visitor, Range range, - Object argument) throws IOException { - - for (int i = 0; i < getRowCount(); i++) { - if (this.translatedModel) { - visitor.process(context, new TranslatedRowKey( - new Integer(i), String.valueOf(translate(i))), argument); - } else { - visitor.process(context, new Integer(translate(i)), argument); - } - } - } -} Modified: branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingList.java =================================================================== --- branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingList.java 2007-11-20 13:40:10 UTC (rev 4103) +++ branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingList.java 2007-11-20 14:26:53 UTC (rev 4104) @@ -19,7 +19,6 @@ import javax.faces.component.UIComponentBase; import javax.faces.component.UIInput; import javax.faces.context.FacesContext; -import javax.faces.context.ResponseWriter; import javax.faces.convert.Converter; import javax.faces.convert.ConverterException; import javax.faces.el.EvaluationException; @@ -38,8 +37,7 @@ import org.ajax4jsf.javascript.ScriptUtils; import org.ajax4jsf.model.DataVisitor; import org.ajax4jsf.model.ExtendedDataModel; -import org.ajax4jsf.renderkit.RendererUtils.HTML; -import org.richfaces.renderkit.OrderingListRendererBase; +import org.richfaces.model.TranslatedSequenceDataModel; public abstract class UIOrderingList extends UIOrderingBaseComponent { Copied: branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/model/TranslatedSequenceDataModel.java (from rev 4099, branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/component/TranslatedSequenceDataModel.java) =================================================================== --- branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/model/TranslatedSequenceDataModel.java (rev 0) +++ branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/model/TranslatedSequenceDataModel.java 2007-11-20 14:26:53 UTC (rev 4104) @@ -0,0 +1,109 @@ +/** + * + */ +package org.richfaces.model; + +import java.io.IOException; + +import javax.faces.context.FacesContext; +import javax.faces.model.DataModel; + +import org.ajax4jsf.model.DataVisitor; +import org.ajax4jsf.model.Range; +import org.ajax4jsf.model.SequenceDataModel; + +/** + * @author Nick Belaevski + * mailto:nbelaevski@exadel.com + * created 07.11.2007 + * + */ +public class TranslatedSequenceDataModel extends SequenceDataModel { + + protected static final class TranslatedRowKey { + private Integer key; + private String asString; + + public TranslatedRowKey(Integer key, String asString) { + super(); + this.key = key; + this.asString = asString; + } + + public Integer getKey() { + return key; + } + + public String getAsString() { + return asString; + } + + public String toString() { + return getAsString(); + } + }; + + private int[] translationTable; + private boolean translatedModel; + + private Object rowKey; + + public TranslatedSequenceDataModel(DataModel wrapped, + boolean translatedModel, int[] translationTable) { + super(wrapped); + this.translatedModel = translatedModel; + this.translationTable = translationTable; + } + + public TranslatedSequenceDataModel(DataModel wrapped) { + super(wrapped); + } + + private int translate(int i) { + if (translationTable != null) { + return translationTable[i]; + } else { + return i; + } + } + + public Object getTranslatedRowKey() { + return super.getRowKey(); + } + + public Object getRowKey() { + return rowKey; + } + + public void setRowKey(Object key) { + this.rowKey = key; + + if (key instanceof TranslatedRowKey) { + super.setRowKey(((TranslatedRowKey) key).getKey()); + } else { + if (this.translatedModel) { + if (rowKey != null) { + int iKey = ((Integer) key).intValue(); + super.setRowKey(new Integer(translate(iKey))); + } else { + super.setRowKey(null); + } + } else { + super.setRowKey(key); + } + } + } + + public void walk(FacesContext context, DataVisitor visitor, Range range, + Object argument) throws IOException { + + for (int i = 0; i < getRowCount(); i++) { + if (this.translatedModel) { + visitor.process(context, new TranslatedRowKey( + new Integer(i), String.valueOf(translate(i))), argument); + } else { + visitor.process(context, new Integer(translate(i)), argument); + } + } + } +}