From 82f37b675d2ccfa6c2c99dfb47bf44638e0b07a0 Mon Sep 17 00:00:00 2001 From: maximAtanasov Date: Mon, 16 Apr 2018 21:15:43 +0200 Subject: [PATCH 1/2] removed ID in URLs, fixed wrong wicket-version on the Homepage and fixed HTML example code --- gradle/wrapper/gradle-wrapper.jar | Bin 54333 -> 54329 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 0 gradlew.bat | 168 +++++++++--------- showcase/gradle.properties | 4 +- showcase/gradle/wrapper/gradle-wrapper.jar | Bin 54333 -> 54329 bytes .../gradle/wrapper/gradle-wrapper.properties | 4 +- showcase/gradlew | 0 showcase/gradlew.bat | 168 +++++++++--------- .../showcase/HomepageChartJs.html | 6 +- .../wickedcharts/showcase/NoIDMount.java | 32 ++++ .../showcase/ShowcaseApplication.java | 11 +- .../showcase/links/UpdateChartJsLink.java | 2 +- 13 files changed, 215 insertions(+), 182 deletions(-) mode change 100644 => 100755 gradlew mode change 100644 => 100755 showcase/gradlew create mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/NoIDMount.java diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index c44b679acd3f794ddbb3aa5e919244914911014a..01b8bf6b1f99cad9213fc495b33ad5bbab8efd20 100644 GIT binary patch delta 757 zcmY+CUr3Wt7{+&AW@@Q3QCL9d}lUxc3_mF^p| z)(+$?$+!?!XmgL2Dl--GUMhVw3CmctAKN1;-QLI1jP}S0b_l-6c`B|Fb$eAl@1l~v zTHx8GV`M%eWMHYDMq7n^)@tNUWaLH_l5N6z7|ny-WQqmSHX?qdcxqq90zj1+I8A zyNsE52L%W4d7y&#lJUtS8~MDmE9Mc&%#a?}S88c~D2pZ7SW(F~l0_p9C+f*Ms)c=t zlQibl@JFJJ4vcB&PPUM1T*F7>X52~2*tV+Br3uXrOz7pkHdv1Pb+ly1;!Uj y(VecLYYSXfi_v^YE9?d`=^l0po$FWm=X$$dXa4_}n*PpBoP999uarWIf8aNW=qTF& delta 705 zcmYL{-%Ha`7{+(rjm?$j*GjXaTd)e{D~3xfrA01^mTOixDlKYW%oMDZpcjQmAYF7} zlSc~EjINT1VkqRYY;&8=`Ey%dMEwKRMHJLc5FJmp&dvEe&-1=7oWmO&)xH_k`u7`q zHjI_nH5$#C{#tj|=k4D+zI8B-p9jW&hx1k|b(&L7Lzb!?I-4(QwjexR_rC*MBModA ztr05=;X$ODeZh5o0X{`kGBbpu`EW6grwIk_D5rCJVVU9A8_+nbz+q4}ijnKbhETMb z9vVf73AM3`wNbH)>;qO}9(D)TnI^JY9IHGZm|eR$6X{y|)@K&nf1U)-PW+ObaS4bPBl>?F&|#=#u!Oi{qn6TsNdFTeQ*PZizkJMIuq~a*@;R zThjWuc#=wb1s=lNq=I`(oHZk`)JB*3WbW_R%JAv zT5x*BL(aiW*f+RVuYi)Ab`4A0o;*M|MckdvyQ`(p@NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/showcase/gradle.properties b/showcase/gradle.properties index 91bc3047..afe04c52 100644 --- a/showcase/gradle.properties +++ b/showcase/gradle.properties @@ -2,7 +2,7 @@ spring_boot_version = 1.5.2.RELEASE springloaded_version = 1.2.5.RELEASE spring_version = 4.3.6.RELEASE hibernate.version=5.0.2.Final -wicket_spring_version=7.6.0 -wicketstuff_lazymodel_version=7.6.0 +wicket_spring_version=7.1.0 +wicketstuff_lazymodel_version=7.1.0 wicketcharts_version = 3.0.0 slf4j_version = 1.7.21 \ No newline at end of file diff --git a/showcase/gradle/wrapper/gradle-wrapper.jar b/showcase/gradle/wrapper/gradle-wrapper.jar index c44b679acd3f794ddbb3aa5e919244914911014a..01b8bf6b1f99cad9213fc495b33ad5bbab8efd20 100644 GIT binary patch delta 757 zcmY+CUr3Wt7{+&AW@@Q3QCL9d}lUxc3_mF^p| z)(+$?$+!?!XmgL2Dl--GUMhVw3CmctAKN1;-QLI1jP}S0b_l-6c`B|Fb$eAl@1l~v zTHx8GV`M%eWMHYDMq7n^)@tNUWaLH_l5N6z7|ny-WQqmSHX?qdcxqq90zj1+I8A zyNsE52L%W4d7y&#lJUtS8~MDmE9Mc&%#a?}S88c~D2pZ7SW(F~l0_p9C+f*Ms)c=t zlQibl@JFJJ4vcB&PPUM1T*F7>X52~2*tV+Br3uXrOz7pkHdv1Pb+ly1;!Uj y(VecLYYSXfi_v^YE9?d`=^l0po$FWm=X$$dXa4_}n*PpBoP999uarWIf8aNW=qTF& delta 705 zcmYL{-%Ha`7{+(rjm?$j*GjXaTd)e{D~3xfrA01^mTOixDlKYW%oMDZpcjQmAYF7} zlSc~EjINT1VkqRYY;&8=`Ey%dMEwKRMHJLc5FJmp&dvEe&-1=7oWmO&)xH_k`u7`q zHjI_nH5$#C{#tj|=k4D+zI8B-p9jW&hx1k|b(&L7Lzb!?I-4(QwjexR_rC*MBModA ztr05=;X$ODeZh5o0X{`kGBbpu`EW6grwIk_D5rCJVVU9A8_+nbz+q4}ijnKbhETMb z9vVf73AM3`wNbH)>;qO}9(D)TnI^JY9IHGZm|eR$6X{y|)@K&nf1U)-PW+ObaS4bPBl>?F&|#=#u!Oi{qn6TsNdFTeQ*PZizkJMIuq~a*@;R zThjWuc#=wb1s=lNq=I`(oHZk`)JB*3WbW_R%JAv zT5x*BL(aiW*f+RVuYi)Ab`4A0o;*M|MckdvyQ`(p@NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.html b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.html index 7fd7fb9a..b1340860 100644 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.html +++ b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.html @@ -229,7 +229,9 @@

Markup:

 <!-- HTML code -->
-<div wicket:id="chart"/>
+<div>
+    <canvas wicket:id="chart"</canvas>
+</div>
@@ -241,7 +243,7 @@

Wicket Page:

chart.setType(ChartType.LINE); chart.setOptions(new Options().setTitle(new Title().setText("My Chart"))); chart.setData(new Data().setDatasets(Arrays.asList(new Dataset().setData(IntegerValue.of(1,2,3,4))))); -... // to see more options, select a chart below and click the button "Show Java code" +//to see more options, select a chart below and click the button "Show Java code" add(new Chart("chart", chart)); diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/NoIDMount.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/NoIDMount.java new file mode 100644 index 00000000..e26d7713 --- /dev/null +++ b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/NoIDMount.java @@ -0,0 +1,32 @@ +package de.adesso.wickedcharts.showcase; + +import org.apache.wicket.core.request.handler.ListenerInterfaceRequestHandler; +import org.apache.wicket.core.request.mapper.MountedMapper; +import org.apache.wicket.request.IRequestHandler; +import org.apache.wicket.request.Url; +import org.apache.wicket.request.component.IRequestablePage; +import org.apache.wicket.request.mapper.info.PageComponentInfo; +import org.apache.wicket.request.mapper.parameter.PageParametersEncoder; +import org.apache.wicket.util.lang.Args; +import org.apache.wicket.util.string.Strings; + +public class NoIDMount extends MountedMapper { + + NoIDMount(String path, Class pageClass) { + super(path, pageClass, new PageParametersEncoder()); + } + + @Override protected void encodePageComponentInfo(Url url, PageComponentInfo info) { + if (info != null) { + String s = info.toString(); + if (!Strings.isEmpty(s)) { + try{ //If the resulting parameter is not a number then we add it to the url + Integer.parseInt(s); + }catch (NumberFormatException e){ + Url.QueryParameter parameter = new Url.QueryParameter(s, ""); + url.getQueryParameters().add(parameter); + } + } + } + } +} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/ShowcaseApplication.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/ShowcaseApplication.java index e4723e82..7a7f3571 100644 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/ShowcaseApplication.java +++ b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/ShowcaseApplication.java @@ -51,12 +51,11 @@ public void init() { JavaScriptResourceRegistry.getInstance().setJQueryReference( new JavaScriptResourceReference(ShowcaseApplication.class, "jquery-1.8.3.min-IEfix.js")); - - //mountPage("/start/chartjs", HomepageChartJs.class); - mountPage("/chartjs/", HomepageChartJs.class); - mountPage("/highcharts/", HomepageHighcharts.class); - mountPage("/simple", SimplePage.class); - mountPage("/modal", ModalWindowPage.class); + + mount(new NoIDMount("/chartjs/", HomepageChartJs.class)); + mount(new NoIDMount("/highcharts/", HomepageHighcharts.class)); + mount(new NoIDMount("/simple", SimplePage.class)); + mount(new NoIDMount("/modal", ModalWindowPage.class)); getJavaScriptLibrarySettings().setJQueryReference( new JavaScriptResourceReference(ShowcaseApplication.class, diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateChartJsLink.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateChartJsLink.java index b43a75e7..ce13f5be 100644 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateChartJsLink.java +++ b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateChartJsLink.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2012-2018 Wicked Charts (http://wicked-charts.googlecode.com) * * Licensed under the Apache License, Version 2.0 (the "License"); From 7fb6a0a8d5460a77e61f6455d80e385c534cd4e5 Mon Sep 17 00:00:00 2001 From: maximAtanasov Date: Mon, 16 Apr 2018 21:22:29 +0200 Subject: [PATCH 2/2] fixed gradlew --- gradle/wrapper/gradle-wrapper.properties | 2 +- showcase/gradle/wrapper/gradle-wrapper.properties | 2 +- .../main/java/de/adesso/wickedcharts/showcase/NoIDMount.java | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 933b6473..568c50bf 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.5.1-bin.zip diff --git a/showcase/gradle/wrapper/gradle-wrapper.properties b/showcase/gradle/wrapper/gradle-wrapper.properties index 4bbbba90..ca004e74 100644 --- a/showcase/gradle/wrapper/gradle-wrapper.properties +++ b/showcase/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.5.1-all.zip diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/NoIDMount.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/NoIDMount.java index e26d7713..b68cee08 100644 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/NoIDMount.java +++ b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/NoIDMount.java @@ -1,13 +1,10 @@ package de.adesso.wickedcharts.showcase; -import org.apache.wicket.core.request.handler.ListenerInterfaceRequestHandler; import org.apache.wicket.core.request.mapper.MountedMapper; -import org.apache.wicket.request.IRequestHandler; import org.apache.wicket.request.Url; import org.apache.wicket.request.component.IRequestablePage; import org.apache.wicket.request.mapper.info.PageComponentInfo; import org.apache.wicket.request.mapper.parameter.PageParametersEncoder; -import org.apache.wicket.util.lang.Args; import org.apache.wicket.util.string.Strings; public class NoIDMount extends MountedMapper {