rpms/jgoodies-looks/devel jgoodies-looks-no-com-sun.patch, 1.1, 1.2 jgoodies-looks-remove-jdk-stuff.patch, 1.1, 1.2
Mary Ellen Foster
mef at fedoraproject.org
Wed Jan 28 16:16:33 UTC 2009
- Previous message (by thread): rpms/jgoodies-looks/devel jgoodies-looks-demo-manifest.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 jgoodies-looks.spec, 1.2, 1.3 sources, 1.2, 1.3
- Next message (by thread): rpms/kdeutils/F-9 kdeutils.spec,1.134,1.135 sources,1.59,1.60
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mef
Update of /cvs/pkgs/rpms/jgoodies-looks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21290
Modified Files:
jgoodies-looks-no-com-sun.patch
jgoodies-looks-remove-jdk-stuff.patch
Log Message:
Adding correct patches
jgoodies-looks-no-com-sun.patch:
Index: jgoodies-looks-no-com-sun.patch
===================================================================
RCS file: /cvs/pkgs/rpms/jgoodies-looks/devel/jgoodies-looks-no-com-sun.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jgoodies-looks-no-com-sun.patch 20 Nov 2007 20:07:59 -0000 1.1
+++ jgoodies-looks-no-com-sun.patch 28 Jan 2009 16:16:02 -0000 1.2
@@ -1,7 +1,7 @@
-diff -ur --ignore-all-space looks-2.1.3/src.orig/core/com/jgoodies/looks/Options.java looks-2.1.3/src/core/com/jgoodies/looks/Options.java
---- looks-2.1.3/src.orig/core/com/jgoodies/looks/Options.java 2007-02-21 17:55:14.000000000 +0100
-+++ looks-2.1.3/src/core/com/jgoodies/looks/Options.java 2007-04-12 14:31:28.000000000 +0200
-@@ -38,8 +38,6 @@
+diff -ur looks-2.2.1.orig/src/core/com/jgoodies/looks/Options.java looks-2.2.1/src/core/com/jgoodies/looks/Options.java
+--- looks-2.2.1.orig/src/core/com/jgoodies/looks/Options.java 2009-01-28 16:40:46.000000000 +0100
++++ looks-2.2.1/src/core/com/jgoodies/looks/Options.java 2009-01-28 16:41:43.000000000 +0100
+@@ -40,8 +40,6 @@
import com.jgoodies.looks.common.ShadowPopup;
import com.jgoodies.looks.plastic.PlasticLookAndFeel;
@@ -9,8 +9,8 @@
-import com.sun.java.swing.plaf.windows.WindowsComboBoxUI;
/**
- * Provides access to optional features of the JGoodies L&Fs
-@@ -723,12 +721,6 @@
+ * Provides access to optional features of the JGoodies L&Fs
+@@ -895,12 +893,6 @@
putLookAndFeelReplacement(
"javax.swing.plaf.metal.MetalLookAndFeel",
PLASTIC3D_NAME);
@@ -23,18 +23,18 @@
}
/**
-Only in looks-2.1.3/src.orig/core/com/jgoodies/looks: windows
-diff -ur --ignore-all-space looks-2.1.3/src.orig/demo/com/jgoodies/looks/demo/DemoFrame.java looks-2.1.3/src/demo/com/jgoodies/looks/demo/DemoFrame.java
---- looks-2.1.3/src.orig/demo/com/jgoodies/looks/demo/DemoFrame.java 2007-02-21 17:55:14.000000000 +0100
-+++ looks-2.1.3/src/demo/com/jgoodies/looks/demo/DemoFrame.java 2007-04-12 14:32:22.000000000 +0200
+Only in looks-2.2.1.orig/src/core/com/jgoodies/looks: windows
+diff -ur looks-2.2.1.orig/src/demo/com/jgoodies/looks/demo/DemoFrame.java looks-2.2.1/src/demo/com/jgoodies/looks/demo/DemoFrame.java
+--- looks-2.2.1.orig/src/demo/com/jgoodies/looks/demo/DemoFrame.java 2009-01-28 16:40:46.000000000 +0100
++++ looks-2.2.1/src/demo/com/jgoodies/looks/demo/DemoFrame.java 2009-01-28 16:42:31.000000000 +0100
@@ -46,7 +46,6 @@
import com.jgoodies.looks.LookUtils;
import com.jgoodies.looks.Options;
import com.jgoodies.looks.plastic.PlasticLookAndFeel;
-import com.jgoodies.looks.windows.WindowsLookAndFeel;
- /**
- * Builds the main frame in the Simple Looks Demo.
+ /**
+ * Builds the main frame in the Simple Looks Demo.
@@ -218,9 +217,6 @@
PlasticLookAndFeel.BORDER_STYLE_KEY,
settings.getToolBarPlasticBorderStyle());
@@ -45,9 +45,16 @@
PlasticLookAndFeel.IS_3D_KEY,
settings.getToolBar3DHint());
-diff -ur --ignore-all-space looks-2.1.3/src.orig/demo/com/jgoodies/looks/demo/MenuBarView.java looks-2.1.3/src/demo/com/jgoodies/looks/demo/MenuBarView.java
---- looks-2.1.3/src.orig/demo/com/jgoodies/looks/demo/MenuBarView.java 2007-02-21 17:55:14.000000000 +0100
-+++ looks-2.1.3/src/demo/com/jgoodies/looks/demo/MenuBarView.java 2007-04-12 14:32:28.000000000 +0200
+@@ -384,4 +380,4 @@
+ }
+
+
+-}
+\ No newline at end of file
++}
+diff -ur looks-2.2.1.orig/src/demo/com/jgoodies/looks/demo/MenuBarView.java looks-2.2.1/src/demo/com/jgoodies/looks/demo/MenuBarView.java
+--- looks-2.2.1.orig/src/demo/com/jgoodies/looks/demo/MenuBarView.java 2009-01-28 16:40:46.000000000 +0100
++++ looks-2.2.1/src/demo/com/jgoodies/looks/demo/MenuBarView.java 2009-01-28 16:42:54.000000000 +0100
@@ -39,7 +39,6 @@
import com.jgoodies.looks.Options;
@@ -55,19 +62,26 @@
-import com.jgoodies.looks.windows.WindowsLookAndFeel;
/**
- * Builds the menu bar and pull-down menus in the Simple Looks Demo.
+ * Builds the menu bar and pull-down menus in the Simple Looks Demo.
@@ -74,8 +73,6 @@
settings.getMenuBarHeaderStyle());
- bar.putClientProperty(PlasticLookAndFeel.BORDER_STYLE_KEY,
+ bar.putClientProperty(PlasticLookAndFeel.BORDER_STYLE_KEY,
settings.getMenuBarPlasticBorderStyle());
-- bar.putClientProperty(WindowsLookAndFeel.BORDER_STYLE_KEY,
+- bar.putClientProperty(WindowsLookAndFeel.BORDER_STYLE_KEY,
- settings.getMenuBarWindowsBorderStyle());
bar.putClientProperty(PlasticLookAndFeel.IS_3D_KEY,
settings.getMenuBar3DHint());
-diff -ur --ignore-all-space looks-2.1.3/src.orig/demo/FontTest.java looks-2.1.3/src/demo/FontTest.java
---- looks-2.1.3/src.orig/demo/FontTest.java 2007-02-21 17:55:14.000000000 +0100
-+++ looks-2.1.3/src/demo/FontTest.java 2007-04-12 14:32:56.000000000 +0200
+@@ -455,4 +452,4 @@
+ }
+
+
+-}
+\ No newline at end of file
++}
+diff -ur looks-2.2.1.orig/src/demo/FontTest.java looks-2.2.1/src/demo/FontTest.java
+--- looks-2.2.1.orig/src/demo/FontTest.java 2009-01-28 16:40:46.000000000 +0100
++++ looks-2.2.1/src/demo/FontTest.java 2009-01-28 16:43:31.000000000 +0100
@@ -11,7 +11,6 @@
import com.jgoodies.looks.LookUtils;
import com.jgoodies.looks.plastic.PlasticLookAndFeel;
@@ -76,17 +90,23 @@
/**
-@@ -275,13 +274,8 @@
+@@ -275,12 +274,7 @@
+
-
private FontSet getWindowsFontSet() {
- try {
- UIManager.setLookAndFeel(new WindowsLookAndFeel());
- return WindowsLookAndFeel.getFontPolicy().getFontSet("Windows", UIManager.getDefaults());
- } catch (UnsupportedLookAndFeelException e) {
return null;
- }
-- }
-
+- }
+ }
+
+
+@@ -313,4 +307,4 @@
+ }
+
- private FontSet getPlasticFontSet() {
+-}
+\ No newline at end of file
++}
jgoodies-looks-remove-jdk-stuff.patch:
Index: jgoodies-looks-remove-jdk-stuff.patch
===================================================================
RCS file: /cvs/pkgs/rpms/jgoodies-looks/devel/jgoodies-looks-remove-jdk-stuff.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jgoodies-looks-remove-jdk-stuff.patch 20 Nov 2007 20:07:59 -0000 1.1
+++ jgoodies-looks-remove-jdk-stuff.patch 28 Jan 2009 16:16:02 -0000 1.2
@@ -1,18 +1,7 @@
-diff -ur jgoodies-looks.orig/src/core/com/jgoodies/looks/plastic/PlasticSpinnerUI.java jgoodies-looks/src/core/com/jgoodies/looks/plastic/PlasticSpinnerUI.java
---- jgoodies-looks.orig/src/core/com/jgoodies/looks/plastic/PlasticSpinnerUI.java 2007-04-17 15:08:46.000000000 +0100
-+++ jgoodies-looks/src/core/com/jgoodies/looks/plastic/PlasticSpinnerUI.java 2007-11-16 17:20:10.000000000 +0000
-@@ -34,12 +34,16 @@
- import java.awt.Insets;
- import java.awt.LayoutManager;
-
--import javax.swing.*;
-+import javax.swing.JComponent;
-+import javax.swing.JPanel;
-+import javax.swing.JSpinner;
-+import javax.swing.JTextField;
-+import javax.swing.SwingConstants;
-+import javax.swing.UIManager;
- import javax.swing.border.EmptyBorder;
+diff -ur looks-2.2.1.orig/src/core/com/jgoodies/looks/plastic/PlasticSpinnerUI.java looks-2.2.1/src/core/com/jgoodies/looks/plastic/PlasticSpinnerUI.java
+--- looks-2.2.1.orig/src/core/com/jgoodies/looks/plastic/PlasticSpinnerUI.java 2009-01-28 16:40:46.000000000 +0100
++++ looks-2.2.1/src/core/com/jgoodies/looks/plastic/PlasticSpinnerUI.java 2009-01-28 16:53:49.000000000 +0100
+@@ -39,7 +39,6 @@
import javax.swing.plaf.ComponentUI;
import javax.swing.plaf.basic.BasicSpinnerUI;
@@ -20,20 +9,20 @@
import com.jgoodies.looks.common.ExtBasicSpinnerLayout;
-@@ -60,56 +64,6 @@
+@@ -60,56 +59,6 @@
/**
-- * The mouse/action listeners that are added to the spinner's
-- * arrow buttons. These listeners are shared by all
+- * The mouse/action listeners that are added to the spinner's
+- * arrow buttons. These listeners are shared by all
- * spinner arrow buttons.
-- *
+- *
- * @see #createNextButton
- * @see #createPreviousButton
- */
-- private static final ExtBasicArrowButtonHandler nextButtonHandler
+- private static final ExtBasicArrowButtonHandler nextButtonHandler
- = new ExtBasicArrowButtonHandler("increment", true);
-- private static final ExtBasicArrowButtonHandler previousButtonHandler
+- private static final ExtBasicArrowButtonHandler previousButtonHandler
- = new ExtBasicArrowButtonHandler("decrement", false);
-
-
@@ -77,7 +66,7 @@
* Create a <code>LayoutManager</code> that manages the <code>editor</code>,
* <code>nextButton</code>, and <code>previousButton</code> children
* of the JSpinner. These three children must be added with a constraint
-@@ -196,31 +150,4 @@
+@@ -196,31 +145,4 @@
}
}
@@ -97,57 +86,48 @@
- int arrowHeight = Math.min((height - 4) / 3, (width - 4) / 3);
- return Math.max(arrowHeight, 3);
- }
--
+-
- protected int calculateArrowOffset() {
- return 1;
- }
--
+-
- protected boolean isPaintingNorthBottom() {
- return true;
- }
--
+-
- }
-
-}
\ No newline at end of file
+}
-diff -ur jgoodies-looks.orig/src/core/com/jgoodies/looks/plastic/PlasticXPSpinnerUI.java jgoodies-looks/src/core/com/jgoodies/looks/plastic/PlasticXPSpinnerUI.java
---- jgoodies-looks.orig/src/core/com/jgoodies/looks/plastic/PlasticXPSpinnerUI.java 2007-04-17 15:08:46.000000000 +0100
-+++ jgoodies-looks/src/core/com/jgoodies/looks/plastic/PlasticXPSpinnerUI.java 2007-11-16 17:20:33.000000000 +0000
-@@ -30,17 +30,8 @@
-
- package com.jgoodies.looks.plastic;
-
--import java.awt.Color;
--import java.awt.Component;
--import java.awt.Graphics;
--
- import javax.swing.JComponent;
--import javax.swing.SwingConstants;
--import javax.swing.UIManager;
+diff -ur looks-2.2.1.orig/src/core/com/jgoodies/looks/plastic/PlasticXPSpinnerUI.java looks-2.2.1/src/core/com/jgoodies/looks/plastic/PlasticXPSpinnerUI.java
+--- looks-2.2.1.orig/src/core/com/jgoodies/looks/plastic/PlasticXPSpinnerUI.java 2009-01-28 16:40:46.000000000 +0100
++++ looks-2.2.1/src/core/com/jgoodies/looks/plastic/PlasticXPSpinnerUI.java 2009-01-28 16:54:46.000000000 +0100
+@@ -40,8 +40,6 @@
import javax.swing.plaf.ComponentUI;
--import javax.swing.plaf.metal.MetalLookAndFeel;
--
--import com.jgoodies.looks.common.ExtBasicArrowButtonHandler;
+ import javax.swing.plaf.metal.MetalLookAndFeel;
+-import com.jgoodies.looks.common.ExtBasicArrowButtonHandler;
+-
/**
-@@ -57,204 +48,4 @@
+ * The JGoodies PlasticXP Look&Feel implementation of <code>SpinnerUI</code>.
+@@ -57,204 +55,4 @@
return new PlasticXPSpinnerUI();
}
-
- /**
-- * The mouse/action listeners that are added to the spinner's
-- * arrow buttons. These listeners are shared by all
+- * The mouse/action listeners that are added to the spinner's
+- * arrow buttons. These listeners are shared by all
- * spinner arrow buttons.
-- *
+- *
- * @see #createNextButton
- * @see #createPreviousButton
- */
-- private static final ExtBasicArrowButtonHandler NEXT_BUTTON_HANDLER
+- private static final ExtBasicArrowButtonHandler NEXT_BUTTON_HANDLER
- = new ExtBasicArrowButtonHandler("increment", true);
-- private static final ExtBasicArrowButtonHandler PREVIOUS_BUTTON_HANDLER
+- private static final ExtBasicArrowButtonHandler PREVIOUS_BUTTON_HANDLER
- = new ExtBasicArrowButtonHandler("decrement", false);
-
-
@@ -205,17 +185,17 @@
- int arrowHeight = Math.min((height - 4) / 3, (width - 4) / 3);
- return Math.max(arrowHeight, 3);
- }
--
+-
- protected boolean isPaintingNorthBottom() {
- return true;
- }
--
+-
- protected int calculateArrowOffset() {
- return 1;
- }
-
-- protected void paintNorth(Graphics g, boolean leftToRight, boolean isEnabled,
-- Color arrowColor, boolean isPressed,
+- protected void paintNorth(Graphics g, boolean leftToRight, boolean isEnabled,
+- Color arrowColor, boolean isPressed,
- int width, int height, int w, int h, int arrowHeight, int arrowOffset,
- boolean paintBottom) {
- if (!isFreeStanding) {
@@ -277,9 +257,9 @@
-
-
- protected void paintSouth(Graphics g, boolean leftToRight, boolean isEnabled,
-- Color arrowColor, boolean isPressed,
+- Color arrowColor, boolean isPressed,
- int width, int height, int w, int h, int arrowHeight, int arrowOffset) {
--
+-
- if (!isFreeStanding) {
- height += 1;
- if (!leftToRight) {
- Previous message (by thread): rpms/jgoodies-looks/devel jgoodies-looks-demo-manifest.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 jgoodies-looks.spec, 1.2, 1.3 sources, 1.2, 1.3
- Next message (by thread): rpms/kdeutils/F-9 kdeutils.spec,1.134,1.135 sources,1.59,1.60
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list