Changeset 623 in dev for trunk/ab5.0/abdev/abdev/src/ProjectManager/ProjectManager.cpp

Timestamp:

May 21, 2008, 11:02:07 PM (16 years ago)

Author:

dai_9181

Message:

Projectクラスをリファクタリング

File:

• trunk/ab5.0/abdev/abdev/src/ProjectManager/ProjectManager.cpp (modified) (7 diffs)

trunk/ab5.0/abdev/abdev/src/ProjectManager/ProjectManager.cpp

@@ -25 +25 @@
     lstrcpy(pobj_nv->DefSaveDir,this->GetWorkDir().GetPath().c_str());
 
-
-    //////////////////////////////////////////
-    // リソースデータ用領域を確保
-    this->res.pCursorResInfo=(RESITEMINFO *)HeapAlloc(hHeap,0,1);
-    this->res.NumberOfCursorRes=0;
-    this->res.pBitmapResInfo=(RESITEMINFO *)HeapAlloc(hHeap,0,1);
-    this->res.NumberOfBitmapRes=0;
-    this->res.pIconResInfo=(RESITEMINFO *)HeapAlloc(hHeap,0,1);
-    this->res.NumberOfIconRes=0;
 
 
@@ -242 +233 @@
 
     // リソースを読み込む
-    Jenga::Common::Path resourcePath( projectInfo.GetResourceFileFullPath() );
+    Jenga::Common::Path resourcePath( this->GetResourceFileFullPath() );
     if( resourcePath.IsExistFile() )
     {
-        GetResourceData();
+        this->resourceManager.Load( this->GetResourceFileFullPath() );
     }
 
@@ -302 +293 @@
         if(MdiInfo[WndNum].DocType==WNDTYPE_ICONEDIT){
             if(MdiInfo[WndNum].MdiIconEditInfo->bModify){
-                for(i=0;i<this->res.NumberOfIconRes;i++){
-                    lstrcpy(temporary,this->res.pIconResInfo[i].path);
+                for(i=0;i<this->resourceManager.iconResources.size();i++){
+                    lstrcpy(temporary,this->resourceManager.iconResources[i].filepath.c_str());
                     lstrcpy( temporary, this->GetWorkDir().GetFullPath( temporary ).c_str() );
                     if(lstrcmpi(MdiInfo[WndNum].path,temporary)==0){
@@ -366 +357 @@
         i2=0;
         i3=101;
-        for(i=0;i<this->res.NumberOfCursorRes;i++,i3++){
+        for(i=0;i<this->resourceManager.cursorResources.size();i++,i3++){
             sprintf(buffer+i2,"Const %s=%d\r\n",
-                this->res.pCursorResInfo[i].IdName,
+                this->resourceManager.cursorResources[i].idName.c_str(),
                 i3);
             i2+=lstrlen(buffer+i2);
         }
-        for(i=0;i<this->res.NumberOfBitmapRes;i++,i3++){
+        for(i=0;i<this->resourceManager.bitmapResources.size();i++,i3++){
             sprintf(buffer+i2,"Const %s=%d\r\n",
-                this->res.pBitmapResInfo[i].IdName,
+                this->resourceManager.bitmapResources[i].idName.c_str(),
                 i3);
             i2+=lstrlen(buffer+i2);
         }
-        for(i=0;i<this->res.NumberOfIconRes;i++,i3++){
+        for(i=0;i<this->resourceManager.iconResources.size();i++,i3++){
             sprintf(buffer+i2,"Const %s=%d\r\n",
-                this->res.pIconResInfo[i].IdName,
+                this->resourceManager.iconResources[i].idName.c_str(),
                 i3);
             i2+=lstrlen(buffer+i2);
@@ -389 +380 @@
 
         i2=0;
-        for(i=0;i<this->res.NumberOfCursorRes;i++){
+        for(i=0;i<this->resourceManager.cursorResources.size();i++){
             sprintf(buffer+i2,"%s CURSOR \"%s\"\r\n",
-                this->res.pCursorResInfo[i].IdName,
-                this->res.pCursorResInfo[i].path);
-            i2+=lstrlen(buffer+i2);
-        }
-        for(i=0;i<this->res.NumberOfBitmapRes;i++){
+                this->resourceManager.cursorResources[i].idName.c_str(),
+                this->resourceManager.cursorResources[i].filepath.c_str());
+            i2+=lstrlen(buffer+i2);
+        }
+        for(i=0;i<this->resourceManager.bitmapResources.size();i++){
             sprintf(buffer+i2,"%s BITMAP \"%s\"\r\n",
-                this->res.pBitmapResInfo[i].IdName,
-                this->res.pBitmapResInfo[i].path);
-            i2+=lstrlen(buffer+i2);
-        }
-        for(i=0;i<this->res.NumberOfIconRes;i++){
+                this->resourceManager.bitmapResources[i].idName.c_str(),
+                this->resourceManager.bitmapResources[i].filepath.c_str());
+            i2+=lstrlen(buffer+i2);
+        }
+        for(i=0;i<this->resourceManager.iconResources.size();i++){
             sprintf(buffer+i2,"%s ICON \"%s\"\r\n",
-                this->res.pIconResInfo[i].IdName,
-                this->res.pIconResInfo[i].path);
+                this->resourceManager.iconResources[i].idName.c_str(),
+                this->resourceManager.iconResources[i].filepath.c_str());
             i2+=lstrlen(buffer+i2);
         }
@@ -578 +569 @@
         }
         else if(MdiInfo[WndNum].DocType==WNDTYPE_ICONEDIT){
-            for(i=0;this->res.NumberOfIconRes;i++){
-                lstrcpy(temporary,this->res.pIconResInfo[i].path);
+            for(i=0;this->resourceManager.iconResources.size();i++){
+                lstrcpy(temporary,this->resourceManager.iconResources[i].filepath.c_str());
                 lstrcpy( temporary, this->GetWorkDir().GetFullPath( temporary ).c_str() );
                 if(lstrcmpi(MdiInfo[WndNum].path,temporary)==0){
@@ -627 +618 @@
 
     //リソースのメモリを解放
-    for(i=0;i<this->res.NumberOfCursorRes;i++){
-        HeapDefaultFree(this->res.pCursorResInfo[i].IdName);
-        HeapDefaultFree(this->res.pCursorResInfo[i].path);
-    }
-    HeapDefaultFree(this->res.pCursorResInfo);
-    for(i=0;i<this->res.NumberOfBitmapRes;i++){
-        HeapDefaultFree(this->res.pBitmapResInfo[i].IdName);
-        HeapDefaultFree(this->res.pBitmapResInfo[i].path);
-    }
-    HeapDefaultFree(this->res.pBitmapResInfo);
-    for(i=0;i<this->res.NumberOfIconRes;i++){
-        HeapDefaultFree(this->res.pIconResInfo[i].IdName);
-        HeapDefaultFree(this->res.pIconResInfo[i].path);
-    }
-    HeapDefaultFree(this->res.pIconResInfo);
+    this->resourceManager.Clear();
 
     //プロジェクト ビューを非表示にする