8000406: change files using @GenerateNativeHeader to use @Native
Summary: Use @Native annotation to mark constants interested by native codes
Reviewed-by: alanb, anthony, prr
--- a/jdk/src/macosx/classes/apple/laf/JRSUIConstants.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/macosx/classes/apple/laf/JRSUIConstants.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -28,27 +28,25 @@
import java.lang.reflect.Field;
import java.nio.ByteBuffer;
-import javax.tools.annotation.GenerateNativeHeader;
+import java.lang.annotation.Native;
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;
+ @Native protected static final int _value = 20;
public static final Key VALUE = new Key(_value);
- protected static final int _thumbProportion = 24;
+ @Native protected static final int _thumbProportion = 24;
public static final Key THUMB_PROPORTION = new Key(_thumbProportion);
- protected static final int _thumbStart = 25;
+ @Native protected static final int _thumbStart = 25;
public static final Key THUMB_START = new Key(_thumbStart);
- protected static final int _windowTitleBarHeight = 28;
+ @Native protected static final int _windowTitleBarHeight = 28;
public static final Key WINDOW_TITLE_BAR_HEIGHT = new Key(_windowTitleBarHeight);
- protected static final int _animationFrame = 23;
+ @Native protected static final int _animationFrame = 23;
public static final Key ANIMATION_FRAME = new Key(_animationFrame);
final int constant;
@@ -70,10 +68,8 @@
}
}
- /* 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;
+ @Native protected static final byte TYPE_CODE = 1;
final double doubleValue;
@@ -139,684 +135,634 @@
}
}
- /* 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;
- private static final long MASK = (long)0x7 << SHIFT;
+ @Native private static final byte SHIFT = 0;
+ @Native private static final byte SIZE = 3;
+ @Native private static final long MASK = (long)0x7 << SHIFT;
private static final PropertyEncoding size = new PropertyEncoding(MASK, SHIFT);
Size(final byte value) {
super(size, value);
}
- private static final byte _mini = 1;
+ @Native private static final byte _mini = 1;
public static final Size MINI = new Size(_mini);
- private static final byte _small = 2;
+ @Native private static final byte _small = 2;
public static final Size SMALL = new Size(_small);
- private static final byte _regular = 3;
+ @Native private static final byte _regular = 3;
public static final Size REGULAR = new Size(_regular);
- private static final byte _large = 4;
+ @Native private static final byte _large = 4;
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;
- private static final long MASK = (long)0xF << SHIFT;
+ @Native private static final byte SHIFT = Size.SHIFT + Size.SIZE;
+ @Native private static final byte SIZE = 4;
+ @Native private static final long MASK = (long)0xF << SHIFT;
private static final PropertyEncoding state = new PropertyEncoding(MASK, SHIFT);
State(final byte value) {
super(state, value);
}
- private static final byte _active = 1;
+ @Native private static final byte _active = 1;
public static final State ACTIVE = new State(_active);
- private static final byte _inactive = 2;
+ @Native private static final byte _inactive = 2;
public static final State INACTIVE = new State(_inactive);
- private static final byte _disabled = 3;
+ @Native private static final byte _disabled = 3;
public static final State DISABLED = new State(_disabled);
- private static final byte _pressed = 4;
+ @Native private static final byte _pressed = 4;
public static final State PRESSED = new State(_pressed);
- private static final byte _pulsed = 5;
+ @Native private static final byte _pulsed = 5;
public static final State PULSED = new State(_pulsed);
- private static final byte _rollover = 6;
+ @Native private static final byte _rollover = 6;
public static final State ROLLOVER = new State(_rollover);
- private static final byte _drag = 7;
+ @Native private static final byte _drag = 7;
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;
- private static final long MASK = (long)0xF << SHIFT;
+ @Native private static final byte SHIFT = State.SHIFT + State.SIZE;
+ @Native private static final byte SIZE = 4;
+ @Native private static final long MASK = (long)0xF << SHIFT;
private static final PropertyEncoding direction = new PropertyEncoding(MASK, SHIFT);
Direction(final byte value) {
super(direction, value);
}
- private static final byte _none = 1;
+ @Native private static final byte _none = 1;
public static final Direction NONE = new Direction(_none);
- private static final byte _up = 2;
+ @Native private static final byte _up = 2;
public static final Direction UP = new Direction(_up);
- private static final byte _down = 3;
+ @Native private static final byte _down = 3;
public static final Direction DOWN = new Direction(_down);
- private static final byte _left = 4;
+ @Native private static final byte _left = 4;
public static final Direction LEFT = new Direction(_left);
- private static final byte _right = 5;
+ @Native private static final byte _right = 5;
public static final Direction RIGHT = new Direction(_right);
- private static final byte _north = 6;
+ @Native private static final byte _north = 6;
public static final Direction NORTH = new Direction(_north);
- private static final byte _south = 7;
+ @Native private static final byte _south = 7;
public static final Direction SOUTH = new Direction(_south);
- private static final byte _east = 8;
+ @Native private static final byte _east = 8;
public static final Direction EAST = new Direction(_east);
- private static final byte _west = 9;
+ @Native private static final byte _west = 9;
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;
- private static final long MASK = (long)0x3 << SHIFT;
+ @Native private static final byte SHIFT = Direction.SHIFT + Direction.SIZE;
+ @Native private static final byte SIZE = 2;
+ @Native private static final long MASK = (long)0x3 << SHIFT;
private static final PropertyEncoding orientation = new PropertyEncoding(MASK, SHIFT);
Orientation(final byte value) {
super(orientation, value);
}
- private static final byte _horizontal = 1;
+ @Native private static final byte _horizontal = 1;
public static final Orientation HORIZONTAL = new Orientation(_horizontal);
- private static final byte _vertical = 2;
+ @Native private static final byte _vertical = 2;
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;
- private static final long MASK = (long)0x3 << SHIFT;
+ @Native private static final byte SHIFT = Orientation.SHIFT + Orientation.SIZE;
+ @Native private static final byte SIZE = 2;
+ @Native private static final long MASK = (long)0x3 << SHIFT;
private static final PropertyEncoding alignmentVertical = new PropertyEncoding(MASK, SHIFT);
AlignmentVertical(final byte value){
super(alignmentVertical, value);
}
- private static final byte _top = 1;
+ @Native private static final byte _top = 1;
public static final AlignmentVertical TOP = new AlignmentVertical(_top);
- private static final byte _center = 2;
+ @Native private static final byte _center = 2;
public static final AlignmentVertical CENTER = new AlignmentVertical(_center);
- private static final byte _bottom = 3;
+ @Native private static final byte _bottom = 3;
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;
- private static final long MASK = (long)0x3 << SHIFT;
+ @Native private static final byte SHIFT = AlignmentVertical.SHIFT + AlignmentVertical.SIZE;
+ @Native private static final byte SIZE = 2;
+ @Native private static final long MASK = (long)0x3 << SHIFT;
private static final PropertyEncoding alignmentHorizontal = new PropertyEncoding(MASK, SHIFT);
AlignmentHorizontal(final byte value){
super(alignmentHorizontal, value);
}
- private static final byte _left = 1;
+ @Native private static final byte _left = 1;
public static final AlignmentHorizontal LEFT = new AlignmentHorizontal(_left);
- private static final byte _center = 2;
+ @Native private static final byte _center = 2;
public static final AlignmentHorizontal CENTER = new AlignmentHorizontal(_center);
- private static final byte _right = 3;
+ @Native private static final byte _right = 3;
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;
- private static final long MASK = (long)0x7 << SHIFT;
+ @Native private static final byte SHIFT = AlignmentHorizontal.SHIFT + AlignmentHorizontal.SIZE;
+ @Native private static final byte SIZE = 3;
+ @Native private static final long MASK = (long)0x7 << SHIFT;
private static final PropertyEncoding segmentPosition = new PropertyEncoding(MASK, SHIFT);
SegmentPosition(final byte value) {
super(segmentPosition, value);
}
- private static final byte _first = 1;
+ @Native private static final byte _first = 1;
public static final SegmentPosition FIRST = new SegmentPosition(_first);
- private static final byte _middle = 2;
+ @Native private static final byte _middle = 2;
public static final SegmentPosition MIDDLE = new SegmentPosition(_middle);
- private static final byte _last = 3;
+ @Native private static final byte _last = 3;
public static final SegmentPosition LAST = new SegmentPosition(_last);
- private static final byte _only = 4;
+ @Native private static final byte _only = 4;
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;
- private static final long MASK = (long)0xF << SHIFT;
+ @Native private static final byte SHIFT = SegmentPosition.SHIFT + SegmentPosition.SIZE;
+ @Native private static final byte SIZE = 4;
+ @Native private static final long MASK = (long)0xF << SHIFT;
private static final PropertyEncoding scrollBarPart = new PropertyEncoding(MASK, SHIFT);
ScrollBarPart(final byte value) {
super(scrollBarPart, value);
}
- private static final byte _none = 1;
+ @Native private static final byte _none = 1;
public static final ScrollBarPart NONE = new ScrollBarPart(_none);
- private static final byte _thumb = 2;
+ @Native private static final byte _thumb = 2;
public static final ScrollBarPart THUMB = new ScrollBarPart(_thumb);
- private static final byte _arrowMin = 3;
+ @Native private static final byte _arrowMin = 3;
public static final ScrollBarPart ARROW_MIN = new ScrollBarPart(_arrowMin);
- private static final byte _arrowMax = 4;
+ @Native private static final byte _arrowMax = 4;
public static final ScrollBarPart ARROW_MAX = new ScrollBarPart(_arrowMax);
- private static final byte _arrowMaxInside = 5;
+ @Native private static final byte _arrowMaxInside = 5;
public static final ScrollBarPart ARROW_MAX_INSIDE = new ScrollBarPart(_arrowMaxInside);
- private static final byte _arrowMinInside = 6;
+ @Native private static final byte _arrowMinInside = 6;
public static final ScrollBarPart ARROW_MIN_INSIDE = new ScrollBarPart(_arrowMinInside);
- private static final byte _trackMin = 7;
+ @Native private static final byte _trackMin = 7;
public static final ScrollBarPart TRACK_MIN = new ScrollBarPart(_trackMin);
- private static final byte _trackMax = 8;
+ @Native private static final byte _trackMax = 8;
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;
- private static final long MASK = (long)0xF << SHIFT;
+ @Native private static final byte SHIFT = ScrollBarPart.SHIFT + ScrollBarPart.SIZE;
+ @Native private static final byte SIZE = 4;
+ @Native private static final long MASK = (long)0xF << SHIFT;
private static final PropertyEncoding variant = new PropertyEncoding(MASK, SHIFT);
Variant(final byte value) {
super(variant, value);
}
- private static final byte _menuGlyph = 1;
+ @Native private static final byte _menuGlyph = 1;
public static final Variant MENU_GLYPH = new Variant(_menuGlyph);
- private static final byte _menuPopup = Variant._menuGlyph + 1;
+ @Native private static final byte _menuPopup = Variant._menuGlyph + 1;
public static final Variant MENU_POPUP = new Variant(_menuPopup);
- private static final byte _menuPulldown = Variant._menuPopup + 1;
+ @Native private static final byte _menuPulldown = Variant._menuPopup + 1;
public static final Variant MENU_PULLDOWN = new Variant(_menuPulldown);
- private static final byte _menuHierarchical = Variant._menuPulldown + 1;
+ @Native private static final byte _menuHierarchical = Variant._menuPulldown + 1;
public static final Variant MENU_HIERARCHICAL = new Variant(_menuHierarchical);
- private static final byte _gradientListBackgroundEven = Variant._menuHierarchical + 1;
+ @Native private static final byte _gradientListBackgroundEven = Variant._menuHierarchical + 1;
public static final Variant GRADIENT_LIST_BACKGROUND_EVEN = new Variant(_gradientListBackgroundEven);
- private static final byte _gradientListBackgroundOdd = Variant._gradientListBackgroundEven + 1;
+ @Native private static final byte _gradientListBackgroundOdd = Variant._gradientListBackgroundEven + 1;
public static final Variant GRADIENT_LIST_BACKGROUND_ODD = new Variant(_gradientListBackgroundOdd);
- private static final byte _gradientSideBar = Variant._gradientListBackgroundOdd + 1;
+ @Native private static final byte _gradientSideBar = Variant._gradientListBackgroundOdd + 1;
public static final Variant GRADIENT_SIDE_BAR = new Variant(_gradientSideBar);
- private static final byte _gradientSideBarSelection = Variant._gradientSideBar + 1;
+ @Native private static final byte _gradientSideBarSelection = Variant._gradientSideBar + 1;
public static final Variant GRADIENT_SIDE_BAR_SELECTION = new Variant(_gradientSideBarSelection);
- private static final byte _gradientSideBarFocusedSelection = Variant._gradientSideBarSelection + 1;
+ @Native private static final byte _gradientSideBarFocusedSelection = Variant._gradientSideBarSelection + 1;
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;
- private static final long MASK = (long)0x3 << SHIFT;
+ @Native private static final byte SHIFT = Variant.SHIFT + Variant.SIZE;
+ @Native private static final byte SIZE = 2;
+ @Native private static final long MASK = (long)0x3 << SHIFT;
private static final PropertyEncoding windowType = new PropertyEncoding(MASK, SHIFT);
WindowType(final byte value){
super(windowType, value);
}
- private static final byte _document = 1;
+ @Native private static final byte _document = 1;
public static final WindowType DOCUMENT = new WindowType(_document);
- private static final byte _utility = 2;
+ @Native private static final byte _utility = 2;
public static final WindowType UTILITY = new WindowType(_utility);
- private static final byte _titlelessUtility = 3;
+ @Native private static final byte _titlelessUtility = 3;
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;
- private static final long MASK = (long)0x1 << SHIFT;
+ @Native private static final byte SHIFT = WindowType.SHIFT + WindowType.SIZE;
+ @Native private static final byte SIZE = 1;
+ @Native private static final long MASK = (long)0x1 << SHIFT;
private static final PropertyEncoding focused = new PropertyEncoding(MASK, SHIFT);
Focused(final byte value) {
super(focused, value);
}
- private static final byte _no = 0;
+ @Native private static final byte _no = 0;
public static final Focused NO = new Focused(_no);
- private static final byte _yes = 1;
+ @Native private static final byte _yes = 1;
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;
- private static final long MASK = (long)0x1 << SHIFT;
+ @Native private static final byte SHIFT = Focused.SHIFT + Focused.SIZE;
+ @Native private static final byte SIZE = 1;
+ @Native private static final long MASK = (long)0x1 << SHIFT;
private static final PropertyEncoding indicatorOnly = new PropertyEncoding(MASK, SHIFT);
IndicatorOnly(final byte value) {
super(indicatorOnly, value);
}
- private static final byte _no = 0;
+ @Native private static final byte _no = 0;
public static final IndicatorOnly NO = new IndicatorOnly(_no);
- private static final byte _yes = 1;
+ @Native private static final byte _yes = 1;
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;
- private static final long MASK = (long)0x1 << SHIFT;
+ @Native private static final byte SHIFT = IndicatorOnly.SHIFT + IndicatorOnly.SIZE;
+ @Native private static final byte SIZE = 1;
+ @Native private static final long MASK = (long)0x1 << SHIFT;
private static final PropertyEncoding noIndicator = new PropertyEncoding(MASK, SHIFT);
NoIndicator(final byte value) {
super(noIndicator, value);
}
- private static final byte _no = 0;
+ @Native private static final byte _no = 0;
public static final NoIndicator NO = new NoIndicator(_no);
- private static final byte _yes = 1;
+ @Native private static final byte _yes = 1;
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;
- private static final long MASK = (long)0x1 << SHIFT;
+ @Native private static final byte SHIFT = NoIndicator.SHIFT + NoIndicator.SIZE;
+ @Native private static final byte SIZE = 1;
+ @Native private static final long MASK = (long)0x1 << SHIFT;
private static final PropertyEncoding focused = new PropertyEncoding(MASK, SHIFT);
ArrowsOnly(final byte value) {
super(focused, value);
}
- private static final byte _no = 0;
+ @Native private static final byte _no = 0;
public static final ArrowsOnly NO = new ArrowsOnly(_no);
- private static final byte _yes = 1;
+ @Native private static final byte _yes = 1;
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;
- private static final long MASK = (long)0x1 << SHIFT;
+ @Native private static final byte SHIFT = ArrowsOnly.SHIFT + ArrowsOnly.SIZE;
+ @Native private static final byte SIZE = 1;
+ @Native private static final long MASK = (long)0x1 << SHIFT;
private static final PropertyEncoding focused = new PropertyEncoding(MASK, SHIFT);
FrameOnly(final byte value) {
super(focused, value);
}
- private static final byte _no = 0;
+ @Native private static final byte _no = 0;
public static final FrameOnly NO = new FrameOnly(_no);
- private static final byte _yes = 1;
+ @Native private static final byte _yes = 1;
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;
- private static final long MASK = (long)0x1 << SHIFT;
+ @Native private static final byte SHIFT = FrameOnly.SHIFT + FrameOnly.SIZE;
+ @Native private static final byte SIZE = 1;
+ @Native private static final long MASK = (long)0x1 << SHIFT;
private static final PropertyEncoding focused = new PropertyEncoding(MASK, SHIFT);
SegmentTrailingSeparator(final byte value) {
super(focused, value);
}
- private static final byte _no = 0;
+ @Native private static final byte _no = 0;
public static final SegmentTrailingSeparator NO = new SegmentTrailingSeparator(_no);
- private static final byte _yes = 1;
+ @Native private static final byte _yes = 1;
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;
- private static final long MASK = (long)0x1 << SHIFT;
+ @Native private static final byte SHIFT = SegmentTrailingSeparator.SHIFT + SegmentTrailingSeparator.SIZE;
+ @Native private static final byte SIZE = 1;
+ @Native private static final long MASK = (long)0x1 << SHIFT;
private static final PropertyEncoding leadingSeparator = new PropertyEncoding(MASK, SHIFT);
SegmentLeadingSeparator(final byte value) {
super(leadingSeparator, value);
}
- private static final byte _no = 0;
+ @Native private static final byte _no = 0;
public static final SegmentLeadingSeparator NO = new SegmentLeadingSeparator(_no);
- private static final byte _yes = 1;
+ @Native private static final byte _yes = 1;
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;
- private static final long MASK = (long)0x1 << SHIFT;
+ @Native private static final byte SHIFT = SegmentLeadingSeparator.SHIFT + SegmentLeadingSeparator.SIZE;
+ @Native private static final byte SIZE = 1;
+ @Native private static final long MASK = (long)0x1 << SHIFT;
private static final PropertyEncoding focused = new PropertyEncoding(MASK, SHIFT);
NothingToScroll(final byte value) {
super(focused, value);
}
- private static final byte _no = 0;
+ @Native private static final byte _no = 0;
public static final NothingToScroll NO = new NothingToScroll(_no);
- private static final byte _yes = 1;
+ @Native private static final byte _yes = 1;
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;
- private static final long MASK = (long)0x1 << SHIFT;
+ @Native private static final byte SHIFT = NothingToScroll.SHIFT + NothingToScroll.SIZE;
+ @Native private static final byte SIZE = 1;
+ @Native private static final long MASK = (long)0x1 << SHIFT;
private static final PropertyEncoding focused = new PropertyEncoding(MASK, SHIFT);
WindowTitleBarSeparator(final byte value) {
super(focused, value);
}
- private static final byte _no = 0;
+ @Native private static final byte _no = 0;
public static final WindowTitleBarSeparator NO = new WindowTitleBarSeparator(_no);
- private static final byte _yes = 1;
+ @Native private static final byte _yes = 1;
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;
- private static final long MASK = (long)0x1 << SHIFT;
+ @Native private static final byte SHIFT = WindowTitleBarSeparator.SHIFT + WindowTitleBarSeparator.SIZE;
+ @Native private static final byte SIZE = 1;
+ @Native private static final long MASK = (long)0x1 << SHIFT;
private static final PropertyEncoding focused = new PropertyEncoding(MASK, SHIFT);
WindowClipCorners(final byte value) {
super(focused, value);
}
- private static final byte _no = 0;
+ @Native private static final byte _no = 0;
public static final WindowClipCorners NO = new WindowClipCorners(_no);
- private static final byte _yes = 1;
+ @Native private static final byte _yes = 1;
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;
- private static final long MASK = (long)0x1 << SHIFT;
+ @Native private static final byte SHIFT = WindowClipCorners.SHIFT + WindowClipCorners.SIZE;
+ @Native private static final byte SIZE = 1;
+ @Native private static final long MASK = (long)0x1 << SHIFT;
private static final PropertyEncoding showArrows = new PropertyEncoding(MASK, SHIFT);
ShowArrows(final byte value) {
super(showArrows, value);
}
- private static final byte _no = 0;
+ @Native private static final byte _no = 0;
public static final ShowArrows NO = new ShowArrows(_no);
- private static final byte _yes = 1;
+ @Native private static final byte _yes = 1;
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;
- private static final long MASK = (long)0x1 << SHIFT;
+ @Native private static final byte SHIFT = ShowArrows.SHIFT + ShowArrows.SIZE;
+ @Native private static final byte SIZE = 1;
+ @Native private static final long MASK = (long)0x1 << SHIFT;
private static final PropertyEncoding booleanValue = new PropertyEncoding(MASK, SHIFT);
BooleanValue(final byte value) {
super(booleanValue, value);
}
- private static final byte _no = 0;
+ @Native private static final byte _no = 0;
public static final BooleanValue NO = new BooleanValue(_no);
- private static final byte _yes = 1;
+ @Native private static final byte _yes = 1;
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;
- private static final long MASK = (long)0x1 << SHIFT;
+ @Native private static final byte SHIFT = BooleanValue.SHIFT + BooleanValue.SIZE;
+ @Native private static final byte SIZE = 1;
+ @Native private static final long MASK = (long)0x1 << SHIFT;
private static final PropertyEncoding animating = new PropertyEncoding(MASK, SHIFT);
Animating(final byte value) {
super(animating, value);
}
- private static final byte _no = 0;
+ @Native private static final byte _no = 0;
public static final Animating NO = new Animating(_no);
- private static final byte _yes = 1;
+ @Native private static final byte _yes = 1;
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;
- private static final long MASK = (long)0x7F << SHIFT;
+ @Native private static final byte SHIFT = Animating.SHIFT + Animating.SIZE;
+ @Native private static final byte SIZE = 7;
+ @Native private static final long MASK = (long)0x7F << SHIFT;
private static final PropertyEncoding widget = new PropertyEncoding(MASK, SHIFT);
Widget(final byte constant) {
super(widget, constant);
}
- private static final byte _background = 1;
+ @Native private static final byte _background = 1;
public static final Widget BACKGROUND = new Widget(_background);
- private static final byte _buttonBevel = _background + 1;
+ @Native private static final byte _buttonBevel = _background + 1;
public static final Widget BUTTON_BEVEL = new Widget(_buttonBevel);
- private static final byte _buttonBevelInset = _buttonBevel + 1;
+ @Native private static final byte _buttonBevelInset = _buttonBevel + 1;
public static final Widget BUTTON_BEVEL_INSET = new Widget(_buttonBevelInset);
- private static final byte _buttonBevelRound = _buttonBevelInset + 1;
+ @Native private static final byte _buttonBevelRound = _buttonBevelInset + 1;
public static final Widget BUTTON_BEVEL_ROUND = new Widget(_buttonBevelRound);
- private static final byte _buttonCheckBox = _buttonBevelRound + 1;
+ @Native private static final byte _buttonCheckBox = _buttonBevelRound + 1;
public static final Widget BUTTON_CHECK_BOX = new Widget(_buttonCheckBox);
- private static final byte _buttonComboBox = _buttonCheckBox + 1;
+ @Native private static final byte _buttonComboBox = _buttonCheckBox + 1;
public static final Widget BUTTON_COMBO_BOX = new Widget(_buttonComboBox);
- private static final byte _buttonComboBoxInset = _buttonComboBox + 1;
+ @Native private static final byte _buttonComboBoxInset = _buttonComboBox + 1;
public static final Widget BUTTON_COMBO_BOX_INSET = new Widget(_buttonComboBoxInset); // not hooked up in JRSUIConstants.m
- private static final byte _buttonDisclosure = _buttonComboBoxInset + 1;
+ @Native private static final byte _buttonDisclosure = _buttonComboBoxInset + 1;
public static final Widget BUTTON_DISCLOSURE = new Widget(_buttonDisclosure);
- private static final byte _buttonListHeader = _buttonDisclosure + 1;
+ @Native private static final byte _buttonListHeader = _buttonDisclosure + 1;
public static final Widget BUTTON_LIST_HEADER = new Widget(_buttonListHeader);
- private static final byte _buttonLittleArrows = _buttonListHeader + 1;
+ @Native private static final byte _buttonLittleArrows = _buttonListHeader + 1;
public static final Widget BUTTON_LITTLE_ARROWS = new Widget(_buttonLittleArrows);
- private static final byte _buttonPopDown = _buttonLittleArrows + 1;
+ @Native private static final byte _buttonPopDown = _buttonLittleArrows + 1;
public static final Widget BUTTON_POP_DOWN = new Widget(_buttonPopDown);
- private static final byte _buttonPopDownInset = _buttonPopDown + 1;
+ @Native private static final byte _buttonPopDownInset = _buttonPopDown + 1;
public static final Widget BUTTON_POP_DOWN_INSET = new Widget(_buttonPopDownInset);
- private static final byte _buttonPopDownSquare = _buttonPopDownInset + 1;
+ @Native private static final byte _buttonPopDownSquare = _buttonPopDownInset + 1;
public static final Widget BUTTON_POP_DOWN_SQUARE = new Widget(_buttonPopDownSquare);
- private static final byte _buttonPopUp = _buttonPopDownSquare + 1;
+ @Native private static final byte _buttonPopUp = _buttonPopDownSquare + 1;
public static final Widget BUTTON_POP_UP = new Widget(_buttonPopUp);
- private static final byte _buttonPopUpInset = _buttonPopUp + 1;
+ @Native private static final byte _buttonPopUpInset = _buttonPopUp + 1;
public static final Widget BUTTON_POP_UP_INSET = new Widget(_buttonPopUpInset);
- private static final byte _buttonPopUpSquare = _buttonPopUpInset + 1;
+ @Native private static final byte _buttonPopUpSquare = _buttonPopUpInset + 1;
public static final Widget BUTTON_POP_UP_SQUARE = new Widget(_buttonPopUpSquare);
- private static final byte _buttonPush = _buttonPopUpSquare + 1;
+ @Native private static final byte _buttonPush = _buttonPopUpSquare + 1;
public static final Widget BUTTON_PUSH = new Widget(_buttonPush);
- private static final byte _buttonPushScope = _buttonPush + 1;
+ @Native private static final byte _buttonPushScope = _buttonPush + 1;
public static final Widget BUTTON_PUSH_SCOPE = new Widget(_buttonPushScope);
- private static final byte _buttonPushScope2 = _buttonPushScope + 1;
+ @Native private static final byte _buttonPushScope2 = _buttonPushScope + 1;
public static final Widget BUTTON_PUSH_SCOPE2 = new Widget(_buttonPushScope2);
- private static final byte _buttonPushTextured = _buttonPushScope2 + 1;
+ @Native private static final byte _buttonPushTextured = _buttonPushScope2 + 1;
public static final Widget BUTTON_PUSH_TEXTURED = new Widget(_buttonPushTextured);
- private static final byte _buttonPushInset = _buttonPushTextured + 1;
+ @Native private static final byte _buttonPushInset = _buttonPushTextured + 1;
public static final Widget BUTTON_PUSH_INSET = new Widget(_buttonPushInset);
- private static final byte _buttonPushInset2 = _buttonPushInset + 1;
+ @Native private static final byte _buttonPushInset2 = _buttonPushInset + 1;
public static final Widget BUTTON_PUSH_INSET2 = new Widget(_buttonPushInset2);
- private static final byte _buttonRadio = _buttonPushInset2 + 1;
+ @Native private static final byte _buttonRadio = _buttonPushInset2 + 1;
public static final Widget BUTTON_RADIO = new Widget(_buttonRadio);
- private static final byte _buttonRound = _buttonRadio + 1;
+ @Native private static final byte _buttonRound = _buttonRadio + 1;
public static final Widget BUTTON_ROUND = new Widget(_buttonRound);
- private static final byte _buttonRoundHelp = _buttonRound + 1;
+ @Native private static final byte _buttonRoundHelp = _buttonRound + 1;
public static final Widget BUTTON_ROUND_HELP = new Widget(_buttonRoundHelp);
- private static final byte _buttonRoundInset = _buttonRoundHelp + 1;
+ @Native private static final byte _buttonRoundInset = _buttonRoundHelp + 1;
public static final Widget BUTTON_ROUND_INSET = new Widget(_buttonRoundInset);
- private static final byte _buttonRoundInset2 =_buttonRoundInset + 1;
+ @Native private static final byte _buttonRoundInset2 =_buttonRoundInset + 1;
public static final Widget BUTTON_ROUND_INSET2 = new Widget(_buttonRoundInset2);
- private static final byte _buttonSearchFieldCancel = _buttonRoundInset2 + 1;
+ @Native private static final byte _buttonSearchFieldCancel = _buttonRoundInset2 + 1;
public static final Widget BUTTON_SEARCH_FIELD_CANCEL = new Widget(_buttonSearchFieldCancel);
- private static final byte _buttonSearchFieldFind = _buttonSearchFieldCancel + 1;
+ @Native private static final byte _buttonSearchFieldFind = _buttonSearchFieldCancel + 1;
public static final Widget BUTTON_SEARCH_FIELD_FIND = new Widget(_buttonSearchFieldFind);
- private static final byte _buttonSegmented = _buttonSearchFieldFind + 1;
+ @Native private static final byte _buttonSegmented = _buttonSearchFieldFind + 1;
public static final Widget BUTTON_SEGMENTED = new Widget(_buttonSegmented);
- private static final byte _buttonSegmentedInset = _buttonSegmented + 1;
+ @Native private static final byte _buttonSegmentedInset = _buttonSegmented + 1;
public static final Widget BUTTON_SEGMENTED_INSET = new Widget(_buttonSegmentedInset);
- private static final byte _buttonSegmentedInset2 = _buttonSegmentedInset + 1;
+ @Native private static final byte _buttonSegmentedInset2 = _buttonSegmentedInset + 1;
public static final Widget BUTTON_SEGMENTED_INSET2 = new Widget(_buttonSegmentedInset2);
- private static final byte _buttonSegmentedSCurve = _buttonSegmentedInset2 + 1;
+ @Native private static final byte _buttonSegmentedSCurve = _buttonSegmentedInset2 + 1;
public static final Widget BUTTON_SEGMENTED_SCURVE = new Widget(_buttonSegmentedSCurve);
- private static final byte _buttonSegmentedTextured = _buttonSegmentedSCurve + 1;
+ @Native private static final byte _buttonSegmentedTextured = _buttonSegmentedSCurve + 1;
public static final Widget BUTTON_SEGMENTED_TEXTURED = new Widget(_buttonSegmentedTextured);
- private static final byte _buttonSegmentedToolbar = _buttonSegmentedTextured + 1;
+ @Native private static final byte _buttonSegmentedToolbar = _buttonSegmentedTextured + 1;
public static final Widget BUTTON_SEGMENTED_TOOLBAR = new Widget(_buttonSegmentedToolbar);
- private static final byte _dial = _buttonSegmentedToolbar + 1;
+ @Native private static final byte _dial = _buttonSegmentedToolbar + 1;
public static final Widget DIAL = new Widget(_dial);
- private static final byte _disclosureTriangle = _dial + 1;
+ @Native private static final byte _disclosureTriangle = _dial + 1;
public static final Widget DISCLOSURE_TRIANGLE = new Widget(_disclosureTriangle);
- private static final byte _dividerGrabber = _disclosureTriangle + 1;
+ @Native private static final byte _dividerGrabber = _disclosureTriangle + 1;
public static final Widget DIVIDER_GRABBER = new Widget(_dividerGrabber);
- private static final byte _dividerSeparatorBar = _dividerGrabber + 1;
+ @Native private static final byte _dividerSeparatorBar = _dividerGrabber + 1;
public static final Widget DIVIDER_SEPARATOR_BAR = new Widget(_dividerSeparatorBar);
- private static final byte _dividerSplitter = _dividerSeparatorBar + 1;
+ @Native private static final byte _dividerSplitter = _dividerSeparatorBar + 1;
public static final Widget DIVIDER_SPLITTER = new Widget(_dividerSplitter);
- private static final byte _focus = _dividerSplitter + 1;
+ @Native private static final byte _focus = _dividerSplitter + 1;
public static final Widget FOCUS = new Widget(_focus);
- private static final byte _frameGroupBox = _focus + 1;
+ @Native private static final byte _frameGroupBox = _focus + 1;
public static final Widget FRAME_GROUP_BOX = new Widget(_frameGroupBox);
- private static final byte _frameGroupBoxSecondary = _frameGroupBox + 1;
+ @Native private static final byte _frameGroupBoxSecondary = _frameGroupBox + 1;
public static final Widget FRAME_GROUP_BOX_SECONDARY = new Widget(_frameGroupBoxSecondary);
- private static final byte _frameListBox = _frameGroupBoxSecondary + 1;
+ @Native private static final byte _frameListBox = _frameGroupBoxSecondary + 1;
public static final Widget FRAME_LIST_BOX = new Widget(_frameListBox);
- private static final byte _framePlacard = _frameListBox + 1;
+ @Native private static final byte _framePlacard = _frameListBox + 1;
public static final Widget FRAME_PLACARD = new Widget(_framePlacard);
- private static final byte _frameTextField = _framePlacard + 1;
+ @Native private static final byte _frameTextField = _framePlacard + 1;
public static final Widget FRAME_TEXT_FIELD = new Widget(_frameTextField);
- private static final byte _frameTextFieldRound = _frameTextField + 1;
+ @Native private static final byte _frameTextFieldRound = _frameTextField + 1;
public static final Widget FRAME_TEXT_FIELD_ROUND = new Widget(_frameTextFieldRound);
- private static final byte _frameWell = _frameTextFieldRound + 1;
+ @Native private static final byte _frameWell = _frameTextFieldRound + 1;
public static final Widget FRAME_WELL = new Widget(_frameWell);
- private static final byte _growBox = _frameWell + 1;
+ @Native private static final byte _growBox = _frameWell + 1;
public static final Widget GROW_BOX = new Widget(_growBox);
- private static final byte _growBoxTextured = _growBox + 1;
+ @Native private static final byte _growBoxTextured = _growBox + 1;
public static final Widget GROW_BOX_TEXTURED = new Widget(_growBoxTextured);
- private static final byte _gradient = _growBoxTextured + 1;
+ @Native private static final byte _gradient = _growBoxTextured + 1;
public static final Widget GRADIENT = new Widget(_gradient);
- private static final byte _menu = _gradient + 1;
+ @Native private static final byte _menu = _gradient + 1;
public static final Widget MENU = new Widget(_menu);
- private static final byte _menuItem = _menu + 1;
+ @Native private static final byte _menuItem = _menu + 1;
public static final Widget MENU_ITEM = new Widget(_menuItem);
- private static final byte _menuBar = _menuItem + 1;
+ @Native private static final byte _menuBar = _menuItem + 1;
public static final Widget MENU_BAR = new Widget(_menuBar);
- private static final byte _menuTitle = _menuBar + 1;
+ @Native private static final byte _menuTitle = _menuBar + 1;
public static final Widget MENU_TITLE = new Widget(_menuTitle);
- private static final byte _progressBar = _menuTitle + 1;
+ @Native private static final byte _progressBar = _menuTitle + 1;
public static final Widget PROGRESS_BAR = new Widget(_progressBar);
- private static final byte _progressIndeterminateBar = _progressBar + 1;
+ @Native private static final byte _progressIndeterminateBar = _progressBar + 1;
public static final Widget PROGRESS_INDETERMINATE_BAR = new Widget(_progressIndeterminateBar);
- private static final byte _progressRelevance = _progressIndeterminateBar + 1;
+ @Native private static final byte _progressRelevance = _progressIndeterminateBar + 1;
public static final Widget PROGRESS_RELEVANCE = new Widget(_progressRelevance);
- private static final byte _progressSpinner = _progressRelevance + 1;
+ @Native private static final byte _progressSpinner = _progressRelevance + 1;
public static final Widget PROGRESS_SPINNER = new Widget(_progressSpinner);
- private static final byte _scrollBar = _progressSpinner + 1;
+ @Native private static final byte _scrollBar = _progressSpinner + 1;
public static final Widget SCROLL_BAR = new Widget(_scrollBar);
- private static final byte _scrollColumnSizer = _scrollBar + 1;
+ @Native private static final byte _scrollColumnSizer = _scrollBar + 1;
public static final Widget SCROLL_COLUMN_SIZER = new Widget(_scrollColumnSizer);
- private static final byte _slider = _scrollColumnSizer + 1;
+ @Native private static final byte _slider = _scrollColumnSizer + 1;
public static final Widget SLIDER = new Widget(_slider);
- private static final byte _sliderThumb = _slider + 1;
+ @Native private static final byte _sliderThumb = _slider + 1;
public static final Widget SLIDER_THUMB = new Widget(_sliderThumb);
- private static final byte _synchronization = _sliderThumb + 1;
+ @Native private static final byte _synchronization = _sliderThumb + 1;
public static final Widget SYNCHRONIZATION = new Widget(_synchronization);
- private static final byte _tab = _synchronization + 1;
+ @Native private static final byte _tab = _synchronization + 1;
public static final Widget TAB = new Widget(_tab);
- private static final byte _titleBarCloseBox = _tab + 1;
+ @Native private static final byte _titleBarCloseBox = _tab + 1;
public static final Widget TITLE_BAR_CLOSE_BOX = new Widget(_titleBarCloseBox);
- private static final byte _titleBarCollapseBox = _titleBarCloseBox + 1;
+ @Native private static final byte _titleBarCollapseBox = _titleBarCloseBox + 1;
public static final Widget TITLE_BAR_COLLAPSE_BOX = new Widget(_titleBarCollapseBox);
- private static final byte _titleBarZoomBox = _titleBarCollapseBox + 1;
+ @Native private static final byte _titleBarZoomBox = _titleBarCollapseBox + 1;
public static final Widget TITLE_BAR_ZOOM_BOX = new Widget(_titleBarZoomBox);
- private static final byte _titleBarToolbarButton = _titleBarZoomBox + 1;
+ @Native private static final byte _titleBarToolbarButton = _titleBarZoomBox + 1;
public static final Widget TITLE_BAR_TOOLBAR_BUTTON = new Widget(_titleBarToolbarButton);
- private static final byte _toolbarItemWell = _titleBarToolbarButton + 1;
+ @Native private static final byte _toolbarItemWell = _titleBarToolbarButton + 1;
public static final Widget TOOLBAR_ITEM_WELL = new Widget(_toolbarItemWell);
- private static final byte _windowFrame = _toolbarItemWell + 1;
+ @Native private static final byte _windowFrame = _toolbarItemWell + 1;
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;
+ @Native private static final int _unknown = -1;
public static final Hit UNKNOWN = new Hit(_unknown);
- private static final int _none = 0;
+ @Native private static final int _none = 0;
public static final Hit NONE = new Hit(_none);
- private static final int _hit = 1;
+ @Native private static final int _hit = 1;
public static final Hit HIT = new Hit(_hit);
final int hit;
@@ -831,24 +777,22 @@
}
}
- /* 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;
+ @Native private static final int _thumb = 2;
public static final ScrollBarHit THUMB = new ScrollBarHit(_thumb);
- private static final int _trackMin = 3;
+ @Native private static final int _trackMin = 3;
public static final ScrollBarHit TRACK_MIN = new ScrollBarHit(_trackMin);
- private static final int _trackMax = 4;
+ @Native private static final int _trackMax = 4;
public static final ScrollBarHit TRACK_MAX = new ScrollBarHit(_trackMax);
- private static final int _arrowMin = 5;
+ @Native private static final int _arrowMin = 5;
public static final ScrollBarHit ARROW_MIN = new ScrollBarHit(_arrowMin);
- private static final int _arrowMax = 6;
+ @Native private static final int _arrowMax = 6;
public static final ScrollBarHit ARROW_MAX = new ScrollBarHit(_arrowMax);
- private static final int _arrowMaxInside = 7;
+ @Native private static final int _arrowMaxInside = 7;
public static final ScrollBarHit ARROW_MAX_INSIDE = new ScrollBarHit(_arrowMaxInside);
- private static final int _arrowMinInside = 8;
+ @Native private static final int _arrowMinInside = 8;
public static final ScrollBarHit ARROW_MIN_INSIDE = new ScrollBarHit(_arrowMinInside);
ScrollBarHit(final int hit) { super(hit); }
--- a/jdk/src/macosx/classes/com/apple/eawt/FullScreenHandler.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/macosx/classes/com/apple/eawt/FullScreenHandler.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -33,17 +33,15 @@
import com.apple.eawt.AppEvent.FullScreenEvent;
-import javax.tools.annotation.GenerateNativeHeader;
+import java.lang.annotation.Native;
-/* 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";
- static final int FULLSCREEN_WILL_ENTER = 1;
- static final int FULLSCREEN_DID_ENTER = 2;
- static final int FULLSCREEN_WILL_EXIT = 3;
- static final int FULLSCREEN_DID_EXIT = 4;
+ @Native static final int FULLSCREEN_WILL_ENTER = 1;
+ @Native static final int FULLSCREEN_DID_ENTER = 2;
+ @Native static final int FULLSCREEN_WILL_EXIT = 3;
+ @Native static final int FULLSCREEN_DID_EXIT = 4;
// installs a private instance of the handler, if necessary
static void addFullScreenListenerTo(final RootPaneContainer window, final FullScreenListener listener) {
--- a/jdk/src/macosx/classes/com/apple/eawt/event/GestureHandler.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/macosx/classes/com/apple/eawt/event/GestureHandler.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -31,18 +31,16 @@
import javax.swing.*;
-import javax.tools.annotation.GenerateNativeHeader;
+import java.lang.annotation.Native;
-/* 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";
// native constants for the supported types of high-level gestures
- static final int PHASE = 1;
- static final int ROTATE = 2;
- static final int MAGNIFY = 3;
- static final int SWIPE = 4;
+ @Native static final int PHASE = 1;
+ @Native static final int ROTATE = 2;
+ @Native static final int MAGNIFY = 3;
+ @Native static final int SWIPE = 4;
// installs a private instance of GestureHandler, if necessary
static void addGestureListenerTo(final JComponent component, final GestureListener listener) {
--- a/jdk/src/macosx/classes/sun/java2d/OSXSurfaceData.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/macosx/classes/sun/java2d/OSXSurfaceData.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -37,13 +37,11 @@
import sun.java2d.pipe.*;
import sun.lwawt.macosx.*;
-import javax.tools.annotation.GenerateNativeHeader;
+import java.lang.annotation.Native;
/*
* 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;
@@ -198,147 +196,147 @@
// graphics primitives drawing implementation:
// certain primitives don't care about all the states (ex. drawing an image needs not involve setting current paint)
- static final int kPrimitive = 0;
- static final int kImage = 1;
- static final int kText = 2;
- static final int kCopyArea = 3;
- static final int kExternal = 4;
+ @Native static final int kPrimitive = 0;
+ @Native static final int kImage = 1;
+ @Native static final int kText = 2;
+ @Native static final int kCopyArea = 3;
+ @Native static final int kExternal = 4;
- static final int kLine = 5; // belongs to kPrimitive
- static final int kRect = 6; // belongs to kPrimitive
- static final int kRoundRect = 7; // belongs to kPrimitive
- static final int kOval = 8; // belongs to kPrimitive
- static final int kArc = 9; // belongs to kPrimitive
- static final int kPolygon = 10; // belongs to kPrimitive
- static final int kShape = 11; // belongs to kPrimitive
+ @Native static final int kLine = 5; // belongs to kPrimitive
+ @Native static final int kRect = 6; // belongs to kPrimitive
+ @Native static final int kRoundRect = 7; // belongs to kPrimitive
+ @Native static final int kOval = 8; // belongs to kPrimitive
+ @Native static final int kArc = 9; // belongs to kPrimitive
+ @Native static final int kPolygon = 10; // belongs to kPrimitive
+ @Native static final int kShape = 11; // belongs to kPrimitive
// static final int kImage = 12; // belongs to kImage
- static final int kString = 13; // belongs to kText
- static final int kGlyphs = 14; // belongs to kText
- static final int kUnicodes = 15; // belongs to kText
+ @Native static final int kString = 13; // belongs to kText
+ @Native static final int kGlyphs = 14; // belongs to kText
+ @Native static final int kUnicodes = 15; // belongs to kText
// static final int kCopyArea = 16; // belongs to kCopyArea
// static final int kExternal = 17; // belongs to kExternal
- static final int kCommonParameterCount = 1 + 1 + 4 + 4; // type + change flags + color info (type(1) align(1) and
+ @Native static final int kCommonParameterCount = 1 + 1 + 4 + 4; // type + change flags + color info (type(1) align(1) and
// value(2)) + parameters ((x1, y1, x2, y2) OR (x, y, w, h))
- static final int kLineParametersCount = kCommonParameterCount; // kCommonParameterCount
- static final int kRectParametersCount = kCommonParameterCount + 1; // kCommonParameterCount + isfill
- static final int kRoundRectParametersCount = kCommonParameterCount + 2 + 1; // kCommonParameterCount + arcW + arcH +
+ @Native static final int kLineParametersCount = kCommonParameterCount; // kCommonParameterCount
+ @Native static final int kRectParametersCount = kCommonParameterCount + 1; // kCommonParameterCount + isfill
+ @Native static final int kRoundRectParametersCount = kCommonParameterCount + 2 + 1; // kCommonParameterCount + arcW + arcH +
// isfill
- static final int kOvalParametersCount = kCommonParameterCount + 1; // kCommonParameterCount + isfill
- static final int kArcParametersCount = kCommonParameterCount + 2 + 1 + 1;// kCommonParameterCount + startAngle +
+ @Native static final int kOvalParametersCount = kCommonParameterCount + 1; // kCommonParameterCount + isfill
+ @Native static final int kArcParametersCount = kCommonParameterCount + 2 + 1 + 1;// kCommonParameterCount + startAngle +
// arcAngle + isfill + type
- static final int kPolygonParametersCount = 0; // not supported
- static final int kShapeParametersCount = 0; // not supported
- static final int kImageParametersCount = kCommonParameterCount + 2 + 2 + 4 + 4; // flip horz vert + w&h + src + dst
- static final int kStringParametersCount = 0; // not supported
- static final int kGlyphsParametersCount = 0; // not supported
- static final int kUnicodesParametersCount = 0; // not supported
- static final int kPixelParametersCount = 0; // not supported
- static final int kExternalParametersCount = 0; // not supported
+ @Native static final int kPolygonParametersCount = 0; // not supported
+ @Native static final int kShapeParametersCount = 0; // not supported
+ @Native static final int kImageParametersCount = kCommonParameterCount + 2 + 2 + 4 + 4; // flip horz vert + w&h + src + dst
+ @Native static final int kStringParametersCount = 0; // not supported
+ @Native static final int kGlyphsParametersCount = 0; // not supported
+ @Native static final int kUnicodesParametersCount = 0; // not supported
+ @Native static final int kPixelParametersCount = 0; // not supported
+ @Native static final int kExternalParametersCount = 0; // not supported
// for intParameters
// states info
- static final int kChangeFlagIndex = 0; // kBoundsChangedBit | .. | kFontChangedBit
+ @Native static final int kChangeFlagIndex = 0; // kBoundsChangedBit | .. | kFontChangedBit
// bounds info
- static final int kBoundsXIndex = 1;
- static final int kBoundsYIndex = 2;
- static final int kBoundsWidthIndex = 3;
- static final int kBoundsHeightIndex = 4;
+ @Native static final int kBoundsXIndex = 1;
+ @Native static final int kBoundsYIndex = 2;
+ @Native static final int kBoundsWidthIndex = 3;
+ @Native static final int kBoundsHeightIndex = 4;
// clip info
- static final int kClipStateIndex = 5;
- static final int kClipNumTypesIndex = 6;
- static final int kClipNumCoordsIndex = 7;
- static final int kClipWindingRuleIndex = 8;
- static final int kClipXIndex = 9;
- static final int kClipYIndex = 10;
- static final int kClipWidthIndex = 11;
- static final int kClipHeightIndex = 12;
+ @Native static final int kClipStateIndex = 5;
+ @Native static final int kClipNumTypesIndex = 6;
+ @Native static final int kClipNumCoordsIndex = 7;
+ @Native static final int kClipWindingRuleIndex = 8;
+ @Native static final int kClipXIndex = 9;
+ @Native static final int kClipYIndex = 10;
+ @Native static final int kClipWidthIndex = 11;
+ @Native static final int kClipHeightIndex = 12;
// ctm info
- static final int kCTMaIndex = 13;
- static final int kCTMbIndex = 14;
- static final int kCTMcIndex = 15;
- static final int kCTMdIndex = 16;
- static final int kCTMtxIndex = 17;
- static final int kCTMtyIndex = 18;
+ @Native static final int kCTMaIndex = 13;
+ @Native static final int kCTMbIndex = 14;
+ @Native static final int kCTMcIndex = 15;
+ @Native static final int kCTMdIndex = 16;
+ @Native static final int kCTMtxIndex = 17;
+ @Native static final int kCTMtyIndex = 18;
// color info
- static final int kColorStateIndex = 19; // kColorSimple or kColorGradient or kColorTexture
- static final int kColorRGBValueIndex = 20; // if kColorSimple
- static final int kColorIndexValueIndex = 21; // if kColorSystem
- static final int kColorPointerIndex = 22; //
- static final int kColorPointerIndex2 = 23; //
- static final int kColorRGBValue1Index = 24; // if kColorGradient
- static final int kColorWidthIndex = 25; // if kColorTexture
- static final int kColorRGBValue2Index = 26; // if kColorGradient
- static final int kColorHeightIndex = 27; // if kColorTexture
- static final int kColorIsCyclicIndex = 28; // if kColorGradient (kColorNonCyclic or kColorCyclic)
- static final int kColorx1Index = 29;
- static final int kColortxIndex = 30;
- static final int kColory1Index = 31;
- static final int kColortyIndex = 32;
- static final int kColorx2Index = 33;
- static final int kColorsxIndex = 34;
- static final int kColory2Index = 35;
- static final int kColorsyIndex = 36;
+ @Native static final int kColorStateIndex = 19; // kColorSimple or kColorGradient or kColorTexture
+ @Native static final int kColorRGBValueIndex = 20; // if kColorSimple
+ @Native static final int kColorIndexValueIndex = 21; // if kColorSystem
+ @Native static final int kColorPointerIndex = 22; //
+ @Native static final int kColorPointerIndex2 = 23; //
+ @Native static final int kColorRGBValue1Index = 24; // if kColorGradient
+ @Native static final int kColorWidthIndex = 25; // if kColorTexture
+ @Native static final int kColorRGBValue2Index = 26; // if kColorGradient
+ @Native static final int kColorHeightIndex = 27; // if kColorTexture
+ @Native static final int kColorIsCyclicIndex = 28; // if kColorGradient (kColorNonCyclic or kColorCyclic)
+ @Native static final int kColorx1Index = 29;
+ @Native static final int kColortxIndex = 30;
+ @Native static final int kColory1Index = 31;
+ @Native static final int kColortyIndex = 32;
+ @Native static final int kColorx2Index = 33;
+ @Native static final int kColorsxIndex = 34;
+ @Native static final int kColory2Index = 35;
+ @Native static final int kColorsyIndex = 36;
// composite info
- static final int kCompositeRuleIndex = 37; // kCGCompositeClear or ... or kCGCompositeXor
- static final int kCompositeValueIndex = 38;
+ @Native static final int kCompositeRuleIndex = 37; // kCGCompositeClear or ... or kCGCompositeXor
+ @Native static final int kCompositeValueIndex = 38;
// stroke info
- static final int kStrokeJoinIndex = 39; // see BasicStroke.java
- static final int kStrokeCapIndex = 40; // see BasicStroke.java
- static final int kStrokeWidthIndex = 41;
- static final int kStrokeDashPhaseIndex = 42;
- static final int kStrokeLimitIndex = 43;
+ @Native static final int kStrokeJoinIndex = 39; // see BasicStroke.java
+ @Native static final int kStrokeCapIndex = 40; // see BasicStroke.java
+ @Native static final int kStrokeWidthIndex = 41;
+ @Native static final int kStrokeDashPhaseIndex = 42;
+ @Native static final int kStrokeLimitIndex = 43;
// hints info
- static final int kHintsAntialiasIndex = 44;
- static final int kHintsTextAntialiasIndex = 45;
- static final int kHintsFractionalMetricsIndex = 46;
- static final int kHintsRenderingIndex = 47;
- static final int kHintsInterpolationIndex = 48;
+ @Native static final int kHintsAntialiasIndex = 44;
+ @Native static final int kHintsTextAntialiasIndex = 45;
+ @Native static final int kHintsFractionalMetricsIndex = 46;
+ @Native static final int kHintsRenderingIndex = 47;
+ @Native static final int kHintsInterpolationIndex = 48;
// live resizing info
- static final int kCanDrawDuringLiveResizeIndex = 49;
+ @Native static final int kCanDrawDuringLiveResizeIndex = 49;
- static final int kSizeOfParameters = kCanDrawDuringLiveResizeIndex + 1;
+ @Native static final int kSizeOfParameters = kCanDrawDuringLiveResizeIndex + 1;
// for objectParameters
- static final int kClipCoordinatesIndex = 0;
- static final int kClipTypesIndex = 1;
- static final int kTextureImageIndex = 2;
- static final int kStrokeDashArrayIndex = 3;
- static final int kFontIndex = 4;
- static final int kFontPaintIndex = 5;
+ @Native static final int kClipCoordinatesIndex = 0;
+ @Native static final int kClipTypesIndex = 1;
+ @Native static final int kTextureImageIndex = 2;
+ @Native static final int kStrokeDashArrayIndex = 3;
+ @Native static final int kFontIndex = 4;
+ @Native static final int kFontPaintIndex = 5;
// possible state changes
- static final int kBoundsChangedBit = 1 << 0;
- static final int kBoundsNotChangedBit = ~kBoundsChangedBit;
- static final int kClipChangedBit = 1 << 1;
- static final int kClipNotChangedBit = ~kClipChangedBit;
- static final int kCTMChangedBit = 1 << 2;
- static final int kCTMNotChangedBit = ~kCTMChangedBit;
- static final int kColorChangedBit = 1 << 3;
- static final int kColorNotChangedBit = ~kColorChangedBit;
- static final int kCompositeChangedBit = 1 << 4;
- static final int kCompositeNotChangedBit = ~kCompositeChangedBit;
- static final int kStrokeChangedBit = 1 << 5;
- static final int kStrokeNotChangedBit = ~kStrokeChangedBit;
- static final int kHintsChangedBit = 1 << 6;
- static final int kHintsNotChangedBit = ~kHintsChangedBit;
- static final int kFontChangedBit = 1 << 7;
- static final int kFontNotChangedBit = ~kFontChangedBit;
- static final int kEverythingChangedFlag = 0xffffffff;
+ @Native static final int kBoundsChangedBit = 1 << 0;
+ @Native static final int kBoundsNotChangedBit = ~kBoundsChangedBit;
+ @Native static final int kClipChangedBit = 1 << 1;
+ @Native static final int kClipNotChangedBit = ~kClipChangedBit;
+ @Native static final int kCTMChangedBit = 1 << 2;
+ @Native static final int kCTMNotChangedBit = ~kCTMChangedBit;
+ @Native static final int kColorChangedBit = 1 << 3;
+ @Native static final int kColorNotChangedBit = ~kColorChangedBit;
+ @Native static final int kCompositeChangedBit = 1 << 4;
+ @Native static final int kCompositeNotChangedBit = ~kCompositeChangedBit;
+ @Native static final int kStrokeChangedBit = 1 << 5;
+ @Native static final int kStrokeNotChangedBit = ~kStrokeChangedBit;
+ @Native static final int kHintsChangedBit = 1 << 6;
+ @Native static final int kHintsNotChangedBit = ~kHintsChangedBit;
+ @Native static final int kFontChangedBit = 1 << 7;
+ @Native static final int kFontNotChangedBit = ~kFontChangedBit;
+ @Native static final int kEverythingChangedFlag = 0xffffffff;
// possible color states
- static final int kColorSimple = 0;
- static final int kColorSystem = 1;
- static final int kColorGradient = 2;
- static final int kColorTexture = 3;
+ @Native static final int kColorSimple = 0;
+ @Native static final int kColorSystem = 1;
+ @Native static final int kColorGradient = 2;
+ @Native static final int kColorTexture = 3;
// possible gradient color states
- static final int kColorNonCyclic = 0;
- static final int kColorCyclic = 1;
+ @Native static final int kColorNonCyclic = 0;
+ @Native static final int kColorCyclic = 1;
// possible clip states
- static final int kClipRect = 0;
- static final int kClipShape = 1;
+ @Native static final int kClipRect = 0;
+ @Native static final int kClipShape = 1;
static int getRendererTypeForPrimitive(int primitiveType) {
switch (primitiveType) {
--- a/jdk/src/macosx/classes/sun/lwawt/macosx/CocoaConstants.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/macosx/classes/sun/lwawt/macosx/CocoaConstants.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,10 +25,7 @@
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(){}
--- a/jdk/src/macosx/native/jobjc/src/core/PrimitiveCoder.hs Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/macosx/native/jobjc/src/core/PrimitiveCoder.hs Thu Apr 04 15:39:17 2013 -0700
@@ -2,7 +2,7 @@
{-
/*
- * Copyright (c) 2011,2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,7 @@
import Data.List
import Data.Maybe
-import Char
+import Data.Char
data Width = W32 | W64
deriving (Show, Eq, Bounded, Enum)
@@ -196,8 +196,6 @@
c2java ntype =
unlines [
"// native " ++ ntypeS ++ " -> java " ++ jprimS,
- "/* No native methods here, but the constants are needed in the supporting JNI code */",
- "@GenerateNativeHeader",
"public static final class " ++ className ++ " extends PrimitiveCoder<" ++ jclassS ++ ">{",
"\tpublic static final " ++ className ++ " INST = new " ++ className ++ "();",
"\tpublic " ++ className ++ "(){ super("++ffitypeVal ntype++", \"" ++ [encoding ntype] ++ "\", "++jclassS++".class, "++jprimS++".class); }",
@@ -248,13 +246,10 @@
putStrLn "package com.apple.jobjc;"
putStrLn "import com.apple.jobjc.JObjCRuntime.Width;"
- putStrLn "import javax.tools.annotation.GenerateNativeHeader;"
putStrLn "// Auto generated by PrimitiveCoder.hs"
putStrLn "// Do not edit by hand."
- putStrLn "/* No native methods here, but the constants are needed in the supporting JNI code */"
- putStrLn "@GenerateNativeHeader"
putStrLn "public abstract class PrimitiveCoder<T> extends Coder<T>{"
putStrLn "\tpublic PrimitiveCoder(int ffiTypeCode, String objCEncoding, Class jclass, Class jprim){"
--- a/jdk/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/CFType.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/CFType.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -24,10 +24,7 @@
*/
package com.apple.jobjc;
-import javax.tools.annotation.GenerateNativeHeader;
-/* No native methods here, but the constants are needed in the supporting JNI code */
-@GenerateNativeHeader
public class CFType extends Pointer<Void> {
protected CFType(long ptr) { super(ptr); }
protected CFType(Pointer<?> ptr) { super(ptr.ptr); }
--- a/jdk/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/Coder.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/Coder.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -35,26 +35,26 @@
import com.apple.jobjc.PrimitiveCoder.SIntCoder;
import com.apple.jobjc.PrimitiveCoder.SLongLongCoder;
import com.apple.jobjc.PrimitiveCoder.SShortCoder;
-import javax.tools.annotation.GenerateNativeHeader;
+import java.lang.annotation.Native;
public abstract class Coder<T> {
private static native long getNativeFFITypePtrForCode(final int code);
- static final int FFI_VOID = 0;
- static final int FFI_PTR = FFI_VOID+1;
+ @Native static final int FFI_VOID = 0;
+ @Native static final int FFI_PTR = FFI_VOID+1;
- static final int FFI_SINT8 = FFI_PTR+1;
- static final int FFI_UINT8 = FFI_SINT8+1;
- static final int FFI_SINT16 = FFI_UINT8+1;
- static final int FFI_UINT16 = FFI_SINT16+1;
- static final int FFI_SINT32 = FFI_UINT16+1;
- static final int FFI_UINT32 = FFI_SINT32+1;
- static final int FFI_SINT64 = FFI_UINT32+1;
- static final int FFI_UINT64 = FFI_SINT64+1;
+ @Native static final int FFI_SINT8 = FFI_PTR+1;
+ @Native static final int FFI_UINT8 = FFI_SINT8+1;
+ @Native static final int FFI_SINT16 = FFI_UINT8+1;
+ @Native static final int FFI_UINT16 = FFI_SINT16+1;
+ @Native static final int FFI_SINT32 = FFI_UINT16+1;
+ @Native static final int FFI_UINT32 = FFI_SINT32+1;
+ @Native static final int FFI_SINT64 = FFI_UINT32+1;
+ @Native static final int FFI_UINT64 = FFI_SINT64+1;
- static final int FFI_FLOAT = FFI_UINT64+1;
- static final int FFI_DOUBLE = FFI_FLOAT+1;
- static final int FFI_LONGDOUBLE = FFI_DOUBLE+1;
+ @Native static final int FFI_FLOAT = FFI_UINT64+1;
+ @Native static final int FFI_DOUBLE = FFI_FLOAT+1;
+ @Native static final int FFI_LONGDOUBLE = FFI_DOUBLE+1;
private static long[] ffiCodesToFFITypePtrs;
static{
@@ -143,8 +143,6 @@
//
- /* No native methods here, but the constants are needed in the supporting JNI code */
- @GenerateNativeHeader
public static final class VoidCoder extends Coder<Object>{
public static final VoidCoder INST = new VoidCoder();
public VoidCoder(){ super(FFI_VOID, "v", Void.class, void.class); }
@@ -153,8 +151,6 @@
@Override public void push(JObjCRuntime runtime, long addr, Object x) { throw new RuntimeException("Trying to push a Void."); }
}
- /* No native methods here, but the constants are needed in the supporting JNI code */
- @GenerateNativeHeader
public static final class UnknownCoder extends Coder<Object> {
public static final UnknownCoder INST = new UnknownCoder();
public UnknownCoder(){ super(-1, "?", null, null); }
@@ -163,8 +159,6 @@
@Override public Object pop(JObjCRuntime runtime, long addr) { throw new RuntimeException("Coder not implemented"); }
}
- /* No native methods here, but the constants are needed in the supporting JNI code */
- @GenerateNativeHeader
public static final class PrimitivePointerCoder extends Coder<Long> {
public static final PrimitivePointerCoder INST = new PrimitivePointerCoder();
public PrimitivePointerCoder(){ super(Coder.FFI_PTR, "^?", Long.class, long.class); }
@@ -194,8 +188,6 @@
@Override public void push(JObjCRuntime runtime, long addr, Long x) { push(runtime, addr, (long) x); }
}
- /* No native methods here, but the constants are needed in the supporting JNI code */
- @GenerateNativeHeader
public static final class PointerCoder extends Coder<Pointer> {
public static final PointerCoder INST = new PointerCoder();
public PointerCoder(){ super(FFI_PTR, "^?", Pointer.class); }
@@ -209,8 +201,6 @@
}
}
- /* No native methods here, but the constants are needed in the supporting JNI code */
- @GenerateNativeHeader
public static final class SELCoder extends Coder<SEL> {
public static final SELCoder INST = new SELCoder();
public SELCoder(){ super(FFI_PTR, ":", SEL.class); }
@@ -224,8 +214,6 @@
}
}
- /* No native methods here, but the constants are needed in the supporting JNI code */
- @GenerateNativeHeader
public static abstract class StructCoder extends Coder<Struct> {
private final FFIType ffiType;
final int sizeof;
@@ -267,8 +255,6 @@
}
}
- /* No native methods here, but the constants are needed in the supporting JNI code */
- @GenerateNativeHeader
public static final class IDCoder extends Coder<ID>{
public static final IDCoder INST = new IDCoder();
public IDCoder(){ super(FFI_PTR, "@", ID.class); }
@@ -287,8 +273,6 @@
}
}
- /* No native methods here, but the constants are needed in the supporting JNI code */
- @GenerateNativeHeader
public static final class NSClassCoder extends Coder<NSClass>{
public static final NSClassCoder INST = new NSClassCoder();
public NSClassCoder(){ super(FFI_PTR, "#", NSClass.class); }
--- a/jdk/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/FFIType.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/FFIType.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,10 +26,7 @@
import com.apple.jobjc.Coder.PrimitivePointerCoder;
-import javax.tools.annotation.GenerateNativeHeader;
-/* No native methods here, but the constants are needed in the supporting JNI code */
-@GenerateNativeHeader
class FFIType{
private static native void makeFFIType(long ffi_type_buf, long elements_buf);
private static native int getFFITypeSizeof();
--- a/jdk/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/Function.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/Function.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -24,10 +24,7 @@
*/
package com.apple.jobjc;
-import javax.tools.annotation.GenerateNativeHeader;
-/* No native methods here, but the constants are needed in the supporting JNI code */
-@GenerateNativeHeader
public class Function {
private static native long getFxnPtrForFunctionName(final String functionName);
private static native long getFxnPtrForFunctionNameAndLib(final long libPtr, final String functionName);
--- a/jdk/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/ID.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/ID.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,10 +29,7 @@
import java.util.LinkedHashMap;
import java.util.Map;
-import javax.tools.annotation.GenerateNativeHeader;
-/* No native methods here, but the constants are needed in the supporting JNI code */
-@GenerateNativeHeader
public class ID extends Pointer<Void>{
static native String getNativeDescription(final long objPtr);
--- a/jdk/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/Invoke.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/Invoke.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -30,18 +30,13 @@
import com.apple.jobjc.Coder.SELCoder;
import com.apple.jobjc.Coder.StructCoder;
-import javax.tools.annotation.GenerateNativeHeader;
-/* No native methods here, but the constants are needed in the supporting JNI code */
-@GenerateNativeHeader
public abstract class Invoke {
public abstract void invoke(NativeArgumentBuffer argBuf);
public abstract void invoke(NativeArgumentBuffer buffer, Struct retvalStruct);
//
- /* No native methods here, but the constants are needed in the supporting JNI code */
- @GenerateNativeHeader
public static final class FunCall extends Invoke{
static native void invoke(long cifPtr, long fxnPtr, long retValPtr, long argsPtr);
@@ -78,8 +73,6 @@
}
}
- /* No native methods here, but the constants are needed in the supporting JNI code */
- @GenerateNativeHeader
public static final class MsgSend extends Invoke{
static{ System.load("/usr/lib/libobjc.dylib"); }
@@ -165,8 +158,6 @@
}
}
- /* No native methods here, but the constants are needed in the supporting JNI code */
- @GenerateNativeHeader
public static final class MsgSendSuper extends Invoke{
static{ System.load("/usr/lib/libobjc.dylib"); }
--- a/jdk/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/JObjCRuntime.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/JObjCRuntime.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -31,16 +31,11 @@
import sun.misc.Unsafe;
-import javax.tools.annotation.GenerateNativeHeader;
-/* No native methods here, but the constants are needed in the supporting JNI code */
-@GenerateNativeHeader
public final class JObjCRuntime {
static { System.loadLibrary("JObjC"); }
- @GenerateNativeHeader
public static enum Arch{ ppc, i386, x86_64 };
- @GenerateNativeHeader
public static enum Width{ W32, W64 };
public static final Arch ARCH = getArch();
--- a/jdk/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/MacOSXFramework.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/MacOSXFramework.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,10 +25,7 @@
package com.apple.jobjc;
-import javax.tools.annotation.GenerateNativeHeader;
-/* No native methods here, but the constants are needed in the supporting JNI code */
-@GenerateNativeHeader
public class MacOSXFramework {
private static native long retainFramework(final String frameworkName);
private static native void releaseFramework(final long frameworkPtr);
--- a/jdk/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/NSClass.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/NSClass.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,13 +27,8 @@
import java.lang.ref.WeakReference;
import java.lang.reflect.Constructor;
-import javax.tools.annotation.GenerateNativeHeader;
-/* No native methods here, but the constants are needed in the supporting JNI code */
-@GenerateNativeHeader
public class NSClass<T extends ID> extends ID {
- /* No native methods here, but the constants are needed in the supporting JNI code */
- @GenerateNativeHeader
public static class NSClassNotFoundException extends RuntimeException{
public NSClassNotFoundException(String m){ super(m); }
public NSClassNotFoundException(String m, Throwable cause){ super(m, cause); }
--- a/jdk/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/NativeArgumentBuffer.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/NativeArgumentBuffer.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -28,10 +28,7 @@
import com.apple.jobjc.Coder.PrimitivePointerCoder;
-import javax.tools.annotation.GenerateNativeHeader;
-/* No native methods here, but the constants are needed in the supporting JNI code */
-@GenerateNativeHeader
public final class NativeArgumentBuffer{
private static final ThreadLocal<NativeArgumentBuffer> threadLocal = new ThreadLocal<NativeArgumentBuffer>();
--- a/jdk/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/NativeBuffer.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/NativeBuffer.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,13 +27,10 @@
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
-import javax.tools.annotation.GenerateNativeHeader;
/**
* A wrapper around a direct ByteBuffer and its native pointer. For documentation, @see java.nio.ByteBuffer
*/
-/* No native methods here, but the constants are needed in the supporting JNI code */
-@GenerateNativeHeader
public class NativeBuffer {
static native long getPtrOfBuffer(final ByteBuffer byteBuffer);
--- a/jdk/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/NativeObjectLifecycleManager.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/NativeObjectLifecycleManager.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -24,10 +24,7 @@
*/
package com.apple.jobjc;
-import javax.tools.annotation.GenerateNativeHeader;
-/* No native methods here, but the constants are needed in the supporting JNI code */
-@GenerateNativeHeader
public abstract class NativeObjectLifecycleManager {
private static native void retainNativeObject(final long ptr);
private static native void releaseNativeObject(final long ptr);
@@ -37,8 +34,6 @@
abstract void end(final long ptr);
boolean shouldPreRetain() { return false; }
- /* No native methods here, but the constants are needed in the supporting JNI code */
- @GenerateNativeHeader
public static class CFRetainRelease extends NativeObjectLifecycleManager {
public static final NativeObjectLifecycleManager INST = new CFRetainRelease();
@Override void begin(final long ptr) { retainNativeObject(ptr); }
@@ -46,16 +41,12 @@
@Override boolean shouldPreRetain() { return true; }
}
- /* No native methods here, but the constants are needed in the supporting JNI code */
- @GenerateNativeHeader
public static class Free extends NativeObjectLifecycleManager {
public static final NativeObjectLifecycleManager INST = new Free();
@Override void begin(final long ptr) { }
@Override void end(final long ptr) { freeNativeObject(ptr); }
}
- /* No native methods here, but the constants are needed in the supporting JNI code */
- @GenerateNativeHeader
public static class Nothing extends NativeObjectLifecycleManager {
public static final NativeObjectLifecycleManager INST = new Nothing();
@Override void begin(final long ptr) { }
--- a/jdk/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/Opaque.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/Opaque.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -24,10 +24,7 @@
*/
package com.apple.jobjc;
-import javax.tools.annotation.GenerateNativeHeader;
-/* No native methods here, but the constants are needed in the supporting JNI code */
-@GenerateNativeHeader
public class Opaque extends Pointer<Void> {
protected Opaque(long ptr) { super(ptr); }
protected Opaque(Pointer<?> ptr) { super(ptr.ptr); }
--- a/jdk/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/Pointer.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/Pointer.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -24,10 +24,7 @@
*/
package com.apple.jobjc;
-import javax.tools.annotation.GenerateNativeHeader;
-/* No native methods here, but the constants are needed in the supporting JNI code */
-@GenerateNativeHeader
public class Pointer <T> implements Comparable<Pointer<T>>{
long ptr;
--- a/jdk/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/PrimitiveCoder.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/PrimitiveCoder.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011,2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -24,11 +24,8 @@
*/
package com.apple.jobjc;
import com.apple.jobjc.JObjCRuntime.Width;
-import javax.tools.annotation.GenerateNativeHeader;
// Auto generated by PrimitiveCoder.hs
// Do not edit by hand.
-/* No native methods here, but the constants are needed in the supporting JNI code */
-@GenerateNativeHeader
public abstract class PrimitiveCoder<T> extends Coder<T>{
public PrimitiveCoder(int ffiTypeCode, String objCEncoding, Class jclass, Class jprim){
super(ffiTypeCode, objCEncoding, jclass, jprim);
@@ -130,8 +127,6 @@
// native BOOL -> java boolean
-/* No native methods here, but the constants are needed in the supporting JNI code */
-@GenerateNativeHeader
public static final class BoolCoder extends PrimitiveCoder<Boolean>{
public static final BoolCoder INST = new BoolCoder();
public BoolCoder(){ super(FFI_SINT8, "B", Boolean.class, boolean.class); }
@@ -175,8 +170,6 @@
}
// native schar -> java byte
-/* No native methods here, but the constants are needed in the supporting JNI code */
-@GenerateNativeHeader
public static final class SCharCoder extends PrimitiveCoder<Byte>{
public static final SCharCoder INST = new SCharCoder();
public SCharCoder(){ super(FFI_SINT8, "c", Byte.class, byte.class); }
@@ -220,8 +213,6 @@
}
// native uchar -> java byte
-/* No native methods here, but the constants are needed in the supporting JNI code */
-@GenerateNativeHeader
public static final class UCharCoder extends PrimitiveCoder<Byte>{
public static final UCharCoder INST = new UCharCoder();
public UCharCoder(){ super(FFI_UINT8, "C", Byte.class, byte.class); }
@@ -265,8 +256,6 @@
}
// native sshort -> java short
-/* No native methods here, but the constants are needed in the supporting JNI code */
-@GenerateNativeHeader
public static final class SShortCoder extends PrimitiveCoder<Short>{
public static final SShortCoder INST = new SShortCoder();
public SShortCoder(){ super(FFI_SINT16, "s", Short.class, short.class); }
@@ -310,8 +299,6 @@
}
// native ushort -> java short
-/* No native methods here, but the constants are needed in the supporting JNI code */
-@GenerateNativeHeader
public static final class UShortCoder extends PrimitiveCoder<Short>{
public static final UShortCoder INST = new UShortCoder();
public UShortCoder(){ super(FFI_UINT16, "S", Short.class, short.class); }
@@ -355,8 +342,6 @@
}
// native sint -> java int
-/* No native methods here, but the constants are needed in the supporting JNI code */
-@GenerateNativeHeader
public static final class SIntCoder extends PrimitiveCoder<Integer>{
public static final SIntCoder INST = new SIntCoder();
public SIntCoder(){ super(FFI_SINT32, "i", Integer.class, int.class); }
@@ -400,8 +385,6 @@
}
// native uint -> java int
-/* No native methods here, but the constants are needed in the supporting JNI code */
-@GenerateNativeHeader
public static final class UIntCoder extends PrimitiveCoder<Integer>{
public static final UIntCoder INST = new UIntCoder();
public UIntCoder(){ super(FFI_UINT32, "I", Integer.class, int.class); }
@@ -445,8 +428,6 @@
}
// native slong -> java long
-/* No native methods here, but the constants are needed in the supporting JNI code */
-@GenerateNativeHeader
public static final class SLongCoder extends PrimitiveCoder<Long>{
public static final SLongCoder INST = new SLongCoder();
public SLongCoder(){ super((JObjCRuntime.IS64 ? (FFI_SINT64) : (FFI_SINT32)), "l", Long.class, long.class); }
@@ -496,8 +477,6 @@
}
// native ulong -> java long
-/* No native methods here, but the constants are needed in the supporting JNI code */
-@GenerateNativeHeader
public static final class ULongCoder extends PrimitiveCoder<Long>{
public static final ULongCoder INST = new ULongCoder();
public ULongCoder(){ super((JObjCRuntime.IS64 ? (FFI_UINT64) : (FFI_UINT32)), "L", Long.class, long.class); }
@@ -547,8 +526,6 @@
}
// native slonglong -> java long
-/* No native methods here, but the constants are needed in the supporting JNI code */
-@GenerateNativeHeader
public static final class SLongLongCoder extends PrimitiveCoder<Long>{
public static final SLongLongCoder INST = new SLongLongCoder();
public SLongLongCoder(){ super(FFI_SINT64, "q", Long.class, long.class); }
@@ -592,8 +569,6 @@
}
// native ulonglong -> java long
-/* No native methods here, but the constants are needed in the supporting JNI code */
-@GenerateNativeHeader
public static final class ULongLongCoder extends PrimitiveCoder<Long>{
public static final ULongLongCoder INST = new ULongLongCoder();
public ULongLongCoder(){ super(FFI_UINT64, "Q", Long.class, long.class); }
@@ -637,8 +612,6 @@
}
// native float -> java float
-/* No native methods here, but the constants are needed in the supporting JNI code */
-@GenerateNativeHeader
public static final class FloatCoder extends PrimitiveCoder<Float>{
public static final FloatCoder INST = new FloatCoder();
public FloatCoder(){ super(FFI_FLOAT, "f", Float.class, float.class); }
@@ -682,8 +655,6 @@
}
// native double -> java double
-/* No native methods here, but the constants are needed in the supporting JNI code */
-@GenerateNativeHeader
public static final class DoubleCoder extends PrimitiveCoder<Double>{
public static final DoubleCoder INST = new DoubleCoder();
public DoubleCoder(){ super(FFI_DOUBLE, "d", Double.class, double.class); }
--- a/jdk/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/SEL.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/SEL.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -24,10 +24,7 @@
*/
package com.apple.jobjc;
-import javax.tools.annotation.GenerateNativeHeader;
-/* No native methods here, but the constants are needed in the supporting JNI code */
-@GenerateNativeHeader
public class SEL {
static native long getSelectorPtr(String selectorName);
static native String getSelectorName(long ptr);
--- a/jdk/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/Struct.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/Struct.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -24,13 +24,10 @@
*/
package com.apple.jobjc;
-import javax.tools.annotation.GenerateNativeHeader;
/**
* A struct is malloced on the C heap and accessed in Java through a ByteBuffer.
*/
-/* No native methods here, but the constants are needed in the supporting JNI code */
-@GenerateNativeHeader
public abstract class Struct{
protected final NativeBuffer raw;
private final JObjCRuntime runtime;
--- a/jdk/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/Subclassing.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/Subclassing.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -33,10 +33,7 @@
import com.apple.jobjc.Coder.VoidCoder;
import com.apple.jobjc.Invoke.MsgSend;
-import javax.tools.annotation.GenerateNativeHeader;
-/* No native methods here, but the constants are needed in the supporting JNI code */
-@GenerateNativeHeader
final class Subclassing {
static native long allocateClassPair(long superClass, String name);
static native boolean addIVarForJObj(long clazz);
--- a/jdk/src/macosx/native/jobjc/src/core/native/Invoke.m Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/macosx/native/jobjc/src/core/native/Invoke.m Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -24,8 +24,6 @@
*/
#include "com_apple_jobjc_Invoke_FunCall.h"
-#include "com_apple_jobjc_Invoke_MsgSend.h"
-#include "com_apple_jobjc_Invoke_MsgSendSuper.h"
#include <ffi/ffi.h>
#include <objc/message.h>
#include <JavaNativeFoundation/JavaNativeFoundation.h>
--- a/jdk/src/macosx/native/jobjc/src/core/native/JObjCRuntime.m Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/macosx/native/jobjc/src/core/native/JObjCRuntime.m Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,5 @@
* questions.
*/
-#include "com_apple_jobjc_JObjCRuntime.h"
#include "Cocoa/Cocoa.h"
--- a/jdk/src/macosx/native/sun/awt/PrinterView.m Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/macosx/native/sun/awt/PrinterView.m Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
#import "PrinterView.h"
#import "java_awt_print_Pageable.h"
-#import "java_awt_print_Printable.h"
#import "java_awt_print_PageFormat.h"
#import <JavaNativeFoundation/JavaNativeFoundation.h>
--- a/jdk/src/share/classes/java/awt/Adjustable.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/share/classes/java/awt/Adjustable.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
import java.awt.event.*;
-import javax.tools.annotation.GenerateNativeHeader;
+import java.lang.annotation.Native;
/**
* The interface for objects which have an adjustable numeric value
@@ -36,24 +36,22 @@
* @author Amy Fowler
* @author Tim Prinzing
*/
-/* No native methods here, but the constants are needed in the supporting JNI code */
-@GenerateNativeHeader
public interface Adjustable {
/**
* Indicates that the <code>Adjustable</code> has horizontal orientation.
*/
- public static final int HORIZONTAL = 0;
+ @Native public static final int HORIZONTAL = 0;
/**
* Indicates that the <code>Adjustable</code> has vertical orientation.
*/
- public static final int VERTICAL = 1;
+ @Native public static final int VERTICAL = 1;
/**
* Indicates that the <code>Adjustable</code> has no orientation.
*/
- public static final int NO_ORIENTATION = 2;
+ @Native public static final int NO_ORIENTATION = 2;
/**
* Gets the orientation of the adjustable object.
--- a/jdk/src/share/classes/java/awt/AlphaComposite.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/share/classes/java/awt/AlphaComposite.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
package java.awt;
import java.awt.image.ColorModel;
-import javax.tools.annotation.GenerateNativeHeader;
+import java.lang.annotation.Native;
import sun.java2d.SunCompositeContext;
/**
@@ -350,8 +350,6 @@
* @see CompositeContext
*/
-/* No native methods here, but the constants are needed in the supporting JNI code */
-@GenerateNativeHeader
public final class AlphaComposite implements Composite {
/**
* Both the color and the alpha of the destination are cleared
@@ -364,7 +362,7 @@
* <em>C<sub>r</sub></em> = 0
*</pre>
*/
- public static final int CLEAR = 1;
+ @Native public static final int CLEAR = 1;
/**
* The source is copied to the destination
@@ -377,7 +375,7 @@
* <em>C<sub>r</sub></em> = <em>C<sub>s</sub></em>
*</pre>
*/
- public static final int SRC = 2;
+ @Native public static final int SRC = 2;
/**
* The destination is left untouched
@@ -390,7 +388,7 @@
*</pre>
* @since 1.4
*/
- public static final int DST = 9;
+ @Native public static final int DST = 9;
// Note that DST was added in 1.4 so it is numbered out of order...
/**
@@ -403,7 +401,7 @@
* <em>C<sub>r</sub></em> = <em>C<sub>s</sub></em> + <em>C<sub>d</sub></em>*(1-<em>A<sub>s</sub></em>)
*</pre>
*/
- public static final int SRC_OVER = 3;
+ @Native public static final int SRC_OVER = 3;
/**
* The destination is composited over the source and
@@ -416,7 +414,7 @@
* <em>C<sub>r</sub></em> = <em>C<sub>s</sub></em>*(1-<em>A<sub>d</sub></em>) + <em>C<sub>d</sub></em>
*</pre>
*/
- public static final int DST_OVER = 4;
+ @Native public static final int DST_OVER = 4;
/**
* The part of the source lying inside of the destination replaces
@@ -429,7 +427,7 @@
* <em>C<sub>r</sub></em> = <em>C<sub>s</sub></em>*<em>A<sub>d</sub></em>
*</pre>
*/
- public static final int SRC_IN = 5;
+ @Native public static final int SRC_IN = 5;
/**
* The part of the destination lying inside of the source
@@ -442,7 +440,7 @@
* <em>C<sub>r</sub></em> = <em>C<sub>d</sub></em>*<em>A<sub>s</sub></em>
*</pre>
*/
- public static final int DST_IN = 6;
+ @Native public static final int DST_IN = 6;
/**
* The part of the source lying outside of the destination
@@ -455,7 +453,7 @@
* <em>C<sub>r</sub></em> = <em>C<sub>s</sub></em>*(1-<em>A<sub>d</sub></em>)
*</pre>
*/
- public static final int SRC_OUT = 7;
+ @Native public static final int SRC_OUT = 7;
/**
* The part of the destination lying outside of the source
@@ -468,7 +466,7 @@
* <em>C<sub>r</sub></em> = <em>C<sub>d</sub></em>*(1-<em>A<sub>s</sub></em>)
*</pre>
*/
- public static final int DST_OUT = 8;
+ @Native public static final int DST_OUT = 8;
// Rule 9 is DST which is defined above where it fits into the
// list logically, rather than numerically
@@ -487,7 +485,7 @@
*</pre>
* @since 1.4
*/
- public static final int SRC_ATOP = 10;
+ @Native public static final int SRC_ATOP = 10;
/**
* The part of the destination lying inside of the source
@@ -501,7 +499,7 @@
*</pre>
* @since 1.4
*/
- public static final int DST_ATOP = 11;
+ @Native public static final int DST_ATOP = 11;
/**
* The part of the source that lies outside of the destination
@@ -516,7 +514,7 @@
*</pre>
* @since 1.4
*/
- public static final int XOR = 12;
+ @Native public static final int XOR = 12;
/**
* <code>AlphaComposite</code> object that implements the opaque CLEAR rule
@@ -606,8 +604,8 @@
*/
public static final AlphaComposite Xor = new AlphaComposite(XOR);
- private static final int MIN_RULE = CLEAR;
- private static final int MAX_RULE = XOR;
+ @Native private static final int MIN_RULE = CLEAR;
+ @Native private static final int MAX_RULE = XOR;
float extraAlpha;
int rule;
--- a/jdk/src/share/classes/java/awt/BasicStroke.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/share/classes/java/awt/BasicStroke.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
import java.beans.ConstructorProperties;
-import javax.tools.annotation.GenerateNativeHeader;
+import java.lang.annotation.Native;
/**
* The <code>BasicStroke</code> class defines a basic set of rendering
@@ -111,47 +111,45 @@
* @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 {
/**
* Joins path segments by extending their outside edges until
* they meet.
*/
- public final static int JOIN_MITER = 0;
+ @Native public final static int JOIN_MITER = 0;
/**
* Joins path segments by rounding off the corner at a radius
* of half the line width.
*/
- public final static int JOIN_ROUND = 1;
+ @Native public final static int JOIN_ROUND = 1;
/**
* Joins path segments by connecting the outer corners of their
* wide outlines with a straight segment.
*/
- public final static int JOIN_BEVEL = 2;
+ @Native public final static int JOIN_BEVEL = 2;
/**
* Ends unclosed subpaths and dash segments with no added
* decoration.
*/
- public final static int CAP_BUTT = 0;
+ @Native public final static int CAP_BUTT = 0;
/**
* Ends unclosed subpaths and dash segments with a round
* decoration that has a radius equal to half of the width
* of the pen.
*/
- public final static int CAP_ROUND = 1;
+ @Native public final static int CAP_ROUND = 1;
/**
* Ends unclosed subpaths and dash segments with a square
* projection that extends beyond the end of the segment
* to a distance equal to half of the line width.
*/
- public final static int CAP_SQUARE = 2;
+ @Native public final static int CAP_SQUARE = 2;
float width;
--- a/jdk/src/share/classes/java/awt/Choice.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/share/classes/java/awt/Choice.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,6 @@
import javax.accessibility.*;
-import javax.tools.annotation.GenerateNativeHeader;
/**
* The <code>Choice</code> class presents a pop-up menu of choices.
@@ -71,8 +70,6 @@
* @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>.
--- a/jdk/src/share/classes/java/awt/DisplayMode.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/share/classes/java/awt/DisplayMode.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
package java.awt;
-import javax.tools.annotation.GenerateNativeHeader;
+import java.lang.annotation.Native;
/**
* The <code>DisplayMode</code> class encapsulates the bit depth, height,
@@ -46,8 +46,6 @@
* @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;
@@ -94,7 +92,7 @@
* display mode.
* @see #getBitDepth
*/
- public final static int BIT_DEPTH_MULTI = -1;
+ @Native public final static int BIT_DEPTH_MULTI = -1;
/**
* Returns the bit depth of the display, in bits per pixel. This may be
@@ -112,7 +110,7 @@
* Value of the refresh rate if not known.
* @see #getRefreshRate
*/
- public final static int REFRESH_RATE_UNKNOWN = 0;
+ @Native public final static int REFRESH_RATE_UNKNOWN = 0;
/**
* Returns the refresh rate of the display, in hertz. This may be
--- a/jdk/src/share/classes/java/awt/Image.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/share/classes/java/awt/Image.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,6 @@
import sun.awt.image.SurfaceManager;
-import javax.tools.annotation.GenerateNativeHeader;
/**
* The abstract class <code>Image</code> is the superclass of all
@@ -44,8 +43,6 @@
* @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 {
/**
--- a/jdk/src/share/classes/java/awt/List.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/share/classes/java/awt/List.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,6 @@
import java.io.ObjectInputStream;
import java.io.IOException;
import javax.accessibility.*;
-import javax.tools.annotation.GenerateNativeHeader;
/**
@@ -107,8 +106,6 @@
* @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
--- a/jdk/src/share/classes/java/awt/PopupMenu.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/share/classes/java/awt/PopupMenu.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
import java.awt.peer.PopupMenuPeer;
import javax.accessibility.*;
-import javax.tools.annotation.GenerateNativeHeader;
import sun.awt.AWTAccessor;
@@ -44,8 +43,6 @@
*
* @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";
--- a/jdk/src/share/classes/java/awt/SystemColor.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/share/classes/java/awt/SystemColor.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
import java.io.ObjectStreamException;
-import javax.tools.annotation.GenerateNativeHeader;
+import java.lang.annotation.Native;
/**
* A class to encapsulate symbolic colors representing the color of
@@ -49,8 +49,6 @@
* @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 {
/**
@@ -58,187 +56,187 @@
* {@link #desktop} system color.
* @see SystemColor#desktop
*/
- public final static int DESKTOP = 0;
+ @Native public final static int DESKTOP = 0;
/**
* The array index for the
* {@link #activeCaption} system color.
* @see SystemColor#activeCaption
*/
- public final static int ACTIVE_CAPTION = 1;
+ @Native public final static int ACTIVE_CAPTION = 1;
/**
* The array index for the
* {@link #activeCaptionText} system color.
* @see SystemColor#activeCaptionText
*/
- public final static int ACTIVE_CAPTION_TEXT = 2;
+ @Native public final static int ACTIVE_CAPTION_TEXT = 2;
/**
* The array index for the
* {@link #activeCaptionBorder} system color.
* @see SystemColor#activeCaptionBorder
*/
- public final static int ACTIVE_CAPTION_BORDER = 3;
+ @Native public final static int ACTIVE_CAPTION_BORDER = 3;
/**
* The array index for the
* {@link #inactiveCaption} system color.
* @see SystemColor#inactiveCaption
*/
- public final static int INACTIVE_CAPTION = 4;
+ @Native public final static int INACTIVE_CAPTION = 4;
/**
* The array index for the
* {@link #inactiveCaptionText} system color.
* @see SystemColor#inactiveCaptionText
*/
- public final static int INACTIVE_CAPTION_TEXT = 5;
+ @Native public final static int INACTIVE_CAPTION_TEXT = 5;
/**
* The array index for the
* {@link #inactiveCaptionBorder} system color.
* @see SystemColor#inactiveCaptionBorder
*/
- public final static int INACTIVE_CAPTION_BORDER = 6;
+ @Native public final static int INACTIVE_CAPTION_BORDER = 6;
/**
* The array index for the
* {@link #window} system color.
* @see SystemColor#window
*/
- public final static int WINDOW = 7;
+ @Native public final static int WINDOW = 7;
/**
* The array index for the
* {@link #windowBorder} system color.
* @see SystemColor#windowBorder
*/
- public final static int WINDOW_BORDER = 8;
+ @Native public final static int WINDOW_BORDER = 8;
/**
* The array index for the
* {@link #windowText} system color.
* @see SystemColor#windowText
*/
- public final static int WINDOW_TEXT = 9;
+ @Native public final static int WINDOW_TEXT = 9;
/**
* The array index for the
* {@link #menu} system color.
* @see SystemColor#menu
*/
- public final static int MENU = 10;
+ @Native public final static int MENU = 10;
/**
* The array index for the
* {@link #menuText} system color.
* @see SystemColor#menuText
*/
- public final static int MENU_TEXT = 11;
+ @Native public final static int MENU_TEXT = 11;
/**
* The array index for the
* {@link #text} system color.
* @see SystemColor#text
*/
- public final static int TEXT = 12;
+ @Native public final static int TEXT = 12;
/**
* The array index for the
* {@link #textText} system color.
* @see SystemColor#textText
*/
- public final static int TEXT_TEXT = 13;
+ @Native public final static int TEXT_TEXT = 13;
/**
* The array index for the
* {@link #textHighlight} system color.
* @see SystemColor#textHighlight
*/
- public final static int TEXT_HIGHLIGHT = 14;
+ @Native public final static int TEXT_HIGHLIGHT = 14;
/**
* The array index for the
* {@link #textHighlightText} system color.
* @see SystemColor#textHighlightText
*/
- public final static int TEXT_HIGHLIGHT_TEXT = 15;
+ @Native public final static int TEXT_HIGHLIGHT_TEXT = 15;
/**
* The array index for the
* {@link #textInactiveText} system color.
* @see SystemColor#textInactiveText
*/
- public final static int TEXT_INACTIVE_TEXT = 16;
+ @Native public final static int TEXT_INACTIVE_TEXT = 16;
/**
* The array index for the
* {@link #control} system color.
* @see SystemColor#control
*/
- public final static int CONTROL = 17;
+ @Native public final static int CONTROL = 17;
/**
* The array index for the
* {@link #controlText} system color.
* @see SystemColor#controlText
*/
- public final static int CONTROL_TEXT = 18;
+ @Native public final static int CONTROL_TEXT = 18;
/**
* The array index for the
* {@link #controlHighlight} system color.
* @see SystemColor#controlHighlight
*/
- public final static int CONTROL_HIGHLIGHT = 19;
+ @Native public final static int CONTROL_HIGHLIGHT = 19;
/**
* The array index for the
* {@link #controlLtHighlight} system color.
* @see SystemColor#controlLtHighlight
*/
- public final static int CONTROL_LT_HIGHLIGHT = 20;
+ @Native public final static int CONTROL_LT_HIGHLIGHT = 20;
/**
* The array index for the
* {@link #controlShadow} system color.
* @see SystemColor#controlShadow
*/
- public final static int CONTROL_SHADOW = 21;
+ @Native public final static int CONTROL_SHADOW = 21;
/**
* The array index for the
* {@link #controlDkShadow} system color.
* @see SystemColor#controlDkShadow
*/
- public final static int CONTROL_DK_SHADOW = 22;
+ @Native public final static int CONTROL_DK_SHADOW = 22;
/**
* The array index for the
* {@link #scrollbar} system color.
* @see SystemColor#scrollbar
*/
- public final static int SCROLLBAR = 23;
+ @Native public final static int SCROLLBAR = 23;
/**
* The array index for the
* {@link #info} system color.
* @see SystemColor#info
*/
- public final static int INFO = 24;
+ @Native public final static int INFO = 24;
/**
* The array index for the
* {@link #infoText} system color.
* @see SystemColor#infoText
*/
- public final static int INFO_TEXT = 25;
+ @Native public final static int INFO_TEXT = 25;
/**
* The number of system colors in the array.
*/
- public final static int NUM_COLORS = 26;
+ @Native public final static int NUM_COLORS = 26;
/******************************************************************************************/
--- a/jdk/src/share/classes/java/awt/TextComponent.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/share/classes/java/awt/TextComponent.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -35,7 +35,6 @@
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,8 +56,6 @@
* @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 {
/**
--- a/jdk/src/share/classes/java/awt/Transparency.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/share/classes/java/awt/Transparency.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 1999, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,34 +25,32 @@
package java.awt;
-import javax.tools.annotation.GenerateNativeHeader;
+import java.lang.annotation.Native;
/**
* 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 {
/**
* Represents image data that is guaranteed to be completely opaque,
* meaning that all pixels have an alpha value of 1.0.
*/
- public final static int OPAQUE = 1;
+ @Native public final static int OPAQUE = 1;
/**
* Represents image data that is guaranteed to be either completely
* opaque, with an alpha value of 1.0, or completely transparent,
* with an alpha value of 0.0.
*/
- public final static int BITMASK = 2;
+ @Native public final static int BITMASK = 2;
/**
* Represents image data that contains or might contain arbitrary
* alpha values between and including 0.0 and 1.0.
*/
- public final static int TRANSLUCENT = 3;
+ @Native public final static int TRANSLUCENT = 3;
/**
* Returns the type of this <code>Transparency</code>.
--- a/jdk/src/share/classes/java/awt/color/ColorSpace.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/share/classes/java/awt/color/ColorSpace.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -35,7 +35,7 @@
package java.awt.color;
-import javax.tools.annotation.GenerateNativeHeader;
+import java.lang.annotation.Native;
import sun.java2d.cmm.PCMM;
import sun.java2d.cmm.CMSManager;
@@ -95,8 +95,6 @@
* @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;
@@ -115,127 +113,127 @@
/**
* Any of the family of XYZ color spaces.
*/
- public static final int TYPE_XYZ = 0;
+ @Native public static final int TYPE_XYZ = 0;
/**
* Any of the family of Lab color spaces.
*/
- public static final int TYPE_Lab = 1;
+ @Native public static final int TYPE_Lab = 1;
/**
* Any of the family of Luv color spaces.
*/
- public static final int TYPE_Luv = 2;
+ @Native public static final int TYPE_Luv = 2;
/**
* Any of the family of YCbCr color spaces.
*/
- public static final int TYPE_YCbCr = 3;
+ @Native public static final int TYPE_YCbCr = 3;
/**
* Any of the family of Yxy color spaces.
*/
- public static final int TYPE_Yxy = 4;
+ @Native public static final int TYPE_Yxy = 4;
/**
* Any of the family of RGB color spaces.
*/
- public static final int TYPE_RGB = 5;
+ @Native public static final int TYPE_RGB = 5;
/**
* Any of the family of GRAY color spaces.
*/
- public static final int TYPE_GRAY = 6;
+ @Native public static final int TYPE_GRAY = 6;
/**
* Any of the family of HSV color spaces.
*/
- public static final int TYPE_HSV = 7;
+ @Native public static final int TYPE_HSV = 7;
/**
* Any of the family of HLS color spaces.
*/
- public static final int TYPE_HLS = 8;
+ @Native public static final int TYPE_HLS = 8;
/**
* Any of the family of CMYK color spaces.
*/
- public static final int TYPE_CMYK = 9;
+ @Native public static final int TYPE_CMYK = 9;
/**
* Any of the family of CMY color spaces.
*/
- public static final int TYPE_CMY = 11;
+ @Native public static final int TYPE_CMY = 11;
/**
* Generic 2 component color spaces.
*/
- public static final int TYPE_2CLR = 12;
+ @Native public static final int TYPE_2CLR = 12;
/**
* Generic 3 component color spaces.
*/
- public static final int TYPE_3CLR = 13;
+ @Native public static final int TYPE_3CLR = 13;
/**
* Generic 4 component color spaces.
*/
- public static final int TYPE_4CLR = 14;
+ @Native public static final int TYPE_4CLR = 14;
/**
* Generic 5 component color spaces.
*/
- public static final int TYPE_5CLR = 15;
+ @Native public static final int TYPE_5CLR = 15;
/**
* Generic 6 component color spaces.
*/
- public static final int TYPE_6CLR = 16;
+ @Native public static final int TYPE_6CLR = 16;
/**
* Generic 7 component color spaces.
*/
- public static final int TYPE_7CLR = 17;
+ @Native public static final int TYPE_7CLR = 17;
/**
* Generic 8 component color spaces.
*/
- public static final int TYPE_8CLR = 18;
+ @Native public static final int TYPE_8CLR = 18;
/**
* Generic 9 component color spaces.
*/
- public static final int TYPE_9CLR = 19;
+ @Native public static final int TYPE_9CLR = 19;
/**
* Generic 10 component color spaces.
*/
- public static final int TYPE_ACLR = 20;
+ @Native public static final int TYPE_ACLR = 20;
/**
* Generic 11 component color spaces.
*/
- public static final int TYPE_BCLR = 21;
+ @Native public static final int TYPE_BCLR = 21;
/**
* Generic 12 component color spaces.
*/
- public static final int TYPE_CCLR = 22;
+ @Native public static final int TYPE_CCLR = 22;
/**
* Generic 13 component color spaces.
*/
- public static final int TYPE_DCLR = 23;
+ @Native public static final int TYPE_DCLR = 23;
/**
* Generic 14 component color spaces.
*/
- public static final int TYPE_ECLR = 24;
+ @Native public static final int TYPE_ECLR = 24;
/**
* Generic 15 component color spaces.
*/
- public static final int TYPE_FCLR = 25;
+ @Native public static final int TYPE_FCLR = 25;
/**
* The sRGB color space defined at
@@ -243,28 +241,28 @@
* http://www.w3.org/pub/WWW/Graphics/Color/sRGB.html
* </A>.
*/
- public static final int CS_sRGB = 1000;
+ @Native public static final int CS_sRGB = 1000;
/**
* A built-in linear RGB color space. This space is based on the
* same RGB primaries as CS_sRGB, but has a linear tone reproduction curve.
*/
- public static final int CS_LINEAR_RGB = 1004;
+ @Native public static final int CS_LINEAR_RGB = 1004;
/**
* The CIEXYZ conversion color space defined above.
*/
- public static final int CS_CIEXYZ = 1001;
+ @Native public static final int CS_CIEXYZ = 1001;
/**
* The Photo YCC conversion color space.
*/
- public static final int CS_PYCC = 1002;
+ @Native public static final int CS_PYCC = 1002;
/**
* The built-in linear gray scale color space.
*/
- public static final int CS_GRAY = 1003;
+ @Native public static final int CS_GRAY = 1003;
/**
--- a/jdk/src/share/classes/java/awt/color/ICC_Profile.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/share/classes/java/awt/color/ICC_Profile.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -58,7 +58,6 @@
import java.security.AccessController;
import java.security.PrivilegedAction;
-import javax.tools.annotation.GenerateNativeHeader;
/**
* A representation of color profile data for device independent and
@@ -90,8 +89,6 @@
*/
-/* 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;
--- a/jdk/src/share/classes/java/awt/datatransfer/StringSelection.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/share/classes/java/awt/datatransfer/StringSelection.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@
import java.io.*;
-import javax.tools.annotation.GenerateNativeHeader;
/**
* A <code>Transferable</code> which implements the capability required
@@ -43,8 +42,6 @@
* @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;
--- a/jdk/src/share/classes/java/awt/dnd/DnDConstants.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/share/classes/java/awt/dnd/DnDConstants.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 1999, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,15 +25,13 @@
package java.awt.dnd;
-import javax.tools.annotation.GenerateNativeHeader;
+import java.lang.annotation.Native;
/**
* 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.
@@ -41,23 +39,23 @@
/**
* An <code>int</code> representing no action.
*/
- public static final int ACTION_NONE = 0x0;
+ @Native public static final int ACTION_NONE = 0x0;
/**
* An <code>int</code> representing a "copy" action.
*/
- public static final int ACTION_COPY = 0x1;
+ @Native public static final int ACTION_COPY = 0x1;
/**
* An <code>int</code> representing a "move" action.
*/
- public static final int ACTION_MOVE = 0x2;
+ @Native public static final int ACTION_MOVE = 0x2;
/**
* An <code>int</code> representing a "copy" or
* "move" action.
*/
- public static final int ACTION_COPY_OR_MOVE = ACTION_COPY | ACTION_MOVE;
+ @Native public static final int ACTION_COPY_OR_MOVE = ACTION_COPY | ACTION_MOVE;
/**
* An <code>int</code> representing a "link" action.
@@ -75,12 +73,12 @@
* results for the user.
*/
- public static final int ACTION_LINK = 0x40000000;
+ @Native public static final int ACTION_LINK = 0x40000000;
/**
* An <code>int</code> representing a "reference"
* action (synonym for ACTION_LINK).
*/
- public static final int ACTION_REFERENCE = ACTION_LINK;
+ @Native public static final int ACTION_REFERENCE = ACTION_LINK;
}
--- a/jdk/src/share/classes/java/awt/event/ActionEvent.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/share/classes/java/awt/event/ActionEvent.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
import java.awt.AWTEvent;
import java.awt.Event;
-import javax.tools.annotation.GenerateNativeHeader;
+import java.lang.annotation.Native;
/**
* A semantic event which indicates that a component-defined action occurred.
@@ -57,8 +57,6 @@
* @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 {
/**
@@ -99,7 +97,7 @@
/**
* This event id indicates that a meaningful action occured.
*/
- public static final int ACTION_PERFORMED = ACTION_FIRST; //Event.ACTION_EVENT
+ @Native public static final int ACTION_PERFORMED = ACTION_FIRST; //Event.ACTION_EVENT
/**
* The nonlocalized string that gives more details
--- a/jdk/src/share/classes/java/awt/event/AdjustmentEvent.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/share/classes/java/awt/event/AdjustmentEvent.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,9 +27,8 @@
import java.awt.Adjustable;
import java.awt.AWTEvent;
-import javax.tools.annotation.GenerateNativeHeader;
+import java.lang.annotation.Native;
-import javax.tools.annotation.GenerateNativeHeader;
/**
* The adjustment event emitted by Adjustable objects like
@@ -57,8 +56,6 @@
* @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 {
/**
@@ -79,27 +76,27 @@
/**
* The unit increment adjustment type.
*/
- public static final int UNIT_INCREMENT = 1;
+ @Native public static final int UNIT_INCREMENT = 1;
/**
* The unit decrement adjustment type.
*/
- public static final int UNIT_DECREMENT = 2;
+ @Native public static final int UNIT_DECREMENT = 2;
/**
* The block decrement adjustment type.
*/
- public static final int BLOCK_DECREMENT = 3;
+ @Native public static final int BLOCK_DECREMENT = 3;
/**
* The block increment adjustment type.
*/
- public static final int BLOCK_INCREMENT = 4;
+ @Native public static final int BLOCK_INCREMENT = 4;
/**
* The absolute tracking adjustment type.
*/
- public static final int TRACK = 5;
+ @Native public static final int TRACK = 5;
/**
* The adjustable object that fired the event.
--- a/jdk/src/share/classes/java/awt/event/ComponentEvent.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/share/classes/java/awt/event/ComponentEvent.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
import java.awt.AWTEvent;
import java.awt.Component;
import java.awt.Rectangle;
-import javax.tools.annotation.GenerateNativeHeader;
+import java.lang.annotation.Native;
/**
* A low-level event which indicates that a component moved, changed
@@ -65,8 +65,6 @@
* @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 {
/**
@@ -82,22 +80,22 @@
/**
* This event indicates that the component's position changed.
*/
- public static final int COMPONENT_MOVED = COMPONENT_FIRST;
+ @Native public static final int COMPONENT_MOVED = COMPONENT_FIRST;
/**
* This event indicates that the component's size changed.
*/
- public static final int COMPONENT_RESIZED = 1 + COMPONENT_FIRST;
+ @Native public static final int COMPONENT_RESIZED = 1 + COMPONENT_FIRST;
/**
* This event indicates that the component was made visible.
*/
- public static final int COMPONENT_SHOWN = 2 + COMPONENT_FIRST;
+ @Native public static final int COMPONENT_SHOWN = 2 + COMPONENT_FIRST;
/**
* This event indicates that the component was rendered invisible.
*/
- public static final int COMPONENT_HIDDEN = 3 + COMPONENT_FIRST;
+ @Native public static final int COMPONENT_HIDDEN = 3 + COMPONENT_FIRST;
/*
* JDK 1.1 serialVersionUID
--- a/jdk/src/share/classes/java/awt/event/FocusEvent.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/share/classes/java/awt/event/FocusEvent.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
package java.awt.event;
import java.awt.Component;
-import javax.tools.annotation.GenerateNativeHeader;
import sun.awt.AppContext;
import sun.awt.SunToolkit;
@@ -64,8 +63,6 @@
* @author Amy Fowler
* @since 1.1
*/
-/* No native methods here, but the constants are needed in the supporting JNI code */
-@GenerateNativeHeader
public class FocusEvent extends ComponentEvent {
/**
--- a/jdk/src/share/classes/java/awt/event/InputMethodEvent.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/share/classes/java/awt/event/InputMethodEvent.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,7 @@
import java.io.ObjectInputStream;
import java.text.AttributedCharacterIterator;
import java.text.CharacterIterator;
-import javax.tools.annotation.GenerateNativeHeader;
+import java.lang.annotation.Native;
/**
* Input method events contain information about text that is being
@@ -56,8 +56,6 @@
* @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 {
/**
@@ -68,25 +66,25 @@
/**
* Marks the first integer id for the range of input method event ids.
*/
- public static final int INPUT_METHOD_FIRST = 1100;
+ @Native public static final int INPUT_METHOD_FIRST = 1100;
/**
* The event type indicating changed input method text. This event is
* generated by input methods while processing input.
*/
- public static final int INPUT_METHOD_TEXT_CHANGED = INPUT_METHOD_FIRST;
+ @Native public static final int INPUT_METHOD_TEXT_CHANGED = INPUT_METHOD_FIRST;
/**
* The event type indicating a changed insertion point in input method text.
* This event is
* generated by input methods while processing input if only the caret changed.
*/
- public static final int CARET_POSITION_CHANGED = INPUT_METHOD_FIRST + 1;
+ @Native public static final int CARET_POSITION_CHANGED = INPUT_METHOD_FIRST + 1;
/**
* Marks the last integer id for the range of input method event ids.
*/
- public static final int INPUT_METHOD_LAST = INPUT_METHOD_FIRST + 1;
+ @Native public static final int INPUT_METHOD_LAST = INPUT_METHOD_FIRST + 1;
/**
* The time stamp that indicates when the event was created.
--- a/jdk/src/share/classes/java/awt/event/MouseWheelEvent.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/share/classes/java/awt/event/MouseWheelEvent.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
import java.awt.Component;
-import javax.tools.annotation.GenerateNativeHeader;
+import java.lang.annotation.Native;
/**
* An event which indicates that the mouse wheel was rotated in a component.
@@ -99,8 +99,6 @@
* @since 1.4
*/
-/* No native methods here, but the constants are needed in the supporting JNI code */
-@GenerateNativeHeader
public class MouseWheelEvent extends MouseEvent {
/**
@@ -109,7 +107,7 @@
*
* @see #getScrollType
*/
- public static final int WHEEL_UNIT_SCROLL = 0;
+ @Native public static final int WHEEL_UNIT_SCROLL = 0;
/**
* Constant representing scrolling by a "block" (like scrolling
@@ -117,7 +115,7 @@
*
* @see #getScrollType
*/
- public static final int WHEEL_BLOCK_SCROLL = 1;
+ @Native public static final int WHEEL_BLOCK_SCROLL = 1;
/**
* Indicates what sort of scrolling should take place in response to this
--- a/jdk/src/share/classes/java/awt/event/WindowEvent.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/share/classes/java/awt/event/WindowEvent.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
package java.awt.event;
import java.awt.Window;
-import javax.tools.annotation.GenerateNativeHeader;
+import java.lang.annotation.Native;
import sun.awt.AppContext;
import sun.awt.SunToolkit;
@@ -56,8 +56,6 @@
*
* @since JDK1.1
*/
-/* No native methods here, but the constants are needed in the supporting JNI code */
-@GenerateNativeHeader
public class WindowEvent extends ComponentEvent {
/**
@@ -69,7 +67,7 @@
* The window opened event. This event is delivered only
* the first time a window is made visible.
*/
- public static final int WINDOW_OPENED = WINDOW_FIRST; // 200
+ @Native public static final int WINDOW_OPENED = WINDOW_FIRST; // 200
/**
* The "window is closing" event. This event is delivered when
@@ -78,13 +76,13 @@
* while processing this event, the window close operation will be
* cancelled.
*/
- public static final int WINDOW_CLOSING = 1 + WINDOW_FIRST; //Event.WINDOW_DESTROY
+ @Native public static final int WINDOW_CLOSING = 1 + WINDOW_FIRST; //Event.WINDOW_DESTROY
/**
* The window closed event. This event is delivered after
* the window has been closed as the result of a call to dispose.
*/
- public static final int WINDOW_CLOSED = 2 + WINDOW_FIRST;
+ @Native public static final int WINDOW_CLOSED = 2 + WINDOW_FIRST;
/**
* The window iconified event. This event is delivered when
@@ -93,13 +91,13 @@
* the icon specified in the window's iconImage property.
* @see java.awt.Frame#setIconImage
*/
- public static final int WINDOW_ICONIFIED = 3 + WINDOW_FIRST; //Event.WINDOW_ICONIFY
+ @Native public static final int WINDOW_ICONIFIED = 3 + WINDOW_FIRST; //Event.WINDOW_ICONIFY
/**
* The window deiconified event type. This event is delivered when
* the window has been changed from a minimized to a normal state.
*/
- public static final int WINDOW_DEICONIFIED = 4 + WINDOW_FIRST; //Event.WINDOW_DEICONIFY
+ @Native public static final int WINDOW_DEICONIFIED = 4 + WINDOW_FIRST; //Event.WINDOW_DEICONIFY
/**
* The window-activated event type. This event is delivered when the Window
@@ -109,7 +107,7 @@
* active Window is always either the focused Window, or the first Frame or
* Dialog that is an owner of the focused Window.
*/
- public static final int WINDOW_ACTIVATED = 5 + WINDOW_FIRST;
+ @Native public static final int WINDOW_ACTIVATED = 5 + WINDOW_FIRST;
/**
* The window-deactivated event type. This event is delivered when the
@@ -119,21 +117,21 @@
* title bar. The active Window is always either the focused Window, or the
* first Frame or Dialog that is an owner of the focused Window.
*/
- public static final int WINDOW_DEACTIVATED = 6 + WINDOW_FIRST;
+ @Native public static final int WINDOW_DEACTIVATED = 6 + WINDOW_FIRST;
/**
* The window-gained-focus event type. This event is delivered when the
* Window becomes the focused Window, which means that the Window, or one
* of its subcomponents, will receive keyboard events.
*/
- public static final int WINDOW_GAINED_FOCUS = 7 + WINDOW_FIRST;
+ @Native public static final int WINDOW_GAINED_FOCUS = 7 + WINDOW_FIRST;
/**
* The window-lost-focus event type. This event is delivered when a Window
* is no longer the focused Window, which means keyboard events will no
* longer be delivered to the Window or any of its subcomponents.
*/
- public static final int WINDOW_LOST_FOCUS = 8 + WINDOW_FIRST;
+ @Native public static final int WINDOW_LOST_FOCUS = 8 + WINDOW_FIRST;
/**
* The window-state-changed event type. This event is delivered
@@ -141,7 +139,7 @@
* iconified, maximized etc.
* @since 1.4
*/
- public static final int WINDOW_STATE_CHANGED = 9 + WINDOW_FIRST;
+ @Native public static final int WINDOW_STATE_CHANGED = 9 + WINDOW_FIRST;
/**
* The last number in the range of ids used for window events.
--- a/jdk/src/share/classes/java/awt/geom/PathIterator.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/share/classes/java/awt/geom/PathIterator.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2000, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
package java.awt.geom;
-import javax.tools.annotation.GenerateNativeHeader;
+import java.lang.annotation.Native;
/**
* The <code>PathIterator</code> interface provides the mechanism
@@ -59,8 +59,6 @@
*
* @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
@@ -69,7 +67,7 @@
* path if a ray drawn in any direction from that point to
* infinity is crossed by path segments an odd number of times.
*/
- public static final int WIND_EVEN_ODD = 0;
+ @Native public static final int WIND_EVEN_ODD = 0;
/**
* The winding rule constant for specifying a non-zero rule
@@ -80,20 +78,20 @@
* of times in the counter-clockwise direction than the
* clockwise direction.
*/
- public static final int WIND_NON_ZERO = 1;
+ @Native public static final int WIND_NON_ZERO = 1;
/**
* The segment type constant for a point that specifies the
* starting location for a new subpath.
*/
- public static final int SEG_MOVETO = 0;
+ @Native public static final int SEG_MOVETO = 0;
/**
* The segment type constant for a point that specifies the
* end point of a line to be drawn from the most recently
* specified point.
*/
- public static final int SEG_LINETO = 1;
+ @Native public static final int SEG_LINETO = 1;
/**
* The segment type constant for the pair of points that specify
@@ -115,7 +113,7 @@
* = n! / (m! * (n-m)!)
* </pre>
*/
- public static final int SEG_QUADTO = 2;
+ @Native public static final int SEG_QUADTO = 2;
/**
* The segment type constant for the set of 3 points that specify
@@ -139,14 +137,14 @@
* </pre>
* This form of curve is commonly known as a Bézier curve.
*/
- public static final int SEG_CUBICTO = 3;
+ @Native public static final int SEG_CUBICTO = 3;
/**
* The segment type constant that specifies that
* the preceding subpath should be closed by appending a line segment
* back to the point corresponding to the most recent SEG_MOVETO.
*/
- public static final int SEG_CLOSE = 4;
+ @Native public static final int SEG_CLOSE = 4;
/**
* Returns the winding rule for determining the interior of the
--- a/jdk/src/share/classes/java/awt/image/AffineTransformOp.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/share/classes/java/awt/image/AffineTransformOp.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,7 @@
import java.awt.Rectangle;
import java.awt.RenderingHints;
import java.awt.Transparency;
-import javax.tools.annotation.GenerateNativeHeader;
+import java.lang.annotation.Native;
import sun.awt.image.ImagingLib;
/**
@@ -63,8 +63,6 @@
* @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;
@@ -72,17 +70,17 @@
/**
* Nearest-neighbor interpolation type.
*/
- public static final int TYPE_NEAREST_NEIGHBOR = 1;
+ @Native public static final int TYPE_NEAREST_NEIGHBOR = 1;
/**
* Bilinear interpolation type.
*/
- public static final int TYPE_BILINEAR = 2;
+ @Native public static final int TYPE_BILINEAR = 2;
/**
* Bicubic interpolation type.
*/
- public static final int TYPE_BICUBIC = 3;
+ @Native public static final int TYPE_BICUBIC = 3;
int interpolationType = TYPE_NEAREST_NEIGHBOR;
--- a/jdk/src/share/classes/java/awt/image/ConvolveOp.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/share/classes/java/awt/image/ConvolveOp.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2000, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,7 @@
import java.awt.Rectangle;
import java.awt.RenderingHints;
import java.awt.geom.Point2D;
-import javax.tools.annotation.GenerateNativeHeader;
+import java.lang.annotation.Native;
import sun.awt.image.ImagingLib;
/**
@@ -66,8 +66,6 @@
* @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;
@@ -81,13 +79,13 @@
* is the default.
*/
- public static final int EDGE_ZERO_FILL = 0;
+ @Native public static final int EDGE_ZERO_FILL = 0;
/**
* Pixels at the edge of the source image are copied to
* the corresponding pixels in the destination without modification.
*/
- public static final int EDGE_NO_OP = 1;
+ @Native public static final int EDGE_NO_OP = 1;
/**
* Constructs a ConvolveOp given a Kernel, an edge condition, and a
--- a/jdk/src/share/classes/java/awt/image/DataBuffer.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/share/classes/java/awt/image/DataBuffer.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -41,7 +41,7 @@
import sun.awt.image.SunWritableRaster;
-import javax.tools.annotation.GenerateNativeHeader;
+import java.lang.annotation.Native;
/**
* This class exists to wrap one or more data arrays. Each data array in
@@ -67,30 +67,28 @@
* @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. */
- public static final int TYPE_BYTE = 0;
+ @Native public static final int TYPE_BYTE = 0;
/** Tag for unsigned short data. */
- public static final int TYPE_USHORT = 1;
+ @Native public static final int TYPE_USHORT = 1;
/** Tag for signed short data. Placeholder for future use. */
- public static final int TYPE_SHORT = 2;
+ @Native public static final int TYPE_SHORT = 2;
/** Tag for int data. */
- public static final int TYPE_INT = 3;
+ @Native public static final int TYPE_INT = 3;
/** Tag for float data. Placeholder for future use. */
- public static final int TYPE_FLOAT = 4;
+ @Native public static final int TYPE_FLOAT = 4;
/** Tag for double data. Placeholder for future use. */
- public static final int TYPE_DOUBLE = 5;
+ @Native public static final int TYPE_DOUBLE = 5;
/** Tag for undefined data. */
- public static final int TYPE_UNDEFINED = 32;
+ @Native public static final int TYPE_UNDEFINED = 32;
/** The data type of this DataBuffer. */
protected int dataType;
--- a/jdk/src/share/classes/java/awt/image/ImageConsumer.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/share/classes/java/awt/image/ImageConsumer.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@
import java.util.Hashtable;
-import javax.tools.annotation.GenerateNativeHeader;
/**
* The interface for objects expressing interest in image data through
@@ -39,8 +38,6 @@
*
* @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
--- a/jdk/src/share/classes/java/awt/image/ImageObserver.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/share/classes/java/awt/image/ImageObserver.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 1999, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@
import java.awt.Image;
-import javax.tools.annotation.GenerateNativeHeader;
/**
* An asynchronous update interface for receiving notifications about
@@ -35,8 +34,6 @@
*
* @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
--- a/jdk/src/share/classes/java/awt/peer/ComponentPeer.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/share/classes/java/awt/peer/ComponentPeer.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,6 @@
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;
@@ -50,8 +49,6 @@
* 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 {
/**
--- a/jdk/src/share/classes/java/awt/print/PageFormat.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/share/classes/java/awt/print/PageFormat.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2000, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,14 +29,12 @@
import java.awt.geom.Point2D;
import java.awt.geom.Rectangle2D;
-import javax.tools.annotation.GenerateNativeHeader;
+import java.lang.annotation.Native;
/**
* 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
{
@@ -48,21 +46,21 @@
* Note that this is not the Macintosh landscape but
* is the Window's and PostScript landscape.
*/
- public static final int LANDSCAPE = 0;
+ @Native public static final int LANDSCAPE = 0;
/**
* The origin is at the top left of the paper with
* x running to the right and y running down the
* paper.
*/
- public static final int PORTRAIT = 1;
+ @Native public static final int PORTRAIT = 1;
/**
* The origin is at the top right of the paper with x
* running top to bottom and y running right to left.
* Note that this is the Macintosh landscape.
*/
- public static final int REVERSE_LANDSCAPE = 2;
+ @Native public static final int REVERSE_LANDSCAPE = 2;
/* Instance Variables */
--- a/jdk/src/share/classes/java/awt/print/Pageable.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/share/classes/java/awt/print/Pageable.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2000, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
package java.awt.print;
-import javax.tools.annotation.GenerateNativeHeader;
+import java.lang.annotation.Native;
/**
* The <code>Pageable</code> implementation represents a set of
@@ -35,8 +35,6 @@
* @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 {
/**
@@ -45,7 +43,7 @@
* method if a <code>Pageable</code> implementation does not know
* the number of pages in its set.
*/
- int UNKNOWN_NUMBER_OF_PAGES = -1;
+ @Native int UNKNOWN_NUMBER_OF_PAGES = -1;
/**
* Returns the number of pages in the set.
--- a/jdk/src/share/classes/java/awt/print/Printable.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/share/classes/java/awt/print/Printable.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@
import java.awt.Graphics;
-import javax.tools.annotation.GenerateNativeHeader;
/**
* The <code>Printable</code> interface is implemented
@@ -100,8 +99,6 @@
* @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 {
/**
--- a/jdk/src/share/classes/sun/awt/EmbeddedFrame.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/share/classes/sun/awt/EmbeddedFrame.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,6 @@
import java.util.Set;
import java.awt.AWTKeyStroke;
import java.applet.Applet;
-import javax.tools.annotation.GenerateNativeHeader;
import sun.applet.AppletPanel;
/**
@@ -54,8 +53,6 @@
*
* @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 {
--- a/jdk/src/share/classes/sun/awt/SunHints.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/share/classes/sun/awt/SunHints.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
package sun.awt;
import java.awt.RenderingHints;
-import javax.tools.annotation.GenerateNativeHeader;
+import java.lang.annotation.Native;
/**
* This class contains rendering hints that can be used by the
@@ -34,8 +34,6 @@
* {@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
@@ -180,86 +178,86 @@
/**
* Rendering hint key and values
*/
- public static final int INTKEY_RENDERING = 0;
- public static final int INTVAL_RENDER_DEFAULT = 0;
- public static final int INTVAL_RENDER_SPEED = 1;
- public static final int INTVAL_RENDER_QUALITY = 2;
+ @Native public static final int INTKEY_RENDERING = 0;
+ @Native public static final int INTVAL_RENDER_DEFAULT = 0;
+ @Native public static final int INTVAL_RENDER_SPEED = 1;
+ @Native public static final int INTVAL_RENDER_QUALITY = 2;
/**
* Antialiasing hint key and values
*/
- public static final int INTKEY_ANTIALIASING = 1;
- public static final int INTVAL_ANTIALIAS_DEFAULT = 0;
- public static final int INTVAL_ANTIALIAS_OFF = 1;
- public static final int INTVAL_ANTIALIAS_ON = 2;
+ @Native public static final int INTKEY_ANTIALIASING = 1;
+ @Native public static final int INTVAL_ANTIALIAS_DEFAULT = 0;
+ @Native public static final int INTVAL_ANTIALIAS_OFF = 1;
+ @Native public static final int INTVAL_ANTIALIAS_ON = 2;
/**
* Text antialiasing hint key and values
*/
- public static final int INTKEY_TEXT_ANTIALIASING = 2;
- public static final int INTVAL_TEXT_ANTIALIAS_DEFAULT = 0;
- public static final int INTVAL_TEXT_ANTIALIAS_OFF = 1;
- public static final int INTVAL_TEXT_ANTIALIAS_ON = 2;
- public static final int INTVAL_TEXT_ANTIALIAS_GASP = 3;
- public static final int INTVAL_TEXT_ANTIALIAS_LCD_HRGB = 4;
- public static final int INTVAL_TEXT_ANTIALIAS_LCD_HBGR = 5;
- public static final int INTVAL_TEXT_ANTIALIAS_LCD_VRGB = 6;
- public static final int INTVAL_TEXT_ANTIALIAS_LCD_VBGR = 7;
+ @Native public static final int INTKEY_TEXT_ANTIALIASING = 2;
+ @Native public static final int INTVAL_TEXT_ANTIALIAS_DEFAULT = 0;
+ @Native public static final int INTVAL_TEXT_ANTIALIAS_OFF = 1;
+ @Native public static final int INTVAL_TEXT_ANTIALIAS_ON = 2;
+ @Native public static final int INTVAL_TEXT_ANTIALIAS_GASP = 3;
+ @Native public static final int INTVAL_TEXT_ANTIALIAS_LCD_HRGB = 4;
+ @Native public static final int INTVAL_TEXT_ANTIALIAS_LCD_HBGR = 5;
+ @Native public static final int INTVAL_TEXT_ANTIALIAS_LCD_VRGB = 6;
+ @Native public static final int INTVAL_TEXT_ANTIALIAS_LCD_VBGR = 7;
/**
* Font fractional metrics hint key and values
*/
- public static final int INTKEY_FRACTIONALMETRICS = 3;
- public static final int INTVAL_FRACTIONALMETRICS_DEFAULT = 0;
- public static final int INTVAL_FRACTIONALMETRICS_OFF = 1;
- public static final int INTVAL_FRACTIONALMETRICS_ON = 2;
+ @Native public static final int INTKEY_FRACTIONALMETRICS = 3;
+ @Native public static final int INTVAL_FRACTIONALMETRICS_DEFAULT = 0;
+ @Native public static final int INTVAL_FRACTIONALMETRICS_OFF = 1;
+ @Native public static final int INTVAL_FRACTIONALMETRICS_ON = 2;
/**
* Dithering hint key and values
*/
- public static final int INTKEY_DITHERING = 4;
- public static final int INTVAL_DITHER_DEFAULT = 0;
- public static final int INTVAL_DITHER_DISABLE = 1;
- public static final int INTVAL_DITHER_ENABLE = 2;
+ @Native public static final int INTKEY_DITHERING = 4;
+ @Native public static final int INTVAL_DITHER_DEFAULT = 0;
+ @Native public static final int INTVAL_DITHER_DISABLE = 1;
+ @Native public static final int INTVAL_DITHER_ENABLE = 2;
/**
* Interpolation hint key and values
*/
- public static final int INTKEY_INTERPOLATION = 5;
- public static final int INTVAL_INTERPOLATION_NEAREST_NEIGHBOR = 0;
- public static final int INTVAL_INTERPOLATION_BILINEAR = 1;
- public static final int INTVAL_INTERPOLATION_BICUBIC = 2;
+ @Native public static final int INTKEY_INTERPOLATION = 5;
+ @Native public static final int INTVAL_INTERPOLATION_NEAREST_NEIGHBOR = 0;
+ @Native public static final int INTVAL_INTERPOLATION_BILINEAR = 1;
+ @Native public static final int INTVAL_INTERPOLATION_BICUBIC = 2;
/**
* Alpha interpolation hint key and values
*/
- public static final int INTKEY_ALPHA_INTERPOLATION = 6;
- public static final int INTVAL_ALPHA_INTERPOLATION_DEFAULT = 0;
- public static final int INTVAL_ALPHA_INTERPOLATION_SPEED = 1;
- public static final int INTVAL_ALPHA_INTERPOLATION_QUALITY = 2;
+ @Native public static final int INTKEY_ALPHA_INTERPOLATION = 6;
+ @Native public static final int INTVAL_ALPHA_INTERPOLATION_DEFAULT = 0;
+ @Native public static final int INTVAL_ALPHA_INTERPOLATION_SPEED = 1;
+ @Native public static final int INTVAL_ALPHA_INTERPOLATION_QUALITY = 2;
/**
* Color rendering hint key and values
*/
- public static final int INTKEY_COLOR_RENDERING = 7;
- public static final int INTVAL_COLOR_RENDER_DEFAULT = 0;
- public static final int INTVAL_COLOR_RENDER_SPEED = 1;
- public static final int INTVAL_COLOR_RENDER_QUALITY = 2;
+ @Native public static final int INTKEY_COLOR_RENDERING = 7;
+ @Native public static final int INTVAL_COLOR_RENDER_DEFAULT = 0;
+ @Native public static final int INTVAL_COLOR_RENDER_SPEED = 1;
+ @Native public static final int INTVAL_COLOR_RENDER_QUALITY = 2;
/**
* Stroke normalization control hint key and values
*/
- public static final int INTKEY_STROKE_CONTROL = 8;
- public static final int INTVAL_STROKE_DEFAULT = 0;
- public static final int INTVAL_STROKE_NORMALIZE = 1;
- public static final int INTVAL_STROKE_PURE = 2;
+ @Native public static final int INTKEY_STROKE_CONTROL = 8;
+ @Native public static final int INTVAL_STROKE_DEFAULT = 0;
+ @Native public static final int INTVAL_STROKE_NORMALIZE = 1;
+ @Native public static final int INTVAL_STROKE_PURE = 2;
/**
* LCD text contrast control hint key.
* Value is "100" to make discontiguous with the others which
* are all enumerative and are of a different class.
*/
- public static final int INTKEY_AATEXT_LCD_CONTRAST = 100;
+ @Native public static final int INTKEY_AATEXT_LCD_CONTRAST = 100;
/**
* Rendering hint key and value objects
--- a/jdk/src/share/classes/sun/awt/dnd/SunDragSourceContextPeer.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/share/classes/sun/awt/dnd/SunDragSourceContextPeer.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -54,7 +54,6 @@
import sun.awt.datatransfer.DataTransferer;
import java.awt.datatransfer.DataFlavor;
-import javax.tools.annotation.GenerateNativeHeader;
/**
* <p>
@@ -64,8 +63,6 @@
* @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;
--- a/jdk/src/share/classes/sun/awt/image/BufImgSurfaceData.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/share/classes/sun/awt/image/BufImgSurfaceData.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -45,10 +45,7 @@
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;
--- a/jdk/src/share/classes/sun/font/FontManager.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/share/classes/sun/font/FontManager.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -32,14 +32,11 @@
import javax.swing.plaf.FontUIResource;
-import javax.tools.annotation.GenerateNativeHeader;
/**
* Interface between Java Fonts (java.awt.Font) and the underlying
* font files/native font resources and the Java and native font scalers.
*/
-/* No native methods here, but the constants are needed in the supporting JNI code */
-@GenerateNativeHeader
public interface FontManager {
// These constants are used in findFont().
--- a/jdk/src/share/classes/sun/java2d/SunGraphics2D.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/share/classes/sun/java2d/SunGraphics2D.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -92,7 +92,7 @@
import sun.java2d.DestSurfaceProvider;
import sun.misc.PerformanceLogger;
-import javax.tools.annotation.GenerateNativeHeader;
+import java.lang.annotation.Native;
/**
* This is a the master Graphics2D superclass for all of the Sun
@@ -103,8 +103,6 @@
*
* @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
@@ -113,18 +111,29 @@
* Attribute States
*/
/* Paint */
+ @Native
public static final int PAINT_CUSTOM = 6; /* Any other Paint object */
+ @Native
public static final int PAINT_TEXTURE = 5; /* Tiled Image */
+ @Native
public static final int PAINT_RAD_GRADIENT = 4; /* Color RadialGradient */
+ @Native
public static final int PAINT_LIN_GRADIENT = 3; /* Color LinearGradient */
+ @Native
public static final int PAINT_GRADIENT = 2; /* Color Gradient */
+ @Native
public static final int PAINT_ALPHACOLOR = 1; /* Non-opaque Color */
+ @Native
public static final int PAINT_OPAQUECOLOR = 0; /* Opaque Color */
/* Composite*/
+ @Native
public static final int COMP_CUSTOM = 3;/* Custom Composite */
+ @Native
public static final int COMP_XOR = 2;/* XOR Mode Composite */
+ @Native
public static final int COMP_ALPHA = 1;/* AlphaComposite */
+ @Native
public static final int COMP_ISCOPY = 0;/* simple stores into destination,
* i.e. Src, SrcOverNoEa, and other
* alpha modes which replace
@@ -132,21 +141,33 @@
*/
/* Stroke */
+ @Native
public static final int STROKE_CUSTOM = 3; /* custom Stroke */
+ @Native
public static final int STROKE_WIDE = 2; /* BasicStroke */
+ @Native
public static final int STROKE_THINDASHED = 1; /* BasicStroke */
+ @Native
public static final int STROKE_THIN = 0; /* BasicStroke */
/* Transform */
+ @Native
public static final int TRANSFORM_GENERIC = 4; /* any 3x2 */
+ @Native
public static final int TRANSFORM_TRANSLATESCALE = 3; /* scale XY */
+ @Native
public static final int TRANSFORM_ANY_TRANSLATE = 2; /* non-int translate */
+ @Native
public static final int TRANSFORM_INT_TRANSLATE = 1; /* int translate */
+ @Native
public static final int TRANSFORM_ISIDENT = 0; /* Identity */
/* Clipping */
+ @Native
public static final int CLIP_SHAPE = 2; /* arbitrary clip */
+ @Native
public static final int CLIP_RECTANGULAR = 1; /* rectangular clip */
+ @Native
public static final int CLIP_DEVICE = 0; /* no clipping set */
/* The following fields are used when the current Paint is a Color. */
--- a/jdk/src/share/classes/sun/java2d/opengl/OGLBlitLoops.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/share/classes/sun/java2d/opengl/OGLBlitLoops.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -45,10 +45,8 @@
import sun.java2d.pipe.RenderBuffer;
import sun.java2d.pipe.RenderQueue;
import static sun.java2d.pipe.BufferedOpCodes.*;
-import javax.tools.annotation.GenerateNativeHeader;
+import java.lang.annotation.Native;
-/* No native methods here, but the constants are needed in the supporting JNI code */
-@GenerateNativeHeader
class OGLBlitLoops {
static void register() {
@@ -190,12 +188,12 @@
* createPackedParams(). (They are also used at the native level when
* unpacking the params.)
*/
- private static final int OFFSET_SRCTYPE = 16;
- private static final int OFFSET_HINT = 8;
- private static final int OFFSET_TEXTURE = 3;
- private static final int OFFSET_RTT = 2;
- private static final int OFFSET_XFORM = 1;
- private static final int OFFSET_ISOBLIT = 0;
+ @Native private static final int OFFSET_SRCTYPE = 16;
+ @Native private static final int OFFSET_HINT = 8;
+ @Native private static final int OFFSET_TEXTURE = 3;
+ @Native private static final int OFFSET_RTT = 2;
+ @Native private static final int OFFSET_XFORM = 1;
+ @Native private static final int OFFSET_ISOBLIT = 0;
/**
* Packs the given parameters into a single int value in order to save
--- a/jdk/src/share/classes/sun/java2d/opengl/OGLContext.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/share/classes/sun/java2d/opengl/OGLContext.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,7 @@
import static sun.java2d.pipe.BufferedOpCodes.*;
import static sun.java2d.pipe.hw.ContextCapabilities.*;
-import javax.tools.annotation.GenerateNativeHeader;
+import java.lang.annotation.Native;
/**
* Note that the RenderQueue lock must be acquired before calling any of
@@ -155,40 +155,38 @@
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.
* This cap will only be set if the fbobject system property has been
* enabled and we are able to create an FBO with depth buffer.
*/
- static final int CAPS_EXT_FBOBJECT =
+ @Native static final int CAPS_EXT_FBOBJECT =
(CAPS_RT_TEXTURE_ALPHA | CAPS_RT_TEXTURE_OPAQUE);
/** Indicates that the context supports a stored alpha channel. */
- static final int CAPS_STORED_ALPHA = CAPS_RT_PLAIN_ALPHA;
+ @Native static final int CAPS_STORED_ALPHA = CAPS_RT_PLAIN_ALPHA;
/** Indicates that the context is doublebuffered. */
- static final int CAPS_DOUBLEBUFFERED = (FIRST_PRIVATE_CAP << 0);
+ @Native static final int CAPS_DOUBLEBUFFERED = (FIRST_PRIVATE_CAP << 0);
/**
* Indicates the presence of the GL_ARB_fragment_shader extension.
* This cap will only be set if the lcdshader system property has been
* enabled and the hardware supports the minimum number of texture units
*/
- static final int CAPS_EXT_LCD_SHADER = (FIRST_PRIVATE_CAP << 1);
+ @Native static final int CAPS_EXT_LCD_SHADER = (FIRST_PRIVATE_CAP << 1);
/**
* Indicates the presence of the GL_ARB_fragment_shader extension.
* This cap will only be set if the biopshader system property has been
* enabled and the hardware meets our minimum requirements.
*/
- static final int CAPS_EXT_BIOP_SHADER = (FIRST_PRIVATE_CAP << 2);
+ @Native static final int CAPS_EXT_BIOP_SHADER = (FIRST_PRIVATE_CAP << 2);
/**
* Indicates the presence of the GL_ARB_fragment_shader extension.
* This cap will only be set if the gradshader system property has been
* enabled and the hardware meets our minimum requirements.
*/
- static final int CAPS_EXT_GRAD_SHADER = (FIRST_PRIVATE_CAP << 3);
+ @Native static final int CAPS_EXT_GRAD_SHADER = (FIRST_PRIVATE_CAP << 3);
/** Indicates the presence of the GL_ARB_texture_rectangle extension. */
- static final int CAPS_EXT_TEXRECT = (FIRST_PRIVATE_CAP << 4);
+ @Native static final int CAPS_EXT_TEXRECT = (FIRST_PRIVATE_CAP << 4);
OGLContextCaps(int caps, String adapterId) {
super(caps, adapterId);
--- a/jdk/src/share/classes/sun/java2d/pipe/BufferedContext.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/share/classes/sun/java2d/pipe/BufferedContext.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -37,7 +37,7 @@
import static sun.java2d.pipe.BufferedOpCodes.*;
import static sun.java2d.pipe.BufferedRenderPipe.BYTES_PER_SPAN;
-import javax.tools.annotation.GenerateNativeHeader;
+import java.lang.annotation.Native;
/**
* Base context class for managing state in a single-threaded rendering
@@ -49,8 +49,6 @@
*
* @see RenderQueue
*/
-/* No native methods here, but the constants are needed in the supporting JNI code */
-@GenerateNativeHeader
public abstract class BufferedContext {
/*
@@ -63,19 +61,19 @@
/**
* Indicates that no flags are needed; take all default code paths.
*/
- public static final int NO_CONTEXT_FLAGS = (0 << 0);
+ @Native public static final int NO_CONTEXT_FLAGS = (0 << 0);
/**
* Indicates that the source surface (or color value, if it is a simple
* rendering operation) is opaque (has an alpha value of 1.0). If this
* flag is present, it allows us to disable blending in certain
* situations in order to improve performance.
*/
- public static final int SRC_IS_OPAQUE = (1 << 0);
+ @Native public static final int SRC_IS_OPAQUE = (1 << 0);
/**
* Indicates that the operation uses an alpha mask, which may determine
* the code path that is used when setting up the current paint state.
*/
- public static final int USE_MASK = (1 << 1);
+ @Native public static final int USE_MASK = (1 << 1);
protected RenderQueue rq;
protected RenderBuffer buf;
--- a/jdk/src/share/classes/sun/java2d/pipe/BufferedOpCodes.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/share/classes/sun/java2d/pipe/BufferedOpCodes.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,79 +25,77 @@
package sun.java2d.pipe;
-import javax.tools.annotation.GenerateNativeHeader;
+import java.lang.annotation.Native;
-/* 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;
- public static final int DRAW_RECT = 11;
- public static final int DRAW_POLY = 12;
- public static final int DRAW_PIXEL = 13;
- public static final int DRAW_SCANLINES = 14;
- public static final int DRAW_PARALLELOGRAM = 15;
- public static final int DRAW_AAPARALLELOGRAM = 16;
+ @Native public static final int DRAW_LINE = 10;
+ @Native public static final int DRAW_RECT = 11;
+ @Native public static final int DRAW_POLY = 12;
+ @Native public static final int DRAW_PIXEL = 13;
+ @Native public static final int DRAW_SCANLINES = 14;
+ @Native public static final int DRAW_PARALLELOGRAM = 15;
+ @Native public static final int DRAW_AAPARALLELOGRAM = 16;
// fill ops
- public static final int FILL_RECT = 20;
- public static final int FILL_SPANS = 21;
- public static final int FILL_PARALLELOGRAM = 22;
- public static final int FILL_AAPARALLELOGRAM = 23;
+ @Native public static final int FILL_RECT = 20;
+ @Native public static final int FILL_SPANS = 21;
+ @Native public static final int FILL_PARALLELOGRAM = 22;
+ @Native public static final int FILL_AAPARALLELOGRAM = 23;
// copy-related ops
- public static final int COPY_AREA = 30;
- public static final int BLIT = 31;
- public static final int MASK_FILL = 32;
- public static final int MASK_BLIT = 33;
- public static final int SURFACE_TO_SW_BLIT = 34;
+ @Native public static final int COPY_AREA = 30;
+ @Native public static final int BLIT = 31;
+ @Native public static final int MASK_FILL = 32;
+ @Native public static final int MASK_BLIT = 33;
+ @Native public static final int SURFACE_TO_SW_BLIT = 34;
// text-related ops
- public static final int DRAW_GLYPH_LIST = 40;
+ @Native public static final int DRAW_GLYPH_LIST = 40;
// state-related ops
- public static final int SET_RECT_CLIP = 51;
- public static final int BEGIN_SHAPE_CLIP = 52;
- public static final int SET_SHAPE_CLIP_SPANS = 53;
- public static final int END_SHAPE_CLIP = 54;
- public static final int RESET_CLIP = 55;
- public static final int SET_ALPHA_COMPOSITE = 56;
- public static final int SET_XOR_COMPOSITE = 57;
- public static final int RESET_COMPOSITE = 58;
- public static final int SET_TRANSFORM = 59;
- public static final int RESET_TRANSFORM = 60;
+ @Native public static final int SET_RECT_CLIP = 51;
+ @Native public static final int BEGIN_SHAPE_CLIP = 52;
+ @Native public static final int SET_SHAPE_CLIP_SPANS = 53;
+ @Native public static final int END_SHAPE_CLIP = 54;
+ @Native public static final int RESET_CLIP = 55;
+ @Native public static final int SET_ALPHA_COMPOSITE = 56;
+ @Native public static final int SET_XOR_COMPOSITE = 57;
+ @Native public static final int RESET_COMPOSITE = 58;
+ @Native public static final int SET_TRANSFORM = 59;
+ @Native public static final int RESET_TRANSFORM = 60;
// context-related ops
- public static final int SET_SURFACES = 70;
- public static final int SET_SCRATCH_SURFACE = 71;
- public static final int FLUSH_SURFACE = 72;
- public static final int DISPOSE_SURFACE = 73;
- public static final int DISPOSE_CONFIG = 74;
- public static final int INVALIDATE_CONTEXT = 75;
- public static final int SYNC = 76;
- public static final int RESTORE_DEVICES = 77;
- public static final int SAVE_STATE = 78;
- public static final int RESTORE_STATE = 79;
+ @Native public static final int SET_SURFACES = 70;
+ @Native public static final int SET_SCRATCH_SURFACE = 71;
+ @Native public static final int FLUSH_SURFACE = 72;
+ @Native public static final int DISPOSE_SURFACE = 73;
+ @Native public static final int DISPOSE_CONFIG = 74;
+ @Native public static final int INVALIDATE_CONTEXT = 75;
+ @Native public static final int SYNC = 76;
+ @Native public static final int RESTORE_DEVICES = 77;
+ @Native public static final int SAVE_STATE = 78;
+ @Native public static final int RESTORE_STATE = 79;
// multibuffering ops
- public static final int SWAP_BUFFERS = 80;
+ @Native public static final int SWAP_BUFFERS = 80;
// special no-op op code (mainly used for achieving 8-byte alignment)
- public static final int NOOP = 90;
+ @Native public static final int NOOP = 90;
// paint-related ops
- public static final int RESET_PAINT = 100;
- public static final int SET_COLOR = 101;
- public static final int SET_GRADIENT_PAINT = 102;
- public static final int SET_LINEAR_GRADIENT_PAINT = 103;
- public static final int SET_RADIAL_GRADIENT_PAINT = 104;
- public static final int SET_TEXTURE_PAINT = 105;
+ @Native public static final int RESET_PAINT = 100;
+ @Native public static final int SET_COLOR = 101;
+ @Native public static final int SET_GRADIENT_PAINT = 102;
+ @Native public static final int SET_LINEAR_GRADIENT_PAINT = 103;
+ @Native public static final int SET_RADIAL_GRADIENT_PAINT = 104;
+ @Native public static final int SET_TEXTURE_PAINT = 105;
// BufferedImageOp-related ops
- public static final int ENABLE_CONVOLVE_OP = 120;
- public static final int DISABLE_CONVOLVE_OP = 121;
- public static final int ENABLE_RESCALE_OP = 122;
- public static final int DISABLE_RESCALE_OP = 123;
- public static final int ENABLE_LOOKUP_OP = 124;
- public static final int DISABLE_LOOKUP_OP = 125;
+ @Native public static final int ENABLE_CONVOLVE_OP = 120;
+ @Native public static final int DISABLE_CONVOLVE_OP = 121;
+ @Native public static final int ENABLE_RESCALE_OP = 122;
+ @Native public static final int DISABLE_RESCALE_OP = 123;
+ @Native public static final int ENABLE_LOOKUP_OP = 124;
+ @Native public static final int DISABLE_LOOKUP_OP = 125;
}
--- a/jdk/src/share/classes/sun/java2d/pipe/BufferedPaints.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/share/classes/sun/java2d/pipe/BufferedPaints.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -46,10 +46,8 @@
import sun.java2d.loops.SurfaceType;
import static sun.java2d.pipe.BufferedOpCodes.*;
-import javax.tools.annotation.GenerateNativeHeader;
+import java.lang.annotation.Native;
-/* 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,
@@ -304,7 +302,7 @@
* shaders. So for now we will cap this value at 12, but we can
* re-evaluate this in the future as hardware becomes more capable.
*/
- public static final int MULTI_MAX_FRACTIONS = 12;
+ @Native public static final int MULTI_MAX_FRACTIONS = 12;
/**
* Helper function to convert a color component in sRGB space to
--- a/jdk/src/share/classes/sun/java2d/pipe/BufferedTextPipe.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/share/classes/sun/java2d/pipe/BufferedTextPipe.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -32,24 +32,22 @@
import sun.java2d.SurfaceData;
import static sun.java2d.pipe.BufferedOpCodes.*;
-import javax.tools.annotation.GenerateNativeHeader;
+import java.lang.annotation.Native;
-/* 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;
- private static final int BYTES_PER_GLYPH_POSITION = 8;
+ @Native private static final int BYTES_PER_GLYPH_IMAGE = 8;
+ @Native private static final int BYTES_PER_GLYPH_POSITION = 8;
/**
* The following offsets are used to pack the parameters in
* createPackedParams(). (They are also used at the native level when
* unpacking the params.)
*/
- private static final int OFFSET_CONTRAST = 8;
- private static final int OFFSET_RGBORDER = 2;
- private static final int OFFSET_SUBPIXPOS = 1;
- private static final int OFFSET_POSITIONS = 0;
+ @Native private static final int OFFSET_CONTRAST = 8;
+ @Native private static final int OFFSET_RGBORDER = 2;
+ @Native private static final int OFFSET_SUBPIXPOS = 1;
+ @Native private static final int OFFSET_POSITIONS = 0;
/**
* Packs the given parameters into a single int value in order to save
--- a/jdk/src/share/classes/sun/java2d/pipe/RenderBuffer.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/share/classes/sun/java2d/pipe/RenderBuffer.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@
import sun.misc.Unsafe;
-import javax.tools.annotation.GenerateNativeHeader;
/**
* The RenderBuffer class is a simplified, high-performance, Unsafe wrapper
@@ -44,8 +43,6 @@
* 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 {
/**
--- a/jdk/src/share/classes/sun/java2d/pipe/hw/AccelDeviceEventNotifier.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/share/classes/sun/java2d/pipe/hw/AccelDeviceEventNotifier.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -30,16 +30,13 @@
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
-import javax.tools.annotation.GenerateNativeHeader;
+import java.lang.annotation.Native;
-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;
@@ -49,13 +46,13 @@
* resources associated with the device which are required for the device
* to be reset.
*/
- public static final int DEVICE_RESET = 0;
+ @Native public static final int DEVICE_RESET = 0;
/**
* A device is about to be disposed. The listeners have to release all
* resources associated with the device.
*/
- public static final int DEVICE_DISPOSED = 1;
+ @Native public static final int DEVICE_DISPOSED = 1;
private final Map<AccelDeviceEventListener, Integer> listeners;
--- a/jdk/src/share/classes/sun/java2d/pipe/hw/AccelSurface.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/share/classes/sun/java2d/pipe/hw/AccelSurface.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -28,41 +28,39 @@
import java.awt.Rectangle;
import sun.java2d.Surface;
-import javax.tools.annotation.GenerateNativeHeader;
+import java.lang.annotation.Native;
/**
* 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
*/
- public static final int UNDEFINED = 0;
+ @Native public static final int UNDEFINED = 0;
/**
* Window (or window substitute) surface
*/
- public static final int WINDOW = 1;
+ @Native public static final int WINDOW = 1;
/**
* Render-To Plain surface (pbuffer for OpenGL, Render Target surface
* for Direct3D)
*/
- public static final int RT_PLAIN = 2;
+ @Native public static final int RT_PLAIN = 2;
/**
* Texture surface
*/
- public static final int TEXTURE = 3;
+ @Native public static final int TEXTURE = 3;
/**
* A back-buffer surface (SwapChain surface for Direct3D, backbuffer for
* OpenGL)
*/
- public static final int FLIP_BACKBUFFER = 4;
+ @Native public static final int FLIP_BACKBUFFER = 4;
/**
* Render-To Texture surface (fbobject for OpenGL, texture with render-to
* attribute for Direct3D)
*/
- public static final int RT_TEXTURE = 5;
+ @Native public static final int RT_TEXTURE = 5;
/**
* Returns {@code int} representing surface's type as defined by constants
--- a/jdk/src/share/classes/sun/java2d/pipe/hw/ContextCapabilities.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/share/classes/sun/java2d/pipe/hw/ContextCapabilities.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@
package sun.java2d.pipe.hw;
-import javax.tools.annotation.GenerateNativeHeader;
/**
* Represents a set of capabilities of a BufferedContext and associated
@@ -33,8 +32,6 @@
*
* @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);
--- a/jdk/src/share/classes/sun/nio/ch/DatagramChannelImpl.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/share/classes/sun/nio/ch/DatagramChannelImpl.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -32,15 +32,12 @@
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
--- a/jdk/src/share/classes/sun/nio/ch/sctp/SctpStdSocketOption.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/share/classes/sun/nio/ch/sctp/SctpStdSocketOption.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,21 +25,19 @@
package sun.nio.ch.sctp;
import com.sun.nio.sctp.SctpSocketOption;
-import javax.tools.annotation.GenerateNativeHeader;
+import java.lang.annotation.Native;
-/* No native methods here, but the constants are needed in the supporting JNI code */
-@GenerateNativeHeader
public class SctpStdSocketOption<T>
implements SctpSocketOption<T>
{
/* for native mapping of int options */
- public static final int SCTP_DISABLE_FRAGMENTS = 1;
- public static final int SCTP_EXPLICIT_COMPLETE = 2;
- public static final int SCTP_FRAGMENT_INTERLEAVE = 3;
- public static final int SCTP_NODELAY = 4;
- public static final int SO_SNDBUF = 5;
- public static final int SO_RCVBUF = 6;
- public static final int SO_LINGER = 7;
+ @Native public static final int SCTP_DISABLE_FRAGMENTS = 1;
+ @Native public static final int SCTP_EXPLICIT_COMPLETE = 2;
+ @Native public static final int SCTP_FRAGMENT_INTERLEAVE = 3;
+ @Native public static final int SCTP_NODELAY = 4;
+ @Native public static final int SO_SNDBUF = 5;
+ @Native public static final int SO_RCVBUF = 6;
+ @Native public static final int SO_LINGER = 7;
private final String name;
private final Class<T> type;
--- a/jdk/src/share/classes/sun/security/pkcs11/Secmod.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/share/classes/sun/security/pkcs11/Secmod.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -35,7 +35,6 @@
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
@@ -57,8 +56,6 @@
* @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;
--- a/jdk/src/share/classes/sun/security/pkcs11/wrapper/PKCS11.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/share/classes/sun/security/pkcs11/wrapper/PKCS11.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
*/
/* Copyright (c) 2002 Graz University of Technology. All rights reserved.
@@ -55,7 +55,6 @@
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
@@ -68,8 +67,6 @@
* @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 {
/**
--- a/jdk/src/solaris/classes/sun/awt/X11/XComponentPeer.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/solaris/classes/sun/awt/X11/XComponentPeer.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -70,10 +70,7 @@
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
{
--- a/jdk/src/solaris/classes/sun/nio/ch/sctp/AssociationChange.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/solaris/classes/sun/nio/ch/sctp/AssociationChange.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,22 +26,20 @@
import com.sun.nio.sctp.Association;
import com.sun.nio.sctp.AssociationChangeNotification;
-import javax.tools.annotation.GenerateNativeHeader;
+import java.lang.annotation.Native;
/**
* An implementation of AssociationChangeNotification
*/
-/* No native methods here, but the constants are needed in the supporting JNI code */
-@GenerateNativeHeader
public class AssociationChange extends AssociationChangeNotification
implements SctpNotification
{
/* static final ints so that they can be referenced from native */
- private final static int SCTP_COMM_UP = 1;
- private final static int SCTP_COMM_LOST = 2;
- private final static int SCTP_RESTART = 3;
- private final static int SCTP_SHUTDOWN = 4;
- private final static int SCTP_CANT_START = 5;
+ @Native private final static int SCTP_COMM_UP = 1;
+ @Native private final static int SCTP_COMM_LOST = 2;
+ @Native private final static int SCTP_RESTART = 3;
+ @Native private final static int SCTP_SHUTDOWN = 4;
+ @Native private final static int SCTP_CANT_START = 5;
private Association association;
--- a/jdk/src/solaris/classes/sun/nio/ch/sctp/PeerAddrChange.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/solaris/classes/sun/nio/ch/sctp/PeerAddrChange.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,23 +27,21 @@
import java.net.SocketAddress;
import com.sun.nio.sctp.Association;
import com.sun.nio.sctp.PeerAddressChangeNotification;
-import javax.tools.annotation.GenerateNativeHeader;
+import java.lang.annotation.Native;
/**
* An implementation of PeerAddressChangeNotification
*/
-/* No native methods here, but the constants are needed in the supporting JNI code */
-@GenerateNativeHeader
public class PeerAddrChange extends PeerAddressChangeNotification
implements SctpNotification
{
/* static final ints so that they can be referenced from native */
- private final static int SCTP_ADDR_AVAILABLE = 1;
- private final static int SCTP_ADDR_UNREACHABLE = 2;
- private final static int SCTP_ADDR_REMOVED = 3;
- private final static int SCTP_ADDR_ADDED = 4;
- private final static int SCTP_ADDR_MADE_PRIM = 5;
- private final static int SCTP_ADDR_CONFIRMED =6;
+ @Native private final static int SCTP_ADDR_AVAILABLE = 1;
+ @Native private final static int SCTP_ADDR_UNREACHABLE = 2;
+ @Native private final static int SCTP_ADDR_REMOVED = 3;
+ @Native private final static int SCTP_ADDR_ADDED = 4;
+ @Native private final static int SCTP_ADDR_MADE_PRIM = 5;
+ @Native private final static int SCTP_ADDR_CONFIRMED =6;
private Association association;
--- a/jdk/src/solaris/classes/sun/nio/ch/sctp/ResultContainer.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/solaris/classes/sun/nio/ch/sctp/ResultContainer.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -24,22 +24,20 @@
*/
package sun.nio.ch.sctp;
-import javax.tools.annotation.GenerateNativeHeader;
+import java.lang.annotation.Native;
/**
* Wraps the actual message or notification so that it can be
* set and returned from the native receive implementation.
*/
-/* No native methods here, but the constants are needed in the supporting JNI code */
-@GenerateNativeHeader
public class ResultContainer {
/* static final ints so that they can be referenced from native */
- static final int NOTHING = 0;
- static final int MESSAGE = 1;
- static final int SEND_FAILED = 2;
- static final int ASSOCIATION_CHANGED = 3;
- static final int PEER_ADDRESS_CHANGED = 4;
- static final int SHUTDOWN = 5;
+ @Native static final int NOTHING = 0;
+ @Native static final int MESSAGE = 1;
+ @Native static final int SEND_FAILED = 2;
+ @Native static final int ASSOCIATION_CHANGED = 3;
+ @Native static final int PEER_ADDRESS_CHANGED = 4;
+ @Native static final int SHUTDOWN = 5;
private Object value;
private int type;
--- a/jdk/src/solaris/native/sun/awt/awt_InputMethod.c Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/solaris/native/sun/awt/awt_InputMethod.c Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -36,7 +36,6 @@
#include "awt_p.h"
#include <sun_awt_X11InputMethod.h>
-#include <sun_awt_X11_XComponentPeer.h>
#include <sun_awt_X11_XInputMethod.h>
#define THROW_OUT_OF_MEMORY_ERROR() \
--- a/jdk/src/solaris/native/sun/awt/fontpath.c Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/solaris/native/sun/awt/fontpath.c Thu Apr 04 15:39:17 2013 -0700
@@ -41,7 +41,6 @@
#include <jni.h>
#include <jni_util.h>
#include <jvm_md.h>
-#include <sun_font_FontManager.h>
#ifndef HEADLESS
#include <X11/Xlib.h>
#include <awt.h>
--- a/jdk/src/windows/classes/sun/java2d/d3d/D3DBlitLoops.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/windows/classes/sun/java2d/d3d/D3DBlitLoops.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,7 @@
import java.awt.image.BufferedImage;
import java.awt.image.BufferedImageOp;
import java.lang.ref.WeakReference;
-import javax.tools.annotation.GenerateNativeHeader;
+import java.lang.annotation.Native;
import sun.java2d.ScreenUpdateManager;
import sun.java2d.SurfaceData;
import sun.java2d.loops.Blit;
@@ -48,8 +48,6 @@
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() {
@@ -179,12 +177,12 @@
* createPackedParams(). (They are also used at the native level when
* unpacking the params.)
*/
- private static final int OFFSET_SRCTYPE = 16;
- private static final int OFFSET_HINT = 8;
- private static final int OFFSET_TEXTURE = 3;
- private static final int OFFSET_RTT = 2;
- private static final int OFFSET_XFORM = 1;
- private static final int OFFSET_ISOBLIT = 0;
+ @Native private static final int OFFSET_SRCTYPE = 16;
+ @Native private static final int OFFSET_HINT = 8;
+ @Native private static final int OFFSET_TEXTURE = 3;
+ @Native private static final int OFFSET_RTT = 2;
+ @Native private static final int OFFSET_XFORM = 1;
+ @Native private static final int OFFSET_ISOBLIT = 0;
/**
* Packs the given parameters into a single int value in order to save
--- a/jdk/src/windows/classes/sun/java2d/d3d/D3DContext.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/windows/classes/sun/java2d/d3d/D3DContext.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
package sun.java2d.d3d;
-import javax.tools.annotation.GenerateNativeHeader;
+import java.lang.annotation.Native;
import sun.java2d.pipe.BufferedContext;
import sun.java2d.pipe.RenderBuffer;
import sun.java2d.pipe.RenderQueue;
@@ -38,8 +38,6 @@
* 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;
@@ -143,31 +141,29 @@
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).
* This cap will only be set if the hardware supports the minimum number
* of texture units.
*/
- static final int CAPS_LCD_SHADER = (FIRST_PRIVATE_CAP << 0);
+ @Native static final int CAPS_LCD_SHADER = (FIRST_PRIVATE_CAP << 0);
/**
* Indicates the presence of pixel shaders (v2.0 or greater).
* This cap will only be set if the hardware meets our
* minimum requirements.
*/
- static final int CAPS_BIOP_SHADER = (FIRST_PRIVATE_CAP << 1);
+ @Native static final int CAPS_BIOP_SHADER = (FIRST_PRIVATE_CAP << 1);
/**
* Indicates that the device was successfully initialized and can
* be safely used.
*/
- static final int CAPS_DEVICE_OK = (FIRST_PRIVATE_CAP << 2);
+ @Native static final int CAPS_DEVICE_OK = (FIRST_PRIVATE_CAP << 2);
/**
* Indicates that the device has all of the necessary capabilities
* to support the Antialiasing Pixel Shader program.
*/
- static final int CAPS_AA_SHADER = (FIRST_PRIVATE_CAP << 3);
+ @Native static final int CAPS_AA_SHADER = (FIRST_PRIVATE_CAP << 3);
D3DContextCaps(int caps, String adapterId) {
super(caps, adapterId);
--- a/jdk/src/windows/classes/sun/java2d/d3d/D3DPaints.java Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/windows/classes/sun/java2d/d3d/D3DPaints.java Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,7 @@
import java.awt.image.BufferedImage;
import java.util.HashMap;
import java.util.Map;
-import javax.tools.annotation.GenerateNativeHeader;
+import java.lang.annotation.Native;
import sun.java2d.SunGraphics2D;
import sun.java2d.SurfaceData;
import sun.java2d.loops.CompositeType;
@@ -158,8 +158,6 @@
/****************** 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 {
/**
@@ -170,7 +168,7 @@
* all versions of the shader can be compiled for PS 2.0 hardware,
* we need to cap this maximum value at 8.
*/
- public static final int MULTI_MAX_FRACTIONS_D3D = 8;
+ @Native public static final int MULTI_MAX_FRACTIONS_D3D = 8;
protected MultiGradient() {}
--- a/jdk/src/windows/native/sun/java2d/d3d/D3DContext.h Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/windows/native/sun/java2d/d3d/D3DContext.h Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
#include "java_awt_Transparency.h"
#include "sun_java2d_pipe_BufferedContext.h"
-#include "sun_java2d_d3d_D3DContext.h"
#include "sun_java2d_d3d_D3DContext_D3DContextCaps.h"
#include "sun_java2d_d3d_D3DSurfaceData.h"
#include "sun_java2d_pipe_hw_AccelDeviceEventNotifier.h"
--- a/jdk/src/windows/native/sun/windows/awt_Component.h Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/windows/native/sun/windows/awt_Component.h Thu Apr 04 15:39:17 2013 -0700
@@ -37,7 +37,6 @@
#include "java_awt_Component.h"
#include "sun_awt_windows_WComponentPeer.h"
#include "java_awt_event_KeyEvent.h"
-#include "java_awt_event_FocusEvent.h"
#include "java_awt_event_MouseEvent.h"
#include "java_awt_event_WindowEvent.h"
#include "java_awt_Dimension.h"
--- a/jdk/src/windows/native/sun/windows/awt_DnDDS.cpp Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/windows/native/sun/windows/awt_DnDDS.cpp Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -52,7 +52,6 @@
#include "java_awt_event_InputEvent.h"
#include "java_awt_dnd_DnDConstants.h"
-#include "sun_awt_dnd_SunDragSourceContextPeer.h"
#include "sun_awt_windows_WDragSourceContextPeer.h"
#include "awt_ole.h"
--- a/jdk/src/windows/native/sun/windows/awt_Frame.cpp Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/windows/native/sun/windows/awt_Frame.cpp Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,6 @@
#include <windowsx.h>
#include <java_lang_Integer.h>
-#include <sun_awt_EmbeddedFrame.h>
#include <sun_awt_windows_WEmbeddedFrame.h>
#include <sun_awt_windows_WEmbeddedFramePeer.h>
--- a/jdk/src/windows/native/sun/windows/awt_List.h Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/windows/native/sun/windows/awt_List.h Thu Apr 04 15:39:17 2013 -0700
@@ -28,7 +28,6 @@
#include "awt_Component.h"
-#include "java_awt_List.h"
#include "sun_awt_windows_WListPeer.h"
--- a/jdk/src/windows/native/sun/windows/awt_PopupMenu.cpp Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/windows/native/sun/windows/awt_PopupMenu.cpp Thu Apr 04 15:39:17 2013 -0700
@@ -28,7 +28,6 @@
#include "awt_Event.h"
#include "awt_Window.h"
-#include <java_awt_PopupMenu.h>
#include <sun_awt_windows_WPopupMenuPeer.h>
#include <java_awt_Event.h>
--- a/jdk/src/windows/native/sun/windows/awt_PopupMenu.h Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/windows/native/sun/windows/awt_PopupMenu.h Thu Apr 04 15:39:17 2013 -0700
@@ -30,7 +30,6 @@
#include <java_awt_MenuItem.h>
#include <sun_awt_windows_WMenuItemPeer.h>
-#include <java_awt_PopupMenu.h>
#include <sun_awt_windows_WPopupMenuPeer.h>
--- a/jdk/src/windows/native/sun/windows/awt_TextComponent.h Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/windows/native/sun/windows/awt_TextComponent.h Thu Apr 04 15:39:17 2013 -0700
@@ -28,7 +28,6 @@
#include "awt_Component.h"
-#include "java_awt_TextComponent.h"
#include "sun_awt_windows_WTextComponentPeer.h"
#include <ole2.h>
--- a/jdk/src/windows/native/sun/windows/awt_Toolkit.cpp Wed Apr 03 10:32:38 2013 -0700
+++ b/jdk/src/windows/native/sun/windows/awt_Toolkit.cpp Thu Apr 04 15:39:17 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -62,7 +62,6 @@
#include <java_awt_Toolkit.h>
#include <java_awt_event_InputMethodEvent.h>
-#include <java_awt_peer_ComponentPeer.h>
extern void initScreens(JNIEnv *env);
extern "C" void awt_dnd_initialize();