[power-architect] r3787 committed - Set the System workspace revision property in the snapshots when creat...

[codesite-noreply]

Revision: 3787
Author: mo.jeff
Date: Fri Jul 23 15:32:49 2010
Log: Set the System workspace revision property in the snapshots when  
created.
http://code.google.com/p/power-architect/source/detail?r=3787
Modified:
 /trunk/src/main/java/ca/sqlpower/architect/swingui/ColumnEditPanel.java

=======================================
--- /trunk/src/main/java/ca/sqlpower/architect/swingui/ColumnEditPanel.java	 
Fri Jul 23 13:50:23 2010
+++ /trunk/src/main/java/ca/sqlpower/architect/swingui/ColumnEditPanel.java	 
Fri Jul 23 15:32:49 2010
@@ -66,7 +66,6 @@

 import org.apache.log4j.Logger;

-import ca.sqlpower.architect.ArchitectSession;
 import ca.sqlpower.architect.ddl.DDLUtils;
 import ca.sqlpower.architect.enterprise.DomainCategory;
 import ca.sqlpower.architect.enterprise.DomainCategorySnapshot;
@@ -216,7 +215,7 @@
      */
     private String seqNameSuffix;

-    private final ArchitectSession session;
+    private final ArchitectSwingSession session;

     public ColumnEditPanel(SQLColumn col, ArchitectSwingSession session)  
throws SQLObjectException {
         this(Collections.singleton(col), session);
@@ -852,23 +851,24 @@
                               (upstreamType.getParent() instanceof  
DomainCategory &&
                                
upstreamType.getParent().getParent().equals(session.getWorkspace())))) //  
not an already existing domain snapshot
                     {
+                        int systemRevision =   
session.getEnterpriseSession().getSystemSession().getCurrentRevisionNumber();;
                         boolean isDomainSnapshot =  
upstreamType.getParent() instanceof DomainCategory;
                         UserDefinedSQLTypeSnapshot snapshot;
                         if (upstreamType.getUpstreamType() != null) {
                             UserDefinedSQLType upUpStreamType =  
upstreamType.getUpstreamType();
-                            UserDefinedSQLTypeSnapshot upstreamSnapshot =  
new UserDefinedSQLTypeSnapshot(upUpStreamType, 0, isDomainSnapshot);
+                            UserDefinedSQLTypeSnapshot upstreamSnapshot =  
new UserDefinedSQLTypeSnapshot(upUpStreamType, systemRevision,  
isDomainSnapshot);
                              
session.getWorkspace().addChild(upstreamSnapshot, 0);
                              
session.getWorkspace().addChild(upstreamSnapshot.getSPObject(), 0);
-                            snapshot = new  
UserDefinedSQLTypeSnapshot(upstreamType, 0, isDomainSnapshot,  
upstreamSnapshot);
+                            snapshot = new  
UserDefinedSQLTypeSnapshot(upstreamType, systemRevision, isDomainSnapshot,  
upstreamSnapshot);
                         } else {
-                            snapshot = new  
UserDefinedSQLTypeSnapshot(upstreamType, 0, isDomainSnapshot);
+                            snapshot = new  
UserDefinedSQLTypeSnapshot(upstreamType, systemRevision, isDomainSnapshot);
                         }
                        session.getWorkspace().addChild(snapshot, 0);
                     	 
column.getUserDefinedSQLType().setUpstreamType(snapshot.getSPObject());
                     	if ((upstreamType.getParent() instanceof  
DomainCategory)) {
                     	    DomainCategory parent = (DomainCategory)  
upstreamType.getParent();
                            DomainCategorySnapshot domainSnapshot =
-                               new DomainCategorySnapshot(parent, 0);
+                    	        new DomainCategorySnapshot(parent,  
systemRevision);
                     	    session.getWorkspace().addChild(domainSnapshot,  
0);
                     	     
session.getWorkspace().addChild(domainSnapshot.getSPObject(), 0);
                     	     
domainSnapshot.getSPObject().addChild(snapshot.getSPObject(), 0);