Author: nbelaevski Date: 2007-11-20 09:35:34 -0500 (Tue, 20 Nov 2007) New Revision: 4105 Modified: branches/3.1.x/sandbox/ui/listShuttle/src/main/java/org/richfaces/model/ListShuttleDataModel.java Log: Java 5 stuff removed 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-20 14:26:53 UTC (rev 4104) +++ branches/3.1.x/sandbox/ui/listShuttle/src/main/java/org/richfaces/model/ListShuttleDataModel.java 2007-11-20 14:35:34 UTC (rev 4105) @@ -55,30 +55,29 @@ /* (non-Javadoc) * @see org.ajax4jsf.model.ExtendedDataModel#getRowKey() */ - @Override public Object getRowKey() { return rowKey; } private void setShuttleRowKey(ListShuttleRowKey shuttleRowKey) { - if (shuttleRowKey == null) { - this.sourceModel.setRowKey(null); - this.targetModel.setRowKey(null); - } else { + Object sourceKey = null; + Object targetKey = null; + + if (shuttleRowKey != null) { if (shuttleRowKey.isSource()) { - this.targetModel.setRowKey(null); - this.sourceModel.setRowKey(shuttleRowKey.getRowKey()); + sourceKey = shuttleRowKey.getRowKey(); } else { - this.sourceModel.setRowKey(null); - this.targetModel.setRowKey(shuttleRowKey.getRowKey()); + targetKey = shuttleRowKey.getRowKey(); } } + + this.sourceModel.setRowKey(null); + this.targetModel.setRowKey(null); } /* (non-Javadoc) * @see org.ajax4jsf.model.ExtendedDataModel#setRowKey(java.lang.Object) */ - @Override public void setRowKey(Object key) { this.rowKey = key; @@ -111,11 +110,10 @@ /* (non-Javadoc) * @see org.ajax4jsf.model.ExtendedDataModel#walk(javax.faces.context.FacesContext, org.ajax4jsf.model.DataVisitor, org.ajax4jsf.model.Range, java.lang.Object) */ - @Override public void walk(final FacesContext context, final DataVisitor visitor, Range range, Object argument) throws IOException { - this.sourceModel.walk(context, new DataVisitor() { @Override + this.sourceModel.walk(context, new DataVisitor() { public void process(FacesContext context, Object rowKey, Object argument) throws IOException { @@ -149,7 +147,6 @@ /* (non-Javadoc) * @see javax.faces.model.DataModel#getRowCount() */ - @Override public int getRowCount() { return sourceModel.getRowCount() + targetModel.getRowCount(); } @@ -157,7 +154,6 @@ /* (non-Javadoc) * @see javax.faces.model.DataModel#getRowData() */ - @Override public Object getRowData() { return sourceModel.isRowAvailable() ? sourceModel.getRowData() : targetModel.getRowData(); } @@ -165,7 +161,6 @@ /* (non-Javadoc) * @see javax.faces.model.DataModel#getRowIndex() */ - @Override public int getRowIndex() { return -1; } @@ -173,7 +168,6 @@ /* (non-Javadoc) * @see javax.faces.model.DataModel#getWrappedData() */ - @Override public Object getWrappedData() { // TODO Auto-generated method stub return null; @@ -182,7 +176,6 @@ /* (non-Javadoc) * @see javax.faces.model.DataModel#isRowAvailable() */ - @Override public boolean isRowAvailable() { return sourceModel.isRowAvailable() || targetModel.isRowAvailable(); } @@ -190,14 +183,12 @@ /* (non-Javadoc) * @see javax.faces.model.DataModel#setRowIndex(int) */ - @Override public void setRowIndex(int rowIndex) { } /* (non-Javadoc) * @see javax.faces.model.DataModel#setWrappedData(java.lang.Object) */ - @Override public void setWrappedData(Object data) { // TODO Auto-generated method stub