1 files changed, 103 insertions, 8 deletions

diff --git a/libjava/java/awt/Frame.java b/libjava/java/awt/Frame.java
index fb9f7fd..22497f7 100644
--- a/libjava/java/awt/Frame.java
+++ b/libjava/java/awt/Frame.java
@@ -13,22 +13,43 @@ import java.awt.peer.FramePeer;
 
 public class Frame extends Window implements MenuContainer
 {
+  public static final int NORMAL = 0;
+  public static final int ICONIFIED = 1;
+
   MenuBar menuBar = null;
   String title;
 
+  private transient Image iconImage;
+  private transient boolean isResizable = true;
+  private transient int state = NORMAL;
+
   public Frame ()
   {
-    super (null);
+    super();
+  }
+
+  public Frame(GraphicsConfiguration gc)
+  {
+    super(gc);
   }
 
   public Frame (String title)
   {
-    super (null);
+    super();
     setTitle(title);
   }
 
-  public String getTitle () { return title; }
+  public Frame(String title, GraphicsConfiguration gc)
+  {
+    super(gc);
+    setTitle(title);
+  }
 
+  public String getTitle()
+  {
+    return (title != null) ? title : "";
+  }
+    
   public void setTitle (String title)
   {
     this.title = title;
@@ -36,11 +57,60 @@ public class Frame extends Window implements MenuContainer
       ((FramePeer)peer).setTitle(title);
   }
 
-  public synchronized void dispose ()
-  { /* FIXME */ }
+  public Image getIconImage()
+  {
+    return iconImage;
+  }
+  
+  public void setIconImage(Image image)
+  {
+    iconImage = image;
+    if (peer != null)
+      ((FramePeer) peer).setIconImage(iconImage);
+  }
+
+  protected void finalize() throws Throwable
+  {
+    //frames.remove(this);
+    /* FIXME: This won't work. Finalize will never be called if frames
+       has a reference to the object. We need weak references to
+       implement this correctly. */
+
+    super.finalize();
+  }
 
   public synchronized void setMenuBar (MenuBar menuBar)
-  { this.menuBar = menuBar; }
+  { 
+    if (this.menuBar != menuBar)
+      {
+	//this.menuBar.removeNotify();
+	this.menuBar = menuBar;
+	//this.menuBar.addNotify();
+      }	
+
+    if (peer != null)
+      ((FramePeer) peer).setMenuBar(menuBar);
+  }
+  
+  public boolean isResizable()
+  {
+    return isResizable;
+  }
+
+  public void setResizable(boolean resizable)
+  {
+    isResizable = resizable;
+    if (peer != null)
+      ((FramePeer) peer).setResizable(isResizable);
+  }
+
+  public int getState()
+  {
+    /* FIXME: State might have changed in the peer... Must check. */
+    
+    return state;
+  }
+
 
   public synchronized void addNotify ()
   {
@@ -49,7 +119,32 @@ public class Frame extends Window implements MenuContainer
     super.addNotify();
   }
 
-  public Font getFont() { return null; } // FIXME
   public boolean postEvent(Event evt) { return false; } // FIXME
-  public void remove(MenuComponent comp) { } // FIXME
+ 
+  public void remove(MenuComponent m)
+  {
+    if (m == menuBar)
+      {
+	setMenuBar(null);
+	return;
+      }
+	
+    super.remove(m);
+  }
+  
+  public void removeNotify()
+  {
+    //if ((peer != null) && (menuBar != null)) menuBar.removeNotify();
+    super.removeNotify();
+  }
+    
+  public static Frame[] getFrames()
+  {
+    //Frame[] array = new Frames[frames.size()];
+    //return frames.toArray(array);
+    
+    // see finalize() comment
+    String msg = "FIXME: can't be implemented without weak references";
+    throw new UnsupportedOperationException(msg);
+  }
 }