2
0
Fork 0

Split backend to backend api.

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

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

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;

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

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";