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
This commit is contained in:
Derek Hulley 2007-06-13 10:40:07 +00:00
parent f1f2d4c035
commit 3a39cf90b6

View File

@ -31,6 +31,7 @@ import org.alfresco.repo.version.VersionModel;
import org.alfresco.service.cmr.version.Version; import org.alfresco.service.cmr.version.Version;
import org.alfresco.service.cmr.version.VersionType; import org.alfresco.service.cmr.version.VersionType;
import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.QName;
import org.alfresco.util.VersionNumber;
/** /**
* The serial version label policy. * The serial version label policy.
@ -92,14 +93,14 @@ public class SerialVersionLabelPolicy
private static final String DELIMITER = "."; 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 * Constructor
@ -110,12 +111,14 @@ public class SerialVersionLabelPolicy
{ {
if (versionLabel != null && versionLabel.length() != 0) if (versionLabel != null && versionLabel.length() != 0)
{ {
int iIndex = versionLabel.indexOf(DELIMITER); VersionNumber versionNumber = new VersionNumber(versionLabel);
String majorString = versionLabel.substring(0, iIndex); majorRevisionNumber = versionNumber.getPart(0);
String minorString = versionLabel.substring(iIndex+1); minorRevisionNumber = versionNumber.getPart(1);
}
this.majorRevisionNumber = Integer.parseInt(majorString); else
this.minorRevisionNumber = Integer.parseInt(minorString); {
majorRevisionNumber = 1;
minorRevisionNumber = 0;
} }
} }