Property editor search field is now case insensitive and searching by value is possible.

cusax-fix
Marin 12 years ago
parent f031023d76
commit 9bb91f0a8a

@ -81,6 +81,7 @@
<classpathentry kind="lib" path="lib/os-specific/mac/OrangeExtensions.jar"/> <classpathentry kind="lib" path="lib/os-specific/mac/OrangeExtensions.jar"/>
<classpathentry kind="lib" path="lib/installer-exclude/jmork-1.0.5-SNAPSHOT.jar" sourcepath="/jmork"/> <classpathentry kind="lib" path="lib/installer-exclude/jmork-1.0.5-SNAPSHOT.jar" sourcepath="/jmork"/>
<classpathentry kind="lib" path="lib/installer-exclude/bcprov-jdk15on-149.jar"/> <classpathentry kind="lib" path="lib/installer-exclude/bcprov-jdk15on-149.jar"/>
<classpathentry kind="lib" path="lib/installer-exclude/commons-lang3-3.1.jar"/>
<classpathentry kind="lib" path="lib/installer-exclude/bccontrib-1.0-SNAPSHOT.jar"/> <classpathentry kind="lib" path="lib/installer-exclude/bccontrib-1.0-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="lib/installer-exclude/zrtp4j-light.jar"/> <classpathentry kind="lib" path="lib/installer-exclude/zrtp4j-light.jar"/>
<classpathentry kind="lib" path="lib/installer-exclude/jcalendar-1.4.jar"/> <classpathentry kind="lib" path="lib/installer-exclude/jcalendar-1.4.jar"/>

@ -1044,7 +1044,7 @@
bundle-plugin-icqaccregwizz,bundle-plugin-jabberaccregwizz, bundle-plugin-icqaccregwizz,bundle-plugin-jabberaccregwizz,
bundle-plugin-msnaccregwizz,bundle-plugin-sipaccregwizz, bundle-plugin-msnaccregwizz,bundle-plugin-sipaccregwizz,
bundle-plugin-yahooaccregwizz,bundle-plugin-aimaccregwizz, bundle-plugin-yahooaccregwizz,bundle-plugin-aimaccregwizz,
bundle-commons-codec,bundle-httputil,bundle-plugin-spellcheck, bundle-commons-codec,bundle-commons-lang,bundle-httputil,bundle-plugin-spellcheck,
bundle-version-impl,bundle-shutdown-timeout,bundle-windows-clean-shutdown, bundle-version-impl,bundle-shutdown-timeout,bundle-windows-clean-shutdown,
bundle-growlnotification,bundle-swingnotification,bundle-galagonotification, bundle-growlnotification,bundle-swingnotification,bundle-galagonotification,
bundle-sparkle, bundle-plugin-branding, bundle-sparkle, bundle-plugin-branding,
@ -2125,6 +2125,18 @@ javax.swing.event, javax.swing.border"/>
</jar> </jar>
</target> </target>
<!--BUNDLE-COMMONS-LANG -->
<target name="bundle-commons-lang">
<jar compress="true" destfile="${bundles.dest}/commons-lang.jar"
filesetmanifest="merge">
<zipfileset src="${lib.noinst}/commons-lang3-3.1.jar" prefix=""/>
<manifest>
<attribute name="System-Bundle" value="yes"/>
</manifest>
</jar>
</target>
<!--BUNDLE-HTTPUTIL --> <!--BUNDLE-HTTPUTIL -->
<target name="bundle-httputil"> <target name="bundle-httputil">
<!-- Create the httputil.jar--> <!-- Create the httputil.jar-->

@ -29,7 +29,8 @@ org.osgi.framework.system.packages.extra= \
felix.auto.start.10= \ felix.auto.start.10= \
reference:file:lib/bundle/org.apache.felix.bundlerepository-1.6.4.jar \ reference:file:lib/bundle/org.apache.felix.bundlerepository-1.6.4.jar \
reference:file:sc-bundles/bouncycastle.jar \ reference:file:sc-bundles/bouncycastle.jar \
reference:file:sc-bundles/bccontrib.jar reference:file:sc-bundles/bccontrib.jar \
reference:file:sc-bundles/commons-lang.jar
# file:lib/bundle/shell.jar \ # file:lib/bundle/shell.jar \
# file:lib/bundle/servicebinder.jar \ # file:lib/bundle/servicebinder.jar \

@ -19,8 +19,8 @@
import net.java.sip.communicator.plugin.desktoputil.plaf.*; import net.java.sip.communicator.plugin.desktoputil.plaf.*;
import net.java.sip.communicator.util.skin.*; import net.java.sip.communicator.util.skin.*;
import org.apache.commons.lang3.*;
import org.jitsi.service.configuration.*; import org.jitsi.service.configuration.*;
import org.jitsi.util.*;
/** /**
* The field used for searching in the properties table. * The field used for searching in the properties table.
@ -255,7 +255,7 @@ private void runInFilterThread()
* not want to keep it alive forever. * not want to keep it alive forever.
*/ */
if ((prevFilterTime != 0) if ((prevFilterTime != 0)
&& StringUtils.isEquals(filter, prevFilter)) && StringUtils.equalsIgnoreCase(filter, prevFilter))
{ {
long timeout long timeout
= FILTER_THREAD_TIMEOUT = FILTER_THREAD_TIMEOUT
@ -287,7 +287,10 @@ private void runInFilterThread()
for (String property : properties) 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( rows.add(
new Object[] new Object[]
@ -300,7 +303,7 @@ private void runInFilterThread()
// If in the meantime someone has changed the filter, we don't want // If in the meantime someone has changed the filter, we don't want
// to update the GUI but filter the results again. // to update the GUI but filter the results again.
if (StringUtils.isEquals(filter, this.filter)) if (StringUtils.equalsIgnoreCase(filter, this.filter))
{ {
LowPriorityEventQueue.invokeLater( LowPriorityEventQueue.invokeLater(
new Runnable() new Runnable()

@ -7,7 +7,7 @@ System-Bundle: yes
Import-Package: org.osgi.framework, Import-Package: org.osgi.framework,
org.jitsi.service.configuration, org.jitsi.service.configuration,
org.jitsi.service.resources, org.jitsi.service.resources,
org.jitsi.util, org.apache.commons.lang3,
net.java.sip.communicator.service.resources, net.java.sip.communicator.service.resources,
net.java.sip.communicator.service.gui, net.java.sip.communicator.service.gui,
net.java.sip.communicator.service.gui.event, net.java.sip.communicator.service.gui.event,

Loading…
Cancel
Save