AncestorEvent.java [...]: Compile fixes.

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

	* javax/swing/event/AncestorEvent.java
	javax/swing/event/HyperlinkEvent.java
	javax/swing/event/InternalFrameEvent.java
	javax/swing/event/ListDataEvent.java
	javax/swing/event/TableModelEvent.java:
	Compile fixes.

From-SVN: r68455

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 6bacfb5e422b3db08ce92c8817eaaff2752126bf..8af7a7d19204de9f3fb50bd9c94fb96abefadcc0 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,12 @@
+2003-06-25  Michael Koch  <konqueror@gmx.de>
+
+       * javax/swing/event/AncestorEvent.java
+       javax/swing/event/HyperlinkEvent.java
+       javax/swing/event/InternalFrameEvent.java
+       javax/swing/event/ListDataEvent.java
+       javax/swing/event/TableModelEvent.java:
+       Compile fixes.
+
 2003-06-24  Michael Koch  <konqueror@gmx.de>
 
        * java/net/URL.java:

diff --git a/libjava/javax/swing/event/AncestorEvent.java b/libjava/javax/swing/event/AncestorEvent.java
index 7acc2881cdbd576ae2f1c8bcc36b8ba75cc84690..0259bad07a81fdde8c2b6eb1615d3e024e3a5819 100644 (file)
--- a/libjava/javax/swing/event/AncestorEvent.java
+++ b/libjava/javax/swing/event/AncestorEvent.java
@@ -48,7 +48,7 @@ import javax.swing.JComponent;
  */
 public class AncestorEvent extends AWTEvent
 {
-  private static final serialVersionUID = 4799843792513591457L;
+  private static final long serialVersionUID = 4799843792513591457L;
   
   public static int ANCESTOR_ADDED = 0;
   public static int ANCESTOR_MOVED = 1;

diff --git a/libjava/javax/swing/event/HyperlinkEvent.java b/libjava/javax/swing/event/HyperlinkEvent.java
index a6bef2e679b57ecb9eb8a428c1f0b72bb640b644..a1dfeb8d006d98074fcd70c45f30f15dcf259df0 100644 (file)
--- a/libjava/javax/swing/event/HyperlinkEvent.java
+++ b/libjava/javax/swing/event/HyperlinkEvent.java
@@ -102,7 +102,8 @@ public class HyperlinkEvent extends EventObject
    * @param url The URL this link pointing too.
    * @param description The description for this link.
    */
-  public HyperlinkEvent(Object source, EventType type, URL url, String description)
+  public HyperlinkEvent(Object source, EventType type, URL url,
+                       String description)
   {
     this (source, type, url, description, null);
   }
@@ -116,7 +117,8 @@ public class HyperlinkEvent extends EventObject
    * @param description The description for this link.
    * @param element The element in the document representing the anchor.
    */
-  public HyperlinkEvent(Object source, EventType type, URL url, String description)
+  public HyperlinkEvent(Object source, EventType type, URL url,
+                       String description, Element element)
   {
     super(source);
     this.type = type;

diff --git a/libjava/javax/swing/event/InternalFrameEvent.java b/libjava/javax/swing/event/InternalFrameEvent.java
index d802cd2608332750649b27293e9e1ee673e02370..1fe65258f6a7a31f7bbcc26412e69fae400db7af 100644 (file)
--- a/libjava/javax/swing/event/InternalFrameEvent.java
+++ b/libjava/javax/swing/event/InternalFrameEvent.java
@@ -46,7 +46,7 @@ import javax.swing.JInternalFrame;
  */
 public class InternalFrameEvent extends AWTEvent
 {
-  private static final serialVersionUID = 9195444901064686684L;
+  private static final long serialVersionUID = 9195444901064686684L;
 
   /**
    * Internal frame activated event
@@ -109,6 +109,6 @@ public class InternalFrameEvent extends AWTEvent
    */
   public JInternalFrame getInternalFrame()
   {
-    return source;
+    return (JInternalFrame) source;
   }
 }

diff --git a/libjava/javax/swing/event/ListDataEvent.java b/libjava/javax/swing/event/ListDataEvent.java
index 46f567a5e425e1d753dbba5e6c150517b9a0d301..3b22ad63bc00840dd0e11e4442de919dbbbcbbbe 100644 (file)
--- a/libjava/javax/swing/event/ListDataEvent.java
+++ b/libjava/javax/swing/event/ListDataEvent.java
@@ -46,7 +46,7 @@ import java.util.EventObject;
  */
 public class ListDataEvent extends EventObject
 {
-  private static final serialVersionUID = -7131487416250401903L;
+  private static final long serialVersionUID = -7131487416250401903L;
   
   public static int CONTENTS_CHANGED = 0;
   public static int INTERVAL_ADDED = 1;

diff --git a/libjava/javax/swing/event/TableModelEvent.java b/libjava/javax/swing/event/TableModelEvent.java
index 222d194c91e1f8372f2412cec554a10c7353bfdf..2dee423eac403b4fa0079abc8e517d996093c572 100644 (file)
--- a/libjava/javax/swing/event/TableModelEvent.java
+++ b/libjava/javax/swing/event/TableModelEvent.java
@@ -46,7 +46,7 @@ import javax.swing.table.TableModel;
  */
 public class TableModelEvent extends EventObject
 {
-  private static final serialVersionUID = -7037680193569691706L;
+  private static final long serialVersionUID = -7037680193569691706L;
   
   public static int ALL_COLUMNS = -1;
   public static int DELETE = -1;