donaldp 2002/09/06 15:51:00
Modified: src/java/org/apache/avalon/phoenix/frontends Tag:
RELEASE_402-branch CLIMain.java
src/java/org/apache/avalon/phoenix/launcher Tag:
RELEASE_402-branch Main.java
Log:
Minor toucups to move from HashMap to Map.
Submitted by: "David W." <[EMAIL PROTECTED]>
Revision Changes Path
No revision
No revision
1.43.2.1 +4 -4
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/frontends/CLIMain.java
Index: CLIMain.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/frontends/CLIMain.java,v
retrieving revision 1.43
retrieving revision 1.43.2.1
diff -u -r1.43 -r1.43.2.1
--- CLIMain.java 6 Sep 2002 11:22:33 -0000 1.43
+++ CLIMain.java 6 Sep 2002 22:50:59 -0000 1.43.2.1
@@ -8,7 +8,7 @@
package org.apache.avalon.phoenix.frontends;
import java.io.File;
-import java.util.Hashtable;
+import java.util.Map;
import java.util.Observable;
import java.util.Observer;
import org.apache.avalon.excalibur.i18n.ResourceManager;
@@ -68,7 +68,7 @@
* @param args the command line arguments
*/
public int main( final String[] args,
- final Hashtable data,
+ final Map data,
final boolean blocking )
{
try
@@ -115,7 +115,7 @@
* @throws Exception if an error occurs
*/
private void execute( final Parameters parameters,
- final Hashtable data,
+ final Map data,
final boolean blocking )
throws Exception
{
@@ -175,7 +175,7 @@
* Startup the embeddor.
*/
private synchronized boolean startup( final Parameters parameters,
- final Hashtable data )
+ final Map data )
{
try
{
No revision
No revision
1.22.2.1 +8 -6
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/launcher/Main.java
Index: Main.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/launcher/Main.java,v
retrieving revision 1.22
retrieving revision 1.22.2.1
diff -u -r1.22 -r1.22.2.1
--- Main.java 6 Aug 2002 11:57:41 -0000 1.22
+++ Main.java 6 Sep 2002 22:50:59 -0000 1.22.2.1
@@ -16,8 +16,9 @@
import java.security.Permissions;
import java.security.Policy;
import java.util.ArrayList;
-import java.util.Hashtable;
+import java.util.Map;
import java.util.StringTokenizer;
+import java.util.HashMap;
/**
* PhoenixLoader is the class that bootstraps and sets up engine ClassLoader.
@@ -27,8 +28,8 @@
*/
public final class Main
{
- private static final String MAIN_CLASS =
"org.apache.avalon.phoenix.frontends.CLIMain";
-
+ private static final String MAIN_CLASS =
+ "org.apache.avalon.phoenix.frontends.CLIMain";
private static final String LOADER_JAR = "phoenix-loader.jar";
private static Object c_frontend;
@@ -42,7 +43,8 @@
public static final void main( final String[] args )
throws Exception
{
- int exitCode = startup( args, new Hashtable(), true );
+ final int exitCode =
+ startup( args, new HashMap(), true );
System.exit( exitCode );
}
@@ -60,7 +62,7 @@
* @throws Exception if an error occurs
*/
protected static final int startup( final String[] args,
- final Hashtable data,
+ final Map data,
final boolean blocking )
throws Exception
{
@@ -84,7 +86,7 @@
//Create main launcher
final Class clazz = classLoader.loadClass( MAIN_CLASS );
final Class[] paramTypes =
- new Class[]{args.getClass(), Hashtable.class, Boolean.TYPE};
+ new Class[]{args.getClass(), Map.class, Boolean.TYPE};
final Method method = clazz.getMethod( "main", paramTypes );
c_frontend = clazz.newInstance();
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
