2
0
Fork 0

Moved all data objects to Serializable and some generics bits.

This commit is contained in:
Willem Cazander 2014-05-28 15:15:12 +02:00
parent 1b3e65fa83
commit 3bf185ad48
73 changed files with 228 additions and 181 deletions

View file

@ -22,6 +22,7 @@
package net.forwardfire.vasc.frontend.swt;
import java.io.Serializable;
import java.util.List;
import net.forwardfire.vasc.core.VascEntry;
@ -125,7 +126,7 @@ public class SwtActionPanel implements VascEntryFrontendEventListener {
return result;
}
public void vascEvent(VascEntry entry,Object dataNotUsed) {
public void vascEvent(VascEntry entry,Serializable dataNotUsed) {
vascEvent = true;
long pageSize = entry.getVascFrontendController().getVascFrontendPageInfo().getPageSize();

View file

@ -22,6 +22,7 @@
package net.forwardfire.vasc.frontend.swt;
import java.io.Serializable;
import java.util.List;
import net.forwardfire.vasc.core.VascEntry;
@ -76,7 +77,7 @@ public class SwtPagerPanel implements VascEntryFrontendEventListener {
return result;
}
public void vascEvent(VascEntry entry,Object dataNotUsed) {
public void vascEvent(VascEntry entry,Serializable dataNotUsed) {
}
}

View file

@ -22,6 +22,8 @@
package net.forwardfire.vasc.frontend.swt;
import java.io.Serializable;
import net.forwardfire.vasc.backend.VascBackendException;
import net.forwardfire.vasc.core.VascEntry;
import net.forwardfire.vasc.core.VascEntryField;
@ -125,7 +127,7 @@ public class SwtVascEditDialog extends Dialog {
}
String name = null;
try {
Object bean = entry.getVascFrontendController().getVascEntryState().getEntryDataObject();
Serializable bean = entry.getVascFrontendController().getVascEntryState().getEntryDataObject();
name = dis.getVascEntryFieldValue().getDisplayValue(dis.getBackendName(), bean);
} catch (VascBackendException e) {
throw new RuntimeException("Could not display value from "+entry.getId(),e);
@ -156,7 +158,7 @@ public class SwtVascEditDialog extends Dialog {
public void createBody(Composite body) throws VascException {
body.setLayout(new GridLayout(2, true));
body.setLayoutData(new GridData(GridData.FILL_BOTH));
Object bean = entry.getVascFrontendController().getVascEntryState().getEntryDataObject();
Serializable bean = entry.getVascFrontendController().getVascEntryState().getEntryDataObject();
entry.getVascFrontendController().clearFieldRenderObjects(); // only needed for swt use

View file

@ -478,7 +478,7 @@ public class SwtVascFrontend extends AbstractVascFrontend {
VascFrontendEventType[] result = {VascEntryFrontendEventListener.VascFrontendEventType.POST_READ};
return result;
}
public void vascEvent(VascEntry entry,Object data) {
public void vascEvent(VascEntry entry,Serializable data) {
tableViewer.refresh();
table2.deselectAll();
}
@ -638,7 +638,7 @@ public class SwtVascFrontend extends AbstractVascFrontend {
//if (vtc.getVascColumnRenderer()==null) {
try {
return vtc.getVascEntryFieldValue().getDisplayValue(vtc.getBackendName(),bean);
return vtc.getVascEntryFieldValue().getDisplayValue(vtc.getBackendName(),(Serializable) bean);
} catch (Exception e) {
logger.log(Level.WARNING,"Error in get value: '"+vtc.getVascEntryFieldValue()+"' error: "+e.getMessage(),e);
return "Err";

View file

@ -22,6 +22,8 @@
package net.forwardfire.vasc.frontend.swt.ui;
import java.io.Serializable;
import net.forwardfire.vasc.core.VascEntry;
import net.forwardfire.vasc.core.VascEntryField;
import net.forwardfire.vasc.core.ui.VascUIComponent;
@ -72,7 +74,7 @@ public class SwtText implements VascUIComponent {
}
public void modifyText(ModifyEvent e) {
Object value = text.getText();
Serializable value = text.getText();
try {
model.setValue(value);
} catch (VascException ve) {

View file

@ -22,6 +22,8 @@
package net.forwardfire.vasc.frontend.swt.ui;
import java.io.Serializable;
import net.forwardfire.vasc.core.VascEntry;
import net.forwardfire.vasc.core.VascEntryField;
import net.forwardfire.vasc.core.ui.VascUIComponent;
@ -96,7 +98,7 @@ public class SwtTextArea implements VascUIComponent {
}
public void modifyText(ModifyEvent e) {
Object value = text.getText();
Serializable value = text.getText();
try {
model.setValue(value);
} catch (VascException ve) {