Ajuste de layout e correção na geração código de classes

EvoUMLPlugin/src/CurioAddIn.dpr

@@ -40,28 +40,20 @@ uses
   utuXSD in 'utuXSD.pas',
   DelphiAddInObj in 'DelphiAddInObj.pas';
 
-type
-
-  { ExceptionCatch }
-
-  ExceptionCatch= Class
-  public
-    procedure CustomExceptionHandler(Sender: TObject; E: Exception);
-  end;
-
 exports
   InitializeAddIn,
   FinalizeAddIn,
   DoMenuAction;
 
-{ ExceptionCatch }
-
-procedure ExceptionCatch.CustomExceptionHandler(Sender: TObject; E: Exception);
-begin
-  Application.MessageBox(PChar(E.message), 'Error...', MB_ICONERROR or MB_OK);
-end;
-
 begin
+  {$if declared(UseHeapTrace)}
+  if UseHeaptrace then
+  begin
+    GlobalSkipIfNoLeaks := True;
+    DeleteFile('CURIOAddIn.trc');
+    SetHeapTraceOutput('CURIOAddIn.trc');
+  end;
+  {$ifend}
   ChangeLocaleFormatSetting;
   gDefaultDatabaseDriver := typeOf(acDatabaseSQLODBC);
   PersistenceManager.DefaultRepositoryClass := typeOf(acRepositorySQL);
@@ -76,8 +68,6 @@ begin
   {$ENDIF}
 
   Application.Initialize;
-  Application.Scaled := True;
-  Application.OnException := ExceptionCatch.CustomExceptionHandler;
 
 //  Application.CaptureExceptions := True;
 

EvoUMLPlugin/src/IntegracaoDelphiSUML.pas

@@ -188,6 +188,7 @@ end;
 function FinalizeAddIn: Integer;  {$IFDEF MSWINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
 begin
   gStarUMLApp := Nil;
+  Result := 0;
 end;
 
 function DoMenuAction(ActionID: Integer): Integer;  {$IFDEF MSWINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
@@ -1607,6 +1608,7 @@ begin
          if not piMetaModelOptions.SilentMode then PutMessage(FormatDateTime('hh:nn:ss', Time) +  ' - Model mappings generated.', gStarUMLApp.GetProject, 2);
        end;
      end;
+     MetaModel.SetOrder;
    finally
 
    end;

EvoUMLPlugin/src/ituDataBaseLogin.dfm

 object DataBaseLogin: TDataBaseLogin
-  Left = 1480
-  Height = 537
-  Top = 299
+  Left = 1160
+  Height = 542
+  Top = 217
   Width = 440
   BorderIcons = [biSystemMenu]
   BorderStyle = bsDialog
   Caption = 'Connect to Database Server'
-  ClientHeight = 537
+  ClientHeight = 542
   ClientWidth = 440
   Color = clBtnFace
   OnClose = FormClose
   OnShow = FormShow
   ParentFont = True
   Position = poOwnerFormCenter
-  LCLVersion = '2.0.0.4'
+  LCLVersion = '2.0.2.0'
   object GroupBox2: TGroupBox
     Left = 8
-    Height = 208
+    Height = 216
     Top = 288
     Width = 424
-    ClientHeight = 206
-    ClientWidth = 422
+    ClientHeight = 196
+    ClientWidth = 420
     TabOrder = 1
     object edtUsuario: TLabeledEdit
       Left = 15
-      Height = 43
+      Height = 23
       Top = 95
       Width = 400
-      EditLabel.Height = 19
+      EditLabel.Height = 15
       EditLabel.Width = 400
       EditLabel.Caption = 'Usuário'
       EditLabel.ParentColor = False
@@ -35,11 +35,11 @@ object DataBaseLogin: TDataBaseLogin
     end
     object edtPassword: TLabeledEdit
       Left = 15
-      Height = 43
+      Height = 23
       Top = 160
       Width = 400
       EchoMode = emPassword
-      EditLabel.Height = 19
+      EditLabel.Height = 15
       EditLabel.Width = 400
       EditLabel.Caption = 'Senha'
       EditLabel.ParentColor = False
@@ -48,46 +48,46 @@ object DataBaseLogin: TDataBaseLogin
     end
     object cbDialect: TComboBox
       Left = 15
-      Height = 39
+      Height = 23
       Top = 25
       Width = 400
-      ItemHeight = 0
+      ItemHeight = 15
       OnChange = cbODBCD_DSNChange
       Style = csDropDownList
       TabOrder = 0
     end
     object Label2: TLabel
       Left = 15
-      Height = 19
+      Height = 15
       Top = 5
-      Width = 48
+      Width = 37
       Caption = 'Dialeto'
       ParentColor = False
     end
   end
   object GroupBox1: TGroupBox
     Left = 8
-    Height = 272
+    Height = 280
     Top = 8
     Width = 424
-    ClientHeight = 270
-    ClientWidth = 422
+    ClientHeight = 260
+    ClientWidth = 420
     TabOrder = 0
     object cbODBCD_DSN: TComboBox
       Left = 26
-      Height = 39
+      Height = 23
       Top = 48
       Width = 389
-      ItemHeight = 0
+      ItemHeight = 15
       OnChange = cbODBCD_DSNChange
       Style = csDropDownList
       TabOrder = 1
     end
     object rbDSN: TRadioButton
       Left = 10
-      Height = 24
+      Height = 19
       Top = 16
-      Width = 130
+      Width = 100
       Caption = 'Selecionar DSN'
       Checked = True
       OnClick = rbDSNClick
@@ -96,30 +96,30 @@ object DataBaseLogin: TDataBaseLogin
     end
     object rbPersonalizado: TRadioButton
       Left = 10
-      Height = 24
+      Height = 19
       Top = 88
-      Width = 119
+      Width = 93
       Caption = 'Personalizado'
       OnClick = rbPersonalizadoClick
       TabOrder = 2
     end
     object cbODBCD_DRIVERS: TComboBox
       Left = 26
-      Height = 39
+      Height = 23
       Top = 115
       Width = 389
       Enabled = False
-      ItemHeight = 0
+      ItemHeight = 15
       OnChange = cbODBCD_DSNChange
       Style = csDropDownList
       TabOrder = 3
     end
     object edtDatabaseName: TLabeledEdit
       Left = 26
-      Height = 43
+      Height = 23
       Top = 232
       Width = 389
-      EditLabel.Height = 19
+      EditLabel.Height = 15
       EditLabel.Width = 389
       EditLabel.Caption = 'Nome do Banco de Dados'
       EditLabel.ParentColor = False
@@ -128,10 +128,10 @@ object DataBaseLogin: TDataBaseLogin
     end
     object edtServerName: TLabeledEdit
       Left = 26
-      Height = 43
+      Height = 23
       Top = 176
       Width = 389
-      EditLabel.Height = 19
+      EditLabel.Height = 15
       EditLabel.Width = 389
       EditLabel.Caption = 'Servidor'
       EditLabel.ParentColor = False
@@ -142,7 +142,7 @@ object DataBaseLogin: TDataBaseLogin
   object Panel2: TPanel
     Left = 0
     Height = 40
-    Top = 497
+    Top = 502
     Width = 440
     Align = alBottom
     ClientHeight = 40

EvoUMLPlugin/src/ituExplorerV2.dfm

@@ -11582,7 +11582,7 @@ object ExplorerV2: TExplorerV2
   ParentFont = True
   Position = poMainFormCenter
   ShowInTaskBar = stAlways
-  LCLVersion = '2.0.0.4'
+  LCLVersion = '2.0.2.0'
   object splVertical: TSplitter
     Left = 360
     Height = 696
@@ -11604,7 +11604,7 @@ object ExplorerV2: TExplorerV2
     object pnlResult: TPanel
       Left = 0
       Height = 185
-      Top = 490
+      Top = 488
       Width = 867
       Align = alBottom
       BevelOuter = bvNone
@@ -11677,14 +11677,14 @@ object ExplorerV2: TExplorerV2
         end
         object tsError: TTabSheet
           Caption = 'tsError'
-          ClientHeight = 181
-          ClientWidth = 857
+          ClientHeight = 177
+          ClientWidth = 859
           ImageIndex = 1
           object memErrorText: TMemo
             Left = 0
-            Height = 181
+            Height = 177
             Top = 0
-            Width = 857
+            Width = 859
             Align = alClient
             BorderStyle = bsNone
             ParentColor = True
@@ -11697,7 +11697,7 @@ object ExplorerV2: TExplorerV2
     end
     object pcEditor: TPageControl
       Left = 0
-      Height = 437
+      Height = 435
       Top = 48
       Width = 502
       ActivePage = tsOQL
@@ -11710,13 +11710,13 @@ object ExplorerV2: TExplorerV2
       Options = [nboMultiLine]
       object tsOQL: TTabSheet
         Caption = 'OQL - Object Query Language'
-        ClientHeight = 404
-        ClientWidth = 492
+        ClientHeight = 407
+        ClientWidth = 494
         inline SynEditOQL: TSynEdit
           Left = 0
-          Height = 404
+          Height = 407
           Top = 0
-          Width = 492
+          Width = 494
           Align = alClient
           Color = clWindow
           Font.Color = clWindowText
@@ -11730,7 +11730,7 @@ object ExplorerV2: TExplorerV2
           OnDragDrop = memOQLQuery2DragDrop
           OnDragOver = memOQLQuery2DragOver
           BorderStyle = bsNone
-          Gutter.Width = 23
+          Gutter.Width = 19
           Gutter.MouseActions = <>
           RightGutter.Width = 0
           RightGutter.MouseActions = <>
@@ -12193,7 +12193,7 @@ object ExplorerV2: TExplorerV2
               MouseActions = <>
             end
             object SynGutterLineNumber1: TSynGutterLineNumber
-              Width = 17
+              Width = 13
               MouseActions = <>
               MarkupInfo.Background = clBtnFace
               MarkupInfo.Foreground = clNone
@@ -12245,7 +12245,7 @@ object ExplorerV2: TExplorerV2
           ParentFont = False
           TabOrder = 0
           BorderStyle = bsNone
-          Gutter.Width = 23
+          Gutter.Width = 33
           Gutter.MouseActions = <>
           RightGutter.Width = 0
           RightGutter.MouseActions = <>
@@ -12809,7 +12809,7 @@ object ExplorerV2: TExplorerV2
           Style = tbsCheck
         end
         object ToolButton8: TToolButton
-          Left = 355
+          Left = 339
           Top = 2
           Action = XMLQuery
           Grouped = True
@@ -12831,7 +12831,7 @@ object ExplorerV2: TExplorerV2
     end
     object spResultObject: TSplitter
       Left = 502
-      Height = 437
+      Height = 435
       Top = 48
       Width = 5
       Align = alRight
@@ -12840,16 +12840,16 @@ object ExplorerV2: TExplorerV2
     end
     inline OQLObjects: TObjectExplorer
       Left = 507
-      Height = 437
+      Height = 435
       Top = 48
       Width = 360
       Align = alRight
-      ClientHeight = 437
+      ClientHeight = 435
       ClientWidth = 360
       TabOrder = 4
       Visible = False
       inherited tvExplorer: TTreeView
-        Height = 437
+        Height = 435
         Width = 360
         Images = ilModel
         ParentColor = True
@@ -12862,7 +12862,7 @@ object ExplorerV2: TExplorerV2
       Cursor = crVSplit
       Left = 0
       Height = 5
-      Top = 485
+      Top = 483
       Width = 867
       Align = alBottom
       ResizeAnchor = akBottom
@@ -12870,9 +12870,10 @@ object ExplorerV2: TExplorerV2
     end
     object sbStatusBar: TStatusBar
       Left = 0
-      Height = 21
-      Top = 675
+      Height = 23
+      Top = 673
       Width = 867
+      AutoSize = False
       Panels = <      
         item
           Width = 400

EvoUMLPlugin/src/uDBAttributeParameters.dfm

 object fDBAttributeParameters: TfDBAttributeParameters
-  Left = 0
-  Height = 353
-  Top = 27
+  Left = 2174
+  Height = 380
+  Top = 341
   Width = 348
   BorderStyle = bsDialog
   Caption = 'fDBAttributeParameters'
-  ClientHeight = 353
+  ClientHeight = 380
   ClientWidth = 348
   Color = clBtnFace
   Font.Color = clWindowText
@@ -14,7 +14,7 @@ object fDBAttributeParameters: TfDBAttributeParameters
   KeyPreview = True
   OnShow = FormShow
   Position = poDesktopCenter
-  LCLVersion = '2.0.0.4'
+  LCLVersion = '2.0.2.0'
   object pnlError: TPanel
     Left = 0
     Height = 27
@@ -44,7 +44,7 @@ object fDBAttributeParameters: TfDBAttributeParameters
   object Panel2: TPanel
     Left = 0
     Height = 44
-    Top = 309
+    Top = 336
     Width = 348
     Align = alBottom
     ClientHeight = 44
@@ -52,9 +52,9 @@ object fDBAttributeParameters: TfDBAttributeParameters
     TabOrder = 1
     object ckbCheckLength: TCheckBox
       Left = 9
-      Height = 23
+      Height = 19
       Top = 6
-      Width = 88
+      Width = 82
       Caption = 'Check length'
       TabOrder = 0
     end
@@ -98,27 +98,27 @@ object fDBAttributeParameters: TfDBAttributeParameters
   end
   object Panel3: TPanel
     Left = 0
-    Height = 282
+    Height = 309
     Top = 27
     Width = 348
     Align = alClient
-    ClientHeight = 282
+    ClientHeight = 309
     ClientWidth = 348
     TabOrder = 0
     object GroupBox1: TGroupBox
       Left = 11
-      Height = 85
+      Height = 90
       Top = 6
       Width = 323
       Caption = 'Attribute (StarUML)'
-      ClientHeight = 70
-      ClientWidth = 321
+      ClientHeight = 72
+      ClientWidth = 319
       TabOrder = 0
       object Label5: TLabel
         Left = 12
         Height = 16
-        Top = 54
-        Width = 32
+        Top = 45
+        Width = 33
         Caption = 'Type:'
         Font.Color = clWindowText
         Font.Height = -13
@@ -129,7 +129,7 @@ object fDBAttributeParameters: TfDBAttributeParameters
       object Label6: TLabel
         Left = 7
         Height = 16
-        Top = 23
+        Top = 14
         Width = 38
         Caption = 'Name:'
         Font.Color = clWindowText
@@ -140,13 +140,13 @@ object fDBAttributeParameters: TfDBAttributeParameters
       end
       object cbbStarUMLTypes: TComboBox
         Left = 52
-        Height = 28
-        Top = 50
+        Height = 24
+        Top = 41
         Width = 249
         Font.Color = clWindowText
         Font.Height = -13
         Font.Name = 'Tahoma'
-        ItemHeight = 0
+        ItemHeight = 16
         OnClick = cbbStarUMLTypesClick
         ParentFont = False
         Style = csDropDownList
@@ -154,8 +154,8 @@ object fDBAttributeParameters: TfDBAttributeParameters
       end
       object edtAttributeName: TEdit
         Left = 52
-        Height = 33
-        Top = 20
+        Height = 24
+        Top = 11
         Width = 249
         Font.Color = clWindowText
         Font.Height = -13
@@ -167,12 +167,12 @@ object fDBAttributeParameters: TfDBAttributeParameters
     end
     object GroupBox2: TGroupBox
       Left = 11
-      Height = 184
-      Top = 97
+      Height = 200
+      Top = 105
       Width = 323
       Caption = 'DB Mappings'
-      ClientHeight = 169
-      ClientWidth = 321
+      ClientHeight = 182
+      ClientWidth = 319
       TabOrder = 1
       object Label1: TLabel
         Left = 16
@@ -190,7 +190,7 @@ object fDBAttributeParameters: TfDBAttributeParameters
         Left = 21
         Height = 16
         Top = 62
-        Width = 32
+        Width = 33
         Caption = 'Type:'
         Font.Color = clWindowText
         Font.Height = -13
@@ -224,7 +224,7 @@ object fDBAttributeParameters: TfDBAttributeParameters
       end
       object lblAttLength: TLabel
         Left = 290
-        Height = 14
+        Height = 13
         Top = 35
         Width = 58
         Caption = 'lblAttLength'
@@ -232,9 +232,9 @@ object fDBAttributeParameters: TfDBAttributeParameters
       end
       object ckbMand: TCheckBox
         Left = 18
-        Height = 23
+        Height = 20
         Top = 159
-        Width = 86
+        Width = 80
         Caption = 'Mandatory'
         Font.Color = clWindowText
         Font.Height = -13
@@ -244,7 +244,7 @@ object fDBAttributeParameters: TfDBAttributeParameters
       end
       object edtName: TEdit
         Left = 67
-        Height = 33
+        Height = 24
         Top = 29
         Width = 214
         Font.Color = clWindowText
@@ -256,7 +256,7 @@ object fDBAttributeParameters: TfDBAttributeParameters
       end
       object edtFSize: TEdit
         Left = 67
-        Height = 33
+        Height = 24
         Top = 89
         Width = 78
         Font.Color = clWindowText
@@ -267,7 +267,7 @@ object fDBAttributeParameters: TfDBAttributeParameters
       end
       object edtVSize: TEdit
         Left = 67
-        Height = 33
+        Height = 24
         Top = 119
         Width = 78
         Font.Color = clWindowText
@@ -284,7 +284,7 @@ object fDBAttributeParameters: TfDBAttributeParameters
         Font.Color = clWindowText
         Font.Height = -13
         Font.Name = 'Tahoma'
-        ItemHeight = 0
+        ItemHeight = 16
         Items.Strings = (
           'CHAR'
           'DATETIME'
@@ -302,9 +302,9 @@ object fDBAttributeParameters: TfDBAttributeParameters
       end
       object ckbIsAuditable: TCheckBox
         Left = 154
-        Height = 23
+        Height = 19
         Top = 159
-        Width = 80
+        Width = 74
         Caption = 'IsAuditable'
         TabOrder = 5
       end