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

14
vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontend/swing/SwingActionPanel.java
View file

@ -34,11 +34,11 @@ import javax.swing.JPanel;
import javax.swing.JTextField;
import javax.swing.ListCellRenderer;
import net.forwardfire.vasc.backend.VascBackendPageNumber;
import net.forwardfire.vasc.core.VascEntry;
import net.forwardfire.vasc.core.VascException;
import net.forwardfire.vasc.core.actions.GlobalVascAction;
import net.forwardfire.vasc.core.entry.VascEntryFrontendEventListener;
import net.forwardfire.vasc.frontend.VascFrontendPageInfoNumber;
import net.forwardfire.vasc.frontend.VascFrontendException;
/**
@ -162,10 +162,10 @@ public class SwingActionPanel extends JPanel implements VascEntryFrontendEventLi
init = true;
long pageSize = entry.getVascFrontendController().getVascFrontendPager().getPageSize();
long pageStart = entry.getVascFrontendController().getVascFrontendPager().getPageStartCount();
long pageStop = entry.getVascFrontendController().getVascFrontendPager().getPageStopCount();
long pageTotalCount = entry.getVascFrontendController().getVascFrontendPager().getPageTotalRecordCount();
long pageSize = entry.getVascFrontendController().getVascFrontendPageInfo().getPageSize();
long pageStart = entry.getVascFrontendController().getVascFrontendPageInfo().getPageStartCount();
long pageStop = entry.getVascFrontendController().getVascFrontendPageInfo().getPageStopCount();
long pageTotalCount = entry.getVascFrontendController().getVascFrontendPageInfo().getPageTotalRecordCount();
String format = "Results %1$d-%2$d from %3$d rows";
resultLabel.setText(String.format(format, pageStart, pageStop, pageTotalCount));
rowNumberField.setText(""+pageSize);
@ -173,9 +173,9 @@ public class SwingActionPanel extends JPanel implements VascEntryFrontendEventLi
gotoDirectPage.removeAllItems();
gotoDirectPage.addItem("Goto...");
List<VascBackendPageNumber> pages = vascEntry.getVascFrontendController().getVascFrontendPager().getTablePagesFromBackend();
List<VascFrontendPageInfoNumber> pages = vascEntry.getVascFrontendController().getVascFrontendPageInfo().getTablePagesFromBackend();
int i=0;
for (VascBackendPageNumber page:pages) {
for (VascFrontendPageInfoNumber page:pages) {
//pages.setRowIndex(i);
//VascBackendPageNumber page = (VascBackendPageNumber)getTablePagesDataModel().getRowData();
// = new SelectItem();

34
vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontend/swing/SwingPagerPanel.java
View file

@ -31,9 +31,9 @@ import javax.swing.JButton;
import javax.swing.JLabel;
import javax.swing.JPanel;
import net.forwardfire.vasc.backend.VascBackendPageNumber;
import net.forwardfire.vasc.core.VascEntry;
import net.forwardfire.vasc.core.entry.VascEntryFrontendEventListener;
import net.forwardfire.vasc.frontend.VascFrontendPageInfoNumber;
/**
* SwingPagerPanel renders dynamic pager for swing.
@ -70,11 +70,11 @@ public class SwingPagerPanel extends JPanel implements VascEntryFrontendEventLis
public void actionPerformed(ActionEvent e) {
int pageIndex = vascEntry.getVascFrontendController().getVascEntryState().getVascBackendState().getPageIndex();
if (next) {
if (vascEntry.getVascFrontendController().getVascFrontendPager().getHasPageNextAction()) {
if (vascEntry.getVascFrontendController().getVascFrontendPageInfo().getHasPageNextAction()) {
vascEntry.getVascFrontendController().getVascFrontendActions().pageAction(pageIndex+1);
}
} else {
if (vascEntry.getVascFrontendController().getVascFrontendPager().getHasPagePreviousAction()) {
if (vascEntry.getVascFrontendController().getVascFrontendPageInfo().getHasPagePreviousAction()) {
vascEntry.getVascFrontendController().getVascFrontendActions().pageAction(pageIndex-1);
}
}
@ -91,13 +91,13 @@ public class SwingPagerPanel extends JPanel implements VascEntryFrontendEventLis
result.removeAll();
if (entry.getVascFrontendController().getVascFrontendPager().getHasExtendedPageMode()) {
if (entry.getVascFrontendController().getVascFrontendPageInfo().getHasExtendedPageMode()) {
JButton prev = new JButton("Previous");
prev.addActionListener(new NextAction(false));
prev.setEnabled(entry.getVascFrontendController().getVascFrontendPager().getHasPagePreviousAction());
prev.setEnabled(entry.getVascFrontendController().getVascFrontendPageInfo().getHasPagePreviousAction());
result.add(prev);
List<VascBackendPageNumber> pages = entry.getVascFrontendController().getVascFrontendPager().getTablePagesExtendedBegin();
for(VascBackendPageNumber page:pages) {
List<VascFrontendPageInfoNumber> pages = entry.getVascFrontendController().getVascFrontendPageInfo().getTablePagesExtendedBegin();
for(VascFrontendPageInfoNumber page:pages) {
JButton but = new JButton(""+page.getPageNumber());
but.addActionListener(this);
if (page.getSelected()!=null && page.getSelected()) {
@ -106,9 +106,9 @@ public class SwingPagerPanel extends JPanel implements VascEntryFrontendEventLis
result.add(but);
}
result.add(new JLabel("..."));
if (entry.getVascFrontendController().getVascFrontendPager().getHasExtendedPageModeCenter()) {
pages = entry.getVascFrontendController().getVascFrontendPager().getTablePagesExtendedCenter();
for(VascBackendPageNumber page:pages) {
if (entry.getVascFrontendController().getVascFrontendPageInfo().getHasExtendedPageModeCenter()) {
pages = entry.getVascFrontendController().getVascFrontendPageInfo().getTablePagesExtendedCenter();
for(VascFrontendPageInfoNumber page:pages) {
JButton but = new JButton(""+page.getPageNumber());
but.addActionListener(this);
if (page.getSelected()!=null && page.getSelected()) {
@ -118,8 +118,8 @@ public class SwingPagerPanel extends JPanel implements VascEntryFrontendEventLis
}
result.add(new JLabel("..."));
}
pages = entry.getVascFrontendController().getVascFrontendPager().getTablePagesExtendedEnd();
for(VascBackendPageNumber page:pages) {
pages = entry.getVascFrontendController().getVascFrontendPageInfo().getTablePagesExtendedEnd();
for(VascFrontendPageInfoNumber page:pages) {
JButton but = new JButton(""+page.getPageNumber());
but.addActionListener(this);
if (page.getSelected()!=null && page.getSelected()) {
@ -128,16 +128,16 @@ public class SwingPagerPanel extends JPanel implements VascEntryFrontendEventLis
result.add(but);
}
JButton next = new JButton("Next");
next.setEnabled(entry.getVascFrontendController().getVascFrontendPager().getHasPageNextAction());
next.setEnabled(entry.getVascFrontendController().getVascFrontendPageInfo().getHasPageNextAction());
next.addActionListener(new NextAction(true));
result.add(next);
} else {
JButton prev = new JButton("Previous");
prev.addActionListener(new NextAction(false));
prev.setEnabled(entry.getVascFrontendController().getVascFrontendPager().getHasPagePreviousAction());
prev.setEnabled(entry.getVascFrontendController().getVascFrontendPageInfo().getHasPagePreviousAction());
result.add(prev);
List<VascBackendPageNumber> pages = entry.getVascFrontendController().getVascFrontendPager().getTablePagesNormal();
for(VascBackendPageNumber page:pages) {
List<VascFrontendPageInfoNumber> pages = entry.getVascFrontendController().getVascFrontendPageInfo().getTablePagesNormal();
for(VascFrontendPageInfoNumber page:pages) {
JButton but = new JButton(""+page.getPageNumber());
but.addActionListener(this);
if (page.getSelected()!=null && page.getSelected()) {
@ -146,7 +146,7 @@ public class SwingPagerPanel extends JPanel implements VascEntryFrontendEventLis
result.add(but);
}
JButton next = new JButton("Next");
next.setEnabled(entry.getVascFrontendController().getVascFrontendPager().getHasPageNextAction());
next.setEnabled(entry.getVascFrontendController().getVascFrontendPageInfo().getHasPageNextAction());
next.addActionListener(new NextAction(true));
result.add(next);
}

11
vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontend/swing/SwingVascEditDialog.java
View file

@ -34,6 +34,7 @@ import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.SpringLayout;
import net.forwardfire.vasc.backend.VascBackendException;
import net.forwardfire.vasc.core.VascController;
import net.forwardfire.vasc.core.VascEntry;
import net.forwardfire.vasc.core.VascEntryField;
@ -115,7 +116,7 @@ public class SwingVascEditDialog extends JPanel {
//System.out.println("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
ee.getVascFrontendController().getVascEntryState().getVascBackendState().setDataParameter(parameterName, selectedValue);
@ -127,7 +128,7 @@ public class SwingVascEditDialog extends JPanel {
Object selectedValue = selected;
if (selectedfieldId!=null) {
VascEntryField v = ee.getVascEntryFieldById(selectedfieldId);
selectedValue = v.getVascEntryFieldValue().getValue(v, selected);
selectedValue = v.getVascEntryFieldValue().getValue(v.getBackendName(), selected);
}
// create listener for new objects
@ -172,7 +173,11 @@ public class SwingVascEditDialog extends JPanel {
VascUIComponent editor = c.getVascEntryFieldType().provideEditorUIComponent(i,c);
model = new VascValueModel(c.getVascEntryFieldType().provideEditorVascValueModel(i,c));
model.setValue(c.getVascEntryFieldValue().getValue(c, bean));
try {
model.setValue(c.getVascEntryFieldValue().getValue(c.getBackendName(), bean));
} catch (VascBackendException e) {
throw new VascException(e);
}
model.addListener(new VascColumnValueModelListener(c,bean));
Object g = editor.createComponent(entry,c,model,body);

12
vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontend/swing/SwingVascFrontend.java
View file

@ -61,6 +61,7 @@ import javax.swing.table.TableCellRenderer;
import javax.swing.table.TableColumn;
import javax.swing.table.TableColumnModel;
import net.forwardfire.vasc.backend.VascBackendException;
import net.forwardfire.vasc.core.VascEntryField;
import net.forwardfire.vasc.core.VascEntryListOption;
import net.forwardfire.vasc.core.actions.GlobalVascAction;
@ -71,7 +72,6 @@ import net.forwardfire.vasc.core.ui.VascOptionValueModelListener;
import net.forwardfire.vasc.core.ui.VascUIComponent;
import net.forwardfire.vasc.core.ui.VascValueModel;
import net.forwardfire.vasc.core.VascException;
import net.forwardfire.vasc.frontend.AbstractVascFrontend;
import net.forwardfire.vasc.frontend.VascFrontendController;
import net.forwardfire.vasc.frontend.VascFrontendException;
@ -161,7 +161,7 @@ public class SwingVascFrontend extends AbstractVascFrontend {
if (entry.getDisplayNameFieldId()!=null) {
VascEntryField v = entry.getVascEntryFieldById(entry.getDisplayNameFieldId());
Object vv = v.getVascEntryFieldValue().getValue(v, rowBean);
Object vv = v.getVascEntryFieldValue().getValue(v.getBackendName(), rowBean);
if (vv==null) {
beanValue="";
} else {
@ -177,7 +177,9 @@ public class SwingVascFrontend extends AbstractVascFrontend {
entry.getVascFrontendController().getVascFrontendHelper().editReadOnlyUIComponents(entry);
panels.openVascView(editPanel,entry);
} catch (VascBackendException ve) {
throw new VascFrontendException(ve);
} catch (VascException ve) {
throw new VascFrontendException(ve);
}
@ -189,11 +191,11 @@ public class SwingVascFrontend extends AbstractVascFrontend {
try {
VascEntryField v = entry.getVascEntryFieldById(entry.getDisplayNameFieldId());
beanValue = ""+v.getVascEntryFieldValue().getValue(v, rowBean);
beanValue = ""+v.getVascEntryFieldValue().getValue(v.getBackendName(), rowBean);
if (beanValue.length()>30) {
beanValue=beanValue.substring(0, 30);
}
} catch (VascException ve) {
} catch (VascBackendException ve) {
throw new VascFrontendException(ve);
}

2
vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontend/swing/SwingVascTableModel.java
View file

@ -96,7 +96,7 @@ public class SwingVascTableModel extends AbstractTableModel implements VascEntry
//if (vtc.getVascColumnRenderer()!=null) {
// return vtc.getVascColumnRenderer().rendererColumn(vtc,bean);
//} else {
return ""+vtc.getVascEntryFieldValue().getValue(vtc,bean);
return ""+vtc.getVascEntryFieldValue().getValue(vtc.getBackendName(),bean);
// }
} catch (Exception e) {
return "Error";

14
vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontend/swt/SwtActionPanel.java
View file

@ -24,11 +24,11 @@ package net.forwardfire.vasc.frontend.swt;
import java.util.List;
import net.forwardfire.vasc.backend.VascBackendPageNumber;
import net.forwardfire.vasc.core.VascEntry;
import net.forwardfire.vasc.core.actions.GlobalVascAction;
import net.forwardfire.vasc.core.entry.VascEntryFrontendEventListener;
import net.forwardfire.vasc.core.ui.VascSelectItem;
import net.forwardfire.vasc.frontend.VascFrontendPageInfoNumber;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
@ -128,10 +128,10 @@ public class SwtActionPanel implements VascEntryFrontendEventListener {
public void vascEvent(VascEntry entry,Object dataNotUsed) {
vascEvent = true;
long pageSize = entry.getVascFrontendController().getVascFrontendPager().getPageSize();
long pageStart = entry.getVascFrontendController().getVascFrontendPager().getPageStartCount();
long pageStop = entry.getVascFrontendController().getVascFrontendPager().getPageStopCount();
long pageTotalCount = entry.getVascFrontendController().getVascFrontendPager().getPageTotalRecordCount();
long pageSize = entry.getVascFrontendController().getVascFrontendPageInfo().getPageSize();
long pageStart = entry.getVascFrontendController().getVascFrontendPageInfo().getPageStartCount();
long pageStop = entry.getVascFrontendController().getVascFrontendPageInfo().getPageStopCount();
long pageTotalCount = entry.getVascFrontendController().getVascFrontendPageInfo().getPageTotalRecordCount();
String format = "Results %1$d-%2$d from %3$d rows";
resultLabel.setText(String.format(format, pageStart, pageStop, pageTotalCount));
resultLabel.redraw();
@ -140,9 +140,9 @@ public class SwtActionPanel implements VascEntryFrontendEventListener {
pageBox.removeAll();
pageBox.add("Goto...");
List<VascBackendPageNumber> pages = entry.getVascFrontendController().getVascFrontendPager().getTablePagesFromBackend();
List<VascFrontendPageInfoNumber> pages = entry.getVascFrontendController().getVascFrontendPageInfo().getTablePagesFromBackend();
int i=0;
for (VascBackendPageNumber page:pages) {
for (VascFrontendPageInfoNumber page:pages) {
pageBox.add("page: "+page.getPageNumber()+" "+(i*pageSize)+"-"+((i*pageSize)+pageSize));
i++;
}

2
vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontend/swt/SwtPagerPanel.java
View file

@ -24,11 +24,11 @@ package net.forwardfire.vasc.frontend.swt;
import java.util.List;
import net.forwardfire.vasc.backend.VascBackendPageNumber;
import net.forwardfire.vasc.core.VascEntry;
import net.forwardfire.vasc.core.actions.GlobalVascAction;
import net.forwardfire.vasc.core.entry.VascEntryFrontendEventListener;
import net.forwardfire.vasc.core.entry.VascEntryFrontendEventListener.VascFrontendEventType;
import net.forwardfire.vasc.frontend.VascFrontendPageInfoNumber;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;

11
vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontend/swt/SwtVascEditDialog.java
View file

@ -22,6 +22,7 @@
package net.forwardfire.vasc.frontend.swt;
import net.forwardfire.vasc.backend.VascBackendException;
import net.forwardfire.vasc.core.VascEntry;
import net.forwardfire.vasc.core.VascEntryField;
import net.forwardfire.vasc.core.ui.VascColumnValueModelListener;
@ -125,8 +126,8 @@ public class SwtVascEditDialog extends Dialog {
String name = null;
try {
Object bean = entry.getVascFrontendController().getVascEntryState().getEntryDataObject();
name = dis.getVascEntryFieldValue().getDisplayValue(dis, bean);
} catch (VascException e) {
name = dis.getVascEntryFieldValue().getDisplayValue(dis.getBackendName(), bean);
} catch (VascBackendException e) {
throw new RuntimeException("Could not display value from "+entry.getId(),e);
}
@ -174,7 +175,11 @@ public class SwtVascEditDialog extends Dialog {
VascUIComponent editor = c.getVascEntryFieldType().provideEditorUIComponent(i,c);
model = new VascValueModel(c.getVascEntryFieldType().provideEditorVascValueModel(i,c));
model.setValue(c.getVascEntryFieldValue().getValue(c, bean));
try {
model.setValue(c.getVascEntryFieldValue().getValue(c.getBackendName(), bean));
} catch (VascBackendException e) {
throw new VascException(e);
}
model.addListener(new VascColumnValueModelListener(c,bean));
Control edit = (Control )editor.createComponent(entry,c,model,body);

3
vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontend/swt/SwtVascFrontend.java
View file

@ -28,6 +28,7 @@ import java.io.OutputStream;
import java.util.logging.Level;
import java.util.logging.Logger;
import net.forwardfire.vasc.backend.VascBackendException;
import net.forwardfire.vasc.core.VascEntry;
import net.forwardfire.vasc.core.VascEntryField;
import net.forwardfire.vasc.core.VascEntryListOption;
@ -636,7 +637,7 @@ public class SwtVascFrontend extends AbstractVascFrontend {
//if (vtc.getVascColumnRenderer()==null) {
try {
return vtc.getVascEntryFieldValue().getDisplayValue(vtc,bean);
return vtc.getVascEntryFieldValue().getDisplayValue(vtc.getBackendName(),bean);
} catch (Exception e) {
logger.log(Level.WARNING,"Error in get value: '"+vtc.getVascEntryFieldValue()+"' error: "+e.getMessage(),e);
return "Err";

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);
}
}