Browse Source

Dalvik support - OpenBeans instead of java.beans

Change-Id: I189abd94eccc8bed7d1be959f383bd7c23212b5c
feature/dalvik
elmot 8 years ago
parent
commit
1ea0f13749

+ 1
- 1
build.properties View File

@@ -4,7 +4,7 @@ ivy.organisation=com.vaadin
vaadin.vendor=Vaadin Ltd
vaadin.url=http://vaadin.com
vaadin.java.version=1.6
vaadin.version=0.0.0.unversioned-development-build
vaadin.version=7.6.4.dalvik
vaadin.sass.version=0.9.13
gwt.version=2.7.0.vaadin3
commons-io.version=2.4

+ 6
- 1
server/ivy.xml View File

@@ -40,7 +40,12 @@

<!-- Bean Validation API -->
<dependency org="javax.validation" name="validation-api"
rev="1.0.0.GA" conf="build-provided,ide,test -> default" />
rev="1.0.0.GA" conf="build-provided,ide,test -> default" />

<dependency org="com.googlecode" name="openbeans"
rev="1.0" conf="build-provided,ide,test -> default" >
<artifact name="openbeans-1.0" type="jar" url="https://bintray.com/artifact/download/melix/thirdparty-apache/com/googlecode/openbeans/1.0/openbeans-1.0.jar"/>
</dependency>

<!-- Sass compiler -->
<dependency org="com.vaadin" name="vaadin-sass-compiler"

+ 1
- 1
server/src/com/vaadin/data/fieldgroup/BeanFieldGroup.java View File

@@ -15,7 +15,7 @@
*/
package com.vaadin.data.fieldgroup;

import java.beans.IntrospectionException;
import com.googlecode.openbeans.IntrospectionException;
import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.Map;

+ 2
- 2
server/src/com/vaadin/data/util/BeanItem.java View File

@@ -16,7 +16,7 @@

package com.vaadin.data.util;

import java.beans.PropertyDescriptor;
import com.googlecode.openbeans.PropertyDescriptor;
import java.lang.reflect.Method;
import java.util.Arrays;
import java.util.Collection;
@@ -202,7 +202,7 @@ public class BeanItem<BT> extends PropertysetItem {
pdMap.put(pd.getName(), vaadinPropertyDescriptor);
}
}
} catch (final java.beans.IntrospectionException ignored) {
} catch (final com.googlecode.openbeans.IntrospectionException ignored) {
}

return pdMap;

+ 5
- 5
server/src/com/vaadin/data/util/BeanUtil.java View File

@@ -15,10 +15,10 @@
*/
package com.vaadin.data.util;

import java.beans.BeanInfo;
import java.beans.IntrospectionException;
import java.beans.Introspector;
import java.beans.PropertyDescriptor;
import com.googlecode.openbeans.BeanInfo;
import com.googlecode.openbeans.IntrospectionException;
import com.googlecode.openbeans.Introspector;
import com.googlecode.openbeans.PropertyDescriptor;
import java.io.Serializable;
import java.lang.reflect.Method;
import java.util.ArrayList;
@@ -46,7 +46,7 @@ public final class BeanUtil implements Serializable {
* to work correctly.
*
* NOTE : This utility method relies on introspection (and returns
* PropertyDescriptor) which is a part of java.beans package. The latter
* PropertyDescriptor) which is a part of com.googlecode.openbeans package. The latter
* package could require bigger JDK in the future (with Java 9+). So it may
* be changed in the future.
*

+ 3
- 3
server/src/com/vaadin/server/JsonCodec.java View File

@@ -16,9 +16,9 @@

package com.vaadin.server;

import java.beans.IntrospectionException;
import java.beans.Introspector;
import java.beans.PropertyDescriptor;
import com.googlecode.openbeans.IntrospectionException;
import com.googlecode.openbeans.Introspector;
import com.googlecode.openbeans.PropertyDescriptor;
import java.io.Serializable;
import java.lang.reflect.Array;
import java.lang.reflect.Field;

+ 1
- 1
server/src/com/vaadin/ui/declarative/Design.java View File

@@ -15,7 +15,7 @@
*/
package com.vaadin.ui.declarative;

import java.beans.IntrospectionException;
import com.googlecode.openbeans.IntrospectionException;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;

+ 4
- 4
server/src/com/vaadin/ui/declarative/DesignAttributeHandler.java View File

@@ -15,10 +15,10 @@
*/
package com.vaadin.ui.declarative;

import java.beans.BeanInfo;
import java.beans.IntrospectionException;
import java.beans.Introspector;
import java.beans.PropertyDescriptor;
import com.googlecode.openbeans.BeanInfo;
import com.googlecode.openbeans.IntrospectionException;
import com.googlecode.openbeans.Introspector;
import com.googlecode.openbeans.PropertyDescriptor;
import java.io.Serializable;
import java.lang.reflect.Method;
import java.util.ArrayList;

+ 1
- 1
server/src/com/vaadin/ui/declarative/FieldBinder.java View File

@@ -15,7 +15,7 @@
*/
package com.vaadin.ui.declarative;

import java.beans.IntrospectionException;
import com.googlecode.openbeans.IntrospectionException;
import java.io.Serializable;
import java.lang.reflect.Field;
import java.util.ArrayList;

+ 2
- 2
server/src/com/vaadin/util/ReflectTools.java View File

@@ -15,8 +15,8 @@
*/
package com.vaadin.util;

import java.beans.IntrospectionException;
import java.beans.PropertyDescriptor;
import com.googlecode.openbeans.IntrospectionException;
import com.googlecode.openbeans.PropertyDescriptor;
import java.io.Serializable;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;

+ 2
- 2
server/tests/src/com/vaadin/data/util/PropertyDescriptorTest.java View File

@@ -1,7 +1,7 @@
package com.vaadin.data.util;

import java.beans.Introspector;
import java.beans.PropertyDescriptor;
import com.googlecode.openbeans.Introspector;
import com.googlecode.openbeans.PropertyDescriptor;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.ObjectInputStream;

+ 3
- 3
server/tests/src/com/vaadin/tests/design/DeclarativeTestBase.java View File

@@ -15,9 +15,9 @@
*/
package com.vaadin.tests.design;

import java.beans.BeanInfo;
import java.beans.Introspector;
import java.beans.PropertyDescriptor;
import com.googlecode.openbeans.BeanInfo;
import com.googlecode.openbeans.Introspector;
import com.googlecode.openbeans.PropertyDescriptor;
import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.Map;

Loading…
Cancel
Save