# HG changeset patch # User ddhill # Date 1474565096 14400 # Thu Sep 22 13:24:56 2016 -0400 # Node ID 18336386e69353425ff11983a47f36e056687041 # Parent 37cdf66a7cb5abe1aee38d98f7f5b0d2ba80bd76 8166564: @native for mac builds Reviewed-by: kcr diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/Clipboard.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/Clipboard.java --- a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/Clipboard.java +++ b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/Clipboard.java @@ -26,6 +26,7 @@ import com.sun.glass.ui.delegate.ClipboardDelegate; +import java.lang.annotation.Native; import java.util.HashMap; import java.util.HashSet; import java.util.Map; @@ -38,32 +39,32 @@ * predefined mime types * Have to be synchronized with native realization. */ - public final static String TEXT_TYPE = "text/plain"; - public final static String HTML_TYPE = "text/html"; - public final static String RTF_TYPE = "text/rtf"; - public final static String URI_TYPE = "text/uri-list";//http://www.ietf.org/rfc/rfc2483.txt - public final static String FILE_LIST_TYPE = "application/x-java-file-list"; - public final static String RAW_IMAGE_TYPE = "application/x-java-rawimage"; - public final static String DRAG_IMAGE = "application/x-java-drag-image"; - public final static String DRAG_IMAGE_OFFSET = "application/x-java-drag-image-offset"; - public final static String IE_URL_SHORTCUT_FILENAME = "text/ie-shortcut-filename"; + @Native public final static String TEXT_TYPE = "text/plain"; + @Native public final static String HTML_TYPE = "text/html"; + @Native public final static String RTF_TYPE = "text/rtf"; + @Native public final static String URI_TYPE = "text/uri-list";//http://www.ietf.org/rfc/rfc2483.txt + @Native public final static String FILE_LIST_TYPE = "application/x-java-file-list"; + @Native public final static String RAW_IMAGE_TYPE = "application/x-java-rawimage"; + @Native public final static String DRAG_IMAGE = "application/x-java-drag-image"; + @Native public final static String DRAG_IMAGE_OFFSET = "application/x-java-drag-image-offset"; + @Native public final static String IE_URL_SHORTCUT_FILENAME = "text/ie-shortcut-filename"; /** * predefined drop-effect actions and combinations. */ - public final static int ACTION_NONE = 0x0; - public final static int ACTION_COPY = 0x1; - public final static int ACTION_MOVE = 0x2; - public final static int ACTION_REFERENCE = 0x40000000; - public final static int ACTION_COPY_OR_MOVE = ACTION_COPY | ACTION_MOVE; - public final static int ACTION_ANY = 0x4FFFFFFF; + @Native public final static int ACTION_NONE = 0x0; + @Native public final static int ACTION_COPY = 0x1; + @Native public final static int ACTION_MOVE = 0x2; + @Native public final static int ACTION_REFERENCE = 0x40000000; + @Native public final static int ACTION_COPY_OR_MOVE = ACTION_COPY | ACTION_MOVE; + @Native public final static int ACTION_ANY = 0x4FFFFFFF; /** * predefined clipboard name for system shared buffers */ - public final static String DND = "DND"; - public final static String SYSTEM = "SYSTEM"; - public final static String SELECTION = "SELECTION"; + @Native public final static String DND = "DND"; + @Native public final static String SYSTEM = "SYSTEM"; + @Native public final static String SELECTION = "SELECTION"; private final static Map clipboards = new HashMap (); private final static ClipboardDelegate delegate = PlatformFactory.getPlatformFactory().createClipboardDelegate(); diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/Timer.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/Timer.java --- a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/Timer.java +++ b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/Timer.java @@ -24,6 +24,8 @@ */ package com.sun.glass.ui; +import java.lang.annotation.Native; + /** * A high-resolution timer. * @@ -36,8 +38,8 @@ */ public abstract class Timer { - private final static double UNSET_PERIOD = -1.0; // 0 is valid value, so can't use it here - private final static double SET_PERIOD = -2.0; // token value for vsync timer + @Native private final static double UNSET_PERIOD = -1.0; // 0 is valid value, so can't use it here + @Native private final static double SET_PERIOD = -2.0; // token value for vsync timer private final Runnable runnable; private long ptr; diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/View.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/View.java --- a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/View.java +++ b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/View.java @@ -403,12 +403,12 @@ static final public class Capability { // we need these for native code - static final public int k3dKeyValue = 0; - static final public int kSyncKeyValue = 1; - static final public int k3dProjectionKeyValue = 2; - static final public int k3dProjectionAngleKeyValue = 3; - static final public int k3dDepthKeyValue = 4; - static final public int kHiDPIAwareKeyValue = 5; + @Native static final public int k3dKeyValue = 0; + @Native static final public int kSyncKeyValue = 1; + @Native static final public int k3dProjectionKeyValue = 2; + @Native static final public int k3dProjectionAngleKeyValue = 3; + @Native static final public int k3dDepthKeyValue = 4; + @Native static final public int kHiDPIAwareKeyValue = 5; static final public Object k3dKey = Integer.valueOf(k3dKeyValue); // value must be Boolean static final public Object kSyncKey = Integer.valueOf(kSyncKeyValue); // value must be Boolean diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/mac/MacVariant.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/mac/MacVariant.java --- a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/mac/MacVariant.java +++ b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/mac/MacVariant.java @@ -25,31 +25,32 @@ package com.sun.glass.ui.mac; +import java.lang.annotation.Native; import java.time.LocalDate; import java.time.ZoneId; import java.util.Arrays; import javafx.geometry.Bounds; final class MacVariant { - final static int NSArray_id = 1; - final static int NSArray_NSString = 2; - final static int NSArray_int = 3; - final static int NSArray_range = 4; - final static int NSAttributedString = 5; /* Uses string for the text and variantArray for the styles */ - final static int NSData = 6; - final static int NSDate = 7; - final static int NSDictionary = 8; /* Uses longArray for keys (NSString) and variantArray for values */ - final static int NSNumber_Boolean = 9; - final static int NSNumber_Int = 10; - final static int NSNumber_Float = 11; - final static int NSNumber_Double = 12; - final static int NSString = 13; - final static int NSURL = 14; - final static int NSValue_point = 15; - final static int NSValue_size = 16; - final static int NSValue_rectangle = 17; - final static int NSValue_range = 18; - final static int NSObject = 19; /* id */ + @Native final static int NSArray_id = 1; + @Native final static int NSArray_NSString = 2; + @Native final static int NSArray_int = 3; + @Native final static int NSArray_range = 4; + @Native final static int NSAttributedString = 5; /* Uses string for the text and variantArray for the styles */ + @Native final static int NSData = 6; + @Native final static int NSDate = 7; + @Native final static int NSDictionary = 8; /* Uses longArray for keys (NSString) and variantArray for values */ + @Native final static int NSNumber_Boolean = 9; + @Native final static int NSNumber_Int = 10; + @Native final static int NSNumber_Float = 11; + @Native final static int NSNumber_Double = 12; + @Native final static int NSString = 13; + @Native final static int NSURL = 14; + @Native final static int NSValue_point = 15; + @Native final static int NSValue_size = 16; + @Native final static int NSValue_rectangle = 17; + @Native final static int NSValue_range = 18; + @Native final static int NSObject = 19; /* id */ int type; long[] longArray; diff --git a/modules/javafx.graphics/src/main/native-glass/mac/GlassApplication.m b/modules/javafx.graphics/src/main/native-glass/mac/GlassApplication.m --- a/modules/javafx.graphics/src/main/native-glass/mac/GlassApplication.m +++ b/modules/javafx.graphics/src/main/native-glass/mac/GlassApplication.m @@ -24,7 +24,6 @@ */ #import "common.h" -#import "com_sun_glass_ui_Application.h" #import "com_sun_glass_ui_mac_MacApplication.h" #import "com_sun_glass_events_KeyEvent.h" diff --git a/modules/javafx.graphics/src/main/native-glass/mac/GlassPixels.m b/modules/javafx.graphics/src/main/native-glass/mac/GlassPixels.m --- a/modules/javafx.graphics/src/main/native-glass/mac/GlassPixels.m +++ b/modules/javafx.graphics/src/main/native-glass/mac/GlassPixels.m @@ -24,7 +24,6 @@ */ #import "common.h" -#import "com_sun_glass_ui_Pixels.h" #import "com_sun_glass_ui_Pixels_Format.h" #import "com_sun_glass_ui_mac_MacPixels.h" diff --git a/modules/javafx.graphics/src/main/native-glass/mac/GlassScreen.m b/modules/javafx.graphics/src/main/native-glass/mac/GlassScreen.m --- a/modules/javafx.graphics/src/main/native-glass/mac/GlassScreen.m +++ b/modules/javafx.graphics/src/main/native-glass/mac/GlassScreen.m @@ -24,7 +24,6 @@ */ #import "common.h" -#import "com_sun_glass_ui_Screen.h" #import "GlassMacros.h" #import "GlassScreen.h" diff --git a/modules/javafx.graphics/src/main/native-prism-es2/macosx/MacOSXWindowSystemInterface.m b/modules/javafx.graphics/src/main/native-prism-es2/macosx/MacOSXWindowSystemInterface.m --- a/modules/javafx.graphics/src/main/native-prism-es2/macosx/MacOSXWindowSystemInterface.m +++ b/modules/javafx.graphics/src/main/native-prism-es2/macosx/MacOSXWindowSystemInterface.m @@ -28,7 +28,6 @@ #import #import "../macosx-window-system.h" -#import "com_sun_prism_es2_GLPixelFormat.h" #import "com_sun_prism_es2_GLPixelFormat_Attributes.h" void *createPixelFormat(jint *ivalues) {