This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
FYI: Patch: javax.swing.UIDefaults
- From: Michael Koch <konqueror at gmx dot de>
- To: java-patches at gcc dot gnu dot org
- Date: Thu, 27 Nov 2003 10:08:05 +0100
- Subject: FYI: Patch: javax.swing.UIDefaults
Hi list,
I commited the attached patch to merge javax.swing.UIDefaults with classpath
again.
Michael
Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/libjava/ChangeLog,v
retrieving revision 1.2373
diff -u -b -B -r1.2373 ChangeLog
--- ChangeLog 27 Nov 2003 08:53:41 -0000 1.2373
+++ ChangeLog 27 Nov 2003 09:03:30 -0000
@@ -1,3 +1,8 @@
+2003-11-27 Michael Koch <konqueror@gmx.de>
+
+ * javax/swing/UIDefaults.java:
+ Reformated to match classpath's version.
+
2003-11-27 Sascha Brawer <brawer@dandelis.ch>
* javax/swing/UIManager.java (getDefaults, getDimension,
Index: javax/swing/UIDefaults.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/UIDefaults.java,v
retrieving revision 1.5
diff -u -b -B -r1.5 UIDefaults.java
--- javax/swing/UIDefaults.java 18 Nov 2003 01:36:56 -0000 1.5
+++ javax/swing/UIDefaults.java 27 Nov 2003 09:03:30 -0000
@@ -80,11 +80,11 @@
public static class LazyInputMap implements LazyValue
{
Object[] bind;
- public LazyInputMap (Object[] bindings)
+ public LazyInputMap(Object[] bindings)
{
bind = bindings;
}
- public Object createValue (UIDefaults table)
+ public Object createValue(UIDefaults table)
{
InputMap im = new InputMap ();
for (int i = 0; 2*i+1 < bind.length; ++i)
@@ -104,7 +104,7 @@
public static class ProxyLazyValue implements LazyValue
{
LazyValue inner;
- public ProxyLazyValue (String s)
+ public ProxyLazyValue(String s)
{
final String className = s;
inner = new LazyValue ()
@@ -126,7 +126,7 @@
};
}
- public ProxyLazyValue (String c, String m)
+ public ProxyLazyValue(String c, String m)
{
final String className = c;
final String methodName = m;
@@ -189,7 +189,7 @@
}
inner = new LazyValue ()
{
- public Object createValue (UIDefaults table)
+ public Object createValue(UIDefaults table)
{
try
{
@@ -214,14 +214,14 @@
private static final long serialVersionUID = 7341222528856548117L;
- public UIDefaults ()
+ public UIDefaults()
{
bundles = new LinkedList ();
listeners = new HashSet ();
defaultLocale = Locale.getDefault ();
}
- public UIDefaults (Object[] entries)
+ public UIDefaults(Object[] entries)
{
bundles = new LinkedList ();
listeners = new HashSet ();
@@ -233,7 +233,7 @@
}
}
- public Object get (Object key)
+ public Object get(Object key)
{
return this.get (key, getDefaultLocale ());
}
@@ -311,79 +311,79 @@
public Font getFont(Object key)
{
- Object o = get (key);
+ Object o = get(key);
return o instanceof Font ? (Font) o : null;
}
public Font getFont(Object key, Locale l)
{
- Object o = get (key, l);
+ Object o = get(key, l);
return o instanceof Font ? (Font) o : null;
}
public Color getColor(Object key)
{
- Object o = get (key);
+ Object o = get(key);
return o instanceof Color ? (Color) o : null;
}
public Color getColor(Object key, Locale l)
{
- Object o = get (key, l);
+ Object o = get(key, l);
return o instanceof Color ? (Color) o : null;
}
public Icon getIcon(Object key)
{
- Object o = get (key);
+ Object o = get(key);
return o instanceof Icon ? (Icon) o : null;
}
public Icon getIcon(Object key, Locale l)
{
- Object o = get (key, l);
+ Object o = get(key, l);
return o instanceof Icon ? (Icon) o : null;
}
public Border getBorder(Object key)
{
- Object o = get (key);
+ Object o = get(key);
return o instanceof Border ? (Border) o : null;
}
public Border getBorder(Object key, Locale l)
{
- Object o = get (key, l);
+ Object o = get(key, l);
return o instanceof Border ? (Border) o : null;
}
public String getString(Object key)
{
- Object o = get (key);
+ Object o = get(key);
return o instanceof String ? (String) o : null;
}
public String getString(Object key, Locale l)
{
- Object o = get (key, l);
+ Object o = get(key, l);
return o instanceof String ? (String) o : null;
}
int getInt(Object key)
{
- Object o = get (key);
+ Object o = get(key);
return o instanceof Integer ? ((Integer) o).intValue() : 0;
}
int getInt(Object key, Locale l)
{
- Object o = get (key, l);
+ Object o = get(key, l);
return o instanceof Integer ? ((Integer) o).intValue() : 0;
}
public boolean getBoolean(Object key)
{
- return Boolean.TRUE.equals (get (key));
+ return Boolean.TRUE.equals(get(key));
}
public boolean getBoolean(Object key, Locale l)
@@ -393,25 +393,25 @@
public Insets getInsets(Object key)
{
- Object o = get (key);
+ Object o = get(key);
return o instanceof Insets ? (Insets) o : null;
}
public Insets getInsets(Object key, Locale l)
{
- Object o = get (key, l);
+ Object o = get(key, l);
return o instanceof Insets ? (Insets) o : null;
}
public Dimension getDimension(Object key)
{
- Object o = get (key);
+ Object o = get(key);
return o instanceof Dimension ? (Dimension) o : null;
}
public Dimension getDimension(Object key, Locale l)
{
- Object o = get (key, l);
+ Object o = get(key, l);
return o instanceof Dimension ? (Dimension) o : null;
}