[Engine-patches] Change in ovirt-engine[master]: engine: search cleanup (1/N)

[lhornyak]

Laszlo Hornyak has uploaded a new change for review.

Change subject: engine: search cleanup (1/N)
......................................................................

engine: search cleanup (1/N)

A small cleanup in the constructors of BaseAutoCompleter.

Change-Id: Id9ed66b776b82ab68f550833d9e5549776b9562d
Signed-off-by: Laszlo Hornyak <lhorn...@redhat.com>
---
M 
backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/AdSearchObjecAutoCompleter.java
M 
backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/BaseAutoCompleter.java
2 files changed, 14 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/04/14404/1

diff --git 
a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/AdSearchObjecAutoCompleter.java
 
b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/AdSearchObjecAutoCompleter.java
index a96064d..90a95bf 100644
--- 
a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/AdSearchObjecAutoCompleter.java
+++ 
b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/AdSearchObjecAutoCompleter.java
@@ -2,12 +2,8 @@
 
 public class AdSearchObjecAutoCompleter extends BaseAutoCompleter {
     public AdSearchObjecAutoCompleter() {
-        super();
-        mVerbs.put(SearchObjects.AD_USER_PLU_OBJ_NAME, 
SearchObjects.AD_USER_PLU_OBJ_NAME);
-        mVerbs.put(SearchObjects.AD_GROUP_PLU_OBJ_NAME, 
SearchObjects.AD_GROUP_PLU_OBJ_NAME);
-        buildCompletions();
-        mVerbs.put(SearchObjects.AD_USER_OBJ_NAME, 
SearchObjects.AD_USER_OBJ_NAME);
-        mVerbs.put(SearchObjects.AD_GROUP_OBJ_NAME, 
SearchObjects.AD_GROUP_OBJ_NAME);
+        super(new String[] { SearchObjects.AD_USER_PLU_OBJ_NAME, 
SearchObjects.AD_GROUP_PLU_OBJ_NAME },
+                new String[] { SearchObjects.AD_USER_OBJ_NAME, 
SearchObjects.AD_GROUP_OBJ_NAME });
     }
 
     @Override
diff --git 
a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/BaseAutoCompleter.java
 
b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/BaseAutoCompleter.java
index b7e876e..ffc224e 100644
--- 
a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/BaseAutoCompleter.java
+++ 
b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/BaseAutoCompleter.java
@@ -22,12 +22,21 @@
     }
 
     public BaseAutoCompleter(String[] text) {
-        for (String s : text) {
-            mVerbs.put(s, s);
-        }
+        acceptAll(text);
         buildCompletions();
     }
 
+    public BaseAutoCompleter(String[] text, String[] noAutocomplete) {
+        this(text);
+        acceptAll(noAutocomplete);
+    }
+
+    protected final void acceptAll(final String[] tokens) {
+        for (String token : tokens) {
+            mVerbs.put(token, token);
+        }
+    }
+
     protected final void buildCompletions() {
         final List<String> emptyKeyList = new ArrayList<String>();
         for (String title : mVerbs.keySet()) {


--
To view, visit http://gerrit.ovirt.org/14404
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id9ed66b776b82ab68f550833d9e5549776b9562d
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Laszlo Hornyak <lhorn...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches