From 648e8d6dd39f9bb1a61b7886007088e1064f7dae Mon Sep 17 00:00:00 2001 From: Thomas Fitzsimmons Date: Wed, 14 Jun 2006 03:38:34 +0000 Subject: configure: Regenerate. 2006-06-13 Thomas Fitzsimmons * configure: Regenerate. * Makefile.in: Regenerate. * configure.ac (--enable-plugin): New option. (ac_configure_args): Add --enable-tool-wrappers. (ac_configure_args): Add --disable-plugin unless --enable-plugin was specified. * gcj/Makefile.in: Regenerate. * sources.am (gnu_java_net_source_files): Add classpath/gnu/java/net/IndexListParser.java. (property_files): Remove classpath/resource/gnu/classpath/tools/jarsigner/MessageBundle.properties, classpath/resource/gnu/classpath/tools/keytool/MessageBundle.properties. Add classpath/resource/gnu/classpath/tools/appletviewer/MessagesBundle.properties, classpath/resource/gnu/classpath/tools/appletviewer/MessagesBundle_de.properties, classpath/resource/gnu/classpath/tools/getopt/Messages.properties, classpath/resource/gnu/classpath/tools/jar/messages.properties, classpath/resource/gnu/classpath/tools/jarsigner/messages.properties, classpath/resource/gnu/classpath/tools/keytool/messages.properties, classpath/resource/gnu/classpath/tools/native2ascii/messages.properties, classpath/resource/gnu/classpath/tools/serialver/messages.properties. * classpath/Makefile.in: Regenerate. * classpath/native/jni/gtk-peer/cairographics2d.h, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c: Merge from GNU Classpath. * classpath/native/Makefile.in: Regenerate. * classpath/native/jawt/Makefile.in: Regenerate. * classpath/native/jawt/Makefile.am: Install libjawt.so in GCJ's versioned library directory. * classpath/native/Makefile.am: Add plugin directory if --enable-plugin was specified. * classpath/native/plugin/Makefile.in: Regenerate. * classpath/native/plugin/Makefile.am: Install libgcjwebplugin.so in GCJ's versioned library directory. * classpath/resource/gnu/classpath/tools/native2ascii/messages.properties: New file. * classpath/resource/gnu/classpath/tools/getopt/Messages.properties: Likewise. * classpath/resource/gnu/classpath/tools/jarsigner/messages.properties: Likewise. * classpath/resource/gnu/classpath/tools/jarsigner/MessageBundle.properties: Remove file. * classpath/resource/gnu/classpath/tools/keytool/messages.properties: New file. * classpath/resource/gnu/classpath/tools/keytool/MessageBundle.properties: Remove file. * classpath/resource/gnu/classpath/tools/appletviewer/MessagesBundle_de.properties: New file. * classpath/resource/gnu/classpath/tools/appletviewer/MessagesBundle.properties: Likewise. * classpath/resource/gnu/classpath/tools/jar/messages.properties: Likewise. * classpath/resource/gnu/classpath/tools/serialver/messages.properties: Likewise. * classpath/gnu/java/net/IndexListParser.java: Likewise. * classpath/gnu/java/awt/peer/gtk/VolatileImageGraphics.java, classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java, classpath/gnu/java/awt/peer/gtk/CairoSurface.java, classpath/gnu/java/awt/peer/gtk/GdkFontPeer.java, classpath/gnu/java/awt/peer/gtk/GdkPixbufDecoder.java, classpath/gnu/java/awt/peer/gtk/FreetypeGlyphVector.java, classpath/gnu/java/awt/peer/gtk/GdkTextLayout.java, classpath/gnu/java/awt/peer/gtk/ComponentGraphics.java, classpath/gnu/java/awt/peer/gtk/CairoSurfaceGraphics.java, classpath/gnu/java/awt/peer/gtk/GtkVolatileImage.java, classpath/gnu/java/awt/font/opentype/truetype/VirtualMachine.java, classpath/gnu/java/awt/java2d/PolyEdge.java, classpath/gnu/java/awt/java2d/AbstractGraphics2D.java: Merge from GNU Classpath. * classpath/tools/toolwrapper.c: Replace tools.zip reference with libgcj-tools-4.2.0.jar. * classpath/tools/Makefile.in: Regenerate. * classpath/tools/Makefile.am: Rename tools.zip to libgcj-tools-4.2.0.jar. Install libgcj-tools-4.2.0.jar in $(datadir)/java. * classpath/javax/swing/JTabbedPane.java, classpath/javax/swing/text/DefaultStyledDocument.java, classpath/javax/swing/text/html/HTMLDocument.java, classpath/javax/swing/text/GapContent.java, classpath/javax/swing/JComponent.java, classpath/javax/swing/RepaintManager.java, classpath/javax/swing/plaf/basic/BasicComboBoxRenderer.java, classpath/javax/swing/plaf/basic/BasicScrollBarUI.java, classpath/javax/swing/plaf/basic/BasicTabbedPaneUI.java, classpath/javax/swing/plaf/basic/BasicScrollPaneUI.java, classpath/javax/swing/plaf/basic/BasicLookAndFeel.java, classpath/javax/swing/plaf/metal/MetalButtonUI.java, classpath/java/text/Bidi.java, classpath/java/awt/image/BufferedImage.java, classpath/java/awt/datatransfer/DataFlavor.java, classpath/java/awt/geom/AffineTransform.java, classpath/java/awt/dnd/DropTargetDropEvent.java, classpath/java/awt/dnd/DropTargetContext.java, classpath/java/awt/font/TextLayout.java, classpath/include/gnu_java_awt_peer_gtk_ComponentGraphics.h, classpath/include/gnu_java_awt_peer_gtk_CairoGraphics2D.h, classpath/include/gnu_java_awt_peer_gtk_FreetypeGlyphVector.h, classpath/include/gnu_java_awt_peer_gtk_GdkTextLayout.h, classpath/include/gnu_java_awt_peer_gtk_GtkVolatileImage.h, classpath/include/gnu_java_awt_peer_gtk_CairoSurface.h: Merge from GNU Classpath. * classpath/include/gnu_java_awt_peer_gtk_GdkGraphics.h, classpath/include/gnu_java_awt_peer_gtk_GdkGraphics2D.h, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c, classpath/native/jni/gtk-peer/gtkcairopeer.h, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c: Remove files. * classpath/Makefile.am (SUBDIRS, DIST_SUBDIRS): Include tools directory. * include/Makefile.in: Regenerate. * testsuite/Makefile.in: Regenerate. From-SVN: r114633 --- .../classpath/java/awt/dnd/DropTargetContext.java | 61 +++++++++++++--------- .../java/awt/dnd/DropTargetDropEvent.java | 53 ++++++++++--------- 2 files changed, 63 insertions(+), 51 deletions(-) (limited to 'libjava/classpath/java/awt/dnd') diff --git a/libjava/classpath/java/awt/dnd/DropTargetContext.java b/libjava/classpath/java/awt/dnd/DropTargetContext.java index 19e27a9..4a26d90 100644 --- a/libjava/classpath/java/awt/dnd/DropTargetContext.java +++ b/libjava/classpath/java/awt/dnd/DropTargetContext.java @@ -1,5 +1,5 @@ /* DropTargetContext.java -- - Copyright (C) 2002, 2003, 2004 Free Software Foundation + Copyright (C) 2002, 2003, 2004, 2006, Free Software Foundation This file is part of GNU Classpath. @@ -37,6 +37,8 @@ exception statement from your version. */ package java.awt.dnd; +import gnu.classpath.NotImplementedException; + import java.awt.Component; import java.awt.datatransfer.DataFlavor; import java.awt.datatransfer.Transferable; @@ -59,23 +61,23 @@ public class DropTargetContext implements Serializable protected boolean isLocal; protected Transferable transferable; - TransferableProxy (Transferable t, boolean local) + TransferableProxy(Transferable t, boolean local) { this.transferable = t; this.isLocal = local; } - public DataFlavor[] getTransferDataFlavors () + public DataFlavor[] getTransferDataFlavors() { - return transferable.getTransferDataFlavors (); + return transferable.getTransferDataFlavors(); } - public boolean isDataFlavorSupported (DataFlavor flavor) + public boolean isDataFlavorSupported(DataFlavor flavor) { - return transferable.isDataFlavorSupported (flavor); + return transferable.isDataFlavorSupported(flavor); } - public Object getTransferData (DataFlavor flavor) + public Object getTransferData(DataFlavor flavor) throws UnsupportedFlavorException, IOException { return transferable.getTransferData (flavor); @@ -87,32 +89,32 @@ public class DropTargetContext implements Serializable private java.awt.dnd.peer.DropTargetContextPeer dtcp; // package private - DropTargetContext (DropTarget dropTarget) + DropTargetContext(DropTarget dropTarget) { this.dropTarget = dropTarget; } - public DropTarget getDropTarget () + public DropTarget getDropTarget() { return dropTarget; } - public Component getComponent () + public Component getComponent() { - return dropTarget.getComponent (); + return dropTarget.getComponent(); } - public void addNotify (java.awt.dnd.peer.DropTargetContextPeer dtcp) + public void addNotify(java.awt.dnd.peer.DropTargetContextPeer dtcp) { this.dtcp = dtcp; } - public void removeNotify () + public void removeNotify() { this.dtcp = null; } - protected void setTargetActions (int actions) + protected void setTargetActions(int actions) { targetActions = actions; } @@ -127,45 +129,51 @@ public class DropTargetContext implements Serializable * * @exception InvalidDnDOperationException If a drop is not outstanding. */ - public void dropComplete (boolean success) + public void dropComplete(boolean success) + throws NotImplementedException { // FIXME: implement this } - protected void acceptDrag (int dragOperation) + protected void acceptDrag(int dragOperation) + throws NotImplementedException { // FIXME: implement this } - protected void rejectDrag () + protected void rejectDrag() + throws NotImplementedException { // FIXME: implement this } - protected void acceptDrop (int dropOperation) + protected void acceptDrop(int dropOperation) + throws NotImplementedException { // FIXME: implement this } - protected void rejectDrop () + protected void rejectDrop() + throws NotImplementedException { // FIXME: implement this } - protected DataFlavor[] getCurrentDataFlavors () + protected DataFlavor[] getCurrentDataFlavors() + throws NotImplementedException { // FIXME: implement this return null; } - protected List getCurrentDataFlavorsAsList () + protected List getCurrentDataFlavorsAsList() { - return Arrays.asList (getCurrentDataFlavors ()); + return Arrays.asList(getCurrentDataFlavors()); } - protected boolean isDataFlavorSupported (DataFlavor flavor) + protected boolean isDataFlavorSupported(DataFlavor flavor) { - return getCurrentDataFlavorsAsList ().contains (flavor); + return getCurrentDataFlavorsAsList().contains(flavor); } /** @@ -173,7 +181,8 @@ public class DropTargetContext implements Serializable * * @exception InvalidDnDOperationException If a drag is not outstanding. */ - protected Transferable getTransferable() throws InvalidDnDOperationException + protected Transferable getTransferable() + throws InvalidDnDOperationException, NotImplementedException { // FIXME: implement this return null; @@ -181,6 +190,6 @@ public class DropTargetContext implements Serializable protected Transferable createTransferableProxy(Transferable t, boolean local) { - return new TransferableProxy (t, local); + return new TransferableProxy(t, local); } } // class DropTargetContext diff --git a/libjava/classpath/java/awt/dnd/DropTargetDropEvent.java b/libjava/classpath/java/awt/dnd/DropTargetDropEvent.java index 0c0777f..a745bd2 100644 --- a/libjava/classpath/java/awt/dnd/DropTargetDropEvent.java +++ b/libjava/classpath/java/awt/dnd/DropTargetDropEvent.java @@ -37,6 +37,8 @@ exception statement from your version. */ package java.awt.dnd; +import gnu.classpath.NotImplementedException; + import java.awt.Point; import java.awt.datatransfer.DataFlavor; import java.awt.datatransfer.Transferable; @@ -65,10 +67,10 @@ public class DropTargetDropEvent extends DropTargetEvent * actions is not a bitwise mask of DnDConstants, or dtc is null. * @exception NullPointerException If location is null. */ - public DropTargetDropEvent (DropTargetContext dtc, Point location, - int dropAction, int actions) + public DropTargetDropEvent(DropTargetContext dtc, Point location, + int dropAction, int actions) { - this (dtc, location, dropAction, actions, false); + this(dtc, location, dropAction, actions, false); } /** @@ -78,16 +80,16 @@ public class DropTargetDropEvent extends DropTargetEvent * actions is not a bitwise mask of DnDConstants, or dtc is null. * @exception NullPointerException If location is null. */ - public DropTargetDropEvent (DropTargetContext dtc, Point location, - int dropAction, int actions, boolean isLocalTx) + public DropTargetDropEvent(DropTargetContext dtc, Point location, + int dropAction, int actions, boolean isLocalTx) { - super (dtc); + super(dtc); if (location == null) - throw new NullPointerException (); + throw new NullPointerException(); if (dtc == null) - throw new IllegalArgumentException (); + throw new IllegalArgumentException(); if (dropAction != DnDConstants.ACTION_NONE && dropAction != DnDConstants.ACTION_COPY @@ -95,7 +97,7 @@ public class DropTargetDropEvent extends DropTargetEvent && dropAction != DnDConstants.ACTION_COPY_OR_MOVE && dropAction != DnDConstants.ACTION_LINK && dropAction != DnDConstants.ACTION_REFERENCE) - throw new IllegalArgumentException (); + throw new IllegalArgumentException(); int actionsMask = DnDConstants.ACTION_NONE | DnDConstants.ACTION_COPY @@ -105,7 +107,7 @@ public class DropTargetDropEvent extends DropTargetEvent | DnDConstants.ACTION_REFERENCE; if (~(actions ^ actionsMask) != 0) - throw new IllegalArgumentException (); + throw new IllegalArgumentException(); this.dropAction = dropAction; this.actions = actions; @@ -113,52 +115,53 @@ public class DropTargetDropEvent extends DropTargetEvent this.isLocalTx = isLocalTx; } - public Point getLocation () + public Point getLocation() { return location; } - public DataFlavor[] getCurrentDataFlavors () + public DataFlavor[] getCurrentDataFlavors() { - return context.getCurrentDataFlavors (); + return context.getCurrentDataFlavors(); } - public List getCurrentDataFlavorsAsList () + public List getCurrentDataFlavorsAsList() { - return context.getCurrentDataFlavorsAsList (); + return context.getCurrentDataFlavorsAsList(); } - public boolean isDataFlavorSupported (DataFlavor flavor) + public boolean isDataFlavorSupported(DataFlavor flavor) { - return context.isDataFlavorSupported (flavor); + return context.isDataFlavorSupported(flavor); } - public int getSourceActions () + public int getSourceActions() { return actions; } - public int getDropAction () + public int getDropAction() { return dropAction; } - public Transferable getTransferable () + public Transferable getTransferable() { return context.getTransferable (); } - public void acceptDrop (int dropAction) + public void acceptDrop(int dropAction) { - context.acceptDrop (dropAction); + context.acceptDrop(dropAction); } - public void rejectDrop () + public void rejectDrop() { - context.rejectDrop (); + context.rejectDrop(); } - public void dropComplete (boolean success) + public void dropComplete(boolean success) + throws NotImplementedException { // FIXME: implement this } -- cgit v1.1