changeset 2019:d3b07a3dd0da

Fix merge discrepancies.
author andrew
date Mon, 14 Dec 2009 18:46:12 +0000
parents 5f24048612f3
children 35224dd04ddb
files src/share/classes/java/awt/color/ICC_Profile.java src/share/classes/javax/swing/plaf/basic/BasicButtonUI.java
diffstat 2 files changed, 0 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/java/awt/color/ICC_Profile.java	Fri Dec 04 16:29:44 2009 +0000
+++ b/src/share/classes/java/awt/color/ICC_Profile.java	Mon Dec 14 18:46:12 2009 +0000
@@ -1834,7 +1834,6 @@
                     f = new File(fullPath);
                 }
             }
-        }
 
         if ((f == null) || (!f.isFile())) {
             /* try the directory of built-in profiles */
--- a/src/share/classes/javax/swing/plaf/basic/BasicButtonUI.java	Fri Dec 04 16:29:44 2009 +0000
+++ b/src/share/classes/javax/swing/plaf/basic/BasicButtonUI.java	Mon Dec 14 18:46:12 2009 +0000
@@ -62,8 +62,6 @@
 
     private static final Object BASIC_BUTTON_UI_KEY = new Object();
 
-    private static final Object BASIC_BUTTON_UI_KEY = new Object();
-
     // ********************************
     //          Create PLAF
     // ********************************