aboutsummaryrefslogtreecommitdiffstats
path: root/src/newt/classes
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2012-08-07 06:15:46 +0300
committerSven Gothel <[email protected]>2012-08-07 06:15:46 +0300
commit1272bf884ce32bb723c48999ea6598f58b65f914 (patch)
treefcf199db2a1198396d09e0621bfaa2d51b642edc /src/newt/classes
parentab671729fd4b50127d8dcb95bd5fd13ce0a4078b (diff)
parenta4e3bb6af06a58ec5247f3e044546f1a2ea4a786 (diff)
Resolve conflict
Diffstat (limited to 'src/newt/classes')
-rw-r--r--src/newt/classes/jogamp/newt/DisplayImpl.java2
-rw-r--r--src/newt/classes/jogamp/newt/ScreenImpl.java2
-rw-r--r--src/newt/classes/jogamp/newt/WindowImpl.java2
-rw-r--r--src/newt/classes/jogamp/newt/driver/kd/Display.java (renamed from src/newt/classes/jogamp/newt/driver/kd/KDDisplay.java)9
-rw-r--r--src/newt/classes/jogamp/newt/driver/kd/Screen.java (renamed from src/newt/classes/jogamp/newt/driver/kd/KDScreen.java)6
-rw-r--r--src/newt/classes/jogamp/newt/driver/kd/Window.java (renamed from src/newt/classes/jogamp/newt/driver/kd/KDWindow.java)8
6 files changed, 14 insertions, 15 deletions
diff --git a/src/newt/classes/jogamp/newt/DisplayImpl.java b/src/newt/classes/jogamp/newt/DisplayImpl.java
index b178bb5d3..867a1f176 100644
--- a/src/newt/classes/jogamp/newt/DisplayImpl.java
+++ b/src/newt/classes/jogamp/newt/DisplayImpl.java
@@ -57,7 +57,7 @@ public abstract class DisplayImpl extends Display {
if (NativeWindowFactory.TYPE_ANDROID == type) {
displayClass = Class.forName("jogamp.newt.driver.android.AndroidDisplay");
} else if (NativeWindowFactory.TYPE_EGL == type) {
- displayClass = Class.forName("jogamp.newt.driver.kd.KDDisplay");
+ displayClass = Class.forName("jogamp.newt.driver.kd.Display");
} else if (NativeWindowFactory.TYPE_WINDOWS == type) {
displayClass = Class.forName("jogamp.newt.driver.windows.WindowsDisplay");
} else if (NativeWindowFactory.TYPE_MACOSX == type) {
diff --git a/src/newt/classes/jogamp/newt/ScreenImpl.java b/src/newt/classes/jogamp/newt/ScreenImpl.java
index cf614b6f1..9f75a0d25 100644
--- a/src/newt/classes/jogamp/newt/ScreenImpl.java
+++ b/src/newt/classes/jogamp/newt/ScreenImpl.java
@@ -98,7 +98,7 @@ public abstract class ScreenImpl extends Screen implements ScreenModeListener {
if (NativeWindowFactory.TYPE_ANDROID == type) {
screenClass = Class.forName("jogamp.newt.driver.android.AndroidScreen");
} else if (NativeWindowFactory.TYPE_EGL == type) {
- screenClass = Class.forName("jogamp.newt.driver.kd.KDScreen");
+ screenClass = Class.forName("jogamp.newt.driver.kd.Screen");
} else if (NativeWindowFactory.TYPE_WINDOWS == type) {
screenClass = Class.forName("jogamp.newt.driver.windows.WindowsScreen");
} else if (NativeWindowFactory.TYPE_MACOSX == type) {
diff --git a/src/newt/classes/jogamp/newt/WindowImpl.java b/src/newt/classes/jogamp/newt/WindowImpl.java
index 606101ade..2971fa07e 100644
--- a/src/newt/classes/jogamp/newt/WindowImpl.java
+++ b/src/newt/classes/jogamp/newt/WindowImpl.java
@@ -157,7 +157,7 @@ public abstract class WindowImpl implements Window, NEWTEventConsumer
if (NativeWindowFactory.TYPE_ANDROID == type) {
windowClass = Class.forName("jogamp.newt.driver.android.AndroidWindow");
} else if (NativeWindowFactory.TYPE_EGL == type) {
- windowClass = Class.forName("jogamp.newt.driver.kd.KDWindow");
+ windowClass = Class.forName("jogamp.newt.driver.kd.Window");
} else if (NativeWindowFactory.TYPE_WINDOWS == type) {
windowClass = Class.forName("jogamp.newt.driver.windows.WindowsWindow");
} else if (NativeWindowFactory.TYPE_MACOSX == type) {
diff --git a/src/newt/classes/jogamp/newt/driver/kd/KDDisplay.java b/src/newt/classes/jogamp/newt/driver/kd/Display.java
index 07b031841..a58ad477a 100644
--- a/src/newt/classes/jogamp/newt/driver/kd/KDDisplay.java
+++ b/src/newt/classes/jogamp/newt/driver/kd/Display.java
@@ -42,13 +42,12 @@ import jogamp.newt.NEWTJNILibLoader;
import jogamp.opengl.egl.EGL;
import jogamp.opengl.egl.EGLDisplayUtil;
-public class KDDisplay extends DisplayImpl {
-
+public class Display extends DisplayImpl {
static {
NEWTJNILibLoader.loadNEWT();
- if (!KDWindow.initIDs()) {
- throw new NativeWindowException("Failed to initialize KDWindow jmethodIDs");
+ if (!Window.initIDs()) {
+ throw new NativeWindowException("Failed to initialize kd.Window jmethodIDs");
}
}
@@ -57,7 +56,7 @@ public class KDDisplay extends DisplayImpl {
}
- public KDDisplay() {
+ public Display() {
}
protected void createNativeImpl() {
diff --git a/src/newt/classes/jogamp/newt/driver/kd/KDScreen.java b/src/newt/classes/jogamp/newt/driver/kd/Screen.java
index ee3475880..53f5890b2 100644
--- a/src/newt/classes/jogamp/newt/driver/kd/KDScreen.java
+++ b/src/newt/classes/jogamp/newt/driver/kd/Screen.java
@@ -40,12 +40,12 @@ import javax.media.nativewindow.util.Point;
import jogamp.newt.ScreenImpl;
-public class KDScreen extends ScreenImpl {
+public class Screen extends ScreenImpl {
static {
- KDDisplay.initSingleton();
+ Display.initSingleton();
}
- public KDScreen() {
+ public Screen() {
}
protected void createNativeImpl() {
diff --git a/src/newt/classes/jogamp/newt/driver/kd/KDWindow.java b/src/newt/classes/jogamp/newt/driver/kd/Window.java
index 9f9d6948e..ce65040c3 100644
--- a/src/newt/classes/jogamp/newt/driver/kd/KDWindow.java
+++ b/src/newt/classes/jogamp/newt/driver/kd/Window.java
@@ -46,14 +46,14 @@ import javax.media.opengl.GLCapabilitiesImmutable;
import jogamp.newt.WindowImpl;
import jogamp.opengl.egl.EGLGraphicsConfiguration;
-public class KDWindow extends WindowImpl {
+public class Window extends WindowImpl {
private static final String WINDOW_CLASS_NAME = "NewtWindow";
static {
- KDDisplay.initSingleton();
+ Display.initSingleton();
}
- public KDWindow() {
+ public Window() {
}
protected void createNativeImpl() {
@@ -152,7 +152,7 @@ public class KDWindow extends WindowImpl {
@Override
protected void sizeChanged(boolean defer, int newWidth, int newHeight, boolean force) {
if(isFullscreen()) {
- ((KDScreen)getScreen()).sizeChanged(getWidth(), getHeight());
+ ((Screen)getScreen()).sizeChanged(getWidth(), getHeight());
}
super.sizeChanged(defer, newWidth, newHeight, force);
}