svn commit: r919672 - /incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.accountcontrolpanel/org.apache.clerezza.platform.accountcontrolpanel.core/src/main/java/org/apache/clerezza/platform/accountcontrolpanel/

[reto]

Author: reto
Date: Fri Mar  5 23:49:58 2010
New Revision: 919672

URL: http://svn.apache.org/viewvc?rev=919672&view=rev
Log:
CLEREZZA-151: not adding menu items for users without 
AccountControlAccessPermission

Modified:
    
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.accountcontrolpanel/org.apache.clerezza.platform.accountcontrolpanel.core/src/main/java/org/apache/clerezza/platform/accountcontrolpanel/AccountControlPanel.java

Modified: 
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.accountcontrolpanel/org.apache.clerezza.platform.accountcontrolpanel.core/src/main/java/org/apache/clerezza/platform/accountcontrolpanel/AccountControlPanel.java
URL: 
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.accountcontrolpanel/org.apache.clerezza.platform.accountcontrolpanel.core/src/main/java/org/apache/clerezza/platform/accountcontrolpanel/AccountControlPanel.java?rev=919672&r1=919671&r2=919672&view=diff
==============================================================================
--- 
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.accountcontrolpanel/org.apache.clerezza.platform.accountcontrolpanel.core/src/main/java/org/apache/clerezza/platform/accountcontrolpanel/AccountControlPanel.java
 (original)
+++ 
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.accountcontrolpanel/org.apache.clerezza.platform.accountcontrolpanel.core/src/main/java/org/apache/clerezza/platform/accountcontrolpanel/AccountControlPanel.java
 Fri Mar  5 23:49:58 2010
@@ -675,10 +675,16 @@
 
                String user = getUserName();
                if (user != null) {
+                       try {
+                               AccessController.checkPermission(new 
AccountControlAccessPermission(user, ""));
+                       } catch (AccessControlException e) {
+                               return items;
+                       }
                        String path = "/user/" + user + "/control-panel/";
                        items.add(new GlobalMenuItem(path, "ACP", "Account 
Control Panel", 5,
                                        "Main-Modules"));
                }
+               
                return items;
        }