Revision: 3939
Author: [email protected]
Date: Fri Sep 3 14:03:29 2010
Log: A bunch of code cleanup and fixing of mistakes I made (new window
function not working).
http://code.google.com/p/power-architect/source/detail?r=3939
Modified:
/trunk/src/main/java/ca/sqlpower/architect/enterprise/NetworkConflictResolver.java
/trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectFrame.java
/trunk/src/main/java/ca/sqlpower/architect/swingui/DefaultColumnPanel.java
/trunk/src/main/java/ca/sqlpower/architect/swingui/enterprise/SecurityPanel.java
/trunk/src/main/java/ca/sqlpower/architect/swingui/enterprise/ServerProjectsManagerPanel.java
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/enterprise/NetworkConflictResolver.java
Fri Aug 27 15:12:47 2010
+++
/trunk/src/main/java/ca/sqlpower/architect/enterprise/NetworkConflictResolver.java
Fri Sep 3 14:03:29 2010
@@ -42,6 +42,7 @@
import org.json.JSONTokener;
import org.springframework.security.AccessDeniedException;
+//import ca.sqlpower.architect.swingui.ArchitectSwingSessionImpl;
import ca.sqlpower.architect.swingui.PlayPenComponent;
import ca.sqlpower.architect.swingui.PlayPenContentPane;
import ca.sqlpower.dao.FriendlyRuntimeSPPersistenceException;
@@ -57,6 +58,7 @@
import ca.sqlpower.dao.session.SessionPersisterSuperConverter;
import ca.sqlpower.object.SPObject;
import ca.sqlpower.sqlobject.SQLRelationship.ColumnMapping;
+//import
ca.sqlpower.swingui.SwingUIUserPrompterFactory.NonModalSwingUIUserPrompterFactory;
import ca.sqlpower.util.MonitorableImpl;
import ca.sqlpower.util.SQLPowerUtils;
import ca.sqlpower.util.UserPrompter.UserPromptOptions;
@@ -145,6 +147,7 @@
this.session = session;
contextRelativePath = "/" + ArchitectClientSideSession.REST_TAG
+ "/project/" + projectLocation.getUUID();
+
}
public void setUserPrompterFactory(UserPrompterFactory promptSession) {
=======================================
--- /trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectFrame.java
Tue Aug 31 14:58:44 2010
+++ /trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectFrame.java
Fri Sep 3 14:03:29 2010
@@ -301,34 +301,29 @@
}
};
- final SPServerInfoManagerPanel sim = new
SPServerInfoManagerPanel(context.getServerManager(),
- ArchitectFrame.this, closeAction);
+ final SPServerInfoManagerPanel sim = new
SPServerInfoManagerPanel(context.getServerManager(), ArchitectFrame.this,
closeAction);
sim.setLoginAction(new AbstractAction("Login") {
public void actionPerformed(ActionEvent e) {
SPServerInfo si = sim.getSelectedServer();
if (si != null) {
- boolean accessible = true;
-
- if (accessible) {
- final JDialog dialog =
SPSUtils.makeOwnedDialog(ArchitectFrame.this, "Projects");
- Action closeAction = new
AbstractAction("Close") {
- public void actionPerformed(ActionEvent e)
{
- dialog.dispose();
- }
- };
-
- ServerProjectsManagerPanel spm = new
ServerProjectsManagerPanel(si, currentSession, context,
- ArchitectFrame.this, closeAction);
- if (spm.isConnected()) {
-
dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
- dialog.setContentPane(spm.getPanel());
-
- SPSUtils.makeJDialogCancellable(dialog,
null);
- dialog.pack();
-
dialog.setLocationRelativeTo(ArchitectFrame.this);
- dialog.setVisible(true);
- }
+ final JDialog dialog =
SPSUtils.makeOwnedDialog(ArchitectFrame.this, "Projects");
+ Action closeAction = new AbstractAction("Close") {
+ public void actionPerformed(ActionEvent e) {
+ dialog.dispose();
+ }
+ };
+
+ ServerProjectsManagerPanel spm = new
ServerProjectsManagerPanel(si, currentSession, context,
+ ArchitectFrame.this, closeAction);
+ if (spm.isConnected()) {
+
dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
+ dialog.setContentPane(spm.getPanel());
+
+ SPSUtils.makeJDialogCancellable(dialog, null);
+ dialog.pack();
+
dialog.setLocationRelativeTo(ArchitectFrame.this);
+ dialog.setVisible(true);
}
} else {
JOptionPane.showMessageDialog(ArchitectFrame.this, "Please select a
server", "", JOptionPane.INFORMATION_MESSAGE);
@@ -662,7 +657,7 @@
Rectangle bounds = new Rectangle(getBounds());
bounds.translate(20, 20);
ArchitectFrame newFrame = new ArchitectFrame(context,
bounds);
- newFrame.init(newSession, false);
+ newFrame.init(newSession);
if ((e.getModifiers() & ActionEvent.ALT_MASK) != 0) {
JMenuBar mb = newFrame.menuBar;
for (int i = 0; i < mb.getMenuCount(); i++) {
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/swingui/DefaultColumnPanel.java
Wed Apr 1 11:48:49 2009
+++
/trunk/src/main/java/ca/sqlpower/architect/swingui/DefaultColumnPanel.java
Fri Sep 3 14:03:29 2010
@@ -223,7 +223,7 @@
if (colType.getSelectedItem() != null) {
SQLColumn.setDefaultType(((SQLType)colType.getSelectedItem()).getType());
} else {
- SQLColumn.setDefaultType(Types.INTEGER);
+ SQLColumn.setDefaultType(Types.VARCHAR);
}
SQLColumn.setDefaultPrec((Integer)colPrec.getValue());
SQLColumn.setDefaultScale((Integer)colScale.getValue());
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/swingui/enterprise/SecurityPanel.java
Fri Aug 13 12:40:03 2010
+++
/trunk/src/main/java/ca/sqlpower/architect/swingui/enterprise/SecurityPanel.java
Fri Sep 3 14:03:29 2010
@@ -176,7 +176,7 @@
User user = createUserFromPrompter();
if (user != null) {
try {
- securityWorkspace.begin("");
+ securityWorkspace.begin("Creating a new user");
securityWorkspace.addChild(user,
securityWorkspace.getChildren(User.class).size());
DomainCategory category = new
DomainCategory(user.getName() + "'s Domains");
user.addGrant(new Grant(category, true, true,
true, true, true));
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/swingui/enterprise/ServerProjectsManagerPanel.java
Fri Aug 20 11:26:13 2010
+++
/trunk/src/main/java/ca/sqlpower/architect/swingui/enterprise/ServerProjectsManagerPanel.java
Fri Sep 3 14:03:29 2010
@@ -532,6 +532,7 @@
}
});
+ model.clear();
for (ProjectLocation pl : projects) {
model.addElement(pl);
}
