libjava/classpath/ChangeLog.gcj:
2007-05-31 Matthias Klose <doko@ubuntu.com>
* javax/management/NotificationBroadcasterSupport.java
(getNotificationInfo): Add cast.
* native/jni/qt-peer/Makefile.am (AM_CXXFLAGS): Add libstdc++ include
directories.
* native/jni/qt-peer/Makefile.in: Regenerate.
libjava/ChangeLog:
2007-06-03 Matthias Klose <doko@ubuntu.com>
* java/io/natFileWin32.cc (setFilePermissions): New (stub only).
_access: Handle EXEC query, stub only.
2007-06-03 Matthias Klose <doko@ubuntu.com>
Merged from classpath:
* gnu/java/nio/SelectorProviderImpl.java: Whitespace merge.
* java/lang/System.java(inheritedChannel): New.
* java/lang/Character.java: Remove stray`;'.
* java/net/MulticastSocket.java: Merged.
* java/text/DateFormatSymbols.java(getInstance): New, comment updates.
* java/text/Collator.java(getInstance): Merged.
* java/util/Calendar.java: New attributes ALL_STYLES, SHORT, LONG.
getDisplayName, getDisplayNames: New.
* java/util/logging/Logger.java: Merged.
* Regenerate .class and .h files.
2007-06-03 Matthias Klose <doko@ubuntu.com>
* java/io/File.java: Merge with classpath-0.95, new method
setFilePermissions, new attribute EXEC.
* java/io/natFilePosix.cc (setFilePermissions): New.
_access: Handle EXEC query.
* classpath/lib/java/io/File.class, java/io/File.h: Regenerate.
2007-06-03 Matthias Klose <doko@ubuntu.com>
Imported GNU Classpath 0.95.
* classpath/Makefile.in,
classpath/native/jni/midi-dssi/Makefile.in,
classpath/native/jni/classpath/Makefile.in,
classpath/native/jni/Makefile.in,
classpath/native/jni/gconf-peer/Makefile.in,
classpath/native/jni/java-io/Makefile.in,
classpath/native/jni/native-lib/Makefile.in,
classpath/native/jni/java-util/Makefile.in,
classpath/native/jni/midi-alsa/Makefile.in,
classpath/native/jni/java-lang/Makefile.in,
classpath/native/jni/java-nio/Makefile.in,
classpath/native/jni/java-net/Makefile.in,
classpath/native/jni/xmlj/Makefile.in,
classpath/native/jni/qt-peer/Makefile.in,
classpath/native/jni/gtk-peer/Makefile.in,
classpath/native/Makefile.in, classpath/native/jawt/Makefile.in,
classpath/native/fdlibm/Makefile.in,
classpath/native/plugin/Makefile.in,
classpath/resource/Makefile.in, classpath/scripts/Makefile.in,
classpath/tools/Makefile.in, classpath/doc/Makefile.in,
classpath/doc/api/Makefile.in, classpath/lib/Makefile.in,
classpath/external/Makefile.in, classpath/external/jsr166/Makefile.in,
classpath/external/sax/Makefile.in,
classpath/external/w3c_dom/Makefile.in,
classpath/external/relaxngDatatype/Makefile.in,
classpath/include/Makefile.in,
classpath/examples/Makefile.in: Regenerate.
* classpath/config.guess, classpath/config.sub,
classpath/ltmain.sh : Update.
* classpath/configure, classpath/depcomp, classpath/missing,
classpath/aclocal.m4, classpath/install-sh: Regenerate.
* gnu/classpath/Configuration.java (CLASSPATH_VERSION): Now 0.95.
* sources.am: Regenerate.
* Makefile.in: Regenerate.
* Update the .class files and generated CNI header files, add new
.class and generated CNI header files.
* Remove generated files for removed java source files:
classpath/gnu/java/net/BASE64.java,
classpath/gnu/java/security/util/Base64.java,
classpath/gnu/java/awt/peer/gtk/GThreadMutex.java,
classpath/gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.java,
classpath/gnu/java/awt/font/autofit/Scaler.java,
classpath/gnu/classpath/jdwp/util/Value.java,
classpath/gnu/javax/net/ssl/Base64.java.
* Remove empty directories.
* Makefile.am(nat_source_files): Add natVMOperatingSystemMXBeanImpl.cc.
* java/lang/Class.java(setAccessible): Merge from classpath.
* java/util/Locale.java: Remove.
* gnu/java/lang/management/VMOperatingSystemMXBeanImpl.java,
gnu/java/lang/management/natVMOperatingSystemMXBeanImpl.cc: New.
* gcj/javaprims.h: Update class declarations.
* scripts/classes.pl: Update usage.
* HACKING: Mention to build all peers.
From-SVN: r125302
This commit is contained in:
Matthias Klose
parent
af333b9a7f
commit
e1bea0c068
2951 changed files with 80982 additions and 68583 deletions
|
|
@ -67,7 +67,7 @@ public class GdkFontPeer extends ClasspathFontPeer
|
|||
* The size of the cache has been chosen so that relativly large GUIs with
|
||||
* text documents are still efficient.
|
||||
*/
|
||||
HashMap textLayoutCache = new GtkToolkit.LRUCache(500);
|
||||
HashMap<String,TextLayout> textLayoutCache = new GtkToolkit.LRUCache<String,TextLayout>(500);
|
||||
|
||||
private class GdkFontMetrics extends FontMetrics
|
||||
{
|
||||
|
|
@ -79,7 +79,7 @@ public class GdkFontPeer extends ClasspathFontPeer
|
|||
|
||||
public int stringWidth (String str)
|
||||
{
|
||||
TextLayout tl = (TextLayout) textLayoutCache.get(str);
|
||||
TextLayout tl = textLayoutCache.get(str);
|
||||
if (tl == null)
|
||||
{
|
||||
tl = new TextLayout(str, font, DEFAULT_CTX);
|
||||
|
|
@ -140,7 +140,7 @@ public class GdkFontPeer extends ClasspathFontPeer
|
|||
/**
|
||||
* Cache GlyphMetrics objects.
|
||||
*/
|
||||
private HashMap metricsCache;
|
||||
private HashMap<Integer,GlyphMetrics> metricsCache;
|
||||
|
||||
private static final int FONT_METRICS_ASCENT = 0;
|
||||
private static final int FONT_METRICS_MAX_ASCENT = 1;
|
||||
|
|
@ -235,7 +235,7 @@ public class GdkFontPeer extends ClasspathFontPeer
|
|||
super(name, style, size);
|
||||
initState ();
|
||||
setFont (this.familyName, this.style, (int)this.size);
|
||||
metricsCache = new HashMap();
|
||||
metricsCache = new HashMap<Integer,GlyphMetrics>();
|
||||
setupMetrics();
|
||||
}
|
||||
|
||||
|
|
@ -244,7 +244,7 @@ public class GdkFontPeer extends ClasspathFontPeer
|
|||
super(name, attributes);
|
||||
initState ();
|
||||
setFont (this.familyName, this.style, (int)this.size);
|
||||
metricsCache = new HashMap();
|
||||
metricsCache = new HashMap<Integer,GlyphMetrics>();
|
||||
setupMetrics();
|
||||
}
|
||||
|
||||
|
|
@ -261,9 +261,9 @@ public class GdkFontPeer extends ClasspathFontPeer
|
|||
return font;
|
||||
else
|
||||
{
|
||||
ClasspathToolkit toolkit;
|
||||
toolkit = (ClasspathToolkit) Toolkit.getDefaultToolkit();
|
||||
return toolkit.getFont(font.getName(), font.getAttributes());
|
||||
ClasspathToolkit toolkit;
|
||||
toolkit = (ClasspathToolkit) Toolkit.getDefaultToolkit();
|
||||
return toolkit.getFont(font.getName(), font.getAttributes());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -294,9 +294,9 @@ public class GdkFontPeer extends ClasspathFontPeer
|
|||
name = getName(NameDecoder.NAME_SUBFAMILY, locale);
|
||||
if (name == null)
|
||||
{
|
||||
name = getName(NameDecoder.NAME_SUBFAMILY, Locale.ENGLISH);
|
||||
if ("Regular".equals(name))
|
||||
name = null;
|
||||
name = getName(NameDecoder.NAME_SUBFAMILY, Locale.ENGLISH);
|
||||
if ("Regular".equals(name))
|
||||
name = null;
|
||||
}
|
||||
|
||||
return name;
|
||||
|
|
@ -340,12 +340,12 @@ public class GdkFontPeer extends ClasspathFontPeer
|
|||
{
|
||||
if (nameTable == null)
|
||||
{
|
||||
byte[] data = getTrueTypeTable((byte)'n', (byte) 'a',
|
||||
(byte) 'm', (byte) 'e');
|
||||
if( data == null )
|
||||
return null;
|
||||
byte[] data = getTrueTypeTable((byte)'n', (byte) 'a',
|
||||
(byte) 'm', (byte) 'e');
|
||||
if( data == null )
|
||||
return null;
|
||||
|
||||
nameTable = ByteBuffer.wrap( data );
|
||||
nameTable = ByteBuffer.wrap( data );
|
||||
}
|
||||
|
||||
return NameDecoder.getName(nameTable, name, locale);
|
||||
|
|
@ -492,8 +492,8 @@ public class GdkFontPeer extends ClasspathFontPeer
|
|||
char[] chars, int start, int limit,
|
||||
int flags)
|
||||
{
|
||||
return new FreetypeGlyphVector( font, chars, start, limit - start,
|
||||
frc, flags);
|
||||
return new FreetypeGlyphVector(font, chars, start, limit - start,
|
||||
frc, flags);
|
||||
}
|
||||
|
||||
public LineMetrics getLineMetrics (Font font, String str,
|
||||
|
|
@ -515,13 +515,13 @@ public class GdkFontPeer extends ClasspathFontPeer
|
|||
*/
|
||||
GlyphMetrics getGlyphMetrics( int glyphCode )
|
||||
{
|
||||
return (GlyphMetrics)metricsCache.get( new Integer( glyphCode ) );
|
||||
return metricsCache.get(new Integer(glyphCode));
|
||||
}
|
||||
|
||||
/**
|
||||
* Put a GlyphMetrics object in the cache.
|
||||
*/
|
||||
void putGlyphMetrics( int glyphCode, Object metrics )
|
||||
void putGlyphMetrics( int glyphCode, GlyphMetrics metrics )
|
||||
{
|
||||
metricsCache.put( new Integer( glyphCode ), metrics );
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue