[GExperts-Checkins] SF.net SVN: gexperts:[4319] trunk/Source/CodeLibraria n

[<tw...@us...>]

Revision: 4319
          http://sourceforge.net/p/gexperts/code/4319
Author:   twm
Date:     2024-09-16 11:44:13 +0000 (Mon, 16 Sep 2024)
Log Message:
-----------
new method TGXStorageFile.AddSlash as a replacement for GX_GenericUtils.AddSlash wich explicitly uses CodeLibPathSep.

Modified Paths:
--------------
    trunk/Source/CodeLibrarian/GX_CodeLib.pas
    trunk/Source/CodeLibrarian/GX_CodeLibFile.pas

Modified: trunk/Source/CodeLibrarian/GX_CodeLib.pas
===================================================================
--- trunk/Source/CodeLibrarian/GX_CodeLib.pas	2024-09-16 10:29:11 UTC (rev 4318)
+++ trunk/Source/CodeLibrarian/GX_CodeLib.pas	2024-09-16 11:44:13 UTC (rev 4319)
@@ -366,7 +366,7 @@
     ParentNode := ParentNode.Parent;
 
   NewTopic := GetUniqueTopicName(ParentNode, True);
-  NewFolder := AddSlash(GetNodePath(ParentNode)) + NewTopic;
+  NewFolder := CodeDB.AddSlash(GetNodePath(ParentNode)) + NewTopic;
   CodeDB.AssertValidFolderName(NewFolder);
   CodeDB.CreateFolder(NewFolder);
   Assert(CodeDB.FolderExists(NewFolder));
@@ -405,7 +405,7 @@
     SelectedNode := SelectedNode.Parent;
 
   TopicName := GetUniqueTopicName(SelectedNode, False);
-  NewFileName := AddSlash(GetNodePath(SelectedNode)) + TopicName;
+  NewFileName := CodeDB.AddSlash(GetNodePath(SelectedNode)) + TopicName;
   CodeDB.OpenFile(NewFileName);
   Assert(CodeDB.FileExists(NewFileName));
   CodeDB.SetAttribute(AttrTopic, TopicName);
@@ -474,7 +474,7 @@
 begin
   Modified := True;
   AssertValidFileName(S);
-  NewFileName := AddSlash(GetNodeParentPath(Node)) + S;
+  NewFileName := CodeDB.AddSlash(GetNodeParentPath(Node)) + S;
   if CodeDB.FileExists(NewFileName) or CodeDB.FolderExists(NewFileName) then
     raise Exception.CreateFmt('An item named %s already exists.', [S]);
   SetNodeAttribute(Node, AttrTopic, S);
@@ -769,7 +769,7 @@
     if IsCodeSnippet(DestNode) or DestNode.HasAsParent(SelectedNode) then
       Exit; //==>
 
-    CodeDB.Move(SelectedNodeFullName, AddSlash(GetNodePath(DestNode)) + SelectedCaption);
+    CodeDB.Move(SelectedNodeFullName, CodeDB.AddSlash(GetNodePath(DestNode)) + SelectedCaption);
     CodeDB.SaveStorage;
     SelectedNode.MoveTo(DestNode, naAddChild);
     DestNode.AlphaSort;
@@ -1426,7 +1426,7 @@
     TopicName := FolderPrefix
   else
     TopicName := SnippetPrefix;
-  ParentPath := AddSlash(GetNodePath(ParentNode));
+  ParentPath := CodeDB.AddSlash(GetNodePath(ParentNode));
   for i := 1 to 101 do
   begin
     TestName := TopicName + IntToStr(i);

Modified: trunk/Source/CodeLibrarian/GX_CodeLibFile.pas
===================================================================
--- trunk/Source/CodeLibrarian/GX_CodeLibFile.pas	2024-09-16 10:29:11 UTC (rev 4318)
+++ trunk/Source/CodeLibrarian/GX_CodeLibFile.pas	2024-09-16 11:44:13 UTC (rev 4319)
@@ -56,18 +56,29 @@
     function GetObjectAttribute(const ObjectName, AttrName: TGXUnicodeString): TGXUnicodeString; overload;
     function GetObjectAttribute(const FolderName, FileName, AttrName: TGXUnicodeString): TGXUnicodeString; overload;
     function MakeFileName(const FolderName, FileName: TGXUnicodeString): TGXUnicodeString;
+    function AddSlash(const Foldername: TGXUnicodeString): TGXUnicodeString;
   end;
 
 implementation
 
-uses
-  GX_GenericUtils;
-
 { TGXStorageFile }
 
+function TGXStorageFile.AddSlash(const FolderName: TGXUnicodeString): TGXUnicodeString;
+
+  function IsPathSep(const s: string; Index: Integer): Boolean;
+  begin
+    Result := (Index >= Low(string)) and (Index <= High(s)) and (s[Index] = CodeLibPathSep)
+      and (ByteType(s, Index) = mbSingleByte);
+  end;
+
+begin
+  Result := FolderName;
+  if not IsPathSep(Result, High(Result)) then
+    Result := Result + CodeLibPathSep;
+end;
+
 function TGXStorageFile.MakeFileName(const FolderName, FileName: TGXUnicodeString): TGXUnicodeString;
 begin
-  // todo: This is not consistent: Either use CodeLibPathSep or use AddSlash, but not both
   Result := FolderName;
   if Result = '' then
     Result := CodeLibPathSep

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.