[power-architect] r3844 committed - Fixed the Security Panel so that the ProjectSecurityPanel it opens is ...

[codesite-noreply]

Revision: 3844
Author: terry...@gmail.com
Date: Thu Aug  5 13:08:01 2010
Log: Fixed the Security Panel so that the ProjectSecurityPanel it opens is  
tied to the correct parent component.
http://code.google.com/p/power-architect/source/detail?r=3844
Modified:
  
/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/ProjectSecurityPanel.java	 
Fri Jun 25 12:24:11 2010
+++  
/trunk/src/main/java/ca/sqlpower/architect/swingui/enterprise/ProjectSecurityPanel.java	 
Thu Aug  5 13:08:01 2010
@@ -90,7 +90,7 @@
     private final Action closeAction;
     private final ArchitectSwingProject securityWorkspace;
     private final SPObject subject;
-    private final Class type;
+    private final Class<?> type;

     private final String username;

@@ -101,7 +101,7 @@

     private final Dialog d;

-    public ProjectSecurityPanel(ArchitectSwingProject securityWorkspace,  
SPObject subject, Class type, String username, Dialog d, Action  
closeAction) {
+    public ProjectSecurityPanel(ArchitectSwingProject securityWorkspace,  
SPObject subject, Class<?> type, String username, Dialog d, Action  
closeAction) {
         this.securityWorkspace = securityWorkspace;
         this.subject = subject;
         this.type = type;
@@ -589,7 +589,7 @@
         }
     }

-    public static Action createShowAction(final ArchitectSwingProject  
securityWorkspace, final SPObject subject, final Class type,
+    public static Action createShowAction(final ArchitectSwingProject  
securityWorkspace, final SPObject subject, final Class<?> type,
             final String username, final JComponent panel) {
        return new AbstractAction("Manage Security Settings...") {
                 public void actionPerformed(ActionEvent e) {
=======================================
---  
/trunk/src/main/java/ca/sqlpower/architect/swingui/enterprise/SecurityPanel.java	 
Wed Aug  4 11:55:58 2010
+++  
/trunk/src/main/java/ca/sqlpower/architect/swingui/enterprise/SecurityPanel.java	 
Thu Aug  5 13:08:01 2010
@@ -431,20 +431,19 @@
                 object = null;
             }

-            Class objectClass = null;
+            Class<?> objectClass = null;
             if (object != null) {
                 objectClass = object.getClass();
             } else {
-                if (node.getUserObject().equals("Users")) {
+                if (node == usersNode) {
                     objectClass = User.class;
-                }
-                if (node.getUserObject().equals("Groups")) {
+                } else if (node == groupsNode) {
                     objectClass = Group.class;
                 }
             }


-            final JDialog d = SPSUtils.makeOwnedDialog(panel, "Security  
Manager");
+            final JDialog d = SPSUtils.makeOwnedDialog(dialog, "Security  
Manager");

             Action closeAction = new AbstractAction("Close") {
                 public void actionPerformed(ActionEvent e) {