ff-attic/imxmi
2
0
Fork 0
Code Activity

Split backend to backend api.

Browse source
This commit is contained in:
Willem Cazander 2014-03-02 19:45:22 +01:00
parent 4bd244f4e5
commit a13719f008
116 changed files with 1029 additions and 815 deletions
Download patch file Download diff file Expand all files Collapse all files

2
vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/JSFVascEntryEventListener.java
View file

@ -90,6 +90,6 @@ public class JSFVascEntryEventListener implements VascEntryFrontendEventListener
ValueExpression ve2 = FacesContext.getCurrentInstance().getApplication().getExpressionFactory().createValueExpression(FacesContext.getCurrentInstance().getELContext(), "#{"+entrySupportVar+".tableDataModel.wrappedData}", Object.class);
ve2.setValue(FacesContext.getCurrentInstance().getELContext(), result);
ValueExpression ve3 = FacesContext.getCurrentInstance().getApplication().getExpressionFactory().createValueExpression(FacesContext.getCurrentInstance().getELContext(), "#{"+entrySupportVar+".tablePagesDataModel.wrappedData}", Object.class);
ve3.setValue(FacesContext.getCurrentInstance().getELContext(), entry.getVascFrontendController().getVascFrontendPager().getTablePagesFromBackend());
ve3.setValue(FacesContext.getCurrentInstance().getELContext(), entry.getVascFrontendController().getVascFrontendPageInfo().getTablePagesFromBackend());
}
}

32
vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/JSFVascEntrySupportBean.java
View file

@ -49,7 +49,6 @@ import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import net.forwardfire.vasc.backend.VascBackend;
import net.forwardfire.vasc.backend.VascBackendPageNumber;
import net.forwardfire.vasc.core.VascEntry;
import net.forwardfire.vasc.core.VascEntryField;
import net.forwardfire.vasc.core.VascEntryState;
@ -60,6 +59,7 @@ import net.forwardfire.vasc.core.actions.GlobalVascAction;
import net.forwardfire.vasc.core.actions.RowVascAction;
import net.forwardfire.vasc.core.entry.VascEntryExport;
import net.forwardfire.vasc.core.entry.VascEntryExportWriter;
import net.forwardfire.vasc.frontend.VascFrontendPageInfoNumber;
import net.forwardfire.vasc.frontend.VascFrontendException;
import net.forwardfire.vasc.impl.actions.AddRowAction;
import net.forwardfire.vasc.impl.actions.DeleteRowAction;
@ -198,14 +198,14 @@ public class JSFVascEntrySupportBean implements Serializable {
public long getPageTotalRecordCount() {
return entry.getVascFrontendController().getVascFrontendPager().getPageTotalRecordCount();
return entry.getVascFrontendController().getVascFrontendPageInfo().getPageTotalRecordCount();
}
public long getPageStartCount() {
return entry.getVascFrontendController().getVascFrontendPager().getPageStartCount();
return entry.getVascFrontendController().getVascFrontendPageInfo().getPageStartCount();
}
public long getPageStopCount() {
return entry.getVascFrontendController().getVascFrontendPager().getPageStopCount();
return entry.getVascFrontendController().getVascFrontendPageInfo().getPageStopCount();
}
public List<SelectItem> getGlobalExportItems() {
@ -237,7 +237,7 @@ public class JSFVascEntrySupportBean implements Serializable {
int pageSize = getVascEntry().getVascFrontendController().getVascEntryState().getVascBackendState().getPageSize();
for (int i=0;i<getTablePagesDataModel().getRowCount();i++) {
getTablePagesDataModel().setRowIndex(i);
VascBackendPageNumber page = (VascBackendPageNumber)getTablePagesDataModel().getRowData();
VascFrontendPageInfoNumber page = (VascFrontendPageInfoNumber)getTablePagesDataModel().getRowData();
s = new SelectItem();
String name = i18nMap.get("generic.vasc.jsf.table.page.name");
String description = i18nMap.get("generic.vasc.jsf.table.page.description");
@ -251,27 +251,27 @@ public class JSFVascEntrySupportBean implements Serializable {
}
public boolean getHasOnlySinglePage() {
return entry.getVascFrontendController().getVascFrontendPager().getHasOnlySinglePage();
return entry.getVascFrontendController().getVascFrontendPageInfo().getHasOnlySinglePage();
}
public boolean getHasExtendedPageMode() {
return entry.getVascFrontendController().getVascFrontendPager().getHasExtendedPageMode();
return entry.getVascFrontendController().getVascFrontendPageInfo().getHasExtendedPageMode();
}
public boolean getHasExtendedPageModeCenter() {
return entry.getVascFrontendController().getVascFrontendPager().getHasExtendedPageModeCenter();
return entry.getVascFrontendController().getVascFrontendPageInfo().getHasExtendedPageModeCenter();
}
public List<VascBackendPageNumber> getTablePagesExtendedBegin() {
return entry.getVascFrontendController().getVascFrontendPager().getTablePagesExtendedBegin();
public List<VascFrontendPageInfoNumber> getTablePagesExtendedBegin() {
return entry.getVascFrontendController().getVascFrontendPageInfo().getTablePagesExtendedBegin();
}
public List<VascBackendPageNumber> getTablePagesExtendedEnd() {
return entry.getVascFrontendController().getVascFrontendPager().getTablePagesExtendedEnd();
public List<VascFrontendPageInfoNumber> getTablePagesExtendedEnd() {
return entry.getVascFrontendController().getVascFrontendPageInfo().getTablePagesExtendedEnd();
}
public List<VascBackendPageNumber> getTablePagesExtendedCenter() {
return entry.getVascFrontendController().getVascFrontendPager().getTablePagesExtendedCenter();
public List<VascFrontendPageInfoNumber> getTablePagesExtendedCenter() {
return entry.getVascFrontendController().getVascFrontendPageInfo().getTablePagesExtendedCenter();
}
private String getComponentType(UIComponent comp) {
@ -507,11 +507,11 @@ public class JSFVascEntrySupportBean implements Serializable {
}
public boolean getHasPageNextAction() {
return entry.getVascFrontendController().getVascFrontendPager().getHasPageNextAction();
return entry.getVascFrontendController().getVascFrontendPageInfo().getHasPageNextAction();
}
public boolean getHasPagePreviousAction() {
return entry.getVascFrontendController().getVascFrontendPager().getHasPagePreviousAction();
return entry.getVascFrontendController().getVascFrontendPageInfo().getHasPagePreviousAction();
}

9
vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/JSFVascUIComponent.java
View file

@ -33,6 +33,7 @@ import javax.faces.component.UIComponent;
import javax.faces.component.UIComponentBase;
import javax.faces.context.FacesContext;
import net.forwardfire.vasc.backend.VascBackendException;
import net.forwardfire.vasc.core.VascController;
import net.forwardfire.vasc.core.VascEntry;
import net.forwardfire.vasc.core.VascEntryField;
@ -349,7 +350,7 @@ public class JSFVascUIComponent extends UIComponentBase {
logger.warning("Could not get VascEntryFieldValue for fieldID: "+fieldId);
continue;
}
Object selectedValue = v.getVascEntryFieldValue().getValue(v, selected);
Object selectedValue = v.getVascEntryFieldValue().getValue(v.getBackendName(), selected);
// set data parameter on new vasc entry
//was; entry.getVascFrontendController().getVascEntryState().getVascBackendState().setDataParameter(parameterName, selectedValue);
@ -362,7 +363,7 @@ public class JSFVascUIComponent extends UIComponentBase {
Object selectedValue = selected;
if (selectedfieldId!=null) {
VascEntryField v = getVascEntry().getVascEntryFieldById(selectedfieldId);
selectedValue = v.getVascEntryFieldValue().getValue(v, selected);
selectedValue = v.getVascEntryFieldValue().getValue(v.getBackendName(), selected);
}
// create listener for new objects
@ -398,8 +399,8 @@ public class JSFVascUIComponent extends UIComponentBase {
public void vascEvent(VascEntry entry,Object data) {
VascEntryField field = entry.getVascEntryFieldById(fieldId);
try {
field.getVascEntryFieldValue().setValue(field, data, value);
} catch (VascException e) {
field.getVascEntryFieldValue().setValue(field.getBackendName(), data, value);
} catch (VascBackendException e) {
throw new VascFrontendException(e);
}
}

13
vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/VascDataBackendBean.java
View file

@ -25,9 +25,10 @@ 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.core.VascEntry;
import net.forwardfire.vasc.core.VascEntryField;
import net.forwardfire.vasc.core.entry.VascEntryFieldValue;
import net.forwardfire.vasc.core.VascException;
import net.forwardfire.vasc.frontend.VascFrontendDataSelector.EntryFieldSelectType;
@ -83,10 +84,10 @@ public class VascDataBackendBean implements Serializable {
VascEntryField field = getFieldIdByIndex(entry,index);
VascEntryFieldValue value = field.getVascEntryFieldValue();
if (isRealValue()) {
return value.getValue(field, record);
return value.getValue(field.getBackendName(), record);
}
return value.getDisplayValue(field, record);
} catch (VascException e) {
return value.getDisplayValue(field.getBackendName(), record);
} catch (Exception e) {
return "Error: "+e.getMessage();
}
}
@ -95,8 +96,8 @@ public class VascDataBackendBean implements Serializable {
try {
VascEntryField field = getFieldIdByIndex(entry,index);
VascEntryFieldValue value = field.getVascEntryFieldValue();
value.setValue(field, record,valueObject);
} catch (VascException e) {
value.setValue(field.getBackendName(), record,valueObject);
} catch (VascBackendException e) {
throw new RuntimeException("Could not set value on record.",e);
}
}