[power-architect] r3766 committed - Removed the throws clause from SQLTable's getPrimaryKeyIndex() method ...

[codesite-noreply]

Revision: 3766
Author: terry...@gmail.com
Date: Tue Jul 20 15:43:01 2010
Log: Removed the throws clause from SQLTable's getPrimaryKeyIndex() method  
since some old changes made it unnecessary for it to call populateColumns()  
and populateIndices.
http://code.google.com/p/power-architect/source/detail?r=3766
Modified:
 /trunk/src/main/java/ca/sqlpower/architect/ProjectLoader.java
 /trunk/src/main/java/ca/sqlpower/architect/ddl/SQLServerDDLGenerator.java

=======================================
--- /trunk/src/main/java/ca/sqlpower/architect/ProjectLoader.java	Fri Jul  
16 13:23:39 2010
+++ /trunk/src/main/java/ca/sqlpower/architect/ProjectLoader.java	Tue Jul  
20 15:43:01 2010
@@ -56,19 +56,18 @@
 import ca.sqlpower.sqlobject.SQLColumn;
 import ca.sqlpower.sqlobject.SQLDatabase;
 import ca.sqlpower.sqlobject.SQLIndex;
+import ca.sqlpower.sqlobject.SQLIndex.AscendDescend;
+import ca.sqlpower.sqlobject.SQLIndex.Column;
 import ca.sqlpower.sqlobject.SQLObject;
 import ca.sqlpower.sqlobject.SQLObjectException;
-import ca.sqlpower.sqlobject.SQLObjectRuntimeException;
 import ca.sqlpower.sqlobject.SQLRelationship;
+import ca.sqlpower.sqlobject.SQLRelationship.Deferrability;
+import ca.sqlpower.sqlobject.SQLRelationship.SQLImportedKey;
+import ca.sqlpower.sqlobject.SQLRelationship.UpdateDeleteRule;
 import ca.sqlpower.sqlobject.SQLSchema;
 import ca.sqlpower.sqlobject.SQLTable;
 import ca.sqlpower.sqlobject.SQLTypePhysicalPropertiesProvider;
 import ca.sqlpower.sqlobject.UserDefinedSQLType;
-import ca.sqlpower.sqlobject.SQLIndex.AscendDescend;
-import ca.sqlpower.sqlobject.SQLIndex.Column;
-import ca.sqlpower.sqlobject.SQLRelationship.Deferrability;
-import ca.sqlpower.sqlobject.SQLRelationship.SQLImportedKey;
-import ca.sqlpower.sqlobject.SQLRelationship.UpdateDeleteRule;
 import ca.sqlpower.swingui.SPSUtils;
 import ca.sqlpower.util.BrowserUtil;
 import ca.sqlpower.util.DefaultUserPrompterFactory;
@@ -859,11 +858,7 @@

             String pkIndex = attributes.getValue("primaryKeyIndex");
             if (Boolean.valueOf(pkIndex)) {
-                try {
-                    index = currentTable.getPrimaryKeyIndex();
-                } catch (SQLObjectException e) {
-                    throw new SQLObjectRuntimeException(e);
-                }
+                index = currentTable.getPrimaryKeyIndex();
             }

             String id = attributes.getValue("id");
=======================================
---  
/trunk/src/main/java/ca/sqlpower/architect/ddl/SQLServerDDLGenerator.java	 
Fri Jul  9 11:47:49 2010
+++  
/trunk/src/main/java/ca/sqlpower/architect/ddl/SQLServerDDLGenerator.java	 
Tue Jul 20 15:43:01 2010
@@ -39,7 +39,6 @@
 import ca.sqlpower.sqlobject.SQLIndex;
 import ca.sqlpower.sqlobject.SQLObject;
 import ca.sqlpower.sqlobject.SQLObjectException;
-import ca.sqlpower.sqlobject.SQLObjectRuntimeException;
 import ca.sqlpower.sqlobject.SQLRelationship;
 import ca.sqlpower.sqlobject.SQLRelationship.Deferrability;
 import ca.sqlpower.sqlobject.SQLTable;
@@ -521,14 +520,10 @@
      */
     @Override
     public void dropPrimaryKey(SQLTable t) {
-        try {
-            SQLIndex pk = t.getPrimaryKeyIndex();
-            print("\nALTER TABLE " + toQualifiedName(t.getName())
-                    + " DROP " + pk.getPhysicalName());
-            endStatement(StatementType.DROP, t);
-        } catch (SQLObjectException e) {
-            throw new SQLObjectRuntimeException(e);
-        }
+        SQLIndex pk = t.getPrimaryKeyIndex();
+        print("\nALTER TABLE " + toQualifiedName(t.getName())
+                + " DROP " + pk.getPhysicalName());
+        endStatement(StatementType.DROP, t);
     }

     @Override