krysalis-version/src/java/org/krysalis/version/loading/loaders VersionJarLoader.java,1.1,1.2 VersionPackageLoader.java,1.2,1.3

Update of /cvsroot/metamorphosis/krysalis-version/src/java/org/krysalis/version/loading/loaders
In directory sc8-pr-cvs1:/tmp/cvs-serv20296/src/java/org/krysalis/version/loading/loaders

Modified Files:
	VersionJarLoader.java VersionPackageLoader.java 
Log Message:
First stab at replacing Formats with Specifications for "non-Krysalis" formats.
Fixed some bugs via new tests.

Index: VersionJarLoader.java
===================================================================
RCS file: /cvsroot/metamorphosis/krysalis-version/src/java/org/krysalis/version/loading/loaders/VersionJarLoader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** VersionJarLoader.java	4 Feb 2003 07:47:05 -0000	1.1
--- VersionJarLoader.java	10 Mar 2003 20:44:20 -0000	1.2
***************
*** 63,70 ****
  
  import org.krysalis.version.Version;
! import org.krysalis.version.formatting.VersionFormat;
! import org.krysalis.version.formatting.VersionFormatFactory;
  import org.krysalis.version.formatting.exception.VersionFormatException;
! import org.krysalis.version.impl.KrysalisVersion;
  import org.krysalis.version.internal.VersionIdentifier;
  import org.krysalis.version.loading.VersionLoadContext;
--- 63,69 ----
  
  import org.krysalis.version.Version;
! import org.krysalis.version.exception.VersionException;
  import org.krysalis.version.formatting.exception.VersionFormatException;
! import org.krysalis.version.impl.VersionImporter;
  import org.krysalis.version.internal.VersionIdentifier;
  import org.krysalis.version.loading.VersionLoadContext;
***************
*** 105,109 ****
  
      public ArrayList load(AnnotationScratchpad pad, Manifest manifest)
!         throws VersionFormatException {
          VersionLoaderLogger.g_log.debug("*** Manifest: " + manifest);
  
--- 104,108 ----
  
      public ArrayList load(AnnotationScratchpad pad, Manifest manifest)
!         throws VersionFormatException, VersionException {
          VersionLoaderLogger.g_log.debug("*** Manifest: " + manifest);
  
***************
*** 168,172 ****
          Attributes mainAttributes,
          String name)
!         throws VersionFormatException {
          VersionLoadContext context = null;
  
--- 167,171 ----
          Attributes mainAttributes,
          String name)
!         throws VersionFormatException, VersionException {
          VersionLoadContext context = null;
  
***************
*** 213,221 ****
              || (null != implementationVendor)
              || (null != implementationVersion)) {
!             VersionFormat format =
!                 VersionFormatFactory.createJavasoftVersionFormat();
! 
              Version version =
!                 new KrysalisVersion(name, format, implementationVersion);
  
              VersionIdentifier identifier =
--- 212,218 ----
              || (null != implementationVendor)
              || (null != implementationVersion)) {
!             
              Version version =
!                 VersionImporter.importVersion(name, implementationVersion);
  
              VersionIdentifier identifier =

Index: VersionPackageLoader.java
===================================================================
RCS file: /cvsroot/metamorphosis/krysalis-version/src/java/org/krysalis/version/loading/loaders/VersionPackageLoader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** VersionPackageLoader.java	16 Feb 2003 14:43:20 -0000	1.2
--- VersionPackageLoader.java	10 Mar 2003 20:44:21 -0000	1.3
***************
*** 57,64 ****
  
  import org.krysalis.version.Version;
! import org.krysalis.version.formatting.VersionFormat;
! import org.krysalis.version.formatting.VersionFormatFactory;
  import org.krysalis.version.formatting.exception.VersionFormatException;
! import org.krysalis.version.impl.KrysalisVersion;
  import org.krysalis.version.internal.VersionIdentifier;
  import org.krysalis.version.loading.VersionLoadContext;
--- 57,63 ----
  
  import org.krysalis.version.Version;
! import org.krysalis.version.exception.VersionException;
  import org.krysalis.version.formatting.exception.VersionFormatException;
! import org.krysalis.version.impl.VersionImporter;
  import org.krysalis.version.internal.VersionIdentifier;
  import org.krysalis.version.loading.VersionLoadContext;
***************
*** 73,77 ****
          AnnotationScratchpad pad,
          VersionIdentifier identifier)
!         throws VersionFormatException {
          Package p = Package.getPackage(identifier.getKey());
  
--- 72,76 ----
          AnnotationScratchpad pad,
          VersionIdentifier identifier)
!         throws VersionFormatException, VersionException {
          Package p = Package.getPackage(identifier.getKey());
  
***************
*** 82,86 ****
          AnnotationScratchpad pad,
          Package p)
!         throws VersionFormatException {
          return loadFromPackage(pad, null, p);
      }
--- 81,85 ----
          AnnotationScratchpad pad,
          Package p)
!         throws VersionFormatException, VersionException {
          return loadFromPackage(pad, null, p);
      }
***************
*** 90,94 ****
          VersionIdentifier identifier,
          Package p)
!         throws VersionFormatException {
          VersionLoadContext context = null;
  
--- 89,93 ----
          VersionIdentifier identifier,
          Package p)
!         throws VersionFormatException, VersionException {
          VersionLoadContext context = null;
  
***************
*** 114,124 ****
  
              // :TODO: Try Javasoft, then others .. Apache?
!             VersionFormat format =
!                 VersionFormatFactory.createJavasoftVersionFormat();
  
              Version version =
!                 new KrysalisVersion(
                      p.getName(),
-                     format,
                      p.getImplementationVersion());
  
--- 113,121 ----
  
              // :TODO: Try Javasoft, then others .. Apache?
!             VersionImporter importer = new VersionImporter();
  
              Version version =
!                 importer.importVersion(
                      p.getName(),
                      p.getImplementationVersion());
  




-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf