Skip to content

Commit

Permalink
updated EMF data for tickets SysFera#397 and SysFera#387: about renam…
Browse files Browse the repository at this point in the history
…ing ctime and creationTime
  • Loading branch information
R. Chakode authored and kcoulomb committed Mar 26, 2014
1 parent c5484c3 commit ca1dde3
Show file tree
Hide file tree
Showing 9 changed files with 95 additions and 96 deletions.
4 changes: 2 additions & 2 deletions core/model/FMS_Data.ecore
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@
<details key="content" value="The size of the file "/>
</eAnnotations>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="start_time" eType="ecore:EDataType Ecore.ecore#//ELong"
<eStructuralFeatures xsi:type="ecore:EAttribute" name="startTime" eType="ecore:EDataType Ecore.ecore#//ELong"
defaultValueLiteral="0">
<eAnnotations source="Description">
<details key="content" value="The start time of the file transfer"/>
Expand Down Expand Up @@ -317,7 +317,7 @@
<details key="content" value="The size of the remote file in bytes"/>
</eAnnotations>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="creationTime" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="ctime" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
<eAnnotations source="Description">
<details key="content" value="The file creation time (in remote host time)"/>
</eAnnotations>
Expand Down
16 changes: 8 additions & 8 deletions core/src/emfdata/FMS_Data/DirEntry.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -181,26 +181,26 @@ void DirEntry::setSize(::ecore::EBigInteger _size)
#endif
}

::ecore::EString const& DirEntry::getCreationTime() const
::ecore::EString const& DirEntry::getCtime() const
{
return m_creationTime;
return m_ctime;
}

void DirEntry::setCreationTime(::ecore::EString const& _creationTime)
void DirEntry::setCtime(::ecore::EString const& _ctime)
{
#ifdef ECORECPP_NOTIFICATION_API
::ecore::EString _old_creationTime = m_creationTime;
::ecore::EString _old_ctime = m_ctime;
#endif
m_creationTime = _creationTime;
m_ctime = _ctime;
#ifdef ECORECPP_NOTIFICATION_API
if (eNotificationRequired())
{
::ecorecpp::notify::Notification notification(
::ecorecpp::notify::Notification::SET,
(::ecore::EObject_ptr) this,
(::ecore::EStructuralFeature_ptr) ::FMS_Data::FMS_DataPackage::_instance()->getDirEntry__creationTime(),
_old_creationTime,
m_creationTime
(::ecore::EStructuralFeature_ptr) ::FMS_Data::FMS_DataPackage::_instance()->getDirEntry__ctime(),
_old_ctime,
m_ctime
);
eNotify(&notification);
}
Expand Down
14 changes: 7 additions & 7 deletions core/src/emfdata/FMS_Data/DirEntry.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -124,15 +124,15 @@ namespace FMS_Data
void setSize(::ecore::EBigInteger _size);

/**
* \brief To get the creationTime
* \return The creationTime attribute value
* \brief To get the ctime
* \return The ctime attribute value
**/
::ecore::EString const& getCreationTime() const;
::ecore::EString const& getCtime() const;
/**
* \brief To set the creationTime
* \param _creationTime The creationTime value
* \brief To set the ctime
* \param _ctime The ctime value
**/
void setCreationTime(::ecore::EString const& _creationTime);
void setCtime(::ecore::EString const& _ctime);

/**
* \brief To get the type
Expand Down Expand Up @@ -180,7 +180,7 @@ namespace FMS_Data

::ecore::EBigInteger m_size;

::ecore::EString m_creationTime;
::ecore::EString m_ctime;

::FMS_Data::FileType m_type;

Expand Down
12 changes: 6 additions & 6 deletions core/src/emfdata/FMS_Data/DirEntryImpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,10 @@ ::ecore::EJavaObject DirEntry::eGet(::ecore::EInt _featureID,
m_size);
}
return _any;
case ::FMS_Data::FMS_DataPackage::DIRENTRY__CREATIONTIME:
case ::FMS_Data::FMS_DataPackage::DIRENTRY__CTIME:
{
::ecorecpp::mapping::any_traits< ::ecore::EString >::toAny(_any,
m_creationTime);
m_ctime);
}
return _any;
case ::FMS_Data::FMS_DataPackage::DIRENTRY__TYPE:
Expand Down Expand Up @@ -135,10 +135,10 @@ void DirEntry::eSet(::ecore::EInt _featureID,
_newValue, m_size);
}
return;
case ::FMS_Data::FMS_DataPackage::DIRENTRY__CREATIONTIME:
case ::FMS_Data::FMS_DataPackage::DIRENTRY__CTIME:
{
::ecorecpp::mapping::any_traits< ::ecore::EString >::fromAny(_newValue,
m_creationTime);
m_ctime);
}
return;
case ::FMS_Data::FMS_DataPackage::DIRENTRY__TYPE:
Expand Down Expand Up @@ -169,9 +169,9 @@ ::ecore::EBoolean DirEntry::eIsSet(::ecore::EInt _featureID)
return m_perms != -1;
case ::FMS_Data::FMS_DataPackage::DIRENTRY__SIZE:
return m_size != -1;
case ::FMS_Data::FMS_DataPackage::DIRENTRY__CREATIONTIME:
case ::FMS_Data::FMS_DataPackage::DIRENTRY__CTIME:
return ::ecorecpp::mapping::set_traits< ::ecore::EString >::is_set(
m_creationTime);
m_ctime);
case ::FMS_Data::FMS_DataPackage::DIRENTRY__TYPE:
return m_type != 6;

Expand Down
24 changes: 12 additions & 12 deletions core/src/emfdata/FMS_Data/FMS_DataPackage.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -294,9 +294,9 @@ namespace FMS_Data
static const int FILETRANSFER__SIZE = 31;

/**
* \brief Constant for FILETRANSFER__START_TIME feature
* \brief Constant for FILETRANSFER__STARTTIME feature
*/
static const int FILETRANSFER__START_TIME = 32;
static const int FILETRANSFER__STARTTIME = 32;

/**
* \brief Constant for FILETRANSFER__TRCOMMAND feature
Expand Down Expand Up @@ -359,9 +359,9 @@ namespace FMS_Data
static const int DIRENTRY__SIZE = 44;

/**
* \brief Constant for DIRENTRY__CREATIONTIME feature
* \brief Constant for DIRENTRY__CTIME feature
*/
static const int DIRENTRY__CREATIONTIME = 45;
static const int DIRENTRY__CTIME = 45;

/**
* \brief Constant for DIRENTRY__TYPE feature
Expand Down Expand Up @@ -672,10 +672,10 @@ namespace FMS_Data
virtual ::ecore::EAttribute_ptr getFileTransfer__size();

/**
* \brief Returns the reflective object for feature start_time of class FileTransfer
* \brief Returns the reflective object for feature startTime of class FileTransfer
* \return A pointer to the reflective object
*/
virtual ::ecore::EAttribute_ptr getFileTransfer__start_time();
virtual ::ecore::EAttribute_ptr getFileTransfer__startTime();

/**
* \brief Returns the reflective object for feature trCommand of class FileTransfer
Expand Down Expand Up @@ -750,10 +750,10 @@ namespace FMS_Data
virtual ::ecore::EAttribute_ptr getDirEntry__size();

/**
* \brief Returns the reflective object for feature creationTime of class DirEntry
* \brief Returns the reflective object for feature ctime of class DirEntry
* \return A pointer to the reflective object
*/
virtual ::ecore::EAttribute_ptr getDirEntry__creationTime();
virtual ::ecore::EAttribute_ptr getDirEntry__ctime();

/**
* \brief Returns the reflective object for feature type of class DirEntry
Expand Down Expand Up @@ -1031,9 +1031,9 @@ namespace FMS_Data
::ecore::EAttribute_ptr m_FileTransfer__size;

/**
* \brief The instance for the feature start_time of class FileTransfer
* \brief The instance for the feature startTime of class FileTransfer
*/
::ecore::EAttribute_ptr m_FileTransfer__start_time;
::ecore::EAttribute_ptr m_FileTransfer__startTime;

/**
* \brief The instance for the feature trCommand of class FileTransfer
Expand Down Expand Up @@ -1096,9 +1096,9 @@ namespace FMS_Data
::ecore::EAttribute_ptr m_DirEntry__size;

/**
* \brief The instance for the feature creationTime of class DirEntry
* \brief The instance for the feature ctime of class DirEntry
*/
::ecore::EAttribute_ptr m_DirEntry__creationTime;
::ecore::EAttribute_ptr m_DirEntry__ctime;

/**
* \brief The instance for the feature type of class DirEntry
Expand Down
77 changes: 38 additions & 39 deletions core/src/emfdata/FMS_Data/FMS_DataPackageImpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -233,11 +233,11 @@ FMS_DataPackage::FMS_DataPackage()
::FMS_Data::FMS_DataPackage::FILETRANSFER__SIZE);
m_FileTransferEClass->getEStructuralFeatures().push_back(
m_FileTransfer__size);
m_FileTransfer__start_time = new ::ecore::EAttribute();
m_FileTransfer__start_time->setFeatureID(
::FMS_Data::FMS_DataPackage::FILETRANSFER__START_TIME);
m_FileTransfer__startTime = new ::ecore::EAttribute();
m_FileTransfer__startTime->setFeatureID(
::FMS_Data::FMS_DataPackage::FILETRANSFER__STARTTIME);
m_FileTransferEClass->getEStructuralFeatures().push_back(
m_FileTransfer__start_time);
m_FileTransfer__startTime);
m_FileTransfer__trCommand = new ::ecore::EAttribute();
m_FileTransfer__trCommand->setFeatureID(
::FMS_Data::FMS_DataPackage::FILETRANSFER__TRCOMMAND);
Expand Down Expand Up @@ -327,11 +327,10 @@ FMS_DataPackage::FMS_DataPackage()
m_DirEntry__size = new ::ecore::EAttribute();
m_DirEntry__size->setFeatureID(::FMS_Data::FMS_DataPackage::DIRENTRY__SIZE);
m_DirEntryEClass->getEStructuralFeatures().push_back(m_DirEntry__size);
m_DirEntry__creationTime = new ::ecore::EAttribute();
m_DirEntry__creationTime->setFeatureID(
::FMS_Data::FMS_DataPackage::DIRENTRY__CREATIONTIME);
m_DirEntryEClass->getEStructuralFeatures().push_back(
m_DirEntry__creationTime);
m_DirEntry__ctime = new ::ecore::EAttribute();
m_DirEntry__ctime->setFeatureID(
::FMS_Data::FMS_DataPackage::DIRENTRY__CTIME);
m_DirEntryEClass->getEStructuralFeatures().push_back(m_DirEntry__ctime);
m_DirEntry__type = new ::ecore::EAttribute();
m_DirEntry__type->setFeatureID(::FMS_Data::FMS_DataPackage::DIRENTRY__TYPE);
m_DirEntryEClass->getEStructuralFeatures().push_back(m_DirEntry__type);
Expand Down Expand Up @@ -849,20 +848,20 @@ FMS_DataPackage::FMS_DataPackage()
m_FileTransfer__size->setUnique(true);
m_FileTransfer__size->setDerived(false);
m_FileTransfer__size->setOrdered(true);
m_FileTransfer__start_time->setEType(
m_FileTransfer__startTime->setEType(
dynamic_cast< ::ecore::EcorePackage* > (::ecore::EcorePackage::_instance())->getELong());
m_FileTransfer__start_time->setName("start_time");
m_FileTransfer__start_time->setDefaultValueLiteral("0");
m_FileTransfer__start_time->setLowerBound(0);
m_FileTransfer__start_time->setUpperBound(1);
m_FileTransfer__start_time->setTransient(false);
m_FileTransfer__start_time->setVolatile(false);
m_FileTransfer__start_time->setChangeable(true);
m_FileTransfer__start_time->setUnsettable(false);
m_FileTransfer__start_time->setID(false);
m_FileTransfer__start_time->setUnique(true);
m_FileTransfer__start_time->setDerived(false);
m_FileTransfer__start_time->setOrdered(true);
m_FileTransfer__startTime->setName("startTime");
m_FileTransfer__startTime->setDefaultValueLiteral("0");
m_FileTransfer__startTime->setLowerBound(0);
m_FileTransfer__startTime->setUpperBound(1);
m_FileTransfer__startTime->setTransient(false);
m_FileTransfer__startTime->setVolatile(false);
m_FileTransfer__startTime->setChangeable(true);
m_FileTransfer__startTime->setUnsettable(false);
m_FileTransfer__startTime->setID(false);
m_FileTransfer__startTime->setUnique(true);
m_FileTransfer__startTime->setDerived(false);
m_FileTransfer__startTime->setOrdered(true);
m_FileTransfer__trCommand->setEType(m_TransferCommandEEnum);
m_FileTransfer__trCommand->setName("trCommand");
m_FileTransfer__trCommand->setDefaultValueLiteral("2");
Expand Down Expand Up @@ -1053,20 +1052,20 @@ FMS_DataPackage::FMS_DataPackage()
m_DirEntry__size->setUnique(true);
m_DirEntry__size->setDerived(false);
m_DirEntry__size->setOrdered(true);
m_DirEntry__creationTime->setEType(
m_DirEntry__ctime->setEType(
dynamic_cast< ::ecore::EcorePackage* > (::ecore::EcorePackage::_instance())->getEString());
m_DirEntry__creationTime->setName("creationTime");
m_DirEntry__creationTime->setDefaultValueLiteral("");
m_DirEntry__creationTime->setLowerBound(0);
m_DirEntry__creationTime->setUpperBound(1);
m_DirEntry__creationTime->setTransient(false);
m_DirEntry__creationTime->setVolatile(false);
m_DirEntry__creationTime->setChangeable(true);
m_DirEntry__creationTime->setUnsettable(false);
m_DirEntry__creationTime->setID(false);
m_DirEntry__creationTime->setUnique(true);
m_DirEntry__creationTime->setDerived(false);
m_DirEntry__creationTime->setOrdered(true);
m_DirEntry__ctime->setName("ctime");
m_DirEntry__ctime->setDefaultValueLiteral("");
m_DirEntry__ctime->setLowerBound(0);
m_DirEntry__ctime->setUpperBound(1);
m_DirEntry__ctime->setTransient(false);
m_DirEntry__ctime->setVolatile(false);
m_DirEntry__ctime->setChangeable(true);
m_DirEntry__ctime->setUnsettable(false);
m_DirEntry__ctime->setID(false);
m_DirEntry__ctime->setUnique(true);
m_DirEntry__ctime->setDerived(false);
m_DirEntry__ctime->setOrdered(true);
m_DirEntry__type->setEType(m_FileTypeEEnum);
m_DirEntry__type->setName("type");
m_DirEntry__type->setDefaultValueLiteral("6");
Expand Down Expand Up @@ -1463,9 +1462,9 @@ ::ecore::EAttribute_ptr FMS_DataPackage::getFileTransfer__size()
{
return m_FileTransfer__size;
}
::ecore::EAttribute_ptr FMS_DataPackage::getFileTransfer__start_time()
::ecore::EAttribute_ptr FMS_DataPackage::getFileTransfer__startTime()
{
return m_FileTransfer__start_time;
return m_FileTransfer__startTime;
}
::ecore::EAttribute_ptr FMS_DataPackage::getFileTransfer__trCommand()
{
Expand Down Expand Up @@ -1515,9 +1514,9 @@ ::ecore::EAttribute_ptr FMS_DataPackage::getDirEntry__size()
{
return m_DirEntry__size;
}
::ecore::EAttribute_ptr FMS_DataPackage::getDirEntry__creationTime()
::ecore::EAttribute_ptr FMS_DataPackage::getDirEntry__ctime()
{
return m_DirEntry__creationTime;
return m_DirEntry__ctime;
}
::ecore::EAttribute_ptr FMS_DataPackage::getDirEntry__type()
{
Expand Down
18 changes: 9 additions & 9 deletions core/src/emfdata/FMS_Data/FileTransfer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ using namespace ::FMS_Data;

// Default constructor
FileTransfer::FileTransfer() :
m_status(4), m_size(-1), m_start_time(0), m_trCommand(2)
m_status(4), m_size(-1), m_startTime(0), m_trCommand(2)
{

/*PROTECTED REGION ID(FileTransferImpl__FileTransferImpl) START*/
Expand Down Expand Up @@ -287,26 +287,26 @@ void FileTransfer::setSize(::ecore::EBigInteger _size)
#endif
}

::ecore::ELong FileTransfer::getStart_time() const
::ecore::ELong FileTransfer::getStartTime() const
{
return m_start_time;
return m_startTime;
}

void FileTransfer::setStart_time(::ecore::ELong _start_time)
void FileTransfer::setStartTime(::ecore::ELong _startTime)
{
#ifdef ECORECPP_NOTIFICATION_API
::ecore::ELong _old_start_time = m_start_time;
::ecore::ELong _old_startTime = m_startTime;
#endif
m_start_time = _start_time;
m_startTime = _startTime;
#ifdef ECORECPP_NOTIFICATION_API
if (eNotificationRequired())
{
::ecorecpp::notify::Notification notification(
::ecorecpp::notify::Notification::SET,
(::ecore::EObject_ptr) this,
(::ecore::EStructuralFeature_ptr) ::FMS_Data::FMS_DataPackage::_instance()->getFileTransfer__start_time(),
_old_start_time,
m_start_time
(::ecore::EStructuralFeature_ptr) ::FMS_Data::FMS_DataPackage::_instance()->getFileTransfer__startTime(),
_old_startTime,
m_startTime
);
eNotify(&notification);
}
Expand Down
14 changes: 7 additions & 7 deletions core/src/emfdata/FMS_Data/FileTransfer.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -171,15 +171,15 @@ namespace FMS_Data
void setSize(::ecore::EBigInteger _size);

/**
* \brief To get the start_time
* \return The start_time attribute value
* \brief To get the startTime
* \return The startTime attribute value
**/
::ecore::ELong getStart_time() const;
::ecore::ELong getStartTime() const;
/**
* \brief To set the start_time
* \param _start_time The start_time value
* \brief To set the startTime
* \param _startTime The startTime value
**/
void setStart_time(::ecore::ELong _start_time);
void setStartTime(::ecore::ELong _startTime);

/**
* \brief To get the trCommand
Expand Down Expand Up @@ -246,7 +246,7 @@ namespace FMS_Data

::ecore::EBigInteger m_size;

::ecore::ELong m_start_time;
::ecore::ELong m_startTime;

::FMS_Data::TransferCommand m_trCommand;

Expand Down
Loading

0 comments on commit ca1dde3

Please sign in to comment.