Commit eceea301 by Michael Koch Committed by Michael Koch

Checkbox.java, [...]: New versions from classpath.

2003-05-25  Michael Koch  <konqueror@gmx.de>

	* java/awt/Checkbox.java,
	java/awt/Dialog.java,
	java/awt/Font.java,
	java/awt/Frame.java,
	java/awt/ScrollPaneAdjustable.java,
	java/awt/Scrollbar.java,
	java/awt/Window.java:
	New versions from classpath.

From-SVN: r67164
parent ef8855d7
2003-05-25 Michael Koch <konqueror@gmx.de>
* java/awt/Checkbox.java,
java/awt/Dialog.java,
java/awt/Font.java,
java/awt/Frame.java,
java/awt/ScrollPaneAdjustable.java,
java/awt/Scrollbar.java,
java/awt/Window.java:
New versions from classpath.
2003-05-22 Jeff Sturm <jsturm@one-point.com> 2003-05-22 Jeff Sturm <jsturm@one-point.com>
PR libgcj/10838: PR libgcj/10838:
......
...@@ -307,7 +307,11 @@ addNotify() ...@@ -307,7 +307,11 @@ addNotify()
super.addNotify (); super.addNotify ();
} }
/*************************************************************************/ public ItemListener[] getItemListeners ()
{
return (ItemListener[])
AWTEventMulticaster.getListeners (item_listeners, ItemListener.class);
}
/** /**
* Adds a new listeners to the list of registered listeners for this object. * Adds a new listeners to the list of registered listeners for this object.
......
...@@ -44,11 +44,11 @@ import java.awt.peer.ContainerPeer; ...@@ -44,11 +44,11 @@ import java.awt.peer.ContainerPeer;
import java.awt.peer.ComponentPeer; import java.awt.peer.ComponentPeer;
/** /**
* A dialog box widget class. * A dialog box widget class.
* *
* @author Aaron M. Renn (arenn@urbanophile.com) * @author Aaron M. Renn <arenn@urbanophile.com>
* @author Tom Tromey <tromey@redhat.com> * @author Tom Tromey <tromey@redhat.com>
*/ */
public class Dialog extends Window public class Dialog extends Window
{ {
...@@ -81,6 +81,11 @@ private boolean resizable; ...@@ -81,6 +81,11 @@ private boolean resizable;
*/ */
private String title; private String title;
/**
* This field indicates whether the dialog is undecorated or not.
*/
private boolean undecorated = false;
/*************************************************************************/ /*************************************************************************/
/* /*
...@@ -395,5 +400,30 @@ paramString() ...@@ -395,5 +400,30 @@ paramString()
",resizable=" + resizable + "," + super.paramString()); ",resizable=" + resizable + "," + super.paramString());
} }
/**
* Returns whether this frame is undecorated or not.
*
* @since 1.4
*/
public boolean isUndecorated ()
{
return undecorated;
}
/**
* Disables or enables decorations for this frame. This method can only be
* called while the frame is not displayable.
*
* @exception IllegalComponentStateException If this frame is displayable.
*
* @since 1.4
*/
public void setUndecorated (boolean undecorated)
{
if (isDisplayable ())
throw new IllegalComponentStateException ();
this.undecorated = undecorated;
}
} // class Dialog } // class Dialog
...@@ -406,6 +406,8 @@ getStyle() ...@@ -406,6 +406,8 @@ getStyle()
* Returns a native peer object for this font. * Returns a native peer object for this font.
* *
* @return A native peer object for this font. * @return A native peer object for this font.
*
* @deprecated
*/ */
public FontPeer public FontPeer
getPeer() getPeer()
......
...@@ -201,6 +201,16 @@ private int state; ...@@ -201,6 +201,16 @@ private int state;
*/ */
private String title = ""; private String title = "";
/**
* Maximized bounds for this frame.
*/
private Rectangle maximizedBounds;
/**
* This field indicates whether the frame is undecorated or not.
*/
private boolean undecorated = false;
/*************************************************************************/ /*************************************************************************/
/* /*
...@@ -456,14 +466,6 @@ paramString() ...@@ -456,14 +466,6 @@ paramString()
return(getClass().getName()); return(getClass().getName());
} }
public int
getState()
{
/* FIXME: State might have changed in the peer... Must check. */
return state;
}
public static Frame[] public static Frame[]
getFrames() getFrames()
{ {
...@@ -475,5 +477,86 @@ getFrames() ...@@ -475,5 +477,86 @@ getFrames()
throw new UnsupportedOperationException(msg); throw new UnsupportedOperationException(msg);
} }
public void setState (int state)
{
int current_state = getExtendedState ();
if (state == NORMAL
&& (current_state & ICONIFIED) != 0)
setExtendedState (current_state | ICONIFIED);
if (state == ICONIFIED
&& (current_state & ~ICONIFIED) == 0)
setExtendedState (current_state & ~ICONIFIED);
}
public int getState ()
{
/* FIXME: State might have changed in the peer... Must check. */
return (state & ICONIFIED) != 0 ? ICONIFIED : NORMAL;
}
/**
* @since 1.4
*/
public void setExtendedState (int state)
{
this.state = state;
}
/**
* @since 1.4
*/
public int getExtendedState ()
{
return state;
}
/**
* @since 1.4
*/
public void setMaximizedBounds (Rectangle maximizedBounds)
{
throw new Error ("not implemented");
}
/**
* Returns the maximized bounds of this frame.
*
* @return the maximized rectangle, may be null.
*
* @since 1.4
*/
public Rectangle getMaximizedBounds ()
{
return maximizedBounds;
}
/**
* Returns whether this frame is undecorated or not.
*
* @since 1.4
*/
public boolean isUndecorated ()
{
return undecorated;
}
/**
* Disables or enables decorations for this frame. This method can only be
* called while the frame is not displayable.
*
* @exception IllegalComponentStateException If this frame is displayable.
*
* @since 1.4
*/
public void setUndecorated (boolean undecorated)
{
if (!isDisplayable ())
throw new IllegalComponentStateException ();
this.undecorated = undecorated;
}
} // class Frame } // class Frame
...@@ -63,6 +63,8 @@ public class ScrollPaneAdjustable ...@@ -63,6 +63,8 @@ public class ScrollPaneAdjustable
int blockIncrement = 1; int blockIncrement = 1;
AdjustmentListener adjustmentListener; AdjustmentListener adjustmentListener;
private transient boolean valueIsAdjusting = false;
ScrollPaneAdjustable (ScrollPane sp, int orientation) ScrollPaneAdjustable (ScrollPane sp, int orientation)
{ {
this.sp = sp; this.sp = sp;
...@@ -175,5 +177,24 @@ public class ScrollPaneAdjustable ...@@ -175,5 +177,24 @@ public class ScrollPaneAdjustable
throw new Error ("not implemented"); throw new Error ("not implemented");
} }
/**
* Returns true if the value is in the process of changing.
*
* @since 1.4
*/
public boolean getValueIsAdjusting ()
{
return valueIsAdjusting;
}
/**
* Sets the value of valueIsAdjusting.
*
* @since 1.4
*/
public void setValueIsAdjusting (boolean valueIsAdjusting)
{
this.valueIsAdjusting = valueIsAdjusting;
}
} // class ScrollPaneAdjustable } // class ScrollPaneAdjustable
...@@ -119,6 +119,8 @@ private int visibleAmount; ...@@ -119,6 +119,8 @@ private int visibleAmount;
// List of AdjustmentListener's. // List of AdjustmentListener's.
private AdjustmentListener adjustment_listeners; private AdjustmentListener adjustment_listeners;
private transient boolean valueIsAdjusting = false;
/*************************************************************************/ /*************************************************************************/
/* /*
...@@ -725,5 +727,25 @@ paramString() ...@@ -725,5 +727,25 @@ paramString()
{ {
return (AdjustmentListener[]) getListeners (AdjustmentListener.class); return (AdjustmentListener[]) getListeners (AdjustmentListener.class);
} }
/**
* Returns true if the value is in the process of changing.
*
* @since 1.4
*/
public boolean getValueIsAdjusting ()
{
return valueIsAdjusting;
}
/**
* Sets the value of valueIsAdjusting.
*
* @since 1.4
*/
public void setValueIsAdjusting (boolean valueIsAdjusting)
{
this.valueIsAdjusting = valueIsAdjusting;
}
} // class Scrollbar } // class Scrollbar
...@@ -57,10 +57,14 @@ import java.util.ResourceBundle; ...@@ -57,10 +57,14 @@ import java.util.ResourceBundle;
public class Window extends Container public class Window extends Container
{ {
// Serialized fields, from Sun's serialization spec. // Serialized fields, from Sun's serialization spec.
// private FocusManager focusMgr; // FIXME: what is this?
private String warningString = null; private String warningString = null;
private int state = 0;
private int windowSerializedDataVersion = 0; // FIXME private int windowSerializedDataVersion = 0; // FIXME
/** @since 1.2 */
// private FocusManager focusMgr; // FIXME: what is this?
/** @since 1.2 */
private int state = 0;
/** @since 1.4 */
private boolean focusableWindowState = true;
private transient WindowListener windowListener; private transient WindowListener windowListener;
private transient WindowFocusListener windowFocusListener; private transient WindowFocusListener windowFocusListener;
...@@ -645,4 +649,43 @@ public class Window extends Container ...@@ -645,4 +649,43 @@ public class Window extends Container
&& event.getID () == WindowEvent.WINDOW_STATE_CHANGED) && event.getID () == WindowEvent.WINDOW_STATE_CHANGED)
windowStateListener.windowStateChanged (event); windowStateListener.windowStateChanged (event);
} }
/**
* Returns whether this <code>Window</code> can get the focus or not.
*
* @since 1.4
*/
public boolean isFocusableWindow ()
{
if (getFocusableWindowState () == false)
return false;
if (this instanceof Dialog
|| this instanceof Frame)
return true;
// FIXME: Implement more possible cases for returning true.
return false;
}
/**
* Returns the value of the focusableWindowState property.
*
* @since 1.4
*/
public boolean getFocusableWindowState ()
{
return focusableWindowState;
}
/**
* Sets the value of the focusableWindowState property.
*
* @since 1.4
*/
public void setFocusableWindowState (boolean focusableWindowState)
{
this.focusableWindowState = focusableWindowState;
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment