Merge branch 'development'

NaluKit · Jan 23, 2019 · 0121e65 · 0121e65
2 parents 3577ed4 + 0f1bb54
commit 0121e65
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/nalu/src/main/java/com/github/nalukit/nalu/client/Nalu.java b/nalu/src/main/java/com/github/nalukit/nalu/client/Nalu.java
@@ -46,10 +46,10 @@ public static boolean isUsingColonForParametersInUrl() {
    * Comparing route '/app/person/3/edit/ with '/app/person/*&#47;edit'
    * will return true
    * <p>
-   * Comparing route '/app/person/3/edit/ with '/app/person/edit/*&#47'
+   * Comparing route '/app/person/3/edit/ with '/app/person/edit/*&#47;'
    * will return false.
    * <p>
-   * Comparing route '/app/person/3/edit/ with '/app/person/*&#47/*&#47'
+   * Comparing route '/app/person/3/edit/ with '/app/person/*&#47;/*&#47;'
    * will return true.
    *
    * @param route     the route containing parameter values instead of '*'
@@ -73,10 +73,10 @@ public static boolean match(String route,
    * Comparing route '/app/person/3/edit/ with '/app/person/*&#47;edit'
    * will return true
    * <p>
-   * Comparing route '/app/person/3/edit/ with '/app/person/edit/*&#47'
+   * Comparing route '/app/person/3/edit/ with '/app/person/edit/*&#47;'
    * will return false.
    * <p>
-   * Comparing route '/app/person/3/edit/ with '/app/person/*&#47/*&#47'
+   * Comparing route '/app/person/3/edit/ with '/app/person/*&#47;/*&#47;'
    * will return true.
    *
    * @param route     the route containing parameter values instead of '*'

diff --git a/nalu/src/main/java/com/github/nalukit/nalu/client/component/AbstractComponentController.java b/nalu/src/main/java/com/github/nalukit/nalu/client/component/AbstractComponentController.java
@@ -63,7 +63,7 @@ public W asElement() {
    * Method will be called in case the element is attached to the DOM.
    * <p>
    * The method is used by the framework!
-   * <p>>
+   * <p>
    * <b>DO NOT CALL THIS METHOD! THIS WILL LEAD TO UNEXPECTED BEHAVIOR!</b>
    */
   @NaluInternalUse
@@ -76,7 +76,7 @@ public final void onAttach() {
    * Method will be called in case the element is removed from the DOM
    * <p>
    * The method is used by the framework!
-   * <p>>
+   * <p>
    * <b>DO NOT CALL THIS METHOD! THIS WILL LEAD TO UNEXPECTED BEHAVIOR!</b>
    */
   @NaluInternalUse
@@ -102,7 +102,7 @@ public String mayStop() {
    * stop-method f the controller is called
    * <p>
    * The method is used by the framework!
-   * <p>>
+   * <p>
    * <b>DO NOT CALL THIS METHOD! THIS WILL LEAD TO UNEXPECTED BEHAVIOR!</b>
    */
   @NaluInternalUse

diff --git a/nalu/src/main/java/com/github/nalukit/nalu/client/internal/route/AbstractRouter.java b/nalu/src/main/java/com/github/nalukit/nalu/client/internal/route/AbstractRouter.java
@@ -852,7 +852,7 @@ private void route(String newRoute,
    *
    * @param route route to navigate to
    * @param parms parameters of the route
-   * @return
+   * @return generate String of new route
    */
   public String generate(String route,
                          String... parms) {

diff --git a/nalu/src/main/java/com/github/nalukit/nalu/client/internal/route/RouterUtils.java b/nalu/src/main/java/com/github/nalukit/nalu/client/internal/route/RouterUtils.java
@@ -15,10 +15,10 @@ public class RouterUtils {
    * Comparing route '/app/person/3/edit/ with '/app/person/*&#47;edit'
    * will return true
    * <p>
-   * Comparing route '/app/person/3/edit/ with '/app/person/edit/*&#47'
+   * Comparing route '/app/person/3/edit/ with '/app/person/edit/*&#47;'
    * will return false.
    * <p>
-   * Comparing route '/app/person/3/edit/ with '/app/person/*&#47/*&#47'
+   * Comparing route '/app/person/3/edit/ with '/app/person/*&#47;/*&#47;'
    * will return true.
    *
    * @param route     the route containing parameter values instead of '*'
@@ -43,10 +43,10 @@ public static boolean match(String route,
    * Comparing route '/app/person/3/edit/ with '/app/person/*&#47;edit'
    * will return true
    * <p>
-   * Comparing route '/app/person/3/edit/ with '/app/person/edit/*&#47'
+   * Comparing route '/app/person/3/edit/ with '/app/person/edit/*&#47;'
    * will return false.
    * <p>
-   * Comparing route '/app/person/3/edit/ with '/app/person/*&#47/*&#47'
+   * Comparing route '/app/person/3/edit/ with '/app/person/*&#47;/*&#47;'
    * will return true.
    *
    * @param route     the route containing parameter values instead of '*'