ff-attic/imxmi
2
0
Fork 0
Code Activity

Moved all data objects to Serializable and some generics bits.

Browse source
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
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

@ -62,7 +62,7 @@ public class JSFVascEntryEventListener implements VascEntryFrontendEventListener
public void vascEvent(VascEntry entry,Object dataNotUsed) {
public void vascEvent(VascEntry entry,Serializable dataNotUsed) {
/* moved to fillVascEntryFrontend
try {
for (VascEntryField field:entry.getVascEntryFields()) {

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

@ -584,7 +584,7 @@ public class JSFVascEntrySupportBean implements Serializable {
logger.fine("moveAction");
String moveAction = getComponentType(event.getComponent());
JSFVascUIComponent comp = JSFVascUIComponent.findVascParent(event.getComponent());
Object selected = comp.getSupportBean().getSelectedTableRecord().getRecord();
Serializable selected = comp.getSupportBean().getSelectedTableRecord().getRecord();
if ("up".equals(moveAction)) {
entry.getVascFrontendController().getVascFrontendActions().moveUpAction(selected);
}

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

@ -339,7 +339,7 @@ public class JSFVascUIComponent extends UIComponentBase {
// Set parameters
try {
Object selected = getSupportBean().getSelected().getRecord();
Serializable selected = getSupportBean().getSelected().getRecord();
for (String parameterName:link.getEntryParameterFieldIdKeys()) {
String fieldId = link.getEntryParameterFieldId(parameterName);
VascEntryField v = getVascEntry().getVascEntryFieldById(fieldId);
@ -361,7 +361,7 @@ public class JSFVascUIComponent extends UIComponentBase {
for (String fieldId:link.getEntryCreateFieldValueKeys()) {
String selectedfieldId = link.getEntryParameterFieldId(fieldId);
Object selectedValue = selected;
Serializable selectedValue = selected;
if (selectedfieldId!=null) {
VascEntryField v = getVascEntry().getVascEntryFieldById(selectedfieldId);
selectedValue = v.getVascEntryFieldValue().getValue(v.getBackendName(), selected);
@ -385,8 +385,8 @@ public class JSFVascUIComponent extends UIComponentBase {
class CreateEntryFieldValuesListener2 implements VascEntryFrontendEventListener {
private static final long serialVersionUID = 1L;
private String fieldId = null;
private Object value = null;
public CreateEntryFieldValuesListener2(String fieldId,Object value) {
private Serializable value = null;
public CreateEntryFieldValuesListener2(String fieldId,Serializable value) {
if (fieldId==null) {
throw new NullPointerException("fieldId may not be null");
}
@ -397,7 +397,7 @@ public class JSFVascUIComponent extends UIComponentBase {
VascFrontendEventType[] result = {VascEntryFrontendEventListener.VascFrontendEventType.PRE_CREATE};
return result;
}
public void vascEvent(VascEntry entry,Object data) {
public void vascEvent(VascEntry entry,Serializable data) {
VascEntryField field = entry.getVascEntryFieldById(fieldId);
try {
field.getVascEntryFieldValue().setValue(field.getBackendName(), data, value);

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

@ -346,7 +346,7 @@ public class JSFVascUIComponentRenderer extends Renderer {
}
public void processValueChange(ValueChangeEvent event) throws AbortProcessingException {
try {
model.setValue(event.getNewValue());
model.setValue((Serializable)event.getNewValue());
} catch (VascException e) {
throw new AbortProcessingException(e);
}

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

@ -92,8 +92,8 @@ public class VascDataBackendBean implements Serializable {
private void setValue(int index,Object valueObject) {
try {
VascEntryField field = getFieldIdByIndex(entry,index);
VascEntryFieldValue value = field.getVascEntryFieldValue();
value.setValue(field.getBackendName(), record,valueObject);
VascEntryFieldValue<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);
}