Revision: 3628
Author: [email protected]
Date: Mon Jun 14 14:54:47 2010
Log: Fixed a bug with the Architect build introduced in revision 3507. The
toSPVersion() method should not be implemented in the ArchitectVersion
class. It creates a Version object (which is located in the library).
However, the class comment states that it is extremely important that the
ArchitectVersion class should not have any dependencies with the exception
of the standard Java libraries.
This is not so much of a problem for developers who have done a build
previous to that change. It becomes an issue when someone does a fresh
checkout of the project.
http://code.google.com/p/power-architect/source/detail?r=3628
Modified:
/trunk/src/main/java/ca/sqlpower/architect/ArchitectVersion.java
/trunk/src/main/java/ca/sqlpower/architect/ArchitectVersionParseException.java
=======================================
--- /trunk/src/main/java/ca/sqlpower/architect/ArchitectVersion.java Fri
Jun 4 07:55:01 2010
+++ /trunk/src/main/java/ca/sqlpower/architect/ArchitectVersion.java Mon
Jun 14 14:54:47 2010
@@ -23,15 +23,13 @@
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
* also used during the build process in order to determine which version
* number to put in the archive file names.
* <p>
- * It is extremely important that this class has no dependencies aside
+ * XXX It is extremely important that this class has no dependencies aside
* from the standard Java libraries.
*/
public class ArchitectVersion implements Comparable<ArchitectVersion> {
@@ -204,7 +202,4 @@
return 0;
}
- public static Version toSPVersion() {
- return new Version(ArchitectVersion.APP_VERSION.toString());
- }
-}
+}
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/ArchitectVersionParseException.java
Thu Jan 29 12:02:55 2009
+++
/trunk/src/main/java/ca/sqlpower/architect/ArchitectVersionParseException.java
Mon Jun 14 14:54:47 2010
@@ -19,16 +19,14 @@
package ca.sqlpower.architect;
-import ca.sqlpower.sqlobject.SQLObjectException;
-import ca.sqlpower.sqlobject.SQLObjectRuntimeException;
/**
* The ArchitectVersionParseException represents a problem due to an
incorrectly
* formatted version number string.
*
*/
-public class ArchitectVersionParseException extends
SQLObjectRuntimeException {
+public class ArchitectVersionParseException extends RuntimeException {
public ArchitectVersionParseException(String version) {
- super(new SQLObjectException("Invalid Architect Version: " +
version));
+ super("Invalid Architect Version: " + version);
}
}