2
0
Fork 0

WIP: left over open files for long...

This commit is contained in:
Willem 2017-06-10 02:22:01 +02:00
parent 0a2398c5c1
commit 76aa74990e
165 changed files with 4299 additions and 3373 deletions

View file

@ -30,15 +30,13 @@ import java.util.List;
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;
import net.forwardfire.vasc.backend.data.BeanVascEntryFieldValue;
import net.forwardfire.vasc.backend.data.BeanVascEntryRecordCreator;
import net.forwardfire.vasc.backend.VascBackendAccessDataRecord;
import net.forwardfire.vasc.backend.crud.AbstractVascBackendCrud;
import net.forwardfire.vasc.backend.data.BeanVascBackendAccessDataRecord;
import net.forwardfire.vasc.backend.list.DefaultVascBackendListResult;
import net.forwardfire.vasc.backend.list.VascBackendListResult;
import net.forwardfire.vasc.backend.list.VascBackendListRequest;
/**
*
@ -48,8 +46,8 @@ import net.forwardfire.vasc.backend.data.BeanVascEntryRecordCreator;
public class TestModelVascDataSource {
//private List<TestModelOrder> testModels = null;
public ListObjectVascDataSource<TestModelOrder> orderModel = null;
public ListObjectVascDataSource<TestModelOrderLine> orderLineModel = null;
public ListObjectVascDataSource<TestModelOrder,Integer> orderModel = null;
public ListObjectVascDataSource<TestModelOrderLine,Integer> orderLineModel = null;
public TestModelVascDataSource() {
this(new ArrayList<TestModelOrder>(200),new ArrayList<TestModelOrderLine>(200));
@ -89,7 +87,7 @@ public class TestModelVascDataSource {
}
}
class ListObjectVascDataSource<DATA_OBJECT extends Serializable> extends AbstractVascBackend<DATA_OBJECT> {
class ListObjectVascDataSource<DATA_OBJECT extends Serializable,DATA_PK extends Serializable> extends AbstractVascBackendCrud<DATA_OBJECT,DATA_PK> {
private Class<?> modelClass = null;
private List<DATA_OBJECT> modelList = null;
private String nullLabel = null;
@ -105,7 +103,7 @@ public class TestModelVascDataSource {
}
@Override
public VascBackendResult<DATA_OBJECT> execute(VascBackendState state) throws VascBackendException {
public VascBackendListResult<DATA_OBJECT> execute(VascBackendListRequest state) throws VascBackendException {
if (state.getDataParameterKeys().isEmpty()==false) {
List<DATA_OBJECT> result = new ArrayList<DATA_OBJECT>(modelList.size()/2);
DefaultElementObjectPropertyValue helper = new DefaultElementObjectPropertyValue();
@ -131,19 +129,20 @@ public class TestModelVascDataSource {
result.add(row);
}
}
return new DefaultVascBackendResult<DATA_OBJECT>(result);
return new DefaultVascBackendListResult<DATA_OBJECT>(result);
} else {
List<DATA_OBJECT> result = new ArrayList<DATA_OBJECT>(modelList.size());
for (DATA_OBJECT row:modelList) {
result.add(row);
}
return new DefaultVascBackendResult<DATA_OBJECT>(result);
return new DefaultVascBackendListResult<DATA_OBJECT>(result);
}
}
@Override
public void persist(DATA_OBJECT object) throws VascBackendException {
public DATA_OBJECT persist(DATA_OBJECT object) throws VascBackendException {
modelList.add(object);
return object;
}
@Override
@ -155,20 +154,34 @@ public class TestModelVascDataSource {
}
@Override
public void delete(DATA_OBJECT object) throws VascBackendException {
modelList.remove(object);
public void delete(DATA_PK object) throws VascBackendException {
modelList.remove(object); // TODO FIXME BUG
}
@Override
public VascEntryFieldValue provideVascEntryFieldValue() {
return new BeanVascEntryFieldValue();
public VascBackendAccessDataRecord<DATA_OBJECT,DATA_PK> provideVascEntryFieldValue() {
return new BeanVascBackendAccessDataRecord();
}
/**
* @see net.forwardfire.vasc.backend.crud.VascBackendCrud#fetch(java.io.Serializable)
*/
@Override
public VascEntryRecordCreator provideVascEntryRecordCreator() {
return new BeanVascEntryRecordCreator(modelClass);
public DATA_OBJECT fetch(DATA_PK recordPK) throws VascBackendException {
// TODO Auto-generated method stub
return null;
}
/**
* @see net.forwardfire.vasc.backend.crud.VascBackendCrud#newRecord()
*/
@Override
@SuppressWarnings("unchecked")
public DATA_OBJECT newRecord() throws VascBackendException {
return (DATA_OBJECT)modelClass.newInstance();
}
// --- VascSelectItemModel interface
/*
public List<VascSelectItem> getVascSelectItems(VascEntry entry) {
@ -181,6 +194,8 @@ public class TestModelVascDataSource {
return res;
}*/
/**
* @return the nullLabel
*/