[power-architect] r3667 committed - Cleaned up Grant usage.

[codesite-noreply]

Revision: 3667
Author: mc3an...@uwaterloo.ca
Date: Mon Jul  5 08:53:34 2010
Log: Cleaned up Grant usage.
http://code.google.com/p/power-architect/source/detail?r=3667
Modified:
  
/trunk/src/main/java/ca/sqlpower/architect/swingui/enterprise/SecurityPanel.java
  
/trunk/src/main/java/ca/sqlpower/architect/swingui/enterprise/UserEditorPanel.java

=======================================
---  
/trunk/src/main/java/ca/sqlpower/architect/swingui/enterprise/SecurityPanel.java	 
Fri Jun 25 12:24:11 2010
+++  
/trunk/src/main/java/ca/sqlpower/architect/swingui/enterprise/SecurityPanel.java	 
Mon Jul  5 08:53:34 2010
@@ -55,7 +55,6 @@
 import ca.sqlpower.architect.enterprise.ArchitectClientSideSession;
 import ca.sqlpower.architect.enterprise.DomainCategory;
 import ca.sqlpower.architect.swingui.ArchitectSwingProject;
-import ca.sqlpower.enterprise.client.Grant;
 import ca.sqlpower.enterprise.client.Group;
 import ca.sqlpower.enterprise.client.SPServerInfo;
 import ca.sqlpower.enterprise.client.User;
@@ -154,7 +153,6 @@
                         securityWorkspace.begin("");
                         securityWorkspace.addChild(user,  
securityWorkspace.getChildren(User.class).size());
                         DomainCategory category = new  
DomainCategory(user.getName() + "'s Domains");
-                        user.addGrant(new Grant(category, true, true,  
true, true, true));
                         securityWorkspace.addChild(category,  
securityWorkspace.getChildren(DomainCategory.class).size());
                         securityWorkspace.commit();

=======================================
---  
/trunk/src/main/java/ca/sqlpower/architect/swingui/enterprise/UserEditorPanel.java	 
Fri May 28 15:08:38 2010
+++  
/trunk/src/main/java/ca/sqlpower/architect/swingui/enterprise/UserEditorPanel.java	 
Mon Jul  5 08:53:34 2010
@@ -198,7 +198,7 @@

         Grant globalGrant = null;
         for (Grant grant : user.getChildren(Grant.class)) {
-            if (grant.getType() != null &&  
grant.getType().equals(ArchitectSwingProject.class.getName())) {
+            if (grant.isSystemLevel() &&  
grant.getType().equals(ArchitectSwingProject.class.getName())) {
                 if (globalGrant != null) {
                     throw new IllegalStateException("Multiple grants for  
Architect Project found");
                 }