Skip to content

Commit bc3bf17

Browse files
adrienbaronadrienbaron
committed
Merge branch 'release/1.0-beta-9'
2 parents fc9f8e7 + 2c44868 commit bc3bf17

File tree

440 files changed

+15158
-9638
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

440 files changed

+15158
-9638
lines changed

‎core/pom.xml‎

Lines changed: 63 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,73 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project xmlns="http://maven.apache.org/POM/4.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5-
<modelVersion>4.0.0</modelVersion>
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
66

7-
<parent>
8-
<groupId>com.axellience</groupId>
9-
<artifactId>vue-gwt-parent</artifactId>
10-
<version>1.0-beta-8</version>
11-
</parent>
7+
<parent>
8+
<groupId>com.axellience</groupId>
9+
<artifactId>vue-gwt-parent</artifactId>
10+
<version>1.0-beta-9</version>
11+
</parent>
1212

13-
<artifactId>vue-gwt</artifactId>
14-
<name>Vue GWT</name>
15-
<description>Vue GWT core classes</description>
16-
<packaging>gwt-lib</packaging>
17-
18-
<properties>
19-
<maven.compiler.source>1.8</maven.compiler.source>
20-
<maven.compiler.target>1.8</maven.compiler.target>
21-
</properties>
13+
<artifactId>vue-gwt</artifactId>
14+
<name>Vue GWT</name>
15+
<description>Vue GWT core classes</description>
16+
<packaging>gwt-lib</packaging>
2217

23-
<dependencies>
18+
<properties>
19+
<maven.compiler.source>1.8</maven.compiler.source>
20+
<maven.compiler.target>1.8</maven.compiler.target>
21+
</properties>
2422

25-
<!-- GWT dependencies -->
26-
<dependency>
27-
<groupId>com.google.gwt</groupId>
28-
<artifactId>gwt-user</artifactId>
29-
</dependency>
30-
<dependency>
31-
<groupId>com.google.jsinterop</groupId>
32-
<artifactId>base</artifactId>
33-
</dependency>
34-
<dependency>
35-
<groupId>com.google.elemental2</groupId>
36-
<artifactId>elemental2-core</artifactId>
37-
</dependency>
38-
<dependency>
39-
<groupId>com.google.elemental2</groupId>
40-
<artifactId>elemental2-dom</artifactId>
41-
</dependency>
23+
<dependencies>
4224

43-
<!-- Injection -->
44-
<dependency>
45-
<groupId>javax.inject</groupId>
46-
<artifactId>javax.inject</artifactId>
47-
</dependency>
48-
<dependency>
49-
<groupId>javax.inject</groupId>
50-
<artifactId>javax.inject</artifactId>
51-
<classifier>sources</classifier>
52-
</dependency>
25+
<!-- GWT dependencies -->
26+
<dependency>
27+
<groupId>com.google.gwt</groupId>
28+
<artifactId>gwt-user</artifactId>
29+
</dependency>
30+
<dependency>
31+
<groupId>com.google.jsinterop</groupId>
32+
<artifactId>base</artifactId>
33+
</dependency>
34+
<dependency>
35+
<groupId>com.google.elemental2</groupId>
36+
<artifactId>elemental2-core</artifactId>
37+
</dependency>
38+
<dependency>
39+
<groupId>com.google.elemental2</groupId>
40+
<artifactId>elemental2-dom</artifactId>
41+
</dependency>
5342

54-
</dependencies>
43+
<!-- Injection -->
44+
<dependency>
45+
<groupId>javax.inject</groupId>
46+
<artifactId>javax.inject</artifactId>
47+
</dependency>
48+
<dependency>
49+
<groupId>javax.inject</groupId>
50+
<artifactId>javax.inject</artifactId>
51+
<classifier>sources</classifier>
52+
</dependency>
5553

56-
<build>
57-
<plugins>
58-
<plugin>
59-
<groupId>net.ltgt.gwt.maven</groupId>
60-
<artifactId>gwt-maven-plugin</artifactId>
61-
<extensions>true</extensions>
62-
<configuration>
63-
<moduleName>com.axellience.vuegwt.VueGWT</moduleName>
64-
</configuration>
65-
</plugin>
66-
</plugins>
67-
</build>
54+
</dependencies>
55+
56+
<build>
57+
<plugins>
58+
<plugin>
59+
<groupId>net.ltgt.gwt.maven</groupId>
60+
<artifactId>gwt-maven-plugin</artifactId>
61+
<extensions>true</extensions>
62+
<configuration>
63+
<moduleName>com.axellience.vuegwt.VueGWT</moduleName>
64+
</configuration>
65+
</plugin>
66+
</plugins>
67+
<resources>
68+
<resource>
69+
<directory>src/main/java</directory>
70+
</resource>
71+
</resources>
72+
</build>
6873
</project>

‎core/src/main/java/com/axellience/vuegwt/core/annotations/component/Component.java‎

Lines changed: 45 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,60 @@
11
package com.axellience.vuegwt.core.annotations.component;
22

3+
import static java.lang.annotation.ElementType.TYPE;
4+
import static java.lang.annotation.RetentionPolicy.RUNTIME;
5+
36
import com.axellience.vuegwt.core.client.component.IsVueComponent;
47
import com.axellience.vuegwt.core.client.component.options.CustomizeOptions;
58
import com.axellience.vuegwt.core.client.directive.VueDirective;
6-
79
import java.lang.annotation.Retention;
810
import java.lang.annotation.Target;
911

10-
import static java.lang.annotation.ElementType.TYPE;
11-
import static java.lang.annotation.RetentionPolicy.RUNTIME;
12-
1312
/**
1413
* Annotation placed on Vue Components
14+
*
1515
* @author Adrien Baron
1616
*/
1717
@Target(TYPE)
1818
@Retention(RUNTIME)
19-
public @interface Component
20-
{
21-
String name() default "";
22-
23-
/**
24-
* Should use a factory for the data model.
25-
* Passing this to false will make all your components instance share the same data model.
26-
* @return true if we should use a factory, false otherwise
27-
*/
28-
boolean useFactory() default true;
29-
30-
/**
31-
* Components to register on this component instance
32-
* @return This list of {@link IsVueComponent} to register on this Component
33-
*/
34-
Class<? extends IsVueComponent>[] components() default {};
35-
36-
/**
37-
* Directives to register on this component instance
38-
* @return This list of {@link VueDirective} to register on this Component
39-
*/
40-
Class<? extends VueDirective>[] directives() default {};
41-
42-
/**
43-
* Object responsible to customize the options of the Component.
44-
* This can be used to register routes with Vue router, or more.
45-
* They are injected if the component is injected.
46-
* @return This list of {@link CustomizeOptions}
47-
*/
48-
Class<? extends CustomizeOptions>[] customizeOptions() default {};
49-
50-
/**
51-
* A flag to set that the component doesn't have a template.
52-
* If the component is abstract, or implement HasRender then it's consider false by default.
53-
* @return true if has a html template, false otherwise
54-
*/
55-
boolean hasTemplate() default true;
19+
public @interface Component {
20+
21+
String name() default "";
22+
23+
/**
24+
* Should use a factory for the data model. Passing this to false will make all your components
25+
* instance share the same data model.
26+
*
27+
* @return true if we should use a factory, false otherwise
28+
*/
29+
boolean useFactory() default true;
30+
31+
/**
32+
* Components to register on this component instance
33+
*
34+
* @return This list of {@link IsVueComponent} to register on this Component
35+
*/
36+
Class<? extends IsVueComponent>[] components() default {};
37+
38+
/**
39+
* Directives to register on this component instance
40+
*
41+
* @return This list of {@link VueDirective} to register on this Component
42+
*/
43+
Class<? extends VueDirective>[] directives() default {};
44+
45+
/**
46+
* Object responsible to customize the options of the Component. This can be used to register
47+
* routes with Vue router, or more. They are injected if the component is injected.
48+
*
49+
* @return This list of {@link CustomizeOptions}
50+
*/
51+
Class<? extends CustomizeOptions>[] customizeOptions() default {};
52+
53+
/**
54+
* A flag to set that the component doesn't have a template. If the component is abstract, or
55+
* implement HasRender then it's consider false by default.
56+
*
57+
* @return true if has a html template, false otherwise
58+
*/
59+
boolean hasTemplate() default true;
5660
}

‎core/src/main/java/com/axellience/vuegwt/core/annotations/component/Computed.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
package com.axellience.vuegwt.core.annotations.component;
22

3-
import java.lang.annotation.Retention;
4-
import java.lang.annotation.Target;
5-
63
import static java.lang.annotation.ElementType.METHOD;
74
import static java.lang.annotation.RetentionPolicy.CLASS;
85

6+
import java.lang.annotation.Retention;
7+
import java.lang.annotation.Target;
8+
99
/**
1010
* Mark a computed property
11+
*
1112
* @author Adrien Baron
1213
*/
1314
@Target(METHOD)
1415
@Retention(CLASS)
15-
public @interface Computed
16-
{
17-
String value() default "";
16+
public @interface Computed {
17+
18+
String value() default "";
1819
}

‎core/src/main/java/com/axellience/vuegwt/core/annotations/component/Data.java‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
package com.axellience.vuegwt.core.annotations.component;
2+
3+
import static java.lang.annotation.ElementType.FIELD;
4+
import static java.lang.annotation.RetentionPolicy.RUNTIME;
5+
6+
import java.lang.annotation.Retention;
7+
import java.lang.annotation.Target;
8+
9+
/**
10+
* Mark a field as "Data" in a Component. This field will be observed recursively by Vue.js
11+
*/
12+
@Target(FIELD)
13+
@Retention(RUNTIME)
14+
public @interface Data {
15+
16+
}

‎core/src/main/java/com/axellience/vuegwt/core/annotations/component/Emit.java‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
package com.axellience.vuegwt.core.annotations.component;
22

3-
import java.lang.annotation.Retention;
4-
import java.lang.annotation.Target;
5-
63
import static java.lang.annotation.ElementType.METHOD;
74
import static java.lang.annotation.RetentionPolicy.CLASS;
85

6+
import java.lang.annotation.Retention;
7+
import java.lang.annotation.Target;
8+
99
/**
10-
* Method annotated with this will emit an event automatically when called
11-
* Similar to @Emit() from vue-property-decorator
12-
* https://github.com/kaorun343/vue-property-decorator
10+
* Method annotated with this will emit an event automatically when called Similar to @Emit() from
11+
* vue-property-decorator https://github.com/kaorun343/vue-property-decorator
1312
*/
1413
@Target(METHOD)
1514
@Retention(CLASS)
16-
public @interface Emit
17-
{
18-
String value() default "";
15+
public @interface Emit {
16+
17+
String value() default "";
1918
}

‎core/src/main/java/com/axellience/vuegwt/core/annotations/component/HookMethod.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
package com.axellience.vuegwt.core.annotations.component;
22

3-
import java.lang.annotation.Retention;
4-
import java.lang.annotation.Target;
5-
63
import static java.lang.annotation.ElementType.METHOD;
74
import static java.lang.annotation.RetentionPolicy.CLASS;
85

6+
import java.lang.annotation.Retention;
7+
import java.lang.annotation.Target;
8+
99
/**
1010
* @author Adrien Baron
1111
*/
1212
@Target(METHOD)
1313
@Retention(CLASS)
14-
public @interface HookMethod
15-
{}
14+
public @interface HookMethod {
15+
16+
}

‎core/src/main/java/com/axellience/vuegwt/core/annotations/component/JsComponent.java‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
11
package com.axellience.vuegwt.core.annotations.component;
22

3-
import java.lang.annotation.Retention;
4-
import java.lang.annotation.Target;
5-
63
import static java.lang.annotation.ElementType.TYPE;
74
import static java.lang.annotation.RetentionPolicy.SOURCE;
85

6+
import java.lang.annotation.Retention;
7+
import java.lang.annotation.Target;
8+
99
/**
1010
* Annotation placed on Vue Components
11+
*
1112
* @author Adrien Baron
1213
*/
1314
@Target(TYPE)
1415
@Retention(SOURCE)
15-
public @interface JsComponent
16-
{
17-
String value();
16+
public @interface JsComponent {
17+
18+
String value();
19+
20+
String name() default "";
1821
}

0 commit comments

Comments
 (0)