* resource/gnu/classpath/tools/jar/messages.properties

(Main.Stdin): New message.
	* tools/gnu/classpath/tools/jar/Main.java (initializeParser): Add
	'-@' option.
	(readNames): New method.
	(run): Use it.

From-SVN: r121424
This commit is contained in:
Tom Tromey 2007-01-31 17:06:33 +00:00 committed by Tom Tromey
parent 4fc7842350
commit 8de15ffc9d
14 changed files with 38 additions and 1 deletions

View File

@ -1,3 +1,12 @@
2007-01-31 Tom Tromey <tromey@redhat.com>
* resource/gnu/classpath/tools/jar/messages.properties
(Main.Stdin): New message.
* tools/gnu/classpath/tools/jar/Main.java (initializeParser): Add
'-@' option.
(readNames): New method.
(run): Use it.
2007-01-26 Andrew Haley <aph@redhat.com>
* java/lang/SecurityManager.java: Load and initialize

View File

@ -69,3 +69,4 @@ Main.FileNameGroup=File name selection
Main.ChangeDir=change to directory before the next file
Main.ChangeDirArg=DIR FILE
Main.InternalError=jar: internal error:
Main.Stdin=Read file names from stdin

View File

@ -1,5 +1,5 @@
/* Main.java - jar program main()
Copyright (C) 2006 Free Software Foundation, Inc.
Copyright (C) 2006, 2007 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@ -45,7 +45,9 @@ import gnu.classpath.tools.getopt.OptionException;
import gnu.classpath.tools.getopt.OptionGroup;
import gnu.classpath.tools.getopt.Parser;
import java.io.BufferedReader;
import java.io.File;
import java.io.InputStreamReader;
import java.io.IOException;
import java.text.MessageFormat;
import java.util.ArrayList;
@ -232,11 +234,34 @@ public class Main
changedDirectory = argument;
}
});
grp.add(new Option('@', Messages.getString("Main.Stdin"))
{
public void parsed(String argument) throws OptionException
{
readNamesFromStdin = true;
}
});
p.add(grp);
return p;
}
private void readNames()
{
String line;
try
{
BufferedReader br
= new BufferedReader(new InputStreamReader(System.in));
while ((line = br.readLine()) != null)
entries.add(new Entry(new File(line)));
}
catch (IOException _)
{
// Ignore.
}
}
private void run(String[] args)
throws InstantiationException, IllegalAccessException, IOException
{
@ -245,6 +270,8 @@ public class Main
if (args.length > 0 && args[0].charAt(0) != '-')
args[0] = '-' + args[0];
p.parse(args, new HandleFile());
if (readNamesFromStdin)
readNames();
Action t = (Action) operationMode.newInstance();
t.run(this);
}