Skip to content

S
StarUML Evológica Plugin
Commit 450b8c5e authored by Jucelino Fonseca's avatar Jucelino Fonseca
Browse files
Options

Ajustes

parent b74604ab
Hide whitespace changes
Inline Side-by-side
Showing with 117 additions and 68 deletions
EvoUMLPlugin/src/ituExplorerV2.dfm
View file @ 450b8c5e
......@@ -11754,7 +11754,7 @@ object ExplorerV2: TExplorerV2
OnDragDrop = memOQLQuery2DragDrop
OnDragOver = memOQLQuery2DragOver
BorderStyle = bsNone
Gutter.Width = 42
Gutter.Width = 29
Gutter.MouseActions = <>
RightGutter.Width = 0
RightGutter.MouseActions = <>
......@@ -12210,6 +12210,7 @@ object ExplorerV2: TExplorerV2
MouseLinkColor.Foreground = clBlue
LineHighlightColor.Background = clNone
LineHighlightColor.Foreground = clNone
OnChange = SynEditOQLChange
inline SynLeftGutterPartList1: TSynGutterPartList
object SynGutterMarks1: TSynGutterMarks
Width = 30
......@@ -12252,15 +12253,15 @@ object ExplorerV2: TExplorerV2
end
object tsSQL: TTabSheet
Caption = 'SQL Translation'
ClientHeight = 511
ClientWidth = 620
ClientHeight = 512
ClientWidth = 467
Font.Color = clWindowText
ParentFont = False
inline SynEditSQL: TSynEdit
Left = 0
Height = 511
Height = 512
Top = 0
Width = 620
Width = 467
Align = alClient
Font.Height = -16
Font.Name = 'Courier New'
......@@ -14276,4 +14277,15 @@ object ExplorerV2: TExplorerV2
0000000000000000000000000000
}
end
object SynAutoComplete1: TSynAutoComplete
AutoCompleteList.Strings = (
'Teste'
)
EndOfTokenChr = '()[].'
ShortCut = 8224
ExecCommandID = ecSynAutoCompletionExecute
Editor = SynEditOQL
Left = 574
Top = 379
end
end
EvoUMLPlugin/src/ituExplorerV2.pas
View file @ 450b8c5e
......@@ -41,6 +41,7 @@ type
sbStatusBar: TStatusBar;
spResultXML: TSplitter;
spResultObject: TSplitter;
SynAutoComplete1: TSynAutoComplete;
SynCompletion1: TSynCompletion;
SynEditOQL: TSynEdit;
SynEditSQL: TSynEdit;
......@@ -86,6 +87,7 @@ type
procedure FormShow(Sender: TObject);
procedure actResultsPanelExecute(Sender: TObject);
procedure rbSequencialClick(Sender: TObject);
procedure SynEditOQLChange(Sender: TObject);
procedure tvModelExplorerGetSelectedIndex(Sender: TObject; Node: TTreeNode);
procedure tvModelExplorerItemExpanding(Sender: TObject; Node: TTreeNode; var AllowExpansion: Boolean);
procedure XMLQueryExecute(Sender: TObject);
......@@ -119,7 +121,8 @@ type
function GetNumeroDeStringOID (piString : string) : string;
procedure CopiaTextoObjeto (piObjeto : TTreeNode);
function BuscaParcialClasse(piCLasse: string; piFiltrar: boolean): boolean;
function BuscarParcialNodeClasse(piClassTicket : acClassTicket; piFiltrar: boolean): boolean;
function BuscarParcialChildClass(piClassTicket : acClassTicket; piFiltrar: boolean): boolean;
function FindParcialNodeClass(piClassTicketPai : acClassTicket; piFiltrar: boolean):acClassTicket;
protected
procedure CreateParams(var Params : TCreateParams); override;
function Connect : acPersistenceSession;
......@@ -425,6 +428,11 @@ begin
end;
procedure TExplorerV2.SynEditOQLChange(Sender: TObject);
begin
end;
procedure TExplorerV2.tvModelExplorerGetSelectedIndex(Sender: TObject; Node: TTreeNode);
......@@ -538,32 +546,73 @@ begin
end;
function TExplorerV2.BuscarParcialNodeClasse( piClassTicket : acClassTicket;
function TExplorerV2.BuscarParcialChildClass( piClassTicket : acClassTicket;
piFiltrar: boolean): boolean;
var lEnumeratorChild : acEnumerator;
lClassTicketChild : acClassTicket;
begin
result := false;
lEnumeratorChild := piClassTicket.DirectDescendants.GetEnumerator;
try
while not lEnumeratorChild.EOL do
begin
lClassTicketChild := acClassTicket(lEnumeratorChild.Current);
if BuscaParcialClasse(lClassTicketChild.PersistentObjectClassName,piFiltrar) then
begin
result := true;
break;
end
else if BuscarParcialNodeClasse(lClassTicketChild,piFiltrar) then
result := BuscaParcialClasse(piClassTicket.PersistentObjectClassName,piFiltrar);
if not result then
begin
lEnumeratorChild := piClassTicket.DirectDescendants.GetEnumerator;
try
while not lEnumeratorChild.EOL do
begin
result := true;
break;
lClassTicketChild := acClassTicket(lEnumeratorChild.Current);
if BuscaParcialClasse(lClassTicketChild.PersistentObjectClassName,piFiltrar) then
begin
result := true;
break;
end
else if BuscarParcialChildClass(lClassTicketChild,piFiltrar) then
begin
result := true;
break;
end;
lEnumeratorChild.MoveNext;
end;
finally
lEnumeratorChild.Free;
end;
end;
end;
lEnumeratorChild.MoveNext;
function TExplorerV2.FindParcialNodeClass(piClassTicketPai: acClassTicket;
piFiltrar: boolean): acClassTicket;
var lEnumeratorChild : acEnumerator;
lClassTicketChild : acClassTicket;
begin
result := nil;
if BuscaParcialClasse(piClassTicketPai.PersistentObjectClassName,piFiltrar) then
begin
result := piClassTicketPai;
end
else
begin
lEnumeratorChild := piClassTicketPai.DirectDescendants.GetEnumerator;
try
while not lEnumeratorChild.EOL do
begin
lClassTicketChild := acClassTicket(lEnumeratorChild.Current);
if BuscaParcialClasse(lClassTicketChild.PersistentObjectClassName,piFiltrar) then
begin
result := lClassTicketChild;
end
else
begin
result :=FindParcialNodeClass(lClassTicketChild,piFiltrar);
end;
if Assigned(result) then
begin
break;
end;
lEnumeratorChild.MoveNext;
end;
finally
lEnumeratorChild.Free;
end;
finally
lEnumeratorChild.Free;
end;
end;
......@@ -743,48 +792,31 @@ begin
lFiltroIgualFilho := false;
if not Assigned(lClassTicket.ParentClassTicket) then
begin
if BuscaParcialClasse(lClassTicket.PersistentObjectClassName,lFiltro) then
lClassTicketChild := FindParcialNodeClass(lClassTicket,lFiltro);
if Assigned(lClassTicketChild) then
begin
lAchei := true;
end
else if lClassTicket.HasDescendants then
begin
if BuscarParcialNodeClasse(lClassTicket,lFiltro) then
if lClassTicket <> lClassTicketChild then
begin
if not Assigned(Node.Owner.FindNodeWithData(lClassTicket)) then
begin
lAchei := true;
lFiltroIgualFilho := true;
lAchei := true;
lFiltroIgualFilho := true;
end;
end
else
begin
lAchei := true;
end;
{lEnumeratorChild := lClassTicket.DirectDescendants.GetEnumerator;
try
while not lEnumeratorChild.EOL do
if lAchei then
begin
targetNode := Node.Owner.AddChildObject(Node, lClassTicket.PersistentObjectClassName, lClassTicket);
targetNode.ImageIndex := 6;
targetNode.HasChildren := True;
if lFiltroIgualFilho then
begin
lClassTicketChild := acClassTicket(lEnumeratorChild.Current);
if BuscaParcialClasse(lClassTicketChild.PersistentObjectClassName,lFiltro) then
begin
if not Assigned(Node.Owner.FindNodeWithData(lClassTicket)) then
begin
lAchei := true;
lFiltroIgualFilho := true;
end;
end;
lEnumeratorChild.MoveNext;
targetNode.Expanded := true;
end;
finally
lEnumeratorChild.Free;
end; }
end;
end;
if lAchei then
begin
targetNode := Node.Owner.AddChildObject(Node, lClassTicket.PersistentObjectClassName, lClassTicket);
targetNode.ImageIndex := 6;
targetNode.HasChildren := True;
if lFiltroIgualFilho then
begin
targetNode.Expanded := true;
end;
end;
end;
lEnumerator.MoveNext;
......@@ -864,27 +896,32 @@ begin
end;
if lClassTicket.HasDescendants then
begin
//Carrega os filhos
//Carrega os filhos
if Assigned(lClassTicket.PatriarcClassTicket) then
begin
lFiltroIgualPai := BuscaParcialClasse(lClassTicket.PatriarcClassTicket.PersistentObjectClassName,lFiltro);
end
else
begin
lFiltroIgualPai := BuscaParcialClasse(lClassTicket.PersistentObjectClassName,lFiltro);
end;
lEnumerator := lClassTicket.DirectDescendants.GetEnumerator;
try
if Assigned(lClassTicket.PatriarcClassTicket) then
begin
lFiltroIgualPai := BuscaParcialClasse(lClassTicket.PatriarcClassTicket.PersistentObjectClassName,lFiltro);
end
else
begin
lFiltroIgualPai := BuscaParcialClasse(lClassTicket.PersistentObjectClassName,lFiltro);
end;
while not lEnumerator.EOL do
begin
lClassTicketChild := acClassTicket(lEnumerator.Current);
lFiltroIgualFilho := BuscaParcialClasse(lClassTicketChild.PersistentObjectClassName,lFiltro);
lFiltroIgualFilho := BuscarParcialChildClass(lClassTicketChild,lFiltro);
lbIncluir := lFiltroIgualPai or lFiltroIgualFilho;
if lbIncluir then
begin
targetNode := Node.Owner.AddChildObject(Node, lClassTicketChild.PersistentObjectClassName, lClassTicketChild);
targetNode.ImageIndex := 6;
targetNode.HasChildren := True;
if lFiltroIgualFilho then
begin
targetNode.Expanded := true;
end;
end;
lEnumerator.MoveNext;
end;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment