krysalis-version/src/java/org/krysalis/version/impl KrysalisVersion.java,1.32,1.33
[email protected] Mon, 31 Mar 2003 15:17:27 -0800
| Newsgroups | gmane.comp.krysalis.sandbox |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/metamorphosis/krysalis-version/src/java/org/krysalis/version/impl
In directory sc8-pr-cvs1:/tmp/cvs-serv1640/src/java/org/krysalis/version/impl
Modified Files:
KrysalisVersion.java
Log Message:
Trying to get cent to work w/ Nick...
Index: KrysalisVersion.java
===================================================================
RCS file: /cvsroot/metamorphosis/krysalis-version/src/java/org/krysalis/version/impl/KrysalisVersion.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** KrysalisVersion.java 25 Mar 2003 21:26:11 -0000 1.32
--- KrysalisVersion.java 31 Mar 2003 23:17:25 -0000 1.33
***************
*** 73,76 ****
--- 73,77 ----
import org.krysalis.version.util.debug.DebugUtils;
import org.krysalis.version.util.debug.Dumpable;
+ import org.krysalis.version.util.logging.VersionLogger;
/**
***************
*** 617,622 ****
/**
! * Compute if this other version is compatible with this one.
! *
*/
public boolean isCompatible(Version other) {
--- 618,631 ----
/**
! * Compute if this version is compatible with other.
! *
! * "Compatible" means (in effect) that this version is a
! * "good replacement" for the other.
! *
! * Say (for example) one wanted something compatible with 1.0
! * then 1.0.1 is such, but 1.0-alpha is not.
! *
! * "Compatibility" is not transitive.
! *
*/
public boolean isCompatible(Version other) {
***************
*** 626,651 ****
KrysalisVersion otherKrysalisVersion = (KrysalisVersion) other;
- compatible = true; // Optomistic...
-
//
// Other is 0, or major's equal
//
! compatible =
! (otherKrysalisVersion.getMajor() == 0)
! || (otherKrysalisVersion.getMajor() == getMajor());
! //
! // Release Level Higher, or neither RELEASE
! //
! compatible
! &= (otherKrysalisVersion
! .getReleaseLevelObject()
! .compareTo(getReleaseLevelObject())
! >= 0)
! || !((ReleaseLevel.RELEASE.equals(getReleaseLevelObject()))
! || (ReleaseLevel
! .RELEASE
! .equals(otherKrysalisVersion.getReleaseLevelObject())));
}
else
--- 635,688 ----
KrysalisVersion otherKrysalisVersion = (KrysalisVersion) other;
//
// Other is 0, or major's equal
//
! if ((otherKrysalisVersion.getMajor() == 0)
! || (otherKrysalisVersion.getMajor() == getMajor())) {
! //
! // *This* Release Level Higher, or neither RELEASE
! //
! if ((getReleaseLevelObject()
! .compareTo(otherKrysalisVersion.getReleaseLevelObject())
! >= 0)) {
!
! compatible = true;
! }
!
! else if (
! !ReleaseLevel.RELEASE.equals(getReleaseLevelObject())
! && !ReleaseLevel.RELEASE.equals(
! otherKrysalisVersion.getReleaseLevelObject())) {
!
! compatible = true;
! }
! else {
+ VersionLogger.g_log.debug(
+ "Release Levels ["
+ + otherKrysalisVersion.getReleaseLevelObject()
+ + ","
+ + getReleaseLevelObject()
+ + "]"
+ + " for "
+ + this
+ + ","
+ + otherKrysalisVersion
+ + " are *NOT* Compatible");
+ }
+ }
+ else
+ VersionLogger.g_log.debug(
+ "Major Version Numbers ["
+ + otherKrysalisVersion.getMajor()
+ + ","
+ + getMajor()
+ + "]"
+ + " for "
+ + this
+ + " and "
+ + otherKrysalisVersion
+ + " are *NOT* Compatible");
}
else
***************
*** 657,683 ****
return compatible;
-
}
/**
! * Returns the data.
! * @return VersionData
! */
public VersionData getData() {
return m_data;
! }
!
! /**
! * Returns the format.
! * @return VersionSpecification
! */
public VersionSpecification getSpecification() {
return m_specification;
! }
!
! /**
! * Returns the identifier.
! * @return VersionIdentifier
! */
public VersionIdentifier getIdentifier() {
return m_identifier;
--- 694,715 ----
return compatible;
}
/**
! * Returns the data.
! * @return VersionData
! */
public VersionData getData() {
return m_data;
! } /**
! * Returns the format.
! * @return VersionSpecification
! */
public VersionSpecification getSpecification() {
return m_specification;
! } /**
! * Returns the identifier.
! * @return VersionIdentifier
! */
public VersionIdentifier getIdentifier() {
return m_identifier;
***************
*** 686,791 ****
public Map getAttributes() {
return m_data.getAttributes();
! }
!
! /**
! * Returns the major.
! * @return int
! */
public int getMajor() {
return m_data.getMajor();
! }
!
! /**
! * Returns the major.
! * @return int
! */
public void setMajor(int major) {
m_data.setMajor(major);
! }
!
! /**
! * Returns the minor.
! * @return int
! */
public int getMinor() {
return m_data.getMinor();
! }
!
! /**
! * Returns the minor.
! * @return int
! */
public void setMinor(int minor) {
m_data.setMinor(minor);
! }
!
! /**
! * Returns the point.
! * @return int
! */
public int getPoint() {
return m_data.getPoint();
! }
!
! /**
! * Returns the point.
! * @return int
! */
public void setPoint(int point) {
m_data.setPoint(point);
! }
!
! /**
! * Returns the point.
! * @return int
! */
public int getBuildNumber() {
return m_data.getBuildNumber();
! }
!
! /**
! * Returns the point.
! * @return int
! */
public void setBuildNumber(int buildNumber) {
m_data.setBuildNumber(buildNumber);
! }
!
! /**
! * Returns the releaseLevel.
! * @return ReleaseLevel
! */
public String getReleaseLevel() {
return m_data.getReleaseLevelAsString();
! }
!
! /**
! * Returns the releaseLevel.
! * @return ReleaseLevel
! */
public void setReleaseLevel(String releaseLevel) throws VersionException {
m_data.setReleaseLevel(ReleaseLevel.getFromString(releaseLevel));
! }
!
! /**
! * Returns the releaseLevel.
! * @return ReleaseLevel
! */
public void setReleaseLevel(ReleaseLevel releaseLevel) {
m_data.setReleaseLevel(releaseLevel);
! }
!
! /**
! * Returns the releaseLevel.
! * @return ReleaseLevel
! */
public ReleaseLevel getReleaseLevelObject() {
return m_data.getReleaseLevel();
! }
!
! /**
! * Returns the releaseQualifier.
! * @return ReleaseQualifier
! */
public int getReleaseQualifier() {
return m_data.getReleaseQualifier();
--- 718,797 ----
public Map getAttributes() {
return m_data.getAttributes();
! } /**
! * Returns the major.
! * @return int
! */
public int getMajor() {
return m_data.getMajor();
! } /**
! * Returns the major.
! * @return int
! */
public void setMajor(int major) {
m_data.setMajor(major);
! } /**
! * Returns the minor.
! * @return int
! */
public int getMinor() {
return m_data.getMinor();
! } /**
! * Returns the minor.
! * @return int
! */
public void setMinor(int minor) {
m_data.setMinor(minor);
! } /**
! * Returns the point.
! * @return int
! */
public int getPoint() {
return m_data.getPoint();
! } /**
! * Returns the point.
! * @return int
! */
public void setPoint(int point) {
m_data.setPoint(point);
! } /**
! * Returns the point.
! * @return int
! */
public int getBuildNumber() {
return m_data.getBuildNumber();
! } /**
! * Returns the point.
! * @return int
! */
public void setBuildNumber(int buildNumber) {
m_data.setBuildNumber(buildNumber);
! } /**
! * Returns the releaseLevel.
! * @return ReleaseLevel
! */
public String getReleaseLevel() {
return m_data.getReleaseLevelAsString();
! } /**
! * Returns the releaseLevel.
! * @return ReleaseLevel
! */
public void setReleaseLevel(String releaseLevel) throws VersionException {
m_data.setReleaseLevel(ReleaseLevel.getFromString(releaseLevel));
! } /**
! * Returns the releaseLevel.
! * @return ReleaseLevel
! */
public void setReleaseLevel(ReleaseLevel releaseLevel) {
m_data.setReleaseLevel(releaseLevel);
! } /**
! * Returns the releaseLevel.
! * @return ReleaseLevel
! */
public ReleaseLevel getReleaseLevelObject() {
return m_data.getReleaseLevel();
! } /**
! * Returns the releaseQualifier.
! * @return ReleaseQualifier
! */
public int getReleaseQualifier() {
return m_data.getReleaseQualifier();
***************
*** 794,821 ****
public void setReleaseQualifier(int releaseQualifier) {
m_data.setReleaseQualifier(releaseQualifier);
! }
!
! /**
! * Accepts (in string form) any of the elements of version data
! * e.g. major or minor or point or release level or build number
! * and returns an incremented version.
! *
! * @see VersionDataElement
! * @see org.krysalis.version.Version#increment(String)
! */
public Version increment(String element) throws VersionException {
-
// Extract which element of the version data, e.g. "major"
VersionDataElement dataElement =
VersionDataElement.getFromString(element);
-
// Construct a suitable incrementor
VersionDataIncrementor incrementor =
new VersionDataIncrementor(dataElement);
-
// Increment the version data element, bumping the
// higher elements
VersionData nextVersionData = incrementor.increment(m_data);
-
// Construct the new immutable version
return new KrysalisVersion(
--- 800,821 ----
public void setReleaseQualifier(int releaseQualifier) {
m_data.setReleaseQualifier(releaseQualifier);
! } /**
! * Accepts (in string form) any of the elements of version data
! * e.g. major or minor or point or release level or build number
! * and returns an incremented version.
! *
! * @see VersionDataElement
! * @see org.krysalis.version.Version#increment(String)
! */
public Version increment(String element) throws VersionException {
// Extract which element of the version data, e.g. "major"
VersionDataElement dataElement =
VersionDataElement.getFromString(element);
// Construct a suitable incrementor
VersionDataIncrementor incrementor =
new VersionDataIncrementor(dataElement);
// Increment the version data element, bumping the
// higher elements
VersionData nextVersionData = incrementor.increment(m_data);
// Construct the new immutable version
return new KrysalisVersion(
***************
*** 827,831 ****
public String toString() {
StringBuffer buffer = new StringBuffer();
-
if (null != m_identifier) {
buffer.append(m_identifier.toString());
--- 827,830 ----
***************
*** 835,843 ****
if (buffer.length() > 0)
buffer.append("|");
-
buffer.append(m_data.toString());
! }
!
! //if (null != m_specification) {
// if (buffer.length() > 0)
// buffer.append("|");
--- 834,839 ----
if (buffer.length() > 0)
buffer.append("|");
buffer.append(m_data.toString());
! } //if (null != m_specification) {
// if (buffer.length() > 0)
// buffer.append("|");
***************
*** 845,849 ****
// buffer.append(m_specification.toString());
// }
-
return buffer.toString();
}
--- 841,844 ----
***************
*** 851,855 ****
public void dump(PrintWriter out, int depth) {
final String indent = DebugUtils.getIndent(depth);
-
if (null != m_identifier) {
out.print(indent);
--- 846,849 ----
***************
*** 867,871 ****
out.print(indent);
out.println("Data:");
-
m_data.dump(out, depth + 1);
}
--- 861,864 ----
-------------------------------------------------------
This SF.net email is sponsored by: ValueWeb:
Dedicated Hosting for just $79/mo with 500 GB of bandwidth!
No other company gives more support or power for your dedicated server
http://click.atdmt.com/AFF/go/sdnxxaff00300020aff/direct/01/