eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-06-16 04:26:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3633 from Akarshit/gsoc-CMaccented

Browse Source 
Accented characters getting searched
This commit is contained in:
Ben Fry
2015-08-16 08:17:57 -04:00
parent 4e6d601d79 6b94b3e158
commit 8cebd64067
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/processing/app/contrib/ContributionListing.java
+11 -4
View File
@@ -23,8 +23,10 @@ package processing.app.contrib;
import java.io.*;
import java.net.*;
import java.text.Normalizer;
import java.util.*;
import java.util.concurrent.locks.ReentrantLock;
import java.util.regex.Pattern;
import processing.app.Base;
import processing.app.Library;
@@ -284,13 +286,18 @@ public class ContributionListing {
filter = ".*" + filter.toLowerCase() + ".*";
return contrib.getAuthorList() != null && contrib.getAuthorList().toLowerCase().matches(filter)
|| contrib.getSentence() != null && contrib.getSentence().toLowerCase().matches(filter)
|| contrib.getParagraph() != null && contrib.getParagraph().toLowerCase().matches(filter)
return contrib.getAuthorList() != null && deAccent(contrib.getAuthorList().toLowerCase()).matches(filter)
|| contrib.getSentence() != null && deAccent(contrib.getSentence().toLowerCase()).matches(filter)
|| contrib.getParagraph() != null && deAccent(contrib.getParagraph().toLowerCase()).matches(filter)
|| contrib.hasCategory(filter)
|| contrib.getName() != null && contrib.getName().toLowerCase().matches(filter);
|| contrib.getName() != null && deAccent(contrib.getName().toLowerCase()).matches(filter);
}
public String deAccent(String str) {
String nfdNormalizedString = Normalizer.normalize(str, Normalizer.Form.NFD);
Pattern pattern = Pattern.compile("\\p{InCombiningDiacriticalMarks}+");
return pattern.matcher(nfdNormalizedString).replaceAll("");
}
private boolean isProperty(String property) {
return property.startsWith("updat") || property.startsWith("upgrad")