Loading...
Helix SwarmHelix Swarm
Loading...

describe

  • //
  • guest/
  • john_kristian/
  • p4d2p/
  • test/
  • golden/
  • describe #1
  • View
  • Commits
  • Open Download .zip Download (25 KB) 
  1. Change 117522 by jkristian@jkristian-home on 2003/11/11 00:46:57
  2.  
  3. 	Renamed UnixStyleFilter to UnixCommand.
  4. 	Improved.
  5.  
  6. Affected files ...
  7.  
  8. ... //users/jkristian/lib/UnixCommandResources.properties#1 branch
  9. ... //users/jkristian/lib/UnixStyleFilterResources.properties#2 delete
  10. ... //users/jkristian/lib/p4d2pResources.properties#3 edit
  11. ... //users/jkristian/src/UnixCommand.java#1 add
  12. ... //users/jkristian/src/UnixStyleFilter.java#3 delete
  13. ... //users/jkristian/src/p4d2p.java#3 edit
  14.  
  15. Differences ...
  16.  
  17. ==== //users/jkristian/lib/p4d2pResources.properties#3 (text) ====
  18.  
  19. Index: users/jkristian/lib/p4d2pResources.properties
  20. diff -r //users/jkristian/lib/p4d2pResources.properties users/jkristian/lib/p4d2pResources.properties
  21. 48a49
  22. > diff.default: converting default diff (not recommended for `patch`)\n
  23.  
  24. ==== //users/jkristian/src/p4d2p.java#3 (text) ====
  25.  
  26. Index: users/jkristian/src/p4d2p.java
  27. diff -r //users/jkristian/src/p4d2p.java users/jkristian/src/p4d2p.java
  28. 2,3d1
  29. < import java.io.BufferedReader;
  30. < import java.io.InputStreamReader;
  31. 5d2
  32. < import java.io.PushbackReader;
  33. 20c17
  34. <         UnixStyleFilter filter = new UnixStyleFilter(p4d2p.class, "hi::o:p:v", ARGV);
  35. ---
  36. >         UnixCommand command = new UnixCommand(p4d2p.class, "hi::o:p:v", ARGV);
  37. 22,24c19,21
  38. <             Properties options = filter.getOptions();
  39. <             if (options.getProperty("h") != null) {
  40. <                 filter.writeError(filter.getHelp());
  41. ---
  42. >             Properties options = command.getOptions();
  43. >             if (options.get("h") != null) {
  44. >                 command.writeError(command.getHelp());
  45. 26,29c23,26
  46. <                 filter.setEditInPlace(options.getProperty("i"));
  47. <                 LineWriter self = new p4d2p(filter, filter.getOutputWriter());
  48. <                 while (filter.getFile()) {
  49. <                     Copier.copyAll(filter.getInputLineReader(), self);
  50. ---
  51. >                 command.setEditInPlace(options.getProperty("i"));
  52. >                 LineWriter self = new p4d2p(command);
  53. >                 while (command.getFile()) {
  54. >                     Copier.copyAll(command.getInputLineReader(), self);
  55. 34c31
  56. <             filter.flush();
  57. ---
  58. >             command.flush();
  59. 38,42c35,50
  60. <     private String oldFile = null;
  61. <     private String oldNote;
  62. <     private String newFile;
  63. <     private String newNote;
  64. <     private List movedFiles = new ArrayList();
  65. ---
  66. >     protected p4d2p(UnixCommand command) throws IOException {
  67. >         this.command = command;
  68. >         this.options = command.getOptions();
  69. >         this.verbose = (options.get("v") != null);
  70. >         this.out = command.getOutputWriter();
  71. >     }
  72. > 
  73. >     protected static DateFormat timeFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z"); // ISO 8601
  74. >     protected static String epoch = timeFormat.format(new Date(0));
  75. > 
  76. >     protected String now = timeFormat.format(new Date());
  77. >     protected UnixCommand command;
  78. >     protected Properties options;
  79. >     protected boolean verbose;
  80. >     protected Writer out;
  81. >     protected Writer err;
  82. 44,48c52,56
  83. <     private static final Pattern P4_DESCRIBE_MOVE   = Pattern.compile("^\\.\\.\\. (//.+?\\#\\d+ (add|branch|delete))$", Pattern.MULTILINE);
  84. <     private static final Pattern P4_MOVED_FILE      = Pattern.compile("//(.+?)(\\#\\d+) (\\w*)$", Pattern.MULTILINE);
  85. <     private static final Pattern P4_DESCRIBE_HEADER = Pattern.compile("^==== //(.+?)(\\#\\d+) .*?====( \\(.+\\))?$", Pattern.MULTILINE);
  86. <     private static final Pattern P4_DIFF_HEADER     = Pattern.compile("^==== //(.+?)(\\#\\d+) +- +(.+?) +====( \\(.+\\))?$", Pattern.MULTILINE);
  87. <     private static final Pattern P4_DIFF2_HEADER    = Pattern.compile("^==== //(.+?)(\\#\\d+) +\\(.+?\\) +- +(.+?)(\\#\\d+) +\\(.+?\\) +==== +\\w+$", Pattern.MULTILINE);
  88. ---
  89. >     protected String oldFile = null;
  90. >     protected String oldNote;
  91. >     protected String newFile;
  92. >     protected String newNote;
  93. >     protected List movedFiles = new ArrayList();
  94. 50,53c58,67
  95. <     private static final Pattern VERSION = Pattern.compile("\\#(\\d+)");
  96. <     private static final Pattern UNIFIED_DIFF = Pattern.compile("^\\@\\@\\s.*\\s\\@\\@$", Pattern.MULTILINE);
  97. <     private static final Pattern CONTEXT_DIFF = Pattern.compile("^\\*+$", Pattern.MULTILINE);
  98. <     private static final Pattern DEFAULT_DIFF = Pattern.compile("^\\d+(,\\d+)?[acd]\\d+", Pattern.MULTILINE);
  99. ---
  100. >     protected static Pattern P4_DESCRIBE_MOVE   = Pattern.compile("^\\.\\.\\. (//.+?\\#\\d+ (add|branch|delete))$", Pattern.MULTILINE);
  101. >     protected static Pattern P4_MOVED_FILE      = Pattern.compile("//(.+?)(\\#\\d+) (\\w*)$", Pattern.MULTILINE);
  102. >     protected static Pattern P4_DESCRIBE_HEADER = Pattern.compile("^==== //(.+?)(\\#\\d+) .*?====( \\(.+\\))?$", Pattern.MULTILINE);
  103. >     protected static Pattern P4_DIFF_HEADER     = Pattern.compile("^==== //(.+?)(\\#\\d+) +- +(.+?) +====( \\(.+\\))?$", Pattern.MULTILINE);
  104. >     protected static Pattern P4_DIFF2_HEADER    = Pattern.compile("^==== //(.+?)(\\#\\d+) +\\(.+?\\) +- +(.+?)(\\#\\d+) +\\(.+?\\) +==== +\\w+$",
  105. >                                                                   Pattern.MULTILINE);
  106. >     protected static Pattern VERSION = Pattern.compile("\\#(\\d+)");
  107. >     protected static Pattern UNIFIED_DIFF = Pattern.compile("^\\@\\@\\s.*\\s\\@\\@$", Pattern.MULTILINE);
  108. >     protected static Pattern CONTEXT_DIFF = Pattern.compile("^\\*+$", Pattern.MULTILINE);
  109. >     protected static Pattern DEFAULT_DIFF = Pattern.compile("^\\d+(,\\d+)?[acd]\\d+", Pattern.MULTILINE);
  110. 56d69
  111. <         //if (verbose) out.write("// write(line)\n");
  112. 60d72
  113. <             if (verbose) out.write("// p4 describe move\n");
  114. 64d75
  115. <             if (verbose) out.write("// p4 diff header\n");
  116. 72d82
  117. <             if (verbose) out.write("// p4 diff2 header\n");
  118. 79d88
  119. <             if (verbose) out.write("// p4 describe header\n");
  120. 90d98
  121. <                 if (verbose) System.err.println("emitting diff -u header");
  122. 97d104
  123. <                 if (verbose) System.err.println("emitting diff -c header");
  124. 104c111
  125. <                 if (verbose) System.err.println("emitting diff header (not recommended for `patch`)");
  126. ---
  127. >                 if (verbose) command.writeError(command.getResource("diff.default"));
  128. 109a117
  129. > 
  130. 126d133
  131. <                 if (verbose) System.err.println(verb);
  132. 128,131c135,137
  133. <                 if (verb.equals("delete")) {
  134. <                     Matcher version = VERSION.matcher(newNote);
  135. <                     version.find();
  136. <                     oldNote = "#" + (Long.parseLong(version.group(1)) - 1);
  137. ---
  138. >                 if ("delete".equals(verb)) {
  139. >                     (m = VERSION.matcher(newNote)).find();
  140. >                     oldNote = "#" + (Long.parseLong(m.group(1)) - 1);
  141. 147c153
  142. <                     if (verb.equals("delete")) {
  143. ---
  144. >                     if ("delete".equals(verb)) {
  145. 168c174
  146. <     private List p4print(String name) throws IOException {
  147. ---
  148. >     protected List p4print(String name) throws IOException {
  149. 176c182
  150. <             System.err.println("exit " + p.exitValue() + " from " + cmd);
  151. ---
  152. >             command.writeError("exit " + p.exitValue() + " from " + cmd + "\n");
  153. 181,197d186
  154. <     protected UnixStyleFilter filter;
  155. <     protected Properties options;
  156. <     protected boolean verbose;
  157. <     protected Writer out;
  158. < 
  159. <     private p4d2p(UnixStyleFilter filter, Writer out) {
  160. <         this.filter = filter;
  161. <         this.options = filter.getOptions();
  162. <         this.verbose = (options.getProperty("v") != null);
  163. <         this.out = out;
  164. <     }
  165. < 
  166. <     private static DateFormat timeFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z"); // ISO 8601
  167. <     private static final String epoch = timeFormat.format(new Date(0));
  168. < 
  169. <     private String now = timeFormat.format(new Date());
  170. < 
  171.  
  172. Index: //users/jkristian/lib/UnixCommandResources.properties
  173. --- users/jkristian/lib/UnixCommandResources.properties 1970-01-01 00:00:00Z
  174. +++ users/jkristian/lib/UnixCommandResources.properties #1
  175. @@ -0,0 +1,2 @@
  176. +usage: usage: {0}
  177. +rename: can''t move {0} to {1}
  178.  
  179. Index: //users/jkristian/lib/UnixStyleFilterResources.properties
  180. --- users/jkristian/lib/UnixStyleFilterResources.properties #1
  181. +++ users/jkristian/lib/UnixStyleFilterResources.properties 1970-01-01 00:00:00Z
  182. @@ -1,2 +0,0 @@
  183. -usage: usage: {0}
  184. -rename: can''t move {0} to {1}
  185.  
  186. Index: //users/jkristian/src/UnixCommand.java
  187. --- users/jkristian/src/UnixCommand.java 1970-01-01 00:00:00Z
  188. +++ users/jkristian/src/UnixCommand.java #1
  189. @@ -0,0 +1,250 @@
  190. +import gnu.getopt.Getopt;
  191. +import java.io.File;
  192. +import java.io.FileInputStream;
  193. +import java.io.FileOutputStream;
  194. +import java.io.FilterInputStream;
  195. +import java.io.FilterOutputStream;
  196. +import java.io.InputStream;
  197. +import java.io.InputStreamReader;
  198. +import java.io.IOException;
  199. +import java.io.OutputStream;
  200. +import java.io.OutputStreamWriter;
  201. +import java.io.PushbackReader;
  202. +import java.io.Reader;
  203. +import java.io.Writer;
  204. +import java.text.MessageFormat;
  205. +import java.util.ArrayList;
  206. +import java.util.Locale;
  207. +import java.util.List;
  208. +import java.util.Properties;
  209. +import java.util.ResourceBundle;
  210. +
  211. +class UnixCommand {
  212. +
  213. +    public UnixCommand(Class command, String options, String[] ARGV) {
  214. +        this.command = command;
  215. +        String commandName = command.getName();
  216. +        this.resourceBundleName = commandName + "Resources";
  217. +        Getopt g = new Getopt(commandName, ARGV, options);
  218. +        {
  219. +            boolean error = false;
  220. +            for (int c; (c = g.getopt()) != -1; ) {
  221. +                // System.err.println("option " + (char)c);
  222. +                if (c == '?') {
  223. +                    error = true;
  224. +                } else {
  225. +                    this.options.put((char)c + "",
  226. +                                     (options.indexOf((char)c + ":") < 0) ? "1" :
  227. +                                     ((g.getOptarg() == null) ? "" : g.getOptarg()));
  228. +                }
  229. +            }
  230. +            if (error) {
  231. +                try {
  232. +                    writeError(getUsage());
  233. +                } catch(IOException ignored) {}
  234. +                exit(1);
  235. +            }
  236. +        }
  237. +        for (int i = g.getOptind(); i < ARGV.length; ++i) {
  238. +            fileNames.add(ARGV[i]);
  239. +        }
  240. +        if (fileNames.isEmpty()) {
  241. +            fileNames.add(STDIN_NAME);
  242. +        }
  243. +    }
  244. +
  245. +    public void exit(int status) {
  246. +        try {
  247. +            flush();
  248. +        } catch(IOException ignored) {}
  249. +        Runtime.getRuntime().exit(1);
  250. +    }
  251. +
  252. +    public static final String STDIN_NAME = "-";
  253. +
  254. +    protected Class command;
  255. +    protected Properties options = new Properties();
  256. +    private Locale locale;
  257. +    private String resourceBundleName;
  258. +    protected String backupFileSuffix = null;
  259. +    protected List fileNames = new ArrayList();
  260. +    protected SteerableInputStream inputStream = new SteerableInputStream(null);
  261. +    protected PushbackReader inputReader;
  262. +    protected LineReader inputLineReader;
  263. +    protected SteerableOutputStream outputStream = new SteerableOutputStream(System.out);
  264. +    protected Writer outputWriter;
  265. +    protected Writer errorWriter;
  266. +
  267. +    protected static class SteerableInputStream extends FilterInputStream {
  268. +        public SteerableInputStream(InputStream in) { super(in); }
  269. +        public void setInput(InputStream in) { this.in = in; }
  270. +    }
  271. +
  272. +    protected static class SteerableOutputStream extends FilterOutputStream {
  273. +        public SteerableOutputStream(OutputStream out) { super(out); }
  274. +        public void setOutput(OutputStream out) { this.out = out; }
  275. +    }
  276. +
  277. +    public Properties getOptions() {
  278. +        return options;
  279. +    }
  280. +
  281. +    public Class getCommand() {
  282. +        return command;
  283. +    }
  284. +
  285. +    public String getResourceBundleName() {
  286. +        return resourceBundleName;
  287. +    }
  288. +
  289. +    public void setResourceBundleName(String name) {
  290. +        resourceBundleName = name;
  291. +    }
  292. +
  293. +    public Locale getLocale() {
  294. +        if (locale == null) {
  295. +            setLocale(Locale.getDefault());
  296. +        }
  297. +        return locale;
  298. +    }
  299. +
  300. +    public void setLocale(Locale locale) {
  301. +        this.locale = locale;
  302. +    }
  303. +
  304. +    public ResourceBundle getResourceBundle()
  305. +    {
  306. +        return ResourceBundle.getBundle(getResourceBundleName(), getLocale(), command.getClassLoader());
  307. +    }
  308. +
  309. +    public String getResource(String name)
  310. +    {
  311. +        return getResourceBundle().getString(name);
  312. +    }
  313. +
  314. +    public void setEditInPlace(String suffix)
  315. +    {
  316. +        this.backupFileSuffix = (suffix == null || suffix.length() > 0) ? suffix : "~";
  317. +    }
  318. +
  319. +    public boolean getFile() throws IOException {
  320. +        if (fileNames.isEmpty()) return false;
  321. +        String fileName = (String)(fileNames.remove(0));
  322. +        if (fileName.equals(STDIN_NAME)) {
  323. +            inputStream.setInput(System.in);
  324. +            outputStream.setOutput(System.out);
  325. +
  326. +        } else if (backupFileSuffix == null) {
  327. +            inputStream.setInput(new FileInputStream(fileName));
  328. +            outputStream.setOutput(System.out);
  329. +
  330. +        } else { // edit in place
  331. +            File inputFile = new File(fileName + backupFileSuffix);
  332. +            File outputFile = new File(fileName);
  333. +            inputFile.delete();
  334. +            if ( ! outputFile.renameTo(inputFile)) {
  335. +                throw new IOException(MessageFormat.format(getMessage("rename"),
  336. +                                                           new String[]{outputFile.getPath(), inputFile.getPath()}));
  337. +            }
  338. +            inputStream.setInput(new FileInputStream(inputFile));
  339. +            outputStream.setOutput(new FileOutputStream(outputFile));
  340. +        }
  341. +        return true;
  342. +    }
  343. +
  344. +    public void flush() throws IOException
  345. +    {
  346. +        IOException ex = null;
  347. +        if (outputWriter != null) try {
  348. +            outputWriter.flush();
  349. +        } catch(IOException e) {
  350. +            ex = e;
  351. +        }
  352. +        if (outputStream != null) try {
  353. +            outputStream.flush();
  354. +        } catch(IOException e) {
  355. +            ex = e;
  356. +        }
  357. +        if (errorWriter != null) try {
  358. +            errorWriter.flush();
  359. +        } catch(IOException e) {
  360. +            ex = e;
  361. +        }
  362. +        System.err.flush();
  363. +        if (ex != null) throw ex;
  364. +    }
  365. +
  366. +    public PushbackReader getInputReader() throws IOException {
  367. +        if (inputReader == null) {
  368. +            inputReader = new PushbackReader(new InputStreamReader(inputStream));
  369. +        }
  370. +        return inputReader;
  371. +    }
  372. +
  373. +    public LineReader getInputLineReader() throws IOException {
  374. +        if (inputLineReader == null) {
  375. +            inputLineReader = new LineReader(getInputReader());
  376. +        }
  377. +        return inputLineReader;
  378. +    }
  379. +
  380. +    public Writer getOutputWriter() throws IOException {
  381. +        if (outputWriter == null) {
  382. +            outputWriter = new OutputStreamWriter(outputStream);
  383. +        }
  384. +        return outputWriter;
  385. +    }
  386. +
  387. +    public Writer getErrorWriter() throws IOException {
  388. +        if (errorWriter == null) {
  389. +            errorWriter = new OutputStreamWriter(System.err);
  390. +        }
  391. +        return errorWriter;
  392. +    }
  393. +
  394. +    public void writeError(String s) throws IOException {
  395. +        Writer err = getErrorWriter();
  396. +        err.write(s);
  397. +        err.flush();
  398. +    }
  399. +
  400. +    public void writeError(Object o) throws IOException {
  401. +        writeError(o + "");
  402. +    }
  403. +
  404. +    public String getUsage() {
  405. +        String message = getMessage("usage");
  406. +        return (message == null) ? getHelp().toString() :
  407. +            MessageFormat.format(message,
  408. +                                 new String[]{MessageFormat.format(getResourceBundle().getString("usage"),
  409. +                                                                   new String[]{command.getName()})});
  410. +    }
  411. +
  412. +    public StringBuffer getHelp() {
  413. +        ResourceBundle resource = getResourceBundle();
  414. +        StringBuffer message = new StringBuffer(resource.getString("help"));
  415. +        replaceAll(message, "{usage}", resource.getString("usage"));
  416. +        message.replace(0, message.length(),
  417. +                        MessageFormat.format(message.toString(),
  418. +                                             new String[]{command.getName()}));
  419. +        return message;
  420. +    }
  421. +
  422. +    protected String getMessage(String name) {
  423. +        return getResourceBundle(UnixCommand.class).getString(name);
  424. +    }
  425. +
  426. +    protected ResourceBundle getResourceBundle(Class base) {
  427. +        return ResourceBundle.getBundle(base.getName() + "Resources",
  428. +                                        getLocale(),
  429. +                                        base.getClassLoader());
  430. +    }
  431. +
  432. +    protected static void replaceAll(StringBuffer s, String find, String replace)
  433. +    {
  434. +        for (int i = 0; (i = s.indexOf(find, i)) >= 0; i += replace.length()) {
  435. +            s.replace(i, i + find.length(), replace);
  436. +        }
  437. +    }
  438. +
  439. +}
  440.  
  441. Index: //users/jkristian/src/UnixStyleFilter.java
  442. --- users/jkristian/src/UnixStyleFilter.java #2
  443. +++ users/jkristian/src/UnixStyleFilter.java 1970-01-01 00:00:00Z
  444. @@ -1,250 +0,0 @@
  445. -import gnu.getopt.Getopt;
  446. -import java.io.File;
  447. -import java.io.FileInputStream;
  448. -import java.io.FileOutputStream;
  449. -import java.io.FilterInputStream;
  450. -import java.io.FilterOutputStream;
  451. -import java.io.InputStream;
  452. -import java.io.InputStreamReader;
  453. -import java.io.IOException;
  454. -import java.io.OutputStream;
  455. -import java.io.OutputStreamWriter;
  456. -import java.io.PushbackReader;
  457. -import java.io.Reader;
  458. -import java.io.Writer;
  459. -import java.text.MessageFormat;
  460. -import java.util.ArrayList;
  461. -import java.util.Locale;
  462. -import java.util.List;
  463. -import java.util.Properties;
  464. -import java.util.ResourceBundle;
  465. -
  466. -class UnixStyleFilter {
  467. -
  468. -    public UnixStyleFilter(Class command, String options, String[] ARGV) {
  469. -        this.command = command;
  470. -        String commandName = command.getName();
  471. -        this.resourceBundleName = commandName + "Resources";
  472. -        Getopt g = new Getopt(commandName, ARGV, options);
  473. -        {
  474. -            boolean error = false;
  475. -            for (int c; (c = g.getopt()) != -1; ) {
  476. -                // System.err.println("option " + (char)c);
  477. -                if (c == '?') {
  478. -                    error = true;
  479. -                } else {
  480. -                    this.options.put((char)c + "",
  481. -                                     (options.indexOf((char)c + ":") < 0) ? "1" :
  482. -                                     ((g.getOptarg() == null) ? "" : g.getOptarg()));
  483. -                }
  484. -            }
  485. -            if (error) {
  486. -                try {
  487. -                    writeError(getUsage());
  488. -                } catch(IOException ignored) {}
  489. -                exit(1);
  490. -            }
  491. -        }
  492. -        for (int i = g.getOptind(); i < ARGV.length; ++i) {
  493. -            fileNames.add(ARGV[i]);
  494. -        }
  495. -        if (fileNames.isEmpty()) {
  496. -            fileNames.add(STDIN_NAME);
  497. -        }
  498. -    }
  499. -
  500. -    public void exit(int status) {
  501. -        try {
  502. -            flush();
  503. -        } catch(IOException ignored) {}
  504. -        Runtime.getRuntime().exit(1);
  505. -    }
  506. -
  507. -    public static final String STDIN_NAME = "-";
  508. -
  509. -    protected Class command;
  510. -    protected Properties options = new Properties();
  511. -    private Locale locale;
  512. -    private String resourceBundleName;
  513. -    protected String backupFileSuffix = null;
  514. -    protected List fileNames = new ArrayList();
  515. -    protected SteerableInputStream inputStream = new SteerableInputStream(null);
  516. -    protected PushbackReader inputReader;
  517. -    protected LineReader inputLineReader;
  518. -    protected SteerableOutputStream outputStream = new SteerableOutputStream(System.out);
  519. -    protected Writer outputWriter;
  520. -    protected Writer errorWriter;
  521. -
  522. -    protected static class SteerableInputStream extends FilterInputStream {
  523. -        public SteerableInputStream(InputStream in) { super(in); }
  524. -        public void setInput(InputStream in) { this.in = in; }
  525. -    }
  526. -
  527. -    protected static class SteerableOutputStream extends FilterOutputStream {
  528. -        public SteerableOutputStream(OutputStream out) { super(out); }
  529. -        public void setOutput(OutputStream out) { this.out = out; }
  530. -    }
  531. -
  532. -    public Properties getOptions() {
  533. -        return options;
  534. -    }
  535. -
  536. -    public Class getCommand() {
  537. -        return command;
  538. -    }
  539. -
  540. -    public String getResourceBundleName() {
  541. -        return resourceBundleName;
  542. -    }
  543. -
  544. -    public void setResourceBundleName(String name) {
  545. -        resourceBundleName = name;
  546. -    }
  547. -
  548. -    public Locale getLocale() {
  549. -        if (locale == null) {
  550. -            setLocale(Locale.getDefault());
  551. -        }
  552. -        return locale;
  553. -    }
  554. -
  555. -    public void setLocale(Locale locale) {
  556. -        this.locale = locale;
  557. -    }
  558. -
  559. -    public ResourceBundle getResourceBundle()
  560. -    {
  561. -        return ResourceBundle.getBundle(getResourceBundleName(), getLocale(), command.getClassLoader());
  562. -    }
  563. -
  564. -    public String getResource(String name)
  565. -    {
  566. -        return getResourceBundle().getString(name);
  567. -    }
  568. -
  569. -    public void setEditInPlace(String suffix)
  570. -    {
  571. -        this.backupFileSuffix = (suffix == null || suffix.length() > 0) ? suffix : "~";
  572. -    }
  573. -
  574. -    public boolean getFile() throws IOException {
  575. -        if (fileNames.isEmpty()) return false;
  576. -        String fileName = (String)(fileNames.remove(0));
  577. -        if (fileName.equals(STDIN_NAME)) {
  578. -            inputStream.setInput(System.in);
  579. -            outputStream.setOutput(System.out);
  580. -
  581. -        } else if (backupFileSuffix == null) {
  582. -            inputStream.setInput(new FileInputStream(fileName));
  583. -            outputStream.setOutput(System.out);
  584. -
  585. -        } else { // edit in place
  586. -            File inputFile = new File(fileName + backupFileSuffix);
  587. -            File outputFile = new File(fileName);
  588. -            inputFile.delete();
  589. -            if ( ! outputFile.renameTo(inputFile)) {
  590. -                throw new IOException(MessageFormat.format(getMessage("rename"),
  591. -                                                           new String[]{outputFile.getPath(), inputFile.getPath()}));
  592. -            }
  593. -            inputStream.setInput(new FileInputStream(inputFile));
  594. -            outputStream.setOutput(new FileOutputStream(outputFile));
  595. -        }
  596. -        return true;
  597. -    }
  598. -
  599. -    public void flush() throws IOException
  600. -    {
  601. -        IOException ex = null;
  602. -        if (outputWriter != null) try {
  603. -            outputWriter.flush();
  604. -        } catch(IOException e) {
  605. -            ex = e;
  606. -        }
  607. -        if (outputStream != null) try {
  608. -            outputStream.flush();
  609. -        } catch(IOException e) {
  610. -            ex = e;
  611. -        }
  612. -        if (errorWriter != null) try {
  613. -            errorWriter.flush();
  614. -        } catch(IOException e) {
  615. -            ex = e;
  616. -        }
  617. -        System.err.flush();
  618. -        if (ex != null) throw ex;
  619. -    }
  620. -
  621. -    public PushbackReader getInputReader() throws IOException {
  622. -        if (inputReader == null) {
  623. -            inputReader = new PushbackReader(new InputStreamReader(inputStream));
  624. -        }
  625. -        return inputReader;
  626. -    }
  627. -
  628. -    public LineReader getInputLineReader() throws IOException {
  629. -        if (inputLineReader == null) {
  630. -            inputLineReader = new LineReader(getInputReader());
  631. -        }
  632. -        return inputLineReader;
  633. -    }
  634. -
  635. -    public Writer getOutputWriter() throws IOException {
  636. -        if (outputWriter == null) {
  637. -            outputWriter = new OutputStreamWriter(outputStream);
  638. -        }
  639. -        return outputWriter;
  640. -    }
  641. -
  642. -    public Writer getErrorWriter() throws IOException {
  643. -        if (errorWriter == null) {
  644. -            errorWriter = new OutputStreamWriter(System.err);
  645. -        }
  646. -        return errorWriter;
  647. -    }
  648. -
  649. -    public void writeError(String s) throws IOException {
  650. -        Writer err = getErrorWriter();
  651. -        err.write(s);
  652. -        err.flush();
  653. -    }
  654. -
  655. -    public void writeError(Object o) throws IOException {
  656. -        writeError(o + "");
  657. -    }
  658. -
  659. -    public String getUsage() {
  660. -        String message = getMessage("usage");
  661. -        return (message == null) ? getHelp().toString() :
  662. -            MessageFormat.format(message,
  663. -                                 new String[]{MessageFormat.format(getResourceBundle().getString("usage"),
  664. -                                                                   new String[]{command.getName()})});
  665. -    }
  666. -
  667. -    public StringBuffer getHelp() {
  668. -        ResourceBundle resource = getResourceBundle();
  669. -        StringBuffer message = new StringBuffer(resource.getString("help"));
  670. -        replaceAll(message, "{usage}", resource.getString("usage"));
  671. -        message.replace(0, message.length(),
  672. -                        MessageFormat.format(message.toString(),
  673. -                                             new String[]{command.getName()}));
  674. -        return message;
  675. -    }
  676. -
  677. -    protected String getMessage(String name) {
  678. -        return getResourceBundle(UnixStyleFilter.class).getString(name);
  679. -    }
  680. -
  681. -    protected ResourceBundle getResourceBundle(Class base) {
  682. -        return ResourceBundle.getBundle(base.getName() + "Resources",
  683. -                                        getLocale(),
  684. -                                        base.getClassLoader());
  685. -    }
  686. -
  687. -    protected static void replaceAll(StringBuffer s, String find, String replace)
  688. -    {
  689. -        for (int i = 0; (i = s.indexOf(find, i)) >= 0; i += replace.length()) {
  690. -            s.replace(i, i + find.length(), replace);
  691. -        }
  692. -    }
  693. -
  694. -}
# Change User Description Committed
#1 5121 John Kristian corrected capitalization 20 years ago