diff options
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2008-01-09 20:42:36 +0000 |
|---|---|---|
| committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2008-01-09 20:42:36 +0000 |
| commit | 7aa3cc0b7dc8206eb1910ca9ad195dcfb819b67f (patch) | |
| tree | f342ed3be31a43a267a16272ec1f0bebc8a6eafc | |
| parent | efeb92bcee2e59df89813bbb46742fca1fafc6e3 (diff) | |
| download | classpath-7aa3cc0b7dc8206eb1910ca9ad195dcfb819b67f.tar.gz | |
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
51 files changed, 156 insertions, 104 deletions
@@ -1,3 +1,58 @@ +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 + 2006-01-09 Roman Kennke <kennke@aicas.com> * java/text/CollationElementIterator.java diff --git a/examples/gnu/classpath/examples/java2d/J2dBenchmark.java b/examples/gnu/classpath/examples/java2d/J2dBenchmark.java index 6d3591808..a0b51f0e2 100644 --- a/examples/gnu/classpath/examples/java2d/J2dBenchmark.java +++ b/examples/gnu/classpath/examples/java2d/J2dBenchmark.java @@ -601,7 +601,7 @@ public class J2dBenchmark void runTestSet(Graphics2D g, Dimension size) { // Any user-specified options (ie set transforms, rendering hints) - prepareGraphics((Graphics2D) g); + prepareGraphics(g); if ((awtTests & J2DTEST_ARC) != 0) { 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; diff --git a/java/awt/AWTKeyStroke.java b/java/awt/AWTKeyStroke.java index 666f3a675..378e4eb15 100644 --- a/java/awt/AWTKeyStroke.java +++ b/java/awt/AWTKeyStroke.java @@ -643,7 +643,7 @@ public class AWTKeyStroke implements Serializable throw (Error) new InternalError().initCause(e); } // Check level 1 cache. - AWTKeyStroke cached = (AWTKeyStroke) cache.get(stroke); + AWTKeyStroke cached = cache.get(stroke); if (cached == null) cache.put(stroke, stroke); else diff --git a/java/awt/DefaultKeyboardFocusManager.java b/java/awt/DefaultKeyboardFocusManager.java index 9fea99b78..325e3ac8d 100644 --- a/java/awt/DefaultKeyboardFocusManager.java +++ b/java/awt/DefaultKeyboardFocusManager.java @@ -350,7 +350,7 @@ public class DefaultKeyboardFocusManager extends KeyboardFocusManager while (i.hasNext ()) { KeyEventPostProcessor processor = (KeyEventPostProcessor) i.next (); - if (processor.postProcessKeyEvent ((KeyEvent) e)) + if (processor.postProcessKeyEvent (e)) return true; } diff --git a/java/awt/GridBagLayout.java b/java/awt/GridBagLayout.java index 0415c7bd3..d016fd31a 100644 --- a/java/awt/GridBagLayout.java +++ b/java/awt/GridBagLayout.java @@ -211,12 +211,12 @@ public class GridBagLayout protected GridBagConstraints lookupConstraints (Component component) { - GridBagConstraints result = (GridBagConstraints) comptable.get (component); + GridBagConstraints result = comptable.get (component); if (result == null) { setConstraints (component, defaultConstraints); - result = (GridBagConstraints) comptable.get (component); + result = comptable.get (component); } return result; @@ -224,8 +224,7 @@ public class GridBagLayout private GridBagConstraints lookupInternalConstraints (Component component) { - GridBagConstraints result = - (GridBagConstraints) internalcomptable.get (component); + GridBagConstraints result = internalcomptable.get (component); if (result == null) { @@ -562,7 +561,7 @@ public class GridBagLayout x = 0; else { - Component lastComponent = (Component) lastInRow.get(new Integer(constraints.gridy)); + Component lastComponent = lastInRow.get(new Integer(constraints.gridy)); GridBagConstraints lastConstraints = lookupInternalConstraints(lastComponent); x = lastConstraints.gridx + Math.max(1, lastConstraints.gridwidth); } @@ -573,7 +572,7 @@ public class GridBagLayout { if (lastInRow.containsKey(new Integer(y))) { - Component lastComponent = (Component) lastInRow.get(new Integer(y)); + Component lastComponent = lastInRow.get(new Integer(y)); GridBagConstraints lastConstraints = lookupInternalConstraints(lastComponent); x = Math.max (x, lastConstraints.gridx + Math.max(1, lastConstraints.gridwidth)); @@ -595,7 +594,7 @@ public class GridBagLayout } else { - Component lastComponent = (Component)lastInCol.get(new Integer(constraints.gridx)); + Component lastComponent = lastInCol.get(new Integer(constraints.gridx)); GridBagConstraints lastConstraints = lookupInternalConstraints(lastComponent); y = lastConstraints.gridy + Math.max(1, lastConstraints.gridheight); } @@ -606,7 +605,7 @@ public class GridBagLayout { if (lastInCol.containsKey(new Integer(x))) { - Component lastComponent = (Component) lastInCol.get(new Integer(x)); + Component lastComponent = lastInCol.get(new Integer(x)); GridBagConstraints lastConstraints = lookupInternalConstraints(lastComponent); y = Math.max (y, lastConstraints.gridy + Math.max(1, lastConstraints.gridheight)); @@ -636,7 +635,7 @@ public class GridBagLayout { if(lastInRow.containsKey(new Integer(y))) { - Component lastComponent = (Component) lastInRow.get(new Integer(y)); + Component lastComponent = lastInRow.get(new Integer(y)); GridBagConstraints lastConstraints = lookupInternalConstraints(lastComponent); if (constraints.gridx > lastConstraints.gridx) { @@ -653,7 +652,7 @@ public class GridBagLayout { if(lastInCol.containsKey(new Integer(x))) { - Component lastComponent = (Component) lastInCol.get(new Integer(x)); + Component lastComponent = lastInCol.get(new Integer(x)); GridBagConstraints lastConstraints = lookupInternalConstraints(lastComponent); if (constraints.gridy > lastConstraints.gridy) { @@ -707,7 +706,7 @@ public class GridBagLayout { if (lastInRow.containsKey(new Integer(y))) { - Component lastComponent = (Component) lastInRow.get(new Integer(y)); + Component lastComponent = lastInRow.get(new Integer(y)); GridBagConstraints lastConstraints = lookupInternalConstraints(lastComponent); if (lastConstraints.gridwidth == GridBagConstraints.RELATIVE) @@ -742,7 +741,7 @@ public class GridBagLayout { if (lastInCol.containsKey(new Integer(x))) { - Component lastComponent = (Component) lastInRow.get(new Integer(x)); + Component lastComponent = lastInRow.get(new Integer(x)); if (lastComponent != null) { GridBagConstraints lastConstraints = lookupInternalConstraints(lastComponent); @@ -804,7 +803,7 @@ public class GridBagLayout // STEP 4: Determine sizes and weights for rows. for (int i = 0; i < sortedByHeight.size(); i++) { - Component component = (Component) sortedByHeight.get(i); + Component component = sortedByHeight.get(i); // If component is not visible we dont have to care about it. if (!component.isVisible()) @@ -904,7 +903,7 @@ public class GridBagLayout int i = 0; if (list.size() > 0) { - GridBagConstraints gbc = lookupInternalConstraints((Component) list.get(i)); + GridBagConstraints gbc = lookupInternalConstraints(list.get(i)); int otherspan = sortByWidth ? gbc.gridwidth : gbc.gridheight; @@ -915,7 +914,7 @@ public class GridBagLayout i++; if (i < list.size()) { - gbc = lookupInternalConstraints((Component) list.get(i)); + gbc = lookupInternalConstraints(list.get(i)); otherspan = sortByWidth ? gbc.gridwidth : gbc.gridheight; diff --git a/java/awt/dnd/DragGestureRecognizer.java b/java/awt/dnd/DragGestureRecognizer.java index 3973e5284..fb37b4fc7 100644 --- a/java/awt/dnd/DragGestureRecognizer.java +++ b/java/awt/dnd/DragGestureRecognizer.java @@ -124,7 +124,7 @@ public abstract class DragGestureRecognizer implements Serializable public InputEvent getTriggerEvent() { - return events.size() > 0 ? (InputEvent) events.get(0) : null; + return events.size() > 0 ? events.get(0) : null; } /** diff --git a/java/awt/geom/Arc2D.java b/java/awt/geom/Arc2D.java index 8d5b01cd5..eb9a16093 100644 --- a/java/awt/geom/Arc2D.java +++ b/java/awt/geom/Arc2D.java @@ -1279,7 +1279,7 @@ public abstract class Arc2D extends RectangularShape width = (float) r.getWidth(); height = (float) r.getHeight(); this.start = start; - this.extent = (float) extent; + this.extent = extent; } /** diff --git a/java/awt/geom/CubicCurve2D.java b/java/awt/geom/CubicCurve2D.java index 50c381194..d0d55984f 100644 --- a/java/awt/geom/CubicCurve2D.java +++ b/java/awt/geom/CubicCurve2D.java @@ -1714,10 +1714,10 @@ public abstract class CubicCurve2D implements Shape, Cloneable */ public Rectangle2D getBounds2D() { - float nx1 = (float) Math.min(Math.min(x1, ctrlx1), Math.min(ctrlx2, x2)); - float ny1 = (float) Math.min(Math.min(y1, ctrly1), Math.min(ctrly2, y2)); - float nx2 = (float) Math.max(Math.max(x1, ctrlx1), Math.max(ctrlx2, x2)); - float ny2 = (float) Math.max(Math.max(y1, ctrly1), Math.max(ctrly2, y2)); + float nx1 = Math.min(Math.min(x1, ctrlx1), Math.min(ctrlx2, x2)); + float ny1 = Math.min(Math.min(y1, ctrly1), Math.min(ctrly2, y2)); + float nx2 = Math.max(Math.max(x1, ctrlx1), Math.max(ctrlx2, x2)); + float ny2 = Math.max(Math.max(y1, ctrly1), Math.max(ctrly2, y2)); return new Rectangle2D.Float(nx1, ny1, nx2 - nx1, ny2 - ny1); } } diff --git a/java/awt/geom/QuadCurve2D.java b/java/awt/geom/QuadCurve2D.java index 41021dbc6..d247c79a5 100644 --- a/java/awt/geom/QuadCurve2D.java +++ b/java/awt/geom/QuadCurve2D.java @@ -1457,10 +1457,10 @@ public abstract class QuadCurve2D implements Shape, Cloneable */ public Rectangle2D getBounds2D() { - float nx1 = (float) Math.min(Math.min(x1, ctrlx), x2); - float ny1 = (float) Math.min(Math.min(y1, ctrly), y2); - float nx2 = (float) Math.max(Math.max(x1, ctrlx), x2); - float ny2 = (float) Math.max(Math.max(y1, ctrly), y2); + float nx1 = Math.min(Math.min(x1, ctrlx), x2); + float ny1 = Math.min(Math.min(y1, ctrly), y2); + float nx2 = Math.max(Math.max(x1, ctrlx), x2); + float ny2 = Math.max(Math.max(y1, ctrly), y2); return new Rectangle2D.Float(nx1, ny1, nx2 - nx1, ny2 - ny1); } } diff --git a/java/awt/im/InputContext.java b/java/awt/im/InputContext.java index 00e9088a4..c2e09b6d1 100644 --- a/java/awt/im/InputContext.java +++ b/java/awt/im/InputContext.java @@ -216,11 +216,11 @@ public class InputContext recent.put(locale, im); return true; } - InputMethod next = (InputMethod) recent.get(locale); + InputMethod next = recent.get(locale); if (next != null) for (int i = 0, limit = descriptors.size(); i < limit; i++) { - InputMethodDescriptor d = (InputMethodDescriptor) descriptors.get(i); + InputMethodDescriptor d = descriptors.get(i); Locale[] list; try { diff --git a/java/awt/image/AffineTransformOp.java b/java/awt/image/AffineTransformOp.java index 849c5b050..df9db7d96 100644 --- a/java/awt/image/AffineTransformOp.java +++ b/java/awt/image/AffineTransformOp.java @@ -188,7 +188,7 @@ public class AffineTransformOp implements BufferedImageOp, RasterOp if (dst == null) dst = createCompatibleDestImage(src, null); - Graphics2D gr = (Graphics2D) dst.createGraphics(); + Graphics2D gr = dst.createGraphics(); gr.setRenderingHints(hints); gr.drawImage(src, transform, null); return dst; diff --git a/java/beans/Encoder.java b/java/beans/Encoder.java index cde1735f4..6dc36277f 100644 --- a/java/beans/Encoder.java +++ b/java/beans/Encoder.java @@ -195,7 +195,7 @@ public class Encoder PersistenceDelegate pd = (PersistenceDelegate) delegates.get(type); - return (pd != null) ? pd : (PersistenceDelegate) defaultPersistenceDelegate; + return (pd != null) ? pd : defaultPersistenceDelegate; } /** diff --git a/java/io/ObjectInputStream.java b/java/io/ObjectInputStream.java index eb968d441..ea3ffde61 100644 --- a/java/io/ObjectInputStream.java +++ b/java/io/ObjectInputStream.java @@ -915,7 +915,7 @@ public class ObjectInputStream extends InputStream return null; ObjectStreamClass oclazz; - oclazz = (ObjectStreamClass)classLookupTable.get(clazz); + oclazz = classLookupTable.get(clazz); if (oclazz == null) return ObjectStreamClass.lookup(clazz); else diff --git a/java/io/ObjectStreamClass.java b/java/io/ObjectStreamClass.java index 39b81a75f..dd7cecf9c 100644 --- a/java/io/ObjectStreamClass.java +++ b/java/io/ObjectStreamClass.java @@ -106,7 +106,7 @@ public class ObjectStreamClass implements Serializable if (cl == null) return null; - ObjectStreamClass osc = (ObjectStreamClass) classLookupTable.get(cl); + ObjectStreamClass osc = classLookupTable.get(cl); if (osc != null) return osc; diff --git a/java/net/ResolverCache.java b/java/net/ResolverCache.java index e8480ce54..ad329b607 100644 --- a/java/net/ResolverCache.java +++ b/java/net/ResolverCache.java @@ -116,7 +116,7 @@ class ResolverCache public static String getHostByAddr(byte[] addr) throws UnknownHostException { Object key = makeHashableAddress(addr); - Entry entry = (Entry) get(key); + Entry entry = get(key); if (entry != null) { if (entry.value == null) @@ -149,7 +149,7 @@ class ResolverCache public static byte[][] getHostByName(String hostname) throws UnknownHostException { - Entry entry = (Entry) get(hostname); + Entry entry = get(hostname); if (entry != null) { if (entry.value == null) diff --git a/java/nio/charset/Charset.java b/java/nio/charset/Charset.java index 556e4707e..924e005e6 100644 --- a/java/nio/charset/Charset.java +++ b/java/nio/charset/Charset.java @@ -234,7 +234,7 @@ public abstract class Charset implements Comparable<Charset> { for (Iterator<Charset> i = providers[j].charsets(); i.hasNext(); ) { - Charset cs = (Charset) i.next(); + Charset cs = i.next(); charsets.put(cs.name(), cs); } } diff --git a/java/security/SecureClassLoader.java b/java/security/SecureClassLoader.java index 87dacf3b7..6e173007e 100644 --- a/java/security/SecureClassLoader.java +++ b/java/security/SecureClassLoader.java @@ -111,7 +111,7 @@ public class SecureClassLoader extends ClassLoader { synchronized (protectionDomainCache) { - protectionDomain = (ProtectionDomain)protectionDomainCache.get(cs); + protectionDomain = protectionDomainCache.get(cs); } if (protectionDomain == null) @@ -120,8 +120,7 @@ public class SecureClassLoader extends ClassLoader = new ProtectionDomain(cs, getPermissions(cs), this, null); synchronized (protectionDomainCache) { - ProtectionDomain domain - = (ProtectionDomain)protectionDomainCache.get(cs); + ProtectionDomain domain = protectionDomainCache.get(cs); if (domain == null) protectionDomainCache.put(cs, protectionDomain); else diff --git a/java/text/MessageFormat.java b/java/text/MessageFormat.java index 5ddf0e825..5a595f576 100644 --- a/java/text/MessageFormat.java +++ b/java/text/MessageFormat.java @@ -630,7 +630,7 @@ public class MessageFormat extends Format // have recursive formatting. ChoiceFormat cf = (ChoiceFormat) formatter; String[] formats = (String[]) cf.getFormats(); - double[] limits = (double[]) cf.getLimits(); + double[] limits = cf.getLimits(); MessageFormat subfmt = new MessageFormat (); subfmt.setLocale(locale); ParsePosition subpos = new ParsePosition (index); diff --git a/java/util/jar/Manifest.java b/java/util/jar/Manifest.java index 8effc2878..980cfc60b 100644 --- a/java/util/jar/Manifest.java +++ b/java/util/jar/Manifest.java @@ -138,7 +138,7 @@ public class Manifest implements Cloneable */ public Attributes getAttributes(String entryName) { - return (Attributes) getEntries().get(entryName); + return getEntries().get(entryName); } /** diff --git a/javax/accessibility/AccessibleRelationSet.java b/javax/accessibility/AccessibleRelationSet.java index 768c9cd79..49161d77e 100644 --- a/javax/accessibility/AccessibleRelationSet.java +++ b/javax/accessibility/AccessibleRelationSet.java @@ -168,7 +168,7 @@ public class AccessibleRelationSet { int i = relations.size(); while (--i >= 0) - if (((AccessibleRelation) relations.get(i)).key.equals(key)) + if ((relations.get(i)).key.equals(key)) return true; return false; } @@ -184,7 +184,7 @@ public class AccessibleRelationSet int i = relations.size(); while (--i >= 0) { - AccessibleRelation r = (AccessibleRelation) relations.get(i); + AccessibleRelation r = relations.get(i); if (r.key.equals(key)) return r; } diff --git a/javax/imageio/ImageReader.java b/javax/imageio/ImageReader.java index a51eb4221..269493f23 100644 --- a/javax/imageio/ImageReader.java +++ b/javax/imageio/ImageReader.java @@ -1734,7 +1734,7 @@ public abstract class ImageReader public ImageTypeSpecifier getRawImageType (int imageIndex) throws IOException { - return (ImageTypeSpecifier) getImageTypes(imageIndex).next(); + return getImageTypes(imageIndex).next(); } /** diff --git a/javax/imageio/metadata/IIOMetadataNode.java b/javax/imageio/metadata/IIOMetadataNode.java index 2d52e4670..37269f539 100644 --- a/javax/imageio/metadata/IIOMetadataNode.java +++ b/javax/imageio/metadata/IIOMetadataNode.java @@ -334,7 +334,7 @@ public class IIOMetadataNode */ public void setAttribute(String name, String value) { - Attr attr = (Attr) getAttributeNode(name); + Attr attr = getAttributeNode(name); if (attr != null) attr.setValue(value); else diff --git a/javax/print/attribute/standard/MediaSize.java b/javax/print/attribute/standard/MediaSize.java index be3f15678..f2fa100a0 100644 --- a/javax/print/attribute/standard/MediaSize.java +++ b/javax/print/attribute/standard/MediaSize.java @@ -214,7 +214,7 @@ public class MediaSize extends Size2DSyntax for (int i = 0; i < mediaCache.size(); i++) { - MediaSize size = (MediaSize) mediaCache.get(i); + MediaSize size = mediaCache.get(i); int dist = (Math.abs(size.getXMicrometers() - xMicro) + Math.abs(size.getYMicrometers() - yMicro)); @@ -240,7 +240,7 @@ public class MediaSize extends Size2DSyntax { for (int i = 0; i < mediaCache.size(); i++) { - MediaSize size = (MediaSize) mediaCache.get(i); + MediaSize size = mediaCache.get(i); if (size.getMediaSizeName().equals(media)) return size; diff --git a/javax/print/attribute/standard/PrinterStateReasons.java b/javax/print/attribute/standard/PrinterStateReasons.java index c58dd5379..3e77e181e 100644 --- a/javax/print/attribute/standard/PrinterStateReasons.java +++ b/javax/print/attribute/standard/PrinterStateReasons.java @@ -178,7 +178,7 @@ public final class PrinterStateReasons if (severity == null) throw new NullPointerException("severity is null"); - return super.put((PrinterStateReason) reason, (Severity) severity); + return super.put(reason, severity); } /** diff --git a/javax/swing/JTree.java b/javax/swing/JTree.java index 332ec7424..c0365bc38 100644 --- a/javax/swing/JTree.java +++ b/javax/swing/JTree.java @@ -3105,7 +3105,7 @@ public class JTree extends JComponent implements Scrollable, Accessible { while (toRemove.hasMoreElements()) { - TreePath current = (TreePath) toRemove.nextElement(); + TreePath current = toRemove.nextElement(); Enumeration descendants = getDescendantToggledPaths(current); while (descendants.hasMoreElements()) diff --git a/javax/swing/table/DefaultTableColumnModel.java b/javax/swing/table/DefaultTableColumnModel.java index e4e7201b1..717ea9868 100644 --- a/javax/swing/table/DefaultTableColumnModel.java +++ b/javax/swing/table/DefaultTableColumnModel.java @@ -243,7 +243,7 @@ public class DefaultTableColumnModel int columnCount = tableColumns.size(); for (int i = 0; i < columnCount; i++) { - TableColumn tc = (TableColumn) tableColumns.get(i); + TableColumn tc = tableColumns.get(i); if (identifier.equals(tc.getIdentifier())) return i; } @@ -264,7 +264,7 @@ public class DefaultTableColumnModel */ public TableColumn getColumn(int columnIndex) { - return (TableColumn) tableColumns.get(columnIndex); + return tableColumns.get(columnIndex); } /** @@ -299,7 +299,7 @@ public class DefaultTableColumnModel { for (int i = 0; i < tableColumns.size(); ++i) { - int w = ((TableColumn) tableColumns.get(i)).getWidth(); + int w = (tableColumns.get(i)).getWidth(); if (0 <= x && x < w) return i; else @@ -654,7 +654,7 @@ public class DefaultTableColumnModel totalColumnWidth = 0; for (int i = 0; i < tableColumns.size(); ++i) { - totalColumnWidth += ((TableColumn) tableColumns.get(i)).getWidth(); + totalColumnWidth += tableColumns.get(i).getWidth(); } } } diff --git a/javax/swing/text/html/MinimalHTMLWriter.java b/javax/swing/text/html/MinimalHTMLWriter.java index d42951a05..acb2c04ac 100644 --- a/javax/swing/text/html/MinimalHTMLWriter.java +++ b/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/javax/swing/text/html/parser/DTD.java b/javax/swing/text/html/parser/DTD.java index ae3c184f1..09b50fee7 100644 --- a/javax/swing/text/html/parser/DTD.java +++ b/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/javax/swing/tree/DefaultMutableTreeNode.java b/javax/swing/tree/DefaultMutableTreeNode.java index 9f587946f..218d31473 100644 --- a/javax/swing/tree/DefaultMutableTreeNode.java +++ b/javax/swing/tree/DefaultMutableTreeNode.java @@ -202,7 +202,7 @@ public class DefaultMutableTreeNode */ public void remove(int index) { - MutableTreeNode child = (MutableTreeNode) children.remove(index); + MutableTreeNode child = children.remove(index); child.setParent(null); } @@ -553,7 +553,7 @@ public class DefaultMutableTreeNode { node = node.getParent(); size = node.getChildCount(); - index = ((Integer) stack.pop()).intValue() + 1; + index = stack.pop().intValue() + 1; current--; } while (index >= size diff --git a/javax/swing/undo/UndoManager.java b/javax/swing/undo/UndoManager.java index b9e6de675..1f47d5170 100644 --- a/javax/swing/undo/UndoManager.java +++ b/javax/swing/undo/UndoManager.java @@ -196,7 +196,7 @@ public class UndoManager size = edits.size(); for (int i = size - 1; i >= 0; i--) - ((UndoableEdit) edits.get(i)).die(); + edits.get(i).die(); indexOfNextAdd = 0; edits.clear(); } @@ -244,7 +244,7 @@ public class UndoManager return; for (int i = to; i >= from; i--) - ((UndoableEdit) edits.get(i)).die(); + edits.get(i).die(); // Remove the range [from .. to] from edits. If from == to, which // is likely to be a very common case, we can do better than @@ -275,7 +275,7 @@ public class UndoManager for (int i = indexOfNextAdd - 1; i >= 0; i--) { - result = (UndoableEdit) edits.get(i); + result = edits.get(i); if (result.isSignificant()) return result; } @@ -298,7 +298,7 @@ public class UndoManager for (int i = indexOfNextAdd; i < edits.size(); i++) { - result = (UndoableEdit) edits.get(i); + result = edits.get(i); if (result.isSignificant()) return result; } @@ -324,7 +324,7 @@ public class UndoManager while (true) { indexOfNextAdd -= 1; - cur = (UndoableEdit) edits.get(indexOfNextAdd); + cur = edits.get(indexOfNextAdd); cur.undo(); if (cur == edit) return; @@ -348,7 +348,7 @@ public class UndoManager while (true) { - cur = (UndoableEdit) edits.get(indexOfNextAdd); + cur = edits.get(indexOfNextAdd); indexOfNextAdd += 1; cur.redo(); if (cur == edit) diff --git a/org/omg/CosNaming/NamingContextExtPOA.java b/org/omg/CosNaming/NamingContextExtPOA.java index cf5d7b3d8..f3c93aab3 100644 --- a/org/omg/CosNaming/NamingContextExtPOA.java +++ b/org/omg/CosNaming/NamingContextExtPOA.java @@ -84,7 +84,7 @@ public abstract class NamingContextExtPOA /** @inheritDoc */ public OutputStream _invoke(String method, InputStream in, ResponseHandler rh) { - Integer call_method = (Integer) _NamingContextExtImplBase._methods.get(method); + Integer call_method = _NamingContextExtImplBase._methods.get(method); if (call_method == null) // The older methods are handled separately. @@ -189,7 +189,7 @@ public abstract class NamingContextExtPOA OutputStream super_invoke(String method, InputStream in, ResponseHandler rh) { OutputStream out = null; - Integer call_method = (Integer) _NamingContextImplBase.methods.get(method); + Integer call_method = _NamingContextImplBase.methods.get(method); if (call_method == null) throw new BAD_OPERATION(Minor.Method, CompletionStatus.COMPLETED_MAYBE); diff --git a/org/omg/CosNaming/NamingContextPOA.java b/org/omg/CosNaming/NamingContextPOA.java index a97888276..a4f8b1cb6 100644 --- a/org/omg/CosNaming/NamingContextPOA.java +++ b/org/omg/CosNaming/NamingContextPOA.java @@ -92,7 +92,7 @@ public abstract class NamingContextPOA public OutputStream _invoke(String method, InputStream in, ResponseHandler rh) { OutputStream out = null; - Integer call_method = (Integer) _NamingContextImplBase.methods.get(method); + Integer call_method = _NamingContextImplBase.methods.get(method); if (call_method == null) throw new BAD_OPERATION(Minor.Method, CompletionStatus.COMPLETED_MAYBE); diff --git a/org/omg/CosNaming/_NamingContextExtImplBase.java b/org/omg/CosNaming/_NamingContextExtImplBase.java index 617f7aec4..387e27e68 100644 --- a/org/omg/CosNaming/_NamingContextExtImplBase.java +++ b/org/omg/CosNaming/_NamingContextExtImplBase.java @@ -96,7 +96,7 @@ public abstract class _NamingContextExtImplBase public OutputStream _invoke(String method, InputStream in, ResponseHandler rh) { - Integer call_method = (Integer) _methods.get(method); + Integer call_method = _methods.get(method); if (call_method == null) @@ -206,7 +206,7 @@ public abstract class _NamingContextExtImplBase { Streamable result = null; - Integer call_method = (Integer) _methods.get(request.operation()); + Integer call_method = _methods.get(request.operation()); if (call_method == null) { diff --git a/org/omg/CosNaming/_NamingContextImplBase.java b/org/omg/CosNaming/_NamingContextImplBase.java index 1c2a56be6..115ef74c3 100644 --- a/org/omg/CosNaming/_NamingContextImplBase.java +++ b/org/omg/CosNaming/_NamingContextImplBase.java @@ -123,7 +123,7 @@ public abstract class _NamingContextImplBase public OutputStream _invoke(String method, InputStream in, ResponseHandler rh) { OutputStream out = null; - Integer call_method = (Integer) methods.get(method); + Integer call_method = methods.get(method); if (call_method == null) throw new BAD_OPERATION(Minor.Method, CompletionStatus.COMPLETED_MAYBE); @@ -389,7 +389,7 @@ public abstract class _NamingContextImplBase Streamable result = null; // The server request contains no required result type. - Integer call_method = (Integer) methods.get(request.operation()); + Integer call_method = methods.get(request.operation()); if (call_method == null) throw new BAD_OPERATION(Minor.Method, CompletionStatus.COMPLETED_MAYBE); diff --git a/tools/gnu/classpath/tools/appletviewer/CommonAppletStub.java b/tools/gnu/classpath/tools/appletviewer/CommonAppletStub.java index c41ac1d7c..24b305a22 100644 --- a/tools/gnu/classpath/tools/appletviewer/CommonAppletStub.java +++ b/tools/gnu/classpath/tools/appletviewer/CommonAppletStub.java @@ -113,7 +113,7 @@ class CommonAppletStub */ public String getParameter(String name) { - return (String) tag.getParameter(name.toLowerCase()); + return tag.getParameter(name.toLowerCase()); } /** |