You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2016/03/14 16:04:26 UTC

[09/10] wicket git commit: Merge branch 'master' into static-factories-for-lambdas

Merge branch 'master' into static-factories-for-lambdas


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/87187c21
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/87187c21
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/87187c21

Branch: refs/heads/master
Commit: 87187c21963ec998d1b5c3db6d5ebd80fed5c61d
Parents: 733d0ab 9ce6d42
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Mar 14 16:00:51 2016 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Mar 14 16:00:51 2016 +0100

----------------------------------------------------------------------
 .../java/org/apache/wicket/Application.java     |   4 +-
 .../main/java/org/apache/wicket/Component.java  |  23 +-
 .../wicket/DefaultPageManagerProvider.java      |   2 +-
 .../org/apache/wicket/IConverterLocator.java    |   2 +-
 .../org/apache/wicket/IPageManagerProvider.java |   7 +-
 .../apache/wicket/IPageRendererProvider.java    |   9 +-
 .../java/org/apache/wicket/IQueueRegion.java    |   6 +-
 .../apache/wicket/IRequestCycleProvider.java    |   5 +-
 .../org/apache/wicket/IRequestListener.java     |   2 +-
 .../org/apache/wicket/IResourceListener.java    |   2 +-
 .../java/org/apache/wicket/MarkupContainer.java |  23 -
 .../src/main/java/org/apache/wicket/Page.java   |  31 -
 .../org/apache/wicket/ajax/json/JSONString.java |   2 +-
 .../IComponentOnBeforeRenderListener.java       |   2 +-
 .../authorization/IAuthorizationStrategy.java   |   4 +-
 .../wicket/behavior/IBehaviorListener.java      |   2 +-
 .../core/request/handler/IPageProvider.java     |  12 +-
 .../handler/RenderPageRequestHandler.java       |   2 +-
 .../resource/locator/IResourceNameIterator.java |   8 +-
 .../apache/wicket/lambda/WicketConsumer.java    |   4 +-
 .../apache/wicket/lambda/WicketFunction.java    |   4 +-
 .../apache/wicket/lambda/WicketSupplier.java    |   4 +-
 .../wicket/markup/html/HTML5Attributes.java     |   4 +-
 .../markup/html/IPackageResourceGuard.java      |   2 +-
 .../org/apache/wicket/markup/html/WebPage.java  |  15 -
 .../wicket/markup/html/form/CheckBox.java       |   6 -
 .../markup/html/form/IFormSubmitListener.java   |   2 +-
 .../wicket/markup/html/form/ILabelProvider.java |   2 +-
 .../markup/html/form/IOnChangeListener.java     |   2 +-
 .../html/form/upload/MultiFileUploadField.java  |   7 +-
 .../wicket/markup/html/link/ExternalLink.java   |   4 +-
 .../wicket/markup/html/link/ILinkListener.java  |   2 +-
 .../wicket/markup/html/list/ListItemModel.java  |  15 +-
 .../markup/html/pages/BrowserInfoPage.java      |   3 +-
 .../wicket/markup/html/panel/FeedbackPanel.java |   3 +-
 .../html/panel/IMarkupSourcingStrategy.java     |   4 +-
 .../markup/parser/AbstractMarkupFilter.java     |  37 +-
 .../wicket/markup/parser/IXmlPullParser.java    |   2 +-
 .../markup/resolver/ComponentResolvers.java     |   3 -
 .../markup/resolver/IComponentResolver.java     |   2 +-
 .../org/apache/wicket/mock/MockApplication.java |   2 +-
 .../wicket/model/AbstractReadOnlyModel.java     |  22 +-
 .../wicket/model/ComponentDetachableModel.java  |  34 -
 .../org/apache/wicket/model/ComponentModel.java |   8 -
 .../wicket/model/ComponentPropertyModel.java    |  16 +-
 .../org/apache/wicket/model/IChainingModel.java |   4 +-
 .../java/org/apache/wicket/model/IModel.java    |   9 +-
 .../apache/wicket/model/IModelComparator.java   |   9 +-
 .../model/IPropertyReflectionAwareModel.java    |   7 +-
 .../org/apache/wicket/model/ResourceModel.java  |  22 +-
 .../apache/wicket/model/lambda/LambdaModel.java |   5 -
 .../wicket/model/lambda/SupplierModel.java      |  81 ---
 .../org/apache/wicket/page/IManageablePage.java |   4 +-
 .../protocol/http/IMultipartWebRequest.java     |   4 +-
 .../wicket/protocol/http/IRequestLogger.java    |   2 +-
 .../protocol/http/IWebApplicationFactory.java   |   2 +-
 .../wicket/protocol/http/WebApplication.java    |  16 +-
 .../http/documentvalidation/Comment.java        |   4 +-
 .../documentvalidation/DocumentElement.java     |   2 +
 .../documentvalidation/HtmlDocumentParser.java  |   4 +-
 .../HtmlDocumentValidator.java                  |   6 +-
 .../protocol/http/documentvalidation/Tag.java   |   4 +-
 .../http/documentvalidation/TextContent.java    |   4 +-
 .../request/component/IRequestablePage.java     |  11 +-
 .../wicket/request/resource/IResource.java      |   2 +-
 .../caching/IResourceCachingStrategy.java       |   2 +-
 .../wicket/resource/IPropertiesFactory.java     |   4 +-
 .../IScopeAwareTextResourceProcessor.java       |   2 +-
 .../resource/ITextResourceCompressor.java       |   2 +-
 .../apache/wicket/session/ISessionStore.java    |   4 +-
 .../wicket/settings/ApplicationSettings.java    |   2 +-
 .../apache/wicket/settings/DebugSettings.java   |   2 +-
 .../wicket/settings/ExceptionSettings.java      |   2 +-
 .../settings/JavaScriptLibrarySettings.java     |   2 +-
 .../apache/wicket/settings/MarkupSettings.java  |   2 +-
 .../apache/wicket/settings/PageSettings.java    |   2 +-
 .../wicket/settings/RequestCycleSettings.java   |   2 +-
 .../wicket/settings/ResourceSettings.java       |   2 +-
 .../wicket/settings/SecuritySettings.java       |   2 +-
 .../apache/wicket/settings/StoreSettings.java   |   2 +-
 .../iterator/AbstractHierarchyIterator.java     | 466 --------------
 .../AbstractHierarchyIteratorWithFilter.java    | 215 -------
 .../iterator/ComponentHierarchyIterator.java    | 246 -------
 .../GenericComponentHierarchyIterator.java      | 208 ------
 .../wicket/util/iterator/IteratorFilter.java    |  34 -
 .../wicket/util/tester/BaseWicketTester.java    |  23 +-
 .../org/apache/wicket/ComponentEventsTest.java  |   9 +-
 .../java/org/apache/wicket/ajax/HomePage.java   |   4 +-
 .../wicket/dontstoreunrendered/BasePage.java    |   4 +-
 .../DontStoreNotRenderedPageTestCase.java       |   2 +-
 .../html/TransparentWebMarkupContainerTest.java |   2 +-
 .../innerfeedback/LocalizedFeedbackBorder.java  |   6 +-
 ...ithWicketMessagePage_invisible_expected.html |   2 +-
 ...eWithWicketMessagePage_visible_expected.html |   2 +-
 .../markup/html/link/DownloadLinkTest.java      |   6 +-
 .../apache/wicket/model/ModelToStringTest.java  |   5 +-
 .../wicket/model/lambda/SupplierModelTest.java  |  93 ---
 .../request/handler/PageIdPoliticTest.java      |   2 +-
 .../iterator/AbstractHierarchyIteratorTest.java | 339 ----------
 .../util/iterator/ComponentIteratorTest.java    | 636 -------------------
 .../WicketTesterLazyIsPageStatelessBase.java    |   4 +-
 .../wicket/util/tester/WicketTesterTest.java    |   5 -
 .../wicket/versioning/PageVersioningTest.java   |   2 +-
 .../extensions/yui/calendar/DatesPage1.java     |   6 +-
 .../wicket/devutils/debugbar/DebugBar.java      |   4 +-
 .../devutils/debugbar/PageSizeDebugPanel.java   |   5 +-
 .../debugbar/SessionSizeDebugPanel.java         |   4 +-
 .../debugbar/VersionDebugContributor.java       |   4 +-
 .../devutils/inspector/LiveSessionsPage.java    |   5 +-
 .../wicket/devutils/inspector/RequestsPage.java |  10 +-
 .../devutils/inspector/SessionSizeModel.java    |   4 +-
 .../examples/ajax/builtin/AutoCompletePage.java |   5 -
 .../examples/ajax/builtin/ChoicePage.java       |   5 +-
 .../wicket/examples/ajax/builtin/Clock.java     |   9 +-
 .../ajax/builtin/EditableLabelPage.java         |  17 +-
 .../examples/ajax/builtin/FileUploadPage.java   |   4 +-
 .../ajaxhellobrowser/AjaxHelloBrowser.java      |   5 +-
 .../apache/wicket/examples/dates/DatesPage.java |   6 +-
 .../apache/wicket/examples/guice/HomePage.java  |  18 +-
 .../examples/hellobrowser/HelloBrowser.java     |   6 +-
 .../wicket/examples/homepage/HomePage.java      |   9 +-
 .../apache/wicket/examples/linkomatic/Home.java |  13 +-
 .../wicket/examples/repeater/OIRPage.java       |   3 +-
 .../wicket/examples/repeater/PagingPage.java    |   4 +-
 .../examples/repeater/RefreshingPage.java       |   3 +-
 .../wicket/examples/repeater/RepeatingPage.java |   4 +-
 .../wicket/examples/repeater/SimplePage.java    |   4 +-
 .../wicket/examples/repeater/SortingPage.java   |   4 +-
 .../wicket/examples/source/SourcesPage.java     |   6 +-
 .../wicket/examples/stateless/SessionModel.java |  10 +-
 .../examples/stockquote/StockQuoteLabel2.java   |   6 +-
 .../wicket/examples/tree/AdvancedTreePage.java  |   3 +-
 .../tree/content/CheckedFolderContent.java      |   7 +-
 .../tree/content/MultiLineLabelContent.java     |   5 +-
 .../markup/html/AjaxEditableChoiceLabel.java    |   5 +-
 .../ajax/markup/html/AjaxEditableLabel.java     |   1 -
 .../markup/html/AjaxEditableMultiLineLabel.java |  23 +-
 .../captcha/kittens/KittenCaptchaPanel.java     |  19 +-
 .../repeater/data/table/NavigationToolbar.java  |   6 +-
 .../repeater/data/table/NoRecordsToolbar.java   |   3 +-
 .../data/table/export/ExportToolbar.java        |   4 +-
 .../data/table/filter/FilterStateModel.java     |  15 -
 .../data/table/filter/FilterToolbar.java        |   3 +-
 .../markup/html/repeater/tree/NestedTree.java   |   3 +-
 .../html/repeater/util/ProviderSubset.java      |   7 +-
 .../markup/html/tabs/TabbedPanel.java           |   5 +-
 .../extensions/model/AbstractCheckBoxModel.java |   8 -
 .../wicket/extensions/wizard/WizardStep.java    |  23 +-
 .../html/repeater/tree/table/NodeModelTest.java |   7 +-
 .../ws/api/AbstractWebSocketProcessor.java      |   2 +-
 .../src/docs/guide/ajax/ajax_1.gdoc             |   8 +-
 .../src/docs/guide/i18n/i18n_2.gdoc             |   4 +-
 .../apache/wicket/util/IContextProvider.java    |  11 +-
 153 files changed, 329 insertions(+), 2934 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/87187c21/wicket-core/src/main/java/org/apache/wicket/lambda/WicketConsumer.java
----------------------------------------------------------------------
diff --cc wicket-core/src/main/java/org/apache/wicket/lambda/WicketConsumer.java
index 44f0bd0,0000000..9ffe611
mode 100644,000000..100644
--- a/wicket-core/src/main/java/org/apache/wicket/lambda/WicketConsumer.java
+++ b/wicket-core/src/main/java/org/apache/wicket/lambda/WicketConsumer.java
@@@ -1,30 -1,0 +1,32 @@@
 +/*
 + * 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.lambda;
 +
 +import java.io.Serializable;
 +import java.util.function.Consumer;
 +
++import org.apache.wicket.util.io.IClusterable;
++
 +/**
 + * A {@link Serializable} {@link Consumer}.
 + *
 + * @param <T>
 + *            - the type of the input to consume
 + */
- public interface WicketConsumer<T> extends Consumer<T>, Serializable
++public interface WicketConsumer<T> extends Consumer<T>, IClusterable
 +{
 +}

http://git-wip-us.apache.org/repos/asf/wicket/blob/87187c21/wicket-core/src/main/java/org/apache/wicket/lambda/WicketFunction.java
----------------------------------------------------------------------
diff --cc wicket-core/src/main/java/org/apache/wicket/lambda/WicketFunction.java
index 1ce20ff,0000000..3016062
mode 100644,000000..100644
--- a/wicket-core/src/main/java/org/apache/wicket/lambda/WicketFunction.java
+++ b/wicket-core/src/main/java/org/apache/wicket/lambda/WicketFunction.java
@@@ -1,32 -1,0 +1,34 @@@
 +/*
 + * 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.lambda;
 +
 +import java.io.Serializable;
 +import java.util.function.Function;
 +
++import org.apache.wicket.util.io.IClusterable;
++
 +/**
 + * A {@link Serializable} {@link Function}.
 + *
 + * @param <T>
 + *            - the type of the input to the function
 + * @param <R>
 + *            - the type of the result of the function
 + */
- public interface WicketFunction<T, R> extends Function<T, R>, Serializable
++public interface WicketFunction<T, R> extends Function<T, R>, IClusterable
 +{
 +}

http://git-wip-us.apache.org/repos/asf/wicket/blob/87187c21/wicket-core/src/main/java/org/apache/wicket/lambda/WicketSupplier.java
----------------------------------------------------------------------
diff --cc wicket-core/src/main/java/org/apache/wicket/lambda/WicketSupplier.java
index 86f31ba,0000000..f25637c
mode 100644,000000..100644
--- a/wicket-core/src/main/java/org/apache/wicket/lambda/WicketSupplier.java
+++ b/wicket-core/src/main/java/org/apache/wicket/lambda/WicketSupplier.java
@@@ -1,30 -1,0 +1,32 @@@
 +/*
 + * 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.lambda;
 +
 +import java.io.Serializable;
 +import java.util.function.Supplier;
 +
++import org.apache.wicket.util.io.IClusterable;
++
 +/**
 + * A {@link Serializable} {@link Supplier}.
 + *
 + * @param <T>
 + *            - the type of results supplied by this supplier
 + */
- public interface WicketSupplier<T> extends Supplier<T>, Serializable
++public interface WicketSupplier<T> extends Supplier<T>, IClusterable
 +{
 +}

http://git-wip-us.apache.org/repos/asf/wicket/blob/87187c21/wicket-core/src/main/java/org/apache/wicket/model/lambda/LambdaModel.java
----------------------------------------------------------------------