You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2005/09/12 19:07:04 UTC

svn commit: r280372 - /maven/components/trunk/maven-mboot2/src/main/java/download/RepositoryMetadata.java

Author: brett
Date: Mon Sep 12 10:06:59 2005
New Revision: 280372

URL: http://svn.apache.org/viewcvs?rev=280372&view=rev
Log:
fix metadata parsing in mboot

Modified:
    maven/components/trunk/maven-mboot2/src/main/java/download/RepositoryMetadata.java

Modified: maven/components/trunk/maven-mboot2/src/main/java/download/RepositoryMetadata.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-mboot2/src/main/java/download/RepositoryMetadata.java?rev=280372&r1=280371&r2=280372&view=diff
==============================================================================
--- maven/components/trunk/maven-mboot2/src/main/java/download/RepositoryMetadata.java (original)
+++ maven/components/trunk/maven-mboot2/src/main/java/download/RepositoryMetadata.java Mon Sep 12 10:06:59 2005
@@ -196,53 +196,13 @@
         {
             if ( insideVersioning )
             {
-                if ( insideSnapshot )
-                {
-                    if ( "buildNumber".equals( rawName ) )
-                    {
-                        try
-                        {
-                            metadata.setSnapshotBuildNumber( Integer.valueOf( getBodyText() ).intValue() );
-                        }
-                        catch ( NumberFormatException e )
-                        {
-                            // Ignore
-                        }
-                    }
-                    else if ( "timestamp".equals( rawName ) )
-                    {
-                        metadata.setSnapshotTimestamp( getBodyText() );
-                    }
-                    else if ( "localCopy".equals( rawName ) )
-                    {
-                        metadata.setLocalCopy( Boolean.valueOf( getBodyText() ).booleanValue() );
-                    }
-                }
-                else if ( insideVersions )
+                if ( "snapshot".equals( rawName ) )
                 {
-                    if ( "version".equals( rawName ) )
-                    {
-                        metadata.addVersion( getBodyText() );
-                    }
+                    insideSnapshot = true;
                 }
-                else
+                else if ( "versions".equals( rawName ) )
                 {
-                    if ( "snapshot".equals( rawName ) )
-                    {
-                        insideSnapshot = true;
-                    }
-                    else if ( "versions".equals( rawName ) )
-                    {
-                        insideVersions = true;
-                    }
-                    else if ( "latest".equals( rawName ) )
-                    {
-                        metadata.setLatestVersion( getBodyText() );
-                    }
-                    else if ( "release".equals( rawName ) )
-                    {
-                        metadata.setReleaseVersion( getBodyText() );
-                    }
+                    insideVersions = true;
                 }
             }
             else
@@ -252,18 +212,6 @@
                 {
                     insideVersioning = true;
                 }
-                else if ( "groupId".equals( rawName ) )
-                {
-                    metadata.setGroupId( getBodyText() );
-                }
-                else if ( "artifactId".equals( rawName ) )
-                {
-                    metadata.setArtifactId( getBodyText() );
-                }
-                else if ( "version".equals( rawName ) )
-                {
-                    metadata.setVersion( getBodyText() );
-                }
             }
         }
 
@@ -286,14 +234,57 @@
                 {
                     insideVersioning = false;
                 }
-                if ( "snapshot".equals( rawName ) )
+                else if ( insideSnapshot && "snapshot".equals( rawName ) )
                 {
+                    if ( "buildNumber".equals( rawName ) )
+                    {
+                        try
+                        {
+                            metadata.setSnapshotBuildNumber( Integer.valueOf( getBodyText() ).intValue() );
+                        }
+                        catch ( NumberFormatException e )
+                        {
+                            // Ignore
+                        }
+                    }
+                    else if ( "timestamp".equals( rawName ) )
+                    {
+                        metadata.setSnapshotTimestamp( getBodyText() );
+                    }
+                    else if ( "localCopy".equals( rawName ) )
+                    {
+                        metadata.setLocalCopy( Boolean.valueOf( getBodyText() ).booleanValue() );
+                    }
                     insideSnapshot = false;
                 }
-                if ( "versions".equals( rawName ) )
+                else if ( insideVersions && "versions".equals( rawName ) )
                 {
+                    if ( "version".equals( rawName ) )
+                    {
+                        metadata.addVersion( getBodyText() );
+                    }
                     insideVersions = false;
                 }
+                else if ( "latest".equals( rawName ) )
+                {
+                    metadata.setLatestVersion( getBodyText() );
+                }
+                else if ( "release".equals( rawName ) )
+                {
+                    metadata.setReleaseVersion( getBodyText() );
+                }
+            }
+            else if ( "groupId".equals( rawName ) )
+            {
+                metadata.setGroupId( getBodyText() );
+            }
+            else if ( "artifactId".equals( rawName ) )
+            {
+                metadata.setArtifactId( getBodyText() );
+            }
+            else if ( "version".equals( rawName ) )
+            {
+                metadata.setVersion( getBodyText() );
             }
             bodyText = new StringBuffer();
         }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org