Testes e ajustes

EvoUMLPlugin/src/ituExplorerV2.pas

@@ -1077,17 +1077,23 @@ begin
 	 if li_Pos > 0 then
 	 begin
      ls_aux := trim(piNameObjeto);
-     lClassTicketAux := nil;
      ls_Objeto := trim(Copy(ls_aux,0,li_Pos -1));
-     //lClassTicketCurrent := self.MetaModel.GetClassTicketByName(ls_Objeto);
      lClassTicketCurrent := Self.GetClassTicketByNameANDAlias(ls_Objeto);
      while li_Pos > 0 do
      begin
+       lClassTicketAux := nil;
        ls_aux := trim(Copy(ls_aux,li_Pos +1,Length(ls_aux)));
        ls_ant_objeto := ls_aux;
        li_Pos := Pos ('.',ls_aux);
-       ls_Objeto := trim(Copy(ls_aux,0,li_Pos -1));
-       if Assigned(lClassTicketCurrent) and (ls_Objeto <> '') then
+       if li_Pos > 0 then
+       begin
+         ls_Objeto := trim(Copy(ls_aux,0,li_Pos -1));
+    	 end
+       else
+       begin
+         ls_Objeto := ls_aux;;
+			 end;
+			 if Assigned(lClassTicketCurrent) and (ls_Objeto <> '') then
        begin
           lbAchei := false;
           for li := 0 to pred(lClassTicketCurrent.RelationTicketsIn.Count) do
@@ -1190,15 +1196,31 @@ begin
 end; }
 
 function TExplorerV2.RetirarPalavraChaveOLQ(piSynEdit: TSynEdit): string;
-var  ls_espaco : string;
+var  ls_espaco,
+     ls_aux : string;
      li_Pos : integer;
      p1,zeroPoint : TPoint;
 begin
     p1           := piSynEdit.CaretXY ;
     zeroPoint.X  := 0;
     zeroPoint.y  := piSynEdit.CaretY;
-    result       := trim(piSynEdit.TextBetweenPoints[zeroPoint,p1]);
-    ls_espaco    := ' ';
+    ls_aux       := piSynEdit.TextBetweenPoints[zeroPoint,p1];
+    if  trim(ls_aux) <> '' then
+    begin
+	     if Copy(ls_aux, Length(ls_aux) - 1, Length(ls_aux)) = '' then
+	     begin
+	       result     := trim(piSynEdit.TextBetweenPoints[zeroPoint,p1]) + '#';
+			 end
+       else
+       begin
+         result     := trim(piSynEdit.TextBetweenPoints[zeroPoint,p1]);
+			 end;
+		end
+    else
+    begin
+	  	result     := trim(piSynEdit.TextBetweenPoints[zeroPoint,p1]);
+		end;
+		ls_espaco    := ' ';
 
     li_Pos       := Pos(__FROM,uppercase(result));
     if li_Pos > 0 then
@@ -1221,7 +1243,7 @@ begin
     li_Pos        := Pos(ls_espaco,trim(result));
     while li_Pos > 0 do
     begin
-      result   :=trim(Copy(result,li_Pos + 1,Length(result)));
+      result   := trim(Copy(result,li_Pos + 1,Length(result)));
       li_Pos   := Pos(ls_espaco,result);
   	end;
 
@@ -1367,23 +1389,28 @@ var lLista : TStrings;
     lAceitaAtributo : boolean;
     li : integer;
 begin
-    opEve.ClearAvails;
+     opEve.ClearAvails;
     lAceitaAtributo := false;
     ls_Texto := SynEditOQL.GetWordAtRowCol(SynEditOQL.CaretXY);
     if not IsKeyword(ls_Texto) then
     begin
-	     if  opEve = fopEvenWhereAposPonto then
-	     begin
-	        lAceitaAtributo := true;
-          //ShowMessage(SynEditOQL.Text);
+       if (opEve = fopEvenSelectAposPonto) or
+          (opEve = fopEvenWhereAposPonto) or
+          (opEve = fopEvenFromAposPonto)
+       then
+       begin
           LoadAliasOQLEdit(SynEditOQL.Text,fAlias);
-	  	 end
-	     else if opEve = fopEvenSelectAposPonto then
-	     begin
-	       if  XMLQuery.Checked then
-	       begin
-	         lAceitaAtributo := true;
-	       end;
+          if  opEve = fopEvenWhereAposPonto then
+		      begin
+		         lAceitaAtributo := true;
+   	  	  end
+		      else if opEve = fopEvenSelectAposPonto then
+		      begin
+		        if  XMLQuery.Checked then
+		        begin
+		          lAceitaAtributo := true;
+		        end;
+				  end;
 			 end;
 
 	     lLista := TStringList.Create;