|
From: <ba...@us...> - 2008-04-10 14:38:28
|
Revision: 22
http://scstudio.svn.sourceforge.net/scstudio/?rev=22&view=rev
Author: babicaj
Date: 2008-04-10 07:38:17 -0700 (Thu, 10 Apr 2008)
Log Message:
-----------
GeneralOrderArea renamed to CoregionArea, GeneralEvent renamed to CoregionEvent, GeneralOrderModification renamed to CoregionModification
Modified Paths:
--------------
trunk/src/data/msc.h
trunk/src/data/msc_modifications.h
Modified: trunk/src/data/msc.h
===================================================================
--- trunk/src/data/msc.h 2008-04-09 10:50:42 UTC (rev 21)
+++ trunk/src/data/msc.h 2008-04-10 14:38:17 UTC (rev 22)
@@ -32,14 +32,14 @@
class Instance;
class Event;
class StrictEvent;
-class GeneralEvent;
+class CoregionEvent;
class Msc;
class BMsc;
class HMsc;
class MscMessage;
class EventArea;
class StrictOrderArea;
-class GeneralOrderArea;
+class CoregionArea;
class InstanceArea;
typedef counted_ptr<Msc> MscPtr;
@@ -64,8 +64,8 @@
typedef counted_ptr<StrictEvent> StrictEventPtr;
typedef std::list<StrictEventPtr> StrictEventPtrList;
-typedef counted_ptr<GeneralEvent> GeneralEventPtr;
-typedef std::list<GeneralEventPtr> GeneralEventPtrList;
+typedef counted_ptr<CoregionEvent> CoregionEventPtr;
+typedef std::list<CoregionEventPtr> CoregionEventPtrList;
typedef counted_ptr<MscMessage> MscMessagePtr;
@@ -76,7 +76,7 @@
typedef counted_ptr<StrictOrderArea> StrictOrderAreaPtr;
-typedef counted_ptr<GeneralOrderArea> GeneralOrderAreaPtr;
+typedef counted_ptr<CoregionArea> CoregionAreaPtr;
/**
* Represents virtual base class for BMsc and HMsc.
@@ -230,13 +230,13 @@
/**
* EventArea whose events are ordered like directed acyclic graph.
*/
-class GeneralOrderArea:public EventArea
+class CoregionArea:public EventArea
{
/**
* Events which aren't successors of any other events.
*/
- GeneralEventPtrList m_minimal_events;
+ CoregionEventPtrList m_minimal_events;
};
/**
@@ -314,14 +314,14 @@
};
/**
- * Event occuring in GeneralOrderArea
+ * Event occuring in CoregionArea
*/
-class GeneralEvent: public Event
+class CoregionEvent: public Event
{
/**
* Successors of this event
*/
- GeneralEventPtrList m_successors;
+ CoregionEventPtrList m_successors;
};
#endif /* _MSC_H */
Modified: trunk/src/data/msc_modifications.h
===================================================================
--- trunk/src/data/msc_modifications.h 2008-04-09 10:50:42 UTC (rev 21)
+++ trunk/src/data/msc_modifications.h 2008-04-10 14:38:17 UTC (rev 22)
@@ -32,8 +32,8 @@
typedef counted_ptr<MscModification> MscModificationPtr;
typedef std::set<MscModificationPtr> MscModificationPtrSet;
-typedef counted_ptr<GeneralEvent> GeneralEventPtr;
-typedef std::set<GeneralEventPtr> GeneralEventPtrSet;
+typedef counted_ptr<CoregionEvent> CoregionEventPtr;
+typedef std::set<CoregionEventPtr> CoregionEventPtrSet;
typedef counted_ptr<StrictEvent> StrictEventPtr;
typedef std::set<StrictEventPtr> StrictEventPtrSet;
@@ -104,24 +104,24 @@
};
/**
- * Modifications which are performed in GeneralOrderArea.
+ * Modifications which are performed in CoregionArea.
*/
-class GeneralOrderModification:public EventAreaModification{
+class CoregionModification:public EventAreaModification{
/**
- * Previous version of GeneralOrderArea.
+ * Previous version of CoregionArea.
*/
- GeneralOrderAreaPtr m_previous;
+ CoregionAreaPtr m_previous;
/**
* Events which are newly minimimal in modified version.
*/
- GeneralEventPtrSet m_minimal_events;
+ CoregionEventPtrSet m_minimal_events;
/**
* Events with modified successors.
*/
- GeneralEventPtrSet m_modified_events;
+ CoregionEventPtrSet m_modified_events;
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|