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
|
@ -209,8 +209,12 @@ label = Name:\\u0020</pre>
|
|||
{
|
||||
if (pos == line.length())
|
||||
{
|
||||
// The line continues on the next line.
|
||||
// The line continues on the next line. If there
|
||||
// is no next line, just treat it as a key with an
|
||||
// empty value.
|
||||
line = reader.readLine();
|
||||
if (line == null)
|
||||
line = "";
|
||||
pos = 0;
|
||||
while (pos < line.length()
|
||||
&& Character.isWhitespace(c = line.charAt(pos)))
|
||||
|
@ -410,7 +414,17 @@ label = Name:\\u0020</pre>
|
|||
*/
|
||||
public String getProperty(String key)
|
||||
{
|
||||
return getProperty(key, null);
|
||||
Properties prop = this;
|
||||
// Eliminate tail recursion.
|
||||
do
|
||||
{
|
||||
String value = (String) prop.get(key);
|
||||
if (value != null)
|
||||
return value;
|
||||
prop = prop.defaults;
|
||||
}
|
||||
while (prop != null);
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -429,17 +443,10 @@ label = Name:\\u0020</pre>
|
|||
*/
|
||||
public String getProperty(String key, String defaultValue)
|
||||
{
|
||||
Properties prop = this;
|
||||
// Eliminate tail recursion.
|
||||
do
|
||||
{
|
||||
String value = (String) prop.get(key);
|
||||
if (value != null)
|
||||
return value;
|
||||
prop = prop.defaults;
|
||||
}
|
||||
while (prop != null);
|
||||
return defaultValue;
|
||||
String prop = getProperty(key);
|
||||
if (prop == null)
|
||||
prop = defaultValue;
|
||||
return prop;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue