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

2003-07-14  Michael Koch  <konqueror@gmx.de>

	* java/awt/image/MemoryImageSource.java,
	java/beans/PropertyEditorManager.java,
	javax/naming/CompoundName.java,
	javax/naming/spi/NamingManager.java,
	javax/swing/AbstractButton.java,
	javax/swing/ButtonModel.java,
	javax/swing/SwingUtilities.java,
	javax/swing/UIManager.java,
	javax/swing/colorchooser/DefaultColorSelectionModel.java,
	javax/swing/event/AncestorEvent.java,
	javax/swing/event/InternalFrameEvent.java,
	java/util/zip/ZipFile.java:
	New versions from classpath.

From-SVN: r69321

libjava/ChangeLog

+2003-07-14  Michael Koch  <konqueror@gmx.de>
+
+	* java/awt/image/MemoryImageSource.java,
+	java/beans/PropertyEditorManager.java,
+	javax/naming/CompoundName.java,
+	javax/naming/spi/NamingManager.java,
+	javax/swing/AbstractButton.java,
+	javax/swing/ButtonModel.java,
+	javax/swing/SwingUtilities.java,
+	javax/swing/UIManager.java,
+	javax/swing/colorchooser/DefaultColorSelectionModel.java,
+	javax/swing/event/AncestorEvent.java,
+	javax/swing/event/InternalFrameEvent.java,
+	java/util/zip/ZipFile.java:
+	New versions from classpath.
+
 2003-07-13  Michael Koch  <konqueror@gmx.de>
 
 	* gnu/java/nio/FileChannelImpl.java,

libjava/java/awt/image/MemoryImageSource.java

@@ -74,7 +74,7 @@ public class MemoryImageSource implements ImageProducer
 	this.props = props;
 	int max = (( scansize > width ) ? scansize : width );
 	pixelb = new byte[ max  * height ];
-	System.arraycopy( pix, 0, pixelb, 0, max );
+	System.arraycopy( pix, 0, pixelb, 0, max * height );
     }
     /**
        Constructs an ImageProducer from memory
@@ -100,7 +100,7 @@ public class MemoryImageSource implements ImageProducer
 	this.props = props;
 	int max = (( scansize > width ) ? scansize : width );
 	pixeli = new int[ max  * height ];
-	System.arraycopy( pix, 0, pixeli, 0, max );
+	System.arraycopy( pix, 0, pixeli, 0, max * height );
     }
     /**
        Constructs an ImageProducer from memory using the default RGB ColorModel
@@ -226,6 +226,7 @@ public class MemoryImageSource implements ImageProducer
 	if( props != null ) {
 	    ic.setProperties( props );
 	}
+	ic.setDimensions(width, height);
 	if( pixeli != null ) {
 	    ic.setPixels( 0, 0, width, height, cm, pixeli, offset, scansize );
 	} else {

libjava/java/beans/PropertyEditorManager.java

@@ -140,9 +140,13 @@ public class PropertyEditorManager
             return (PropertyEditor)found.newInstance();
           }
 
+	ClassLoader contextClassLoader
+		= Thread.currentThread().getContextClassLoader();
+
         try
           {
-            found = Class.forName(editedClass.getName()+"Editor");
+            found = Class.forName(editedClass.getName()+"Editor", true,
+				  contextClassLoader);
             registerEditor(editedClass,found);
             return (PropertyEditor)found.newInstance();
           }
@@ -150,14 +154,18 @@ public class PropertyEditorManager
           {
           }
 
-        String appendName = "." + ClassHelper.getTruncatedClassName(editedClass) + "Editor";
+        String appendName
+		= "."
+		+ ClassHelper.getTruncatedClassName(editedClass)
+		+ "Editor";
         synchronized(editorSearchPath)
           {
             for(int i=0;i<editorSearchPath.length;i++)
               {
                 try
                   {
-                    found = Class.forName(editorSearchPath[i] + appendName);
+                    found = Class.forName(editorSearchPath[i] + appendName,
+					  true, contextClassLoader);
                     registerEditor(editedClass,found);
                     return (PropertyEditor)found.newInstance();
                   }

libjava/java/util/zip/ZipFile.java

@@ -308,7 +308,7 @@ public class ZipFile implements ZipConstants
    */
   protected void finalize() throws IOException
   {
-    if (!closed) close();
+    if (!closed && raf != null) close();
   }
 
   /**

libjava/javax/naming/CompoundName.java

@@ -142,13 +142,17 @@ public class CompoundName implements Name, Cloneable, Serializable
 	    // Otherwise, fall through.
 	  }
 	// Quotes are only special at the start of a component.
-	else if (new_element.length () == 0 && special == beginQuote)
+	else if (new_element.length () == 0
+		 && special == beginQuote
+		 && beginQuote != null)
 	  {
 	    quote = endQuote;
 	    i += special.length ();
 	    continue;
 	  }
-	else if (new_element.length () == 0 && special == beginQuote2)
+	else if (new_element.length () == 0
+		 && special == beginQuote2
+		 && beginQuote2 != null)
 	  {
 	    quote = endQuote2;
 	    i += special.length ();

libjava/javax/naming/spi/NamingManager.java

@@ -83,13 +83,17 @@ public class NamingManager
 
 	try
 	  {
-	    icf = (InitialContextFactory) Class.forName (java_naming_factory_initial).newInstance ();
+	    icf = (InitialContextFactory)Class.forName
+		(java_naming_factory_initial, true,
+		 Thread.currentThread().getContextClassLoader())
+		.newInstance ();
 	  }
 	catch (Exception exception)
 	  {
 	    NoInitialContextException e
-	      = new NoInitialContextException ("Can't load InitialContextFactory class: "
-					       + java_naming_factory_initial);
+	      = new NoInitialContextException
+	      ("Can't load InitialContextFactory class: "
+	       + java_naming_factory_initial);
 	    e.setRootCause(exception);
 	    throw e;
 	  }

libjava/javax/swing/ButtonModel.java

@@ -76,12 +76,4 @@ public interface ButtonModel extends ItemSelectable
 
     void setSelected(boolean b);
     boolean isSelected();
-
-
-    // there are not in the spec !!
-
-
-    void fireItemStateChanged(ItemEvent event);
-    void fireStateChanged(ChangeEvent event);    
-    void fireActionPerformed(ActionEvent event);
 }

libjava/javax/swing/SwingUtilities.java

@@ -58,70 +58,71 @@ import javax.accessibility.AccessibleStateSet;
 public class SwingUtilities implements SwingConstants
 {
   public static FontMetrics getFontMetrics (Font font)
-{
-	return Toolkit.getDefaultToolkit().getFontMetrics(font);
-    }
+  {
+    return Toolkit.getDefaultToolkit ().getFontMetrics (font);
+  }
 
   public static JRootPane getRootPane (Component a)
-    {
-	if (a instanceof JRootPane)
-	    return (JRootPane) a;
+  {
+    if (a instanceof JRootPane)
+      return (JRootPane) a;
 	
-	a = a.getParent();
-
-	if (a != null)
-	    {
-		return getRootPane(a);
-	    }
+    a = a.getParent();
 
-	return null;
-    }
+    if (a != null)
+      {
+        return getRootPane(a);
+      }
+    
+    return null;
+  }
 
   public static void updateComponentTreeUI(JFrame comp)
-    {
-    }
+  {
+  }
 
   public static String layoutCompoundLabel(JComponent c, 
-					     FontMetrics fm,
-					     String text,
-					     Icon i,
-					     int vert_a, 
-					     int hor_i, 
-					     int vert_text_pos,
-					     int hor_text_pos, 
-					     Rectangle vr,
-					     Rectangle ir, 
-					     Rectangle tr,
-					     int gap)
-    {
-	// view rect 'vr' already ok, 
-	// we need to compute ir (icon rect) and tr (text-rect)
+                                           FontMetrics fm,
+                                           String text,
+                                           Icon i,
+                                           int vert_a, 
+                                           int hor_i, 
+                                           int vert_text_pos,
+                                           int hor_text_pos, 
+                                           Rectangle vr,
+                                           Rectangle ir, 
+                                           Rectangle tr,
+                                           int gap)
+  {
+    // view rect 'vr' already ok, 
+    // we need to compute ir (icon rect) and tr (text-rect)
 	
-	int next_x = 0;//vr.x;
-	int next_y = 0;//vr.y;
+    int next_x = 0;//vr.x;
+    int next_y = 0;//vr.y;
 	
-	ir.height = ir.width = ir.y = ir.x = 0;
+    ir.height = ir.width = ir.y = ir.x = 0;
 
-	if (i != null)
-	    {
-		ir.x = vr.x;
-		ir.y = vr.y;
-		ir.width = i.getIconWidth();
-		ir.height = i.getIconWidth();
+    if (i != null)
+      {
+        ir.x = vr.x;
+        ir.y = vr.y;
+        ir.width = i.getIconWidth();
+        ir.height = i.getIconWidth();
 
 
-		next_x += gap + i.getIconWidth();
-		next_y += gap + i.getIconHeight();
-	    }
+        next_x += gap + i.getIconWidth();
+        next_y += gap + i.getIconHeight();
+      }
 	
-	tr.x = next_x;
-	tr.y = vr.y + (vr.height/2);
+    tr.x = next_x;
+    tr.y = vr.y + (vr.height/2);
+
+    tr.width  = fm.stringWidth(text);
+    tr.height = fm.getHeight() +  fm.getAscent()/2;
 
-	tr.width  = fm.stringWidth(text);
-	tr.height = fm.getHeight() +  fm.getAscent()/2;
+    return text;
+  }
 
-	return text;
-    }
 }
 
 

libjava/javax/swing/colorchooser/DefaultColorSelectionModel.java

@@ -52,90 +52,90 @@ import javax.swing.event.EventListenerList;
 public class DefaultColorSelectionModel 
   implements ColorSelectionModel, Serializable
 {
-  static final long serialVersionUID = 580150227676302096L;
-
-	//-------------------------------------------------------------
-	// Variables --------------------------------------------------
-	//-------------------------------------------------------------
-
-	/**
-	 * changeEvent
-	 */
-	protected transient ChangeEvent changeEvent;
-
-	/**
-	 * listenerList
-	 */
-	protected EventListenerList listenerList;
-
-	/**
-	 * selectedColor
-	 */
-	private Color selectedColor;
-
-
-	//-------------------------------------------------------------
-	// Initialization ---------------------------------------------
-	//-------------------------------------------------------------
-
-	/**
-	 * Constructor DefaultColorSelectionModel
-	 */
-	public DefaultColorSelectionModel() {
-		// TODO
-	} // DefaultColorSelectionModel()
-
-	/**
-	 * Constructor DefaultColorSelectionModel
-	 * @param color TODO
-	 */
-	public DefaultColorSelectionModel(Color color) {
-		// TODO
-	} // DefaultColorSelectionModel()
-
-
-	//-------------------------------------------------------------
-	// Methods ----------------------------------------------------
-	//-------------------------------------------------------------
-
-	/**
-	 * getSelectedColor
-	 * @returns Color
-	 */
-	public Color getSelectedColor() {
-		return null; // TODO
-	} // getSelectedColor()
-
-	/**
-	 * setSelectedColor
-	 * @param color TODO
-	 */
-	public void setSelectedColor(Color color) {
-		// TODO
-	} // setSelectedColor()
-
-	/**
-	 * addChangeListener
-	 * @param listener TODO
-	 */
-	public void addChangeListener(ChangeListener listener) {
-		// TODO
-	} // addChangeListener()
-
-	/**
-	 * removeChangeListener
-	 * @param listener TODO
-	 */
-	public void removeChangeListener(ChangeListener listener) {
-		// TODO
-	} // removeChangeListener()
-
-	/**
-	 * fireStateChanged
-	 */
-	protected void fireStateChanged() {
-		// TODO
-	} // fireStateChanged()
-
-
-} // DefaultColorSelectionModel
+  private static final long serialVersionUID = -8117143602864778804L;
+
+  private Color selectedColor;
+
+  protected transient ChangeEvent changeEvent = new ChangeEvent (this);
+  protected EventListenerList listenerList = new EventListenerList ();
+
+  /**
+   * Creates a new color selection model.
+   */
+  public DefaultColorSelectionModel()
+  {
+    this (Color.white);
+  }
+
+  /**
+   * Creates a new color selection model with a given selected color.
+   * 
+   * @param color The selected color.
+   */
+  public DefaultColorSelectionModel (Color color)
+  {
+    super();
+    this.selectedColor = color;
+  }
+
+  /**
+   * Returns the selected color.
+   * 
+   * @return The selected color.
+   */
+  public Color getSelectedColor()
+  {
+    return selectedColor;
+  }
+
+  /**
+   * @param color The color to set.
+   */
+  public void setSelectedColor (Color color)
+  {
+    this.selectedColor = color;
+  }
+
+  /**
+   * Adds a listener to this model.
+   * 
+   * @param listener The listener to add.
+   */
+  public void addChangeListener (ChangeListener listener)
+  {
+    listenerList.add (ChangeListener.class, listener);
+  }
+
+  /**
+   * Removes a listener from this model.
+   * 
+   * @param listener The listener to remove.
+   */
+  public void removeChangeListener (ChangeListener listener)
+  {
+    listenerList.remove (ChangeListener.class, listener);
+  }
+
+  /**
+   * Returns all currently added <code>ChangeListener</code> objects.
+   *
+   * @return Array of <code>ChangeListener</code> objects.
+   */
+  public ChangeListener[] getChangeListeners()
+  {
+    return (ChangeListener[]) listenerList.getListeners (ChangeListener.class);
+  }
+
+  /**
+   * Calls all the <code>stateChanged()</code> method of all added
+   * <code>ChangeListener</code> objects with <code>changeEvent</code>
+   * as argument.
+   */
+  protected void fireStateChanged()
+  {
+    ChangeListener[] listeners = getChangeListeners();
+
+    for (int i = 0; i < listeners.length; i++)
+      listeners [i].stateChanged (changeEvent);
+  }
+}

libjava/javax/swing/event/AncestorEvent.java

@@ -50,9 +50,9 @@ public class AncestorEvent extends AWTEvent
 {
   private static final long serialVersionUID = -8079801679695605002L;
   
-  public static final int ANCESTOR_ADDED = 0;
-  public static final int ANCESTOR_MOVED = 1;
+  public static final int ANCESTOR_ADDED = 1;
   public static final int ANCESTOR_REMOVED = 2;
+  public static final int ANCESTOR_MOVED = 3;
 
   private JComponent sourceComponent;
   private Container ancestor;

libjava/javax/swing/event/InternalFrameEvent.java

@@ -81,7 +81,7 @@ public class InternalFrameEvent extends AWTEvent
   /**
    * Internal frame iconified event
    */
-  public static final int INTERNAL_FRAME_ICONIFIED = 2552;
+  public static final int INTERNAL_FRAME_ICONIFIED = 25552;
 
   /**
    * Internal frame last event
@@ -91,7 +91,7 @@ public class InternalFrameEvent extends AWTEvent
   /**
    * Internal frame opened event
    */
-  public static final int INTERNAL_FRAME_OPENED = 25550;
+  public static final int INTERNAL_FRAME_OPENED = 25549;
 
   /**
    * Creates a <code>JInternalFrameEvent</code> object.