X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.specs%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2FBasicNameVersion.java;h=9d8e71af0a90bf11914307462f2c7993860479f2;hb=67d2877ade3628bf462df281fe0ba83491e25280;hp=3404445a9dc22ccf020b55b70a3f477ae08dd5cc;hpb=74904a755b5b344238eafa798419b80c5e74f7ed;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/BasicNameVersion.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/BasicNameVersion.java
index 3404445a9..9d8e71af0 100644
--- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/BasicNameVersion.java
+++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/BasicNameVersion.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2012 Mathieu Baudier
+ * Copyright (C) 2007-2012 Argeo GmbH
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,67 +17,32 @@ package org.argeo.slc;
 
 import java.io.Serializable;
 
-
-public class BasicNameVersion implements NameVersion, Comparable<NameVersion>,
+/** @deprecated use {@link DefaultNameVersion} instead. */
+@Deprecated
+public class BasicNameVersion extends DefaultNameVersion implements
 		Serializable {
 	private static final long serialVersionUID = -5127304279136195127L;
-	private String name;
-	private String version;
 
 	public BasicNameVersion() {
 	}
 
-	public BasicNameVersion(String name, String version) {
-		this.name = name;
-		this.version = version;
-	}
-
-	public BasicNameVersion(NameVersion nameVersion) {
-		this.name = nameVersion.getName();
-		this.version = nameVersion.getVersion();
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getVersion() {
-		return version;
-	}
-
-	public void setVersion(String version) {
-		this.version = version;
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (obj instanceof NameVersion) {
-			NameVersion nameVersion = (NameVersion) obj;
-			return name.equals(nameVersion.getName())
-					&& version.equals(nameVersion.getVersion());
-		} else
-			return false;
+	/** Interprets string in OSGi-like format my.module.name;version=0.0.0 */
+	public BasicNameVersion(String nameVersion) {
+		int index = nameVersion.indexOf(";version=");
+		if (index < 0) {
+			setName(nameVersion);
+			setVersion(null);
+		} else {
+			setName(nameVersion.substring(0, index));
+			setVersion(nameVersion.substring(index + ";version=".length()));
+		}
 	}
 
-	@Override
-	public int hashCode() {
-		return name.hashCode() + version.hashCode();
-	}
-
-	@Override
-	public String toString() {
-		return name + ":" + version;
+	public BasicNameVersion(String name, String version) {
+		super(name, version);
 	}
 
-	public int compareTo(NameVersion o) {
-		if (o.getName().equals(name))
-			return version.compareTo(o.getVersion());
-		else
-			return name.compareTo(o.getName());
+	public BasicNameVersion(NameVersion nameVersion) {
+		super(nameVersion);
 	}
-
 }