You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2017/11/29 15:59:36 UTC
[myfaces-tobago] 01/06: TOBAGO-1832: Remove support for attic
MethodBinding * also ValueBinding
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit 90a6fbe02cf2b916505b2493c2c1a40315a860ce
Author: Udo Schnurpfeil <lo...@apache.org>
AuthorDate: Wed Nov 29 14:40:04 2017 +0100
TOBAGO-1832: Remove support for attic MethodBinding
* also ValueBinding
---
.../apache/myfaces/tobago/util/ComponentUtils.java | 9 +-
.../tobago/util/ValueBindingComparator.java | 131 ---------------------
2 files changed, 4 insertions(+), 136 deletions(-)
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ComponentUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ComponentUtils.java
index c5f1d5c..af6cac9 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ComponentUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ComponentUtils.java
@@ -51,7 +51,6 @@ import javax.faces.component.ValueHolder;
import javax.faces.context.FacesContext;
import javax.faces.convert.Converter;
import javax.faces.convert.ConverterException;
-import javax.faces.el.ValueBinding;
import javax.faces.event.ActionEvent;
import javax.faces.event.ValueChangeEvent;
import javax.faces.render.RenderKit;
@@ -719,10 +718,10 @@ public final class ComponentUtils {
} else if (component instanceof ValueHolder) {
Converter converter = ((ValueHolder) component).getConverter();
if (converter == null) {
- //Try to find out by value binding
- final ValueBinding vb = component.getValueBinding("value");
- if (vb != null) {
- final Class valueType = vb.getType(facesContext);
+ //Try to find out by value expression
+ final ValueExpression expression = component.getValueExpression("value");
+ if (expression != null) {
+ final Class valueType = expression.getType(facesContext.getELContext());
if (valueType != null) {
converter = facesContext.getApplication().createConverter(valueType);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ValueBindingComparator.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ValueBindingComparator.java
deleted file mode 100644
index 1f20c8e..0000000
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ValueBindingComparator.java
+++ /dev/null
@@ -1,131 +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.myfaces.tobago.util;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.faces.context.FacesContext;
-import javax.faces.el.ValueBinding;
-import java.util.Comparator;
-import java.util.Map;
-
-/**
- * @deprecated since 2.0.0
- */
-@Deprecated
-public class ValueBindingComparator extends ComparatorBase {
-
- private static final Logger LOG = LoggerFactory.getLogger(ValueBindingComparator.class);
-
- private FacesContext facesContext;
-
- private String var;
-
- private ValueBinding valueBinding;
-
- public ValueBindingComparator(final FacesContext facesContext, final String var, final ValueBinding valueBinding) {
- this.facesContext = facesContext;
- this.var = var;
- this.valueBinding = valueBinding;
- }
-
- public ValueBindingComparator(
- final FacesContext facesContext, final String var, final ValueBinding valueBinding, final boolean reverse) {
- super(reverse);
- this.facesContext = facesContext;
- this.var = var;
- this.valueBinding = valueBinding;
- }
-
- public ValueBindingComparator(
- final FacesContext facesContext, final String var,
- final ValueBinding valueBinding, final Comparator comparator) {
- super(comparator);
- this.facesContext = facesContext;
- this.var = var;
- this.valueBinding = valueBinding;
- }
-
- public ValueBindingComparator(
- final FacesContext facesContext, final String var,
- final ValueBinding valueBinding, final boolean reverse, final Comparator comparator) {
- super(reverse, comparator);
- this.facesContext = facesContext;
- this.var = var;
- this.valueBinding = valueBinding;
- }
-
- public boolean equals(final Object o) {
- if (this == o) {
- return true;
- }
- if (o == null || getClass() != o.getClass()) {
- return false;
- }
-
- final ValueBindingComparator that = (ValueBindingComparator) o;
-
- if (!super.equals(o)) {
- return false;
- }
- if (facesContext != null ? !facesContext.equals(that.facesContext) : that.facesContext != null) {
- return false;
- }
- if (valueBinding != null ? !valueBinding.equals(that.valueBinding) : that.valueBinding != null) {
- return false;
- }
- if (var != null ? !var.equals(that.var) : that.var != null) {
- return false;
- }
-
- return true;
- }
-
- public int hashCode() {
- int result;
- result = facesContext != null ? facesContext.hashCode() : 0;
- result = 29 * result + (var != null ? var.hashCode() : 0);
- result = 29 * result + (valueBinding != null ? valueBinding.hashCode() : 0);
- result = 29 * result + super.hashCode();
- return result;
- }
-
- // implementation of java.util.Comparator interface
-
- @Override
- public int compare(final Object param1, final Object param2) {
- final Object obj1;
- final Object obj2;
- try {
- final Map<String, Object> requestMap = facesContext.getExternalContext().getRequestMap();
- requestMap.put(var, param1);
- obj1 = valueBinding.getValue(facesContext);
- requestMap.put(var, param2);
- obj2 = valueBinding.getValue(facesContext);
-
- } catch (final Exception e) {
- LOG.error(e.getMessage(), e);
- return 0;
- }
- return super.internalCompare(obj1, obj2);
- }
-
-}
--
To stop receiving notification emails like this one, please contact
"commits@myfaces.apache.org" <co...@myfaces.apache.org>.