krysalis-version/src/java/org/krysalis/version/impl/apache ApacheVersionMarker.java,1.2,1.3 ApacheVersionFormat.java,1.3,1.4
Nick Chalko <[email protected]> Wed, 10 Nov 2004 07:57:00 +0000
| Newsgroups | gmane.comp.krysalis.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/krysalis/krysalis-version/src/java/org/krysalis/version/impl/apache
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9128/src/java/org/krysalis/version/impl/apache
Modified Files:
ApacheVersionMarker.java ApacheVersionFormat.java
Log Message:
Basic stamp seems to be working.
Index: ApacheVersionMarker.java
===================================================================
RCS file: /cvsroot/krysalis/krysalis-version/src/java/org/krysalis/version/impl/apache/ApacheVersionMarker.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ApacheVersionMarker.java 9 Nov 2004 07:13:57 -0000 1.2
--- ApacheVersionMarker.java 10 Nov 2004 07:56:57 -0000 1.3
***************
*** 36,43 ****
/** Extended Optional Settings... */
! //:TODO: final on these two?
! private Map m_attributes = null;
! private List m_annotations = null;
/**
--- 36,43 ----
/** Extended Optional Settings... */
! // :TODO: final on these two?
! private final Map<String, Object> m_attributes = new HashMap<String, Object>();
! private final List<Object> m_annotations = new ArrayList<Object>();
/**
***************
*** 72,78 ****
*/
public ApacheVersionMarker(VersionIdentifier id, ApacheVersion version,
! Map properties) {
!
! // TODO Auto-generated constructor stub
}
--- 72,80 ----
*/
public ApacheVersionMarker(VersionIdentifier id, ApacheVersion version,
! Map<String, Object> properties) {
! m_identifier = id;
! m_version = version;
! m_attributes.putAll(properties);
! validate();
}
***************
*** 109,113 ****
}
! // Please let me complete 'MASK' in format first
public String getShortVersion() {
return FORMAT.format(m_version, VersionFormat.SHORT);
--- 111,115 ----
}
! // Please let me complete 'MASK' in format first
public String getShortVersion() {
return FORMAT.format(m_version, VersionFormat.SHORT);
***************
*** 183,192 ****
*/
public void setAttributes(Map attributes) {
! m_attributes = attributes;
}
public void setAttribute(String key, Object value) {
- if (null == m_attributes)
- m_attributes = new HashMap();
m_attributes.put(key, value);
--- 185,193 ----
*/
public void setAttributes(Map attributes) {
! m_attributes.clear();
! m_attributes.putAll(attributes);
}
public void setAttribute(String key, Object value) {
m_attributes.put(key, value);
***************
*** 212,217 ****
public void addAnnotation(Object note) {
- if (null == m_annotations)
- m_annotations = new ArrayList();
m_annotations.add(note);
--- 213,216 ----
***************
*** 234,238 ****
*/
public void setAnnotations(List annotations) {
! m_annotations = annotations;
}
--- 233,238 ----
*/
public void setAnnotations(List annotations) {
! m_annotations.clear();
! m_annotations.addAll(annotations);
}
***************
*** 241,245 ****
throw new IllegalArgumentException("Invalid (null) identifier");
}
! //m_identifier.validate();
if (null == m_version) {
--- 241,245 ----
throw new IllegalArgumentException("Invalid (null) identifier");
}
! // m_identifier.validate();
if (null == m_version) {
Index: ApacheVersionFormat.java
===================================================================
RCS file: /cvsroot/krysalis/krysalis-version/src/java/org/krysalis/version/impl/apache/ApacheVersionFormat.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ApacheVersionFormat.java 9 Nov 2004 08:01:38 -0000 1.3
--- ApacheVersionFormat.java 10 Nov 2004 07:56:58 -0000 1.4
***************
*** 16,19 ****
--- 16,20 ----
package org.krysalis.version.impl.apache;
+
import java.util.Date;
import java.util.Map;
***************
*** 39,43 ****
public class ApacheVersionFormat extends VersionFormatImpl {
private final static Logger LOG = Logger.global;
! //:TODO: Make it sensetive to elements...
private VersionDataElementSet m_elements = null;
--- 40,45 ----
public class ApacheVersionFormat extends VersionFormatImpl {
private final static Logger LOG = Logger.global;
!
! // :TODO: Make it sensetive to elements...
private VersionDataElementSet m_elements = null;
***************
*** 59,64 ****
// public String getVersionFormatMask() {
! // return "{MAJOR}.{MINOR}[.{POINT}][-{RELEASE_LEVEL}][-{BUILD_NUMBER}]";
! //}
public String getVersionFormatDescription() {
--- 61,66 ----
// public String getVersionFormatMask() {
! // return "{MAJOR}.{MINOR}[.{POINT}][-{RELEASE_LEVEL}][-{BUILD_NUMBER}]";
! // }
public String getVersionFormatDescription() {
***************
*** 67,71 ****
//
! // {MAJOR}.{MINOR}[.{POINT}][-{RELEASE_LEVEL}][-{BUILD_NUMBER}]
//
public VersionData parseVersionData(String versionString)
--- 69,73 ----
//
! // {MAJOR}.{MINOR}[.{POINT}][-{RELEASE_LEVEL}][-{BUILD_NUMBER}]
//
public VersionData parseVersionData(String versionString)
***************
*** 73,88 ****
int elementMask = 0;
! LOG.log(Level.FINE,
! "Parse Apache Version String: [" + versionString + "]");
StringTokenizer tokens = new StringTokenizer(versionString, ". ");
! // ---------------------------------------------------------------------------
! // Extract MAJOR (a mandatory element)
elementMask |= VersionDataElement.ELEMENT_MAJOR;
int major = parseInt(versionString, VersionDataElement.MAJOR, tokens
.nextToken());
! // ---------------------------------------------------------------------------
// Extract MINOR
int minor = VersionDataElement.MIN_MINOR;
--- 75,90 ----
int elementMask = 0;
! LOG.log(Level.FINE, "Parse Apache Version String: [" + versionString
! + "]");
StringTokenizer tokens = new StringTokenizer(versionString, ". ");
! // ---------------------------------------------------------------------------
! // Extract MAJOR (a mandatory element)
elementMask |= VersionDataElement.ELEMENT_MAJOR;
int major = parseInt(versionString, VersionDataElement.MAJOR, tokens
.nextToken());
! // ---------------------------------------------------------------------------
// Extract MINOR
int minor = VersionDataElement.MIN_MINOR;
***************
*** 112,118 ****
overflow = overflow + tokens.nextToken();
! LOG.log(Level.FINE,
! "Major/Minor/Extra : [" + major + "/" + minor + "/" + overflow
! + "]");
int point = VersionDataElement.DEFAULT_BUILD_NUMBER;
--- 114,119 ----
overflow = overflow + tokens.nextToken();
! LOG.log(Level.FINE, "Major/Minor/Extra : [" + major + "/" + minor + "/"
! + overflow + "]");
int point = VersionDataElement.DEFAULT_BUILD_NUMBER;
***************
*** 135,139 ****
possiblePoint = pointToken;
! // Terminated point with a non-digit
int nonNumericPos = findEndOfNumericalArea(possiblePoint);
--- 136,140 ----
possiblePoint = pointToken;
! // Terminated point with a non-digit
int nonNumericPos = findEndOfNumericalArea(possiblePoint);
***************
*** 155,160 ****
remainder = tokens2.nextToken();
! LOG.log(Level.FINE,
! "Point/Extra : [" + point + "/" + remainder + "]");
if (remainder.length() > 0)
--- 156,161 ----
remainder = tokens2.nextToken();
! LOG.log(Level.FINE, "Point/Extra : [" + point + "/" + remainder
! + "]");
if (remainder.length() > 0)
***************
*** 187,193 ****
}
! LOG.log(Level.FINE,
! "RelaseLevel/Qualifier : [" + releaseLevel + "/"
! + releaseQualifier + "]");
if (tokens2.hasMoreTokens()) {
--- 188,193 ----
}
! LOG.log(Level.FINE, "RelaseLevel/Qualifier : ["
! + releaseLevel + "/" + releaseQualifier + "]");
if (tokens2.hasMoreTokens()) {
***************
*** 209,213 ****
}
} catch (VersionFormatException vfe) {
! LOG.log(Level.FINE,"Previous", vfe);
elementMask |= VersionDataElement.ELEMENT_BUILD_NUMBER;
buildNumber = parseInt(versionString,
--- 209,213 ----
}
} catch (VersionFormatException vfe) {
! LOG.log(Level.FINE, "Previous", vfe);
elementMask |= VersionDataElement.ELEMENT_BUILD_NUMBER;
buildNumber = parseInt(versionString,
***************
*** 216,220 ****
}
! //:TODO: Trap remainder and fail if leftovers...
return new VersionData(new VersionDataElementSet(elementMask), major,
--- 216,220 ----
}
! // :TODO: Trap remainder and fail if leftovers...
return new VersionData(new VersionDataElementSet(elementMask), major,
***************
*** 317,344 ****
* @see org.apache.depot.version.specification.formatting.VersionFormat#parseVersion(java.lang.String)
*/
! public ApacheVersion parseVersion(String version) throws VersionFormatException {
try {
! ApacheVersionFormat avf=new ApacheVersionFormat();
! return new ApacheVersion(avf.parseVersionData(version));
} catch (VersionException e) {
! throw new VersionFormatException(ApacheVersion.APACHE_VERSION_SPEC.getVersionFormat(),e);
}
}
! /* (non-Javadoc)
! * @see org.krysalis.version.VersionFormat#createVersionMarker(org.krysalis.version.VersionIdentifier, org.krysalis.version.Version, java.util.Map)
*/
! public VersionMarker createVersionMarker(VersionIdentifier id, Version version, Map properties) {
// TODO Auto-generated method stub
return null;
}
! /* (non-Javadoc)
! * @see org.krysalis.version.VersionFormat#format(org.krysalis.version.Version, java.lang.String)
*/
! public String format(Version m_version, String format) {
! // TODO Auto-generated method stub
! return null;
}
}
\ No newline at end of file
--- 317,352 ----
* @see org.apache.depot.version.specification.formatting.VersionFormat#parseVersion(java.lang.String)
*/
! public ApacheVersion parseVersion(String version)
! throws VersionFormatException {
try {
! ApacheVersionFormat avf = new ApacheVersionFormat();
! return new ApacheVersion(avf.parseVersionData(version));
} catch (VersionException e) {
! throw new VersionFormatException(ApacheVersion.APACHE_VERSION_SPEC
! .getVersionFormat(), e);
}
}
! /*
! * (non-Javadoc)
! *
! * @see org.krysalis.version.VersionFormat#createVersionMarker(org.krysalis.version.VersionIdentifier,
! * org.krysalis.version.Version, java.util.Map)
*/
! public VersionMarker createVersionMarker(VersionIdentifier id,
! Version version, Map properties) {
// TODO Auto-generated method stub
return null;
}
! /*
! * (non-Javadoc)
! *
! * @see org.krysalis.version.VersionFormat#format(org.krysalis.version.Version,
! * java.lang.String)
*/
! public String format(Version version, String format) {
! return format(((ApacheVersion) version).getData(), format);
}
}
\ No newline at end of file
-------------------------------------------------------
This SF.Net email is sponsored by:
Sybase ASE Linux Express Edition - download now for FREE
LinuxWorld Reader's Choice Award Winner for best database on Linux.
http://ads.osdn.com/?ad_id=5588&alloc_id=12065&op=click