diff --git a/LICENSE.txt b/LICENSE.txt index b28578952..7e11b67fb 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,7 +1,7 @@ Copyright (c) 2002-2018, the original author or authors. All rights reserved. -http://www.opensource.org/licenses/bsd-license.php +https://opensource.org/licenses/BSD-3-Clause Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following diff --git a/README.md b/README.md index 04c8d1fd9..eb71ed801 100644 --- a/README.md +++ b/README.md @@ -5,10 +5,10 @@ This software is distributable under the BSD license. See the terms of the BSD license in the documentation provided with this software. - http://www.opensource.org/licenses/bsd-license.php + https://opensource.org/licenses/BSD-3-Clause --> -# JLine [![License](https://img.shields.io/badge/License-BSD%202--Clause-orange.svg)](https://opensource.org/licenses/BSD-2-Clause) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.jline/jline/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.jline/jline) [![Build Status: Linux](https://travis-ci.org/jline/jline3.svg?branch=master)](https://travis-ci.org/jline/jline3) [![Build Status: Windows](https://ci.appveyor.com/api/projects/status/github/jline/jline3?svg=true)](https://ci.appveyor.com/project/gnodet/jline3) [![DepShield Badge](https://depshield.sonatype.org/badges/jline/jline3/depshield.svg)](https://depshield.github.io) +# JLine [![License](https://img.shields.io/badge/License-BSD%202--Clause-orange.svg)](https://opensource.org/licenses/BSD-3-Clause) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.jline/jline/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.jline/jline) [![Build Status: Linux](https://travis-ci.org/jline/jline3.svg?branch=master)](https://travis-ci.org/jline/jline3) [![Build Status: Windows](https://ci.appveyor.com/api/projects/status/github/jline/jline3?svg=true)](https://ci.appveyor.com/project/gnodet/jline3) [![DepShield Badge](https://depshield.sonatype.org/badges/jline/jline3/depshield.svg)](https://depshield.github.io) JLine is a Java library for handling console input. It is similar in functionality to [BSD editline](http://www.thrysoee.dk/editline/) and [GNU readline](http://www.gnu.org/s/readline/) but with additional features that bring it in par with [ZSH line editor](http://zsh.sourceforge.net/Doc/Release/Zsh-Line-Editor.html). People familiar with the readline/editline capabilities for modern shells (such as bash and tcsh) will find most of the command editing features of JLine to be familiar. @@ -17,7 +17,7 @@ JLine 3.x is an evolution of [JLine 2.x](https://github.com/jline/jline2). # License -JLine is distributed under the [BSD License](http://www.opensource.org/licenses/bsd-license.php), meaning that you are completely free to redistribute, modify, or sell it with almost no restrictions. +JLine is distributed under the [BSD License](https://opensource.org/licenses/BSD-3-Clause), meaning that you are completely free to redistribute, modify, or sell it with almost no restrictions. # Documentation @@ -131,7 +131,7 @@ The finer grained bundles are located at: Maven has a concept of `SNAPSHOT`. During development, the jline version will always ends with `-SNAPSHOT`, which means that the version is in development and not a release. -Note that all those artifacts are also installed in the local maven repostitory, so you will usually find them in the following folder: `~/.m2/repository/org/jline/`. +Note that all those artifacts are also installed in the local maven repository, so you will usually find them in the following folder: `~/.m2/repository/org/jline/`. ## Running the demo diff --git a/builtins/pom.xml b/builtins/pom.xml index d09d754f9..6f2359161 100644 --- a/builtins/pom.xml +++ b/builtins/pom.xml @@ -6,7 +6,7 @@ This software is distributable under the BSD license. See the terms of the BSD license in the documentation provided with this software. - http://www.opensource.org/licenses/bsd-license.php + https://opensource.org/licenses/BSD-3-Clause --> diff --git a/builtins/src/main/java/org/jline/builtins/Commands.java b/builtins/src/main/java/org/jline/builtins/Commands.java index 3acf92e52..fe117baee 100644 --- a/builtins/src/main/java/org/jline/builtins/Commands.java +++ b/builtins/src/main/java/org/jline/builtins/Commands.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.builtins; diff --git a/builtins/src/main/java/org/jline/builtins/Completers.java b/builtins/src/main/java/org/jline/builtins/Completers.java index f59ef1600..7caf6455e 100644 --- a/builtins/src/main/java/org/jline/builtins/Completers.java +++ b/builtins/src/main/java/org/jline/builtins/Completers.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.builtins; diff --git a/builtins/src/main/java/org/jline/builtins/InputRC.java b/builtins/src/main/java/org/jline/builtins/InputRC.java index 6a176cd0e..08578609c 100644 --- a/builtins/src/main/java/org/jline/builtins/InputRC.java +++ b/builtins/src/main/java/org/jline/builtins/InputRC.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.builtins; diff --git a/builtins/src/main/java/org/jline/builtins/Less.java b/builtins/src/main/java/org/jline/builtins/Less.java index b1cd0dbca..9740b62af 100644 --- a/builtins/src/main/java/org/jline/builtins/Less.java +++ b/builtins/src/main/java/org/jline/builtins/Less.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.builtins; diff --git a/builtins/src/main/java/org/jline/builtins/Nano.java b/builtins/src/main/java/org/jline/builtins/Nano.java index 19ab185ce..bf2061e0e 100644 --- a/builtins/src/main/java/org/jline/builtins/Nano.java +++ b/builtins/src/main/java/org/jline/builtins/Nano.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.builtins; @@ -1473,7 +1473,6 @@ private LinkedHashMap standardShortcuts() { s.put("^G", "Get Help"); s.put("^O", "WriteOut"); s.put("^R", "Read File"); - s.put("^O", "WriteOut"); s.put("^Y", "Prev Page"); s.put("^K", "Cut Text"); s.put("^C", "Cur Pos"); @@ -1552,6 +1551,7 @@ void help(String help) { void search() throws IOException { KeyMap searchKeyMap = new KeyMap<>(); searchKeyMap.setUnicode(Operation.INSERT); + searchKeyMap.setNomatch(Operation.INSERT); for (char i = 'A'; i <= 'Z'; i++) { searchKeyMap.bind(Operation.DO_LOWER_CASE, alt(i)); } diff --git a/builtins/src/main/java/org/jline/builtins/NfaMatcher.java b/builtins/src/main/java/org/jline/builtins/NfaMatcher.java index ed1832b70..c4c99eca1 100644 --- a/builtins/src/main/java/org/jline/builtins/NfaMatcher.java +++ b/builtins/src/main/java/org/jline/builtins/NfaMatcher.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.builtins; diff --git a/builtins/src/main/java/org/jline/builtins/Options.java b/builtins/src/main/java/org/jline/builtins/Options.java index 427bf4d89..e49b4ec51 100644 --- a/builtins/src/main/java/org/jline/builtins/Options.java +++ b/builtins/src/main/java/org/jline/builtins/Options.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/builtins/src/main/java/org/jline/builtins/ScreenTerminal.java b/builtins/src/main/java/org/jline/builtins/ScreenTerminal.java index 19503a5e6..fa1fe9d3f 100644 --- a/builtins/src/main/java/org/jline/builtins/ScreenTerminal.java +++ b/builtins/src/main/java/org/jline/builtins/ScreenTerminal.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ /* diff --git a/builtins/src/main/java/org/jline/builtins/Source.java b/builtins/src/main/java/org/jline/builtins/Source.java index 13df5acac..47d52ae47 100644 --- a/builtins/src/main/java/org/jline/builtins/Source.java +++ b/builtins/src/main/java/org/jline/builtins/Source.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.builtins; diff --git a/builtins/src/main/java/org/jline/builtins/TTop.java b/builtins/src/main/java/org/jline/builtins/TTop.java index 8ba369081..ee77a06e9 100644 --- a/builtins/src/main/java/org/jline/builtins/TTop.java +++ b/builtins/src/main/java/org/jline/builtins/TTop.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.builtins; diff --git a/builtins/src/main/java/org/jline/builtins/Tmux.java b/builtins/src/main/java/org/jline/builtins/Tmux.java index e1f72fddc..97093f01e 100644 --- a/builtins/src/main/java/org/jline/builtins/Tmux.java +++ b/builtins/src/main/java/org/jline/builtins/Tmux.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.builtins; diff --git a/builtins/src/test/java/org/jline/builtins/CompletersTest.java b/builtins/src/test/java/org/jline/builtins/CompletersTest.java index ccdcf8bf9..130709bd1 100644 --- a/builtins/src/test/java/org/jline/builtins/CompletersTest.java +++ b/builtins/src/test/java/org/jline/builtins/CompletersTest.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.builtins; diff --git a/builtins/src/test/java/org/jline/builtins/InputRCTest.java b/builtins/src/test/java/org/jline/builtins/InputRCTest.java index 9f7ecc775..2882590ee 100644 --- a/builtins/src/test/java/org/jline/builtins/InputRCTest.java +++ b/builtins/src/test/java/org/jline/builtins/InputRCTest.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.builtins; diff --git a/builtins/src/test/java/org/jline/builtins/NanoTest.java b/builtins/src/test/java/org/jline/builtins/NanoTest.java index 1be9c13bc..334315e84 100644 --- a/builtins/src/test/java/org/jline/builtins/NanoTest.java +++ b/builtins/src/test/java/org/jline/builtins/NanoTest.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.builtins; diff --git a/builtins/src/test/java/org/jline/builtins/NfaMatcherTest.java b/builtins/src/test/java/org/jline/builtins/NfaMatcherTest.java index 3c0419174..61c5c8945 100644 --- a/builtins/src/test/java/org/jline/builtins/NfaMatcherTest.java +++ b/builtins/src/test/java/org/jline/builtins/NfaMatcherTest.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.builtins; diff --git a/builtins/src/test/java/org/jline/builtins/OptionsTest.java b/builtins/src/test/java/org/jline/builtins/OptionsTest.java index a950b62c0..dace8ca2f 100644 --- a/builtins/src/test/java/org/jline/builtins/OptionsTest.java +++ b/builtins/src/test/java/org/jline/builtins/OptionsTest.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ /* diff --git a/builtins/src/test/java/org/jline/builtins/ReaderTestSupport.java b/builtins/src/test/java/org/jline/builtins/ReaderTestSupport.java index 0e1cc3572..762e60f0d 100644 --- a/builtins/src/test/java/org/jline/builtins/ReaderTestSupport.java +++ b/builtins/src/test/java/org/jline/builtins/ReaderTestSupport.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.builtins; diff --git a/builtins/src/test/java/org/jline/builtins/TmuxTest.java b/builtins/src/test/java/org/jline/builtins/TmuxTest.java index ab544eb4f..94e33fcea 100644 --- a/builtins/src/test/java/org/jline/builtins/TmuxTest.java +++ b/builtins/src/test/java/org/jline/builtins/TmuxTest.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.builtins; diff --git a/builtins/src/test/java/org/jline/builtins/TreeCompleterTest.java b/builtins/src/test/java/org/jline/builtins/TreeCompleterTest.java index 8afda07d3..23359dd7d 100644 --- a/builtins/src/test/java/org/jline/builtins/TreeCompleterTest.java +++ b/builtins/src/test/java/org/jline/builtins/TreeCompleterTest.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.builtins; diff --git a/builtins/src/test/java/org/jline/example/ArgumentMaskCallbackReader.java b/builtins/src/test/java/org/jline/example/ArgumentMaskCallbackReader.java index 110b34bd5..2f5edd039 100644 --- a/builtins/src/test/java/org/jline/example/ArgumentMaskCallbackReader.java +++ b/builtins/src/test/java/org/jline/example/ArgumentMaskCallbackReader.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.example; diff --git a/builtins/src/test/java/org/jline/example/Example.java b/builtins/src/test/java/org/jline/example/Example.java index 8ca26b352..39eb9c761 100644 --- a/builtins/src/test/java/org/jline/example/Example.java +++ b/builtins/src/test/java/org/jline/example/Example.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.example; diff --git a/builtins/src/test/java/org/jline/example/OptionMaskCallbackReader.java b/builtins/src/test/java/org/jline/example/OptionMaskCallbackReader.java index 56e209818..4eb47dbd2 100644 --- a/builtins/src/test/java/org/jline/example/OptionMaskCallbackReader.java +++ b/builtins/src/test/java/org/jline/example/OptionMaskCallbackReader.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.example; diff --git a/builtins/src/test/java/org/jline/example/PasswordReader.java b/builtins/src/test/java/org/jline/example/PasswordReader.java index 6abe0f841..8701a9f65 100644 --- a/builtins/src/test/java/org/jline/example/PasswordReader.java +++ b/builtins/src/test/java/org/jline/example/PasswordReader.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.example; diff --git a/demo/pom.xml b/demo/pom.xml index dbaca213c..31ed6bdb8 100644 --- a/demo/pom.xml +++ b/demo/pom.xml @@ -6,7 +6,7 @@ This software is distributable under the BSD license. See the terms of the BSD license in the documentation provided with this software. - http://www.opensource.org/licenses/bsd-license.php + https://opensource.org/licenses/BSD-3-Clause --> diff --git a/demo/src/main/java/org/jline/demo/FunctionConverter.java b/demo/src/main/java/org/jline/demo/FunctionConverter.java index bea3188f2..77b7fabc2 100644 --- a/demo/src/main/java/org/jline/demo/FunctionConverter.java +++ b/demo/src/main/java/org/jline/demo/FunctionConverter.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.demo; diff --git a/demo/src/main/java/org/jline/demo/Gogo.java b/demo/src/main/java/org/jline/demo/Gogo.java index 9086ab891..4817b54dc 100644 --- a/demo/src/main/java/org/jline/demo/Gogo.java +++ b/demo/src/main/java/org/jline/demo/Gogo.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.demo; diff --git a/header.txt b/header.txt index 955992598..53133d82c 100644 --- a/header.txt +++ b/header.txt @@ -3,4 +3,4 @@ Copyright (c) 2002-2017, the original author or authors. This software is distributable under the BSD license. See the terms of the BSD license in the documentation provided with this software. -http://www.opensource.org/licenses/bsd-license.php \ No newline at end of file +https://opensource.org/licenses/BSD-3-Clause \ No newline at end of file diff --git a/jline/pom.xml b/jline/pom.xml index 854cb5ff7..5b00e46ea 100644 --- a/jline/pom.xml +++ b/jline/pom.xml @@ -6,7 +6,7 @@ This software is distributable under the BSD license. See the terms of the BSD license in the documentation provided with this software. - http://www.opensource.org/licenses/bsd-license.php + https://opensource.org/licenses/BSD-3-Clause --> diff --git a/pom.xml b/pom.xml index 396de86fd..6a502b771 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ This software is distributable under the BSD license. See the terms of the BSD license in the documentation provided with this software. - http://www.opensource.org/licenses/bsd-license.php + https://opensource.org/licenses/BSD-3-Clause --> @@ -29,7 +29,7 @@ The BSD License - http://www.opensource.org/licenses/bsd-license.php + https://opensource.org/licenses/BSD-3-Clause repo diff --git a/reader/pom.xml b/reader/pom.xml index 4cafcd720..f8bbc0596 100644 --- a/reader/pom.xml +++ b/reader/pom.xml @@ -6,7 +6,7 @@ This software is distributable under the BSD license. See the terms of the BSD license in the documentation provided with this software. - http://www.opensource.org/licenses/bsd-license.php + https://opensource.org/licenses/BSD-3-Clause --> diff --git a/reader/src/main/java/org/jline/keymap/BindingReader.java b/reader/src/main/java/org/jline/keymap/BindingReader.java index add3f8576..2a796b814 100644 --- a/reader/src/main/java/org/jline/keymap/BindingReader.java +++ b/reader/src/main/java/org/jline/keymap/BindingReader.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.keymap; diff --git a/reader/src/main/java/org/jline/keymap/KeyMap.java b/reader/src/main/java/org/jline/keymap/KeyMap.java index 50656ff25..9d3b65f9d 100644 --- a/reader/src/main/java/org/jline/keymap/KeyMap.java +++ b/reader/src/main/java/org/jline/keymap/KeyMap.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.keymap; diff --git a/reader/src/main/java/org/jline/reader/Binding.java b/reader/src/main/java/org/jline/reader/Binding.java index 4206b9475..8a999b7e5 100644 --- a/reader/src/main/java/org/jline/reader/Binding.java +++ b/reader/src/main/java/org/jline/reader/Binding.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.reader; diff --git a/reader/src/main/java/org/jline/reader/Buffer.java b/reader/src/main/java/org/jline/reader/Buffer.java index c2264909c..6eb87545f 100644 --- a/reader/src/main/java/org/jline/reader/Buffer.java +++ b/reader/src/main/java/org/jline/reader/Buffer.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.reader; diff --git a/reader/src/main/java/org/jline/reader/Candidate.java b/reader/src/main/java/org/jline/reader/Candidate.java index 7fd45b6c8..d32e98683 100644 --- a/reader/src/main/java/org/jline/reader/Candidate.java +++ b/reader/src/main/java/org/jline/reader/Candidate.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.reader; diff --git a/reader/src/main/java/org/jline/reader/Completer.java b/reader/src/main/java/org/jline/reader/Completer.java index bbbeadc2e..da3f8ac0d 100644 --- a/reader/src/main/java/org/jline/reader/Completer.java +++ b/reader/src/main/java/org/jline/reader/Completer.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.reader; diff --git a/reader/src/main/java/org/jline/reader/CompletingParsedLine.java b/reader/src/main/java/org/jline/reader/CompletingParsedLine.java index f76cf48af..f1e432217 100644 --- a/reader/src/main/java/org/jline/reader/CompletingParsedLine.java +++ b/reader/src/main/java/org/jline/reader/CompletingParsedLine.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.reader; diff --git a/reader/src/main/java/org/jline/reader/EndOfFileException.java b/reader/src/main/java/org/jline/reader/EndOfFileException.java index d40fac6bf..16c6681eb 100644 --- a/reader/src/main/java/org/jline/reader/EndOfFileException.java +++ b/reader/src/main/java/org/jline/reader/EndOfFileException.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.reader; diff --git a/reader/src/main/java/org/jline/reader/Expander.java b/reader/src/main/java/org/jline/reader/Expander.java index f8e95318a..1a81b8537 100644 --- a/reader/src/main/java/org/jline/reader/Expander.java +++ b/reader/src/main/java/org/jline/reader/Expander.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.reader; diff --git a/reader/src/main/java/org/jline/reader/Highlighter.java b/reader/src/main/java/org/jline/reader/Highlighter.java index 891bde674..2753e577b 100644 --- a/reader/src/main/java/org/jline/reader/Highlighter.java +++ b/reader/src/main/java/org/jline/reader/Highlighter.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.reader; diff --git a/reader/src/main/java/org/jline/reader/History.java b/reader/src/main/java/org/jline/reader/History.java index 82a312042..ac8aff3e1 100644 --- a/reader/src/main/java/org/jline/reader/History.java +++ b/reader/src/main/java/org/jline/reader/History.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.reader; diff --git a/reader/src/main/java/org/jline/reader/LineReader.java b/reader/src/main/java/org/jline/reader/LineReader.java index f23230ce0..b6e50da33 100644 --- a/reader/src/main/java/org/jline/reader/LineReader.java +++ b/reader/src/main/java/org/jline/reader/LineReader.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.reader; diff --git a/reader/src/main/java/org/jline/reader/LineReaderBuilder.java b/reader/src/main/java/org/jline/reader/LineReaderBuilder.java index 155802d42..dd7cae231 100644 --- a/reader/src/main/java/org/jline/reader/LineReaderBuilder.java +++ b/reader/src/main/java/org/jline/reader/LineReaderBuilder.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.reader; diff --git a/reader/src/main/java/org/jline/reader/Macro.java b/reader/src/main/java/org/jline/reader/Macro.java index 9d0818b04..34397cdd3 100644 --- a/reader/src/main/java/org/jline/reader/Macro.java +++ b/reader/src/main/java/org/jline/reader/Macro.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.reader; diff --git a/reader/src/main/java/org/jline/reader/MaskingCallback.java b/reader/src/main/java/org/jline/reader/MaskingCallback.java index 0d5f1269e..7cab89a57 100644 --- a/reader/src/main/java/org/jline/reader/MaskingCallback.java +++ b/reader/src/main/java/org/jline/reader/MaskingCallback.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.reader; diff --git a/reader/src/main/java/org/jline/reader/ParsedLine.java b/reader/src/main/java/org/jline/reader/ParsedLine.java index 110117c69..9d3763114 100644 --- a/reader/src/main/java/org/jline/reader/ParsedLine.java +++ b/reader/src/main/java/org/jline/reader/ParsedLine.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.reader; diff --git a/reader/src/main/java/org/jline/reader/Parser.java b/reader/src/main/java/org/jline/reader/Parser.java index 9bb6eeb97..d8461d8e8 100644 --- a/reader/src/main/java/org/jline/reader/Parser.java +++ b/reader/src/main/java/org/jline/reader/Parser.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.reader; diff --git a/reader/src/main/java/org/jline/reader/Reference.java b/reader/src/main/java/org/jline/reader/Reference.java index 96a4c3ae1..7a4efe18e 100644 --- a/reader/src/main/java/org/jline/reader/Reference.java +++ b/reader/src/main/java/org/jline/reader/Reference.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.reader; diff --git a/reader/src/main/java/org/jline/reader/UserInterruptException.java b/reader/src/main/java/org/jline/reader/UserInterruptException.java index 1f5dd7de6..89ecb45ff 100644 --- a/reader/src/main/java/org/jline/reader/UserInterruptException.java +++ b/reader/src/main/java/org/jline/reader/UserInterruptException.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.reader; diff --git a/reader/src/main/java/org/jline/reader/Widget.java b/reader/src/main/java/org/jline/reader/Widget.java index af4e02dda..a12b7704c 100644 --- a/reader/src/main/java/org/jline/reader/Widget.java +++ b/reader/src/main/java/org/jline/reader/Widget.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.reader; diff --git a/reader/src/main/java/org/jline/reader/impl/BufferImpl.java b/reader/src/main/java/org/jline/reader/impl/BufferImpl.java index 75338f043..1b7b6493f 100644 --- a/reader/src/main/java/org/jline/reader/impl/BufferImpl.java +++ b/reader/src/main/java/org/jline/reader/impl/BufferImpl.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.reader.impl; diff --git a/reader/src/main/java/org/jline/reader/impl/DefaultExpander.java b/reader/src/main/java/org/jline/reader/impl/DefaultExpander.java index 3a644d9c8..582d95eab 100644 --- a/reader/src/main/java/org/jline/reader/impl/DefaultExpander.java +++ b/reader/src/main/java/org/jline/reader/impl/DefaultExpander.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.reader.impl; diff --git a/reader/src/main/java/org/jline/reader/impl/DefaultHighlighter.java b/reader/src/main/java/org/jline/reader/impl/DefaultHighlighter.java index 943c611e0..8f7d583d8 100644 --- a/reader/src/main/java/org/jline/reader/impl/DefaultHighlighter.java +++ b/reader/src/main/java/org/jline/reader/impl/DefaultHighlighter.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.reader.impl; diff --git a/reader/src/main/java/org/jline/reader/impl/DefaultParser.java b/reader/src/main/java/org/jline/reader/impl/DefaultParser.java index 3b9aead13..bf435441b 100644 --- a/reader/src/main/java/org/jline/reader/impl/DefaultParser.java +++ b/reader/src/main/java/org/jline/reader/impl/DefaultParser.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.reader.impl; @@ -110,37 +110,25 @@ public ParsedLine parse(final String line, final int cursor, ParseContext contex if (quoteStart < 0 && isQuoteChar(line, i)) { // Start a quote block quoteStart = i; - } else if (quoteStart >= 0) { - // In a quote block - if (line.charAt(quoteStart) == line.charAt(i) && !isEscaped(line, i)) { - // End the block; arg could be empty, but that's fine + } else if (quoteStart >= 0 && line.charAt(quoteStart) == line.charAt(i) && !isEscaped(line, i)) { + // End quote block + quoteStart = -1; + if (rawWordCursor >= 0 && rawWordLength < 0) { + rawWordLength = i - rawWordStart + 1; + } + } else if (quoteStart < 0 && isDelimiter(line, i)) { + // Delimiter + if (current.length() > 0) { words.add(current.toString()); - current.setLength(0); - quoteStart = -1; + current.setLength(0); // reset the arg if (rawWordCursor >= 0 && rawWordLength < 0) { - rawWordLength = i - rawWordStart + 1; - } - } else { - if (!isEscapeChar(line, i)) { - // Take the next character - current.append(line.charAt(i)); + rawWordLength = i - rawWordStart; } } + rawWordStart = i + 1; } else { - // Not in a quote block - if (isDelimiter(line, i)) { - if (current.length() > 0) { - words.add(current.toString()); - current.setLength(0); // reset the arg - if (rawWordCursor >= 0 && rawWordLength < 0) { - rawWordLength = i - rawWordStart; - } - } - rawWordStart = i + 1; - } else { - if (!isEscapeChar(line, i)) { - current.append(line.charAt(i)); - } + if (!isEscapeChar(line, i)) { + current.append(line.charAt(i)); } } } @@ -373,7 +361,7 @@ public String line() { public CharSequence escape(CharSequence candidate, boolean complete) { StringBuilder sb = new StringBuilder(candidate); Predicate needToBeEscaped; - String _openingQuote=null; + String quote = openingQuote; if (escapeChars != null) { // Completion is protected by an opening quote: // Delimiters (spaces) don't need to be escaped, nor do other quotes, but everything else does. @@ -391,29 +379,22 @@ public CharSequence escape(CharSequence candidate, boolean complete) { sb.insert(i++, escapeChars[0]); } } - } else if (openingQuote==null) { + } else if (openingQuote == null) { for (int i = 0; i < sb.length(); i++) { if (isDelimiterChar(sb, i)) { - _openingQuote="'"; + quote = "'"; break; } } - } - if (openingQuote != null) { - encloseQuotes(sb, openingQuote, complete); - } else if (_openingQuote != null) { - encloseQuotes(sb, _openingQuote, complete); + if (quote != null) { + sb.insert(0, quote); + if (complete) { + sb.append(quote); + } } return sb; } - - private void encloseQuotes(StringBuilder sb, String openingQuote, boolean complete){ - sb.insert(0, openingQuote); - if (complete) { - sb.append(openingQuote); - } - } @Override public int rawWordCursor() { @@ -426,4 +407,4 @@ public int rawWordLength() { } } -} +} \ No newline at end of file diff --git a/reader/src/main/java/org/jline/reader/impl/KillRing.java b/reader/src/main/java/org/jline/reader/impl/KillRing.java index 9c11a79b0..5cbc6736b 100644 --- a/reader/src/main/java/org/jline/reader/impl/KillRing.java +++ b/reader/src/main/java/org/jline/reader/impl/KillRing.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.reader.impl; diff --git a/reader/src/main/java/org/jline/reader/impl/LineReaderImpl.java b/reader/src/main/java/org/jline/reader/impl/LineReaderImpl.java index 4a7308642..743061e17 100644 --- a/reader/src/main/java/org/jline/reader/impl/LineReaderImpl.java +++ b/reader/src/main/java/org/jline/reader/impl/LineReaderImpl.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.reader.impl; @@ -21,6 +21,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; +import java.util.stream.Stream; import java.util.stream.StreamSupport; import org.jline.keymap.BindingReader; @@ -5358,6 +5359,7 @@ public Map> defaultKeyMaps() { public KeyMap emacs() { KeyMap emacs = new KeyMap<>(); + bindKeys(emacs); bind(emacs, SET_MARK_COMMAND, ctrl('@')); bind(emacs, BEGINNING_OF_LINE, ctrl('A')); bind(emacs, BACKWARD_CHAR, ctrl('B')); @@ -5439,6 +5441,7 @@ public KeyMap emacs() { public KeyMap viInsertion() { KeyMap viins = new KeyMap<>(); + bindKeys(viins); bind(viins, SELF_INSERT, range("^@-^_")); bind(viins, LIST_CHOICES, ctrl('D')); bind(viins, SEND_BREAK, ctrl('G')); @@ -5638,6 +5641,13 @@ private String key(Capability capability) { return KeyMap.key(terminal, capability); } + private void bindKeys(KeyMap emacs) { + Stream.of(Capability.values()) + .filter(c -> c.name().startsWith("key_")) + .map(this::key) + .forEach(k -> bind(emacs, this::beep, k)); + } + private void bindArrowKeys(KeyMap map) { bind(map, UP_LINE_OR_SEARCH, key(Capability.key_up)); bind(map, DOWN_LINE_OR_SEARCH, key(Capability.key_down)); diff --git a/reader/src/main/java/org/jline/reader/impl/ReaderUtils.java b/reader/src/main/java/org/jline/reader/impl/ReaderUtils.java index cc046e246..dce256801 100644 --- a/reader/src/main/java/org/jline/reader/impl/ReaderUtils.java +++ b/reader/src/main/java/org/jline/reader/impl/ReaderUtils.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.reader.impl; diff --git a/reader/src/main/java/org/jline/reader/impl/SimpleMaskingCallback.java b/reader/src/main/java/org/jline/reader/impl/SimpleMaskingCallback.java index 0ec19c553..deec086af 100644 --- a/reader/src/main/java/org/jline/reader/impl/SimpleMaskingCallback.java +++ b/reader/src/main/java/org/jline/reader/impl/SimpleMaskingCallback.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.reader.impl; diff --git a/reader/src/main/java/org/jline/reader/impl/UndoTree.java b/reader/src/main/java/org/jline/reader/impl/UndoTree.java index a6637c1bf..46eaa7289 100644 --- a/reader/src/main/java/org/jline/reader/impl/UndoTree.java +++ b/reader/src/main/java/org/jline/reader/impl/UndoTree.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.reader.impl; diff --git a/reader/src/main/java/org/jline/reader/impl/completer/AggregateCompleter.java b/reader/src/main/java/org/jline/reader/impl/completer/AggregateCompleter.java index db3162419..5c468ca05 100644 --- a/reader/src/main/java/org/jline/reader/impl/completer/AggregateCompleter.java +++ b/reader/src/main/java/org/jline/reader/impl/completer/AggregateCompleter.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.reader.impl.completer; diff --git a/reader/src/main/java/org/jline/reader/impl/completer/ArgumentCompleter.java b/reader/src/main/java/org/jline/reader/impl/completer/ArgumentCompleter.java index c2217ec9b..c9c2cec18 100644 --- a/reader/src/main/java/org/jline/reader/impl/completer/ArgumentCompleter.java +++ b/reader/src/main/java/org/jline/reader/impl/completer/ArgumentCompleter.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.reader.impl.completer; diff --git a/reader/src/main/java/org/jline/reader/impl/completer/EnumCompleter.java b/reader/src/main/java/org/jline/reader/impl/completer/EnumCompleter.java index 0d92cc261..80507bb2c 100644 --- a/reader/src/main/java/org/jline/reader/impl/completer/EnumCompleter.java +++ b/reader/src/main/java/org/jline/reader/impl/completer/EnumCompleter.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.reader.impl.completer; diff --git a/reader/src/main/java/org/jline/reader/impl/completer/FileNameCompleter.java b/reader/src/main/java/org/jline/reader/impl/completer/FileNameCompleter.java index e74df3ead..6c9b37039 100644 --- a/reader/src/main/java/org/jline/reader/impl/completer/FileNameCompleter.java +++ b/reader/src/main/java/org/jline/reader/impl/completer/FileNameCompleter.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.reader.impl.completer; diff --git a/reader/src/main/java/org/jline/reader/impl/completer/NullCompleter.java b/reader/src/main/java/org/jline/reader/impl/completer/NullCompleter.java index 201bedd54..7fd3f9b15 100644 --- a/reader/src/main/java/org/jline/reader/impl/completer/NullCompleter.java +++ b/reader/src/main/java/org/jline/reader/impl/completer/NullCompleter.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.reader.impl.completer; diff --git a/reader/src/main/java/org/jline/reader/impl/completer/StringsCompleter.java b/reader/src/main/java/org/jline/reader/impl/completer/StringsCompleter.java index 97158249f..f5d556a20 100644 --- a/reader/src/main/java/org/jline/reader/impl/completer/StringsCompleter.java +++ b/reader/src/main/java/org/jline/reader/impl/completer/StringsCompleter.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.reader.impl.completer; diff --git a/reader/src/main/java/org/jline/reader/impl/completer/package-info.java b/reader/src/main/java/org/jline/reader/impl/completer/package-info.java index 5edafecb7..609f719f0 100644 --- a/reader/src/main/java/org/jline/reader/impl/completer/package-info.java +++ b/reader/src/main/java/org/jline/reader/impl/completer/package-info.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ /** * JLine 3. diff --git a/reader/src/main/java/org/jline/reader/impl/history/DefaultHistory.java b/reader/src/main/java/org/jline/reader/impl/history/DefaultHistory.java index 301713e7c..c131244ae 100644 --- a/reader/src/main/java/org/jline/reader/impl/history/DefaultHistory.java +++ b/reader/src/main/java/org/jline/reader/impl/history/DefaultHistory.java @@ -4,12 +4,13 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.reader.impl.history; import java.io.*; import java.nio.file.*; +import java.time.DateTimeException; import java.time.Instant; import java.util.*; @@ -100,12 +101,19 @@ public void load() throws IOException { protected void addHistoryLine(Path path, String line) { if (reader.isSet(LineReader.Option.HISTORY_TIMESTAMPED)) { int idx = line.indexOf(':'); + final String badHistoryFileSyntax = "Bad history file syntax! " + + "The history file `" + path + "` may be an older history: " + + "please remove it or use a different history file."; if (idx < 0) { - throw new IllegalArgumentException("Bad history file syntax! " + - "The history file `" + path + "` may be an older history: " + - "please remove it or use a different history file."); + throw new IllegalArgumentException(badHistoryFileSyntax); } - Instant time = Instant.ofEpochMilli(Long.parseLong(line.substring(0, idx))); + Instant time; + try { + time = Instant.ofEpochMilli(Long.parseLong(line.substring(0, idx))); + } catch (DateTimeException | NumberFormatException e) { + throw new IllegalArgumentException(badHistoryFileSyntax); + } + String unescaped = unescape(line.substring(idx + 1)); internalAdd(time, unescaped); } diff --git a/reader/src/main/java/org/jline/reader/impl/history/package-info.java b/reader/src/main/java/org/jline/reader/impl/history/package-info.java index 80ba8c30a..66c83f48f 100644 --- a/reader/src/main/java/org/jline/reader/impl/history/package-info.java +++ b/reader/src/main/java/org/jline/reader/impl/history/package-info.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ /** * JLine 3. diff --git a/reader/src/main/java/org/jline/reader/package-info.java b/reader/src/main/java/org/jline/reader/package-info.java index 1e28296e2..89e5a586f 100644 --- a/reader/src/main/java/org/jline/reader/package-info.java +++ b/reader/src/main/java/org/jline/reader/package-info.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ /** * JLine 3. diff --git a/reader/src/test/java/org/jline/keymap/BindingReaderTest.java b/reader/src/test/java/org/jline/keymap/BindingReaderTest.java index 0cf4ad239..8be061d6e 100644 --- a/reader/src/test/java/org/jline/keymap/BindingReaderTest.java +++ b/reader/src/test/java/org/jline/keymap/BindingReaderTest.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.keymap; diff --git a/reader/src/test/java/org/jline/keymap/KeyMapTest.java b/reader/src/test/java/org/jline/keymap/KeyMapTest.java index 76429ff9a..18bf1e378 100644 --- a/reader/src/test/java/org/jline/keymap/KeyMapTest.java +++ b/reader/src/test/java/org/jline/keymap/KeyMapTest.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.keymap; diff --git a/reader/src/test/java/org/jline/reader/completer/ArgumentCompleterTest.java b/reader/src/test/java/org/jline/reader/completer/ArgumentCompleterTest.java index e2532905a..adc3df5e8 100644 --- a/reader/src/test/java/org/jline/reader/completer/ArgumentCompleterTest.java +++ b/reader/src/test/java/org/jline/reader/completer/ArgumentCompleterTest.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.reader.completer; diff --git a/reader/src/test/java/org/jline/reader/completer/DefaultParserTest.java b/reader/src/test/java/org/jline/reader/completer/DefaultParserTest.java index b5bbc968e..3a174b0e3 100644 --- a/reader/src/test/java/org/jline/reader/completer/DefaultParserTest.java +++ b/reader/src/test/java/org/jline/reader/completer/DefaultParserTest.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.reader.completer; @@ -79,6 +79,6 @@ public void testEscapedQuotes() { assertEquals(Arrays.asList("'1", "2", "3"), delimited.words()); delimited = parser.parse("'1 '2\\' 3", 0); - assertEquals(Arrays.asList("1 ", "2'", "3"), delimited.words()); + assertEquals(Arrays.asList("1 2'", "3"), delimited.words()); } } diff --git a/reader/src/test/java/org/jline/reader/completer/NullCompleterTest.java b/reader/src/test/java/org/jline/reader/completer/NullCompleterTest.java index 4ed7512de..1172dbb87 100644 --- a/reader/src/test/java/org/jline/reader/completer/NullCompleterTest.java +++ b/reader/src/test/java/org/jline/reader/completer/NullCompleterTest.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.reader.completer; diff --git a/reader/src/test/java/org/jline/reader/completer/StringsCompleterTest.java b/reader/src/test/java/org/jline/reader/completer/StringsCompleterTest.java index 111408f22..8ba185b26 100644 --- a/reader/src/test/java/org/jline/reader/completer/StringsCompleterTest.java +++ b/reader/src/test/java/org/jline/reader/completer/StringsCompleterTest.java @@ -4,10 +4,11 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.reader.completer; +import org.jline.reader.LineReader; import org.jline.reader.impl.DefaultParser; import org.jline.reader.impl.ReaderTestSupport; import org.jline.reader.impl.completer.StringsCompleter; @@ -34,30 +35,30 @@ public void test1() throws Exception { @Test public void escapeCharsNull() throws Exception { - DefaultParser dp = (DefaultParser)reader.getParser(); - dp.setEscapeChars(null); + DefaultParser dp = (DefaultParser) reader.getParser(); + dp.setEscapeChars(null); + reader.setVariable(LineReader.ERRORS, 0); reader.setParser(dp); - reader.setCompleter(new StringsCompleter("foo bar")); + reader.setCompleter(new StringsCompleter("foo bar", "bar")); assertBuffer("'foo bar' ", new TestBuffer("f").tab()); assertBuffer("'foo bar' ", new TestBuffer("'f").tab()); - // mrn 18/11/2018 IMHO the two bellow are wrong - assertBuffer("'foo bar' ", new TestBuffer("foo'b").tab()); - assertBuffer("'foo bar' ", new TestBuffer("'bar'f").tab()); + assertBuffer("foo'b", new TestBuffer("foo'b").tab()); + assertBuffer("bar'f", new TestBuffer("bar'f").tab()); } @Test public void escapeChars() throws Exception { - DefaultParser dp = (DefaultParser)reader.getParser(); - dp.setEscapeChars(new char[]{'\\'}); - reader.setParser(dp); + DefaultParser dp = (DefaultParser) reader.getParser(); + dp.setEscapeChars(new char[] { '\\' }); + reader.setVariable(LineReader.ERRORS, 0); + reader.setParser(dp); reader.setCompleter(new StringsCompleter("foo bar", "bar")); assertBuffer("foo\\ bar ", new TestBuffer("f").tab()); assertBuffer("'bar' ", new TestBuffer("'b").tab()); - // mrn 18/11/2018 IMHO the two bellow are wrong - assertBuffer("foo\\ bar ", new TestBuffer("'bar'f").tab()); - assertBuffer("'bar' ", new TestBuffer("bar'f").tab()); + assertBuffer("'bar'f", new TestBuffer("'bar'f").tab()); + assertBuffer("bar'f", new TestBuffer("bar'f").tab()); } - -} + +} \ No newline at end of file diff --git a/reader/src/test/java/org/jline/reader/impl/BufferTest.java b/reader/src/test/java/org/jline/reader/impl/BufferTest.java index f90606e56..0c2ec703b 100644 --- a/reader/src/test/java/org/jline/reader/impl/BufferTest.java +++ b/reader/src/test/java/org/jline/reader/impl/BufferTest.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.reader.impl; diff --git a/reader/src/test/java/org/jline/reader/impl/CompletionTest.java b/reader/src/test/java/org/jline/reader/impl/CompletionTest.java index 1a3886686..c288151ce 100644 --- a/reader/src/test/java/org/jline/reader/impl/CompletionTest.java +++ b/reader/src/test/java/org/jline/reader/impl/CompletionTest.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.reader.impl; diff --git a/reader/src/test/java/org/jline/reader/impl/CompletionWithParserTest.java b/reader/src/test/java/org/jline/reader/impl/CompletionWithParserTest.java index 41a83625f..7f8a7875f 100644 --- a/reader/src/test/java/org/jline/reader/impl/CompletionWithParserTest.java +++ b/reader/src/test/java/org/jline/reader/impl/CompletionWithParserTest.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.reader.impl; diff --git a/reader/src/test/java/org/jline/reader/impl/DefaultParserTest.java b/reader/src/test/java/org/jline/reader/impl/DefaultParserTest.java index 118495c15..313c2314d 100644 --- a/reader/src/test/java/org/jline/reader/impl/DefaultParserTest.java +++ b/reader/src/test/java/org/jline/reader/impl/DefaultParserTest.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.reader.impl; diff --git a/reader/src/test/java/org/jline/reader/impl/DigitArgumentTest.java b/reader/src/test/java/org/jline/reader/impl/DigitArgumentTest.java index a47518aa1..170576799 100644 --- a/reader/src/test/java/org/jline/reader/impl/DigitArgumentTest.java +++ b/reader/src/test/java/org/jline/reader/impl/DigitArgumentTest.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.reader.impl; diff --git a/reader/src/test/java/org/jline/reader/impl/EditLineTest.java b/reader/src/test/java/org/jline/reader/impl/EditLineTest.java index cc576fd10..7e631e24c 100644 --- a/reader/src/test/java/org/jline/reader/impl/EditLineTest.java +++ b/reader/src/test/java/org/jline/reader/impl/EditLineTest.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.reader.impl; diff --git a/reader/src/test/java/org/jline/reader/impl/KillRingTest.java b/reader/src/test/java/org/jline/reader/impl/KillRingTest.java index e051f3d46..bc83c7d1d 100644 --- a/reader/src/test/java/org/jline/reader/impl/KillRingTest.java +++ b/reader/src/test/java/org/jline/reader/impl/KillRingTest.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.reader.impl; diff --git a/reader/src/test/java/org/jline/reader/impl/LineReaderTest.java b/reader/src/test/java/org/jline/reader/impl/LineReaderTest.java index 7ef69cbcd..d1011420e 100644 --- a/reader/src/test/java/org/jline/reader/impl/LineReaderTest.java +++ b/reader/src/test/java/org/jline/reader/impl/LineReaderTest.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.reader.impl; diff --git a/reader/src/test/java/org/jline/reader/impl/MultiByteCharTest.java b/reader/src/test/java/org/jline/reader/impl/MultiByteCharTest.java index 4969b1025..0cb6392a0 100644 --- a/reader/src/test/java/org/jline/reader/impl/MultiByteCharTest.java +++ b/reader/src/test/java/org/jline/reader/impl/MultiByteCharTest.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.reader.impl; diff --git a/reader/src/test/java/org/jline/reader/impl/ReaderTestSupport.java b/reader/src/test/java/org/jline/reader/impl/ReaderTestSupport.java index f8074550d..e43e91c61 100644 --- a/reader/src/test/java/org/jline/reader/impl/ReaderTestSupport.java +++ b/reader/src/test/java/org/jline/reader/impl/ReaderTestSupport.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.reader.impl; diff --git a/reader/src/test/java/org/jline/reader/impl/TerminalReaderTest.java b/reader/src/test/java/org/jline/reader/impl/TerminalReaderTest.java index e33cdb871..6149da09f 100644 --- a/reader/src/test/java/org/jline/reader/impl/TerminalReaderTest.java +++ b/reader/src/test/java/org/jline/reader/impl/TerminalReaderTest.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.reader.impl; diff --git a/reader/src/test/java/org/jline/reader/impl/ViMoveModeTest.java b/reader/src/test/java/org/jline/reader/impl/ViMoveModeTest.java index 3aacee296..27040e7f5 100644 --- a/reader/src/test/java/org/jline/reader/impl/ViMoveModeTest.java +++ b/reader/src/test/java/org/jline/reader/impl/ViMoveModeTest.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.reader.impl; diff --git a/reader/src/test/java/org/jline/reader/impl/WidgetTest.java b/reader/src/test/java/org/jline/reader/impl/WidgetTest.java index 315cedf73..5250275d6 100644 --- a/reader/src/test/java/org/jline/reader/impl/WidgetTest.java +++ b/reader/src/test/java/org/jline/reader/impl/WidgetTest.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.reader.impl; diff --git a/reader/src/test/java/org/jline/reader/impl/history/HistoryPersistenceTest.java b/reader/src/test/java/org/jline/reader/impl/history/HistoryPersistenceTest.java index 47151294d..1a27752f8 100644 --- a/reader/src/test/java/org/jline/reader/impl/history/HistoryPersistenceTest.java +++ b/reader/src/test/java/org/jline/reader/impl/history/HistoryPersistenceTest.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.reader.impl.history; diff --git a/reader/src/test/java/org/jline/reader/impl/history/HistoryReaderTest.java b/reader/src/test/java/org/jline/reader/impl/history/HistoryReaderTest.java index b160fa073..43402679e 100644 --- a/reader/src/test/java/org/jline/reader/impl/history/HistoryReaderTest.java +++ b/reader/src/test/java/org/jline/reader/impl/history/HistoryReaderTest.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.reader.impl.history; diff --git a/reader/src/test/java/org/jline/reader/impl/history/HistoryTest.java b/reader/src/test/java/org/jline/reader/impl/history/HistoryTest.java index a80d23d60..288b6e055 100644 --- a/reader/src/test/java/org/jline/reader/impl/history/HistoryTest.java +++ b/reader/src/test/java/org/jline/reader/impl/history/HistoryTest.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.reader.impl.history; @@ -24,6 +24,8 @@ import java.util.List; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; /** * Tests for {@link DefaultHistory}. @@ -148,4 +150,30 @@ public void testTrim() { assertEquals("a", trimmed.get(2).line()); } + @Test + public void testAddHistoryLine() throws IOException { + final Path histFile = Files.createTempFile(null, null); + + reader.setOpt(LineReader.Option.HISTORY_TIMESTAMPED); + try { + history.addHistoryLine(histFile, ":test"); + fail("Wrong handling of timestamped history"); + } catch (IllegalArgumentException e) { + assertTrue(e.getMessage().startsWith("Bad history file syntax!")); + } + + try { + history.addHistoryLine(histFile, "test:test"); + fail("Wrong handling of timestamped history"); + } catch (IllegalArgumentException e) { + assertTrue(e.getMessage().startsWith("Bad history file syntax!")); + } + + try { + history.addHistoryLine(histFile, "123456789123456789123456789:test"); + fail("Wrong handling of timestamped history "); + } catch (IllegalArgumentException e) { + assertTrue(e.getMessage().startsWith("Bad history file syntax!")); + } + } } diff --git a/reader/src/test/java/org/jline/terminal/impl/ExternalTerminalTest.java b/reader/src/test/java/org/jline/terminal/impl/ExternalTerminalTest.java index 1b9fa1fd7..2e8e8ad9c 100644 --- a/reader/src/test/java/org/jline/terminal/impl/ExternalTerminalTest.java +++ b/reader/src/test/java/org/jline/terminal/impl/ExternalTerminalTest.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.terminal.impl; diff --git a/remote-ssh/pom.xml b/remote-ssh/pom.xml index 752376d82..1c298f439 100644 --- a/remote-ssh/pom.xml +++ b/remote-ssh/pom.xml @@ -6,7 +6,7 @@ This software is distributable under the BSD license. See the terms of the BSD license in the documentation provided with this software. - http://www.opensource.org/licenses/bsd-license.php + https://opensource.org/licenses/BSD-3-Clause --> diff --git a/remote-ssh/src/main/java/org/jline/builtins/ssh/ShellCommand.java b/remote-ssh/src/main/java/org/jline/builtins/ssh/ShellCommand.java index 0f8015c8c..92cf9883b 100644 --- a/remote-ssh/src/main/java/org/jline/builtins/ssh/ShellCommand.java +++ b/remote-ssh/src/main/java/org/jline/builtins/ssh/ShellCommand.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.builtins.ssh; diff --git a/remote-ssh/src/main/java/org/jline/builtins/ssh/ShellFactoryImpl.java b/remote-ssh/src/main/java/org/jline/builtins/ssh/ShellFactoryImpl.java index 7cfad9c64..60c65a609 100644 --- a/remote-ssh/src/main/java/org/jline/builtins/ssh/ShellFactoryImpl.java +++ b/remote-ssh/src/main/java/org/jline/builtins/ssh/ShellFactoryImpl.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.builtins.ssh; diff --git a/remote-ssh/src/main/java/org/jline/builtins/ssh/Ssh.java b/remote-ssh/src/main/java/org/jline/builtins/ssh/Ssh.java index d9f14990d..e217297d3 100644 --- a/remote-ssh/src/main/java/org/jline/builtins/ssh/Ssh.java +++ b/remote-ssh/src/main/java/org/jline/builtins/ssh/Ssh.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.builtins.ssh; diff --git a/remote-telnet/pom.xml b/remote-telnet/pom.xml index 499064424..aab494205 100644 --- a/remote-telnet/pom.xml +++ b/remote-telnet/pom.xml @@ -6,7 +6,7 @@ This software is distributable under the BSD license. See the terms of the BSD license in the documentation provided with this software. - http://www.opensource.org/licenses/bsd-license.php + https://opensource.org/licenses/BSD-3-Clause --> diff --git a/remote-telnet/src/main/java/org/jline/builtins/telnet/Connection.java b/remote-telnet/src/main/java/org/jline/builtins/telnet/Connection.java index 522e570bc..c4366920c 100644 --- a/remote-telnet/src/main/java/org/jline/builtins/telnet/Connection.java +++ b/remote-telnet/src/main/java/org/jline/builtins/telnet/Connection.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ /* diff --git a/remote-telnet/src/main/java/org/jline/builtins/telnet/ConnectionData.java b/remote-telnet/src/main/java/org/jline/builtins/telnet/ConnectionData.java index cfc0569d6..d5c829ae7 100644 --- a/remote-telnet/src/main/java/org/jline/builtins/telnet/ConnectionData.java +++ b/remote-telnet/src/main/java/org/jline/builtins/telnet/ConnectionData.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ /* diff --git a/remote-telnet/src/main/java/org/jline/builtins/telnet/ConnectionEvent.java b/remote-telnet/src/main/java/org/jline/builtins/telnet/ConnectionEvent.java index ca089abd7..2912aef86 100644 --- a/remote-telnet/src/main/java/org/jline/builtins/telnet/ConnectionEvent.java +++ b/remote-telnet/src/main/java/org/jline/builtins/telnet/ConnectionEvent.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ /* diff --git a/remote-telnet/src/main/java/org/jline/builtins/telnet/ConnectionFilter.java b/remote-telnet/src/main/java/org/jline/builtins/telnet/ConnectionFilter.java index 6afc2dd2b..0d169dbc0 100644 --- a/remote-telnet/src/main/java/org/jline/builtins/telnet/ConnectionFilter.java +++ b/remote-telnet/src/main/java/org/jline/builtins/telnet/ConnectionFilter.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ /* diff --git a/remote-telnet/src/main/java/org/jline/builtins/telnet/ConnectionListener.java b/remote-telnet/src/main/java/org/jline/builtins/telnet/ConnectionListener.java index 383f7193c..bcd594950 100644 --- a/remote-telnet/src/main/java/org/jline/builtins/telnet/ConnectionListener.java +++ b/remote-telnet/src/main/java/org/jline/builtins/telnet/ConnectionListener.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ /* diff --git a/remote-telnet/src/main/java/org/jline/builtins/telnet/ConnectionManager.java b/remote-telnet/src/main/java/org/jline/builtins/telnet/ConnectionManager.java index ca7534ac8..c32e4181a 100644 --- a/remote-telnet/src/main/java/org/jline/builtins/telnet/ConnectionManager.java +++ b/remote-telnet/src/main/java/org/jline/builtins/telnet/ConnectionManager.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ /* diff --git a/remote-telnet/src/main/java/org/jline/builtins/telnet/PortListener.java b/remote-telnet/src/main/java/org/jline/builtins/telnet/PortListener.java index 95bb7e296..4a29bb9b3 100644 --- a/remote-telnet/src/main/java/org/jline/builtins/telnet/PortListener.java +++ b/remote-telnet/src/main/java/org/jline/builtins/telnet/PortListener.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ /* diff --git a/remote-telnet/src/main/java/org/jline/builtins/telnet/Telnet.java b/remote-telnet/src/main/java/org/jline/builtins/telnet/Telnet.java index 53eb5d24c..635880069 100644 --- a/remote-telnet/src/main/java/org/jline/builtins/telnet/Telnet.java +++ b/remote-telnet/src/main/java/org/jline/builtins/telnet/Telnet.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.builtins.telnet; diff --git a/remote-telnet/src/main/java/org/jline/builtins/telnet/TelnetIO.java b/remote-telnet/src/main/java/org/jline/builtins/telnet/TelnetIO.java index 61b91b068..3596ddf49 100644 --- a/remote-telnet/src/main/java/org/jline/builtins/telnet/TelnetIO.java +++ b/remote-telnet/src/main/java/org/jline/builtins/telnet/TelnetIO.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ /* diff --git a/style/pom.xml b/style/pom.xml index ed7f9060e..17796ca52 100644 --- a/style/pom.xml +++ b/style/pom.xml @@ -6,7 +6,7 @@ This software is distributable under the BSD license. See the terms of the BSD license in the documentation provided with this software. - http://www.opensource.org/licenses/bsd-license.php + https://opensource.org/licenses/BSD-3-Clause --> diff --git a/style/src/main/java/org/jline/style/InterpolationHelper.java b/style/src/main/java/org/jline/style/InterpolationHelper.java index 03a33be7e..24fd86a93 100644 --- a/style/src/main/java/org/jline/style/InterpolationHelper.java +++ b/style/src/main/java/org/jline/style/InterpolationHelper.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.style; diff --git a/style/src/main/java/org/jline/style/MemoryStyleSource.java b/style/src/main/java/org/jline/style/MemoryStyleSource.java index bf30f1216..4326d0f1c 100644 --- a/style/src/main/java/org/jline/style/MemoryStyleSource.java +++ b/style/src/main/java/org/jline/style/MemoryStyleSource.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.style; diff --git a/style/src/main/java/org/jline/style/NopStyleSource.java b/style/src/main/java/org/jline/style/NopStyleSource.java index d8d0012b0..91934cf18 100644 --- a/style/src/main/java/org/jline/style/NopStyleSource.java +++ b/style/src/main/java/org/jline/style/NopStyleSource.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.style; diff --git a/style/src/main/java/org/jline/style/StyleBundle.java b/style/src/main/java/org/jline/style/StyleBundle.java index ad5037c73..4d301cc1e 100644 --- a/style/src/main/java/org/jline/style/StyleBundle.java +++ b/style/src/main/java/org/jline/style/StyleBundle.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.style; diff --git a/style/src/main/java/org/jline/style/StyleBundleInvocationHandler.java b/style/src/main/java/org/jline/style/StyleBundleInvocationHandler.java index 79b1d86d8..aa742bcf2 100644 --- a/style/src/main/java/org/jline/style/StyleBundleInvocationHandler.java +++ b/style/src/main/java/org/jline/style/StyleBundleInvocationHandler.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.style; diff --git a/style/src/main/java/org/jline/style/StyleColor.java b/style/src/main/java/org/jline/style/StyleColor.java index 8070dc2c7..7e7b9a220 100644 --- a/style/src/main/java/org/jline/style/StyleColor.java +++ b/style/src/main/java/org/jline/style/StyleColor.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.style; diff --git a/style/src/main/java/org/jline/style/StyleExpression.java b/style/src/main/java/org/jline/style/StyleExpression.java index 2b9ee212f..629ed0343 100644 --- a/style/src/main/java/org/jline/style/StyleExpression.java +++ b/style/src/main/java/org/jline/style/StyleExpression.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.style; diff --git a/style/src/main/java/org/jline/style/StyleFactory.java b/style/src/main/java/org/jline/style/StyleFactory.java index bdd5b429e..ca7b44f93 100644 --- a/style/src/main/java/org/jline/style/StyleFactory.java +++ b/style/src/main/java/org/jline/style/StyleFactory.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.style; diff --git a/style/src/main/java/org/jline/style/StyleResolver.java b/style/src/main/java/org/jline/style/StyleResolver.java index 0946d50ec..09642c144 100644 --- a/style/src/main/java/org/jline/style/StyleResolver.java +++ b/style/src/main/java/org/jline/style/StyleResolver.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.style; diff --git a/style/src/main/java/org/jline/style/StyleSource.java b/style/src/main/java/org/jline/style/StyleSource.java index a6f28877a..2341d8932 100644 --- a/style/src/main/java/org/jline/style/StyleSource.java +++ b/style/src/main/java/org/jline/style/StyleSource.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.style; diff --git a/style/src/main/java/org/jline/style/StyledWriter.java b/style/src/main/java/org/jline/style/StyledWriter.java index 493241b7b..c52445930 100644 --- a/style/src/main/java/org/jline/style/StyledWriter.java +++ b/style/src/main/java/org/jline/style/StyledWriter.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.style; diff --git a/style/src/main/java/org/jline/style/Styler.java b/style/src/main/java/org/jline/style/Styler.java index 9023af4e1..34975e909 100644 --- a/style/src/main/java/org/jline/style/Styler.java +++ b/style/src/main/java/org/jline/style/Styler.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.style; diff --git a/style/src/test/java/org/jline/style/StyleBundleInvocationHandlerTest.java b/style/src/test/java/org/jline/style/StyleBundleInvocationHandlerTest.java index 68ba68ae3..268ebf00c 100644 --- a/style/src/test/java/org/jline/style/StyleBundleInvocationHandlerTest.java +++ b/style/src/test/java/org/jline/style/StyleBundleInvocationHandlerTest.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.style; diff --git a/style/src/test/java/org/jline/style/StyleExpressionTest.java b/style/src/test/java/org/jline/style/StyleExpressionTest.java index b87f281ef..cfa52e1ff 100644 --- a/style/src/test/java/org/jline/style/StyleExpressionTest.java +++ b/style/src/test/java/org/jline/style/StyleExpressionTest.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.style; diff --git a/style/src/test/java/org/jline/style/StyleFactoryTest.java b/style/src/test/java/org/jline/style/StyleFactoryTest.java index d38a1e9fe..6fc8f71bc 100644 --- a/style/src/test/java/org/jline/style/StyleFactoryTest.java +++ b/style/src/test/java/org/jline/style/StyleFactoryTest.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.style; diff --git a/style/src/test/java/org/jline/style/StyleResolverTest.java b/style/src/test/java/org/jline/style/StyleResolverTest.java index 87de0a57a..183c612c3 100644 --- a/style/src/test/java/org/jline/style/StyleResolverTest.java +++ b/style/src/test/java/org/jline/style/StyleResolverTest.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.style; diff --git a/style/src/test/java/org/jline/style/StyleTestSupport.java b/style/src/test/java/org/jline/style/StyleTestSupport.java index d0078d5a3..eaee4351a 100644 --- a/style/src/test/java/org/jline/style/StyleTestSupport.java +++ b/style/src/test/java/org/jline/style/StyleTestSupport.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.style; diff --git a/terminal-jansi/pom.xml b/terminal-jansi/pom.xml index 33c8ff861..b01167f3a 100644 --- a/terminal-jansi/pom.xml +++ b/terminal-jansi/pom.xml @@ -6,7 +6,7 @@ This software is distributable under the BSD license. See the terms of the BSD license in the documentation provided with this software. - http://www.opensource.org/licenses/bsd-license.php + https://opensource.org/licenses/BSD-3-Clause --> diff --git a/terminal-jansi/src/main/java/org/jline/terminal/impl/jansi/JansiNativePty.java b/terminal-jansi/src/main/java/org/jline/terminal/impl/jansi/JansiNativePty.java index d6457f722..58503f482 100644 --- a/terminal-jansi/src/main/java/org/jline/terminal/impl/jansi/JansiNativePty.java +++ b/terminal-jansi/src/main/java/org/jline/terminal/impl/jansi/JansiNativePty.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.terminal.impl.jansi; diff --git a/terminal-jansi/src/main/java/org/jline/terminal/impl/jansi/JansiSupportImpl.java b/terminal-jansi/src/main/java/org/jline/terminal/impl/jansi/JansiSupportImpl.java index 49ec5abc4..476cd4927 100644 --- a/terminal-jansi/src/main/java/org/jline/terminal/impl/jansi/JansiSupportImpl.java +++ b/terminal-jansi/src/main/java/org/jline/terminal/impl/jansi/JansiSupportImpl.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.terminal.impl.jansi; diff --git a/terminal-jansi/src/main/java/org/jline/terminal/impl/jansi/freebsd/FreeBsdNativePty.java b/terminal-jansi/src/main/java/org/jline/terminal/impl/jansi/freebsd/FreeBsdNativePty.java index 308888485..901e97167 100644 --- a/terminal-jansi/src/main/java/org/jline/terminal/impl/jansi/freebsd/FreeBsdNativePty.java +++ b/terminal-jansi/src/main/java/org/jline/terminal/impl/jansi/freebsd/FreeBsdNativePty.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.terminal.impl.jansi.freebsd; diff --git a/terminal-jansi/src/main/java/org/jline/terminal/impl/jansi/linux/LinuxNativePty.java b/terminal-jansi/src/main/java/org/jline/terminal/impl/jansi/linux/LinuxNativePty.java index a7b658d47..15322b1c8 100644 --- a/terminal-jansi/src/main/java/org/jline/terminal/impl/jansi/linux/LinuxNativePty.java +++ b/terminal-jansi/src/main/java/org/jline/terminal/impl/jansi/linux/LinuxNativePty.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.terminal.impl.jansi.linux; diff --git a/terminal-jansi/src/main/java/org/jline/terminal/impl/jansi/osx/OsXNativePty.java b/terminal-jansi/src/main/java/org/jline/terminal/impl/jansi/osx/OsXNativePty.java index 934262ad0..4b085976b 100644 --- a/terminal-jansi/src/main/java/org/jline/terminal/impl/jansi/osx/OsXNativePty.java +++ b/terminal-jansi/src/main/java/org/jline/terminal/impl/jansi/osx/OsXNativePty.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.terminal.impl.jansi.osx; diff --git a/terminal-jansi/src/main/java/org/jline/terminal/impl/jansi/solaris/SolarisNativePty.java b/terminal-jansi/src/main/java/org/jline/terminal/impl/jansi/solaris/SolarisNativePty.java index f510a3eb7..66059e58e 100644 --- a/terminal-jansi/src/main/java/org/jline/terminal/impl/jansi/solaris/SolarisNativePty.java +++ b/terminal-jansi/src/main/java/org/jline/terminal/impl/jansi/solaris/SolarisNativePty.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.terminal.impl.jansi.solaris; diff --git a/terminal-jansi/src/main/java/org/jline/terminal/impl/jansi/win/JansiWinConsoleWriter.java b/terminal-jansi/src/main/java/org/jline/terminal/impl/jansi/win/JansiWinConsoleWriter.java index ac1695b2c..656a604cd 100644 --- a/terminal-jansi/src/main/java/org/jline/terminal/impl/jansi/win/JansiWinConsoleWriter.java +++ b/terminal-jansi/src/main/java/org/jline/terminal/impl/jansi/win/JansiWinConsoleWriter.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.terminal.impl.jansi.win; diff --git a/terminal-jansi/src/main/java/org/jline/terminal/impl/jansi/win/JansiWinSysTerminal.java b/terminal-jansi/src/main/java/org/jline/terminal/impl/jansi/win/JansiWinSysTerminal.java index c2ce5c5c1..7512c52b7 100644 --- a/terminal-jansi/src/main/java/org/jline/terminal/impl/jansi/win/JansiWinSysTerminal.java +++ b/terminal-jansi/src/main/java/org/jline/terminal/impl/jansi/win/JansiWinSysTerminal.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.terminal.impl.jansi.win; diff --git a/terminal-jna/pom.xml b/terminal-jna/pom.xml index 4c48cdda7..47d2e33e7 100644 --- a/terminal-jna/pom.xml +++ b/terminal-jna/pom.xml @@ -6,7 +6,7 @@ This software is distributable under the BSD license. See the terms of the BSD license in the documentation provided with this software. - http://www.opensource.org/licenses/bsd-license.php + https://opensource.org/licenses/BSD-3-Clause --> diff --git a/terminal-jna/src/main/java/org/jline/terminal/impl/jna/JnaNativePty.java b/terminal-jna/src/main/java/org/jline/terminal/impl/jna/JnaNativePty.java index 8b37e4375..2dd2fa178 100644 --- a/terminal-jna/src/main/java/org/jline/terminal/impl/jna/JnaNativePty.java +++ b/terminal-jna/src/main/java/org/jline/terminal/impl/jna/JnaNativePty.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.terminal.impl.jna; diff --git a/terminal-jna/src/main/java/org/jline/terminal/impl/jna/freebsd/CLibrary.java b/terminal-jna/src/main/java/org/jline/terminal/impl/jna/freebsd/CLibrary.java index 79bd429e1..ee6cf4bd9 100644 --- a/terminal-jna/src/main/java/org/jline/terminal/impl/jna/freebsd/CLibrary.java +++ b/terminal-jna/src/main/java/org/jline/terminal/impl/jna/freebsd/CLibrary.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.terminal.impl.jna.freebsd; diff --git a/terminal-jna/src/main/java/org/jline/terminal/impl/jna/freebsd/FreeBsdNativePty.java b/terminal-jna/src/main/java/org/jline/terminal/impl/jna/freebsd/FreeBsdNativePty.java index 0c4fc8e6a..6667af148 100644 --- a/terminal-jna/src/main/java/org/jline/terminal/impl/jna/freebsd/FreeBsdNativePty.java +++ b/terminal-jna/src/main/java/org/jline/terminal/impl/jna/freebsd/FreeBsdNativePty.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.terminal.impl.jna.freebsd; diff --git a/terminal-jna/src/main/java/org/jline/terminal/impl/jna/linux/CLibrary.java b/terminal-jna/src/main/java/org/jline/terminal/impl/jna/linux/CLibrary.java index 08fc74283..70693a094 100644 --- a/terminal-jna/src/main/java/org/jline/terminal/impl/jna/linux/CLibrary.java +++ b/terminal-jna/src/main/java/org/jline/terminal/impl/jna/linux/CLibrary.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.terminal.impl.jna.linux; diff --git a/terminal-jna/src/main/java/org/jline/terminal/impl/jna/linux/LinuxNativePty.java b/terminal-jna/src/main/java/org/jline/terminal/impl/jna/linux/LinuxNativePty.java index a8cea727b..fa7577aaf 100644 --- a/terminal-jna/src/main/java/org/jline/terminal/impl/jna/linux/LinuxNativePty.java +++ b/terminal-jna/src/main/java/org/jline/terminal/impl/jna/linux/LinuxNativePty.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.terminal.impl.jna.linux; diff --git a/terminal-jna/src/main/java/org/jline/terminal/impl/jna/osx/CLibrary.java b/terminal-jna/src/main/java/org/jline/terminal/impl/jna/osx/CLibrary.java index 260335b15..7ac595630 100644 --- a/terminal-jna/src/main/java/org/jline/terminal/impl/jna/osx/CLibrary.java +++ b/terminal-jna/src/main/java/org/jline/terminal/impl/jna/osx/CLibrary.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.terminal.impl.jna.osx; diff --git a/terminal-jna/src/main/java/org/jline/terminal/impl/jna/osx/OsXNativePty.java b/terminal-jna/src/main/java/org/jline/terminal/impl/jna/osx/OsXNativePty.java index d44a740ec..34a3c0d73 100644 --- a/terminal-jna/src/main/java/org/jline/terminal/impl/jna/osx/OsXNativePty.java +++ b/terminal-jna/src/main/java/org/jline/terminal/impl/jna/osx/OsXNativePty.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.terminal.impl.jna.osx; diff --git a/terminal-jna/src/main/java/org/jline/terminal/impl/jna/solaris/CLibrary.java b/terminal-jna/src/main/java/org/jline/terminal/impl/jna/solaris/CLibrary.java index 860753194..0df5b23ca 100644 --- a/terminal-jna/src/main/java/org/jline/terminal/impl/jna/solaris/CLibrary.java +++ b/terminal-jna/src/main/java/org/jline/terminal/impl/jna/solaris/CLibrary.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.terminal.impl.jna.solaris; diff --git a/terminal-jna/src/main/java/org/jline/terminal/impl/jna/solaris/SolarisNativePty.java b/terminal-jna/src/main/java/org/jline/terminal/impl/jna/solaris/SolarisNativePty.java index 82f336266..c3713ef9a 100644 --- a/terminal-jna/src/main/java/org/jline/terminal/impl/jna/solaris/SolarisNativePty.java +++ b/terminal-jna/src/main/java/org/jline/terminal/impl/jna/solaris/SolarisNativePty.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.terminal.impl.jna.solaris; diff --git a/terminal-jna/src/main/java/org/jline/terminal/impl/jna/win/JnaWinConsoleWriter.java b/terminal-jna/src/main/java/org/jline/terminal/impl/jna/win/JnaWinConsoleWriter.java index 13bfa50f2..ed0a669b1 100644 --- a/terminal-jna/src/main/java/org/jline/terminal/impl/jna/win/JnaWinConsoleWriter.java +++ b/terminal-jna/src/main/java/org/jline/terminal/impl/jna/win/JnaWinConsoleWriter.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.terminal.impl.jna.win; diff --git a/terminal-jna/src/main/java/org/jline/terminal/impl/jna/win/JnaWinSysTerminal.java b/terminal-jna/src/main/java/org/jline/terminal/impl/jna/win/JnaWinSysTerminal.java index 89f97d0f0..7a9974690 100644 --- a/terminal-jna/src/main/java/org/jline/terminal/impl/jna/win/JnaWinSysTerminal.java +++ b/terminal-jna/src/main/java/org/jline/terminal/impl/jna/win/JnaWinSysTerminal.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.terminal.impl.jna.win; diff --git a/terminal-jna/src/main/java/org/jline/terminal/impl/jna/win/Kernel32.java b/terminal-jna/src/main/java/org/jline/terminal/impl/jna/win/Kernel32.java index e55f0f40b..32f2f8a4a 100644 --- a/terminal-jna/src/main/java/org/jline/terminal/impl/jna/win/Kernel32.java +++ b/terminal-jna/src/main/java/org/jline/terminal/impl/jna/win/Kernel32.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.terminal.impl.jna.win; diff --git a/terminal-jna/src/main/java/org/jline/terminal/impl/jna/win/WindowsAnsiWriter.java b/terminal-jna/src/main/java/org/jline/terminal/impl/jna/win/WindowsAnsiWriter.java index c3bb37c6b..fbf1d3c5c 100644 --- a/terminal-jna/src/main/java/org/jline/terminal/impl/jna/win/WindowsAnsiWriter.java +++ b/terminal-jna/src/main/java/org/jline/terminal/impl/jna/win/WindowsAnsiWriter.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.terminal.impl.jna.win; diff --git a/terminal-jna/src/test/java/org/jline/terminal/impl/jna/JnaNativePtyTest.java b/terminal-jna/src/test/java/org/jline/terminal/impl/jna/JnaNativePtyTest.java index ed9e878ce..47434ab09 100644 --- a/terminal-jna/src/test/java/org/jline/terminal/impl/jna/JnaNativePtyTest.java +++ b/terminal-jna/src/test/java/org/jline/terminal/impl/jna/JnaNativePtyTest.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.terminal.impl.jna; diff --git a/terminal/pom.xml b/terminal/pom.xml index bda7b0d9e..b1a0d3f75 100644 --- a/terminal/pom.xml +++ b/terminal/pom.xml @@ -6,7 +6,7 @@ This software is distributable under the BSD license. See the terms of the BSD license in the documentation provided with this software. - http://www.opensource.org/licenses/bsd-license.php + https://opensource.org/licenses/BSD-3-Clause --> diff --git a/terminal/src/main/java/org/jline/terminal/Attributes.java b/terminal/src/main/java/org/jline/terminal/Attributes.java index 08341db6a..cbe674310 100644 --- a/terminal/src/main/java/org/jline/terminal/Attributes.java +++ b/terminal/src/main/java/org/jline/terminal/Attributes.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.terminal; diff --git a/terminal/src/main/java/org/jline/terminal/Cursor.java b/terminal/src/main/java/org/jline/terminal/Cursor.java index e6f52de56..dc84284fc 100644 --- a/terminal/src/main/java/org/jline/terminal/Cursor.java +++ b/terminal/src/main/java/org/jline/terminal/Cursor.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.terminal; diff --git a/terminal/src/main/java/org/jline/terminal/MouseEvent.java b/terminal/src/main/java/org/jline/terminal/MouseEvent.java index 2533bdc77..35f659ee5 100644 --- a/terminal/src/main/java/org/jline/terminal/MouseEvent.java +++ b/terminal/src/main/java/org/jline/terminal/MouseEvent.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.terminal; diff --git a/terminal/src/main/java/org/jline/terminal/Size.java b/terminal/src/main/java/org/jline/terminal/Size.java index 2886b5f37..08e320e7d 100644 --- a/terminal/src/main/java/org/jline/terminal/Size.java +++ b/terminal/src/main/java/org/jline/terminal/Size.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.terminal; diff --git a/terminal/src/main/java/org/jline/terminal/Terminal.java b/terminal/src/main/java/org/jline/terminal/Terminal.java index fae1acbdb..a855358d7 100644 --- a/terminal/src/main/java/org/jline/terminal/Terminal.java +++ b/terminal/src/main/java/org/jline/terminal/Terminal.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.terminal; diff --git a/terminal/src/main/java/org/jline/terminal/TerminalBuilder.java b/terminal/src/main/java/org/jline/terminal/TerminalBuilder.java index a16f80bbf..6411b350a 100644 --- a/terminal/src/main/java/org/jline/terminal/TerminalBuilder.java +++ b/terminal/src/main/java/org/jline/terminal/TerminalBuilder.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.terminal; diff --git a/terminal/src/main/java/org/jline/terminal/impl/AbstractPosixTerminal.java b/terminal/src/main/java/org/jline/terminal/impl/AbstractPosixTerminal.java index 4994f1aa1..2a36ea688 100644 --- a/terminal/src/main/java/org/jline/terminal/impl/AbstractPosixTerminal.java +++ b/terminal/src/main/java/org/jline/terminal/impl/AbstractPosixTerminal.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.terminal.impl; diff --git a/terminal/src/main/java/org/jline/terminal/impl/AbstractTerminal.java b/terminal/src/main/java/org/jline/terminal/impl/AbstractTerminal.java index 03ead209f..28a82215b 100644 --- a/terminal/src/main/java/org/jline/terminal/impl/AbstractTerminal.java +++ b/terminal/src/main/java/org/jline/terminal/impl/AbstractTerminal.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.terminal.impl; diff --git a/terminal/src/main/java/org/jline/terminal/impl/AbstractWindowsConsoleWriter.java b/terminal/src/main/java/org/jline/terminal/impl/AbstractWindowsConsoleWriter.java index 81de6aa6b..aca6603d2 100644 --- a/terminal/src/main/java/org/jline/terminal/impl/AbstractWindowsConsoleWriter.java +++ b/terminal/src/main/java/org/jline/terminal/impl/AbstractWindowsConsoleWriter.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.terminal.impl; diff --git a/terminal/src/main/java/org/jline/terminal/impl/AbstractWindowsTerminal.java b/terminal/src/main/java/org/jline/terminal/impl/AbstractWindowsTerminal.java index 79e0151bb..308a46ac7 100644 --- a/terminal/src/main/java/org/jline/terminal/impl/AbstractWindowsTerminal.java +++ b/terminal/src/main/java/org/jline/terminal/impl/AbstractWindowsTerminal.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.terminal.impl; diff --git a/terminal/src/main/java/org/jline/terminal/impl/CursorSupport.java b/terminal/src/main/java/org/jline/terminal/impl/CursorSupport.java index 6397eea3d..538ed59d6 100644 --- a/terminal/src/main/java/org/jline/terminal/impl/CursorSupport.java +++ b/terminal/src/main/java/org/jline/terminal/impl/CursorSupport.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.terminal.impl; diff --git a/terminal/src/main/java/org/jline/terminal/impl/DumbTerminal.java b/terminal/src/main/java/org/jline/terminal/impl/DumbTerminal.java index 9affe3e14..b83628a7c 100644 --- a/terminal/src/main/java/org/jline/terminal/impl/DumbTerminal.java +++ b/terminal/src/main/java/org/jline/terminal/impl/DumbTerminal.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.terminal.impl; diff --git a/terminal/src/main/java/org/jline/terminal/impl/ExecPty.java b/terminal/src/main/java/org/jline/terminal/impl/ExecPty.java index 82a180b7b..61659a448 100644 --- a/terminal/src/main/java/org/jline/terminal/impl/ExecPty.java +++ b/terminal/src/main/java/org/jline/terminal/impl/ExecPty.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.terminal.impl; @@ -137,12 +137,12 @@ protected List getFlagsToSet(Attributes attr, Attributes current) { } String undef = System.getProperty("os.name").toLowerCase().startsWith("hp") ? "^-" : "undef"; for (ControlChar cchar : ControlChar.values()) { - if (attr.getControlChar(cchar) != current.getControlChar(cchar)) { + int v = attr.getControlChar(cchar); + if (v >= 0 && v != current.getControlChar(cchar)) { String str = ""; - int v = attr.getControlChar(cchar); commands.add(cchar.name().toLowerCase().substring(1)); if (cchar == ControlChar.VMIN || cchar == ControlChar.VTIME) { - commands.add(Integer.toBinaryString(v)); + commands.add(Integer.toString(v)); } else if (v == 0) { commands.add(undef); diff --git a/terminal/src/main/java/org/jline/terminal/impl/ExternalTerminal.java b/terminal/src/main/java/org/jline/terminal/impl/ExternalTerminal.java index 253e4ed40..92af63ee4 100644 --- a/terminal/src/main/java/org/jline/terminal/impl/ExternalTerminal.java +++ b/terminal/src/main/java/org/jline/terminal/impl/ExternalTerminal.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.terminal.impl; diff --git a/terminal/src/main/java/org/jline/terminal/impl/LineDisciplineTerminal.java b/terminal/src/main/java/org/jline/terminal/impl/LineDisciplineTerminal.java index 171a9b0a0..000a6e67b 100644 --- a/terminal/src/main/java/org/jline/terminal/impl/LineDisciplineTerminal.java +++ b/terminal/src/main/java/org/jline/terminal/impl/LineDisciplineTerminal.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.terminal.impl; diff --git a/terminal/src/main/java/org/jline/terminal/impl/MouseSupport.java b/terminal/src/main/java/org/jline/terminal/impl/MouseSupport.java index d8494cebc..07b6724e9 100644 --- a/terminal/src/main/java/org/jline/terminal/impl/MouseSupport.java +++ b/terminal/src/main/java/org/jline/terminal/impl/MouseSupport.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.terminal.impl; diff --git a/terminal/src/main/java/org/jline/terminal/impl/NativeSignalHandler.java b/terminal/src/main/java/org/jline/terminal/impl/NativeSignalHandler.java index 4d605e833..f39e1b7f1 100644 --- a/terminal/src/main/java/org/jline/terminal/impl/NativeSignalHandler.java +++ b/terminal/src/main/java/org/jline/terminal/impl/NativeSignalHandler.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.terminal.impl; diff --git a/terminal/src/main/java/org/jline/terminal/impl/PosixPtyTerminal.java b/terminal/src/main/java/org/jline/terminal/impl/PosixPtyTerminal.java index ad26785ca..9fc9561b1 100644 --- a/terminal/src/main/java/org/jline/terminal/impl/PosixPtyTerminal.java +++ b/terminal/src/main/java/org/jline/terminal/impl/PosixPtyTerminal.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.terminal.impl; diff --git a/terminal/src/main/java/org/jline/terminal/impl/PosixSysTerminal.java b/terminal/src/main/java/org/jline/terminal/impl/PosixSysTerminal.java index 2546c0c9d..aa6fb3b86 100644 --- a/terminal/src/main/java/org/jline/terminal/impl/PosixSysTerminal.java +++ b/terminal/src/main/java/org/jline/terminal/impl/PosixSysTerminal.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.terminal.impl; diff --git a/terminal/src/main/java/org/jline/terminal/impl/package-info.java b/terminal/src/main/java/org/jline/terminal/impl/package-info.java index 9089b9bd0..a0ee138c6 100644 --- a/terminal/src/main/java/org/jline/terminal/impl/package-info.java +++ b/terminal/src/main/java/org/jline/terminal/impl/package-info.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ /** * JLine 3. diff --git a/terminal/src/main/java/org/jline/terminal/spi/Pty.java b/terminal/src/main/java/org/jline/terminal/spi/Pty.java index 7b2a54928..03363e825 100644 --- a/terminal/src/main/java/org/jline/terminal/spi/Pty.java +++ b/terminal/src/main/java/org/jline/terminal/spi/Pty.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.terminal.spi; diff --git a/terminal/src/main/java/org/jline/utils/AttributedCharSequence.java b/terminal/src/main/java/org/jline/utils/AttributedCharSequence.java index 3333e520e..540110112 100644 --- a/terminal/src/main/java/org/jline/utils/AttributedCharSequence.java +++ b/terminal/src/main/java/org/jline/utils/AttributedCharSequence.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.utils; diff --git a/terminal/src/main/java/org/jline/utils/AttributedString.java b/terminal/src/main/java/org/jline/utils/AttributedString.java index ba0efd6cb..8f612e0d6 100644 --- a/terminal/src/main/java/org/jline/utils/AttributedString.java +++ b/terminal/src/main/java/org/jline/utils/AttributedString.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.utils; diff --git a/terminal/src/main/java/org/jline/utils/AttributedStringBuilder.java b/terminal/src/main/java/org/jline/utils/AttributedStringBuilder.java index 024943be9..0cc3e49b7 100644 --- a/terminal/src/main/java/org/jline/utils/AttributedStringBuilder.java +++ b/terminal/src/main/java/org/jline/utils/AttributedStringBuilder.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.utils; diff --git a/terminal/src/main/java/org/jline/utils/AttributedStyle.java b/terminal/src/main/java/org/jline/utils/AttributedStyle.java index 62a6fd583..c63bae8be 100644 --- a/terminal/src/main/java/org/jline/utils/AttributedStyle.java +++ b/terminal/src/main/java/org/jline/utils/AttributedStyle.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.utils; diff --git a/terminal/src/main/java/org/jline/utils/ClosedException.java b/terminal/src/main/java/org/jline/utils/ClosedException.java index f54450b83..39a1f4ff4 100644 --- a/terminal/src/main/java/org/jline/utils/ClosedException.java +++ b/terminal/src/main/java/org/jline/utils/ClosedException.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.utils; diff --git a/terminal/src/main/java/org/jline/utils/Colors.java b/terminal/src/main/java/org/jline/utils/Colors.java index 13c5e643a..29a7b523a 100644 --- a/terminal/src/main/java/org/jline/utils/Colors.java +++ b/terminal/src/main/java/org/jline/utils/Colors.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.utils; diff --git a/terminal/src/main/java/org/jline/utils/Curses.java b/terminal/src/main/java/org/jline/utils/Curses.java index f668c3f72..9b15b53da 100644 --- a/terminal/src/main/java/org/jline/utils/Curses.java +++ b/terminal/src/main/java/org/jline/utils/Curses.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.utils; diff --git a/terminal/src/main/java/org/jline/utils/DiffHelper.java b/terminal/src/main/java/org/jline/utils/DiffHelper.java index a57b0198b..650c774f6 100644 --- a/terminal/src/main/java/org/jline/utils/DiffHelper.java +++ b/terminal/src/main/java/org/jline/utils/DiffHelper.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.utils; diff --git a/terminal/src/main/java/org/jline/utils/Display.java b/terminal/src/main/java/org/jline/utils/Display.java index a03f22da0..c3201fad1 100644 --- a/terminal/src/main/java/org/jline/utils/Display.java +++ b/terminal/src/main/java/org/jline/utils/Display.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.utils; diff --git a/terminal/src/main/java/org/jline/utils/ExecHelper.java b/terminal/src/main/java/org/jline/utils/ExecHelper.java index 0836682e9..094b480ff 100644 --- a/terminal/src/main/java/org/jline/utils/ExecHelper.java +++ b/terminal/src/main/java/org/jline/utils/ExecHelper.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.utils; diff --git a/terminal/src/main/java/org/jline/utils/InfoCmp.java b/terminal/src/main/java/org/jline/utils/InfoCmp.java index e86d95a69..18082b9a4 100644 --- a/terminal/src/main/java/org/jline/utils/InfoCmp.java +++ b/terminal/src/main/java/org/jline/utils/InfoCmp.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.utils; diff --git a/terminal/src/main/java/org/jline/utils/InputStreamReader.java b/terminal/src/main/java/org/jline/utils/InputStreamReader.java index dd0627627..4289a9ea7 100644 --- a/terminal/src/main/java/org/jline/utils/InputStreamReader.java +++ b/terminal/src/main/java/org/jline/utils/InputStreamReader.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.utils; diff --git a/terminal/src/main/java/org/jline/utils/Levenshtein.java b/terminal/src/main/java/org/jline/utils/Levenshtein.java index 2afb3b9cd..6bdecc626 100644 --- a/terminal/src/main/java/org/jline/utils/Levenshtein.java +++ b/terminal/src/main/java/org/jline/utils/Levenshtein.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.utils; diff --git a/terminal/src/main/java/org/jline/utils/Log.java b/terminal/src/main/java/org/jline/utils/Log.java index 7f17ba872..dced1e14e 100644 --- a/terminal/src/main/java/org/jline/utils/Log.java +++ b/terminal/src/main/java/org/jline/utils/Log.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.utils; diff --git a/terminal/src/main/java/org/jline/utils/NonBlocking.java b/terminal/src/main/java/org/jline/utils/NonBlocking.java index 0f340c4ce..c70c1ec32 100644 --- a/terminal/src/main/java/org/jline/utils/NonBlocking.java +++ b/terminal/src/main/java/org/jline/utils/NonBlocking.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.utils; diff --git a/terminal/src/main/java/org/jline/utils/NonBlockingInputStream.java b/terminal/src/main/java/org/jline/utils/NonBlockingInputStream.java index a5a0d96f0..e5f1cfbfb 100644 --- a/terminal/src/main/java/org/jline/utils/NonBlockingInputStream.java +++ b/terminal/src/main/java/org/jline/utils/NonBlockingInputStream.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.utils; diff --git a/terminal/src/main/java/org/jline/utils/NonBlockingInputStreamImpl.java b/terminal/src/main/java/org/jline/utils/NonBlockingInputStreamImpl.java index c50ecbc60..3f702b9ab 100644 --- a/terminal/src/main/java/org/jline/utils/NonBlockingInputStreamImpl.java +++ b/terminal/src/main/java/org/jline/utils/NonBlockingInputStreamImpl.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.utils; diff --git a/terminal/src/main/java/org/jline/utils/NonBlockingPumpInputStream.java b/terminal/src/main/java/org/jline/utils/NonBlockingPumpInputStream.java index 3d1837ade..a328be4ec 100644 --- a/terminal/src/main/java/org/jline/utils/NonBlockingPumpInputStream.java +++ b/terminal/src/main/java/org/jline/utils/NonBlockingPumpInputStream.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.utils; diff --git a/terminal/src/main/java/org/jline/utils/NonBlockingPumpReader.java b/terminal/src/main/java/org/jline/utils/NonBlockingPumpReader.java index 1fcf2ba24..4e845c79a 100644 --- a/terminal/src/main/java/org/jline/utils/NonBlockingPumpReader.java +++ b/terminal/src/main/java/org/jline/utils/NonBlockingPumpReader.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.utils; diff --git a/terminal/src/main/java/org/jline/utils/NonBlockingReader.java b/terminal/src/main/java/org/jline/utils/NonBlockingReader.java index 52a9bdeaa..2aeee53df 100644 --- a/terminal/src/main/java/org/jline/utils/NonBlockingReader.java +++ b/terminal/src/main/java/org/jline/utils/NonBlockingReader.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.utils; diff --git a/terminal/src/main/java/org/jline/utils/NonBlockingReaderImpl.java b/terminal/src/main/java/org/jline/utils/NonBlockingReaderImpl.java index 481cdee39..172ae1579 100644 --- a/terminal/src/main/java/org/jline/utils/NonBlockingReaderImpl.java +++ b/terminal/src/main/java/org/jline/utils/NonBlockingReaderImpl.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.utils; diff --git a/terminal/src/main/java/org/jline/utils/OSUtils.java b/terminal/src/main/java/org/jline/utils/OSUtils.java index c4a19ebaf..28cf7ead9 100644 --- a/terminal/src/main/java/org/jline/utils/OSUtils.java +++ b/terminal/src/main/java/org/jline/utils/OSUtils.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.utils; diff --git a/terminal/src/main/java/org/jline/utils/PumpReader.java b/terminal/src/main/java/org/jline/utils/PumpReader.java index aff2613d5..4dd46b782 100644 --- a/terminal/src/main/java/org/jline/utils/PumpReader.java +++ b/terminal/src/main/java/org/jline/utils/PumpReader.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.utils; diff --git a/terminal/src/main/java/org/jline/utils/ShutdownHooks.java b/terminal/src/main/java/org/jline/utils/ShutdownHooks.java index a84bab8a7..276c0bccd 100644 --- a/terminal/src/main/java/org/jline/utils/ShutdownHooks.java +++ b/terminal/src/main/java/org/jline/utils/ShutdownHooks.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.utils; diff --git a/terminal/src/main/java/org/jline/utils/Signals.java b/terminal/src/main/java/org/jline/utils/Signals.java index 4b0084525..1afab42c8 100644 --- a/terminal/src/main/java/org/jline/utils/Signals.java +++ b/terminal/src/main/java/org/jline/utils/Signals.java @@ -4,10 +4,11 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.utils; +import java.lang.reflect.Constructor; import java.lang.reflect.Proxy; import java.util.Objects; @@ -85,13 +86,16 @@ public static void unregister(String name, Object previous) { private static Object doRegister(String name, Object handler) throws Exception { Log.trace(() -> "Registering signal " + name + " with handler " + toString(handler)); - if ("QUIT".equals(name) || "INFO".equals(name) && "9".equals(System.getProperty("java.specification.version"))) { + Class signalClass = Class.forName("sun.misc.Signal"); + Constructor constructor = signalClass.getConstructor(String.class); + Object signal; + try { + signal = constructor.newInstance(name); + } catch (IllegalArgumentException e) { Log.trace(() -> "Ignoring unsupported signal " + name); return null; } - Class signalClass = Class.forName("sun.misc.Signal"); Class signalHandlerClass = Class.forName("sun.misc.SignalHandler"); - Object signal = signalClass.getConstructor(String.class).newInstance(name); return signalClass.getMethod("handle", signalClass, signalHandlerClass) .invoke(null, signal, handler); } diff --git a/terminal/src/main/java/org/jline/utils/Status.java b/terminal/src/main/java/org/jline/utils/Status.java index ea011a6b2..f5442d8e6 100644 --- a/terminal/src/main/java/org/jline/utils/Status.java +++ b/terminal/src/main/java/org/jline/utils/Status.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.utils; diff --git a/terminal/src/main/java/org/jline/utils/StyleResolver.java b/terminal/src/main/java/org/jline/utils/StyleResolver.java index 08f1a611c..f093a88cb 100644 --- a/terminal/src/main/java/org/jline/utils/StyleResolver.java +++ b/terminal/src/main/java/org/jline/utils/StyleResolver.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.utils; diff --git a/terminal/src/main/java/org/jline/utils/WCWidth.java b/terminal/src/main/java/org/jline/utils/WCWidth.java index 99516cd4c..dc93d4286 100644 --- a/terminal/src/main/java/org/jline/utils/WCWidth.java +++ b/terminal/src/main/java/org/jline/utils/WCWidth.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.utils; diff --git a/terminal/src/main/java/org/jline/utils/WriterOutputStream.java b/terminal/src/main/java/org/jline/utils/WriterOutputStream.java index 9031d533f..a23696771 100644 --- a/terminal/src/main/java/org/jline/utils/WriterOutputStream.java +++ b/terminal/src/main/java/org/jline/utils/WriterOutputStream.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.utils; diff --git a/terminal/src/main/java/org/jline/utils/package-info.java b/terminal/src/main/java/org/jline/utils/package-info.java index b17a0b561..fc49ec23c 100644 --- a/terminal/src/main/java/org/jline/utils/package-info.java +++ b/terminal/src/main/java/org/jline/utils/package-info.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ /** * JLine 3. diff --git a/terminal/src/main/resources/org/jline/utils/capabilities.txt b/terminal/src/main/resources/org/jline/utils/capabilities.txt index 729be3f15..2d146f30a 100644 --- a/terminal/src/main/resources/org/jline/utils/capabilities.txt +++ b/terminal/src/main/resources/org/jline/utils/capabilities.txt @@ -4,7 +4,7 @@ # This software is distributable under the BSD license. See the terms of the # BSD license in the documentation provided with this software. # -# http://www.opensource.org/licenses/bsd-license.php +# https://opensource.org/licenses/BSD-3-Clause # auto_left_margin, bw, bw diff --git a/terminal/src/main/resources/org/jline/utils/colors.txt b/terminal/src/main/resources/org/jline/utils/colors.txt index 5b6ef4faf..0e08642f0 100644 --- a/terminal/src/main/resources/org/jline/utils/colors.txt +++ b/terminal/src/main/resources/org/jline/utils/colors.txt @@ -4,7 +4,7 @@ # This software is distributable under the BSD license. See the terms of the # BSD license in the documentation provided with this software. # -# http://www.opensource.org/licenses/bsd-license.php +# https://opensource.org/licenses/BSD-3-Clause # black diff --git a/terminal/src/main/resources/org/jline/utils/dumb-colors.caps b/terminal/src/main/resources/org/jline/utils/dumb-colors.caps new file mode 100644 index 000000000..41c36bb9b --- /dev/null +++ b/terminal/src/main/resources/org/jline/utils/dumb-colors.caps @@ -0,0 +1,4 @@ +dumb-color|80-column dumb tty with 256 coors, + am, + colors#256, cols#80, + bel=^G, cr=^M, cud1=^J, ind=^J, diff --git a/terminal/src/test/java/org/jline/terminal/impl/AbstractWindowsTerminalTest.java b/terminal/src/test/java/org/jline/terminal/impl/AbstractWindowsTerminalTest.java index 3a4af9bab..be564e3c9 100644 --- a/terminal/src/test/java/org/jline/terminal/impl/AbstractWindowsTerminalTest.java +++ b/terminal/src/test/java/org/jline/terminal/impl/AbstractWindowsTerminalTest.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.terminal.impl; diff --git a/terminal/src/test/java/org/jline/terminal/impl/ExecPtyTest.java b/terminal/src/test/java/org/jline/terminal/impl/ExecPtyTest.java index 88d36b6ce..dae56fa3d 100644 --- a/terminal/src/test/java/org/jline/terminal/impl/ExecPtyTest.java +++ b/terminal/src/test/java/org/jline/terminal/impl/ExecPtyTest.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.terminal.impl; diff --git a/terminal/src/test/java/org/jline/terminal/impl/PosixSysTerminalTest.java b/terminal/src/test/java/org/jline/terminal/impl/PosixSysTerminalTest.java index bf154c17f..6b1c11c24 100644 --- a/terminal/src/test/java/org/jline/terminal/impl/PosixSysTerminalTest.java +++ b/terminal/src/test/java/org/jline/terminal/impl/PosixSysTerminalTest.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.terminal.impl; diff --git a/terminal/src/test/java/org/jline/utils/AttributedCharSequenceTest.java b/terminal/src/test/java/org/jline/utils/AttributedCharSequenceTest.java index 13ca9a9aa..15ad28d72 100644 --- a/terminal/src/test/java/org/jline/utils/AttributedCharSequenceTest.java +++ b/terminal/src/test/java/org/jline/utils/AttributedCharSequenceTest.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.utils; diff --git a/terminal/src/test/java/org/jline/utils/AttributedStringBuilderTest.java b/terminal/src/test/java/org/jline/utils/AttributedStringBuilderTest.java index fabfdd230..08533af87 100644 --- a/terminal/src/test/java/org/jline/utils/AttributedStringBuilderTest.java +++ b/terminal/src/test/java/org/jline/utils/AttributedStringBuilderTest.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.utils; diff --git a/terminal/src/test/java/org/jline/utils/ColorsTest.java b/terminal/src/test/java/org/jline/utils/ColorsTest.java index c7a21b67b..2a60ef03d 100644 --- a/terminal/src/test/java/org/jline/utils/ColorsTest.java +++ b/terminal/src/test/java/org/jline/utils/ColorsTest.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.utils; diff --git a/terminal/src/test/java/org/jline/utils/CursesTest.java b/terminal/src/test/java/org/jline/utils/CursesTest.java index 70e5b5d54..0d9038567 100644 --- a/terminal/src/test/java/org/jline/utils/CursesTest.java +++ b/terminal/src/test/java/org/jline/utils/CursesTest.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.utils; diff --git a/terminal/src/test/java/org/jline/utils/InfoCmpTest.java b/terminal/src/test/java/org/jline/utils/InfoCmpTest.java index e60b0566c..ea63b769c 100644 --- a/terminal/src/test/java/org/jline/utils/InfoCmpTest.java +++ b/terminal/src/test/java/org/jline/utils/InfoCmpTest.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.utils; diff --git a/terminal/src/test/java/org/jline/utils/PumpReaderTest.java b/terminal/src/test/java/org/jline/utils/PumpReaderTest.java index 1bb140bc3..9bcfd3432 100644 --- a/terminal/src/test/java/org/jline/utils/PumpReaderTest.java +++ b/terminal/src/test/java/org/jline/utils/PumpReaderTest.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.utils; diff --git a/terminal/src/test/java/org/jline/utils/WriterOutputStreamTest.java b/terminal/src/test/java/org/jline/utils/WriterOutputStreamTest.java index 8ccbc54d1..a89d461d2 100644 --- a/terminal/src/test/java/org/jline/utils/WriterOutputStreamTest.java +++ b/terminal/src/test/java/org/jline/utils/WriterOutputStreamTest.java @@ -4,7 +4,7 @@ * This software is distributable under the BSD license. See the terms of the * BSD license in the documentation provided with this software. * - * http://www.opensource.org/licenses/bsd-license.php + * https://opensource.org/licenses/BSD-3-Clause */ package org.jline.utils;