From 3a39cf90b69973c277b307fb1ac11f828a367d40 Mon Sep 17 00:00:00 2001 From: Derek Hulley Date: Wed, 13 Jun 2007 10:40:07 +0000 Subject: [PATCH] Fixed version label to handle '0' as an initializer git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5929 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../SerialVersionLabelPolicy.java | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/source/java/org/alfresco/repo/version/common/versionlabel/SerialVersionLabelPolicy.java b/source/java/org/alfresco/repo/version/common/versionlabel/SerialVersionLabelPolicy.java index 966a436edb..be2a498f5f 100644 --- a/source/java/org/alfresco/repo/version/common/versionlabel/SerialVersionLabelPolicy.java +++ b/source/java/org/alfresco/repo/version/common/versionlabel/SerialVersionLabelPolicy.java @@ -31,6 +31,7 @@ import org.alfresco.repo.version.VersionModel; import org.alfresco.service.cmr.version.Version; import org.alfresco.service.cmr.version.VersionType; import org.alfresco.service.namespace.QName; +import org.alfresco.util.VersionNumber; /** * The serial version label policy. @@ -92,14 +93,14 @@ public class SerialVersionLabelPolicy private static final String DELIMITER = "."; /** - * The major revision number + * The major revision number (default 1) */ - private int majorRevisionNumber = 1; + private int majorRevisionNumber; /** - * The minor revision number + * The minor revision number (default 0) */ - private int minorRevisionNumber = 0; + private int minorRevisionNumber; /** * Constructor @@ -110,12 +111,14 @@ public class SerialVersionLabelPolicy { if (versionLabel != null && versionLabel.length() != 0) { - int iIndex = versionLabel.indexOf(DELIMITER); - String majorString = versionLabel.substring(0, iIndex); - String minorString = versionLabel.substring(iIndex+1); - - this.majorRevisionNumber = Integer.parseInt(majorString); - this.minorRevisionNumber = Integer.parseInt(minorString); + VersionNumber versionNumber = new VersionNumber(versionLabel); + majorRevisionNumber = versionNumber.getPart(0); + minorRevisionNumber = versionNumber.getPart(1); + } + else + { + majorRevisionNumber = 1; + minorRevisionNumber = 0; } }