From 959d6d83ec26152343d538287c02eeebf0dcf238 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Fri, 31 May 2013 06:17:57 +0200
Subject: Enhance VersionNumber*: Use only RegExp and cache default (no wrapped
whitespace tokenizer); String match: Store end-of-match and flag defined
components.
---
.../jogamp/common/util/VersionNumberString.java | 36 +++++++++++++++++++---
1 file changed, 32 insertions(+), 4 deletions(-)
(limited to 'src/java/com/jogamp/common/util/VersionNumberString.java')
diff --git a/src/java/com/jogamp/common/util/VersionNumberString.java b/src/java/com/jogamp/common/util/VersionNumberString.java
index 7e68aea..143d57c 100644
--- a/src/java/com/jogamp/common/util/VersionNumberString.java
+++ b/src/java/com/jogamp/common/util/VersionNumberString.java
@@ -34,24 +34,52 @@ package com.jogamp.common.util;
*/
public class VersionNumberString extends VersionNumber {
- /** A {@link #isZero() zero} version instance. */
- public static final VersionNumberString zeroVersion = new VersionNumberString(0, 0, 0, "n/a");
+ /**
+ * A {@link #isZero() zero} version instance, w/o any component defined explicitly.
+ * @see #hasMajor()
+ * @see #hasMinor()
+ * @see #hasSub()
+ */
+ public static final VersionNumberString zeroVersion = new VersionNumberString(0, 0, 0, -1, (short)0, "n/a");
protected final String strVal;
+ protected VersionNumberString(int majorRev, int minorRev, int subMinorRev, int strEnd, short _state, String versionString) {
+ super(majorRev, minorRev, subMinorRev, strEnd, _state);
+ strVal = versionString;
+ }
+
+ /**
+ * See {@link VersionNumber#VersionNumber(int, int, int)}.
+ */
public VersionNumberString(int majorRev, int minorRev, int subMinorRev, String versionString) {
- super(majorRev, minorRev, subMinorRev);
+ this(majorRev, minorRev, subMinorRev, -1, (short)(HAS_MAJOR | HAS_MINOR | HAS_SUB), versionString);
+ }
+
+ /**
+ * See {@link VersionNumber#VersionNumber(String)}.
+ */
+ public VersionNumberString(final String versionString) {
+ super( versionString);
strVal = versionString;
}
/**
* See {@link VersionNumber#VersionNumber(String, String)}.
*/
- public VersionNumberString(String versionString, String delim) {
+ public VersionNumberString(final String versionString, final String delim) {
super( versionString, delim);
strVal = versionString;
}
+ /**
+ * See {@link VersionNumber#VersionNumber(String, java.util.regex.Pattern)}.
+ */
+ public VersionNumberString(final String versionString, final java.util.regex.Pattern versionPattern) {
+ super( versionString, versionPattern);
+ strVal = versionString;
+ }
+
/** Returns the version string this version number is derived from. */
public final String getVersionString() { return strVal; }
--
cgit v1.2.3