Revision: 3507
Author: lucboudreau
Date: Thu May 6 12:56:55 2010
Log: Places the update checker in the help menu.
Adds a helper method co toncert from architect version to sqlp version.
http://code.google.com/p/power-architect/source/detail?r=3507
Modified:
/trunk/src/main/java/ca/sqlpower/architect/ArchitectVersion.java
/trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectFrame.java
/trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectSwingSessionImpl.java
=======================================
--- /trunk/src/main/java/ca/sqlpower/architect/ArchitectVersion.java Fri
Mar 5 07:40:55 2010
+++ /trunk/src/main/java/ca/sqlpower/architect/ArchitectVersion.java Thu
May 6 12:56:55 2010
@@ -23,6 +23,8 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import ca.sqlpower.util.Version;
+
/**
* The ArchitectVersion class exists as a means of finding out which
* version of the Architect application you are dealing with. It is
@@ -201,4 +203,8 @@
// they're actually the same
return 0;
}
-}
+
+ public static Version toSPVersion() {
+ return new Version(ArchitectVersion.APP_VERSION.toString());
+ }
+}
=======================================
--- /trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectFrame.java
Thu May 6 09:31:10 2010
+++ /trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectFrame.java
Thu May 6 12:56:55 2010
@@ -892,7 +892,7 @@
if (!context.isMacOSX()) {
helpMenu.add(aboutAction);
- helpMenu.add(checkForUpdateAction);
+
helpMenu.addSeparator();
}
@@ -904,7 +904,8 @@
helpMenu.add(new OpenUrlAction(SPSUtils.ARCHITECT_UPGRADE_URL,
Messages.getString("ArchitectFrame.upgradeAction")));
helpMenu.add(new OpenUrlAction(SPSUtils.ARCHITECT_PS_URL,
Messages.getString("ArchitectFrame.premiumSupportAction")));
helpMenu.add(new OpenUrlAction(SPSUtils.ARCHITECT_UG_URL,
Messages.getString("ArchitectFrame.userGuideAction")));
-
+ helpMenu.addSeparator();
+ helpMenu.add(checkForUpdateAction);
menuBar.add(helpMenu);
return menuBar;
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectSwingSessionImpl.java
Thu May 6 09:31:10 2010
+++
/trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectSwingSessionImpl.java
Thu May 6 12:56:55 2010
@@ -69,7 +69,6 @@
import ca.sqlpower.architect.profile.ProfileManagerImpl;
import ca.sqlpower.architect.swingui.action.AboutAction;
import ca.sqlpower.architect.swingui.action.AddDataSourceAction;
-import ca.sqlpower.architect.swingui.action.CheckForUpdateAction;
import ca.sqlpower.architect.swingui.action.NewDataSourceAction;
import ca.sqlpower.architect.swingui.action.OpenProjectAction;
import ca.sqlpower.architect.swingui.action.PreferencesAction;
@@ -449,7 +448,7 @@
// The main registration method. Takes quitAction,
prefsAction, aboutAction.
Class[] defArgs = { Action.class, Action.class,
Action.class };
Method registerMethod =
osxAdapter.getDeclaredMethod("registerMacOSXApplication", defArgs);
//$NON-NLS-1$
- Object[] args = { exitAction, prefAction, aboutAction, new
CheckForUpdateAction(this) };
+ Object[] args = { exitAction, prefAction, aboutAction };
registerMethod.invoke(osxAdapter, args);
// The enable prefs method. Takes a boolean.
