ice: import from f16

1 files changed, 44 insertions, 0 deletions

diff --git a/ice-3.4.2-jgoodies.patch b/ice-3.4.2-jgoodies.patch
new file mode 100644
index 0000000..ac2c299
--- /dev/null
+++ b/ice-3.4.2-jgoodies.patch
@@ -0,0 +1,44 @@
+diff --git a/java/config/build.properties b/java/config/build.properties
+index 6d53b7b..224b16b 100644
+--- a/java/config/build.properties
++++ b/java/config/build.properties
+@@ -31,9 +31,9 @@ lint = unchecked,deprecation
+ # These properties only need to be set if you want to build the
+ # standalone jar for the IceGrid GUI.
+ #
+-jgoodies.common = /usr/share/java/jgoodies-common-1.2.0.jar
+-jgoodies.forms  = /usr/share/java/jgoodies-forms-1.4.1.jar
+-jgoodies.looks  = /usr/share/java/jgoodies-looks-2.4.1.jar
++jgoodies.common = /usr/share/java/jgoodies-common.jar
++jgoodies.forms  = /usr/share/java/jgoodies-forms.jar
++jgoodies.looks  = /usr/share/java/jgoodies-looks.jar
+ #jgoodies.common = C:/Program\ Files/ZeroC/Ice-${ice.version}-ThirdParty/lib/jgoodies-common-1.2.0.jar
+ #jgoodies.forms  = C:/Program\ Files/ZeroC/Ice-${ice.version}-ThirdParty/lib/jgoodies-forms-1.4.1.jar
+ #jgoodies.looks  = C:/Program\ Files/ZeroC/Ice-${ice.version}-ThirdParty/lib/jgoodies-looks-2.4.1.jar
+diff --git a/java/src/IceGridGUI/ApplicationPane.java b/java/src/IceGridGUI/ApplicationPane.java
+index d35baae..b98766a 100644
+--- a/java/src/IceGridGUI/ApplicationPane.java
++++ b/java/src/IceGridGUI/ApplicationPane.java
+@@ -29,7 +29,6 @@ import javax.swing.tree.TreeSelectionModel;
+ 
+ import com.jgoodies.looks.Options;
+ import com.jgoodies.looks.plastic.PlasticLookAndFeel;
+-import com.jgoodies.looks.windows.WindowsLookAndFeel;
+ import com.jgoodies.forms.factories.Borders;
+ 
+ import IceGrid.*;
+diff --git a/java/src/IceGridGUI/SimpleInternalFrame.java b/java/src/IceGridGUI/SimpleInternalFrame.java
+index 8f3b017..a60689a 100644
+--- a/java/src/IceGridGUI/SimpleInternalFrame.java
++++ b/java/src/IceGridGUI/SimpleInternalFrame.java
+@@ -373,8 +373,8 @@ public class SimpleInternalFrame extends JPanel {
+             UIManager.getColor("SimpleInternalFrame.activeTitleBackground");
+         if (c != null)
+             return c;
+-        if (SystemUtils.IS_LAF_WINDOWS_XP_ENABLED)
+-            c = UIManager.getColor("InternalFrame.activeTitleGradient");
++        /*if (SystemUtils.IS_LAF_WINDOWS_XP_ENABLED)
++            c = UIManager.getColor("InternalFrame.activeTitleGradient");*/
+         return c != null
+             ? c
+             : UIManager.getColor("InternalFrame.activeTitleBackground");