Removing redundant code

Common/Globals.vb

@@ -1,6 +1,8 @@
 Imports System.Drawing
+Imports System.IO
 Imports System.Linq
 Imports System.Runtime.CompilerServices
+Imports System.Threading
 
 Namespace Common
  Public Module Globals
@@ -53,9 +55,9 @@ Namespace Common
   End Function
 
   Public Function GetUploadedFileName(folder As String, originalFilename As String) As String
-   For Each f As String In IO.Directory.GetFiles(folder, "*.resources")
+   For Each f As String In Directory.GetFiles(folder, "*.resources")
     If ReadFile(f) = originalFilename Then
-     Return IO.Path.GetFileNameWithoutExtension(f)
+     Return Path.GetFileNameWithoutExtension(f)
     End If
    Next
    Return ""
@@ -65,14 +67,14 @@ Namespace Common
    Return ReadFile(fileName, 10)
   End Function
   Public Function ReadFile(ByVal fileName As String, retries As Integer) As String
-   If Not IO.File.Exists(fileName) Then Return ""
+   If Not File.Exists(fileName) Then Return ""
    If retries = 0 Then Return ""
    Try
-    Using sr As New IO.StreamReader(fileName)
+    Using sr As New StreamReader(fileName)
      Return sr.ReadToEnd
     End Using
-   Catch ioex As IO.IOException
-    Threading.Thread.Sleep(200)
+   Catch ioex As IOException
+    Thread.Sleep(200)
     Return ReadFile(fileName, retries - 1)
    Catch ex As Exception
     Return ""
@@ -84,12 +86,12 @@ Namespace Common
   Public Sub WriteTextToFile(filePath As String, textToWrite As String, retries As Integer)
    If retries = 0 Then Exit Sub
    Try
-    Using sw As New IO.StreamWriter(filePath)
+    Using sw As New StreamWriter(filePath)
      sw.Write(textToWrite)
      sw.Flush()
     End Using
-   Catch ioex As IO.IOException
-    Threading.Thread.Sleep(200)
+   Catch ioex As IOException
+    Thread.Sleep(200)
     WriteTextToFile(filePath, textToWrite, retries - 1)
    Catch ex As Exception
    End Try

Common/Image.vb

@@ -1,5 +1,8 @@
-Imports System.Runtime.Serialization
+Imports System.Globalization
+Imports System.IO
+Imports System.Runtime.Serialization
 Imports System.Xml.Serialization
+Imports DotNetNuke.Entities.Users
 Imports DotNetNuke.Services.Tokens
 
 Namespace Common
@@ -32,20 +35,20 @@ Namespace Common
   Public Sub New()
   End Sub
   Public Sub New(filepath As String, title As String, remarks As String)
-   Me.File = IO.Path.GetFileNameWithoutExtension(filepath)
-   Me.Extension = IO.Path.GetExtension(filepath)
+   Me.File = Path.GetFileNameWithoutExtension(filepath)
+   Me.Extension = Path.GetExtension(filepath)
    Me.Title = title
    Me.Remarks = remarks
   End Sub
 
 #Region " IPropertyAccess "
-  Public ReadOnly Property Cacheability As DotNetNuke.Services.Tokens.CacheLevel Implements DotNetNuke.Services.Tokens.IPropertyAccess.Cacheability
+  Public ReadOnly Property Cacheability As CacheLevel Implements IPropertyAccess.Cacheability
    Get
     Return CacheLevel.fullyCacheable
    End Get
   End Property
 
-  Public Function GetProperty(strPropertyName As String, strFormat As String, formatProvider As System.Globalization.CultureInfo, AccessingUser As DotNetNuke.Entities.Users.UserInfo, AccessLevel As DotNetNuke.Services.Tokens.Scope, ByRef PropertyNotFound As Boolean) As String Implements DotNetNuke.Services.Tokens.IPropertyAccess.GetProperty
+  Public Function GetProperty(strPropertyName As String, strFormat As String, formatProvider As CultureInfo, AccessingUser As UserInfo, AccessLevel As Scope, ByRef PropertyNotFound As Boolean) As String Implements IPropertyAccess.GetProperty
    Dim OutputFormat As String = String.Empty
    If strFormat = String.Empty Then
     OutputFormat = "D"

Common/ImageCollection.vb

@@ -1,4 +1,6 @@
-Imports System.Linq
+Imports System.Diagnostics.CodeAnalysis
+Imports System.IO
+Imports System.Linq
 Imports System.Runtime.Serialization
 Imports System.Xml.Serialization
 
@@ -8,7 +10,7 @@ Namespace Common
  <DataContract>
  Public Class ImageCollection
 
-  <System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1002:DoNotExposeGenericLists"), XmlElement("image")>
+  <SuppressMessage("Microsoft.Design", "CA1002:DoNotExposeGenericLists"), XmlElement("image")>
   <DataMember()>
   Public Property Images As New List(Of Image)
 
@@ -23,9 +25,9 @@ Namespace Common
    ImagePath = imagesPath
    AlbumFile = imagesMapPath & "album.xml"
    _imagesMapPath = imagesMapPath
-   Dim x As New System.Xml.Serialization.XmlSerializer(GetType(ImageCollection))
-   If IO.File.Exists(AlbumFile) Then
-    Using rdr As New IO.StreamReader(AlbumFile)
+   Dim x As New XmlSerializer(GetType(ImageCollection))
+   If File.Exists(AlbumFile) Then
+    Using rdr As New StreamReader(AlbumFile)
      Dim a As ImageCollection = CType(x.Deserialize(rdr), ImageCollection)
      Me.Images = a.Images
     End Using
@@ -39,8 +41,8 @@ Namespace Common
   End Sub
 
   Public Sub Save(filePath As String)
-   Dim x As New System.Xml.Serialization.XmlSerializer(GetType(ImageCollection))
-   Using w As New IO.StreamWriter(filePath, False, System.Text.Encoding.UTF8)
+   Dim x As New XmlSerializer(GetType(ImageCollection))
+   Using w As New StreamWriter(filePath, False, Encoding.UTF8)
     x.Serialize(w, Me)
    End Using
   End Sub
@@ -83,7 +85,7 @@ Namespace Common
    Dim registered As New List(Of String)
    Dim disappeared As New List(Of Image)
    For Each i As Image In Images
-    If Not IO.File.Exists(_imagesMapPath & i.File & i.Extension) Then
+    If Not File.Exists(_imagesMapPath & i.File & i.Extension) Then
      disappeared.Add(i)
     Else
      registered.Add(i.File)
@@ -95,26 +97,26 @@ Namespace Common
     Images.Remove(i)
    Next
    ' pick up new images
-   For Each f As String In IO.Directory.GetFiles(_imagesMapPath, "*.*")
+   For Each f As String In Directory.GetFiles(_imagesMapPath, "*.*")
     Dim m As Match = Regex.Match(f, "(?i)(\d{8}-\d{6,})\.(?-i)")
     If m.Success Then
      Dim fname As String = m.Groups(1).Value
      If Not registered.Contains(fname) Then
-      Dim i As New Image With {.Extension = IO.Path.GetExtension(f), .File = fname, .Title = fname, .Order = Images.Count + 1}
+      Dim i As New Image With {.Extension = Path.GetExtension(f), .File = fname, .Title = fname, .Order = Images.Count + 1}
       Images.Add(i)
       registered.Add(fname)
       hasChanges = True
      End If
     End If
    Next
    ' remove orphaned thumbnails/zooms
-   For Each f As String In IO.Directory.GetFiles(_imagesMapPath, "*.*")
+   For Each f As String In Directory.GetFiles(_imagesMapPath, "*.*")
     Dim m As Match = Regex.Match(f, "(?i)([^_\\\.]+)(_tn|_zoom)\.(?-i)")
     If m.Success Then
      Dim fname As String = m.Groups(1).Value
      If Not registered.Contains(fname) Then
       Try
-       IO.File.Delete(f)
+       File.Delete(f)
       Catch ex As Exception
       End Try
      End If

Common/ModuleApiController.vb

@@ -1,4 +1,5 @@
-Imports DotNetNuke.Entities.Users
+Imports System.IO
+Imports DotNetNuke.Entities.Users
 Imports DotNetNuke.Web.Api
 
 Namespace Common
@@ -54,7 +55,7 @@ Namespace Common
 
   Public Function GetImageMapPath(projectId As Integer) As String
    Dim res As String = String.Format("{0}{1}\", ImageMapPath, projectId)
-   If Not IO.Directory.Exists(res) Then IO.Directory.CreateDirectory(res)
+   If Not Directory.Exists(res) Then Directory.CreateDirectory(res)
    Return res
   End Function
  End Class

Common/ModuleBase.vb

@@ -1,4 +1,8 @@
 Imports DotNetNuke.Entities.Users
+Imports DotNetNuke.Framework
+Imports DotNetNuke.Services.Localization
+Imports DotNetNuke.UI.Utilities
+Imports DotNetNuke.Web.Client
 Imports DotNetNuke.Web.Client.ClientResourceManagement
 Imports DotNetNuke.Web.Razor
 
@@ -32,7 +36,7 @@ Namespace Common
 #End Region
 
 #Region " Event Handlers "
-  Private Sub Page_Load(sender As Object, e As System.EventArgs) Handles Me.Load
+  Private Sub Page_Load(sender As Object, e As EventArgs) Handles Me.Load
   End Sub
 #End Region
 
@@ -42,11 +46,11 @@ Namespace Common
    If Context.Items("ServiceAdded") Is Nothing Then
 
     ' Announce at DNN
-    DotNetNuke.Framework.jQuery.RequestRegistration()
-    DotNetNuke.Framework.jQuery.RequestDnnPluginsRegistration()
-    DotNetNuke.Framework.jQuery.RequestUIRegistration()
-    DotNetNuke.Framework.ServicesFramework.Instance.RequestAjaxScriptSupport()
-    DotNetNuke.Framework.ServicesFramework.Instance.RequestAjaxAntiForgerySupport()
+    jQuery.RequestRegistration()
+    jQuery.RequestDnnPluginsRegistration()
+    jQuery.RequestUIRegistration()
+    ServicesFramework.Instance.RequestAjaxScriptSupport()
+    ServicesFramework.Instance.RequestAjaxAntiForgerySupport()
 
     ' Scripts
     AddJavascriptFile("angular.min.js", 50)
@@ -73,15 +77,15 @@ Namespace Common
   End Sub
 
   Public Sub AddCssFile(cssFilename As String)
-   ClientResourceManager.RegisterStyleSheet(Page, ResolveUrl("~/DesktopModules/Connect/Projects/css/" & cssFilename), DotNetNuke.Web.Client.FileOrder.Css.ModuleCss)
+   ClientResourceManager.RegisterStyleSheet(Page, ResolveUrl("~/DesktopModules/Connect/Projects/css/" & cssFilename), FileOrder.Css.ModuleCss)
   End Sub
 
   Public Function LocalizeJSString(resourceKey As String) As String
-   Return DotNetNuke.UI.Utilities.ClientAPI.GetSafeJSString(LocalizeString(resourceKey))
+   Return ClientAPI.GetSafeJSString(LocalizeString(resourceKey))
   End Function
 
   Public Function LocalizeJSString(resourceKey As String, resourceFile As String) As String
-   Return DotNetNuke.UI.Utilities.ClientAPI.GetSafeJSString(DotNetNuke.Services.Localization.Localization.GetString(resourceKey, resourceFile))
+   Return ClientAPI.GetSafeJSString(Localization.GetString(resourceKey, resourceFile))
   End Function
 #End Region
 

Common/ModuleSettings.vb

@@ -1,4 +1,6 @@
 
+Imports DotNetNuke.Common.Utilities
+Imports DotNetNuke.Entities.Modules
 
 Namespace Common
  Public Class ModuleSettings
@@ -21,7 +23,7 @@ Namespace Common
   Public Sub New(moduleId As Integer)
 
    Me.ModuleId = moduleId
-   Settings = (New DotNetNuke.Entities.Modules.ModuleController).GetModuleSettings(moduleId)
+   Settings = (New ModuleController).GetModuleSettings(moduleId)
    Settings.ReadValue("TnWidth", TnWidth)
    Settings.ReadValue("TnHeight", TnHeight)
    Settings.ReadValue("MedWidth", MedWidth)
@@ -38,7 +40,7 @@ Namespace Common
 #Region " Public Members "
   Public Sub SaveSettings()
 
-   Dim objModules As New DotNetNuke.Entities.Modules.ModuleController
+   Dim objModules As New ModuleController
    objModules.UpdateModuleSetting(ModuleId, "TnWidth", Me.TnWidth.ToString)
    objModules.UpdateModuleSetting(ModuleId, "TnHeight", Me.TnHeight.ToString)
    objModules.UpdateModuleSetting(ModuleId, "MedWidth", Me.MedWidth.ToString)
@@ -48,20 +50,20 @@ Namespace Common
    objModules.UpdateModuleSetting(ModuleId, "TnFit", Me.TnFit)
    objModules.UpdateModuleSetting(ModuleId, "MedFit", Me.MedFit)
    objModules.UpdateModuleSetting(ModuleId, "ZoomFit", Me.ZoomFit)
-   DotNetNuke.Common.Utilities.DataCache.SetCache(CacheKey(ModuleId), Me)
+   DataCache.SetCache(CacheKey(ModuleId), Me)
 
   End Sub
 
   Public Shared Function GetSettings(moduleId As Integer) As ModuleSettings
 
    Dim res As ModuleSettings = Nothing
    Try
-    res = CType(DotNetNuke.Common.Utilities.DataCache.GetCache(CacheKey(moduleId)), ModuleSettings)
+    res = CType(DataCache.GetCache(CacheKey(moduleId)), ModuleSettings)
    Catch ex As Exception
    End Try
    If res Is Nothing Then
     res = New ModuleSettings(moduleId)
-    DotNetNuke.Common.Utilities.DataCache.SetCache(CacheKey(moduleId), res)
+    DataCache.SetCache(CacheKey(moduleId), res)
    End If
    Return res
 

Common/RazorControl.vb

@@ -1,4 +1,5 @@
-Imports DotNetNuke.Entities.Modules
+Imports System.IO
+Imports DotNetNuke.Entities.Modules
 Imports DotNetNuke.UI.Modules
 Imports DotNetNuke.Web.Razor
 
@@ -28,7 +29,7 @@ Namespace Common
 
   Public Function RenderObject() As String
 
-   Using tw As New IO.StringWriter()
+   Using tw As New StringWriter()
     Engine.Render(tw)
     Return tw.ToString
    End Using
@@ -37,7 +38,7 @@ Namespace Common
 
   Public Function RenderObject(Of T)(model As T) As String
 
-   Using tw As New IO.StringWriter()
+   Using tw As New StringWriter()
     Engine.Render(Of T)(tw, model)
     Return tw.ToString
    End Using

Common/Resizer.vb

@@ -1,5 +1,7 @@
 Imports System.Drawing
+Imports System.Drawing.Drawing2D
 Imports System.Drawing.Imaging
+Imports System.IO
 
 Namespace Common
  Public Class Resizer
@@ -20,7 +22,7 @@ Namespace Common
     Dim originalHeight As Integer = thisImage.Height
     Dim imgRatio As Single = Convert.ToSingle(originalHeight / originalWidth)
 
-    Dim ext As String = IO.Path.GetExtension(originalFile)
+    Dim ext As String = Path.GetExtension(originalFile)
     Dim saveFilename As String = Left(originalFile, originalFile.Length - ext.Length)
 
     ' Resize Image
@@ -61,10 +63,10 @@ Namespace Common
      ' Stretch
    End Select
 
-   Using backBuffer As Bitmap = New Bitmap(newWidth, newHeight, Drawing.Imaging.PixelFormat.Format24bppRgb)
+   Using backBuffer As Bitmap = New Bitmap(newWidth, newHeight, PixelFormat.Format24bppRgb)
     Using backBufferGraphics As Graphics = Graphics.FromImage(backBuffer)
-     backBufferGraphics.InterpolationMode = Drawing.Drawing2D.InterpolationMode.HighQualityBicubic
-     backBufferGraphics.SmoothingMode = Drawing.Drawing2D.SmoothingMode.AntiAlias
+     backBufferGraphics.InterpolationMode = InterpolationMode.HighQualityBicubic
+     backBufferGraphics.SmoothingMode = SmoothingMode.AntiAlias
      backBufferGraphics.DrawImage(thisImage, newX - 1, newY - 1, Convert.ToInt32(originalWidth * scaleX) + 2, Convert.ToInt32(originalHeight * scaleY) + 2)
      backBuffer.Save(SaveAs, imgFormat)
     End Using

Common/RouteMapper.vb

@@ -5,7 +5,7 @@ Namespace Common
   Implements IServiceRouteMapper
 
 #Region " IServiceRouteMapper "
-  Public Sub RegisterRoutes(mapRouteManager As DotNetNuke.Web.Api.IMapRoute) Implements DotNetNuke.Web.Api.IServiceRouteMapper.RegisterRoutes
+  Public Sub RegisterRoutes(mapRouteManager As IMapRoute) Implements IServiceRouteMapper.RegisterRoutes
    mapRouteManager.MapHttpRoute("Connect/Projects", "Projects1", "{controller}/{action}/{id}", Nothing, New With {.id = "\d*"}, New String() {
    "Connect.DNN.Modules.Projects.Controllers",
    "Connect.DNN.Modules.Projects.Controllers.Projects",