Changeset 13 for trunk/UAcronym.pas

Timestamp:

Apr 28, 2016, 10:09:02 PM (9 years ago)

Author:

chronos

Message:

• Modified: Acronym meaning context items renamed to categories.
• Added: Ability to select categories for meanings.

File:

• trunk/UAcronym.pas (modified) (15 diffs)

trunk/UAcronym.pas

@@ -9 +9 @@
 
 type
-  TAcronymContexts = class;
+  TAcronymCategories = class;
   TAcronymMeanings = class;
 
@@ -33 +33 @@
     Language: string;
     Acronym: TAcronym;
-    Contexts: TAcronymContexts;
+    Categories: TAcronymCategories;
     Source: TAcronymSource;
     constructor Create;
@@ -53 +53 @@
   end;
 
-  { TAcronymContext }
-
-  TAcronymContext = class
+  { TAcronymCategory }
+
+  TAcronymCategory = class
     Name: string;
     Acronyms: TObjectList; // TObjectList<TAcronym>
@@ -62 +62 @@
   end;
 
-  { TAcronymContexts }
-
-  TAcronymContexts = class(TObjectList)
-    function SearchByName(Name: string): TAcronymContext;
-    function AddContext(Name: string): TAcronymContext;
-  end;
+  { TAcronymCategories }
+
+  TAcronymCategories = class(TObjectList)
+    function SearchByName(Name: string): TAcronymCategory;
+    function AddContext(Name: string): TAcronymCategory;
+    procedure AssignToStrings(Strings: TStrings);
+    procedure AssignFromStrings(Strings: TStrings);
+  end;
+
+  { TAcronymEntry }
 
   TAcronymEntry = class
@@ -73 +77 @@
     Meaning: string;
     Description: string;
+    Categories: TStringList;
+    constructor Create;
+    destructor Destroy; override;
   end;
 
@@ -81 +88 @@
     Sources: TObjectList; // TObjectList<TAcronymSource>
     Acronyms: TAcronyms;
-    Contexts: TAcronymContexts;
+    Categories: TAcronymCategories;
     Modified: Boolean;
     constructor Create;
@@ -101 +108 @@
 end;
 
+{ TAcronymEntry }
+
+constructor TAcronymEntry.Create;
+begin
+  Categories := TStringList.Create;
+end;
+
+destructor TAcronymEntry.Destroy;
+begin
+  Categories.Free;
+  inherited Destroy;
+end;
+
 { TAcronymMeanings }
 
@@ -124 +144 @@
 constructor TAcronymMeaning.Create;
 begin
-  Contexts := TAcronymContexts.Create(False);
+  Categories := TAcronymCategories.Create(False);
 end;
 
 destructor TAcronymMeaning.Destroy;
 begin
-  FreeAndNil(Contexts);
+  FreeAndNil(Categories);
   inherited Destroy;
 end;
@@ -152 +172 @@
 end;
 
-{ TAcronymContexts }
-
-function TAcronymContexts.SearchByName(Name: string): TAcronymContext;
+{ TAcronymCategories }
+
+function TAcronymCategories.SearchByName(Name: string): TAcronymCategory;
 var
   I: Integer;
 begin
   I := 0;
-  while (I < Count) and (TAcronymContext(Items[I]).Name <> Name) do Inc(I);
-  if I < Count then Result := TAcronymContext(Items[I])
+  while (I < Count) and (TAcronymCategory(Items[I]).Name <> Name) do Inc(I);
+  if I < Count then Result := TAcronymCategory(Items[I])
     else Result := nil;
 end;
 
-function TAcronymContexts.AddContext(Name: string): TAcronymContext;
-begin
-  Result := TAcronymContext.Create;
+function TAcronymCategories.AddContext(Name: string): TAcronymCategory;
+begin
+  Result := TAcronymCategory.Create;
   Result.Name := Name;
   Add(Result);
 end;
 
+procedure TAcronymCategories.AssignToStrings(Strings: TStrings);
+var
+  I: Integer;
+begin
+  Strings.Clear;
+  for I := 0 to Count - 1 do
+    Strings.AddObject(TAcronymCategory(Items[I]).Name, Items[I]);
+end;
+
+procedure TAcronymCategories.AssignFromStrings(Strings: TStrings);
+var
+  I: Integer;
+begin
+  Clear;
+  for I := 0 to Strings.Count - 1 do
+    Add(TAcronymCategory(Strings.Objects[I]));
+end;
+
 
 { TAcronym }
@@ -185 +223 @@
 end;
 
-{ TAcronymContext }
-
-constructor TAcronymContext.Create;
+{ TAcronymCategory }
+
+constructor TAcronymCategory.Create;
 begin
   Acronyms := TObjectList.Create(False);
 end;
 
-destructor TAcronymContext.Destroy;
+destructor TAcronymCategory.Destroy;
 begin
   FreeAndNil(Acronyms);
@@ -204 +242 @@
   Sources := TObjectList.Create;
   Acronyms := TAcronyms.Create;
-  Contexts := TAcronymContexts.Create;
+  Categories := TAcronymCategories.Create;
+  TAcronymCategory(Categories[Categories.Add(TAcronymCategory.Create)]).Name := 'Internet';
+  TAcronymCategory(Categories[Categories.Add(TAcronymCategory.Create)]).Name := 'Software';
+  TAcronymCategory(Categories[Categories.Add(TAcronymCategory.Create)]).Name := 'Chat';
 end;
 
@@ -211 +252 @@
   FreeAndNil(Sources);
   FreeAndNil(Acronyms);
-  FreeAndNil(Contexts);
+  FreeAndNil(Categories);
   inherited Destroy;
 end;
@@ -224 +265 @@
   I: Integer;
   J: Integer;
-  AcronymContext: TAcronymContext;
+  AcronymContext: TAcronymCategory;
 begin
   Self.FileName := FileName;
@@ -252 +293 @@
       Context.DelimitedText := Line[2];
       for J := 0 to Context.Count - 1 do begin
-        AcronymContext := Contexts.SearchByName(Context[J]);
+        AcronymContext := Categories.SearchByName(Context[J]);
         if not Assigned(AcronymContext) then begin
-          AcronymContext := TAcronymContext.Create;
+          AcronymContext := TAcronymCategory.Create;
           AcronymContext.Name := Context[J];
-          Contexts.Add(AcronymContext);
+          Categories.Add(AcronymContext);
         end;
-        NewMeaning.Contexts.Add(AcronymContext);
+        NewMeaning.Categories.Add(AcronymContext);
       end;
     end;
@@ -294 +335 @@
         Line.Add(Name);
         Context.Clear;
-        for J := 0 to Contexts.Count - 1 do
-          Context.Add(TAcronymContext(Contexts[J]).Name);
+        for J := 0 to Categories.Count - 1 do
+          Context.Add(TAcronymCategory(Categories[J]).Name);
         Line.Add(Context.DelimitedText);
         F.Add(Line.CommaText);