Commit 32ddef76 authored by Sandro Camata Santana's avatar Sandro Camata Santana

Ajustes

parent 8209f16a
......@@ -152,9 +152,6 @@
</Linking>
<Other>
<CustomOptions Value="-dUseCThreads"/>
<OtherDefines Count="1">
<Define0 Value="FullDebugMode"/>
</OtherDefines>
</Other>
</CompilerOptions>
</Item4>
......@@ -167,8 +164,17 @@
<UseFileFilters Value="True"/>
</PublishOptions>
<RunParams>
<local>
<HostApplicationFilename Value="$(ProjPath)..\..\..\StarUML\staruml\src\deploy\$(TargetCPU)-$(TargetOS)\EvoUML.exe"/>
</local>
<FormatVersion Value="2"/>
<Modes Count="0"/>
<Modes Count="1">
<Mode0 Name="default">
<local>
<HostApplicationFilename Value="$(ProjPath)..\..\..\StarUML\staruml\src\deploy\$(TargetCPU)-$(TargetOS)\EvoUML.exe"/>
</local>
</Mode0>
</Modes>
</RunParams>
<RequiredPackages Count="7">
<Item1>
......
......@@ -136,7 +136,16 @@ begin
begin
if (TObject(Node.Data) is acPersistentObject)
then lPersistentObject := acPersistentObject(Node.Data)
else lPersistentObject := acRelationPartnerShip(Node.Data).Partner;
else begin
lPersistentObject := acRelationPartnerShip(Node.Data).Partner;
if acRelationPartnerShip(Node.Data).IsOrigin
then lPropertyName := acRelationPartnerShip(Node.Data).RelationTicket.OriginPropertyName
else lPropertyName := acRelationPartnerShip(Node.Data).RelationTicket.DestinationPropertyName;
Node.Text := lPropertyName + ': ' + acRelationPartnerShip(Node.Data).Partner.ClassTicket.PersistentObjectClassName + ' (OID:' + acRelationPartnerShip(Node.Data).Partner.IDO.AsString + ')';
end;
lClassTicket := lPersistentObject.ClassTicket;
while lClassTicket <> nil do
......@@ -176,7 +185,7 @@ begin
begin
if assigned(acRelationPartnerShip(lObject).Partner)
then begin
lNode := Node.Owner.AddChildObject(Node, lPropertyName+ ': ' + acRelationPartnerShip(lObject).RelationTicket.OriginClassTicket.PersistentObjectClassName + ' (OID:' + acRelationPartnerShip(lObject).Partner.IDO.AsString + ')', acRelationPartnerShip(lObject).Partner);
lNode := Node.Owner.AddChildObject(Node, lPropertyName+ ': ' + acRelationPartnerShip(lObject).Partner.ClassTicket.PersistentObjectClassName + ' (OID:' + acRelationPartnerShip(lObject).Partner.IDO.AsString + ')', acRelationPartnerShip(lObject).Partner);
lNode.HasChildren := True;
end
else lNode := Node.Owner.AddChildObject(Node, lPropertyName+ ': ' + acRelationPartnerShip(lObject).RelationTicket.OriginClassTicket.PersistentObjectClassName + ' (null)', lObject);
......@@ -215,10 +224,10 @@ begin
if acRelationPartnerShip(lObject).Status = acRelationPartnerStatus.PSLoaded then
if assigned(acRelationPartnerShip(lObject).Partner)
then begin
lNode := Node.Owner.AddChildObject(Node, lPropertyName+ ': ' + acRelationPartnerShip(lObject).RelationTicket.DestinationClassTicket.PersistentObjectClassName + ' (OID:' + acRelationPartnerShip(lObject).Partner.IDO.AsString + ')', acRelationPartnerShip(lObject).Partner);
lNode := Node.Owner.AddChildObject(Node, lPropertyName+ ': ' + acRelationPartnerShip(lObject).Partner.ClassTicket.PersistentObjectClassName + ' (OID:' + acRelationPartnerShip(lObject).Partner.IDO.AsString + ')', acRelationPartnerShip(lObject).Partner);
lNode.HasChildren := True;
end
else Node.Owner.AddChildObject(Node, lPropertyName+ ': ' + acRelationPartnerShip(lObject).RelationTicket.DestinationClassTicket.PersistentObjectClassName + ' (null)', lObject)
else lNode := Node.Owner.AddChildObject(Node, lPropertyName+ ': ' + acRelationPartnerShip(lObject).RelationTicket.DestinationClassTicket.PersistentObjectClassName + ' (null)', lObject)
else
if assigned(acRelationPartnerShip(lObject).PartnerOID)
then begin
......
......@@ -27,15 +27,11 @@ var lRequestMessage: mxRequestMessage;
lResponseMessage: mxAnswerMessage;
begin
lRequestMessage := self.NewRequest('RM_OBTEM_CONTEXTO', piField);
lResponseMessage := self.Session.SendRequest(lRequestMessage);
try
lResponseMessage := self.Session.SendRequest(lRequestMessage);
try
if assigned(piResponseField) then piResponseField.Assign(lResponseMessage.RootField);
finally
lResponseMessage.free;
end;
if assigned(piResponseField) then piResponseField.Assign(lResponseMessage.RootField);
finally
lRequestMessage.Free;
lResponseMessage.free;
end;
end;
......@@ -44,15 +40,11 @@ var lRequestMessage: mxRequestMessage;
lResponseMessage: mxAnswerMessage;
begin
lRequestMessage := self.NewRequest('RM_SALVA_OBJETO', piField);
lResponseMessage := self.Session.SendRequest(lRequestMessage);
try
lResponseMessage := self.Session.SendRequest(lRequestMessage);
try
if assigned(piResponseField) then piResponseField.Assign(lResponseMessage.RootField);
finally
lResponseMessage.free;
end;
if assigned(piResponseField) then piResponseField.Assign(lResponseMessage.RootField);
finally
lRequestMessage.Free;
lResponseMessage.free;
end;
end;
......@@ -61,15 +53,11 @@ var lRequestMessage: mxRequestMessage;
lResponseMessage: mxAnswerMessage;
begin
lRequestMessage := self.NewRequest('RM_EXCLUI_OBJETO', piField);
lResponseMessage := self.Session.SendRequest(lRequestMessage);
try
lResponseMessage := self.Session.SendRequest(lRequestMessage);
try
if assigned(piResponseField) then piResponseField.Assign(lResponseMessage.RootField);
finally
lResponseMessage.free;
end;
if assigned(piResponseField) then piResponseField.Assign(lResponseMessage.RootField);
finally
lRequestMessage.Free;
lResponseMessage.free;
end;
end;
......@@ -78,15 +66,11 @@ var lRequestMessage: mxRequestMessage;
lResponseMessage: mxAnswerMessage;
begin
lRequestMessage := self.NewRequest('RM_INCLUI_OBJETO', piField);
lResponseMessage := self.Session.SendRequest(lRequestMessage);
try
lResponseMessage := self.Session.SendRequest(lRequestMessage);
try
if assigned(piResponseField) then piResponseField.Assign(lResponseMessage.RootField);
finally
lResponseMessage.free;
end;
if assigned(piResponseField) then piResponseField.Assign(lResponseMessage.RootField);
finally
lRequestMessage.Free;
lResponseMessage.free;
end;
end;
......@@ -95,15 +79,11 @@ var lRequestMessage: mxRequestMessage;
lResponseMessage: mxAnswerMessage;
begin
lRequestMessage := self.NewRequest('RM_CONSULTA_OBJETO', piField);
lResponseMessage := self.Session.SendRequest(lRequestMessage);
try
lResponseMessage := self.Session.SendRequest(lRequestMessage);
try
if assigned(piResponseField) then piResponseField.Assign(lResponseMessage.RootField);
finally
lResponseMessage.free;
end;
if assigned(piResponseField) then piResponseField.Assign(lResponseMessage.RootField);
finally
lRequestMessage.Free;
lResponseMessage.free;
end;
end;
......@@ -112,15 +92,11 @@ var lRequestMessage: mxRequestMessage;
lResponseMessage: mxAnswerMessage;
begin
lRequestMessage := self.NewRequest('RM_EDITA_OBJETO', piField);
lResponseMessage := self.Session.SendRequest(lRequestMessage);
try
lResponseMessage := self.Session.SendRequest(lRequestMessage);
try
if assigned(piResponseField) then piResponseField.Assign(lResponseMessage.RootField);
finally
lResponseMessage.free;
end;
if assigned(piResponseField) then piResponseField.Assign(lResponseMessage.RootField);
finally
lRequestMessage.Free;
lResponseMessage.free;
end;
end;
......
object CodeGen: TCodeGen
Left = 700
Left = 484
Height = 616
Top = 230
Top = 143
Width = 889
Caption = 'CodeGen'
ClientHeight = 616
......@@ -13,7 +13,7 @@ object CodeGen: TCodeGen
KeyPreview = True
OnShow = FormShow
Position = poScreenCenter
LCLVersion = '2.1.0.0'
LCLVersion = '2.0.10.0'
object PageControl1: TPageControl
Left = 0
Height = 616
......@@ -2918,7 +2918,7 @@ object CodeGen: TCodeGen
ParentFont = False
TabOrder = 1
BorderStyle = bsNone
Gutter.Width = 23
Gutter.Width = 33
Gutter.MouseActions = <>
RightGutter.Width = 0
RightGutter.MouseActions = <>
......@@ -3464,7 +3464,7 @@ object CodeGen: TCodeGen
ParentFont = False
TabOrder = 1
BorderStyle = bsNone
Gutter.Width = 23
Gutter.Width = 33
Gutter.MouseActions = <>
RightGutter.Width = 0
RightGutter.MouseActions = <>
......@@ -4526,7 +4526,6 @@ object CodeGen: TCodeGen
Enabled = False
CompilerMode = pcmObjFPC
NestedComments = True
TypeHelpers = False
Left = 710
Top = 137
end
......
object itCadastrarFormulario: TitCadastrarFormulario
Left = 628
Left = 755
Height = 482
Top = 321
Top = 386
Width = 937
ClientHeight = 482
ClientWidth = 937
OnDestroy = FormDestroy
LCLVersion = '2.1.0.0'
LCLVersion = '2.0.10.0'
object scrlbxTudo: TScrollBox
Left = 0
Height = 840
......
object DataBaseLogin: TDataBaseLogin
Left = 1160
Left = 1381
Height = 542
Top = 217
Top = 262
Width = 440
BorderIcons = [biSystemMenu]
BorderStyle = bsDialog
......@@ -13,7 +13,7 @@ object DataBaseLogin: TDataBaseLogin
OnShow = FormShow
ParentFont = True
Position = poOwnerFormCenter
LCLVersion = '2.1.0.0'
LCLVersion = '2.0.10.0'
object GroupBox2: TGroupBox
Left = 8
Height = 216
......
object ExplorerV2: TExplorerV2
Left = -1230
Left = 379
Height = 697
Top = 112
Top = 195
Width = 1110
Caption = 'Model OQL Query'
ClientHeight = 697
......@@ -11755,7 +11755,7 @@ object ExplorerV2: TExplorerV2
OnKeyUp = SynEditOQLKeyUp
OnUTF8KeyPress = SynEditOQLUTF8KeyPress
BorderStyle = bsNone
Gutter.Width = 23
Gutter.Width = 33
Gutter.MouseActions = <>
RightGutter.Width = 0
RightGutter.MouseActions = <>
......@@ -12271,7 +12271,7 @@ object ExplorerV2: TExplorerV2
ParentFont = False
TabOrder = 0
BorderStyle = bsNone
Gutter.Width = 23
Gutter.Width = 33
Gutter.MouseActions = <>
RightGutter.Width = 0
RightGutter.MouseActions = <>
......@@ -12797,12 +12797,12 @@ object ExplorerV2: TExplorerV2
ShowCaptions = True
TabOrder = 0
object ToolButton1: TToolButton
Left = 55
Left = 56
Top = 2
Action = actModelPanel
end
object ToolButton2: TToolButton
Left = 105
Left = 106
Top = 2
Action = actResultsPanel
end
......@@ -12814,24 +12814,24 @@ object ExplorerV2: TExplorerV2
Style = tbsDivider
end
object ToolButton4: TToolButton
Left = 159
Left = 161
Top = 2
Action = actExecute
end
object ToolButton5: TToolButton
Left = 209
Left = 211
Top = 2
Action = actCancel
end
object ToolButton6: TToolButton
Left = 259
Left = 261
Height = 40
Top = 2
Caption = 'ToolButton6'
Style = tbsDivider
end
object ToolButton7: TToolButton
Left = 263
Left = 266
Top = 2
Action = OQLQuery
AutoSize = True
......@@ -12839,7 +12839,7 @@ object ExplorerV2: TExplorerV2
Style = tbsCheck
end
object ToolButton8: TToolButton
Left = 336
Left = 339
Top = 2
Action = XMLQuery
Grouped = True
......@@ -12851,7 +12851,7 @@ object ExplorerV2: TExplorerV2
Action = ReconnectDB
end
object ToolButton10: TToolButton
Left = 155
Left = 156
Height = 40
Top = 2
Caption = 'ToolButton10'
......
......@@ -108,9 +108,8 @@ type
procedure FormShow(Sender: TObject);
procedure actResultsPanelExecute(Sender: TObject);
procedure rbSequencialClick(Sender: TObject);
procedure SynEditOQLCommandProcessed(Sender: TObject;
var Command: TSynEditorCommand; var AChar: TUTF8Char; Data: pointer);
procedure SynEditOQLKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState);
procedure SynEditOQLCommandProcessed(Sender: TObject; var Command: TSynEditorCommand; var AChar: TUTF8Char; Data: pointer);
procedure SynEditOQLKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState);
procedure SynEditOQLUTF8KeyPress(Sender: TObject; var UTF8Key: TUTF8Char);
procedure tvModelExplorerGetSelectedIndex(Sender: TObject; Node: TTreeNode);
procedure tvModelExplorerItemExpanding(Sender: TObject; Node: TTreeNode; var AllowExpansion: Boolean);
......@@ -537,16 +536,12 @@ begin
end;
end;
procedure TExplorerV2.SynEditOQLUTF8KeyPress(Sender: TObject;
var UTF8Key: TUTF8Char);
begin
fhlt1.UTF8KeyPress(Sender, UTF8Key);
end;
procedure TExplorerV2.tvModelExplorerGetSelectedIndex(Sender: TObject; Node: TTreeNode);
begin
Node.SelectedIndex := Node.ImageIndex;
......
object OQLExplorerV2: TOQLExplorerV2
Left = 2453
Left = 534
Height = 552
Top = 431
Top = 331
Width = 1090
Caption = 'Curio OQL Explorer'
ClientHeight = 552
......@@ -11583,7 +11583,7 @@ object OQLExplorerV2: TOQLExplorerV2
OnResize = FormResize
OnShow = FormShow
Position = poScreenCenter
LCLVersion = '2.0.2.0'
LCLVersion = '2.0.10.0'
object pcCXOQL: TPageControl
Left = 0
Height = 517
......@@ -12313,7 +12313,7 @@ object OQLExplorerV2: TOQLExplorerV2
object abExportPAS: TAction
Caption = 'abExportPAS'
Visible = False
left = 1007
Left = 1007
end
object abCXOQL: TAction
Caption = 'abCXOQL'
......@@ -12324,7 +12324,7 @@ object OQLExplorerV2: TOQLExplorerV2
object ilCXOQL: TImageList
Height = 24
Width = 24
left = 798
Left = 798
Bitmap = {
4C690B0000001800000018000000D27619FFD27619FFD27619FFD27619FFD276
19FFD27619FFD27619FFD27619FFD27619FFD27619FFD27619FFD27619FFD276
......@@ -13122,8 +13122,8 @@ object OQLExplorerV2: TOQLExplorerV2
}
end
object ilOQLState: TImageList
left = 861
top = 5
Left = 861
Top = 5
Bitmap = {
4C6903000000100000001000000000000000000000000071ADFF0071ADFF0071
ADFF0071ADFF0071ADFF0071ADFF000000000000000000000000000000000000
......@@ -13226,15 +13226,15 @@ object OQLExplorerV2: TOQLExplorerV2
end
object OpenDialog1: TOpenDialog
Filter = 'cxoql|*.cxoql'
left = 720
Left = 720
end
object SaveDialog1: TSaveDialog
Filter = 'cxoql|*.cxoql'
left = 688
Left = 688
end
object ActionList1: TActionList
left = 926
top = 6
Left = 926
Top = 6
object aNewOQL: TAction
Caption = '&New OQL'
ImageIndex = 5
......@@ -13267,13 +13267,13 @@ object OQLExplorerV2: TOQLExplorerV2
end
end
object SelectUnitDirectory: TSelectDirectoryDialog
left = 561
Left = 561
end
object SynFreePascalSyn1: TSynFreePascalSyn
Enabled = False
CompilerMode = pcmObjFPC
NestedComments = True
left = 1002
top = 12
Left = 1002
Top = 12
end
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