[libbluray-devel] Moved common parts of BDGraphicsConfiguration implementations to base class

[hpi1]

libbluray | branch: master | hpi1 <hpi1 at anonymous.org> | Wed Mar 19 17:03:42 2014 +0200| [e01482418cf5f756561f966090f4821e838af601] | committer: hpi1

Moved common parts of BDGraphicsConfiguration implementations to base class

> http://git.videolan.org/gitweb.cgi/libbluray.git/?a=commit;h=e01482418cf5f756561f966090f4821e838af601
---

 .../java/awt/BDGraphicsConfiguration.java          |   46 +------------
 .../java/awt/BDGraphicsConfiguration.java          |   41 +-----------
 .../java/java/awt/BDGraphicsConfigurationBase.java |   70 ++++++++++++++++++++
 3 files changed, 74 insertions(+), 83 deletions(-)

diff --git a/src/libbluray/bdj/java-j2me/java/awt/BDGraphicsConfiguration.java b/src/libbluray/bdj/java-j2me/java/awt/BDGraphicsConfiguration.java
index a317e35..2fd0be0 100644
--- a/src/libbluray/bdj/java-j2me/java/awt/BDGraphicsConfiguration.java
+++ b/src/libbluray/bdj/java-j2me/java/awt/BDGraphicsConfiguration.java
@@ -19,52 +19,10 @@
 
 package java.awt;
 
-import java.awt.color.ColorSpace;
-import java.awt.image.BufferedImage;
-import java.awt.image.ColorModel;
-import java.awt.image.DataBuffer;
-import java.awt.image.DirectColorModel;
-import java.awt.image.VolatileImage;
-
-class BDGraphicsConfiguration extends GraphicsConfiguration {
+class BDGraphicsConfiguration extends BDGraphicsConfigurationBase {
     private BDGraphicsDevice device;
 
     BDGraphicsConfiguration(BDGraphicsDevice device) {
-        this.device = device;
-    }
-
-    public GraphicsDevice getDevice() {
-        return device;
-    }
-
-    public Rectangle getBounds() {
-        return device.getBounds();
-    }
-
-    int getCompatibleImageType() {
-        return BufferedImage.TYPE_INT_ARGB;
-    }
-
-    public synchronized ColorModel getColorModel() {
-        return new DirectColorModel(ColorSpace.getInstance(ColorSpace.CS_sRGB),
-                                    32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000, true,
-                                    DataBuffer.TYPE_INT);
-    }
-
-    public BufferedImage createCompatibleImage(int width, int height) {
-        if (width <= 0 || height <= 0)
-            return null;
-        return BDImage.getBuffededImage(width, height, this);
-    }
-
-    public BufferedImage createCompatibleImage(int width, int height, int trans) {
-        if (width <= 0 || height <= 0)
-            return null;
-        return BDImage.getBuffededImage(width, height, this);
-    }
-
-    public VolatileImage createCompatibleVolatileImage(int width, int height) {
-        org.videolan.Logger.unimplemented("BDGraphicsConfiguration", "createCompatibleVolatileImage");
-        return null;
+        super(device);
     }
 }
diff --git a/src/libbluray/bdj/java-j2se/java/awt/BDGraphicsConfiguration.java b/src/libbluray/bdj/java-j2se/java/awt/BDGraphicsConfiguration.java
index 3b98984..e8d47ed 100644
--- a/src/libbluray/bdj/java-j2se/java/awt/BDGraphicsConfiguration.java
+++ b/src/libbluray/bdj/java-j2se/java/awt/BDGraphicsConfiguration.java
@@ -26,23 +26,9 @@ import java.awt.image.DataBuffer;
 import java.awt.image.DirectColorModel;
 import java.awt.image.VolatileImage;
 
-class BDGraphicsConfiguration extends GraphicsConfiguration {
-    private BDGraphicsDevice device;
-
+class BDGraphicsConfiguration extends BDGraphicsConfigurationBase {
     BDGraphicsConfiguration(BDGraphicsDevice device) {
-        this.device = device;
-    }
-
-    public GraphicsDevice getDevice() {
-        return device;
-    }
-
-    public Rectangle getBounds() {
-        return device.getBounds();
-    }
-
-    int getCompatibleImageType() {
-        return BufferedImage.TYPE_INT_ARGB;
+        super(device);
     }
 
     public java.awt.geom.AffineTransform getNormalizingTransform() {
@@ -58,29 +44,6 @@ class BDGraphicsConfiguration extends GraphicsConfiguration {
         return null;
     }
 
-    public synchronized ColorModel getColorModel() {
-        return new DirectColorModel(ColorSpace.getInstance(ColorSpace.CS_sRGB),
-                                    32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000, true,
-                                    DataBuffer.TYPE_INT);
-    }
-
-    public BufferedImage createCompatibleImage(int width, int height, int trans) {
-        if (width <= 0 || height <= 0)
-            return null;
-        return BDImage.getBuffededImage(width, height, this);
-    }
-
-    public BufferedImage createCompatibleImage(int width, int height) {
-        if (width <= 0 || height <= 0)
-            return null;
-        return BDImage.getBuffededImage(width, height, this);
-    }
-
-    public VolatileImage createCompatibleVolatileImage(int width, int height) {
-        org.videolan.Logger.unimplemented("BDGraphicsConfiguration", "createCompatibleVolatileImage");
-        return null;
-    }
-
     public VolatileImage createCompatibleVolatileImage(int width, int height, int trans) {
         org.videolan.Logger.unimplemented("BDGraphicsConfiguration", "createCompatibleVolatileImage");
         return null;
diff --git a/src/libbluray/bdj/java/java/awt/BDGraphicsConfigurationBase.java b/src/libbluray/bdj/java/java/awt/BDGraphicsConfigurationBase.java
new file mode 100644
index 0000000..c215fab
--- /dev/null
+++ b/src/libbluray/bdj/java/java/awt/BDGraphicsConfigurationBase.java
@@ -0,0 +1,70 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2012  Libbluray
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package java.awt;
+
+import java.awt.color.ColorSpace;
+import java.awt.image.BufferedImage;
+import java.awt.image.ColorModel;
+import java.awt.image.DataBuffer;
+import java.awt.image.DirectColorModel;
+import java.awt.image.VolatileImage;
+
+abstract class BDGraphicsConfigurationBase extends GraphicsConfiguration {
+    private BDGraphicsDevice device;
+
+    BDGraphicsConfigurationBase(BDGraphicsDevice device) {
+        this.device = device;
+    }
+
+    public GraphicsDevice getDevice() {
+        return device;
+    }
+
+    public Rectangle getBounds() {
+        return device.getBounds();
+    }
+
+    int getCompatibleImageType() {
+        return BufferedImage.TYPE_INT_ARGB;
+    }
+
+    public synchronized ColorModel getColorModel() {
+        return new DirectColorModel(ColorSpace.getInstance(ColorSpace.CS_sRGB),
+                                    32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000, true,
+                                    DataBuffer.TYPE_INT);
+    }
+
+    public BufferedImage createCompatibleImage(int width, int height) {
+        if (width <= 0 || height <= 0)
+            return null;
+        return BDImage.getBuffededImage(width, height, this);
+    }
+
+    public BufferedImage createCompatibleImage(int width, int height, int trans) {
+        if (width <= 0 || height <= 0)
+            return null;
+        return BDImage.getBuffededImage(width, height, this);
+    }
+
+    public VolatileImage createCompatibleVolatileImage(int width, int height) {
+        org.videolan.Logger.unimplemented("BDGraphicsConfiguration", "createCompatibleVolatileImage");
+        return null;
+    }
+}