Support for core changes.

Change-Id: Id53cffeafe14198df4aeb6f18174d56d33fe9d81
Depends-On: I24dfd19a887a4bafe767aa24377d6dbeb305f77d
Reviewed-on: http://gerrit.dmdirc.com/3868
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Build Manager

tabcompletion_bash/src/com/dmdirc/addons/tabcompletion_bash/BashStyle.java

@@ -25,11 +25,12 @@ package com.dmdirc.addons.tabcompletion_bash;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleter;
-import com.dmdirc.ui.input.TabCompleterResult;
+import com.dmdirc.ui.input.TabCompletionMatches;
 import com.dmdirc.ui.input.tabstyles.TabCompletionResult;
 import com.dmdirc.ui.input.tabstyles.TabCompletionStyle;
 
 import java.awt.Toolkit;
+import java.util.Locale;
 
 public class BashStyle implements TabCompletionStyle {
 
@@ -60,7 +61,7 @@ public class BashStyle implements TabCompletionStyle {
             final int end, final boolean shiftPressed,
             final AdditionalTabTargets additional) {
         final String word = original.substring(start, end);
-        final TabCompleterResult res = tabCompleter.complete(word, additional);
+        final TabCompletionMatches res = tabCompleter.complete(word, additional);
 
         if (start == lastPosition && word.equals(lastWord)) {
             tabCount++;
@@ -85,7 +86,7 @@ public class BashStyle implements TabCompletionStyle {
         } else {
             // Multiple results
 
-            final String sub = res.getBestSubstring();
+            final String sub = getBestSubstring(res);
             if (sub.equalsIgnoreCase(word) && tabCount >= 2) {
                 window.addLine("tabCompletion", res.toString());
 
@@ -98,4 +99,34 @@ public class BashStyle implements TabCompletionStyle {
         }
     }
 
+    /**
+     * Returns the longest substring that matches all results.
+     *
+     * @return longest possible substring matching all results
+     */
+    private String getBestSubstring(final TabCompletionMatches res) {
+        if (res.getResultCount() == 0) {
+            return "";
+        }
+
+        final boolean caseSensitive = window.getConfigManager()
+                .getOptionBool("tabcompletion", "casesensitive");
+
+        String substring = res.getResults().get(0);
+        for (String entry : res.getResults()) {
+            if (caseSensitive) {
+                while (!entry.startsWith(substring)) {
+                    substring = substring.substring(0, substring.length() - 1);
+                }
+            } else {
+                while (!entry.toLowerCase(Locale.getDefault()).startsWith(
+                        substring.toLowerCase(Locale.getDefault()))) {
+                    substring = substring.substring(0, substring.length() - 1);
+                }
+            }
+        }
+
+        return substring;
+    }
+
 }

tabcompletion_mirc/src/com/dmdirc/addons/tabcompletion_mirc/MircStyle.java

@@ -26,7 +26,7 @@ import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleter;
-import com.dmdirc.ui.input.TabCompleterResult;
+import com.dmdirc.ui.input.TabCompletionMatches;
 import com.dmdirc.ui.input.tabstyles.TabCompletionResult;
 import com.dmdirc.ui.input.tabstyles.TabCompletionStyle;
 
@@ -63,7 +63,7 @@ public class MircStyle implements TabCompletionStyle {
         final String word = original.substring(start, end);
         final String target;
         if (word.equals(lastWord)) {
-            final TabCompleterResult res = tabCompleter.complete(tabString, additional);
+            final TabCompletionMatches res = tabCompleter.complete(tabString, additional);
             Collections.sort(res.getResults(), String.CASE_INSENSITIVE_ORDER);
             // We're continuing to tab through
             target = res.getResults().get((res.getResults().indexOf(lastWord) + (shiftPressed ? -1
@@ -71,7 +71,7 @@ public class MircStyle implements TabCompletionStyle {
                     .getResults().size());
         } else {
             // New tab target
-            final TabCompleterResult res = tabCompleter.complete(word, additional);
+            final TabCompletionMatches res = tabCompleter.complete(word, additional);
 
             if (res.getResultCount() == 0) {
                 Toolkit.getDefaultToolkit().beep();