[kaffe] CVS kaffe (robilad): resynced with GNU Classpath: cleanups
Kaffe CVS
cvs-commits at kaffe.org
Sat Feb 19 07:33:12 PST 2005
PatchSet 5562
Date: 2005/02/19 15:26:34
Author: robilad
Branch: HEAD
Tag: (none)
Log:
resynced with GNU Classpath: cleanups
Members:
ChangeLog:1.3605->1.3606
ChangeLog:1.3604->1.3605
libraries/javalib/gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.java:1.1->1.2
libraries/javalib/gnu/java/awt/peer/gtk/GdkFontPeer.java:1.5->1.6
libraries/javalib/gnu/java/awt/peer/gtk/GdkGlyphVector.java:1.6->1.7
libraries/javalib/gnu/java/awt/peer/gtk/GdkGraphics.java:1.9->1.10
libraries/javalib/gnu/java/awt/peer/gtk/GdkGraphics2D.java:1.16->1.17
libraries/javalib/gnu/java/awt/peer/gtk/GdkGraphicsConfiguration.java:1.1->1.2
libraries/javalib/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java:1.7->1.8
libraries/javalib/gnu/java/awt/peer/gtk/GdkPixbufDecoder.java:1.7->1.8
libraries/javalib/gnu/java/awt/peer/gtk/GdkRobotPeer.java:1.2->1.3
libraries/javalib/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java:1.2->1.3
libraries/javalib/gnu/java/awt/peer/gtk/GdkTextLayout.java:1.2->1.3
libraries/javalib/gnu/java/awt/peer/gtk/GtkCheckboxMenuItemPeer.java:1.3->1.4
libraries/javalib/gnu/java/awt/peer/gtk/GtkChoicePeer.java:1.4->1.5
libraries/javalib/gnu/java/awt/peer/gtk/GtkClipboard.java:1.3->1.4
libraries/javalib/gnu/java/awt/peer/gtk/GtkComponentPeer.java:1.11->1.12
libraries/javalib/gnu/java/awt/peer/gtk/GtkFileDialogPeer.java:1.7->1.8
libraries/javalib/gnu/java/awt/peer/gtk/GtkFontPeer.java:1.3->1.4
libraries/javalib/gnu/java/awt/peer/gtk/GtkLabelPeer.java:1.4->1.5
libraries/javalib/gnu/java/awt/peer/gtk/GtkMenuBarPeer.java:1.2->1.3
libraries/javalib/gnu/java/awt/peer/gtk/GtkMenuItemPeer.java:1.4->1.5
libraries/javalib/gnu/java/awt/peer/gtk/GtkMenuPeer.java:1.2->1.3
libraries/javalib/gnu/java/awt/peer/gtk/GtkScrollPanePeer.java:1.4->1.5
libraries/javalib/gnu/java/awt/peer/gtk/GtkScrollbarPeer.java:1.3->1.4
libraries/javalib/gnu/java/awt/peer/gtk/GtkToolkit.java:1.14->1.15
libraries/javalib/gnu/java/awt/peer/gtk/GtkWindowPeer.java:1.7->1.8
libraries/javalib/gnu/java/awt/peer/gtk/package.html:INITIAL->1.1
libraries/javalib/java/awt/geom/Ellipse2D.java:1.4->1.5
libraries/javalib/java/beans/PropertyDescriptor.java:1.10->1.11
libraries/javalib/java/net/NetworkInterface.java:1.12->1.13
libraries/javalib/java/nio/ByteBufferImpl.java:1.10->1.11
libraries/javalib/java/nio/DoubleBufferImpl.java:1.8->1.9
libraries/javalib/java/nio/FloatBufferImpl.java:1.8->1.9
libraries/javalib/java/nio/IntBufferImpl.java:1.8->1.9
libraries/javalib/java/nio/LongBufferImpl.java:1.8->1.9
libraries/javalib/java/nio/ShortBufferImpl.java:1.8->1.9
libraries/javalib/java/nio/channels/Channel.java:1.4->1.5
libraries/javalib/java/util/Calendar.java:1.33->1.34
libraries/javalib/java/util/Comparator.java:1.5->1.6
libraries/javalib/java/util/Date.java:1.25->1.26
libraries/javalib/java/util/SimpleTimeZone.java:1.22->1.23
libraries/javalib/java/util/logging/FileHandler.java:1.5->1.6
libraries/javalib/java/util/prefs/InvalidPreferencesFormatException.java:1.2->1.3
libraries/javalib/java/util/prefs/Preferences.java:1.6->1.7
libraries/javalib/javax/security/auth/callback/ConfirmationCallback.java:1.4->1.5
libraries/javalib/javax/security/sasl/Sasl.java:1.2->1.3
libraries/javalib/javax/security/sasl/SaslServerFactory.java:1.2->1.3
libraries/javalib/javax/swing/JComponent.java:1.13->1.14
libraries/javalib/javax/swing/JList.java:1.7->1.8
libraries/javalib/javax/swing/JProgressBar.java:1.2->1.3
libraries/javalib/javax/swing/JTree.java:1.13->1.14
libraries/javalib/javax/swing/text/JTextComponent.java:1.10->1.11
libraries/javalib/javax/xml/XMLConstants.java:1.3->1.4
libraries/javalib/javax/xml/datatype/DatatypeConfigurationException.java:1.3->1.4
libraries/javalib/javax/xml/datatype/DatatypeConstants.java:1.3->1.4
libraries/javalib/javax/xml/datatype/DatatypeFactory.java:1.3->1.4
libraries/javalib/javax/xml/datatype/Duration.java:1.3->1.4
libraries/javalib/javax/xml/datatype/XMLGregorianCalendar.java:1.3->1.4
libraries/javalib/javax/xml/namespace/NamespaceContext.java:1.3->1.4
libraries/javalib/javax/xml/namespace/QName.java:1.7->1.8
libraries/javalib/javax/xml/parsers/DocumentBuilder.java:1.10->1.11
libraries/javalib/javax/xml/parsers/DocumentBuilderFactory.java:1.12->1.13
libraries/javalib/javax/xml/parsers/FactoryConfigurationError.java:1.7->1.8
libraries/javalib/javax/xml/parsers/ParserConfigurationException.java:1.7->1.8
libraries/javalib/javax/xml/parsers/SAXParser.java:1.9->1.10
libraries/javalib/javax/xml/parsers/SAXParserFactory.java:1.9->1.10
libraries/javalib/javax/xml/transform/ErrorListener.java:1.7->1.8
libraries/javalib/javax/xml/transform/OutputKeys.java:1.7->1.8
libraries/javalib/javax/xml/transform/Result.java:1.7->1.8
libraries/javalib/javax/xml/transform/Source.java:1.7->1.8
libraries/javalib/javax/xml/transform/SourceLocator.java:1.7->1.8
libraries/javalib/javax/xml/transform/Templates.java:1.7->1.8
libraries/javalib/javax/xml/transform/Transformer.java:1.7->1.8
libraries/javalib/javax/xml/transform/TransformerConfigurationException.java:1.8->1.9
libraries/javalib/javax/xml/transform/TransformerException.java:1.11->1.12
libraries/javalib/javax/xml/transform/TransformerFactory.java:1.13->1.14
libraries/javalib/javax/xml/transform/TransformerFactoryConfigurationError.java:1.7->1.8
libraries/javalib/javax/xml/transform/URIResolver.java:1.6->1.7
libraries/javalib/javax/xml/transform/dom/DOMLocator.java:1.8->1.9
libraries/javalib/javax/xml/transform/dom/DOMResult.java:1.8->1.9
libraries/javalib/javax/xml/transform/dom/DOMSource.java:1.8->1.9
libraries/javalib/javax/xml/transform/sax/SAXResult.java:1.8->1.9
libraries/javalib/javax/xml/transform/sax/SAXSource.java:1.10->1.11
libraries/javalib/javax/xml/transform/sax/SAXTransformerFactory.java:1.8->1.9
libraries/javalib/javax/xml/transform/sax/TemplatesHandler.java:1.8->1.9
libraries/javalib/javax/xml/transform/sax/TransformerHandler.java:1.8->1.9
libraries/javalib/javax/xml/transform/stream/StreamResult.java:1.8->1.9
libraries/javalib/javax/xml/transform/stream/StreamSource.java:1.8->1.9
libraries/javalib/javax/xml/validation/Schema.java:1.3->1.4
libraries/javalib/javax/xml/validation/SchemaFactory.java:1.3->1.4
libraries/javalib/javax/xml/validation/TypeInfoProvider.java:1.3->1.4
libraries/javalib/javax/xml/validation/Validator.java:1.3->1.4
libraries/javalib/javax/xml/validation/ValidatorHandler.java:1.3->1.4
libraries/javalib/javax/xml/xpath/XPathConstants.java:1.3->1.4
libraries/javalib/javax/xml/xpath/XPathException.java:1.3->1.4
libraries/javalib/javax/xml/xpath/XPathExpression.java:1.3->1.4
libraries/javalib/javax/xml/xpath/XPathExpressionException.java:1.3->1.4
libraries/javalib/javax/xml/xpath/XPathFactory.java:1.4->1.5
libraries/javalib/javax/xml/xpath/XPathFactoryConfigurationException.java:1.3->1.4
libraries/javalib/javax/xml/xpath/XPathFunction.java:1.3->1.4
libraries/javalib/javax/xml/xpath/XPathFunctionException.java:1.3->1.4
libraries/javalib/javax/xml/xpath/XPathFunctionResolver.java:1.3->1.4
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3605 kaffe/ChangeLog:1.3606
--- kaffe/ChangeLog:1.3605 Sat Feb 19 15:23:31 2005
+++ kaffe/ChangeLog Sat Feb 19 15:26:34 2005
@@ -4,6 +4,64 @@
2005-02-16 Michael Koch <konqueror at gmx.de>
+ * javax/xml/XMLConstants.java,
+ javax/xml/datatype/DatatypeConfigurationException.java,
+ javax/xml/datatype/DatatypeConstants.java,
+ javax/xml/datatype/DatatypeFactory.java,
+ javax/xml/datatype/Duration.java,
+ javax/xml/datatype/XMLGregorianCalendar.java,
+ javax/xml/namespace/NamespaceContext.java,
+ javax/xml/namespace/QName.java,
+ javax/xml/parsers/DocumentBuilder.java,
+ javax/xml/parsers/DocumentBuilderFactory.java,
+ javax/xml/parsers/FactoryConfigurationError.java,
+ javax/xml/parsers/ParserConfigurationException.java,
+ javax/xml/parsers/SAXParser.java,
+ javax/xml/parsers/SAXParserFactory.java,
+ javax/xml/transform/ErrorListener.java,
+ javax/xml/transform/OutputKeys.java,
+ javax/xml/transform/Result.java,
+ javax/xml/transform/Source.java,
+ javax/xml/transform/SourceLocator.java,
+ javax/xml/transform/Templates.java,
+ javax/xml/transform/Transformer.java,
+ javax/xml/transform/TransformerConfigurationException.java,
+ javax/xml/transform/TransformerException.java,
+ javax/xml/transform/TransformerFactory.java,
+ javax/xml/transform/TransformerFactoryConfigurationError.java,
+ javax/xml/transform/URIResolver.java,
+ javax/xml/transform/dom/DOMLocator.java,
+ javax/xml/transform/dom/DOMResult.java,
+ javax/xml/transform/dom/DOMSource.java,
+ javax/xml/transform/sax/SAXResult.java,
+ javax/xml/transform/sax/SAXSource.java,
+ javax/xml/transform/sax/SAXTransformerFactory.java,
+ javax/xml/transform/sax/TemplatesHandler.java,
+ javax/xml/transform/sax/TransformerHandler.java,
+ javax/xml/transform/stream/StreamResult.java,
+ javax/xml/transform/stream/StreamSource.java,
+ javax/xml/validation/Schema.java,
+ javax/xml/validation/SchemaFactory.java,
+ javax/xml/validation/TypeInfoProvider.java,
+ javax/xml/validation/Validator.java,
+ javax/xml/validation/ValidatorHandler.java,
+ javax/xml/xpath/XPathConstants.java,
+ javax/xml/xpath/XPathException.java,
+ javax/xml/xpath/XPathExpression.java,
+ javax/xml/xpath/XPathExpressionException.java,
+ javax/xml/xpath/XPathFactory.java,
+ javax/xml/xpath/XPathFactoryConfigurationException.java,
+ javax/xml/xpath/XPathFunction.java,
+ javax/xml/xpath/XPathFunctionException.java,
+ javax/xml/xpath/XPathFunctionResolver.java:
+ Fixed usage of @author tag.
+
+2005-02-19 Dalibor Topic <robilad at kaffe.org>
+
+ Resynced with GNU Classpath.
+
+ 2005-02-16 Michael Koch <konqueror at gmx.de>
+
* java/awt/geom/Ellipse2D.java,
java/beans/PropertyDescriptor.java,
java/net/NetworkInterface.java,
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3604 kaffe/ChangeLog:1.3605
--- kaffe/ChangeLog:1.3604 Sat Feb 19 15:04:11 2005
+++ kaffe/ChangeLog Sat Feb 19 15:23:31 2005
@@ -1,60 +1,35 @@
2005-02-19 Dalibor Topic <robilad at kaffe.org>
Resynced with GNU Classpath.
-
+
2005-02-16 Michael Koch <konqueror at gmx.de>
- * javax/XMLConstants.java,
- javax/datatype/DatatypeConfigurationException.java,
- javax/datatype/DatatypeConstants.java,
- javax/datatype/DatatypeFactory.java,
- javax/datatype/Duration.java,
- javax/datatype/XMLGregorianCalendar.java,
- javax/namespace/NamespaceContext.java,
- javax/namespace/QName.java,
- javax/parsers/DocumentBuilder.java,
- javax/parsers/DocumentBuilderFactory.java,
- javax/parsers/FactoryConfigurationError.java,
- javax/parsers/ParserConfigurationException.java,
- javax/parsers/SAXParser.java,
- javax/parsers/SAXParserFactory.java,
- javax/transform/ErrorListener.java,
- javax/transform/OutputKeys.java,
- javax/transform/Result.java,
- javax/transform/Source.java,
- javax/transform/SourceLocator.java,
- javax/transform/Templates.java,
- javax/transform/Transformer.java,
- javax/transform/TransformerConfigurationException.java,
- javax/transform/TransformerException.java,
- javax/transform/TransformerFactory.java,
- javax/transform/TransformerFactoryConfigurationError.java,
- javax/transform/URIResolver.java,
- javax/transform/dom/DOMLocator.java,
- javax/transform/dom/DOMResult.java,
- javax/transform/dom/DOMSource.java,
- javax/transform/sax/SAXResult.java,
- javax/transform/sax/SAXSource.java,
- javax/transform/sax/SAXTransformerFactory.java,
- javax/transform/sax/TemplatesHandler.java,
- javax/transform/sax/TransformerHandler.java,
- javax/transform/stream/StreamResult.java,
- javax/transform/stream/StreamSource.java,
- javax/validation/Schema.java,
- javax/validation/SchemaFactory.java,
- javax/validation/TypeInfoProvider.java,
- javax/validation/Validator.java,
- javax/validation/ValidatorHandler.java,
- javax/xpath/XPathConstants.java,
- javax/xpath/XPathException.java,
- javax/xpath/XPathExpression.java,
- javax/xpath/XPathExpressionException.java,
- javax/xpath/XPathFactory.java,
- javax/xpath/XPathFactoryConfigurationException.java,
- javax/xpath/XPathFunction.java,
- javax/xpath/XPathFunctionException.java,
- javax/xpath/XPathFunctionResolver.java:
- Fixed usage of @author tag.
+ * java/awt/geom/Ellipse2D.java,
+ java/beans/PropertyDescriptor.java,
+ java/net/NetworkInterface.java,
+ java/nio/ByteBufferImpl.java,
+ java/nio/DoubleBufferImpl.java,
+ java/nio/FloatBufferImpl.java,
+ java/nio/IntBufferImpl.java,
+ java/nio/LongBufferImpl.java,
+ java/nio/ShortBufferImpl.java,
+ java/nio/channels/Channel.java,
+ java/util/Calendar.java,
+ java/util/Comparator.java,
+ java/util/Date.java,
+ java/util/SimpleTimeZone.java,
+ java/util/logging/FileHandler.java,
+ java/util/prefs/InvalidPreferencesFormatException.java,
+ java/util/prefs/Preferences.java,
+ javax/security/auth/callback/ConfirmationCallback.java,
+ javax/security/sasl/Sasl.java,
+ javax/security/sasl/SaslServerFactory.java,
+ javax/swing/JComponent.java,
+ javax/swing/JList.java,
+ javax/swing/JProgressBar.java,
+ javax/swing/JTree.java,
+ javax/swing/text/JTextComponent.java:
+ Fixed javadocs to contain valid (X)HTML.
2005-02-19 Dalibor Topic <robilad at kaffe.org>
Index: kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.java
diff -u kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.java:1.1 kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.java:1.2
--- kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.java:1.1 Thu Jul 22 19:20:13 2004
+++ kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.java Sat Feb 19 15:30:25 2005
@@ -3,7 +3,7 @@
--portable-native-sync option.
This is used by gthread-jni.c
- Copyright (C) 2004 Free Software Foundation, Inc.
+ Copyright (C) 2004, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -40,10 +40,11 @@
exception statement from your version. */
package gnu.java.awt.peer.gtk;
+
import java.lang.ref.WeakReference;
-import java.util.Set;
import java.util.Collections;
import java.util.HashSet;
+import java.util.Set;
/** Implements pthread_create(), under glib's gthread abstraction, for use
with GNU Classpath's --portable-native-sync option. This is used in
Index: kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkFontPeer.java
diff -u kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkFontPeer.java:1.5 kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkFontPeer.java:1.6
--- kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkFontPeer.java:1.5 Mon Feb 14 20:49:26 2005
+++ kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkFontPeer.java Sat Feb 19 15:30:25 2005
@@ -1,5 +1,5 @@
/* GdkFontPeer.java -- Implements FontPeer with GTK+
- Copyright (C) 1999, 2004 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2004, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -47,16 +47,15 @@
import java.awt.font.GlyphVector;
import java.awt.font.LineMetrics;
import java.awt.geom.Rectangle2D;
+import java.text.CharacterIterator;
+import java.text.StringCharacterIterator;
import java.util.Locale;
import java.util.Map;
import java.util.ResourceBundle;
-import java.text.CharacterIterator;
-import java.text.StringCharacterIterator;
public class GdkFontPeer extends ClasspathFontPeer
{
-
- native static void initStaticState ();
+ static native void initStaticState();
private final int native_state = GtkGenericPeer.getUniqueInteger ();
private static ResourceBundle bundle;
Index: kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkGlyphVector.java
diff -u kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkGlyphVector.java:1.6 kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkGlyphVector.java:1.7
--- kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkGlyphVector.java:1.6 Mon Feb 14 20:49:26 2005
+++ kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkGlyphVector.java Sat Feb 19 15:30:25 2005
@@ -1,5 +1,5 @@
/* GdkGlyphVector.java -- Glyph vector object
- Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -42,9 +42,9 @@
import java.awt.Rectangle;
import java.awt.Shape;
import java.awt.font.FontRenderContext;
+import java.awt.font.GlyphJustificationInfo;
import java.awt.font.GlyphMetrics;
import java.awt.font.GlyphVector;
-import java.awt.font.GlyphJustificationInfo;
import java.awt.geom.AffineTransform;
import java.awt.geom.Point2D;
import java.awt.geom.Rectangle2D;
Index: kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkGraphics.java
diff -u kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkGraphics.java:1.9 kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkGraphics.java:1.10
--- kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkGraphics.java:1.9 Wed Jan 5 18:32:08 2005
+++ kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkGraphics.java Sat Feb 19 15:30:25 2005
@@ -1,5 +1,5 @@
/* GdkGraphics.java
- Copyright (C) 1998, 1999, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1998, 1999, 2002, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -108,7 +108,7 @@
native void connectSignals (GtkComponentPeer component);
- public native void clearRect (int x, int y, int width, int height);
+ public native void clearRect(int x, int y, int width, int height);
public void clipRect (int x, int y, int width, int height)
{
@@ -119,15 +119,15 @@
setClipRectangle (clip.x, clip.y, clip.width, clip.height);
}
- native public void copyArea (int x, int y, int width, int height,
- int dx, int dy);
+ public native void copyArea(int x, int y, int width, int height,
+ int dx, int dy);
public Graphics create ()
{
return new GdkGraphics (this);
}
- native public void dispose ();
+ public native void dispose();
native void copyPixmap (Graphics g, int x, int y, int width, int height);
native void copyAndScalePixmap (Graphics g, boolean flip_x, boolean flip_y,
@@ -316,22 +316,22 @@
SystemColor.window, observer);
}
- native public void drawLine (int x1, int y1, int x2, int y2);
+ public native void drawLine(int x1, int y1, int x2, int y2);
- native public void drawArc (int x, int y, int width, int height,
- int startAngle, int arcAngle);
- native public void fillArc (int x, int y, int width, int height,
- int startAngle, int arcAngle);
- native public void drawOval(int x, int y, int width, int height);
- native public void fillOval(int x, int y, int width, int height);
+ public native void drawArc(int x, int y, int width, int height,
+ int startAngle, int arcAngle);
+ public native void fillArc(int x, int y, int width, int height,
+ int startAngle, int arcAngle);
+ public native void drawOval(int x, int y, int width, int height);
+ public native void fillOval(int x, int y, int width, int height);
- native public void drawPolygon(int[] xPoints, int[] yPoints, int nPoints);
- native public void fillPolygon(int[] xPoints, int[] yPoints, int nPoints);
+ public native void drawPolygon(int[] xPoints, int[] yPoints, int nPoints);
+ public native void fillPolygon(int[] xPoints, int[] yPoints, int nPoints);
- native public void drawPolyline(int[] xPoints, int[] yPoints, int nPoints);
+ public native void drawPolyline(int[] xPoints, int[] yPoints, int nPoints);
- native public void drawRect(int x, int y, int width, int height);
- native public void fillRect (int x, int y, int width, int height);
+ public native void drawRect(int x, int y, int width, int height);
+ public native void fillRect(int x, int y, int width, int height);
GdkFontPeer getFontPeer()
{
@@ -448,7 +448,7 @@
setClip (clip.getBounds ());
}
- native private void setFGColor (int red, int green, int blue);
+ private native void setFGColor(int red, int green, int blue);
public void setColor (Color c)
{
@@ -490,7 +490,7 @@
color.getBlue () ^ xorColor.getBlue ());
}
- native public void translateNative (int x, int y);
+ public native void translateNative(int x, int y);
public void translate (int x, int y)
{
Index: kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkGraphics2D.java
diff -u kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkGraphics2D.java:1.16 kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkGraphics2D.java:1.17
--- kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkGraphics2D.java:1.16 Mon Feb 14 20:49:26 2005
+++ kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkGraphics2D.java Sat Feb 19 15:30:25 2005
@@ -370,7 +370,7 @@
// "middle of pixel" coordinates and light up complete pixels.
private boolean shiftDrawCalls = false;
- private final double shifted(double coord, boolean doShift)
+ private double shifted(double coord, boolean doShift)
{
if (doShift)
return Math.floor(coord) + 0.5;
@@ -378,7 +378,7 @@
return coord;
}
- private final void walkPath(PathIterator p, boolean doShift)
+ private void walkPath(PathIterator p, boolean doShift)
{
double x = 0;
double y = 0;
@@ -428,7 +428,7 @@
}
}
- private final Map getDefaultHints()
+ private Map getDefaultHints()
{
HashMap defaultHints = new HashMap();
@@ -450,7 +450,7 @@
return defaultHints;
}
- public static final int[] findSimpleIntegerArray (ColorModel cm, Raster raster)
+ public static int[] findSimpleIntegerArray (ColorModel cm, Raster raster)
{
if (cm == null || raster == null)
return null;
@@ -489,7 +489,7 @@
return db.getData();
}
- private final void updateBufferedImage()
+ private void updateBufferedImage()
{
if (bimage != null && pixelConversionRequired)
{
@@ -501,8 +501,8 @@
}
}
- private final boolean drawImage(Image img, AffineTransform xform,
- Color bgcolor, ImageObserver obs)
+ private boolean drawImage(Image img, AffineTransform xform,
+ Color bgcolor, ImageObserver obs)
{
if (img == null)
return false;
@@ -931,8 +931,8 @@
return bg;
}
- private final void doPolygon(int[] xPoints, int[] yPoints, int nPoints,
- boolean close, boolean fill)
+ private void doPolygon(int[] xPoints, int[] yPoints, int nPoints,
+ boolean close, boolean fill)
{
if (nPoints < 1)
return;
@@ -985,8 +985,8 @@
doPolygon(xPoints, yPoints, nPoints, false, false);
}
- private final boolean drawRaster(ColorModel cm, Raster r,
- AffineTransform imageToUser, Color bgcolor)
+ private boolean drawRaster(ColorModel cm, Raster r,
+ AffineTransform imageToUser, Color bgcolor)
{
if (r == null)
return false;
Index: kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkGraphicsConfiguration.java
diff -u kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkGraphicsConfiguration.java:1.1 kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkGraphicsConfiguration.java:1.2
--- kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkGraphicsConfiguration.java:1.1 Mon Feb 14 20:01:30 2005
+++ kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkGraphicsConfiguration.java Sat Feb 19 15:30:25 2005
@@ -38,9 +38,9 @@
package gnu.java.awt.peer.gtk;
import java.awt.BufferCapabilities;
-import java.awt.ImageCapabilities;
import java.awt.GraphicsConfiguration;
import java.awt.GraphicsDevice;
+import java.awt.ImageCapabilities;
import java.awt.Rectangle;
import java.awt.geom.AffineTransform;
Index: kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java
diff -u kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java:1.7 kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java:1.8
--- kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java:1.7 Mon Feb 14 20:49:26 2005
+++ kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java Sat Feb 19 15:30:25 2005
@@ -1,5 +1,5 @@
/* GdkGraphicsEnvironment.java -- information about the graphics environment
- Copyright (C) 2004 Free Software Foundation, Inc.
+ Copyright (C) 2004, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -79,8 +79,9 @@
{
return new GdkGraphics2D (image);
}
- native private int nativeGetNumFontFamilies ();
- native private void nativeGetFontFamilies (String[] family_names);
+
+ private native int nativeGetNumFontFamilies();
+ private native void nativeGetFontFamilies(String[] family_names);
public Font[] getAllFonts ()
{
Index: kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkPixbufDecoder.java
diff -u kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkPixbufDecoder.java:1.7 kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkPixbufDecoder.java:1.8
--- kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkPixbufDecoder.java:1.7 Mon Feb 14 20:49:26 2005
+++ kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkPixbufDecoder.java Sat Feb 19 15:30:25 2005
@@ -1,5 +1,5 @@
/* GdkPixbufDecoder.java -- Image data decoding object
- Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -57,16 +57,16 @@
import java.util.Locale;
import java.util.Vector;
-import javax.imageio.ImageReader;
-import javax.imageio.ImageWriter;
+import javax.imageio.IIOImage;
import javax.imageio.ImageReadParam;
+import javax.imageio.ImageReader;
import javax.imageio.ImageTypeSpecifier;
import javax.imageio.ImageWriteParam;
-import javax.imageio.IIOImage;
+import javax.imageio.ImageWriter;
import javax.imageio.metadata.IIOMetadata;
+import javax.imageio.spi.IIORegistry;
import javax.imageio.spi.ImageReaderSpi;
import javax.imageio.spi.ImageWriterSpi;
-import javax.imageio.spi.IIORegistry;
import javax.imageio.stream.ImageInputStream;
import javax.imageio.stream.ImageOutputStream;
@@ -80,7 +80,8 @@
}
initStaticState ();
}
- native static void initStaticState ();
+
+ static native void initStaticState();
private final int native_state = GtkGenericPeer.getUniqueInteger ();
private boolean initialized = false;
Index: kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkRobotPeer.java
diff -u kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkRobotPeer.java:1.2 kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkRobotPeer.java:1.3
--- kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkRobotPeer.java:1.2 Mon Feb 14 20:49:26 2005
+++ kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkRobotPeer.java Sat Feb 19 15:30:25 2005
@@ -1,5 +1,5 @@
/* GdkRobot.java -- an XTest implementation of RobotPeer
- Copyright (C) 2004 Free Software Foundation, Inc.
+ Copyright (C) 2004, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -39,9 +39,9 @@
import java.awt.AWTException;
import java.awt.GraphicsDevice;
+import java.awt.Rectangle;
import java.awt.image.ColorModel;
import java.awt.image.DirectColorModel;
-import java.awt.Rectangle;
import java.awt.peer.RobotPeer;
/**
Index: kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java
diff -u kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java:1.2 kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java:1.3
--- kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java:1.2 Mon Feb 14 20:01:30 2005
+++ kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java Sat Feb 19 15:30:25 2005
@@ -1,5 +1,5 @@
/* GdkScreenGraphicsDevice.java -- information about a screen device
- Copyright (C) 2004 Free Software Foundation, Inc.
+ Copyright (C) 2004, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -38,8 +38,8 @@
package gnu.java.awt.peer.gtk;
-import java.awt.GraphicsDevice;
import java.awt.GraphicsConfiguration;
+import java.awt.GraphicsDevice;
public class GdkScreenGraphicsDevice extends GraphicsDevice
{
Index: kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkTextLayout.java
diff -u kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkTextLayout.java:1.2 kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkTextLayout.java:1.3
--- kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkTextLayout.java:1.2 Mon Feb 14 20:49:26 2005
+++ kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkTextLayout.java Sat Feb 19 15:30:25 2005
@@ -1,5 +1,5 @@
/* GdkTextLayout.java
- Copyright (C) 2003 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -38,24 +38,24 @@
package gnu.java.awt.peer.gtk;
+import gnu.classpath.Configuration;
+import gnu.java.awt.peer.ClasspathTextLayoutPeer;
+
import java.awt.Font;
import java.awt.Graphics2D;
import java.awt.Shape;
import java.awt.font.FontRenderContext;
import java.awt.font.GlyphMetrics;
import java.awt.font.GlyphVector;
+import java.awt.font.TextAttribute;
import java.awt.font.TextHitInfo;
import java.awt.font.TextLayout;
import java.awt.geom.AffineTransform;
import java.awt.geom.GeneralPath;
import java.awt.geom.Rectangle2D;
-import java.text.CharacterIterator;
import java.text.AttributedCharacterIterator;
import java.text.AttributedString;
-import java.awt.font.TextAttribute;
-
-import gnu.classpath.Configuration;
-import gnu.java.awt.peer.ClasspathTextLayoutPeer;
+import java.text.CharacterIterator;
/**
* This is an implementation of the text layout peer interface which
@@ -82,7 +82,7 @@
private native void indexToPos(int idx, double[] pos);
private native void initState ();
private native void dispose ();
- native static void initStaticState ();
+ static native void initStaticState();
private final int native_state = GtkGenericPeer.getUniqueInteger ();
protected void finalize ()
{
Index: kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkCheckboxMenuItemPeer.java
diff -u kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkCheckboxMenuItemPeer.java:1.3 kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkCheckboxMenuItemPeer.java:1.4
--- kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkCheckboxMenuItemPeer.java:1.3 Mon Feb 14 20:49:27 2005
+++ kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkCheckboxMenuItemPeer.java Sat Feb 19 15:30:25 2005
@@ -1,5 +1,5 @@
/* GtkCheckboxMenuItemPeer.java -- Implements CheckboxMenuItemPeer with GTK+
- Copyright (C) 1999 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -38,9 +38,9 @@
package gnu.java.awt.peer.gtk;
+import java.awt.CheckboxMenuItem;
import java.awt.ItemSelectable;
import java.awt.event.ItemEvent;
-import java.awt.CheckboxMenuItem;
import java.awt.peer.CheckboxMenuItemPeer;
public class GtkCheckboxMenuItemPeer extends GtkMenuItemPeer
@@ -54,7 +54,7 @@
setState (menu.getState ());
}
- native public void setState (boolean t);
+ public native void setState(boolean t);
protected void postMenuActionEvent ()
{
Index: kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkChoicePeer.java
diff -u kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkChoicePeer.java:1.4 kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkChoicePeer.java:1.5
--- kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkChoicePeer.java:1.4 Mon Feb 14 20:49:27 2005
+++ kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkChoicePeer.java Sat Feb 19 15:30:26 2005
@@ -1,5 +1,5 @@
/* GtkChoicePeer.java -- Implements ChoicePeer with GTK
- Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1998, 1999, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -72,7 +72,7 @@
native void nativeRemove (int index);
native void nativeRemoveAll ();
- native public void select (int position);
+ public native void select (int position);
public void add (String item, int index)
{
Index: kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkClipboard.java
diff -u kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkClipboard.java:1.3 kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkClipboard.java:1.4
--- kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkClipboard.java:1.3 Mon Oct 4 13:32:33 2004
+++ kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkClipboard.java Sat Feb 19 15:30:26 2005
@@ -1,5 +1,5 @@
/* GtkClipboard.java
- Copyright (C) 1999 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -52,7 +52,7 @@
/* the number of milliseconds that we'll wait around for the
owner of the GDK_SELECTION_PRIMARY selection to convert
the requested data */
- final static int SELECTION_RECEIVED_TIMEOUT = 5000;
+ static final int SELECTION_RECEIVED_TIMEOUT = 5000;
/* We currently only support transferring of text between applications */
static String selection;
@@ -165,6 +165,6 @@
}
native void initNativeState();
- native static void requestStringConversion();
- native static void selectionGet();
+ static native void requestStringConversion();
+ static native void selectionGet();
}
Index: kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkComponentPeer.java
diff -u kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkComponentPeer.java:1.11 kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkComponentPeer.java:1.12
--- kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkComponentPeer.java:1.11 Mon Feb 14 20:49:27 2005
+++ kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkComponentPeer.java Sat Feb 19 15:30:26 2005
@@ -1,5 +1,5 @@
/* GtkComponentPeer.java -- Implements ComponentPeer with GTK
- Copyright (C) 1998, 1999, 2002, 2004 Free Software Foundation, Inc.
+ Copyright (C) 1998, 1999, 2002, 2004, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -81,7 +81,7 @@
knows if a parent is disabled. In that case Component.isEnabled
may return true, but our isEnabled will always return false */
native boolean isEnabled ();
- native static boolean modalHasGrab ();
+ static native boolean modalHasGrab();
native int[] gtkWidgetGetForeground ();
native int[] gtkWidgetGetBackground ();
Index: kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkFileDialogPeer.java
diff -u kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkFileDialogPeer.java:1.7 kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkFileDialogPeer.java:1.8
--- kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkFileDialogPeer.java:1.7 Mon Feb 14 20:49:27 2005
+++ kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkFileDialogPeer.java Sat Feb 19 15:30:26 2005
@@ -1,5 +1,5 @@
/* GtkFileDialogPeer.java -- Implements FileDialogPeer with GTK
- Copyright (C) 1998, 1999, 2002, 2004 Free Software Foundation, Inc.
+ Copyright (C) 1998, 1999, 2002, 2004, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -57,11 +57,12 @@
native void create (GtkContainerPeer parent);
native void connectSignals ();
native void nativeSetFile (String file);
- native public String nativeGetDirectory();
- native public void nativeSetDirectory(String directory);
+ public native String nativeGetDirectory();
+ public native void nativeSetDirectory(String directory);
native void nativeSetFilenameFilter (FilenameFilter filter);
- public void create() {
+ public void create()
+ {
create((GtkContainerPeer) awtComponent.getParent().getPeer());
FileDialog fd = (FileDialog) awtComponent;
Index: kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkFontPeer.java
diff -u kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkFontPeer.java:1.3 kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkFontPeer.java:1.4
--- kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkFontPeer.java:1.3 Mon Feb 14 20:49:27 2005
+++ kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkFontPeer.java Sat Feb 19 15:30:26 2005
@@ -1,5 +1,5 @@
/* GtkFontPeer.java -- Implements FontPeer with GTK+
- Copyright (C) 1999, 2004 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2004, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -67,7 +67,7 @@
}
}
- final private String Xname;
+ private final String Xname;
public GtkFontPeer (String name, int style)
{
Index: kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkLabelPeer.java
diff -u kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkLabelPeer.java:1.4 kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkLabelPeer.java:1.5
--- kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkLabelPeer.java:1.4 Mon Feb 14 20:49:27 2005
+++ kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkLabelPeer.java Sat Feb 19 15:30:26 2005
@@ -1,5 +1,5 @@
/* GtkLabelPeer.java -- Implements LabelPeer with GTK
- Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1998, 1999, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -48,7 +48,7 @@
native void gtkWidgetModifyFont (String name, int style, int size);
native void nativeSetAlignment (float alignment);
- native public void setText (String text);
+ public native void setText(String text);
native void setNativeBounds (int x, int y, int width, int height);
void create ()
Index: kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkMenuBarPeer.java
diff -u kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkMenuBarPeer.java:1.2 kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkMenuBarPeer.java:1.3
--- kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkMenuBarPeer.java:1.2 Mon Sep 27 17:41:04 2004
+++ kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkMenuBarPeer.java Sat Feb 19 15:30:26 2005
@@ -1,5 +1,5 @@
/* GtkMenuBarPeer.java -- Implements MenuBarPeer with GTK+
- Copyright (C) 1999 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -76,5 +76,5 @@
// nativeSetHelpMenu((MenuPeer) menu.getPeer());
}
- native public void delMenu (int index);
+ public native void delMenu(int index);
}
Index: kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkMenuItemPeer.java
diff -u kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkMenuItemPeer.java:1.4 kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkMenuItemPeer.java:1.5
--- kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkMenuItemPeer.java:1.4 Mon Feb 14 20:49:27 2005
+++ kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkMenuItemPeer.java Sat Feb 19 15:30:26 2005
@@ -1,5 +1,5 @@
/* GtkMenuItemPeer.java -- Implements MenuItemPeer with GTK+
- Copyright (C) 1999 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -40,8 +40,8 @@
import java.awt.Font;
import java.awt.Menu;
-import java.awt.MenuComponent;
import java.awt.MenuBar;
+import java.awt.MenuComponent;
import java.awt.MenuItem;
import java.awt.peer.MenuItemPeer;
import java.awt.peer.MenuPeer;
@@ -109,9 +109,9 @@
setEnabled (true);
}
- native public void setEnabled (boolean b);
+ public native void setEnabled(boolean b);
- native public void setLabel (String label);
+ public native void setLabel(String label);
protected void postMenuActionEvent ()
{
Index: kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkMenuPeer.java
diff -u kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkMenuPeer.java:1.2 kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkMenuPeer.java:1.3
--- kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkMenuPeer.java:1.2 Mon Jul 26 21:13:48 2004
+++ kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkMenuPeer.java Sat Feb 19 15:30:26 2005
@@ -1,5 +1,5 @@
/* GtkMenuPeer.java -- Implements MenuPeer with GTK+
- Copyright (C) 1999 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -43,8 +43,8 @@
import java.awt.MenuContainer;
import java.awt.MenuItem;
import java.awt.MenuShortcut;
-import java.awt.peer.MenuPeer;
import java.awt.peer.MenuItemPeer;
+import java.awt.peer.MenuPeer;
public class GtkMenuPeer extends GtkMenuItemPeer
implements MenuPeer
@@ -99,5 +99,5 @@
addItem (item, key, shiftModifier);
}
- native public void delItem (int index);
+ public native void delItem(int index);
}
Index: kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkScrollPanePeer.java
diff -u kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkScrollPanePeer.java:1.4 kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkScrollPanePeer.java:1.5
--- kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkScrollPanePeer.java:1.4 Mon Feb 14 20:49:27 2005
+++ kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkScrollPanePeer.java Sat Feb 19 15:30:27 2005
@@ -1,5 +1,5 @@
/* GtkScrollPanePeer.java -- Implements ScrollPanePeer with GTK
- Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1998, 1999, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -83,9 +83,9 @@
setPolicy (((ScrollPane) awtComponent).getScrollbarDisplayPolicy ());
}
- native public int getHScrollbarHeight ();
- native public int getVScrollbarWidth ();
- native public void setScrollPosition (int x, int y);
+ public native int getHScrollbarHeight();
+ public native int getVScrollbarWidth();
+ public native void setScrollPosition(int x, int y);
public Dimension getPreferredSize ()
{
Index: kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkScrollbarPeer.java
diff -u kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkScrollbarPeer.java:1.3 kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkScrollbarPeer.java:1.4
--- kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkScrollbarPeer.java:1.3 Thu Jan 13 08:02:25 2005
+++ kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkScrollbarPeer.java Sat Feb 19 15:30:27 2005
@@ -1,5 +1,5 @@
/* GtkScrollbarPeer.java -- Implements ScrollbarPeer with GTK+
- Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1998, 1999, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -67,9 +67,9 @@
super (s);
}
- native public void setLineIncrement (int amount);
- native public void setPageIncrement (int amount);
- native public void setValues (int value, int visible, int min, int max);
+ public native void setLineIncrement(int amount);
+ public native void setPageIncrement(int amount);
+ public native void setValues(int value, int visible, int min, int max);
protected void postAdjustmentEvent (int type, int value)
{
Index: kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkToolkit.java
diff -u kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkToolkit.java:1.14 kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkToolkit.java:1.15
--- kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkToolkit.java:1.14 Mon Feb 14 20:49:27 2005
+++ kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkToolkit.java Sat Feb 19 15:30:27 2005
@@ -1,5 +1,5 @@
/* GtkToolkit.java -- Implements an AWT Toolkit using GTK for peers
*** Patch too long, truncated ***
More information about the kaffe
mailing list