[power-architect] r3323 committed - Update to enterprise classes based on the new way CompareSQL works.

[codesite-noreply]

Revision: 3323
Author: silva.josemanuel1
Date: Mon Feb 22 08:55:17 2010
Log: Update to enterprise classes based on the new way CompareSQL works.
http://code.google.com/p/power-architect/source/detail?r=3323
Modified:
 /trunk/src/ca/sqlpower/architect/enterprise/ArchitectClientSideSession.java
  
/trunk/src/ca/sqlpower/architect/swingui/enterprise/CompareRevisionsPanel.java

=======================================
---  
/trunk/src/ca/sqlpower/architect/enterprise/ArchitectClientSideSession.java	 
Fri Feb 19 11:29:28 2010
+++  
/trunk/src/ca/sqlpower/architect/enterprise/ArchitectClientSideSession.java	 
Mon Feb 22 08:55:17 2010
@@ -58,6 +58,7 @@
 import ca.sqlpower.dao.json.SPJSONPersister;
 import ca.sqlpower.dao.session.SessionPersisterSuperConverter;
 import ca.sqlpower.diff.DiffChunk;
+import ca.sqlpower.diff.DiffInfo;
 import ca.sqlpower.diff.SimpleDiffChunkJSONConverter;
 import ca.sqlpower.enterprise.TransactionInformation;
 import ca.sqlpower.enterprise.client.SPServerInfo;
@@ -69,7 +70,6 @@
 import ca.sqlpower.sql.PlDotIni;
 import ca.sqlpower.sql.SPDataSource;
 import ca.sqlpower.sql.SpecificDataSourceCollection;
-import ca.sqlpower.sqlobject.SQLObject;
 import ca.sqlpower.sqlobject.SQLObjectException;
 import ca.sqlpower.swingui.event.SessionLifecycleEvent;
 import ca.sqlpower.swingui.event.SessionLifecycleListener;
@@ -416,7 +416,7 @@
        /**
      * Gets a list of DiffChunks representing the differences between the  
two revisions from the server.
      */
-	public List<DiffChunk<SQLObject>> getComparisonDiffChunks(int  
oldRevisionNo, int newRevisionNo)
+	public List<DiffChunk<DiffInfo>> getComparisonDiffChunks(int  
oldRevisionNo, int newRevisionNo)
 	throws IOException, URISyntaxException, JSONException,  
SPPersistenceException {

         SPServerInfo serviceInfo = projectLocation.getServiceInfo();
@@ -896,6 +896,7 @@
                     buffer.append(line).append("\n");
                 }

+                logger.debug(buffer);
                 JSONObject message = new JSONObject(buffer.toString());

                 // Does the response contain data? If so, return it.  
Communication
=======================================
---  
/trunk/src/ca/sqlpower/architect/swingui/enterprise/CompareRevisionsPanel.java	 
Wed Feb 17 12:26:45 2010
+++  
/trunk/src/ca/sqlpower/architect/swingui/enterprise/CompareRevisionsPanel.java	 
Mon Feb 22 08:55:17 2010
@@ -40,7 +40,7 @@
 import ca.sqlpower.architect.enterprise.ArchitectClientSideSession;
 import ca.sqlpower.architect.swingui.CompareDMFormatter;
 import ca.sqlpower.diff.DiffChunk;
-import ca.sqlpower.sqlobject.SQLObject;
+import ca.sqlpower.diff.DiffInfo;

 import com.jgoodies.forms.builder.DefaultFormBuilder;
 import com.jgoodies.forms.layout.CellConstraints;
@@ -76,11 +76,11 @@
             DefaultStyledDocument resultDoc = new DefaultStyledDocument();
             try {
                 if (oldRevisionNo >= 0 && newRevisionNo >= 0) {
-                    List<DiffChunk<SQLObject>> diff =  
session.getComparisonDiffChunks(oldRevisionNo, newRevisionNo);
+                    List<DiffChunk<DiffInfo>> diff =  
session.getComparisonDiffChunks(oldRevisionNo, newRevisionNo);
                     if (diff.size() == 0) {
                         resultDoc.insertString(0, "Revisions are  
identical", null);
                     } else {
-                        resultDoc =  
CompareDMFormatter.generateEnglishDescription(CompareDMFormatter.DIFF_STYLES,  
true, diff);
+                        resultDoc =  
CompareDMFormatter.generateEnglishDescription(CompareDMFormatter.DIFF_STYLES,  
diff);
                     }
                 } else {
                     JOptionPane.showMessageDialog(panel, "A revision must  
be selected from each table.");