diff options
author | Mark Wielaard <mark@klomp.org> | 2004-07-31 17:15:12 +0000 |
---|---|---|
committer | Mark Wielaard <mark@klomp.org> | 2004-07-31 17:15:12 +0000 |
commit | 81043543d0adc2223c8b857165bb349238b28fb4 (patch) | |
tree | 2532e6f17f4b2602471fd27f49b3dbe814cc5ca0 /javax | |
parent | f2d307f6ef8cf0162002bec3b723d5410c606547 (diff) | |
download | classpath-81043543d0adc2223c8b857165bb349238b28fb4.tar.gz |
* gnu/java/awt/EmbeddedWindow.java: Reindent.
* gnu/java/awt/image/ImageDecoder.java: Reindent.
* gnu/java/awt/peer/gtk/GtkComponentPeer.java: Reindent.
* gnu/java/awt/peer/gtk/GtkFileDialogPeer.java: Reindent.
* java/awt/DefaultKeyboardFocusManager.java: Reindent.
* java/awt/Frame.java: Reindent.
* javax/swing/JCheckBox.java: Reindent.
* javax/swing/JCheckBoxMenuItem.java: Reindent.
* javax/swing/UIDefaults.java: Reindent.
* javax/swing/UIManager.java: Reindent.
Diffstat (limited to 'javax')
-rw-r--r-- | javax/swing/JCheckBox.java | 60 | ||||
-rw-r--r-- | javax/swing/JCheckBoxMenuItem.java | 2 | ||||
-rw-r--r-- | javax/swing/UIDefaults.java | 116 | ||||
-rw-r--r-- | javax/swing/UIManager.java | 2 |
4 files changed, 89 insertions, 91 deletions
diff --git a/javax/swing/JCheckBox.java b/javax/swing/JCheckBox.java index f5cc78ace..7c48ffac0 100644 --- a/javax/swing/JCheckBox.java +++ b/javax/swing/JCheckBox.java @@ -48,7 +48,7 @@ import javax.accessibility.AccessibleContext; public class JCheckBox extends JToggleButton { private static final long serialVersionUID = -5246739313864538930L; - + private boolean borderPaintedFlat; private void init() @@ -57,20 +57,20 @@ public class JCheckBox extends JToggleButton contentAreaFilled = false; } - public JCheckBox() - { + public JCheckBox() + { super(); init(); - } + } public JCheckBox(Action action) - { + { super(action); init(); - } + } - public JCheckBox(Icon icon) - { + public JCheckBox(Icon icon) + { super(icon); init(); } @@ -79,10 +79,10 @@ public class JCheckBox extends JToggleButton { super(icon, selected); init(); - } + } - public JCheckBox(String text) - { + public JCheckBox(String text) + { super(text); init(); } @@ -91,41 +91,41 @@ public class JCheckBox extends JToggleButton { super(text, selected); init(); - } + } - public JCheckBox(String text, Icon icon) - { - super(text, icon); + public JCheckBox(String text, Icon icon) + { + super(text, icon); init(); - } + } public JCheckBox(String text, Icon icon, boolean selected) { super(text, icon, selected); init(); } - + /** * Gets the AccessibleContext associated with this JCheckBox. */ - public AccessibleContext getAccessibleContext() - { - return null; - } + public AccessibleContext getAccessibleContext() + { + return null; + } /** - * Returns a string that specifies the name of the L&F class + * Returns a string that specifies the name of the Look and Feel class * that renders this component. */ - public String getUIClassID() - { - return "CheckBoxUI"; - } + public String getUIClassID() + { + return "CheckBoxUI"; + } - protected String paramString() - { - return "JCheckBox"; - } + protected String paramString() + { + return "JCheckBox"; + } public boolean isBorderPaintedFlat() { diff --git a/javax/swing/JCheckBoxMenuItem.java b/javax/swing/JCheckBoxMenuItem.java index e0ebb7f8d..f3868870f 100644 --- a/javax/swing/JCheckBoxMenuItem.java +++ b/javax/swing/JCheckBoxMenuItem.java @@ -205,7 +205,7 @@ public class JCheckBoxMenuItem extends JMenuItem implements SwingConstants, * This method overrides JComponent.requestFocus with an empty * implementation, since JCheckBoxMenuItems should not * receve focus in general. - */ + */ public void requestFocus() { // Should do nothing here diff --git a/javax/swing/UIDefaults.java b/javax/swing/UIDefaults.java index f72c2748c..44fa4f3bc 100644 --- a/javax/swing/UIDefaults.java +++ b/javax/swing/UIDefaults.java @@ -51,8 +51,6 @@ import java.util.ListIterator; import java.util.Locale; import java.util.MissingResourceException; import java.util.ResourceBundle; -import java.util.Set; - import javax.swing.border.Border; import javax.swing.plaf.ComponentUI; @@ -111,9 +109,9 @@ public class UIDefaults extends Hashtable try { return Class - .forName (className) - .getConstructor (new Class[] {}) - .newInstance (new Object[] {}); + .forName(className) + .getConstructor(new Class[] {}) + .newInstance(new Object[] {}); } catch (Exception e) { @@ -146,54 +144,54 @@ public class UIDefaults extends Hashtable }; } - public ProxyLazyValue (String c, Object[] os) + public ProxyLazyValue(String c, Object[] os) { final String className = c; final Object[] objs = os; final Class[] clss = new Class[objs.length]; for (int i = 0; i < objs.length; ++i) { - clss[i] = objs[i].getClass (); + clss[i] = objs[i].getClass(); } - inner = new LazyValue () + inner = new LazyValue() { - public Object createValue (UIDefaults table) + public Object createValue(UIDefaults table) { try { return Class - .forName (className) - .getConstructor (clss) - .newInstance (objs); - } + .forName(className) + .getConstructor(clss) + .newInstance(objs); + } catch (Exception e) - { + { return null; } } }; } - public ProxyLazyValue (String c, String m, Object[] os) + public ProxyLazyValue(String c, String m, Object[] os) { final String className = c; final String methodName = m; final Object[] objs = os; final Class[] clss = new Class[objs.length]; for (int i = 0; i < objs.length; ++i) - { - clss[i] = objs[i].getClass (); - } - inner = new LazyValue () + { + clss[i] = objs[i].getClass(); + } + inner = new LazyValue() { - public Object createValue(UIDefaults table) - { + public Object createValue(UIDefaults table) + { try { return Class - .forName (className) - .getMethod (methodName, clss) - .invoke (null, objs); + .forName(className) + .getMethod(methodName, clss) + .invoke(null, objs); } catch (Exception e) { @@ -203,9 +201,9 @@ public class UIDefaults extends Hashtable }; } - public Object createValue (UIDefaults table) + public Object createValue(UIDefaults table) { - return inner.createValue (table); + return inner.createValue(table); } } @@ -213,46 +211,46 @@ public class UIDefaults extends Hashtable public UIDefaults() { - bundles = new LinkedList (); - defaultLocale = Locale.getDefault (); + bundles = new LinkedList(); + defaultLocale = Locale.getDefault(); propertyChangeSupport = new PropertyChangeSupport(this); } public UIDefaults(Object[] entries) { this(); - - for (int i = 0; (2*i+1) < entries.length; ++i) - put (entries[2*i], entries[2*i+1]); - } + + for (int i = 0; (2 * i + 1) < entries.length; ++i) + put(entries[2 * i], entries[2 * i + 1]); + } public Object get(Object key) { - return this.get (key, getDefaultLocale ()); + return this.get(key, getDefaultLocale()); } - public Object get (Object key, Locale loc) + public Object get(Object key, Locale loc) { Object obj = null; - if (super.containsKey (key)) + if (super.containsKey(key)) { - obj = super.get (key); + obj = super.get(key); } else if (key instanceof String) { String keyString = (String) key; - ListIterator i = bundles.listIterator (0); - while (i.hasNext ()) - { - String bundle_name = (String) i.next (); + ListIterator i = bundles.listIterator(0); + while (i.hasNext()) + { + String bundle_name = (String) i.next(); ResourceBundle res = - ResourceBundle.getBundle (bundle_name, loc); + ResourceBundle.getBundle(bundle_name, loc); if (res != null) { try { - obj = res.getObject (keyString); + obj = res.getObject(keyString); break; } catch (MissingResourceException me) @@ -272,14 +270,14 @@ public class UIDefaults extends Hashtable if (obj instanceof LazyValue) { - Object resolved = ((LazyValue)obj).createValue (this); - super.remove (key); - super.put (key, resolved); + Object resolved = ((LazyValue) obj).createValue(this); + super.remove(key); + super.put(key, resolved); return resolved; } else if (obj instanceof ActiveValue) { - return ((ActiveValue)obj).createValue (this); + return ((ActiveValue) obj).createValue(this); } return obj; @@ -287,19 +285,19 @@ public class UIDefaults extends Hashtable public Object put(Object key, Object value) { - Object old = super.put (key, value); + Object old = super.put(key, value); if (key instanceof String && old != value) - firePropertyChange ((String) key, old, value); + firePropertyChange((String) key, old, value); return old; } public void putDefaults(Object[] entries) { - for (int i = 0; (2*i+1) < entries.length; ++i) + for (int i = 0; (2 * i + 1) < entries.length; ++i) { - super.put (entries[2*i], entries[2*i+1]); + super.put(entries[2 * i], entries[2 * i + 1]); } - firePropertyChange ("UIDefaults", null, null); + firePropertyChange("UIDefaults", null, null); } public Font getFont(Object key) @@ -455,20 +453,20 @@ public class UIDefaults extends Hashtable { getUIError ("failed to locate createUI method on " + cls.toString ()); return null; - } + } try - { + { return (ComponentUI) factory.invoke (null, new Object[] { target }); - } + } catch (java.lang.reflect.InvocationTargetException ite) - { + { getUIError ("InvocationTargetException ("+ ite.getTargetException() +") calling createUI(...) on " + cls.toString ()); return null; - } + } catch (Exception e) - { + { getUIError ("exception calling createUI(...) on " + cls.toString ()); return null; } @@ -497,12 +495,12 @@ public class UIDefaults extends Hashtable public void addResourceBundle(String name) { - bundles.addFirst (name); + bundles.addFirst(name); } public void removeResourceBundle(String name) { - bundles.remove (name); + bundles.remove(name); } public void setDefaultLocale(Locale loc) diff --git a/javax/swing/UIManager.java b/javax/swing/UIManager.java index 4aaed6f77..d7ebad9a5 100644 --- a/javax/swing/UIManager.java +++ b/javax/swing/UIManager.java @@ -278,7 +278,7 @@ public class UIManager implements Serializable } /** - * Returns the L&F object that renders the target component. + * Returns the Look and Feel object that renders the target component. */ public static ComponentUI getUI(JComponent target) { |