Move internal container annotations to the appropriate packages (#2771)

vaadin · Oct 26, 2017 · 69d63c7 · 69d63c7
1 parent 6c6df58
commit 69d63c7
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 28 deletions.
diff --git a/flow-server/src/main/java/com/vaadin/flow/model/Convert.java b/flow-server/src/main/java/com/vaadin/flow/model/Convert.java
@@ -21,19 +21,15 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import com.vaadin.annotations.InternalContainerAnnotationForConvert;
-import com.vaadin.flow.template.angular.model.TemplateModel;
-import com.vaadin.flow.model.ModelConverter;
-
 /**
  * Defines a ModelConverter on a template model property found through
  * {@link #path()}.
  * <p>
  * Use this annotation on setters in your {@link TemplateModel} class to perform
  * type conversions on properties.
- * 
+ *
  * @see ModelConverter
- * 
+ *
  * @author Vaadin Ltd
  */
 @Retention(RetentionPolicy.RUNTIME)
@@ -44,7 +40,7 @@
     /**
      * The ModelConverter class to use for conversion of the property found
      * through {{@link #path()}.
-     * 
+     *
      * @return the ModelConverter class
      */
     Class<? extends ModelConverter<?, ?>> value();
@@ -53,7 +49,7 @@
      * The dot separated path from the TemplateModel property to the value to
      * apply conversion to. Empty string by default, which will apply conversion
      * directly to the property.
-     * 
+     *
      * @return the dot separated path to the bean property to convert, empty
      *         string by default
      */

diff --git a/...nternalContainerAnnotationForConvert.java → ...nternalContainerAnnotationForConvert.java b/...nternalContainerAnnotationForConvert.java → ...nternalContainerAnnotationForConvert.java
@@ -13,22 +13,20 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.annotations;
+package com.vaadin.flow.model;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import com.vaadin.flow.model.Convert;
-
 /**
  * Annotation enabling use of multiple {@link Convert} annotations.
  * <p>
  * <b>NOT meant to be used</b>, for multiple converters, {@link Convert} should
  * be used instead.
- * 
+ *
  * @author Vaadin Ltd
  */
 @Retention(RetentionPolicy.RUNTIME)

diff --git a/flow-server/src/main/java/com/vaadin/ui/common/HtmlImport.java b/flow-server/src/main/java/com/vaadin/ui/common/HtmlImport.java
@@ -23,7 +23,6 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import com.vaadin.annotations.InternalContainerAnnotationForHtml;
 import com.vaadin.shared.ui.LoadMode;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.WebComponents;

diff --git a/...s/InternalContainerAnnotationForHtml.java → ...n/InternalContainerAnnotationForHtml.java b/...s/InternalContainerAnnotationForHtml.java → ...n/InternalContainerAnnotationForHtml.java
@@ -13,16 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.annotations;
+package com.vaadin.ui.common;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import com.vaadin.ui.common.HtmlImport;
-
 /**
  * Annotation enabling using multiple {@link HtmlImport @HtmlImport}
  * annotations.

diff --git a/...ons/InternalContainerAnnotationForJS.java → ...mon/InternalContainerAnnotationForJS.java b/...ons/InternalContainerAnnotationForJS.java → ...mon/InternalContainerAnnotationForJS.java
@@ -13,16 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.annotations;
+package com.vaadin.ui.common;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import com.vaadin.ui.common.JavaScript;
-
 /**
  * Annotation enabling using multiple {@link JavaScript @JavaScript}
  * annotations.

diff --git a/...ons/InternalContainerAnnotationForSS.java → ...mon/InternalContainerAnnotationForSS.java b/...ons/InternalContainerAnnotationForSS.java → ...mon/InternalContainerAnnotationForSS.java
@@ -13,16 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.annotations;
+package com.vaadin.ui.common;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import com.vaadin.ui.common.StyleSheet;
-
 /**
  * Annotation enabling using multiple {@link StyleSheet @StyleSheet}
  * annotations.

diff --git a/...s/InternalContainerAnnotationForUses.java → ...n/InternalContainerAnnotationForUses.java b/...s/InternalContainerAnnotationForUses.java → ...n/InternalContainerAnnotationForUses.java
@@ -13,16 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.annotations;
+package com.vaadin.ui.common;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import com.vaadin.ui.common.Uses;
-
 /**
  * Annotation enabling using multiple {@link Uses @Uses} annotations.
  * <p>

diff --git a/flow-server/src/main/java/com/vaadin/ui/common/JavaScript.java b/flow-server/src/main/java/com/vaadin/ui/common/JavaScript.java
@@ -23,7 +23,6 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import com.vaadin.annotations.InternalContainerAnnotationForJS;
 import com.vaadin.shared.ui.LoadMode;
 import com.vaadin.ui.Component;
 

diff --git a/flow-server/src/main/java/com/vaadin/ui/common/StyleSheet.java b/flow-server/src/main/java/com/vaadin/ui/common/StyleSheet.java
@@ -23,7 +23,6 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import com.vaadin.annotations.InternalContainerAnnotationForSS;
 import com.vaadin.shared.ui.LoadMode;
 import com.vaadin.ui.Component;
 

diff --git a/flow-server/src/main/java/com/vaadin/ui/common/Uses.java b/flow-server/src/main/java/com/vaadin/ui/common/Uses.java
@@ -23,7 +23,6 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import com.vaadin.annotations.InternalContainerAnnotationForUses;
 import com.vaadin.ui.Component;
 
 /**