Teste e ajustes

EvoUMLPlugin/src/ituExplorerV2.pas

@@ -36,6 +36,7 @@ const
     __SINAL_MAIOR        = '>';
     __SINAL_MENOR        = '<';
     __SINAL_MENOS        = '-';
+    __OID                = 'OID';
 type
 
   TDLLDialog = class(TForm)
@@ -758,6 +759,7 @@ var lClassTicketCurrent : acClassTicket;
     lbAchei : boolean;
     lAttributeTicket : acAttributeTicket;
 begin
+
   piLista.Clear;
   li_Pos := Pos ('..',piLinha);
   if li_Pos > 0 then
@@ -767,6 +769,7 @@ begin
   li_Pos := Pos (__PONTO,piLinha);
 	if li_Pos <= 0 then
   begin
+
     lEnumerator := self.MetaModel.ClassTickets.GetEnumerator;
     try
       while not lEnumerator.EOL do
@@ -784,42 +787,56 @@ begin
   end
   else
   begin
+
      lClassTicketCurrent := self.GetClassTicketByNameRelation(piLinha,ls_ant_objeto);
      if Assigned(lClassTicketCurrent) then
      begin
         //ShowMessage(ls_ant_objeto);
-        if piAceitaAtributo then
-        begin
-          for li := 0 to pred(lClassTicketCurrent.Attributes.Count) do
+        repeat
+          if piAceitaAtributo then
           begin
-            lAttributeTicket := acAttributeTicket(lClassTicketCurrent.Attributes.Objects[li]);
-            if lAttributeTicket.Stereotype = acAttributeStereotype.pvPersistent then
+            for li := 0 to pred(lClassTicketCurrent.Attributes.Count) do
             begin
+              lAttributeTicket := acAttributeTicket(lClassTicketCurrent.Attributes.Objects[li]);
+              if lAttributeTicket.Stereotype = acAttributeStereotype.pvPersistent then
+              begin
+                if BuscaParcial(ls_ant_objeto,__OID) then
+                begin
+                   if piLista.IndexOf(__OID) < 0 then
+                   begin
+                     piLista.Add(__OID);
+    							 end;
+    						end;
+                if BuscaParcial(ls_ant_objeto,lAttributeTicket.AttributeName) then
+                begin
+                   piLista.Add(lAttributeTicket.AttributeName);
+                end;
 
-              if BuscaParcial(ls_ant_objeto,lAttributeTicket.AttributeName) then
-                 piLista.Add(lAttributeTicket.AttributeName);
+							end;
             end;
-          end;
-				end;
-        for li := 0 to pred(lClassTicketCurrent.RelationTicketsIn.Count) do
-        begin
-          lRelationTicket := acRelationTicket(lClassTicketCurrent.RelationTicketsIn.Objects[li]);
-          if trim(lRelationTicket.DestinationPropertyName) <> '' then
+        	end;
+          for li := 0 to pred(lClassTicketCurrent.RelationTicketsIn.Count) do
           begin
-            if BuscaParcial(ls_ant_objeto,lRelationTicket.DestinationPropertyName) then
-               piLista.Add(lRelationTicket.DestinationPropertyName);
+            lRelationTicket := acRelationTicket(lClassTicketCurrent.RelationTicketsIn.Objects[li]);
+            if trim(lRelationTicket.DestinationPropertyName) <> '' then
+            begin
+              if BuscaParcial(ls_ant_objeto,lRelationTicket.DestinationPropertyName) then
+                 piLista.Add(lRelationTicket.DestinationPropertyName);
+            end;
           end;
-        end;
 
-        for li := 0 to pred(lClassTicketCurrent.RelationTicketsOut.Count) do
-        begin
-          lRelationTicket := acRelationTicket(lClassTicketCurrent.RelationTicketsOut.Objects[li]);
-          if trim(lRelationTicket.OriginPropertyName) <> '' then
+          for li := 0 to pred(lClassTicketCurrent.RelationTicketsOut.Count) do
           begin
-            if BuscaParcial(ls_ant_objeto,lRelationTicket.OriginPropertyName) then
-             piLista.Add(lRelationTicket.OriginPropertyName);
+            lRelationTicket := acRelationTicket(lClassTicketCurrent.RelationTicketsOut.Objects[li]);
+            if trim(lRelationTicket.OriginPropertyName) <> '' then
+            begin
+              if BuscaParcial(ls_ant_objeto,lRelationTicket.OriginPropertyName) then
+               piLista.Add(lRelationTicket.OriginPropertyName);
+            end;
           end;
-        end;
+          lClassTicketCurrent := lClassTicketCurrent.ParentClassTicket;
+        until  lClassTicketCurrent = nil
+
 		 end;
 	end;
 
@@ -1289,7 +1306,35 @@ begin
 		 end;
 	 end;
 
-	{1           := piSynEdit.CaretXY ;
+   if result <> '' then
+   begin
+     p1           := piSynEdit.CaretXY ;
+     zeroPoint.X  := 0;
+     zeroPoint.y  := piSynEdit.CaretY;
+     ls_aux       := piSynEdit.TextBetweenPoints[zeroPoint,p1];
+     ls_espaco    := ' ';
+     li_Pos        := Pos(ls_espaco,trim(ls_aux));
+     while li_Pos > 0 do
+     begin
+       ls_aux   := trim(Copy(ls_aux,li_Pos + 1,Length(ls_aux)));
+       li_Pos   := Pos(ls_espaco,ls_aux);
+   	 end;
+     result     :=ls_aux; {
+     li_Pos       := Pos(result,ls_aux) ;
+     if li_Pos >  0 then
+     begin
+       ls_espaco    := ' ';
+       ls_aux := trim(Copy(ls_aux,0,li_Pos));
+       li_Pos        := Pos(ls_espaco,trim(ls_aux));
+       while li_Pos > 0 do
+       begin
+         ls_aux   := trim(Copy(ls_aux,li_Pos + 1,Length(ls_aux)));
+         li_Pos   := Pos(ls_espaco,ls_aux);
+     	 end;
+       result   := ls_aux + result;
+     end }
+   end
+	{  p1           := piSynEdit.CaretXY ;
     zeroPoint.X  := 0;
     zeroPoint.y  := piSynEdit.CaretY;
     ls_aux       := piSynEdit.TextBetweenPoints[zeroPoint,p1];