WIP: left over open files for long...
This commit is contained in:
Willem
parent
0a2398c5c1
commit
76aa74990e
165 changed files with 4299 additions and 3373 deletions
|
|
@ -1,49 +1,42 @@
|
|||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<artifactId>vasc-frontend</artifactId>
|
||||
<groupId>net.forwardfire.vasc</groupId>
|
||||
<version>0.4.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
<artifactId>vasc-frontend-web-jsf</artifactId>
|
||||
<name>vasc-frontend-web-jsf</name>
|
||||
<description>vasc-frontend-web-jsf</description>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>net.forwardfire.vasc</groupId>
|
||||
<artifactId>vasc-core</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>net.forwardfire.vasc</groupId>
|
||||
<artifactId>vasc-core-ejb3-client</artifactId>
|
||||
<version>${project.version}</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>servlet-api</artifactId>
|
||||
<version>${servlet-api.version}</version>
|
||||
<type>jar</type>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>jstl</artifactId>
|
||||
<version>${jstl.version}</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.servlet.jsp</groupId>
|
||||
<artifactId>jsp-api</artifactId>
|
||||
<version>${jsp-api.version}</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.glassfish</groupId>
|
||||
<artifactId>javax.faces</artifactId>
|
||||
<version>${javax.faces.version}</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<artifactId>vasc-frontend</artifactId>
|
||||
<groupId>net.forwardfire.vasc</groupId>
|
||||
<version>0.4.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
<artifactId>vasc-frontend-web-jsf</artifactId>
|
||||
<name>vasc-frontend-web-jsf</name>
|
||||
<description>vasc-frontend-web-jsf</description>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>net.forwardfire.vasc</groupId>
|
||||
<artifactId>vasc-core</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>net.forwardfire.vasc</groupId>
|
||||
<artifactId>vasc-frontend-api</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>net.forwardfire.vasc</groupId>
|
||||
<artifactId>vasc-core-ejb3-client</artifactId>
|
||||
<version>${project.version}</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax</groupId>
|
||||
<artifactId>javaee-api</artifactId>
|
||||
<version>${javaee-api.version}</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.glassfish</groupId>
|
||||
<artifactId>javax.faces</artifactId>
|
||||
<version>${javax.faces.version}</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ import java.io.Serializable;
|
|||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import net.forwardfire.vasc.backend.VascBackendState;
|
||||
import net.forwardfire.vasc.backend.list.VascBackendListRequest;
|
||||
import net.forwardfire.vasc.core.VascController;
|
||||
import net.forwardfire.vasc.core.VascEntry;
|
||||
import net.forwardfire.vasc.core.VascEntryField;
|
||||
|
|
@ -58,7 +58,7 @@ public abstract class AbstractJSFVascFacesControllerBase {
|
|||
getVascController().getVascEntryConfigController().configVascFrontendController(getVascController(), entry);
|
||||
|
||||
// set def para
|
||||
VascBackendState state = entry.getVascFrontendController().getVascEntryState().getVascBackendState();
|
||||
VascBackendListRequest state = entry.getVascFrontendController().getVascEntryState().getVascBackendState();
|
||||
for (String key2:entry.getEntryParameterKeys()) {
|
||||
Object value = entry.getEntryParameter(key2);
|
||||
state.setDataParameter(key2, value);
|
||||
|
|
|
|||
|
|
@ -32,8 +32,8 @@ import java.util.ResourceBundle;
|
|||
import javax.naming.Context;
|
||||
import javax.naming.InitialContext;
|
||||
|
||||
import net.forwardfire.vasc.backend.VascBackend;
|
||||
import net.forwardfire.vasc.backend.VascBackendControllerLocal;
|
||||
import net.forwardfire.vasc.backend.crud.VascBackendCrud;
|
||||
import net.forwardfire.vasc.backend.proxy.VascBackendProxyEventExecutor;
|
||||
import net.forwardfire.vasc.core.VascController;
|
||||
import net.forwardfire.vasc.core.VascEntryControllerLocal;
|
||||
|
|
@ -193,7 +193,7 @@ abstract public class AbstractJSFVascFacesControllerEJB extends AbstractJSFVascF
|
|||
for (String id:entryIds) {
|
||||
VascEntryLocal ve = (VascEntryLocal)vascManager.getVascEntry(id);
|
||||
String backendId = ve.getBackendId();
|
||||
VascBackend vb = new VascServiceRemoteBackend(vascManager,backendId);
|
||||
VascBackendCrud vb = new VascServiceRemoteBackend(vascManager,backendId);
|
||||
|
||||
for (String key:ve.getEntryParameterKeys()) {
|
||||
Object value = ve.getEntryParameter(key);
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ import javax.faces.model.SelectItem;
|
|||
import javax.servlet.ServletOutputStream;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import net.forwardfire.vasc.backend.VascBackend;
|
||||
import net.forwardfire.vasc.backend.crud.VascBackendCrud;
|
||||
import net.forwardfire.vasc.core.VascEntry;
|
||||
import net.forwardfire.vasc.core.VascEntryField;
|
||||
import net.forwardfire.vasc.core.VascEntryState;
|
||||
|
|
@ -106,7 +106,7 @@ public class JSFVascEntrySupportBean implements Serializable {
|
|||
editSelectItemModels = new HashMap<String,Object>(6);
|
||||
|
||||
// cache some values
|
||||
VascBackend backend = entry.getVascFrontendController().getVascEntryState().getVascBackend();
|
||||
VascBackendCrud backend = entry.getVascFrontendController().getVascEntryState().getVascBackend();
|
||||
backendPageable = backend.isPageable();
|
||||
backendMoveable = backend.isRecordMoveable();
|
||||
backendSearchable = backend.isSearchable();
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ package net.forwardfire.vasc.frontend.web.jsf;
|
|||
import java.io.Serializable;
|
||||
|
||||
import net.forwardfire.vasc.backend.VascBackendException;
|
||||
import net.forwardfire.vasc.backend.VascEntryFieldValue;
|
||||
import net.forwardfire.vasc.backend.VascBackendAccessDataRecord;
|
||||
import net.forwardfire.vasc.core.VascEntry;
|
||||
import net.forwardfire.vasc.core.VascEntryField;
|
||||
import net.forwardfire.vasc.frontend.VascFrontendDataSelector.EntryFieldSelectType;
|
||||
|
|
@ -79,7 +79,7 @@ public class VascDataBackendBean implements Serializable {
|
|||
private Object getValue(int index) {
|
||||
try {
|
||||
VascEntryField field = getFieldIdByIndex(entry,index);
|
||||
VascEntryFieldValue value = field.getVascEntryFieldValue();
|
||||
VascBackendAccessDataRecord value = field.getVascEntryFieldValue();
|
||||
if (isRealValue()) {
|
||||
return value.getValue(field.getBackendName(), record);
|
||||
}
|
||||
|
|
@ -92,7 +92,7 @@ public class VascDataBackendBean implements Serializable {
|
|||
private void setValue(int index,Object valueObject) {
|
||||
try {
|
||||
VascEntryField field = getFieldIdByIndex(entry,index);
|
||||
VascEntryFieldValue<Serializable> value = field.getVascEntryFieldValue();
|
||||
VascBackendAccessDataRecord<Serializable> value = field.getVascEntryFieldValue();
|
||||
value.setValue(field.getBackendName(), record,(Serializable)valueObject); // TODO: rm cast
|
||||
} catch (VascBackendException e) {
|
||||
throw new RuntimeException("Could not set value on record.",e);
|
||||
|
|
|
|||
|
|
@ -35,9 +35,9 @@ import javax.faces.context.FacesContext;
|
|||
import javax.faces.convert.Converter;
|
||||
import javax.faces.convert.ConverterException;
|
||||
|
||||
import net.forwardfire.vasc.backend.select.VascBackendSelectItem;
|
||||
import net.forwardfire.vasc.core.VascEntry;
|
||||
import net.forwardfire.vasc.core.VascEntryField;
|
||||
import net.forwardfire.vasc.core.ui.VascSelectItem;
|
||||
import net.forwardfire.vasc.core.ui.VascValueModel;
|
||||
import net.forwardfire.vasc.core.VascException;
|
||||
import net.forwardfire.vasc.frontend.web.jsf.JSFVascUIComponent;
|
||||
|
|
@ -130,7 +130,7 @@ class VascConverter implements Converter,Serializable {
|
|||
if (value == null) { return null; }
|
||||
if ((value=value.trim()).length() == 0) { return null; }
|
||||
|
||||
for (VascSelectItem v:testModel.getVascItems()) {
|
||||
for (VascBackendSelectItem v:testModel.getVascItems()) {
|
||||
if (value.equals(v.getKeyValue())) {
|
||||
return v.getValue();
|
||||
}
|
||||
|
|
@ -147,7 +147,7 @@ class VascConverter implements Converter,Serializable {
|
|||
if (component == null) { throw new NullPointerException("component may not be null"); }
|
||||
if (value == null) { return ""; }
|
||||
|
||||
for (VascSelectItem v:testModel.getVascItems()) {
|
||||
for (VascBackendSelectItem v:testModel.getVascItems()) {
|
||||
if (value.equals(v.getValue())) {
|
||||
return v.getKeyValue();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,8 +31,8 @@ import java.util.ListIterator;
|
|||
|
||||
import javax.faces.model.SelectItem;
|
||||
|
||||
import net.forwardfire.vasc.backend.select.VascBackendSelectItem;
|
||||
import net.forwardfire.vasc.core.VascEntryField;
|
||||
import net.forwardfire.vasc.core.ui.VascSelectItem;
|
||||
import net.forwardfire.vasc.core.ui.VascSelectItemModel;
|
||||
import net.forwardfire.vasc.core.VascException;
|
||||
|
||||
|
|
@ -49,12 +49,12 @@ public class JSFListModel implements Serializable,List<SelectItem> {
|
|||
|
||||
private static final long serialVersionUID = -5266070864271715383L;
|
||||
private VascEntryField entryField;
|
||||
private List<VascSelectItem> items = null;
|
||||
private List<VascBackendSelectItem> items = null;
|
||||
private List<SelectItem> selectItems = null;
|
||||
private boolean refresh = true;
|
||||
|
||||
public JSFListModel() {
|
||||
items = new ArrayList<VascSelectItem>(40);
|
||||
items = new ArrayList<VascBackendSelectItem>(40);
|
||||
selectItems = new ArrayList<SelectItem>(40);
|
||||
}
|
||||
|
||||
|
|
@ -63,7 +63,7 @@ public class JSFListModel implements Serializable,List<SelectItem> {
|
|||
this.entryField=entryField;
|
||||
}
|
||||
|
||||
public List<VascSelectItem> getVascItems() {
|
||||
public List<VascBackendSelectItem> getVascItems() {
|
||||
refresh();
|
||||
return items;
|
||||
}
|
||||
|
|
@ -91,12 +91,12 @@ public class JSFListModel implements Serializable,List<SelectItem> {
|
|||
} catch (VascException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
for (VascSelectItem v:items) {
|
||||
for (VascBackendSelectItem v:items) {
|
||||
selectItems.add(convert(v));
|
||||
}
|
||||
}
|
||||
|
||||
private SelectItem convert(VascSelectItem v) {
|
||||
private SelectItem convert(VascBackendSelectItem v) {
|
||||
SelectItem si = new SelectItem();
|
||||
si.setLabel(v.getLabel());
|
||||
si.setValue(v.getValue());
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue