#852 Ignore case doesn't works when using Search in AS with russian text fixed

This commit is contained in:
honfika@gmail.com
2015-04-10 21:37:57 +02:00
parent 7699514bce
commit dc21854c3b
4 changed files with 8 additions and 8 deletions

View File

@@ -474,7 +474,7 @@
</target>
<target name="git-tag">
<exec executable="git" outputproperty="GITTAG" failonerror="true">
<exec executable="git" outputproperty="GITTAG" failonerror="true">
<arg value="rev-parse"/>
<arg value="HEAD"/>
</exec>

View File

@@ -1352,9 +1352,9 @@ public final class MainPanel extends JPanel implements ActionListener, TreeSelec
}
Pattern pat;
if (regexp) {
pat = Pattern.compile(txt, ignoreCase ? Pattern.CASE_INSENSITIVE : 0);
pat = Pattern.compile(txt, ignoreCase ? (Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE) : 0);
} else {
pat = Pattern.compile(Pattern.quote(txt), ignoreCase ? Pattern.CASE_INSENSITIVE : 0);
pat = Pattern.compile(Pattern.quote(txt), ignoreCase ? (Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE) : 0);
}
List<TextTag> textTags = new ArrayList<>();
for (Tag tag : swf.tags) {
@@ -2356,7 +2356,7 @@ public final class MainPanel extends JPanel implements ActionListener, TreeSelec
if (swf == null) {
swf = swfs.get(0).get(0);
}
updateUi(swf);
}
} else {

View File

@@ -180,8 +180,8 @@ public class ABCPanel extends JPanel implements ItemListener, ActionListener, Se
ClassesListTreeModel clModel = (ClassesListTreeModel) scriptsNode;
List<ScriptPack> allpacks = clModel.getList();
final Pattern pat = regexp
? Pattern.compile(txt, ignoreCase ? Pattern.CASE_INSENSITIVE : 0)
: Pattern.compile(Pattern.quote(txt), ignoreCase ? Pattern.CASE_INSENSITIVE : 0);
? Pattern.compile(txt, ignoreCase ? (Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE) : 0)
: Pattern.compile(Pattern.quote(txt), ignoreCase ? (Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE) : 0);
int pos = 0;
for (final ScriptPack pack : allpacks) {
pos++;

View File

@@ -252,9 +252,9 @@ public class ActionPanel extends JPanel implements ActionListener, SearchListene
final List<ActionSearchResult> found = new ArrayList<>();
Pattern pat;
if (regexp) {
pat = Pattern.compile(txt, ignoreCase ? Pattern.CASE_INSENSITIVE : 0);
pat = Pattern.compile(txt, ignoreCase ? (Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE) : 0);
} else {
pat = Pattern.compile(Pattern.quote(txt), ignoreCase ? Pattern.CASE_INSENSITIVE : 0);
pat = Pattern.compile(Pattern.quote(txt), ignoreCase ? (Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE) : 0);
}
int pos = 0;
for (Entry<String, ASMSource> item : asms.entrySet()) {