From 1360f3839ec52a8da5420946781327cb859597c4 Mon Sep 17 00:00:00 2001 From: Michael Bien Date: Wed, 11 Nov 2009 18:58:31 +0100 Subject: refactoring: new struct accessor method naming conventions. --- .../nativewindow/impl/jawt/macosx/MacOSXJAWTWindow.java | 2 +- .../nativewindow/impl/jawt/windows/WindowsJAWTWindow.java | 2 +- .../com/sun/nativewindow/impl/jawt/x11/X11JAWTWindow.java | 2 +- .../impl/x11/X11GraphicsConfigurationFactory.java | 14 +++++++------- 4 files changed, 10 insertions(+), 10 deletions(-) (limited to 'src/nativewindow/classes/com') diff --git a/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/macosx/MacOSXJAWTWindow.java b/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/macosx/MacOSXJAWTWindow.java index 2d85f1d4d..4ecc6aa4d 100644 --- a/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/macosx/MacOSXJAWTWindow.java +++ b/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/macosx/MacOSXJAWTWindow.java @@ -111,7 +111,7 @@ public class MacOSXJAWTWindow extends JAWTWindow { super.unlockSurface(); return NativeWindow.LOCK_SURFACE_NOT_READY; } - drawable = macosxdsi.cocoaViewRef(); + drawable = macosxdsi.getCocoaViewRef(); if (drawable == 0) { // Widget not yet realized diff --git a/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/windows/WindowsJAWTWindow.java b/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/windows/WindowsJAWTWindow.java index 591213038..2b8cab9c4 100644 --- a/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/windows/WindowsJAWTWindow.java +++ b/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/windows/WindowsJAWTWindow.java @@ -105,7 +105,7 @@ public class WindowsJAWTWindow extends JAWTWindow { super.unlockSurface(); return LOCK_SURFACE_NOT_READY; } - drawable = win32dsi.hdc(); + drawable = win32dsi.getHdc(); if (drawable == 0) { // Widget not yet realized ds.FreeDrawingSurfaceInfo(dsi); diff --git a/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/x11/X11JAWTWindow.java b/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/x11/X11JAWTWindow.java index 75133488f..af2b7a71c 100644 --- a/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/x11/X11JAWTWindow.java +++ b/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/x11/X11JAWTWindow.java @@ -99,7 +99,7 @@ public class X11JAWTWindow extends JAWTWindow { super.unlockSurface(); return LOCK_SURFACE_NOT_READY; } - drawable = x11dsi.drawable(); + drawable = x11dsi.getDrawable(); if (drawable == 0) { // Widget not yet realized ds.FreeDrawingSurfaceInfo(dsi); diff --git a/src/nativewindow/classes/com/sun/nativewindow/impl/x11/X11GraphicsConfigurationFactory.java b/src/nativewindow/classes/com/sun/nativewindow/impl/x11/X11GraphicsConfigurationFactory.java index d6abf291f..4709e3ef0 100644 --- a/src/nativewindow/classes/com/sun/nativewindow/impl/x11/X11GraphicsConfigurationFactory.java +++ b/src/nativewindow/classes/com/sun/nativewindow/impl/x11/X11GraphicsConfigurationFactory.java @@ -53,8 +53,8 @@ public class X11GraphicsConfigurationFactory extends GraphicsConfigurationFactor public static XVisualInfo getXVisualInfo(AbstractGraphicsScreen screen, long visualID) { XVisualInfo xvi_temp = XVisualInfo.create(); - xvi_temp.visualid(visualID); - xvi_temp.screen(screen.getIndex()); + xvi_temp.setVisualid(visualID); + xvi_temp.setScreen(screen.getIndex()); int num[] = { -1 }; long display = screen.getDevice().getHandle(); @@ -86,8 +86,8 @@ public class X11GraphicsConfigurationFactory extends GraphicsConfigurationFactor int[] num = { -1 }; XVisualInfo vinfo_template = XVisualInfo.create(); - vinfo_template.screen(screen.getIndex()); - vinfo_template.c_class(c_class); + vinfo_template.setScreen(screen.getIndex()); + vinfo_template.setC_class(c_class); long display = screen.getDevice().getHandle(); try { @@ -97,14 +97,14 @@ public class X11GraphicsConfigurationFactory extends GraphicsConfigurationFactor int rdepth = capabilities.getRedBits() + capabilities.getGreenBits() + capabilities.getBlueBits() + capabilities.getAlphaBits(); for (int i = 0; vinfos!=null && i < num[0]; i++) { if ( best == null || - best.depth() < vinfos[i].depth() ) + best.getDepth() < vinfos[i].getDepth() ) { best = vinfos[i]; - if(rdepth <= best.depth()) + if(rdepth <= best.getDepth()) break; } } - if ( null!=best && ( rdepth <= best.depth() || 24 == best.depth()) ) { + if ( null!=best && ( rdepth <= best.getDepth() || 24 == best.getDepth()) ) { ret = XVisualInfo.create(best); } best = null; -- cgit v1.2.3