Expression.java: New file.

2004-06-28  Jerry Quinn  <jlquinn@optonline.net>

	* java/beans/Expression.java: New file.
	* java/beans/Statement.java: New file.
	* Makefile.am: Added new files.
	* Makefile.in: Re-generate.

From-SVN: r83836

libjava/ChangeLog

+2004-06-28  Jerry Quinn  <jlquinn@optonline.net>
+
+	* java/beans/Expression.java: New file.
+	* java/beans/Statement.java: New file.
+	* Makefile.am: Added new files.
+	* Makefile.in: Re-generate.
+
 2004-06-27 Mark Wielaard  <mark@klomp.org>
 
 	* java/io/FilePermission.java (usingPerms): Removed.

libjava/Makefile.am

@@ -1284,6 +1284,7 @@ java/beans/Customizer.java \
 java/beans/DesignMode.java \
 java/beans/EventSetDescriptor.java \
 java/beans/ExceptionListener.java \
+java/beans/Expression.java \
 java/beans/FeatureDescriptor.java \
 java/beans/IndexedPropertyDescriptor.java \
 java/beans/IntrospectionException.java \
@@ -1299,6 +1300,7 @@ java/beans/PropertyEditor.java \
 java/beans/PropertyEditorManager.java \
 java/beans/PropertyEditorSupport.java \
 java/beans/PropertyVetoException.java \
+java/beans/Statement.java \
 java/beans/SimpleBeanInfo.java \
 java/beans/VetoableChangeListener.java \
 java/beans/VetoableChangeListenerProxy.java \

libjava/Makefile.in

@@ -963,6 +963,7 @@ java/beans/Customizer.java \
 java/beans/DesignMode.java \
 java/beans/EventSetDescriptor.java \
 java/beans/ExceptionListener.java \
+java/beans/Expression.java \
 java/beans/FeatureDescriptor.java \
 java/beans/IndexedPropertyDescriptor.java \
 java/beans/IntrospectionException.java \
@@ -978,6 +979,7 @@ java/beans/PropertyEditor.java \
 java/beans/PropertyEditorManager.java \
 java/beans/PropertyEditorSupport.java \
 java/beans/PropertyVetoException.java \
+java/beans/Statement.java \
 java/beans/SimpleBeanInfo.java \
 java/beans/VetoableChangeListener.java \
 java/beans/VetoableChangeListenerProxy.java \
@@ -3084,8 +3086,8 @@ DEP_FILES =  .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
 .deps/gnu/classpath/ServiceFactory.P \
 .deps/gnu/classpath/ServiceProviderLoadingAction.P .deps/gnu/gcj/Core.P \
 .deps/gnu/gcj/RawData.P .deps/gnu/gcj/RawDataManaged.P \
-.deps/gnu/gcj/convert/BytesToUnicode.P \
-.deps/gnu/gcj/convert/Convert.P .deps/gnu/gcj/convert/IOConverter.P \
+.deps/gnu/gcj/convert/BytesToUnicode.P .deps/gnu/gcj/convert/Convert.P \
+.deps/gnu/gcj/convert/IOConverter.P \
 .deps/gnu/gcj/convert/Input_8859_1.P \
 .deps/gnu/gcj/convert/Input_ASCII.P \
 .deps/gnu/gcj/convert/Input_EUCJIS.P \
@@ -3480,8 +3482,7 @@ DEP_FILES =  .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
 .deps/gnu/java/util/prefs/MemoryBasedFactory.P \
 .deps/gnu/java/util/prefs/MemoryBasedPreferences.P \
 .deps/gnu/java/util/prefs/NodeReader.P \
-.deps/gnu/java/util/prefs/NodeWriter.P \
-.deps/gnu/regexp/CharIndexed.P \
+.deps/gnu/java/util/prefs/NodeWriter.P .deps/gnu/regexp/CharIndexed.P \
 .deps/gnu/regexp/CharIndexedCharArray.P \
 .deps/gnu/regexp/CharIndexedInputStream.P \
 .deps/gnu/regexp/CharIndexedString.P \
@@ -3723,7 +3724,7 @@ DEP_FILES =  .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
 .deps/java/beans/BeanDescriptor.P .deps/java/beans/BeanInfo.P \
 .deps/java/beans/Beans.P .deps/java/beans/Customizer.P \
 .deps/java/beans/DesignMode.P .deps/java/beans/EventSetDescriptor.P \
-.deps/java/beans/ExceptionListener.P \
+.deps/java/beans/ExceptionListener.P .deps/java/beans/Expression.P \
 .deps/java/beans/FeatureDescriptor.P \
 .deps/java/beans/IndexedPropertyDescriptor.P \
 .deps/java/beans/IntrospectionException.P \
@@ -3737,7 +3738,7 @@ DEP_FILES =  .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
 .deps/java/beans/PropertyEditorManager.P \
 .deps/java/beans/PropertyEditorSupport.P \
 .deps/java/beans/PropertyVetoException.P \
-.deps/java/beans/SimpleBeanInfo.P \
+.deps/java/beans/SimpleBeanInfo.P .deps/java/beans/Statement.P \
 .deps/java/beans/VetoableChangeListener.P \
 .deps/java/beans/VetoableChangeListenerProxy.P \
 .deps/java/beans/VetoableChangeSupport.P .deps/java/beans/Visibility.P \

libjava/java/beans/Expression.java

+/* java.beans.Expression
+   Copyright (C) 2004 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+ 
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package java.beans;
+
+/**
+ * class Expression
+ *
+ * An Expression captures the execution of an object method that
+ * returns a value.  It stores an object, the method to call, and the
+ * arguments to pass to the method.
+ *
+ * @since 1.4
+ */
+public class Expression extends Statement
+{
+  // This is a placeholder to indicate that value hasn't been set
+  // yet;
+  private static final Object unset = new Object();
+
+  // The value to return.  This is equal to unset until getValue is called.
+  private Object value;
+   
+
+  /**
+   * Constructor
+   *
+   * Constructs an Expression representing the invocation of
+   * object.methodName(arg[0], arg[1], ...);  However, it will never
+   * be executed.  Instead, value will always be returned.
+   *
+   * @param value The value to return.
+   * @param target The object to invoke the method on.
+   * @param methodName The object method to invoke.
+   * @param arguments An array of arguments to pass to the method.
+   */
+  public Expression(Object value, Object target, String methodName,
+		    Object[] arguments)
+  {
+    super(target, methodName, arguments);
+    this.value = value;
+  }
+
+  /**
+   * Constructor
+   *
+   * Constructs an Expression representing the invocation of
+   * object.methodName(arg[0], arg[1], ...);
+   *
+   * @param target The object to invoke the method on.
+   * @param methodName The object method to invoke.
+   * @param arguments An array of arguments to pass to the method.
+   */
+  public Expression(Object target, String methodName, Object[] arguments)
+  {
+    super(target, methodName, arguments);
+    this.value = unset;
+  }
+
+  /**
+   * Return the result of executing the method.
+   *
+   * If the cached value has not yet been set, the method is
+   * executed in the same way as Statement.execute(), except that
+   * the value is cached, and then returned.  If the value has been
+   * set, it is returned without executing the method again.
+   *
+   * @return the result of executing the method.
+   * @exception Exception if an error occurs
+   */
+  public Object getValue() throws Exception
+  {
+    if (value == unset)
+      value = doExecute();
+    return value;
+  }
+
+  /**
+   * Set the cached value to be returned by getValue()
+   *
+   * @param value the value to cache and return.
+   */
+  public void setValue(Object value)
+  {
+    this.value = value;
+  }
+    
+  /**
+   * Return a string representation of this expression.
+   */
+  public String toString()
+  {
+    String result = super.toString();
+    if (value != unset)
+      return value.getClass().getName() + " " + result;
+    return result;
+  }
+}