Commit d36b4459 authored by Sandro Camata Santana's avatar Sandro Camata Santana

Ajustes para compatibilização Linux
parent 1f872ceb
...@@ -11,9 +11,12 @@ uses ...@@ -11,9 +11,12 @@ uses
cthreads, cthreads,
{$ENDIF}{$ENDIF} {$ENDIF}{$ENDIF}
SysUtils, SysUtils,
LCLType,
Classes, Classes,
Interfaces, Interfaces,
{$IFDEF DARWIN}
CocoaInt, CocoaInt,
{$ENDIF}
Forms, Forms,
acuObject, acuObject,
utuMessage, utuMessage,
...@@ -37,12 +40,26 @@ uses ...@@ -37,12 +40,26 @@ uses
utuXSD in 'utuXSD.pas', utuXSD in 'utuXSD.pas',
DelphiAddInObj in 'DelphiAddInObj.pas'; DelphiAddInObj in 'DelphiAddInObj.pas';
type
{ ExceptionCatch }
ExceptionCatch= Class
public
procedure CustomExceptionHandler(Sender: TObject; E: Exception);
end;
exports exports
InitializeAddIn, InitializeAddIn,
FinalizeAddIn, FinalizeAddIn,
DoMenuAction; DoMenuAction;
{$R *.res} { ExceptionCatch }
procedure ExceptionCatch.CustomExceptionHandler(Sender: TObject; E: Exception);
begin
Application.MessageBox(PChar(E.message), 'Error...', MB_ICONERROR or MB_OK);
end;
begin begin
ChangeLocaleFormatSetting; ChangeLocaleFormatSetting;
...@@ -50,13 +67,18 @@ begin ...@@ -50,13 +67,18 @@ begin
PersistenceManager.DefaultRepositoryClass := typeOf(acRepositorySQL); PersistenceManager.DefaultRepositoryClass := typeOf(acRepositorySQL);
PersistenceManager.RegisterClass(typeOf(acPersistentObject), acPersistentObjectClassFactory.Create); PersistenceManager.RegisterClass(typeOf(acPersistentObject), acPersistentObjectClassFactory.Create);
gSQLDialectManager.RegisterSQLDialect('MS SQL Server', typeOf(acSQLDialectSQLServer), acSQLDialectSQLServerClassFactory.Create); gSQLDialectManager.RegisterSQLDialect('MS SQL Server', typeOf(acSQLDialectSQLServer), acSQLDialectSQLServerClassFactory.Create);
// gSQLDialectManager.RegisterSQLDialect('Oracle', typeOf(acSQLDialectOracle), acSQLDialectOracleClassFactory.Create); gSQLDialectManager.RegisterSQLDialect('Oracle', typeOf(acSQLDialectOracle), acSQLDialectOracleClassFactory.Create);
// gSQLDialectManager.RegisterSQLDialect('DB2', typeOf(acSQLDialectDB2), acSQLDialectDB2ClassFactory.Create); gSQLDialectManager.RegisterSQLDialect('DB2', typeOf(acSQLDialectDB2), acSQLDialectDB2ClassFactory.Create);
gLinksManager.RegisterLink('tcp/ip', typeOf(utLinkSock), utLinkSockClassFactory.Create); gLinksManager.RegisterLink('tcp/ip', typeOf(utLinkSock), utLinkSockClassFactory.Create);
{$IFDEF DARWIN}
MainPool := Nil; MainPool := Nil;
{$ENDIF}
Application.Initialize; Application.Initialize;
Application.Scaled := True;
Application.OnException := ExceptionCatch.CustomExceptionHandler;
// Application.CaptureExceptions := True; // Application.CaptureExceptions := True;
// ExtensionManager.LoadProfiles; // ExtensionManager.LoadProfiles;
......
...@@ -3,7 +3,7 @@ unit DelphiAddInObj; ...@@ -3,7 +3,7 @@ unit DelphiAddInObj;
interface interface
uses uses
LCLType, IntegracaoDelphiSUML, StarUMLintf, Classes; LCLType, IntegracaoDelphiSUML, StarUMLintf, cxuSession, Classes;
type type
...@@ -40,7 +40,7 @@ type ...@@ -40,7 +40,7 @@ type
procedure ListOwnedClasses( piPackage : IUMLPackage ; piObjectList : TInterfaceList ; piStringList : TStringList); procedure ListOwnedClasses( piPackage : IUMLPackage ; piObjectList : TInterfaceList ; piStringList : TStringList);
procedure ListOwnedUseCases ( piPackage : IUMLPackage ; piObjectList : TInterfaceList ; piStringList : TStringList); procedure ListOwnedUseCases ( piPackage : IUMLPackage ; piObjectList : TInterfaceList ; piStringList : TStringList);
class function GetServiceConnectionString: string; class function GetServiceSession: cxSession;
class function DoMenuAction(const ActionID: Integer): Integer; class function DoMenuAction(const ActionID: Integer): Integer;
// function NotifyEvent(AEvent: EventKind): HResult; stdcall; // function NotifyEvent(AEvent: EventKind): HResult; stdcall;
end; end;
...@@ -50,7 +50,8 @@ implementation ...@@ -50,7 +50,8 @@ implementation
uses uses
InstantCode, SysUtils, Mostra_Processamento, utuStateMachine, fCodeGen, Controls, Forms, InstantCode, SysUtils, Mostra_Processamento, utuStateMachine, fCodeGen, Controls, Forms,
fModelMappingsGenerationOptions, fXSDEditor, ituDataBaseLogin, cxuSession, formMemo, fModelMappingsGenerationOptions, fXSDEditor, ituDataBaseLogin, formMemo,
cxuCadastroClasse, cxuCadastroCasoDeUso,
utuMessage, uCadastroCasoDeUso, uCadastroClasse, ituServiceParameters, ituExplorerV2, utuMessage, uCadastroCasoDeUso, uCadastroClasse, ituServiceParameters, ituExplorerV2,
Registry, uRTFEditor, ituXSDExplorer, ituExportUnits, ituOQLExplorerV2; Registry, uRTFEditor, ituXSDExplorer, ituExportUnits, ituOQLExplorerV2;
...@@ -107,7 +108,7 @@ begin ...@@ -107,7 +108,7 @@ begin
result := gStarUMLApp.SelectionManager.GetSelectedModelAt(0); result := gStarUMLApp.SelectionManager.GetSelectedModelAt(0);
end; end;
class function TDelphiAddInObj.GetServiceConnectionString: string; class function TDelphiAddInObj.GetServiceSession: cxSession;
var lServiceParamDialog: TitServiceParameters; var lServiceParamDialog: TitServiceParameters;
lReg: TRegistry; lReg: TRegistry;
begin begin
...@@ -135,13 +136,10 @@ begin ...@@ -135,13 +136,10 @@ begin
gStarUMLApp.ProjectManager.Project.SetTaggedValueAsInteger('DBMappings', 'ProjectMap', 'SystemCode', lServiceParamDialog.SystemCode); gStarUMLApp.ProjectManager.Project.SetTaggedValueAsInteger('DBMappings', 'ProjectMap', 'SystemCode', lServiceParamDialog.SystemCode);
gStarUMLApp.ProjectManager.Project.SetTaggedValueAsInteger('DBMappings', 'ProjectMap', 'PortNumber', lServiceParamDialog.PortNumber); gStarUMLApp.ProjectManager.Project.SetTaggedValueAsInteger('DBMappings', 'ProjectMap', 'PortNumber', lServiceParamDialog.PortNumber);
result := format('ServerName=%s;PortNumber=%d;SystemCode=%d;UserName=%s;Password=%s;', result := lServiceParamDialog.Session;
[lServiceParamDialog.ServerName, lServiceParamDialog.PortNumber,
lServiceParamDialog.SystemCode, lServiceParamDialog.UserName,
lServiceParamDialog.Password]);
end end
else else
result := ''; result := Nil;
finally finally
lReg.free; lReg.free;
end; end;
...@@ -177,7 +175,6 @@ begin ...@@ -177,7 +175,6 @@ begin
on E: Exception do on E: Exception do
begin begin
Application.MessageBox(PAnsiChar(e.Message), 'Staruml', MB_ICONERROR); Application.MessageBox(PAnsiChar(e.Message), 'Staruml', MB_ICONERROR);
raise;
end; end;
end; end;
end; end;
...@@ -274,29 +271,32 @@ end; ...@@ -274,29 +271,32 @@ end;
class procedure TDelphiAddInObj.ActionMenu_InsertClass; class procedure TDelphiAddInObj.ActionMenu_InsertClass;
var lCadClasse: TCadastroClasse; var lCadClasse: TCadastroClasse;
lConnString: string; lSession: cxSession;
lCadastroClasseUC: cxCadastroClasse;
lModel: IModel; lModel: IModel;
lUMLPackageAux: IUMLPackage; lUMLPackageAux: IUMLPackage;
begin begin
lCadClasse := nil; lCadClasse := nil;
lConnString := GetServiceConnectionString; lSession := GetServiceSession;
if lConnString <> '' then if Assigned(lSession) then
begin begin
lModel := gStarUMLApp.SelectionManager.GetSelectedModelAt(0); lModel := gStarUMLApp.SelectionManager.GetSelectedModelAt(0);
lCadastroClasseUC := cxCadastroClasse.Create(lSession);
try try
if lModel.QueryInterface(IUMLPackage, lUMLPackageAux) = S_OK then lCadClasse := TCadastroClasse.Create(nil, lCadastroClasseUC, Nil);
begin try
lCadClasse := TCadastroClasse.Create(nil, lConnString, Nil); if lModel.QueryInterface(IUMLPackage, lUMLPackageAux) = S_OK then
lCadClasse.ClassPackage := lModel as IUMLPackage; begin
end lCadClasse.ClassPackage := lModel as IUMLPackage;
else end;
begin if lCadClasse.ShowModal = mrok then
lCadClasse := TCadastroClasse.Create(nil, lConnString, Nil); gStarUMLApp.SelectInModelExplorer(lCadClasse.UMLClass);
finally
lCadClasse.Free;
end; end;
if lCadClasse.ShowModal = mrok then
gStarUMLApp.SelectInModelExplorer(lCadClasse.UMLClass);
finally finally
if assigned(lCadClasse) then lCadClasse.Free; lCadastroClasseUC.Free;
end; end;
end; end;
end; end;
...@@ -327,58 +327,66 @@ end; ...@@ -327,58 +327,66 @@ end;
class procedure TDelphiAddInObj.ActionMenu_EditClass; class procedure TDelphiAddInObj.ActionMenu_EditClass;
var lCadClasse: TCadastroClasse; var lCadClasse: TCadastroClasse;
lConnString: string; lSession: cxSession;
lCadastroClasseUC: cxCadastroClasse;
lModel: IModel; lModel: IModel;
lUMLClassAux: IUMLClass; lUMLClassAux: IUMLClass;
begin begin
lCadClasse := nil; lModel := gStarUMLApp.SelectionManager.GetSelectedModelAt(0);
lConnString := GetServiceConnectionString; if lModel.QueryInterface(IUMLClass, lUMLClassAux) = S_OK then
if lConnString <> '' then
begin begin
lModel := gStarUMLApp.SelectionManager.GetSelectedModelAt(0); lUMLClassAux := lModel as IUMLClass;
if lModel.QueryInterface(IUMLClass, lUMLClassAux) = S_OK then lSession := GetServiceSession;
begin if Assigned(lSession) then
lUMLClassAux := lModel as IUMLClass; begin
lCadastroClasseUC := cxCadastroClasse.Create(lSession);
try
lCadClasse := TCadastroClasse.Create(nil, lCadastroClasseUC, lUMLClassAux);
try try
lCadClasse := TCadastroClasse.Create(nil, lConnString, lUMLClassAux);
if lCadClasse.ShowModal = mrok then if lCadClasse.ShowModal = mrok then
gStarUMLApp.SelectInModelExplorer(lCadClasse.UMLClass); gStarUMLApp.SelectInModelExplorer(lCadClasse.UMLClass);
finally finally
if assigned(lCadClasse) then lCadClasse.Free; lCadClasse.Free;
end; end;
end finally
else lCadastroClasseUC.Free;
raise Exception.Create('This option is avaliable only for classes.'); end;
end; end;
end else raise Exception.Create('This option is avaliable only for classes.');
end; end;
class procedure TDelphiAddInObj.ActionMenu_EditUseCase; class procedure TDelphiAddInObj.ActionMenu_EditUseCase;
var lCadCasoDeUso: TCadastroCasoDeUso; var lCadCasoDeUso: TCadastroCasoDeUso;
lConnString: string; lSession: cxSession;
lCadastroCasoUsoUC: cxCadatroCasoDeUso;
lModel: IModel; lModel: IModel;
lUMLUseCaseAux: IUMLUseCase; lUMLUseCaseAux: IUMLUseCase;
begin begin
lCadCasoDeUso := nil; lModel := gStarUMLApp.SelectionManager.GetSelectedModelAt(0);
lConnString := GetServiceConnectionString; if lModel.QueryInterface(IUMLUsecase, lUMLUseCaseAux) = S_OK then
if lConnString <> '' then
begin begin
lModel := gStarUMLApp.SelectionManager.GetSelectedModelAt(0); lUMLUseCaseAux := lModel as IUMLUsecase;
try
if lModel.QueryInterface(IUMLUsecase, lUMLUseCaseAux) = S_OK then
begin
lUMLUseCaseAux := lModel as IUMLUsecase;
lCadCasoDeUso := TCadastroCasoDeUso.Create(nil, lConnString, lUMLUseCaseAux);
end
else
raise exception.Create('This option is only avaliable for Usecases.');
if lCadCasoDeUso.ShowModal = mrok then lSession := GetServiceSession;
gStarUMLApp.SelectInModelExplorer(lCadCasoDeUso.UseCase); if assigned(lSession) then
finally begin
if assigned(lCadCasoDeUso) then lCadCasoDeUso.Free; lCadastroCasoUsoUC := cxCadatroCasoDeUso.Create(lSession);
try
lCadCasoDeUso := TCadastroCasoDeUso.Create(nil, lCadastroCasoUsoUC, lUMLUseCaseAux);
try
if lCadCasoDeUso.ShowModal = mrok then
gStarUMLApp.SelectInModelExplorer(lCadCasoDeUso.UseCase);
finally
lCadCasoDeUso.Free;
end;
finally
lCadastroCasoUsoUC.Free;
end;
end; end;
end; end
else raise exception.Create('This option is only avaliable for Usecases.');
end; end;
class procedure TDelphiAddInObj.ActionMenu_GeneratePreview; class procedure TDelphiAddInObj.ActionMenu_GeneratePreview;
...@@ -616,32 +624,33 @@ end; ...@@ -616,32 +624,33 @@ end;
class procedure TDelphiAddInObj.ActionMenu_InsertUseCase; class procedure TDelphiAddInObj.ActionMenu_InsertUseCase;
var lCadCasoDeUso: TCadastroCasoDeUso; var lCadCasoDeUso: TCadastroCasoDeUso;
lConnString: string; lSession: cxSession;
lCadastroCasoUsoUC: cxCadatroCasoDeUso;
lModel: IModel; lModel: IModel;
lUMLPackageAux: IUMLPackage; lUMLPackageAux: IUMLPackage;
begin begin
lCadCasoDeUso := nil; lCadCasoDeUso := nil;
lConnString := GetServiceConnectionString; lSession := GetServiceSession;
if lConnString <> '' then if assigned(lSession) then
begin begin
lModel := gStarUMLApp.SelectionManager.GetSelectedModelAt(0); lModel := gStarUMLApp.SelectionManager.GetSelectedModelAt(0);
lCadastroCasoUsoUC := cxCadatroCasoDeUso.Create(lSession);
try try
if lModel.QueryInterface(IUMLPackage, lUMLPackageAux) = S_OK then lCadCasoDeUso := TCadastroCasoDeUso.Create(nil, lCadastroCasoUsoUC, Nil);
begin try
lCadCasoDeUso := TCadastroCasoDeUso.Create(nil, lConnString, Nil); if lModel.QueryInterface(IUMLPackage, lUMLPackageAux) = S_OK then
lCadCasoDeUso.UseCasePackage := lModel as IUMLPackage; begin
end lCadCasoDeUso.UseCasePackage := lModel as IUMLPackage;
else end;
begin
lCadCasoDeUso := TCadastroCasoDeUso.Create(nil, lConnString, Nil);
end;
if lCadCasoDeUso.ShowModal = mrok then if lCadCasoDeUso.ShowModal = mrok then
gStarUMLApp.SelectInModelExplorer(lCadCasoDeUso.UseCase); gStarUMLApp.SelectInModelExplorer(lCadCasoDeUso.UseCase);
finally
if assigned(lCadCasoDeUso) then lCadCasoDeUso.Free;
end;
finally finally
if assigned(lCadCasoDeUso) then lCadCasoDeUso.Free; lCadastroCasoUsoUC.Free;
end; end;
end; end;
end; end;
......
...@@ -30,11 +30,7 @@ ...@@ -30,11 +30,7 @@
unit InstantTextFiler; unit InstantTextFiler;
{$IFDEF LINUX}
{$I '../InstantDefines.inc'}
{$ELSE}
{$I 'InstantDefines.inc'} {$I 'InstantDefines.inc'}
{$ENDIF}
interface interface
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -3,29 +3,36 @@ unit formMemo; ...@@ -3,29 +3,36 @@ unit formMemo;
interface interface
uses uses
Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, Dialogs,
Dialogs, StdCtrls, ExtCtrls, ComCtrls, SynEdit; StdCtrls, ExtCtrls, ComCtrls, SynEdit, SynHighlighterPas, SynHighlighterJava,
SynHighlighterSQL;
type type
{ TPreviewClassCode }
TPreviewClassCode = class(TForm) TPreviewClassCode = class(TForm)
Panel2: TPanel; Panel2: TPanel;
Panel1: TPanel; Panel1: TPanel;
Button1: TButton; Button1: TButton;
pgc_Main: TPageControl; pgc_Main: TPageControl;
mem_ClassJava: TSynEdit;
mem_ClassPascal: TSynEdit;
mem_ClassCSharp: TSynEdit;
mem_ClassSQL: TSynEdit;
mem_ClassOracle: TSynEdit;
SynFreePascalSyn1: TSynFreePascalSyn;
SynJavaSyn1: TSynJavaSyn;
SynSQLSyn1: TSynSQLSyn;
TabSheet1: TTabSheet; TabSheet1: TTabSheet;
pgc_ClassCode: TPageControl; pgc_ClassCode: TPageControl;
TabSheet3: TTabSheet; TabSheet3: TTabSheet;
mem_ClassPascal: TSynEdit;
TabSheet4: TTabSheet; TabSheet4: TTabSheet;
mem_ClassJava: TSynEdit;
TabSheet5: TTabSheet; TabSheet5: TTabSheet;
mem_ClassCSharp: TSynEdit;
TabSheet6: TTabSheet; TabSheet6: TTabSheet;
PageControl1: TPageControl; PageControl1: TPageControl;
TabSheet10: TTabSheet; TabSheet10: TTabSheet;
TabSheet14: TTabSheet; TabSheet14: TTabSheet;
mem_ClassSQL: TSynEdit;
mem_ClassOracle: TSynEdit;
procedure Button1Click(Sender: TObject); procedure Button1Click(Sender: TObject);
private private
{ Private declarations } { Private declarations }
......
object DataBaseLogin: TDataBaseLogin object DataBaseLogin: TDataBaseLogin
Left = 2241 Left = 1480
Height = 543 Height = 537
Top = 255 Top = 299
Width = 440 Width = 440
BorderIcons = [biSystemMenu] BorderIcons = [biSystemMenu]
BorderStyle = bsDialog BorderStyle = bsDialog
Caption = 'Connect to Database Server' Caption = 'Connect to Database Server'
ClientHeight = 543 ClientHeight = 537
ClientWidth = 440 ClientWidth = 440
Color = clBtnFace Color = clBtnFace
OnClose = FormClose OnClose = FormClose
OnShow = FormShow OnShow = FormShow
ParentFont = True ParentFont = True
Position = poOwnerFormCenter Position = poOwnerFormCenter
LCLVersion = '2.0.0.4'
object GroupBox2: TGroupBox object GroupBox2: TGroupBox
Left = 8 Left = 8
Height = 208 Height = 208
Top = 288 Top = 288
Width = 424 Width = 424
TabOrder = 11 ClientHeight = 206
ClientWidth = 422
TabOrder = 1
object edtUsuario: TLabeledEdit
Left = 15
Height = 43
Top = 95
Width = 400
EditLabel.Height = 19
EditLabel.Width = 400
EditLabel.Caption = 'Usuário'
EditLabel.ParentColor = False
TabOrder = 1
end
object edtPassword: TLabeledEdit
Left = 15
Height = 43
Top = 160
Width = 400
EchoMode = emPassword
EditLabel.Height = 19
EditLabel.Width = 400
EditLabel.Caption = 'Senha'
EditLabel.ParentColor = False
PasswordChar = '*'
TabOrder = 2
end
object cbDialect: TComboBox
Left = 15
Height = 39
Top = 25
Width = 400
ItemHeight = 0
OnChange = cbODBCD_DSNChange
Style = csDropDownList
TabOrder = 0
end
object Label2: TLabel
Left = 15
Height = 19
Top = 5
Width = 48
Caption = 'Dialeto'
ParentColor = False
end
end end
object GroupBox1: TGroupBox object GroupBox1: TGroupBox
Left = 8 Left = 8
Height = 272 Height = 272
Top = 8 Top = 8
Width = 424 Width = 424
TabOrder = 10 ClientHeight = 270
end ClientWidth = 422
object cbODBCD_DSN: TComboBox
Left = 32
Height = 15
Top = 48
Width = 389
ItemHeight = 0
OnChange = cbODBCD_DSNChange
Style = csDropDownList
TabOrder = 1
end
object edtUsuario: TLabeledEdit
Left = 21
Height = 22
Top = 398
Width = 400
EditLabel.Height = 16
EditLabel.Width = 400
EditLabel.Caption = 'Usuário'
EditLabel.ParentColor = False
TabOrder = 7
end
object edtPassword: TLabeledEdit
Left = 21
Height = 22
Top = 454
Width = 400
EchoMode = emPassword
EditLabel.Height = 16
EditLabel.Width = 400
EditLabel.Caption = 'Senha'
EditLabel.ParentColor = False
PasswordChar = '*'
TabOrder = 8
end
object cbDialect: TComboBox
Left = 21
Height = 15
Top = 339
Width = 400
ItemHeight = 0
OnChange = cbODBCD_DSNChange
Style = csDropDownList
TabOrder = 6
end
object Label2: TLabel
Left = 21
Height = 16
Top = 320
Width = 45
Caption = 'Dialeto'
ParentColor = False
end
object rbDSN: TRadioButton
Left = 16
Height = 18
Top = 16
Width = 115
Caption = 'Selecionar DSN'
Checked = True
OnClick = rbDSNClick
TabOrder = 0 TabOrder = 0
TabStop = True object cbODBCD_DSN: TComboBox
end Left = 26
object rbPersonalizado: TRadioButton Height = 39
Left = 16 Top = 48
Height = 18 Width = 389
Top = 88 ItemHeight = 0
Width = 108 OnChange = cbODBCD_DSNChange
Caption = 'Personalizado' Style = csDropDownList
OnClick = rbPersonalizadoClick TabOrder = 1
TabOrder = 2 end
end object rbDSN: TRadioButton
object cbODBCD_DRIVERS: TComboBox Left = 10
Left = 35 Height = 24
Height = 15 Top = 16
Top = 120 Width = 130
Width = 386 Caption = 'Selecionar DSN'
Enabled = False Checked = True
ItemHeight = 0 OnClick = rbDSNClick
OnChange = cbODBCD_DSNChange TabOrder = 0
Style = csDropDownList TabStop = True
TabOrder = 3 end
end object rbPersonalizado: TRadioButton
object edtDatabaseName: TLabeledEdit Left = 10
Left = 32 Height = 24
Height = 22 Top = 88
Top = 232 Width = 119
Width = 389 Caption = 'Personalizado'
EditLabel.Height = 16 OnClick = rbPersonalizadoClick
EditLabel.Width = 389 TabOrder = 2
EditLabel.Caption = 'Nome do Banco de Dados' end
EditLabel.ParentColor = False object cbODBCD_DRIVERS: TComboBox
Enabled = False Left = 26
TabOrder = 5 Height = 39
end Top = 115
object edtServerName: TLabeledEdit Width = 389
Left = 32 Enabled = False
Height = 22 ItemHeight = 0
Top = 176 OnChange = cbODBCD_DSNChange
Width = 389 Style = csDropDownList
EditLabel.Height = 16 TabOrder = 3
EditLabel.Width = 389 end
EditLabel.Caption = 'Servidor' object edtDatabaseName: TLabeledEdit
EditLabel.ParentColor = False Left = 26
Enabled = False Height = 43
TabOrder = 4 Top = 232
Width = 389
EditLabel.Height = 19
EditLabel.Width = 389
EditLabel.Caption = 'Nome do Banco de Dados'
EditLabel.ParentColor = False
Enabled = False
TabOrder = 4
end
object edtServerName: TLabeledEdit
Left = 26
Height = 43
Top = 176
Width = 389
EditLabel.Height = 19
EditLabel.Width = 389
EditLabel.Caption = 'Servidor'
EditLabel.ParentColor = False
Enabled = False
TabOrder = 5
end
end end
object Panel2: TPanel object Panel2: TPanel
Left = 0 Left = 0
Height = 40 Height = 40
Top = 503 Top = 497
Width = 440 Width = 440
Align = alBottom Align = alBottom
ClientHeight = 40 ClientHeight = 40
ClientWidth = 440 ClientWidth = 440
TabOrder = 9 TabOrder = 2
object BitBtn1: TBitBtn object BitBtn1: TBitBtn
Left = 268 Left = 238
Height = 25 Height = 27
Top = 7 Top = 5
Width = 75 Width = 93
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
Caption = 'Ok' Caption = 'Ok'
Default = True
Kind = bkOK Kind = bkOK
ModalResult = 1 ModalResult = 1
OnClick = Button1Click OnClick = Button1Click
TabOrder = 0 TabOrder = 0
end end
object BitBtn2: TBitBtn object BitBtn2: TBitBtn
Left = 349 Left = 337
Height = 25 Height = 27
Top = 7 Top = 5
Width = 75 Width = 93
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
Cancel = True
Caption = 'Cancel' Caption = 'Cancel'
Kind = bkCancel Kind = bkCancel
ModalResult = 2 ModalResult = 2
......
object ExplorerV2: TExplorerV2 object ExplorerV2: TExplorerV2
Left = 2406 Left = 577
Height = 695 Height = 696
Top = 177 Top = 103
Width = 1228 Width = 1232
Caption = 'Model OQL Query' Caption = 'Model OQL Query'
ClientHeight = 695 ClientHeight = 696
ClientWidth = 1228 ClientWidth = 1232
Color = clWindow Color = clWindow
Icon.Data = { Icon.Data = {
96A5050000000100060000000000010020002820040066000000101000000100 96A5050000000100060000000000010020002820040066000000101000000100
...@@ -11574,6 +11574,7 @@ object ExplorerV2: TExplorerV2 ...@@ -11574,6 +11574,7 @@ object ExplorerV2: TExplorerV2
001FF80000000000001FF80000000000001FFFFFFFFFFFFFFFFFFFFFFFFFFFFF 001FF80000000000001FF80000000000001FFFFFFFFFFFFFFFFFFFFFFFFFFFFF
FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
} }
KeyPreview = True
OnClose = FormClose OnClose = FormClose
OnCreate = FormCreate OnCreate = FormCreate
OnDestroy = FormDestroy OnDestroy = FormDestroy
...@@ -11581,9 +11582,10 @@ object ExplorerV2: TExplorerV2 ...@@ -11581,9 +11582,10 @@ object ExplorerV2: TExplorerV2
ParentFont = True ParentFont = True
Position = poMainFormCenter Position = poMainFormCenter
ShowInTaskBar = stAlways ShowInTaskBar = stAlways
LCLVersion = '2.0.0.4'
object splVertical: TSplitter object splVertical: TSplitter
Left = 360 Left = 360
Height = 695 Height = 696
Top = 0 Top = 0
Width = 5 Width = 5
MinSize = 5 MinSize = 5
...@@ -11591,56 +11593,56 @@ object ExplorerV2: TExplorerV2 ...@@ -11591,56 +11593,56 @@ object ExplorerV2: TExplorerV2
end end
object pnlEditor: TPanel object pnlEditor: TPanel
Left = 365 Left = 365
Height = 695 Height = 696
Top = 0 Top = 0
Width = 863 Width = 867
Align = alClient Align = alClient
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 695 ClientHeight = 696
ClientWidth = 863 ClientWidth = 867
TabOrder = 0 TabOrder = 0
object pnlResult: TPanel object pnlResult: TPanel
Left = 0 Left = 0
Height = 185 Height = 185
Top = 495 Top = 490
Width = 863 Width = 867
Align = alBottom Align = alBottom
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 185 ClientHeight = 185
ClientWidth = 863 ClientWidth = 867
TabOrder = 0 TabOrder = 0
object pcResults: TPageControl object pcResults: TPageControl
Left = 0 Left = 0
Height = 185 Height = 185
Top = 0 Top = 0
Width = 863 Width = 867
ActivePage = tsError ActivePage = tsError
Align = alClient Align = alClient
ShowTabs = False
TabIndex = 1 TabIndex = 1
TabOrder = 0 TabOrder = 0
object tsQueryResult: TTabSheet object tsQueryResult: TTabSheet
Caption = 'tsQueryResult' Caption = 'tsQueryResult'
ClientHeight = 158 ClientHeight = 181
ClientWidth = 882 ClientWidth = 857
TabVisible = False
object pcXMLResults: TPageControl object pcXMLResults: TPageControl
Left = 0 Left = 0
Height = 158 Height = 181
Top = 0 Top = 0
Width = 882 Width = 853
ActivePage = tsList ActivePage = tsList
Align = alClient Align = alClient
TabIndex = 0 TabIndex = 0
TabOrder = 0 TabOrder = 0
object tsList: TTabSheet object tsList: TTabSheet
Caption = 'Result List' Caption = 'Result List'
ClientHeight = 119 ClientHeight = 177
ClientWidth = 876 ClientWidth = 849
object lvXMLListResult: TListView object lvXMLListResult: TListView
Left = 0 Left = 0
Height = 131 Height = 148
Top = 0 Top = 0
Width = 874 Width = 843
Align = alClient Align = alClient
BorderStyle = bsNone BorderStyle = bsNone
Columns = <> Columns = <>
...@@ -11648,25 +11650,26 @@ object ExplorerV2: TExplorerV2 ...@@ -11648,25 +11650,26 @@ object ExplorerV2: TExplorerV2
ParentColor = True ParentColor = True
ReadOnly = True ReadOnly = True
RowSelect = True RowSelect = True
ScrollBars = ssAutoBoth
TabOrder = 0 TabOrder = 0
ViewStyle = vsReport ViewStyle = vsReport
end end
end end
object tsXML: TTabSheet object tsXML: TTabSheet
Caption = 'XML Result' Caption = 'XML Result'
ClientHeight = 131 ClientHeight = 177
ClientWidth = 874 ClientWidth = 849
ImageIndex = 1 ImageIndex = 1
object memXMLTextResult: TMemo object memXMLTextResult: TMemo
Left = 0 Left = 0
Height = 131 Height = 148
Top = 0 Top = 0
Width = 874 Width = 843
Align = alClient Align = alClient
BorderStyle = bsNone BorderStyle = bsNone
ParentColor = True ParentColor = True
ReadOnly = True ReadOnly = True
ScrollBars = ssBoth ScrollBars = ssAutoBoth
TabOrder = 0 TabOrder = 0
end end
end end
...@@ -11674,20 +11677,19 @@ object ExplorerV2: TExplorerV2 ...@@ -11674,20 +11677,19 @@ object ExplorerV2: TExplorerV2
end end
object tsError: TTabSheet object tsError: TTabSheet
Caption = 'tsError' Caption = 'tsError'
ClientHeight = 146 ClientHeight = 181
ClientWidth = 857 ClientWidth = 857
ImageIndex = 1 ImageIndex = 1
TabVisible = False
object memErrorText: TMemo object memErrorText: TMemo
Left = 0 Left = 0
Height = 146 Height = 181
Top = 0 Top = 0
Width = 857 Width = 857
Align = alClient Align = alClient
BorderStyle = bsNone BorderStyle = bsNone
ParentColor = True ParentColor = True
ReadOnly = True ReadOnly = True
ScrollBars = ssBoth ScrollBars = ssAutoBoth
TabOrder = 0 TabOrder = 0
end end
end end
...@@ -11695,28 +11697,31 @@ object ExplorerV2: TExplorerV2 ...@@ -11695,28 +11697,31 @@ object ExplorerV2: TExplorerV2
end end
object pcEditor: TPageControl object pcEditor: TPageControl
Left = 0 Left = 0
Height = 442 Height = 437
Top = 48 Top = 48
Width = 498 Width = 502
ActivePage = tsOQL ActivePage = tsOQL
Align = alClient Align = alClient
MultiLine = True MultiLine = True
ParentFont = False
TabIndex = 0 TabIndex = 0
TabOrder = 1 TabOrder = 1
OnChange = pcEditorChange OnChange = pcEditorChange
Options = [nboMultiLine] Options = [nboMultiLine]
object tsOQL: TTabSheet object tsOQL: TTabSheet
Caption = 'OQL - Object Query Language' Caption = 'OQL - Object Query Language'
ClientHeight = 403 ClientHeight = 404
ClientWidth = 492 ClientWidth = 492
inline SynEditOQL: TSynEdit inline SynEditOQL: TSynEdit
Left = 0 Left = 0
Height = 403 Height = 404
Top = 0 Top = 0
Width = 492 Width = 492
Align = alClient Align = alClient
Font.Height = -13 Color = clWindow
Font.Name = 'Courier New' Font.Color = clWindowText
Font.Height = 13
Font.Name = 'DejaVu Sans Mono'
Font.Pitch = fpFixed Font.Pitch = fpFixed
Font.Quality = fqNonAntialiased Font.Quality = fqNonAntialiased
ParentColor = False ParentColor = False
...@@ -11725,7 +11730,7 @@ object ExplorerV2: TExplorerV2 ...@@ -11725,7 +11730,7 @@ object ExplorerV2: TExplorerV2
OnDragDrop = memOQLQuery2DragDrop OnDragDrop = memOQLQuery2DragDrop
OnDragOver = memOQLQuery2DragOver OnDragOver = memOQLQuery2DragOver
BorderStyle = bsNone BorderStyle = bsNone
Gutter.Width = 33 Gutter.Width = 23
Gutter.MouseActions = <> Gutter.MouseActions = <>
RightGutter.Width = 0 RightGutter.Width = 0
RightGutter.MouseActions = <> RightGutter.MouseActions = <>
...@@ -12222,14 +12227,16 @@ object ExplorerV2: TExplorerV2 ...@@ -12222,14 +12227,16 @@ object ExplorerV2: TExplorerV2
end end
object tsSQL: TTabSheet object tsSQL: TTabSheet
Caption = 'SQL Translation' Caption = 'SQL Translation'
ClientHeight = 403 ClientHeight = 404
ClientWidth = 492 ClientWidth = 492
inline SynEditSQL: TSynEdit inline SynEditSQL: TSynEdit
Left = 0 Left = 0
Height = 403 Height = 404
Top = 0 Top = 0
Width = 492 Width = 492
Align = alClient Align = alClient
Color = clWindow
Font.Color = clWindowText
Font.Height = -13 Font.Height = -13
Font.Name = 'Courier New' Font.Name = 'Courier New'
Font.Pitch = fpFixed Font.Pitch = fpFixed
...@@ -12238,7 +12245,7 @@ object ExplorerV2: TExplorerV2 ...@@ -12238,7 +12245,7 @@ object ExplorerV2: TExplorerV2
ParentFont = False ParentFont = False
TabOrder = 0 TabOrder = 0
BorderStyle = bsNone BorderStyle = bsNone
Gutter.Width = 33 Gutter.Width = 23
Gutter.MouseActions = <> Gutter.MouseActions = <>
RightGutter.Width = 0 RightGutter.Width = 0
RightGutter.MouseActions = <> RightGutter.MouseActions = <>
...@@ -12739,18 +12746,18 @@ object ExplorerV2: TExplorerV2 ...@@ -12739,18 +12746,18 @@ object ExplorerV2: TExplorerV2
Left = 0 Left = 0
Height = 48 Height = 48
Top = 0 Top = 0
Width = 863 Width = 867
Align = alTop Align = alTop
AutoSize = True AutoSize = True
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 48 ClientHeight = 48
ClientWidth = 863 ClientWidth = 867
TabOrder = 2 TabOrder = 2
object ToolBar1: TToolBar object ToolBar1: TToolBar
Left = 0 Left = 0
Height = 48 Height = 48
Top = 0 Top = 0
Width = 863 Width = 867
ButtonHeight = 40 ButtonHeight = 40
ButtonWidth = 50 ButtonWidth = 50
Caption = 'ToolBar1' Caption = 'ToolBar1'
...@@ -12802,7 +12809,7 @@ object ExplorerV2: TExplorerV2 ...@@ -12802,7 +12809,7 @@ object ExplorerV2: TExplorerV2
Style = tbsCheck Style = tbsCheck
end end
object ToolButton8: TToolButton object ToolButton8: TToolButton
Left = 351 Left = 355
Top = 2 Top = 2
Action = XMLQuery Action = XMLQuery
Grouped = True Grouped = True
...@@ -12823,8 +12830,8 @@ object ExplorerV2: TExplorerV2 ...@@ -12823,8 +12830,8 @@ object ExplorerV2: TExplorerV2
end end
end end
object spResultObject: TSplitter object spResultObject: TSplitter
Left = 498 Left = 502
Height = 442 Height = 437
Top = 48 Top = 48
Width = 5 Width = 5
Align = alRight Align = alRight
...@@ -12832,41 +12839,40 @@ object ExplorerV2: TExplorerV2 ...@@ -12832,41 +12839,40 @@ object ExplorerV2: TExplorerV2
ResizeStyle = rsPattern ResizeStyle = rsPattern
end end
inline OQLObjects: TObjectExplorer inline OQLObjects: TObjectExplorer
Left = 503 Left = 507
Height = 442 Height = 437
Top = 48 Top = 48
Width = 360 Width = 360
Align = alRight Align = alRight
ClientHeight = 442 ClientHeight = 437
ClientWidth = 360 ClientWidth = 360
TabOrder = 4 TabOrder = 4
Visible = False Visible = False
inherited tvExplorer: TTreeView inherited tvExplorer: TTreeView
Height = 442 Height = 437
Width = 360 Width = 360
Images = ilModel Images = ilModel
ParentColor = True ParentColor = True
PopupMenu = pmCopiar PopupMenu = pmCopiar
ReadOnly = False
RightClickSelect = True RightClickSelect = True
Options = [tvoAutoItemHeight, tvoHideSelection, tvoKeepCollapsedNodes, tvoRightClickSelect, tvoShowButtons, tvoShowRoot, tvoToolTips, tvoThemedDraw] Options = [tvoAutoItemHeight, tvoHideSelection, tvoKeepCollapsedNodes, tvoReadOnly, tvoRightClickSelect, tvoShowButtons, tvoShowRoot, tvoToolTips, tvoThemedDraw]
end end
end end
object spResultXML: TSplitter object spResultXML: TSplitter
Cursor = crVSplit Cursor = crVSplit
Left = 0 Left = 0
Height = 5 Height = 5
Top = 490 Top = 485
Width = 863 Width = 867
Align = alBottom Align = alBottom
ResizeAnchor = akBottom ResizeAnchor = akBottom
ResizeStyle = rsPattern ResizeStyle = rsPattern
end end
object sbStatusBar: TStatusBar object sbStatusBar: TStatusBar
Left = 0 Left = 0
Height = 15 Height = 21
Top = 680 Top = 675
Width = 863 Width = 867
Panels = < Panels = <
item item
Width = 400 Width = 400
...@@ -12886,17 +12892,17 @@ object ExplorerV2: TExplorerV2 ...@@ -12886,17 +12892,17 @@ object ExplorerV2: TExplorerV2
end end
object pnlModel: TPanel object pnlModel: TPanel
Left = 0 Left = 0
Height = 695 Height = 696
Top = 0 Top = 0
Width = 360 Width = 360
Align = alLeft Align = alLeft
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 695 ClientHeight = 696
ClientWidth = 360 ClientWidth = 360
TabOrder = 1 TabOrder = 1
object tvModelExplorer: TTreeView object tvModelExplorer: TTreeView
Left = 0 Left = 0
Height = 695 Height = 696
Top = 0 Top = 0
Width = 360 Width = 360
Align = alClient Align = alClient
......
...@@ -117,6 +117,8 @@ type ...@@ -117,6 +117,8 @@ type
{ Public declarations } { Public declarations }
property MetaModel: acMetaModel read fMetaModel write SetMetaModel; property MetaModel: acMetaModel read fMetaModel write SetMetaModel;
property Util: TUtil read fUtil; property Util: TUtil read fUtil;
property SQLDialect: acAbstractSQLDialect read fSQLDialect;
property Schema: String read fSchema;
end; end;
var var
...@@ -370,6 +372,7 @@ begin ...@@ -370,6 +372,7 @@ begin
end end
else else
begin begin
pcResults.ActivePageIndex := 0;
spResultObject.Visible := False; spResultObject.Visible := False;
pnlResult.Visible := True; pnlResult.Visible := True;
spResultXML.Visible := True; spResultXML.Visible := True;
......
object OQLExplorerV2: TOQLExplorerV2 object OQLExplorerV2: TOQLExplorerV2
Left = 375 Left = 2177
Height = 558 Height = 552
Top = 363 Top = 281
Width = 1090 Width = 1090
Caption = 'OQLExplorerV2' Caption = 'Curio OQL Explorer'
ClientHeight = 558 ClientHeight = 552
ClientWidth = 1090 ClientWidth = 1090
Color = clBtnFace Color = clBtnFace
Font.Color = clWindowText Font.Color = clWindowText
...@@ -11582,90 +11582,73 @@ object OQLExplorerV2: TOQLExplorerV2 ...@@ -11582,90 +11582,73 @@ object OQLExplorerV2: TOQLExplorerV2
OnCreate = FormCreate OnCreate = FormCreate
OnResize = FormResize OnResize = FormResize
OnShow = FormShow OnShow = FormShow
LCLVersion = '2.0.2.0' LCLVersion = '2.0.0.4'
object pnlActionBar: TPanel
Left = 0
Height = 35
Top = 0
Width = 1090
Align = alTop
BevelOuter = bvNone
TabOrder = 0
end
object pcCXOQL: TPageControl object pcCXOQL: TPageControl
Left = 0 Left = 0
Height = 523 Height = 517
Top = 35 Top = 35
Width = 1090 Width = 1090
ActivePage = tsCXOQL ActivePage = tsCXOQL
Align = alClient Align = alClient
TabIndex = 0 TabIndex = 0
TabOrder = 1 TabOrder = 0
object tsCXOQL: TTabSheet object tsCXOQL: TTabSheet
Caption = 'CXOQL' Caption = 'CXOQL'
ClientHeight = 497 ClientHeight = 489
ClientWidth = 1082 ClientWidth = 1080
object pnlCXOQL: TPanel object pnlCXOQL: TPanel
Left = 0 Left = 0
Height = 497 Height = 489
Top = 0 Top = 0
Width = 1082 Width = 1080
Align = alClient Align = alClient
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 497 ClientHeight = 489
ClientWidth = 1082 ClientWidth = 1080
ParentBackground = False ParentBackground = False
TabOrder = 0 TabOrder = 0
object splVertical: TSplitter object splVertical: TSplitter
Left = 219 Left = 274
Height = 497 Height = 489
Top = 0 Top = 0
Width = 8 Width = 4
Color = clBtnFace Color = clBtnFace
OnCanResize = splVerticalCanResize OnCanResize = splVerticalCanResize
ParentColor = False ParentColor = False
end end
object pnlOQLList: TPanel object pnlOQLList: TPanel
Left = 0 Left = 0
Height = 497 Height = 489
Top = 0 Top = 0
Width = 219 Width = 274
Align = alLeft Align = alLeft
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 497 ClientHeight = 489
ClientWidth = 219 ClientWidth = 274
TabOrder = 0 TabOrder = 0
object pnlOQLButtons: TPanel
Left = 0
Height = 35
Top = 0
Width = 219
Align = alTop
BevelOuter = bvNone
TabOrder = 0
end
object pnlList: TPanel object pnlList: TPanel
Left = 0 Left = 0
Height = 462 Height = 463
Top = 35 Top = 26
Width = 219 Width = 274
Align = alClient Align = alClient
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 462 ClientHeight = 463
ClientWidth = 219 ClientWidth = 274
TabOrder = 1 TabOrder = 0
object lvOQLList: TListView object lvOQLList: TListView
Left = 0 Left = 0
Height = 374 Height = 375
Top = 0 Top = 0
Width = 219 Width = 274
Align = alClient Align = alClient
Columns = < Columns = <
item item
AutoSize = True AutoSize = True
Caption = 'OQL Name' Caption = 'OQL Name'
Width = 74 Width = 272
end> end>
ScrollBars = ssAutoBoth
SmallImages = ilOQLState SmallImages = ilOQLState
TabOrder = 0 TabOrder = 0
ViewStyle = vsReport ViewStyle = vsReport
...@@ -11674,30 +11657,51 @@ object OQLExplorerV2: TOQLExplorerV2 ...@@ -11674,30 +11657,51 @@ object OQLExplorerV2: TOQLExplorerV2
object memError: TMemo object memError: TMemo
Left = 0 Left = 0
Height = 88 Height = 88
Top = 374 Top = 375
Width = 219 Width = 274
Align = alBottom Align = alBottom
Color = clBtnFace Color = clBtnFace
ReadOnly = True ReadOnly = True
TabOrder = 1 TabOrder = 1
end end
end end
object ToolBar2: TToolBar
Left = 0
Height = 26
Top = 0
Width = 274
Caption = 'ToolBar2'
Images = ilCXOQL
List = True
ShowCaptions = True
TabOrder = 1
object ToolButton5: TToolButton
Left = 1
Top = 2
Action = aNewOQL
end
object ToolButton6: TToolButton
Left = 80
Top = 2
Action = aDeleteOQL
end
end
end end
object pnlRight: TPanel object pnlRight: TPanel
Left = 227 Left = 278
Height = 497 Height = 489
Top = 0 Top = 0
Width = 855 Width = 802
Align = alClient Align = alClient
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 497 ClientHeight = 489
ClientWidth = 855 ClientWidth = 802
TabOrder = 1 TabOrder = 1
object pnlOQLExplorer: TPanel object pnlOQLExplorer: TPanel
Left = 0 Left = 0
Height = 424 Height = 416
Top = 73 Top = 73
Width = 855 Width = 802
Align = alClient Align = alClient
BevelOuter = bvNone BevelOuter = bvNone
ParentBackground = False ParentBackground = False
...@@ -11707,16 +11711,16 @@ object OQLExplorerV2: TOQLExplorerV2 ...@@ -11707,16 +11711,16 @@ object OQLExplorerV2: TOQLExplorerV2
Left = 0 Left = 0
Height = 73 Height = 73
Top = 0 Top = 0
Width = 855 Width = 802
Align = alTop Align = alTop
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 73 ClientHeight = 73
ClientWidth = 855 ClientWidth = 802
ParentBackground = False ParentBackground = False
TabOrder = 0 TabOrder = 0
object labelName: TLabel object labelName: TLabel
Left = 58 Left = 58
Height = 13 Height = 14
Top = 13 Top = 13
Width = 31 Width = 31
Caption = 'Name:' Caption = 'Name:'
...@@ -11724,7 +11728,7 @@ object OQLExplorerV2: TOQLExplorerV2 ...@@ -11724,7 +11728,7 @@ object OQLExplorerV2: TOQLExplorerV2
end end
object labelDescription: TLabel object labelDescription: TLabel
Left = 32 Left = 32
Height = 13 Height = 14
Top = 43 Top = 43
Width = 57 Width = 57
Caption = 'Description:' Caption = 'Description:'
...@@ -11732,14 +11736,14 @@ object OQLExplorerV2: TOQLExplorerV2 ...@@ -11732,14 +11736,14 @@ object OQLExplorerV2: TOQLExplorerV2
end end
object edtName: TEdit object edtName: TEdit
Left = 97 Left = 97
Height = 21 Height = 31
Top = 10 Top = 10
Width = 384 Width = 384
TabOrder = 0 TabOrder = 0
end end
object edtDescription: TEdit object edtDescription: TEdit
Left = 97 Left = 97
Height = 21 Height = 31
Top = 40 Top = 40
Width = 384 Width = 384
TabOrder = 1 TabOrder = 1
...@@ -11750,8 +11754,8 @@ object OQLExplorerV2: TOQLExplorerV2 ...@@ -11750,8 +11754,8 @@ object OQLExplorerV2: TOQLExplorerV2
end end
object tsPASunit: TTabSheet object tsPASunit: TTabSheet
Caption = 'Unit' Caption = 'Unit'
ClientHeight = 497 ClientHeight = 489
ClientWidth = 1082 ClientWidth = 1080
ImageIndex = 1 ImageIndex = 1
object pnlPASUnit: TPanel object pnlPASUnit: TPanel
Left = 0 Left = 0
...@@ -11776,6 +11780,39 @@ object OQLExplorerV2: TOQLExplorerV2 ...@@ -11776,6 +11780,39 @@ object OQLExplorerV2: TOQLExplorerV2
end end
end end
end end
object ToolBar1: TToolBar
Left = 0
Height = 35
Top = 0
Width = 1090
ButtonHeight = 24
ButtonWidth = 24
Caption = 'ToolBar1'
Images = ilCXOQL
List = True
ShowCaptions = True
TabOrder = 1
object ToolButton1: TToolButton
Left = 1
Top = 2
Action = aNewFile
end
object ToolButton2: TToolButton
Left = 56
Top = 2
Action = aLoadFile
end
object ToolButton3: TToolButton
Left = 116
Top = 2
Action = aSaveFile
end
object ToolButton4: TToolButton
Left = 174
Top = 2
Action = aExportPas
end
end
object abExportPAS: TAction object abExportPAS: TAction
Caption = 'abExportPAS' Caption = 'abExportPAS'
Visible = False Visible = False
...@@ -12588,8 +12625,8 @@ object OQLExplorerV2: TOQLExplorerV2 ...@@ -12588,8 +12625,8 @@ object OQLExplorerV2: TOQLExplorerV2
} }
end end
object ilOQLState: TImageList object ilOQLState: TImageList
left = 16 left = 861
top = 472 top = 5
Bitmap = { Bitmap = {
4C6903000000100000001000000000000000000000000071ADFF0071ADFF0071 4C6903000000100000001000000000000000000000000071ADFF0071ADFF0071
ADFF0071ADFF0071ADFF0071ADFF000000000000000000000000000000000000 ADFF0071ADFF0071ADFF0071ADFF000000000000000000000000000000000000
...@@ -12702,4 +12739,38 @@ object OQLExplorerV2: TOQLExplorerV2 ...@@ -12702,4 +12739,38 @@ object OQLExplorerV2: TOQLExplorerV2
Filter = 'pas|*.pas' Filter = 'pas|*.pas'
left = 616 left = 616
end end
object ActionList1: TActionList
left = 926
top = 6
object aNewOQL: TAction
Caption = '&New OQL'
ImageIndex = 5
OnExecute = aNewOQLExecute
end
object aDeleteOQL: TAction
Caption = '&Delete OQL'
ImageIndex = 9
OnExecute = aDeleteOQLExecute
end
object aNewFile: TAction
Caption = 'Ne&w'
ImageIndex = 10
OnExecute = aNewFileExecute
end
object aLoadFile: TAction
Caption = '&Open'
ImageIndex = 3
OnExecute = aLoadFileExecute
end
object aSaveFile: TAction
Caption = '&Save'
ImageIndex = 7
OnExecute = aSaveFileExecute
end
object aExportPas: TAction
Caption = '&Export'
ImageIndex = 8
OnExecute = aExportPASExecute
end
end
end end
This diff is collapsed.
object itServiceParameters: TitServiceParameters object itServiceParameters: TitServiceParameters
Left = 0 Left = 778
Height = 276 Height = 289
Top = 0 Top = 453
Width = 306 Width = 314
BorderStyle = bsDialog BorderStyle = bsDialog
Caption = 'Propriedades do Serviço' Caption = 'Propriedades do Serviço'
ClientHeight = 276 ClientHeight = 289
ClientWidth = 306 ClientWidth = 314
Color = clBtnFace
ParentFont = True ParentFont = True
Position = poDesktopCenter Position = poScreenCenter
LCLVersion = '2.0.0.4'
object Panel2: TPanel object Panel2: TPanel
Left = 0 Left = 0
Height = 237 Height = 240
Top = 0 Top = 0
Width = 306 Width = 314
Align = alClient Align = alClient
ClientHeight = 237 ClientHeight = 240
ClientWidth = 306 ClientWidth = 314
TabOrder = 1 TabOrder = 1
object GroupBox1: TGroupBox object GroupBox1: TGroupBox
Left = 6 Left = 6
Height = 77 Height = 77
Top = 3 Top = 3
Width = 296 Width = 296
ClientHeight = 70 ClientHeight = 75
ClientWidth = 288 ClientWidth = 294
TabOrder = 0 TabOrder = 0
object Label2: TLabel object Label2: TLabel
Left = 5 Left = 5
Height = 16 Height = 19
Top = 14 Top = 14
Width = 117 Width = 122
Caption = 'Nome do Servidor:' Caption = 'Nome do Servidor:'
ParentColor = False ParentColor = False
end end
object Label1: TLabel object Label1: TLabel
Left = 11 Left = 11
Height = 16 Height = 19
Top = 42 Top = 42
Width = 111 Width = 116
Caption = 'Número da Porta:' Caption = 'Número da Porta:'
ParentColor = False ParentColor = False
end end
object edtServerName: TEdit object edtServerName: TEdit
Left = 133 Left = 133
Height = 22 Height = 29
Top = 8 Top = 8
Width = 155 Width = 155
TabOrder = 0 TabOrder = 0
end end
object edtPortNumber: TEdit object edtPortNumber: TEdit
Left = 133 Left = 133
Height = 22 Height = 29
Top = 36 Top = 36
Width = 155 Width = 155
TabOrder = 1 TabOrder = 1
...@@ -63,20 +63,20 @@ object itServiceParameters: TitServiceParameters ...@@ -63,20 +63,20 @@ object itServiceParameters: TitServiceParameters
Height = 48 Height = 48
Top = 88 Top = 88
Width = 296 Width = 296
ClientHeight = 41 ClientHeight = 46
ClientWidth = 288 ClientWidth = 294
TabOrder = 1 TabOrder = 1
object Label3: TLabel object Label3: TLabel
Left = 0 Left = 0
Height = 16 Height = 19
Top = 12 Top = 12
Width = 122 Width = 126
Caption = 'Código do Sistema:' Caption = 'Código do Sistema:'
ParentColor = False ParentColor = False
end end
object edtSystemCode: TEdit object edtSystemCode: TEdit
Left = 133 Left = 133
Height = 22 Height = 29
Top = 8 Top = 8
Width = 155 Width = 155
TabOrder = 0 TabOrder = 0
...@@ -87,35 +87,35 @@ object itServiceParameters: TitServiceParameters ...@@ -87,35 +87,35 @@ object itServiceParameters: TitServiceParameters
Height = 80 Height = 80
Top = 144 Top = 144
Width = 296 Width = 296
ClientHeight = 73 ClientHeight = 78
ClientWidth = 288 ClientWidth = 294
TabOrder = 2 TabOrder = 2
object Label5: TLabel object Label5: TLabel
Left = 9 Left = 9
Height = 16 Height = 19
Top = 12 Top = 12
Width = 113 Width = 117
Caption = 'Nome do Usuário:' Caption = 'Nome do Usuário:'
ParentColor = False ParentColor = False
end end
object Label4: TLabel object Label4: TLabel
Left = 80 Left = 80
Height = 16 Height = 19
Top = 46 Top = 46
Width = 42 Width = 45
Caption = 'Senha:' Caption = 'Senha:'
ParentColor = False ParentColor = False
end end
object edtUserName: TEdit object edtUserName: TEdit
Left = 133 Left = 133
Height = 22 Height = 29
Top = 6 Top = 6
Width = 155 Width = 155
TabOrder = 0 TabOrder = 0
end end
object edtPassword: TEdit object edtPassword: TEdit
Left = 133 Left = 133
Height = 22 Height = 29
Top = 40 Top = 40
Width = 155 Width = 155
EchoMode = emPassword EchoMode = emPassword
...@@ -126,18 +126,18 @@ object itServiceParameters: TitServiceParameters ...@@ -126,18 +126,18 @@ object itServiceParameters: TitServiceParameters
end end
object Panel1: TPanel object Panel1: TPanel
Left = 0 Left = 0
Height = 39 Height = 49
Top = 237 Top = 240
Width = 306 Width = 314
Align = alBottom Align = alBottom
ClientHeight = 39 ClientHeight = 49
ClientWidth = 306 ClientWidth = 314
TabOrder = 0 TabOrder = 0
object BitBtn1: TBitBtn object BitBtn1: TBitBtn
Left = 141 Left = 96
Height = 25 Height = 35
Top = 6 Top = 6
Width = 75 Width = 99
Anchors = [akTop, akLeft, akBottom] Anchors = [akTop, akLeft, akBottom]
Caption = 'Ok' Caption = 'Ok'
Kind = bkOK Kind = bkOK
...@@ -146,10 +146,10 @@ object itServiceParameters: TitServiceParameters ...@@ -146,10 +146,10 @@ object itServiceParameters: TitServiceParameters
TabOrder = 0 TabOrder = 0
end end
object BitBtn2: TBitBtn object BitBtn2: TBitBtn
Left = 229 Left = 203
Height = 25 Height = 35
Top = 6 Top = 6
Width = 75 Width = 97
Anchors = [akTop, akLeft, akBottom] Anchors = [akTop, akLeft, akBottom]
Caption = 'Cancel' Caption = 'Cancel'
Kind = bkCancel Kind = bkCancel
......
...@@ -4,7 +4,7 @@ interface ...@@ -4,7 +4,7 @@ interface
uses uses
LCLType, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, LCLType, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
Dialogs, StdCtrls, Buttons, ExtCtrls; Dialogs, StdCtrls, Buttons, ExtCtrls, cxuSession;
type type
TitServiceParameters = class(TForm) TitServiceParameters = class(TForm)
...@@ -27,6 +27,7 @@ type ...@@ -27,6 +27,7 @@ type
Label4: TLabel; Label4: TLabel;
procedure BitBtn1Click(Sender: TObject); procedure BitBtn1Click(Sender: TObject);
private private
fSession: cxSession;
function GetPassword: string; function GetPassword: string;
function GetPortNumber: integer; function GetPortNumber: integer;
function GetServerName: string; function GetServerName: string;
...@@ -40,6 +41,7 @@ type ...@@ -40,6 +41,7 @@ type
{ Private declarations } { Private declarations }
public public
{ Public declarations } { Public declarations }
property Session: cxSession read fSession write fSession;
property ServerName: string read GetServerName write SetServerName; property ServerName: string read GetServerName write SetServerName;
property PortNumber: integer read GetPortNumber write SetPortNumber; property PortNumber: integer read GetPortNumber write SetPortNumber;
property SystemCode: integer read GetSystemCode write SetSystemCode; property SystemCode: integer read GetSystemCode write SetSystemCode;
...@@ -55,6 +57,7 @@ implementation ...@@ -55,6 +57,7 @@ implementation
{ TServiceParameters } { TServiceParameters }
procedure TitServiceParameters.BitBtn1Click(Sender: TObject); procedure TitServiceParameters.BitBtn1Click(Sender: TObject);
var lConnectioString: String;
begin begin
if edtServerName.Text = '' then if edtServerName.Text = '' then
begin begin
...@@ -79,7 +82,7 @@ begin ...@@ -79,7 +82,7 @@ begin
end; end;
try try
strtoint(edtPortNumber.Text); StrToInt(edtPortNumber.Text);
except except
Application.MessageBox('Porta informada invlida.','Ateno', MB_ICONEXCLAMATION); Application.MessageBox('Porta informada invlida.','Ateno', MB_ICONEXCLAMATION);
edtPortNumber.SetFocus; edtPortNumber.SetFocus;
...@@ -88,13 +91,29 @@ begin ...@@ -88,13 +91,29 @@ begin
end; end;
try try
strtoint(edtSystemCode.Text); StrToInt(edtSystemCode.Text);
except except
Application.MessageBox('Cdigo do sistema informado invlido.','Ateno', MB_ICONEXCLAMATION); Application.MessageBox('Cdigo do sistema informado invlido.','Ateno', MB_ICONEXCLAMATION);
edtSystemCode.SetFocus; edtSystemCode.SetFocus;
edtSystemCode.SelectAll; edtSystemCode.SelectAll;
modalresult := mrnone; modalresult := mrnone;
end; end;
try
lConnectioString := format('ServerName=%s;PortNumber=%d;SystemCode=%d;UserName=%s;Password=%s;',
[edtServerName.Caption, StrToInt(edtPortNumber.Caption),
StrToInt(edtSystemCode.Caption), edtUserName.Caption,
edtPassword.Caption]);
fSession := cxSession.Create(lConnectioString);
except
on e:Exception do
begin
Application.MessageBox(PCHAR(e.Message), 'Ateno', MB_ICONEXCLAMATION);
modalresult := mrnone;
end;
end;
end; end;
function TitServiceParameters.GetPassword: string; function TitServiceParameters.GetPassword: string;
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -56,7 +56,7 @@ type ...@@ -56,7 +56,7 @@ type
procedure Initialize; procedure Initialize;
public public
{ Public declarations } { Public declarations }
Constructor Create(Sender: TComponent; piConnectionString: string; piUMLClass: IUMLCLass); reintroduce; Constructor Create(Sender: TComponent; piCadastroClasse: cxCadastroClasse; piUMLClass: IUMLCLass); reintroduce;
property ClassPackage: IUMLPackage read fClassPackage write fClassPackage; property ClassPackage: IUMLPackage read fClassPackage write fClassPackage;
property UMLClass: IUMLClass read fUMLClass write fUMLClass; property UMLClass: IUMLClass read fUMLClass write fUMLClass;
...@@ -73,7 +73,7 @@ uses IntegracaoDelphiSUML; ...@@ -73,7 +73,7 @@ uses IntegracaoDelphiSUML;
{ TCadastroClasse } { TCadastroClasse }
constructor TCadastroClasse.Create(Sender: TComponent; piConnectionString: string; piUMLClass: IUMLCLass); constructor TCadastroClasse.Create(Sender: TComponent; piCadastroClasse: cxCadastroClasse; piUMLClass: IUMLCLass);
begin begin
inherited Create(sender); inherited Create(sender);
...@@ -83,7 +83,7 @@ begin ...@@ -83,7 +83,7 @@ begin
edtDBIDO.Text := fUMLClass.GetTaggedValueAsString('DBMappings', 'DBClassMap', 'DBIDO'); edtDBIDO.Text := fUMLClass.GetTaggedValueAsString('DBMappings', 'DBClassMap', 'DBIDO');
edtDBTableName.Text := fUMLClass.GetTaggedValueAsString('DBMappings', 'DBClassMap', 'Table'); edtDBTableName.Text := fUMLClass.GetTaggedValueAsString('DBMappings', 'DBClassMap', 'Table');
end; end;
fcxCadastroClasse := cxCadastroClasse.Create(piConnectionString); fcxCadastroClasse := piCadastroClasse;
self.Initialize; self.Initialize;
end; end;
...@@ -94,17 +94,17 @@ var lUMLFactory: IUMLFactory; ...@@ -94,17 +94,17 @@ var lUMLFactory: IUMLFactory;
begin begin
if edtNomeStarUML.Text = '' then if edtNomeStarUML.Text = '' then
begin begin
application.MessageBox(' necessrio informar o nome da classe no StarUML.','StarUML', MB_ICONEXCLAMATION + MB_OK); application.MessageBox('É necessário informar o nome da classe no StarUML.','StarUML', MB_ICONEXCLAMATION + MB_OK);
exit; exit;
end else end else
if edtPackage.Text = '' then if edtPackage.Text = '' then
begin begin
application.MessageBox(' necessrio informar o package onde ser criado o caso de uso.','StarUML', MB_ICONEXCLAMATION + MB_OK); application.MessageBox('É necessário informar o package onde será criado o caso de uso.','StarUML', MB_ICONEXCLAMATION + MB_OK);
exit; exit;
end; end;
try try
//Se em modo de edio (classe j criada) //Se em modo de edição (classe já criada)
if assigned(fUMLClass) then if assigned(fUMLClass) then
begin begin
SalvaObjeto; SalvaObjeto;
...@@ -114,10 +114,10 @@ begin ...@@ -114,10 +114,10 @@ begin
end end
else else
begin begin
//Seno cria o objeto no StarUML e salva no caso de uso //Senão cria o objeto no StarUML e salva no caso de uso
if assigned(fClassPackage.FindByName(edtNomeStarUML.Text)) then if assigned(fClassPackage.FindByName(edtNomeStarUML.Text)) then
begin begin
application.MessageBox('Classe j existente no pacote selecionado.','StarUML', MB_ICONEXCLAMATION + MB_OK); application.MessageBox('Classe já existente no pacote selecionado.','StarUML', MB_ICONEXCLAMATION + MB_OK);
exit; exit;
end; end;
...@@ -158,8 +158,11 @@ begin ...@@ -158,8 +158,11 @@ begin
lElementSelector.ClearSelectableModels(); lElementSelector.ClearSelectableModels();
lElementSelector.AddSelectableModel('UMLPackage'); lElementSelector.AddSelectableModel('UMLPackage');
lElementSelector.AddSelectableModel('UMLModel'); lElementSelector.AddSelectableModel('UMLModel');
if lElementSelector.Execute('Selecione o local para criar o caso de uso') then if lElementSelector.Execute('Selecione o local para criar a classe') then
begin
ClassPackage := lElementSelector.GetSelectedModel as IUMLPackage; ClassPackage := lElementSelector.GetSelectedModel as IUMLPackage;
edtPackage.caption := ClassPackage.PathName;
end;
end; end;
procedure TCadastroClasse.edtNomeChange(Sender: TObject); procedure TCadastroClasse.edtNomeChange(Sender: TObject);
...@@ -182,8 +185,8 @@ var lField, lResponseField: utField; ...@@ -182,8 +185,8 @@ var lField, lResponseField: utField;
lClassCode: string; lClassCode: string;
begin begin
FOID := -1; FOID := -1;
//Se for edio, seta o contexto no caso de uso (cadastro de classe )para a classe corrente //Se for edição, seta o contexto no caso de uso (cadastro de classe )para a classe corrente
// atraves do cdigo // atraves do código
if assigned(fUMLClass) then if assigned(fUMLClass) then
begin begin
lField := utField.Create; lField := utField.Create;
......
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