package uk.ac.vamsas.client.simpleclient;
import java.io.File;
-import java.net.MalformedURLException;
+import java.net.URI;
+
+import uk.ac.vamsas.client.InvalidSessionUrnException;
/**
* SessionUrn for simpleclient sessions:
* simpleclient://{Absolute path to session directory}
+ *
+ * For simpleclient urn, it consideres as on the same machine, using the path to the session
+ * directory to generate the session URN
+ *
* @author jimp
*
*/
TYPES.put(SessionUrn.VAMSASDOCUMENT, SessionUrn.class);
}
- public SessionUrn(File sessionLocation) throws MalformedURLException {
+ /**
+ * Creates a SessionUrn object from a String.
+ * The string must be a string representation of a URI
+ * @param urnString
+ * @throws InvalidSessionUrnException
+ */
+ public SessionUrn(String urnString) throws InvalidSessionUrnException
+ {
+ super();
+ this.setURN(urnString);
+ }
+
+
+ /**
+ * Generates a sessionURN bases on a session directory location
+ *
+ * @param sessionLocation the file object to the session directory
+ */
+ public SessionUrn(File sessionLocation)
+ {//throws MalformedURLException {
// TODO: LATER: implement switch to have vamsas document or simpleclient sessions for same constructor
- super(SIMPLECLIENT, sessionLocation.getAbsoluteFile().toURL());
- //else
- // super(VAMSASDOCUMENT, sessionLocation);
+ //use URI instead of URL
+ super(SIMPLECLIENT, sessionLocation.getAbsoluteFile().toURI());
}
- public SessionUrn(VamsasSession session) throws MalformedURLException {
- super(SIMPLECLIENT, session.sessionDir.getAbsoluteFile().toURL());
+
+ /**
+ * Generates a sessionURN bases on a vamsas session
+ * @param session a VamsasSession
+ *
+ * Should return the same URN string than the creation with the session directory
+ */
+ public SessionUrn(VamsasSession session)
+ {
+ //throws MalformedURLException {
+ // use URI instead of URL
+ super(SIMPLECLIENT, session.sessionDir.getAbsoluteFile().toURI());
}
+
+
+
+
+
/**
* TODO: LATER: think about this again.
- * @return File(urn.getPath())
+ *
+ * Retrieves the file associated to the current sessionURN.
+ * The sessionURN (URI) is based on the session directory absolute path.
+ * Use the raw path of the URN and change the scheme to file to generate a new file
+ * URI. Then, from the URI create the File object (a File object can be created from an uri)
+ *
+ * @return File object representing the session URN //
+ * File(urn.getPath())
*/
public File asFile() {
- return new File(urn.getPath());
+ String path = this.urn.getRawPath();
+
+ return new File ( URI.create("file://"+path));
}
// TODO: add abstract 'handler' methods for resolving the URN to a particular class
}