|
@@ -25,11 +25,11 @@ package com.dmdirc.addons.tabcompletion_bash;
|
25
|
25
|
import com.dmdirc.interfaces.WindowModel;
|
26
|
26
|
import com.dmdirc.ui.input.AdditionalTabTargets;
|
27
|
27
|
import com.dmdirc.ui.input.TabCompleter;
|
28
|
|
-import com.dmdirc.ui.input.TabCompletionMatches;
|
29
|
28
|
import com.dmdirc.ui.input.tabstyles.TabCompletionResult;
|
30
|
29
|
import com.dmdirc.ui.input.tabstyles.TabCompletionStyle;
|
31
|
30
|
|
32
|
31
|
import java.awt.Toolkit;
|
|
32
|
+import java.util.List;
|
33
|
33
|
import java.util.Locale;
|
34
|
34
|
|
35
|
35
|
public class BashStyle implements TabCompletionStyle {
|
|
@@ -61,7 +61,7 @@ public class BashStyle implements TabCompletionStyle {
|
61
|
61
|
final int end, final boolean shiftPressed,
|
62
|
62
|
final AdditionalTabTargets additional) {
|
63
|
63
|
final String word = original.substring(start, end);
|
64
|
|
- final TabCompletionMatches res = tabCompleter.complete(word, additional);
|
|
64
|
+ final List<String> res = tabCompleter.complete(word, additional);
|
65
|
65
|
|
66
|
66
|
if (start == lastPosition && word.equals(lastWord)) {
|
67
|
67
|
tabCount++;
|
|
@@ -71,14 +71,14 @@ public class BashStyle implements TabCompletionStyle {
|
71
|
71
|
tabCount = 1;
|
72
|
72
|
}
|
73
|
73
|
|
74
|
|
- if (res.getResultCount() == 0) {
|
|
74
|
+ if (res.isEmpty()) {
|
75
|
75
|
Toolkit.getDefaultToolkit().beep();
|
76
|
76
|
|
77
|
77
|
return null;
|
78
|
|
- } else if (res.getResultCount() == 1) {
|
|
78
|
+ } else if (res.size() == 1) {
|
79
|
79
|
// One result, just replace it
|
80
|
80
|
|
81
|
|
- final String result = res.getResults().get(0);
|
|
81
|
+ final String result = res.get(0);
|
82
|
82
|
|
83
|
83
|
return new TabCompletionResult(
|
84
|
84
|
original.substring(0, start) + result + original.substring(end),
|
|
@@ -104,16 +104,16 @@ public class BashStyle implements TabCompletionStyle {
|
104
|
104
|
*
|
105
|
105
|
* @return longest possible substring matching all results
|
106
|
106
|
*/
|
107
|
|
- private String getBestSubstring(final TabCompletionMatches res) {
|
108
|
|
- if (res.getResultCount() == 0) {
|
|
107
|
+ private String getBestSubstring(final List<String> res) {
|
|
108
|
+ if (res.isEmpty()) {
|
109
|
109
|
return "";
|
110
|
110
|
}
|
111
|
111
|
|
112
|
112
|
final boolean caseSensitive = window.getConfigManager()
|
113
|
113
|
.getOptionBool("tabcompletion", "casesensitive");
|
114
|
114
|
|
115
|
|
- String substring = res.getResults().get(0);
|
116
|
|
- for (String entry : res.getResults()) {
|
|
115
|
+ String substring = res.get(0);
|
|
116
|
+ for (String entry : res) {
|
117
|
117
|
if (caseSensitive) {
|
118
|
118
|
while (!entry.startsWith(substring)) {
|
119
|
119
|
substring = substring.substring(0, substring.length() - 1);
|