Permalink
Browse files

Removing unnecessary generated code

  • Loading branch information...
1 parent 3053641 commit 3ef44854802d8d27c00794fc2df84fa47916cd4d @arjantijms arjantijms committed Feb 16, 2017
View
@@ -736,75 +736,6 @@
<copy file="src/main/template/MultiFieldValidationUtils.java"
todir="${project.build.directory}/generated-sources/antrun/javax/faces/validator"
filtering="true"/>
-
-
-
- <!--
-
- Generate API Adapters
-
- -->
- <filter token="protection" value=""/>
- <filter token="package" value="javax.faces.component"/>
- <copy todir="${project.build.directory}/generated-sources/antrun/javax/faces/component"
- filtering="true">
- <fileset dir="src/main/template">
- <include name="*Adapter.java"/>
- </fileset>
- </copy>
- <replace
- file="${project.build.directory}/generated-sources/antrun/javax/faces/component/MethodBindingMethodExpressionAdapter.java"
- token="@serialVersionUID@"
- value="7334926223014401689L"/>
- <replace
- file="${project.build.directory}/generated-sources/antrun/javax/faces/component/MethodExpressionMethodBindingAdapter.java"
- token="@serialVersionUID@"
- value="-1822420567946048452L"/>
- <replace
- file="${project.build.directory}/generated-sources/antrun/javax/faces/component/ValueExpressionValueBindingAdapter.java"
- token="@serialVersionUID@"
- value="2388977392466671243L"/>
- <replace
- file="${project.build.directory}/generated-sources/antrun/javax/faces/component/ValueBindingValueExpressionAdapter.java"
- token="@serialVersionUID@"
- value="-8015491904782686906L"/>
-
- <!--
-
- Generate API StateHolderSaver.java
-
- -->
- <filter token="protection" value=""/>
- <filter token="package" value="javax.faces.component"/>
- <copy file="src/main/template/StateHolderSaver.java"
- todir="${project.build.directory}/generated-sources/antrun/javax/faces/component"
- filtering="true"/>
- <replace
- file="${project.build.directory}/generated-sources/antrun/javax/faces/component/StateHolderSaver.java"
- token="@serialVersionUID@"
- value="6470180891722042701L"/>
-
- <!--
-
- Generate API SharedUtils.java #1
-
- -->
- <filter token="protection" value=""/>
- <filter token="package" value="javax.faces.component"/>
- <copy file="src/main/template/SharedUtils.java"
- todir="${project.build.directory}/generated-sources/antrun/javax/faces/component"
- filtering="true"/>
-
- <!--
-
- Generate API SharedUtils.java #2
-
- -->
- <filter token="protection" value=""/>
- <filter token="package" value="javax.faces.application"/>
- <copy file="src/main/template/SharedUtils.java"
- todir="${project.build.directory}/generated-sources/antrun/javax/faces/application"
- filtering="true"/>
</target>
</configuration>
<goals>
@@ -0,0 +1,122 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License"). You
+ * may not use this file except in compliance with the License. You can
+ * obtain a copy of the License at
+ * https://glassfish.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt. See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license." If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above. However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+
+package javax.faces.application;
+
+import javax.faces.context.FacesContext;
+import javax.faces.application.Application;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+
+class SharedUtils {
+
+ /*
+ * Determine whether String is a mixed value binding expression or not.
+ */
+ static boolean isMixedExpression(String expression) {
+
+ if (null == expression) {
+ return false;
+ }
+
+ // if it doesn't start and end with delimiters
+ return (!(expression.startsWith("#{") && expression.endsWith("}")))
+ && isExpression(expression);
+
+ }
+
+
+ /*
+ * Determine whether String is a value binding expression or not.
+ */
+ static boolean isExpression(String expression) {
+
+ if (null == expression) {
+ return false;
+ }
+
+ //check to see if attribute has an expression
+ int start = expression.indexOf("#{");
+ return start != -1 && expression.indexOf('}', start+2) != -1;
+ }
+
+ static Map<String, List<String>> evaluateExpressions(FacesContext context, Map<String, List<String>> map) {
+ if (map != null && !map.isEmpty()) {
+ Map<String, List<String>> ret = new HashMap<String, List<String>>(map.size());
+ for (Map.Entry<String, List<String>> entry : map.entrySet()) {
+ ret.put(entry.getKey(), evaluateExpressions(context, entry.getValue()));
+ }
+
+ return ret;
+ }
+
+ return map;
+ }
+
+ static List<String> evaluateExpressions(FacesContext context, List<String> values) {
+ if (!values.isEmpty()) {
+ List<String> ret = new ArrayList<String>(values.size());
+ Application app = context.getApplication();
+ for (String val : values) {
+ if (val != null) {
+ String value = val.trim();
+ if (isExpression(value)) {
+ value = app.evaluateExpressionGet(context,
+ value,
+ String.class);
+ }
+ ret.add(value);
+ }
+ }
+
+ return ret;
+ }
+ return values;
+ }
+
+
+
+}
+
+
+
Oops, something went wrong.

0 comments on commit 3ef4485

Please sign in to comment.