libjava/

2008-06-28  Matthias Klose  <doko@ubuntu.com>

        Import GNU Classpath (classpath-0_97_2-release).

        * Regenerate class and header files.
        * Regenerate auto* files.
        * gcj/javaprims.h: Define jobjectRefType.
        * jni.cc (_Jv_JNI_GetObjectRefType): New (stub only).
        (_Jv_JNIFunctions): Initialize GetObjectRefType.
        * gnu/classpath/jdwp/VMVirtualMachine.java,
        java/security/VMSecureRandom.java: Merge from classpath.
        * HACKING: Fix typo.
        * ChangeLog-2007: New file.
        * configure.ac: Set JAVAC, pass --disable-regen-headers to classpath.

libjava/classpath/

2008-06-28  Matthias Klose  <doko@ubuntu.com>

        * m4/ac_prog_javac.m4: Disable check for JAVAC, when
        not configured with --enable-java-maintainer-mode.
        * aclocal.m4, configure: Regenerate.
        * native/jni/gstreamer-peer/Makefile.am: Do not link with
        libclasspathnative.
        * native/jni/gstreamer-peer/Makefile.in: Regenerate.
        * tools/Makefile.am, lib/Makefile.am: Use JAVAC for setting
        JCOMPILER, drop flags not understood by gcj.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@137223 138bc75d-0d04-0410-961f-82ee72b054a4

7 files changed, 7 insertions, 11 deletions

diff --git a/libjava/classpath/javax/swing/text/DefaultStyledDocument.java b/libjava/classpath/javax/swing/text/DefaultStyledDocument.java
index 4ed8aa2d264..341579e3df8 100644
--- a/libjava/classpath/javax/swing/text/DefaultStyledDocument.java
+++ b/libjava/classpath/javax/swing/text/DefaultStyledDocument.java
@@ -1158,6 +1158,9 @@ public class DefaultStyledDocument extends AbstractDocument implements
 
     private void insertElement(ElementSpec spec)
     {
+      if (elementStack.isEmpty())
+        return;
+      
       Edit edit = (Edit) elementStack.peek();
       switch (spec.getType())
         {
diff --git a/libjava/classpath/javax/swing/text/GlyphView.java b/libjava/classpath/javax/swing/text/GlyphView.java
index 1e418d2e06a..6bc2a382c52 100644
--- a/libjava/classpath/javax/swing/text/GlyphView.java
+++ b/libjava/classpath/javax/swing/text/GlyphView.java
@@ -736,7 +736,6 @@ public class GlyphView extends View implements TabableView, Cloneable
     if (bg != null)
       {
         g.setColor(bg);
-        System.err.println("fill background: " + bg);
         g.fillRect(r.x, r.y, r.width, r.height);
       }
 
diff --git a/libjava/classpath/javax/swing/text/ParagraphView.java b/libjava/classpath/javax/swing/text/ParagraphView.java
index fb4ac65d835..f2795e2c38a 100644
--- a/libjava/classpath/javax/swing/text/ParagraphView.java
+++ b/libjava/classpath/javax/swing/text/ParagraphView.java
@@ -38,9 +38,6 @@ exception statement from your version. */
 
 package javax.swing.text;
 
-import java.awt.Color;
-import java.awt.Graphics;
-import java.awt.Rectangle;
 import java.awt.Shape;
 
 import javax.swing.SizeRequirements;
diff --git a/libjava/classpath/javax/swing/text/html/MinimalHTMLWriter.java b/libjava/classpath/javax/swing/text/html/MinimalHTMLWriter.java
index d42951a05ec..acb2c04acc2 100644
--- a/libjava/classpath/javax/swing/text/html/MinimalHTMLWriter.java
+++ b/libjava/classpath/javax/swing/text/html/MinimalHTMLWriter.java
@@ -321,7 +321,7 @@ public class MinimalHTMLWriter extends AbstractWriter
       }
     else
       { // What else to do here?
-	Style s = (Style)doc.getStyle("default");
+	Style s = doc.getStyle("default");
 	if(s != null)
 	  writeStyle( s );
       }
diff --git a/libjava/classpath/javax/swing/text/html/ResetableToggleButtonModel.java b/libjava/classpath/javax/swing/text/html/ResetableToggleButtonModel.java
index 619c24e477c..637ece15149 100644
--- a/libjava/classpath/javax/swing/text/html/ResetableToggleButtonModel.java
+++ b/libjava/classpath/javax/swing/text/html/ResetableToggleButtonModel.java
@@ -38,7 +38,6 @@ exception statement from your version. */
 
 package javax.swing.text.html;
 
-import javax.swing.ButtonGroup;
 import javax.swing.JToggleButton.ToggleButtonModel;
 
 class ResetableToggleButtonModel
diff --git a/libjava/classpath/javax/swing/text/html/parser/DTD.java b/libjava/classpath/javax/swing/text/html/parser/DTD.java
index ae3c184f153..09b50fee7de 100644
--- a/libjava/classpath/javax/swing/text/html/parser/DTD.java
+++ b/libjava/classpath/javax/swing/text/html/parser/DTD.java
@@ -181,7 +181,7 @@ public class DTD
   public static DTD getDTD(String name)
                     throws IOException
   {
-    DTD d = (DTD) dtdHash.get(name);
+    DTD d = dtdHash.get(name);
 
     if (d == null)
       {
@@ -210,7 +210,7 @@ public class DTD
    */
   public Element getElement(int index)
   {
-    return (Element) elements.get(index);
+    return elements.get(index);
   }
 
   /**
@@ -235,7 +235,7 @@ public class DTD
    */
   public Entity getEntity(String entity_name)
   {
-    return (Entity) entityHash.get(entity_name);
+    return entityHash.get(entity_name);
   }
 
   /**
diff --git a/libjava/classpath/javax/swing/text/html/parser/Entity.java b/libjava/classpath/javax/swing/text/html/parser/Entity.java
index cf294c748db..1d59df237b8 100644
--- a/libjava/classpath/javax/swing/text/html/parser/Entity.java
+++ b/libjava/classpath/javax/swing/text/html/parser/Entity.java
@@ -41,8 +41,6 @@ package javax.swing.text.html.parser;
 
 import gnu.javax.swing.text.html.parser.support.gnuStringIntMapper;
 
-import java.io.Serializable;
-
 /**
  * <p>Stores information, obtained by parsing SGML DTL
  * &lt;!ENTITY % .. &gt; tag.</p>