Merge branch 'evolveddiseases' of ssh://git.eclipse.org:29418/stem/org.eclipse.stem into evolveddiseases
diff --git a/core/org.eclipse.stem.core/src/org/eclipse/stem/core/common/impl/DublinCoreImpl.java b/core/org.eclipse.stem.core/src/org/eclipse/stem/core/common/impl/DublinCoreImpl.java
index 79e1a45..06f3b3c 100644
--- a/core/org.eclipse.stem.core/src/org/eclipse/stem/core/common/impl/DublinCoreImpl.java
+++ b/core/org.eclipse.stem.core/src/org/eclipse/stem/core/common/impl/DublinCoreImpl.java
@@ -1548,7 +1548,7 @@
if (getCreated() != null && !getCreated().equals("")) {
result.append("created=\"");
result.append(getCreated().trim());
- result.append("\" ");
+ result.append("\" ");
}
if (getLicense() != null && !getLicense().equals("")) {
result.append("license=\"");
@@ -1590,6 +1590,40 @@
public static String createISO8601DateString(final Date date) {
return (new SimpleDateFormat("yyyy-MM-dd")).format(date);
} // createISO8601DateString
+
+ /**
+ * Create a date string that conforms to ISO 8601 <a
+ * href="http://www.w3.org/TR/NOTE-datetime">
+ * http://www.w3.org/TR/NOTE-datetime</a>.
+ * <ul>
+ * <li>Example:</li>
+ * 2006-03-29
+ * </ul>
+ *
+ * @see #getDate()
+ * @see #getCreated()
+ * @see #getValid()
+ */
+ public static String createISO8601DateStringMillis(final Date date) {
+ return (new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ")).format(date);
+ } // createISO8601DateString
+
+ /**
+ * Create a date string that conforms to ISO 8601 <a
+ * href="http://www.w3.org/TR/NOTE-datetime">
+ * http://www.w3.org/TR/NOTE-datetime</a>.
+ * <ul>
+ * <li>Example:</li>
+ * 2006-03-29
+ * </ul>
+ *
+ * @see #getDate()
+ * @see #getCreated()
+ * @see #getValid()
+ */
+ public static String createISO8601DateStringSeconds(final Date date) {
+ return (new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss")).format(date);
+ } // createISO8601DateString
/**
* Create a Date from a string that conforms to ISO 8601 <a
diff --git a/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/execution/Executable.java b/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/execution/Executable.java
index d2bce88..baa122d 100644
--- a/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/execution/Executable.java
+++ b/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/execution/Executable.java
@@ -94,7 +94,9 @@
sb.append("-");
sb.append(getSequenceNumber());
sb.append("-");
- sb.append(DublinCoreImpl.createISO8601DateString(getCreationTime()));
+ sb.append(DublinCoreImpl.createISO8601DateStringSeconds(getCreationTime()));
+ // for milli-sec resolution use the following
+ // sb.append(DublinCoreImpl.createISO8601DateString(getCreationTime()));
return sb.toString();
} // getUniqueIDString
diff --git a/core/org.eclipse.stem.loggers.csv/src/org/eclipse/stem/loggers/csv/logger/DelimetedFileSimulationLogger.java b/core/org.eclipse.stem.loggers.csv/src/org/eclipse/stem/loggers/csv/logger/DelimetedFileSimulationLogger.java
index f608c62..672538e 100644
--- a/core/org.eclipse.stem.loggers.csv/src/org/eclipse/stem/loggers/csv/logger/DelimetedFileSimulationLogger.java
+++ b/core/org.eclipse.stem.loggers.csv/src/org/eclipse/stem/loggers/csv/logger/DelimetedFileSimulationLogger.java
@@ -267,14 +267,12 @@
if (featureId == GraphPackage.GRAPH__DECORATORS) {
if (msg.getNewValue() instanceof IntegrationDecorator) {
addChildDecoratorLogger((IntegrationDecorator)msg.getNewValue());
- System.out.println(msg);
+ //System.out.println(msg);
}
}
-
-
//addChildDecoratorLogger(parentLogger, (IntegrationDecorator)decorator);
}
