From 50847d1d34ca935041599c8c4e2e6952e2b6234c Mon Sep 17 00:00:00 2001 From: Aleksi Hietanen Date: Wed, 10 May 2017 15:13:36 +0300 Subject: Move CompositeState to different package --- server/src/main/java/com/vaadin/ui/Composite.java | 2 +- .../vaadin/shared/composite/CompositeState.java | 27 ---------------------- .../vaadin/shared/ui/composite/CompositeState.java | 27 ++++++++++++++++++++++ 3 files changed, 28 insertions(+), 28 deletions(-) delete mode 100644 shared/src/main/java/com/vaadin/shared/composite/CompositeState.java create mode 100644 shared/src/main/java/com/vaadin/shared/ui/composite/CompositeState.java diff --git a/server/src/main/java/com/vaadin/ui/Composite.java b/server/src/main/java/com/vaadin/ui/Composite.java index 5bbbc6612c..ed0db20f07 100644 --- a/server/src/main/java/com/vaadin/ui/Composite.java +++ b/server/src/main/java/com/vaadin/ui/Composite.java @@ -23,8 +23,8 @@ import java.util.Optional; import com.vaadin.server.ErrorMessage; import com.vaadin.server.Resource; -import com.vaadin.shared.composite.CompositeState; import com.vaadin.shared.ui.ContentMode; +import com.vaadin.shared.ui.composite.CompositeState; /** * Composite allows creating new UI components by composition of existing diff --git a/shared/src/main/java/com/vaadin/shared/composite/CompositeState.java b/shared/src/main/java/com/vaadin/shared/composite/CompositeState.java deleted file mode 100644 index cd4a9a0cab..0000000000 --- a/shared/src/main/java/com/vaadin/shared/composite/CompositeState.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright 2000-2016 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.shared.composite; - -import com.vaadin.shared.AbstractComponentState; - -/** - * Shared state for Composite. - * - * @author Vaadin Ltd - * @since 8.1 - */ -public class CompositeState extends AbstractComponentState { -} diff --git a/shared/src/main/java/com/vaadin/shared/ui/composite/CompositeState.java b/shared/src/main/java/com/vaadin/shared/ui/composite/CompositeState.java new file mode 100644 index 0000000000..600bcf4608 --- /dev/null +++ b/shared/src/main/java/com/vaadin/shared/ui/composite/CompositeState.java @@ -0,0 +1,27 @@ +/* + * Copyright 2000-2016 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.shared.ui.composite; + +import com.vaadin.shared.AbstractComponentState; + +/** + * Shared state for Composite. + * + * @author Vaadin Ltd + * @since 8.1 + */ +public class CompositeState extends AbstractComponentState { +} -- cgit v1.2.3