add FileId to DocumentObject

GUIs.Test.EDMIBenchmark/Form1.Designer.vb

@@ -27,16 +27,16 @@ Partial Class Form1
         Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl()
         Me.ButtonSelectFiles = New DevExpress.XtraBars.BarButtonItem()
         Me.ButtonImportFiles = New DevExpress.XtraBars.BarButtonItem()
+        Me.buttonClearLog = New DevExpress.XtraBars.BarButtonItem()
+        Me.buttonClearFiles = New DevExpress.XtraBars.BarButtonItem()
         Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
         Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
+        Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
         Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage()
         Me.SplitContainerControl1 = New DevExpress.XtraEditors.SplitContainerControl()
         Me.listboxLog = New DevExpress.XtraEditors.ListBoxControl()
-        Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
-        Me.buttonClearLog = New DevExpress.XtraBars.BarButtonItem()
-        Me.buttonClearFiles = New DevExpress.XtraBars.BarButtonItem()
         CType(Me.listboxFiles, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -77,11 +77,25 @@ Partial Class Form1
         Me.ButtonImportFiles.ImageOptions.SvgImage = CType(resources.GetObject("ButtonImportFiles.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
         Me.ButtonImportFiles.Name = "ButtonImportFiles"
         '
+        'buttonClearLog
+        '
+        Me.buttonClearLog.Caption = "Clear Log"
+        Me.buttonClearLog.Id = 3
+        Me.buttonClearLog.ImageOptions.SvgImage = CType(resources.GetObject("buttonClearLog.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.buttonClearLog.Name = "buttonClearLog"
+        '
+        'buttonClearFiles
+        '
+        Me.buttonClearFiles.Caption = "Clear Files"
+        Me.buttonClearFiles.Id = 4
+        Me.buttonClearFiles.ImageOptions.SvgImage = CType(resources.GetObject("buttonClearFiles.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.buttonClearFiles.Name = "buttonClearFiles"
+        '
         'RibbonPage1
         '
         Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2, Me.RibbonPageGroup3})
         Me.RibbonPage1.Name = "RibbonPage1"
-        Me.RibbonPage1.Text = "RibbonPage1"
+        Me.RibbonPage1.Text = "Import Files"
         '
         'RibbonPageGroup1
         '
@@ -95,6 +109,13 @@ Partial Class Form1
         Me.RibbonPageGroup2.Name = "RibbonPageGroup2"
         Me.RibbonPageGroup2.Text = "RibbonPageGroup2"
         '
+        'RibbonPageGroup3
+        '
+        Me.RibbonPageGroup3.ItemLinks.Add(Me.buttonClearLog)
+        Me.RibbonPageGroup3.ItemLinks.Add(Me.buttonClearFiles)
+        Me.RibbonPageGroup3.Name = "RibbonPageGroup3"
+        Me.RibbonPageGroup3.Text = "RibbonPageGroup3"
+        '
         'RibbonStatusBar1
         '
         Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 453)
@@ -128,27 +149,6 @@ Partial Class Form1
         Me.listboxLog.Size = New System.Drawing.Size(599, 295)
         Me.listboxLog.TabIndex = 0
         '
-        'RibbonPageGroup3
-        '
-        Me.RibbonPageGroup3.ItemLinks.Add(Me.buttonClearLog)
-        Me.RibbonPageGroup3.ItemLinks.Add(Me.buttonClearFiles)
-        Me.RibbonPageGroup3.Name = "RibbonPageGroup3"
-        Me.RibbonPageGroup3.Text = "RibbonPageGroup3"
-        '
-        'buttonClearLog
-        '
-        Me.buttonClearLog.Caption = "Clear Log"
-        Me.buttonClearLog.Id = 3
-        Me.buttonClearLog.ImageOptions.SvgImage = CType(resources.GetObject("buttonClearLog.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
-        Me.buttonClearLog.Name = "buttonClearLog"
-        '
-        'buttonClearFiles
-        '
-        Me.buttonClearFiles.Caption = "Clear Files"
-        Me.buttonClearFiles.Id = 4
-        Me.buttonClearFiles.ImageOptions.SvgImage = CType(resources.GetObject("buttonClearFiles.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
-        Me.buttonClearFiles.Name = "buttonClearFiles"
-        '
         'Form1
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)

Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Services.EDMIService1.xsd

@@ -75,6 +75,7 @@
   <xs:element name="DocumentResult2" nillable="true" type="tns:DocumentResult2" />
   <xs:complexType name="DocumentResult2.DocumentObject">
     <xs:sequence>
+      <xs:element minOccurs="0" name="FileId" nillable="true" type="xs:string" />
       <xs:element minOccurs="0" name="FileName" nillable="true" type="xs:string" />
     </xs:sequence>
   </xs:complexType>

Modules.EDMIAPI/Connected Services/EDMIServiceReference/Reference.vb

@@ -244,6 +244,9 @@ Namespace EDMIServiceReference
             <System.NonSerializedAttribute()>  _
             Private extensionDataField As System.Runtime.Serialization.ExtensionDataObject
             
+            <System.Runtime.Serialization.OptionalFieldAttribute()>  _
+            Private FileIdField As String
+            
             <System.Runtime.Serialization.OptionalFieldAttribute()>  _
             Private FileNameField As String
             
@@ -256,6 +259,19 @@ Namespace EDMIServiceReference
                 End Set
             End Property
             
+            <System.Runtime.Serialization.DataMemberAttribute()>  _
+            Public Property FileId() As String
+                Get
+                    Return Me.FileIdField
+                End Get
+                Set
+                    If (Object.ReferenceEquals(Me.FileIdField, value) <> true) Then
+                        Me.FileIdField = value
+                        Me.RaisePropertyChanged("FileId")
+                    End If
+                End Set
+            End Property
+            
             <System.Runtime.Serialization.DataMemberAttribute()>  _
             Public Property FileName() As String
                 Get

Service.EDMIService/EDMIService.vb

@@ -303,7 +303,7 @@ Public Class EDMIService
         Dim oDocumentType As String = "DummyDocumentType"
         Dim oDirectoryPath = EDMIPath.GetActivePath(oDocumentType)
         Dim oFilePath = Path.Combine(oDirectoryPath, FileInfo.Name)
-        Dim oDocument = New DocumentResult2.DocumentObject() With {.FileName = FileInfo.Name}
+        Dim oDocument = New DocumentResult2.DocumentObject() With {.FileName = FileInfo.Name, .FileId = Guid.NewGuid.ToString}
 
         Try
             Directory.CreateDirectory(oDirectoryPath)

Service.EDMIService/Results/DocumentResult2.vb

@@ -24,5 +24,6 @@ Public Class DocumentResult2
 
     Public Class DocumentObject
         Public FileName As String
+        Public FileId As String
     End Class
 End Class