Imported Classpath 0.18.
* sources.am, Makefile.in: Updated. * Makefile.am (nat_source_files): Removed natProxy.cc. * java/lang/reflect/natProxy.cc: Removed. * gnu/classpath/jdwp/VMFrame.java, gnu/classpath/jdwp/VMIdManager.java, gnu/classpath/jdwp/VMVirtualMachine.java, java/lang/reflect/VMProxy.java: New files. 2005-09-23 Thomas Fitzsimmons <fitzsim@redhat.com> * scripts/makemake.tcl (verbose): Add gnu/java/awt/peer/qt to BC list. 2005-09-23 Thomas Fitzsimmons <fitzsim@redhat.com> * gnu/java/net/DefaultContentHandlerFactory.java (getContent): Remove ClasspathToolkit references. 2005-09-23 Thomas Fitzsimmons <fitzsim@redhat.com> * gnu/awt/xlib/XCanvasPeer.java: Add new peer methods. * gnu/awt/xlib/XFramePeer.java: Likewise. * gnu/awt/xlib/XGraphicsConfiguration.java: Likewise. 2005-09-23 Thomas Fitzsimmons <fitzsim@redhat.com> * Makefile.am (libgcjawt_la_SOURCES): Remove jawt.c. Add classpath/native/jawt/jawt.c. * Makefile.in: Regenerate. * jawt.c: Remove file. * include/Makefile.am (tool_include__HEADERS): Remove jawt.h and jawt_md.h. Add ../classpath/include/jawt.h and ../classpath/include/jawt_md.h. * include/Makefile.in: Regenerate. * include/jawt.h: Regenerate. * include/jawt_md.h: Regenerate. From-SVN: r104586
This commit is contained in:
parent
9b044d1951
commit
1ea63ef8be
544 changed files with 34724 additions and 14512 deletions
|
@ -1,5 +1,5 @@
|
|||
/* java.beans.Expression
|
||||
Copyright (C) 2004 Free Software Foundation, Inc.
|
||||
Copyright (C) 2004, 2005 Free Software Foundation, Inc.
|
||||
|
||||
This file is part of GNU Classpath.
|
||||
|
||||
|
@ -51,7 +51,7 @@ 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();
|
||||
private static final Object UNSET = new Object();
|
||||
|
||||
// The value to return. This is equal to unset until getValue is called.
|
||||
private Object value;
|
||||
|
@ -89,7 +89,7 @@ public class Expression extends Statement
|
|||
public Expression(Object target, String methodName, Object[] arguments)
|
||||
{
|
||||
super(target, methodName, arguments);
|
||||
this.value = unset;
|
||||
this.value = UNSET;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -105,7 +105,7 @@ public class Expression extends Statement
|
|||
*/
|
||||
public Object getValue() throws Exception
|
||||
{
|
||||
if (value == unset)
|
||||
if (value == UNSET)
|
||||
value = doExecute();
|
||||
return value;
|
||||
}
|
||||
|
@ -126,7 +126,7 @@ public class Expression extends Statement
|
|||
public String toString()
|
||||
{
|
||||
String result = super.toString();
|
||||
if (value != unset)
|
||||
if (value != UNSET)
|
||||
return value.getClass().getName() + " " + result;
|
||||
return result;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue