Attachment 40490 Details for Bug 135180 – Patch getting rid of the need to parse

[patch] Patch getting rid of the need to parse

135180v2.patch (text/plain), 2.28 KB, created by Pascal Rapicault

on 2006-05-05 11:27:00 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Pascal Rapicault

Created: 2006-05-05 11:27:00 EDT

Size: 2.28 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.update.configurator
>Index: build.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.update.configurator/build.properties,v
>retrieving revision 1.6
>diff -u -r1.6 build.properties
>--- build.properties	4 Apr 2005 03:11:02 -0000	1.6
>+++ build.properties	5 May 2006 15:24:19 -0000
>@@ -18,3 +18,4 @@
>                META-INF/
> src.includes = about.html
> source.. = src/
>+qualifier=v20060428
>\ No newline at end of file
>Index: src/org/eclipse/update/internal/configurator/VersionedIdentifier.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/VersionedIdentifier.java,v
>retrieving revision 1.9
>diff -u -r1.9 VersionedIdentifier.java
>--- src/org/eclipse/update/internal/configurator/VersionedIdentifier.java	11 Apr 2006 15:47:56 -0000	1.9
>+++ src/org/eclipse/update/internal/configurator/VersionedIdentifier.java	5 May 2006 15:24:19 -0000
>@@ -13,6 +13,8 @@
> import java.util.ArrayList;
> import java.util.StringTokenizer;
> 
>+import org.osgi.framework.Version;
>+
> public class VersionedIdentifier {
> 	private String identifier = ""; //$NON-NLS-1$
> 	private int major = 0;
>@@ -22,31 +24,15 @@
> 	private String version;
> 
> 	private static final String VER_SEPARATOR = "."; //$NON-NLS-1$
>-	private static final String ID_SEPARATOR = "_"; //$NON-NLS-1$
> 
> 	public static final int LESS_THAN = -1;
> 	public static final int EQUAL = 0;
> 	public static final int EQUIVALENT = 1;
> 	public static final int COMPATIBLE = 2;
> 	public static final int GREATER_THAN = 3;
>-
>-	public VersionedIdentifier(String s) {
>-		if (s == null || (s = s.trim()).equals("")) //$NON-NLS-1$
>-			return;
>-
>-		int loc = s.lastIndexOf(ID_SEPARATOR);
>-		if (loc != -1) {
>-			this.identifier = s.substring(0, loc);
>-			version = s.substring(loc + 1);
>-			if(version==null)
>-				version = "0.0.0"; //$NON-NLS-1$
>-			parseVersion(version);
>-		} else
>-			this.identifier = s;
>-	}
> 	
> 	public VersionedIdentifier(String id, String version) {
>-		this(id+ID_SEPARATOR+ (version==null?"0.0.0":version) ); //$NON-NLS-1$
>+		this.identifier = id;
> 		this.version = version;
> 	}
>

Actions: View | Diff

Attachments on bug 135180: 40483 | 40486 | 40490 | 40492