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

@ -4,15 +4,13 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
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.VascBackendCrud;
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;
import net.forwardfire.vasc.core.VascController;
import net.forwardfire.vasc.core.VascEntry;
import net.forwardfire.vasc.core.VascEntryControllerLocal;
@ -30,14 +28,14 @@ import net.forwardfire.vasc.impl.DefaultVascEntryField;
import net.forwardfire.vasc.impl.DefaultVascEntryFieldSet;
import net.forwardfire.vasc.impl.DefaultVascEntryLink;
public class VirtualVascBackend extends AbstractVascBackend<Serializable> {
public class VirtualVascBackend implements VascBackendCrud<Serializable,Serializable> {
private VascController vascController = null;
private String vascType = "entry";
private String entryId = null;
@Override
public VascBackendResult<Serializable> execute(VascBackendState state) throws VascBackendException {
public VascBackendListResult<Serializable> execute(VascBackendListRequest state) throws VascBackendException {
List<Serializable> result = new ArrayList<Serializable>(100);
entryId = (String)state.getDataParameter("entry_id");
if ("entry".equals(vascType)) {
@ -66,12 +64,12 @@ public class VirtualVascBackend extends AbstractVascBackend<Serializable> {
}
}
return new DefaultVascBackendResult<Serializable>(result);
return new DefaultVascBackendListResult<Serializable>(result);
}
@Override
public void persist(Serializable object) throws VascBackendException {
edit(object,false,true);
public Serializable persist(Serializable object) throws VascBackendException {
return edit(object,false,true);
}
@Override
@ -134,53 +132,63 @@ public class VirtualVascBackend extends AbstractVascBackend<Serializable> {
}
@Override
public VascEntryFieldValue provideVascEntryFieldValue() {
return new BeanVascEntryFieldValue();
public VascBackendAccessDataRecord provideVascEntryFieldValue() {
return new BeanVascBackendAccessDataRecord();
}
/**
* @see net.forwardfire.vasc.backend.crud.VascBackendCrud#fetch(java.io.Serializable)
*/
@Override
public VascEntryRecordCreator provideVascEntryRecordCreator() {
public Serializable fetch(Serializable recordPK) throws VascBackendException {
// TODO Auto-generated method stub
return null;
}
/**
* @see net.forwardfire.vasc.backend.crud.VascBackendCrud#newRecord()
*/
@Override
public Serializable newRecord() throws VascBackendException {
if ("entry".equals(vascType)) {
return new BeanVascEntryRecordCreator(DefaultVascEntry.class);
return new DefaultVascEntry(); // FIXME: where is loader?
} else if ("field".equals(vascType)) {
return new BeanVascEntryRecordCreator(DefaultVascEntryField.class);
return new DefaultVascEntryField();
} else if ("fieldset".equals(vascType)) {
return new BeanVascEntryRecordCreator(DefaultVascEntryFieldSet.class);
return new DefaultVascEntryFieldSet();
} else if ("linkentries".equals(vascType)) {
return new BeanVascEntryRecordCreator(DefaultVascEntryLink.class);
return new DefaultVascEntryLink();
} else if ("listoptions".equals(vascType)) {
return new BeanVascEntryRecordCreator(DefaultVascEntryField.class);
return new DefaultVascEntryField();
}
return null;
}
/**
* @return the vascController
*/
public VascController getVascController() {
return vascController;
}
/**
* @param vascController the vascController to set
*/
public void setVascController(VascController vascController) {
this.vascController = vascController;
}
/**
* @return the vascType
*/
public String getVascType() {
return vascType;
}
/**
* @param vascType the vascType to set
*/
public void setVascType(String vascType) {
this.vascType = vascType;
}
}

View file

@ -36,10 +36,11 @@ import org.eobjects.metamodel.schema.Column;
import org.eobjects.metamodel.schema.Relationship;
import org.eobjects.metamodel.schema.Table;
import net.forwardfire.vasc.backend.VascBackend;
import net.forwardfire.vasc.backend.VascBackendControllerLocal;
import net.forwardfire.vasc.backend.crud.VascBackendCrud;
import net.forwardfire.vasc.backend.metamodel.MetaModelDataContextProvider;
import net.forwardfire.vasc.backend.metamodel.MetaModelVascBackend;
import net.forwardfire.vasc.backend.metamodel.MetaModelVascBackendCrud;
import net.forwardfire.vasc.backend.object.VascSelectItemModelEntry;
import net.forwardfire.vasc.core.VascController;
import net.forwardfire.vasc.core.VascEntry;
import net.forwardfire.vasc.core.VascEntryAccessType;
@ -52,7 +53,6 @@ import net.forwardfire.vasc.core.VascEntryLocal;
import net.forwardfire.vasc.impl.DefaultVascEntry;
import net.forwardfire.vasc.impl.DefaultVascEntryField;
import net.forwardfire.vasc.impl.DefaultVascEntryLink;
import net.forwardfire.vasc.impl.ui.VascSelectItemModelEntry;
/**
* MetaModelSchemaAutoEntry
@ -75,14 +75,14 @@ public class MetaModelSchemaAutoEntry {
private Map<String,VascEntryLocal> resultEntries = null;
private Map<String,VascEntryGroupLocal> resultEntryGroups = null;
private Map<String,MetaModelVascBackend> resultBackends = null;
private Map<String,MetaModelVascBackendCrud> resultBackends = null;
public MetaModelSchemaAutoEntry() {
logger = Logger.getLogger(MetaModelSchemaAutoEntry.class.getName());
tables = new ArrayList<String>();
resultEntries = new HashMap<String,VascEntryLocal>();
resultEntryGroups = new HashMap<String,VascEntryGroupLocal>();
resultBackends = new HashMap<String,MetaModelVascBackend>();
resultBackends = new HashMap<String,MetaModelVascBackendCrud>();
}
public void autoFillResult(VascController vascController) {
@ -113,7 +113,7 @@ public class MetaModelSchemaAutoEntry {
}
public void autoAddResultToController() {
for (VascBackend backend:resultBackends.values()) {
for (VascBackendCrud backend:resultBackends.values()) {
((VascBackendControllerLocal)getVascController().getVascBackendController()).addVascBackend(backend);
}
for (VascEntryLocal ve:resultEntries.values()) {
@ -142,7 +142,7 @@ public class MetaModelSchemaAutoEntry {
return; // vasc needs at least one column
}
MetaModelVascBackend backend = new MetaModelVascBackend();
MetaModelVascBackendCrud backend = new MetaModelVascBackendCrud();
backend.setId(id+"_backend");
backend.setDataContextProvider(getDataContextProvider());
backend.setTable(metaTable.getName());
@ -177,7 +177,7 @@ public class MetaModelSchemaAutoEntry {
private void createLinkEntry(Relationship rs2,VascEntryLocal ve,Table metaTable) {
String id = getEntryPrefix()+"_"+rs2.getForeignTable().getName()+getVeLinkPostfix();
MetaModelVascBackend backendLink = new MetaModelVascBackend();
MetaModelVascBackendCrud backendLink = new MetaModelVascBackendCrud();
backendLink.setId(id+"_backend");
backendLink.setDataContextProvider(getDataContextProvider());
backendLink.setTable(rs2.getForeignTable().getName());
@ -228,7 +228,7 @@ public class MetaModelSchemaAutoEntry {
private void createListEntry(Relationship rs,VascEntry ve,Table metaTable) {
String id = getEntryPrefix()+"_"+rs.getPrimaryTable().getName()+getVeListPostfix();
MetaModelVascBackend backendList = new MetaModelVascBackend();
MetaModelVascBackendCrud backendList = new MetaModelVascBackendCrud();
backendList.setId(id+"_backend");
backendList.setDataContextProvider(getDataContextProvider());
backendList.setTable(rs.getPrimaryTable().getName());
@ -474,11 +474,11 @@ public class MetaModelSchemaAutoEntry {
/**
* @return the resultBackends
*/
public List<MetaModelVascBackend> getResultBackends() {
List<MetaModelVascBackend> result = new ArrayList<MetaModelVascBackend>(resultBackends.values());
Collections.sort(result, new Comparator<MetaModelVascBackend>() {
public List<MetaModelVascBackendCrud> getResultBackends() {
List<MetaModelVascBackendCrud> result = new ArrayList<MetaModelVascBackendCrud>(resultBackends.values());
Collections.sort(result, new Comparator<MetaModelVascBackendCrud>() {
@Override
public int compare(MetaModelVascBackend o1, MetaModelVascBackend o2) {
public int compare(MetaModelVascBackendCrud o1, MetaModelVascBackendCrud o2) {
return o1.getId().compareTo(o2.getId());
}
});