From 275d0bbf555c8917be82ce4cc21eb4cabb00f4c5 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Fri, 3 Oct 2014 17:30:41 +0200
Subject: Huge exception overhaul: Merged ClusterStorageException with
 PersistencyException. Replaced MembershipException with
 InvalidCollectionModification CORBA Exception. Made all predef steps throw
 more accurate exceptions when they go wrong, and let more exceptions bubble
 through from underneath.

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

(limited to 'src/main/java/com/c2kernel/events')

diff --git a/src/main/java/com/c2kernel/events/Event.java b/src/main/java/com/c2kernel/events/Event.java
index a6cc9bc..fd5bb33 100644
--- a/src/main/java/com/c2kernel/events/Event.java
+++ b/src/main/java/com/c2kernel/events/Event.java
@@ -23,7 +23,7 @@ package com.c2kernel.events;
 import java.util.Calendar;
 
 import com.c2kernel.common.GTimeStamp;
-import com.c2kernel.common.InvalidDataException;
+import com.c2kernel.common.InvalidData;
 import com.c2kernel.entity.C2KLocalObject;
 import com.c2kernel.lookup.AgentPath;
 import com.c2kernel.lookup.InvalidItemPathException;
@@ -289,7 +289,7 @@ public class Event implements C2KLocalObject
         return time.toString();
     }
 
-    public void setTimeString(String time) throws InvalidDataException
+    public void setTimeString(String time) throws InvalidData
     {
     	if (time.length() == 19)
     	    mTimeStamp = new GTimeStamp(
@@ -310,7 +310,7 @@ public class Event implements C2KLocalObject
                             Integer.parseInt(time.substring(12,14)),
                             Calendar.getInstance().get(Calendar.ZONE_OFFSET));
         else
-            throw new InvalidDataException("Unknown time format: "+time, "");
+            throw new InvalidData("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 a197f65..2010e81 100644
--- a/src/main/java/com/c2kernel/events/History.java
+++ b/src/main/java/com/c2kernel/events/History.java
@@ -21,7 +21,7 @@
 package com.c2kernel.events;
 
 
-import com.c2kernel.common.InvalidDataException;
+import com.c2kernel.common.InvalidData;
 import com.c2kernel.lifecycle.instance.stateMachine.Transition;
 import com.c2kernel.lookup.AgentPath;
 import com.c2kernel.lookup.ItemPath;
@@ -93,7 +93,7 @@ public class History extends RemoteMap<Event> {
             String stateMachineName,
             Integer stateMachineVersion,
             Transition transition,
-            String timeString) throws InvalidDataException {
+            String timeString) throws InvalidData {
     	return addEvent(agentPath, agentRole, stepName, stepPath, stepType, null, null, stateMachineName, stateMachineVersion, transition, null, timeString);
     }
     	
@@ -107,7 +107,7 @@ public class History extends RemoteMap<Event> {
                     Integer stateMachineVersion,
                     Transition transition,
                     String viewName,
-                    String timeString) throws InvalidDataException {
+                    String timeString) throws InvalidData {
         Logger.msg(7, "History.addEvent() - creating new event for "+transition.getName()+" on "+stepName+" in "+mItemPath);
         Event newEvent = new Event();
         newEvent.setItemPath(mItemPath);
-- 
cgit v1.2.3