aboutsummaryrefslogtreecommitdiffstats
path: root/src/net/java
diff options
context:
space:
mode:
authorMarin <m.dzhigarov@gmail.com>2013-11-27 09:04:02 +0200
committerMarin <m.dzhigarov@gmail.com>2013-12-06 12:07:05 +0200
commit9bb91f0a8a75a8841772e9deeb4ff63a55959cb9 (patch)
treeda66ca215ea2b1e17a287de32256dbc3077020b6 /src/net/java
parentf031023d769cd46557c878b6d411e5914428db9e (diff)
downloadjitsi-9bb91f0a8a75a8841772e9deeb4ff63a55959cb9.zip
jitsi-9bb91f0a8a75a8841772e9deeb4ff63a55959cb9.tar.gz
jitsi-9bb91f0a8a75a8841772e9deeb4ff63a55959cb9.tar.bz2
Property editor search field is now case insensitive and searching by value is possible.
Diffstat (limited to 'src/net/java')
-rw-r--r--src/net/java/sip/communicator/plugin/propertieseditor/SearchField.java11
-rw-r--r--src/net/java/sip/communicator/plugin/propertieseditor/propertieseditor.manifest.mf2
2 files changed, 8 insertions, 5 deletions
diff --git a/src/net/java/sip/communicator/plugin/propertieseditor/SearchField.java b/src/net/java/sip/communicator/plugin/propertieseditor/SearchField.java
index e2e1f3d..99bcf52 100644
--- a/src/net/java/sip/communicator/plugin/propertieseditor/SearchField.java
+++ b/src/net/java/sip/communicator/plugin/propertieseditor/SearchField.java
@@ -19,8 +19,8 @@ import net.java.sip.communicator.plugin.desktoputil.*;
import net.java.sip.communicator.plugin.desktoputil.plaf.*;
import net.java.sip.communicator.util.skin.*;
+import org.apache.commons.lang3.*;
import org.jitsi.service.configuration.*;
-import org.jitsi.util.*;
/**
* The field used for searching in the properties table.
@@ -255,7 +255,7 @@ public class SearchField
* not want to keep it alive forever.
*/
if ((prevFilterTime != 0)
- && StringUtils.isEquals(filter, prevFilter))
+ && StringUtils.equalsIgnoreCase(filter, prevFilter))
{
long timeout
= FILTER_THREAD_TIMEOUT
@@ -287,7 +287,10 @@ public class SearchField
for (String property : properties)
{
- if ((filter == null) || property.contains(filter))
+ String value = (String) confService.getProperty(property);
+ if ((filter == null)
+ || StringUtils.containsIgnoreCase(property, filter)
+ || StringUtils.containsIgnoreCase(value, filter))
{
rows.add(
new Object[]
@@ -300,7 +303,7 @@ public class SearchField
// If in the meantime someone has changed the filter, we don't want
// to update the GUI but filter the results again.
- if (StringUtils.isEquals(filter, this.filter))
+ if (StringUtils.equalsIgnoreCase(filter, this.filter))
{
LowPriorityEventQueue.invokeLater(
new Runnable()
diff --git a/src/net/java/sip/communicator/plugin/propertieseditor/propertieseditor.manifest.mf b/src/net/java/sip/communicator/plugin/propertieseditor/propertieseditor.manifest.mf
index e408fe0..0d66769 100644
--- a/src/net/java/sip/communicator/plugin/propertieseditor/propertieseditor.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/propertieseditor/propertieseditor.manifest.mf
@@ -7,7 +7,7 @@ System-Bundle: yes
Import-Package: org.osgi.framework,
org.jitsi.service.configuration,
org.jitsi.service.resources,
- org.jitsi.util,
+ org.apache.commons.lang3,
net.java.sip.communicator.service.resources,
net.java.sip.communicator.service.gui,
net.java.sip.communicator.service.gui.event,