Changeset 1302

Timestamp:

2/8/2010 2:52:30 AM (5 weeks ago)

Author:

vessper

Message:

08/02/2010

---

- Core: Added SQLCE library to project folder
- Core: Corrected issues with DataFunctions? class
- Core: Handled errors from multiple attempts to fetch EveMail?

Location:

branches/EveHQv2

Files:

• EveHQ.Core/DataFunctions.vb (modified) (4 diffs)
• EveHQ.Core/EveHQ.Core.vbproj (modified) (2 diffs)
• EveHQ.Core/ExternalLibs (added)
• EveHQ.Core/ExternalLibs/System.Data.SqlServerCe.dll (added)
• EveHQ/Forms/frmMail.vb (modified) (1 diff)

branches/EveHQv2/EveHQ.Core/DataFunctions.vb

@@ -19 +19 @@
 '=========================================================================
 Imports System.Data
+Imports System.Data.OleDb
+Imports System.Data.Odbc
 Imports System.Data.SqlClient
-Imports System.Data.SqlServerCe
 Imports System.IO
 Imports System.Text
 Imports System.Windows.Forms
 Imports System.Xml
+Imports System.Data.SqlServerCe
 
 Public Class DataFunctions
@@ -330 +332 @@
         End Select
     End Function
-
     Public Shared Function GetData(ByVal strSQL As String) As DataSet
 
@@ -515 +516 @@
         End If
     End Function
+
+
     Public Shared Function LoadItemData() As Boolean
         Dim itemData As New DataSet
@@ -1661 +1664 @@
         End Select
     End Function
+
     Public Shared Function CheckDataDatabaseConnection(ByVal silentResponse As Boolean) As Boolean
         Dim strConnection As String = ""

branches/EveHQv2/EveHQ.Core/EveHQ.Core.vbproj

@@ -47 +47 @@
     <Reference Include="System" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Data.SqlServerCe, Version=3.5.1.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL" />
+    <Reference Include="System.Data.SqlServerCe, Version=3.5.1.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System.Design" />
     <Reference Include="System.Drawing" />
@@ -202 +204 @@
   </ItemGroup>
   <ItemGroup>
+    <Content Include="ExternalLibs\System.Data.SqlServerCe.dll" />
     <Content Include="LgLcd.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

branches/EveHQv2/EveHQ/Forms/frmMail.vb

@@ -86 +86 @@
         Dim myMail As New EveHQ.Core.EveMail
         AddHandler myMail.MailProgress, AddressOf DisplayMailProgress
-        Me.Invoke(New MethodInvoker(AddressOf MailUpdateStarted))
-        Call myMail.GetMail()
-        Me.Invoke(New MethodInvoker(AddressOf MailUpdateCompleted))
+        Try
+            Me.Invoke(New MethodInvoker(AddressOf MailUpdateStarted))
+            Call myMail.GetMail()
+            Me.Invoke(New MethodInvoker(AddressOf MailUpdateCompleted))
+        Catch e As Exception
+            ' Handles cases where application is sluggish due to plug-in loading etc
+            ' Simply abort
+        End Try
     End Sub