Improve SLC Build framework

[gpl/argeo-slc.git] / runtime / org.argeo.slc.specs / src / main / java / org / argeo / slc / BasicNameVersion.java

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 73f12fc4a51b6e32fa2bdc3e430e522882158932..9d8e71af0a90bf11914307462f2c7993860479f2 100644 (file)
--- 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
@@ -17,11 +17,11 @@ 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() {
        }
@@ -30,64 +30,19 @@ public class BasicNameVersion implements NameVersion, Comparable<NameVersion>,
        public BasicNameVersion(String nameVersion) {
                int index = nameVersion.indexOf(";version=");
                if (index < 0) {
-                       name = nameVersion;
-                       version = null;
+                       setName(nameVersion);
+                       setVersion(null);
                } else {
-                       name = nameVersion.substring(0, index);
-                       version = nameVersion.substring(index + ";version=".length());
+                       setName(nameVersion.substring(0, index));
+                       setVersion(nameVersion.substring(index + ";version=".length()));
                }
        }
 
        public BasicNameVersion(String name, String version) {
-               this.name = name;
-               this.version = version;
+               super(name, 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;
-       }
-
-       @Override
-       public int hashCode() {
-               return name.hashCode() + version.hashCode();
-       }
-
-       @Override
-       public String toString() {
-               return name + ":" + version;
-       }
-
-       public int compareTo(NameVersion o) {
-               if (o.getName().equals(name))
-                       return version.compareTo(o.getVersion());
-               else
-                       return name.compareTo(o.getName());
+               super(nameVersion);
        }
 }