ff-attic/imxmi
2
0
Fork 0
Code Activity

Removed a few complile errors

Browse source
This commit is contained in:
Willem Cazander 2022-04-27 18:34:46 +02:00
parent 76aa74990e
commit 0997b66c89
14 changed files with 135 additions and 403 deletions
Download patch file Download diff file Expand all files Collapse all files

4
vasc-test/vasc-test-frontend/src/main/java/net/forwardfire/vasc/test/frontend/data/TestModelData.java
View file

@ -48,10 +48,10 @@ public class TestModelData {
TestModelVascDataSource backends = new TestModelVascDataSource();
backends.generatorData(10876);
backends.orderModel.setId("orderModelBackend");
//backends.orderModel.setId("orderModelBackend");
((VascBackendControllerLocal)c.getVascBackendController()).addVascBackend(backends.orderModel);
backends.orderLineModel.setId("orderLineModelBackend");
//backends.orderLineModel.setId("orderLineModelBackend");
((VascBackendControllerLocal)c.getVascBackendController()).addVascBackend(backends.orderLineModel);
return c;

142
vasc-test/vasc-test-frontend/src/main/java/net/forwardfire/vasc/test/frontend/data/TestModelVascDataSource.java
View file

@ -25,16 +25,20 @@ package net.forwardfire.vasc.test.frontend.data;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Date;
import java.util.EnumSet;
import java.util.List;
import org.x4o.xml.element.DefaultElementObjectPropertyValue;
import org.x4o.xml.element.ElementObjectPropertyValueException;
import net.forwardfire.vasc.backend.VascBackendException;
import net.forwardfire.vasc.backend.VascBackendAccessDataKey;
import net.forwardfire.vasc.backend.VascBackendAccessDataRecord;
import net.forwardfire.vasc.backend.crud.AbstractVascBackendCrud;
import net.forwardfire.vasc.backend.crud.VascBackendCrud;
import net.forwardfire.vasc.backend.data.BeanVascBackendAccessDataRecord;
import net.forwardfire.vasc.backend.list.DefaultVascBackendListResult;
import net.forwardfire.vasc.backend.list.VascBackendList;
import net.forwardfire.vasc.backend.list.VascBackendListFeature;
import net.forwardfire.vasc.backend.list.VascBackendListResult;
import net.forwardfire.vasc.backend.list.VascBackendListRequest;
@ -46,8 +50,8 @@ import net.forwardfire.vasc.backend.list.VascBackendListRequest;
public class TestModelVascDataSource {
//private List<TestModelOrder> testModels = null;
public ListObjectVascDataSource<TestModelOrder,Integer> orderModel = null;
public ListObjectVascDataSource<TestModelOrderLine,Integer> orderLineModel = null;
public ListObjectVascDataSource<Integer,TestModelOrder> orderModel = null;
public ListObjectVascDataSource<Integer,TestModelOrderLine> orderLineModel = null;
public TestModelVascDataSource() {
this(new ArrayList<TestModelOrder>(200),new ArrayList<TestModelOrderLine>(200));
@ -55,8 +59,8 @@ public class TestModelVascDataSource {
@SuppressWarnings({ "unchecked", "rawtypes" })
public TestModelVascDataSource(List<TestModelOrder> testModels,List<TestModelOrderLine> testModelLine) {
orderModel = new ListObjectVascDataSource(TestModelOrder.class,(List)testModels);
orderLineModel = new ListObjectVascDataSource(TestModelOrderLine.class,(List)testModelLine);
orderModel = new ListObjectVascDataSource((List)testModels);
orderLineModel = new ListObjectVascDataSource((List)testModelLine);
}
public void generatorData(int size) {
@ -72,7 +76,7 @@ public class TestModelVascDataSource {
t.setActive(true);
}
if (orderModel.getObjectList().isEmpty()==false) {
t.setTestModel((TestModelOrder)orderModel.getObjectList().get(0));
t.setTestModel(orderModel.getObjectList().get(0));
}
orderModel.getObjectList().add(t);
@ -87,27 +91,23 @@ public class TestModelVascDataSource {
}
}
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;
private String nullKeyValue = null;
class ListObjectVascDataSource<DATA_PK extends Serializable,DATA_RECORD extends Serializable> implements VascBackendList<DATA_PK,DATA_RECORD> {
private List<DATA_RECORD> modelList = null;
public ListObjectVascDataSource(Class<?> modelClass,List<DATA_OBJECT> modelList) {
this.modelClass=modelClass;
public ListObjectVascDataSource(List<DATA_RECORD> modelList) {
this.modelList=modelList;
}
public List<DATA_OBJECT> getObjectList() {
public List<DATA_RECORD> getObjectList() {
return modelList;
}
@Override
public VascBackendListResult<DATA_OBJECT> execute(VascBackendListRequest state) throws VascBackendException {
public VascBackendListResult<DATA_RECORD> execute(VascBackendListRequest state) throws VascBackendException {
if (state.getDataParameterKeys().isEmpty()==false) {
List<DATA_OBJECT> result = new ArrayList<DATA_OBJECT>(modelList.size()/2);
List<DATA_RECORD> result = new ArrayList<DATA_RECORD>(modelList.size()/2);
DefaultElementObjectPropertyValue helper = new DefaultElementObjectPropertyValue();
for (DATA_OBJECT row:modelList) {
for (DATA_RECORD row:modelList) {
boolean addRow = true;
for (String key:state.getDataParameterKeys()) {
Object keyValue = state.getDataParameter(key);
@ -129,99 +129,51 @@ public class TestModelVascDataSource {
result.add(row);
}
}
return new DefaultVascBackendListResult<DATA_OBJECT>(result);
return new DefaultVascBackendListResult<DATA_RECORD>(result);
} else {
List<DATA_OBJECT> result = new ArrayList<DATA_OBJECT>(modelList.size());
for (DATA_OBJECT row:modelList) {
List<DATA_RECORD> result = new ArrayList<DATA_RECORD>(modelList.size());
for (DATA_RECORD row:modelList) {
result.add(row);
}
return new DefaultVascBackendListResult<DATA_OBJECT>(result);
return new DefaultVascBackendListResult<DATA_RECORD>(result);
}
}
@Override
public DATA_OBJECT persist(DATA_OBJECT object) throws VascBackendException {
modelList.add(object);
return object;
}
@Override
public DATA_OBJECT merge(DATA_OBJECT object) throws VascBackendException {
if(modelList.contains(object)==false) {
modelList.add(object);
}
return object;
}
@Override
public void delete(DATA_PK object) throws VascBackendException {
modelList.remove(object); // TODO FIXME BUG
}
@Override
public VascBackendAccessDataRecord<DATA_OBJECT,DATA_PK> provideVascEntryFieldValue() {
return new BeanVascBackendAccessDataRecord();
}
/**
* @see net.forwardfire.vasc.backend.crud.VascBackendCrud#fetch(java.io.Serializable)
*/
@Override
public DATA_OBJECT fetch(DATA_PK recordPK) throws VascBackendException {
public EnumSet<VascBackendListFeature> getSupportedFeatures() {
// 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();
public List<String> getSupportedRowActions() {
// TODO Auto-generated method stub
return null;
}
// --- VascSelectItemModel interface
/*
public List<VascSelectItem> getVascSelectItems(VascEntry entry) {
List<VascSelectItem> res = new ArrayList<VascSelectItem>(4);
for (Object o:testModels) {
TestModelOrder t = (TestModelOrder)o;
VascSelectItem i = new VascSelectItem(t.getName(),t);
res.add(i);
}
return res;
}*/
@Override
public VascBackendAccessDataRecord<DATA_PK, DATA_RECORD> createVascBackendAccessDataRecord() {
// TODO Auto-generated method stub
return null;
}
/**
* @return the nullLabel
*/
public String getNullLabel() {
return nullLabel;
@Override
public String getId() {
// TODO Auto-generated method stub
return null;
}
/**
* @param nullLabel the nullLabel to set
*/
public void setNullLabel(String nullLabel) {
this.nullLabel = nullLabel;
@Override
public VascBackendAccessDataKey<DATA_PK> createVascBackendAccessDataKey() {
// TODO Auto-generated method stub
return null;
}
/**
* @return the nullKeyValue
*/
public String getNullKeyValue() {
return nullKeyValue;
}
/**
* @param nullKeyValue the nullKeyValue to set
*/
public void setNullKeyValue(String nullKeyValue) {
this.nullKeyValue = nullKeyValue;
@Override
public void executeRowAction(VascBackendListRequest request, List<DATA_PK> recordPKs, String actionName)
throws VascBackendException {
// TODO Auto-generated method stub
}
}