From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 20529 invoked by alias); 17 Jan 2008 17:30:22 -0000 Received: (qmail 20071 invoked by uid 9639); 17 Jan 2008 17:29:32 -0000 Date: Thu, 17 Jan 2008 17:30:00 -0000 Message-ID: <20080117172932.20055.qmail@sourceware.org> From: moore@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Merge commit 'origin' X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 122b4d0b3b983050d9f98ca9970e37c03d1a5db8 X-Git-Newrev: 60492e907b8182e4bc2a9f27d467ef79a14dfb30 Mailing-List: contact frysk-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: frysk-cvs-owner@sourceware.org Reply-To: frysk@sourceware.org X-SW-Source: 2008-q1/txt/msg00075.txt.bz2 The branch, master has been updated via 60492e907b8182e4bc2a9f27d467ef79a14dfb30 (commit) via d07c3cc3baa0cc28cd6a7fa05cc2f0d51d744044 (commit) via f51302c2c5c48ba4088d783e23b80eadbddcf9de (commit) via aadf1a17a80683789875729c14bb4df9ef4cfb1e (commit) via 2189e2a71a5e38d6ce0122ffa1dabd812ea8a62b (commit) via 3ba4d42fbca6f5ce7dc22ab1f6b34a575537be46 (commit) via 261cfee49f93bb042db2d123b6ed86b08ae35fee (commit) via 131e257ac4b0815274b997039f41d442821d9d59 (commit) via 019482335590d521328b71ebe0d2cbfcf4fb93b3 (commit) via 398db1108cefd54a76534142dc851f14064703ff (commit) from 122b4d0b3b983050d9f98ca9970e37c03d1a5db8 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit 60492e907b8182e4bc2a9f27d467ef79a14dfb30 Merge: d07c3cc3baa0cc28cd6a7fa05cc2f0d51d744044 122b4d0b3b983050d9f98ca9970e37c03d1a5db8 Author: Tim Moore Date: Thu Jan 17 18:27:48 2008 +0100 Merge commit 'origin' commit d07c3cc3baa0cc28cd6a7fa05cc2f0d51d744044 Merge: f51302c2c5c48ba4088d783e23b80eadbddcf9de 882c8ebdcc825139e58e50982810a0f00f1a229b Author: Tim Moore Date: Thu Jan 17 14:01:35 2008 +0100 Merge commit 'origin' commit f51302c2c5c48ba4088d783e23b80eadbddcf9de Merge: 0443d3a51378ad5454ed4b04d12823380e7385cf aadf1a17a80683789875729c14bb4df9ef4cfb1e Author: Tim Moore Date: Wed Jan 16 15:48:04 2008 +0100 Merge branch 'topic/jline-import' commit aadf1a17a80683789875729c14bb4df9ef4cfb1e Author: Tim Moore Date: Wed Jan 16 15:24:34 2008 +0100 Changes for import of jline 0.0.93 frysk-imports/jline/ChangeLog: 2008-01-16 Tim Moore * src/src/main/java/jline/PtyTerminal.java (isEchoEnabled, enableEcho, disableEcho): Implement new abstract methods in Terminal. Import jline 0.9.93, which has a new file layout. commit 2189e2a71a5e38d6ce0122ffa1dabd812ea8a62b Author: Tim Moore Date: Wed Jan 16 10:28:40 2008 +0100 Add back local patches commit 3ba4d42fbca6f5ce7dc22ab1f6b34a575537be46 Author: Tim Moore Date: Wed Jan 16 10:17:15 2008 +0100 Add back new files to jline-.9.9.3 commit 261cfee49f93bb042db2d123b6ed86b08ae35fee Merge: 131e257ac4b0815274b997039f41d442821d9d59 019482335590d521328b71ebe0d2cbfcf4fb93b3 Author: Tim Moore Date: Wed Jan 16 10:12:07 2008 +0100 Merge branch 'vendor/JLINE-9-9-3' into topic/jline-import commit 131e257ac4b0815274b997039f41d442821d9d59 Author: Tim Moore Date: Wed Jan 16 10:11:39 2008 +0100 Delete old jline in preperation for merge ----------------------------------------------------------------------- Summary of changes: frysk-core/frysk/util/PtyTerminal.java | 19 + frysk-imports/jline/.cvsignore | 4 - frysk-imports/jline/AUTHORS | 1 - frysk-imports/jline/CHANGELOG | 16 - frysk-imports/jline/ChangeLog | 8 + frysk-imports/jline/{LICENSE => LICENSE.txt} | 2 +- frysk-imports/jline/Makefile.am | 7 +- .../javadoc => apidocs}/allclasses-frame.html | 11 +- .../javadoc => apidocs}/allclasses-noframe.html | 11 +- .../javadoc => apidocs}/constant-values.html | 341 +++-- .../javadoc => apidocs}/deprecated-list.html | 33 +- .../{doc-build/javadoc => apidocs}/help-doc.html | 57 +- frysk-imports/jline/apidocs/index-all.html | 1459 +++++++++++++++++ frysk-imports/jline/apidocs/index.html | 37 + .../jline/ANSIBuffer.ANSICodes.html | 411 +---- .../javadoc => apidocs}/jline/ANSIBuffer.html | 155 +- ...rgumentCompletor.AbstractArgumentDelimiter.html | 102 +- .../jline/ArgumentCompletor.ArgumentDelimiter.html | 82 +- .../jline/ArgumentCompletor.ArgumentList.html | 102 +- ...umentCompletor.WhitespaceArgumentDelimiter.html | 76 +- .../jline/ArgumentCompletor.html | 223 +-- .../jline/CandidateCycleCompletionHandler.html | 90 +- .../jline/CandidateListCompletionHandler.html | 365 +++++ .../jline/ClassNameCompletor.html | 121 +- .../jline/CompletionHandler.html | 70 +- .../javadoc => apidocs}/jline/Completor.html | 78 +- .../jline/ConsoleOperations.html | 413 ++++-- .../javadoc => apidocs}/jline/ConsoleReader.html | 960 ++++++------ .../jline/ConsoleReaderInputStream.html | 121 +- .../javadoc => apidocs}/jline/ConsoleRunner.html | 87 +- .../javadoc => apidocs}/jline/CursorBuffer.html | 236 ++- .../jline/FileNameCompletor.html | 138 +- .../javadoc => apidocs}/jline/History.html | 231 ++- frysk-imports/jline/apidocs/jline/JLineBuffer.html | 417 +++++ .../jline/apidocs/jline/JLineStringBuilder.html | 586 +++++++ .../javadoc => apidocs}/jline/MultiCompletor.html | 143 +- .../javadoc => apidocs}/jline/NullCompletor.html | 84 +- .../jline/SimpleCompletor.NoOpFilter.html | 78 +- .../SimpleCompletor.SimpleCompletorFilter.html | 70 +- .../javadoc => apidocs}/jline/SimpleCompletor.html | 231 +-- frysk-imports/jline/apidocs/jline/Terminal.html | 714 +++++++++ .../jline/apidocs/jline/UnixTerminal.html | 822 ++++++++++ .../jline/apidocs/jline/UnsupportedTerminal.html | 534 ++++++ .../jline/apidocs/jline/WindowsTerminal.html | 965 +++++++++++ .../jline/class-use/ANSIBuffer.ANSICodes.html | 139 ++ .../jline/apidocs/jline/class-use/ANSIBuffer.html | 259 +++ ...rgumentCompletor.AbstractArgumentDelimiter.html | 165 ++ .../ArgumentCompletor.ArgumentDelimiter.html | 199 +++ .../class-use/ArgumentCompletor.ArgumentList.html | 173 ++ ...umentCompletor.WhitespaceArgumentDelimiter.html | 139 ++ .../apidocs/jline/class-use/ArgumentCompletor.html | 139 ++ .../class-use/CandidateCycleCompletionHandler.html | 139 ++ .../class-use/CandidateListCompletionHandler.html | 139 ++ .../jline/class-use/ClassNameCompletor.html | 139 ++ .../apidocs/jline/class-use/CompletionHandler.html | 206 +++ .../jline/apidocs/jline/class-use/Completor.html | 303 ++++ .../apidocs/jline/class-use/ConsoleOperations.html | 196 +++ .../apidocs/jline/class-use/ConsoleReader.html | 266 +++ .../jline/class-use/ConsoleReaderInputStream.html | 139 ++ .../apidocs/jline/class-use/ConsoleRunner.html | 139 ++ .../apidocs/jline/class-use/CursorBuffer.html | 162 ++ .../apidocs/jline/class-use/FileNameCompletor.html | 139 ++ .../jline/apidocs/jline/class-use/History.html | 178 ++ .../jline/apidocs/jline/class-use/JLineBuffer.html | 194 +++ .../jline/class-use/JLineStringBuilder.html | 139 ++ .../apidocs/jline/class-use/MultiCompletor.html | 139 ++ .../apidocs/jline/class-use/NullCompletor.html | 139 ++ .../class-use/SimpleCompletor.NoOpFilter.html | 139 ++ .../SimpleCompletor.SimpleCompletorFilter.html | 183 +++ .../apidocs/jline/class-use/SimpleCompletor.html | 162 ++ .../jline/apidocs/jline/class-use/Terminal.html | 230 +++ .../apidocs/jline/class-use/UnixTerminal.html | 139 ++ .../jline/class-use/UnsupportedTerminal.html | 139 ++ .../apidocs/jline/class-use/WindowsTerminal.html | 139 ++ .../javadoc => apidocs}/jline/package-frame.html | 11 +- .../javadoc => apidocs}/jline/package-summary.html | 77 +- .../jline/apidocs/jline/package-tree.html | 179 +++ frysk-imports/jline/apidocs/jline/package-use.html | 238 +++ frysk-imports/jline/apidocs/options | 20 + frysk-imports/jline/apidocs/overview-tree.html | 181 +++ .../{doc-build/javadoc => apidocs}/package-list | 0 frysk-imports/jline/apidocs/packages | 1 + .../javadoc => apidocs}/resources/inherit.gif | Bin 57 -> 57 bytes .../src-html/jline/ANSIBuffer.ANSICodes.html | 471 ++++++ .../jline/apidocs/src-html/jline/ANSIBuffer.html | 471 ++++++ ...rgumentCompletor.AbstractArgumentDelimiter.html | 505 ++++++ .../jline/ArgumentCompletor.ArgumentDelimiter.html | 505 ++++++ .../jline/ArgumentCompletor.ArgumentList.html | 505 ++++++ ...umentCompletor.WhitespaceArgumentDelimiter.html | 505 ++++++ .../apidocs/src-html/jline/ArgumentCompletor.html | 505 ++++++ .../jline/CandidateCycleCompletionHandler.html | 94 ++ .../jline/CandidateListCompletionHandler.html | 255 +++ .../apidocs/src-html/jline/ClassNameCompletor.html | 212 +++ .../apidocs/src-html/jline/CompletionHandler.html | 86 + .../jline/apidocs/src-html/jline/Completor.html | 98 ++ .../apidocs/src-html/jline/ConsoleOperations.html | 342 ++++ .../apidocs/src-html/jline/ConsoleReader.html | 1690 ++++++++++++++++++++ .../src-html/jline/ConsoleReaderInputStream.html | 174 ++ .../apidocs/src-html/jline/ConsoleRunner.html | 152 ++ .../jline/apidocs/src-html/jline/CursorBuffer.html | 170 ++ .../apidocs/src-html/jline/FileNameCompletor.html | 199 +++ .../jline/apidocs/src-html/jline/History.html | 321 ++++ .../jline/apidocs/src-html/jline/JLineBuffer.html | 92 ++ .../apidocs/src-html/jline/JLineStringBuilder.html | 135 ++ .../apidocs/src-html/jline/MultiCompletor.html | 146 ++ .../apidocs/src-html/jline/NullCompletor.html | 93 ++ .../src-html/jline/SimpleCompletor.NoOpFilter.html | 260 +++ .../SimpleCompletor.SimpleCompletorFilter.html | 260 +++ .../apidocs/src-html/jline/SimpleCompletor.html | 260 +++ .../jline/apidocs/src-html/jline/Terminal.html | 246 +++ .../jline/apidocs/src-html/jline/UnixTerminal.html | 487 ++++++ .../src-html/jline/UnsupportedTerminal.html | 164 ++ .../apidocs/src-html/jline/WindowsTerminal.html | 487 ++++++ frysk-imports/jline/apidocs/stylesheet.css | 29 + frysk-imports/jline/build.xml | 413 ----- .../jline/doc-build/javadoc/index-all.html | 1248 --------------- frysk-imports/jline/doc-build/javadoc/index.html | 23 - .../jline/CandidateListCompletionHandler.html | 275 ---- .../jline/doc-build/javadoc/jline/Terminal.html | 536 ------- .../doc-build/javadoc/jline/UnixTerminal.html | 560 ------- .../javadoc/jline/UnsupportedTerminal.html | 397 ----- .../doc-build/javadoc/jline/WindowsTerminal.html | 553 ------- .../doc-build/javadoc/jline/package-tree.html | 164 -- .../jline/doc-build/javadoc/overview-tree.html | 166 -- .../jline/doc-build/javadoc/packages.html | 37 - .../jline/doc-build/javadoc/serialized-form.html | 130 -- .../src-html/jline/ANSIBuffer.ANSICodes.html | 567 ------- .../javadoc/src-html/jline/ANSIBuffer.html | 567 ------- ...rgumentCompletor.AbstractArgumentDelimiter.html | 593 ------- .../jline/ArgumentCompletor.ArgumentDelimiter.html | 593 ------- .../jline/ArgumentCompletor.ArgumentList.html | 593 ------- ...umentCompletor.WhitespaceArgumentDelimiter.html | 593 ------- .../javadoc/src-html/jline/ArgumentCompletor.html | 593 ------- .../jline/CandidateCycleCompletionHandler.html | 130 -- .../jline/CandidateListCompletionHandler.html | 289 ---- .../javadoc/src-html/jline/ClassNameCompletor.html | 241 --- .../javadoc/src-html/jline/CompletionHandler.html | 117 -- .../javadoc/src-html/jline/Completor.html | 134 -- .../javadoc/src-html/jline/ConsoleOperations.html | 352 ---- .../javadoc/src-html/jline/ConsoleReader.html | 1601 ------------------ .../src-html/jline/ConsoleReaderInputStream.html | 231 --- .../javadoc/src-html/jline/ConsoleRunner.html | 190 --- .../javadoc/src-html/jline/CursorBuffer.html | 164 -- .../javadoc/src-html/jline/FileNameCompletor.html | 247 --- .../doc-build/javadoc/src-html/jline/History.html | 351 ---- .../javadoc/src-html/jline/MultiCompletor.html | 188 --- .../javadoc/src-html/jline/NullCompletor.html | 125 -- .../src-html/jline/SimpleCompletor.NoOpFilter.html | 326 ---- .../SimpleCompletor.SimpleCompletorFilter.html | 326 ---- .../javadoc/src-html/jline/SimpleCompletor.html | 326 ---- .../doc-build/javadoc/src-html/jline/Terminal.html | 259 --- .../javadoc/src-html/jline/UnixTerminal.html | 349 ---- .../src-html/jline/UnsupportedTerminal.html | 148 -- .../javadoc/src-html/jline/WindowsTerminal.html | 434 ----- frysk-imports/jline/doc-build/javadoc/styles.css | 174 -- frysk-imports/jline/doc-build/manual.html | 338 ---- frysk-imports/jline/doc-build/manual.txt | 376 ----- frysk-imports/jline/doc-build/styles.css | 174 -- frysk-imports/jline/doc/html.xsl | 57 - frysk-imports/jline/doc/index.html | 88 - frysk-imports/jline/doc/styles.css | 174 -- .../jline/examples/jline/example/Example.java | 97 ++ .../examples/jline/example/PasswordReader.java | 32 + .../{test => examples}/jline/example/english.gz | Bin 130975 -> 130975 bytes frysk-imports/jline/jline-0.9.93.jar | Bin 0 -> 87325 bytes frysk-imports/jline/project.properties | 20 - frysk-imports/jline/src/jline/ANSIBuffer.java | 501 ------ .../jline/src/jline/ArgumentCompletor.java | 527 ------ .../src/jline/CandidateCycleCompletionHandler.java | 64 - .../src/jline/CandidateListCompletionHandler.java | 218 --- .../jline/src/jline/ClassNameCompletor.java | 175 -- .../jline/src/jline/CompletionHandler.java | 51 - frysk-imports/jline/src/jline/Completor.java | 68 - .../jline/src/jline/ConsoleOperations.java | 283 ---- frysk-imports/jline/src/jline/ConsoleReader.java | 1535 ------------------ .../jline/src/jline/ConsoleReaderInputStream.java | 165 -- frysk-imports/jline/src/jline/ConsoleRunner.java | 124 -- frysk-imports/jline/src/jline/CursorBuffer.java | 98 -- .../jline/src/jline/FileNameCompletor.java | 181 --- frysk-imports/jline/src/jline/History.java | 285 ---- frysk-imports/jline/src/jline/MultiCompletor.java | 122 -- frysk-imports/jline/src/jline/NullCompletor.java | 59 - frysk-imports/jline/src/jline/SimpleCompletor.java | 260 --- frysk-imports/jline/src/jline/Terminal.java | 196 --- frysk-imports/jline/src/jline/UnixTerminal.java | 285 ---- .../jline/src/jline/UnsupportedTerminal.java | 82 - frysk-imports/jline/src/pom.xml | 212 +++ frysk-imports/jline/src/src/assembly/assembly.xml | 55 + .../jline/src/src/main/java/jline/ANSIBuffer.java | 405 +++++ .../src/src/main/java/jline/ArgumentCompletor.java | 439 +++++ .../jline/CandidateCycleCompletionHandler.java | 28 + .../java/jline/CandidateListCompletionHandler.java | 189 +++ .../src/main/java/jline/ClassNameCompletor.java | 146 ++ .../src/src/main/java/jline/CompletionHandler.java | 20 + .../jline/src/src/main/java/jline/Completor.java | 32 + .../src/src/main/java/jline/ConsoleOperations.java | 274 ++++ .../src/src/main/java/jline/ConsoleReader.java | 1624 +++++++++++++++++++ .../main/java/jline/ConsoleReaderInputStream.java | 108 ++ .../src/src/main/java/jline/ConsoleRunner.java | 86 + .../src/src/main/java/jline/CursorBuffer.java | 104 ++ .../src/src/main/java/jline/FileNameCompletor.java | 133 ++ .../jline/src/src/main/java/jline/History.java | 255 +++ .../jline/src/src/main/java/jline/JLineBuffer.java | 26 + .../src/main/java/jline/JLineStringBuilder.java | 69 + .../src/src/main/java/jline/MultiCompletor.java | 80 + .../src/src/main/java/jline/NullCompletor.java | 27 + .../src/{ => src/main/java}/jline/PtyTerminal.java | 24 + .../src/src/main/java/jline/SimpleCompletor.java | 194 +++ .../jline/src/src/main/java/jline/Terminal.java | 180 +++ .../src/src/main/java/jline/UnixTerminal.java | 421 +++++ .../src/main/java/jline/UnsupportedTerminal.java | 98 ++ .../src/{ => src/main/java}/jline/package.html | 0 .../jline/{ => src/src/main}/native/Makefile | 0 .../src/main}/native/jline_WindowsTerminal.c | 0 .../src/main}/native/jline_WindowsTerminal.h | 0 .../CandidateListCompletionHandler.properties | 1 + .../src/main/resources/jline/jline32.dll} | Bin 16069 -> 16069 bytes .../jline/src/src/main/resources/jline/jline64.dll | Bin 0 -> 48128 bytes .../main/resources}/jline/keybindings.properties | 9 +- .../resources/jline/windowsbindings.properties} | 16 +- frysk-imports/jline/src/src/site/apt/building.apt | 39 + frysk-imports/jline/src/src/site/apt/downloads.apt | 39 + .../manual.xml => src/src/site/docbook/index.xml} | 147 ++- frysk-imports/jline/src/src/site/fml/faq.fml | 26 + .../jline/src/src/site/resources/css/site.css | 311 ++++ .../src/src/site/resources/images/collapsed.png | Bin 0 -> 222 bytes .../jline/src/src/site/resources/images/dotted.png | Bin 0 -> 190 bytes .../src/src/site/resources/images/expanded.png | Bin 0 -> 198 bytes .../src/src/site/resources/images/external.png | Bin 0 -> 223 bytes .../src/src/site/resources/images/ico_file_pdf.png | Bin 0 -> 280 bytes .../jline/src/src/site/resources/images/logo.jpg | Bin 0 -> 4121 bytes .../src/src/site/resources/images/newwindow.png | Bin 0 -> 224 bytes frysk-imports/jline/src/src/site/site.xml | 40 + .../src/src/test/java/jline/ConsoleReaderTest.java | 162 ++ .../src/src/test/java/jline/JLineTestCase.java | 140 ++ .../src/src/test/java/jline/TestCompletion.java | 71 + .../src/src/test/java/jline/TestEditLine.java | 160 ++ .../jline/src/src/test/java/jline/TestHistory.java | 76 + .../src/src/test/java/jline/example/Example.java | 97 ++ .../test/java/jline/example/PasswordReader.java | 32 + .../src/test/resources}/jline/example/english.gz | Bin 130975 -> 130975 bytes frysk-imports/jline/test/jline/JLineTestCase.java | 209 --- frysk-imports/jline/test/jline/TestCompletion.java | 107 -- frysk-imports/jline/test/jline/TestEditLine.java | 223 --- frysk-imports/jline/test/jline/TestHistory.java | 115 -- .../jline/test/jline/example/Example.java | 140 -- .../jline/test/jline/example/PasswordReader.java | 65 - 247 files changed, 30676 insertions(+), 25153 deletions(-) delete mode 100644 frysk-imports/jline/.cvsignore delete mode 100644 frysk-imports/jline/AUTHORS delete mode 100644 frysk-imports/jline/CHANGELOG rename frysk-imports/jline/{LICENSE => LICENSE.txt} (94%) rename frysk-imports/jline/{doc-build/javadoc => apidocs}/allclasses-frame.html (88%) rename frysk-imports/jline/{doc-build/javadoc => apidocs}/allclasses-noframe.html (87%) rename frysk-imports/jline/{doc-build/javadoc => apidocs}/constant-values.html (70%) rename frysk-imports/jline/{doc-build/javadoc => apidocs}/deprecated-list.html (78%) rename frysk-imports/jline/{doc-build/javadoc => apidocs}/help-doc.html (75%) create mode 100644 frysk-imports/jline/apidocs/index-all.html create mode 100644 frysk-imports/jline/apidocs/index.html rename frysk-imports/jline/{doc-build/javadoc => apidocs}/jline/ANSIBuffer.ANSICodes.html (50%) rename frysk-imports/jline/{doc-build/javadoc => apidocs}/jline/ANSIBuffer.html (68%) rename frysk-imports/jline/{doc-build/javadoc => apidocs}/jline/ArgumentCompletor.AbstractArgumentDelimiter.html (71%) rename frysk-imports/jline/{doc-build/javadoc => apidocs}/jline/ArgumentCompletor.ArgumentDelimiter.html (67%) rename frysk-imports/jline/{doc-build/javadoc => apidocs}/jline/ArgumentCompletor.ArgumentList.html (66%) rename frysk-imports/jline/{doc-build/javadoc => apidocs}/jline/ArgumentCompletor.WhitespaceArgumentDelimiter.html (66%) rename frysk-imports/jline/{doc-build/javadoc => apidocs}/jline/ArgumentCompletor.html (63%) rename frysk-imports/jline/{doc-build/javadoc => apidocs}/jline/CandidateCycleCompletionHandler.html (61%) create mode 100644 frysk-imports/jline/apidocs/jline/CandidateListCompletionHandler.html rename frysk-imports/jline/{doc-build/javadoc => apidocs}/jline/ClassNameCompletor.html (59%) rename frysk-imports/jline/{doc-build/javadoc => apidocs}/jline/CompletionHandler.html (70%) rename frysk-imports/jline/{doc-build/javadoc => apidocs}/jline/Completor.html (70%) rename frysk-imports/jline/{doc-build/javadoc => apidocs}/jline/ConsoleOperations.html (69%) rename frysk-imports/jline/{doc-build/javadoc => apidocs}/jline/ConsoleReader.html (52%) rename frysk-imports/jline/{doc-build/javadoc => apidocs}/jline/ConsoleReaderInputStream.html (52%) rename frysk-imports/jline/{doc-build/javadoc => apidocs}/jline/ConsoleRunner.html (61%) rename frysk-imports/jline/{doc-build/javadoc => apidocs}/jline/CursorBuffer.html (52%) rename frysk-imports/jline/{doc-build/javadoc => apidocs}/jline/FileNameCompletor.html (58%) rename frysk-imports/jline/{doc-build/javadoc => apidocs}/jline/History.html (56%) create mode 100644 frysk-imports/jline/apidocs/jline/JLineBuffer.html create mode 100644 frysk-imports/jline/apidocs/jline/JLineStringBuilder.html rename frysk-imports/jline/{doc-build/javadoc => apidocs}/jline/MultiCompletor.html (58%) rename frysk-imports/jline/{doc-build/javadoc => apidocs}/jline/NullCompletor.html (61%) rename frysk-imports/jline/{doc-build/javadoc => apidocs}/jline/SimpleCompletor.NoOpFilter.html (60%) rename frysk-imports/jline/{doc-build/javadoc => apidocs}/jline/SimpleCompletor.SimpleCompletorFilter.html (68%) rename frysk-imports/jline/{doc-build/javadoc => apidocs}/jline/SimpleCompletor.html (54%) create mode 100644 frysk-imports/jline/apidocs/jline/Terminal.html create mode 100644 frysk-imports/jline/apidocs/jline/UnixTerminal.html create mode 100644 frysk-imports/jline/apidocs/jline/UnsupportedTerminal.html create mode 100644 frysk-imports/jline/apidocs/jline/WindowsTerminal.html create mode 100644 frysk-imports/jline/apidocs/jline/class-use/ANSIBuffer.ANSICodes.html create mode 100644 frysk-imports/jline/apidocs/jline/class-use/ANSIBuffer.html create mode 100644 frysk-imports/jline/apidocs/jline/class-use/ArgumentCompletor.AbstractArgumentDelimiter.html create mode 100644 frysk-imports/jline/apidocs/jline/class-use/ArgumentCompletor.ArgumentDelimiter.html create mode 100644 frysk-imports/jline/apidocs/jline/class-use/ArgumentCompletor.ArgumentList.html create mode 100644 frysk-imports/jline/apidocs/jline/class-use/ArgumentCompletor.WhitespaceArgumentDelimiter.html create mode 100644 frysk-imports/jline/apidocs/jline/class-use/ArgumentCompletor.html create mode 100644 frysk-imports/jline/apidocs/jline/class-use/CandidateCycleCompletionHandler.html create mode 100644 frysk-imports/jline/apidocs/jline/class-use/CandidateListCompletionHandler.html create mode 100644 frysk-imports/jline/apidocs/jline/class-use/ClassNameCompletor.html create mode 100644 frysk-imports/jline/apidocs/jline/class-use/CompletionHandler.html create mode 100644 frysk-imports/jline/apidocs/jline/class-use/Completor.html create mode 100644 frysk-imports/jline/apidocs/jline/class-use/ConsoleOperations.html create mode 100644 frysk-imports/jline/apidocs/jline/class-use/ConsoleReader.html create mode 100644 frysk-imports/jline/apidocs/jline/class-use/ConsoleReaderInputStream.html create mode 100644 frysk-imports/jline/apidocs/jline/class-use/ConsoleRunner.html create mode 100644 frysk-imports/jline/apidocs/jline/class-use/CursorBuffer.html create mode 100644 frysk-imports/jline/apidocs/jline/class-use/FileNameCompletor.html create mode 100644 frysk-imports/jline/apidocs/jline/class-use/History.html create mode 100644 frysk-imports/jline/apidocs/jline/class-use/JLineBuffer.html create mode 100644 frysk-imports/jline/apidocs/jline/class-use/JLineStringBuilder.html create mode 100644 frysk-imports/jline/apidocs/jline/class-use/MultiCompletor.html create mode 100644 frysk-imports/jline/apidocs/jline/class-use/NullCompletor.html create mode 100644 frysk-imports/jline/apidocs/jline/class-use/SimpleCompletor.NoOpFilter.html create mode 100644 frysk-imports/jline/apidocs/jline/class-use/SimpleCompletor.SimpleCompletorFilter.html create mode 100644 frysk-imports/jline/apidocs/jline/class-use/SimpleCompletor.html create mode 100644 frysk-imports/jline/apidocs/jline/class-use/Terminal.html create mode 100644 frysk-imports/jline/apidocs/jline/class-use/UnixTerminal.html create mode 100644 frysk-imports/jline/apidocs/jline/class-use/UnsupportedTerminal.html create mode 100644 frysk-imports/jline/apidocs/jline/class-use/WindowsTerminal.html rename frysk-imports/jline/{doc-build/javadoc => apidocs}/jline/package-frame.html (89%) rename frysk-imports/jline/{doc-build/javadoc => apidocs}/jline/package-summary.html (77%) create mode 100644 frysk-imports/jline/apidocs/jline/package-tree.html create mode 100644 frysk-imports/jline/apidocs/jline/package-use.html create mode 100644 frysk-imports/jline/apidocs/options create mode 100644 frysk-imports/jline/apidocs/overview-tree.html rename frysk-imports/jline/{doc-build/javadoc => apidocs}/package-list (100%) create mode 100644 frysk-imports/jline/apidocs/packages rename frysk-imports/jline/{doc-build/javadoc => apidocs}/resources/inherit.gif (100%) create mode 100644 frysk-imports/jline/apidocs/src-html/jline/ANSIBuffer.ANSICodes.html create mode 100644 frysk-imports/jline/apidocs/src-html/jline/ANSIBuffer.html create mode 100644 frysk-imports/jline/apidocs/src-html/jline/ArgumentCompletor.AbstractArgumentDelimiter.html create mode 100644 frysk-imports/jline/apidocs/src-html/jline/ArgumentCompletor.ArgumentDelimiter.html create mode 100644 frysk-imports/jline/apidocs/src-html/jline/ArgumentCompletor.ArgumentList.html create mode 100644 frysk-imports/jline/apidocs/src-html/jline/ArgumentCompletor.WhitespaceArgumentDelimiter.html create mode 100644 frysk-imports/jline/apidocs/src-html/jline/ArgumentCompletor.html create mode 100644 frysk-imports/jline/apidocs/src-html/jline/CandidateCycleCompletionHandler.html create mode 100644 frysk-imports/jline/apidocs/src-html/jline/CandidateListCompletionHandler.html create mode 100644 frysk-imports/jline/apidocs/src-html/jline/ClassNameCompletor.html create mode 100644 frysk-imports/jline/apidocs/src-html/jline/CompletionHandler.html create mode 100644 frysk-imports/jline/apidocs/src-html/jline/Completor.html create mode 100644 frysk-imports/jline/apidocs/src-html/jline/ConsoleOperations.html create mode 100644 frysk-imports/jline/apidocs/src-html/jline/ConsoleReader.html create mode 100644 frysk-imports/jline/apidocs/src-html/jline/ConsoleReaderInputStream.html create mode 100644 frysk-imports/jline/apidocs/src-html/jline/ConsoleRunner.html create mode 100644 frysk-imports/jline/apidocs/src-html/jline/CursorBuffer.html create mode 100644 frysk-imports/jline/apidocs/src-html/jline/FileNameCompletor.html create mode 100644 frysk-imports/jline/apidocs/src-html/jline/History.html create mode 100644 frysk-imports/jline/apidocs/src-html/jline/JLineBuffer.html create mode 100644 frysk-imports/jline/apidocs/src-html/jline/JLineStringBuilder.html create mode 100644 frysk-imports/jline/apidocs/src-html/jline/MultiCompletor.html create mode 100644 frysk-imports/jline/apidocs/src-html/jline/NullCompletor.html create mode 100644 frysk-imports/jline/apidocs/src-html/jline/SimpleCompletor.NoOpFilter.html create mode 100644 frysk-imports/jline/apidocs/src-html/jline/SimpleCompletor.SimpleCompletorFilter.html create mode 100644 frysk-imports/jline/apidocs/src-html/jline/SimpleCompletor.html create mode 100644 frysk-imports/jline/apidocs/src-html/jline/Terminal.html create mode 100644 frysk-imports/jline/apidocs/src-html/jline/UnixTerminal.html create mode 100644 frysk-imports/jline/apidocs/src-html/jline/UnsupportedTerminal.html create mode 100644 frysk-imports/jline/apidocs/src-html/jline/WindowsTerminal.html create mode 100644 frysk-imports/jline/apidocs/stylesheet.css delete mode 100644 frysk-imports/jline/build.xml delete mode 100644 frysk-imports/jline/doc-build/javadoc/index-all.html delete mode 100644 frysk-imports/jline/doc-build/javadoc/index.html delete mode 100644 frysk-imports/jline/doc-build/javadoc/jline/CandidateListCompletionHandler.html delete mode 100644 frysk-imports/jline/doc-build/javadoc/jline/Terminal.html delete mode 100644 frysk-imports/jline/doc-build/javadoc/jline/UnixTerminal.html delete mode 100644 frysk-imports/jline/doc-build/javadoc/jline/UnsupportedTerminal.html delete mode 100644 frysk-imports/jline/doc-build/javadoc/jline/WindowsTerminal.html delete mode 100644 frysk-imports/jline/doc-build/javadoc/jline/package-tree.html delete mode 100644 frysk-imports/jline/doc-build/javadoc/overview-tree.html delete mode 100644 frysk-imports/jline/doc-build/javadoc/packages.html delete mode 100644 frysk-imports/jline/doc-build/javadoc/serialized-form.html delete mode 100644 frysk-imports/jline/doc-build/javadoc/src-html/jline/ANSIBuffer.ANSICodes.html delete mode 100644 frysk-imports/jline/doc-build/javadoc/src-html/jline/ANSIBuffer.html delete mode 100644 frysk-imports/jline/doc-build/javadoc/src-html/jline/ArgumentCompletor.AbstractArgumentDelimiter.html delete mode 100644 frysk-imports/jline/doc-build/javadoc/src-html/jline/ArgumentCompletor.ArgumentDelimiter.html delete mode 100644 frysk-imports/jline/doc-build/javadoc/src-html/jline/ArgumentCompletor.ArgumentList.html delete mode 100644 frysk-imports/jline/doc-build/javadoc/src-html/jline/ArgumentCompletor.WhitespaceArgumentDelimiter.html delete mode 100644 frysk-imports/jline/doc-build/javadoc/src-html/jline/ArgumentCompletor.html delete mode 100644 frysk-imports/jline/doc-build/javadoc/src-html/jline/CandidateCycleCompletionHandler.html delete mode 100644 frysk-imports/jline/doc-build/javadoc/src-html/jline/CandidateListCompletionHandler.html delete mode 100644 frysk-imports/jline/doc-build/javadoc/src-html/jline/ClassNameCompletor.html delete mode 100644 frysk-imports/jline/doc-build/javadoc/src-html/jline/CompletionHandler.html delete mode 100644 frysk-imports/jline/doc-build/javadoc/src-html/jline/Completor.html delete mode 100644 frysk-imports/jline/doc-build/javadoc/src-html/jline/ConsoleOperations.html delete mode 100644 frysk-imports/jline/doc-build/javadoc/src-html/jline/ConsoleReader.html delete mode 100644 frysk-imports/jline/doc-build/javadoc/src-html/jline/ConsoleReaderInputStream.html delete mode 100644 frysk-imports/jline/doc-build/javadoc/src-html/jline/ConsoleRunner.html delete mode 100644 frysk-imports/jline/doc-build/javadoc/src-html/jline/CursorBuffer.html delete mode 100644 frysk-imports/jline/doc-build/javadoc/src-html/jline/FileNameCompletor.html delete mode 100644 frysk-imports/jline/doc-build/javadoc/src-html/jline/History.html delete mode 100644 frysk-imports/jline/doc-build/javadoc/src-html/jline/MultiCompletor.html delete mode 100644 frysk-imports/jline/doc-build/javadoc/src-html/jline/NullCompletor.html delete mode 100644 frysk-imports/jline/doc-build/javadoc/src-html/jline/SimpleCompletor.NoOpFilter.html delete mode 100644 frysk-imports/jline/doc-build/javadoc/src-html/jline/SimpleCompletor.SimpleCompletorFilter.html delete mode 100644 frysk-imports/jline/doc-build/javadoc/src-html/jline/SimpleCompletor.html delete mode 100644 frysk-imports/jline/doc-build/javadoc/src-html/jline/Terminal.html delete mode 100644 frysk-imports/jline/doc-build/javadoc/src-html/jline/UnixTerminal.html delete mode 100644 frysk-imports/jline/doc-build/javadoc/src-html/jline/UnsupportedTerminal.html delete mode 100644 frysk-imports/jline/doc-build/javadoc/src-html/jline/WindowsTerminal.html delete mode 100644 frysk-imports/jline/doc-build/javadoc/styles.css delete mode 100644 frysk-imports/jline/doc-build/manual.html delete mode 100644 frysk-imports/jline/doc-build/manual.txt delete mode 100644 frysk-imports/jline/doc-build/styles.css delete mode 100644 frysk-imports/jline/doc/html.xsl delete mode 100644 frysk-imports/jline/doc/index.html delete mode 100644 frysk-imports/jline/doc/styles.css create mode 100644 frysk-imports/jline/examples/jline/example/Example.java create mode 100644 frysk-imports/jline/examples/jline/example/PasswordReader.java copy frysk-imports/jline/{test => examples}/jline/example/english.gz (100%) create mode 100644 frysk-imports/jline/jline-0.9.93.jar delete mode 100644 frysk-imports/jline/project.properties delete mode 100644 frysk-imports/jline/src/jline/ANSIBuffer.java delete mode 100644 frysk-imports/jline/src/jline/ArgumentCompletor.java delete mode 100644 frysk-imports/jline/src/jline/CandidateCycleCompletionHandler.java delete mode 100644 frysk-imports/jline/src/jline/CandidateListCompletionHandler.java delete mode 100644 frysk-imports/jline/src/jline/ClassNameCompletor.java delete mode 100644 frysk-imports/jline/src/jline/CompletionHandler.java delete mode 100644 frysk-imports/jline/src/jline/Completor.java delete mode 100644 frysk-imports/jline/src/jline/ConsoleOperations.java delete mode 100644 frysk-imports/jline/src/jline/ConsoleReader.java delete mode 100644 frysk-imports/jline/src/jline/ConsoleReaderInputStream.java delete mode 100644 frysk-imports/jline/src/jline/ConsoleRunner.java delete mode 100644 frysk-imports/jline/src/jline/CursorBuffer.java delete mode 100644 frysk-imports/jline/src/jline/FileNameCompletor.java delete mode 100644 frysk-imports/jline/src/jline/History.java delete mode 100644 frysk-imports/jline/src/jline/MultiCompletor.java delete mode 100644 frysk-imports/jline/src/jline/NullCompletor.java delete mode 100644 frysk-imports/jline/src/jline/SimpleCompletor.java delete mode 100644 frysk-imports/jline/src/jline/Terminal.java delete mode 100644 frysk-imports/jline/src/jline/UnixTerminal.java delete mode 100644 frysk-imports/jline/src/jline/UnsupportedTerminal.java create mode 100644 frysk-imports/jline/src/pom.xml create mode 100644 frysk-imports/jline/src/src/assembly/assembly.xml create mode 100644 frysk-imports/jline/src/src/main/java/jline/ANSIBuffer.java create mode 100644 frysk-imports/jline/src/src/main/java/jline/ArgumentCompletor.java create mode 100644 frysk-imports/jline/src/src/main/java/jline/CandidateCycleCompletionHandler.java create mode 100644 frysk-imports/jline/src/src/main/java/jline/CandidateListCompletionHandler.java create mode 100644 frysk-imports/jline/src/src/main/java/jline/ClassNameCompletor.java create mode 100644 frysk-imports/jline/src/src/main/java/jline/CompletionHandler.java create mode 100644 frysk-imports/jline/src/src/main/java/jline/Completor.java create mode 100644 frysk-imports/jline/src/src/main/java/jline/ConsoleOperations.java create mode 100644 frysk-imports/jline/src/src/main/java/jline/ConsoleReader.java create mode 100644 frysk-imports/jline/src/src/main/java/jline/ConsoleReaderInputStream.java create mode 100644 frysk-imports/jline/src/src/main/java/jline/ConsoleRunner.java create mode 100644 frysk-imports/jline/src/src/main/java/jline/CursorBuffer.java create mode 100644 frysk-imports/jline/src/src/main/java/jline/FileNameCompletor.java create mode 100644 frysk-imports/jline/src/src/main/java/jline/History.java create mode 100644 frysk-imports/jline/src/src/main/java/jline/JLineBuffer.java create mode 100644 frysk-imports/jline/src/src/main/java/jline/JLineStringBuilder.java create mode 100644 frysk-imports/jline/src/src/main/java/jline/MultiCompletor.java create mode 100644 frysk-imports/jline/src/src/main/java/jline/NullCompletor.java rename frysk-imports/jline/src/{ => src/main/java}/jline/PtyTerminal.java (93%) create mode 100644 frysk-imports/jline/src/src/main/java/jline/SimpleCompletor.java create mode 100644 frysk-imports/jline/src/src/main/java/jline/Terminal.java create mode 100644 frysk-imports/jline/src/src/main/java/jline/UnixTerminal.java create mode 100644 frysk-imports/jline/src/src/main/java/jline/UnsupportedTerminal.java rename frysk-imports/jline/src/{ => src/main/java}/jline/package.html (100%) rename frysk-imports/jline/{ => src/src/main}/native/Makefile (100%) rename frysk-imports/jline/{ => src/src/main}/native/jline_WindowsTerminal.c (100%) rename frysk-imports/jline/{ => src/src/main}/native/jline_WindowsTerminal.h (100%) rename frysk-imports/jline/src/{ => src/main/resources}/jline/CandidateListCompletionHandler.properties (82%) rename frysk-imports/jline/{native/jline.dll => src/src/main/resources/jline/jline32.dll} (100%) create mode 100644 frysk-imports/jline/src/src/main/resources/jline/jline64.dll copy frysk-imports/jline/src/{ => src/main/resources}/jline/keybindings.properties (82%) rename frysk-imports/jline/src/{jline/keybindings.properties => src/main/resources/jline/windowsbindings.properties} (75%) create mode 100644 frysk-imports/jline/src/src/site/apt/building.apt create mode 100644 frysk-imports/jline/src/src/site/apt/downloads.apt rename frysk-imports/jline/{doc/manual.xml => src/src/site/docbook/index.xml} (74%) create mode 100644 frysk-imports/jline/src/src/site/fml/faq.fml create mode 100644 frysk-imports/jline/src/src/site/resources/css/site.css create mode 100644 frysk-imports/jline/src/src/site/resources/images/collapsed.png create mode 100644 frysk-imports/jline/src/src/site/resources/images/dotted.png create mode 100644 frysk-imports/jline/src/src/site/resources/images/expanded.png create mode 100644 frysk-imports/jline/src/src/site/resources/images/external.png create mode 100644 frysk-imports/jline/src/src/site/resources/images/ico_file_pdf.png create mode 100644 frysk-imports/jline/src/src/site/resources/images/logo.jpg create mode 100644 frysk-imports/jline/src/src/site/resources/images/newwindow.png create mode 100644 frysk-imports/jline/src/src/site/site.xml create mode 100644 frysk-imports/jline/src/src/test/java/jline/ConsoleReaderTest.java create mode 100644 frysk-imports/jline/src/src/test/java/jline/JLineTestCase.java create mode 100644 frysk-imports/jline/src/src/test/java/jline/TestCompletion.java create mode 100644 frysk-imports/jline/src/src/test/java/jline/TestEditLine.java create mode 100644 frysk-imports/jline/src/src/test/java/jline/TestHistory.java create mode 100644 frysk-imports/jline/src/src/test/java/jline/example/Example.java create mode 100644 frysk-imports/jline/src/src/test/java/jline/example/PasswordReader.java rename frysk-imports/jline/{test => src/src/test/resources}/jline/example/english.gz (100%) delete mode 100644 frysk-imports/jline/test/jline/JLineTestCase.java delete mode 100644 frysk-imports/jline/test/jline/TestCompletion.java delete mode 100644 frysk-imports/jline/test/jline/TestEditLine.java delete mode 100644 frysk-imports/jline/test/jline/TestHistory.java delete mode 100644 frysk-imports/jline/test/jline/example/Example.java delete mode 100644 frysk-imports/jline/test/jline/example/PasswordReader.java First 500 lines of diff: diff --git a/frysk-core/frysk/util/PtyTerminal.java b/frysk-core/frysk/util/PtyTerminal.java index 43d60c7..e781302 100644 --- a/frysk-core/frysk/util/PtyTerminal.java +++ b/frysk-core/frysk/util/PtyTerminal.java @@ -58,6 +58,7 @@ import frysk.sys.termios.Termios; public class PtyTerminal extends Terminal { + private boolean echoEnabled; private final FileDescriptor fd; public FileDescriptor getFd() @@ -105,6 +106,7 @@ public class PtyTerminal // set the console to be character-buffered instead of line-buffered termios.set(Local.CANONICAL, false); termios.set(Local.ECHO_INPUT, false); + echoEnabled = false; termios.set(Special.NON_CANONICAL_READ_MINIMUM, (char)1); termios.set(fd); // at exit, restore the original tty configuration @@ -178,4 +180,21 @@ public class PtyTerminal Size size = fd.getSize(); return size.getColumns(); } + + public boolean isEchoEnabled() { + return echoEnabled; + } + + public void enableEcho() { + final Termios termios = new Termios(fd); + termios.set(Local.ECHO_INPUT, true); + echoEnabled = true; + } + + public void disableEcho() { + final Termios termios = new Termios(fd); + termios.set(Local.ECHO_INPUT, false); + echoEnabled = false; + } + } \ No newline at end of file diff --git a/frysk-imports/jline/.cvsignore b/frysk-imports/jline/.cvsignore deleted file mode 100644 index 411f41f..0000000 --- a/frysk-imports/jline/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile.in -Makefile -jline -jline.jar diff --git a/frysk-imports/jline/AUTHORS b/frysk-imports/jline/AUTHORS deleted file mode 100644 index 877c08c..0000000 --- a/frysk-imports/jline/AUTHORS +++ /dev/null @@ -1 +0,0 @@ -Marc Prud'hommeaux diff --git a/frysk-imports/jline/CHANGELOG b/frysk-imports/jline/CHANGELOG deleted file mode 100644 index 7f4c431..0000000 --- a/frysk-imports/jline/CHANGELOG +++ /dev/null @@ -1,16 +0,0 @@ -2002-10-05 Marc Prud'hommeaux - - * Release 0.3 - * Initial release - - -2003-07-08 Marc Prud'hommeaux - - * Release 0.6.0 - * Many bugfixes - * Better release system - * Automatically set terminal property by issueing stty on UNIX systems - * Additional tab-completion handlers - * Tested on Debian Linux and Mac OS 10.2 - * Example includes dictionary, filename, and simple completion - diff --git a/frysk-imports/jline/ChangeLog b/frysk-imports/jline/ChangeLog index 8d6ef76..f2b4b3e 100644 --- a/frysk-imports/jline/ChangeLog +++ b/frysk-imports/jline/ChangeLog @@ -1,3 +1,11 @@ +2008-01-16 Tim Moore + + * src/src/main/java/jline/PtyTerminal.java (isEchoEnabled, + enableEcho, disableEcho): Implement new abstract methods in + Terminal. + + Import jline 0.9.93, which has a new file layout. + 2007-11-01 Andrew Cagney Backport fix from upstream. diff --git a/frysk-imports/jline/LICENSE b/frysk-imports/jline/LICENSE.txt similarity index 94% rename from frysk-imports/jline/LICENSE rename to frysk-imports/jline/LICENSE.txt index 7e7f94f..1cdc44c 100644 --- a/frysk-imports/jline/LICENSE +++ b/frysk-imports/jline/LICENSE.txt @@ -1,4 +1,4 @@ -Copyright (c) 2002, 2003, 2004, 2005, Marc Prud'hommeaux +Copyright (c) 2002-2006, Marc Prud'hommeaux All rights reserved. Redistribution and use in source and binary forms, with or diff --git a/frysk-imports/jline/Makefile.am b/frysk-imports/jline/Makefile.am index 6be6c83..220333c 100644 --- a/frysk-imports/jline/Makefile.am +++ b/frysk-imports/jline/Makefile.am @@ -1,13 +1,14 @@ -jlinesrc=$(srcdir)/src/jline/ +jlinesrc=$(srcdir)/src/src/main/java/jline +jlinepropsrc=$(srcdir)/src/src/main/resources/jline all-local: jline.jar EXTRA_DIST = $(jlinesrc)/*.java \ - $(jlinesrc)/*.properties + $(jlinepropsrc)/*.properties CLEANFILES = jline.jar jline/* jline.jar: $(jlinesrc)/*.java $(JAVAC) $(JAVACFLAGS) -g -d . $(jlinesrc)/*.java - cp $(jlinesrc)/*.properties ./jline + cp $(jlinepropsrc)/*.properties ./jline $(JAR) cf jline.jar jline/* diff --git a/frysk-imports/jline/doc-build/javadoc/allclasses-frame.html b/frysk-imports/jline/apidocs/allclasses-frame.html similarity index 88% rename from frysk-imports/jline/doc-build/javadoc/allclasses-frame.html rename to frysk-imports/jline/apidocs/allclasses-frame.html index 61dffa4..aac8644 100644 --- a/frysk-imports/jline/doc-build/javadoc/allclasses-frame.html +++ b/frysk-imports/jline/apidocs/allclasses-frame.html @@ -2,13 +2,14 @@ - + + -All Classes (API Documentation - jline 0.9.1) +All Classes (JLine 0.9.93 API) - + @@ -58,6 +59,10 @@ All Classes (API Documentation - jline 0.9.1)
History
+JLineBuffer +
+JLineStringBuilder +
MultiCompletor
NullCompletor diff --git a/frysk-imports/jline/doc-build/javadoc/allclasses-noframe.html b/frysk-imports/jline/apidocs/allclasses-noframe.html similarity index 87% rename from frysk-imports/jline/doc-build/javadoc/allclasses-noframe.html rename to frysk-imports/jline/apidocs/allclasses-noframe.html index f6c370d..2dfdc59 100644 --- a/frysk-imports/jline/doc-build/javadoc/allclasses-noframe.html +++ b/frysk-imports/jline/apidocs/allclasses-noframe.html @@ -2,13 +2,14 @@ - + + -All Classes (API Documentation - jline 0.9.1) +All Classes (JLine 0.9.93 API) - + @@ -58,6 +59,10 @@ All Classes (API Documentation - jline 0.9.1)
History
+JLineBuffer +
+JLineStringBuilder +
MultiCompletor
NullCompletor diff --git a/frysk-imports/jline/doc-build/javadoc/constant-values.html b/frysk-imports/jline/apidocs/constant-values.html similarity index 70% rename from frysk-imports/jline/doc-build/javadoc/constant-values.html rename to frysk-imports/jline/apidocs/constant-values.html index a5bbaaf..5ed5664 100644 --- a/frysk-imports/jline/doc-build/javadoc/constant-values.html +++ b/frysk-imports/jline/apidocs/constant-values.html @@ -2,20 +2,23 @@ - + + -Constant Field Values (API Documentation - jline 0.9.1) +Constant Field Values (JLine 0.9.93 API) - + + @@ -27,12 +30,13 @@ function windowTitle() -
+ - + + @@ -50,7 +54,7 @@ function windowTitle()  PREV   NEXT
Package  Package  Class  Use  Tree  Deprecated  Index  - FRAMES   + FRAMES    NO FRAMES