[Yanel-commits] rev 42031 - public/yanel/trunk/src/contributions/resources/policymanager/src/java/org/wyona/yanel/impl/resources/policymanager

michi at wyona.com michi at wyona.com
Thu Mar 19 10:57:59 CET 2009


Author: michi
Date: 2009-03-19 10:57:58 +0100 (Thu, 19 Mar 2009)
New Revision: 42031

Modified:
   public/yanel/trunk/src/contributions/resources/policymanager/src/java/org/wyona/yanel/impl/resources/policymanager/PolicyViewer.java
Log:
display of rights improved

Modified: public/yanel/trunk/src/contributions/resources/policymanager/src/java/org/wyona/yanel/impl/resources/policymanager/PolicyViewer.java
===================================================================
--- public/yanel/trunk/src/contributions/resources/policymanager/src/java/org/wyona/yanel/impl/resources/policymanager/PolicyViewer.java	2009-03-19 09:55:38 UTC (rev 42030)
+++ public/yanel/trunk/src/contributions/resources/policymanager/src/java/org/wyona/yanel/impl/resources/policymanager/PolicyViewer.java	2009-03-19 09:57:58 UTC (rev 42031)
@@ -316,16 +316,35 @@
      * @param pm PolicyManager
      */
     private static String getCommaSeparatedList(Vector rights, PolicyManager pm) {
-        //pm.getUsecases();
         StringBuilder sb = new StringBuilder();
-        if (rights.size() > 0) {
-            sb.append((String) rights.elementAt(0));
-            for (int i = 1; i < rights.size(); i++) {
-                sb.append(", " + (String) rights.elementAt(i));
+        try {
+            String[] usecases = pm.getUsecases();
+            for (int i = 0; i < usecases.length; i++) {
+                boolean noSuchRight = true;
+                for (int k = 0; k < rights.size(); k++) {
+                    if (usecases[i].equals((String) rights.elementAt(k))) {
+                        sb.append(usecases[i]);
+                        noSuchRight = false;
+                        break;
+                    }
+                }
+                if (noSuchRight) sb.append("-");
+                if (i < usecases.length -1) sb.append(", ");
             }
-        } else {
-            if(log.isDebugEnabled()) log.debug("No rights asigned!");
-            return "No rights!";
+/*
+            if (rights.size() > 0) {
+                sb.append((String) rights.elementAt(0));
+                for (int i = 1; i < rights.size(); i++) {
+                    sb.append(", " + (String) rights.elementAt(i));
+                }
+            } else {
+                if(log.isDebugEnabled()) log.debug("No rights asigned!");
+                sb.append("No rights!");
+      		}
+*/
+        } catch(Exception e) {
+            log.error(e, e);
+            sb.append(e.getMessage());
         }
         return sb.toString();
     }



More information about the Yanel-commits mailing list