Menu
▾
▴
[Jnode-svn-commits] SF.net SVN: jnode: [3044] trunk/core/src/classpath/javax/javax
|
From: <ls...@us...> - 2007-01-07 18:42:16
|
Revision: 3044
http://jnode.svn.sourceforge.net/jnode/?rev=3044&view=rev
Author: lsantha
Date: 2007-01-07 10:42:15 -0800 (Sun, 07 Jan 2007)
Log Message:
-----------
Classpath patches.
Modified Paths:
--------------
trunk/core/src/classpath/javax/javax/security/sasl/Sasl.java
trunk/core/src/classpath/javax/javax/security/sasl/SaslClientFactory.java
trunk/core/src/classpath/javax/javax/security/sasl/SaslServerFactory.java
trunk/core/src/classpath/javax/javax/swing/undo/CompoundEdit.java
trunk/core/src/classpath/javax/javax/swing/undo/StateEdit.java
trunk/core/src/classpath/javax/javax/swing/undo/StateEditable.java
trunk/core/src/classpath/javax/javax/swing/undo/UndoableEditSupport.java
Modified: trunk/core/src/classpath/javax/javax/security/sasl/Sasl.java
===================================================================
--- trunk/core/src/classpath/javax/javax/security/sasl/Sasl.java 2007-01-07 18:41:27 UTC (rev 3043)
+++ trunk/core/src/classpath/javax/javax/security/sasl/Sasl.java 2007-01-07 18:42:15 UTC (rev 3044)
@@ -356,7 +356,8 @@
public static SaslClient createSaslClient(String[] mechanisms,
String authorizationID,
String protocol,
- String serverName, Map props,
+ String serverName,
+ Map<String, ?> props,
CallbackHandler cbh)
throws SaslException
{
@@ -444,7 +445,7 @@
* {@link SaslClient} instance.
* @see #createSaslClient(String[],String,String,String,Map,CallbackHandler)
*/
- public static Enumeration getSaslClientFactories()
+ public static Enumeration<SaslClientFactory> getSaslClientFactories()
{
Vector result = new Vector();
HashSet names = new HashSet();
@@ -559,7 +560,8 @@
*/
public static SaslServer createSaslServer(String mechanism, String protocol,
String serverName,
- Map props, CallbackHandler cbh)
+ Map<String, ?> props,
+ CallbackHandler cbh)
throws SaslException
{
if (mechanism == null)
@@ -636,7 +638,7 @@
* {@link SaslServer} instance.
* @see #createSaslServer(String,String,String,Map,CallbackHandler)
*/
- public static Enumeration getSaslServerFactories()
+ public static Enumeration<SaslServerFactory> getSaslServerFactories()
{
Vector result = new Vector();
HashSet names = new HashSet();
Modified: trunk/core/src/classpath/javax/javax/security/sasl/SaslClientFactory.java
===================================================================
--- trunk/core/src/classpath/javax/javax/security/sasl/SaslClientFactory.java 2007-01-07 18:41:27 UTC (rev 3043)
+++ trunk/core/src/classpath/javax/javax/security/sasl/SaslClientFactory.java 2007-01-07 18:42:15 UTC (rev 3044)
@@ -97,8 +97,8 @@
* because of an error.
*/
SaslClient createSaslClient(String[] mechanisms, String authorizationID,
- String protocol, String serverName, Map props,
- CallbackHandler cbh)
+ String protocol, String serverName,
+ Map<String, ?> props, CallbackHandler cbh)
throws SaslException;
/**
@@ -114,5 +114,5 @@
* properties, if present in props, are ignored.
* @return a non-null array containing IANA-registered SASL mechanism names.
*/
- String[] getMechanismNames(Map props);
+ String[] getMechanismNames(Map<String, ?> props);
}
Modified: trunk/core/src/classpath/javax/javax/security/sasl/SaslServerFactory.java
===================================================================
--- trunk/core/src/classpath/javax/javax/security/sasl/SaslServerFactory.java 2007-01-07 18:41:27 UTC (rev 3043)
+++ trunk/core/src/classpath/javax/javax/security/sasl/SaslServerFactory.java 2007-01-07 18:42:15 UTC (rev 3044)
@@ -95,7 +95,8 @@
* of an error.
*/
SaslServer createSaslServer(String mechanism, String protocol,
- String serverName, Map props, CallbackHandler cbh)
+ String serverName, Map<String, ?> props,
+ CallbackHandler cbh)
throws SaslException;
/**
@@ -111,5 +112,5 @@
* properties, if present in props, are ignored.
* @return a non-null array containing IANA-registered SASL mechanism names.
*/
- String[] getMechanismNames(Map props);
+ String[] getMechanismNames(Map<String, ?> props);
}
Modified: trunk/core/src/classpath/javax/javax/swing/undo/CompoundEdit.java
===================================================================
--- trunk/core/src/classpath/javax/javax/swing/undo/CompoundEdit.java 2007-01-07 18:41:27 UTC (rev 3043)
+++ trunk/core/src/classpath/javax/javax/swing/undo/CompoundEdit.java 2007-01-07 18:42:15 UTC (rev 3044)
@@ -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 @@
* The <code>UndoableEdit</code>s being combined into a compound
* editing action.
*/
- protected Vector edits;
+ protected Vector<UndoableEdit> edits;
/**
@@ -92,7 +92,7 @@
*/
public CompoundEdit()
{
- edits = new Vector();
+ edits = new Vector<UndoableEdit>();
inProgress = true;
}
@@ -118,7 +118,7 @@
super.undo();
for (int i = edits.size() - 1; i >= 0; i--)
- ((UndoableEdit) edits.elementAt(i)).undo();
+ edits.elementAt(i).undo();
}
@@ -143,7 +143,7 @@
super.redo();
for (int i = 0; i < edits.size(); i++)
- ((UndoableEdit) edits.elementAt(i)).redo();
+ edits.elementAt(i).redo();
}
@@ -156,7 +156,7 @@
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 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 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;
Modified: trunk/core/src/classpath/javax/javax/swing/undo/StateEdit.java
===================================================================
--- trunk/core/src/classpath/javax/javax/swing/undo/StateEdit.java 2007-01-07 18:41:27 UTC (rev 3043)
+++ trunk/core/src/classpath/javax/javax/swing/undo/StateEdit.java 2007-01-07 18:42:15 UTC (rev 3044)
@@ -121,14 +121,14 @@
* The state of <code>object</code> at the time of constructing
* this <code>StateEdit</code>.
*/
- protected Hashtable preState;
+ protected Hashtable<Object, Object> preState;
/**
* The state of <code>object</code> at the time when {@link #end()}
* was called.
*/
- protected Hashtable postState;
+ protected Hashtable<Object, Object> postState;
/**
Modified: trunk/core/src/classpath/javax/javax/swing/undo/StateEditable.java
===================================================================
--- trunk/core/src/classpath/javax/javax/swing/undo/StateEditable.java 2007-01-07 18:41:27 UTC (rev 3043)
+++ trunk/core/src/classpath/javax/javax/swing/undo/StateEditable.java 2007-01-07 18:42:15 UTC (rev 3044)
@@ -100,7 +100,7 @@
* @param state a hash table containing the relevant state
* information.
*/
- void restoreState(Hashtable state);
+ void restoreState(Hashtable<?, ?> state);
/**
@@ -110,5 +110,5 @@
* @param state a hash table for storing relevant state
* information.
*/
- void storeState(Hashtable state);
+ void storeState(Hashtable<Object, Object> state);
}
Modified: trunk/core/src/classpath/javax/javax/swing/undo/UndoableEditSupport.java
===================================================================
--- trunk/core/src/classpath/javax/javax/swing/undo/UndoableEditSupport.java 2007-01-07 18:41:27 UTC (rev 3043)
+++ trunk/core/src/classpath/javax/javax/swing/undo/UndoableEditSupport.java 2007-01-07 18:42:15 UTC (rev 3044)
@@ -69,7 +69,8 @@
/**
* The currently registered listeners.
*/
- protected Vector listeners = new Vector();
+ protected Vector<UndoableEditListener> listeners =
+ new Vector<UndoableEditListener>();
/**
@@ -148,7 +149,7 @@
public synchronized UndoableEditListener[] getUndoableEditListeners()
{
UndoableEditListener[] result = new UndoableEditListener[listeners.size()];
- return (UndoableEditListener[]) listeners.toArray(result);
+ return listeners.toArray(result);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
