Revision: 3324
Author: silva.josemanuel1
Date: Mon Feb 22 13:39:16 2010
Log: Updated UI component sizes
Minor update to how CompareSQL handles remark updates.
Update to how the time field of revision histories is formatted.
http://code.google.com/p/power-architect/source/detail?r=3324
Modified:
/trunk
/trunk/src/ca/sqlpower/architect/diff/CompareSQL.java
/trunk/src/ca/sqlpower/architect/enterprise/ArchitectClientSideSession.java
/trunk/src/ca/sqlpower/architect/swingui/CompareDMFormatter.java
/trunk/src/ca/sqlpower/architect/swingui/enterprise/CompareRevisionsPanel.java
/trunk/src/ca/sqlpower/architect/swingui/enterprise/RevisionListPanel.java
/trunk/src/ca/sqlpower/architect/swingui/enterprise/RevisionsTable.java
=======================================
--- /trunk/src/ca/sqlpower/architect/diff/CompareSQL.java Mon Feb 22
08:44:13 2010
+++ /trunk/src/ca/sqlpower/architect/diff/CompareSQL.java Mon Feb 22
13:39:16 2010
@@ -225,7 +225,8 @@
if (comparator.compare(sourceTable,
targetTable) == 0) {
List<PropertyChange> changes =
generatePropertyChanges(sourceTable, targetTable);
if (changes.size() > 0) {
- if
(sourceTable.getRemarks().equals(targetTable.getRemarks())) {
+ if (sourceTable.getRemarks() == null &&
sourceTable.getRemarks() == null
+ ||
sourceTable.getRemarks().equals(targetTable.getRemarks())) {
// If the remarks are the same, then don't
generate SQL script
chunk = new DiffChunk<SQLObject>(sourceTable,
DiffType.MODIFIED);
} else {
=======================================
---
/trunk/src/ca/sqlpower/architect/enterprise/ArchitectClientSideSession.java
Mon Feb 22 08:55:17 2010
+++
/trunk/src/ca/sqlpower/architect/enterprise/ArchitectClientSideSession.java
Mon Feb 22 13:39:16 2010
@@ -8,7 +8,6 @@
import java.io.UnsupportedEncodingException;
import java.net.URI;
import java.net.URISyntaxException;
-import java.text.DateFormat;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.List;
@@ -354,8 +353,8 @@
JSONObject json = jsonArray.getJSONObject(i);
TransactionInformation transaction = new
TransactionInformation(
- json.getLong("number"),
- DateFormat.getDateTimeInstance(DateFormat.MEDIUM,
DateFormat.SHORT).parse(json.getString("time")),
+ json.getLong("number"),
+
TransactionInformation.DATE_FORMAT.parse(json.getString("time")),
json.getString("author"),
json.getString("description"));
transactions.add(transaction);
=======================================
--- /trunk/src/ca/sqlpower/architect/swingui/CompareDMFormatter.java Mon
Feb 22 08:44:13 2010
+++ /trunk/src/ca/sqlpower/architect/swingui/CompareDMFormatter.java Mon
Feb 22 13:39:16 2010
@@ -87,6 +87,10 @@
att = new SimpleAttributeSet();
StyleConstants.setForeground(att, Color.orange);
DIFF_STYLES.put(DiffType.MODIFIED, att);
+
+ att = new SimpleAttributeSet();
+ StyleConstants.setForeground(att, Color.orange);
+ DIFF_STYLES.put(DiffType.SQL_MODIFIED, att);
att = new SimpleAttributeSet();
StyleConstants.setForeground(att, Color.blue);
@@ -260,11 +264,12 @@
if (chunk.getData() instanceof SQLColumn) {
SQLColumn c = (SQLColumn) chunk.getData();
gen.modifyColumn(c);
- } else if (chunk.getData() instanceof SQLTable) {
- SQLTable t = (SQLTable) chunk.getData();
- gen.modifyComment(t);
- } else {
- throw new IllegalStateException("DiffChunk is an
unexpected type.");
+ }
+ for (PropertyChange change : chunk.getPropertyChanges()) {
+ if (change.getPropertyName().equals("remarks")) {
+ gen.modifyComment(chunk.getData());
+ break;
+ }
}
} else if (chunk.getType() == DiffType.SAME) {
//do nothing when they're the same
=======================================
---
/trunk/src/ca/sqlpower/architect/swingui/enterprise/CompareRevisionsPanel.java
Mon Feb 22 08:55:17 2010
+++
/trunk/src/ca/sqlpower/architect/swingui/enterprise/CompareRevisionsPanel.java
Mon Feb 22 13:39:16 2010
@@ -150,7 +150,7 @@
builder.setDefaultDialogBorder();
panel = builder.getPanel();
- panel.setPreferredSize(new Dimension(900, 500));
+ panel.setPreferredSize(new Dimension(900, 650));
refreshPanel();
}
=======================================
---
/trunk/src/ca/sqlpower/architect/swingui/enterprise/RevisionListPanel.java
Wed Feb 17 12:26:45 2010
+++
/trunk/src/ca/sqlpower/architect/swingui/enterprise/RevisionListPanel.java
Mon Feb 22 13:39:16 2010
@@ -137,7 +137,7 @@
builder.setDefaultDialogBorder();
panel = builder.getPanel();
- panel.setPreferredSize(new Dimension(700, 250));
+ panel.setPreferredSize(new Dimension(700, 500));
refreshPanel();
=======================================
--- /trunk/src/ca/sqlpower/architect/swingui/enterprise/RevisionsTable.java
Wed Feb 17 12:26:45 2010
+++ /trunk/src/ca/sqlpower/architect/swingui/enterprise/RevisionsTable.java
Mon Feb 22 13:39:16 2010
@@ -165,7 +165,7 @@
for (int i = 0; i < transactions.size(); i++) {
TransactionInformation transaction = transactions.get(i);
data[i][0] =
String.valueOf(transaction.getVersionNumber());
- data[i][1] = transaction.getTimeCreated().toString();
+ data[i][1] = transaction.getTimeString() + " ";
data[i][2] = transaction.getVersionAuthor();
data[i][3] = transaction.getVersionDescription();
