2008-01-09 Stefan Huehner <stefan@huehner.org>

	* examples/gnu/classpath/examples/java2d/J2dBenchmark.java,
	* gnu/CORBA/OrbFocused.java,
	* gnu/CORBA/CDR/HeadlessInput.java,
	* gnu/java/awt/peer/gtk/CairoGraphics2D.java,
	* gnu/java/awt/peer/gtk/GtkFramePeer.java,
	* gnu/java/awt/peer/qt/QtMenuPeer.java,
	* gnu/java/nio/FileChannelImpl.java,
	* gnu/java/nio/SocketChannelSelectionKeyImpl.java,
	* gnu/java/security/Engine.java,
	* gnu/javax/imageio/jpeg/JPEGComponent.java,
	* gnu/javax/imageio/jpeg/JPEGDecoder.java,
	* gnu/javax/imageio/jpeg/JPEGFrame.java,
	* gnu/javax/print/PrinterDialog.java,
	* gnu/javax/security/auth/Password.java,
	* gnu/javax/swing/text/html/parser/support/Parser.java,
	* gnu/javax/swing/text/html/parser/support/parameterDefaulter.java,
	* gnu/xml/pipeline/DomConsumer.java,
	* java/awt/AWTKeyStroke.java,
	* java/awt/DefaultKeyboardFocusManager.java,
	* java/awt/GridBagLayout.java,
	* java/awt/dnd/DragGestureRecognizer.java,
	* java/awt/geom/Arc2D.java,
	* java/awt/geom/CubicCurve2D.java,
	* java/awt/geom/QuadCurve2D.java,
	* java/awt/im/InputContext.java,
	* java/awt/image/AffineTransformOp.java,
	* java/beans/Encoder.java,
	* java/io/ObjectInputStream.java,
	* java/io/ObjectStreamClass.java,
	* java/net/ResolverCache.java,
	* java/nio/charset/Charset.java,
	* java/security/SecureClassLoader.java,
	* java/text/MessageFormat.java,
	* java/util/jar/Manifest.java,
	* javax/accessibility/AccessibleRelationSet.java,
	* javax/imageio/ImageReader.java,
	* javax/imageio/metadata/IIOMetadataNode.java,
	* javax/print/attribute/standard/MediaSize.java,
	* javax/print/attribute/standard/PrinterStateReasons.java,
	* javax/swing/JTree.java,
	* javax/swing/table/DefaultTableColumnModel.java,
	* javax/swing/text/html/MinimalHTMLWriter.java,
	* javax/swing/text/html/parser/DTD.java,
	* javax/swing/tree/DefaultMutableTreeNode.java,
	* javax/swing/undo/UndoManager.java,
	* org/omg/CosNaming/NamingContextExtPOA.java,
	* org/omg/CosNaming/NamingContextPOA.java,
	* org/omg/CosNaming/_NamingContextExtImplBase.java,
	* org/omg/CosNaming/_NamingContextImplBase.java,
	* tools/gnu/classpath/tools/appletviewer/CommonAppletStub.java:
	Remove unneeded casts

16 files changed, 29 insertions, 30 deletions

diff --git a/gnu/CORBA/CDR/HeadlessInput.java b/gnu/CORBA/CDR/HeadlessInput.java
index 9c7bb6bef..273ecea50 100644
--- a/gnu/CORBA/CDR/HeadlessInput.java
+++ b/gnu/CORBA/CDR/HeadlessInput.java
@@ -151,7 +151,7 @@ public class HeadlessInput
     else
       {
         subsequentCalls = true;
-        Serializable value = (Serializable) Vio.readValue(this, NONE, null,
+        Serializable value = Vio.readValue(this, NONE, null,
           null, repository_id, null, null);
         return value;
       }
@@ -167,7 +167,7 @@ public class HeadlessInput
     else
       {
         subsequentCalls = true;
-        value = (Serializable) Vio.readValue(this, NONE, value, null, null,
+        value = Vio.readValue(this, NONE, value, null, null,
           null, null);
         return value;
       }
@@ -186,7 +186,7 @@ public class HeadlessInput
           {
             subsequentCalls = true;
             Serializable value = (Serializable) Vio.instantiateAnyWay(clz);
-            value = (Serializable) Vio.readValue(this, NONE, value, null, null,
+            value = Vio.readValue(this, NONE, value, null, null,
               null, null);
             return value;
           }
diff --git a/gnu/CORBA/OrbFocused.java b/gnu/CORBA/OrbFocused.java
index a0f9993c1..572acbc11 100644
--- a/gnu/CORBA/OrbFocused.java
+++ b/gnu/CORBA/OrbFocused.java
@@ -185,7 +185,7 @@ public class OrbFocused
             p = (portServer) portServers.get(i);
             if (p.s_port == port)
               {
-                return (portServer) p;
+                return p;
               }
           }
         // The server is not yet instantiated. Instantiate.
diff --git a/gnu/java/awt/peer/gtk/CairoGraphics2D.java b/gnu/java/awt/peer/gtk/CairoGraphics2D.java
index e3ab39364..7dc0158d4 100644
--- a/gnu/java/awt/peer/gtk/CairoGraphics2D.java
+++ b/gnu/java/awt/peer/gtk/CairoGraphics2D.java
@@ -2114,10 +2114,10 @@ public abstract class CairoGraphics2D extends Graphics2D
   private static Rectangle computeIntersection(int x, int y, int w, int h,
                                                Rectangle rect)
   {
-    int x2 = (int) rect.x;
-    int y2 = (int) rect.y;
-    int w2 = (int) rect.width;
-    int h2 = (int) rect.height;
+    int x2 = rect.x;
+    int y2 = rect.y;
+    int w2 = rect.width;
+    int h2 = rect.height;
 
     int dx = (x > x2) ? x : x2;
     int dy = (y > y2) ? y : y2;
diff --git a/gnu/java/awt/peer/gtk/GtkFramePeer.java b/gnu/java/awt/peer/gtk/GtkFramePeer.java
index 4278a4579..87dbd5e0f 100644
--- a/gnu/java/awt/peer/gtk/GtkFramePeer.java
+++ b/gnu/java/awt/peer/gtk/GtkFramePeer.java
@@ -87,7 +87,7 @@ public class GtkFramePeer extends GtkWindowPeer
       {
         // We're adding a menubar where there was no menubar before.
         gtkFixedSetVisible (false);
-        menuBar = (MenuBarPeer) ((MenuBar) bar).getPeer();
+        menuBar = (MenuBarPeer) bar.getPeer();
         setMenuBarPeer (menuBar);
         int menuBarWidth =
           awtComponent.getWidth () - insets.left - insets.right;
@@ -109,7 +109,7 @@ public class GtkFramePeer extends GtkWindowPeer
         int oldHeight = menuBarHeight;
         int menuBarWidth =
           awtComponent.getWidth () - insets.left - insets.right;
-        menuBar = (MenuBarPeer) ((MenuBar) bar).getPeer ();
+        menuBar = (MenuBarPeer) bar.getPeer ();
         setMenuBarPeer (menuBar);
         if (menuBarWidth > 0)
           setMenuBarWidth (menuBar, menuBarWidth);
diff --git a/gnu/java/awt/peer/qt/QtMenuPeer.java b/gnu/java/awt/peer/qt/QtMenuPeer.java
index 7457c38d2..87324c710 100644
--- a/gnu/java/awt/peer/qt/QtMenuPeer.java
+++ b/gnu/java/awt/peer/qt/QtMenuPeer.java
@@ -74,7 +74,7 @@ public class QtMenuPeer extends QtMenuComponentPeer implements MenuPeer
 	Menu o = (Menu)owner;
 	for( int i=0; i < o.getItemCount(); i++ )
 	  {
-	    MenuItem ci = (MenuItem)o.getItem(i);
+	    MenuItem ci = o.getItem(i);
 	    if (ci instanceof Menu && ci.getPeer() != null)
 	      ((QtMenuPeer)ci.getPeer()).addItems();
 	    addItem( ci );
diff --git a/gnu/java/nio/FileChannelImpl.java b/gnu/java/nio/FileChannelImpl.java
index 419124050..d4a374b4a 100644
--- a/gnu/java/nio/FileChannelImpl.java
+++ b/gnu/java/nio/FileChannelImpl.java
@@ -412,7 +412,7 @@ public final class FileChannelImpl extends FileChannel
 
     if (buffer == null)
       {
-	buffer = ByteBuffer.allocate ((int) count);
+	buffer = ByteBuffer.allocate (count);
 	src.read (buffer);
 	buffer.flip();
       }
diff --git a/gnu/java/nio/SocketChannelSelectionKeyImpl.java b/gnu/java/nio/SocketChannelSelectionKeyImpl.java
index 31a96ed7d..7557e28c4 100644
--- a/gnu/java/nio/SocketChannelSelectionKeyImpl.java
+++ b/gnu/java/nio/SocketChannelSelectionKeyImpl.java
@@ -57,7 +57,7 @@ public class SocketChannelSelectionKeyImpl extends SelectionKeyImpl
   public SocketChannelSelectionKeyImpl(SocketChannelImpl ch, SelectorImpl impl)
   {
     super(ch, impl);
-    this.ch = (SocketChannelImpl) ch;
+    this.ch = ch;
   }
 
   /**
diff --git a/gnu/java/security/Engine.java b/gnu/java/security/Engine.java
index 85491922f..2cb218321 100644
--- a/gnu/java/security/Engine.java
+++ b/gnu/java/security/Engine.java
@@ -163,7 +163,7 @@ public final class Engine
           }
         else if (key.equalsIgnoreCase(ALG_ALIAS + service + "." + algorithm))
           {
-            alias = (String) provider.getProperty(key);
+            alias = provider.getProperty(key);
             if (! algorithm.equalsIgnoreCase(alias)) // does not refer to itself
               {
                 algorithm = alias;
diff --git a/gnu/javax/imageio/jpeg/JPEGComponent.java b/gnu/javax/imageio/jpeg/JPEGComponent.java
index d5799fd41..d07bb34e9 100644
--- a/gnu/javax/imageio/jpeg/JPEGComponent.java
+++ b/gnu/javax/imageio/jpeg/JPEGComponent.java
@@ -336,7 +336,7 @@ public class JPEGComponent
           {
             k += r;
             r = (int) JPEGStream.readBits(s);
-            s = (int) HuffmanTable.extend(r, s);
+            s = HuffmanTable.extend(r, s);
             zz[k] = s;
           }
         else
diff --git a/gnu/javax/imageio/jpeg/JPEGDecoder.java b/gnu/javax/imageio/jpeg/JPEGDecoder.java
index ef1f80e87..0f2a3f2b9 100644
--- a/gnu/javax/imageio/jpeg/JPEGDecoder.java
+++ b/gnu/javax/imageio/jpeg/JPEGDecoder.java
@@ -387,7 +387,7 @@ public class JPEGDecoder
                     // read in how much they need
                     for (int compIndex = 0; compIndex < numberOfComponents; compIndex++)
                       {
-                        JPEGComponent comp = (JPEGComponent) frame.components.getComponentByID(componentSelector[compIndex]);
+                        JPEGComponent comp = frame.components.getComponentByID(componentSelector[compIndex]);
                         comp.readComponentMCU(jpegStream);
                       }
                     mcuIndex++;
@@ -416,7 +416,7 @@ public class JPEGDecoder
                       {
                         for (int compIndex = 0; compIndex < numberOfComponents; compIndex++)
                           {
-                            JPEGComponent comp = (JPEGComponent) frame.components.getComponentByID(componentSelector[compIndex]);
+                            JPEGComponent comp = frame.components.getComponentByID(componentSelector[compIndex]);
                             if (compIndex > 1)
                               comp.padMCU(mcuTotalIndex, resetInterval - mcuIndex);
                             comp.resetInterval();
@@ -481,8 +481,7 @@ public class JPEGDecoder
                 // Unencode the data.
                 for (int i = 0; i < frame.getComponentCount(); i++)
                   {
-                    JPEGComponent comp =
-                      (JPEGComponent) frame.components.get(i);
+                    JPEGComponent comp = frame.components.get(i);
                     comp.setQuantizationTable(qTables[comp.quant_id].getTable());
                     comp.quantitizeData();
                     comp.idctData(myDCT);
@@ -490,7 +489,7 @@ public class JPEGDecoder
                 // Scale the image and write the data to the raster.
                 for (int i = 0; i < frame.getComponentCount(); i++)
                   {
-                    JPEGComponent comp = (JPEGComponent) frame.components.get(i);
+                    JPEGComponent comp = frame.components.get(i);
                     comp.scaleByFactors();
                     comp.writeData(raster, i);
                     // Ensure garbage collection.
diff --git a/gnu/javax/imageio/jpeg/JPEGFrame.java b/gnu/javax/imageio/jpeg/JPEGFrame.java
index 9b958f98f..35aed728a 100644
--- a/gnu/javax/imageio/jpeg/JPEGFrame.java
+++ b/gnu/javax/imageio/jpeg/JPEGFrame.java
@@ -101,7 +101,7 @@ public class JPEGFrame
   public void setHuffmanTables(byte componentID, JPEGHuffmanTable ACTable,
                                JPEGHuffmanTable DCTable)
   {
-    JPEGComponent comp = (JPEGComponent)components.getComponentByID(componentID);
+    JPEGComponent comp = components.getComponentByID(componentID);
     comp.setACTable(ACTable);
     comp.setDCTable(DCTable);
   }
diff --git a/gnu/javax/print/PrinterDialog.java b/gnu/javax/print/PrinterDialog.java
index d7598be3e..54d6b87b4 100644
--- a/gnu/javax/print/PrinterDialog.java
+++ b/gnu/javax/print/PrinterDialog.java
@@ -479,17 +479,17 @@ public final class PrinterDialog extends JDialog implements ActionListener
        */
       void updateForSelectedService()
       {
-        PrinterMakeAndModel att1 = (PrinterMakeAndModel)
+        PrinterMakeAndModel att1 =
           getSelectedPrintService().getAttribute(PrinterMakeAndModel.class);
         typValue.setText(att1 == null ? "" : att1.getValue());
         
-        PrinterInfo att2 = (PrinterInfo) 
+        PrinterInfo att2 = 
           getSelectedPrintService().getAttribute(PrinterInfo.class);
         infoValue.setText(att2 == null ? "" : att2.getValue());
         
-        PrinterIsAcceptingJobs att3 = (PrinterIsAcceptingJobs)
+        PrinterIsAcceptingJobs att3 =
           getSelectedPrintService().getAttribute(PrinterIsAcceptingJobs.class);
-        PrinterState att4 = (PrinterState)
+        PrinterState att4 =
           getSelectedPrintService().getAttribute(PrinterState.class);
         
         String status = att4.toString();  
diff --git a/gnu/javax/security/auth/Password.java b/gnu/javax/security/auth/Password.java
index c55f4a51c..8fb07ee6b 100644
--- a/gnu/javax/security/auth/Password.java
+++ b/gnu/javax/security/auth/Password.java
@@ -143,7 +143,7 @@ public final class Password extends ExpirableObject
 
     for(i = 0, j = offset; i < length; i++, j++)
       {
-        this.password[i] = (char) password[j];
+        this.password[i] = password[j];
         // XXX this should use character encodings, other than ASCII.
         bPassword[i] = (byte) (password[j] & 0x7F);
       }
diff --git a/gnu/javax/swing/text/html/parser/support/Parser.java b/gnu/javax/swing/text/html/parser/support/Parser.java
index 55557e812..e99be3238 100644
--- a/gnu/javax/swing/text/html/parser/support/Parser.java
+++ b/gnu/javax/swing/text/html/parser/support/Parser.java
@@ -866,7 +866,7 @@ public class Parser
   {
     Object value = HTML.NULL_ATTRIBUTE_VALUE;
 
-    Element e = (Element) dtd.elementHash.get(element.toLowerCase());
+    Element e = dtd.elementHash.get(element.toLowerCase());
     if (e != null)
       {
         AttributeList attr = e.getAttribute(attribute);
@@ -1326,7 +1326,7 @@ public class Parser
 
   private TagElement makeTagElement(String name, boolean isSupposed)
   {
-    Element e = (Element) dtd.elementHash.get(name.toLowerCase());
+    Element e = dtd.elementHash.get(name.toLowerCase());
     if (e == null)
       {
         error("Unknown tag <" + name + ">");
diff --git a/gnu/javax/swing/text/html/parser/support/parameterDefaulter.java b/gnu/javax/swing/text/html/parser/support/parameterDefaulter.java
index 654acbbb5..43c07572a 100644
--- a/gnu/javax/swing/text/html/parser/support/parameterDefaulter.java
+++ b/gnu/javax/swing/text/html/parser/support/parameterDefaulter.java
@@ -80,7 +80,7 @@ public class parameterDefaulter
     if (atts == null)
       {
         htmlAttributeSet set = new htmlAttributeSet();
-        Element e = (Element) dtd.elementHash.get(element.toLowerCase());
+        Element e = dtd.elementHash.get(element.toLowerCase());
 
         if (e != null)
           {
diff --git a/gnu/xml/pipeline/DomConsumer.java b/gnu/xml/pipeline/DomConsumer.java
index da527b965..53f7f24a2 100644
--- a/gnu/xml/pipeline/DomConsumer.java
+++ b/gnu/xml/pipeline/DomConsumer.java
@@ -743,7 +743,7 @@ public class DomConsumer implements EventConsumer
 	    // ELSE ... search up the tree we've been building
 	    for (Node n = top;
 		    n != null && n.getNodeType () != Node.DOCUMENT_NODE;
-		    n = (Node) n.getParentNode ()) {
+		    n = n.getParentNode ()) {
 		if (n.getNodeType () == Node.ENTITY_REFERENCE_NODE)
 		    continue;
 		Element e = (Element) n;