Browse Source

Fix errors that affect validation builds (#7749).

Change-Id: Idfed1c2f87812afcbb961eb238a36a1e09d61952
tags/7.4.0.beta1
Mika Murtojarvi 9 years ago
parent
commit
409727ec61

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

@@ -20,6 +20,7 @@ import java.beans.IntrospectionException;
import java.beans.Introspector;
import java.beans.PropertyDescriptor;
import java.io.File;
import java.io.Serializable;
import java.lang.reflect.Method;
import java.text.DecimalFormat;
import java.text.DecimalFormatSymbols;
@@ -55,7 +56,7 @@ import com.vaadin.ui.DesignSynchronizable;
* @since 7.4
* @author Vaadin Ltd
*/
public class DesignAttributeHandler {
public class DesignAttributeHandler implements Serializable {

protected static Logger getLogger() {
return Logger.getLogger(DesignAttributeHandler.class.getName());
@@ -464,7 +465,7 @@ public class DesignAttributeHandler {
*
* @author Vaadin Ltd
*/
private static class AttributeCacheEntry {
private static class AttributeCacheEntry implements Serializable {
private Map<String, Method[]> accessMethods = Collections
.synchronizedMap(new HashMap<String, Method[]>());


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

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

import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -40,7 +41,7 @@ import com.vaadin.ui.DesignSynchronizable;
* @since 7.4
* @author Vaadin Ltd
*/
public class DesignContext {
public class DesignContext implements Serializable {

// cache for object instances
private static Map<Class<?>, Object> instanceCache = Collections
@@ -618,7 +619,7 @@ public class DesignContext {
*
* @author Vaadin Ltd
*/
public interface ComponentCreationListener {
public interface ComponentCreationListener extends Serializable {

/**
* Called when component has been created in the design context
@@ -636,7 +637,7 @@ public class DesignContext {
*
* @author Vaadin Ltd
*/
public class ComponentCreatedEvent {
public class ComponentCreatedEvent implements Serializable {
private String localId;
private DesignSynchronizable component;
private DesignContext context;

+ 15
- 0
server/src/com/vaadin/ui/declarative/DesignException.java View File

@@ -1,3 +1,18 @@
/*
* Copyright 2000-2014 Vaadin Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations under
* the License.
*/
package com.vaadin.ui.declarative;

@SuppressWarnings("serial")

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

@@ -16,6 +16,7 @@
package com.vaadin.ui.declarative;

import java.beans.IntrospectionException;
import java.io.Serializable;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
@@ -34,7 +35,7 @@ import com.vaadin.util.ReflectTools;
* @since 7.4
* @author Vaadin Ltd
*/
public class FieldBinder {
public class FieldBinder implements Serializable {

// the design class instance (the instance containing the bound fields)
private Component bindTarget;

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

@@ -19,6 +19,7 @@ import java.beans.IntrospectionException;
import java.io.BufferedWriter;
import java.io.IOException;
import java.io.InputStream;
import java.io.Serializable;

import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
@@ -42,7 +43,7 @@ import com.vaadin.ui.declarative.DesignContext.ComponentCreationListener;
* @since 7.4
* @author Vaadin Ltd
*/
public class LayoutHandler {
public class LayoutHandler implements Serializable {
/**
* Constructs a component hierarchy from the design specified as an html
* document. The component hierarchy must contain exactly one top-level

+ 3
- 0
server/tests/src/com/vaadin/tests/layoutparser/InvalidLayoutTemplate.java View File

@@ -15,6 +15,8 @@
*/
package com.vaadin.tests.layoutparser;

import org.junit.Ignore;

import com.vaadin.ui.Button;
import com.vaadin.ui.NativeButton;
import com.vaadin.ui.TextField;
@@ -25,6 +27,7 @@ import com.vaadin.ui.VerticalLayout;
* @since
* @author Vaadin Ltd
*/
@Ignore
public class InvalidLayoutTemplate extends VerticalLayout {
private NativeButton firstButton;
private NativeButton secondButton;

+ 3
- 0
server/tests/src/com/vaadin/tests/layoutparser/LayoutTemplate.java View File

@@ -15,6 +15,8 @@
*/
package com.vaadin.tests.layoutparser;

import org.junit.Ignore;

import com.vaadin.ui.Button;
import com.vaadin.ui.NativeButton;
import com.vaadin.ui.VerticalLayout;
@@ -25,6 +27,7 @@ import com.vaadin.ui.VerticalLayout;
* @since
* @author Vaadin Ltd
*/
@Ignore
public class LayoutTemplate extends VerticalLayout {
private NativeButton firstButton; // assigned based on local id
private NativeButton secondButton; // assigned based on id

Loading…
Cancel
Save