summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog11
-rw-r--r--javax/swing/JComponent.java8
-rw-r--r--javax/swing/plaf/basic/BasicTreeUI.java1
3 files changed, 15 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 1bbab6b83..00ff21445 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
2006-01-27 Roman Kennke <kennke@aicas.com>
+ * javax/swing/plaf/basic/BasicTreeUI.java
+ (installDefaults): Removed requestFocusInWindow() call.
+ * javax/swing/JComponent.java
+ (requestFocusInWindow(boolean)): Made method protected.
+ (printComponent): Made method protected.
+ (printChildren): Made method protected.
+ (printComponent): Made method protected.
+ (printBorder): Made method protected.
+
+2006-01-27 Roman Kennke <kennke@aicas.com>
+
* javax/swing/AbstractButton.java
(ButtonChangeListener.ButtonChangeListener()): Made constructor
package private.
diff --git a/javax/swing/JComponent.java b/javax/swing/JComponent.java
index 747eba54d..83e1a2b35 100644
--- a/javax/swing/JComponent.java
+++ b/javax/swing/JComponent.java
@@ -2879,7 +2879,7 @@ public abstract class JComponent extends Container implements Serializable
*
* @since 1.4
*/
- public boolean requestFocusInWindow(boolean temporary)
+ protected boolean requestFocusInWindow(boolean temporary)
{
return super.requestFocusInWindow(temporary);
}
@@ -3098,7 +3098,7 @@ public abstract class JComponent extends Container implements Serializable
*
* @since 1.3
*/
- public void printComponent(Graphics g)
+ protected void printComponent(Graphics g)
{
paintComponent(g);
}
@@ -3112,7 +3112,7 @@ public abstract class JComponent extends Container implements Serializable
*
* @since 1.3
*/
- public void printChildren(Graphics g)
+ protected void printChildren(Graphics g)
{
paintChildren(g);
}
@@ -3126,7 +3126,7 @@ public abstract class JComponent extends Container implements Serializable
*
* @since 1.3
*/
- public void printBorder(Graphics g)
+ protected void printBorder(Graphics g)
{
paintBorder(g);
}
diff --git a/javax/swing/plaf/basic/BasicTreeUI.java b/javax/swing/plaf/basic/BasicTreeUI.java
index 39009bdad..0460055bd 100644
--- a/javax/swing/plaf/basic/BasicTreeUI.java
+++ b/javax/swing/plaf/basic/BasicTreeUI.java
@@ -1295,7 +1295,6 @@ public class BasicTreeUI extends TreeUI
leftChildIndent = UIManager.getInt("Tree.leftChildIndent");
setRowHeight(UIManager.getInt("Tree.rowHeight"));
tree.setRowHeight(getRowHeight());
- tree.requestFocusInWindow(false);
tree.setScrollsOnExpand(UIManager.getBoolean("Tree.scrollsOnExpand"));
setExpandedIcon(UIManager.getIcon("Tree.expandedIcon"));
setCollapsedIcon(UIManager.getIcon("Tree.collapsedIcon"));