Merge

src/macosx/classes/apple/laf/JRSUIConstants.java

@@ -28,9 +28,13 @@ package apple.laf;
 import java.lang.reflect.Field;
 import java.nio.ByteBuffer;
 
+import javax.tools.annotation.GenerateNativeHeader;
+
 public final class JRSUIConstants {
     private static native long getPtrForConstant(final int constant);
 
+    /* No native methods here, but the constants are needed in the supporting JNI code */
+    @GenerateNativeHeader
     static class Key {
         protected static final int _value = 20;
         public static final Key VALUE = new Key(_value);
@@ -66,6 +70,8 @@ public final class JRSUIConstants {
         }
     }
 
+    /* No native methods here, but the constants are needed in the supporting JNI code */
+    @GenerateNativeHeader
     static class DoubleValue {
         protected static final byte TYPE_CODE = 1;
 
@@ -133,6 +139,8 @@ public final class JRSUIConstants {
         }
     }
 
+    /* No native methods here, but the constants are needed in the supporting JNI code */
+    @GenerateNativeHeader
     public static class Size extends Property {
         private static final byte SHIFT = 0;
         private static final byte SIZE = 3;
@@ -153,6 +161,8 @@ public final class JRSUIConstants {
         public static final Size LARGE = new Size(_large);
     }
 
+    /* No native methods here, but the constants are needed in the supporting JNI code */
+    @GenerateNativeHeader
     public static class State extends Property {
         private static final byte SHIFT = Size.SHIFT + Size.SIZE;
         private static final byte SIZE = 4;
@@ -179,6 +189,8 @@ public final class JRSUIConstants {
         public static final State DRAG = new State(_drag);
     }
 
+    /* No native methods here, but the constants are needed in the supporting JNI code */
+    @GenerateNativeHeader
     public static class Direction extends Property {
         private static final byte SHIFT = State.SHIFT + State.SIZE;
         private static final byte SIZE = 4;
@@ -209,6 +221,8 @@ public final class JRSUIConstants {
         public static final Direction WEST = new Direction(_west);
     }
 
+    /* No native methods here, but the constants are needed in the supporting JNI code */
+    @GenerateNativeHeader
     public static class Orientation extends Property {
         private static final byte SHIFT = Direction.SHIFT + Direction.SIZE;
         private static final byte SIZE = 2;
@@ -225,6 +239,8 @@ public final class JRSUIConstants {
         public static final Orientation VERTICAL = new Orientation(_vertical);
     }
 
+    /* No native methods here, but the constants are needed in the supporting JNI code */
+    @GenerateNativeHeader
     public static class AlignmentVertical extends Property {
         private static final byte SHIFT = Orientation.SHIFT + Orientation.SIZE;
         private static final byte SIZE = 2;
@@ -243,6 +259,8 @@ public final class JRSUIConstants {
         public static final AlignmentVertical BOTTOM = new AlignmentVertical(_bottom);
     }
 
+    /* No native methods here, but the constants are needed in the supporting JNI code */
+    @GenerateNativeHeader
     public static class AlignmentHorizontal extends Property {
         private static final byte SHIFT = AlignmentVertical.SHIFT + AlignmentVertical.SIZE;
         private static final byte SIZE = 2;
@@ -261,6 +279,8 @@ public final class JRSUIConstants {
         public static final AlignmentHorizontal RIGHT = new AlignmentHorizontal(_right);
     }
 
+    /* No native methods here, but the constants are needed in the supporting JNI code */
+    @GenerateNativeHeader
     public static class SegmentPosition extends Property {
         private static final byte SHIFT = AlignmentHorizontal.SHIFT + AlignmentHorizontal.SIZE;
         private static final byte SIZE = 3;
@@ -281,6 +301,8 @@ public final class JRSUIConstants {
         public static final SegmentPosition ONLY = new SegmentPosition(_only);
     }
 
+    /* No native methods here, but the constants are needed in the supporting JNI code */
+    @GenerateNativeHeader
     public static class ScrollBarPart extends Property {
         private static final byte SHIFT = SegmentPosition.SHIFT + SegmentPosition.SIZE;
         private static final byte SIZE = 4;
@@ -309,6 +331,8 @@ public final class JRSUIConstants {
         public static final ScrollBarPart TRACK_MAX = new ScrollBarPart(_trackMax);
     }
 
+    /* No native methods here, but the constants are needed in the supporting JNI code */
+    @GenerateNativeHeader
     public static class Variant extends Property {
         private static final byte SHIFT = ScrollBarPart.SHIFT + ScrollBarPart.SIZE;
         private static final byte SIZE = 4;
@@ -340,6 +364,8 @@ public final class JRSUIConstants {
         public static final Variant GRADIENT_SIDE_BAR_FOCUSED_SELECTION = new Variant(_gradientSideBarFocusedSelection);
     }
 
+    /* No native methods here, but the constants are needed in the supporting JNI code */
+    @GenerateNativeHeader
     public static class WindowType extends Property {
         private static final byte SHIFT = Variant.SHIFT + Variant.SIZE;
         private static final byte SIZE = 2;
@@ -358,6 +384,8 @@ public final class JRSUIConstants {
         public static final WindowType TITLELESS_UTILITY = new WindowType(_titlelessUtility);
     }
 
+    /* No native methods here, but the constants are needed in the supporting JNI code */
+    @GenerateNativeHeader
     public static class Focused extends Property {
         private static final byte SHIFT = WindowType.SHIFT + WindowType.SIZE;
         private static final byte SIZE = 1;
@@ -374,6 +402,8 @@ public final class JRSUIConstants {
         public static final Focused YES = new Focused(_yes);
     }
 
+    /* No native methods here, but the constants are needed in the supporting JNI code */
+    @GenerateNativeHeader
     public static class IndicatorOnly extends Property {
         private static final byte SHIFT = Focused.SHIFT + Focused.SIZE;
         private static final byte SIZE = 1;
@@ -390,6 +420,8 @@ public final class JRSUIConstants {
         public static final IndicatorOnly YES = new IndicatorOnly(_yes);
     }
 
+    /* No native methods here, but the constants are needed in the supporting JNI code */
+    @GenerateNativeHeader
     public static class NoIndicator extends Property {
         private static final byte SHIFT = IndicatorOnly.SHIFT + IndicatorOnly.SIZE;
         private static final byte SIZE = 1;
@@ -406,6 +438,8 @@ public final class JRSUIConstants {
         public static final NoIndicator YES = new NoIndicator(_yes);
     }
 
+    /* No native methods here, but the constants are needed in the supporting JNI code */
+    @GenerateNativeHeader
     public static class ArrowsOnly extends Property {
         private static final byte SHIFT = NoIndicator.SHIFT + NoIndicator.SIZE;
         private static final byte SIZE = 1;
@@ -422,6 +456,8 @@ public final class JRSUIConstants {
         public static final ArrowsOnly YES = new ArrowsOnly(_yes);
     }
 
+    /* No native methods here, but the constants are needed in the supporting JNI code */
+    @GenerateNativeHeader
     public static class FrameOnly extends Property {
         private static final byte SHIFT = ArrowsOnly.SHIFT + ArrowsOnly.SIZE;
         private static final byte SIZE = 1;
@@ -438,6 +474,8 @@ public final class JRSUIConstants {
         public static final FrameOnly YES = new FrameOnly(_yes);
     }
 
+    /* No native methods here, but the constants are needed in the supporting JNI code */
+    @GenerateNativeHeader
     public static class SegmentTrailingSeparator extends Property {
         private static final byte SHIFT = FrameOnly.SHIFT + FrameOnly.SIZE;
         private static final byte SIZE = 1;
@@ -454,6 +492,8 @@ public final class JRSUIConstants {
         public static final SegmentTrailingSeparator YES = new SegmentTrailingSeparator(_yes);
     }
 
+    /* No native methods here, but the constants are needed in the supporting JNI code */
+    @GenerateNativeHeader
     public static class SegmentLeadingSeparator extends Property {
         private static final byte SHIFT = SegmentTrailingSeparator.SHIFT + SegmentTrailingSeparator.SIZE;
         private static final byte SIZE = 1;
@@ -470,6 +510,8 @@ public final class JRSUIConstants {
         public static final SegmentLeadingSeparator YES = new SegmentLeadingSeparator(_yes);
     }
 
+    /* No native methods here, but the constants are needed in the supporting JNI code */
+    @GenerateNativeHeader
     public static class NothingToScroll extends Property {
         private static final byte SHIFT = SegmentLeadingSeparator.SHIFT + SegmentLeadingSeparator.SIZE;
         private static final byte SIZE = 1;
@@ -486,6 +528,8 @@ public final class JRSUIConstants {
         public static final NothingToScroll YES = new NothingToScroll(_yes);
     }
 
+    /* No native methods here, but the constants are needed in the supporting JNI code */
+    @GenerateNativeHeader
     public static class WindowTitleBarSeparator extends Property {
         private static final byte SHIFT = NothingToScroll.SHIFT + NothingToScroll.SIZE;
         private static final byte SIZE = 1;
@@ -502,6 +546,8 @@ public final class JRSUIConstants {
         public static final WindowTitleBarSeparator YES = new WindowTitleBarSeparator(_yes);
     }
 
+    /* No native methods here, but the constants are needed in the supporting JNI code */
+    @GenerateNativeHeader
     public static class WindowClipCorners extends Property {
         private static final byte SHIFT = WindowTitleBarSeparator.SHIFT + WindowTitleBarSeparator.SIZE;
         private static final byte SIZE = 1;
@@ -518,6 +564,8 @@ public final class JRSUIConstants {
         public static final WindowClipCorners YES = new WindowClipCorners(_yes);
     }
 
+    /* No native methods here, but the constants are needed in the supporting JNI code */
+    @GenerateNativeHeader
     public static class ShowArrows extends Property {
         private static final byte SHIFT = WindowClipCorners.SHIFT + WindowClipCorners.SIZE;
         private static final byte SIZE = 1;
@@ -534,6 +582,8 @@ public final class JRSUIConstants {
         public static final ShowArrows YES = new ShowArrows(_yes);
     }
 
+    /* No native methods here, but the constants are needed in the supporting JNI code */
+    @GenerateNativeHeader
     public static class BooleanValue extends Property {
         private static final byte SHIFT = ShowArrows.SHIFT + ShowArrows.SIZE;
         private static final byte SIZE = 1;
@@ -550,6 +600,8 @@ public final class JRSUIConstants {
         public static final BooleanValue YES = new BooleanValue(_yes);
     }
 
+    /* No native methods here, but the constants are needed in the supporting JNI code */
+    @GenerateNativeHeader
     public static class Animating extends Property {
         private static final byte SHIFT = BooleanValue.SHIFT + BooleanValue.SIZE;
         private static final byte SIZE = 1;
@@ -566,6 +618,8 @@ public final class JRSUIConstants {
         public static final Animating YES = new Animating(_yes);
     }
 
+    /* No native methods here, but the constants are needed in the supporting JNI code */
+    @GenerateNativeHeader
     public static class Widget extends Property {
         private static final byte SHIFT = Animating.SHIFT + Animating.SIZE;
         private static final byte SIZE = 7;
@@ -755,6 +809,8 @@ public final class JRSUIConstants {
         public static final Widget WINDOW_FRAME = new Widget(_windowFrame);
     }
 
+    /* No native methods here, but the constants are needed in the supporting JNI code */
+    @GenerateNativeHeader
     public static class Hit {
         private static final int _unknown = -1;
         public static final Hit UNKNOWN = new Hit(_unknown);
@@ -775,6 +831,8 @@ public final class JRSUIConstants {
         }
     }
 
+    /* No native methods here, but the constants are needed in the supporting JNI code */
+    @GenerateNativeHeader
     public static class ScrollBarHit extends Hit {
         private static final int _thumb = 2;
         public static final ScrollBarHit THUMB = new ScrollBarHit(_thumb);

src/macosx/classes/com/apple/eawt/FullScreenHandler.java

@@ -33,6 +33,10 @@ import javax.swing.RootPaneContainer;
 
 import com.apple.eawt.AppEvent.FullScreenEvent;
 
+import javax.tools.annotation.GenerateNativeHeader;
+
+/* No native methods here, but the constants are needed in the supporting JNI code */
+@GenerateNativeHeader
 final class FullScreenHandler {
     private static final String CLIENT_PROPERTY = "com.apple.eawt.event.internalFullScreenHandler";
 

src/macosx/classes/com/apple/eawt/event/GestureHandler.java

@@ -31,6 +31,10 @@ import java.util.List;
 
 import javax.swing.*;
 
+import javax.tools.annotation.GenerateNativeHeader;
+
+/* No native methods here, but the constants are needed in the supporting JNI code */
+@GenerateNativeHeader
 final class GestureHandler {
     private static final String CLIENT_PROPERTY = "com.apple.eawt.event.internalGestureHandler";
 

src/macosx/classes/sun/java2d/OSXSurfaceData.java

@@ -37,9 +37,13 @@ import sun.java2d.loops.*;
 import sun.java2d.pipe.*;
 import sun.lwawt.macosx.*;
 
+import javax.tools.annotation.GenerateNativeHeader;
+
 /*
  * This is the SurfaceData for a CGContextRef.
  */
+/* No native methods here, but the constants are needed in the supporting JNI code */
+@GenerateNativeHeader
 public abstract class OSXSurfaceData extends BufImgSurfaceData {
     final static float UPPER_BND = Float.MAX_VALUE / 2.0f;
     final static float LOWER_BND = -UPPER_BND;

src/macosx/classes/sun/lwawt/LWLabelPeer.java

@@ -34,10 +34,14 @@ import java.awt.peer.LabelPeer;
 import javax.swing.JLabel;
 import javax.swing.SwingConstants;
 
+import javax.tools.annotation.GenerateNativeHeader;
+
 /**
  * Lightweight implementation of {@link LabelPeer}. Delegates most of the work
  * to the {@link JLabel}.
  */
+/* No native methods here, but the constants are needed in the supporting JNI code */
+@GenerateNativeHeader
 final class LWLabelPeer extends LWComponentPeer<Label, JLabel>
         implements LabelPeer {
 

src/macosx/classes/sun/lwawt/LWTextFieldPeer.java

@@ -37,6 +37,10 @@ import java.awt.peer.TextFieldPeer;
 import javax.swing.JPasswordField;
 import javax.swing.text.JTextComponent;
 
+import javax.tools.annotation.GenerateNativeHeader;
+
+/* No native methods here, but the constants are needed in the supporting JNI code */
+@GenerateNativeHeader
 final class LWTextFieldPeer
         extends LWTextComponentPeer<TextField, JPasswordField>
         implements TextFieldPeer, ActionListener {

src/macosx/classes/sun/lwawt/macosx/CocoaConstants.java

@@ -25,6 +25,10 @@
 
 package sun.lwawt.macosx;
 
+import javax.tools.annotation.GenerateNativeHeader;
+
+/* No native methods here, but the constants are needed in the supporting JNI code */
+@GenerateNativeHeader
 public final class CocoaConstants {
     private CocoaConstants(){}
 

src/share/classes/java/awt/Adjustable.java

@@ -27,6 +27,8 @@ package java.awt;
 
 import java.awt.event.*;
 
+import javax.tools.annotation.GenerateNativeHeader;
+
 /**
  * The interface for objects which have an adjustable numeric value
  * contained within a bounded range of values.
@@ -34,7 +36,8 @@ import java.awt.event.*;
  * @author Amy Fowler
  * @author Tim Prinzing
  */
-
+/* No native methods here, but the constants are needed in the supporting JNI code */
+@GenerateNativeHeader
 public interface Adjustable {
 
     /**

src/share/classes/java/awt/BasicStroke.java

@@ -27,6 +27,8 @@ package java.awt;
 
 import java.beans.ConstructorProperties;
 
+import javax.tools.annotation.GenerateNativeHeader;
+
 /**
  * The <code>BasicStroke</code> class defines a basic set of rendering
  * attributes for the outlines of graphics primitives, which are rendered
@@ -109,6 +111,8 @@ import java.beans.ConstructorProperties;
  * @see Graphics2D
  * @author Jim Graham
  */
+/* No native methods here, but the constants are needed in the supporting JNI code */
+@GenerateNativeHeader
 public class BasicStroke implements Stroke {
 
     /**

src/share/classes/java/awt/Choice.java

@@ -34,6 +34,8 @@ import java.io.IOException;
 
 import javax.accessibility.*;
 
+import javax.tools.annotation.GenerateNativeHeader;
+
 /**
  * The <code>Choice</code> class presents a pop-up menu of choices.
  * The current choice is displayed as the title of the menu.
@@ -69,6 +71,8 @@ import javax.accessibility.*;
  * @author      Arthur van Hoff
  * @since       JDK1.0
  */
+/* No native methods here, but the constants are needed in the supporting JNI code */
+@GenerateNativeHeader
 public class Choice extends Component implements ItemSelectable, Accessible {
     /**
      * The items for the <code>Choice</code>.

src/share/classes/java/awt/DisplayMode.java

@@ -25,6 +25,8 @@
 
 package java.awt;
 
+import javax.tools.annotation.GenerateNativeHeader;
+
 /**
  * The <code>DisplayMode</code> class encapsulates the bit depth, height,
  * width, and refresh rate of a <code>GraphicsDevice</code>. The ability to
@@ -43,6 +45,9 @@ package java.awt;
  * @author Michael Martak
  * @since 1.4
  */
+
+/* No native methods here, but the constants are needed in the supporting JNI code */
+@GenerateNativeHeader
 public final class DisplayMode {
 
     private Dimension size;

src/share/classes/java/awt/Image.java

@@ -33,6 +33,8 @@ import java.awt.image.ReplicateScaleFilter;
 
 import sun.awt.image.SurfaceManager;
 
+import javax.tools.annotation.GenerateNativeHeader;
+
 /**
  * The abstract class <code>Image</code> is the superclass of all
  * classes that represent graphical images. The image must be
@@ -42,6 +44,8 @@ import sun.awt.image.SurfaceManager;
  * @author      Arthur van Hoff
  * @since       JDK1.0
  */
+/* No native methods here, but the constants are needed in the supporting JNI code */
+@GenerateNativeHeader
 public abstract class Image {
 
     /**

src/share/classes/java/awt/List.java

@@ -33,6 +33,7 @@ import java.io.ObjectOutputStream;
 import java.io.ObjectInputStream;
 import java.io.IOException;
 import javax.accessibility.*;
+import javax.tools.annotation.GenerateNativeHeader;
 
 
 /**
@@ -106,6 +107,8 @@ import javax.accessibility.*;
  * @see         java.awt.event.ActionListener
  * @since       JDK1.0
  */
+/* No native methods here, but the constants are needed in the supporting JNI code */
+@GenerateNativeHeader
 public class List extends Component implements ItemSelectable, Accessible {
     /**
      * A vector created to contain items which will become

src/share/classes/java/awt/PopupMenu.java

@@ -28,6 +28,8 @@ package java.awt;
 import java.awt.peer.PopupMenuPeer;
 import javax.accessibility.*;
 
+import javax.tools.annotation.GenerateNativeHeader;
+
 import sun.awt.AWTAccessor;
 
 /**
@@ -42,6 +44,8 @@ import sun.awt.AWTAccessor;
  *
  * @author      Amy Fowler
  */
+/* No native methods here, but the constants are needed in the supporting JNI code */
+@GenerateNativeHeader
 public class PopupMenu extends Menu {
 
     private static final String base = "popup";

src/share/classes/java/awt/SystemColor.java

@@ -26,6 +26,8 @@ package java.awt;
 
 import java.io.ObjectStreamException;
 
+import javax.tools.annotation.GenerateNativeHeader;
+
 /**
  * A class to encapsulate symbolic colors representing the color of
  * native GUI objects on a system.  For systems which support the dynamic
@@ -47,6 +49,8 @@ import java.io.ObjectStreamException;
  * @author      Carl Quinn
  * @author      Amy Fowler
  */
+/* No native methods here, but the constants are needed in the supporting JNI code */
+@GenerateNativeHeader
 public final class SystemColor extends Color implements java.io.Serializable {
 
    /**

src/share/classes/java/awt/TextComponent.java

@@ -35,7 +35,7 @@ import java.text.BreakIterator;
 import javax.swing.text.AttributeSet;
 import javax.accessibility.*;
 import java.awt.im.InputMethodRequests;
-
+import javax.tools.annotation.GenerateNativeHeader;
 
 /**
  * The <code>TextComponent</code> class is the superclass of
@@ -57,6 +57,8 @@ import java.awt.im.InputMethodRequests;
  * @author      Arthur van Hoff
  * @since       JDK1.0
  */
+/* No native methods here, but the constants are needed in the supporting JNI code */
+@GenerateNativeHeader
 public class TextComponent extends Component implements Accessible {
 
     /**

src/share/classes/java/awt/Transparency.java

@@ -25,10 +25,14 @@
 
 package java.awt;
 
+import javax.tools.annotation.GenerateNativeHeader;
+
 /**
  * The <code>Transparency</code> interface defines the common transparency
  * modes for implementing classes.
  */
+/* No native methods here, but the constants are needed in the supporting JNI code */
+@GenerateNativeHeader
 public interface Transparency {
 
     /**

src/share/classes/java/awt/color/ColorSpace.java

@@ -35,6 +35,8 @@
 
 package java.awt.color;
 
+import javax.tools.annotation.GenerateNativeHeader;
+
 import sun.java2d.cmm.PCMM;
 import sun.java2d.cmm.CMSManager;
 
@@ -93,8 +95,8 @@ import sun.java2d.cmm.CMSManager;
  * @see ICC_ColorSpace
  */
 
-
-
+/* No native methods here, but the constants are needed in the supporting JNI code */
+@GenerateNativeHeader
 public abstract class ColorSpace implements java.io.Serializable {
 
     static final long serialVersionUID = -409452704308689724L;

src/share/classes/java/awt/color/ICC_Profile.java

@@ -58,6 +58,7 @@ import java.util.StringTokenizer;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 
+import javax.tools.annotation.GenerateNativeHeader;
 
 /**
  * A representation of color profile data for device independent and
@@ -89,6 +90,8 @@ import java.security.PrivilegedAction;
  */
 
 
+/* No native methods here, but the constants are needed in the supporting JNI code */
+@GenerateNativeHeader
 public class ICC_Profile implements Serializable {
 
     private static final long serialVersionUID = -3938515861990936766L;

src/share/classes/java/awt/datatransfer/Clipboard.java

@@ -35,7 +35,6 @@ import java.io.IOException;
 
 import sun.awt.EventListenerAggregate;
 
-
 /**
  * A class that implements a mechanism to transfer data using
  * cut/copy/paste operations.

src/share/classes/java/awt/datatransfer/StringSelection.java

@@ -27,6 +27,8 @@ package java.awt.datatransfer;
 
 import java.io.*;
 
+import javax.tools.annotation.GenerateNativeHeader;
+
 /**
  * A <code>Transferable</code> which implements the capability required
  * to transfer a <code>String</code>.
@@ -41,6 +43,8 @@ import java.io.*;
  * @see java.awt.datatransfer.DataFlavor#stringFlavor
  * @see java.awt.datatransfer.DataFlavor#plainTextFlavor
  */
+/* No native methods here, but the constants are needed in the supporting JNI code */
+@GenerateNativeHeader
 public class StringSelection implements Transferable, ClipboardOwner {
 
     private static final int STRING = 0;

src/share/classes/java/awt/dnd/DnDConstants.java

@@ -25,12 +25,15 @@
 
 package java.awt.dnd;
 
+import javax.tools.annotation.GenerateNativeHeader;
+
 /**
  * This class contains constant values representing
  * the type of action(s) to be performed by a Drag and Drop operation.
  * @since 1.2
  */
-
+/* No native methods here, but the constants are needed in the supporting JNI code */
+@GenerateNativeHeader
 public final class DnDConstants {
 
     private DnDConstants() {} // define null private constructor.

src/share/classes/java/awt/event/ActionEvent.java

@@ -27,6 +27,7 @@ package java.awt.event;
 
 import java.awt.AWTEvent;
 import java.awt.Event;
+import javax.tools.annotation.GenerateNativeHeader;
 
 /**
  * A semantic event which indicates that a component-defined action occurred.
@@ -56,6 +57,8 @@ import java.awt.Event;
  * @author Carl Quinn
  * @since 1.1
  */
+/* No native methods here, but the constants are needed in the supporting JNI code */
+@GenerateNativeHeader
 public class ActionEvent extends AWTEvent {
 
     /**

src/share/classes/java/awt/event/AdjustmentEvent.java

@@ -27,6 +27,9 @@ package java.awt.event;
 
 import java.awt.Adjustable;
 import java.awt.AWTEvent;
+import javax.tools.annotation.GenerateNativeHeader;
+
+import javax.tools.annotation.GenerateNativeHeader;
 
 /**
  * The adjustment event emitted by Adjustable objects like
@@ -54,6 +57,8 @@ import java.awt.AWTEvent;
  * @author Amy Fowler
  * @since 1.1
  */
+/* No native methods here, but the constants are needed in the supporting JNI code */
+@GenerateNativeHeader
 public class AdjustmentEvent extends AWTEvent {
 
     /**

src/share/classes/java/awt/event/ComponentEvent.java

@@ -28,6 +28,7 @@ package java.awt.event;
 import java.awt.AWTEvent;
 import java.awt.Component;
 import java.awt.Rectangle;
+import javax.tools.annotation.GenerateNativeHeader;
 
 /**
  * A low-level event which indicates that a component moved, changed
@@ -64,6 +65,8 @@ import java.awt.Rectangle;
  * @author Carl Quinn
  * @since 1.1
  */
+/* No native methods here, but the constants are needed in the supporting JNI code */
+@GenerateNativeHeader
 public class ComponentEvent extends AWTEvent {
 
     /**

src/share/classes/java/awt/event/InputMethodEvent.java

@@ -33,6 +33,7 @@ import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.text.AttributedCharacterIterator;
 import java.text.CharacterIterator;
+import javax.tools.annotation.GenerateNativeHeader;
 
 /**
  * Input method events contain information about text that is being
@@ -55,7 +56,8 @@ import java.text.CharacterIterator;
  * @author JavaSoft Asia/Pacific
  * @since 1.2
  */
-
+/* No native methods here, but the constants are needed in the supporting JNI code */
+@GenerateNativeHeader
 public class InputMethodEvent extends AWTEvent {
 
     /**

src/share/classes/java/awt/event/MouseWheelEvent.java

@@ -27,6 +27,8 @@ package java.awt.event;
 
 import java.awt.Component;
 
+import javax.tools.annotation.GenerateNativeHeader;
+
 /**
  * An event which indicates that the mouse wheel was rotated in a component.
  * <P>
@@ -97,6 +99,8 @@ import java.awt.Component;
  * @since 1.4
  */
 
+/* No native methods here, but the constants are needed in the supporting JNI code */
+@GenerateNativeHeader
 public class MouseWheelEvent extends MouseEvent {
 
     /**

src/share/classes/java/awt/geom/PathIterator.java

@@ -25,6 +25,8 @@
 
 package java.awt.geom;
 
+import javax.tools.annotation.GenerateNativeHeader;
+
 /**
  * The <code>PathIterator</code> interface provides the mechanism
  * for objects that implement the {@link java.awt.Shape Shape}
@@ -57,6 +59,8 @@ package java.awt.geom;
  *
  * @author Jim Graham
  */
+/* No native methods here, but the constants are needed in the supporting JNI code */
+@GenerateNativeHeader
 public interface PathIterator {
     /**
      * The winding rule constant for specifying an even-odd rule

src/share/classes/java/awt/image/AffineTransformOp.java

@@ -34,6 +34,7 @@ import java.awt.GraphicsEnvironment;
 import java.awt.Rectangle;
 import java.awt.RenderingHints;
 import java.awt.Transparency;
+import javax.tools.annotation.GenerateNativeHeader;
 import sun.awt.image.ImagingLib;
 
 /**
@@ -62,6 +63,8 @@ import sun.awt.image.ImagingLib;
  * @see java.awt.RenderingHints#KEY_COLOR_RENDERING
  * @see java.awt.RenderingHints#KEY_DITHERING
  */
+/* No native methods here, but the constants are needed in the supporting JNI code */
+@GenerateNativeHeader
 public class AffineTransformOp implements BufferedImageOp, RasterOp {
     private AffineTransform xform;
     RenderingHints hints;

src/share/classes/java/awt/image/ConvolveOp.java

@@ -30,6 +30,7 @@ import java.awt.geom.Rectangle2D;
 import java.awt.Rectangle;
 import java.awt.RenderingHints;
 import java.awt.geom.Point2D;
+import javax.tools.annotation.GenerateNativeHeader;
 import sun.awt.image.ImagingLib;
 
 /**
@@ -65,6 +66,8 @@ import sun.awt.image.ImagingLib;
  * @see java.awt.RenderingHints#KEY_COLOR_RENDERING
  * @see java.awt.RenderingHints#KEY_DITHERING
  */
+/* No native methods here, but the constants are needed in the supporting JNI code */
+@GenerateNativeHeader
 public class ConvolveOp implements BufferedImageOp, RasterOp {
     Kernel kernel;
     int edgeHint;

src/share/classes/java/awt/image/DataBuffer.java

@@ -41,6 +41,8 @@ import sun.java2d.StateTrackableDelegate;
 
 import sun.awt.image.SunWritableRaster;
 
+import javax.tools.annotation.GenerateNativeHeader;
+
 /**
  * This class exists to wrap one or more data arrays.  Each data array in
  * the DataBuffer is referred to as a bank.  Accessor methods for getting
@@ -65,6 +67,8 @@ import sun.awt.image.SunWritableRaster;
  * @see java.awt.image.Raster
  * @see java.awt.image.SampleModel
  */
+/* No native methods here, but the constants are needed in the supporting JNI code */
+@GenerateNativeHeader
 public abstract class DataBuffer {
 
     /** Tag for unsigned byte data. */

src/share/classes/java/awt/image/DirectColorModel.java

@@ -27,6 +27,7 @@ package java.awt.image;
 
 import java.awt.color.ColorSpace;
 import java.awt.Transparency;
+import javax.tools.annotation.GenerateNativeHeader;
 
 /**
  * The <code>DirectColorModel</code> class is a <code>ColorModel</code>
@@ -106,6 +107,8 @@ import java.awt.Transparency;
  * @see ColorModel#getRGBdefault
  *
  */
+/* No native methods here, but the constants are needed in the supporting JNI code */
+@GenerateNativeHeader
 public class DirectColorModel extends PackedColorModel {
     private int red_mask;
     private int green_mask;

src/share/classes/java/awt/image/ImageConsumer.java

@@ -27,6 +27,8 @@ package java.awt.image;
 
 import java.util.Hashtable;
 
+import javax.tools.annotation.GenerateNativeHeader;
+
 /**
  * The interface for objects expressing interest in image data through
  * the ImageProducer interfaces.  When a consumer is added to an image
@@ -37,6 +39,8 @@ import java.util.Hashtable;
  *
  * @author      Jim Graham
  */
+/* No native methods here, but the constants are needed in the supporting JNI code */
+@GenerateNativeHeader
 public interface ImageConsumer {
     /**
      * The dimensions of the source image are reported using the

src/share/classes/java/awt/image/ImageObserver.java

@@ -27,12 +27,16 @@ package java.awt.image;
 
 import java.awt.Image;
 
+import javax.tools.annotation.GenerateNativeHeader;
+
 /**
  * An asynchronous update interface for receiving notifications about
  * Image information as the Image is constructed.
  *
  * @author      Jim Graham
  */
+/* No native methods here, but the constants are needed in the supporting JNI code */
+@GenerateNativeHeader
 public interface ImageObserver {
     /**
      * This method is called when information about an image which was

src/share/classes/java/awt/peer/ComponentPeer.java

@@ -32,6 +32,7 @@ import java.awt.image.ImageObserver;
 import java.awt.image.ColorModel;
 import java.awt.image.VolatileImage;
 import java.awt.GraphicsConfiguration;
+import javax.tools.annotation.GenerateNativeHeader;
 import sun.awt.CausedFocusEvent;
 import sun.java2d.pipe.Region;
 
@@ -49,6 +50,8 @@ import sun.java2d.pipe.Region;
  * nor invoke any of the peer methods directly on the peer
  * instances.
  */
+/* No native methods here, but the constants are needed in the supporting JNI code */
+@GenerateNativeHeader
 public interface ComponentPeer {
 
     /**

src/share/classes/java/awt/print/PageFormat.java

@@ -29,10 +29,14 @@ import java.awt.geom.AffineTransform;
 import java.awt.geom.Point2D;
 import java.awt.geom.Rectangle2D;
 
+import javax.tools.annotation.GenerateNativeHeader;
+
 /**
  * The <code>PageFormat</code> class describes the size and
  * orientation of a page to be printed.
  */
+/* No native methods here, but the constants are needed in the supporting JNI code */
+@GenerateNativeHeader
 public class PageFormat implements Cloneable
 {
 

src/share/classes/java/awt/print/Pageable.java

@@ -25,6 +25,8 @@
 
 package java.awt.print;
 
+import javax.tools.annotation.GenerateNativeHeader;
+
 /**
  * The <code>Pageable</code> implementation represents a set of
  * pages to be printed. The <code>Pageable</code> object returns
@@ -33,6 +35,8 @@ package java.awt.print;
  * @see java.awt.print.PageFormat
  * @see java.awt.print.Printable
  */
+/* No native methods here, but the constants are needed in the supporting JNI code */
+@GenerateNativeHeader
 public interface Pageable {
 
     /**

src/share/classes/java/awt/print/Printable.java

@@ -27,6 +27,8 @@ package java.awt.print;
 
 import java.awt.Graphics;
 
+import javax.tools.annotation.GenerateNativeHeader;
+
 /**
  * The <code>Printable</code> interface is implemented
  * by the <code>print</code> methods of the current
@@ -98,6 +100,8 @@ import java.awt.Graphics;
  * @see java.awt.print.PageFormat
  * @see java.awt.print.PrinterJob
  */
+/* No native methods here, but the constants are needed in the supporting JNI code */
+@GenerateNativeHeader
 public interface Printable {
 
     /**

src/share/classes/sun/awt/CharsetString.java

@@ -24,6 +24,10 @@
  */
 package sun.awt;
 
+import javax.tools.annotation.GenerateNativeHeader;
+
+/* No native methods here, but the constants are needed in the supporting JNI code */
+@GenerateNativeHeader
 public class CharsetString {
     /**
      * chars for this string.  See also offset, length.

src/share/classes/sun/awt/EmbeddedFrame.java

@@ -40,6 +40,7 @@ import java.beans.PropertyChangeEvent;
 import java.util.Set;
 import java.awt.AWTKeyStroke;
 import java.applet.Applet;
+import javax.tools.annotation.GenerateNativeHeader;
 import sun.applet.AppletPanel;
 
 /**
@@ -59,6 +60,8 @@ import sun.applet.AppletPanel;
  *
  * @author      Thomas Ball
  */
+/* No native methods here, but the constants are needed in the supporting JNI code */
+@GenerateNativeHeader
 public abstract class EmbeddedFrame extends Frame
                           implements KeyEventDispatcher, PropertyChangeListener {
 

src/share/classes/sun/awt/SunHints.java

@@ -26,6 +26,7 @@
 package sun.awt;
 
 import java.awt.RenderingHints;
+import javax.tools.annotation.GenerateNativeHeader;
 
 /**
  * This class contains rendering hints that can be used by the
@@ -33,6 +34,8 @@ import java.awt.RenderingHints;
  * {@link java.awt.image.BufferedImageOp} and
  * {@link java.awt.image.Raster}.
  */
+/* No native methods here, but the constants are needed in the supporting JNI code */
+@GenerateNativeHeader
 public class SunHints {
     /**
      * Defines the type of all keys used to control various

src/share/classes/sun/awt/dnd/SunDragSourceContextPeer.java

@@ -54,6 +54,8 @@ import sun.awt.SunToolkit;
 import sun.awt.datatransfer.DataTransferer;
 import java.awt.datatransfer.DataFlavor;
 
+import javax.tools.annotation.GenerateNativeHeader;
+
 /**
  * <p>
  * TBC
@@ -62,7 +64,8 @@ import java.awt.datatransfer.DataFlavor;
  * @since JDK1.3.1
  *
  */
-
+/* No native methods here, but the constants are needed in the supporting JNI code */
+@GenerateNativeHeader
 public abstract class SunDragSourceContextPeer implements DragSourceContextPeer {
 
     private DragGestureEvent  trigger;

src/share/classes/sun/awt/image/BufImgSurfaceData.java

@@ -45,6 +45,10 @@ import sun.java2d.loops.SurfaceType;
 import sun.java2d.loops.CompositeType;
 import sun.java2d.loops.RenderLoops;
 
+import javax.tools.annotation.GenerateNativeHeader;
+
+/* No native methods here, but the constants are needed in the supporting JNI code */
+@GenerateNativeHeader
 public class BufImgSurfaceData extends SurfaceData {
     BufferedImage bufImg;
     private BufferedImageGraphicsConfig graphicsConfig;

src/share/classes/sun/java2d/SunGraphics2D.java

@@ -92,6 +92,8 @@ import java.util.Iterator;
 import sun.java2d.DestSurfaceProvider;
 import sun.misc.PerformanceLogger;
 
+import javax.tools.annotation.GenerateNativeHeader;
+
 /**
  * This is a the master Graphics2D superclass for all of the Sun
  * Graphics implementations.  This class relies on subclasses to
@@ -101,6 +103,8 @@ import sun.misc.PerformanceLogger;
  *
  * @author Jim Graham
  */
+/* No native methods here, but the constants are needed in the supporting JNI code */
+@GenerateNativeHeader
 public final class SunGraphics2D
     extends Graphics2D
     implements ConstrainableGraphics, Cloneable, DestSurfaceProvider

src/share/classes/sun/java2d/opengl/OGLBlitLoops.java

@@ -44,7 +44,10 @@ import sun.java2d.pipe.Region;
 import sun.java2d.pipe.RenderBuffer;
 import sun.java2d.pipe.RenderQueue;
 import static sun.java2d.pipe.BufferedOpCodes.*;
+import javax.tools.annotation.GenerateNativeHeader;
 
+/* No native methods here, but the constants are needed in the supporting JNI code */
+@GenerateNativeHeader
 class OGLBlitLoops {
 
     static void register() {

src/share/classes/sun/java2d/opengl/OGLContext.java

@@ -32,6 +32,8 @@ import sun.java2d.pipe.hw.ContextCapabilities;
 import static sun.java2d.pipe.BufferedOpCodes.*;
 import static sun.java2d.pipe.hw.ContextCapabilities.*;
 
+import javax.tools.annotation.GenerateNativeHeader;
+
 /**
  * Note that the RenderQueue lock must be acquired before calling any of
  * the methods in this class.
@@ -153,6 +155,8 @@ public class OGLContext extends BufferedContext {
         rq.flushNow();
     }
 
+    /* No native methods here, but the constants are needed in the supporting JNI code */
+    @GenerateNativeHeader
     static class OGLContextCaps extends ContextCapabilities {
         /**
          * Indicates the presence of the GL_EXT_framebuffer_object extension.

src/share/classes/sun/java2d/pipe/BufferedContext.java

@@ -37,6 +37,8 @@ import sun.java2d.loops.XORComposite;
 import static sun.java2d.pipe.BufferedOpCodes.*;
 import static sun.java2d.pipe.BufferedRenderPipe.BYTES_PER_SPAN;
 
+import javax.tools.annotation.GenerateNativeHeader;
+
 /**
  * Base context class for managing state in a single-threaded rendering
  * environment.  Each state-setting operation (e.g. SET_COLOR) is added to
@@ -47,6 +49,8 @@ import static sun.java2d.pipe.BufferedRenderPipe.BYTES_PER_SPAN;
  *
  * @see RenderQueue
  */
+/* No native methods here, but the constants are needed in the supporting JNI code */
+@GenerateNativeHeader
 public abstract class BufferedContext {
 
     /*

src/share/classes/sun/java2d/pipe/BufferedOpCodes.java

@@ -25,6 +25,10 @@
 
 package sun.java2d.pipe;
 
+import javax.tools.annotation.GenerateNativeHeader;
+
+/* No native methods here, but the constants are needed in the supporting JNI code */
+@GenerateNativeHeader
 public class BufferedOpCodes {
     // draw ops
     public static final int DRAW_LINE            = 10;

src/share/classes/sun/java2d/pipe/BufferedPaints.java

@@ -46,6 +46,10 @@ import sun.java2d.loops.CompositeType;
 import sun.java2d.loops.SurfaceType;
 import static sun.java2d.pipe.BufferedOpCodes.*;
 
+import javax.tools.annotation.GenerateNativeHeader;
+
+/* No native methods here, but the constants are needed in the supporting JNI code */
+@GenerateNativeHeader
 public class BufferedPaints {
 
     static void setPaint(RenderQueue rq, SunGraphics2D sg2d,

src/share/classes/sun/java2d/pipe/BufferedTextPipe.java

@@ -32,6 +32,10 @@ import sun.java2d.SunGraphics2D;
 import sun.java2d.SurfaceData;
 import static sun.java2d.pipe.BufferedOpCodes.*;
 
+import javax.tools.annotation.GenerateNativeHeader;
+
+/* No native methods here, but the constants are needed in the supporting JNI code */
+@GenerateNativeHeader
 public abstract class BufferedTextPipe extends GlyphListPipe {
 
     private static final int BYTES_PER_GLYPH_IMAGE = 8;

src/share/classes/sun/java2d/pipe/RegionIterator.java

@@ -27,10 +27,14 @@ package sun.java2d.pipe;
 
 import java.awt.Rectangle;
 
+import javax.tools.annotation.GenerateNativeHeader;
+
 /**
  * This class defines the API for iterating through the bands
  * of a region object.
  */
+/* No native methods here, but the constants are needed in the supporting JNI code */
+@GenerateNativeHeader
 public class RegionIterator {
     Region region;
     int curIndex;

src/share/classes/sun/java2d/pipe/RenderBuffer.java

@@ -27,6 +27,8 @@ package sun.java2d.pipe;
 
 import sun.misc.Unsafe;
 
+import javax.tools.annotation.GenerateNativeHeader;
+
 /**
  * The RenderBuffer class is a simplified, high-performance, Unsafe wrapper
  * used for buffering rendering operations in a single-threaded rendering
@@ -42,6 +44,8 @@ import sun.misc.Unsafe;
  * single-threaded rendering.  For example, there is no put(double[]) method
  * because we currently have no need for such a method in the STR classes.
  */
+/* No native methods here, but the constants are needed in the supporting JNI code */
+@GenerateNativeHeader
 public class RenderBuffer {
 
     /**

src/share/classes/sun/java2d/pipe/hw/AccelDeviceEventNotifier.java

@@ -30,11 +30,16 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
+import javax.tools.annotation.GenerateNativeHeader;
+
+import javax.tools.annotation.GenerateNativeHeader;
 
 /**
  * This class is used to notify listeners about accelerated device's
  * events such as device reset or dispose that are about to occur.
  */
+/* No native methods here, but the constants are needed in the supporting JNI code */
+@GenerateNativeHeader
 public class AccelDeviceEventNotifier {
 
     private static AccelDeviceEventNotifier theInstance;

src/share/classes/sun/java2d/pipe/hw/AccelSurface.java

@@ -28,9 +28,13 @@ package sun.java2d.pipe.hw;
 import java.awt.Rectangle;
 import sun.java2d.Surface;
 
+import javax.tools.annotation.GenerateNativeHeader;
+
 /**
  * Abstraction for a hardware accelerated surface.
  */
+/* No native methods here, but the constants are needed in the supporting JNI code */
+@GenerateNativeHeader
 public interface AccelSurface extends BufferedContextProvider, Surface {
     /**
      * Undefined

src/share/classes/sun/java2d/pipe/hw/ContextCapabilities.java

@@ -25,12 +25,16 @@
 
 package sun.java2d.pipe.hw;
 
+import javax.tools.annotation.GenerateNativeHeader;
+
 /**
  * Represents a set of capabilities of a BufferedContext and associated
  * AccelGraphicsConfig.
  *
  * @see AccelGraphicsConfig
  */
+/* No native methods here, but the constants are needed in the supporting JNI code */
+@GenerateNativeHeader
 public class ContextCapabilities {
     /** Indicates that the context has no capabilities. */
     public static final int CAPS_EMPTY             = (0 << 0);

src/share/classes/sun/nio/ch/DatagramChannelImpl.java

@@ -32,13 +32,15 @@ import java.nio.ByteBuffer;
 import java.nio.channels.*;
 import java.nio.channels.spi.*;
 import java.util.*;
+import javax.tools.annotation.GenerateNativeHeader;
 import sun.net.ResourceManager;
 
-
 /**
  * An implementation of DatagramChannels.
  */
 
+/* No native methods here, but the constants are needed in the supporting JNI code */
+@GenerateNativeHeader
 class DatagramChannelImpl
     extends DatagramChannel
     implements SelChImpl

src/share/classes/sun/nio/ch/IOStatus.java

@@ -25,12 +25,9 @@
 
 package sun.nio.ch;
 
-import javax.tools.annotation.GenerateNativeHeader;
 
 // Constants for reporting I/O status
 
-/* No native methods here, but the constants are needed in the supporting JNI code */
-@GenerateNativeHeader
 public final class IOStatus {
 
     private IOStatus() { }

src/share/classes/sun/security/pkcs11/Secmod.java

@@ -35,6 +35,8 @@ import java.security.cert.X509Certificate;
 import sun.security.pkcs11.wrapper.*;
 import static sun.security.pkcs11.wrapper.PKCS11Constants.*;
 
+import javax.tools.annotation.GenerateNativeHeader;
+
 /**
  * The Secmod class defines the interface to the native NSS
  * library and the configuration information it stores in its
@@ -55,6 +57,8 @@ import static sun.security.pkcs11.wrapper.PKCS11Constants.*;
  * @since   1.6
  * @author  Andreas Sterbenz
  */
+/* No native methods here, but the constants are needed in the supporting JNI code */
+@GenerateNativeHeader
 public final class Secmod {
 
     private final static boolean DEBUG = false;

src/share/classes/sun/security/pkcs11/wrapper/PKCS11.java

@@ -55,6 +55,7 @@ import java.security.AccessController;
 import java.security.PrivilegedAction;
 
 import static sun.security.pkcs11.wrapper.PKCS11Constants.*;
+import javax.tools.annotation.GenerateNativeHeader;
 
 /**
  * This is the default implementation of the PKCS11 interface. IT connects to
@@ -67,6 +68,8 @@ import static sun.security.pkcs11.wrapper.PKCS11Constants.*;
  * @author Martin Schlaeffer <schlaeff@sbox.tugraz.at>
  * @invariants (pkcs11ModulePath_ <> null)
  */
+/* No native methods here, but the constants are needed in the supporting JNI code */
+@GenerateNativeHeader
 public class PKCS11 {
 
     /**

src/solaris/classes/sun/awt/X11/XComponentPeer.java

@@ -70,6 +70,10 @@ import sun.awt.image.ToolkitImage;
 import sun.java2d.BackBufferCapsProvider;
 import sun.java2d.pipe.Region;
 
+import javax.tools.annotation.GenerateNativeHeader;
+
+/* No native methods here, but the constants are needed in the supporting JNI code */
+@GenerateNativeHeader
 public class XComponentPeer extends XWindow implements ComponentPeer, DropTargetPeer,
     BackBufferCapsProvider
 {

src/windows/classes/sun/java2d/d3d/D3DBlitLoops.java

@@ -32,6 +32,7 @@ import java.awt.image.AffineTransformOp;
 import java.awt.image.BufferedImage;
 import java.awt.image.BufferedImageOp;
 import java.lang.ref.WeakReference;
+import javax.tools.annotation.GenerateNativeHeader;
 import sun.java2d.ScreenUpdateManager;
 import sun.java2d.SurfaceData;
 import sun.java2d.loops.Blit;
@@ -47,6 +48,8 @@ import sun.java2d.pipe.RenderQueue;
 import static sun.java2d.pipe.BufferedOpCodes.*;
 import sun.java2d.windows.GDIWindowSurfaceData;
 
+/* No native methods here, but the constants are needed in the supporting JNI code */
+@GenerateNativeHeader
 class D3DBlitLoops {
 
     static void register() {

src/windows/classes/sun/java2d/d3d/D3DContext.java

@@ -25,6 +25,7 @@
 
 package sun.java2d.d3d;
 
+import javax.tools.annotation.GenerateNativeHeader;
 import sun.java2d.pipe.BufferedContext;
 import sun.java2d.pipe.RenderBuffer;
 import sun.java2d.pipe.RenderQueue;
@@ -37,6 +38,8 @@ import static sun.java2d.d3d.D3DContext.D3DContextCaps.*;
  * Note that the RenderQueue lock must be acquired before calling any of
  * the methods in this class.
  */
+/* No native methods here, but the constants are needed in the supporting JNI code */
+@GenerateNativeHeader
 class D3DContext extends BufferedContext {
 
     private final D3DGraphicsDevice device;
@@ -140,6 +143,8 @@ class D3DContext extends BufferedContext {
         return device;
     }
 
+    /* No native methods here, but the constants are needed in the supporting JNI code */
+    @GenerateNativeHeader
     static class D3DContextCaps extends ContextCapabilities {
         /**
          * Indicates the presence of pixel shaders (v2.0 or greater).

src/windows/classes/sun/java2d/d3d/D3DPaints.java

@@ -33,6 +33,7 @@ import java.awt.TexturePaint;
 import java.awt.image.BufferedImage;
 import java.util.HashMap;
 import java.util.Map;
+import javax.tools.annotation.GenerateNativeHeader;
 import sun.java2d.SunGraphics2D;
 import sun.java2d.SurfaceData;
 import sun.java2d.loops.CompositeType;
@@ -157,6 +158,8 @@ abstract class D3DPaints {
 
 /****************** Shared MultipleGradientPaint support ********************/
 
+    /* No native methods here, but the constants are needed in the supporting JNI code */
+    @GenerateNativeHeader
     private static abstract class MultiGradient extends D3DPaints {
 
         /**

src/windows/native/java/net/TwoStacksPlainSocketImpl.c

@@ -33,7 +33,6 @@
 
 #include "java_net_SocketOptions.h"
 #include "java_net_TwoStacksPlainSocketImpl.h"
-#include "java_net_SocketImpl.h"
 #include "java_net_InetAddress.h"
 #include "java_io_FileDescriptor.h"
 #include "java_lang_Integer.h"

src/windows/native/sun/windows/awt_DataTransferer.cpp

@@ -29,7 +29,6 @@
 #include "awt_TextComponent.h"
 #include <shlobj.h>
 #include <shellapi.h>
-#include <sun_awt_datatransfer_DataTransferer.h>
 #include <sun_awt_windows_WDataTransferer.h>
 
 #include "locale_str.h"

src/windows/native/sun/windows/awt_MenuItem.h

@@ -34,7 +34,6 @@
 #include <java_awt_Menu.h>
 #include <sun_awt_windows_WMenuPeer.h>
 #include <java_awt_MenuComponent.h>
-#include <java_awt_peer_MenuComponentPeer.h>
 #include <java_awt_FontMetrics.h>
 
 class AwtMenu;