#8 - BIG CHANGES! migrating from angular2 to vue.js ;> Rewriting all …

…the js code generators, still in progress ...
activey · Oct 27, 2016 · 4f6adb2 · 4f6adb2
1 parent df32775
commit 4f6adb2
Show file tree

Hide file tree

Showing 98 changed files with 850 additions and 1,048 deletions.
diff --git a/...ava/org/licket/core/common/Suppliers.java → ...a/org/licket/core/supplier/Suppliers.java b/...ava/org/licket/core/common/Suppliers.java → ...a/org/licket/core/supplier/Suppliers.java
@@ -1,4 +1,4 @@
-package org.licket.core.common;
+package org.licket.core.supplier;
 
 import java.util.function.Supplier;
 

diff --git a/licket-demo/src/main/java/org/licket/demo/licket/LicketConfiguration.java b/licket-demo/src/main/java/org/licket/demo/licket/LicketConfiguration.java
@@ -1,20 +1,14 @@
 package org.licket.demo.licket;
 
 import org.licket.core.module.application.LicketComponentModelReloader;
-import org.licket.core.resource.HeadParticipatingResource;
 import org.licket.demo.view.ContactsAppRoot;
 import org.licket.demo.view.ContactsPanel;
-import org.licket.demo.view.semantic.JqueryLibraryResource;
-import org.licket.demo.view.semantic.SemanticLibraryResource;
-import org.licket.demo.view.semantic.SemanticStylesheetResource;
 import org.licket.semantic.SemanticUIModuleConfiguration;
 import org.licket.spring.annotation.LicketComponent;
 import org.licket.spring.annotation.LicketRootContainer;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
-import org.springframework.core.annotation.Order;
 
 @Configuration
 @Import(SemanticUIModuleConfiguration.class)
@@ -29,22 +23,4 @@ public ContactsAppRoot root(@Autowired LicketComponentModelReloader modelReloade
     public ContactsPanel contactsPanel(LicketComponentModelReloader modelReloader) {
         return new ContactsPanel("contacts-panel", modelReloader);
     }
-
-    @Bean
-    @Order(10)
-    public HeadParticipatingResource jqueryResource() {
-        return new JqueryLibraryResource();
-    }
-
-    @Bean
-    @Order(11)
-    public HeadParticipatingResource semanticLibrary() {
-        return new SemanticLibraryResource();
-    }
-
-    @Bean
-    @Order(12)
-    public HeadParticipatingResource semanticStylesheet() {
-        return new SemanticStylesheetResource();
-    }
 }
diff --git a/licket-demo/src/main/resources/org/licket/demo/view/ContactsAppRoot.html b/licket-demo/src/main/resources/org/licket/demo/view/ContactsAppRoot.html
@@ -4,54 +4,56 @@
         <title>Contacts Page</title>
     </head>
     <body>
-        <h1 class="ui center aligned header">Contacts list</h1>
+        <div>
+            <h1 class="ui center aligned header">Contacts list</h1>
 
-        <div class="ui container" lick:id="contacts-panel">
-            <div class="ui form" lick:id="add-contact-form">
-                <div class="two fields">
-                    <div class="field">
-                        <label>Name</label>
-                        <input type="text" placeholder="Full Name" lick:id="name"/>
-                    </div>
+            <div class="ui container" lick:id="contacts-panel">
+                <div class="ui form" lick:id="add-contact-form">
+                    <div class="two fields">
+                        <div class="field">
+                            <label>Name</label>
+                            <input type="text" placeholder="Full Name" lick:id="name"/>
+                        </div>
 
-                    <div class="field">
-                        <label>Description</label>
-                        <input type="text" placeholder="Some description" lick:id="description"/>
+                        <div class="field">
+                            <label>Description</label>
+                            <input type="text" placeholder="Some description" lick:id="description"/>
+                        </div>
                     </div>
-                </div>
 
-                <div class="ui submit button" lick:id="add">
-                    Add one
+                    <div class="ui submit button" lick:id="add">
+                        Add one
+                    </div>
                 </div>
-            </div>
 
-            <div class="ui relaxed divided items">
-                <div class="item" lick:id="contact">
-                    <div class="ui small image">
-                        <!--<img src="assets/images/wireframe/image.png"></img>-->
-                    </div>
-                    <div class="content">
-                        <a class="header" lick:id="name">Content Header</a>
-                        <div class="meta">
-                            <a lick:id="email">
-                                <span lick:id="email">
-                                    [email protected]
-                                </span>
-                            </a>
-                        </div>
-                        <div class="description" lick:id="description">
-                            A description which may flow for several lines and give context to the content.
+                <div class="ui relaxed divided items">
+                    <div class="item" lick:id="contact">
+                        <div class="ui small image">
+                            <!--<img src="assets/images/wireframe/image.png"></img>-->
                         </div>
-                        <div class="extra">
-                            <!--<img src="assets/images/wireframe/square-image.png" class="ui circular avatar image"/> Username-->
+                        <div class="content">
+                            <a class="header" lick:id="name">Content Header</a>
+                            <div class="meta">
+                                <a lick:id="email">
+                                    <span lick:id="email">
+                                        [email protected]
+                                    </span>
+                                </a>
+                            </div>
+                            <div class="description" lick:id="description">
+                                A description which may flow for several lines and give context to the content.
+                            </div>
+                            <div class="extra">
+                                <!--<img src="assets/images/wireframe/square-image.png" class="ui circular avatar image"/> Username-->
+                            </div>
                         </div>
                     </div>
                 </div>
-            </div>
 
-            <button class="ui primary button" lick:id="reload">
-                Reload list model
-            </button>
+                <button class="ui primary button" lick:id="reload">
+                    Reload list model
+                </button>
+            </div>
         </div>
     </body>
 </html>
diff --git a/licket-framework-hippo/src/main/java/org/licket/framework/hippo/FunctionCallBuilder.java b/licket-framework-hippo/src/main/java/org/licket/framework/hippo/FunctionCallBuilder.java
@@ -30,6 +30,11 @@ public FunctionCallBuilder target(PropertyNameBuilder propertyNameBuilder) {
         return this;
     }
 
+    public FunctionCallBuilder target(NameBuilder nameBuilder) {
+        this.target = nameBuilder;
+        return this;
+    }
+
     public FunctionCallBuilder argument(AbstractAstNodeBuilder<ObjectLiteral> objectLiteral) {
         arguments.add(objectLiteral);
         return this;

diff --git a/licket-framework-hippo/src/main/java/org/licket/framework/hippo/FunctionNodeBuilder.java b/licket-framework-hippo/src/main/java/org/licket/framework/hippo/FunctionNodeBuilder.java
@@ -5,13 +5,15 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import static org.licket.framework.hippo.BlockBuilder.block;
+
 /**
  * @author activey
  */
 public class FunctionNodeBuilder extends AbstractAstNodeBuilder<FunctionNode> {
 
     private List<NameBuilder> paramBuilders = new ArrayList();
-    private BlockBuilder blockBuilder;
+    private BlockBuilder blockBuilder = block();
 
     private FunctionNodeBuilder() {}
 

diff --git a/licket-framework-hippo/src/main/java/org/licket/framework/hippo/NewExpressionBuilder.java b/licket-framework-hippo/src/main/java/org/licket/framework/hippo/NewExpressionBuilder.java
@@ -26,11 +26,21 @@ public NewExpressionBuilder target(PropertyNameBuilder property) {
         return this;
     }
 
+    public NewExpressionBuilder target(NameBuilder name) {
+        this.target = name;
+        return this;
+    }
+
     public NewExpressionBuilder argument(NameBuilder name) {
         arguments.add(name);
         return this;
     }
 
+    public NewExpressionBuilder argument(ObjectLiteralBuilder objectLiteral) {
+        arguments.add(objectLiteral);
+        return this;
+    }
+
     @Override
     public NewExpression build() {
         NewExpression newExpression = new NewExpression();

diff --git a/licket-framework-hippo/src/main/java/org/licket/framework/hippo/ObjectPropertyBuilder.java b/licket-framework-hippo/src/main/java/org/licket/framework/hippo/ObjectPropertyBuilder.java
@@ -9,7 +9,7 @@
  */
 public class ObjectPropertyBuilder extends AbstractAstNodeBuilder<ObjectProperty> {
 
-    private NameBuilder name;
+    private AbstractAstNodeBuilder name;
 
     private AbstractAstNodeBuilder<?> value;
 
@@ -29,6 +29,11 @@ public ObjectPropertyBuilder name(String name) {
         return this;
     }
 
+    public ObjectPropertyBuilder name(StringLiteralBuilder stringLiteral) {
+        this.name = stringLiteral;
+        return this;
+    }
+
     public ObjectPropertyBuilder arrayValue(AbstractAstNodeBuilder<ArrayLiteral> arrayLiteralBuilder) {
         this.value = arrayLiteralBuilder;
         return this;

diff --git a/licket-framework-hippo/src/main/java/org/licket/framework/hippo/PropertyNameBuilder.java b/licket-framework-hippo/src/main/java/org/licket/framework/hippo/PropertyNameBuilder.java
@@ -2,6 +2,8 @@
 
 import org.mozilla.javascript.ast.PropertyGet;
 
+import static org.licket.framework.hippo.NameBuilder.name;
+
 /**
  * @author activey
  */
@@ -27,10 +29,18 @@ public static PropertyNameBuilder property(PropertyNameBuilder left, NameBuilder
         return new PropertyNameBuilder(left, right);
     }
 
+    public static PropertyNameBuilder property(PropertyNameBuilder left, String right) {
+        return new PropertyNameBuilder(left, name(right));
+    }
+
     public static PropertyNameBuilder property(NameBuilder left, NameBuilder right) {
         return new PropertyNameBuilder(left, right);
     }
 
+    public static PropertyNameBuilder property(String left, String right) {
+        return new PropertyNameBuilder(name(left), name(right));
+    }
+
     public PropertyGet build() {
         PropertyGet propertyGet = new PropertyGet();
         propertyGet.setTarget(left.build());

diff --git a/licket-framework-hippo/src/main/java/org/licket/framework/hippo/ReturnStatementBuilder.java b/licket-framework-hippo/src/main/java/org/licket/framework/hippo/ReturnStatementBuilder.java
@@ -16,13 +16,18 @@ public static ReturnStatementBuilder returnStatement() {
         return new ReturnStatementBuilder();
     }
 
-    public ReturnStatementBuilder returnValue(FunctionCallBuilder returnValue) {
-        this.returnValue = returnValue;
+    public ReturnStatementBuilder returnValue(ObjectLiteralBuilder objectLiteral) {
+        this.returnValue = objectLiteral;
         return this;
     }
 
-    public ReturnStatementBuilder returnValue(NameBuilder nameBuilder) {
-        this.returnValue = nameBuilder;
+    public ReturnStatementBuilder returnValue(FunctionCallBuilder functionCall) {
+        this.returnValue = functionCall;
+        return this;
+    }
+
+    public ReturnStatementBuilder returnValue(NameBuilder name) {
+        this.returnValue = name;
         return this;
     }
 

diff --git a/licket-framework/src/main/java/org/licket/core/DefaultLicketApplication.java b/licket-framework/src/main/java/org/licket/core/DefaultLicketApplication.java
@@ -12,7 +12,7 @@
 import org.licket.core.id.CompositeId;
 import org.licket.core.view.LicketComponent;
 import org.licket.core.view.container.LicketComponentContainer;
-import org.licket.core.view.hippo.ngmodule.AngularModule;
+import org.licket.core.view.hippo.angular.ngmodule.VuePlugin;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 
@@ -25,7 +25,7 @@ public class DefaultLicketApplication implements LicketApplication, Serializable
     private LicketComponentContainer<?> rootContainer;
 
     @Autowired
-    private List<AngularModule> modules = newArrayList();
+    private List<VuePlugin> modules = newArrayList();
 
     public DefaultLicketApplication(String name) {
         this.name = name;
@@ -59,12 +59,13 @@ public void traverseDown(Predicate<LicketComponent<?>> componentVisitor) {
 
     @Override
     public void traverseDownContainers(Predicate<LicketComponentContainer<?>> containerVisitor) {
-        containerVisitor.test(rootContainer);
-        rootContainer.traverseDownContainers(containerVisitor);
+        if (containerVisitor.test(rootContainer)) {
+            rootContainer.traverseDownContainers(containerVisitor);
+        }
     }
 
     @Override
-    public final Iterable<AngularModule> modules() {
+    public final Iterable<VuePlugin> modules() {
         return modules;
     }
 }
diff --git a/licket-framework/src/main/java/org/licket/core/LicketApplication.java b/licket-framework/src/main/java/org/licket/core/LicketApplication.java
@@ -3,7 +3,7 @@
 import org.licket.core.id.CompositeId;
 import org.licket.core.view.LicketComponent;
 import org.licket.core.view.container.LicketComponentContainer;
-import org.licket.core.view.hippo.ngmodule.AngularModule;
+import org.licket.core.view.hippo.angular.ngmodule.VuePlugin;
 
 import java.util.Optional;
 import java.util.function.Predicate;
@@ -25,5 +25,5 @@ public interface LicketApplication {
 
     void traverseDownContainers(Predicate<LicketComponentContainer<?>> containerVisitor);
 
-    Iterable<AngularModule> modules();
+    Iterable<VuePlugin> modules();
 }
diff --git a/licket-framework/src/main/java/org/licket/core/model/LicketModel.java b/licket-framework/src/main/java/org/licket/core/model/LicketModel.java
@@ -2,7 +2,7 @@
 
 import java.util.function.Supplier;
 
-import static org.licket.core.common.Suppliers.of;
+import static org.licket.core.supplier.Suppliers.of;
 
 /**
  * @author activey

diff --git a/licket-framework/src/main/java/org/licket/core/module/AngularModulesConfiguration.java b/licket-framework/src/main/java/org/licket/core/module/AngularModulesConfiguration.java
@@ -1,9 +1,7 @@
 package org.licket.core.module;
 
 import org.licket.core.module.application.ApplicationModuleConfiguration;
-import org.licket.core.module.forms.FormsModuleConfiguration;
-import org.licket.core.module.http.HttpModuleConfiguration;
-import org.licket.core.module.platform.BrowserModuleConfiguration;
+import org.licket.core.module.resource.ResourcePluginConfiguration;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 
@@ -12,9 +10,7 @@
  */
 @Configuration
 @Import({
-        BrowserModuleConfiguration.class,
-        FormsModuleConfiguration.class,
-        HttpModuleConfiguration.class,
+        ResourcePluginConfiguration.class,
         ApplicationModuleConfiguration.class
 })
 public class AngularModulesConfiguration {}