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

4
vasc-core/src/main/java/net/forwardfire/vasc/annotations/VascChoicesSelectItemModel.java
View file

@ -85,10 +85,10 @@ public class VascChoicesSelectItemModel implements VascSelectItemModel,Serializa
name = entry.getVascFrontendController().getVascEntryResourceResolver().getTextValue(key);
}
item.setLabel(name);
Object value = vascChoices.choisesValues()[index];
Serializable value = vascChoices.choisesValues()[index];
if (vascChoices.choisesType().equals(String.class)==false) {
try {
value = vascChoices.choisesType().getConstructor(String.class).newInstance(key);
value = (Serializable) vascChoices.choisesType().getConstructor(String.class).newInstance(key);
} catch (Exception e) {
}
}

2
vasc-core/src/main/java/net/forwardfire/vasc/backend/proxy/AbstractVascBackendProxy.java
View file

@ -148,7 +148,7 @@ abstract public class AbstractVascBackendProxy implements VascBackendProxy {
/**
* @see net.forwardfire.vasc.backend.VascBackend#provideVascEntryFieldValue()
*/
public VascEntryFieldValue provideVascEntryFieldValue() {
public VascEntryFieldValue<Serializable> provideVascEntryFieldValue() {
return backend.provideVascEntryFieldValue();
}

4
vasc-core/src/main/java/net/forwardfire/vasc/backend/proxy/VascBackendProxySearch.java
View file

@ -83,8 +83,8 @@ public class VascBackendProxySearch extends AbstractVascBackendProxy {
List<Serializable> search = new ArrayList<Serializable>(result.size()/4);
for (Serializable record:result) {
for (VascEntryField field:entry.getVascEntryFields()) {
VascEntryFieldValue fieldValue = backend.provideVascEntryFieldValue();
Object value = fieldValue.getValue(field.getBackendName(), record);
VascEntryFieldValue<Serializable> fieldValue = backend.provideVascEntryFieldValue();
Serializable value = fieldValue.getValue(field.getBackendName(), record);
if (value==null) {
continue; // can't search null values.
}

6
vasc-core/src/main/java/net/forwardfire/vasc/backend/proxy/VascBackendProxySort.java
View file

@ -80,10 +80,10 @@ public class VascBackendProxySort extends AbstractVascBackendProxy {
return result;
}
final VascEntryField field = getVascEntryFieldByBackendName(state.getSortField());
final VascEntryFieldValue fieldValue = backend.provideVascEntryFieldValue();
Collections.sort(result, new Comparator<Object>() {
final VascEntryFieldValue<Serializable> fieldValue = backend.provideVascEntryFieldValue();
Collections.sort(result, new Comparator<Serializable>() {
@SuppressWarnings("rawtypes")
public int compare(Object o1, Object o2) {
public int compare(Serializable o1, Serializable o2) {
try {
Comparable c1 = null;
Comparable c2 = null;

13
vasc-core/src/main/java/net/forwardfire/vasc/core/AbstractVascEntryFieldLocal.java
View file

@ -22,6 +22,7 @@
package net.forwardfire.vasc.core;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
@ -42,9 +43,9 @@ abstract public class AbstractVascEntryFieldLocal extends AbstractVascBaseIdRole
private String backendName = null;
private String displayName = null;
private VascEntryFieldType vascEntryFieldType = null;
private VascEntryFieldValue vascEntryFieldValue = null;
private VascEntryFieldValue<Serializable> vascEntryFieldValue = null;
private List<VascValidator> vascValidators = null;
private Object defaultValue = null;
private Serializable defaultValue = null;
private Integer sizeList = null;
private Integer sizeEdit = null;
private String styleList = null;
@ -142,14 +143,14 @@ abstract public class AbstractVascEntryFieldLocal extends AbstractVascBaseIdRole
/**
* @return the vascEntryFieldValue
*/
public VascEntryFieldValue getVascEntryFieldValue() {
public VascEntryFieldValue<Serializable> getVascEntryFieldValue() {
return vascEntryFieldValue;
}
/**
* @param vascEntryFieldValue the vascEntryFieldValue to set
*/
public void setVascEntryFieldValue(VascEntryFieldValue vascEntryFieldValue) {
public void setVascEntryFieldValue(VascEntryFieldValue<Serializable> vascEntryFieldValue) {
this.vascEntryFieldValue = vascEntryFieldValue;
}
@ -178,14 +179,14 @@ abstract public class AbstractVascEntryFieldLocal extends AbstractVascBaseIdRole
/**
* @return the defaultValue
*/
public Object getDefaultValue() {
public Serializable getDefaultValue() {
return defaultValue;
}
/**
* @param defaultValue the defaultValue to set
*/
public void setDefaultValue(Object defaultValue) {
public void setDefaultValue(Serializable defaultValue) {
this.defaultValue = defaultValue;
}

5
vasc-core/src/main/java/net/forwardfire/vasc/core/VascEntryField.java
View file

@ -22,6 +22,7 @@
package net.forwardfire.vasc.core;
import java.io.Serializable;
import java.util.List;
import net.forwardfire.vasc.backend.VascEntryFieldValue;
@ -55,7 +56,7 @@ public interface VascEntryField extends VascBaseIdRoleCrudOrderMeta {
/**
* @return the vascEntryFieldValue
*/
public VascEntryFieldValue getVascEntryFieldValue();
public VascEntryFieldValue<Serializable> getVascEntryFieldValue();
/**
* @return the vascValidators
@ -65,7 +66,7 @@ public interface VascEntryField extends VascBaseIdRoleCrudOrderMeta {
/**
* @return the defaultValue
*/
public Object getDefaultValue();
public Serializable getDefaultValue();
/**
* @return the sizeList

6
vasc-core/src/main/java/net/forwardfire/vasc/core/VascEntryFieldLocal.java
View file

@ -22,6 +22,8 @@
package net.forwardfire.vasc.core;
import java.io.Serializable;
import net.forwardfire.vasc.backend.VascEntryFieldValue;
import net.forwardfire.vasc.core.base.VascBaseIdRoleCrudOrderMetaLocal;
import net.forwardfire.vasc.validators.VascValidator;
@ -53,7 +55,7 @@ public interface VascEntryFieldLocal extends VascEntryField,VascBaseIdRoleCrudOr
/**
* @param vascEntryFieldValue the vascEntryFieldValue to set
*/
public void setVascEntryFieldValue(VascEntryFieldValue vascEntryFieldValue);
public void setVascEntryFieldValue(VascEntryFieldValue<Serializable> vascEntryFieldValue);
/**
* @param vascValidator the vascValidator to add
@ -68,7 +70,7 @@ public interface VascEntryFieldLocal extends VascEntryField,VascBaseIdRoleCrudOr
/**
* @param defaultValue the defaultValue to set
*/
public void setDefaultValue(Object defaultValue);
public void setDefaultValue(Serializable defaultValue);
/**
* @param sizeList the sizeList to set

2
vasc-core/src/main/java/net/forwardfire/vasc/core/entry/VascEntryFrontendEventListener.java
View file

@ -63,5 +63,5 @@ public interface VascEntryFrontendEventListener extends Serializable {
* @param type
* @param data
*/
public void vascEvent(VascEntry entry,Object data);
public void vascEvent(VascEntry entry,Serializable data);
}

10
vasc-core/src/main/java/net/forwardfire/vasc/core/ui/VascColumnValueModelListener.java
View file

@ -22,6 +22,8 @@
package net.forwardfire.vasc.core.ui;
import java.io.Serializable;
import net.forwardfire.vasc.backend.VascBackendException;
import net.forwardfire.vasc.core.VascEntryField;
import net.forwardfire.vasc.core.VascException;
@ -35,12 +37,12 @@ import net.forwardfire.vasc.core.VascException;
public class VascColumnValueModelListener implements VascValueModelListener {
private VascEntryField vascEntryField = null;
private Object bean = null;
private Serializable bean = null;
public VascColumnValueModelListener() {
}
public VascColumnValueModelListener(VascEntryField vascEntryField,Object bean) {
public VascColumnValueModelListener(VascEntryField vascEntryField,Serializable bean) {
setVascEntryField(vascEntryField);
setBean(bean);
}
@ -70,14 +72,14 @@ public class VascColumnValueModelListener implements VascValueModelListener {
/**
* @return the bean
*/
public Object getBean() {
public Serializable getBean() {
return bean;
}
/**
* @param bean the bean to set
*/
public void setBean(Object bean) {
public void setBean(Serializable bean) {
this.bean = bean;
}
}

12
vasc-core/src/main/java/net/forwardfire/vasc/core/ui/VascSelectItem.java
View file

@ -22,6 +22,8 @@
package net.forwardfire.vasc.core.ui;
import java.io.Serializable;
/**
*
* @author Willem Cazander
@ -30,18 +32,18 @@ package net.forwardfire.vasc.core.ui;
public class VascSelectItem {
private String label = null;
private Object value = null;
private Serializable value = null;
private String keyValue = null;
private boolean disabled = false;
public VascSelectItem() {
}
public VascSelectItem(String label,Object value) {
public VascSelectItem(String label,Serializable value) {
setLabel(label);
setValue(value);
}
public VascSelectItem(String label,Object value,String keyValue) {
public VascSelectItem(String label,Serializable value,String keyValue) {
setLabel(label);
setValue(value);
setKeyValue(keyValue);
@ -64,14 +66,14 @@ public class VascSelectItem {
/**
* @return the value
*/
public Object getValue() {
public Serializable getValue() {
return value;
}
/**
* @param value the value to set
*/
public void setValue(Object value) {
public void setValue(Serializable value) {
this.value = value;
}

7
vasc-core/src/main/java/net/forwardfire/vasc/core/ui/VascValueModel.java
View file

@ -22,6 +22,7 @@
package net.forwardfire.vasc.core.ui;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
@ -37,7 +38,7 @@ import net.forwardfire.vasc.core.VascException;
*/
public class VascValueModel {
private Object value = null;
private Serializable value = null;
private List<VascValueModelListener> listeners = null;
private VascValueModel parentModel = null;
@ -49,14 +50,14 @@ public class VascValueModel {
this.parentModel=parentModel;
}
public Object getValue() throws VascException {
public Serializable getValue() throws VascException {
if (parentModel!=null) {
return parentModel.getValue();
}
return value;
}
public void setValue(Object value) throws VascException {
public void setValue(Serializable value) throws VascException {
if (parentModel!=null) {
parentModel.setValue(value);
} else {

6
vasc-core/src/main/java/net/forwardfire/vasc/frontend/VascFrontendActions.java
View file

@ -42,7 +42,7 @@ public interface VascFrontendActions extends VascFrontendEntry {
public void persistObject() throws VascFrontendException;
public Object mergeObject() throws VascFrontendException;
public Serializable mergeObject() throws VascFrontendException;
public void sortAction(VascEntryField field) throws VascFrontendException;
@ -50,7 +50,7 @@ public interface VascFrontendActions extends VascFrontendEntry {
public void pageAction(Integer page) throws VascFrontendException;
public void moveUpAction(Object object) throws VascFrontendException;
public void moveUpAction(Serializable object) throws VascFrontendException;
public void moveDownAction(Object object) throws VascFrontendException;
public void moveDownAction(Serializable object) throws VascFrontendException;
}

3
vasc-core/src/main/java/net/forwardfire/vasc/frontend/VascFrontendController.java
View file

@ -22,6 +22,7 @@
package net.forwardfire.vasc.frontend;
import java.io.Serializable;
import java.util.List;
import net.forwardfire.vasc.core.VascController;
@ -115,7 +116,7 @@ public interface VascFrontendController {
public void initFrontendListeners(VascEntryLocal entry,String frontendType) throws InstantiationException, IllegalAccessException;
public void addVascEntryFrontendEventListener(VascEntryFrontendEventListener listener);
public List<VascEntryFrontendEventListener> getVascEntryFrontendEventListener(VascEntryFrontendEventListener.VascFrontendEventType type);
public void fireVascFrontendEvent(VascEntry entry,VascFrontendEventType type,Object data);
public void fireVascFrontendEvent(VascEntry entry,VascFrontendEventType type,Serializable data);
/**

13
vasc-core/src/main/java/net/forwardfire/vasc/impl/DefaultVascEntryConfigController.java
View file

@ -22,6 +22,7 @@
package net.forwardfire.vasc.impl;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@ -169,8 +170,8 @@ public class DefaultVascEntryConfigController implements VascEntryConfigControll
/**
* @see net.forwardfire.vasc.core.VascEntryConfigController#configVascBackendProxied(net.forwardfire.vasc.core.VascController, net.forwardfire.vasc.core.VascEntry)
*/
public VascBackend configVascBackendProxied(VascController vascController,VascEntry vascEntry) throws VascException {
VascBackend realBackend = vascController.getVascBackendController().getVascBackendById(vascEntry.getBackendId());
public VascBackend<Serializable> configVascBackendProxied(VascController vascController,VascEntry vascEntry) throws VascException {
VascBackend<Serializable> realBackend = vascController.getVascBackendController().getVascBackendById(vascEntry.getBackendId());
if (realBackend==null) {
throw new VascException("Could not find backend: "+vascEntry.getBackendId());
}
@ -180,8 +181,8 @@ public class DefaultVascEntryConfigController implements VascEntryConfigControll
/**
* @see net.forwardfire.vasc.core.VascEntryConfigController#configVascBackendProxied(net.forwardfire.vasc.core.VascController, net.forwardfire.vasc.core.VascEntry, net.forwardfire.vasc.backend.VascBackend)
*/
public VascBackend configVascBackendProxied(VascController vascController,VascEntry vascEntry, VascBackend realBackend) throws VascException {
VascBackend backend = realBackend;
public VascBackend<Serializable> configVascBackendProxied(VascController vascController,VascEntry vascEntry, VascBackend<Serializable> realBackend) throws VascException {
VascBackend<Serializable> backend = realBackend;
for (VascBackendProxy proxy:backendProxies) {
VascBackendProxy proxyClone;
try {
@ -247,14 +248,14 @@ public class DefaultVascEntryConfigController implements VascEntryConfigControll
}
// Add backend to entry
VascBackend backend = vascController.getVascEntryConfigController().configVascBackendProxied(vascController, entry);
VascBackend<Serializable> backend = vascController.getVascEntryConfigController().configVascBackendProxied(vascController, entry);
controller.getVascEntryState().setVascBackend(backend);
controller.getVascEntryState().setVascEntry(entry);
// Fetch all data field value impl for this backend.
for (VascEntryField field:entry.getVascEntryFields()) {
if (field.getVascEntryFieldValue()==null) {
VascEntryFieldValue v = backend.provideVascEntryFieldValue();
VascEntryFieldValue<Serializable> v = backend.provideVascEntryFieldValue();
((VascEntryFieldLocal)field).setVascEntryFieldValue(v);
}
}

2
vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/HibernateValidatorService.java
View file

@ -122,7 +122,7 @@ public class HibernateValidatorService implements VascEntryFieldValidatorService
//do not resolve the property eagerly to allow validator.apply to work wo interpolator
}
@SuppressWarnings("unchecked")
@SuppressWarnings("rawtypes")
public String interpolate(String message, Validator validator, MessageInterpolator defaultInterpolator) {
if ( annotationMessage!=null && annotationMessage.equals( message ) ) {
//short cut

1
vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/config/VascActionsFinalizer.java
View file

@ -23,7 +23,6 @@
package net.forwardfire.vasc.impl.entry.config;
import net.forwardfire.vasc.core.VascController;
import net.forwardfire.vasc.core.VascEntry;
import net.forwardfire.vasc.core.VascEntryConfigFinalizer;
import net.forwardfire.vasc.core.VascEntryLocal;
import net.forwardfire.vasc.core.VascException;

11
vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/config/VascDefaultsFinalizer.java
View file

@ -22,6 +22,7 @@
package net.forwardfire.vasc.impl.entry.config;
import java.io.Serializable;
import java.util.Locale;
import org.x4o.xml.conv.ObjectConverterException;
@ -57,7 +58,7 @@ public class VascDefaultsFinalizer implements VascEntryConfigFinalizer {
}
// Check if backendId is valid
VascBackend back = vascController.getVascBackendController().getVascBackendById( entry.getBackendId() );
VascBackend<Serializable> back = vascController.getVascBackendController().getVascBackendById( entry.getBackendId() );
if (back==null) {
throw new IllegalArgumentException("The VascEntry backend is not found in backends: '"+entry.getBackendId()+"' in entryId: "+id);
}
@ -161,9 +162,9 @@ public class VascDefaultsFinalizer implements VascEntryConfigFinalizer {
if (vef.getDefaultValue()!=null && vef.getDefaultValue() instanceof String) {
if (vef.getVascEntryFieldType().getObjectConverter() != null) {
Object value;
Serializable value;
try {
value = vef.getVascEntryFieldType().getObjectConverter().convertTo(vef.getDefaultValue(), Locale.getDefault());
value = (Serializable) vef.getVascEntryFieldType().getObjectConverter().convertTo(vef.getDefaultValue(), Locale.getDefault());
} catch (ObjectConverterException e) {
throw new VascException(e);
}
@ -237,9 +238,9 @@ public class VascDefaultsFinalizer implements VascEntryConfigFinalizer {
if (vef.getDefaultValue()!=null && vef.getDefaultValue() instanceof String) {
if (vef.getVascEntryFieldType()!=null && vef.getVascEntryFieldType().getObjectConverter() != null) {
Object value;
Serializable value;
try {
value = vef.getVascEntryFieldType().getObjectConverter().convertTo(vef.getDefaultValue(), Locale.getDefault());
value = (Serializable) vef.getVascEntryFieldType().getObjectConverter().convertTo(vef.getDefaultValue(), Locale.getDefault());
} catch (ObjectConverterException e) {
throw new VascException(e);
}

4
vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/config/VascIdCheckFinalizer.java
View file

@ -22,6 +22,8 @@
package net.forwardfire.vasc.impl.entry.config;
import java.io.Serializable;
import net.forwardfire.vasc.backend.VascBackend;
import net.forwardfire.vasc.core.VascController;
import net.forwardfire.vasc.core.VascEntryField;
@ -65,7 +67,7 @@ public class VascIdCheckFinalizer implements VascEntryConfigFinalizer {
}
// Check if backendId is valid
VascBackend back = vascController.getVascBackendController().getVascBackendById( entry.getBackendId() );
VascBackend<Serializable> back = vascController.getVascBackendController().getVascBackendById( entry.getBackendId() );
if (back==null) {
throw new IllegalArgumentException("The VascEntry backend is not found in backends: '"+entry.getBackendId()+"' in entryId: "+id);
}

18
vasc-core/src/main/java/net/forwardfire/vasc/impl/frontend/DefaultVascFrontendActions.java
View file

@ -31,13 +31,11 @@ import net.forwardfire.vasc.backend.VascBackendState;
import net.forwardfire.vasc.backend.proxy.VascProxyFilter;
import net.forwardfire.vasc.core.VascEntry;
import net.forwardfire.vasc.core.VascEntryField;
import net.forwardfire.vasc.core.VascEntryLocal;
import net.forwardfire.vasc.core.entry.VascEntryFrontendEventListener;
import net.forwardfire.vasc.core.VascException;
import net.forwardfire.vasc.frontend.VascFrontendActions;
import net.forwardfire.vasc.frontend.VascFrontendException;
/**
* Default impl of default frontend actions
*
@ -72,11 +70,11 @@ public class DefaultVascFrontendActions implements VascFrontendActions {
continue; // no default value to set.
}
try {
Object value = field.getVascEntryFieldValue().getValue(field.getBackendName(), object);
Serializable value = field.getVascEntryFieldValue().getValue(field.getBackendName(), object);
if (value!=null) {
continue; // value is already set by backend creator.
}
Object defaultValue = field.getDefaultValue();
Serializable defaultValue = field.getDefaultValue();
if (defaultValue instanceof String) {
String def = (String)defaultValue;
if (def.equals("now()")) { // TODO: add default string parsers
@ -93,7 +91,7 @@ public class DefaultVascFrontendActions implements VascFrontendActions {
return object;
}
protected int removeObjectFromDataList(Object object) throws VascBackendException {
protected int removeObjectFromDataList(Serializable object) throws VascBackendException {
int indexOld = entry.getVascFrontendController().getVascEntryState().getEntryDataList().indexOf(object);
if (entry.getVascFrontendController().getVascEntryState().getEntryDataList().remove(object)) {
return indexOld; // java worked well for use
@ -107,7 +105,7 @@ public class DefaultVascFrontendActions implements VascFrontendActions {
// is only null when creating objects
if (idObject!=null) {
int index = 0;
for (Object o:entry.getVascFrontendController().getVascEntryState().getEntryDataList()) {
for (Serializable o:entry.getVascFrontendController().getVascEntryState().getEntryDataList()) {
field = entry.getVascEntryFieldById(entry.getPrimaryKeyFieldId());
Object id = field.getVascEntryFieldValue().getValue(field.getBackendName(), o);
if (idObject.equals(id)) {
@ -137,7 +135,7 @@ public class DefaultVascFrontendActions implements VascFrontendActions {
/**
* @see net.forwardfire.vasc.frontend.VascFrontendActions#mergeObject()
*/
public Object mergeObject() throws VascFrontendException {
public Serializable mergeObject() throws VascFrontendException {
try {
return saveObject(false);
} catch (VascException e) {
@ -145,7 +143,7 @@ public class DefaultVascFrontendActions implements VascFrontendActions {
}
}
protected Object saveObject(boolean persist) throws VascException {
protected Serializable saveObject(boolean persist) throws VascException {
try {
Serializable object = entry.getVascFrontendController().getVascEntryState().getEntryDataObject();
Serializable result = null;
@ -284,7 +282,7 @@ public class DefaultVascFrontendActions implements VascFrontendActions {
entry.getVascFrontendController().getVascFrontend().renderView();
}
public void moveUpAction(Object record) throws VascFrontendException {
public void moveUpAction(Serializable record) throws VascFrontendException {
if (entry.getVascFrontendController().getVascEntryState().getVascBackend().isRecordMoveable()) {
try {
VascEntryField p = entry.getVascEntryFieldById(entry.getPrimaryKeyFieldId());
@ -301,7 +299,7 @@ public class DefaultVascFrontendActions implements VascFrontendActions {
entry.getVascFrontendController().getVascFrontend().renderView();
}
public void moveDownAction(Object record) throws VascFrontendException {
public void moveDownAction(Serializable record) throws VascFrontendException {
if (entry.getVascFrontendController().getVascEntryState().getVascBackend().isRecordMoveable()) {
try {

3
vasc-core/src/main/java/net/forwardfire/vasc/impl/frontend/DefaultVascFrontendController.java
View file

@ -22,6 +22,7 @@
package net.forwardfire.vasc.impl.frontend;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@ -362,7 +363,7 @@ public class DefaultVascFrontendController implements VascFrontendControllerLoca
return list;
}
public void fireVascFrontendEvent(VascEntry entry,VascFrontendEventType type, Object data) {
public void fireVascFrontendEvent(VascEntry entry,VascFrontendEventType type, Serializable data) {
List<VascEntryFrontendEventListener> list = getVascEntryFrontendEventListener(type);
for (VascEntryFrontendEventListener l:list) {
l.vascEvent(entry, data);

2
vasc-core/src/main/java/net/forwardfire/vasc/impl/frontend/DefaultVascFrontendDataSelector.java
View file

@ -31,8 +31,6 @@ import net.forwardfire.vasc.core.VascEntry;
import net.forwardfire.vasc.core.VascEntryField;
import net.forwardfire.vasc.core.actions.VascAction;
import net.forwardfire.vasc.frontend.VascFrontendDataSelector;
import net.forwardfire.vasc.frontend.VascFrontendDataSelector.EntryFieldSelectType;
/**
* DefaultVascFrontendDataSelector orders and filters out vasc data.

11
vasc-core/src/main/java/net/forwardfire/vasc/impl/frontend/DefaultVascFrontendHelper.java
View file

@ -22,6 +22,7 @@
package net.forwardfire.vasc.impl.frontend;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import java.util.logging.Logger;
@ -107,7 +108,7 @@ public class DefaultVascFrontendHelper implements VascFrontendHelper {
return error;
}
Object objectSelected = entry.getVascFrontendController().getVascEntryState().getEntryDataObject();
Serializable objectSelected = entry.getVascFrontendController().getVascEntryState().getEntryDataObject();
try {
Object objectValue = field.getVascEntryFieldValue().getValue(field.getBackendName(), objectSelected);
for (VascEntryFieldValidatorService s:entry.getVascFrontendController().getVascValidatorServices()) {
@ -189,12 +190,12 @@ public class DefaultVascFrontendHelper implements VascFrontendHelper {
}
public String getSelectedDisplayName(VascEntry entry) {
Object row = entry.getVascFrontendController().getVascEntryState().getEntryDataObject();
Serializable row = entry.getVascFrontendController().getVascEntryState().getEntryDataObject();
if (row==null) {
return "no-selection";
}
VascEntryField v = entry.getVascEntryFieldById(entry.getDisplayNameFieldId());
VascEntryFieldValue ve = v.getVascEntryFieldValue();
VascEntryFieldValue<Serializable> ve = v.getVascEntryFieldValue();
String result = "no-data";
try {
result = ve.getDisplayValue(v.getBackendName(), row);
@ -210,12 +211,12 @@ public class DefaultVascFrontendHelper implements VascFrontendHelper {
}
VascEntry parent = entry.getVascFrontendController().getVascEntryState().getParent().getVascEntry();
Object row = entry.getVascFrontendController().getVascEntryState().getParent().getEntryDataObject();
Serializable row = entry.getVascFrontendController().getVascEntryState().getParent().getEntryDataObject();
if (row==null) {
return "no-selection";
}
VascEntryField v = parent.getVascEntryFieldById(parent.getDisplayNameFieldId());
VascEntryFieldValue ve = v.getVascEntryFieldValue();
VascEntryFieldValue<Serializable> ve = v.getVascEntryFieldValue();
String result = "no-data";
try {
result = ve.getDisplayValue(v.getBackendName(), row);

3
vasc-core/src/main/java/net/forwardfire/vasc/impl/frontend/DefaultVascFrontendPager.java
View file

@ -22,6 +22,7 @@
package net.forwardfire.vasc.impl.frontend;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
@ -56,7 +57,7 @@ public class DefaultVascFrontendPager implements VascFrontendPageInfo {
VascFrontendEventType[] result = {VascEntryFrontendEventListener.VascFrontendEventType.POST_READ};
return result;
}
public void vascEvent(VascEntry entry, Object data) {
public void vascEvent(VascEntry entry, Serializable data) {
pagesAll = getTablePagesFromBackend();
}
}

3
vasc-core/src/main/java/net/forwardfire/vasc/impl/jndi/JndiVascControllerFactory.java
View file

@ -22,6 +22,7 @@
package net.forwardfire.vasc.impl.jndi;
import java.io.Serializable;
import java.util.Enumeration;
import java.util.Hashtable;
import java.util.List;
@ -126,7 +127,7 @@ public class JndiVascControllerFactory implements ObjectFactory {
public List<String> getVascBackendIds() {
return backendController.getVascBackendIds();
}
public VascBackend getVascBackendById(String id) {
public VascBackend<Serializable> getVascBackendById(String id) {
return backendController.getVascBackendById(id);
}
});

9
vasc-core/src/main/java/net/forwardfire/vasc/impl/type/MultiTextVascEntryFieldType.java
View file

@ -22,6 +22,7 @@
package net.forwardfire.vasc.impl.type;
import java.io.Serializable;
import java.util.List;
import net.forwardfire.vasc.core.VascEntryField;
@ -139,8 +140,8 @@ public class MultiTextVascEntryFieldType extends DefaultVascEntryFieldType {
}
}
class MultiVascValueModel extends VascValueModel {
public Object getValue() throws VascException {
Object value = super.getValue();
public Serializable getValue() throws VascException {
Serializable value = super.getValue();
//System.out.println("value: "+value+" type: "+value.getClass());
StringBuffer buf = new StringBuffer(100);
if (value instanceof List<?>) {
@ -164,7 +165,7 @@ class MultiVascValueModel extends VascValueModel {
}
@SuppressWarnings("unchecked")
public void setValue(Object editValueObj) throws VascException {
public void setValue(Serializable editValueObj) throws VascException {
if (super.getValue()==null) {
super.setValue(editValueObj);
@ -178,7 +179,7 @@ class MultiVascValueModel extends VascValueModel {
String[] editList = editValue.split(",|\t|\n");
Object value = super.getValue();
Serializable value = super.getValue();
if (value instanceof List<?>) {
((List<?>)value).clear();
for (String o:editList) {

15
vasc-core/src/main/java/net/forwardfire/vasc/impl/ui/VascSelectItemModelEntry.java
View file

@ -22,6 +22,7 @@
package net.forwardfire.vasc.impl.ui;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@ -83,7 +84,7 @@ public class VascSelectItemModelEntry implements VascSelectItemModel {
// set frontend data for new clone, we need te get better lifecycle management for stats/entry/etc
entry.setVascFrontendController(currentEntry.getVascFrontendController());
VascBackend back = currentEntry.getVascFrontendController().getVascController().getVascEntryConfigController().configVascBackendProxied(currentEntry.getVascFrontendController().getVascController(), entry);
VascBackend<Serializable> back = currentEntry.getVascFrontendController().getVascController().getVascEntryConfigController().configVascBackendProxied(currentEntry.getVascFrontendController().getVascController(), entry);
try {
if (nullLabel!=null) {
if (nullKeyValue==null) {
@ -135,9 +136,9 @@ public class VascSelectItemModelEntry implements VascSelectItemModel {
}
VascEntryField field = fieldOrg.clone();
field.getVascValidators().clear();
VascEntryFieldValue v = fieldEntry.getVascFrontendController().getVascEntryState().getVascBackend().provideVascEntryFieldValue();
VascEntryFieldValue<Serializable> v = fieldEntry.getVascFrontendController().getVascEntryState().getVascBackend().provideVascEntryFieldValue();
Object record = fieldEntry.getVascFrontendController().getVascEntryState().getEntryDataObject();
Serializable record = fieldEntry.getVascFrontendController().getVascEntryState().getEntryDataObject();
if (record==null) {
//System.out.println("could not get selected records from state.");
continue;
@ -155,7 +156,7 @@ public class VascSelectItemModelEntry implements VascSelectItemModel {
VascEntryField fieldClone = key.clone();
fieldClone.getVascValidators().clear();
VascEntryFieldValue v = currentEntry.getVascFrontendController().getVascEntryState().getVascBackend().provideVascEntryFieldValue();
VascEntryFieldValue<Serializable> v = currentEntry.getVascFrontendController().getVascEntryState().getVascBackend().provideVascEntryFieldValue();
key.setVascEntryFieldValue(v);
}
if (dis.getVascEntryFieldValue()==null) {
@ -163,14 +164,14 @@ public class VascSelectItemModelEntry implements VascSelectItemModel {
VascEntryField fieldClone = dis.clone();
fieldClone.getVascValidators().clear();
VascEntryFieldValue v = currentEntry.getVascFrontendController().getVascEntryState().getVascBackend().provideVascEntryFieldValue();
VascEntryFieldValue<Serializable> v = currentEntry.getVascFrontendController().getVascEntryState().getVascBackend().provideVascEntryFieldValue();
dis.setVascEntryFieldValue(v);
}
// execute
for (Object o:back.execute(state)) {
Object keyId = key.getVascEntryFieldValue().getValue(key.getBackendName(), o);
for (Serializable o:back.execute(state)) {
Serializable keyId = key.getVascEntryFieldValue().getValue(key.getBackendName(), o);
String nameId = dis.getVascEntryFieldValue().getDisplayValue(dis.getBackendName(), o);
if (returnKeyValue!=null && false==returnKeyValue) {
VascSelectItem item = new VascSelectItem(nameId,o,""+keyId);

6
vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/AnnotationParserElement.java
View file

@ -23,6 +23,7 @@
package net.forwardfire.vasc.impl.x4o;
import java.io.IOException;
import java.io.Serializable;
import java.io.StringReader;
import java.lang.reflect.Method;
import java.util.Calendar;
@ -33,7 +34,6 @@ import java.util.Map;
import java.util.Properties;
import java.util.Set;
import net.forwardfire.vasc.annotations.VascAnnotationParser;
import net.forwardfire.vasc.annotations.VascChoices;
import net.forwardfire.vasc.annotations.VascChoicesSelectItemModel;
@ -377,13 +377,13 @@ public class AnnotationParserElement extends AbstractElement {
Class<?> retType = methodCall.getReturnType();
try {
//System.out.println("creating real def value of: "+defValue+" for: "+retType.getName());
Object defObject = null;
Serializable defObject = null;
if (Date.class.equals(retType)) {
defObject = new Date();
} else if (Calendar.class.equals(retType)) {
defObject = Calendar.getInstance();
} else {
defObject = retType.getConstructor(String.class).newInstance(defValue);
defObject = (Serializable) retType.getConstructor(String.class).newInstance(defValue);
}
//System.out.println("real object: "+defObject);
field.setDefaultValue(defObject);

3
vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/SelectItemModelBindingHandler.java
View file

@ -23,10 +23,7 @@
package net.forwardfire.vasc.impl.x4o;
import net.forwardfire.vasc.core.VascEntryField;
import net.forwardfire.vasc.core.VascEntryFieldLocal;
import net.forwardfire.vasc.core.VascEntryFieldType;
import net.forwardfire.vasc.core.VascEntryListOptionLocal;
import net.forwardfire.vasc.core.VascEntryLocal;
import net.forwardfire.vasc.core.ui.VascSelectItemModel;
import org.x4o.xml.element.AbstractElementBindingHandler;

5
vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascBackendElementConfigurator.java
View file

@ -23,6 +23,8 @@
package net.forwardfire.vasc.impl.x4o;
import java.io.Serializable;
import net.forwardfire.vasc.backend.VascBackend;
import net.forwardfire.vasc.backend.VascBackendController;
import net.forwardfire.vasc.backend.VascBackendControllerLocal;
@ -46,7 +48,8 @@ public class VascBackendElementConfigurator extends AbstractElementConfigurator
*/
public void doConfigElement(Element element) throws ElementConfiguratorException {
VascBackend backend = (VascBackend)element.getElementObject();
@SuppressWarnings("unchecked")
VascBackend<Serializable> backend = (VascBackend<Serializable>)element.getElementObject();
VascController vascController = VascDriver.getVascController(element.getLanguageSession());
VascBackendController backendController = vascController.getVascBackendController();

2
vasc-core/src/main/java/net/forwardfire/vasc/validators/VascDateFutureValidator.java
View file

@ -32,6 +32,8 @@ import java.util.Date;
* @version 1.0 Sep 5, 2008
*/
public class VascDateFutureValidator implements VascValidator {
private static final long serialVersionUID = -8779126994191323884L;
/**
* @see net.forwardfire.vasc.validators.VascValidator#isObjectValid(java.lang.Object)

4
vasc-core/src/main/java/net/forwardfire/vasc/validators/VascDatePastValidator.java
View file

@ -32,7 +32,9 @@ import java.util.Date;
* @version 1.0 Sep 5, 2008
*/
public class VascDatePastValidator implements VascValidator {
private static final long serialVersionUID = 74015638500286753L;
/**
* @see net.forwardfire.vasc.validators.VascValidator#isObjectValid(java.lang.Object)
*/

3
vasc-core/src/main/java/net/forwardfire/vasc/validators/VascIntSizeValidator.java
View file

@ -31,7 +31,8 @@ import java.lang.annotation.Annotation;
* @version 1.0 Sep 5, 2008
*/
public class VascIntSizeValidator implements VascValidator {
private static final long serialVersionUID = 5208748030708077917L;
private int max = Integer.MAX_VALUE;
private int min = Integer.MIN_VALUE;

1
vasc-core/src/main/java/net/forwardfire/vasc/validators/VascLongSizeValidator.java
View file

@ -32,6 +32,7 @@ import java.lang.annotation.Annotation;
*/
public class VascLongSizeValidator implements VascValidator {
private static final long serialVersionUID = -4030130692127481134L;
private long max = Long.MAX_VALUE;
private long min = Long.MIN_VALUE;

4
vasc-core/src/main/java/net/forwardfire/vasc/validators/VascObjectNotNullValidator.java
View file

@ -31,7 +31,9 @@ import java.lang.annotation.Annotation;
* @version 1.0 Sep 5, 2008
*/
public class VascObjectNotNullValidator implements VascValidator {
private static final long serialVersionUID = 224078383059443142L;
/**
* @see net.forwardfire.vasc.validators.VascValidator#isObjectValid(java.lang.Object)
*/

4
vasc-core/src/main/java/net/forwardfire/vasc/validators/VascObjectNullValidator.java
View file

@ -31,7 +31,9 @@ import java.lang.annotation.Annotation;
* @version 1.0 Sep 5, 2008
*/
public class VascObjectNullValidator implements VascValidator {
private static final long serialVersionUID = 150805733891675721L;
/**
* @see net.forwardfire.vasc.validators.VascValidator#isObjectValid(java.lang.Object)
*/

1
vasc-core/src/main/java/net/forwardfire/vasc/validators/VascObjectUrlValidator.java
View file

@ -36,6 +36,7 @@ import java.util.regex.Pattern;
*/
public class VascObjectUrlValidator implements VascValidator {
private static final long serialVersionUID = -1539950641644630956L;
private Pattern pattern = null;
/**

1
vasc-core/src/main/java/net/forwardfire/vasc/validators/VascStringEmailValidator.java
View file

@ -35,6 +35,7 @@ package net.forwardfire.vasc.validators;
*/
public class VascStringEmailValidator extends VascStringRegexValidator {
private static final long serialVersionUID = 6441424565202039568L;
static private final String EMAIL_REGEX = "(\\w+)@(\\w+\\.)(\\w+)(\\.\\w+)*";
/**

1
vasc-core/src/main/java/net/forwardfire/vasc/validators/VascStringLengthValidator.java
View file

@ -32,6 +32,7 @@ import java.lang.annotation.Annotation;
*/
public class VascStringLengthValidator implements VascValidator {
private static final long serialVersionUID = 7676298359239607685L;
private Integer minLenght = 0;
private Integer maxLenght = Integer.MAX_VALUE;
private boolean nullable = false;

3
vasc-core/src/main/java/net/forwardfire/vasc/validators/VascStringRegexValidator.java
View file

@ -33,7 +33,8 @@ import java.util.regex.Pattern;
* @version 1.0 Sep 5, 2008
*/
public class VascStringRegexValidator implements VascValidator {
private static final long serialVersionUID = -7077554409967479437L;
private Pattern pattern = null;
/**

1
vasc-core/src/main/java/net/forwardfire/vasc/validators/VascStringZipCodeValidator.java
View file

@ -46,6 +46,7 @@ package net.forwardfire.vasc.validators;
*/
public class VascStringZipCodeValidator extends VascStringRegexValidator {
private static final long serialVersionUID = -8625655465308689744L;
static private final String ZIP_REGEX = "^[0-9]{4}\\s*[a-zA-Z]{2}$";
/**