Updated Branches: refs/heads/master 6f4610c6e -> 857732013
WICKET-3367 Rewrite all JavaScript inline event handlers to be proper attached event handlers Remove ExpressionDecorator because it is not used. Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/85773201 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/85773201 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/85773201 Branch: refs/heads/master Commit: 8577320137c454ad0ed2d0065c3617821a1cd2f7 Parents: 6f4610c Author: martin-g <[email protected]> Authored: Mon Jan 2 12:29:32 2012 +0200 Committer: martin-g <[email protected]> Committed: Mon Jan 2 12:29:32 2012 +0200 ---------------------------------------------------------------------- .../apache/wicket/ajax/ExpressionDecorator.java | 33 --------------- .../ajax/attributes/AjaxRequestAttributes.java | 23 ---------- 2 files changed, 0 insertions(+), 56 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/85773201/wicket-core/src/main/java/org/apache/wicket/ajax/ExpressionDecorator.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/ExpressionDecorator.java b/wicket-core/src/main/java/org/apache/wicket/ajax/ExpressionDecorator.java deleted file mode 100644 index ddcd443..0000000 --- a/wicket-core/src/main/java/org/apache/wicket/ajax/ExpressionDecorator.java +++ /dev/null @@ -1,33 +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.ajax; - -/** - * Decorator of an expression. - * - * @author Matej Knopp - */ -public interface ExpressionDecorator -{ - /** - * Decorate the given expression (possibly prepending/appending it with another expression). - * - * @param expression - * @return decorated expression - */ - public CharSequence decorateExpression(CharSequence expression); -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/wicket/blob/85773201/wicket-core/src/main/java/org/apache/wicket/ajax/attributes/AjaxRequestAttributes.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/attributes/AjaxRequestAttributes.java b/wicket-core/src/main/java/org/apache/wicket/ajax/attributes/AjaxRequestAttributes.java index a995b5e..4dd0b21 100644 --- a/wicket-core/src/main/java/org/apache/wicket/ajax/attributes/AjaxRequestAttributes.java +++ b/wicket-core/src/main/java/org/apache/wicket/ajax/attributes/AjaxRequestAttributes.java @@ -17,7 +17,6 @@ package org.apache.wicket.ajax.attributes; import org.apache.wicket.ajax.AjaxChannel; -import org.apache.wicket.ajax.ExpressionDecorator; import org.apache.wicket.util.lang.Args; import java.util.ArrayList; @@ -91,7 +90,6 @@ public final class AjaxRequestAttributes private Map<String, Object> extraParameters = null; private List<CharSequence> dynamicExtraParameters = null; private List<CharSequence> requestQueueItemCreationListeners = null; - private List<ExpressionDecorator> expressionDecorators = null; private AjaxChannel channel = null; /** @@ -401,27 +399,6 @@ public final class AjaxRequestAttributes } /** - * Certain behaviors support decorating the javascript expression they generate with - * {@link ExpressionDecorator}s. - * <p> - * This usually decorates the javascript expression that is responsible for creating - * <code>RequestQueueItem</code> and adding it to the queue. The decorator may be useful to - * intercept the <code>RequestQueueItem</code> creation on in the earliest possible time. - * <p> - * Note that not all Ajax behaviors are required to support decorating the expression. - * - * @return list of {@link ExpressionDecorator} . - */ - public List<ExpressionDecorator> getExpressionDecorators() - { - if (expressionDecorators == null) - { - expressionDecorators = new ArrayList<ExpressionDecorator>(); - } - return expressionDecorators; - } - - /** * Only applies for event behaviors. Returns whether the behavior should allow the default event * handler to be invoked. For example if the behavior is attached to a link and * {@link #isAllowDefault()} returns <code>false</code> (which is default value), the link's URL
