[JEDI.NET-commits] main/run Jedi.System.Strings.pas,1.1,1.2

[Marcel B. <jed...@us...>]

Update of /cvsroot/jedidotnet/main/run
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12509/main/run

Modified Files:
	Jedi.System.Strings.pas 
Log Message:
Overloaded StringUtils.TabSet.ToString to allow more control over the output string. The default format has been changed a little as well for improved readability.

Index: Jedi.System.Strings.pas
===================================================================
RCS file: /cvsroot/jedidotnet/main/run/Jedi.System.Strings.pas,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Jedi.System.Strings.pas	5 Dec 2004 13:19:48 -0000	1.1
--- Jedi.System.Strings.pas	6 Dec 2004 10:51:44 -0000	1.2
***************
*** 70,74 ****
          procedure set_Tabs(index: Integer; value: Integer);
          procedure set_DefaultWidth(value: Integer);
!         function ToString: string; override;
  
          property Count: Integer read get_Count;
--- 70,77 ----
          procedure set_Tabs(index: Integer; value: Integer);
          procedure set_DefaultWidth(value: Integer);
!         function ToString: string; overload; override;
!         function ToString(wantBrackets: Boolean): string; overload;
!         function ToString(wantBrackets, emptyBrackets: Boolean): string; overload;
!         function ToString(wantBrackets, emptyBrackets, includeDefaultWidth: Boolean): string; overload;
  
          property Count: Integer read get_Count;
***************
*** 670,673 ****
--- 673,691 ----
  
  function StringUtils.TabSet.ToString: string;
+ begin
+   Result := ToString(True, True, True);
+ end;
+ 
+ function StringUtils.TabSet.ToString(wantBrackets: Boolean): string;
+ begin
+   Result := ToString(wantBrackets, wantBrackets, True);
+ end;
+ 
+ function StringUtils.TabSet.ToString(wantBrackets, emptyBrackets: Boolean): string;
+ begin
+   Result := ToString(wantBrackets, emptyBrackets, True);
+ end;
+ 
+ function StringUtils.TabSet.ToString(wantBrackets, emptyBrackets, includeDefaultWidth: Boolean): string;
  var
    sb: StringBuilder;
***************
*** 675,693 ****
  begin
    sb := StringBuilder.Create;
-   sb.Append('[');
    enum := FTabs.GetEnumerator;
!   if FTabs.Count > 0 then
    begin
!     while enum.MoveNext do
!     begin
!       sb.Append(Integer(enum.Current));
!       sb.Append(',');
!     end;
      sb.Remove(sb.Length - 1, 1);
    end;
-   sb.Append(']+');
-   sb.Append(RealDefaultWidth);
-   if RealDefaultWidth <> DefaultWidth then
-     sb.Append(' (automatic)');
    Result := sb.ToString;
  end;
--- 693,718 ----
  begin
    sb := StringBuilder.Create;
    enum := FTabs.GetEnumerator;
!   while enum.MoveNext do
    begin
!     sb.Append(Integer(enum.Current));
!     sb.Append(',');
!   end;
!   if sb.Length <> 0 then
      sb.Remove(sb.Length - 1, 1);
+   if wantBrackets and (emptyBrackets or (sb.Length > 0)) then
+   begin
+     sb.Insert(0, '[');
+     sb.Append(']');
+   end;
+   if includeDefaultWidth then
+   begin
+     if sb.Length > 0 then
+       sb.Append(' and ');
+     sb.Append('every ');
+     sb.Append(RealDefaultWidth);
+     if RealDefaultWidth <> DefaultWidth then
+       sb.Append(' (automatic)');
    end;
    Result := sb.ToString;
  end;