prehistoric-systems/Flow.Launcher
1
0
Fork 0
mirror of https://github.com/Flow-Launcher/Flow.Launcher.git synced 2026-03-11 08:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Move namespace

Browse source
This commit is contained in:
bao-qian 2015-11-09 01:32:33 +00:00
parent 60f06f97fa
commit da5a930e89
21 changed files with 30 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Plugins/Wox.Plugin.Program/ProgramSources/FileSystemProgramSource.cs
View file

@ -2,7 +2,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using Wox.Core.Exception; using Wox.Infrastructure.Exception;
using Wox.Infrastructure.Logger; using Wox.Infrastructure.Logger;
namespace Wox.Plugin.Program.ProgramSources namespace Wox.Plugin.Program.ProgramSources

2
Wox.Core/Plugin/CSharpPluginLoader.cs
View file

@ -2,7 +2,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
using Wox.Core.Exception; using Wox.Infrastructure.Exception;
using Wox.Infrastructure.Logger; using Wox.Infrastructure.Logger;
using Wox.Plugin; using Wox.Plugin;

2
Wox.Core/Plugin/JsonRPCPlugin.cs
View file

@ -5,7 +5,7 @@ using System.Reflection;
using System.Threading; using System.Threading;
using System.Windows.Forms; using System.Windows.Forms;
using Newtonsoft.Json; using Newtonsoft.Json;
using Wox.Core.Exception; using Wox.Infrastructure.Exception;
using Wox.Infrastructure.Logger; using Wox.Infrastructure.Logger;
using Wox.Plugin; using Wox.Plugin;

2
Wox.Core/Plugin/PluginConfig.cs
View file

@ -2,8 +2,8 @@
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using Newtonsoft.Json; using Newtonsoft.Json;
using Wox.Core.Exception;
using Wox.Core.UserSettings; using Wox.Core.UserSettings;
using Wox.Infrastructure.Exception;
using Wox.Infrastructure.Logger; using Wox.Infrastructure.Logger;
using Wox.Plugin; using Wox.Plugin;

4
Wox.Core/Plugin/PluginManager.cs
View file

@ -4,10 +4,10 @@ using System.IO;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
using System.Threading; using System.Threading;
using Wox.Core.Exception;
using Wox.Core.i18n; using Wox.Core.i18n;
using Wox.Core.UI; using Wox.Core.UI;
using Wox.Core.UserSettings; using Wox.Core.UserSettings;
using Wox.Infrastructure.Exception;
using Wox.Infrastructure.Logger; using Wox.Infrastructure.Logger;
using Wox.Plugin; using Wox.Plugin;
using Stopwatch = Wox.Infrastructure.Stopwatch; using Stopwatch = Wox.Infrastructure.Stopwatch;
@ -30,7 +30,7 @@ namespace Wox.Core.Plugin
public static IEnumerable<PluginPair> AllPlugins { get; private set; } public static IEnumerable<PluginPair> AllPlugins { get; private set; }
public static List<PluginPair> GlobalPlugins { get; } = new List<PluginPair>(); public static List<PluginPair> GlobalPlugins { get; } = new List<PluginPair>();
public static Dictionary<string, PluginPair> NonGlobalPlugins { get; } = new Dictionary<string, PluginPair>(); public static Dictionary<string, PluginPair> NonGlobalPlugins { get; set; } = new Dictionary<string, PluginPair>();
private static IEnumerable<PluginPair> InstantQueryPlugins { get; set; } private static IEnumerable<PluginPair> InstantQueryPlugins { get; set; }
public static IPublicAPI API { private set; get; } public static IPublicAPI API { private set; get; }

2
Wox.Core/Updater/SemanticVersion.cs
View file

@ -1,5 +1,5 @@
using System; using System;
using Wox.Core.Exception; using Wox.Infrastructure.Exception;
namespace Wox.Core.Updater namespace Wox.Core.Updater
{ {

2
Wox.Core/i18n/Internationalization.cs
View file

@ -4,9 +4,9 @@ using System.IO;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
using System.Windows; using System.Windows;
using Wox.Core.Exception;
using Wox.Core.UI; using Wox.Core.UI;
using Wox.Core.UserSettings; using Wox.Core.UserSettings;
using Wox.Infrastructure.Exception;
using Wox.Infrastructure.Logger; using Wox.Infrastructure.Logger;
using Wox.Plugin; using Wox.Plugin;

2
Wox.Infrastructure/Exception/ExceptionFormatter.cs
View file

@ -5,7 +5,7 @@ using System.Text;
using System.Xml; using System.Xml;
using Microsoft.Win32; using Microsoft.Win32;
namespace Wox.Core.Exception namespace Wox.Infrastructure.Exception
{ {
public class ExceptionFormatter public class ExceptionFormatter
{ {

2
Wox.Infrastructure/Exception/WoxException.cs
View file

@ -1,4 +1,4 @@
namespace Wox.Core.Exception namespace Wox.Infrastructure.Exception
{ {
/// <summary> /// <summary>
/// Base Wox Exceptions /// Base Wox Exceptions

2
Wox.Infrastructure/Exception/WoxFatalException.cs
View file

@ -1,4 +1,4 @@
namespace Wox.Core.Exception namespace Wox.Infrastructure.Exception
{ {
/// <summary> /// <summary>
/// Represent exceptions that wox can't handle and MUST close running Wox. /// Represent exceptions that wox can't handle and MUST close running Wox.

2
Wox.Infrastructure/Exception/WoxHttpException.cs
View file

@ -1,4 +1,4 @@
namespace Wox.Core.Exception namespace Wox.Infrastructure.Exception
{ {
public class WoxHttpException :WoxException public class WoxHttpException :WoxException
{ {

4
Wox.Infrastructure/Exception/WoxI18nException.cs
View file

@ -1,6 +1,6 @@
namespace Wox.Core.Exception namespace Wox.Infrastructure.Exception
{ {
public class WoxI18nException:WoxException public class WoxI18nException : WoxException
{ {
public WoxI18nException(string msg) : base(msg) public WoxI18nException(string msg) : base(msg)
{ {

2
Wox.Infrastructure/Exception/WoxJsonRPCException.cs
View file

@ -1,4 +1,4 @@
namespace Wox.Core.Exception namespace Wox.Infrastructure.Exception
{ {
public class WoxJsonRPCException : WoxException public class WoxJsonRPCException : WoxException
{ {

2
Wox.Infrastructure/Exception/WoxPluginException.cs
View file

@ -1,4 +1,4 @@
namespace Wox.Core.Exception namespace Wox.Infrastructure.Exception
{ {
public class WoxPluginException : WoxException public class WoxPluginException : WoxException
{ {

7
Wox.Infrastructure/Http/HttpRequest.cs
View file

@ -1,5 +1,4 @@
using System; using System.IO;
using System.IO;
using System.Net; using System.Net;
using System.Text; using System.Text;
using Wox.Plugin; using Wox.Plugin;
@ -55,7 +54,7 @@ namespace Wox.Infrastructure.Http
} }
} }
} }
catch (Exception e) catch (System.Exception e)
{ {
Logger.Log.Error(e); Logger.Log.Error(e);
return string.Empty; return string.Empty;
@ -108,7 +107,7 @@ namespace Wox.Infrastructure.Http
} }
} }
} }
catch (Exception e) catch (System.Exception e)
{ {
Logger.Log.Error(e); Logger.Log.Error(e);
return string.Empty; return string.Empty;

8
Wox.Infrastructure/Logger/Log.cs
View file

@ -1,6 +1,4 @@
using System; using NLog;
using NLog;
using Wox.Core.Exception;
namespace Wox.Infrastructure.Logger namespace Wox.Infrastructure.Logger
{ {
@ -8,7 +6,7 @@ namespace Wox.Infrastructure.Logger
{ {
private static NLog.Logger logger = LogManager.GetCurrentClassLogger(); private static NLog.Logger logger = LogManager.GetCurrentClassLogger();
public static void Error(Exception e) public static void Error(System.Exception e)
{ {
#if DEBUG #if DEBUG
throw e; throw e;
@ -35,7 +33,7 @@ namespace Wox.Infrastructure.Logger
logger.Warn(msg); logger.Warn(msg);
} }
public static void Fatal(Exception e) public static void Fatal(System.Exception e)
{ {
#if DEBUG #if DEBUG
throw e; throw e;

6
Wox.Infrastructure/Storage/BinaryStorage.cs
View file

@ -42,7 +42,7 @@ namespace Wox.Infrastructure.Storage
serializedObject = LoadDefault(); serializedObject = LoadDefault();
#if (DEBUG) #if (DEBUG)
{ {
throw new Exception("deserialize failed"); throw new System.Exception("deserialize failed");
} }
#endif #endif
} }
@ -53,7 +53,7 @@ namespace Wox.Infrastructure.Storage
} }
} }
} }
catch (Exception e) catch (System.Exception e)
{ {
Log.Error(e); Log.Error(e);
serializedObject = LoadDefault(); serializedObject = LoadDefault();
@ -101,7 +101,7 @@ namespace Wox.Infrastructure.Storage
binaryFormatter.Serialize(fileStream, serializedObject); binaryFormatter.Serialize(fileStream, serializedObject);
fileStream.Close(); fileStream.Close();
} }
catch (Exception e) catch (System.Exception e)
{ {
Log.Error(e); Log.Error(e);
#if (DEBUG) #if (DEBUG)

2
Wox.Infrastructure/Storage/JsonStorage.cs
View file

@ -25,7 +25,7 @@ namespace Wox.Infrastructure.Storage
{ {
serializedObject = JsonConvert.DeserializeObject<T>(json); serializedObject = JsonConvert.DeserializeObject<T>(json);
} }
catch (Exception) catch (System.Exception)
{ {
serializedObject = LoadDefault(); serializedObject = LoadDefault();
} }

4
Wox.Infrastructure/WindowsShellRun.cs
View file

@ -115,7 +115,7 @@ namespace Wox.Infrastructure
needsCommandLine = peHeaderReader.OptionalHeader64.Subsystem == 3; needsCommandLine = peHeaderReader.OptionalHeader64.Subsystem == 3;
} }
catch (Exception) catch (System.Exception)
{ {
// Error reading the headers. We will try to run the command the standard way. // Error reading the headers. We will try to run the command the standard way.
needsCommandLine = false; needsCommandLine = false;
@ -149,7 +149,7 @@ namespace Wox.Infrastructure
{ {
global::System.Diagnostics.Process.Start(startInfo); global::System.Diagnostics.Process.Start(startInfo);
} }
catch (Exception e) catch (System.Exception e)
{ {
if (!startInfo.ErrorDialog) if (!startInfo.ErrorDialog)
throw e; throw e;

2
Wox.Test/Plugins/PluginInitTest.cs
View file

@ -1,6 +1,6 @@
using NUnit.Framework; using NUnit.Framework;
using Wox.Core.Exception;
using Wox.Core.Plugin; using Wox.Core.Plugin;
using Wox.Infrastructure.Exception;
namespace Wox.Test.Plugins namespace Wox.Test.Plugins
{ {

2
Wox/Helper/ErrorReporting.cs
View file

@ -1,6 +1,6 @@
using System; using System;
using System.Windows.Threading; using System.Windows.Threading;
using Wox.Core.Exception; using Wox.Infrastructure.Exception;
using Wox.Infrastructure.Logger; using Wox.Infrastructure.Logger;
namespace Wox.Helper namespace Wox.Helper