Revision: 3783
Author: [email protected]
Date: Thu Jul 22 13:35:26 2010
Log: Removed the completely unused property change event system from
architect session, and made architect frame update the window and tab
titles when saving and switching projects.
http://code.google.com/p/power-architect/source/detail?r=3783
Modified:
/trunk/regress/ca/sqlpower/architect/StubArchitectSession.java
/trunk/regress/ca/sqlpower/architect/TestingArchitectSession.java
/trunk/regress/ca/sqlpower/architect/swingui/TestingArchitectSwingSession.java
/trunk/src/main/java/ca/sqlpower/architect/ArchitectSession.java
/trunk/src/main/java/ca/sqlpower/architect/ArchitectSessionImpl.java
/trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectFrame.java
/trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectSwingSessionImpl.java
=======================================
--- /trunk/regress/ca/sqlpower/architect/StubArchitectSession.java Sat May
22 09:31:01 2010
+++ /trunk/regress/ca/sqlpower/architect/StubArchitectSession.java Thu Jul
22 13:35:26 2010
@@ -19,13 +19,12 @@
package ca.sqlpower.architect;
-import ca.sqlpower.architect.swingui.LiquibaseSettings;
-import java.beans.PropertyChangeListener;
import java.util.List;
import ca.sqlpower.architect.ddl.DDLGenerator;
import ca.sqlpower.architect.enterprise.DomainCategory;
import ca.sqlpower.architect.profile.ProfileManager;
+import ca.sqlpower.architect.swingui.LiquibaseSettings;
import ca.sqlpower.sql.DataSourceCollection;
import ca.sqlpower.sql.JDBCDataSource;
import ca.sqlpower.sql.SPDataSource;
@@ -40,11 +39,6 @@
public class StubArchitectSession implements ArchitectSession {
- public void addPropertyChangeListener(PropertyChangeListener l) {
- // TODO Auto-generated method stub
-
- }
-
public void
addSessionLifecycleListener(SessionLifecycleListener<ArchitectSession> l) {
// TODO Auto-generated method stub
@@ -94,11 +88,6 @@
// TODO Auto-generated method stub
return null;
}
-
- public void removePropertyChangeListener(PropertyChangeListener l) {
- // TODO Auto-generated method stub
-
- }
public void
removeSessionLifecycleListener(SessionLifecycleListener<ArchitectSession>
l) {
// TODO Auto-generated method stub
=======================================
--- /trunk/regress/ca/sqlpower/architect/TestingArchitectSession.java Sat
May 22 09:31:01 2010
+++ /trunk/regress/ca/sqlpower/architect/TestingArchitectSession.java Thu
Jul 22 13:35:26 2010
@@ -32,14 +32,13 @@
package ca.sqlpower.architect;
-import ca.sqlpower.architect.swingui.LiquibaseSettings;
-import java.beans.PropertyChangeListener;
import java.util.List;
import ca.sqlpower.architect.ddl.DDLGenerator;
import ca.sqlpower.architect.enterprise.DomainCategory;
import ca.sqlpower.architect.olap.OLAPRootObject;
import ca.sqlpower.architect.profile.ProfileManager;
+import ca.sqlpower.architect.swingui.LiquibaseSettings;
import ca.sqlpower.sql.DataSourceCollection;
import ca.sqlpower.sql.JDBCDataSource;
import ca.sqlpower.sql.SPDataSource;
@@ -167,16 +166,6 @@
// TODO Auto-generated method stub
}
-
- public void addPropertyChangeListener(PropertyChangeListener l) {
- // TODO Auto-generated method stub
-
- }
-
- public void removePropertyChangeListener(PropertyChangeListener l) {
- // TODO Auto-generated method stub
-
- }
public void
addSessionLifecycleListener(SessionLifecycleListener<ArchitectSession> l) {
// TODO Auto-generated method stub
=======================================
---
/trunk/regress/ca/sqlpower/architect/swingui/TestingArchitectSwingSession.java
Mon Jul 12 08:21:11 2010
+++
/trunk/regress/ca/sqlpower/architect/swingui/TestingArchitectSwingSession.java
Thu Jul 22 13:35:26 2010
@@ -20,7 +20,6 @@
import java.awt.Color;
import java.awt.Window;
-import java.beans.PropertyChangeListener;
import java.io.IOException;
import java.sql.DatabaseMetaData;
import java.sql.SQLException;
@@ -435,16 +434,6 @@
public void runInForeground(Runnable runner) {
runner.run();
}
-
- public void addPropertyChangeListener(PropertyChangeListener l) {
- // TODO Auto-generated method stub
-
- }
-
- public void removePropertyChangeListener(PropertyChangeListener l) {
- // TODO Auto-generated method stub
-
- }
public boolean isEnterpriseSession() {
// TODO Auto-generated method stub
=======================================
--- /trunk/src/main/java/ca/sqlpower/architect/ArchitectSession.java Sat
May 22 08:44:54 2010
+++ /trunk/src/main/java/ca/sqlpower/architect/ArchitectSession.java Thu
Jul 22 13:35:26 2010
@@ -18,7 +18,6 @@
*/
package ca.sqlpower.architect;
-import java.beans.PropertyChangeListener;
import java.sql.Types;
import java.util.List;
@@ -119,10 +118,6 @@
public boolean isEnterpriseSession();
- void addPropertyChangeListener(PropertyChangeListener l);
-
- void removePropertyChangeListener(PropertyChangeListener l);
-
public void
addSessionLifecycleListener(SessionLifecycleListener<ArchitectSession> l);
public void
removeSessionLifecycleListener(SessionLifecycleListener<ArchitectSession>
l);
=======================================
--- /trunk/src/main/java/ca/sqlpower/architect/ArchitectSessionImpl.java
Tue May 25 13:03:30 2010
+++ /trunk/src/main/java/ca/sqlpower/architect/ArchitectSessionImpl.java
Thu Jul 22 13:35:26 2010
@@ -19,8 +19,6 @@
package ca.sqlpower.architect;
-import java.beans.PropertyChangeListener;
-import java.beans.PropertyChangeSupport;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Collections;
@@ -62,8 +60,6 @@
private final ArchitectProject project;
private String name;
- private final PropertyChangeSupport pcs = new
PropertyChangeSupport(this);
-
private final List<SessionLifecycleListener<ArchitectSession>>
lifecycleListeners =
new ArrayList<SessionLifecycleListener<ArchitectSession>>();
@@ -220,14 +216,6 @@
public void runInForeground(Runnable runner) {
runner.run();
}
-
- public void addPropertyChangeListener(PropertyChangeListener l) {
- pcs.addPropertyChangeListener(l);
- }
-
- public void removePropertyChangeListener(PropertyChangeListener l) {
- pcs.addPropertyChangeListener(l);
- }
public boolean close() {
//TODO decide what to do with cleanup in the long run. At current
this call
=======================================
--- /trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectFrame.java
Thu Jul 22 13:10:20 2010
+++ /trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectFrame.java
Thu Jul 22 13:35:26 2010
@@ -43,8 +43,6 @@
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.awt.event.WindowStateListener;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
import java.io.BufferedInputStream;
import java.io.File;
import java.io.FileInputStream;
@@ -445,14 +443,6 @@
}
};
- private final PropertyChangeListener nameChangeListener = new
PropertyChangeListener() {
- public void propertyChange(PropertyChangeEvent evt) {
- if ("name".equals(evt.getPropertyName())) {
-
stackedTabPane.setTitleAt(stackedTabPane.indexOfTab(sessionTabs.get((ArchitectSwingSession)
evt.getSource())), (String) evt.getNewValue());
- }
- }
- };
-
private JMenu securityMenu;
private ChangeListener tabChangeListener = new ChangeListener() {
@@ -656,6 +646,8 @@
sprefs.getInt(ArchitectSwingUserSettings.ICON_SIZE,
ArchitectSwingSessionContext.ICON_SIZE))) {
public void actionPerformed(ActionEvent e) {
currentSession.saveOrSaveAs(false, true);
+
stackedTabPane.setTitleAt(stackedTabPane.getSelectedIndex(),
currentSession.getName());
+
setTitle(Messages.getString("ArchitectSwingSessionImpl.mainFrameTitle",
currentSession.getName())); //$NON-NLS-1$
}
};
saveProjectAction.putValue(AbstractAction.SHORT_DESCRIPTION,
Messages.getString("ArchitectFrame.saveProjectActionDescription"));
//$NON-NLS-1$
@@ -668,6 +660,8 @@
sprefs.getInt(ArchitectSwingUserSettings.ICON_SIZE,
ArchitectSwingSessionContext.ICON_SIZE))) {
public void actionPerformed(ActionEvent e) {
currentSession.saveOrSaveAs(true, true);
+
stackedTabPane.setTitleAt(stackedTabPane.getSelectedIndex(),
currentSession.getName());
+
setTitle(Messages.getString("ArchitectSwingSessionImpl.mainFrameTitle",
currentSession.getName())); //$NON-NLS-1$
}
};
saveProjectAsAction.putValue(AbstractAction.SHORT_DESCRIPTION,
Messages.getString("ArchitectFrame.saveProjectAsActionDescription"));
//$NON-NLS-1$
@@ -679,7 +673,9 @@
public void actionPerformed(ActionEvent e) {
for (ArchitectSwingSession session : sessions) {
session.saveOrSaveAs(false, true);
- }
+
stackedTabPane.setTitleAt(stackedTabPane.indexOfTab(sessionTabs.get(session)),
session.getName());
+ }
+
setTitle(Messages.getString("ArchitectSwingSessionImpl.mainFrameTitle",
currentSession.getName())); //$NON-NLS-1$
}
};
saveAllProjectsAction.putValue(AbstractAction.ACCELERATOR_KEY,
@@ -846,6 +842,8 @@
context.registerFrame(this);
+
setTitle(Messages.getString("ArchitectSwingSessionImpl.mainFrameTitle",
session.getName())); //$NON-NLS-1$
+
setVisible(showGUI);
}
@@ -1133,11 +1131,15 @@
newSession.getPlayPen().addFocusListener(l);
}
+
setTitle(Messages.getString("ArchitectSwingSessionImpl.mainFrameTitle",
newSession.getName())); //$NON-NLS-1$
+
stackedTabPane.setSelectedIndex(stackedTabPane.indexOfTab(sessionTabs.get(newSession)));
+ stackedTabPane.setTitleAt(stackedTabPane.getSelectedIndex(),
newSession.getName());
int div = splitPane.getDividerLocation();
splitPane.setRightComponent(newSession.getProjectPanel());
splitPane.setDividerLocation(div);
+
firePropertyChange("currentSession", oldSession, newSession);
}
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectSwingSessionImpl.java
Mon Jul 19 11:32:40 2010
+++
/trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectSwingSessionImpl.java
Thu Jul 22 13:35:26 2010
@@ -570,7 +570,6 @@
project.clearFileVersion();
String projName = file.getName().substring(0,
file.getName().length()-".architect".length()); //$NON-NLS-1$
setName(projName);
-
frame.setTitle(Messages.getString("ArchitectSwingSessionImpl.mainFrameTitle",
projName)); //$NON-NLS-1$
}
}
final boolean finalSeparateThread = separateThread;
@@ -1127,14 +1126,6 @@
}
}
- public void addPropertyChangeListener(PropertyChangeListener l) {
- delegateSession.addPropertyChangeListener(l);
- }
-
- public void removePropertyChangeListener(PropertyChangeListener l) {
- delegateSession.removePropertyChangeListener(l);
- }
-
public boolean isEnterpriseSession() {
return delegateSession.isEnterpriseSession();
}
