diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-08-09 13:52:40 +0300 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-08-09 13:52:40 +0300 |
| commit | b2db361984b7f6833d24eb4c574ec3513d8b7633 (patch) | |
| tree | 1696a76a81582ab43cae0e01c01c3ff1c2d799e1 /Software/Visual_Studio/Tango.PMR/Synchronization | |
| parent | a5f9c99d51f7e096ff612da6605ab4d4f5067009 (diff) | |
| download | Tango-b2db361984b7f6833d24eb4c574ec3513d8b7633.tar.gz Tango-b2db361984b7f6833d24eb4c574ec3513d8b7633.zip | |
Removed APPLICATION_VERSIONS & EMBEDDED_SOFTWARE_VERSIONS TABLES.
Added TANGO_VERSIONS.
Working on PPC machine setup.
Diffstat (limited to 'Software/Visual_Studio/Tango.PMR/Synchronization')
| -rw-r--r-- | Software/Visual_Studio/Tango.PMR/Synchronization/MachineSetupResponse.cs | 156 |
1 files changed, 49 insertions, 107 deletions
diff --git a/Software/Visual_Studio/Tango.PMR/Synchronization/MachineSetupResponse.cs b/Software/Visual_Studio/Tango.PMR/Synchronization/MachineSetupResponse.cs index 02d312aa1..0618c947e 100644 --- a/Software/Visual_Studio/Tango.PMR/Synchronization/MachineSetupResponse.cs +++ b/Software/Visual_Studio/Tango.PMR/Synchronization/MachineSetupResponse.cs @@ -23,17 +23,15 @@ namespace Tango.PMR.Synchronization { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "ChpNYWNoaW5lU2V0dXBSZXNwb25zZS5wcm90bxIZVGFuZ28uUE1SLlN5bmNo", - "cm9uaXphdGlvbiLTAQoUTWFjaGluZVNldHVwUmVzcG9uc2USGgoSQXBwbGlj", - "YXRpb25WZXJzaW9uGAEgASgJEh4KFkFwcGxpY2F0aW9uRnRwRmlsZVBhdGgY", - "AiABKAkSFwoPRW1iZWRkZWRWZXJzaW9uGAMgASgJEhsKE0VtYmVkZGVkRnRw", - "RmlsZVBhdGgYBCABKAkSEgoKRnRwQWRkcmVzcxgFIAEoCRIQCghVc2VyTmFt", - "ZRgGIAEoCRIQCghQYXNzd29yZBgHIAEoCRIRCglEYkFkZHJlc3MYCCABKAlC", - "JQojY29tLnR3aW5lLnRhbmdvLnBtci5zeW5jaHJvbml6YXRpb25iBnByb3Rv", - "Mw==")); + "cm9uaXphdGlvbiKEAQoUTWFjaGluZVNldHVwUmVzcG9uc2USDwoHVmVyc2lv", + "bhgBIAEoCRIQCghGaWxlUGF0aBgCIAEoCRISCgpGdHBBZGRyZXNzGAMgASgJ", + "EhAKCFVzZXJOYW1lGAQgASgJEhAKCFBhc3N3b3JkGAUgASgJEhEKCURiQWRk", + "cmVzcxgGIAEoCUIlCiNjb20udHdpbmUudGFuZ28ucG1yLnN5bmNocm9uaXph", + "dGlvbmIGcHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Synchronization.MachineSetupResponse), global::Tango.PMR.Synchronization.MachineSetupResponse.Parser, new[]{ "ApplicationVersion", "ApplicationFtpFilePath", "EmbeddedVersion", "EmbeddedFtpFilePath", "FtpAddress", "UserName", "Password", "DbAddress" }, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Synchronization.MachineSetupResponse), global::Tango.PMR.Synchronization.MachineSetupResponse.Parser, new[]{ "Version", "FilePath", "FtpAddress", "UserName", "Password", "DbAddress" }, null, null, null) })); } #endregion @@ -64,10 +62,8 @@ namespace Tango.PMR.Synchronization { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public MachineSetupResponse(MachineSetupResponse other) : this() { - applicationVersion_ = other.applicationVersion_; - applicationFtpFilePath_ = other.applicationFtpFilePath_; - embeddedVersion_ = other.embeddedVersion_; - embeddedFtpFilePath_ = other.embeddedFtpFilePath_; + version_ = other.version_; + filePath_ = other.filePath_; ftpAddress_ = other.ftpAddress_; userName_ = other.userName_; password_ = other.password_; @@ -79,52 +75,30 @@ namespace Tango.PMR.Synchronization { return new MachineSetupResponse(this); } - /// <summary>Field number for the "ApplicationVersion" field.</summary> - public const int ApplicationVersionFieldNumber = 1; - private string applicationVersion_ = ""; + /// <summary>Field number for the "Version" field.</summary> + public const int VersionFieldNumber = 1; + private string version_ = ""; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public string ApplicationVersion { - get { return applicationVersion_; } + public string Version { + get { return version_; } set { - applicationVersion_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); + version_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); } } - /// <summary>Field number for the "ApplicationFtpFilePath" field.</summary> - public const int ApplicationFtpFilePathFieldNumber = 2; - private string applicationFtpFilePath_ = ""; + /// <summary>Field number for the "FilePath" field.</summary> + public const int FilePathFieldNumber = 2; + private string filePath_ = ""; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public string ApplicationFtpFilePath { - get { return applicationFtpFilePath_; } + public string FilePath { + get { return filePath_; } set { - applicationFtpFilePath_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); - } - } - - /// <summary>Field number for the "EmbeddedVersion" field.</summary> - public const int EmbeddedVersionFieldNumber = 3; - private string embeddedVersion_ = ""; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public string EmbeddedVersion { - get { return embeddedVersion_; } - set { - embeddedVersion_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); - } - } - - /// <summary>Field number for the "EmbeddedFtpFilePath" field.</summary> - public const int EmbeddedFtpFilePathFieldNumber = 4; - private string embeddedFtpFilePath_ = ""; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public string EmbeddedFtpFilePath { - get { return embeddedFtpFilePath_; } - set { - embeddedFtpFilePath_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); + filePath_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); } } /// <summary>Field number for the "FtpAddress" field.</summary> - public const int FtpAddressFieldNumber = 5; + public const int FtpAddressFieldNumber = 3; private string ftpAddress_ = ""; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public string FtpAddress { @@ -135,7 +109,7 @@ namespace Tango.PMR.Synchronization { } /// <summary>Field number for the "UserName" field.</summary> - public const int UserNameFieldNumber = 6; + public const int UserNameFieldNumber = 4; private string userName_ = ""; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public string UserName { @@ -146,7 +120,7 @@ namespace Tango.PMR.Synchronization { } /// <summary>Field number for the "Password" field.</summary> - public const int PasswordFieldNumber = 7; + public const int PasswordFieldNumber = 5; private string password_ = ""; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public string Password { @@ -157,7 +131,7 @@ namespace Tango.PMR.Synchronization { } /// <summary>Field number for the "DbAddress" field.</summary> - public const int DbAddressFieldNumber = 8; + public const int DbAddressFieldNumber = 6; private string dbAddress_ = ""; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public string DbAddress { @@ -180,10 +154,8 @@ namespace Tango.PMR.Synchronization { if (ReferenceEquals(other, this)) { return true; } - if (ApplicationVersion != other.ApplicationVersion) return false; - if (ApplicationFtpFilePath != other.ApplicationFtpFilePath) return false; - if (EmbeddedVersion != other.EmbeddedVersion) return false; - if (EmbeddedFtpFilePath != other.EmbeddedFtpFilePath) return false; + if (Version != other.Version) return false; + if (FilePath != other.FilePath) return false; if (FtpAddress != other.FtpAddress) return false; if (UserName != other.UserName) return false; if (Password != other.Password) return false; @@ -194,10 +166,8 @@ namespace Tango.PMR.Synchronization { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override int GetHashCode() { int hash = 1; - if (ApplicationVersion.Length != 0) hash ^= ApplicationVersion.GetHashCode(); - if (ApplicationFtpFilePath.Length != 0) hash ^= ApplicationFtpFilePath.GetHashCode(); - if (EmbeddedVersion.Length != 0) hash ^= EmbeddedVersion.GetHashCode(); - if (EmbeddedFtpFilePath.Length != 0) hash ^= EmbeddedFtpFilePath.GetHashCode(); + if (Version.Length != 0) hash ^= Version.GetHashCode(); + if (FilePath.Length != 0) hash ^= FilePath.GetHashCode(); if (FtpAddress.Length != 0) hash ^= FtpAddress.GetHashCode(); if (UserName.Length != 0) hash ^= UserName.GetHashCode(); if (Password.Length != 0) hash ^= Password.GetHashCode(); @@ -212,36 +182,28 @@ namespace Tango.PMR.Synchronization { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public void WriteTo(pb::CodedOutputStream output) { - if (ApplicationVersion.Length != 0) { + if (Version.Length != 0) { output.WriteRawTag(10); - output.WriteString(ApplicationVersion); + output.WriteString(Version); } - if (ApplicationFtpFilePath.Length != 0) { + if (FilePath.Length != 0) { output.WriteRawTag(18); - output.WriteString(ApplicationFtpFilePath); - } - if (EmbeddedVersion.Length != 0) { - output.WriteRawTag(26); - output.WriteString(EmbeddedVersion); - } - if (EmbeddedFtpFilePath.Length != 0) { - output.WriteRawTag(34); - output.WriteString(EmbeddedFtpFilePath); + output.WriteString(FilePath); } if (FtpAddress.Length != 0) { - output.WriteRawTag(42); + output.WriteRawTag(26); output.WriteString(FtpAddress); } if (UserName.Length != 0) { - output.WriteRawTag(50); + output.WriteRawTag(34); output.WriteString(UserName); } if (Password.Length != 0) { - output.WriteRawTag(58); + output.WriteRawTag(42); output.WriteString(Password); } if (DbAddress.Length != 0) { - output.WriteRawTag(66); + output.WriteRawTag(50); output.WriteString(DbAddress); } } @@ -249,17 +211,11 @@ namespace Tango.PMR.Synchronization { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public int CalculateSize() { int size = 0; - if (ApplicationVersion.Length != 0) { - size += 1 + pb::CodedOutputStream.ComputeStringSize(ApplicationVersion); - } - if (ApplicationFtpFilePath.Length != 0) { - size += 1 + pb::CodedOutputStream.ComputeStringSize(ApplicationFtpFilePath); - } - if (EmbeddedVersion.Length != 0) { - size += 1 + pb::CodedOutputStream.ComputeStringSize(EmbeddedVersion); + if (Version.Length != 0) { + size += 1 + pb::CodedOutputStream.ComputeStringSize(Version); } - if (EmbeddedFtpFilePath.Length != 0) { - size += 1 + pb::CodedOutputStream.ComputeStringSize(EmbeddedFtpFilePath); + if (FilePath.Length != 0) { + size += 1 + pb::CodedOutputStream.ComputeStringSize(FilePath); } if (FtpAddress.Length != 0) { size += 1 + pb::CodedOutputStream.ComputeStringSize(FtpAddress); @@ -281,17 +237,11 @@ namespace Tango.PMR.Synchronization { if (other == null) { return; } - if (other.ApplicationVersion.Length != 0) { - ApplicationVersion = other.ApplicationVersion; + if (other.Version.Length != 0) { + Version = other.Version; } - if (other.ApplicationFtpFilePath.Length != 0) { - ApplicationFtpFilePath = other.ApplicationFtpFilePath; - } - if (other.EmbeddedVersion.Length != 0) { - EmbeddedVersion = other.EmbeddedVersion; - } - if (other.EmbeddedFtpFilePath.Length != 0) { - EmbeddedFtpFilePath = other.EmbeddedFtpFilePath; + if (other.FilePath.Length != 0) { + FilePath = other.FilePath; } if (other.FtpAddress.Length != 0) { FtpAddress = other.FtpAddress; @@ -316,34 +266,26 @@ namespace Tango.PMR.Synchronization { input.SkipLastField(); break; case 10: { - ApplicationVersion = input.ReadString(); + Version = input.ReadString(); break; } case 18: { - ApplicationFtpFilePath = input.ReadString(); + FilePath = input.ReadString(); break; } case 26: { - EmbeddedVersion = input.ReadString(); - break; - } - case 34: { - EmbeddedFtpFilePath = input.ReadString(); - break; - } - case 42: { FtpAddress = input.ReadString(); break; } - case 50: { + case 34: { UserName = input.ReadString(); break; } - case 58: { + case 42: { Password = input.ReadString(); break; } - case 66: { + case 50: { DbAddress = input.ReadString(); break; } |
