Author: aadamchik
Date: Sun Nov 1 14:01:10 2009
New Revision: 831678
URL: http://svn.apache.org/viewvc?rev=831678&view=rev
Log:
prevent project version from displaying to the user, as internal version
numbers may cause confusion
(cherry picked from commit 5e8edfeb2c50e6441589d155af89a3be2e7ccdfe)
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/ApplicationUpgradeHandler.java
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/ApplicationUpgradeHandler.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/ApplicationUpgradeHandler.java?rev=831678&r1=831677&r2=831678&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/ApplicationUpgradeHandler.java
(original)
+++
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/ApplicationUpgradeHandler.java
Sun Nov 1 14:01:10 2009
@@ -117,17 +117,11 @@
String loadedVersion = project.getProjectVersion();
int versionState = compareVersion(loadedVersion);
if (versionState < 0) {
- String versionLabel = (loadedVersion != null) ? loadedVersion
: "?";
- appendMessages.add("Newer Project Version Detected: \""
- + versionLabel
- + "\"");
+ appendMessages.add("Newer Project Version Detected");
return Project.UPGRADE_STATUS_NEW;
}
else if (versionState > 0) {
- String versionLabel = (loadedVersion != null) ? loadedVersion
: "?";
- appendMessages.add("Older Project Version Detected: \""
- + versionLabel
- + "\"");
+ appendMessages.add("Older Project Version Detected");
return Project.UPGRADE_STATUS_OLD;
}
else {
