...

6 files changed, 39 insertions, 234 deletions

diff --git a/Timeline/Resources/Services/Exception.Designer.cs b/Timeline/Resources/Services/Exception.Designer.cs
index 671c4b93..cada1788 100644
--- a/Timeline/Resources/Services/Exception.Designer.cs
+++ b/Timeline/Resources/Services/Exception.Designer.cs
@@ -115,6 +115,15 @@ namespace Timeline.Resources.Services {
         }

         

         /// <summary>

+        ///   Looks up a localized string similar to A present resource conflicts with the given resource..

+        /// </summary>

+        internal static string ConfictException {

+            get {

+                return ResourceManager.GetString("ConfictException", resourceCulture);

+            }

+        }

+        

+        /// <summary>

         ///   Looks up a localized string similar to The hashes password is of bad format. It might not be created by server..

         /// </summary>

         internal static string HashedPasswordBadFromatException {

@@ -313,15 +322,6 @@ namespace Timeline.Resources.Services {
         }

         

         /// <summary>

-        ///   Looks up a localized string similar to The username already exists..

-        /// </summary>

-        internal static string UsernameConfictException {

-            get {

-                return ResourceManager.GetString("UsernameConfictException", resourceCulture);

-            }

-        }

-        

-        /// <summary>

         ///   Looks up a localized string similar to The user does not exist..

         /// </summary>

         internal static string UserNotExistException {

diff --git a/Timeline/Resources/Services/Exception.resx b/Timeline/Resources/Services/Exception.resx
index 3ae14d4e..2cb0f11a 100644
--- a/Timeline/Resources/Services/Exception.resx
+++ b/Timeline/Resources/Services/Exception.resx
@@ -135,6 +135,9 @@
   <data name="BadPasswordException" xml:space="preserve">

     <value>The password is wrong.</value>

   </data>

+  <data name="ConfictException" xml:space="preserve">

+    <value>A present resource conflicts with the given resource.</value>

+  </data>

   <data name="HashedPasswordBadFromatException" xml:space="preserve">

     <value>The hashes password is of bad format. It might not be created by server.</value>

   </data>

@@ -201,9 +204,6 @@
   <data name="TimelineUserNotMemberException" xml:space="preserve">

     <value>The use is not a member of the timeline.</value>

   </data>

-  <data name="UsernameConfictException" xml:space="preserve">

-    <value>The username already exists.</value>

-  </data>

   <data name="UserNotExistException" xml:space="preserve">

     <value>The user does not exist.</value>

   </data>

diff --git a/Timeline/Resources/Services/UserManager.Designer.cs b/Timeline/Resources/Services/UserManager.Designer.cs
deleted file mode 100644
index 424499f8..00000000
--- a/Timeline/Resources/Services/UserManager.Designer.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-//------------------------------------------------------------------------------

-// <auto-generated>

-//     This code was generated by a tool.

-//     Runtime Version:4.0.30319.42000

-//

-//     Changes to this file may cause incorrect behavior and will be lost if

-//     the code is regenerated.

-// </auto-generated>

-//------------------------------------------------------------------------------

-

-namespace Timeline.Resources.Services {

-    using System;

-    

-    

-    /// <summary>

-    ///   A strongly-typed resource class, for looking up localized strings, etc.

-    /// </summary>

-    // This class was auto-generated by the StronglyTypedResourceBuilder

-    // 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", "16.0.0.0")]

-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-    internal class UserManager {

-        

-        private static global::System.Resources.ResourceManager resourceMan;

-        

-        private static global::System.Globalization.CultureInfo resourceCulture;

-        

-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]

-        internal UserManager() {

-        }

-        

-        /// <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 {

-            get {

-                if (object.ReferenceEquals(resourceMan, null)) {

-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Timeline.Resources.Services.UserManager", typeof(UserManager).Assembly);

-                    resourceMan = temp;

-                }

-                return resourceMan;

-            }

-        }

-        

-        /// <summary>

-        ///   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 {

-            get {

-                return resourceCulture;

-            }

-            set {

-                resourceCulture = value;

-            }

-        }

-        

-        /// <summary>

-        ///   Looks up a localized string similar to A user has been created..

-        /// </summary>

-        internal static string LogUserCreate {

-            get {

-                return ResourceManager.GetString("LogUserCreate", resourceCulture);

-            }

-        }

-    }

-}

diff --git a/Timeline/Resources/Services/UserManager.resx b/Timeline/Resources/Services/UserManager.resx
deleted file mode 100644
index ecb89179..00000000
--- a/Timeline/Resources/Services/UserManager.resx
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<root>

-  <!-- 

-    Microsoft ResX Schema 

-    

-    Version 2.0

-    

-    The primary goals of this format is to allow a simple XML format 

-    that is mostly human readable. The generation and parsing of the 

-    various data types are done through the TypeConverter classes 

-    associated with the data types.

-    

-    Example:

-    

-    ... ado.net/XML headers & schema ...

-    <resheader name="resmimetype">text/microsoft-resx</resheader>

-    <resheader name="version">2.0</resheader>

-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>

-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>

-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>

-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>

-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">

-        <value>[base64 mime encoded serialized .NET Framework object]</value>

-    </data>

-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>

-        <comment>This is a comment</comment>

-    </data>

-                

-    There are any number of "resheader" rows that contain simple 

-    name/value pairs.

-    

-    Each data row contains a name, and value. The row also contains a 

-    type or mimetype. Type corresponds to a .NET class that support 

-    text/value conversion through the TypeConverter architecture. 

-    Classes that don't support this are serialized and stored with the 

-    mimetype set.

-    

-    The mimetype is used for serialized objects, and tells the 

-    ResXResourceReader how to depersist the object. This is currently not 

-    extensible. For a given mimetype the value must be set accordingly:

-    

-    Note - application/x-microsoft.net.object.binary.base64 is the format 

-    that the ResXResourceWriter will generate, however the reader can 

-    read any of the formats listed below.

-    

-    mimetype: application/x-microsoft.net.object.binary.base64

-    value   : The object must be serialized with 

-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter

-            : and then encoded with base64 encoding.

-    

-    mimetype: application/x-microsoft.net.object.soap.base64

-    value   : The object must be serialized with 

-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter

-            : and then encoded with base64 encoding.

-

-    mimetype: application/x-microsoft.net.object.bytearray.base64

-    value   : The object must be serialized into a byte array 

-            : using a System.ComponentModel.TypeConverter

-            : and then encoded with base64 encoding.

-    -->

-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">

-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />

-    <xsd:element name="root" msdata:IsDataSet="true">

-      <xsd:complexType>

-        <xsd:choice maxOccurs="unbounded">

-          <xsd:element name="metadata">

-            <xsd:complexType>

-              <xsd:sequence>

-                <xsd:element name="value" type="xsd:string" minOccurs="0" />

-              </xsd:sequence>

-              <xsd:attribute name="name" use="required" type="xsd:string" />

-              <xsd:attribute name="type" type="xsd:string" />

-              <xsd:attribute name="mimetype" type="xsd:string" />

-              <xsd:attribute ref="xml:space" />

-            </xsd:complexType>

-          </xsd:element>

-          <xsd:element name="assembly">

-            <xsd:complexType>

-              <xsd:attribute name="alias" type="xsd:string" />

-              <xsd:attribute name="name" type="xsd:string" />

-            </xsd:complexType>

-          </xsd:element>

-          <xsd:element name="data">

-            <xsd:complexType>

-              <xsd:sequence>

-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />

-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />

-              </xsd:sequence>

-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />

-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />

-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />

-              <xsd:attribute ref="xml:space" />

-            </xsd:complexType>

-          </xsd:element>

-          <xsd:element name="resheader">

-            <xsd:complexType>

-              <xsd:sequence>

-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />

-              </xsd:sequence>

-              <xsd:attribute name="name" type="xsd:string" use="required" />

-            </xsd:complexType>

-          </xsd:element>

-        </xsd:choice>

-      </xsd:complexType>

-    </xsd:element>

-  </xsd:schema>

-  <resheader name="resmimetype">

-    <value>text/microsoft-resx</value>

-  </resheader>

-  <resheader name="version">

-    <value>2.0</value>

-  </resheader>

-  <resheader name="reader">

-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

-  </resheader>

-  <resheader name="writer">

-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

-  </resheader>

-  <data name="LogUserCreate" xml:space="preserve">

-    <value>A user has been created.</value>

-  </data>

-</root>
\ No newline at end of file
diff --git a/Timeline/Resources/Services/UserService.Designer.cs b/Timeline/Resources/Services/UserService.Designer.cs
index 1b85546d..cdf7f390 100644
--- a/Timeline/Resources/Services/UserService.Designer.cs
+++ b/Timeline/Resources/Services/UserService.Designer.cs
@@ -70,6 +70,15 @@ namespace Timeline.Resources.Services {
         }

         

         /// <summary>

+        ///   Looks up a localized string similar to Nickname is of bad format, because {}..

+        /// </summary>

+        internal static string ExceptionNicknameBadFormat {

+            get {

+                return ResourceManager.GetString("ExceptionNicknameBadFormat", resourceCulture);

+            }

+        }

+        

+        /// <summary>

         ///   Looks up a localized string similar to Old username is of bad format..

         /// </summary>

         internal static string ExceptionOldUsernameBadFormat {

@@ -88,11 +97,11 @@ namespace Timeline.Resources.Services {
         }

         

         /// <summary>

-        ///   Looks up a localized string similar to Password can&apos;t be null or empty..

+        ///   Looks up a localized string similar to Password can&apos;t be null..

         /// </summary>

-        internal static string ExceptionPasswordNullOrEmpty {

+        internal static string ExceptionPasswordNull {

             get {

-                return ResourceManager.GetString("ExceptionPasswordNullOrEmpty", resourceCulture);

+                return ResourceManager.GetString("ExceptionPasswordNull", resourceCulture);

             }

         }

         

@@ -106,29 +115,20 @@ namespace Timeline.Resources.Services {
         }

         

         /// <summary>

-        ///   Looks up a localized string similar to Username can&apos;t be null or empty..

-        /// </summary>

-        internal static string ExceptionUsernameNullOrEmpty {

-            get {

-                return ResourceManager.GetString("ExceptionUsernameNullOrEmpty", resourceCulture);

-            }

-        }

-        

-        /// <summary>

-        ///   Looks up a localized string similar to A cache entry is created..

+        ///   Looks up a localized string similar to A user with given username already exists..

         /// </summary>

-        internal static string LogCacheCreate {

+        internal static string ExceptionUsernameConflict {

             get {

-                return ResourceManager.GetString("LogCacheCreate", resourceCulture);

+                return ResourceManager.GetString("ExceptionUsernameConflict", resourceCulture);

             }

         }

         

         /// <summary>

-        ///   Looks up a localized string similar to A cache entry is removed..

+        ///   Looks up a localized string similar to Username can&apos;t be null..

         /// </summary>

-        internal static string LogCacheRemove {

+        internal static string ExceptionUsernameNull {

             get {

-                return ResourceManager.GetString("LogCacheRemove", resourceCulture);

+                return ResourceManager.GetString("ExceptionUsernameNull", resourceCulture);

             }

         }

         

diff --git a/Timeline/Resources/Services/UserService.resx b/Timeline/Resources/Services/UserService.resx
index 26221770..09bd4abb 100644
--- a/Timeline/Resources/Services/UserService.resx
+++ b/Timeline/Resources/Services/UserService.resx
@@ -120,26 +120,26 @@
   <data name="ExceptionNewUsernameBadFormat" xml:space="preserve">

     <value>New username is of bad format.</value>

   </data>

+  <data name="ExceptionNicknameBadFormat" xml:space="preserve">

+    <value>Nickname is of bad format, because {}.</value>

+  </data>

   <data name="ExceptionOldUsernameBadFormat" xml:space="preserve">

     <value>Old username is of bad format.</value>

   </data>

   <data name="ExceptionPasswordEmpty" xml:space="preserve">

     <value>Password can't be empty.</value>

   </data>

-  <data name="ExceptionPasswordNullOrEmpty" xml:space="preserve">

-    <value>Password can't be null or empty.</value>

+  <data name="ExceptionPasswordNull" xml:space="preserve">

+    <value>Password can't be null.</value>

   </data>

   <data name="ExceptionUsernameBadFormat" xml:space="preserve">

     <value>Username is of bad format, because {}.</value>

   </data>

-  <data name="ExceptionUsernameNullOrEmpty" xml:space="preserve">

-    <value>Username can't be null or empty.</value>

-  </data>

-  <data name="LogCacheCreate" xml:space="preserve">

-    <value>A cache entry is created.</value>

+  <data name="ExceptionUsernameConflict" xml:space="preserve">

+    <value>A user with given username already exists.</value>

   </data>

-  <data name="LogCacheRemove" xml:space="preserve">

-    <value>A cache entry is removed.</value>

+  <data name="ExceptionUsernameNull" xml:space="preserve">

+    <value>Username can't be null.</value>

   </data>

   <data name="LogDatabaseCreate" xml:space="preserve">

     <value>A new user entry is added to the database.</value>