git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
17ba90f
)
JAL-3690 patch out need for java.time in j2s (see https://github.com/BobHanson/java2s...
author
Jim Procter
<jprocter@issues.jalview.org>
Tue, 15 Dec 2020 18:45:32 +0000
(18:45 +0000)
committer
Jim Procter
<jprocter@issues.jalview.org>
Tue, 15 Dec 2020 18:45:32 +0000
(18:45 +0000)
src/jalview/ws/api/JobId.java
patch
|
blob
|
history
diff --git
a/src/jalview/ws/api/JobId.java
b/src/jalview/ws/api/JobId.java
index
2a092bd
..
5c3b51d
100644
(file)
--- a/
src/jalview/ws/api/JobId.java
+++ b/
src/jalview/ws/api/JobId.java
@@
-1,6
+1,5
@@
package jalview.ws.api;
package jalview.ws.api;
-import java.time.Instant;
import java.util.Date;
public class JobId
import java.util.Date;
public class JobId
@@
-12,22
+11,31
@@
public class JobId
private String serviceImpl;
private String jobId;
private String serviceImpl;
private String jobId;
-
- private Instant creationTime;
+ // TODO: java2script instant
+ private String creationTime=null;
public JobId(String serviceType, String serviceImpl, String id)
{
this.serviceType = serviceType;
this.serviceImpl = serviceImpl;
jobId = id;
public JobId(String serviceType, String serviceImpl, String id)
{
this.serviceType = serviceType;
this.serviceImpl = serviceImpl;
jobId = id;
- creationTime = Instant.now();
+ /*
+ * @j2sIgnore
+ */
+ {
+// creationTime = Date.from(Instant.now()).toString();
+ }
+ if (creationTime==null)
+ {
+ creationTime = new Date().toString(); // j2s only
+ }
}
@Override
public String toString()
{
return "" + serviceType + ":" + serviceImpl + ":" + jobId + "\nCreated "
}
@Override
public String toString()
{
return "" + serviceType + ":" + serviceImpl + ":" + jobId + "\nCreated "
- + Date.from(creationTime);
+ + creationTime;
}
/**
* a stringified version of the Job Id that can be saved in project.
}
/**
* a stringified version of the Job Id that can be saved in project.
@@
-52,7
+60,7
@@
public class JobId
return jobId;
}
return jobId;
}
- public Instant getCreationTime()
+ public String getCreationTime()
{
return creationTime;
}
{
return creationTime;
}