You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by so...@apache.org on 2017/09/22 17:23:27 UTC
[50/50] [abbrv] wicket git commit: Wicket is compilable,
tests are fails
Wicket is compilable, tests are fails
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/11ef5c48
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/11ef5c48
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/11ef5c48
Branch: refs/heads/WICKET-6105-java.time
Commit: 11ef5c48962bb42e9e823d428b3fffb1d8b126b9
Parents: a9b06ca
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Sat Sep 23 00:20:26 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Sat Sep 23 00:20:26 2017 +0700
----------------------------------------------------------------------
NOTICE | 6 -
README.md | 4 -
pom.xml | 7 -
testing/wicket-common-tests/pom.xml | 5 -
testing/wicket-js-tests/Gruntfile.js | 4 -
.../markup/html/form/FormComponentPanel.java | 3 +-
wicket-datetime/pom.xml | 6 +-
.../org/apache/wicket/extensions/yui/VERSION | 2 -
.../apache/wicket/extensions/yui/YuiLib.java | 71 -
.../extensions/yui/assets/skins/sam/sprite.png | Bin 3745 -> 0 bytes
.../yui/calendar/AbstractCalendar.java | 260 -
.../extensions/yui/calendar/DatePicker.java | 890 ---
.../extensions/yui/calendar/DatePicker.js | 21 -
.../extensions/yui/calendar/DatePickerInit.js | 57 -
.../extensions/yui/calendar/TimeField.java | 71 -
.../yui/calendar/assets/skins/sam/calendar.css | 8 -
.../extensions/yui/calendar/calendar-min.js | 18 -
.../wicket/extensions/yui/calendar/calendar.js | 7390 ------------------
.../wicket/extensions/yui/calendar/icon1.gif | Bin 970 -> 0 bytes
.../wicket/extensions/yui/calendar/icon2.gif | Bin 1083 -> 0 bytes
.../wicket/extensions/yui/calendar/icon3.gif | Bin 1086 -> 0 bytes
.../extensions/yui/calendar/wicket-date.js | 432 -
.../apache/wicket/extensions/yui/dom/dom-min.js | 9 -
.../org/apache/wicket/extensions/yui/dom/dom.js | 1846 -----
.../wicket/extensions/yui/event/event-min.js | 11 -
.../apache/wicket/extensions/yui/event/event.js | 2537 ------
.../wicket/extensions/yui/yahoo/yahoo-min.js | 8 -
.../apache/wicket/extensions/yui/yahoo/yahoo.js | 1229 ---
.../yui/yahoodomevent/yahoo-dom-event.js | 14 -
.../extensions/yui/yuiloader/yuiloader-min.js | 11 -
.../extensions/yui/yuiloader/yuiloader.js | 4065 ----------
.../src/main/resources/META-INF/NOTICE | 3 -
.../wicket/datetime/DateConverterTest.java | 86 -
.../extensions/yui/calendar/DatePickerTest.java | 763 --
.../yui/calendar/DateTimeFieldTest.java | 71 -
.../extensions/yui/calendar/DatesPage1.html | 25 -
.../extensions/yui/calendar/DatesPage1.java | 201 -
.../yui/calendar/DatesPage1_ExpectedResult.html | 142 -
.../extensions/yui/calendar/DatesPage2.html | 11 -
.../extensions/yui/calendar/DatesPage2.java | 53 -
wicket-examples/.tomcatplugin | 2 -
wicket-examples/pom.xml | 4 -
.../bean/validation/BeanValidationPage.java | 6 +-
.../wicket/examples/bean/validation/Person.java | 12 +-
.../wicket/examples/dates/DatesApplication.java | 32 -
.../apache/wicket/examples/dates/DatesPage.html | 47 -
.../apache/wicket/examples/dates/DatesPage.java | 217 -
.../src/main/resources/META-INF/NOTICE | 3 -
.../markup/html/form/datetime/DateField.java | 2 +-
.../markup/html/form/datetime/DateLabel.java | 2 +-
.../html/form/datetime/DateTextField.java | 2 +-
.../html/form/datetime/DateTimeField.java | 15 +-
.../form/datetime/PatternDateConverter.java | 2 +-
.../html/form/datetime/StyleDateConverter.java | 8 +-
.../html/form/datetime/DateConverterTest.java | 109 +
.../main/asciidoc/helloWorld/helloWorld_1.adoc | 1 -
56 files changed, 143 insertions(+), 20661 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/11ef5c48/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index c2b4544..7cc91f9 100644
--- a/NOTICE
+++ b/NOTICE
@@ -59,9 +59,6 @@ src/./wicket-examples
This product includes ASM, released under a BSD style license (http://asm.objectweb.org).
Copyright (c) 2000-2005 INRIA, France Telecom
- This product includes software developed by
- Joda.org (http://www.joda.org/).
-
This product includes jhighlight (https://jhighlight.dev.java.net/)
which is released under CDDL 1.0 license (http://www.opensource.org/licenses/cddl1.php).
@@ -114,9 +111,6 @@ src/./wicket-datetime
http://developer.yahoo.net/yui/license.txt
Copyright (c) 2010, Yahoo! Inc.
- This product includes software developed by
- Joda.org (http://www.joda.org/).
-
---------------------------------------------------------------------------
src/./wicket-metrics
---------------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/11ef5c48/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 3ff8f95..a17dd27 100644
--- a/README.md
+++ b/README.md
@@ -157,10 +157,6 @@ the src/ folder.
As the following projects all depend on wicket, they inherit these
dependencies.
- - wicket-datetime:
-
- Joda-Time 2.4 (http://joda-time.sourceforge.net/)
-
- wicket-velocity:
Apache Velocity 1.7 (http://velocity.apache.org/) and it's dependencies
http://git-wip-us.apache.org/repos/asf/wicket/blob/11ef5c48/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c2b4997..9305f1d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,7 +89,6 @@
<module>wicket</module>
<module>wicket-core</module>
<module>wicket-util</module>
- <module>wicket-datetime</module>
<module>wicket-request</module>
<module>wicket-devutils</module>
<module>wicket-extensions</module>
@@ -127,7 +126,6 @@
<cglib.version>3.2.5</cglib.version>
<jacoco.version>0.7.9</jacoco.version>
<jetty.version>9.4.6.v20170531</jetty.version>
- <joda-time.version>2.9.9</joda-time.version>
<junit.version>4.12</junit.version>
<spring.version>4.3.10.RELEASE</spring.version>
<servlet-api.version>3.1.0</servlet-api.version>
@@ -248,11 +246,6 @@
<version>1</version>
</dependency>
<dependency>
- <groupId>joda-time</groupId>
- <artifactId>joda-time</artifactId>
- <version>${joda-time.version}</version>
- </dependency>
- <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
http://git-wip-us.apache.org/repos/asf/wicket/blob/11ef5c48/testing/wicket-common-tests/pom.xml
----------------------------------------------------------------------
diff --git a/testing/wicket-common-tests/pom.xml b/testing/wicket-common-tests/pom.xml
index 62ccc61..a8a3750 100644
--- a/testing/wicket-common-tests/pom.xml
+++ b/testing/wicket-common-tests/pom.xml
@@ -59,11 +59,6 @@
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
- <artifactId>wicket-datetime</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
<artifactId>wicket-devutils</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/wicket/blob/11ef5c48/testing/wicket-js-tests/Gruntfile.js
----------------------------------------------------------------------
diff --git a/testing/wicket-js-tests/Gruntfile.js b/testing/wicket-js-tests/Gruntfile.js
index 6cb79bd..29b746b 100644
--- a/testing/wicket-js-tests/Gruntfile.js
+++ b/testing/wicket-js-tests/Gruntfile.js
@@ -34,9 +34,6 @@ module.exports = function(grunt) {
"../../wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js",
"../../wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/wicket-filterform.js"
],
- datetimeJs = [
- "../../wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/wicket-date.js"
- ],
nativeWebSocketJs = [
"../../wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/res/js/wicket-websocket-jquery.js"
],
@@ -75,7 +72,6 @@ module.exports = function(grunt) {
jshint: {
core: coreJs,
extensions: extensionsJs,
- datetime: datetimeJs,
nativeWebSocket: nativeWebSocketJs,
testsJs: testsJs,
gymTestsJs: gymTestsJs,
http://git-wip-us.apache.org/repos/asf/wicket/blob/11ef5c48/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponentPanel.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponentPanel.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponentPanel.java
index 0112614..c85772a 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponentPanel.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponentPanel.java
@@ -40,8 +40,7 @@ import org.apache.wicket.util.visit.IVisitor;
* <p>
* Here is a simple example of a panel with two components that multiplies and sets that as the
* master model object. Note that for this simple example, setting the model value wouldn't make
- * sense, as the lhs and rhs cannot be known. For more complete examples of using this class, see
- * the wicket-datetime project.
+ * sense, as the lhs and rhs cannot be known.
* </p>
*
* <pre>
http://git-wip-us.apache.org/repos/asf/wicket/blob/11ef5c48/wicket-datetime/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-datetime/pom.xml b/wicket-datetime/pom.xml
index 26330c3..4a17324 100644
--- a/wicket-datetime/pom.xml
+++ b/wicket-datetime/pom.xml
@@ -29,12 +29,12 @@
<description>Date/Time components and utilities for Wicket</description>
<dependencies>
<dependency>
- <groupId>joda-time</groupId>
- <artifactId>joda-time</artifactId>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
- <artifactId>wicket-core</artifactId>
+ <artifactId>wicket-extensions</artifactId>
</dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/wicket/blob/11ef5c48/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/VERSION
----------------------------------------------------------------------
diff --git a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/VERSION b/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/VERSION
deleted file mode 100644
index 094e00c..0000000
--- a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/VERSION
+++ /dev/null
@@ -1,2 +0,0 @@
-http://developer.yahoo.com/yui/
-this version: 2.8.2r1
http://git-wip-us.apache.org/repos/asf/wicket/blob/11ef5c48/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/YuiLib.java
----------------------------------------------------------------------
diff --git a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/YuiLib.java b/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/YuiLib.java
deleted file mode 100644
index f8cfec5..0000000
--- a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/YuiLib.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.wicket.extensions.yui;
-
-import org.apache.wicket.Application;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import org.apache.wicket.request.resource.PackageResourceReference;
-import org.apache.wicket.request.resource.ResourceReference;
-
-/**
- * Use the {@link #load(org.apache.wicket.markup.head.IHeaderResponse)} method to initialize the YUI library using the YUI loader.
- * It is OK to call this multiple times.
- *
- * By default the resource stream gets gzipped. You may disable it via
- * Application.get().getResourceSettings().getDisableGZipCompression()
- *
- * @author eelcohillenius
- */
-public final class YuiLib
-{
- private static ResourceReference YUILOADER;
-
- /**
- * Load the YUI loader script. After that, you can declare YUI dependencies using
- * YAHOO.util.YUILoader.
- *
- * @param response
- * header response
- */
- public static void load(IHeaderResponse response)
- {
- response.render(JavaScriptHeaderItem.forReference(getYuiLoader()));
- }
-
- private static ResourceReference getYuiLoader()
- {
- if (YUILOADER == null)
- {
- StringBuilder sb = new StringBuilder("yuiloader/yuiloader");
- if (Application.get().usesDeploymentConfig())
- {
- sb.append("-min");
- }
- sb.append(".js");
- YUILOADER = new PackageResourceReference(YuiLib.class, sb.toString());
- }
- return YUILOADER;
- }
-
- /**
- * Prevent construction.
- */
- private YuiLib()
- {
- }
-}
http://git-wip-us.apache.org/repos/asf/wicket/blob/11ef5c48/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/assets/skins/sam/sprite.png
----------------------------------------------------------------------
diff --git a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/assets/skins/sam/sprite.png b/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/assets/skins/sam/sprite.png
deleted file mode 100644
index 73634d6..0000000
Binary files a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/assets/skins/sam/sprite.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/wicket/blob/11ef5c48/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/AbstractCalendar.java
----------------------------------------------------------------------
diff --git a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/AbstractCalendar.java b/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/AbstractCalendar.java
deleted file mode 100644
index b448196..0000000
--- a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/AbstractCalendar.java
+++ /dev/null
@@ -1,260 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.wicket.extensions.yui.calendar;
-
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Properties;
-
-import org.apache.wicket.extensions.yui.YuiLib;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import org.apache.wicket.markup.html.WebComponent;
-import org.apache.wicket.request.resource.PackageResourceReference;
-
-
-/**
- * Abstract calendar component based on the YUI (Yahoo User Interface library) javascript widget.
- * <p>
- * Although this component by itself is fully functional, it doesn't do much other than just
- * displaying the calendar. Hence, this class is abstract.
- * </p>
- * <p>
- * An easy way to build upon this component is to override
- * {@link #appendToInit(String, String, String, StringBuffer)} and add event handlers etc. in the
- * YUI widget's initialization function.
- * </p>
- * See <a href="http://developer.yahoo.com/yui/calendar/">YUI's calendar documentation</a> for more
- * info.
- *
- * @author eelcohillenius
- *
- * @see DatePicker
- */
-// TODO provide localization strings (base them on the messages of
-// JsDatePicker?)
-public abstract class AbstractCalendar extends WebComponent
-{
- private static final long serialVersionUID = 1L;
-
- private final boolean contributeDependencies;
-
- /**
- * Construct. Contributes packaged dependencies.
- *
- * @param id
- * The component id
- */
- public AbstractCalendar(String id)
- {
- this(id, true);
- }
-
- /**
- * Construct.
- *
- * @param id
- * The component id
- * @param contributeDependencies
- * Whether to contribute the packaged dependencies. Pass false in case you want to
- * include the dependencies manually in your own page, e.g. when you want to keep
- * them in your web application dir. To contribute yourself (in case you want to pass
- * false), your page header should look like:
- *
- * <pre>
- * <script type="text/javascript" src="yahoo.js"></script>
- * <script type="text/javascript" src="dom.js"></script>
- * <script type="text/javascript" src="event.js"></script>
- * <script type="text/javascript" src="calendar.js"></script>
- * <link rel="stylesheet" type="text/css" href="calendar.css" />
- * </pre>
- */
- public AbstractCalendar(String id, boolean contributeDependencies)
- {
-
- super(id);
- setOutputMarkupId(true);
- this.contributeDependencies = contributeDependencies;
- }
-
- /**
- * Gets the id of the javascript widget. Note that this is the non-namespaced id, so depending
- * on what you want to do with it, you may need to prepend 'YAHOO.wicket.' to it. Or you can
- * call {@link #getJavaScriptWidgetId()}.
- *
- * @return The javascript id
- * @see #getJavaScriptWidgetId()
- */
- public final String getJavaScriptId()
- {
- return getMarkupId() + "Js";
- }
-
- /**
- * The name spaced id of the widget.
- *
- * @return The widget id
- * @see #getJavaScriptId()
- */
- public final String getJavaScriptWidgetId()
- {
- return "YAHOO.wicket." + getJavaScriptId();
- }
-
- /**
- * add header contributions for packaged resources.
- *
- * @param response
- * the header response to contribute to
- */
- private void contributeDependencies(IHeaderResponse response)
- {
- response.render(JavaScriptHeaderItem.forReference(new PackageResourceReference(
- YuiLib.class, "yahoodomevent/yahoo-dom-event.js")));
- response.render(JavaScriptHeaderItem.forReference(new PackageResourceReference(
- AbstractCalendar.class, "calendar-min.js")));
- response.render(CssHeaderItem.forReference(new PackageResourceReference(
- AbstractCalendar.class, "assets/skins/sam/calendar.css")));
- }
-
- /**
- * Append javascript to the initialization function for the YUI widget. Can be used by
- * subclasses to conveniently extend configuration without having to write a separate
- * contribution.
- *
- * @param markupId
- * The markup id of the calendar component
- * @param javascriptId
- * the non-name spaced javascript id of the widget
- * @param javascriptWidgetId
- * the name space id of the widget
- * @param b
- * the buffer to append the script to
- */
- protected void appendToInit(String markupId, String javascriptId, String javascriptWidgetId,
- StringBuilder b)
- {
- }
-
- /**
- * Gives overriding classes the option of adding (or even changing/ removing) configuration
- * properties for the javascript widget. See <a
- * href="http://developer.yahoo.com/yui/calendar/">the widget's documentation</a> for the
- * available options. If you want to override/ remove properties, you obviously should call
- * <code>super.configureWidgetProperties(properties)</code>.
- *
- * @param widgetProperties
- * the current widget properties
- */
- protected void configureWidgetProperties(Map<Object, Object> widgetProperties)
- {
- }
-
- @Override
- public void renderHead(IHeaderResponse response)
- {
- if (contributeDependencies)
- {
- contributeDependencies(response);
- }
-
-
- // not pretty to look at, but cheaper than using a template
- String markupId = AbstractCalendar.this.getMarkupId();
- String javascriptId = getJavaScriptId();
- String javascriptWidgetId = getJavaScriptWidgetId();
- StringBuilder b = new StringBuilder();
- // initialize wicket namespace and register the init function
- // for the YUI widget
- b.append("YAHOO.namespace(\"wicket\");\nfunction init");
- b.append(javascriptId);
- b.append("() {\n");
-
- // instantiate the calendar object
- b.append(" ");
- b.append(javascriptWidgetId);
- b.append(" = new YAHOO.widget.Calendar(\"");
- b.append(javascriptId);
- b.append("\",\"");
- b.append(markupId);
-
- Properties p = new Properties();
- configureWidgetProperties(p);
- b.append("\", { ");
- for (Iterator<Entry<Object, Object>> i = p.entrySet().iterator(); i.hasNext();)
- {
- Entry<Object, Object> entry = i.next();
- b.append(entry.getKey());
- Object value = entry.getValue();
- if (value instanceof CharSequence)
- {
- b.append(":\"");
- b.append(value);
- b.append("\"");
- }
- else if (value instanceof CharSequence[])
- {
- b.append(":[");
- CharSequence[] valueArray = (CharSequence[])value;
- for (int j = 0; j < valueArray.length; j++)
- {
- CharSequence tmpValue = valueArray[j];
- b.append("\"");
- b.append(tmpValue);
- b.append("\"");
- if (j < valueArray.length - 1)
- {
- b.append(",");
- }
- }
- b.append("]");
- }
- else
- {
- b.append(":");
- b.append(value);
- }
- // TODO handle arrays
- if (i.hasNext())
- {
- b.append(",");
- }
- }
-
- b.append(" });\n");
-
- // append the javascript we want for our init function; call
- // this in an overridable method so that clients can add their
- // stuff without needing a big ass API
- appendToInit(markupId, javascriptId, javascriptWidgetId, b);
-
- // trigger rendering
- b.append(" ");
- b.append(javascriptWidgetId);
- b.append(".render();\n");
-
- b.append("}\n");
- // register the function for execution when the page is loaded
- b.append("YAHOO.util.Event.addListener(window, \"load\", init");
- b.append(javascriptId);
- b.append(");");
-
- response.render(JavaScriptHeaderItem.forScript(b, null));
- }
-}
http://git-wip-us.apache.org/repos/asf/wicket/blob/11ef5c48/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java
----------------------------------------------------------------------
diff --git a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java b/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java
deleted file mode 100644
index 6b09e7a..0000000
--- a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java
+++ /dev/null
@@ -1,890 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.wicket.extensions.yui.calendar;
-
-import java.text.DateFormatSymbols;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import org.apache.wicket.Application;
-import org.apache.wicket.Component;
-import org.apache.wicket.WicketRuntimeException;
-import org.apache.wicket.ajax.AjaxEventBehavior;
-import org.apache.wicket.behavior.Behavior;
-import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
-import org.apache.wicket.datetime.markup.html.form.DateTextField;
-import org.apache.wicket.extensions.yui.YuiLib;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
-import org.apache.wicket.markup.html.form.AbstractTextComponent.ITextFormatProvider;
-import org.apache.wicket.request.Response;
-import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandler;
-import org.apache.wicket.request.resource.JavaScriptResourceReference;
-import org.apache.wicket.request.resource.PackageResourceReference;
-import org.apache.wicket.request.resource.ResourceReference;
-import org.apache.wicket.util.convert.IConverter;
-import org.apache.wicket.util.convert.converter.DateConverter;
-import org.apache.wicket.util.lang.Objects;
-import org.apache.wicket.util.string.Strings;
-import org.apache.wicket.util.template.PackageTextTemplate;
-import org.apache.wicket.util.template.TextTemplate;
-import org.joda.time.DateTime;
-
-/**
- * Pops up a YUI calendar component so that the user can select a date. On selection, the date is
- * set in the component it is coupled to, after which the popup is closed again. This behavior can
- * only be used with components that either implement {@link ITextFormatProvider} or that use
- * {@link DateConverter} configured with an instance of {@link SimpleDateFormat} (like Wicket's
- * default configuration has).<br/>
- *
- * To use, simply add a new instance to your component, which would typically a TextField, like
- * {@link DateTextField}.<br/>
- *
- * The CalendarNavigator can be configured by overriding {@link #configure(java.util.Map, org.apache.wicket.markup.head.IHeaderResponse, java.util.Map)} and setting the
- * property or by returning <code>true</code> for {@link #enableMonthYearSelection()}.
- *
- * @see <a
- * href="http://developer.yahoo.com/yui/calendar/">http://developer.yahoo.com/yui/calendar/</a>
- *
- * @author eelcohillenius
- */
-public class DatePicker extends Behavior
-{
-
- /**
- * Exception thrown when the bound component does not produce a format this date picker can work
- * with.
- */
- private static final class UnableToDetermineFormatException extends WicketRuntimeException
- {
- private static final long serialVersionUID = 1L;
-
- public UnableToDetermineFormatException()
- {
- super("This behavior can only be added to components that either implement " +
- ITextFormatProvider.class.getName() +
- " AND produce a non-null format, or that use" +
- " converters that this DatePicker can use to determine" +
- " the pattern being used. Alternatively, you can extend " +
- " the DatePicker and override getDatePattern to provide your own.");
- }
- }
-
- /**
- * Format to be used when configuring YUI calendar. Can be used when using the
- * "selected" property.
- */
- // See wicket-1988: SimpleDateFormat is not thread safe. Do not use static final
- // See wicket-2525: SimpleDateFormat consumes a lot of memory
- public static String FORMAT_DATE = "MM/dd/yyyy";
-
- /**
- * For specifying which page (month/year) to show in the calendar, use this format for the date.
- * This is to be used together with the property "pagedate"
- */
- // See wicket-1988: SimpleDateFormat is not thread safe. Do not use static final
- // See wicket-2525: SimpleDateFormat consumes a lot of memory
- public static String FORMAT_PAGEDATE = "MM/yyyy";
-
- private static final ResourceReference YUI = new JavaScriptResourceReference(YuiLib.class, "");
-
- private static final ResourceReference WICKET_DATE = new JavaScriptResourceReference(
- DatePicker.class, "wicket-date.js");
-
- private static final long serialVersionUID = 1L;
-
- /** The target component. */
- private Component component;
-
- private boolean showOnFieldClick = false;
-
- /**
- * A setting that decides whether to close the date picker when the user clicks somewhere else
- * on the document.
- */
- private boolean autoHide = false;
-
- /**
- * The string to use for the close button label.
- */
- private String closeLabel = "";
-
- /**
- * Construct.
- */
- public DatePicker()
- {
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void bind(final Component component)
- {
- this.component = component;
- checkComponentProvidesDateFormat(component);
- component.setOutputMarkupId(true);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void afterRender(final Component component)
- {
- super.afterRender(component);
-
- // Append the span and img icon right after the rendering of the
- // component. Not as pretty as working with a panel etc, but works
- // for behaviors and is more efficient
- Response response = component.getResponse();
- response.write("\n<span class=\"yui-skin-sam\"> <span style=\"");
-
- if (renderOnLoad())
- {
- response.write("display:block;");
- }
- else
- {
- response.write("display:none;");
- response.write("position:absolute;");
- }
-
- response.write("z-index: 99999;\" id=\"");
- response.write(getEscapedComponentMarkupId());
- response.write("Dp\"></span><img style=\"");
- response.write(getIconStyle());
- response.write("\" id=\"");
- response.write(getIconId());
- response.write("\" src=\"");
- CharSequence iconUrl = getIconUrl();
- response.write(Strings.escapeMarkup(iconUrl != null ? iconUrl.toString() : ""));
- response.write("\" alt=\"");
- CharSequence alt = getIconAltText();
- response.write(Strings.escapeMarkup((alt != null) ? alt.toString() : ""));
- response.write("\" title=\"");
- CharSequence title = getIconTitle();
- response.write(Strings.escapeMarkup((title != null) ? title.toString() : ""));
- response.write("\"/>");
-
- if (renderOnLoad())
- {
- response.write("<br style=\"clear:left;\"/>");
- }
- response.write("</span>");
- }
-
- /**
- * Controls whether or not datepicker will contribute YUI libraries to the page as part of its
- * rendering lifecycle.
- *
- * There may be cases when the user wants to use their own version of YUI contribution code, in
- * those cases this method should be overridden to return <code>false</code>.
- *
- * @return a flag whether to contribute YUI libraries to the page. {@code true} by default.
- */
- protected boolean includeYUILibraries()
- {
- return true;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void renderHead(Component component, IHeaderResponse response)
- {
- super.renderHead(component, response);
-
- if (includeYUILibraries())
- {
- YuiLib.load(response);
- }
-
- renderHeadInit(response);
-
- // variables for the initialization script
- Map<String, Object> variables = new HashMap<>();
- String widgetId = getEscapedComponentMarkupId();
- variables.put("componentId", getComponentMarkupId());
- variables.put("widgetId", widgetId);
- variables.put("datePattern", getDatePattern());
- variables.put("fireChangeEvent", notifyComponentOnDateSelected());
- variables.put("alignWithIcon", alignWithIcon());
- variables.put("hideOnSelect", hideOnSelect());
- variables.put("showOnFieldClick", showOnFieldClick());
- variables.put("autoHide", autoHide());
- variables.put("closeLabel", closeLabel());
-
- String script = getAdditionalJavaScript();
- if (script != null)
- {
- variables.put("additionalJavascript",
- Strings.replaceAll(script, "${calendar}", "YAHOO.wicket." + widgetId + "DpJs"));
- }
-
- // print out the initialization properties
- Map<String, Object> p = new LinkedHashMap<>();
- configure(p, response, variables);
- if (!p.containsKey("navigator") && enableMonthYearSelection())
- {
- p.put("navigator", Boolean.TRUE);
- }
-
- if (enableMonthYearSelection() && p.containsKey("pages") &&
- Objects.longValue(p.get("pages")) > 1)
- {
- throw new IllegalStateException(
- "You cannot use a CalendarGroup with month/year selection!");
- }
-
- // ${calendarInit}
- StringBuilder calendarInit = new StringBuilder();
- appendMapping(p, calendarInit);
- variables.put("calendarInit", calendarInit.toString());
-
- // render initialization script with the variables interpolated
- TextTemplate datePickerJs = new PackageTextTemplate(DatePicker.class, "DatePicker.js");
- datePickerJs.interpolate(variables);
- response.render(OnDomReadyHeaderItem.forScript(datePickerJs.asString()));
-
- // remove previously generated markup (see onRendered) via javascript in
- // ajax requests to not render the yui calendar multiple times
- component.getRequestCycle().find(IPartialPageRequestHandler.class).ifPresent(target -> {
- String escapedComponentMarkupId = getEscapedComponentMarkupId();
- String javascript = "var e = Wicket.$('" + escapedComponentMarkupId + "Dp" +
- "'); if (e != null && typeof(e.parentNode) != 'undefined' && " +
- "typeof(e.parentNode.parentNode != 'undefined')) {" +
- "e.parentNode.parentNode.removeChild(e.parentNode);" + "YAHOO.wicket." +
- escapedComponentMarkupId + "DpJs.destroy(); delete YAHOO.wicket." +
- escapedComponentMarkupId + "DpJs;}";
-
- target.prependJavaScript(javascript);
- });
- }
-
- /**
- * Renders yui & wicket calendar js module loading. It is done only once per page.
- *
- * @param response
- * header response
- */
- protected void renderHeadInit(IHeaderResponse response)
- {
- String key = "DatePickerInit.js";
- if (response.wasRendered(key))
- {
- return;
- }
-
- // variables for YUILoader
- Map<String, Object> variables = new HashMap<>();
- variables.put("basePath",
- Strings.stripJSessionId(RequestCycle.get().urlFor(YUI, null).toString()) + "/");
- variables.put("Wicket.DateTimeInit.DatePath", RequestCycle.get().urlFor(WICKET_DATE, null));
-
- if (Application.get().usesDevelopmentConfig())
- {
- variables.put("filter", "filter: \"RAW\",");
- variables.put("allowRollup", false);
- }
- else
- {
- variables.put("filter", "");
- variables.put("allowRollup", true);
- }
-
- TextTemplate template = new PackageTextTemplate(DatePicker.class, key);
- response.render(OnDomReadyHeaderItem.forScript(template.asString(variables)));
-
- response.markRendered(key);
- }
-
- /**
- * Check that this behavior can get a date format out of the component it is coupled to. It
- * checks whether {@link #getDatePattern()} produces a non-null value. If that method returns
- * null, and exception will be thrown
- *
- * @param component
- * the component this behavior is being coupled to
- * @throws UnableToDetermineFormatException
- * if this date picker is unable to determine a format.
- */
- private void checkComponentProvidesDateFormat(final Component component)
- {
- if (getDatePattern() == null)
- {
- throw new UnableToDetermineFormatException();
- }
- }
-
- /**
- * Set widget property if the array is null and has a length greater than 0.
- *
- * @param widgetProperties
- * @param key
- * @param array
- */
- private void setWidgetProperty(final Map<String, Object> widgetProperties, final String key,
- final String[] array)
- {
- if (array != null && array.length > 0)
- {
- widgetProperties.put(key, array);
- }
- }
-
- /**
- * Whether to position the date picker relative to the trigger icon.
- *
- * @return If true, the date picker is aligned with the left position of the icon, and with the
- * top right under. If false, the date picker will skip positioning and will let you do
- * the positioning yourself. Returns true by default.
- */
- protected boolean alignWithIcon()
- {
- return true;
- }
-
- /**
- * Gives overriding classes the option of adding (or even changing/ removing) configuration
- * properties for the javascript widget. See <a
- * href="http://developer.yahoo.com/yui/calendar/">the widget's documentation</a> for the
- * available options. If you want to override/ remove properties, you should call
- * super.configure(properties) first. If you don't call that, be aware that you will have to
- * call {@link #localize(java.util.Map, org.apache.wicket.markup.head.IHeaderResponse, java.util.Map)} manually if you like localized strings to be added.
- *
- * @param widgetProperties
- * the current widget properties
- * @param response
- * the header response
- * @param initVariables
- * variables passed to the Wicket.DateTime.init() js method
- */
- protected void configure(final Map<String, Object> widgetProperties,
- final IHeaderResponse response, final Map<String, Object> initVariables)
- {
- widgetProperties.put("close", true);
-
- // localize date fields
- localize(widgetProperties, response, initVariables);
-
- Object modelObject = component.getDefaultModelObject();
- // null and cast check
- if (modelObject instanceof Date)
- {
- Date date = (Date)modelObject;
- widgetProperties.put("selected", new SimpleDateFormat(FORMAT_DATE).format(date));
- widgetProperties.put("pagedate", new SimpleDateFormat(FORMAT_PAGEDATE).format(date));
- }
- }
-
- /**
- * Filter all empty elements (workaround for {@link DateFormatSymbols} returning arrays with
- * empty elements).
- *
- * @param stringArray
- * array to filter
- * @return filtered array (without null or empty string elements)
- */
- protected final String[] filterEmpty(String[] stringArray)
- {
- if (stringArray == null)
- {
- return null;
- }
-
- List<String> list = new ArrayList<>(stringArray.length);
- for (String string : stringArray)
- {
- if (!Strings.isEmpty(string))
- {
- list.add(string);
- }
- }
- return list.toArray(new String[list.size()]);
- }
-
- /**
- * Gets the id of the component that the calendar widget will get attached to.
- *
- * @return The DOM id of the component
- */
- protected final String getComponentMarkupId()
- {
- return component.getMarkupId();
- }
-
- /**
- * Gets the date pattern to use for putting selected values in the coupled component.
- *
- * @return The date pattern
- */
- protected String getDatePattern()
- {
- String format = null;
- if (component instanceof ITextFormatProvider)
- {
- format = ((ITextFormatProvider)component).getTextFormat();
- // it is possible that components implement ITextFormatProvider but
- // don't provide a format
- }
-
- if (format == null)
- {
- IConverter<?> converter = component.getConverter(DateTime.class);
- if (!(converter instanceof DateConverter))
- {
- converter = component.getConverter(Date.class);
- }
- format = ((SimpleDateFormat)((DateConverter)converter).getDateFormat(component.getLocale())).toPattern();
- }
-
- return format;
- }
-
- /**
- * Gets the escaped DOM id that the calendar widget will get attached to. All non word
- * characters (\W) will be removed from the string.
- *
- * @return The DOM id of the calendar widget - same as the component's markup id + 'Dp'}
- */
- protected final String getEscapedComponentMarkupId()
- {
- return component.getMarkupId().replaceAll("\\W", "");
- }
-
- /**
- * Gets the id of the icon that triggers the popup.
- *
- * @return The id of the icon
- */
- protected final String getIconId()
- {
- return getEscapedComponentMarkupId() + "Icon";
- }
-
- /**
- * Gets the style of the icon that triggers the popup.
- *
- * @return The style of the icon, e.g. 'cursor: point' etc.
- */
- protected String getIconStyle()
- {
- return "cursor: pointer; border: none;";
- }
-
- /**
- * Gets the title attribute of the datepicker icon
- *
- * @return text
- */
- protected CharSequence getIconTitle()
- {
- return "";
- }
-
- /**
- * Gets the icon alt text for the datepicker icon
- *
- * @return text
- */
- protected CharSequence getIconAltText()
- {
- return "";
- }
-
- /**
- * Gets the url for the popup button. Users can override to provide their own icon URL.
- *
- * @return the url to use for the popup button/ icon
- */
- protected CharSequence getIconUrl()
- {
- return RequestCycle.get().urlFor(
- new ResourceReferenceRequestHandler(new PackageResourceReference(DatePicker.class,
- "icon1.gif")));
- }
-
- /**
- * Gets the locale that should be used to configure this widget.
- *
- * @return By default the locale of the bound component.
- */
- protected Locale getLocale()
- {
- return component.getLocale();
- }
-
- /**
- * Configure the localized strings for the datepicker widget. This implementation uses
- * {@link DateFormatSymbols} and some slight string manipulation to get the strings for months
- * and week days. Also, the first week day is set according to the {@link Locale} returned by
- * {@link #getLocale()}. It should work well for most locales.
- * <p>
- * This method is called from {@link #configure(java.util.Map, org.apache.wicket.markup.head.IHeaderResponse, java.util.Map)} and can be overridden if
- * you want to customize setting up the localized strings but are happy with the rest of
- * {@link #configure(java.util.Map, org.apache.wicket.markup.head.IHeaderResponse, java.util.Map)}'s behavior. Note that you can call (overridable)
- * method {@link #getLocale()} to get the locale that should be used for setting up the widget.
- * </p>
- * <p>
- * See YUI Calendar's <a href="http://developer.yahoo.com/yui/examples/calendar/germany/1.html">
- * German</a> and <a
- * href="http://developer.yahoo.com/yui/examples/calendar/japan/1.html">Japanese</a> examples
- * for more info.
- * </p>
- *
- * @param widgetProperties
- * the current widget properties
- * @param response
- * the header response
- * @param initVariables
- * variables passed to the Wicket.DateTime.init() js method
- */
- protected void localize(Map<String, Object> widgetProperties, IHeaderResponse response,
- Map<String, Object> initVariables)
- {
- Locale locale = getLocale();
- String key = "Wicket.DateTimeInit.CalendarI18n[\"" + locale.toString() + "\"]";
- initVariables.put("i18n", key);
-
- if (response.wasRendered(key))
- {
- return;
- }
-
- DateFormatSymbols dfSymbols = DateFormatSymbols.getInstance(locale);
- if (dfSymbols == null)
- {
- dfSymbols = new DateFormatSymbols(locale);
- }
-
- Map<String, Object> i18nVariables = new LinkedHashMap<>();
- setWidgetProperty(i18nVariables, "MONTHS_SHORT", filterEmpty(dfSymbols.getShortMonths()));
- setWidgetProperty(i18nVariables, "MONTHS_LONG", filterEmpty(dfSymbols.getMonths()));
- setWidgetProperty(i18nVariables, "WEEKDAYS_MEDIUM",
- filterEmpty(dfSymbols.getShortWeekdays()));
- setWidgetProperty(i18nVariables, "WEEKDAYS_LONG", filterEmpty(dfSymbols.getWeekdays()));
-
- i18nVariables.put("START_WEEKDAY", getFirstDayOfWeek(locale));
-
- if (Locale.SIMPLIFIED_CHINESE.equals(locale) || Locale.TRADITIONAL_CHINESE.equals(locale))
- {
- setWidgetProperty(i18nVariables, "WEEKDAYS_1CHAR",
- filterEmpty(substring(dfSymbols.getShortWeekdays(), 2, 1)));
- i18nVariables.put("WEEKDAYS_SHORT",
- filterEmpty(substring(dfSymbols.getShortWeekdays(), 2, 1)));
- }
- else
- {
- setWidgetProperty(i18nVariables, "WEEKDAYS_1CHAR",
- filterEmpty(substring(dfSymbols.getShortWeekdays(), 0, 1)));
- setWidgetProperty(i18nVariables, "WEEKDAYS_SHORT",
- filterEmpty(substring(dfSymbols.getShortWeekdays(), 0, 2)));
- }
-
- StringBuilder i18n = new StringBuilder(key);
- i18n.append('=');
- appendMapping(i18nVariables, i18n);
- i18n.append(';');
-
- response.render(OnDomReadyHeaderItem.forScript(i18n.toString()));
-
- response.wasRendered(key);
- }
-
- /**
- * Gets the first day of week of a given locale.
- *
- * @return By default the first day of week accordingly to Calendar class.
- */
- protected int getFirstDayOfWeek(Locale locale)
- {
- return Calendar.getInstance(locale).getFirstDayOfWeek() - 1;
- }
-
- /**
- * Whether to notify the associated component when a date is selected. Notifying is done by
- * calling the associated component's onchange JavaScript event handler. You can for instance
- * attach an {@link AjaxEventBehavior} to that component to get a call back to the server. The
- * default is true.
- *
- * @return if true, notifies the associated component when a date is selected
- */
- protected boolean notifyComponentOnDateSelected()
- {
- return true;
- }
-
- /**
- * Makes a copy of the provided array and for each element copy the substring 0..len to the new
- * array
- *
- * @param array
- * array to copy from
- * @param len
- * size of substring for each element to copy
- * @return copy of the array filled with substrings.
- */
- protected final String[] substring(final String[] array, final int len)
- {
- return substring(array, 0, len);
- }
-
- /**
- * Makes a copy of the provided array and for each element copy the substring 0..len to the new
- * array
- *
- * @param array
- * array to copy from
- * @param start
- * start position of the substring
- * @param len
- * size of substring for each element to copy
- * @return copy of the array filled with substrings.
- */
- protected final String[] substring(final String[] array, final int start, final int len)
- {
- if (array != null)
- {
- String[] copy = new String[array.length];
- for (int i = 0; i < array.length; i++)
- {
- String el = array[i];
- if (el != null)
- {
- if (el.length() > (start + len))
- {
- copy[i] = el.substring(start, start + len);
- }
- else
- {
- copy[i] = el;
- }
- }
- }
- return copy;
- }
- return null;
- }
-
- /**
- * Indicates whether plain text is rendered or two select boxes are used to allow direct
- * selection of month and year.
- *
- * @return <code>true</code> if select boxes should be rendered to allow month and year
- * selection.<br/>
- * <code>false</code> to render just plain text.
- */
- protected boolean enableMonthYearSelection()
- {
- return false;
- }
-
- /**
- * Indicates whether the calendar should be hidden after a date was selected.
- *
- * @return <code>true</code> (default) if the calendar should be hidden after the date selection <br/>
- * <code>false</code> if the calendar should remain visible after the date selection.
- */
- protected boolean hideOnSelect()
- {
- return true;
- }
-
- /**
- * Indicates whether the calendar should be shown when corresponding text input is clicked.
- *
- * @return <code>true</code> <br/>
- * <code>false</code> (default)
- */
- protected boolean showOnFieldClick()
- {
- return showOnFieldClick;
- }
-
- /**
- * @param show
- * a flag indicating whether to show the picker on click event
- * @return {@code this} instance to be able to chain calls
- * @see {@link #showOnFieldClick()}
- */
- public DatePicker setShowOnFieldClick(boolean show)
- {
- showOnFieldClick = show;
- return this;
- }
-
-
- /**
- * Indicates whether the calendar should be hidden when the user clicks on an area of the
- * document outside of the dialog.
- *
- * @return <code>true</code> <br/>
- * <code>false</code> (default)
- */
- protected boolean autoHide()
- {
- return autoHide;
- }
-
- /**
- * @param autoHide
- * a flag indicating whether to hide the picker on click event
- * @return {@code this} instance to be able to chain calls
- * @see {@link #autoHide()}
- */
- public DatePicker setAutoHide(boolean autoHide)
- {
- this.autoHide = autoHide;
- return this;
- }
-
- /**
- * The string to use for the close button label.
- *
- * @return label
- */
- protected String closeLabel()
- {
- return closeLabel;
- }
-
- /**
- * @param closeLabel
- * The string to use for the close button label.
- */
- public void setCloseLabel(String closeLabel)
- {
- this.closeLabel = closeLabel;
- }
-
- /**
- * Indicates whether the calendar should be rendered after it has been loaded.
- *
- * @return <code>true</code> if the calendar should be rendered after it has been loaded.<br/>
- * <code>false</code> (default) if it's initially hidden.
- */
- protected boolean renderOnLoad()
- {
- return false;
- }
-
- /**
- * Override this method to further customize the YUI Calendar with additional JavaScript code.
- * The code returned by this method is executed right after the Calendar has been constructed
- * and initialized. To refer to the actual Calendar DOM object, use <code>${calendar}</code> in
- * your code.<br/>
- * See <a href="http://developer.yahoo.com/yui/calendar/">the widget's documentation</a> for
- * more information about the YUI Calendar.<br/>
- * Example:
- *
- * <pre>
- * protected String getAdditionalJavaScript()
- * {
- * return "${calendar}.addRenderer(\"10/3\", ${calendar}.renderCellStyleHighlight1);";
- * }
- * </pre>
- *
- * @return a String containing additional JavaScript code
- */
- protected String getAdditionalJavaScript()
- {
- return "";
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public boolean isEnabled(final Component component)
- {
- return component.isEnabledInHierarchy();
- }
-
- /**
- *
- * @param map
- * the key-value pairs to be serialized
- * @param json
- * the buffer holding the constructed json
- */
- private void appendMapping(final Map<String, Object> map, final StringBuilder json)
- {
- json.append('{');
- for (Iterator<Entry<String, Object>> i = map.entrySet().iterator(); i.hasNext();)
- {
- Entry<String, Object> entry = i.next();
- json.append(entry.getKey());
- Object value = entry.getValue();
- if (value instanceof CharSequence)
- {
- json.append(":\"");
- json.append(Strings.toEscapedUnicode(value.toString()));
- json.append('"');
- }
- else if (value instanceof CharSequence[])
- {
- json.append(":[");
- CharSequence[] valueArray = (CharSequence[])value;
- for (int j = 0; j < valueArray.length; j++)
- {
- CharSequence tmpValue = valueArray[j];
- if (j > 0)
- {
- json.append(',');
- }
- if (tmpValue != null)
- {
- json.append('"');
- json.append(Strings.toEscapedUnicode(tmpValue.toString()));
- json.append('"');
- }
- }
- json.append(']');
- }
- else if (value instanceof Map)
- {
- json.append(':');
- @SuppressWarnings("unchecked")
- Map<String, Object> nmap = (Map<String, Object>)value;
- appendMapping(nmap, json);
- }
- else
- {
- json.append(':');
- json.append(Strings.toEscapedUnicode(String.valueOf(value)));
- }
- if (i.hasNext())
- {
- json.append(',');
- }
- }
- json.append('}');
- }
-}
http://git-wip-us.apache.org/repos/asf/wicket/blob/11ef5c48/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.js
----------------------------------------------------------------------
diff --git a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.js b/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.js
deleted file mode 100644
index e40e0c2..0000000
--- a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-Wicket.DateTimeInit.CalendarAdd(function() {
- Wicket.DateTime.init2("${widgetId}", "${componentId}", ${calendarInit}, "${datePattern}",
- ${alignWithIcon}, ${fireChangeEvent}, ${hideOnSelect}, ${showOnFieldClick}, ${i18n}, ${autoHide}, "${closeLabel}");
- ${additionalJavascript}
-});
http://git-wip-us.apache.org/repos/asf/wicket/blob/11ef5c48/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePickerInit.js
----------------------------------------------------------------------
diff --git a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePickerInit.js b/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePickerInit.js
deleted file mode 100644
index 61b4056..0000000
--- a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePickerInit.js
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-if (typeof(Wicket) === 'undefined') {
- window.Wicket = {};
-}
-if (typeof(Wicket.DateTimeInit) === 'undefined') {
- Wicket.DateTimeInit = {};
-}
-
-Wicket.DateTimeInit.CalendarInits = [];
-Wicket.DateTimeInit.CalendarInitFinished = false;
-Wicket.DateTimeInit.CalendarI18n = {};
-Wicket.DateTimeInit.CalendarAdd = function(initFn) {
- if (Wicket.DateTimeInit.CalendarInitFinished) {
- // when a DatePicker is added via ajax, the loader is already finished, so
- // we call the init function directly.
- initFn();
- } else {
- // when page is rendered, all calendar components will be initialized after
- // the required js libraries have been loaded.
- Wicket.DateTimeInit.CalendarInits.push(initFn);
- }
-};
-
-Wicket.DateTimeInit.YuiLoader = new YAHOO.util.YUILoader({
- base: "${basePath}",
- ${filter}
- allowRollup: ${allowRollup},
- require: ["wicket-date"],
- onSuccess: function() {
- Wicket.DateTimeInit.CalendarInitFinished = true;
- while (Wicket.DateTimeInit.CalendarInits.length > 0) {
- Wicket.DateTimeInit.CalendarInits.pop()();
- }
- }
-});
-Wicket.DateTimeInit.YuiLoader.addModule({
- name: "wicket-date",
- type: "js",
- requires: ["calendar"],
- fullpath: "${Wicket.DateTimeInit.DatePath}"
-});
-Wicket.DateTimeInit.YuiLoader.insert();
http://git-wip-us.apache.org/repos/asf/wicket/blob/11ef5c48/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/TimeField.java
----------------------------------------------------------------------
diff --git a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/TimeField.java b/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/TimeField.java
deleted file mode 100644
index 3d98b31..0000000
--- a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/TimeField.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.wicket.extensions.yui.calendar;
-
-import java.util.Date;
-import java.util.Locale;
-
-import org.apache.wicket.model.IModel;
-
-/**
- * Works on a {@link java.util.Date} object. Displays a field for hours and a field for minutes, and
- * an AM/PM field. The format (12h/24h) of the hours field depends on the time format of this
- * {@link TimeField}'s {@link Locale}, as does the visibility of the AM/PM field (see
- * {@link TimeField#use12HourFormat}).
- *
- * @author eelcohillenius
- * @see DateField for a variant with just the date field and date picker
- */
-public class TimeField extends DateTimeField
-{
- private static final long serialVersionUID = 1L;
-
- /**
- * Construct.
- *
- * @param id
- * the component id
- */
- public TimeField(String id)
- {
- this(id, null);
- }
-
- /**
- * Construct.
- *
- * @param id
- * the component id
- * @param model
- * the component's model
- */
- public TimeField(String id, IModel<Date> model)
- {
- super(id, model);
-
- getDateTextField().setVisibilityAllowed(false);
- }
-
- @Override
- public void convertInput()
- {
- Date modelObject = (Date)getDefaultModelObject();
- getDateTextField().setConvertedInput(modelObject != null ? modelObject : newDateInstance());
- super.convertInput();
- }
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/11ef5c48/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/assets/skins/sam/calendar.css
----------------------------------------------------------------------
diff --git a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/assets/skins/sam/calendar.css b/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/assets/skins/sam/calendar.css
deleted file mode 100644
index 3e932f4..0000000
--- a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/assets/skins/sam/calendar.css
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
-Copyright (c) 2011, Yahoo! Inc. All rights reserved.
-Code licensed under the BSD License:
-http://developer.yahoo.com/yui/license.html
-version: 2.9.0
-*/
-.yui-calcontainer{position:relative;float:left;_overflow:hidden}.yui-calcontainer iframe{position:absolute;border:0;margin:0;padding:0;z-index:0;width:100%;height:100%;left:0;top:0}.yui-calcontainer iframe.fixedsize{width:50em;height:50em;top:-1px;left:-1px}.yui-calcontainer.multi .groupcal{z-index:1;float:left;position:relative}.yui-calcontainer .title{position:relative;z-index:1}.yui-calcontainer .close-icon{position:absolute;z-index:1;text-indent:-10000em;overflow:hidden}.yui-calendar{position:relative}.yui-calendar .calnavleft{position:absolute;z-index:1;text-indent:-10000em;overflow:hidden}.yui-calendar .calnavright{position:absolute;z-index:1;text-indent:-10000em;overflow:hidden}.yui-calendar .calheader{position:relative;width:100%;text-align:center}.yui-calcontainer .yui-cal-nav-mask{position:absolute;z-index:2;margin:0;padding:0;width:100%;height:100%;_width:0;_height:0;left:0;top:0;display:none}.yui-calcontainer .yui-cal-nav{position:absolute;z-index:3;top:0;display:none}.y
ui-calcontainer .yui-cal-nav .yui-cal-nav-btn{display:-moz-inline-box;display:inline-block}.yui-calcontainer .yui-cal-nav .yui-cal-nav-btn button{display:block;*display:inline-block;*overflow:visible;border:0;background-color:transparent;cursor:pointer}.yui-calendar .calbody a:hover{background:inherit}p#clear{clear:left;padding-top:10px}.yui-skin-sam .yui-calcontainer{background-color:#f2f2f2;border:1px solid #808080;padding:10px}.yui-skin-sam .yui-calcontainer.multi{padding:0 5px 0 5px}.yui-skin-sam .yui-calcontainer.multi .groupcal{background-color:transparent;border:0;padding:10px 5px 10px 5px;margin:0}.yui-skin-sam .yui-calcontainer .title{background:url(../../../../assets/skins/sam/sprite.png) repeat-x 0 0;border-bottom:1px solid #ccc;font:100% sans-serif;color:#000;font-weight:bold;height:auto;padding:.4em;margin:0 -10px 10px -10px;top:0;left:0;text-align:left}.yui-skin-sam .yui-calcontainer.multi .title{margin:0 -5px 0 -5px}.yui-skin-sam .yui-calcontainer.withtitle{padding-to
p:0}.yui-skin-sam .yui-calcontainer .calclose{background:url(../../../../assets/skins/sam/sprite.png) no-repeat 0 -300px;width:25px;height:15px;top:.4em;right:.4em;cursor:pointer}.yui-skin-sam .yui-calendar{border-spacing:0;border-collapse:collapse;font:100% sans-serif;text-align:center;margin:0}.yui-skin-sam .yui-calendar .calhead{background:transparent;border:0;vertical-align:middle;padding:0}.yui-skin-sam .yui-calendar .calheader{background:transparent;font-weight:bold;padding:0 0 .6em 0;text-align:center}.yui-skin-sam .yui-calendar .calheader img{border:0}.yui-skin-sam .yui-calendar .calnavleft{background:url(../../../../assets/skins/sam/sprite.png) no-repeat 0 -450px;width:25px;height:15px;top:0;bottom:0;left:-10px;margin-left:.4em;cursor:pointer}.yui-skin-sam .yui-calendar .calnavright{background:url(../../../../assets/skins/sam/sprite.png) no-repeat 0 -500px;width:25px;height:15px;top:0;bottom:0;right:-10px;margin-right:.4em;cursor:pointer}.yui-skin-sam .yui-calendar .calweek
dayrow{height:2em}.yui-skin-sam .yui-calendar .calweekdayrow th{padding:0;border:0}.yui-skin-sam .yui-calendar .calweekdaycell{color:#000;font-weight:bold;text-align:center;width:2em}.yui-skin-sam .yui-calendar .calfoot{background-color:#f2f2f2}.yui-skin-sam .yui-calendar .calrowhead,.yui-skin-sam .yui-calendar .calrowfoot{color:#a6a6a6;font-size:85%;font-style:normal;font-weight:normal;border:0}.yui-skin-sam .yui-calendar .calrowhead{text-align:right;padding:0 2px 0 0}.yui-skin-sam .yui-calendar .calrowfoot{text-align:left;padding:0 0 0 2px}.yui-skin-sam .yui-calendar td.calcell{border:1px solid #ccc;background:#fff;padding:1px;height:1.6em;line-height:1.6em;text-align:center;white-space:nowrap}.yui-skin-sam .yui-calendar td.calcell a{color:#06c;display:block;height:100%;text-decoration:none}.yui-skin-sam .yui-calendar td.calcell.today{background-color:#000}.yui-skin-sam .yui-calendar td.calcell.today a{background-color:#fff}.yui-skin-sam .yui-calendar td.calcell.oom{background-col
or:#ccc;color:#a6a6a6;cursor:default}.yui-skin-sam .yui-calendar td.calcell.oom a{color:#a6a6a6}.yui-skin-sam .yui-calendar td.calcell.selected{background-color:#fff;color:#000}.yui-skin-sam .yui-calendar td.calcell.selected a{background-color:#b3d4ff;color:#000}.yui-skin-sam .yui-calendar td.calcell.calcellhover{background-color:#426fd9;color:#fff;cursor:pointer}.yui-skin-sam .yui-calendar td.calcell.calcellhover a{background-color:#426fd9;color:#fff}.yui-skin-sam .yui-calendar td.calcell.previous{color:#e0e0e0}.yui-skin-sam .yui-calendar td.calcell.restricted{text-decoration:line-through}.yui-skin-sam .yui-calendar td.calcell.highlight1{background-color:#cf9}.yui-skin-sam .yui-calendar td.calcell.highlight2{background-color:#9cf}.yui-skin-sam .yui-calendar td.calcell.highlight3{background-color:#fcc}.yui-skin-sam .yui-calendar td.calcell.highlight4{background-color:#cf9}.yui-skin-sam .yui-calendar a.calnav{border:1px solid #f2f2f2;padding:0 4px;text-decoration:none;color:#000;zoom
:1}.yui-skin-sam .yui-calendar a.calnav:hover{background:url(../../../../assets/skins/sam/sprite.png) repeat-x 0 0;border-color:#a0a0a0;cursor:pointer}.yui-skin-sam .yui-calcontainer .yui-cal-nav-mask{background-color:#000;opacity:.25;filter:alpha(opacity=25)}.yui-skin-sam .yui-calcontainer .yui-cal-nav{font-family:arial,helvetica,clean,sans-serif;font-size:93%;border:1px solid #808080;left:50%;margin-left:-7em;width:14em;padding:0;top:2.5em;background-color:#f2f2f2}.yui-skin-sam .yui-calcontainer.withtitle .yui-cal-nav{top:4.5em}.yui-skin-sam .yui-calcontainer.multi .yui-cal-nav{width:16em;margin-left:-8em}.yui-skin-sam .yui-calcontainer .yui-cal-nav-y,.yui-skin-sam .yui-calcontainer .yui-cal-nav-m,.yui-skin-sam .yui-calcontainer .yui-cal-nav-b{padding:5px 10px 5px 10px}.yui-skin-sam .yui-calcontainer .yui-cal-nav-b{text-align:center}.yui-skin-sam .yui-calcontainer .yui-cal-nav-e{margin-top:5px;padding:5px;background-color:#edf5ff;border-top:1px solid black;display:none}.yui-skin-s
am .yui-calcontainer .yui-cal-nav label{display:block;font-weight:bold}
-.yui-skin-sam .yui-calcontainer .yui-cal-nav-mc{width:100%;_width:auto}.yui-skin-sam .yui-calcontainer .yui-cal-nav-y input.yui-invalid{background-color:#ffee69;border:1px solid #000}.yui-skin-sam .yui-calcontainer .yui-cal-nav-yc{width:4em}.yui-skin-sam .yui-calcontainer .yui-cal-nav .yui-cal-nav-btn{border:1px solid #808080;background:url(../../../../assets/skins/sam/sprite.png) repeat-x 0 0;background-color:#ccc;margin:auto .15em}.yui-skin-sam .yui-calcontainer .yui-cal-nav .yui-cal-nav-btn button{padding:0 8px;font-size:93%;line-height:2;*line-height:1.7;min-height:2em;*min-height:auto;color:#000}.yui-skin-sam .yui-calcontainer .yui-cal-nav .yui-cal-nav-btn.yui-default{border:1px solid #304369;background-color:#426fd9;background:url(../../../../assets/skins/sam/sprite.png) repeat-x 0 -1400px}.yui-skin-sam .yui-calcontainer .yui-cal-nav .yui-cal-nav-btn.yui-default button{color:#fff}