[libjide-oss-java] 03/05: Drop XPStyle.java.patch. Fixed upstream.

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository libjide-oss-java.

commit 8fc85fa3f84ee856d41e80bc25b7efe330c3ca51
Author: Markus Koschany <apo at gambaru.de>
Date:   Sat Aug 2 19:45:58 2014 +0200

    Drop XPStyle.java.patch. Fixed upstream.
---
 debian/patches/XPStyle.java.patch | 40 ---------------------------------------
 debian/patches/series             |  1 -
 2 files changed, 41 deletions(-)

diff --git a/debian/patches/XPStyle.java.patch b/debian/patches/XPStyle.java.patch
deleted file mode 100644
index 7802a81..0000000
--- a/debian/patches/XPStyle.java.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Markus Koschany <apo at gambaru.de>
-Date: Thu, 14 Mar 2013 00:26:09 +0100
-Subject: XPStyle.java
-
-Make XPStyle.java compile
----
- src/com/jidesoft/plaf/windows/XPStyle.java | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/com/jidesoft/plaf/windows/XPStyle.java b/src/com/jidesoft/plaf/windows/XPStyle.java
-index 74d4938..2b4f233 100644
---- a/src/com/jidesoft/plaf/windows/XPStyle.java
-+++ b/src/com/jidesoft/plaf/windows/XPStyle.java
-@@ -635,7 +635,7 @@ public class XPStyle {
- 
-         protected void paintToImage(Component c, Image image, Graphics g,
-                                     int w, int h, Object[] args) {
--            if (!SystemInfo.isJdk7Above()) {
-+/*          if (!SystemInfo.isJdk7Above()) {
-                 sun.awt.image.CachingSurfaceManager csm = null;
-                 boolean accEnabled = false;
-                 Skin skin = (Skin) args[0];
-@@ -672,7 +672,7 @@ public class XPStyle {
-                 }
-             }
-             else {  // copied from JDK7 XPStyle. To make the code compilable under JDk6, we use RefectionUtils
--                boolean accEnabled = false;
-+*/              boolean accEnabled = false;
-                 Skin skin = (Skin) args[0];
-                 Part part = skin.part;
-                 State state = (State) args[1];
-@@ -701,7 +701,7 @@ public class XPStyle {
-                 catch (Exception e) {
-                     e.printStackTrace();
-                 }
--            }
-+//          }
-         }
- 
-         protected Image createImage(Component c, int w, int h,
diff --git a/debian/patches/series b/debian/patches/series
index fa1ff86..e3bca3f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 AquaJidePopupMenuUI.java.patch
-XPStyle.java.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libjide-oss-java.git