Commit 2bde221e authored by Sandro Camata Santana's avatar Sandro Camata Santana

Ajustes - alteracao do isolamento de janelas - pode ter ficado incompativel com o mac-os

parent 41104f1b
...@@ -159,8 +159,9 @@ ...@@ -159,8 +159,9 @@
</Other> </Other>
</CompilerOptions> </CompilerOptions>
</Item4> </Item4>
<SharedMatrixOptions Count="1"> <SharedMatrixOptions Count="2">
<Item1 ID="311574553573" Modes="Dev Darwin Cocoa X64" Type="IDEMacro" MacroName="LCLWidgetType" Value="cocoa"/> <Item1 ID="311574553573" Modes="Dev Darwin Cocoa X64" Type="IDEMacro" MacroName="LCLWidgetType" Value="cocoa"/>
<Item2 ID="280556421411" Value="-gw2"/>
</SharedMatrixOptions> </SharedMatrixOptions>
</BuildModes> </BuildModes>
<PublishOptions> <PublishOptions>
...@@ -180,28 +181,31 @@ ...@@ -180,28 +181,31 @@
</Mode0> </Mode0>
</Modes> </Modes>
</RunParams> </RunParams>
<RequiredPackages Count="7"> <RequiredPackages Count="8">
<Item1> <Item1>
<PackageName Value="CurioApplication"/> <PackageName Value="LazUtils"/>
</Item1> </Item1>
<Item2> <Item2>
<PackageName Value="Curio"/> <PackageName Value="CurioApplication"/>
</Item2> </Item2>
<Item3> <Item3>
<PackageName Value="CurioPersistence"/> <PackageName Value="Curio"/>
</Item3> </Item3>
<Item4> <Item4>
<PackageName Value="CurioModeling"/> <PackageName Value="CurioPersistence"/>
</Item4> </Item4>
<Item5> <Item5>
<PackageName Value="evoumlintf"/> <PackageName Value="CurioModeling"/>
</Item5> </Item5>
<Item6> <Item6>
<PackageName Value="SynEdit"/> <PackageName Value="evoumlintf"/>
</Item6> </Item6>
<Item7> <Item7>
<PackageName Value="LCL"/> <PackageName Value="SynEdit"/>
</Item7> </Item7>
<Item8>
<PackageName Value="LCL"/>
</Item8>
</RequiredPackages> </RequiredPackages>
<Units Count="33"> <Units Count="33">
<Unit0> <Unit0>
...@@ -215,7 +219,9 @@ ...@@ -215,7 +219,9 @@
<Unit2> <Unit2>
<Filename Value="Mostra_Processamento.pas"/> <Filename Value="Mostra_Processamento.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<ComponentName Value="FMostra_Processamento"/>
<HasResources Value="True"/> <HasResources Value="True"/>
<ResourceBaseClass Value="Form"/>
</Unit2> </Unit2>
<Unit3> <Unit3>
<Filename Value="InstantCode\InstantClasses.pas"/> <Filename Value="InstantCode\InstantClasses.pas"/>
...@@ -397,6 +403,7 @@ ...@@ -397,6 +403,7 @@
<Filename Value="itumainform.pas"/> <Filename Value="itumainform.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<ComponentName Value="itMainForm"/> <ComponentName Value="itMainForm"/>
<HasResources Value="True"/>
<ResourceBaseClass Value="Form"/> <ResourceBaseClass Value="Form"/>
<UnitName Value="ituMainForm"/> <UnitName Value="ituMainForm"/>
</Unit32> </Unit32>
......
...@@ -52,7 +52,7 @@ implementation ...@@ -52,7 +52,7 @@ implementation
uses uses
InstantCode, SysUtils, Mostra_Processamento, utuStateMachine, fCodeGen, Controls, Forms, InstantCode, SysUtils, Mostra_Processamento, utuStateMachine, fCodeGen, Controls, Forms,
fModelMappingsGenerationOptions, fXSDEditor, ituDataBaseLogin, formMemo, fModelMappingsGenerationOptions, fXSDEditor, ituDataBaseLogin, formMemo, Interfacebase,
cxuCadastroClasse, cxuCadastroCasoDeUso, ituCadastrarDefinicao, ituCadastrarFormulario, cxuCadastroClasse, cxuCadastroCasoDeUso, ituCadastrarDefinicao, ituCadastrarFormulario,
utuMessage, uCadastroCasoDeUso, uCadastroClasse, ituServiceParameters, ituExplorerV2, utuMessage, uCadastroCasoDeUso, uCadastroClasse, ituServiceParameters, ituExplorerV2,
Registry, uRTFEditor, ituXSDExplorer, ituExportUnits, ituOQLExplorerV2, cxuCadastroDefinicaoClasse; Registry, uRTFEditor, ituXSDExplorer, ituExportUnits, ituOQLExplorerV2, cxuCadastroDefinicaoClasse;
...@@ -114,7 +114,7 @@ class function TDelphiAddInObj.GetServiceSession: cxSession; ...@@ -114,7 +114,7 @@ class function TDelphiAddInObj.GetServiceSession: cxSession;
var lServiceParamDialog: TitServiceParameters; var lServiceParamDialog: TitServiceParameters;
lReg: TRegistry; lReg: TRegistry;
begin begin
lServiceParamDialog := TitServiceParameters.Create(nil); lServiceParamDialog := TitServiceParameters.Create(Application);
try try
lReg := TRegistry.Create; lReg := TRegistry.Create;
try try
...@@ -197,7 +197,7 @@ begin ...@@ -197,7 +197,7 @@ begin
lMetaModelGenOpt.CheckDBTableNameLength := true; lMetaModelGenOpt.CheckDBTableNameLength := true;
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
lModelMappingsOptionsForm := TModelMappingsGenerationOptions.Create(nil); lModelMappingsOptionsForm := TModelMappingsGenerationOptions.Create(Application);
try try
if lModelMappingsOptionsForm.ShowModal = mrok then if lModelMappingsOptionsForm.ShowModal = mrok then
begin begin
...@@ -241,7 +241,7 @@ begin ...@@ -241,7 +241,7 @@ begin
finally finally
lUtilitario.Free; lUtilitario.Free;
end; end;
application.MessageBox(PAnsiChar('File ' + lModelMappingsOptions.FileName + ' was generated.'), 'Staruml', MB_OK + MB_ICONINFORMATION); application.MessageBox(PAnsiChar('File ' + lModelMappingsOptions.FileName + ' was generated.'), 'Staruml', MB_OK + MB_ICONINFORMATION);
finally finally
lProgress.Free; lProgress.Free;
...@@ -313,18 +313,14 @@ begin ...@@ -313,18 +313,14 @@ begin
lMetaModelGenOpt.CheckDBAttributeNameLength := true; lMetaModelGenOpt.CheckDBAttributeNameLength := true;
lMetaModelGenOpt.CheckDBTableNameLength := true; lMetaModelGenOpt.CheckDBTableNameLength := true;
lCodeGen := TCodeGen.Create(nil); Application.CreateForm(TCodeGen, lCodeGen);
lUtilitario := TUtil.Create;
try try
lUtilitario := TUtil.Create; lUtilitario.AlimentarMetamodel(lMetaModelGenOpt, nil);
try lCodeGen.Util := lUtilitario;
lUtilitario.AlimentarMetamodel(lMetaModelGenOpt, nil); lCodeGen.ShowModal;
lCodeGen.Util := lUtilitario;
lCodeGen.ShowModal;
finally
lUtilitario.Free;
end;
finally finally
lCodeGen.Free; lUtilitario.Free;
end; end;
end; end;
...@@ -410,7 +406,7 @@ begin ...@@ -410,7 +406,7 @@ begin
if lModel.QueryInterface(IUMLClass, lUMLClasAux) = S_OK then if lModel.QueryInterface(IUMLClass, lUMLClasAux) = S_OK then
begin begin
lUtilitario.AlimentarMetamodel(lMetaModelGenOpt, nil); lUtilitario.AlimentarMetamodel(lMetaModelGenOpt, nil);
lPreview := TPreviewClassCode.Create(nil); lPreview := TPreviewClassCode.Create(Application);
try try
// inserir preview para oracle // inserir preview para oracle
lPreview.mem_ClassPascal.Lines.Text := lUtilitario.GerarClassPreview_Pascal(lModel as IUMLClass); lPreview.mem_ClassPascal.Lines.Text := lUtilitario.GerarClassPreview_Pascal(lModel as IUMLClass);
...@@ -427,7 +423,7 @@ begin ...@@ -427,7 +423,7 @@ begin
if lModel.QueryInterface(IUMLAssociation, lUMLAssociationAux) = S_OK then if lModel.QueryInterface(IUMLAssociation, lUMLAssociationAux) = S_OK then
begin begin
lUtilitario.AlimentarMetamodel(lMetaModelGenOpt, nil); lUtilitario.AlimentarMetamodel(lMetaModelGenOpt, nil);
lPreview := TPreviewClassCode.Create(nil); lPreview := TPreviewClassCode.Create(Application);
try try
lPreview.mem_ClassSQL.Lines.Text := lUtilitario.GerarSQLPreview(lModel); lPreview.mem_ClassSQL.Lines.Text := lUtilitario.GerarSQLPreview(lModel);
lPreview.mem_ClassOracle.Lines.Text := lUtilitario.GerarSQLPreview(lModel, dbvOracle); lPreview.mem_ClassOracle.Lines.Text := lUtilitario.GerarSQLPreview(lModel, dbvOracle);
...@@ -704,7 +700,7 @@ begin ...@@ -704,7 +700,7 @@ begin
gStarUMLApp.SelectInModelExplorer(lCadCasoDeUso.UseCase); gStarUMLApp.SelectInModelExplorer(lCadCasoDeUso.UseCase);
finally finally
if assigned(lCadCasoDeUso) then lCadCasoDeUso.Free; lCadCasoDeUso.Free;
end; end;
finally finally
lCadastroCasoUsoUC.Free; lCadastroCasoUsoUC.Free;
...@@ -721,11 +717,11 @@ begin ...@@ -721,11 +717,11 @@ begin
lModel := gStarUMLApp.SelectionManager.GetSelectedModelAt(0); lModel := gStarUMLApp.SelectionManager.GetSelectedModelAt(0);
if lModel.QueryInterface(IUMLTransition, lUMLTransitionAux) = S_OK then if lModel.QueryInterface(IUMLTransition, lUMLTransitionAux) = S_OK then
begin begin
lXSDEditor := TXSDEdit.Create(nil); lXSDEditor := TXSDEdit.Create(Application);
try try
lXSDEditor.Transition := lModel as IUMLTransition; lXSDEditor.Transition := lModel as IUMLTransition;
lXSDEditor.ShowModal; lXSDEditor.ShowModal;
except finally
FreeAndNil(lXSDEditor); FreeAndNil(lXSDEditor);
end; end;
end end
......
This diff is collapsed.
...@@ -11,7 +11,7 @@ object FMostra_Processamento: TFMostra_Processamento ...@@ -11,7 +11,7 @@ object FMostra_Processamento: TFMostra_Processamento
Font.Height = -11 Font.Height = -11
Font.Name = 'MS Sans Serif' Font.Name = 'MS Sans Serif'
Position = poScreenCenter Position = poScreenCenter
LCLVersion = '2.0.0.4' LCLVersion = '2.2.4.0'
object pnlMensagem: TPanel object pnlMensagem: TPanel
Left = 0 Left = 0
Height = 27 Height = 27
......
...@@ -69,7 +69,7 @@ end; ...@@ -69,7 +69,7 @@ end;
constructor TFShowProgressForm.create(piMsg: string; piPosition, piTotal: integer); constructor TFShowProgressForm.create(piMsg: string; piPosition, piTotal: integer);
begin begin
fFormProgress := TFMostra_Processamento.Create(nil); fFormProgress := TFMostra_Processamento.Create(Application);
fFormProgress.pgbBarraDeProgresso.Max := piTotal; fFormProgress.pgbBarraDeProgresso.Max := piTotal;
fFormProgress.pgbBarraDeProgresso.Position := piPosition; fFormProgress.pgbBarraDeProgresso.Position := piPosition;
fFormProgress.pnlMensagem.Caption := piMsg; fFormProgress.pnlMensagem.Caption := piMsg;
......
...@@ -260,6 +260,7 @@ begin ...@@ -260,6 +260,7 @@ begin
lNode.ImageIndex := 8; lNode.ImageIndex := 8;
lEnumerator.MoveNext; lEnumerator.MoveNext;
end; end;
Node.Text := Node.Text + ' (ITENS:' + IntToStr(Node.Count) + ')';
end; end;
finally finally
Node.Owner.EndUpdate; Node.Owner.EndUpdate;
......
...@@ -28,15 +28,11 @@ var lRequestMessage: mxRequestMessage; ...@@ -28,15 +28,11 @@ var lRequestMessage: mxRequestMessage;
lResponseMessage: mxAnswerMessage; lResponseMessage: mxAnswerMessage;
begin begin
lRequestMessage := self.NewRequest('RM_OBTEM_CONTEXTO', piField); lRequestMessage := self.NewRequest('RM_OBTEM_CONTEXTO', piField);
lResponseMessage := self.Session.SendRequest(lRequestMessage);
try try
lResponseMessage := self.Session.SendRequest(lRequestMessage); if assigned(piResponseField) then piResponseField.Assign(lResponseMessage.RootField);
try
if assigned(piResponseField) then piResponseField.Assign(lResponseMessage.RootField);
finally
lResponseMessage.free;
end;
finally finally
lRequestMessage.Free; lResponseMessage.free;
end; end;
end; end;
...@@ -45,15 +41,11 @@ var lRequestMessage: mxRequestMessage; ...@@ -45,15 +41,11 @@ var lRequestMessage: mxRequestMessage;
lResponseMessage: mxAnswerMessage; lResponseMessage: mxAnswerMessage;
begin begin
lRequestMessage := self.NewRequest('RM_SALVA_OBJETO', piField); lRequestMessage := self.NewRequest('RM_SALVA_OBJETO', piField);
lResponseMessage := self.Session.SendRequest(lRequestMessage);
try try
lResponseMessage := self.Session.SendRequest(lRequestMessage); if assigned(piResponseField) then piResponseField.Assign(lResponseMessage.RootField);
try
if assigned(piResponseField) then piResponseField.Assign(lResponseMessage.RootField);
finally
lResponseMessage.free;
end;
finally finally
lRequestMessage.Free; lResponseMessage.free;
end; end;
end; end;
...@@ -62,15 +54,11 @@ var lRequestMessage: mxRequestMessage; ...@@ -62,15 +54,11 @@ var lRequestMessage: mxRequestMessage;
lResponseMessage: mxAnswerMessage; lResponseMessage: mxAnswerMessage;
begin begin
lRequestMessage := self.NewRequest('RM_EXCLUI_OBJETO', piField); lRequestMessage := self.NewRequest('RM_EXCLUI_OBJETO', piField);
lResponseMessage := self.Session.SendRequest(lRequestMessage);
try try
lResponseMessage := self.Session.SendRequest(lRequestMessage); if assigned(piResponseField) then piResponseField.Assign(lResponseMessage.RootField);
try
if assigned(piResponseField) then piResponseField.Assign(lResponseMessage.RootField);
finally
lResponseMessage.free;
end;
finally finally
lRequestMessage.Free; lResponseMessage.free;
end; end;
end; end;
...@@ -79,15 +67,11 @@ var lRequestMessage: mxRequestMessage; ...@@ -79,15 +67,11 @@ var lRequestMessage: mxRequestMessage;
lResponseMessage: mxAnswerMessage; lResponseMessage: mxAnswerMessage;
begin begin
lRequestMessage := self.NewRequest('RM_INCLUI_OBJETO', piField); lRequestMessage := self.NewRequest('RM_INCLUI_OBJETO', piField);
lResponseMessage := self.Session.SendRequest(lRequestMessage);
try try
lResponseMessage := self.Session.SendRequest(lRequestMessage); if assigned(piResponseField) then piResponseField.Assign(lResponseMessage.RootField);
try
if assigned(piResponseField) then piResponseField.Assign(lResponseMessage.RootField);
finally
lResponseMessage.free;
end;
finally finally
lRequestMessage.Free; lResponseMessage.free;
end; end;
end; end;
...@@ -96,15 +80,11 @@ var lRequestMessage: mxRequestMessage; ...@@ -96,15 +80,11 @@ var lRequestMessage: mxRequestMessage;
lResponseMessage: mxAnswerMessage; lResponseMessage: mxAnswerMessage;
begin begin
lRequestMessage := self.NewRequest('RM_CONSULTA_OBJETO', piField); lRequestMessage := self.NewRequest('RM_CONSULTA_OBJETO', piField);
lResponseMessage := self.Session.SendRequest(lRequestMessage);
try try
lResponseMessage := self.Session.SendRequest(lRequestMessage); if assigned(piResponseField) then piResponseField.Assign(lResponseMessage.RootField);
try
if assigned(piResponseField) then piResponseField.Assign(lResponseMessage.RootField);
finally
lResponseMessage.free;
end;
finally finally
lRequestMessage.Free; lResponseMessage.free;
end; end;
end; end;
...@@ -113,15 +93,11 @@ var lRequestMessage: mxRequestMessage; ...@@ -113,15 +93,11 @@ var lRequestMessage: mxRequestMessage;
lResponseMessage: mxAnswerMessage; lResponseMessage: mxAnswerMessage;
begin begin
lRequestMessage := self.NewRequest('RM_EDITA_OBJETO', piField); lRequestMessage := self.NewRequest('RM_EDITA_OBJETO', piField);
lResponseMessage := self.Session.SendRequest(lRequestMessage);
try try
lResponseMessage := self.Session.SendRequest(lRequestMessage); if assigned(piResponseField) then piResponseField.Assign(lResponseMessage.RootField);
try
if assigned(piResponseField) then piResponseField.Assign(lResponseMessage.RootField);
finally
lResponseMessage.free;
end;
finally finally
lRequestMessage.Free; lResponseMessage.free;
end; end;
end; end;
......
...@@ -27,15 +27,11 @@ var lRequestMessage: mxRequestMessage; ...@@ -27,15 +27,11 @@ var lRequestMessage: mxRequestMessage;
lResponseMessage: mxAnswerMessage; lResponseMessage: mxAnswerMessage;
begin begin
lRequestMessage := self.NewRequest('RM_OBTER_CONTEXTO', piField); lRequestMessage := self.NewRequest('RM_OBTER_CONTEXTO', piField);
lResponseMessage := self.Session.SendRequest(lRequestMessage);
try try
lResponseMessage := self.Session.SendRequest(lRequestMessage); if assigned(piResponseField) then piResponseField.Assign(lResponseMessage.RootField);
try
if assigned(piResponseField) then piResponseField.Assign(lResponseMessage.RootField);
finally
lResponseMessage.free;
end;
finally finally
lRequestMessage.Free; lResponseMessage.free;
end; end;
end; end;
...@@ -44,15 +40,11 @@ var lRequestMessage: mxRequestMessage; ...@@ -44,15 +40,11 @@ var lRequestMessage: mxRequestMessage;
lResponseMessage: mxAnswerMessage; lResponseMessage: mxAnswerMessage;
begin begin
lRequestMessage := self.NewRequest('RM_SALVAR', piField); lRequestMessage := self.NewRequest('RM_SALVAR', piField);
lResponseMessage := self.Session.SendRequest(lRequestMessage);
try try
lResponseMessage := self.Session.SendRequest(lRequestMessage); if assigned(piResponseField) then piResponseField.Assign(lResponseMessage.RootField);
try
if assigned(piResponseField) then piResponseField.Assign(lResponseMessage.RootField);
finally
lResponseMessage.free;
end;
finally finally
lRequestMessage.Free; lResponseMessage.free;
end; end;
end; end;
...@@ -61,15 +53,11 @@ var lRequestMessage: mxRequestMessage; ...@@ -61,15 +53,11 @@ var lRequestMessage: mxRequestMessage;
lResponseMessage: mxAnswerMessage; lResponseMessage: mxAnswerMessage;
begin begin
lRequestMessage := self.NewRequest('RM_EXCLUIR', piField); lRequestMessage := self.NewRequest('RM_EXCLUIR', piField);
lResponseMessage := self.Session.SendRequest(lRequestMessage);
try try
lResponseMessage := self.Session.SendRequest(lRequestMessage); if assigned(piResponseField) then piResponseField.Assign(lResponseMessage.RootField);
try
if assigned(piResponseField) then piResponseField.Assign(lResponseMessage.RootField);
finally
lResponseMessage.free;
end;
finally finally
lRequestMessage.Free; lResponseMessage.free;
end; end;
end; end;
...@@ -78,15 +66,11 @@ var lRequestMessage: mxRequestMessage; ...@@ -78,15 +66,11 @@ var lRequestMessage: mxRequestMessage;
lResponseMessage: mxAnswerMessage; lResponseMessage: mxAnswerMessage;
begin begin
lRequestMessage := self.NewRequest('RM_INCLUIR', piField); lRequestMessage := self.NewRequest('RM_INCLUIR', piField);
lResponseMessage := self.Session.SendRequest(lRequestMessage);
try try
lResponseMessage := self.Session.SendRequest(lRequestMessage); if assigned(piResponseField) then piResponseField.Assign(lResponseMessage.RootField);
try
if assigned(piResponseField) then piResponseField.Assign(lResponseMessage.RootField);
finally
lResponseMessage.free;
end;
finally finally
lRequestMessage.Free; lResponseMessage.free;
end; end;
end; end;
...@@ -95,15 +79,11 @@ var lRequestMessage: mxRequestMessage; ...@@ -95,15 +79,11 @@ var lRequestMessage: mxRequestMessage;
lResponseMessage: mxAnswerMessage; lResponseMessage: mxAnswerMessage;
begin begin
lRequestMessage := self.NewRequest('RM_CONSULTA_OBJETO', piField); lRequestMessage := self.NewRequest('RM_CONSULTA_OBJETO', piField);
lResponseMessage := self.Session.SendRequest(lRequestMessage);
try try
lResponseMessage := self.Session.SendRequest(lRequestMessage); if assigned(piResponseField) then piResponseField.Assign(lResponseMessage.RootField);
try
if assigned(piResponseField) then piResponseField.Assign(lResponseMessage.RootField);
finally
lResponseMessage.free;
end;
finally finally
lRequestMessage.Free; lResponseMessage.free;
end; end;
end; end;
...@@ -112,15 +92,11 @@ var lRequestMessage: mxRequestMessage; ...@@ -112,15 +92,11 @@ var lRequestMessage: mxRequestMessage;
lResponseMessage: mxAnswerMessage; lResponseMessage: mxAnswerMessage;
begin begin
lRequestMessage := self.NewRequest('RM_EDITA_OBJETO', piField); lRequestMessage := self.NewRequest('RM_EDITA_OBJETO', piField);
lResponseMessage := self.Session.SendRequest(lRequestMessage);
try try
lResponseMessage := self.Session.SendRequest(lRequestMessage); if assigned(piResponseField) then piResponseField.Assign(lResponseMessage.RootField);
try
if assigned(piResponseField) then piResponseField.Assign(lResponseMessage.RootField);
finally
lResponseMessage.free;
end;
finally finally
lRequestMessage.Free; lResponseMessage.free;
end; end;
end; end;
......
...@@ -11,9 +11,11 @@ object CodeGen: TCodeGen ...@@ -11,9 +11,11 @@ object CodeGen: TCodeGen
Font.Height = -11 Font.Height = -11
Font.Name = 'Tahoma' Font.Name = 'Tahoma'
KeyPreview = True KeyPreview = True
OnClose = FormClose
OnShow = FormShow OnShow = FormShow
Position = poScreenCenter Position = poScreenCenter
LCLVersion = '2.0.10.0' ShowInTaskBar = stAlways
LCLVersion = '2.2.4.0'
object PageControl1: TPageControl object PageControl1: TPageControl
Left = 0 Left = 0
Height = 616 Height = 616
...@@ -4526,6 +4528,7 @@ object CodeGen: TCodeGen ...@@ -4526,6 +4528,7 @@ object CodeGen: TCodeGen
Enabled = False Enabled = False
CompilerMode = pcmObjFPC CompilerMode = pcmObjFPC
NestedComments = True NestedComments = True
TypeHelpers = False
Left = 710 Left = 710
Top = 137 Top = 137
end end
......
...@@ -98,6 +98,7 @@ type ...@@ -98,6 +98,7 @@ type
Panel14: TPanel; Panel14: TPanel;
Panel15: TPanel; Panel15: TPanel;
SpeedButton8: TSpeedButton; SpeedButton8: TSpeedButton;
procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
procedure FormShow(Sender: TObject); procedure FormShow(Sender: TObject);
procedure lvUseCasesChange(Sender: TObject; Item: TListItem; procedure lvUseCasesChange(Sender: TObject; Item: TListItem;
Change: TItemChange); Change: TItemChange);
...@@ -160,6 +161,10 @@ begin ...@@ -160,6 +161,10 @@ begin
end; end;
end; end;
procedure TCodeGen.FormClose(Sender: TObject; var CloseAction: TCloseAction);
begin
end;
procedure TCodeGen.ShowCodePreview(piUseCase: acUseCaseTicket); procedure TCodeGen.ShowCodePreview(piUseCase: acUseCaseTicket);
var lTransitions: acObjectList; var lTransitions: acObjectList;
lItem: TListItem; lItem: TListItem;
......
...@@ -43,6 +43,7 @@ type ...@@ -43,6 +43,7 @@ type
rdCSharp: TRadioButton; rdCSharp: TRadioButton;
rdJava: TRadioButton; rdJava: TRadioButton;
procedure dlbDirectoryGetImageIndex(Sender: TObject; Node: TTreeNode); procedure dlbDirectoryGetImageIndex(Sender: TObject; Node: TTreeNode);
procedure dlbDirectoryGetSelectedIndex(Sender: TObject; Node: TTreeNode);
procedure FormShow(Sender: TObject); procedure FormShow(Sender: TObject);
procedure BitBtn1Click(Sender: TObject); procedure BitBtn1Click(Sender: TObject);
procedure edtFileNameChange(Sender: TObject); procedure edtFileNameChange(Sender: TObject);
...@@ -153,6 +154,11 @@ begin ...@@ -153,6 +154,11 @@ begin
Node.ImageIndex := 0; Node.ImageIndex := 0;
end; end;
procedure TModelMappingsGenerationOptions.dlbDirectoryGetSelectedIndex(Sender: TObject; Node: TTreeNode);
begin
Node.SelectedIndex := 0;
end;
procedure TModelMappingsGenerationOptions.GetParameters; procedure TModelMappingsGenerationOptions.GetParameters;
var lReg: TRegistry; var lReg: TRegistry;
begin begin
...@@ -164,9 +170,17 @@ begin ...@@ -164,9 +170,17 @@ begin
ckbIgnoreXSD.Checked := StrToBoolDef(lReg.ReadString('MODELMAPPINGS_IGNORE_XSD_SCHEMA'), false); ckbIgnoreXSD.Checked := StrToBoolDef(lReg.ReadString('MODELMAPPINGS_IGNORE_XSD_SCHEMA'), false);
if lReg.ReadString('MODELMAPPINGS_OUTPUT_DIRECTORY') <> '' then if lReg.ReadString('MODELMAPPINGS_OUTPUT_DIRECTORY') <> '' then
dlbDirectory.Path := lReg.ReadString('MODELMAPPINGS_OUTPUT_DIRECTORY') begin
dlbDirectory.Path := lReg.ReadString('MODELMAPPINGS_OUTPUT_DIRECTORY');
ckbDefault.Checked := false;
BitBtn3.Enabled := true;
end
else else
begin
dlbDirectory.Path := ExtractFilePath(gStarUMLApp.ProjectManager.FileName); dlbDirectory.Path := ExtractFilePath(gStarUMLApp.ProjectManager.FileName);
ckbDefault.Checked := true;
BitBtn3.Enabled := false;
end;
if lReg.ReadString('MODELMAPPINGS_FILENAME') <> '' then if lReg.ReadString('MODELMAPPINGS_FILENAME') <> '' then
edtFileName.Text := lReg.ReadString('MODELMAPPINGS_FILENAME') edtFileName.Text := lReg.ReadString('MODELMAPPINGS_FILENAME')
......
...@@ -14,6 +14,8 @@ object XSDEdit: TXSDEdit ...@@ -14,6 +14,8 @@ object XSDEdit: TXSDEdit
OnCreate = FormCreate OnCreate = FormCreate
OnShow = FormShow OnShow = FormShow
Position = poDesktopCenter Position = poDesktopCenter
ShowInTaskBar = stAlways
LCLVersion = '2.2.4.0'
object pnlTransition: TPanel object pnlTransition: TPanel
Left = 0 Left = 0
Height = 23 Height = 23
...@@ -362,13 +364,13 @@ object XSDEdit: TXSDEdit ...@@ -362,13 +364,13 @@ object XSDEdit: TXSDEdit
OnChanging = pgcPrincipalChanging OnChanging = pgcPrincipalChanging
object tbsXSDIn: TTabSheet object tbsXSDIn: TTabSheet
Caption = 'XSD In' Caption = 'XSD In'
ClientHeight = 420 ClientHeight = 433
ClientWidth = 695 ClientWidth = 693
object memXSDIn: TMemo object memXSDIn: TMemo
Left = 0 Left = 0
Height = 420 Height = 433
Top = 0 Top = 0
Width = 695 Width = 693
Align = alClient Align = alClient
Font.CharSet = ANSI_CHARSET Font.CharSet = ANSI_CHARSET
Font.Color = clWindowText Font.Color = clWindowText
...@@ -382,14 +384,14 @@ object XSDEdit: TXSDEdit ...@@ -382,14 +384,14 @@ object XSDEdit: TXSDEdit
end end
object tbsXSDOut: TTabSheet object tbsXSDOut: TTabSheet
Caption = 'XSD Out' Caption = 'XSD Out'
ClientHeight = 420 ClientHeight = 433
ClientWidth = 695 ClientWidth = 693
ImageIndex = 1 ImageIndex = 1
object memXSDOut: TMemo object memXSDOut: TMemo
Left = 0 Left = 0
Height = 420 Height = 433
Top = 0 Top = 0
Width = 695 Width = 693
Align = alClient Align = alClient
Font.CharSet = ANSI_CHARSET Font.CharSet = ANSI_CHARSET
Font.Color = clWindowText Font.Color = clWindowText
......
object PreviewClassCode: TPreviewClassCode object PreviewClassCode: TPreviewClassCode
Left = 2149 Left = 100
Height = 580 Height = 580
Top = 247 Top = 247
Width = 803 Width = 803
...@@ -10,9 +10,9 @@ object PreviewClassCode: TPreviewClassCode ...@@ -10,9 +10,9 @@ object PreviewClassCode: TPreviewClassCode
Font.Color = clWindowText Font.Color = clWindowText
Font.Height = -11 Font.Height = -11
Font.Name = 'Tahoma' Font.Name = 'Tahoma'
KeyPreview = True
Position = poScreenCenter Position = poScreenCenter
LCLVersion = '2.0.2.0' ShowInTaskBar = stAlways
LCLVersion = '2.2.4.0'
object Panel2: TPanel object Panel2: TPanel
Left = 0 Left = 0
Height = 580 Height = 580
...@@ -75,9 +75,15 @@ object PreviewClassCode: TPreviewClassCode ...@@ -75,9 +75,15 @@ object PreviewClassCode: TPreviewClassCode
Top = 0 Top = 0
Width = 785 Width = 785
Align = alClient Align = alClient
Font.Height = -13
Font.Name = 'Courier New'
Font.Pitch = fpFixed
Font.Quality = fqNonAntialiased
ParentColor = False
ParentFont = False
TabOrder = 0 TabOrder = 0
BorderStyle = bsNone BorderStyle = bsNone
Gutter.Width = 29 Gutter.Width = 33
Gutter.MouseActions = <> Gutter.MouseActions = <>
RightGutter.Width = 0 RightGutter.Width = 0
RightGutter.MouseActions = <> RightGutter.MouseActions = <>
...@@ -541,7 +547,7 @@ object PreviewClassCode: TPreviewClassCode ...@@ -541,7 +547,7 @@ object PreviewClassCode: TPreviewClassCode
MouseActions = <> MouseActions = <>
end end
object SynGutterLineNumber1: TSynGutterLineNumber object SynGutterLineNumber1: TSynGutterLineNumber
Width = 23 Width = 17
MouseActions = <> MouseActions = <>
MarkupInfo.Background = clBtnFace MarkupInfo.Background = clBtnFace
MarkupInfo.Foreground = clNone MarkupInfo.Foreground = clNone
...@@ -584,9 +590,15 @@ object PreviewClassCode: TPreviewClassCode ...@@ -584,9 +590,15 @@ object PreviewClassCode: TPreviewClassCode
Top = 0 Top = 0
Width = 785 Width = 785
Align = alClient Align = alClient
Font.Height = -13
Font.Name = 'Courier New'
Font.Pitch = fpFixed
Font.Quality = fqNonAntialiased
ParentColor = False
ParentFont = False
TabOrder = 0 TabOrder = 0
BorderStyle = bsNone BorderStyle = bsNone
Gutter.Width = 29 Gutter.Width = 33
Gutter.MouseActions = <> Gutter.MouseActions = <>
RightGutter.Width = 0 RightGutter.Width = 0
RightGutter.MouseActions = <> RightGutter.MouseActions = <>
...@@ -1050,7 +1062,7 @@ object PreviewClassCode: TPreviewClassCode ...@@ -1050,7 +1062,7 @@ object PreviewClassCode: TPreviewClassCode
MouseActions = <> MouseActions = <>
end end
object SynGutterLineNumber1: TSynGutterLineNumber object SynGutterLineNumber1: TSynGutterLineNumber
Width = 23 Width = 17
MouseActions = <> MouseActions = <>
MarkupInfo.Background = clBtnFace MarkupInfo.Background = clBtnFace
MarkupInfo.Foreground = clNone MarkupInfo.Foreground = clNone
...@@ -1093,9 +1105,15 @@ object PreviewClassCode: TPreviewClassCode ...@@ -1093,9 +1105,15 @@ object PreviewClassCode: TPreviewClassCode
Top = 0 Top = 0
Width = 785 Width = 785
Align = alClient Align = alClient
Font.Height = -13
Font.Name = 'Courier New'
Font.Pitch = fpFixed
Font.Quality = fqNonAntialiased
ParentColor = False
ParentFont = False
TabOrder = 0 TabOrder = 0
BorderStyle = bsNone BorderStyle = bsNone
Gutter.Width = 29 Gutter.Width = 33
Gutter.MouseActions = <> Gutter.MouseActions = <>
RightGutter.Width = 0 RightGutter.Width = 0
RightGutter.MouseActions = <> RightGutter.MouseActions = <>
...@@ -1559,7 +1577,7 @@ object PreviewClassCode: TPreviewClassCode ...@@ -1559,7 +1577,7 @@ object PreviewClassCode: TPreviewClassCode
MouseActions = <> MouseActions = <>
end end
object SynGutterLineNumber1: TSynGutterLineNumber object SynGutterLineNumber1: TSynGutterLineNumber
Width = 23 Width = 17
MouseActions = <> MouseActions = <>
MarkupInfo.Background = clBtnFace MarkupInfo.Background = clBtnFace
MarkupInfo.Foreground = clNone MarkupInfo.Foreground = clNone
...@@ -1615,9 +1633,15 @@ object PreviewClassCode: TPreviewClassCode ...@@ -1615,9 +1633,15 @@ object PreviewClassCode: TPreviewClassCode
Top = 0 Top = 0
Width = 777 Width = 777
Align = alClient Align = alClient
Font.Height = -13
Font.Name = 'Courier New'
Font.Pitch = fpFixed
Font.Quality = fqNonAntialiased
ParentColor = False
ParentFont = False
TabOrder = 0 TabOrder = 0
BorderStyle = bsNone BorderStyle = bsNone
Gutter.Width = 29 Gutter.Width = 33
Gutter.MouseActions = <> Gutter.MouseActions = <>
RightGutter.Width = 0 RightGutter.Width = 0
RightGutter.MouseActions = <> RightGutter.MouseActions = <>
...@@ -2081,7 +2105,7 @@ object PreviewClassCode: TPreviewClassCode ...@@ -2081,7 +2105,7 @@ object PreviewClassCode: TPreviewClassCode
MouseActions = <> MouseActions = <>
end end
object SynGutterLineNumber1: TSynGutterLineNumber object SynGutterLineNumber1: TSynGutterLineNumber
Width = 23 Width = 17
MouseActions = <> MouseActions = <>
MarkupInfo.Background = clBtnFace MarkupInfo.Background = clBtnFace
MarkupInfo.Foreground = clNone MarkupInfo.Foreground = clNone
...@@ -2124,9 +2148,15 @@ object PreviewClassCode: TPreviewClassCode ...@@ -2124,9 +2148,15 @@ object PreviewClassCode: TPreviewClassCode
Top = 0 Top = 0
Width = 777 Width = 777
Align = alClient Align = alClient
Font.Height = -13
Font.Name = 'Courier New'
Font.Pitch = fpFixed
Font.Quality = fqNonAntialiased
ParentColor = False
ParentFont = False
TabOrder = 0 TabOrder = 0
BorderStyle = bsNone BorderStyle = bsNone
Gutter.Width = 29 Gutter.Width = 33
Gutter.MouseActions = <> Gutter.MouseActions = <>
RightGutter.Width = 0 RightGutter.Width = 0
RightGutter.MouseActions = <> RightGutter.MouseActions = <>
...@@ -2590,7 +2620,7 @@ object PreviewClassCode: TPreviewClassCode ...@@ -2590,7 +2620,7 @@ object PreviewClassCode: TPreviewClassCode
MouseActions = <> MouseActions = <>
end end
object SynGutterLineNumber1: TSynGutterLineNumber object SynGutterLineNumber1: TSynGutterLineNumber
Width = 23 Width = 17
MouseActions = <> MouseActions = <>
MarkupInfo.Background = clBtnFace MarkupInfo.Background = clBtnFace
MarkupInfo.Foreground = clNone MarkupInfo.Foreground = clNone
...@@ -2632,33 +2662,34 @@ object PreviewClassCode: TPreviewClassCode ...@@ -2632,33 +2662,34 @@ object PreviewClassCode: TPreviewClassCode
Enabled = False Enabled = False
CompilerMode = pcmObjFPC CompilerMode = pcmObjFPC
NestedComments = True NestedComments = True
left = 383 TypeHelpers = False
top = 19 Left = 383
Top = 19
end end
object SynJavaSyn1: TSynJavaSyn object SynJavaSyn1: TSynJavaSyn
DefaultFilter = 'Java Files (*.java)|*.java' DefaultFilter = 'Java Files (*.java)|*.java'
Enabled = False Enabled = False
left = 503 Left = 503
top = 19 Top = 19
end end
object SynSQLSyn1: TSynSQLSyn object SynSQLSyn1: TSynSQLSyn
DefaultFilter = 'SQL Files (*.sql)|*.sql' DefaultFilter = 'SQL Files (*.sql)|*.sql'
Enabled = False Enabled = False
SQLDialect = sqlMSSQL2K SQLDialect = sqlMSSQL2K
left = 589 Left = 589
top = 19 Top = 19
end end
object SynCppSyn1: TSynCppSyn object SynCppSyn1: TSynCppSyn
DefaultFilter = 'C++ Files (*.c,*.cpp,*.h,*.hpp,*.hh)|*.c;*.cpp;*.h;*.hpp;*.hh' DefaultFilter = 'C++ Files (*.c,*.cpp,*.h,*.hpp,*.hh)|*.c;*.cpp;*.h;*.hpp;*.hh'
Enabled = False Enabled = False
left = 688 Left = 688
top = 32 Top = 32
end end
object SynSQLSyn2: TSynSQLSyn object SynSQLSyn2: TSynSQLSyn
DefaultFilter = 'SQL Files (*.sql)|*.sql' DefaultFilter = 'SQL Files (*.sql)|*.sql'
Enabled = False Enabled = False
SQLDialect = sqlOracle SQLDialect = sqlOracle
left = 589 Left = 589
top = 85 Top = 85
end end
end end
...@@ -52,7 +52,7 @@ var SaveDialog1: TSaveDialog; ...@@ -52,7 +52,7 @@ var SaveDialog1: TSaveDialog;
lsNGUFile: String; lsNGUFile: String;
myFile : TextFile; myFile : TextFile;
begin begin
SaveDialog1 := TSaveDialog.Create(nil); SaveDialog1 := TSaveDialog.Create(Application);
try try
if SaveDialog1.Execute then if SaveDialog1.Execute then
begin begin
......
...@@ -5,7 +5,8 @@ object itCadastrarDefinicao: TitCadastrarDefinicao ...@@ -5,7 +5,8 @@ object itCadastrarDefinicao: TitCadastrarDefinicao
Width = 817 Width = 817
ClientHeight = 323 ClientHeight = 323
ClientWidth = 817 ClientWidth = 817
LCLVersion = '2.1.0.0' ShowInTaskBar = stAlways
LCLVersion = '2.2.4.0'
object pnPrincipal: TPanel object pnPrincipal: TPanel
Left = 0 Left = 0
Height = 312 Height = 312
......
...@@ -215,23 +215,31 @@ end; ...@@ -215,23 +215,31 @@ end;
procedure TitCadastrarFormulario.FillListViewClassData(piClass: acClassTicket); procedure TitCadastrarFormulario.FillListViewClassData(piClass: acClassTicket);
var var
lRelationName: string; lRelationName: string;
lClass: acClassTicket;
i: Integer; i: Integer;
begin begin
for i := 0 to piClass.Attributes.Count - 1 do lClass := piClass;
while assigned(lClass) do
begin begin
AdicionarCampo(piClass.Attributes[i]); for i := 0 to piClass.Attributes.Count - 1 do
end; begin
AdicionarCampo(piClass.Attributes[i]);
end;
for i := 0 to piClass.RelationTicketsIn.Count - 1 do for i := 0 to piClass.RelationTicketsIn.Count - 1 do
begin begin
lRelationName := acRelationTicket(piClass.RelationTicketsIn.Objects[i]).DestinationPropertyName; lRelationName := acRelationTicket(piClass.RelationTicketsIn.Objects[i]).DestinationPropertyName;
if lRelationName <> '' then AdicionarCampo(lRelationName); if lRelationName <> '' then AdicionarCampo(lRelationName);
end; end;
for i := 0 to piClass.RelationTicketsOut.Count - 1 do
begin
lRelationName := acRelationTicket(piClass.RelationTicketsOut.Objects[i]).OriginPropertyName;
if lRelationName <> '' then AdicionarCampo(lRelationName);
end;
lClass := lClass.ParentClassTicket;
for i := 0 to piClass.RelationTicketsOut.Count - 1 do
begin
lRelationName := acRelationTicket(piClass.RelationTicketsOut.Objects[i]).OriginPropertyName;
if lRelationName <> '' then AdicionarCampo(lRelationName);
end; end;
end; end;
......
This diff is collapsed.
...@@ -32,16 +32,6 @@ const ...@@ -32,16 +32,6 @@ const
type type
TDLLDialog = class(TForm)
protected
procedure CreateParams(var Params: TCreateParams); override;
public
procedure BtnShowMessageClick(Sender: TObject);
constructor Create(aOwner: TComponent); override;
public
ParentFormHandle: HWND;
end;
{ TExplorerV2 } { TExplorerV2 }
TExplorerV2 = class(TForm) TExplorerV2 = class(TForm)
...@@ -153,8 +143,6 @@ type ...@@ -153,8 +143,6 @@ type
procedure MontarModelExploreHieraquia(Sender: TObject; Node: TTreeNode); procedure MontarModelExploreHieraquia(Sender: TObject; Node: TTreeNode);
procedure SetMetaModel(const Value: acMetaModel); procedure SetMetaModel(const Value: acMetaModel);
procedure ResizeColumns(piListView: TListView); procedure ResizeColumns(piListView: TListView);
function GetStringEntreParenteses(piString : string) : string;
function GetNumeroDeStringOID (piString : string) : string;
function GetClassTicket(piBloco,piPropertyName : string):acClassTicket; function GetClassTicket(piBloco,piPropertyName : string):acClassTicket;
procedure CopiaTextoObjeto (piObjeto : TTreeNode); procedure CopiaTextoObjeto (piObjeto : TTreeNode);
function BuscaParcial(piSubstring,piTexto :string;piretirarEspaco : boolean = true): boolean; function BuscaParcial(piSubstring,piTexto :string;piretirarEspaco : boolean = true): boolean;
...@@ -184,7 +172,6 @@ type ...@@ -184,7 +172,6 @@ type
function IsExepressaoValida(piOpEve: TFaOpenEvent;piTexto : string; piTemPalavraAntes : Boolean = false):boolean; function IsExepressaoValida(piOpEve: TFaOpenEvent;piTexto : string; piTemPalavraAntes : Boolean = false):boolean;
function GetPrevWordPosValida(piSynEdit: TSynEdit) :TPoint; function GetPrevWordPosValida(piSynEdit: TSynEdit) :TPoint;
protected protected
procedure CreateParams(var Params : TCreateParams); override;
function Connect : acPersistenceSession; function Connect : acPersistenceSession;
public public
...@@ -354,7 +341,7 @@ begin ...@@ -354,7 +341,7 @@ begin
begin begin
lField := utField(lEnum.Current); lField := utField(lEnum.Current);
lListItem := lvXMLListResult.Items.Add; lListItem := lvXMLListResult.Items.Add;
lEnumAtt := lField.GetAttibutesEnumerator; lEnumAtt := lField.GetAttributesEnumerator;
try try
lFirstItemFlag := true; lFirstItemFlag := true;
while not lEnumAtt.EOL do while not lEnumAtt.EOL do
...@@ -560,7 +547,7 @@ var ...@@ -560,7 +547,7 @@ var
begin begin
lModalResult := mrOk; lModalResult := mrOk;
Result := Nil; Result := Nil;
lDataBaseLogin := TDataBaseLogin.Create(Self); lDataBaseLogin := TDataBaseLogin.Create(Screen.ActiveForm);
try try
lDataBaseLogin.ProjectFileName := ExtractFileName(fUtil.StarUMLApp.ProjectManager.FileName); lDataBaseLogin.ProjectFileName := ExtractFileName(fUtil.StarUMLApp.ProjectManager.FileName);
while (lModalResult = mrOk) and (not Assigned(Result)) do while (lModalResult = mrOk) and (not Assigned(Result)) do
...@@ -593,7 +580,7 @@ begin ...@@ -593,7 +580,7 @@ begin
if fConnectionString <> '' then if fConnectionString <> '' then
begin begin
try try
Result := PersistenceManager.OpenSession(fMetaModelPersistenceMap, fConnectionString); Result := PersistenceManager.OpenSession(fMetaModelPersistenceMap, fConnectionString, acIsolationLevel.acILReadUncommitted);
(Result.Repository as acRepositorySQL).SQLDialect := fSQLDialect; (Result.Repository as acRepositorySQL).SQLDialect := fSQLDialect;
if actResultsPanel.Checked then actResultsPanel.Execute; if actResultsPanel.Checked then actResultsPanel.Execute;
...@@ -628,10 +615,28 @@ end; ...@@ -628,10 +615,28 @@ end;
procedure TExplorerV2.CopiaTextoObjeto(piObjeto: TTreeNode); procedure TExplorerV2.CopiaTextoObjeto(piObjeto: TTreeNode);
var var
lString : string; lString : UTF8String;
begin begin
lString := piObjeto.Text; if (TObject(piObjeto.Data) is acPersistentObject) then
lString := GetNumeroDeStringOID(GetStringEntreParenteses(lString)); begin
lString := acPersistentObject(piObjeto.Data).IDO.AsString;
end
else if (TObject(piObjeto.Data) is acRelationPartnerShip) then
begin
if Assigned(acRelationPartnerShip(piObjeto.Data).PartnerOID)
then lString := acRelationPartnerShip(piObjeto.Data).PartnerOID.AsString
else if Assigned(acRelationPartnerShip(piObjeto.Data).Partner)
then lString := acRelationPartnerShip(piObjeto.Data).Partner.IDO.AsString
else lString := 'null';
end
else if (TObject(piObjeto.Data) is acAttribute) then
begin
if acAttribute(piObjeto.Data).IsNull
then lString := 'null'
else lString := acAttribute(piObjeto.Data).AsString;
end
else lString := '';
if lString <> '' then if lString <> '' then
Clipbrd.Clipboard.AsText := lString; Clipbrd.Clipboard.AsText := lString;
end; end;
...@@ -1648,14 +1653,6 @@ begin ...@@ -1648,14 +1653,6 @@ begin
end; end;
procedure TExplorerV2.CreateParams(var Params: TCreateParams);
begin
inherited CreateParams(Params);
{$IFDEF LCLWin32}
// Params.WndParent := 0;
{$ENDIF}
end;
procedure TExplorerV2.FormClose(Sender: TObject; var Action: TCloseAction); procedure TExplorerV2.FormClose(Sender: TObject; var Action: TCloseAction);
begin begin
Action := caFree; Action := caFree;
...@@ -2136,46 +2133,6 @@ begin ...@@ -2136,46 +2133,6 @@ begin
pcResults.ActivePageIndex := 1; pcResults.ActivePageIndex := 1;
end; end;
function TExplorerV2.GetNumeroDeStringOID(piString: string): string;
var
lString : string;
lEnum : Integer;
begin
lString := '';
// Verifica se a string tem mais que 4 caracteres
if Length(piString) > 4 then
begin
// Extrai os 4 primeiros caracteres da string
for lEnum := 1 to 4 do
begin
lString := Concat(lString,piString[lEnum])
end;
// Se a string comear com OID: esses 4 primeiro caracteres sero excludos
if lString = 'OID:' then
begin
lString := '';
for lEnum := 5 to Length(piString) do
begin
lString := Concat(lString,piString[lEnum])
end;
end
// Caso contrrio copia-se a string toda
else
begin
lString := '';
for lEnum := 1 to Length(piString) do
begin
lString := Concat(lString,piString[lEnum])
end;
end;
end
else
begin
lString := piString;
end;
Result := lString;
end;
function TExplorerV2.GetClassTicket(piBloco, piPropertyName: string function TExplorerV2.GetClassTicket(piBloco, piPropertyName: string
): acClassTicket; ): acClassTicket;
var lEnumerator: acEnumerator; var lEnumerator: acEnumerator;
...@@ -2193,31 +2150,6 @@ begin ...@@ -2193,31 +2150,6 @@ begin
lEnumerator.Free; lEnumerator.Free;
end; end;
end; end;
function TExplorerV2.GetStringEntreParenteses(piString: string): string;
var
lString : string;
lEnum : Integer;
flagDadosDesejados : Boolean;
begin
flagDadosDesejados := False;
lString := '';
for lEnum := 1 to Length(piString) do
begin
// Fim dos dados entre parenteses
if piString[lEnum] = ')' then
flagDadosDesejados := False;
if flagDadosDesejados then
begin
lString := Concat(lString,piString[lEnum])
end;
// Inicio dos dados entre parenteses
if piString[lEnum] = '(' then
flagDadosDesejados := True;
end;
Result := lString;
end;
procedure TExplorerV2.memOQLQuery2DragDrop(Sender, Source: TObject; X,Y: Integer); procedure TExplorerV2.memOQLQuery2DragDrop(Sender, Source: TObject; X,Y: Integer);
function IsRoot(piNode: TTreeNode): Boolean; function IsRoot(piNode: TTreeNode): Boolean;
begin begin
...@@ -2449,42 +2381,4 @@ begin ...@@ -2449,42 +2381,4 @@ begin
XMLQuery.Checked := True; XMLQuery.Checked := True;
end; end;
{ TDLLDialog }
constructor TDLLDialog.Create(aOwner: TComponent);
var
BtnShowMessage: TButton;
edt: TEdit;
begin
inherited CreateNew(aOwner);
Caption := 'This form is in a DLL !!!';
Position := poWorkAreaCenter;
Width := 200;
Height := 100;
BtnShowMessage := TButton.Create(Self);
BtnShowMessage.Parent := Self;
BtnShowMessage.Caption := 'Show message';
BtnShowMessage.AutoSize := True;
BtnShowMessage.OnClick := BtnShowMessageClick;
edt := TEdit.Create(Self);
edt.Parent := Self;
end;
procedure TDLLDialog.BtnShowMessageClick(Sender: TObject);
begin
ShowMessage('Hello from DLL!');
end;
procedure TDLLDialog.CreateParams(var Params: TCreateParams);
begin
inherited CreateParams(Params);
{$IFDEF LCLWin32}
Params.WndParent := ParentFormHandle;
{$ENDIF}
end;
end. end.
...@@ -10,7 +10,8 @@ object ExportUnits: TExportUnits ...@@ -10,7 +10,8 @@ object ExportUnits: TExportUnits
Font.Color = clWindowText Font.Color = clWindowText
Font.Height = -11 Font.Height = -11
Font.Name = 'Tahoma' Font.Name = 'Tahoma'
LCLVersion = '2.1.0.0' ShowInTaskBar = stAlways
LCLVersion = '2.2.4.0'
object pnl2: TPanel object pnl2: TPanel
Left = 0 Left = 0
Height = 36 Height = 36
......
...@@ -11650,11 +11650,14 @@ object OQLExplorerV2: TOQLExplorerV2 ...@@ -11650,11 +11650,14 @@ object OQLExplorerV2: TOQLExplorerV2
Caption = 'OQL Name' Caption = 'OQL Name'
Width = 74 Width = 74
end> end>
HideSelection = False
ReadOnly = True
ScrollBars = ssAutoBoth ScrollBars = ssAutoBoth
SmallImages = ilOQLState SmallImages = ilOQLState
TabOrder = 0 TabOrder = 0
ViewStyle = vsReport ViewStyle = vsReport
OnChange = lvOQLListChange OnChange = lvOQLListChange
OnSelectItem = lvOQLListSelectItem
end end
object memError: TMemo object memError: TMemo
Left = 0 Left = 0
......
...@@ -75,23 +75,21 @@ type ...@@ -75,23 +75,21 @@ type
procedure FormResize(Sender: TObject); procedure FormResize(Sender: TObject);
procedure lvOQLListChange(Sender: TObject; Item: TListItem;Change: TItemChange); procedure lvOQLListChange(Sender: TObject; Item: TListItem;Change: TItemChange);
procedure aNewFileExecute(Sender: TObject); procedure aNewFileExecute(Sender: TObject);
procedure lvOQLListSelectItem(Sender: TObject; Item: TListItem;
Selected: Boolean);
procedure splVerticalCanResize(Sender: TObject; var NewSize: Integer; var Accept: Boolean); procedure splVerticalCanResize(Sender: TObject; var NewSize: Integer; var Accept: Boolean);
protected
procedure CreateParams(var Params : TCreateParams); override;
private private
{ Private declarations } { Private declarations }
fFlagFormClosing : Boolean; // Impede que as OQLs sejam inutilmente verificados ao fechar o form fFlagFormClosing : Boolean; // Impede que as OQLs sejam inutilmente verificados ao fechar o form
fExplorer: TExplorerV2; fExplorer: TExplorerV2;
fOQLList: utOQLFile; fOQLList: utOQLFile;
fLastItem: TListItem;
function GerarUnitOQL(piXMLFileName: String): string; function GerarUnitOQL(piXMLFileName: String): string;
procedure InterfaceToSelectedOQL; procedure InterfaceToSelectedOQL(piItem: TListItem);
function GetQueryType ( piExplorer : TExplorerV2 ) : Integer; function GetQueryType ( piExplorer : TExplorerV2 ) : Integer;
function ValidaQuery(piQuery: string; piOQLType: integer): string; function ValidaQuery(piQuery: string; piOQLType: integer): string;
procedure SetQueryType (piType: integer); procedure SetQueryType (piType: integer);
procedure SelectedOQLToInterface; procedure SelectedOQLToInterface(piItem: TListItem);
procedure UpdateOQLList; procedure UpdateOQLList;
public public
{ Public declarations } { Public declarations }
...@@ -122,13 +120,11 @@ begin ...@@ -122,13 +120,11 @@ begin
lvOQLList.Selected.Delete; lvOQLList.Selected.Delete;
lOQL.Delete; lOQL.Delete;
fLastItem := Nil;
if lvOQLList.Items.Count > 0 then if lvOQLList.Items.Count > 0 then
if li - 1 >= 0 then if li - 1 >= 0 then
lvOQLList.Selected := lvOQLList.Items[li-1] lvOQLList.Selected := lvOQLList.Items[li-1]
else else
lvOQLList.Selected := lvOQLList.Items[0]; lvOQLList.Selected := lvOQLList.Items[0];
SelectedOQLToInterface;
end; end;
end; end;
...@@ -139,7 +135,7 @@ begin ...@@ -139,7 +135,7 @@ begin
ShowMessage('You need to save before exporting.') ShowMessage('You need to save before exporting.')
else else
begin begin
InterfaceToSelectedOQL; lvOQLList.Selected := Nil;
fOQLList.Save; fOQLList.Save;
Screen.Cursor := crHourGlass; Screen.Cursor := crHourGlass;
try try
...@@ -514,12 +510,19 @@ begin ...@@ -514,12 +510,19 @@ begin
end; end;
end; end;
procedure TOQLExplorerV2.lvOQLListSelectItem(Sender: TObject; Item: TListItem; Selected: Boolean);
begin
if not Selected
// then if assigned(fLastItem) and (fLastItem <> Item)
then InterfaceToSelectedOQL(Item)
else SelectedOQLToInterface(Item);
end;
procedure TOQLExplorerV2.aNewOQLExecute(Sender: TObject); procedure TOQLExplorerV2.aNewOQLExecute(Sender: TObject);
var lListItem: TListItem; var lListItem: TListItem;
lOQL: utOQL; lOQL: utOQL;
lCont: integer; lCont: integer;
begin begin
InterfaceToSelectedOQL;
lCont := 1; lCont := 1;
while fOQLList.OQLExists('_NEW_OQL_' + inttostr(lCont)) do while fOQLList.OQLExists('_NEW_OQL_' + inttostr(lCont)) do
Inc(lCont); Inc(lCont);
...@@ -531,7 +534,6 @@ begin ...@@ -531,7 +534,6 @@ begin
lListItem.ImageIndex := 2; lListItem.ImageIndex := 2;
lListItem.SubItems.Add('No OQL query'); lListItem.SubItems.Add('No OQL query');
lvOQLList.Selected := lListItem; lvOQLList.Selected := lListItem;
SelectedOQLToInterface;
edtName.SetFocus; edtName.SetFocus;
edtName.SelectAll; edtName.SelectAll;
end; end;
...@@ -539,7 +541,7 @@ end; ...@@ -539,7 +541,7 @@ end;
procedure TOQLExplorerV2.aSaveFileExecute(Sender: TObject); procedure TOQLExplorerV2.aSaveFileExecute(Sender: TObject);
var lFileName: string; var lFileName: string;
begin begin
InterfaceToSelectedOQL; lvOQLList.Selected := Nil;
lFileName := fOQLList.FileName; lFileName := fOQLList.FileName;
try try
if lFileName = '' then if lFileName = '' then
...@@ -578,12 +580,6 @@ begin ...@@ -578,12 +580,6 @@ begin
fExplorer.Show; fExplorer.Show;
end; end;
procedure TOQLExplorerV2.CreateParams(var Params: TCreateParams);
begin
inherited CreateParams(Params);
// Params.ExStyle := Params.ExStyle or WS_EX_APPWINDOW;
end;
procedure TOQLExplorerV2.FormClose(Sender: TObject; var Action: TCloseAction); procedure TOQLExplorerV2.FormClose(Sender: TObject; var Action: TCloseAction);
begin begin
fFlagFormClosing := True; fFlagFormClosing := True;
...@@ -634,13 +630,13 @@ begin ...@@ -634,13 +630,13 @@ begin
Result := __XMLQuery; Result := __XMLQuery;
end; end;
procedure TOQLExplorerV2.InterfaceToSelectedOQL; procedure TOQLExplorerV2.InterfaceToSelectedOQL(piItem: TListItem);
var lOQL: utOQL; var lOQL: utOQL;
lErro: string; lErro: string;
begin begin
if Assigned(fLastItem) and Assigned(fExplorer.SynEditOQL) then if Assigned(piItem) and Assigned(fExplorer.SynEditOQL) then
begin begin
lOQL := utOQL(fLastItem.Data); lOQL := utOQL(piItem.Data);
lOQL.ID := edtName.Text; lOQL.ID := edtName.Text;
lOQL.Description := edtDescription.Text; lOQL.Description := edtDescription.Text;
lOQL.Query := fExplorer.SynEditOQL.Text; lOQL.Query := fExplorer.SynEditOQL.Text;
...@@ -653,39 +649,36 @@ begin ...@@ -653,39 +649,36 @@ begin
if lErro = '' then if lErro = '' then
begin begin
if lOQL.OQLType = 1 if lOQL.OQLType = 1
then fLastItem.ImageIndex := 1 then piItem.ImageIndex := 1
else fLastItem.ImageIndex := 0; else piItem.ImageIndex := 0;
end end
else else
fLastItem.ImageIndex := 2; piItem.ImageIndex := 2;
fLastItem.Caption := edtName.Text; piItem.Caption := edtName.Text;
fLastItem.SubItems[0] := lErro; piItem.SubItems[0] := lErro;
memError.Text := '';
end; end;
end; end;
procedure TOQLExplorerV2.lvOQLListChange(Sender: TObject; Item: TListItem; Change: TItemChange); procedure TOQLExplorerV2.lvOQLListChange(Sender: TObject; Item: TListItem; Change: TItemChange);
begin begin
if assigned(fLastItem) and (fLastItem <> Item) then InterfaceToSelectedOQL;
SelectedOQLToInterface;
end; end;
procedure TOQLExplorerV2.SelectedOQLToInterface; procedure TOQLExplorerV2.SelectedOQLToInterface(piItem: TListItem);
var lOQL: utOQL; var lOQL: utOQL;
begin begin
edtName.Text := ''; edtName.Text := '';
edtDescription.Text := ''; edtDescription.Text := '';
fExplorer.SynEditOQL.Text := ''; fExplorer.SynEditOQL.Text := '';
if Assigned(lvOQLList.Selected) and Assigned( fExplorer.SynEditOQL) then if Assigned(piItem) and Assigned( fExplorer.SynEditOQL) then
begin begin
fLastItem := lvOQLList.Selected; lOQL := utOQL(piItem.Data);
lOQL := utOQL(lvOQLList.Selected.Data);
edtName.Text := lOQL.ID; edtName.Text := lOQL.ID;
edtDescription.Text := lOQL.Description; edtDescription.Text := lOQL.Description;
fExplorer.SynEditOQL.Text := lOQL.Query; fExplorer.SynEditOQL.Text := lOQL.Query;
memError.Text := lvOQLList.Selected.SubItems[0]; memError.Text := piItem.SubItems[0];
SetQueryType(lOQL.OQLType); SetQueryType(lOQL.OQLType);
end end;
else fLastItem := Nil;
lvOQLList.Column[0].Caption := 'OQL''s (' + IntToStr(fOQLList.Count) + ')'; lvOQLList.Column[0].Caption := 'OQL''s (' + IntToStr(fOQLList.Count) + ')';
end; end;
...@@ -740,7 +733,6 @@ begin ...@@ -740,7 +733,6 @@ begin
if lvOQLList.Items.Count > 0 then if lvOQLList.Items.Count > 0 then
begin begin
lvOQLList.ItemIndex := 0; lvOQLList.ItemIndex := 0;
SelectedOQLToInterface;
end; end;
end; end;
......
...@@ -13,6 +13,8 @@ object OQLParams: TOQLParams ...@@ -13,6 +13,8 @@ object OQLParams: TOQLParams
Font.Name = 'Tahoma' Font.Name = 'Tahoma'
OnClose = FormClose OnClose = FormClose
Position = poDesktopCenter Position = poDesktopCenter
ShowInTaskBar = stAlways
LCLVersion = '2.2.4.0'
object Panel1: TPanel object Panel1: TPanel
Left = 0 Left = 0
Height = 214 Height = 214
......
...@@ -9,7 +9,8 @@ object itServiceParameters: TitServiceParameters ...@@ -9,7 +9,8 @@ object itServiceParameters: TitServiceParameters
ClientWidth = 314 ClientWidth = 314
ParentFont = True ParentFont = True
Position = poScreenCenter Position = poScreenCenter
LCLVersion = '2.1.0.0' ShowInTaskBar = stAlways
LCLVersion = '2.2.4.0'
object Panel2: TPanel object Panel2: TPanel
Left = 0 Left = 0
Height = 284 Height = 284
......
...@@ -11,7 +11,8 @@ object XSDExplorer: TXSDExplorer ...@@ -11,7 +11,8 @@ object XSDExplorer: TXSDExplorer
Font.Name = 'Tahoma' Font.Name = 'Tahoma'
OnCreate = FormCreate OnCreate = FormCreate
OnShow = FormShow OnShow = FormShow
LCLVersion = '2.0.0.4' ShowInTaskBar = stAlways
LCLVersion = '2.2.4.0'
WindowState = wsMaximized WindowState = wsMaximized
object Panel1: TPanel object Panel1: TPanel
Left = 0 Left = 0
...@@ -617,12 +618,12 @@ object XSDExplorer: TXSDExplorer ...@@ -617,12 +618,12 @@ object XSDExplorer: TXSDExplorer
end end
object tbsTriggers: TTabSheet object tbsTriggers: TTabSheet
Caption = 'Triggers' Caption = 'Triggers'
ClientHeight = 0 ClientHeight = 400
ClientWidth = 0 ClientWidth = 694
ImageIndex = 1 ImageIndex = 1
object trvStates: TTreeView object trvStates: TTreeView
Left = 0 Left = 0
Height = 361 Height = 365
Top = 35 Top = 35
Width = 694 Width = 694
Align = alClient Align = alClient
...@@ -715,8 +716,8 @@ object XSDExplorer: TXSDExplorer ...@@ -715,8 +716,8 @@ object XSDExplorer: TXSDExplorer
end end
end end
object alMain: TActionList object alMain: TActionList
left = 664 Left = 664
top = 8 Top = 8
object actNewXSD: TAction object actNewXSD: TAction
Caption = 'New XSD' Caption = 'New XSD'
OnExecute = actNewXSDExecute OnExecute = actNewXSDExecute
...@@ -745,80 +746,39 @@ object XSDExplorer: TXSDExplorer ...@@ -745,80 +746,39 @@ object XSDExplorer: TXSDExplorer
end end
end end
object imgOQLState: TImageList object imgOQLState: TImageList
left = 760 Left = 760
top = 8 Top = 8
Bitmap = { Bitmap = {
4C69020000001000000010000000000000000000000000000000000000000000 4C7A020000001000000010000000EA0200000000000078DABD935D48935118C7
00001DA435FF139923FF139923FF139923FF139923FF138C2AFF000000000000 DD7BE6AB9B9B3A25B5B432775149E248838292EC8B299639FCB8C988A0F2E332
0000000000000000000000000000000000000000000000000000139923FF1399 2FD4B00FEBC24022BAB08C36174E479BA18BA661132D9A82047A91A0178E4448
23FF98E1B5FFBDEED4FFA7E7C4FF90E0B1FF78D99FFF49C779FF1B9D3DFF1B9D 26E4A286860DFF9DF7DDDA9CE9360D7AE0CF79CF799FDFFF39CF399CB0B0BF63
3DFF0000000000000000000000000000000000000000139923FF6ACC88FFD0F4 A7EE10E25BE5FE6A4E475890F893FB64C68C81854FD0CF7DC0C3CF26D44EB521
E3FF9AE1B6FF50C77AFF38BD67FF2CBA5DFF30BB60FF2FBC5DFF23BC4FFF11A3 6FA40EC9EA63BC3662AB3E3661DC398BA733BD383F528FC303D770A0BF1C8AB7
30FF06620FFF000000000000000000000000139923FF56C573FFC5F0D8FF66CF 9790692987DC520859BB02ECE518AC654BADD761FD3689AB63CD487DAD82DC5C
8CFF20B452FF23B554FFAAE6C0FF96DEB1FF19B148FF13AC3CFF12AA34FF0FB0 0CC39721B4D84CD86E5222BEEB28E20CD988E9C980B8753748B518AB79C39C15
2DFF0A991FFF036B0AFF0000000000000000139923FFAAE7C5FF68D08EFF16AF 15E30F90D0AD44B2A90047062BE0742D818B7B531AC80C0711ADDF8F285D2A44
48FF1BB14CFF39BF68FFF4FCF7FFFFFFFFFF84D99EFF11AA32FF0EA729FF0BA4 DD295E9EAD8D46C14025EE4EEB91D65B829457E790466B732A19BD8599453BEF
20FF09AF1CFF036B0AFF0000000006780EFF4CBD69FF83DDA7FF22B655FF1CB2 D134A546AC311392CEBD60F50920CD6208CE10707CB1B51EA7866BA01A6940D9
4EFF22B554FF22B554FF55CA7FFFE1F6E9FFFFFFFFFF88D99DFF10AB2FFF0CA6 E81D948EDEE6C73CDA53DDC4232CAF2CF31E8FA73BB0E36516223A9240D4129E
27FF06A716FF038C0AFF014603FF06780EFF54C57AFF44C674FF52C77DFF57CA 8FAC89430EAD9FDE7F011B856BC5E5FD36CCF6806825206D1230AA70B01552EC
81FF56CA80FF57CA81FF49C573FF79D592FFFAFEFAFFFFFFFFFF97DDA5FF1AAD 311561575F1106BF8EA17F7E187DF6F778336F85998E7DF67758F49CC3C2B283
33FF07A518FF039D0CFF014603FF087412FF3EBD69FF2ABA5CFFFFFFFFFFFFFF EEF5A29717E40B41CA5824B6E722C99C0F99311BAC5606A29140D826E5C79AF1
FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCFEFCFFFFFFFFFFFFFFFFFFAAE3 06BEFE8F5F4EE45894FC1A794ED542FB3F41785EDA2847626F2EA25F64205C1B
B0FF03A00CFF039F0CFF025205FF06680DFF21B151FF1EB751FFBFEDCFFFBAEA CFB311D4A771E23E5FD7E95AC4714BBE9BE5D441752392E7B93B10168A10DBA5
C6FFB7E9C2FFB8EAC5FFB5E9C2FFB7E9C1FFF6FCF7FFFFFFFFFFEEFAEFFF54C5 80D4B80F221DBD1B4D0C120CA998F83E09FBCF792887543E96EE9BE869EF0542
5EFF03A00CFF039F0CFF014A04FF035706FF17A341FF18B54AFF11AB34FF06A0 EFFD733C5B2D83D8B81B11BA6D106AA460D4627AC6621FC749EB61AB583F9E0B
11FF039E0CFF049F0DFF039E0CFF74D07DFFFCFEFCFFF3FBF4FF3EBC48FF039E 423DC8151184EDB4EF4E2E370A8C46ECAEA7F5EC99AE33952C04D9CCBA6F4070
0CFF03A10CFF03960AFF014203FF035706FF0D8223FF17B641FF0EA92DFF05A0 9A8013A98D047916E56639D1BB666E8A20382BE415EC1D0A140C04B9044C9190
13FF049F0DFF07A011FF82D589FFFFFFFFFFF4FCF6FF40BC4AFF039E0CFF039E 97E024F5CD6282725B0A05C0EB5FF9FFE9B15E5E281E21FD7720A07FD0BD2D79
0CFF03A50CFF037B08FF014203FF00000000044F09FF10AC30FF0DAB28FF09A4 3C1CF05FDBC4F9286C3E0F5E4B9B3F5BC51CDC726C81B5C18FE7E69B626D3E66
1CFF039E0FFF16AA20FFD5F2D8FFE9F8EAFF48C052FF039E0CFF039E0CFF039F ED7C43CE8180B9813C567381EA04F30EA5CFF5F24265B79A1FC0E337A1B35A41
0CFF03A70CFF024C04FF0000000000000000044F09FF066B11FF0AAB1FFF07A4
15FF049E0DFF029D0AFF039D0AFF039E0CFF039E0CFF039E0CFF03A00CFF03A7
0CFF026A06FF024C04FF000000000000000000000000034F09FF036509FF04A3
0DFF03A60CFF03A00BFF029E0AFF039F0CFF03A00CFF03A50CFF03A60CFF0269
06FF013402FF0000000000000000000000000000000000000000014503FF0145
03FF037808FF039C0BFF039F0CFF039F0CFF039D0CFF027E09FF014D04FF014D
04FF000000000000000000000000000000000000000000000000000000000000
0000013002FF014103FF025104FF025104FF014303FF013302FF000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000030FFFF0030FFFF00000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000030FFFF0030FFFF0030FFFF000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000030FFFF0030FFFF0030FFFF0000
0000000000000000000000000000000000000000000000000000000000000000
00000030FFFF000000000000000000000000000000000030FFFF0030FFFF0030
FFFF0000000000000000000000000000000000000000000000000030FFFF0030
FFFF0000000000000000000000000000000000000000000000000030FFFF0030
EFFF0030FFFF000000000000000000000000000000000030FFFF0030FFFF0000
0000000000000000000000000000000000000000000000000000000000000030
F7FF0030EFFF0030EFFF00000000000000000030F7FF0030FFFF000000000000
0000000000000000000000000000000000000000000000000000000000000000
00000030DEFF0030EFFF0030EFFF0030EFFF0030F7FF00000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000030E7FF0030E7FF0030EFFF0000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
00000030DEFF0030E7FF0030E7FF0030EFFF0030DEFF00000000000000000000
0000000000000000000000000000000000000000000000000000000000000030
DEFF0030DEFF0030DEFF000000000030DEFF0030DEFF0030DEFF000000000000
000000000000000000000000000000000000000000000030EFFF0030DEFF0030
DEFF0030DEFF000000000000000000000000000000000030DEFF0030DEFF0000
0000000000000000000000000000000000000030DEFF0030DEFF0030DEFF0030
DEFF0000000000000000000000000000000000000000000000000030DEFF0030
DEFF000000000000000000000000000000000030DEFF0030DEFF0030DEFF0000
0000000000000000000000000000000000000000000000000000000000000030
DEFF0030DEFF0000000000000000000000000030DEFF0030DEFF000000000000
0000000000000000000000000000000000000000000000000000000000000000
00000030DEFF0030DEFF00000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000030DEFF0030DEFF
} }
end end
object ppmTriggers: TPopupMenu object ppmTriggers: TPopupMenu
OnPopup = ppmTriggersPopup OnPopup = ppmTriggersPopup
left = 528 Left = 528
top = 8 Top = 8
object miClear: TMenuItem object miClear: TMenuItem
Caption = 'Clear' Caption = 'Clear'
OnClick = miClearClick OnClick = miClearClick
......
...@@ -8,11 +8,11 @@ object itMainForm: TitMainForm ...@@ -8,11 +8,11 @@ object itMainForm: TitMainForm
Caption = 'Curio EvoUML Plugin' Caption = 'Curio EvoUML Plugin'
Color = clGradientActiveCaption Color = clGradientActiveCaption
FormStyle = fsSystemStayOnTop FormStyle = fsSystemStayOnTop
OnCreate = FormCreate
Position = poScreenCenter Position = poScreenCenter
ShowInTaskBar = stNever ShowInTaskBar = stNever
LCLVersion = '2.2.4.0' LCLVersion = '2.2.4.0'
object Timer1: TTimer object Timer1: TTimer
Interval = 4000
OnTimer = Timer1Timer OnTimer = Timer1Timer
Left = 16 Left = 16
Top = 16 Top = 16
......
...@@ -18,8 +18,8 @@ type ...@@ -18,8 +18,8 @@ type
TitMainForm = class(TForm) TitMainForm = class(TForm)
Timer1: TTimer; Timer1: TTimer;
procedure FormCreate(Sender: TObject);
procedure Timer1Timer(Sender: TObject); procedure Timer1Timer(Sender: TObject);
private
protected protected
procedure Finalize(var Msg: TLMessage); message WM_FINALIZE; procedure Finalize(var Msg: TLMessage); message WM_FINALIZE;
...@@ -46,8 +46,8 @@ implementation ...@@ -46,8 +46,8 @@ implementation
{$R *.lfm} {$R *.lfm}
uses Win32Int, Win32Proc, LazUTF8, Windows, ituExplorerV2, ituOQLExplorerV2, uses Win32Int, Win32Proc, Windows, ActiveX,
DelphiAddInObj, StarUMLintf, IntegracaoDelphiSUML, ActiveX; LazUTF8, DelphiAddInObj, StarUMLintf, IntegracaoDelphiSUML;
procedure CreateAppHandle; procedure CreateAppHandle;
var var
...@@ -71,8 +71,12 @@ end; ...@@ -71,8 +71,12 @@ end;
procedure TitMainForm.Timer1Timer(Sender: TObject); procedure TitMainForm.Timer1Timer(Sender: TObject);
begin begin
timer1.Enabled := false;
itMainForm.Hide; itMainForm.Hide;
timer1.OnTimer:=nil; end;
procedure TitMainForm.FormCreate(Sender: TObject);
begin
end; end;
procedure TitMainForm.Finalize(var Msg: TLMessage); procedure TitMainForm.Finalize(var Msg: TLMessage);
...@@ -97,8 +101,9 @@ end; ...@@ -97,8 +101,9 @@ end;
procedure TDLLThread.Execute; procedure TDLLThread.Execute;
begin begin
CoInitializeEx(nil, COINIT_SPEED_OVER_MEMORY); CoInitialize(nil);
StarUMLApplication.GetInterface(IID_IStarUMLApplication, gStarUMLApp); StarUMLApplication.GetInterface(IID_IStarUMLApplication, gStarUMLApp);
Application.ExceptionDialog := aedOkMessageBox;
Application.Initialize; Application.Initialize;
CreateAppHandle; CreateAppHandle;
Application.CreateForm(TitMainForm, itMainForm); Application.CreateForm(TitMainForm, itMainForm);
......
...@@ -8,7 +8,8 @@ object CadastroCasoDeUso: TCadastroCasoDeUso ...@@ -8,7 +8,8 @@ object CadastroCasoDeUso: TCadastroCasoDeUso
ClientHeight = 456 ClientHeight = 456
ClientWidth = 782 ClientWidth = 782
Position = poScreenCenter Position = poScreenCenter
LCLVersion = '2.0.0.4' ShowInTaskBar = stAlways
LCLVersion = '2.2.4.0'
object pnPrincipal: TPanel object pnPrincipal: TPanel
Left = 0 Left = 0
Height = 316 Height = 316
...@@ -22,9 +23,9 @@ object CadastroCasoDeUso: TCadastroCasoDeUso ...@@ -22,9 +23,9 @@ object CadastroCasoDeUso: TCadastroCasoDeUso
TabOrder = 0 TabOrder = 0
object lblNome: TLabel object lblNome: TLabel
Left = 8 Left = 8
Height = 14 Height = 13
Top = 88 Top = 88
Width = 31 Width = 32
Caption = 'Nome' Caption = 'Nome'
Font.Color = clWindowText Font.Color = clWindowText
Font.Height = -11 Font.Height = -11
...@@ -35,9 +36,9 @@ object CadastroCasoDeUso: TCadastroCasoDeUso ...@@ -35,9 +36,9 @@ object CadastroCasoDeUso: TCadastroCasoDeUso
end end
object lblCodigo: TLabel object lblCodigo: TLabel
Left = 8 Left = 8
Height = 14 Height = 13
Top = 6 Top = 6
Width = 39 Width = 38
Caption = 'Código' Caption = 'Código'
Font.Color = clWindowText Font.Color = clWindowText
Font.Height = -11 Font.Height = -11
...@@ -48,7 +49,7 @@ object CadastroCasoDeUso: TCadastroCasoDeUso ...@@ -48,7 +49,7 @@ object CadastroCasoDeUso: TCadastroCasoDeUso
end end
object lblDescricao: TLabel object lblDescricao: TLabel
Left = 8 Left = 8
Height = 14 Height = 13
Top = 140 Top = 140
Width = 55 Width = 55
Caption = 'Descrição' Caption = 'Descrição'
...@@ -61,9 +62,9 @@ object CadastroCasoDeUso: TCadastroCasoDeUso ...@@ -61,9 +62,9 @@ object CadastroCasoDeUso: TCadastroCasoDeUso
end end
object lblEntidade: TLabel object lblEntidade: TLabel
Left = 8 Left = 8
Height = 14 Height = 13
Top = 251 Top = 251
Width = 50 Width = 49
Caption = 'Entidade' Caption = 'Entidade'
Font.Color = clWindowText Font.Color = clWindowText
Font.Height = -11 Font.Height = -11
...@@ -74,9 +75,9 @@ object CadastroCasoDeUso: TCadastroCasoDeUso ...@@ -74,9 +75,9 @@ object CadastroCasoDeUso: TCadastroCasoDeUso
end end
object lblCategoria: TLabel object lblCategoria: TLabel
Left = 8 Left = 8
Height = 14 Height = 13
Top = 193 Top = 193
Width = 56 Width = 55
Caption = 'Categoria' Caption = 'Categoria'
Font.Color = clWindowText Font.Color = clWindowText
Font.Height = -11 Font.Height = -11
...@@ -87,18 +88,18 @@ object CadastroCasoDeUso: TCadastroCasoDeUso ...@@ -87,18 +88,18 @@ object CadastroCasoDeUso: TCadastroCasoDeUso
end end
object lblValorCodigo: TLabel object lblValorCodigo: TLabel
Left = 8 Left = 8
Height = 19 Height = 15
Top = 24 Top = 24
Width = 61 Width = 53
Caption = '<código>' Caption = '<código>'
Layout = tlCenter Layout = tlCenter
ParentColor = False ParentColor = False
end end
object Label1: TLabel object Label1: TLabel
Left = 304 Left = 304
Height = 14 Height = 13
Top = 6 Top = 6
Width = 65 Width = 62
Caption = 'Operações' Caption = 'Operações'
Font.Color = clWindowText Font.Color = clWindowText
Font.Height = -11 Font.Height = -11
...@@ -109,9 +110,9 @@ object CadastroCasoDeUso: TCadastroCasoDeUso ...@@ -109,9 +110,9 @@ object CadastroCasoDeUso: TCadastroCasoDeUso
end end
object Label2: TLabel object Label2: TLabel
Left = 538 Left = 538
Height = 14 Height = 13
Top = 6 Top = 6
Width = 56 Width = 51
Caption = 'Sistemas' Caption = 'Sistemas'
Font.Color = clWindowText Font.Color = clWindowText
Font.Height = -11 Font.Height = -11
...@@ -122,29 +123,29 @@ object CadastroCasoDeUso: TCadastroCasoDeUso ...@@ -122,29 +123,29 @@ object CadastroCasoDeUso: TCadastroCasoDeUso
end end
object edtNome: TEdit object edtNome: TEdit
Left = 8 Left = 8
Height = 31 Height = 23
Top = 103 Top = 103
Width = 289 Width = 289
TabOrder = 0 TabOrder = 0
end end
object cbxEntidade: TComboBox object cbxEntidade: TComboBox
Left = 8 Left = 8
Height = 37 Height = 23
Top = 270 Top = 270
Width = 289 Width = 289
AutoDropDown = True AutoDropDown = True
ItemHeight = 0 ItemHeight = 15
Sorted = True Sorted = True
Style = csDropDownList Style = csDropDownList
TabOrder = 3 TabOrder = 3
end end
object cbxCategoria: TComboBox object cbxCategoria: TComboBox
Left = 8 Left = 8
Height = 37 Height = 23
Top = 212 Top = 212
Width = 289 Width = 289
AutoDropDown = True AutoDropDown = True
ItemHeight = 0 ItemHeight = 15
Sorted = True Sorted = True
Style = csDropDownList Style = csDropDownList
TabOrder = 2 TabOrder = 2
...@@ -158,10 +159,13 @@ object CadastroCasoDeUso: TCadastroCasoDeUso ...@@ -158,10 +159,13 @@ object CadastroCasoDeUso: TCadastroCasoDeUso
Checkboxes = True Checkboxes = True
Columns = < Columns = <
item item
AutoSize = True
Caption = 'Sistemas' Caption = 'Sistemas'
Width = 230 Width = 10
end> end>
ParentShowHint = False
ScrollBars = ssAutoBoth ScrollBars = ssAutoBoth
ShowHint = True
SortType = stText SortType = stText
TabOrder = 5 TabOrder = 5
end end
...@@ -174,16 +178,19 @@ object CadastroCasoDeUso: TCadastroCasoDeUso ...@@ -174,16 +178,19 @@ object CadastroCasoDeUso: TCadastroCasoDeUso
Checkboxes = True Checkboxes = True
Columns = < Columns = <
item item
AutoSize = True
Caption = 'Operações' Caption = 'Operações'
Width = 222 Width = 10
end> end>
ParentShowHint = False
ScrollBars = ssAutoBoth ScrollBars = ssAutoBoth
ShowHint = True
SortType = stText SortType = stText
TabOrder = 4 TabOrder = 4
end end
object edtDescricao: TEdit object edtDescricao: TEdit
Left = 8 Left = 8
Height = 31 Height = 23
Top = 155 Top = 155
Width = 289 Width = 289
TabOrder = 1 TabOrder = 1
...@@ -195,7 +202,7 @@ object CadastroCasoDeUso: TCadastroCasoDeUso ...@@ -195,7 +202,7 @@ object CadastroCasoDeUso: TCadastroCasoDeUso
Width = 71 Width = 71
Caption = 'Ícone' Caption = 'Ícone'
ClientHeight = 70 ClientHeight = 70
ClientWidth = 69 ClientWidth = 67
TabOrder = 6 TabOrder = 6
object Label5: TLabel object Label5: TLabel
Left = 17 Left = 17
...@@ -237,7 +244,7 @@ object CadastroCasoDeUso: TCadastroCasoDeUso ...@@ -237,7 +244,7 @@ object CadastroCasoDeUso: TCadastroCasoDeUso
TabOrder = 1 TabOrder = 1
object Label3: TLabel object Label3: TLabel
Left = 225 Left = 225
Height = 14 Height = 13
Top = 13 Top = 13
Width = 202 Width = 202
Caption = 'Destino para criação do caso de uso' Caption = 'Destino para criação do caso de uso'
...@@ -302,7 +309,7 @@ object CadastroCasoDeUso: TCadastroCasoDeUso ...@@ -302,7 +309,7 @@ object CadastroCasoDeUso: TCadastroCasoDeUso
end end
object edtPackage: TEdit object edtPackage: TEdit
Left = 225 Left = 225
Height = 29 Height = 23
Top = 29 Top = 29
Width = 393 Width = 393
Color = 15461355 Color = 15461355
...@@ -311,16 +318,16 @@ object CadastroCasoDeUso: TCadastroCasoDeUso ...@@ -311,16 +318,16 @@ object CadastroCasoDeUso: TCadastroCasoDeUso
end end
object edtUseCaseName: TEdit object edtUseCaseName: TEdit
Left = 8 Left = 8
Height = 29 Height = 23
Top = 29 Top = 29
Width = 198 Width = 198
TabOrder = 1 TabOrder = 1
end end
object Label4: TLabel object Label4: TLabel
Left = 8 Left = 8
Height = 14 Height = 13
Top = 13 Top = 13
Width = 191 Width = 193
Caption = 'Nome no StarUML (case sensitive)' Caption = 'Nome no StarUML (case sensitive)'
Font.Color = clWindowText Font.Color = clWindowText
Font.Height = -11 Font.Height = -11
......
...@@ -7,10 +7,10 @@ unit uCadastroCasoDeUso; ...@@ -7,10 +7,10 @@ unit uCadastroCasoDeUso;
interface interface
uses uses
LCLIntf, LCLType, LMessages, StarUMLintf, LCLIntf, LCLType, StarUMLintf,
Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, SysUtils, Variants, Classes, Graphics, Controls, Forms,
Dialogs, ExtCtrls, StdCtrls, ComCtrls, utuMessage, uCadastroCasoDeUsoIcones, acuObject, cxuCadastroCasoDeUso, Dialogs, ExtCtrls, StdCtrls, ComCtrls, utuMessage, uCadastroCasoDeUsoIcones, acuObject, cxuCadastroCasoDeUso,
Buttons, cxuSession; Buttons;
type type
...@@ -79,9 +79,6 @@ uses IntegracaoDelphiSUML; ...@@ -79,9 +79,6 @@ uses IntegracaoDelphiSUML;
{$R *.dfm} {$R *.dfm}
type
CP1252String = type AnsiString(1252);
constructor TCadastroCasoDeUso.Create(Sender: TComponent; piCadatroCasoDeUso: cxCadatroCasoDeUso; piUseCase: IUMLUseCase); constructor TCadastroCasoDeUso.Create(Sender: TComponent; piCadatroCasoDeUso: cxCadatroCasoDeUso; piUseCase: IUMLUseCase);
begin begin
inherited Create(sender); inherited Create(sender);
...@@ -114,7 +111,6 @@ begin ...@@ -114,7 +111,6 @@ begin
//Retorna do caso de uso os atributos da classe //Retorna do caso de uso os atributos da classe
FreeAndNil(FContextField); FreeAndNil(FContextField);
FContextField := utField.Create; FContextField := utField.Create;
lRequestField := utField.Create; lRequestField := utField.Create;
fcxCadastroCasoDeUso.rmObtemContexto(lRequestField, FContextField); fcxCadastroCasoDeUso.rmObtemContexto(lRequestField, FContextField);
SendToInterface(FContextField); SendToInterface(FContextField);
...@@ -196,8 +192,7 @@ var lFieldCategorias, lFieldCategoria, ...@@ -196,8 +192,7 @@ var lFieldCategorias, lFieldCategoria,
lMemoryStream: TMemoryStream; lMemoryStream: TMemoryStream;
lListItem: TListItem; lListItem: TListItem;
lIDO: integer; lIDO: integer;
I,T: integer; I: integer;
s: CP1252String;
begin begin
inherited; inherited;
//CATEGORIAS //CATEGORIAS
...@@ -225,7 +220,6 @@ begin ...@@ -225,7 +220,6 @@ begin
while not lEnum.EOL do while not lEnum.EOL do
begin begin
lFieldEntidade := utField(lEnum.Current); lFieldEntidade := utField(lEnum.Current);
s := lFieldEntidade.AttributeByName('nome').AsString;
cbxEntidade.AddItem(lFieldEntidade.AttributeByName('nome').AsString, lFieldEntidade.AttributeByName('ido')); cbxEntidade.AddItem(lFieldEntidade.AttributeByName('nome').AsString, lFieldEntidade.AttributeByName('ido'));
lEnum.MoveNext; lEnum.MoveNext;
end; end;
......
...@@ -10,7 +10,8 @@ object CadastroCasoDeUsoIcones: TCadastroCasoDeUsoIcones ...@@ -10,7 +10,8 @@ object CadastroCasoDeUsoIcones: TCadastroCasoDeUsoIcones
Font.Height = -11 Font.Height = -11
Font.Name = 'Tahoma' Font.Name = 'Tahoma'
Position = poScreenCenter Position = poScreenCenter
LCLVersion = '2.0.0.4' ShowInTaskBar = stAlways
LCLVersion = '2.2.4.0'
object Panel2: TPanel object Panel2: TPanel
Left = 0 Left = 0
Height = 357 Height = 357
...@@ -79,7 +80,7 @@ object CadastroCasoDeUsoIcones: TCadastroCasoDeUsoIcones ...@@ -79,7 +80,7 @@ object CadastroCasoDeUsoIcones: TCadastroCasoDeUsoIcones
Height = 32 Height = 32
Scaled = True Scaled = True
Width = 32 Width = 32
left = 440 Left = 440
top = 56 Top = 56
end end
end end
...@@ -8,7 +8,8 @@ object CadastroClasse: TCadastroClasse ...@@ -8,7 +8,8 @@ object CadastroClasse: TCadastroClasse
ClientHeight = 345 ClientHeight = 345
ClientWidth = 504 ClientWidth = 504
Position = poScreenCenter Position = poScreenCenter
LCLVersion = '2.0.0.4' ShowInTaskBar = stAlways
LCLVersion = '2.2.4.0'
object Panel1: TPanel object Panel1: TPanel
Left = 0 Left = 0
Height = 345 Height = 345
...@@ -37,9 +38,9 @@ object CadastroClasse: TCadastroClasse ...@@ -37,9 +38,9 @@ object CadastroClasse: TCadastroClasse
TabOrder = 0 TabOrder = 0
object Label4: TLabel object Label4: TLabel
Left = 8 Left = 8
Height = 14 Height = 13
Top = 5 Top = 5
Width = 153 Width = 155
Caption = 'Nome da classe no StarUML' Caption = 'Nome da classe no StarUML'
Font.Color = clWindowText Font.Color = clWindowText
Font.Height = -11 Font.Height = -11
...@@ -50,7 +51,7 @@ object CadastroClasse: TCadastroClasse ...@@ -50,7 +51,7 @@ object CadastroClasse: TCadastroClasse
end end
object edtNomeStarUML: TEdit object edtNomeStarUML: TEdit
Left = 8 Left = 8
Height = 29 Height = 23
Top = 21 Top = 21
Width = 184 Width = 184
TabOrder = 0 TabOrder = 0
...@@ -63,34 +64,34 @@ object CadastroClasse: TCadastroClasse ...@@ -63,34 +64,34 @@ object CadastroClasse: TCadastroClasse
Width = 270 Width = 270
Caption = 'DB Mappings' Caption = 'DB Mappings'
ClientHeight = 83 ClientHeight = 83
ClientWidth = 268 ClientWidth = 266
TabOrder = 1 TabOrder = 1
object Label1: TLabel object Label1: TLabel
Left = 6 Left = 6
Height = 19 Height = 15
Top = 14 Top = 14
Width = 41 Width = 30
Caption = 'Table:' Caption = 'Table:'
ParentColor = False ParentColor = False
end end
object Label2: TLabel object Label2: TLabel
Left = 0 Left = 0
Height = 19 Height = 15
Top = 47 Top = 47
Width = 51 Width = 38
Caption = 'DBIDO:' Caption = 'DBIDO:'
ParentColor = False ParentColor = False
end end
object edtDBTableName: TEdit object edtDBTableName: TEdit
Left = 46 Left = 46
Height = 29 Height = 23
Top = 8 Top = 8
Width = 210 Width = 210
TabOrder = 0 TabOrder = 0
end end
object edtDBIDO: TEdit object edtDBIDO: TEdit
Left = 46 Left = 46
Height = 29 Height = 23
Top = 41 Top = 41
Width = 210 Width = 210
TabOrder = 1 TabOrder = 1
...@@ -108,7 +109,7 @@ object CadastroClasse: TCadastroClasse ...@@ -108,7 +109,7 @@ object CadastroClasse: TCadastroClasse
TabOrder = 1 TabOrder = 1
object Label3: TLabel object Label3: TLabel
Left = 7 Left = 7
Height = 14 Height = 13
Top = 8 Top = 8
Width = 171 Width = 171
Caption = 'Destino para criação da classe' Caption = 'Destino para criação da classe'
...@@ -173,7 +174,7 @@ object CadastroClasse: TCadastroClasse ...@@ -173,7 +174,7 @@ object CadastroClasse: TCadastroClasse
end end
object edtPackage: TEdit object edtPackage: TEdit
Left = 7 Left = 7
Height = 29 Height = 23
Top = 23 Top = 23
Width = 321 Width = 321
Color = 15461355 Color = 15461355
...@@ -192,9 +193,9 @@ object CadastroClasse: TCadastroClasse ...@@ -192,9 +193,9 @@ object CadastroClasse: TCadastroClasse
TabOrder = 0 TabOrder = 0
object lblNome: TLabel object lblNome: TLabel
Left = 97 Left = 97
Height = 14 Height = 13
Top = 13 Top = 13
Width = 124 Width = 125
Caption = 'Nome (case sensitive)' Caption = 'Nome (case sensitive)'
Font.Color = clWindowText Font.Color = clWindowText
Font.Height = -11 Font.Height = -11
...@@ -205,17 +206,17 @@ object CadastroClasse: TCadastroClasse ...@@ -205,17 +206,17 @@ object CadastroClasse: TCadastroClasse
end end
object lblValorCodigo: TLabel object lblValorCodigo: TLabel
Left = 9 Left = 9
Height = 19 Height = 15
Top = 32 Top = 32
Width = 97 Width = 78
Caption = 'lblValorCodigo' Caption = 'lblValorCodigo'
ParentColor = False ParentColor = False
end end
object lblCodigo: TLabel object lblCodigo: TLabel
Left = 9 Left = 9
Height = 14 Height = 13
Top = 13 Top = 13
Width = 39 Width = 38
Caption = 'Código' Caption = 'Código'
Font.Color = clWindowText Font.Color = clWindowText
Font.Height = -11 Font.Height = -11
...@@ -226,7 +227,7 @@ object CadastroClasse: TCadastroClasse ...@@ -226,7 +227,7 @@ object CadastroClasse: TCadastroClasse
end end
object edtNome: TEdit object edtNome: TEdit
Left = 96 Left = 96
Height = 29 Height = 23
Top = 32 Top = 32
Width = 390 Width = 390
OnChange = edtNomeChange OnChange = edtNomeChange
......
object fDBAttributeParameters: TfDBAttributeParameters object fDBAttributeParameters: TfDBAttributeParameters
Left = 2174 Left = 100
Height = 380 Height = 380
Top = 341 Top = 341
Width = 348 Width = 348
...@@ -14,7 +14,8 @@ object fDBAttributeParameters: TfDBAttributeParameters ...@@ -14,7 +14,8 @@ object fDBAttributeParameters: TfDBAttributeParameters
KeyPreview = True KeyPreview = True
OnShow = FormShow OnShow = FormShow
Position = poDesktopCenter Position = poDesktopCenter
LCLVersion = '2.0.2.0' ShowInTaskBar = stAlways
LCLVersion = '2.2.4.0'
object pnlError: TPanel object pnlError: TPanel
Left = 0 Left = 0
Height = 27 Height = 27
......
This diff is collapsed.
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