[power-architect] r3642 committed - Changes to support modifications to Grant class.

[codesite-noreply]

Revision: 3642
Author: mc3an...@uwaterloo.ca
Date: Fri Jun 25 12:24:11 2010
Log: Changes to support modifications to Grant class.
http://code.google.com/p/power-architect/source/detail?r=3642
Modified:
  
/trunk/src/main/java/ca/sqlpower/architect/swingui/enterprise/PrivilegesEditorPanel.java
  
/trunk/src/main/java/ca/sqlpower/architect/swingui/enterprise/ProjectSecurityPanel.java
  
/trunk/src/main/java/ca/sqlpower/architect/swingui/enterprise/SecurityPanel.java

=======================================
---  
/trunk/src/main/java/ca/sqlpower/architect/swingui/enterprise/PrivilegesEditorPanel.java	 
Wed Jun 23 13:50:03 2010
+++  
/trunk/src/main/java/ca/sqlpower/architect/swingui/enterprise/PrivilegesEditorPanel.java	 
Fri Jun 25 12:24:11 2010
@@ -167,7 +167,7 @@

                 if (!doesNotRequireSave) {
                     Grant newGrant = new Grant(
-                            subject, subject != null ? null : type,
+                            subject, type,
                             createPrivilege.isSelected(),
                             modifyPrivilege.isSelected(),
                             deletePrivilege.isSelected(),
=======================================
---  
/trunk/src/main/java/ca/sqlpower/architect/swingui/enterprise/ProjectSecurityPanel.java	 
Mon May 31 12:42:15 2010
+++  
/trunk/src/main/java/ca/sqlpower/architect/swingui/enterprise/ProjectSecurityPanel.java	 
Fri Jun 25 12:24:11 2010
@@ -388,10 +388,10 @@
                         for (int i = 0; i < selectedIndices.length; i++) {
                             SPObject obj = (SPObject)  
model.get(selectedIndices[i]);
                             if (subject != null) {
-                                obj.addChild(new Grant(subject.getUUID(),  
null, false, false, false, false, false),
+                                obj.addChild(new Grant(subject, false,  
false, false, false, false),
                                          
obj.getChildren(Grant.class).size());
                             } else {
-                                obj.addChild(new Grant(null,  
type.getName(), false, false, false, false, false),
+                                obj.addChild(new Grant(type.getName(),  
false, false, false, false, false),
                                          
obj.getChildren(Grant.class).size());
                             }
                         }
=======================================
---  
/trunk/src/main/java/ca/sqlpower/architect/swingui/enterprise/SecurityPanel.java	 
Tue May 25 13:03:30 2010
+++  
/trunk/src/main/java/ca/sqlpower/architect/swingui/enterprise/SecurityPanel.java	 
Fri Jun 25 12:24:11 2010
@@ -154,7 +154,7 @@
                         securityWorkspace.begin("");
                         securityWorkspace.addChild(user,  
securityWorkspace.getChildren(User.class).size());
                         DomainCategory category = new  
DomainCategory(user.getName() + "'s Domains");
-                        user.addGrant(new Grant(category.getUUID(), null,  
true, true, true, true, true));
+                        user.addGrant(new Grant(category, true, true,  
true, true, true));
                         securityWorkspace.addChild(category,  
securityWorkspace.getChildren(DomainCategory.class).size());
                         securityWorkspace.commit();