From 8fdeb39b5a48f7aa15beb02be03f6272835bdc14 Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Thu, 1 Nov 2012 10:47:36 +0100 Subject: [PATCH] [DEV] update to etk::FSNode --- Sources/appl/Buffer/Buffer.cpp | 6 ++-- Sources/appl/Buffer/Buffer.h | 12 +++---- Sources/appl/Buffer/BufferManager.cpp | 18 +++++------ Sources/appl/Buffer/BufferManager.h | 4 +-- Sources/appl/Buffer/BufferText.cpp | 36 +++++++++++---------- Sources/appl/Buffer/BufferText.h | 2 +- Sources/appl/Colorize/ColorizeManager.cpp | 11 ++++--- Sources/appl/Gui/BufferView.cpp | 6 ++-- Sources/appl/Gui/BufferView.h | 8 ++--- Sources/appl/Gui/MainWindows.cpp | 14 ++++---- Sources/appl/Highlight/Highlight.cpp | 18 +++++------ Sources/appl/Highlight/Highlight.h | 4 +-- Sources/appl/Highlight/HighlightManager.cpp | 8 ++--- Sources/appl/Highlight/HighlightManager.h | 4 +-- Sources/appl/ctags/CTagsManager.cpp | 26 +++++++-------- Sources/appl/init.cpp | 6 ++-- 16 files changed, 93 insertions(+), 90 deletions(-) diff --git a/Sources/appl/Buffer/Buffer.cpp b/Sources/appl/Buffer/Buffer.cpp index 6e1e924..8194334 100644 --- a/Sources/appl/Buffer/Buffer.cpp +++ b/Sources/appl/Buffer/Buffer.cpp @@ -51,7 +51,7 @@ Buffer::Buffer() EWOL_DEBUG("Create buffer try name : \"" << mString << "\""); SetFileName(mString); m_haveName = false; - EWOL_DEBUG("Create buffer with name : \"" << m_fileName.GetCompleateName() << "\""); + EWOL_DEBUG("Create buffer with name : " << m_fileName ); } /** @@ -62,12 +62,12 @@ Buffer::Buffer() * @return --- * */ -Buffer::Buffer(etk::File &newName) +Buffer::Buffer(etk::FSNode &newName) { m_fileModify = false; EWOL_DEBUG("Create buffer try name : \"" << newName << "\""); SetFileName(newName); - EWOL_DEBUG("Create buffer with name : \"" << m_fileName.GetCompleateName() << "\""); + EWOL_DEBUG("Create buffer with name : " << m_fileName ); } /** diff --git a/Sources/appl/Buffer/Buffer.h b/Sources/appl/Buffer/Buffer.h index cccb43f..5dc37de 100644 --- a/Sources/appl/Buffer/Buffer.h +++ b/Sources/appl/Buffer/Buffer.h @@ -27,7 +27,7 @@ #define __BUFFER_H__ #include -#include +#include #include #include @@ -50,15 +50,15 @@ typedef struct{ class Buffer { public: Buffer(void); - Buffer(etk::File &newName); + Buffer(etk::FSNode &newName); virtual ~Buffer(void); - etk::File GetFileName(void) + etk::FSNode GetFileName(void) { return m_fileName; }; - void SetFileName(etk::File &newName) + void SetFileName(etk::FSNode &newName) { m_fileName = newName; m_haveName = true; @@ -67,7 +67,7 @@ class Buffer { void SetFileName(etk::UString &newName) { - m_fileName.SetCompleateName(newName, etk::FILE_TYPE_DIRECT); + m_fileName.SetName(newName); m_haveName = true; NameChange(); }; @@ -139,7 +139,7 @@ class Buffer { protected: bool m_fileModify; //!< // naming - etk::File m_fileName; //!< filename of the curent buffer + etk::FSNode m_fileName; //!< filename of the curent buffer bool m_haveName; //!< to know if the file have a name or NOT }; diff --git a/Sources/appl/Buffer/BufferManager.cpp b/Sources/appl/Buffer/BufferManager.cpp index b4e4c77..a0e781a 100644 --- a/Sources/appl/Buffer/BufferManager.cpp +++ b/Sources/appl/Buffer/BufferManager.cpp @@ -63,15 +63,15 @@ class classBufferManager: public ewol::EObject // create a buffer with no element int32_t Create(void); // open curent filename - int32_t Open(etk::File &myFile); + int32_t Open(etk::FSNode &myFile); bool Remove(int32_t BufferID); public: int32_t GetSelected(void) { return m_idSelected;}; //void SetSelected(int32_t id) {m_idSelected = id;}; Buffer * Get(int32_t BufferID); bool Exist(int32_t BufferID); - bool Exist(etk::File &myFile); - int32_t GetId(etk::File &myFile); + bool Exist(etk::FSNode &myFile); + int32_t GetId(etk::FSNode &myFile); // return the number of buffer (open in the past) if 5 buffer open and 4 close ==> return 5 uint32_t Size(void); uint32_t SizeOpen(void); @@ -165,7 +165,7 @@ void classBufferManager::OnReceiveMessage(ewol::EObject * CallerObject, const ch } } else if (eventId == ednMsgOpenFile) { if (data != "" ) { - etk::File myFile(data, etk::FILE_TYPE_DIRECT); + etk::FSNode myFile(data); APPL_DEBUG("request open file = \"" <Exist(BufferID); } -bool BufferManager::Exist(etk::File &myFile) +bool BufferManager::Exist(etk::FSNode &myFile) { if (NULL == localManager) { EWOL_ERROR("classBufferManager ==> request UnInit, but does not exist ..."); @@ -570,7 +570,7 @@ bool BufferManager::Exist(etk::File &myFile) return localManager->Exist(myFile); } -int32_t BufferManager::GetId(etk::File &myFile) +int32_t BufferManager::GetId(etk::FSNode &myFile) { if (NULL == localManager) { EWOL_ERROR("classBufferManager ==> request UnInit, but does not exist ..."); diff --git a/Sources/appl/Buffer/BufferManager.h b/Sources/appl/Buffer/BufferManager.h index aba0750..7ba772c 100644 --- a/Sources/appl/Buffer/BufferManager.h +++ b/Sources/appl/Buffer/BufferManager.h @@ -39,8 +39,8 @@ namespace BufferManager int32_t GetSelected(void); Buffer * Get(int32_t BufferID); bool Exist(int32_t BufferID); - bool Exist(etk::File &myFile); - int32_t GetId(etk::File &myFile); + bool Exist(etk::FSNode &myFile); + int32_t GetId(etk::FSNode &myFile); // return the number of buffer (open in the past) if 5 buffer open and 4 close ==> return 5 uint32_t Size(void); uint32_t SizeOpen(void); diff --git a/Sources/appl/Buffer/BufferText.cpp b/Sources/appl/Buffer/BufferText.cpp index b96a237..19240eb 100644 --- a/Sources/appl/Buffer/BufferText.cpp +++ b/Sources/appl/Buffer/BufferText.cpp @@ -117,20 +117,22 @@ BufferText::BufferText() * @return --- * */ -BufferText::BufferText(etk::File &fileName) : Buffer(fileName) +BufferText::BufferText(etk::FSNode &fileName) : Buffer(fileName) { BasicInit(); NameChange(); APPL_INFO("Add Data from file(" << GetFileName() << ")"); - FILE * myFile = NULL; - // try to open the file. if not existed, new file - - myFile = fopen(fileName.GetCompleateName().c_str(), "r"); - if (NULL != myFile) { - m_EdnBuf.DumpFrom(myFile); - // close the input file - fclose(myFile); - SetModify(false); + etk::FSNode myFile(fileName); + if (true == myFile.Exist()) { + if (false == myFile.FileOpenRead()) { + APPL_WARNING("File can not be open in read mode : " << myFile); + SetModify(true); + } else { + // TODO : Old methode to file access : + //m_EdnBuf.DumpFrom(myFile); + myFile.FileClose(); + SetModify(false); + } } else { // fichier inexistant... creation d'un nouveaux APPL_WARNING("No File ==> created a new one(" << GetFileName() << ")"); @@ -151,14 +153,14 @@ BufferText::BufferText(etk::File &fileName) : Buffer(fileName) void BufferText::Save(void) { APPL_INFO("Save File : \"" << GetFileName() << "\"" ); - FILE * myFile = NULL; - myFile = fopen(GetFileName().GetCompleateName().c_str(), "w"); - if (NULL != myFile) { - m_EdnBuf.DumpIn(myFile); - fclose(myFile); - SetModify(false); - } else { + etk::FSNode myFile(GetFileName()); + if (false == myFile.FileOpenWrite()) { APPL_ERROR("Can not open in writing the specify file"); + } else { + // TODO : Old methode to file access : + //m_EdnBuf.DumpIn(myFile); + myFile.FileClose(); + SetModify(false); } } diff --git a/Sources/appl/Buffer/BufferText.h b/Sources/appl/Buffer/BufferText.h index 3a642cf..50c9352 100644 --- a/Sources/appl/Buffer/BufferText.h +++ b/Sources/appl/Buffer/BufferText.h @@ -48,7 +48,7 @@ class CharElement class BufferText : public Buffer { public: BufferText(void); - BufferText(etk::File &fileName); + BufferText(etk::FSNode &fileName); virtual ~BufferText(void); void Save(void); diff --git a/Sources/appl/Colorize/ColorizeManager.cpp b/Sources/appl/Colorize/ColorizeManager.cpp index 721dac3..e0ae0fc 100644 --- a/Sources/appl/Colorize/ColorizeManager.cpp +++ b/Sources/appl/Colorize/ColorizeManager.cpp @@ -28,6 +28,7 @@ #include #include #include +#include #define PFX "ColorizeManager " @@ -143,17 +144,17 @@ void classColorManager::LoadFile(const char * xmlFilename) // allocate the document in the stack TiXmlDocument XmlDocument; // open the curent File - etk::File fileName(xmlFilename, etk::FILE_TYPE_DATA); + etk::FSNode fileName(etk::UString("DATA:") + xmlFilename); if (false == fileName.Exist()) { APPL_ERROR("File Does not exist : " << fileName); return; } - int32_t fileSize = fileName.Size(); + int32_t fileSize = fileName.FileSize(); if (0==fileSize) { APPL_ERROR("This file is empty : " << fileName); return; } - if (false == fileName.fOpenRead()) { + if (false == fileName.FileOpenRead()) { APPL_ERROR("Can not open the file : " << fileName); return; } @@ -165,9 +166,9 @@ void classColorManager::LoadFile(const char * xmlFilename) } memset(fileBuffer, 0, (fileSize+5)*sizeof(char)); // load data from the file : - fileName.fRead(fileBuffer, 1, fileSize); + fileName.FileRead(fileBuffer, 1, fileSize); // close the file: - fileName.fClose(); + fileName.FileClose(); // load the XML from the memory XmlDocument.Parse((const char*)fileBuffer, 0, TIXML_ENCODING_UTF8); diff --git a/Sources/appl/Gui/BufferView.cpp b/Sources/appl/Gui/BufferView.cpp index cf6a893..3c9042a 100644 --- a/Sources/appl/Gui/BufferView.cpp +++ b/Sources/appl/Gui/BufferView.cpp @@ -46,7 +46,7 @@ static void SortElementList(etk::Vector &list) for(int32_t jjj=0; jjjm_bufferName.GetShortFilename() > list[jjj]->m_bufferName.GetShortFilename()) { + if (tmpList[iii]->m_bufferName.GetNameFile() > list[jjj]->m_bufferName.GetNameFile()) { findPos = jjj+1; } } @@ -103,7 +103,7 @@ void BufferView::OnReceiveMessage(ewol::EObject * CallerObject, const char * eve for (int32_t iii=0; iiiIsModify(); - etk::File name = BufferManager::Get(iii)->GetFileName(); + etk::FSNode name = BufferManager::Get(iii)->GetFileName(); appl::dataBufferStruct* tmpElement = new appl::dataBufferStruct(name, iii, isModify); if (NULL != tmpElement) { m_list.PushBack(tmpElement); @@ -164,7 +164,7 @@ bool BufferView::GetElement(int32_t colomn, int32_t raw, etk::UString &myTextToW if( raw>=0 && rawm_bufferName.GetShortFilename(); + myTextToWrite = m_list[raw]->m_bufferName.GetNameFile(); if (true == m_list[raw]->m_isModify) { selectFG = COLOR_LIST_TEXT_MODIFY; diff --git a/Sources/appl/Gui/BufferView.h b/Sources/appl/Gui/BufferView.h index 5929ac1..b8a2f36 100644 --- a/Sources/appl/Gui/BufferView.h +++ b/Sources/appl/Gui/BufferView.h @@ -36,10 +36,10 @@ namespace appl class dataBufferStruct { public: - etk::File m_bufferName; - uint32_t m_bufferID; - bool m_isModify; - dataBufferStruct(etk::File& bufferName, int32_t bufferID, bool isModify) : + etk::FSNode m_bufferName; + uint32_t m_bufferID; + bool m_isModify; + dataBufferStruct(etk::FSNode& bufferName, int32_t bufferID, bool isModify) : m_bufferName(bufferName), m_bufferID(bufferID), m_isModify(isModify) diff --git a/Sources/appl/Gui/MainWindows.cpp b/Sources/appl/Gui/MainWindows.cpp index 8fa6aed..698b59a 100644 --- a/Sources/appl/Gui/MainWindows.cpp +++ b/Sources/appl/Gui/MainWindows.cpp @@ -302,8 +302,8 @@ void MainWindows::OnReceiveMessage(ewol::EObject * CallerObject, const char * ev if (BufferManager::GetSelected()!=-1) { Buffer * myBuffer = BufferManager::Get(BufferManager::GetSelected()); if (NULL!=myBuffer) { - etk::File tmpFile = myBuffer->GetFileName(); - tmpWidget->SetFolder(tmpFile.GetFolder()); + etk::FSNode tmpFile = myBuffer->GetFileName(); + tmpWidget->SetFolder(tmpFile.GetNameFolder()); } } PopUpWidgetPush(tmpWidget); @@ -335,9 +335,9 @@ void MainWindows::OnReceiveMessage(ewol::EObject * CallerObject, const char * ev etk::UString folder = "/home/"; etk::UString fileName = ""; if (true == myBuffer->HaveName()) { - etk::File tmpName = myBuffer->GetFileName(); - folder = tmpName.GetFolder(); - fileName = tmpName.GetShortFilename(); + etk::FSNode tmpName = myBuffer->GetFileName(); + folder = tmpName.GetNameFolder(); + fileName = tmpName.GetNameFile(); } tmpWidget->SetFolder(folder); tmpWidget->SetFileName(fileName); @@ -358,9 +358,9 @@ void MainWindows::OnReceiveMessage(ewol::EObject * CallerObject, const char * ev // the buffer change we need to update the widget string Buffer* tmpBuffer = BufferManager::Get(BufferManager::GetSelected()); if (NULL != tmpBuffer) { - etk::File compleateName = tmpBuffer->GetFileName(); + etk::FSNode compleateName = tmpBuffer->GetFileName(); bool isModify = tmpBuffer->IsModify(); - etk::UString directName = compleateName.GetCompleateName(); + etk::UString directName = compleateName.GetName(); if (true == isModify) { directName += " *"; } diff --git a/Sources/appl/Highlight/Highlight.cpp b/Sources/appl/Highlight/Highlight.cpp index 73fe87a..d059bdd 100644 --- a/Sources/appl/Highlight/Highlight.cpp +++ b/Sources/appl/Highlight/Highlight.cpp @@ -49,17 +49,17 @@ Highlight::Highlight(etk::UString &xmlFilename) { TiXmlDocument XmlDocument; - etk::File fileName(xmlFilename, etk::FILE_TYPE_DATA); + etk::FSNode fileName(etk::UString("DATA:") + xmlFilename); if (false == fileName.Exist()) { APPL_ERROR("File Does not exist : " << fileName); return; } - int32_t fileSize = fileName.Size(); + int32_t fileSize = fileName.FileSize(); if (0==fileSize) { APPL_ERROR("This file is empty : " << fileName); return; } - if (false == fileName.fOpenRead()) { + if (false == fileName.FileOpenRead()) { APPL_ERROR("Can not open the file : " << fileName); return; } @@ -71,9 +71,9 @@ Highlight::Highlight(etk::UString &xmlFilename) } memset(fileBuffer, 0, (fileSize+5)*sizeof(char)); // load data from the file : - fileName.fRead(fileBuffer, 1, fileSize); + fileName.FileRead(fileBuffer, 1, fileSize); // close the file: - fileName.fClose(); + fileName.FileClose(); // load the XML from the memory bool loadError = XmlDocument.Parse((const char*)fileBuffer, 0, TIXML_ENCODING_UTF8); if (false == loadError) { @@ -191,15 +191,15 @@ bool Highlight::HasExtention(etk::UString &ext) return false; } -bool Highlight::FileNameCompatible(etk::File &fileName) +bool Highlight::FileNameCompatible(etk::FSNode &fileName) { int32_t i; etk::UString extention; - if (true == fileName.HasExtention() ) { + if (true == fileName.FileHasExtention() ) { extention = "*."; - extention += fileName.GetExtention(); + extention += fileName.FileGetExtention(); } else { - extention = fileName.GetShortFilename(); + extention = fileName.GetNameFile(); } APPL_DEBUG(" try to find : in \"" << fileName << "\" extention:\"" << extention << "\" "); diff --git a/Sources/appl/Highlight/Highlight.h b/Sources/appl/Highlight/Highlight.h index bcf38f7..cb5b532 100644 --- a/Sources/appl/Highlight/Highlight.h +++ b/Sources/appl/Highlight/Highlight.h @@ -42,7 +42,7 @@ extern "C" { } colorInformation_ts; } -#include +#include #include #include #include @@ -54,7 +54,7 @@ class Highlight { Highlight(etk::UString &xmlFilename); ~Highlight(void); bool HasExtention(etk::UString &ext); - bool FileNameCompatible(etk::File &fileName); + bool FileNameCompatible(etk::FSNode &fileName); void Display(void); void ReloadColor(void); void Parse(int32_t start, diff --git a/Sources/appl/Highlight/HighlightManager.cpp b/Sources/appl/Highlight/HighlightManager.cpp index f6e965a..7a6f7ab 100644 --- a/Sources/appl/Highlight/HighlightManager.cpp +++ b/Sources/appl/Highlight/HighlightManager.cpp @@ -89,7 +89,7 @@ class localClassHighlightManager: public ewol::EObject */ } - Highlight* Get(etk::File &fileName) + Highlight* Get(etk::FSNode &fileName) { int32_t i; for (i=0; iloadLanguages(); } -Highlight* HighlightManager::Get(etk::File &fileName) +Highlight* HighlightManager::Get(etk::FSNode &fileName) { if (NULL == localManager) { return NULL; @@ -209,7 +209,7 @@ Highlight* HighlightManager::Get(etk::File &fileName) return localManager->Get(fileName); } -bool HighlightManager::Exist(etk::File &fileName) +bool HighlightManager::Exist(etk::FSNode &fileName) { if (NULL == localManager) { return false; diff --git a/Sources/appl/Highlight/HighlightManager.h b/Sources/appl/Highlight/HighlightManager.h index d7cc910..1c2f3a6 100644 --- a/Sources/appl/Highlight/HighlightManager.h +++ b/Sources/appl/Highlight/HighlightManager.h @@ -36,8 +36,8 @@ namespace HighlightManager{ void Init(void); void UnInit(void); void loadLanguages(void); - Highlight* Get(etk::File &fileName); - bool Exist(etk::File &fileName); + Highlight* Get(etk::FSNode &fileName); + bool Exist(etk::FSNode &fileName); }; diff --git a/Sources/appl/ctags/CTagsManager.cpp b/Sources/appl/ctags/CTagsManager.cpp index 913aa4b..ef5024b 100644 --- a/Sources/appl/ctags/CTagsManager.cpp +++ b/Sources/appl/ctags/CTagsManager.cpp @@ -31,7 +31,7 @@ #include #include - +// TODO : The line ID is no more stored in the file system (FSNode) ... #undef __class__ #define __class__ "CTagsManager" @@ -73,7 +73,7 @@ class CTagsManager: public ewol::EObject tagFile * m_ctagFile; // history system int32_t m_historyPos; - etk::Vector m_historyList; + etk::Vector m_historyList; void RegisterHistory(void); }; @@ -151,9 +151,9 @@ void CTagsManager::OnReceiveMessage(ewol::EObject * CallerObject, const char * e } else if( eventId == ednEventPopUpCtagsLoadFile || eventId == ednMsgCtagsLoadFile) { // open the new one : - etk::File tmpFilename = data; - m_tagFilename = tmpFilename.GetShortFilename(); - m_tagFolderBase = tmpFilename.GetFolder(); + etk::FSNode tmpFilename = data; + m_tagFilename = tmpFilename.GetNameFile(); + m_tagFolderBase = tmpFilename.GetNameFolder(); APPL_DEBUG("Receive load Ctags file : " << m_tagFolderBase << "/" << m_tagFilename << " "); LoadTagFile(); } else if (eventId == ednMsgGuiCtags) { @@ -176,8 +176,8 @@ void CTagsManager::OnReceiveMessage(ewol::EObject * CallerObject, const char * e } else if (data == "Back") { if (m_historyList.Size() > 0) { int32_t id = m_historyList.Size()-1; - SendMultiCast(ednMsgOpenFile, m_historyList[id]->GetCompleateName() ); - SendMultiCast(ednMsgGuiGotoLine, m_historyList[id]->GetLineNumber()); + SendMultiCast(ednMsgOpenFile, m_historyList[id]->GetName() ); + SendMultiCast(ednMsgGuiGotoLine, 0);// TODO : m_historyList[id]->GetLineNumber()); // Remove element .... delete(m_historyList[id]); m_historyList[id]=NULL; @@ -229,9 +229,9 @@ void CTagsManager::RegisterHistory(void) int32_t currentSelected = BufferManager::GetSelected(); Buffer* tmpBuf = BufferManager::Get(currentSelected); if (NULL != tmpBuf) { - etk::File * bufferFilename = new etk::File(); + etk::FSNode * bufferFilename = new etk::FSNode(); *bufferFilename = tmpBuf->GetFileName(); - bufferFilename->SetLineNumber(tmpBuf->GetCurrentLine()); + // TODO : bufferFilename->SetLineNumber(tmpBuf->GetCurrentLine()); m_historyList.PushBack(bufferFilename); } } @@ -254,7 +254,7 @@ void CTagsManager::JumpTo(void) // For all tags : Save in an internal Structure : etk::UString tmpFile(m_tagFolderBase + "/" + entry.file); - etk::File myfile(tmpFile); + etk::FSNode myfile(tmpFile); int32_t lineID = entry.address.lineNumber; PrintTag(&entry, true); @@ -264,13 +264,13 @@ void CTagsManager::JumpTo(void) if (NULL == tmpWidget) { APPL_ERROR("Can not allocate widget ==> display might be in error"); } else { - tmpWidget->AddCtagsNewItem(myfile.GetCompleateName(), lineID); + tmpWidget->AddCtagsNewItem(myfile.GetName(), lineID); do { tmpFile = m_tagFolderBase + "/" + entry.file; myfile = tmpFile; lineID = entry.address.lineNumber; PrintTag(&entry, true); - tmpWidget->AddCtagsNewItem(myfile.GetCompleateName(), lineID); + tmpWidget->AddCtagsNewItem(myfile.GetName(), lineID); } while (tagsFindNext (m_ctagFile, &entry) == TagSuccess); PopUpWidgetPush(tmpWidget); tmpWidget->RegisterOnEvent(this, applEventctagsSelection); @@ -278,7 +278,7 @@ void CTagsManager::JumpTo(void) } else { RegisterHistory(); APPL_INFO(" OPEN the TAG file Destination : " << tmpFile ); - SendMultiCast(ednMsgOpenFile, myfile.GetCompleateName()); + SendMultiCast(ednMsgOpenFile, myfile.GetName()); SendMultiCast(ednMsgGuiGotoLine, lineID - 1); } } else { diff --git a/Sources/appl/init.cpp b/Sources/appl/init.cpp index c697508..851b439 100644 --- a/Sources/appl/init.cpp +++ b/Sources/appl/init.cpp @@ -31,7 +31,7 @@ #include #include -#include +#include #include #include #include @@ -154,9 +154,9 @@ void APP_Init(void) } -etk::File APP_Icon(void) +etk::FSNode APP_Icon(void) { - etk::File bitmapFile("iconEdn.bmp", etk::FILE_TYPE_DATA); + etk::FSNode bitmapFile("DATA:iconEdn.bmp"); return bitmapFile; }