diff --git a/vasc-backend/pom.xml b/vasc-backend/pom.xml
index 658c2f4..9985295 100644
--- a/vasc-backend/pom.xml
+++ b/vasc-backend/pom.xml
@@ -17,7 +17,6 @@
vasc-backend-jdbc
vasc-backend-metamodel
vasc-backend-api
- vasc-backend-test
vasc-backend-object
diff --git a/vasc-backend/vasc-backend-api/src/main/java/net/forwardfire/vasc/backend/list/DefaultVascBackendListRequest.java b/vasc-backend/vasc-backend-api/src/main/java/net/forwardfire/vasc/backend/list/DefaultVascBackendListRequest.java
deleted file mode 100644
index 11e44fa..0000000
--- a/vasc-backend/vasc-backend-api/src/main/java/net/forwardfire/vasc/backend/list/DefaultVascBackendListRequest.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * Copyright 2007-2012 forwardfire.net All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are permitted provided
- * that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this list of conditions and the
- * following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and
- * the following disclaimer in the documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
- * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
- * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package net.forwardfire.vasc.backend.list;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-
-
-/**
- * Holds the state for the backend
- *
- * @author Willem Cazander
- * @version 1.0 May 26, 2009
- */
-@SuppressWarnings("serial")
-public class DefaultVascBackendListRequest implements VascBackendListRequest {
-
- protected Map parameters = null;
- private int pageIndex = 0;
- private int pageSize = 0;
- private int pageSizeMax = 0;
- private String sortField = null;
- private String searchString = null;
- private boolean ascending = true;
-
- public DefaultVascBackendListRequest() {
- parameters = new HashMap(10);
- }
-
- public void setDataParameter(String key, Object data) {
- parameters.put(key,data);
- }
-
- public void removeDataParameter(String key) {
- parameters.remove(key);
- }
-
- public void removeDataParameterAll() {
- parameters.clear();
- }
-
- /**
- * @see net.forwardfire.vasc.backend.list.VascBackendListRequest#getDataParameter(java.lang.String)
- */
- @Override
- public Object getDataParameter(String key) {
- return parameters.get(key);
- }
-
- /**
- * @see net.forwardfire.vasc.backend.list.VascBackendListRequest#getDataParameterKeys()
- */
- @Override
- public Set getDataParameterKeys() {
- return parameters.keySet();
- }
-
- /**
- * @see net.forwardfire.vasc.backend.crud.VascBackendCrud#getPageIndex()
- */
- @Override
- public int getPageIndex() {
- return pageIndex;
- }
-
- public void setPageIndex(int pageIndex) {
- this.pageIndex=pageIndex;
- }
-
- /**
- * @see net.forwardfire.vasc.backend.crud.VascBackendCrud#getPageSize()
- */
- @Override
- public int getPageSize() {
- return pageSize;
- }
-
- public void setPageSize(int pageSize) {
- this.pageSize=pageSize;
- }
-
- /**
- * @see net.forwardfire.vasc.backend.crud.VascBackendCrud#getSearchString()
- */
- @Override
- public String getSearchString() {
- return searchString;
- }
-
- public void setSearchString(String searchString) {
- this.searchString=searchString;
- }
-
- /**
- * @see net.forwardfire.vasc.backend.crud.VascBackendCrud#isSortAscending()
- */
- @Override
- public boolean isSortAscending() {
- return ascending;
- }
-
- public void setSortAscending(boolean ascending) {
- this.ascending=ascending;
- }
-
- /**
- * @see net.forwardfire.vasc.backend.crud.VascBackendCrud#getSortField()
- */
- @Override
- public String getSortField() {
- return sortField;
- }
-
- public void setSortField(String sortField) {
- this.sortField=sortField;
- }
-
- /**
- * @return the pageSizeMax
- */
- @Override
- public int getPageSizeMax() {
- return pageSizeMax;
- }
-
- public void setPageSizeMax(int pageSizeMax) {
- this.pageSizeMax = pageSizeMax;
- }
-}
\ No newline at end of file
diff --git a/vasc-backend/vasc-backend-api/src/main/java/net/forwardfire/vasc/backend/list/VascBackendListRequest.java b/vasc-backend/vasc-backend-api/src/main/java/net/forwardfire/vasc/backend/list/VascBackendListRequest.java
index ecb56be..393baf4 100644
--- a/vasc-backend/vasc-backend-api/src/main/java/net/forwardfire/vasc/backend/list/VascBackendListRequest.java
+++ b/vasc-backend/vasc-backend-api/src/main/java/net/forwardfire/vasc/backend/list/VascBackendListRequest.java
@@ -23,6 +23,8 @@
package net.forwardfire.vasc.backend.list;
import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
import java.util.Set;
/**
@@ -31,20 +33,86 @@ import java.util.Set;
* @author Willem Cazander
* @version 1.0 May 26, 2009
*/
-public interface VascBackendListRequest extends Serializable {
+public class VascBackendListRequest implements Serializable {
- Object getDataParameter(String key);
- Set getDataParameterKeys();
+ private static final long serialVersionUID = -2076113513122609253L;
+ protected Map parameters = null;
+ private int pageIndex = 0;
+ private int pageSize = 0;
+ private int pageSizeMax = 0;
+ private String sortField = null;
+ private String searchString = null;
+ private boolean ascending = true;
- String getSortField();
+ public VascBackendListRequest() {
+ parameters = new HashMap(10);
+ }
- boolean isSortAscending();
+ public void setDataParameter(String key, Object data) {
+ parameters.put(key,data);
+ }
- int getPageSize();
+ public void removeDataParameter(String key) {
+ parameters.remove(key);
+ }
- int getPageSizeMax();
+ public void removeDataParameterAll() {
+ parameters.clear();
+ }
+
+ public Object getDataParameter(String key) {
+ return parameters.get(key);
+ }
+
+ public Set getDataParameterKeys() {
+ return parameters.keySet();
+ }
+
+ public int getPageIndex() {
+ return pageIndex;
+ }
- int getPageIndex();
+ public void setPageIndex(int pageIndex) {
+ this.pageIndex=pageIndex;
+ }
- String getSearchString();
+ public int getPageSize() {
+ return pageSize;
+ }
+
+ public void setPageSize(int pageSize) {
+ this.pageSize=pageSize;
+ }
+
+ public String getSearchString() {
+ return searchString;
+ }
+
+ public void setSearchString(String searchString) {
+ this.searchString=searchString;
+ }
+
+ public boolean isSortAscending() {
+ return ascending;
+ }
+
+ public void setSortAscending(boolean ascending) {
+ this.ascending=ascending;
+ }
+
+ public String getSortField() {
+ return sortField;
+ }
+
+ public void setSortField(String sortField) {
+ this.sortField=sortField;
+ }
+
+ public int getPageSizeMax() {
+ return pageSizeMax;
+ }
+
+ public void setPageSizeMax(int pageSizeMax) {
+ this.pageSizeMax = pageSizeMax;
+ }
}
diff --git a/vasc-backend/vasc-backend-object/src/main/java/net/forwardfire/vasc/backend/object/VascSelectItemModelEntry.java b/vasc-backend/vasc-backend-object/src/main/java/net/forwardfire/vasc/backend/object/VascSelectItemModelEntry.java
index b55b0e5..a1d3435 100644
--- a/vasc-backend/vasc-backend-object/src/main/java/net/forwardfire/vasc/backend/object/VascSelectItemModelEntry.java
+++ b/vasc-backend/vasc-backend-object/src/main/java/net/forwardfire/vasc/backend/object/VascSelectItemModelEntry.java
@@ -30,7 +30,6 @@ import java.util.Map;
import net.forwardfire.vasc.backend.VascBackendAccessDataRecord;
import net.forwardfire.vasc.backend.crud.VascBackendCrud;
-import net.forwardfire.vasc.backend.list.DefaultVascBackendListRequest;
import net.forwardfire.vasc.backend.list.VascBackendListRequest;
import net.forwardfire.vasc.backend.select.VascBackendSelectItem;
diff --git a/vasc-backend/vasc-backend-test/.project b/vasc-backend/vasc-backend-test/.project
deleted file mode 100644
index a326b25..0000000
--- a/vasc-backend/vasc-backend-test/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
- vasc-backend-test
-
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
- org.eclipse.m2e.core.maven2Builder
-
-
-
-
-
- org.eclipse.jdt.core.javanature
- org.eclipse.m2e.core.maven2Nature
-
-
diff --git a/vasc-backend/vasc-backend-test/pom.xml b/vasc-backend/vasc-backend-test/pom.xml
deleted file mode 100644
index ac42c2c..0000000
--- a/vasc-backend/vasc-backend-test/pom.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-
- 4.0.0
-
- net.forwardfire.vasc.backend
- vasc-backend
- 0.4.2-SNAPSHOT
-
- vasc-backend-test
- vasc-backend-test
- vasc-backend-test
-
-
- net.forwardfire.vasc.backend
- vasc-backend-jdbc
- ${project.version}
-
-
- net.forwardfire.vasc.backend
- vasc-backend-metamodel
- ${project.version}
-
-
- net.forwardfire.vasc.backend
- vasc-backend-mongodb
- ${project.version}
-
-
- net.forwardfire.vasc.backend
- vasc-backend-ldap
- ${project.version}
-
-
-
- com.h2database
- h2
- ${h2.version}
-
-
- postgresql
- postgresql
- ${postgresql.version}
-
-
-
\ No newline at end of file
diff --git a/vasc-backend/vasc-backend-test/src/main/java/net/forwardfire/vasc/backend/test/CrudTest.java b/vasc-backend/vasc-backend-test/src/main/java/net/forwardfire/vasc/backend/test/CrudTest.java
deleted file mode 100644
index edc9190..0000000
--- a/vasc-backend/vasc-backend-test/src/main/java/net/forwardfire/vasc/backend/test/CrudTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package net.forwardfire.vasc.backend.test;
-
-import java.io.Serializable;
-
-import junit.framework.TestCase;
-import net.forwardfire.vasc.backend.DefaultVascBackendController;
-import net.forwardfire.vasc.backend.VascBackendAccessDataRecord;
-import net.forwardfire.vasc.backend.crud.VascBackendCrud;
-import net.forwardfire.vasc.backend.list.DefaultVascBackendListRequest;
-import net.forwardfire.vasc.backend.list.VascBackendListResult;
-import net.forwardfire.vasc.backend.metamodel.MetaModelDataContextJdbc;
-import net.forwardfire.vasc.backend.metamodel.MetaModelVascBackendCrud;
-
-import org.testng.annotations.Test;
-
-public class CrudTest extends TestCase {
-
- private DefaultVascBackendController backends;
-
- //@Before
- public void setup() {
- backends = new DefaultVascBackendController();
-
- MetaModelDataContextJdbc mmDB = new MetaModelDataContextJdbc();
- mmDB.setConnectUrl("jdbc:postgresql://localhost/moviedb");
- mmDB.setDriverClass("org.postgresql.Driver");
- mmDB.setUsername("postgres");
- mmDB.setPassword("postgresql");
-
- MetaModelVascBackendCrud mm = new MetaModelVascBackendCrud();
- mm.setId("mm");
- mm.setTable("country");
- mm.setTableId("country_id");
- mm.setDataContextProvider(mmDB);
-
-
- backends.addVascBackend(mm);
- }
-
- @Test
- public void testCrudBackends() throws Exception {
-
- setup();
-
- VascBackendCrud backend = (VascBackendCrud) backends.getVascBackendById(VascBackendCrud.class,"mm");
- assertNotNull(backend);
-
-
-//
-// DefaultVascBackendListRequest state = new DefaultVascBackendListRequest();
-// VascBackendListResult result = backend.execute(state);
-// assertNotNull(result);
-// assertFalse(result.getData().isEmpty());
-//
-// VascBackendAccessDataRecord values = backend.provideVascEntryFieldValue();
-//
-// for (Serializable record:result.getData()) {
-// Object id = values.getValue("country_id", record);
-// Object name = values.getValue("name", record);
-// Object code = values.getValue("code", record);
-// System.out.println("line: "+id+" name: "+name+" code: "+code);
-// }
- }
-}
diff --git a/vasc-backend/vasc-backend-test/src/main/java/net/forwardfire/vasc/backend/test/package-info.java b/vasc-backend/vasc-backend-test/src/main/java/net/forwardfire/vasc/backend/test/package-info.java
deleted file mode 100644
index b2e55ad..0000000
--- a/vasc-backend/vasc-backend-test/src/main/java/net/forwardfire/vasc/backend/test/package-info.java
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- *
- */
-/**
- * @author willemc
- *
- */
-package net.forwardfire.vasc.backend.test;
\ No newline at end of file
diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/impl/DefaultVascEntryConfigController.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/DefaultVascEntryConfigController.java
index 8ed3f8c..bb30594 100644
--- a/vasc-core/src/main/java/net/forwardfire/vasc/impl/DefaultVascEntryConfigController.java
+++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/DefaultVascEntryConfigController.java
@@ -32,7 +32,6 @@ import java.util.ResourceBundle;
import net.forwardfire.vasc.backend.VascBackendAccessDataRecord;
import net.forwardfire.vasc.backend.crud.VascBackendCrud;
-import net.forwardfire.vasc.backend.list.DefaultVascBackendListRequest;
import net.forwardfire.vasc.backend.list.VascBackendListRequest;
import net.forwardfire.vasc.backend.proxy.VascBackendProxy;
import net.forwardfire.vasc.core.VascController;
@@ -80,7 +79,7 @@ public class DefaultVascEntryConfigController implements VascEntryConfigControll
vascInterfaceImpls = new HashMap>(VascInterfaceKey.values().length);
vascInterfaceImplFrontends = new HashMap>(VascInterfaceKeyFrontend.values().length);
vascInterfaceLoader = new DefaultVascInterfaceLoader(this);
- masterVascBackendState = new DefaultVascBackendListRequest();
+ masterVascBackendState = new VascBackendListRequest();
masterVascBackendState.setPageSize(100);
masterVascBackendState.setPageSizeMax(1500);
}
diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/config/VascIdCheckFinalizer.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/config/VascIdCheckFinalizer.java
index cb0717a..c03c44c 100644
--- a/vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/config/VascIdCheckFinalizer.java
+++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/config/VascIdCheckFinalizer.java
@@ -68,7 +68,7 @@ public class VascIdCheckFinalizer implements VascEntryConfigFinalizer {
}
// Check if backendId is valid
- VascBackendCrud back = vascController.getVascBackendController().getVascBackendById( entry.getBackendId() );
+ VascBackendCrud back = vascController.getVascBackendController().getVascBackendById(VascBackendCrud.class, entry.getBackendId() );
if (back==null) {
throw new IllegalArgumentException("The VascEntry backend is not found in backends: '"+entry.getBackendId()+"' in entryId: "+id);
}
diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/impl/frontend/DefaultVascFrontendActions.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/frontend/DefaultVascFrontendActions.java
index be91b26..8b4501a 100644
--- a/vasc-core/src/main/java/net/forwardfire/vasc/impl/frontend/DefaultVascFrontendActions.java
+++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/frontend/DefaultVascFrontendActions.java
@@ -61,7 +61,7 @@ public class DefaultVascFrontendActions implements VascFrontendActions {
entry.getVascFrontendController().fireVascFrontendEvent(entry,VascEntryFrontendEventListener.VascFrontendEventType.PRE_CREATE, null);
Serializable object;
try {
- object = entry.getVascFrontendController().getVascEntryState().getVascBackend().provideVascEntryRecordCreator().newRecord();
+ object = entry.getVascFrontendController().getVascEntryState().getVascBackend().newRecord();
} catch (VascBackendException e) {
throw new VascFrontendException(e);
}
diff --git a/vasc-export/vasc-export-jr4o/src/main/java/net/forwardfire/vasc/export/jr4o/JRDynamicDataSourceVascEntry.java b/vasc-export/vasc-export-jr4o/src/main/java/net/forwardfire/vasc/export/jr4o/JRDynamicDataSourceVascEntry.java
index ebd838a..336c265 100644
--- a/vasc-export/vasc-export-jr4o/src/main/java/net/forwardfire/vasc/export/jr4o/JRDynamicDataSourceVascEntry.java
+++ b/vasc-export/vasc-export-jr4o/src/main/java/net/forwardfire/vasc/export/jr4o/JRDynamicDataSourceVascEntry.java
@@ -76,7 +76,12 @@ public class JRDynamicDataSourceVascEntry extends AbstractJRDynamicDataSource {
for (Serializable o:vascEntry.getVascFrontendController().getVascEntryState().getEntryDataList()) {
List row = new ArrayList(30);
for (VascEntryField c:fields) {
- row.add(c.getVascEntryFieldValue().getDisplayValue(c.getBackendName(), o));
+ Object rowData = c.getVascEntryFieldValue().getValue(c.getBackendName(), o);
+ if (rowData == null) {
+ row.add(null);
+ } else {
+ row.add(rowData.toString());
+ }
}
data.add(row);
}
diff --git a/vasc-test/vasc-test-frontend/src/main/java/net/forwardfire/vasc/test/frontend/data/TestModelData.java b/vasc-test/vasc-test-frontend/src/main/java/net/forwardfire/vasc/test/frontend/data/TestModelData.java
index f180ba4..d1a7d59 100644
--- a/vasc-test/vasc-test-frontend/src/main/java/net/forwardfire/vasc/test/frontend/data/TestModelData.java
+++ b/vasc-test/vasc-test-frontend/src/main/java/net/forwardfire/vasc/test/frontend/data/TestModelData.java
@@ -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;
diff --git a/vasc-test/vasc-test-frontend/src/main/java/net/forwardfire/vasc/test/frontend/data/TestModelVascDataSource.java b/vasc-test/vasc-test-frontend/src/main/java/net/forwardfire/vasc/test/frontend/data/TestModelVascDataSource.java
index 9f06925..6e13c91 100644
--- a/vasc-test/vasc-test-frontend/src/main/java/net/forwardfire/vasc/test/frontend/data/TestModelVascDataSource.java
+++ b/vasc-test/vasc-test-frontend/src/main/java/net/forwardfire/vasc/test/frontend/data/TestModelVascDataSource.java
@@ -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 testModels = null;
- public ListObjectVascDataSource orderModel = null;
- public ListObjectVascDataSource orderLineModel = null;
+ public ListObjectVascDataSource orderModel = null;
+ public ListObjectVascDataSource orderLineModel = null;
public TestModelVascDataSource() {
this(new ArrayList(200),new ArrayList(200));
@@ -55,8 +59,8 @@ public class TestModelVascDataSource {
@SuppressWarnings({ "unchecked", "rawtypes" })
public TestModelVascDataSource(List testModels,List 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 extends AbstractVascBackendCrud {
- private Class> modelClass = null;
- private List modelList = null;
- private String nullLabel = null;
- private String nullKeyValue = null;
+ class ListObjectVascDataSource implements VascBackendList {
+ private List modelList = null;
- public ListObjectVascDataSource(Class> modelClass,List modelList) {
- this.modelClass=modelClass;
+ public ListObjectVascDataSource(List modelList) {
this.modelList=modelList;
}
- public List getObjectList() {
+ public List getObjectList() {
return modelList;
}
@Override
- public VascBackendListResult execute(VascBackendListRequest state) throws VascBackendException {
+ public VascBackendListResult execute(VascBackendListRequest state) throws VascBackendException {
if (state.getDataParameterKeys().isEmpty()==false) {
- List result = new ArrayList(modelList.size()/2);
+ List result = new ArrayList(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(result);
+ return new DefaultVascBackendListResult(result);
} else {
- List result = new ArrayList(modelList.size());
- for (DATA_OBJECT row:modelList) {
+ List result = new ArrayList(modelList.size());
+ for (DATA_RECORD row:modelList) {
result.add(row);
}
- return new DefaultVascBackendListResult(result);
+ return new DefaultVascBackendListResult(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 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 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 getSupportedRowActions() {
+ // TODO Auto-generated method stub
+ return null;
}
-
-
- // --- VascSelectItemModel interface
- /*
- public List getVascSelectItems(VascEntry entry) {
- List res = new ArrayList(4);
- for (Object o:testModels) {
- TestModelOrder t = (TestModelOrder)o;
- VascSelectItem i = new VascSelectItem(t.getName(),t);
- res.add(i);
- }
- return res;
- }*/
-
+ @Override
+ public VascBackendAccessDataRecord 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 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 recordPKs, String actionName)
+ throws VascBackendException {
+ // TODO Auto-generated method stub
+
}
}