geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lin...@apache.org
Subject svn commit: r687436 - in /geronimo/server/branches/2.1/plugins/debugviews/debugviews-portlets/src/main: resources/debugviews.properties resources/debugviews_zh.properties webapp/WEB-INF/view/jndiview/view.jsp
Date Wed, 20 Aug 2008 20:06:28 GMT
Author: linsun
Date: Wed Aug 20 13:06:27 2008
New Revision: 687436

URL: http://svn.apache.org/viewvc?rev=687436&view=rev
Log:
GERONIMO-4235 - JNDI search should be case-insensitive by default

Modified:
    geronimo/server/branches/2.1/plugins/debugviews/debugviews-portlets/src/main/resources/debugviews.properties
    geronimo/server/branches/2.1/plugins/debugviews/debugviews-portlets/src/main/resources/debugviews_zh.properties
    geronimo/server/branches/2.1/plugins/debugviews/debugviews-portlets/src/main/webapp/WEB-INF/view/jndiview/view.jsp

Modified: geronimo/server/branches/2.1/plugins/debugviews/debugviews-portlets/src/main/resources/debugviews.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/debugviews/debugviews-portlets/src/main/resources/debugviews.properties?rev=687436&r1=687435&r2=687436&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/debugviews/debugviews-portlets/src/main/resources/debugviews.properties
(original)
+++ geronimo/server/branches/2.1/plugins/debugviews/debugviews-portlets/src/main/resources/debugviews.properties
Wed Aug 20 13:06:27 2008
@@ -46,6 +46,7 @@
 
 jndiview.help.content            = This view can be used to view JNDI context for various
modules.
 jndiview.help.title              = This is the help for the Geronimo Administration JNDI
VIEW page.
+jndiview.view.caseSensitive      = Case Sensitive
 jndiview.view.searchOnlySelected = Search only selected
 jndiview.view.searchText         = Search Text
 

Modified: geronimo/server/branches/2.1/plugins/debugviews/debugviews-portlets/src/main/resources/debugviews_zh.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/debugviews/debugviews-portlets/src/main/resources/debugviews_zh.properties?rev=687436&r1=687435&r2=687436&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/debugviews/debugviews-portlets/src/main/resources/debugviews_zh.properties
(original)
+++ geronimo/server/branches/2.1/plugins/debugviews/debugviews-portlets/src/main/resources/debugviews_zh.properties
Wed Aug 20 13:06:27 2008
@@ -46,6 +46,7 @@
 
 jndiview.help.content            = \u8FD9\u4E2A\u9875\u9762\u7528\u4E8E\u67E5\u770B\u5404\u79CD\u6A21\u5757\u7684JNDI\u73AF\u5883\u3002
 jndiview.help.title              = \u8FD9\u662FGeronimo\u7BA1\u7406\u63A7\u5236\u53F0\u67E5\u770BJNDI\u9875\u9762\u7684\u5E2E\u52A9\u9875\u9762\u3002
+jndiview.view.caseSensitive      = Case Sensitive
 jndiview.view.searchOnlySelected = Search only selected
 jndiview.view.searchText         = \u67E5\u627E\u6587\u5B57
 

Modified: geronimo/server/branches/2.1/plugins/debugviews/debugviews-portlets/src/main/webapp/WEB-INF/view/jndiview/view.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/debugviews/debugviews-portlets/src/main/webapp/WEB-INF/view/jndiview/view.jsp?rev=687436&r1=687435&r2=687436&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/debugviews/debugviews-portlets/src/main/webapp/WEB-INF/view/jndiview/view.jsp
(original)
+++ geronimo/server/branches/2.1/plugins/debugviews/debugviews-portlets/src/main/webapp/WEB-INF/view/jndiview/view.jsp
Wed Aug 20 13:06:27 2008
@@ -72,6 +72,7 @@
 
     var lastFound = '';
     var doCheck = false;
+    var caseSensitive = false;
 
     function check(curr,last) {
         var cr = curr.split(".");
@@ -94,8 +95,13 @@
                         doCheck = false;
             }
 
-            if (children[child].title.indexOf(str) != -1 && children[child].widgetId
!= lastFound && !doCheck)
-                return children[child].widgetId;
+            if (caseSensitive) {
+            	if (children[child].title.indexOf(str) != -1 && children[child].widgetId
!= lastFound && !doCheck)
+            		return children[child].widgetId;
+            } else {
+                if (children[child].title.toLowerCase().indexOf(str.toLowerCase()) != -1
&& children[child].widgetId != lastFound && !doCheck)
+                    return children[child].widgetId;
+            }
 
             if(children[child].children){
                 var ret = findNext(children[child].children, str);
@@ -156,6 +162,14 @@
         doCheck = false;
     }
 
+    function caseSensitiveChange() {
+        if (caseSensitive) {
+            caseSensitive = false;
+        } else {
+        	caseSensitive = true;
+        }
+    }
+
     var lastSearchOn = '';
 
     function search() {
@@ -198,6 +212,7 @@
 <input type="button" value='<fmt:message key="debugviews.common.find"/>' onClick="javascript:search()"/>
 <input type="button" id="findNext" value='<fmt:message key="debugviews.common.findNext"/>'
onClick="javascript:searchContinue()" disabled=true />
 <fmt:message key="jndiview.view.searchOnlySelected"/>:<input type="checkbox" id="inSelected"
onChange="javascript:textChange()"/>
+<fmt:message key="jndiview.view.caseSensitive"/>:<input type="checkbox" id="caseSensitiveSelected"
onChange="javascript:caseSensitiveChange()"/>
 </td></tr>
 </table>
 <br/>



Mime
View raw message