Revision: 793
http://dasblogce.svn.sourceforge.net/dasblogce/?rev=793&view=rev
Author: sfcaus
Date: 2008-01-11 07:53:27 -0800 (Fri, 11 Jan 2008)
Log Message:
-----------
- cleanup the Namespaces
- reformating code
- some fixes
- useless comments deleted
Modified Paths:
--------------
branches/refactoring_architecture/source/AssemblyInfo.cs
branches/refactoring_architecture/source/DasBlogUpgrader/AssemblyInfo.cs
branches/refactoring_architecture/source/DasBlogUpgrader/DayExtraOld.cs
branches/refactoring_architecture/source/DasBlogUpgrader/MovableTypeBlacklist.cs
branches/refactoring_architecture/source/DasBlogUpgrader/Program.cs
branches/refactoring_architecture/source/DasBlogUpgrader/ReferralBlackList.cs
branches/refactoring_architecture/source/Lesnikowski.Pawel.Mail.Pop3/AssemblyInfo.cs
branches/refactoring_architecture/source/Lesnikowski.Pawel.Mail.Pop3/Example.cs
branches/refactoring_architecture/source/Lesnikowski.Pawel.Mail.Pop3/Pop3Message.cs
branches/refactoring_architecture/source/Lesnikowski.Pawel.Mail.Pop3/QuotedCoding.cs
branches/refactoring_architecture/source/Subtext.Akismet/HttpClient.cs
branches/refactoring_architecture/source/WebControlCaptcha/AssemblyInfo.vb
branches/refactoring_architecture/source/WebControlCaptcha/CaptchaControl.vb
branches/refactoring_architecture/source/WebControlCaptcha/CaptchaImage.vb
branches/refactoring_architecture/source/WebControlCaptcha/CaptchaImageHandler.vb
branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/BlogDataService.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CategoryCache.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CategoryCacheEntry.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CategoryCacheEntryCollection.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CategoryCacheEntryDetail.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CategoryCacheEntryDetailCollection.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CollectionFilter.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Comment.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CommentCollection.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CommentFile.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CrossPostServerInfo.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Crosspost.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CrosspostInfoCollection.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CrosspostSite.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/DataManager.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/DayEntry.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/DayEntryCollection.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/DayEntryCollectionFilter.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/EntryCollection.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/EntryCollectionFilter.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/EntryIdCache.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/EntryIdCacheEntry.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/EntryIdCacheEntryCollection.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/ErrorTrace.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/EventDataItemCollection.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/EventMessageTemplates.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/IDayEntry.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/IFeedback.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/ISpamBlockingService.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/LogDataItem.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/LogDataItemCollection.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/LogEncoder.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/LoggingDataService.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/LoggingDataServiceFactory.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/PingService.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/PingbackInfoCollection.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/SendMailInfo.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/SpamState.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/AppTest.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/BlogDataServiceTests.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/BloggerApiTest.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/EntryCollectionTests.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/EntryTests.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/TestBaseLocal.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/TestBaseServer.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/TrackbackTests.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/assemblyinfo.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/TrackbackInfo.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/TrackbackInfoCollection.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Tracking.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/TrackingCollection.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/WeblogUpdatePingInfo.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime.Proxies/BloggerAPIClientProxy.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime.Proxies/ImpersonationSharing.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime.Proxies/XmlStorageSystemClientProxy.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Util/CommandLineSwitchAttribute.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Html/HtmlTokenizer.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Util/HttpHelper.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Parser.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Util/RFC2822Date.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Util/ReflectionHelper.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Resources/WebUtil.Designer.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Test/BlogSource.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Test/CommandLine.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Test/ParserTest.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Test/ReflectionHelperTest.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Util/TimeZones.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Util/XmlNamespaceUpgradeReader.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Zip/Crc32.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Zip/Shared.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Zip/ZipDirEntry.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Zip/ZipEntry.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Zip/ZipFile.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Activity.aspx.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ActivityBox.ascx.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AdminNavBar.ascx.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AggBugs.aspx.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AggBugsBox.ascx.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ArchivesControl.ascx.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web/BlogRollControl.ascx.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CategoryView.aspx.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ClickThroughs.aspx.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ClickThroughsBox.ascx.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CommentViewBox.ascx.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CrosspostReferrers.aspx.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CrosspostReferrersBox.ascx.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditBlogRoll.aspx.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditBlogRollBox.ascx.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditBlogRollEditItem.ascx.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditBlogRollItem.ascx.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditConfig.aspx.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditConfigBox.ascx.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditContentFilters.aspx.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditContentFiltersBox.ascx.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditControlProvider.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditCrosspostSites.aspx.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditCrosspostSitesBox.ascx.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditEntryBox.ascx.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditNavigatorLinks.aspx.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditNavigatorLinksBox.ascx.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditService.asmx.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditUser.aspx.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditUserBox.ascx.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Email.aspx.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EmailBox.ascx.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Eventlog.aspx.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EventlogBox.ascx.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web/FormatControl.ascx.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web/FormatPage.aspx.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web/FreeTextBoxAdapter.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Global.asax
branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Global.asax.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web/LoginBox.ascx.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Logout.ascx.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web/MonthView.aspx.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web/MonthViewBox.ascx.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Profile.aspx.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ProfileCombo.ascx.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Search.ascx
branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Search.ascx.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Search.ascx.designer.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SearchView.aspx.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SearchViewBox.ascx.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SingleCommentView.ascx
branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SingleCommentView.ascx.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SingleCommentView.ascx.designer.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web/StatisticsListBase.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SyndicationService.asmx.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SyndicationServiceExperimental.asmx.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web/TextBoxAdapter.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ThemeBar.ascx.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ThemeCombo.ascx.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web/TimeLineControl.ascx.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web/UserClickThroughs.aspx.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web/UserClickThroughsBox.ascx.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web/UserView.aspx.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web/default.aspx.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ftb/ftb.inserttable.aspx
branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/AkismetSpamBlockingService.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/CategoryList.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/IPBlackList.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/MatchedTag.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/MatchedTagCollection.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/NamingPanel.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/NavigationLink.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Opml.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/ProfileMapperModule.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/RobotDefinition.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/SearchHighlight.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/SharedBaseControl.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/SharedBasePage.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/SideBarList.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/SideBarOpmlList.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/SiteConfig.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/SiteSecurity.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/SiteUtilities.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/TemplateProcessor.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Test/AssemblyInfo.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Test/OpmlSerializeTest.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Test/SiteConfigSerializeTest.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Test/UtilitiesTests.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Themes.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/TitleMapperModule.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/UrlMapperModule.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/ValidTag.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/ValidTagCollection.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/WebControls/ControlImageHandler.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/WebControls/ShadowBox.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/WeblogCalendar.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/AggregatorBugHandler.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/ApproveItemHandler.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/Atom10.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/AutoSaveEntryHandler.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/Blogger.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/BloggerAPI.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/CdfHandler.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/ClickThroughHandler.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/CommentAPI.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/ConfigEditingServiceImplementation.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/CrosspostReferrerHandler.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/DeleteItemHandler.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/EditServiceImplementation.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/GoogleSitemap.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/GoogleSitemapHandler.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/MailToWeblog.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/MicrosummaryHandler.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/PingbackAPI.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/ReportMailer.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/Rsd.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/Rss.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/SyndicationServiceBase.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/SyndicationServiceExperimentalImplementation.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/SyndicationServiceImplementation.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/Test/AssemblyInfo.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/Test/ConfigServiceTester.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/Test/Web References/ConfigService/Reference.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/Test/newtelligence.DasBlog.Web.Services.Test.csproj
branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/Timeline.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/TimelineHandler.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/TrackbackHandler.cs
branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/XSSUpstreamer.cs
Modified: branches/refactoring_architecture/source/AssemblyInfo.cs
===================================================================
--- branches/refactoring_architecture/source/AssemblyInfo.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/AssemblyInfo.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -10,17 +10,14 @@
using System;
using System.Reflection;
-using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
-[assembly: AssemblyTitle("dasBlog 2.1")]
-[assembly: AssemblyDescription("dasBlog 2.1 ASP.NET Blogging Engine")]
-[assembly: AssemblyProduct("newtelligence dasBlog")]
-[assembly: AssemblyCopyright("Copyright (c) 2007 newtelligence AG")]
-[assembly: ComVisible(false)]
-[assembly: CLSCompliant(false)]
-[assembly: Guid("22F15D36-4E7E-4c9b-A79C-F0A2177EE97B")]
-[assembly: AssemblyVersion("2.1.7238.742")]
-[assembly: AssemblyFileVersion("2.1.7238.742")]
-
-
+[assembly : AssemblyTitle("dasBlog 2.1")]
+[assembly : AssemblyDescription("dasBlog 2.1 ASP.NET Blogging Engine")]
+[assembly : AssemblyProduct("newtelligence dasBlog")]
+[assembly : AssemblyCopyright("Copyright (c) 2007 newtelligence AG")]
+[assembly : ComVisible(false)]
+[assembly : CLSCompliant(false)]
+[assembly : Guid("22F15D36-4E7E-4c9b-A79C-F0A2177EE97B")]
+[assembly : AssemblyVersion("2.1.7238.742")]
+[assembly : AssemblyFileVersion("2.1.7238.742")]
\ No newline at end of file
Modified: branches/refactoring_architecture/source/DasBlogUpgrader/AssemblyInfo.cs
===================================================================
--- branches/refactoring_architecture/source/DasBlogUpgrader/AssemblyInfo.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/DasBlogUpgrader/AssemblyInfo.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -1,5 +1,4 @@
using System.Reflection;
-using System.Runtime.CompilerServices;
//
// General Information about an assembly is controlled through the following
Modified: branches/refactoring_architecture/source/DasBlogUpgrader/DayExtraOld.cs
===================================================================
--- branches/refactoring_architecture/source/DasBlogUpgrader/DayExtraOld.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/DasBlogUpgrader/DayExtraOld.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -38,14 +38,11 @@
#endregion
using System;
-using System.Collections.Specialized;
using System.Diagnostics;
-using System.Globalization;
using System.IO;
using System.Xml;
using System.Xml.Serialization;
using newtelligence.DasBlog.Util;
-using System.Web;
namespace newtelligence.DasBlog.Runtime
{
Modified: branches/refactoring_architecture/source/DasBlogUpgrader/MovableTypeBlacklist.cs
===================================================================
--- branches/refactoring_architecture/source/DasBlogUpgrader/MovableTypeBlacklist.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/DasBlogUpgrader/MovableTypeBlacklist.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -161,7 +161,7 @@
/// <returns>A <see cref="Match"/>.</returns>
public Match IsBlacklisted(string url)
{
- if (!MovableTypeBlacklist.loaded)
+ if (!loaded)
{
return null;
}
Modified: branches/refactoring_architecture/source/DasBlogUpgrader/Program.cs
===================================================================
--- branches/refactoring_architecture/source/DasBlogUpgrader/Program.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/DasBlogUpgrader/Program.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -6,6 +6,7 @@
using System.IO;
using System.Security.Principal;
using System.Text.RegularExpressions;
+using System.Threading;
using System.Xml;
using System.Xml.Serialization;
using newtelligence.DasBlog.Runtime;
@@ -198,7 +199,7 @@
}
catch(Exception e)
{
- ErrorTrace.Trace(System.Diagnostics.TraceLevel.Error,e);
+ ErrorTrace.Trace(TraceLevel.Error,e);
}
finally
{
@@ -408,7 +409,7 @@
Console.WriteLine("BACKUP YOUR CONTENT FOLDER BEFORE RUNNING THIS!");
// we need to set the role to admin so we get public entries
- System.Threading.Thread.CurrentPrincipal = new GenericPrincipal(System.Threading.Thread.CurrentPrincipal.Identity, new string[] {"admin"});
+ Thread.CurrentPrincipal = new GenericPrincipal(Thread.CurrentPrincipal.Identity, new string[] {"admin"});
if (args.Length != 1)
{
Modified: branches/refactoring_architecture/source/DasBlogUpgrader/ReferralBlackList.cs
===================================================================
--- branches/refactoring_architecture/source/DasBlogUpgrader/ReferralBlackList.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/DasBlogUpgrader/ReferralBlackList.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -1,9 +1,8 @@
using System;
using System.Collections;
+using System.Collections.Generic;
using System.Text.RegularExpressions;
-using System.Web;
using newtelligence.DasBlog.Runtime;
-using System.Collections.Generic;
namespace newtelligence.DasBlog.Web.Core
{
Modified: branches/refactoring_architecture/source/Lesnikowski.Pawel.Mail.Pop3/AssemblyInfo.cs
===================================================================
--- branches/refactoring_architecture/source/Lesnikowski.Pawel.Mail.Pop3/AssemblyInfo.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/Lesnikowski.Pawel.Mail.Pop3/AssemblyInfo.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -1,5 +1,4 @@
using System.Reflection;
-using System.Runtime.CompilerServices;
//
// General Information about an assembly is controlled through the following
Modified: branches/refactoring_architecture/source/Lesnikowski.Pawel.Mail.Pop3/Example.cs
===================================================================
--- branches/refactoring_architecture/source/Lesnikowski.Pawel.Mail.Pop3/Example.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/Lesnikowski.Pawel.Mail.Pop3/Example.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -1,11 +1,8 @@
//Pawel Lesnikowski lesnikowski@...
using System;
-using Lesnikowski.Pawel.Mail.Pop3;
-using System.IO;
-using System.Text;
using System.Collections;
+using Lesnikowski.Pawel.Mail.Pop3;
-
namespace Example
{
Modified: branches/refactoring_architecture/source/Lesnikowski.Pawel.Mail.Pop3/Pop3Message.cs
===================================================================
--- branches/refactoring_architecture/source/Lesnikowski.Pawel.Mail.Pop3/Pop3Message.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/Lesnikowski.Pawel.Mail.Pop3/Pop3Message.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -1,6 +1,3 @@
-using System;
-using System.Collections;
-
namespace Lesnikowski.Pawel.Mail.Pop3
{
public class Pop3Message : BaseEntity
Modified: branches/refactoring_architecture/source/Lesnikowski.Pawel.Mail.Pop3/QuotedCoding.cs
===================================================================
--- branches/refactoring_architecture/source/Lesnikowski.Pawel.Mail.Pop3/QuotedCoding.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/Lesnikowski.Pawel.Mail.Pop3/QuotedCoding.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -38,7 +38,7 @@
}
else
{
- buffer[bufferPosition]=System.Convert.ToByte(s.Substring(i+1,2),16);
+ buffer[bufferPosition]=Convert.ToByte(s.Substring(i+1,2),16);
}
i+=2;
}
Modified: branches/refactoring_architecture/source/Subtext.Akismet/HttpClient.cs
===================================================================
--- branches/refactoring_architecture/source/Subtext.Akismet/HttpClient.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/Subtext.Akismet/HttpClient.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -26,7 +26,7 @@
/// <returns></returns>
public virtual string PostRequest(Uri url, string userAgent, int timeout, string formParameters)
{
- System.Net.ServicePointManager.Expect100Continue = false;
+ ServicePointManager.Expect100Continue = false;
HttpWebRequest request = WebRequest.Create(url) as HttpWebRequest;
if (null != request)
Modified: branches/refactoring_architecture/source/WebControlCaptcha/AssemblyInfo.vb
===================================================================
--- branches/refactoring_architecture/source/WebControlCaptcha/AssemblyInfo.vb 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/WebControlCaptcha/AssemblyInfo.vb 2008-01-11 15:53:27 UTC (rev 793)
@@ -1,4 +1,3 @@
-Imports System
Imports System.Reflection
' General Information about an assembly is controlled through the following
Modified: branches/refactoring_architecture/source/WebControlCaptcha/CaptchaControl.vb
===================================================================
--- branches/refactoring_architecture/source/WebControlCaptcha/CaptchaControl.vb 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/WebControlCaptcha/CaptchaControl.vb 2008-01-11 15:53:27 UTC (rev 793)
@@ -1,9 +1,11 @@
Imports System.ComponentModel
-Imports System.Web
+Imports System.Web.UI.WebControls
Imports System.Web.UI
-Imports System.Web.UI.WebControls
-Imports System.Collections
Imports System.Collections.Specialized
+Imports System.Drawing
+Imports System.Web
+Imports System.Text
+Imports System.Web.Caching
''' <summary>
'''
@@ -18,7 +20,7 @@
''' </summary>
<DefaultProperty("Text")> _
Public Class CaptchaControl
- Inherits System.Web.UI.WebControls.WebControl
+ Inherits WebControl
Implements INamingContainer
Implements IPostBackDataHandler
@@ -47,7 +49,7 @@
End Set
End Property
- <DefaultValue(GetType(CaptchaControl.Layout), "Horizontal"), Description("Determines if image and input area are displayed horizontally, or vertically."), Category("Captcha")> _
+ <DefaultValue(GetType(Layout), "Horizontal"), Description("Determines if image and input area are displayed horizontally, or vertically."), Category("Captcha")> _
Public Property LayoutStyle() As Layout
Get
Return _LayoutStyle
@@ -231,7 +233,7 @@
''' <summary>
''' returns HTML-ized color strings
''' </summary>
- Private Function HtmlColor(ByVal color As Drawing.Color) As String
+ Private Function HtmlColor(ByVal color As Color) As String
If color.IsEmpty Then Return ""
If color.IsNamedColor Then
Return color.ToKnownColor.ToString
@@ -247,7 +249,7 @@
''' based on standard control visual properties
''' </summary>
Private Function CssStyle() As String
- Dim sb As New System.Text.StringBuilder
+ Dim sb As New StringBuilder
Dim strColor As String
With sb
@@ -421,7 +423,7 @@
If Not IsDesignMode Then
'HttpContext.Current.Cache.Add(LocalGuid, _captcha, Nothing, DateTime.Now.AddMinutes(HttpContext.Current.Session.Timeout), TimeSpan.Zero, Caching.CacheItemPriority.Normal, Nothing)
'No reason to keep the captcha in the cache very long.
- HttpContext.Current.Cache.Add(LocalGuid, _captcha, Nothing, DateTime.Now.AddMinutes(1), TimeSpan.Zero, Caching.CacheItemPriority.High, Nothing)
+ HttpContext.Current.Cache.Add(LocalGuid, _captcha, Nothing, DateTime.Now.AddMinutes(1), TimeSpan.Zero, CacheItemPriority.High, Nothing)
End If
Me.CaptchaText = _captcha.Text
Me.GeneratedAt = Now
Modified: branches/refactoring_architecture/source/WebControlCaptcha/CaptchaImage.vb
===================================================================
--- branches/refactoring_architecture/source/WebControlCaptcha/CaptchaImage.vb 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/WebControlCaptcha/CaptchaImage.vb 2008-01-11 15:53:27 UTC (rev 793)
@@ -1,7 +1,8 @@
-Imports System
Imports System.Drawing
+Imports System.Drawing.Text
+Imports System.Text
+Imports System.Drawing.Imaging
Imports System.Drawing.Drawing2D
-Imports System.Drawing.Imaging
''' <summary>
'''
@@ -70,7 +71,7 @@
_strFontFamilyName = Value
font1.Dispose()
Catch ex As Exception
- _strFontFamilyName = Drawing.FontFamily.GenericSerif.Name
+ _strFontFamilyName = FontFamily.GenericSerif.Name
End Try
End Set
End Property
@@ -181,8 +182,8 @@
''' .. that's not on our font blacklist (illegible for CAPTCHA)
''' </summary>
Private Function RandomFontFamily() As String
- Dim fc As New System.Drawing.Text.InstalledFontCollection
- Dim ff() As System.Drawing.FontFamily = fc.Families
+ Dim fc As New InstalledFontCollection
+ Dim ff() As FontFamily = fc.Families
Dim strFontFamilyName As String = "bogus"
Do While _strGoodFontList.IndexOf(strFontFamilyName) = -1
@@ -198,7 +199,7 @@
''' eg, try to avoid numbers and characters that look alike
''' </summary>
Private Function GenerateRandomText() As String
- Dim sb As New System.Text.StringBuilder
+ Dim sb As New StringBuilder
Dim n As Integer
Dim intMaxLength As Integer = _strRandomTextChars.Length
For n = 0 To _intRandomTextLength - 1
Modified: branches/refactoring_architecture/source/WebControlCaptcha/CaptchaImageHandler.vb
===================================================================
--- branches/refactoring_architecture/source/WebControlCaptcha/CaptchaImageHandler.vb 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/WebControlCaptcha/CaptchaImageHandler.vb 2008-01-11 15:53:27 UTC (rev 793)
@@ -1,6 +1,5 @@
-Imports System
Imports System.Web
-Imports System.Drawing
+Imports System.Drawing.Imaging
''' <summary>
'''
@@ -20,7 +19,7 @@
Public Class CaptchaImageHandler
Implements IHttpHandler
- Public Sub ProcessRequest(ByVal context As System.Web.HttpContext) Implements System.Web.IHttpHandler.ProcessRequest
+ Public Sub ProcessRequest(ByVal context As HttpContext) Implements IHttpHandler.ProcessRequest
Dim app As HttpApplication = context.ApplicationInstance
'-- get the unique GUID of the captcha; this must be passed in via querystring
@@ -47,7 +46,7 @@
End If
'-- write the image to the HTTP output stream as an array of bytes
- ci.Image.Save(app.Context.Response.OutputStream, Drawing.Imaging.ImageFormat.Jpeg)
+ ci.Image.Save(app.Context.Response.OutputStream, ImageFormat.Jpeg)
app.Response.ContentType = "image/jpeg"
app.Response.StatusCode = 200
app.Response.End()
@@ -55,7 +54,7 @@
End Sub
- Public ReadOnly Property IsReusable() As Boolean Implements System.Web.IHttpHandler.IsReusable
+ Public ReadOnly Property IsReusable() As Boolean Implements IHttpHandler.IsReusable
Get
Return True
End Get
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/BlogDataService.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/BlogDataService.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/BlogDataService.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -39,6 +39,7 @@
using System;
using System.Collections;
+using System.Collections.Generic;
using System.Diagnostics;
using System.Globalization;
using System.IO;
@@ -48,7 +49,6 @@
using System.Web;
using CookComputing.XmlRpc;
using newtelligence.DasBlog.Runtime.Proxies;
-using System.Collections.Generic;
namespace newtelligence.DasBlog.Runtime
{
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CategoryCache.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CategoryCache.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CategoryCache.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -37,8 +37,6 @@
*/
#endregion
-
-using System.Collections;
using System.Collections.Generic;
using System.Xml;
using System.Xml.Serialization;
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CategoryCacheEntry.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CategoryCacheEntry.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CategoryCacheEntry.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -37,7 +37,6 @@
*/
#endregion
-
using System.Xml.Serialization;
namespace newtelligence.DasBlog.Runtime
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CategoryCacheEntryCollection.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CategoryCacheEntryCollection.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CategoryCacheEntryCollection.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -1,6 +1,4 @@
-
using System;
-using System.Collections;
using System.Collections.Generic;
namespace newtelligence.DasBlog.Runtime
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CategoryCacheEntryDetail.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CategoryCacheEntryDetail.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CategoryCacheEntryDetail.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -37,7 +37,6 @@
*/
#endregion
-
using System;
using System.Xml.Serialization;
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CategoryCacheEntryDetailCollection.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CategoryCacheEntryDetailCollection.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CategoryCacheEntryDetailCollection.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -1,6 +1,4 @@
-
using System;
-using System.Collections;
using System.Collections.Generic;
namespace newtelligence.DasBlog.Runtime
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CollectionFilter.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CollectionFilter.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CollectionFilter.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -1,7 +1,6 @@
using System;
-using System.Collections.Generic;
-using System.Text;
using System.Collections;
+using System.Collections.Generic;
namespace newtelligence.DasBlog.Runtime
{
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Comment.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Comment.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Comment.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -37,7 +37,6 @@
*/
#endregion
-
using System;
using System.Xml;
using System.Xml.Serialization;
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CommentCollection.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CommentCollection.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CommentCollection.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -1,8 +1,5 @@
-
using System;
-using System.Collections;
using System.Collections.Generic;
-using System.Globalization;
namespace newtelligence.DasBlog.Runtime
{
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CommentFile.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CommentFile.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CommentFile.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -39,15 +39,12 @@
#endregion
-
using System;
using System.Diagnostics;
using System.IO;
using System.Threading;
using System.Xml.Serialization;
-using newtelligence.DasBlog.Util;
-
namespace newtelligence.DasBlog.Runtime {
/// <summary>
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CrossPostServerInfo.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CrossPostServerInfo.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CrossPostServerInfo.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -1,5 +1,3 @@
-using System;
-
namespace newtelligence.DasBlog.Runtime
{
/// <summary>
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Crosspost.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Crosspost.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Crosspost.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -42,7 +42,6 @@
using System.Collections.ObjectModel;
using System.Xml.Serialization;
-
namespace newtelligence.DasBlog.Runtime
{
[Serializable]
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CrosspostInfoCollection.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CrosspostInfoCollection.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CrosspostInfoCollection.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -37,7 +37,6 @@
*/
#endregion
-
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CrosspostSite.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CrosspostSite.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CrosspostSite.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -37,14 +37,12 @@
*/
#endregion
-
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Xml;
using System.Xml.Serialization;
-
namespace newtelligence.DasBlog.Runtime
{
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/DataManager.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/DataManager.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/DataManager.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -40,13 +40,9 @@
#endregion
using System;
-using System.Diagnostics;
+using System.Collections.Generic;
using System.Globalization;
using System.IO;
-using System.Web;
-using System.Collections;
-using newtelligence.DasBlog.Util;
-using System.Collections.Generic;
namespace newtelligence.DasBlog.Runtime
{
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/DayEntry.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/DayEntry.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/DayEntry.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -37,14 +37,15 @@
*/
#endregion
-
using System;
+using System.Collections;
using System.Diagnostics;
using System.Globalization;
using System.IO;
+using System.Security.Principal;
+using System.Threading;
using System.Xml;
using System.Xml.Serialization;
-using System.Collections;
using newtelligence.DasBlog.Runtime.Proxies;
using newtelligence.DasBlog.Util;
@@ -144,7 +145,7 @@
lock(entriesLock)
{
Predicate<Entry> filter = null;
- if(!System.Threading.Thread.CurrentPrincipal.IsInRole("admin"))
+ if(!Thread.CurrentPrincipal.IsInRole("admin"))
{
filter += EntryCollectionFilter.DefaultFilters.IsPublic();
}
@@ -204,7 +205,7 @@
}
catch(Exception e)
{
- ErrorTrace.Trace(System.Diagnostics.TraceLevel.Error,e);
+ ErrorTrace.Trace(TraceLevel.Error,e);
}
finally
{
@@ -233,7 +234,7 @@
}
else
{
- System.Security.Principal.WindowsImpersonationContext wi = Impersonation.Impersonate();
+ WindowsImpersonationContext wi = Impersonation.Impersonate();
FileStream fileStream = FileUtils.OpenForWrite(fullPath);
@@ -249,7 +250,7 @@
}
catch(Exception e)
{
- ErrorTrace.Trace(System.Diagnostics.TraceLevel.Error,e);
+ ErrorTrace.Trace(TraceLevel.Error,e);
}
finally
{
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/DayEntryCollection.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/DayEntryCollection.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/DayEntryCollection.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -1,6 +1,4 @@
-
using System;
-using System.Collections;
using System.Collections.Generic;
namespace newtelligence.DasBlog.Runtime
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/DayEntryCollectionFilter.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/DayEntryCollectionFilter.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/DayEntryCollectionFilter.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -1,6 +1,4 @@
using System;
-using System.Collections.Generic;
-using System.Text;
namespace newtelligence.DasBlog.Runtime
{
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/EntryCollection.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/EntryCollection.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/EntryCollection.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -1,6 +1,4 @@
-
using System;
-using System.Collections;
using System.Collections.Generic;
namespace newtelligence.DasBlog.Runtime
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/EntryCollectionFilter.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/EntryCollectionFilter.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/EntryCollectionFilter.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -1,7 +1,5 @@
using System;
-using System.Collections.Generic;
-
namespace newtelligence.DasBlog.Runtime
{
public class EntryCollectionFilter : CollectionFilter<EntryCollection, Entry>
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/EntryIdCache.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/EntryIdCache.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/EntryIdCache.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -38,10 +38,8 @@
#endregion
using System;
-using System.Collections;
using System.Collections.Generic;
-
namespace newtelligence.DasBlog.Runtime
{
/// <summary>
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/EntryIdCacheEntry.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/EntryIdCacheEntry.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/EntryIdCacheEntry.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -37,8 +37,8 @@
*/
#endregion
-
using System;
+using System.Globalization;
using System.Xml.Serialization;
namespace newtelligence.DasBlog.Runtime
@@ -61,7 +61,7 @@
{
get
{
- string date = this.DateUtc.ToString("yyyy/MM/dd/", System.Globalization.CultureInfo.InvariantCulture);
+ string date = this.DateUtc.ToString("yyyy/MM/dd/", CultureInfo.InvariantCulture);
return date + this.CompressedTitle;
}
}
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/EntryIdCacheEntryCollection.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/EntryIdCacheEntryCollection.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/EntryIdCacheEntryCollection.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -1,7 +1,4 @@
-
using System;
-using System.Collections;
-using newtelligence.DasBlog.Runtime;
using System.Collections.Generic;
namespace newtelligence.DasBlog.Runtime
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/ErrorTrace.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/ErrorTrace.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/ErrorTrace.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -37,7 +37,6 @@
*/
#endregion
-
using System;
using System.Diagnostics;
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/EventDataItemCollection.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/EventDataItemCollection.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/EventDataItemCollection.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -37,11 +37,9 @@
*/
#endregion
-
using System;
-using System.Collections;
-using System.Collections.ObjectModel;
using System.Collections.Generic;
+using System.Collections.ObjectModel;
namespace newtelligence.DasBlog.Runtime
{
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/EventMessageTemplates.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/EventMessageTemplates.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/EventMessageTemplates.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -38,7 +38,6 @@
#endregion
using System;
-using System.Collections;
using System.Collections.Generic;
namespace newtelligence.DasBlog.Runtime
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/IDayEntry.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/IDayEntry.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/IDayEntry.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -37,15 +37,6 @@
*/
#endregion
-
-using System;
-using System.Diagnostics;
-using System.IO;
-using System.Xml;
-using System.Xml.Serialization;
-using System.Collections;
-using newtelligence.DasBlog.Util;
-
namespace newtelligence.DasBlog.Runtime
{
public interface IDayEntry
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/IFeedback.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/IFeedback.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/IFeedback.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -1,5 +1,3 @@
-using System;
-
namespace newtelligence.DasBlog.Runtime
{
public interface IFeedback
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/ISpamBlockingService.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/ISpamBlockingService.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/ISpamBlockingService.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -1,5 +1,3 @@
-using System;
-
namespace newtelligence.DasBlog.Runtime
{
public interface ISpamBlockingService
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/LogDataItem.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/LogDataItem.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/LogDataItem.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -37,7 +37,6 @@
*/
#endregion
-
using System;
using System.Xml;
using System.Xml.Serialization;
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/LogDataItemCollection.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/LogDataItemCollection.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/LogDataItemCollection.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -1,7 +1,4 @@
-
using System;
-using System.Collections;
-using newtelligence.DasBlog.Runtime;
using System.Collections.Generic;
namespace newtelligence.DasBlog.Runtime
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/LogEncoder.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/LogEncoder.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/LogEncoder.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -1,4 +1,3 @@
-using System;
using System.Text.RegularExpressions;
namespace newtelligence.DasBlog.Runtime
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/LoggingDataService.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/LoggingDataService.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/LoggingDataService.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -43,7 +43,6 @@
using System.Text;
using System.Text.RegularExpressions;
using System.Threading;
-
using newtelligence.DasBlog.Runtime.Proxies;
using newtelligence.DasBlog.Util.Zip;
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/LoggingDataServiceFactory.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/LoggingDataServiceFactory.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/LoggingDataServiceFactory.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -1,4 +1,3 @@
-using System;
using System.Collections;
namespace newtelligence.DasBlog.Runtime
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/PingService.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/PingService.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/PingService.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -1,7 +1,7 @@
using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
using System.Xml.Serialization;
-using System.Collections.ObjectModel;
-using System.Collections.Generic;
namespace newtelligence.DasBlog.Runtime
{
@@ -72,7 +72,7 @@
ping.Name = "Weblogs";
ping.Url = "http://www.weblogs.com";
ping.Endpoint = "http://rpc.weblogs.com/RPC2";
- ping.PingApi = PingService.PingApiType.Basic;
+ ping.PingApi = PingApiType.Basic;
return ping;
}
@@ -82,7 +82,7 @@
ping.Name = "blo.gs";
ping.Url = "http://www.blo.gs";
ping.Endpoint = "http://ping.blo.gs/";
- ping.PingApi = PingService.PingApiType.Extended;
+ ping.PingApi = PingApiType.Extended;
return ping;
}
}
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/PingbackInfoCollection.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/PingbackInfoCollection.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/PingbackInfoCollection.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -1,7 +1,4 @@
-
using System;
-using System.Collections;
-using newtelligence.DasBlog.Runtime;
using System.Collections.Generic;
namespace newtelligence.DasBlog.Runtime
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/SendMailInfo.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/SendMailInfo.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/SendMailInfo.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -37,8 +37,8 @@
*/
#endregion
-
using System;
+using System.Net;
using System.Net.Mail;
namespace newtelligence.DasBlog.Runtime
@@ -108,7 +108,7 @@
if (this.enableSmtpAuthentication)
{
mailClient.UseDefaultCredentials = false;
- mailClient.Credentials = new System.Net.NetworkCredential(this.smtpUserName, this.smtpPassword);
+ mailClient.Credentials = new NetworkCredential(this.smtpUserName, this.smtpPassword);
}
mailClient.EnableSsl = this.useSSL;
mailClient.Send(this.message);
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/SpamState.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/SpamState.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/SpamState.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -1,5 +1,3 @@
-using System;
-
namespace newtelligence.DasBlog.Runtime
{
/// <summary>
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/AppTest.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/AppTest.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/AppTest.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -1,6 +1,5 @@
using System;
using NUnit.Framework;
-using newtelligence.DasBlog.Runtime;
namespace newtelligence.DasBlog.Runtime.Test
{
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/BlogDataServiceTests.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/BlogDataServiceTests.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/BlogDataServiceTests.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -1,9 +1,7 @@
using System;
-using System.Collections;
+using System.Collections.Generic;
using System.IO;
-using newtelligence.DasBlog.Runtime;
using NUnit.Framework;
-using System.Collections.Generic;
namespace newtelligence.DasBlog.Runtime.Test
{
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/BloggerApiTest.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/BloggerApiTest.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/BloggerApiTest.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -1,7 +1,4 @@
using System;
-using System.Diagnostics;
-using System.IO;
-using CookComputing.XmlRpc;
using newtelligence.DasBlog.Runtime.Proxies;
using NUnit.Framework;
@@ -23,8 +20,8 @@
{
site.ApiType = "metaweblog";
site.BlogId = "BlogId";
- site.Username = BloggerApiTest.Username;
- site.Password = BloggerApiTest.Password;
+ site.Username = Username;
+ site.Password = Password;
crosspostInfo = new CrosspostInfo(site);
proxy = new BloggerAPIClientProxy();
@@ -33,7 +30,7 @@
proxy.UserAgent="newtelligence dasBlog/1.4";
Entry testEntry = TestEntry.CreateEntry("MetaWeblog " + DateTime.Now.ToShortTimeString(), 5, 2);
- testEntry.Author = BloggerApiTest.Username;
+ testEntry.Author = Username;
mwPost newPost = CreateMovableTypePost(testEntry);
@@ -51,7 +48,7 @@
public void EditMetaWeblogPost()
{
Entry testEntry = TestEntry.CreateEntry("MetaWeblog " + DateTime.Now.ToLongTimeString(), 5, 2);
- testEntry.Author = BloggerApiTest.Username;
+ testEntry.Author = Username;
// create a new entry
mwPost newPost = CreateMovableTypePost(testEntry);
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/EntryCollectionTests.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/EntryCollectionTests.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/EntryCollectionTests.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
-using System.Text;
using NUnit.Framework;
namespace newtelligence.DasBlog.Runtime.Test
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/EntryTests.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/EntryTests.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/EntryTests.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -1,6 +1,5 @@
using System;
using System.Text;
-using newtelligence.DasBlog.Runtime;
using NUnit.Framework;
namespace newtelligence.DasBlog.Runtime.Test
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/TestBaseLocal.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/TestBaseLocal.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/TestBaseLocal.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -1,4 +1,3 @@
-using System;
using System.IO;
using newtelligence.DasBlog.Util;
using NUnit.Framework;
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/TestBaseServer.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/TestBaseServer.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/TestBaseServer.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -1,4 +1,3 @@
-using System;
using System.IO;
using newtelligence.DasBlog.Util;
using NUnit.Framework;
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/TrackbackTests.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/TrackbackTests.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/TrackbackTests.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -1,7 +1,5 @@
using System;
-using System.IO;
-using newtelligence.DasBlog.Runtime;
-using newtelligence.DasBlog.Util;
+using System.Threading;
using NUnit.Framework;
namespace newtelligence.DasBlog.Runtime.Test
@@ -36,7 +34,7 @@
blogService.AddTracking( t );
}
- System.Threading.Thread.Sleep(2000);
+ Thread.Sleep(2000);
TrackingCollection trackingCollection = blogService.GetTrackingsFor(entries[0].EntryId);
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/assemblyinfo.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/assemblyinfo.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/assemblyinfo.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -1,5 +1,5 @@
using System.Reflection;
-using System.Runtime.CompilerServices;
+using System.Security.Permissions;
//
// General Information about an assembly is controlled through the following
@@ -57,4 +57,4 @@
[assembly: AssemblyKeyFile("")]
[assembly: AssemblyKeyName("")]
-[assembly: System.Security.Permissions.EnvironmentPermissionAttribute(System.Security.Permissions.SecurityAction.RequestMinimum)]
\ No newline at end of file
+[assembly: EnvironmentPermission(SecurityAction.RequestMinimum)]
\ No newline at end of file
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/TrackbackInfo.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/TrackbackInfo.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/TrackbackInfo.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -37,7 +37,6 @@
*/
#endregion
-
using System;
namespace newtelligence.DasBlog.Runtime
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/TrackbackInfoCollection.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/TrackbackInfoCollection.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/TrackbackInfoCollection.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -1,4 +1,3 @@
-
using System;
using System.Collections.Generic;
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Tracking.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Tracking.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Tracking.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -37,7 +37,6 @@
*/
#endregion
-
using System;
using System.Xml;
using System.Xml.Serialization;
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/TrackingCollection.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/TrackingCollection.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/TrackingCollection.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -1,7 +1,4 @@
-
using System;
-using System.Collections;
-using newtelligence.DasBlog.Runtime;
using System.Collections.Generic;
namespace newtelligence.DasBlog.Runtime
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/WeblogUpdatePingInfo.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/WeblogUpdatePingInfo.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/WeblogUpdatePingInfo.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -37,7 +37,6 @@
*/
#endregion
-
using System;
namespace newtelligence.DasBlog.Runtime
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime.Proxies/BloggerAPIClientProxy.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime.Proxies/BloggerAPIClientProxy.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime.Proxies/BloggerAPIClientProxy.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -303,7 +303,7 @@
/// <summary>
///
/// </summary>
- public System.DateTime dateCreated;
+ public DateTime dateCreated;
/// <summary>
///
/// </summary>
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime.Proxies/ImpersonationSharing.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime.Proxies/ImpersonationSharing.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime.Proxies/ImpersonationSharing.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -1,3 +1,6 @@
+using System.Security.Principal;
+using System.Threading;
+
/// <summary>
/// Provides help to share identity between threads.
/// http://aspalliance.com/articleViewer.aspx?aId=650&vId=1&pId
@@ -19,18 +22,18 @@
#endregion
#region ApplicationIdentity
- private static System.Security.Principal.WindowsIdentity applicationIdentity;
+ private static WindowsIdentity applicationIdentity;
/// <summary>
/// Gets the current application identity.
/// </summary>
/// <remarks>If the identity has not been set, it will return
/// <see cref="System.Security.Principal.WindowsIdentity.GetCurrent"/>.</remarks>
- public static System.Security.Principal.WindowsIdentity ApplicationIdentity
+ public static WindowsIdentity ApplicationIdentity
{
get
{
if (applicationIdentity == null)
- applicationIdentity = System.Security.Principal.WindowsIdentity.GetCurrent();
+ applicationIdentity = WindowsIdentity.GetCurrent();
return applicationIdentity;
}
set
@@ -44,11 +47,11 @@
/// <summary>
/// Impersonates the identity specified by <see cref="ApplicationIdentity"/>.
/// </summary>
- public static System.Security.Principal.WindowsImpersonationContext Impersonate()
+ public static WindowsImpersonationContext Impersonate()
{
- System.Security.Principal.WindowsPrincipal newPrin =
- new System.Security.Principal.WindowsPrincipal(ApplicationIdentity);
- System.Threading.Thread.CurrentPrincipal = newPrin;
+ WindowsPrincipal newPrin =
+ new WindowsPrincipal(ApplicationIdentity);
+ Thread.CurrentPrincipal = newPrin;
return ApplicationIdentity.Impersonate();
}
#endregion
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime.Proxies/XmlStorageSystemClientProxy.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime.Proxies/XmlStorageSystemClientProxy.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime.Proxies/XmlStorageSystemClientProxy.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -34,13 +34,10 @@
*/
#endregion
-using System;
using System.Security.Cryptography;
using System.Text;
-using System.Xml;
using CookComputing.XmlRpc;
-
namespace newtelligence.DasBlog.Runtime.Proxies
{
[XmlRpcMissingMapping(MappingAction.Ignore)]
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Util/CommandLineSwitchAttribute.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Util/CommandLineSwitchAttribute.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Util/CommandLineSwitchAttribute.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -18,7 +18,7 @@
/// <remark>Only currently is implemented for properties, so all
/// auto-switching variables should have a get/set method supplied.</remark>
[AttributeUsage( AttributeTargets.Property )]
- public class CommandLineSwitchAttribute : System.Attribute
+ public class CommandLineSwitchAttribute : Attribute
{
#region Private Variables
private string m_name = "";
@@ -54,7 +54,7 @@
/// defines an alias for it.
/// </summary>
[AttributeUsage( AttributeTargets.Property )]
- public class CommandLineAliasAttribute : System.Attribute
+ public class CommandLineAliasAttribute : Attribute
{
#region Private Variables
protected string m_Alias = "";
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Html/HtmlTokenizer.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Html/HtmlTokenizer.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Html/HtmlTokenizer.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -47,8 +47,6 @@
#endregion
using System;
-using System.IO;
-using System.Text;
namespace newtelligence.DasBlog.Util.Html
{
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Util/HttpHelper.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Util/HttpHelper.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Util/HttpHelper.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -1,6 +1,5 @@
-using System;
-using System.Collections.Generic;
using System.Text;
+using System.Web;
namespace newtelligence.DasBlog.Util
{
@@ -82,7 +81,7 @@
}
}
- return System.Web.HttpUtility.UrlEncode(retVal.ToString());
+ return HttpUtility.UrlEncode(retVal.ToString());
}
}
}
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Parser.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Parser.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Parser.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -9,6 +9,9 @@
// called Eas.Console that serves a similar purpose and should be investigated
// before another command line parser workspace is created.
using System;
+using System.Collections;
+using System.Reflection;
+using System.Text;
using System.Text.RegularExpressions;
namespace RJH.CommandLineHelper
@@ -33,7 +36,7 @@
public string Name { get { return (m_Switch as SwitchRecord).Name; } }
public string Description { get { return (m_Switch as SwitchRecord).Description; } }
public string[] Aliases { get { return (m_Switch as SwitchRecord).Aliases; } }
- public System.Type Type { get { return (m_Switch as SwitchRecord).Type; } }
+ public Type Type { get { return (m_Switch as SwitchRecord).Type; } }
public object Value { get { return (m_Switch as SwitchRecord).Value; } }
public object InternalValue { get { return (m_Switch as SwitchRecord).InternalValue; } }
public bool IsEnum { get { return (m_Switch as SwitchRecord).Type.IsEnum; } }
@@ -68,14 +71,14 @@
private string m_name = "";
private string m_description = "";
private object m_value = null;
- private System.Type m_switchType = typeof(bool);
- private System.Collections.ArrayList m_Aliases = null;
+ private Type m_switchType = typeof(bool);
+ private ArrayList m_Aliases = null;
private string m_Pattern = "";
// The following advanced functions allow for callbacks to be
// made to manipulate the associated data type.
- private System.Reflection.MethodInfo m_SetMethod = null;
- private System.Reflection.MethodInfo m_GetMethod = null;
+ private MethodInfo m_SetMethod = null;
+ private MethodInfo m_GetMethod = null;
private object m_PropertyOwner = null;
#endregion
@@ -120,7 +123,7 @@
strPatternEnd = @")(?::|\s+))(?<value>" + e_str + @")";
}
else
- throw new System.ArgumentException();
+ throw new ArgumentException();
// Set the internal regular expression pattern.
m_Pattern = strPatternStart + matchString + strPatternEnd + strCommonSuffix;
@@ -156,7 +159,7 @@
set { m_description = value; }
}
- public System.Type Type
+ public Type Type
{
get { return m_switchType; }
}
@@ -171,12 +174,12 @@
get { return m_Pattern; }
}
- public System.Reflection.MethodInfo SetMethod
+ public MethodInfo SetMethod
{
set { m_SetMethod = value; }
}
- public System.Reflection.MethodInfo GetMethod
+ public MethodInfo GetMethod
{
set { m_GetMethod = value; }
}
@@ -202,7 +205,7 @@
get
{
if ( m_switchType.IsEnum )
- return System.Enum.GetNames( m_switchType );
+ return Enum.GetNames( m_switchType );
else
return null;
}
@@ -215,7 +218,7 @@
Initialize( name, description );
}
- public SwitchRecord( string name, string description, System.Type type )
+ public SwitchRecord( string name, string description, Type type )
{
if ( type == typeof(bool) ||
type == typeof(string) ||
@@ -234,7 +237,7 @@
public void AddAlias( string alias )
{
if ( m_Aliases == null )
- m_Aliases = new System.Collections.ArrayList();
+ m_Aliases = new ArrayList();
m_Aliases.Add( alias );
BuildPattern();
@@ -260,7 +263,7 @@
private string m_workingString = "";
private string m_applicationName = "";
private string[] m_splitParameters = null;
- private System.Collections.ArrayList m_switches = null;
+ private ArrayList m_switches = null;
#endregion
#region Private Utility Functions
@@ -356,7 +359,7 @@
else if ( s.Type == typeof(int) )
s.Notify( int.Parse( value ) );
else if ( s.Type.IsEnum )
- s.Notify( System.Enum.Parse(s.Type,value,true) );
+ s.Notify( Enum.Parse(s.Type,value,true) );
}
}
@@ -438,7 +441,7 @@
public void AddSwitch( string name, string description )
{
if ( m_switches == null )
- m_switches = new System.Collections.ArrayList();
+ m_switches = new ArrayList();
SwitchRecord rec = new SwitchRecord( name, description );
m_switches.Add( rec );
@@ -447,7 +450,7 @@
public void AddSwitch( string[] names, string description )
{
if ( m_switches == null )
- m_switches = new System.Collections.ArrayList();
+ m_switches = new ArrayList();
SwitchRecord rec = new SwitchRecord( names[0], description );
for ( int s=1; s<names.Length; s++ )
rec.AddAlias( names[s] );
@@ -469,9 +472,9 @@
public string GetHelpText()
{
- System.Text.StringBuilder message = new System.Text.StringBuilder("");
+ StringBuilder message = new StringBuilder("");
message.Append( this.ApplicationName + " ");
- foreach(Parser.SwitchInfo switchInfo in this.Switches)
+ foreach(SwitchInfo switchInfo in this.Switches)
{
message.Append( "[/" );
if(switchInfo.Aliases != null)
@@ -495,7 +498,7 @@
}
message.Append("\n\n");
- foreach(Parser.SwitchInfo switchInfo in this.Switches)
+ foreach(SwitchInfo switchInfo in this.Switches)
{
message.AppendFormat("\t/{0,-17}-{1}\n", switchInfo.Name, switchInfo.Description);
if(switchInfo.Aliases != null)
@@ -529,7 +532,7 @@
m_commandLine = commandLine;
Type type = classForAutoAttributes.GetType();
- System.Reflection.MemberInfo[] members = type.GetMembers();
+ MemberInfo[] members = type.GetMembers();
for(int i=0; i<members.Length; i++)
{
@@ -547,9 +550,9 @@
// Get the property information. We're only handling
// properties at the moment!
- if ( members[i] is System.Reflection.PropertyInfo )
+ if ( members[i] is PropertyInfo )
{
- System.Reflection.PropertyInfo pi = (System.Reflection.PropertyInfo) members[i];
+ PropertyInfo pi = (PropertyInfo) members[i];
rec = new SwitchRecord( switchAttrib.Name,
switchAttrib.Description,
@@ -589,7 +592,7 @@
if ( rec != null )
{
if ( m_switches == null )
- m_switches = new System.Collections.ArrayList();
+ m_switches = new ArrayList();
m_switches.Add( rec );
}
}
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Util/RFC2822Date.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Util/RFC2822Date.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Util/RFC2822Date.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -38,7 +38,6 @@
using System;
using System.Collections;
using System.Text.RegularExpressions;
-using System.Diagnostics;
namespace newtelligence.DasBlog.Util
{
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Util/ReflectionHelper.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Util/ReflectionHelper.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Util/ReflectionHelper.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -1,7 +1,6 @@
-using System;
-using System.Text;
using System.Diagnostics;
using System.Reflection;
+using System.Text;
namespace newtelligence.DasBlog.Util
{
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Resources/WebUtil.Designer.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Resources/WebUtil.Designer.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Resources/WebUtil.Designer.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -8,10 +8,15 @@
// </auto-generated>
//------------------------------------------------------------------------------
+using System.CodeDom.Compiler;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Resources;
+using System.Runtime.CompilerServices;
+
namespace newtelligence.DasBlog.Util.Resources {
- using System;
-
-
/// <summary>
/// A strongly-typed resource class, for looking up localized strings, etc.
/// </summary>
@@ -19,27 +24,27 @@
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+ [GeneratedCode("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
+ [DebuggerNonUserCode()]
+ [CompilerGenerated()]
internal class WebUtil {
- private static global::System.Resources.ResourceManager resourceMan;
+ private static ResourceManager resourceMan;
- private static global::System.Globalization.CultureInfo resourceCulture;
+ private static CultureInfo resourceCulture;
- [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+ [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
internal WebUtil() {
}
/// <summary>
/// Returns the cached ResourceManager instance used by this class.
/// </summary>
- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
- internal static global::System.Resources.ResourceManager ResourceManager {
+ [EditorBrowsable(EditorBrowsableState.Advanced)]
+ internal static ResourceManager ResourceManager {
get {
- if (object.ReferenceEquals(resourceMan, null)) {
- global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("newtelligence.DasBlog.Util.Resources.WebUtil", typeof(WebUtil).Assembly);
+ if (ReferenceEquals(resourceMan, null)) {
+ ResourceManager temp = new ResourceManager("newtelligence.DasBlog.Util.Resources.WebUtil", typeof(WebUtil).Assembly);
resourceMan = temp;
}
return resourceMan;
@@ -50,8 +55,8 @@
/// Overrides the current thread's CurrentUICulture property for all
/// resource lookups using this strongly typed resource class.
/// </summary>
- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
- internal static global::System.Globalization.CultureInfo Culture {
+ [EditorBrowsable(EditorBrowsableState.Advanced)]
+ internal static CultureInfo Culture {
get {
return resourceCulture;
}
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Test/BlogSource.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Test/BlogSource.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Test/BlogSource.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -1,5 +1,3 @@
-using System;
-
namespace RJH.CommandLineHelper.Test
{
/// <summary>
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Test/CommandLine.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Test/CommandLine.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Test/CommandLine.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -1,8 +1,5 @@
-using RJH.CommandLineHelper;
+using System.Diagnostics;
-using System;
-
-
namespace RJH.CommandLineHelper.Test
{
/// <summary>
@@ -13,12 +10,12 @@
[CommandLineSwitch("SourceType","Specify the blog program from which to import content.")]
public BlogSourceType Source
{
- [System.Diagnostics.DebuggerStepThrough()]
+ [DebuggerStepThrough()]
get
{
return _source;
}
- [System.Diagnostics.DebuggerStepThrough()]
+ [DebuggerStepThrough()]
set
{
_source = value;
@@ -30,12 +27,12 @@
[CommandLineAlias("to")]
public string ContentDirectory
{
- [System.Diagnostics.DebuggerStepThrough()]
+ [DebuggerStepThrough()]
get
{
return _contentDirectory;
}
- [System.Diagnostics.DebuggerStepThrough()]
+ [DebuggerStepThrough()]
set
{
_contentDirectory = value;
@@ -47,12 +44,12 @@
[CommandLineAlias("from")]
public string SourceDirectory
{
- [System.Diagnostics.DebuggerStepThrough()]
+ [DebuggerStepThrough()]
get
{
return _sourceDirectory;
}
- [System.Diagnostics.DebuggerStepThrough()]
+ [DebuggerStepThrough()]
set
{
_sourceDirectory = value;
@@ -63,12 +60,12 @@
[CommandLineSwitch("Help", "Displays the command line help.")]
public bool Help
{
- [System.Diagnostics.DebuggerStepThrough()]
+ [DebuggerStepThrough()]
get
{
return _help;
}
- [System.Diagnostics.DebuggerStepThrough()]
+ [DebuggerStepThrough()]
set
{
_help = value;
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Test/ParserTest.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Test/ParserTest.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Test/ParserTest.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -1,9 +1,6 @@
using System;
using NUnit.Framework;
-using RJH.CommandLineHelper;
-
-
namespace RJH.CommandLineHelper.Test
{
/// <summary>
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Test/ReflectionHelperTest.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Test/ReflectionHelperTest.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Test/ReflectionHelperTest.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -1,6 +1,4 @@
-using System;
using System.Reflection;
-using newtelligence.DasBlog.Util;
using NUnit.Framework;
namespace newtelligence.DasBlog.Util.Test
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Util/TimeZones.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Util/TimeZones.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Util/TimeZones.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -1,10 +1,10 @@
using System;
+using System.Collections;
+using System.Globalization;
using System.IO;
using System.Security.Permissions;
using System.Xml.Serialization;
using Microsoft.Win32;
-using System.Collections;
-using System.Globalization;
namespace newtelligence.DasBlog.Util
{
@@ -434,7 +434,7 @@
/// <summary>
/// A collection of elements of type WindowsTimeZone
/// </summary>
- public class WindowsTimeZoneCollection: System.Collections.CollectionBase
+ public class WindowsTimeZoneCollection: CollectionBase
{
/// <summary>
/// Initializes a new empty instance of the WindowsTimeZoneCollection class.
@@ -513,13 +513,13 @@
/// <summary>
/// Type-specific enumeration class, used by WindowsTimeZoneCollection.GetEnumerator.
/// </summary>
- public class Enumerator: System.Collections.IEnumerator
+ public class Enumerator: IEnumerator
{
- private System.Collections.IEnumerator wrapped;
+ private IEnumerator wrapped;
public Enumerator(WindowsTimeZoneCollection collection)
{
- this.wrapped = ((System.Collections.CollectionBase)collection).GetEnumerator();
+ this.wrapped = ((CollectionBase)collection).GetEnumerator();
}
public WindowsTimeZone Current
@@ -530,7 +530,7 @@
}
}
- object System.Collections.IEnumerator.Current
+ object IEnumerator.Current
{
get
{
@@ -557,9 +557,9 @@
/// <returns>
/// An object that implements System.Collections.IEnumerator.
/// </returns>
- public new virtual WindowsTimeZoneCollection.Enumerator GetEnumerator()
+ public new virtual Enumerator GetEnumerator()
{
- return new WindowsTimeZoneCollection.Enumerator(this);
+ return new Enumerator(this);
}
public void SortByTimeZoneBias()
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Util/XmlNamespaceUpgradeReader.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Util/XmlNamespaceUpgradeReader.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Util/XmlNamespaceUpgradeReader.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -1,7 +1,3 @@
-using System;
-using System.IO;
-using System.Xml;
-
namespace newtelligence.DasBlog.Util
{
//SDH: Requires FullTrust
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Zip/Crc32.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Zip/Crc32.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Zip/Crc32.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -19,6 +19,7 @@
//
using System;
+using System.IO;
namespace newtelligence.DasBlog.Util.Zip
{
@@ -43,7 +44,7 @@
/// </summary>
/// <param name="input">The stream over which to calculate the CRC32</param>
/// <returns>the CRC32 calculation</returns>
- public UInt32 GetCrc32(System.IO.Stream input)
+ public UInt32 GetCrc32(Stream input)
{
return GetCrc32AndCopy(input, null) ;
}
@@ -54,7 +55,7 @@
/// <param name="input">The stream over which to calculate the CRC32</param>
/// <param name="output">The stream into which to deflate the input</param>
/// <returns>the CRC32 calculation</returns>
- public UInt32 GetCrc32AndCopy(System.IO.Stream input, System.IO.Stream output)
+ public UInt32 GetCrc32AndCopy(Stream input, Stream output)
{
unchecked
{
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Zip/Shared.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Zip/Shared.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Zip/Shared.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -9,6 +9,7 @@
using System;
+using System.IO;
namespace newtelligence.DasBlog.Util.Zip
{
@@ -23,11 +24,11 @@
{
c[i] = (char)buf[i]; // System.BitConverter.ToChar(buf, start+i*2);
}
- string s = new System.String(c, 0, i);
+ string s = new String(c, 0, i);
return s;
}
- protected internal static int ReadSignature(System.IO.Stream s)
+ protected internal static int ReadSignature(Stream s)
{
int n = 0;
byte[] sig = new byte[4];
@@ -37,7 +38,7 @@
return signature;
}
- protected internal static long FindSignature(System.IO.Stream s, int SignatureToFind)
+ protected internal static long FindSignature(Stream s, int SignatureToFind)
{
long startingPosition = s.Position;
@@ -59,10 +60,10 @@
{
if (batch[i] == targetBytes[3])
{
- s.Seek(i - n, System.IO.SeekOrigin.Current);
+ s.Seek(i - n, SeekOrigin.Current);
int sig = ReadSignature(s);
success = (sig == SignatureToFind);
- if (!success) s.Seek(-3, System.IO.SeekOrigin.Current);
+ if (!success) s.Seek(-3, SeekOrigin.Current);
break; // out of for loop
}
}
@@ -72,7 +73,7 @@
} while (true);
if (!success)
{
- s.Seek(startingPosition, System.IO.SeekOrigin.Begin);
+ s.Seek(startingPosition, SeekOrigin.Begin);
return -1; // or throw?
}
@@ -95,8 +96,8 @@
int minute = (packedTime & 0x07E0) >> 5;
int second = packedTime & 0x001F;
- DateTime d = System.DateTime.Now;
- try { d = new System.DateTime(year, month, day, hour, minute, second, 0); }
+ DateTime d = DateTime.Now;
+ try { d = new DateTime(year, month, day, hour, minute, second, 0); }
catch
{
Console.Write("\nInvalid date/time?:\nyear: {0} ", year);
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Zip/ZipDirEntry.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Zip/ZipDirEntry.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Zip/ZipDirEntry.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -9,6 +9,7 @@
using System;
+using System.IO;
namespace newtelligence.DasBlog.Util.Zip
{
@@ -88,21 +89,21 @@
internal ZipDirEntry(ZipEntry ze) { }
- public static ZipDirEntry Read(System.IO.Stream s)
+ public static ZipDirEntry Read(Stream s)
{
return Read(s, false);
}
- public static ZipDirEntry Read(System.IO.Stream s, bool TurnOnDebug)
+ public static ZipDirEntry Read(Stream s, bool TurnOnDebug)
{
- int signature = newtelligence.DasBlog.Util.Zip.Shared.ReadSignature(s);
+ int signature = Shared.ReadSignature(s);
// return null if this is not a local file header signature
if (SignatureIsNotValid(signature))
{
- s.Seek(-4, System.IO.SeekOrigin.Current);
- if (TurnOnDebug) System.Console.WriteLine(" ZipDirEntry::Read(): Bad signature ({0:X8}) at position {1}", signature, s.Position);
+ s.Seek(-4, SeekOrigin.Current);
+ if (TurnOnDebug) Console.WriteLine(" ZipDirEntry::Read(): Bad signature ({0:X8}) at position {1}", signature, s.Position);
return null;
}
@@ -123,7 +124,7 @@
zde._CompressedSize = block[i++] + block[i++] * 256 + block[i++] * 256 * 256 + block[i++] * 256 * 256 * 256;
zde._UncompressedSize = block[i++] + block[i++] * 256 + block[i++] * 256 * 256 + block[i++] * 256 * 256 * 256;
- zde._LastModified = newtelligence.DasBlog.Util.Zip.Shared.PackedToDateTime(zde._LastModDateTime);
+ zde._LastModified = Shared.PackedToDateTime(zde._LastModDateTime);
Int16 filenameLength = (short)(block[i++] + block[i++] * 256);
Int16 extraFieldLength = (short)(block[i++] + block[i++] * 256);
@@ -135,14 +136,14 @@
block = new byte[filenameLength];
n = s.Read(block, 0, block.Length);
- zde._FileName = newtelligence.DasBlog.Util.Zip.Shared.StringFromBuffer(block, 0, block.Length);
+ zde._FileName = Shared.StringFromBuffer(block, 0, block.Length);
zde._Extra = new byte[extraFieldLength];
n = s.Read(zde._Extra, 0, zde._Extra.Length);
block = new byte[commentLength];
n = s.Read(block, 0, block.Length);
- zde._Comment = newtelligence.DasBlog.Util.Zip.Shared.StringFromBuffer(block, 0, block.Length);
+ zde._Comment = Shared.StringFromBuffer(block, 0, block.Length);
return zde;
}
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Zip/ZipEntry.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Zip/ZipEntry.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Zip/ZipEntry.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -10,6 +10,7 @@
using System;
using System.IO;
+using System.IO.Compression;
namespace newtelligence.DasBlog.Util.Zip
{
@@ -107,18 +108,18 @@
}
}
- private System.IO.MemoryStream _UnderlyingMemoryStream;
- private System.IO.Compression.DeflateStream _CompressedStream;
- private System.IO.Compression.DeflateStream CompressedStream
+ private MemoryStream _UnderlyingMemoryStream;
+ private DeflateStream _CompressedStream;
+ private DeflateStream CompressedStream
{
get
{
if (_CompressedStream == null)
{
- _UnderlyingMemoryStream = new System.IO.MemoryStream();
+ _UnderlyingMemoryStream = new MemoryStream();
bool LeaveUnderlyingStreamOpen = true;
- _CompressedStream = new System.IO.Compression.DeflateStream(_UnderlyingMemoryStream,
- System.IO.Compression.CompressionMode.Compress,
+ _CompressedStream = new DeflateStream(_UnderlyingMemoryStream,
+ CompressionMode.Compress,
LeaveUnderlyingStreamOpen);
}
return _CompressedStream;
@@ -137,15 +138,15 @@
private int _RelativeOffsetOfHeader;
- private static bool ReadHeader(System.IO.Stream s, ZipEntry ze)
+ private static bool ReadHeader(Stream s, ZipEntry ze)
{
- int signature = newtelligence.DasBlog.Util.Zip.Shared.ReadSignature(s);
+ int signature = Shared.ReadSignature(s);
// return null if this is not a local file header signature
if (SignatureIsNotValid(signature))
{
- s.Seek(-4, System.IO.SeekOrigin.Current);
- if (ze._Debug) System.Console.WriteLine(" ZipEntry::Read(): Bad signature ({0:X8}) at position {1}", signature, s.Position);
+ s.Seek(-4, SeekOrigin.Current);
+ if (ze._Debug) Console.WriteLine(" ZipEntry::Read(): Bad signature ({0:X8}) at position {1}", signature, s.Position);
return false;
}
@@ -181,19 +182,19 @@
block = new byte[filenameLength];
n = s.Read(block, 0, block.Length);
- ze._FileName = newtelligence.DasBlog.Util.Zip.Shared.StringFromBuffer(block, 0, block.Length);
+ ze._FileName = Shared.StringFromBuffer(block, 0, block.Length);
ze._Extra = new byte[extraFieldLength];
n = s.Read(ze._Extra, 0, ze._Extra.Length);
// transform the time data into something usable
- ze._LastModified = newtelligence.DasBlog.Util.Zip.Shared.PackedToDateTime(ze._LastModDateTime);
+ ze._LastModified = Shared.PackedToDateTime(ze._LastModDateTime);
// actually get the compressed size and CRC if necessary
if ((ze._BitField & 0x0008) == 0x0008)
{
long posn = s.Position;
- long SizeOfDataRead = newtelligence.DasBlog.Util.Zip.Shared.FindSignature(s, ZipEntryDataDescriptorSignature);
+ long SizeOfDataRead = Shared.FindSignature(s, ZipEntryDataDescriptorSignature);
if (SizeOfDataRead == -1) return false;
// read 3x 4-byte fields (CRC, Compressed Size, Uncompressed Size)
@@ -209,7 +210,7 @@
throw new Exception("Data format error (bit 3 is set)");
// seek back to previous position, to read file data
- s.Seek(posn, System.IO.SeekOrigin.Begin);
+ s.Seek(posn, SeekOrigin.Begin);
}
return true;
@@ -222,13 +223,13 @@
}
- public static ZipEntry Read(System.IO.Stream s)
+ public static ZipEntry Read(Stream s)
{
return Read(s, false);
}
- public static ZipEntry Read(System.IO.Stream s, bool TurnOnDebug)
+ public static ZipEntry Read(Stream s, bool TurnOnDebug)
{
ZipEntry entry = new ZipEntry();
entry._Debug = TurnOnDebug;
@@ -243,7 +244,7 @@
// finally, seek past the (already read) Data descriptor if necessary
if ((entry._BitField & 0x0008) == 0x0008)
{
- s.Seek(16, System.IO.SeekOrigin.Current);
+ s.Seek(16, SeekOrigin.Current);
}
return entry;
}
@@ -255,16 +256,16 @@
ZipEntry entry = new ZipEntry();
entry._FileName = filename;
- entry._LastModified = System.IO.File.GetLastWriteTime(filename);
+ entry._LastModified = File.GetLastWriteTime(filename);
// adjust the time if the .NET BCL thinks it is in DST.
// see the note elsewhere in this file for more info.
if (entry._LastModified.IsDaylightSavingTime())
{
- System.DateTime AdjustedTime = entry._LastModified - new System.TimeSpan(1, 0, 0);
- entry._LastModDateTime = newtelligence.DasBlog.Util.Zip.Shared.DateTimeToPacked(AdjustedTime);
+ DateTime AdjustedTime = entry._LastModified - new TimeSpan(1, 0, 0);
+ entry._LastModDateTime = Shared.DateTimeToPacked(AdjustedTime);
}
else
- entry._LastModDateTime = newtelligence.DasBlog.Util.Zip.Shared.DateTimeToPacked(entry._LastModified);
+ entry._LastModDateTime = Shared.DateTimeToPacked(entry._LastModified);
// we don't actually slurp in the file until the caller invokes Write on this entry.
@@ -278,7 +279,7 @@
Extract(".");
}
- public void Extract(System.IO.Stream s)
+ public void Extract(Stream s)
{
Extract(null, s);
}
@@ -291,18 +292,18 @@
// pass in either basedir or s, but not both.
// In other words, you can extract to a stream or to a directory, but not both!
- private void Extract(string basedir, System.IO.Stream s)
+ private void Extract(string basedir, Stream s)
{
string TargetFile = null;
if (basedir != null)
{
- TargetFile = System.IO.Path.Combine(basedir, FileName);
+ TargetFile = Path.Combine(basedir, FileName);
// check if a directory
if (FileName.EndsWith("/"))
{
- if (!System.IO.Directory.Exists(TargetFile))
- System.IO.Directory.CreateDirectory(TargetFile);
+ if (!Directory.Exists(TargetFile))
+ Directory.CreateDirectory(TargetFile);
return;
}
}
@@ -315,10 +316,10 @@
else throw new Exception("Invalid input.");
- using (System.IO.MemoryStream memstream = new System.IO.MemoryStream(_FileData))
+ using (MemoryStream memstream = new MemoryStream(_FileData))
{
- System.IO.Stream input = null;
+ Stream input = null;
try
{
@@ -330,25 +331,25 @@
}
else
{
- input = new System.IO.Compression.DeflateStream(memstream, System.IO.Compression.CompressionMode.Decompress);
+ input = new DeflateStream(memstream, CompressionMode.Decompress);
}
if (TargetFile != null)
{
// ensure the target path exists
- if (!System.IO.Directory.Exists(System.IO.Path.GetDirectoryName(TargetFile)))
+ if (!Directory.Exists(Path.GetDirectoryName(TargetFile)))
{
- System.IO.Directory.CreateDirectory(System.IO.Path.GetDirectoryName(TargetFile));
+ Directory.CreateDirectory(Path.GetDirectoryName(TargetFile));
}
}
- System.IO.Stream output = null;
+ Stream output = null;
try
{
if (TargetFile != null)
- output = new System.IO.FileStream(TargetFile, System.IO.FileMode.CreateNew);
+ output = new FileStream(TargetFile, FileMode.CreateNew);
else
output = s;
@@ -369,12 +370,12 @@
for (int j = 0; j < n; j += 2)
{
if ((j > 0) && (j % 40 == 0))
- System.Console.WriteLine();
- System.Console.Write(" {0:X2}", _FileData[j]);
+ Console.WriteLine();
+ Console.Write(" {0:X2}", _FileData[j]);
if (j + 1 < n)
- System.Console.Write("{0:X2}", _FileData[j + 1]);
+ Console.Write("{0:X2}", _FileData[j + 1]);
}
- System.Console.WriteLine("\n");
+ Console.WriteLine("\n");
}
n = 1; // anything non-zero
@@ -454,11 +455,11 @@
if (LastModified.IsDaylightSavingTime())
{
- DateTime AdjustedLastModified = LastModified + new System.TimeSpan(1, 0, 0);
- System.IO.File.SetLastWriteTime(TargetFile, AdjustedLastModified);
+ DateTime AdjustedLastModified = LastModified + new TimeSpan(1, 0, 0);
+ File.SetLastWriteTime(TargetFile, AdjustedLastModified);
}
else
- System.IO.File.SetLastWriteTime(TargetFile, LastModified);
+ File.SetLastWriteTime(TargetFile, LastModified);
}
}
@@ -476,7 +477,7 @@
}
- internal void WriteCentralDirectoryEntry(System.IO.Stream s)
+ internal void WriteCentralDirectoryEntry(Stream s)
{
byte[] bytes = new byte[4096];
int i = 0;
@@ -525,21 +526,21 @@
bytes[i++] = (byte)((_RelativeOffsetOfHeader & 0x00FF0000) >> 16);
bytes[i++] = (byte)((_RelativeOffsetOfHeader & 0xFF000000) >> 24);
- if (_Debug) System.Console.WriteLine("\ninserting filename into CDS: (length= {0})", Header.Length - 30);
+ if (_Debug) Console.WriteLine("\ninserting filename into CDS: (length= {0})", Header.Length - 30);
// actual filename (starts at offset 34 in header)
for (j = 0; j < Header.Length - 30; j++)
{
bytes[i + j] = Header[30 + j];
- if (_Debug) System.Console.Write(" {0:X2}", bytes[i + j]);
+ if (_Debug) Console.Write(" {0:X2}", bytes[i + j]);
}
- if (_Debug) System.Console.WriteLine();
+ if (_Debug) Console.WriteLine();
i += j;
s.Write(bytes, 0, i);
}
- private void WriteHeader(System.IO.Stream s, byte[] bytes)
+ private void WriteHeader(Stream s, byte[] bytes)
{
// write the header info
@@ -574,7 +575,7 @@
// CRC32 (Int32)
CRC32 crc32 = new CRC32();
UInt32 crc = 0;
- using (System.IO.Stream input = System.IO.File.OpenRead(FileName))
+ using (Stream input = File.OpenRead(FileName))
{
crc = crc32.GetCrc32AndCopy(input, CompressedStream);
}
@@ -594,7 +595,7 @@
bytes[i++] = (byte)((sz & 0xFF000000) >> 24);
// UncompressedSize (Int32)
- if (_Debug) System.Console.WriteLine("Uncompressed Size: {0}", crc32.TotalBytesRead);
+ if (_Debug) Console.WriteLine("Uncompressed Size: {0}", crc32.TotalBytesRead);
bytes[i++] = (byte)(crc32.TotalBytesRead & 0x000000FF);
bytes[i++] = (byte)((crc32.TotalBytesRead & 0x0000FF00) >> 8);
bytes[i++] = (byte)((crc32.TotalBytesRead & 0x00FF0000) >> 16);
@@ -635,15 +636,15 @@
if (_Debug)
{
- System.Console.WriteLine("local header: writing filename, {0} chars", c.Length);
- System.Console.WriteLine("starting offset={0}", i);
+ Console.WriteLine("local header: writing filename, {0} chars", c.Length);
+ Console.WriteLine("starting offset={0}", i);
}
for (j = 0; (j < c.Length) && (i + j < bytes.Length); j++)
{
- bytes[i + j] = System.BitConverter.GetBytes(c[j])[0];
- if (_Debug) System.Console.Write(" {0:X2}", bytes[i + j]);
+ bytes[i + j] = BitConverter.GetBytes(c[j])[0];
+ if (_Debug) Console.Write(" {0:X2}", bytes[i + j]);
}
- if (_Debug) System.Console.WriteLine();
+ if (_Debug) Console.WriteLine();
i += j;
@@ -656,24 +657,24 @@
if (_Debug)
{
- System.Console.WriteLine("\nAll header data:");
+ Console.WriteLine("\nAll header data:");
for (j = 0; j < i; j++)
- System.Console.Write(" {0:X2}", bytes[j]);
- System.Console.WriteLine();
+ Console.Write(" {0:X2}", bytes[j]);
+ Console.WriteLine();
}
// finally, write the header to the stream
s.Write(bytes, 0, i);
// preserve this header data for use with the central directory structure.
_header = new byte[i];
- if (_Debug) System.Console.WriteLine("preserving header of {0} bytes", _header.Length);
+ if (_Debug) Console.WriteLine("preserving header of {0} bytes", _header.Length);
for (j = 0; j < i; j++)
_header[j] = bytes[j];
}
- internal void Write(System.IO.Stream s)
+ internal void Write(Stream s)
{
byte[] bytes = new byte[4096];
int n;
@@ -699,12 +700,12 @@
for (int j = 0; j < n; j += 2)
{
if ((j > 0) && (j % 40 == 0))
- System.Console.WriteLine();
- System.Console.Write(" {0:X2}", bytes[j]);
+ Console.WriteLine();
+ Console.Write(" {0:X2}", bytes[j]);
if (j + 1 < n)
- System.Console.Write("{0:X2}", bytes[j + 1]);
+ Console.Write("{0:X2}", bytes[j + 1]);
}
- System.Console.WriteLine("\n");
+ Console.WriteLine("\n");
}
s.Write(bytes, 0, n);
Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Zip/ZipFile.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Zip/ZipFile.cs 2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Zip/ZipFile.cs 2008-01-11 15:53:27 UTC (rev 793)
@@ -62,12 +62,15 @@
using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
namespace newtelligence.DasBlog.Util.Zip
{
- public class ZipFile : System.Collections.Generic.IEnumerable<ZipEntry>,
+ public class ZipFile : IEnumerable<ZipEntry>,
IDisposable
{
private string _name;
@@ -100,25 +103,25 @@
- private System.IO.Stream ReadStream
+ private Stream ReadStream
{
get
{
if (_readstream == null)
{
- _readstream = System.IO.File.OpenRead(_name);
+ _readstream = File.OpenRead(_name);
}
return _readstream;
}
}
- private System.IO.FileStream WriteStream
+ private FileStream WriteStream
{
get
{
if (_writestream == null)
{
- _writestream = new System.IO.FileStream(_name, System.IO.FileMode.CreateNew);
+ _writestream = new FileStream(_name, FileMode.CreateNew);
}
return _writestream;
}
@@ -133,9 +136,9 @@
{
// create a new zipfile
_name = NewZipFileName;
- if (System.IO.File.Exists(_name))
- throw new System.Exception(String.Format("That file ({0}) already exists.", NewZipFileName));
- _entries = new System.Collections.Generic.List<ZipEntry>();
+ if (File.Exists(_name))
+ throw new Exception(String.Format("That file ({0}) already exists.", NewZipFileName));
+ _entries = new List<ZipEntry>();
}
@@ -146,9 +149,9 @@
public void AddItem(string FileOrDirectoryName, bool WantVerbose)
{
- if (System.IO.File.Exists(FileOrDirectoryName))
+ if (File.Exists(FileOrDirectoryName))
AddFile(FileOrDirectoryName, WantVerbose);
- else if (System.IO.Directory.Exists(FileOrDirectoryName))
+ else if (Directory.Exists(FileOrDirectoryName))
AddDirectory(FileOrDirectoryName, WantVerbose);
else
@@ -176,13 +179,13 @@
public void AddDirectory(string DirectoryName, bool WantVerbose)
{
- String[] filenames = System.IO.Directory.GetFiles(DirectoryName);
+ String[] filenames = Directory.GetFiles(DirectoryName);
foreach (String filename in filenames)
{
AddFile(filename, WantVerbose);
}
- String[] dirnames = System.IO.Directory.GetDirectories(DirectoryName);
+ String[] dirnames = Directory.GetDirectories(DirectoryName);
foreach (String dir in dirnames)
{
AddDirectory(dir, WantVerbose);
@@ -288,34 +291,34 @@
ZipFile zf = new ZipFile();
zf._Debug = TurnOnDebug;
zf._name = zipfilename;
- zf._entries = new System.Collections.Generic.List<ZipEntry>();
+ zf._entries = new List<ZipEntry>();
ZipEntry e;
while ((e = ZipEntry.Read(zf.ReadStream, zf._Debug)) != null)
{
- if (zf._Debug) System.Console.WriteLine(" ZipFile::Read(): ZipEntry: {0}", e.FileName);
+ if (zf._Debug) Console.WriteLine(" ZipFile::Read(): ZipEntry: {0}", e.FileName);
zf._entries.Add(e);
}
// read the zipfile's central directory structure here.
- zf._direntries = new System.Collections.Generic.List<ZipDirEntry>();
+ zf._direntries = new List<ZipDirEntry>();
ZipDirEntry de;
while ((de = ZipDirEntry.Read(zf.ReadStream, zf._Debug)) != null)
{
- if (zf._Debug) System.Console.WriteLine(" ZipFile::Read(): ZipDirEntry: {0}", de.FileName);
+ if (zf._Debug) Console.WriteLine(" ZipFile::Read(): ZipDirEntry: {0}", de.FileName);
zf._direntries.Add(de);
}
return zf;
}
- public System.Collections.Generic.IEnumerator<ZipEntry> GetEnumerator()
+ public IEnumerator<ZipEntry> GetEnumerator()
{
foreach (ZipEntry e in _entries)
yield return e;
}
- System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+ IEnumerator IEnumerable.GetEnumerator()
{
return GetEnumerator();
}
@@ -334,13 +337,13 @@
{
if (header)
{
- System.Console.WriteLine("\n{1,-22} {2,-6} {3,4} {4,-8} {0}",
+ Console.WriteLine("\n{1,-22} {2,-6} {3,4} {4,-8} {0}",
"Name", "Modified", "Size", "Ratio", "Packed");
- System.Console.WriteLine(new System.String('-', 72));
+ Console.WriteLine(new String('-', 72));
header = false;
}
if (WantVerbose)
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|