This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Re: [gui] Implement accessibility for menu classes
Michael Koch wrote:
Am Mittwoch, 29. Dezember 2004 00:53 schrieb Jerry Quinn:
+ /* Create the context if this is the first request */
+ if (accessibleContext == null)
+ {
+ /* Create the context */
+ accessibleContext = new AccessibleAWTCheckboxMenuItem();
+ }
+ return accessibleContext;
Don't you think the code speaks enough without comments in this case ?
Comments are useful but too many comments can obscure code more then
needed.
Can I pin the blame on copy and paste?
2004-12-29 Jerry Quinn <jlquinn@optonline.net>
* java/awt/Button.java,
java/awt/Canvas.java,
java/awt/Checkbox.java,
java/awt/CheckboxMenuItem.java,
java/awt/Choice.java,
java/awt/Dialog.java,
java/awt/Frame.java,
java/awt/Label.java,
java/awt/List.java,
java/awt/Menu.java,
java/awt/MenuBar.java,
java/awt/MenuItem.java,
java/awt/PopupMenu.java,
java/awt/ScrollPane.java,
java/awt/Scrollbar.java,
java/awt/TextArea.java,
java/awt/Window.java (getAccessibleContext): Clean up comments.
Reformat.
* java/awt/Button.java,
java/awt/Checkbox.java,
java/awt/Choice.java,
java/awt/Menu.java,
java/awt/PopupMenu.java,
java/awt/TextArea.java (getAccessibleContext): Only create new
accessible once.
java/awt/TextComponent.java (getAccessibleContext): Implement.
Index: java/awt/Button.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/Button.java,v
retrieving revision 1.12.2.8
diff -u -r1.12.2.8 Button.java
--- java/awt/Button.java 29 Dec 2004 15:53:30 -0000 1.12.2.8
+++ java/awt/Button.java 29 Dec 2004 16:46:57 -0000
@@ -428,9 +428,18 @@
+ getWidth () + "x" + getHeight () + ",label=" + getLabel ();
}
+/**
+ * Gets the AccessibleContext associated with this <code>Button</code>.
+ * The context is created, if necessary.
+ *
+ * @return the associated context
+ */
public AccessibleContext getAccessibleContext()
{
- return new AccessibleAWTButton();
+ /* Create the context if this is the first request */
+ if (accessibleContext == null)
+ accessibleContext = new AccessibleAWTButton();
+ return accessibleContext;
}
/**
Index: java/awt/Canvas.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/Canvas.java,v
retrieving revision 1.4.72.4
diff -u -r1.4.72.4 Canvas.java
--- java/awt/Canvas.java 16 Nov 2004 09:55:29 -0000 1.4.72.4
+++ java/awt/Canvas.java 29 Dec 2004 16:46:57 -0000
@@ -174,10 +174,7 @@
{
/* Create the context if this is the first request */
if (accessibleContext == null)
- {
- /* Create the context */
- accessibleContext = new AccessibleAWTCanvas();
- }
+ accessibleContext = new AccessibleAWTCanvas();
return accessibleContext;
}
Index: java/awt/Checkbox.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/Checkbox.java,v
retrieving revision 1.9.20.3
diff -u -r1.9.20.3 Checkbox.java
--- java/awt/Checkbox.java 22 Nov 2004 03:18:05 -0000 1.9.20.3
+++ java/awt/Checkbox.java 29 Dec 2004 16:46:57 -0000
@@ -490,11 +490,22 @@
+ "," + super.paramString());
}
+/**
+ * Gets the AccessibleContext associated with this <code>CheckBox</code>.
+ * The context is created, if necessary.
+ *
+ * @return the associated context
+ */
public AccessibleContext getAccessibleContext()
{
- AccessibleAWTCheckBox ac = new AccessibleAWTCheckBox();
- addItemListener(ac);
- return ac;
+ /* Create the context if this is the first request */
+ if (accessibleContext == null)
+ {
+ AccessibleAWTCheckBox ac = new AccessibleAWTCheckBox();
+ accessibleContext = ac;
+ addItemListener(ac);
+ }
+ return accessibleContext;
}
} // class Checkbox
Index: java/awt/CheckboxMenuItem.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/CheckboxMenuItem.java,v
retrieving revision 1.9.20.4
diff -u -r1.9.20.4 CheckboxMenuItem.java
--- java/awt/CheckboxMenuItem.java 28 Dec 2004 23:51:22 -0000 1.9.20.4
+++ java/awt/CheckboxMenuItem.java 29 Dec 2004 16:46:57 -0000
@@ -330,7 +330,7 @@
}
/**
- * Gets the AccessibleContext associated with this <code>List</code>.
+ * Gets the AccessibleContext associated with this
<code>CheckboxMenuItem</code>.
* The context is created, if necessary.
*
* @return the associated context
@@ -339,10 +339,7 @@
{
/* Create the context if this is the first request */
if (accessibleContext == null)
- {
- /* Create the context */
- accessibleContext = new AccessibleAWTCheckboxMenuItem();
- }
+ accessibleContext = new AccessibleAWTCheckboxMenuItem();
return accessibleContext;
}
Index: java/awt/Choice.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/Choice.java,v
retrieving revision 1.14.2.3
diff -u -r1.14.2.3 Choice.java
--- java/awt/Choice.java 28 Dec 2004 19:54:40 -0000 1.14.2.3
+++ java/awt/Choice.java 29 Dec 2004 16:46:57 -0000
@@ -566,8 +566,17 @@
return (ItemListener[]) getListeners (ItemListener.class);
}
+ /**
+ * Gets the AccessibleContext associated with this <code>Choice</code>.
+ * The context is created, if necessary.
+ *
+ * @return the associated context
+ */
public AccessibleContext getAccessibleContext()
{
- return new AccessibleAWTChoice();
+ /* Create the context if this is the first request */
+ if (accessibleContext == null)
+ accessibleContext = new AccessibleAWTChoice();
+ return accessibleContext;
}
} // class Choice
Index: java/awt/Dialog.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/Dialog.java,v
retrieving revision 1.13.8.2
diff -u -r1.13.8.2 Dialog.java
--- java/awt/Dialog.java 29 Dec 2004 04:14:27 -0000 1.13.8.2
+++ java/awt/Dialog.java 29 Dec 2004 16:46:57 -0000
@@ -545,10 +545,7 @@
{
/* Create the context if this is the first request */
if (accessibleContext == null)
- {
- /* Create the context */
- accessibleContext = new AccessibleAWTDialog();
- }
+ accessibleContext = new AccessibleAWTDialog();
return accessibleContext;
}
Index: java/awt/Frame.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/Frame.java,v
retrieving revision 1.20.2.5
diff -u -r1.20.2.5 Frame.java
--- java/awt/Frame.java 29 Dec 2004 04:14:27 -0000 1.20.2.5
+++ java/awt/Frame.java 29 Dec 2004 16:46:57 -0000
@@ -583,10 +583,7 @@
{
/* Create the context if this is the first request */
if (accessibleContext == null)
- {
- /* Create the context */
- accessibleContext = new AccessibleAWTFrame();
- }
+ accessibleContext = new AccessibleAWTFrame();
return accessibleContext;
}
Index: java/awt/Label.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/Label.java,v
retrieving revision 1.12.20.4
diff -u -r1.12.20.4 Label.java
--- java/awt/Label.java 16 Nov 2004 09:55:36 -0000 1.12.20.4
+++ java/awt/Label.java 29 Dec 2004 16:46:57 -0000
@@ -306,10 +306,7 @@
{
/* Create the context if this is the first request */
if (accessibleContext == null)
- {
- /* Create the context */
- accessibleContext = new AccessibleAWTLabel();
- }
+ accessibleContext = new AccessibleAWTLabel();
return accessibleContext;
}
Index: java/awt/List.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/List.java,v
retrieving revision 1.17.2.3
diff -u -r1.17.2.3 List.java
--- java/awt/List.java 28 Dec 2004 23:22:06 -0000 1.17.2.3
+++ java/awt/List.java 29 Dec 2004 16:46:57 -0000
@@ -1257,10 +1257,7 @@
{
/* Create the context if this is the first request */
if (accessibleContext == null)
- {
- /* Create the context */
- accessibleContext = new AccessibleAWTList();
- }
+ accessibleContext = new AccessibleAWTList();
return accessibleContext;
}
} // class List
Index: java/awt/Menu.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/Menu.java,v
retrieving revision 1.16.2.4
diff -u -r1.16.2.4 Menu.java
--- java/awt/Menu.java 15 Nov 2004 06:13:34 -0000 1.16.2.4
+++ java/awt/Menu.java 29 Dec 2004 16:46:57 -0000
@@ -451,12 +451,18 @@
}
}
- /* (non-Javadoc)
- * @see java.awt.MenuComponent#getAccessibleContext()
+ /**
+ * Gets the AccessibleContext associated with this <code>Menu</code>.
+ * The context is created, if necessary.
+ *
+ * @return the associated context
*/
public AccessibleContext getAccessibleContext()
{
- return new AccessibleAWTMenu();
+ /* Create the context if this is the first request */
+ if (accessibleContext == null)
+ accessibleContext = new AccessibleAWTMenu();
+ return accessibleContext;
}
} // class Menu
Index: java/awt/MenuBar.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/MenuBar.java,v
retrieving revision 1.13.2.6
diff -u -r1.13.2.6 MenuBar.java
--- java/awt/MenuBar.java 16 Nov 2004 09:55:36 -0000 1.13.2.6
+++ java/awt/MenuBar.java 29 Dec 2004 16:46:57 -0000
@@ -381,10 +381,7 @@
{
/* Create the context if this is the first request */
if (accessibleContext == null)
- {
- /* Create the context */
- accessibleContext = new AccessibleAWTMenuBar();
- }
+ accessibleContext = new AccessibleAWTMenuBar();
return accessibleContext;
}
Index: java/awt/MenuItem.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/MenuItem.java,v
retrieving revision 1.16.2.6
diff -u -r1.16.2.6 MenuItem.java
--- java/awt/MenuItem.java 28 Dec 2004 23:51:23 -0000 1.16.2.6
+++ java/awt/MenuItem.java 29 Dec 2004 16:46:57 -0000
@@ -590,10 +590,7 @@
{
/* Create the context if this is the first request */
if (accessibleContext == null)
- {
- /* Create the context */
- accessibleContext = new AccessibleAWTMenuItem();
- }
+ accessibleContext = new AccessibleAWTMenuItem();
return accessibleContext;
}
Index: java/awt/PopupMenu.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/PopupMenu.java,v
retrieving revision 1.7.20.3
diff -u -r1.7.20.3 PopupMenu.java
--- java/awt/PopupMenu.java 15 Nov 2004 06:13:34 -0000 1.7.20.3
+++ java/awt/PopupMenu.java 29 Dec 2004 16:46:57 -0000
@@ -151,9 +151,18 @@
}
+ /**
+ * Gets the AccessibleContext associated with this <code>PopupMenu</code>.
+ * The context is created, if necessary.
+ *
+ * @return the associated context
+ */
public AccessibleContext getAccessibleContext()
{
- return new AccessibleAWTPopupMenu();
+ /* Create the context if this is the first request */
+ if (accessibleContext == null)
+ accessibleContext = new AccessibleAWTPopupMenu();
+ return accessibleContext;
}
} // class PopupMenu
Index: java/awt/ScrollPane.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/ScrollPane.java,v
retrieving revision 1.15.2.3
diff -u -r1.15.2.3 ScrollPane.java
--- java/awt/ScrollPane.java 29 Dec 2004 04:38:55 -0000 1.15.2.3
+++ java/awt/ScrollPane.java 29 Dec 2004 16:46:57 -0000
@@ -599,7 +599,7 @@
}
/**
- * Gets the AccessibleContext associated with this <code>Scrollbar</code>.
+ * Gets the AccessibleContext associated with this <code>ScrollPane</code>.
* The context is created, if necessary.
*
* @return the associated context
@@ -608,10 +608,7 @@
{
/* Create the context if this is the first request */
if (accessibleContext == null)
- {
- /* Create the context */
- accessibleContext = new AccessibleAWTScrollPane();
- }
+ accessibleContext = new AccessibleAWTScrollPane();
return accessibleContext;
}
} // class ScrollPane
Index: java/awt/Scrollbar.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/Scrollbar.java,v
retrieving revision 1.17.2.4
diff -u -r1.17.2.4 Scrollbar.java
--- java/awt/Scrollbar.java 29 Dec 2004 04:38:55 -0000 1.17.2.4
+++ java/awt/Scrollbar.java 29 Dec 2004 16:46:58 -0000
@@ -845,10 +845,7 @@
{
/* Create the context if this is the first request */
if (accessibleContext == null)
- {
- /* Create the context */
- accessibleContext = new AccessibleAWTScrollbar();
- }
+ accessibleContext = new AccessibleAWTScrollbar();
return accessibleContext;
}
Index: java/awt/TextArea.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/TextArea.java,v
retrieving revision 1.10.2.5
diff -u -r1.10.2.5 TextArea.java
--- java/awt/TextArea.java 20 Nov 2004 04:05:33 -0000 1.10.2.5
+++ java/awt/TextArea.java 29 Dec 2004 16:46:58 -0000
@@ -613,8 +613,17 @@
}
}
+ /**
+ * Gets the AccessibleContext associated with this <code>TextArea</code>.
+ * The context is created, if necessary.
+ *
+ * @return the associated context
+ */
public AccessibleContext getAccessibleContext()
{
- return new AccessibleAWTTextArea();
+ /* Create the context if this is the first request */
+ if (accessibleContext == null)
+ accessibleContext = new AccessibleAWTTextArea();
+ return accessibleContext;
}
}
Index: java/awt/TextComponent.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/TextComponent.java,v
retrieving revision 1.11.8.3
diff -u -r1.11.8.3 TextComponent.java
--- java/awt/TextComponent.java 7 Nov 2004 22:45:27 -0000 1.11.8.3
+++ java/awt/TextComponent.java 29 Dec 2004 16:46:58 -0000
@@ -46,6 +46,7 @@
import java.util.EventListener;
import javax.accessibility.Accessible;
+import javax.accessibility.AccessibleContext;
import javax.accessibility.AccessibleRole;
import javax.accessibility.AccessibleState;
import javax.accessibility.AccessibleStateSet;
@@ -690,6 +691,21 @@
return (TextListener[]) getListeners (TextListener.class);
}
+ /**
+ * Gets the AccessibleContext associated with this <code>TextComponent</code>.
+ * The context is created, if necessary.
+ *
+ * @return the associated context
+ */
+ public AccessibleContext getAccessibleContext()
+ {
+ /* Create the context if this is the first request */
+ if (accessibleContext == null)
+ accessibleContext = new AccessibleAWTTextComponent();
+ return accessibleContext;
+ }
+
+
/*******************************/
// Provide AccessibleAWTTextComponent access to several peer functions that
// aren't publicly exposed.
Index: java/awt/Window.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/Window.java,v
retrieving revision 1.32.12.17
diff -u -r1.32.12.17 Window.java
--- java/awt/Window.java 29 Dec 2004 04:14:27 -0000 1.32.12.17
+++ java/awt/Window.java 29 Dec 2004 16:46:58 -0000
@@ -824,10 +824,7 @@
{
/* Create the context if this is the first request */
if (accessibleContext == null)
- {
- /* Create the context */
- accessibleContext = new AccessibleAWTWindow();
- }
+ accessibleContext = new AccessibleAWTWindow();
return accessibleContext;
}