From 6f9de54853bfa39061879cf53456356962d99a87 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Mon, 4 Feb 2013 22:04:23 +0100
Subject: Cleanup timestamp exception

---
 src/main/java/com/c2kernel/events/Event.java   | 5 +++--
 src/main/java/com/c2kernel/events/History.java | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/c2kernel/events/Event.java b/src/main/java/com/c2kernel/events/Event.java
index 9936f49..a1a2e8b 100644
--- a/src/main/java/com/c2kernel/events/Event.java
+++ b/src/main/java/com/c2kernel/events/Event.java
@@ -12,6 +12,7 @@ package com.c2kernel.events;
 import java.util.Calendar;
 
 import com.c2kernel.common.GTimeStamp;
+import com.c2kernel.common.InvalidDataException;
 import com.c2kernel.entity.C2KLocalObject;
 import com.c2kernel.persistency.ClusterStorage;
 
@@ -227,7 +228,7 @@ public class Event implements C2KLocalObject
         return time.toString();
     }
 
-    public void setTimeString(String time) throws Exception
+    public void setTimeString(String time) throws InvalidDataException
     {
     	if (time.length() == 19)
     	    mTimeStamp = new GTimeStamp(
@@ -248,7 +249,7 @@ public class Event implements C2KLocalObject
                             Integer.parseInt(time.substring(12,14)),
                             Calendar.getInstance().get(Calendar.ZONE_OFFSET));
         else
-            throw new Exception("Unknown time format: "+time);
+            throw new InvalidDataException("Unknown time format: "+time, "");
     }
 
 
diff --git a/src/main/java/com/c2kernel/events/History.java b/src/main/java/com/c2kernel/events/History.java
index 88f5460..c9e4995 100644
--- a/src/main/java/com/c2kernel/events/History.java
+++ b/src/main/java/com/c2kernel/events/History.java
@@ -1,6 +1,7 @@
 package com.c2kernel.events;
 
 
+import com.c2kernel.common.InvalidDataException;
 import com.c2kernel.persistency.ClusterStorage;
 import com.c2kernel.persistency.RemoteMap;
 import com.c2kernel.utils.Logger;
@@ -52,7 +53,7 @@ public class History extends RemoteMap<Event> {
                     String stepType,
                     String viewName,
                     int stepCurrentState,
-                    String timeString) throws Exception {
+                    String timeString) throws InvalidDataException {
         Logger.msg(7, "History.addEvent() - creating new event for "+stepTransitionId+" on "+stepName+" in "+mSysKey);
         Event newEvent = new Event();
         newEvent.setEntitySystemKey(mSysKey);
-- 
cgit v1.2.3