Change sort on builtIn to sort on defaultValue

danchang · May 21, 2012 · e1ec77d · e1ec77d
1 parent d0c9d96
commit e1ec77d
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/sipXconfig/web/src/org/sipfoundry/sipxconfig/rest/PermissionsResource.java b/sipXconfig/web/src/org/sipfoundry/sipxconfig/rest/PermissionsResource.java
@@ -54,7 +54,7 @@ public class PermissionsResource extends UserResource {
 
     // use to define all possible sort fields
     private enum SortField {
-        NAME, DESCRIPTION, LABEL, BUILTIN, NONE;
+        NAME, DESCRIPTION, LABEL, DEFAULTVALUE, NONE;
 
         public static SortField toSortField(String fieldString) {
             if (fieldString == null) {
@@ -298,13 +298,13 @@ public int compare(Object object1, Object object2) {
                 });
                 break;
 
-            case BUILTIN:
+            case DEFAULTVALUE:
                 Collections.sort(permissions, new Comparator() {
 
                     public int compare(Object object1, Object object2) {
                         Permission permission1 = (Permission) object1;
                         Permission permission2 = (Permission) object2;
-                        return RestUtilities.compareIgnoreCaseNullSafe(Boolean.toString(permission1.isBuiltIn()),Boolean.toString(permission2.isBuiltIn()));
+                        return RestUtilities.compareIgnoreCaseNullSafe(Boolean.toString(permission1.getDefaultValue()),Boolean.toString(permission2.getDefaultValue()));
                     }
 
                 });
@@ -350,13 +350,13 @@ public int compare(Object object1, Object object2) {
                 });
                 break;
 
-            case BUILTIN:
+            case DEFAULTVALUE:
                 Collections.sort(permissions, new Comparator() {
 
                     public int compare(Object object1, Object object2) {
                         Permission permission1 = (Permission) object1;
                         Permission permission2 = (Permission) object2;
-                        return RestUtilities.compareIgnoreCaseNullSafe(Boolean.toString(permission2.isBuiltIn()),Boolean.toString(permission1.isBuiltIn()));
+                        return RestUtilities.compareIgnoreCaseNullSafe(Boolean.toString(permission2.getDefaultValue()),Boolean.toString(permission1.getDefaultValue()));
                     }
 
                 });