diff options
author | Mark Wielaard <mark@klomp.org> | 2005-07-13 23:22:30 +0000 |
---|---|---|
committer | Mark Wielaard <mark@klomp.org> | 2005-07-13 23:22:30 +0000 |
commit | 060340343dfd94be0dd68295a46be9d525db44e5 (patch) | |
tree | 1880a9be9a5614bd808315e23872beda8c15e6dc | |
parent | 21ab449df7e458702de8e8c6a96fd912b26faf5c (diff) | |
download | classpath-060340343dfd94be0dd68295a46be9d525db44e5.tar.gz |
2005-07-14 Mark Wielaard <mark@klomp.org>
* examples/gnu/classpath/examples/awt/Demo.java
(TestWindow.parent): Make package private.
* gnu/java/net/protocol/http/HTTPURLConnection.java
(proxyHostname, proxyPort, agent, keepAlive, maxConnections):
Likewise.
* java/text/SimpleDateFormat.java (field, size): Likewise.
* java/util/jar/JarFile.java (readSignatures): Likewise.
* java/util/logging/FileHandler.java (written): Likewise.
* javax/swing/plaf/basic/BasicFileChooserUI.java: Make shared
fields package private.
(closeDialog): Make package private.
(filterEntries): Likewise.
* javax/swing/plaf/basic/BasicPopupMenuUI.java
(mouseInputListener): Likewise.
* javax/swing/plaf/basic/BasicTreeUI.java
(getNextVisibleNode, getPreviousVisibleNode, selectPath): Likewise.
* javax/swing/text/JTextComponent.java (caret, editable): Likewise.
-rw-r--r-- | ChangeLog | 20 | ||||
-rw-r--r-- | examples/gnu/classpath/examples/awt/Demo.java | 2 | ||||
-rw-r--r-- | gnu/java/net/protocol/http/HTTPURLConnection.java | 11 | ||||
-rw-r--r-- | java/text/SimpleDateFormat.java | 8 | ||||
-rw-r--r-- | java/util/jar/JarFile.java | 3 | ||||
-rw-r--r-- | java/util/logging/FileHandler.java | 3 | ||||
-rw-r--r-- | javax/swing/plaf/basic/BasicFileChooserUI.java | 60 | ||||
-rw-r--r-- | javax/swing/plaf/basic/BasicPopupMenuUI.java | 4 | ||||
-rw-r--r-- | javax/swing/plaf/basic/BasicTreeUI.java | 10 | ||||
-rw-r--r-- | javax/swing/text/JTextComponent.java | 7 |
10 files changed, 74 insertions, 54 deletions
@@ -1,3 +1,23 @@ +2005-07-14 Mark Wielaard <mark@klomp.org> + + * examples/gnu/classpath/examples/awt/Demo.java + (TestWindow.parent): Make package private. + * gnu/java/net/protocol/http/HTTPURLConnection.java + (proxyHostname, proxyPort, agent, keepAlive, maxConnections): + Likewise. + * java/text/SimpleDateFormat.java (field, size): Likewise. + * java/util/jar/JarFile.java (readSignatures): Likewise. + * java/util/logging/FileHandler.java (written): Likewise. + * javax/swing/plaf/basic/BasicFileChooserUI.java: Make shared + fields package private. + (closeDialog): Make package private. + (filterEntries): Likewise. + * javax/swing/plaf/basic/BasicPopupMenuUI.java + (mouseInputListener): Likewise. + * javax/swing/plaf/basic/BasicTreeUI.java + (getNextVisibleNode, getPreviousVisibleNode, selectPath): Likewise. + * javax/swing/text/JTextComponent.java (caret, editable): Likewise. + 2005-07-14 Robert Schuster <robertschuster@fsfe.org> * javax/swing/AbstractButton.java: Minor doc fixes. diff --git a/examples/gnu/classpath/examples/awt/Demo.java b/examples/gnu/classpath/examples/awt/Demo.java index effd92c02..dbb6600ed 100644 --- a/examples/gnu/classpath/examples/awt/Demo.java +++ b/examples/gnu/classpath/examples/awt/Demo.java @@ -613,7 +613,7 @@ class Demo static class TestWindow extends SubFrame { static int xs = 5, ys = 5; - private final Frame parent; + final Frame parent; public TestWindow(Frame f) { diff --git a/gnu/java/net/protocol/http/HTTPURLConnection.java b/gnu/java/net/protocol/http/HTTPURLConnection.java index fb37fbc06..9f2055fe6 100644 --- a/gnu/java/net/protocol/http/HTTPURLConnection.java +++ b/gnu/java/net/protocol/http/HTTPURLConnection.java @@ -82,11 +82,12 @@ public class HTTPURLConnection */ private HTTPConnection connection; - private String proxyHostname; - private int proxyPort; - private String agent; - private boolean keepAlive; - private int maxConnections; + // These are package private for use in anonymous inner classes. + String proxyHostname; + int proxyPort; + String agent; + boolean keepAlive; + int maxConnections; private Request request; private Headers requestHeaders; diff --git a/java/text/SimpleDateFormat.java b/java/text/SimpleDateFormat.java index b58d8c02f..789cb83d8 100644 --- a/java/text/SimpleDateFormat.java +++ b/java/text/SimpleDateFormat.java @@ -73,14 +73,16 @@ public class SimpleDateFormat extends DateFormat private class CompiledField { /** - * The ID of the field within the local pattern characters, + * The ID of the field within the local pattern characters. + * Package private for use in out class. */ - private int field; + int field; /** * The size of the character sequence. + * Package private for use in out class. */ - private int size; + int size; /** * The character used. diff --git a/java/util/jar/JarFile.java b/java/util/jar/JarFile.java index 3550ad8e0..a9ad21ecc 100644 --- a/java/util/jar/JarFile.java +++ b/java/util/jar/JarFile.java @@ -495,7 +495,8 @@ public class JarFile extends ZipFile } // Only called with lock on this JarFile. - private void readSignatures() throws IOException + // Package private for use in inner classes. + void readSignatures() throws IOException { Map pkcs7Dsa = new HashMap(); Map pkcs7Rsa = new HashMap(); diff --git a/java/util/logging/FileHandler.java b/java/util/logging/FileHandler.java index 8323bd425..3d958b7d7 100644 --- a/java/util/logging/FileHandler.java +++ b/java/util/logging/FileHandler.java @@ -228,8 +228,9 @@ public class FileHandler /** * The number of bytes that have currently been written to the stream. + * Package private for use in inner classes. */ - private long written; + long written; /** diff --git a/javax/swing/plaf/basic/BasicFileChooserUI.java b/javax/swing/plaf/basic/BasicFileChooserUI.java index 6ccb08322..fd34fbd62 100644 --- a/javax/swing/plaf/basic/BasicFileChooserUI.java +++ b/javax/swing/plaf/basic/BasicFileChooserUI.java @@ -874,76 +874,74 @@ public class BasicFileChooserUI extends FileChooserUI } }; - // -- begin private -- + // -- begin private, but package local since used in inner classes -- - /** DOCUMENT ME! */ - private JFileChooser filechooser; + JFileChooser filechooser; /** DOCUMENT ME! */ - private JList filelist; + JList filelist; /** DOCUMENT ME! */ - private JComboBox filters; + JComboBox filters; /** DOCUMENT ME! */ - private BasicDirectoryModel model; + BasicDirectoryModel model; /** DOCUMENT ME! */ - private FileFilter acceptAll = new AcceptAllFileFilter(); + FileFilter acceptAll = new AcceptAllFileFilter(); /** DOCUMENT ME! */ - private FileView fv = new BasicFileView(); + FileView fv = new BasicFileView(); /** DOCUMENT ME! */ - private static final int ICON_SIZE = 24; + static final int ICON_SIZE = 24; /** DOCUMENT ME! */ - private JComboBox parents; + JComboBox parents; /** DOCUMENT ME! */ - private String filename; + String filename; /** DOCUMENT ME! */ - private JButton accept; + JButton accept; /** DOCUMENT ME! */ - private JButton cancel; + JButton cancel; /** DOCUMENT ME! */ - private JButton upFolderButton; + JButton upFolderButton; /** DOCUMENT ME! */ - private JButton newFolderButton; + JButton newFolderButton; /** DOCUMENT ME! */ - private JButton homeFolderButton; + JButton homeFolderButton; /** DOCUMENT ME! */ - private JPanel accessoryPanel; + JPanel accessoryPanel; /** DOCUMENT ME! */ - private PropertyChangeListener propertyChangeListener; + PropertyChangeListener propertyChangeListener; /** DOCUMENT ME! */ - private String acceptAllFileFilterText; + String acceptAllFileFilterText; /** DOCUMENT ME! */ - private String dirDescText; + String dirDescText; /** DOCUMENT ME! */ - private String fileDescText; + String fileDescText; /** DOCUMENT ME! */ - private boolean dirSelected = false; + boolean dirSelected = false; /** DOCUMENT ME! */ - private File currDir = null; + File currDir = null; - /** DOCUMENT ME! */ - private JPanel bottomPanel; + JPanel bottomPanel; /** DOCUMENT ME! */ - private JPanel closePanel; + JPanel closePanel; // -- end private -- private class ListLabelRenderer @@ -1029,10 +1027,7 @@ public class BasicFileChooserUI extends FileChooserUI } } - /** - * DOCUMENT ME! - */ - private void closeDialog() + void closeDialog() { Window owner = SwingUtilities.windowForComponent(filechooser); if (owner instanceof JDialog) @@ -1168,10 +1163,7 @@ public class BasicFileChooserUI extends FileChooserUI }; } - /** - * DOCUMENT ME! - */ - private void filterEntries() + void filterEntries() { FileFilter[] list = filechooser.getChoosableFileFilters(); if (filters.getItemCount() > 0) diff --git a/javax/swing/plaf/basic/BasicPopupMenuUI.java b/javax/swing/plaf/basic/BasicPopupMenuUI.java index 8792d51bd..247117bc9 100644 --- a/javax/swing/plaf/basic/BasicPopupMenuUI.java +++ b/javax/swing/plaf/basic/BasicPopupMenuUI.java @@ -74,8 +74,8 @@ public class BasicPopupMenuUI extends PopupMenuUI /* popupMenu for which this UI delegate is for*/ protected JPopupMenu popupMenu; - /* MouseInputListener listens to mouse events */ - private static transient MouseInputListener mouseInputListener; + /* MouseInputListener listens to mouse events. Package private for inner classes. */ + static transient MouseInputListener mouseInputListener; /* PopupMenuListener listens to popup menu events fired by JPopupMenu*/ private transient PopupMenuListener popupMenuListener; diff --git a/javax/swing/plaf/basic/BasicTreeUI.java b/javax/swing/plaf/basic/BasicTreeUI.java index d53391be5..aef12e9ef 100644 --- a/javax/swing/plaf/basic/BasicTreeUI.java +++ b/javax/swing/plaf/basic/BasicTreeUI.java @@ -625,12 +625,12 @@ public class BasicTreeUI /** * Get next visible node in the tree. - * + * Package private for use in inner classes. * @param the current node * @return the next visible node in the JTree. Return null if there are no * more. */ - private DefaultMutableTreeNode getNextVisibleNode(DefaultMutableTreeNode node) + DefaultMutableTreeNode getNextVisibleNode(DefaultMutableTreeNode node) { DefaultMutableTreeNode next = null; TreePath current = null; @@ -657,12 +657,13 @@ public class BasicTreeUI /** * Get previous visible node in the tree. + * Package private for use in inner classes. * * @param the current node * @return the next visible node in the JTree. Return null if there are no * more. */ - private DefaultMutableTreeNode getPreviousVisibleNode + DefaultMutableTreeNode getPreviousVisibleNode (DefaultMutableTreeNode node) { DefaultMutableTreeNode prev = null; @@ -1562,11 +1563,12 @@ public class BasicTreeUI /** * Selects the specified path in the tree depending on modes. + * Package private for use in inner classes. * * @param tree is the tree we are selecting the path in * @param path is the path we are selecting */ - private void selectPath(JTree tree, TreePath path) + void selectPath(JTree tree, TreePath path) { if (path != null) { diff --git a/javax/swing/text/JTextComponent.java b/javax/swing/text/JTextComponent.java index ac2900b6f..f2ef4d77f 100644 --- a/javax/swing/text/JTextComponent.java +++ b/javax/swing/text/JTextComponent.java @@ -934,15 +934,16 @@ public abstract class JTextComponent extends JComponent return getUI().getEditorKit(this).getActions(); } - // This is package-private to avoid an accessor method. + // These are package-private to avoid an accessor method. Document doc; - private Caret caret; + Caret caret; + boolean editable; + private Highlighter highlighter; private Color caretColor; private Color disabledTextColor; private Color selectedTextColor; private Color selectionColor; - private boolean editable; private Insets margin; private boolean dragEnabled; |