From 12bd033dc950a99d4b8dd29c38e3fb239799644a Mon Sep 17 00:00:00 2001
From: Tuna Aksoy <tuna.aksoy@alfresco.com>
Date: Tue, 4 Dec 2012 14:13:25 +0000
Subject: [PATCH] RM-563 (Add group id and title to Capability API and
 definitions) * Showing the capabilities sorted in the UI

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@44317 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../capability/AbstractCapability.java                      | 6 +++---
 .../org_alfresco_module_rm/capability/Capability.java       | 4 ++--
 .../capability/CapabilityServiceImpl.java                   | 4 ++--
 .../module/org_alfresco_module_rm/capability/Group.java     | 4 ++--
 .../module/org_alfresco_module_rm/capability/GroupImpl.java | 6 +++---
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/AbstractCapability.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/AbstractCapability.java
index 2d1dd7479b..7f46957ecc 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/AbstractCapability.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/AbstractCapability.java
@@ -58,7 +58,7 @@ public abstract class AbstractCapability extends RMSecurityCommon
     protected Group group;
 
     /** Capability index */
-    protected String index;
+    protected int index;
 
     /** Indicates whether this is a private capability or not */
     protected boolean isPrivate = false;
@@ -328,12 +328,12 @@ public abstract class AbstractCapability extends RMSecurityCommon
     /**
      * @see org.alfresco.module.org_alfresco_module_rm.capability.Capability#getIndex()
      */
-    public String getIndex()
+    public int getIndex()
     {
         return this.index;
     }
 
-    public void setIndex(String index)
+    public void setIndex(int index)
     {
         this.index = index;
     }
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/Capability.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/Capability.java
index 75790e95eb..c13301c2cf 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/Capability.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/Capability.java
@@ -99,7 +99,7 @@ public interface Capability
     /**
      * Gets the index of a capability
      *
-     * @return String capability index
+     * @return int capability index
      */
-    String getIndex();
+    int getIndex();
 }
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/CapabilityServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/CapabilityServiceImpl.java
index 6534e8bd38..e4d750ac34 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/CapabilityServiceImpl.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/CapabilityServiceImpl.java
@@ -191,7 +191,7 @@ public class CapabilityServiceImpl implements CapabilityService
             @Override
             public int compare(Group g1, Group g2)
             {
-                return Integer.parseInt(g1.getIndex()) - Integer.parseInt(g2.getIndex());
+                return g1.getIndex() - g2.getIndex();
             }
         });
 
@@ -226,7 +226,7 @@ public class CapabilityServiceImpl implements CapabilityService
             @Override
             public int compare(Capability c1, Capability c2)
             {
-                return Integer.parseInt(c1.getIndex()) - Integer.parseInt(c2.getIndex());
+                return c1.getIndex() - c2.getIndex();
             }
         });
 
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/Group.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/Group.java
index bbc7038cb7..2987718b15 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/Group.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/Group.java
@@ -43,7 +43,7 @@ public interface Group
     /**
      * Gets the index of a group
      *
-     * @return String the group index
+     * @return int the group index
      */
-    String getIndex();
+    int getIndex();
 }
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/GroupImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/GroupImpl.java
index a2653125d7..f56925dbcc 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/GroupImpl.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/GroupImpl.java
@@ -36,7 +36,7 @@ public class GroupImpl implements Group
     private String title;
 
     /** The group index */
-    private String index;
+    private int index;
 
     /** Capability service */
     private CapabilityService capabilityService;
@@ -93,12 +93,12 @@ public class GroupImpl implements Group
      * @see org.alfresco.module.org_alfresco_module_rm.capability.Group#getIndex()
      */
     @Override
-    public String getIndex()
+    public int getIndex()
     {
         return this.index;
     }
 
-    public void setIndex(String index)
+    public void setIndex(int index)
     {
         this.index = index;
     }