I'm committing the attached patch to fix a few methods and fields that lack generic information.
Changelog:
2005-10-12 Andrew John Hughes <[EMAIL PROTECTED]>
* java/awt/datatransfer/DataFlavor.java:
(DataFlavor(Class<?>,String,String): Genericized.
* java/awt/dnd/DragGestureEvent.java:
(DragGestureEvent(DragGestureRecognizer,int,Point,
List<? extends InputEvent>)): Likewise.
(iterator()): Likewise.
* java/awt/dnd/DragSource.java:
(createDragGestureRecognizer(Class<T>,Component,int,
DragGestureListener)): Likewise.
* java/awt/dnd/DropTargetContext.java:
(getCurrentDataFlavorsAsList()): Likewise.
* java/awt/dnd/DropTargetDragEvent.java:
(getCurrentDataFlavorsAsList()): Likewise.
* java/awt/dnd/DropTargetDropEvent.java:
(getCurrentDataFlavorsAsList()): Likewise.
* java/awt/font/TextLayout.java:
(TextLayout(String,Map<? extends
AttributedCharacterIterator.Attribute>, FontRenderContext)): Likewise.
* java/awt/image/BufferedImage.java:
(BufferedImage(ColorModel,WritableRaster,boolean,Hashtable<?,?>)):
Likewise.
* java/awt/image/ImageConsumer.java:
(setProperties(Hashtable<?,?>)): Likewise.
* java/awt/image/MemoryImageSource.java:
(MemoryImageSource(int,int,ColorModel,byte[],int,int,Hashtable<?,?>)):
Likewise.
(MemoryImageSource(int,int,ColorModel,int[],int,int,Hashtable<?,?>)):
Likewise.
* java/awt/image/RenderedImage.java:
(getSources()): Likewise.
* java/awt/image/renderable/ParameterBlock.java:
(sources): Likewise.
(parameters): Likewise.
(ParameterBlock()): Likewise.
(ParameterBlock(Vector<Object>)): Likewise.
(ParameterBlock(Vector<Object>,Vector<Object>)): Likewise.
(clone()): Added casts to handle new Vector type.
(getSources()): Genericized.
(setSources(Vector<Object>)): Likewise.
(getParameters()): Likewise.
(setParameters(Vector<Object>)): Likewise.
* java/awt/image/renderable/RenderableImage.java:
(getSources()): Likewise.
* javax/swing/tree/DefaultMutableTreeNode.java:
(children): Likewise.
(getSharedAncestor(DefaultMutableTreeNode)): Likewise.
(getDepth()): Likewise.
(pathFromAncestorEnumeration(TreeNode)): Likewise.
(PostOrderEnumeration)): Likewise.
* javax/swing/undo/CompoundEdit.java:
(edits): Likewise.
(CompoundEdit()): Likewise.
(undo()): Likewise.
(redo()): Likewise.
(lastEdit()): Likewise.
(die()): Likewise.
(isSignificant()): Likewise.
* javax/swing/undo/UndoableEditSupport.java:
(listeners): Likewise.
(getUndoableEditListeners()): Likewise.
* lib/Makefile.am:
Turn off listing unused imports (at least for now).
* org/omg/CosNaming/_NamingContextExtImplBase.java:
(_methods): Likewise.
* org/omg/CosNaming/_NamingContextImplBase.java:
(methods): Likewise.
* vm/reference/java/lang/reflect/Method.java:
(getTypeParameters()): Corrected return type.
--
Andrew :-)
Please avoid sending me Microsoft Office (e.g. Word, PowerPoint) attachments.
See http://www.fsf.org/philosophy/no-word-attachments.html
"Value your freedom, or you will lose it, teaches history.
`Don't bother us with politics' respond those who don't want to learn."
-- Richard Stallman
Escape the Java Trap with GNU Classpath!
http://www.gnu.org/philosophy/java-trap.html
public class gcj extends Freedom implements Java { ... }
Index: java/awt/datatransfer/DataFlavor.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/datatransfer/DataFlavor.java,v
retrieving revision 1.20.2.5
diff -u -3 -p -u -r1.20.2.5 DataFlavor.java
--- java/awt/datatransfer/DataFlavor.java 6 Oct 2005 00:59:30 -0000
1.20.2.5
+++ java/awt/datatransfer/DataFlavor.java 12 Oct 2005 21:05:35 -0000
@@ -231,7 +231,7 @@ DataFlavor()
* Private constructor.
*/
private
-DataFlavor(Class representationClass,
+DataFlavor(Class<?> representationClass,
String mimeType,
String humanPresentableName)
{
Index: java/awt/dnd/DragGestureEvent.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/dnd/DragGestureEvent.java,v
retrieving revision 1.2.2.1
diff -u -3 -p -u -r1.2.2.1 DragGestureEvent.java
--- java/awt/dnd/DragGestureEvent.java 2 Aug 2005 20:12:15 -0000 1.2.2.1
+++ java/awt/dnd/DragGestureEvent.java 12 Oct 2005 21:05:35 -0000
@@ -68,7 +68,7 @@ public class DragGestureEvent extends Ev
private final int action;
public DragGestureEvent(DragGestureRecognizer dgr, int action, Point origin,
- List events)
+ List<? extends InputEvent> events)
{
super(dgr);
if (origin == null || events == null)
@@ -93,7 +93,7 @@ public class DragGestureEvent extends Ev
{
return origin;
}
- public Iterator iterator()
+ public Iterator<InputEvent> iterator()
{
return null;
}
Index: java/awt/dnd/DragSource.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/dnd/DragSource.java,v
retrieving revision 1.4.2.2
diff -u -3 -p -u -r1.4.2.2 DragSource.java
--- java/awt/dnd/DragSource.java 6 Oct 2005 00:32:41 -0000 1.4.2.2
+++ java/awt/dnd/DragSource.java 12 Oct 2005 21:05:35 -0000
@@ -172,8 +172,8 @@ public class DragSource implements Seria
return flavorMap;
}
- public DragGestureRecognizer
- createDragGestureRecognizer(Class recognizer, Component c, int actions,
+ public <T extends DragGestureRecognizer> T
+ createDragGestureRecognizer(Class<T> recognizer, Component c, int actions,
DragGestureListener dgl)
{
return Toolkit.getDefaultToolkit ()
@@ -245,11 +245,11 @@ public class DragSource implements Seria
{
if (listenerType == DragSourceListener.class)
return DnDEventMulticaster.getListeners (dragSourceListener,
- listenerType);
+ listenerType);
if (listenerType == DragSourceMotionListener.class)
return DnDEventMulticaster.getListeners (dragSourceMotionListener,
- listenerType);
+ listenerType);
// Return an empty EventListener array.
return (T[]) new EventListener [0];
Index: java/awt/dnd/DropTargetContext.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/dnd/DropTargetContext.java,v
retrieving revision 1.6.2.4
diff -u -3 -p -u -r1.6.2.4 DropTargetContext.java
--- java/awt/dnd/DropTargetContext.java 2 Aug 2005 20:12:15 -0000 1.6.2.4
+++ java/awt/dnd/DropTargetContext.java 12 Oct 2005 21:05:35 -0000
@@ -161,7 +161,7 @@ public class DropTargetContext implement
return null;
}
- protected List getCurrentDataFlavorsAsList ()
+ protected List<DataFlavor> getCurrentDataFlavorsAsList ()
{
return Arrays.asList (getCurrentDataFlavors ());
}
Index: java/awt/dnd/DropTargetDragEvent.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/dnd/DropTargetDragEvent.java,v
retrieving revision 1.2.2.2
diff -u -3 -p -u -r1.2.2.2 DropTargetDragEvent.java
--- java/awt/dnd/DropTargetDragEvent.java 2 Aug 2005 20:12:15 -0000
1.2.2.2
+++ java/awt/dnd/DropTargetDragEvent.java 12 Oct 2005 21:05:35 -0000
@@ -107,7 +107,7 @@ public class DropTargetDragEvent extends
return context.getCurrentDataFlavors ();
}
- public List getCurrentDataFlavorsAsList ()
+ public List<DataFlavor> getCurrentDataFlavorsAsList ()
{
return context.getCurrentDataFlavorsAsList ();
}
Index: java/awt/dnd/DropTargetDropEvent.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/dnd/DropTargetDropEvent.java,v
retrieving revision 1.2.2.1
diff -u -3 -p -u -r1.2.2.1 DropTargetDropEvent.java
--- java/awt/dnd/DropTargetDropEvent.java 2 Aug 2005 20:12:15 -0000
1.2.2.1
+++ java/awt/dnd/DropTargetDropEvent.java 12 Oct 2005 21:05:35 -0000
@@ -123,7 +123,7 @@ public class DropTargetDropEvent extends
return context.getCurrentDataFlavors ();
}
- public List getCurrentDataFlavorsAsList ()
+ public List<DataFlavor> getCurrentDataFlavorsAsList ()
{
return context.getCurrentDataFlavorsAsList ();
}
Index: java/awt/font/TextLayout.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/font/TextLayout.java,v
retrieving revision 1.2.2.3
diff -u -3 -p -u -r1.2.2.3 TextLayout.java
--- java/awt/font/TextLayout.java 2 Aug 2005 20:12:15 -0000 1.2.2.3
+++ java/awt/font/TextLayout.java 12 Oct 2005 21:05:35 -0000
@@ -88,7 +88,7 @@ public final class TextLayout implements
peer = tk.getClasspathTextLayoutPeer(as, frc);
}
- public TextLayout (String string, Map attributes, FontRenderContext frc)
+ public TextLayout (String string, Map<? extends
AttributedCharacterIterator.Attribute,?> attributes, FontRenderContext frc)
{
AttributedString as = new AttributedString (string, attributes);
ClasspathToolkit tk = (ClasspathToolkit)(Toolkit.getDefaultToolkit ());
Index: java/awt/image/BufferedImage.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/image/BufferedImage.java,v
retrieving revision 1.8.2.3
diff -u -3 -p -u -r1.8.2.3 BufferedImage.java
--- java/awt/image/BufferedImage.java 2 Aug 2005 20:12:15 -0000 1.8.2.3
+++ java/awt/image/BufferedImage.java 12 Oct 2005 21:05:35 -0000
@@ -224,7 +224,7 @@ public class BufferedImage extends Image
public BufferedImage(ColorModel colormodel,
WritableRaster writableraster,
boolean premultiplied,
- Hashtable properties)
+ Hashtable<?,?> properties)
{
init(colormodel, writableraster, premultiplied, properties,
TYPE_CUSTOM);
Index: java/awt/image/ImageConsumer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/image/ImageConsumer.java,v
retrieving revision 1.7.2.1
diff -u -3 -p -u -r1.7.2.1 ImageConsumer.java
--- java/awt/image/ImageConsumer.java 2 Aug 2005 20:12:16 -0000 1.7.2.1
+++ java/awt/image/ImageConsumer.java 12 Oct 2005 21:05:35 -0000
@@ -136,7 +136,7 @@ public interface ImageConsumer
*
* @param props the list of properties associated with this image
*/
- void setProperties(Hashtable props);
+ void setProperties(Hashtable<?,?> props);
/**
* This <code>ColorModel</code> should indicate the model used by
Index: java/awt/image/MemoryImageSource.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/image/MemoryImageSource.java,v
retrieving revision 1.9.2.3
diff -u -3 -p -u -r1.9.2.3 MemoryImageSource.java
--- java/awt/image/MemoryImageSource.java 2 Aug 2005 20:12:16 -0000
1.9.2.3
+++ java/awt/image/MemoryImageSource.java 12 Oct 2005 21:05:35 -0000
@@ -76,7 +76,7 @@ public class MemoryImageSource implement
* Constructs an ImageProducer from memory
*/
public MemoryImageSource(int w, int h, ColorModel cm, byte[] pix, int off,
- int scan, Hashtable props)
+ int scan, Hashtable<?,?> props)
{
width = w;
height = h;
@@ -109,7 +109,7 @@ public class MemoryImageSource implement
Constructs an ImageProducer from memory
*/
public MemoryImageSource(int w, int h, ColorModel cm, int[] pix, int off,
- int scan, Hashtable props)
+ int scan, Hashtable<?,?> props)
{
width = w;
height = h;
Index: java/awt/image/RenderedImage.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/image/RenderedImage.java,v
retrieving revision 1.1.2.1
diff -u -3 -p -u -r1.1.2.1 RenderedImage.java
--- java/awt/image/RenderedImage.java 2 Aug 2005 20:12:16 -0000 1.1.2.1
+++ java/awt/image/RenderedImage.java 12 Oct 2005 21:05:35 -0000
@@ -46,7 +46,7 @@ import java.util.Vector;
*/
public interface RenderedImage
{
- Vector getSources();
+ Vector<RenderedImage> getSources();
Object getProperty(String name);
String[] getPropertyNames();
ColorModel getColorModel();
Index: java/awt/image/renderable/ParameterBlock.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/java/awt/image/renderable/ParameterBlock.java,v
retrieving revision 1.1.2.1
diff -u -3 -p -u -r1.1.2.1 ParameterBlock.java
--- java/awt/image/renderable/ParameterBlock.java 2 Aug 2005 20:12:16
-0000 1.1.2.1
+++ java/awt/image/renderable/ParameterBlock.java 12 Oct 2005 21:05:35
-0000
@@ -45,20 +45,20 @@ import java.util.Vector;
public class ParameterBlock implements Cloneable, Serializable
{
private static final long serialVersionUID = -7577115551785240750L;
- protected Vector sources;
- protected Vector parameters;
+ protected Vector<Object> sources;
+ protected Vector<Object> parameters;
public ParameterBlock()
{
- this(new Vector(), new Vector());
+ this(new Vector<Object>(), new Vector<Object>());
}
- public ParameterBlock(Vector sources)
+ public ParameterBlock(Vector<Object> sources)
{
- this(sources, new Vector());
+ this(sources, new Vector<Object>());
}
- public ParameterBlock(Vector sources, Vector parameters)
+ public ParameterBlock(Vector<Object> sources, Vector<Object> parameters)
{
this.sources = sources;
this.parameters = parameters;
@@ -80,9 +80,9 @@ public class ParameterBlock implements C
{
ParameterBlock pb = (ParameterBlock) shallowClone();
if (sources != null)
- pb.sources = (Vector) sources.clone();
+ pb.sources = (Vector<Object>) sources.clone();
if (parameters != null)
- pb.parameters = (Vector) parameters.clone();
+ pb.parameters = (Vector<Object>) parameters.clone();
return pb;
}
@@ -119,12 +119,12 @@ public class ParameterBlock implements C
return sources.size();
}
- public Vector getSources()
+ public Vector<Object> getSources()
{
return sources;
}
- public void setSources(Vector sources)
+ public void setSources(Vector<Object> sources)
{
this.sources = sources;
}
@@ -140,12 +140,12 @@ public class ParameterBlock implements C
return parameters.size();
}
- public Vector getParameters()
+ public Vector<Object> getParameters()
{
return parameters;
}
- public void setParameters(Vector parameters)
+ public void setParameters(Vector<Object> parameters)
{
this.parameters = parameters;
}
Index: java/awt/image/renderable/RenderableImage.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/java/awt/image/renderable/RenderableImage.java,v
retrieving revision 1.3.2.1
diff -u -3 -p -u -r1.3.2.1 RenderableImage.java
--- java/awt/image/renderable/RenderableImage.java 2 Aug 2005 20:12:16
-0000 1.3.2.1
+++ java/awt/image/renderable/RenderableImage.java 12 Oct 2005 21:05:35
-0000
@@ -46,7 +46,7 @@ public interface RenderableImage
{
String HINTS_OBSERVED = "HINTS_OBSERVED";
- Vector getSources();
+ Vector<RenderableImage> getSources();
Object getProperty(String name);
String[] getPropertyNames();
boolean isDynamic();
Index: javax/swing/tree/DefaultMutableTreeNode.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/swing/tree/DefaultMutableTreeNode.java,v
retrieving revision 1.5.2.4
diff -u -3 -p -u -r1.5.2.4 DefaultMutableTreeNode.java
--- javax/swing/tree/DefaultMutableTreeNode.java 2 Aug 2005 20:12:39
-0000 1.5.2.4
+++ javax/swing/tree/DefaultMutableTreeNode.java 12 Oct 2005 21:05:36
-0000
@@ -78,7 +78,7 @@ public class DefaultMutableTreeNode
/**
* children
*/
- protected Vector children = new Vector();
+ protected Vector<MutableTreeNode> children = new Vector<MutableTreeNode>();
/**
* userObject
@@ -422,7 +422,7 @@ public class DefaultMutableTreeNode
public TreeNode getSharedAncestor(DefaultMutableTreeNode node)
{
TreeNode current = this;
- ArrayList list = new ArrayList();
+ ArrayList<TreeNode> list = new ArrayList<TreeNode>();
while (current != null)
{
@@ -469,7 +469,7 @@ public class DefaultMutableTreeNode
|| children.size() == 0)
return 0;
- Stack stack = new Stack();
+ Stack<Integer> stack = new Stack<Integer>();
stack.push(new Integer(0));
TreeNode node = getChildAt(0);
int depth = 0;
@@ -707,7 +707,7 @@ public class DefaultMutableTreeNode
throw new IllegalArgumentException();
TreeNode parent = this;
- Vector nodes = new Vector();
+ Vector<TreeNode> nodes = new Vector<TreeNode>();
nodes.add(this);
while (parent != node && parent != null)
@@ -1058,7 +1058,7 @@ public class DefaultMutableTreeNode
static class PostorderEnumeration implements Enumeration
{
- Stack nodes = new Stack();
+ Stack<TreeNode> nodes = new Stack<TreeNode>();
Stack childrenEnums = new Stack();
PostorderEnumeration(TreeNode node)
Index: javax/swing/undo/CompoundEdit.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/undo/CompoundEdit.java,v
retrieving revision 1.6.2.1
diff -u -3 -p -u -r1.6.2.1 CompoundEdit.java
--- javax/swing/undo/CompoundEdit.java 2 Aug 2005 20:12:39 -0000 1.6.2.1
+++ javax/swing/undo/CompoundEdit.java 12 Oct 2005 21:05:36 -0000
@@ -1,5 +1,5 @@
/* CompoundEdit.java -- Combines multiple UndoableEdits.
- Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -75,7 +75,7 @@ public class CompoundEdit
* The <code>UndoableEdit</code>s being combined into a compound
* editing action.
*/
- protected Vector edits;
+ protected Vector<UndoableEdit> edits;
/**
@@ -92,7 +92,7 @@ public class CompoundEdit
*/
public CompoundEdit()
{
- edits = new Vector();
+ edits = new Vector<UndoableEdit>();
inProgress = true;
}
@@ -118,7 +118,7 @@ public class CompoundEdit
super.undo();
for (int i = edits.size() - 1; i >= 0; i--)
- ((UndoableEdit) edits.elementAt(i)).undo();
+ edits.elementAt(i).undo();
}
@@ -143,7 +143,7 @@ public class CompoundEdit
super.redo();
for (int i = 0; i < edits.size(); i++)
- ((UndoableEdit) edits.elementAt(i)).redo();
+ edits.elementAt(i).redo();
}
@@ -156,7 +156,7 @@ public class CompoundEdit
if (edits.size() == 0)
return null;
else
- return (UndoableEdit) edits.elementAt(edits.size() - 1);
+ return edits.elementAt(edits.size() - 1);
}
@@ -172,7 +172,7 @@ public class CompoundEdit
public void die()
{
for (int i = edits.size() - 1; i >= 0; i--)
- ((UndoableEdit) edits.elementAt(i)).die();
+ edits.elementAt(i).die();
super.die();
}
@@ -316,7 +316,7 @@ public class CompoundEdit
public boolean isSignificant()
{
for (int i = edits.size() - 1; i >= 0; i--)
- if (((UndoableEdit) edits.elementAt(i)).isSignificant())
+ if (edits.elementAt(i).isSignificant())
return true;
return false;
Index: javax/swing/undo/UndoableEditSupport.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/swing/undo/UndoableEditSupport.java,v
retrieving revision 1.6.2.3
diff -u -3 -p -u -r1.6.2.3 UndoableEditSupport.java
--- javax/swing/undo/UndoableEditSupport.java 2 Aug 2005 20:12:39 -0000
1.6.2.3
+++ javax/swing/undo/UndoableEditSupport.java 12 Oct 2005 21:05:36 -0000
@@ -69,7 +69,8 @@ public class UndoableEditSupport
/**
* The currently registered listeners.
*/
- protected Vector listeners = new Vector();
+ protected Vector<UndoableEditListener> listeners =
+ new Vector<UndoableEditListener>();
/**
@@ -148,7 +149,7 @@ public class UndoableEditSupport
public synchronized UndoableEditListener[] getUndoableEditListeners()
{
UndoableEditListener[] result = new UndoableEditListener[listeners.size()];
- return (UndoableEditListener[]) listeners.toArray(result);
+ return listeners.toArray(result);
}
Index: lib/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/lib/Makefile.am,v
retrieving revision 1.63.2.14
diff -u -3 -p -u -r1.63.2.14 Makefile.am
--- lib/Makefile.am 20 Sep 2005 18:46:36 -0000 1.63.2.14
+++ lib/Makefile.am 12 Oct 2005 21:05:36 -0000
@@ -14,7 +14,7 @@ compile_classpath = $(vm_classes):$(top_
# handling source to bytecode compiler programs like gcj, jikes and kjc
if FOUND_ECJ
-JAVAC = $(ECJ) -1.5 -warn:-deprecation,serial -proceedOnError -bootclasspath
'' -classpath $(compile_classpath) -d . @classes
+JAVAC = $(ECJ) -1.5 -warn:-deprecation,serial,unusedImport -proceedOnError
-bootclasspath '' -classpath $(compile_classpath) -d . @classes
else
if FOUND_GCJ
## This should never be used when gcj is the compiler.
Index: org/omg/CosNaming/_NamingContextExtImplBase.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/org/omg/CosNaming/_NamingContextExtImplBase.java,v
retrieving revision 1.1.2.4
diff -u -3 -p -u -r1.1.2.4 _NamingContextExtImplBase.java
--- org/omg/CosNaming/_NamingContextExtImplBase.java 10 Sep 2005 15:32:05
-0000 1.1.2.4
+++ org/omg/CosNaming/_NamingContextExtImplBase.java 12 Oct 2005 21:05:37
-0000
@@ -66,7 +66,7 @@ public abstract class _NamingContextExtI
extends _NamingContextImplBase
implements NamingContextExt, InvokeHandler
{
- static Hashtable _methods = new Hashtable();
+ static Hashtable<String,Integer> _methods = new Hashtable<String,Integer>();
static
{
@@ -234,4 +234,4 @@ public abstract class _NamingContextExtI
}
gnu.CORBA.ServiceRequestAdapter.invoke(request, this, result);
}
-}
\ No newline at end of file
+}
Index: org/omg/CosNaming/_NamingContextImplBase.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/org/omg/CosNaming/_NamingContextImplBase.java,v
retrieving revision 1.1.2.4
diff -u -3 -p -u -r1.1.2.4 _NamingContextImplBase.java
--- org/omg/CosNaming/_NamingContextImplBase.java 10 Sep 2005 15:32:05
-0000 1.1.2.4
+++ org/omg/CosNaming/_NamingContextImplBase.java 12 Oct 2005 21:05:37
-0000
@@ -80,7 +80,7 @@ public abstract class _NamingContextImpl
* As there are quite many methods, it may be sensible to use the hashtable.
* This field is also reused in NamingContextPOA.
*/
- static Hashtable methods = new Hashtable();
+ static Hashtable<String,Integer> methods = new Hashtable<String,Integer>();
/**
* Put all methods into the table.
@@ -410,4 +410,4 @@ public abstract class _NamingContextImpl
gnu.CORBA.ServiceRequestAdapter.invoke(request, this, result);
}
-}
\ No newline at end of file
+}
Index: vm/reference/java/lang/reflect/Method.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/vm/reference/java/lang/reflect/Method.java,v
retrieving revision 1.12.2.6
diff -u -3 -p -u -r1.12.2.6 Method.java
--- vm/reference/java/lang/reflect/Method.java 1 Oct 2005 10:02:47 -0000
1.12.2.6
+++ vm/reference/java/lang/reflect/Method.java 12 Oct 2005 21:05:37 -0000
@@ -346,7 +346,7 @@ extends AccessibleObject implements Memb
* specification, version 3.
* @since 1.5
*/
- public TypeVariable<?>[] getTypeParameters()
+ public TypeVariable<Method>[] getTypeParameters()
{
String sig = getSignature();
MethodSignatureParser p = new MethodSignatureParser(this, sig);
signature.asc
Description: Digital signature
_______________________________________________ Classpath-patches mailing list [email protected] http://lists.gnu.org/mailman/listinfo/classpath-patches
