Revision: 3710
Author: [email protected]
Date: Mon Jul 12 07:31:38 2010
Log: NEW - bug 2458: Create Critic Manager
http://trillian.sqlpower.ca/bugzilla/show_bug.cgi?id=2458
Moved the method that writes out a nicer name for classes that are being
criticized to the utility class.
http://code.google.com/p/power-architect/source/detail?r=3710
Modified:
/trunk/src/main/java/ca/sqlpower/architect/ArchitectUtils.java
/trunk/src/main/java/ca/sqlpower/architect/swingui/critic/CriticismTableModel.java
=======================================
--- /trunk/src/main/java/ca/sqlpower/architect/ArchitectUtils.java Mon Mar
29 13:18:45 2010
+++ /trunk/src/main/java/ca/sqlpower/architect/ArchitectUtils.java Mon Jul
12 07:31:38 2010
@@ -29,8 +29,12 @@
import org.apache.log4j.Logger;
import ca.sqlpower.architect.swingui.ASUtils;
+import ca.sqlpower.sql.JDBCDataSourceType;
import ca.sqlpower.sqlobject.SQLColumn;
+import ca.sqlpower.sqlobject.SQLIndex;
import ca.sqlpower.sqlobject.SQLObjectException;
+import ca.sqlpower.sqlobject.SQLRelationship;
+import ca.sqlpower.sqlobject.SQLTable;
import ca.sqlpower.swingui.SPSUtils;
import ca.sqlpower.util.ExceptionReport;
@@ -308,4 +312,24 @@
return (f.canRead() && f.isFile());
}
}
-}
+
+ /**
+ * A simple method that converts classes to a nicer human-readable
+ * name.
+ */
+ public static String convertClassToString(Class<?> c) {
+ if (SQLTable.class.equals(c)) {
+ return "Table";
+ } else if (SQLColumn.class.equals(c)) {
+ return "Column";
+ } else if (SQLRelationship.class.equals(c)) {
+ return "Relationship";
+ } else if (SQLIndex.class.equals(c)) {
+ return "Index";
+ } else if (JDBCDataSourceType.class.equals(c)) {
+ return "Data Source Type";
+ } else {
+ return c.getSimpleName();
+ }
+ }
+}
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/swingui/critic/CriticismTableModel.java
Fri Jul 9 08:12:54 2010
+++
/trunk/src/main/java/ca/sqlpower/architect/swingui/critic/CriticismTableModel.java
Mon Jul 12 07:31:38 2010
@@ -23,6 +23,7 @@
import javax.swing.table.AbstractTableModel;
+import ca.sqlpower.architect.ArchitectUtils;
import ca.sqlpower.architect.ddl.critic.CriticAndSettings;
import ca.sqlpower.architect.ddl.critic.Criticism;
import ca.sqlpower.architect.ddl.critic.CriticismBucket;
@@ -30,37 +31,12 @@
import ca.sqlpower.architect.ddl.critic.CriticismListener;
import ca.sqlpower.architect.ddl.critic.CriticAndSettings.Severity;
import ca.sqlpower.architect.swingui.ArchitectSwingSession;
-import ca.sqlpower.sql.JDBCDataSourceType;
-import ca.sqlpower.sqlobject.SQLColumn;
-import ca.sqlpower.sqlobject.SQLIndex;
-import ca.sqlpower.sqlobject.SQLRelationship;
-import ca.sqlpower.sqlobject.SQLTable;
/**
* This table model displays all of the critics in the bucket passed to its
* constructor.
*/
public class CriticismTableModel extends AbstractTableModel {
-
- /**
- * A simple method that converts classes to a nicer human-readable
- * name. This could be refactored to a utility class in the future.
- */
- private static String convertClassToString(Class<?> c) {
- if (SQLTable.class.equals(c)) {
- return "Table";
- } else if (SQLColumn.class.equals(c)) {
- return "Column";
- } else if (SQLRelationship.class.equals(c)) {
- return "Relationship";
- } else if (SQLIndex.class.equals(c)) {
- return "Index";
- } else if (JDBCDataSourceType.class.equals(c)) {
- return "Data Source Type";
- } else {
- return c.getSimpleName();
- }
- }
private final CriticismBucket criticizer;
@@ -133,7 +109,7 @@
} else if (columnIndex == 1) {
return rowVal.getSubject();
} else if (columnIndex == 2) {
- return convertClassToString(rowVal.getSubject().getClass());
+ return
ArchitectUtils.convertClassToString(rowVal.getSubject().getClass());
} else if (columnIndex == 3) {
//All critics in Architect are currently CriticAndSettings
objects
//In the future we may want to look up the settings in the
critic
