Hi,
remove a lot unused type casts. Some of these seem to come from
a previous cleanup introducing typed containers (collections).
Please comment/commit.
Regards,
Stefan
2008-01-09 Stefan Huehner <stefan at 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
Index: examples/gnu/classpath/examples/java2d/J2dBenchmark.java
===================================================================
RCS file: /sources/classpath/classpath/examples/gnu/classpath/examples/java2d/J2dBenchmark.java,v
retrieving revision 1.4
diff -u -r1.4 J2dBenchmark.java
--- examples/gnu/classpath/examples/java2d/J2dBenchmark.java 11 Jan 2007 22:13:23 -0000 1.4
+++ examples/gnu/classpath/examples/java2d/J2dBenchmark.java 8 Jan 2008 11:32:51 -0000
@@ -601,7 +601,7 @@
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)
{
Index: gnu/CORBA/OrbFocused.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/CORBA/OrbFocused.java,v
retrieving revision 1.1
diff -u -r1.1 OrbFocused.java
--- gnu/CORBA/OrbFocused.java 28 Oct 2005 12:04:39 -0000 1.1
+++ gnu/CORBA/OrbFocused.java 8 Jan 2008 11:32:57 -0000
@@ -185,7 +185,7 @@
p = (portServer) portServers.get(i);
if (p.s_port == port)
{
- return (portServer) p;
+ return p;
}
}
// The server is not yet instantiated. Instantiate.
Index: gnu/CORBA/CDR/HeadlessInput.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/CORBA/CDR/HeadlessInput.java,v
retrieving revision 1.2
diff -u -r1.2 HeadlessInput.java
--- gnu/CORBA/CDR/HeadlessInput.java 7 Jan 2008 21:11:18 -0000 1.2
+++ gnu/CORBA/CDR/HeadlessInput.java 8 Jan 2008 11:32:58 -0000
@@ -151,7 +151,7 @@
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 @@
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 @@
{
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;
}
Index: gnu/java/awt/peer/gtk/CairoGraphics2D.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java,v
retrieving revision 1.71
diff -u -r1.71 CairoGraphics2D.java
--- gnu/java/awt/peer/gtk/CairoGraphics2D.java 7 Jan 2008 21:11:20 -0000 1.71
+++ gnu/java/awt/peer/gtk/CairoGraphics2D.java 8 Jan 2008 11:33:00 -0000
@@ -2114,10 +2114,10 @@
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;
Index: gnu/java/awt/peer/gtk/GtkFramePeer.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/awt/peer/gtk/GtkFramePeer.java,v
retrieving revision 1.53
diff -u -r1.53 GtkFramePeer.java
--- gnu/java/awt/peer/gtk/GtkFramePeer.java 22 Jun 2007 14:27:57 -0000 1.53
+++ gnu/java/awt/peer/gtk/GtkFramePeer.java 8 Jan 2008 11:33:00 -0000
@@ -87,7 +87,7 @@
{
// 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 @@
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);
Index: gnu/java/awt/peer/qt/QtMenuPeer.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/awt/peer/qt/QtMenuPeer.java,v
retrieving revision 1.5
diff -u -r1.5 QtMenuPeer.java
--- gnu/java/awt/peer/qt/QtMenuPeer.java 4 Sep 2005 15:31:07 -0000 1.5
+++ gnu/java/awt/peer/qt/QtMenuPeer.java 8 Jan 2008 11:33:00 -0000
@@ -74,7 +74,7 @@
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 );
Index: gnu/java/nio/FileChannelImpl.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/nio/FileChannelImpl.java,v
retrieving revision 1.19
diff -u -r1.19 FileChannelImpl.java
--- gnu/java/nio/FileChannelImpl.java 25 Sep 2006 21:54:45 -0000 1.19
+++ gnu/java/nio/FileChannelImpl.java 8 Jan 2008 11:33:01 -0000
@@ -412,7 +412,7 @@
if (buffer == null)
{
- buffer = ByteBuffer.allocate ((int) count);
+ buffer = ByteBuffer.allocate (count);
src.read (buffer);
buffer.flip();
}
Index: gnu/java/nio/SocketChannelSelectionKeyImpl.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/nio/SocketChannelSelectionKeyImpl.java,v
retrieving revision 1.2
diff -u -r1.2 SocketChannelSelectionKeyImpl.java
--- gnu/java/nio/SocketChannelSelectionKeyImpl.java 17 Sep 2006 07:31:41 -0000 1.2
+++ gnu/java/nio/SocketChannelSelectionKeyImpl.java 8 Jan 2008 11:33:01 -0000
@@ -57,7 +57,7 @@
public SocketChannelSelectionKeyImpl(SocketChannelImpl ch, SelectorImpl impl)
{
super(ch, impl);
- this.ch = (SocketChannelImpl) ch;
+ this.ch = ch;
}
/**
Index: gnu/java/security/Engine.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/security/Engine.java,v
retrieving revision 1.7
diff -u -r1.7 Engine.java
--- gnu/java/security/Engine.java 21 Jun 2007 05:29:38 -0000 1.7
+++ gnu/java/security/Engine.java 8 Jan 2008 11:33:01 -0000
@@ -163,7 +163,7 @@
}
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;
Index: gnu/javax/imageio/jpeg/JPEGComponent.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/javax/imageio/jpeg/JPEGComponent.java,v
retrieving revision 1.1
diff -u -r1.1 JPEGComponent.java
--- gnu/javax/imageio/jpeg/JPEGComponent.java 4 May 2006 21:49:57 -0000 1.1
+++ gnu/javax/imageio/jpeg/JPEGComponent.java 8 Jan 2008 11:33:01 -0000
@@ -336,7 +336,7 @@
{
k += r;
r = (int) JPEGStream.readBits(s);
- s = (int) HuffmanTable.extend(r, s);
+ s = HuffmanTable.extend(r, s);
zz[k] = s;
}
else
Index: gnu/javax/imageio/jpeg/JPEGDecoder.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/javax/imageio/jpeg/JPEGDecoder.java,v
retrieving revision 1.2
diff -u -r1.2 JPEGDecoder.java
--- gnu/javax/imageio/jpeg/JPEGDecoder.java 18 Sep 2007 21:52:29 -0000 1.2
+++ gnu/javax/imageio/jpeg/JPEGDecoder.java 8 Jan 2008 11:33:01 -0000
@@ -387,7 +387,7 @@
// 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 @@
{
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 @@
// 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 @@
// 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.
Index: gnu/javax/imageio/jpeg/JPEGFrame.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/javax/imageio/jpeg/JPEGFrame.java,v
retrieving revision 1.1
diff -u -r1.1 JPEGFrame.java
--- gnu/javax/imageio/jpeg/JPEGFrame.java 4 May 2006 21:49:57 -0000 1.1
+++ gnu/javax/imageio/jpeg/JPEGFrame.java 8 Jan 2008 11:33:01 -0000
@@ -101,7 +101,7 @@
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);
}
Index: gnu/javax/print/PrinterDialog.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/javax/print/PrinterDialog.java,v
retrieving revision 1.1
diff -u -r1.1 PrinterDialog.java
--- gnu/javax/print/PrinterDialog.java 13 Mar 2006 18:56:15 -0000 1.1
+++ gnu/javax/print/PrinterDialog.java 8 Jan 2008 11:33:02 -0000
@@ -479,17 +479,17 @@
*/
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();
Index: gnu/javax/security/auth/Password.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/javax/security/auth/Password.java,v
retrieving revision 1.2
diff -u -r1.2 Password.java
--- gnu/javax/security/auth/Password.java 18 Sep 2007 21:52:31 -0000 1.2
+++ gnu/javax/security/auth/Password.java 8 Jan 2008 11:33:02 -0000
@@ -143,7 +143,7 @@
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);
}
Index: gnu/javax/swing/text/html/parser/support/Parser.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/javax/swing/text/html/parser/support/Parser.java,v
retrieving revision 1.19
diff -u -r1.19 Parser.java
--- gnu/javax/swing/text/html/parser/support/Parser.java 7 Jan 2008 21:11:22 -0000 1.19
+++ gnu/javax/swing/text/html/parser/support/Parser.java 8 Jan 2008 11:33:04 -0000
@@ -866,7 +866,7 @@
{
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 @@
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 + ">");
Index: gnu/javax/swing/text/html/parser/support/parameterDefaulter.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/javax/swing/text/html/parser/support/parameterDefaulter.java,v
retrieving revision 1.2
diff -u -r1.2 parameterDefaulter.java
--- gnu/javax/swing/text/html/parser/support/parameterDefaulter.java 2 Jul 2005 20:32:15 -0000 1.2
+++ gnu/javax/swing/text/html/parser/support/parameterDefaulter.java 8 Jan 2008 11:33:04 -0000
@@ -80,7 +80,7 @@
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)
{
Index: gnu/xml/pipeline/DomConsumer.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/xml/pipeline/DomConsumer.java,v
retrieving revision 1.5
diff -u -r1.5 DomConsumer.java
--- gnu/xml/pipeline/DomConsumer.java 19 Dec 2006 01:14:24 -0000 1.5
+++ gnu/xml/pipeline/DomConsumer.java 8 Jan 2008 11:33:05 -0000
@@ -743,7 +743,7 @@
// 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;
Index: java/awt/AWTKeyStroke.java
===================================================================
RCS file: /sources/classpath/classpath/java/awt/AWTKeyStroke.java,v
retrieving revision 1.16
diff -u -r1.16 AWTKeyStroke.java
--- java/awt/AWTKeyStroke.java 1 Nov 2007 20:06:56 -0000 1.16
+++ java/awt/AWTKeyStroke.java 8 Jan 2008 11:33:07 -0000
@@ -643,7 +643,7 @@
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
Index: java/awt/DefaultKeyboardFocusManager.java
===================================================================
RCS file: /sources/classpath/classpath/java/awt/DefaultKeyboardFocusManager.java,v
retrieving revision 1.22
diff -u -r1.22 DefaultKeyboardFocusManager.java
--- java/awt/DefaultKeyboardFocusManager.java 26 Jul 2006 19:09:50 -0000 1.22
+++ java/awt/DefaultKeyboardFocusManager.java 8 Jan 2008 11:33:10 -0000
@@ -350,7 +350,7 @@
while (i.hasNext ())
{
KeyEventPostProcessor processor = (KeyEventPostProcessor) i.next ();
- if (processor.postProcessKeyEvent ((KeyEvent) e))
+ if (processor.postProcessKeyEvent (e))
return true;
}
Index: java/awt/GridBagLayout.java
===================================================================
RCS file: /sources/classpath/classpath/java/awt/GridBagLayout.java,v
retrieving revision 1.33
diff -u -r1.33 GridBagLayout.java
--- java/awt/GridBagLayout.java 10 Dec 2006 20:25:43 -0000 1.33
+++ java/awt/GridBagLayout.java 8 Jan 2008 11:33:10 -0000
@@ -211,12 +211,12 @@
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 @@
private GridBagConstraints lookupInternalConstraints (Component component)
{
- GridBagConstraints result =
- (GridBagConstraints) internalcomptable.get (component);
+ GridBagConstraints result = internalcomptable.get (component);
if (result == null)
{
@@ -562,7 +561,7 @@
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 @@
{
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 @@
}
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 @@
{
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 @@
{
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 @@
{
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 @@
{
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 @@
{
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 @@
// 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 @@
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 @@
i++;
if (i < list.size())
{
- gbc = lookupInternalConstraints((Component) list.get(i));
+ gbc = lookupInternalConstraints(list.get(i));
otherspan = sortByWidth ?
gbc.gridwidth :
gbc.gridheight;
Index: java/awt/dnd/DragGestureRecognizer.java
===================================================================
RCS file: /sources/classpath/classpath/java/awt/dnd/DragGestureRecognizer.java,v
retrieving revision 1.9
diff -u -r1.9 DragGestureRecognizer.java
--- java/awt/dnd/DragGestureRecognizer.java 10 Dec 2006 20:25:43 -0000 1.9
+++ java/awt/dnd/DragGestureRecognizer.java 8 Jan 2008 11:33:10 -0000
@@ -124,7 +124,7 @@
public InputEvent getTriggerEvent()
{
- return events.size() > 0 ? (InputEvent) events.get(0) : null;
+ return events.size() > 0 ? events.get(0) : null;
}
/**
Index: java/awt/geom/Arc2D.java
===================================================================
RCS file: /sources/classpath/classpath/java/awt/geom/Arc2D.java,v
retrieving revision 1.13
diff -u -r1.13 Arc2D.java
--- java/awt/geom/Arc2D.java 5 Dec 2006 20:52:05 -0000 1.13
+++ java/awt/geom/Arc2D.java 8 Jan 2008 11:33:11 -0000
@@ -1279,7 +1279,7 @@
width = (float) r.getWidth();
height = (float) r.getHeight();
this.start = start;
- this.extent = (float) extent;
+ this.extent = extent;
}
/**
Index: java/awt/geom/CubicCurve2D.java
===================================================================
RCS file: /sources/classpath/classpath/java/awt/geom/CubicCurve2D.java,v
retrieving revision 1.12
diff -u -r1.12 CubicCurve2D.java
--- java/awt/geom/CubicCurve2D.java 2 Jul 2005 20:32:29 -0000 1.12
+++ java/awt/geom/CubicCurve2D.java 8 Jan 2008 11:33:11 -0000
@@ -1714,10 +1714,10 @@
*/
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);
}
}
Index: java/awt/geom/QuadCurve2D.java
===================================================================
RCS file: /sources/classpath/classpath/java/awt/geom/QuadCurve2D.java,v
retrieving revision 1.16
diff -u -r1.16 QuadCurve2D.java
--- java/awt/geom/QuadCurve2D.java 2 Jul 2005 20:32:29 -0000 1.16
+++ java/awt/geom/QuadCurve2D.java 8 Jan 2008 11:33:12 -0000
@@ -1457,10 +1457,10 @@
*/
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);
}
}
Index: java/awt/im/InputContext.java
===================================================================
RCS file: /sources/classpath/classpath/java/awt/im/InputContext.java,v
retrieving revision 1.12
diff -u -r1.12 InputContext.java
--- java/awt/im/InputContext.java 21 Sep 2007 18:05:22 -0000 1.12
+++ java/awt/im/InputContext.java 8 Jan 2008 11:33:12 -0000
@@ -216,11 +216,11 @@
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
{
Index: java/awt/image/AffineTransformOp.java
===================================================================
RCS file: /sources/classpath/classpath/java/awt/image/AffineTransformOp.java,v
retrieving revision 1.10
diff -u -r1.10 AffineTransformOp.java
--- java/awt/image/AffineTransformOp.java 8 Sep 2006 15:42:41 -0000 1.10
+++ java/awt/image/AffineTransformOp.java 8 Jan 2008 11:33:12 -0000
@@ -188,7 +188,7 @@
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;
Index: java/beans/Encoder.java
===================================================================
RCS file: /sources/classpath/classpath/java/beans/Encoder.java,v
retrieving revision 1.4
diff -u -r1.4 Encoder.java
--- java/beans/Encoder.java 10 Dec 2006 20:25:44 -0000 1.4
+++ java/beans/Encoder.java 8 Jan 2008 11:33:12 -0000
@@ -195,7 +195,7 @@
PersistenceDelegate pd = (PersistenceDelegate) delegates.get(type);
- return (pd != null) ? pd : (PersistenceDelegate) defaultPersistenceDelegate;
+ return (pd != null) ? pd : defaultPersistenceDelegate;
}
/**
Index: java/io/ObjectInputStream.java
===================================================================
RCS file: /sources/classpath/classpath/java/io/ObjectInputStream.java,v
retrieving revision 1.82
diff -u -r1.82 ObjectInputStream.java
--- java/io/ObjectInputStream.java 16 Apr 2007 15:39:10 -0000 1.82
+++ java/io/ObjectInputStream.java 8 Jan 2008 11:33:13 -0000
@@ -915,7 +915,7 @@
return null;
ObjectStreamClass oclazz;
- oclazz = (ObjectStreamClass)classLookupTable.get(clazz);
+ oclazz = classLookupTable.get(clazz);
if (oclazz == null)
return ObjectStreamClass.lookup(clazz);
else
Index: java/io/ObjectStreamClass.java
===================================================================
RCS file: /sources/classpath/classpath/java/io/ObjectStreamClass.java,v
retrieving revision 1.51
diff -u -r1.51 ObjectStreamClass.java
--- java/io/ObjectStreamClass.java 1 Nov 2007 20:06:57 -0000 1.51
+++ java/io/ObjectStreamClass.java 8 Jan 2008 11:33:14 -0000
@@ -106,7 +106,7 @@
if (cl == null)
return null;
- ObjectStreamClass osc = (ObjectStreamClass) classLookupTable.get(cl);
+ ObjectStreamClass osc = classLookupTable.get(cl);
if (osc != null)
return osc;
Index: java/net/ResolverCache.java
===================================================================
RCS file: /sources/classpath/classpath/java/net/ResolverCache.java,v
retrieving revision 1.3
diff -u -r1.3 ResolverCache.java
--- java/net/ResolverCache.java 7 Jan 2008 21:11:25 -0000 1.3
+++ java/net/ResolverCache.java 8 Jan 2008 11:33:14 -0000
@@ -116,7 +116,7 @@
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 @@
public static byte[][] getHostByName(String hostname)
throws UnknownHostException
{
- Entry entry = (Entry) get(hostname);
+ Entry entry = get(hostname);
if (entry != null)
{
if (entry.value == null)
Index: java/nio/charset/Charset.java
===================================================================
RCS file: /sources/classpath/classpath/java/nio/charset/Charset.java,v
retrieving revision 1.28
diff -u -r1.28 Charset.java
--- java/nio/charset/Charset.java 10 Dec 2006 20:25:45 -0000 1.28
+++ java/nio/charset/Charset.java 8 Jan 2008 11:33:14 -0000
@@ -234,7 +234,7 @@
{
for (Iterator<Charset> i = providers[j].charsets(); i.hasNext(); )
{
- Charset cs = (Charset) i.next();
+ Charset cs = i.next();
charsets.put(cs.name(), cs);
}
}
Index: java/security/SecureClassLoader.java
===================================================================
RCS file: /sources/classpath/classpath/java/security/SecureClassLoader.java,v
retrieving revision 1.17
diff -u -r1.17 SecureClassLoader.java
--- java/security/SecureClassLoader.java 18 Sep 2007 21:52:34 -0000 1.17
+++ java/security/SecureClassLoader.java 8 Jan 2008 11:33:14 -0000
@@ -111,7 +111,7 @@
{
synchronized (protectionDomainCache)
{
- protectionDomain = (ProtectionDomain)protectionDomainCache.get(cs);
+ protectionDomain = protectionDomainCache.get(cs);
}
if (protectionDomain == null)
@@ -120,8 +120,7 @@
= 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
Index: java/text/MessageFormat.java
===================================================================
RCS file: /sources/classpath/classpath/java/text/MessageFormat.java,v
retrieving revision 1.25
diff -u -r1.25 MessageFormat.java
--- java/text/MessageFormat.java 27 Oct 2007 23:33:04 -0000 1.25
+++ java/text/MessageFormat.java 8 Jan 2008 11:33:14 -0000
@@ -630,7 +630,7 @@
// 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);
Index: java/util/jar/Manifest.java
===================================================================
RCS file: /sources/classpath/classpath/java/util/jar/Manifest.java,v
retrieving revision 1.14
diff -u -r1.14 Manifest.java
--- java/util/jar/Manifest.java 10 Dec 2006 20:25:46 -0000 1.14
+++ java/util/jar/Manifest.java 8 Jan 2008 11:33:15 -0000
@@ -138,7 +138,7 @@
*/
public Attributes getAttributes(String entryName)
{
- return (Attributes) getEntries().get(entryName);
+ return getEntries().get(entryName);
}
/**
Index: javax/accessibility/AccessibleRelationSet.java
===================================================================
RCS file: /sources/classpath/classpath/javax/accessibility/AccessibleRelationSet.java,v
retrieving revision 1.5
diff -u -r1.5 AccessibleRelationSet.java
--- javax/accessibility/AccessibleRelationSet.java 10 Dec 2006 20:25:46 -0000 1.5
+++ javax/accessibility/AccessibleRelationSet.java 8 Jan 2008 11:33:15 -0000
@@ -168,7 +168,7 @@
{
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 @@
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;
}
Index: javax/imageio/ImageReader.java
===================================================================
RCS file: /sources/classpath/classpath/javax/imageio/ImageReader.java,v
retrieving revision 1.11
diff -u -r1.11 ImageReader.java
--- javax/imageio/ImageReader.java 7 Jan 2008 21:11:25 -0000 1.11
+++ javax/imageio/ImageReader.java 8 Jan 2008 11:33:16 -0000
@@ -1734,7 +1734,7 @@
public ImageTypeSpecifier getRawImageType (int imageIndex)
throws IOException
{
- return (ImageTypeSpecifier) getImageTypes(imageIndex).next();
+ return getImageTypes(imageIndex).next();
}
/**
Index: javax/imageio/metadata/IIOMetadataNode.java
===================================================================
RCS file: /sources/classpath/classpath/javax/imageio/metadata/IIOMetadataNode.java,v
retrieving revision 1.4
diff -u -r1.4 IIOMetadataNode.java
--- javax/imageio/metadata/IIOMetadataNode.java 24 Oct 2005 20:10:22 -0000 1.4
+++ javax/imageio/metadata/IIOMetadataNode.java 8 Jan 2008 11:33:16 -0000
@@ -334,7 +334,7 @@
*/
public void setAttribute(String name, String value)
{
- Attr attr = (Attr) getAttributeNode(name);
+ Attr attr = getAttributeNode(name);
if (attr != null)
attr.setValue(value);
else
Index: javax/print/attribute/standard/MediaSize.java
===================================================================
RCS file: /sources/classpath/classpath/javax/print/attribute/standard/MediaSize.java,v
retrieving revision 1.9
diff -u -r1.9 MediaSize.java
--- javax/print/attribute/standard/MediaSize.java 10 Dec 2006 20:25:47 -0000 1.9
+++ javax/print/attribute/standard/MediaSize.java 8 Jan 2008 11:33:16 -0000
@@ -214,7 +214,7 @@
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 @@
{
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;
Index: javax/print/attribute/standard/PrinterStateReasons.java
===================================================================
RCS file: /sources/classpath/classpath/javax/print/attribute/standard/PrinterStateReasons.java,v
retrieving revision 1.7
diff -u -r1.7 PrinterStateReasons.java
--- javax/print/attribute/standard/PrinterStateReasons.java 10 Dec 2006 20:25:47 -0000 1.7
+++ javax/print/attribute/standard/PrinterStateReasons.java 8 Jan 2008 11:33:17 -0000
@@ -178,7 +178,7 @@
if (severity == null)
throw new NullPointerException("severity is null");
- return super.put((PrinterStateReason) reason, (Severity) severity);
+ return super.put(reason, severity);
}
/**
Index: javax/swing/JTree.java
===================================================================
RCS file: /sources/classpath/classpath/javax/swing/JTree.java,v
retrieving revision 1.79
diff -u -r1.79 JTree.java
--- javax/swing/JTree.java 10 Dec 2006 20:25:48 -0000 1.79
+++ javax/swing/JTree.java 8 Jan 2008 11:33:18 -0000
@@ -3105,7 +3105,7 @@
{
while (toRemove.hasMoreElements())
{
- TreePath current = (TreePath) toRemove.nextElement();
+ TreePath current = toRemove.nextElement();
Enumeration descendants = getDescendantToggledPaths(current);
while (descendants.hasMoreElements())
Index: javax/swing/table/DefaultTableColumnModel.java
===================================================================
RCS file: /sources/classpath/classpath/javax/swing/table/DefaultTableColumnModel.java,v
retrieving revision 1.20
diff -u -r1.20 DefaultTableColumnModel.java
--- javax/swing/table/DefaultTableColumnModel.java 10 Dec 2006 20:25:48 -0000 1.20
+++ javax/swing/table/DefaultTableColumnModel.java 8 Jan 2008 11:33:20 -0000
@@ -243,7 +243,7 @@
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 TableColumn getColumn(int columnIndex)
{
- return (TableColumn) tableColumns.get(columnIndex);
+ return tableColumns.get(columnIndex);
}
/**
@@ -299,7 +299,7 @@
{
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 @@
totalColumnWidth = 0;
for (int i = 0; i < tableColumns.size(); ++i)
{
- totalColumnWidth += ((TableColumn) tableColumns.get(i)).getWidth();
+ totalColumnWidth += tableColumns.get(i).getWidth();
}
}
}
Index: javax/swing/text/html/MinimalHTMLWriter.java
===================================================================
RCS file: /sources/classpath/classpath/javax/swing/text/html/MinimalHTMLWriter.java,v
retrieving revision 1.2
diff -u -r1.2 MinimalHTMLWriter.java
--- javax/swing/text/html/MinimalHTMLWriter.java 21 May 2006 15:48:06 -0000 1.2
+++ javax/swing/text/html/MinimalHTMLWriter.java 8 Jan 2008 11:33:20 -0000
@@ -321,7 +321,7 @@
}
else
{ // What else to do here?
- Style s = (Style)doc.getStyle("default");
+ Style s = doc.getStyle("default");
if(s != null)
writeStyle( s );
}
Index: javax/swing/text/html/parser/DTD.java
===================================================================
RCS file: /sources/classpath/classpath/javax/swing/text/html/parser/DTD.java,v
retrieving revision 1.7
diff -u -r1.7 DTD.java
--- javax/swing/text/html/parser/DTD.java 10 Dec 2006 20:25:48 -0000 1.7
+++ javax/swing/text/html/parser/DTD.java 8 Jan 2008 11:33:20 -0000
@@ -181,7 +181,7 @@
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 Element getElement(int index)
{
- return (Element) elements.get(index);
+ return elements.get(index);
}
/**
@@ -235,7 +235,7 @@
*/
public Entity getEntity(String entity_name)
{
- return (Entity) entityHash.get(entity_name);
+ return entityHash.get(entity_name);
}
/**
Index: javax/swing/tree/DefaultMutableTreeNode.java
===================================================================
RCS file: /sources/classpath/classpath/javax/swing/tree/DefaultMutableTreeNode.java,v
retrieving revision 1.18
diff -u -r1.18 DefaultMutableTreeNode.java
--- javax/swing/tree/DefaultMutableTreeNode.java 10 Dec 2006 20:25:49 -0000 1.18
+++ javax/swing/tree/DefaultMutableTreeNode.java 8 Jan 2008 11:33:21 -0000
@@ -202,7 +202,7 @@
*/
public void remove(int index)
{
- MutableTreeNode child = (MutableTreeNode) children.remove(index);
+ MutableTreeNode child = children.remove(index);
child.setParent(null);
}
@@ -553,7 +553,7 @@
{
node = node.getParent();
size = node.getChildCount();
- index = ((Integer) stack.pop()).intValue() + 1;
+ index = stack.pop().intValue() + 1;
current--;
}
while (index >= size
Index: javax/swing/undo/UndoManager.java
===================================================================
RCS file: /sources/classpath/classpath/javax/swing/undo/UndoManager.java,v
retrieving revision 1.7
diff -u -r1.7 UndoManager.java
--- javax/swing/undo/UndoManager.java 5 Mar 2006 21:33:44 -0000 1.7
+++ javax/swing/undo/UndoManager.java 8 Jan 2008 11:33:21 -0000
@@ -196,7 +196,7 @@
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 @@
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 @@
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 @@
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 @@
while (true)
{
indexOfNextAdd -= 1;
- cur = (UndoableEdit) edits.get(indexOfNextAdd);
+ cur = edits.get(indexOfNextAdd);
cur.undo();
if (cur == edit)
return;
@@ -348,7 +348,7 @@
while (true)
{
- cur = (UndoableEdit) edits.get(indexOfNextAdd);
+ cur = edits.get(indexOfNextAdd);
indexOfNextAdd += 1;
cur.redo();
if (cur == edit)
Index: org/omg/CosNaming/NamingContextExtPOA.java
===================================================================
RCS file: /sources/classpath/classpath/org/omg/CosNaming/NamingContextExtPOA.java,v
retrieving revision 1.2
diff -u -r1.2 NamingContextExtPOA.java
--- org/omg/CosNaming/NamingContextExtPOA.java 5 Oct 2005 16:25:42 -0000 1.2
+++ org/omg/CosNaming/NamingContextExtPOA.java 8 Jan 2008 11:33:22 -0000
@@ -84,7 +84,7 @@
/** @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 @@
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);
Index: org/omg/CosNaming/NamingContextPOA.java
===================================================================
RCS file: /sources/classpath/classpath/org/omg/CosNaming/NamingContextPOA.java,v
retrieving revision 1.2
diff -u -r1.2 NamingContextPOA.java
--- org/omg/CosNaming/NamingContextPOA.java 5 Oct 2005 16:25:42 -0000 1.2
+++ org/omg/CosNaming/NamingContextPOA.java 8 Jan 2008 11:33:22 -0000
@@ -92,7 +92,7 @@
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);
Index: org/omg/CosNaming/_NamingContextExtImplBase.java
===================================================================
RCS file: /sources/classpath/classpath/org/omg/CosNaming/_NamingContextExtImplBase.java,v
retrieving revision 1.5
diff -u -r1.5 _NamingContextExtImplBase.java
--- org/omg/CosNaming/_NamingContextExtImplBase.java 10 Dec 2006 20:25:49 -0000 1.5
+++ org/omg/CosNaming/_NamingContextExtImplBase.java 8 Jan 2008 11:33:22 -0000
@@ -96,7 +96,7 @@
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 @@
{
Streamable result = null;
- Integer call_method = (Integer) _methods.get(request.operation());
+ Integer call_method = _methods.get(request.operation());
if (call_method == null)
{
Index: org/omg/CosNaming/_NamingContextImplBase.java
===================================================================
RCS file: /sources/classpath/classpath/org/omg/CosNaming/_NamingContextImplBase.java,v
retrieving revision 1.7
diff -u -r1.7 _NamingContextImplBase.java
--- org/omg/CosNaming/_NamingContextImplBase.java 10 Dec 2006 20:25:49 -0000 1.7
+++ org/omg/CosNaming/_NamingContextImplBase.java 8 Jan 2008 11:33:22 -0000
@@ -123,7 +123,7 @@
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 @@
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);
Index: tools/gnu/classpath/tools/appletviewer/CommonAppletStub.java
===================================================================
RCS file: /sources/classpath/classpath/tools/gnu/classpath/tools/appletviewer/CommonAppletStub.java,v
retrieving revision 1.2
diff -u -r1.2 CommonAppletStub.java
--- tools/gnu/classpath/tools/appletviewer/CommonAppletStub.java 18 Oct 2006 20:47:40 -0000 1.2
+++ tools/gnu/classpath/tools/appletviewer/CommonAppletStub.java 8 Jan 2008 11:33:23 -0000
@@ -113,7 +113,7 @@
*/
public String getParameter(String name)
{
- return (String) tag.getParameter(name.toLowerCase());
+ return tag.getParameter(name.toLowerCase());
}
/**
