2
0
Fork 0

WIP added backend generics so all is seriazible and started to make

execute return full result.
This commit is contained in:
Willem Cazander 2014-08-23 16:58:42 +02:00
parent 3bf185ad48
commit 90b81deb29
25 changed files with 109 additions and 76 deletions

View file

@ -31,7 +31,9 @@ import org.x4o.xml.element.DefaultElementObjectPropertyValue;
import org.x4o.xml.element.ElementObjectPropertyValueException;
import net.forwardfire.vasc.backend.AbstractVascBackend;
import net.forwardfire.vasc.backend.DefaultVascBackendResult;
import net.forwardfire.vasc.backend.VascBackendException;
import net.forwardfire.vasc.backend.VascBackendResult;
import net.forwardfire.vasc.backend.VascBackendState;
import net.forwardfire.vasc.backend.VascEntryFieldValue;
import net.forwardfire.vasc.backend.VascEntryRecordCreator;
@ -102,7 +104,7 @@ public class TestModelVascDataSource {
return modelList;
}
public List<DATA_OBJECT> execute(VascBackendState state) throws VascBackendException {
public VascBackendResult<DATA_OBJECT> execute(VascBackendState state) throws VascBackendException {
if (state.getDataParameterKeys().isEmpty()==false) {
List<DATA_OBJECT> result = new ArrayList<DATA_OBJECT>(modelList.size()/2);
DefaultElementObjectPropertyValue helper = new DefaultElementObjectPropertyValue();
@ -128,13 +130,13 @@ public class TestModelVascDataSource {
result.add(row);
}
}
return result;
return new DefaultVascBackendResult<DATA_OBJECT>(result);
} else {
List<DATA_OBJECT> result = new ArrayList<DATA_OBJECT>(modelList.size());
for (DATA_OBJECT row:modelList) {
result.add(row);
}
return result;
return new DefaultVascBackendResult<DATA_OBJECT>(result);
}
}