Skip to content

Commit

Permalink
Correct copyright dates
Browse files Browse the repository at this point in the history
  • Loading branch information
markt-asf committed Oct 7, 2023
1 parent 48326d5 commit 73cc689
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion api/pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 1997, 2022 Oracle and/or its affiliates and others.
Copyright (c) 1997, 2023 Oracle and/or its affiliates and others.
All rights reserved.
This program and the accompanying materials are made available under the
Expand Down
4 changes: 2 additions & 2 deletions api/src/main/java/jakarta/el/ArrayELResolver.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2022 Oracle and/or its affiliates and others.
* Copyright (c) 1997, 2023 Oracle and/or its affiliates and others.
* All rights reserved.
* Copyright 2004 The Apache Software Foundation
*
Expand Down Expand Up @@ -40,7 +40,7 @@
*
* @see CompositeELResolver
* @see ELResolver
*
*
* @since Jakarta Server Pages 2.1
*/
public class ArrayELResolver extends ELResolver {
Expand Down
10 changes: 5 additions & 5 deletions api/src/main/java/jakarta/el/CompositeELResolver.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2022 Oracle and/or its affiliates and others.
* Copyright (c) 1997, 2023 Oracle and/or its affiliates and others.
* All rights reserved.
* Copyright 2004 The Apache Software Foundation
*
Expand Down Expand Up @@ -181,9 +181,9 @@ public Object getValue(ELContext context, Object base, Object property) {
* an empty array if the method has no parameters. Can be <code>null</code>, in which case the method's formal parameter
* types are assumed to be unknown.
* @param params The parameters to pass to the method, or <code>null</code> if no parameters.
*
*
* @return The result of the method invocation (<code>null</code> if the method has a <code>void</code> return type).
*
*
* @since Jakarta Expression Language 2.2
*/
@Override
Expand Down Expand Up @@ -393,7 +393,7 @@ public boolean isReadOnly(ELContext context, Object base, Object property) {
* @param context The context of this evaluation.
* @param base The base object to return the most general property type for, or <code>null</code> to enumerate the set
* of top-level variables that this resolver can evaluate.
*
*
* @return <code>null</code> if this <code>ELResolver</code> does not know how to handle the given <code>base</code>
* object; otherwise <code>Object.class</code> if any type of <code>property</code> is accepted; otherwise the most
* general <code>property</code> type accepted for the given <code>base</code>.
Expand Down Expand Up @@ -432,7 +432,7 @@ public Class<?> getCommonPropertyType(ELContext context, Object base) {
* @param context The context of this evaluation.
* @param obj The object to convert.
* @param targetType The target type for the convertion.
*
*
* @throws ELException thrown if errors occur.
*
* @since Jakarta Expression Language 3.0
Expand Down
14 changes: 7 additions & 7 deletions api/src/main/java/jakarta/el/ELResolver.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2022 Oracle and/or its affiliates and others.
* Copyright (c) 1997, 2023 Oracle and/or its affiliates and others.
* All rights reserved.
* Copyright 2004 The Apache Software Foundation
*
Expand Down Expand Up @@ -101,10 +101,10 @@ public abstract class ELResolver {
* @param base The base object whose property value is to be returned, or <code>null</code> to resolve a top-level
* variable.
* @param property The property or variable to be resolved.
*
*
* @return If the <code>propertyResolved</code> property of <code>ELContext</code> was set to <code>true</code>, then
* the result of the variable or property resolution; otherwise undefined.
*
*
* @throws NullPointerException if context is <code>null</code>
* @throws PropertyNotFoundException if the given (base, property) pair is handled by this <code>ELResolver</code> but
* the specified variable or property does not exist or is not readable.
Expand Down Expand Up @@ -132,15 +132,15 @@ public abstract class ELResolver {
* an empty array if the method has no parameters. Can be <code>null</code>, in which case the method's formal parameter
* types are assumed to be unknown.
* @param params The parameters to pass to the method, or <code>null</code> if no parameters.
*
*
* @return The result of the method invocation (<code>null</code> if the method has a <code>void</code> return type).
*
*
* @throws MethodNotFoundException if no suitable method can be found.
* @throws ELException if an exception was thrown while performing (base, method) resolution. The thrown exception must
* be included as the cause property of this exception, if available. If the exception thrown is an
* <code>InvocationTargetException</code>, extract its <code>cause</code> and pass it to the <code>ELException</code>
* constructor.
*
*
* @since Jakarta Expression Language 2.2
*/
public Object invoke(ELContext context, Object base, Object method, Class<?>[] paramTypes, Object[] params) {
Expand All @@ -167,7 +167,7 @@ public Object invoke(ELContext context, Object base, Object method, Class<?>[] p
* <p>
* If the resolver or the property is read-only, this method must return {@code null}.
* </p>
*
*
* @param context The context of this evaluation.
* @param base The base object whose property value is to be analyzed, or <code>null</code> to analyze a top-level
* variable.
Expand Down
6 changes: 3 additions & 3 deletions api/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2021 Contributors to the Eclipse Foundation
*
* Copyright (c) 2023 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
* http://www.eclipse.org/legal/epl-2.0.
Expand All @@ -17,6 +17,6 @@
exports jakarta.el;

requires static transitive java.desktop;

uses jakarta.el.ExpressionFactory;
}

0 comments on commit 73cc689

Please sign in to comment.