diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2017-11-05 18:58:01 +0200 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2017-11-05 18:58:01 +0200 |
| commit | 26298fa2aeb11f2c5678a05defa05d5cc0ef1d4f (patch) | |
| tree | 9425b67bcbabfb995310bd5a18ad121d1b7fc65d /Software | |
| parent | f08f7354a85effcba1f5ecf15da244bddb5c03a3 (diff) | |
| download | Tango-26298fa2aeb11f2c5678a05defa05d5cc0ef1d4f.tar.gz Tango-26298fa2aeb11f2c5678a05defa05d5cc0ef1d4f.zip | |
Implemented precise package names for Java compiler using a new 'UseDefaultStructure' property for all compilers!
Diffstat (limited to 'Software')
18 files changed, 381 insertions, 261 deletions
diff --git a/Software/Android-Studio/Tango.PMR/build.gradle b/Software/Android-Studio/Tango.PMR/build.gradle index 06435d18d..fccf25b66 100644 --- a/Software/Android-Studio/Tango.PMR/build.gradle +++ b/Software/Android-Studio/Tango.PMR/build.gradle @@ -10,7 +10,7 @@ targetCompatibility = "1.7" task createPMR(type: Exec, description: 'Update all PMR files') { - commandLine '..\\Visual Studio\\Build\\Debug\\proto-tc.exe', '-i' , '..\\..\\PMR\\Messages', '-o', 'src\\main\\java\\Tango\\PMR', '-l', 'Java' + commandLine '..\\Visual Studio\\Build\\Debug\\proto-tc.exe', '-i' , '..\\..\\PMR\\Messages', '-o', 'src\\main\\java', '-l', 'Java' ext.output = { return standardOutput.toString() diff --git a/Software/Android-Studio/Tango.PMR/src/main/java/Tango/PMR/dummyClass.java b/Software/Android-Studio/Tango.PMR/src/main/java/Tango/PMR/dummyClass.java deleted file mode 100644 index f1cfd7e74..000000000 --- a/Software/Android-Studio/Tango.PMR/src/main/java/Tango/PMR/dummyClass.java +++ /dev/null @@ -1,5 +0,0 @@ -package Tango.PMR; - -public class dummyClass { - -} diff --git a/Software/Android-Studio/Tango.PMR/src/main/java/Tango/PMR/Common/MessageContainerOuterClass.java b/Software/Android-Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/common/MessageContainerOuterClass.java index 331fab637..6e6a3df01 100644 --- a/Software/Android-Studio/Tango.PMR/src/main/java/Tango/PMR/Common/MessageContainerOuterClass.java +++ b/Software/Android-Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/common/MessageContainerOuterClass.java @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: MessageContainer.proto -package Tango.PMR.Common; +package com.twine.tango.pmr.common; public final class MessageContainerOuterClass { private MessageContainerOuterClass() {} @@ -25,7 +25,7 @@ public final class MessageContainerOuterClass { /** * <code>.Tango.PMR.Common.MessageType Type = 1;</code> */ - Tango.PMR.Common.MessageTypeOuterClass.MessageType getType(); + com.twine.tango.pmr.common.MessageTypeOuterClass.MessageType getType(); /** * <code>bytes Data = 2;</code> @@ -102,14 +102,14 @@ public final class MessageContainerOuterClass { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return Tango.PMR.Common.MessageContainerOuterClass.internal_static_Tango_PMR_Common_MessageContainer_descriptor; + return com.twine.tango.pmr.common.MessageContainerOuterClass.internal_static_Tango_PMR_Common_MessageContainer_descriptor; } protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return Tango.PMR.Common.MessageContainerOuterClass.internal_static_Tango_PMR_Common_MessageContainer_fieldAccessorTable + return com.twine.tango.pmr.common.MessageContainerOuterClass.internal_static_Tango_PMR_Common_MessageContainer_fieldAccessorTable .ensureFieldAccessorsInitialized( - Tango.PMR.Common.MessageContainerOuterClass.MessageContainer.class, Tango.PMR.Common.MessageContainerOuterClass.MessageContainer.Builder.class); + com.twine.tango.pmr.common.MessageContainerOuterClass.MessageContainer.class, com.twine.tango.pmr.common.MessageContainerOuterClass.MessageContainer.Builder.class); } public static final int TYPE_FIELD_NUMBER = 1; @@ -123,9 +123,9 @@ public final class MessageContainerOuterClass { /** * <code>.Tango.PMR.Common.MessageType Type = 1;</code> */ - public Tango.PMR.Common.MessageTypeOuterClass.MessageType getType() { - Tango.PMR.Common.MessageTypeOuterClass.MessageType result = Tango.PMR.Common.MessageTypeOuterClass.MessageType.valueOf(type_); - return result == null ? Tango.PMR.Common.MessageTypeOuterClass.MessageType.UNRECOGNIZED : result; + public com.twine.tango.pmr.common.MessageTypeOuterClass.MessageType getType() { + com.twine.tango.pmr.common.MessageTypeOuterClass.MessageType result = com.twine.tango.pmr.common.MessageTypeOuterClass.MessageType.valueOf(type_); + return result == null ? com.twine.tango.pmr.common.MessageTypeOuterClass.MessageType.UNRECOGNIZED : result; } public static final int DATA_FIELD_NUMBER = 2; @@ -149,7 +149,7 @@ public final class MessageContainerOuterClass { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (type_ != Tango.PMR.Common.MessageTypeOuterClass.MessageType.RGB.getNumber()) { + if (type_ != com.twine.tango.pmr.common.MessageTypeOuterClass.MessageType.RGB.getNumber()) { output.writeEnum(1, type_); } if (!data_.isEmpty()) { @@ -163,7 +163,7 @@ public final class MessageContainerOuterClass { if (size != -1) return size; size = 0; - if (type_ != Tango.PMR.Common.MessageTypeOuterClass.MessageType.RGB.getNumber()) { + if (type_ != com.twine.tango.pmr.common.MessageTypeOuterClass.MessageType.RGB.getNumber()) { size += com.google.protobuf.CodedOutputStream .computeEnumSize(1, type_); } @@ -181,10 +181,10 @@ public final class MessageContainerOuterClass { if (obj == this) { return true; } - if (!(obj instanceof Tango.PMR.Common.MessageContainerOuterClass.MessageContainer)) { + if (!(obj instanceof com.twine.tango.pmr.common.MessageContainerOuterClass.MessageContainer)) { return super.equals(obj); } - Tango.PMR.Common.MessageContainerOuterClass.MessageContainer other = (Tango.PMR.Common.MessageContainerOuterClass.MessageContainer) obj; + com.twine.tango.pmr.common.MessageContainerOuterClass.MessageContainer other = (com.twine.tango.pmr.common.MessageContainerOuterClass.MessageContainer) obj; boolean result = true; result = result && type_ == other.type_; @@ -210,69 +210,69 @@ public final class MessageContainerOuterClass { return hash; } - public static Tango.PMR.Common.MessageContainerOuterClass.MessageContainer parseFrom( + public static com.twine.tango.pmr.common.MessageContainerOuterClass.MessageContainer parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static Tango.PMR.Common.MessageContainerOuterClass.MessageContainer parseFrom( + public static com.twine.tango.pmr.common.MessageContainerOuterClass.MessageContainer parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static Tango.PMR.Common.MessageContainerOuterClass.MessageContainer parseFrom( + public static com.twine.tango.pmr.common.MessageContainerOuterClass.MessageContainer parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static Tango.PMR.Common.MessageContainerOuterClass.MessageContainer parseFrom( + public static com.twine.tango.pmr.common.MessageContainerOuterClass.MessageContainer parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static Tango.PMR.Common.MessageContainerOuterClass.MessageContainer parseFrom(byte[] data) + public static com.twine.tango.pmr.common.MessageContainerOuterClass.MessageContainer parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static Tango.PMR.Common.MessageContainerOuterClass.MessageContainer parseFrom( + public static com.twine.tango.pmr.common.MessageContainerOuterClass.MessageContainer parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static Tango.PMR.Common.MessageContainerOuterClass.MessageContainer parseFrom(java.io.InputStream input) + public static com.twine.tango.pmr.common.MessageContainerOuterClass.MessageContainer parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static Tango.PMR.Common.MessageContainerOuterClass.MessageContainer parseFrom( + public static com.twine.tango.pmr.common.MessageContainerOuterClass.MessageContainer parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static Tango.PMR.Common.MessageContainerOuterClass.MessageContainer parseDelimitedFrom(java.io.InputStream input) + public static com.twine.tango.pmr.common.MessageContainerOuterClass.MessageContainer parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static Tango.PMR.Common.MessageContainerOuterClass.MessageContainer parseDelimitedFrom( + public static com.twine.tango.pmr.common.MessageContainerOuterClass.MessageContainer parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static Tango.PMR.Common.MessageContainerOuterClass.MessageContainer parseFrom( + public static com.twine.tango.pmr.common.MessageContainerOuterClass.MessageContainer parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static Tango.PMR.Common.MessageContainerOuterClass.MessageContainer parseFrom( + public static com.twine.tango.pmr.common.MessageContainerOuterClass.MessageContainer parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -284,7 +284,7 @@ public final class MessageContainerOuterClass { public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(Tango.PMR.Common.MessageContainerOuterClass.MessageContainer prototype) { + public static Builder newBuilder(com.twine.tango.pmr.common.MessageContainerOuterClass.MessageContainer prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } public Builder toBuilder() { @@ -304,20 +304,20 @@ public final class MessageContainerOuterClass { public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:Tango.PMR.Common.MessageContainer) - Tango.PMR.Common.MessageContainerOuterClass.MessageContainerOrBuilder { + com.twine.tango.pmr.common.MessageContainerOuterClass.MessageContainerOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return Tango.PMR.Common.MessageContainerOuterClass.internal_static_Tango_PMR_Common_MessageContainer_descriptor; + return com.twine.tango.pmr.common.MessageContainerOuterClass.internal_static_Tango_PMR_Common_MessageContainer_descriptor; } protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return Tango.PMR.Common.MessageContainerOuterClass.internal_static_Tango_PMR_Common_MessageContainer_fieldAccessorTable + return com.twine.tango.pmr.common.MessageContainerOuterClass.internal_static_Tango_PMR_Common_MessageContainer_fieldAccessorTable .ensureFieldAccessorsInitialized( - Tango.PMR.Common.MessageContainerOuterClass.MessageContainer.class, Tango.PMR.Common.MessageContainerOuterClass.MessageContainer.Builder.class); + com.twine.tango.pmr.common.MessageContainerOuterClass.MessageContainer.class, com.twine.tango.pmr.common.MessageContainerOuterClass.MessageContainer.Builder.class); } - // Construct using Tango.PMR.Common.MessageContainerOuterClass.MessageContainer.newBuilder() + // Construct using com.twine.tango.pmr.common.MessageContainerOuterClass.MessageContainer.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -343,23 +343,23 @@ public final class MessageContainerOuterClass { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return Tango.PMR.Common.MessageContainerOuterClass.internal_static_Tango_PMR_Common_MessageContainer_descriptor; + return com.twine.tango.pmr.common.MessageContainerOuterClass.internal_static_Tango_PMR_Common_MessageContainer_descriptor; } - public Tango.PMR.Common.MessageContainerOuterClass.MessageContainer getDefaultInstanceForType() { - return Tango.PMR.Common.MessageContainerOuterClass.MessageContainer.getDefaultInstance(); + public com.twine.tango.pmr.common.MessageContainerOuterClass.MessageContainer getDefaultInstanceForType() { + return com.twine.tango.pmr.common.MessageContainerOuterClass.MessageContainer.getDefaultInstance(); } - public Tango.PMR.Common.MessageContainerOuterClass.MessageContainer build() { - Tango.PMR.Common.MessageContainerOuterClass.MessageContainer result = buildPartial(); + public com.twine.tango.pmr.common.MessageContainerOuterClass.MessageContainer build() { + com.twine.tango.pmr.common.MessageContainerOuterClass.MessageContainer result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public Tango.PMR.Common.MessageContainerOuterClass.MessageContainer buildPartial() { - Tango.PMR.Common.MessageContainerOuterClass.MessageContainer result = new Tango.PMR.Common.MessageContainerOuterClass.MessageContainer(this); + public com.twine.tango.pmr.common.MessageContainerOuterClass.MessageContainer buildPartial() { + com.twine.tango.pmr.common.MessageContainerOuterClass.MessageContainer result = new com.twine.tango.pmr.common.MessageContainerOuterClass.MessageContainer(this); result.type_ = type_; result.data_ = data_; onBuilt(); @@ -393,16 +393,16 @@ public final class MessageContainerOuterClass { return (Builder) super.addRepeatedField(field, value); } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof Tango.PMR.Common.MessageContainerOuterClass.MessageContainer) { - return mergeFrom((Tango.PMR.Common.MessageContainerOuterClass.MessageContainer)other); + if (other instanceof com.twine.tango.pmr.common.MessageContainerOuterClass.MessageContainer) { + return mergeFrom((com.twine.tango.pmr.common.MessageContainerOuterClass.MessageContainer)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(Tango.PMR.Common.MessageContainerOuterClass.MessageContainer other) { - if (other == Tango.PMR.Common.MessageContainerOuterClass.MessageContainer.getDefaultInstance()) return this; + public Builder mergeFrom(com.twine.tango.pmr.common.MessageContainerOuterClass.MessageContainer other) { + if (other == com.twine.tango.pmr.common.MessageContainerOuterClass.MessageContainer.getDefaultInstance()) return this; if (other.type_ != 0) { setTypeValue(other.getTypeValue()); } @@ -422,11 +422,11 @@ public final class MessageContainerOuterClass { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - Tango.PMR.Common.MessageContainerOuterClass.MessageContainer parsedMessage = null; + com.twine.tango.pmr.common.MessageContainerOuterClass.MessageContainer parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (Tango.PMR.Common.MessageContainerOuterClass.MessageContainer) e.getUnfinishedMessage(); + parsedMessage = (com.twine.tango.pmr.common.MessageContainerOuterClass.MessageContainer) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -454,14 +454,14 @@ public final class MessageContainerOuterClass { /** * <code>.Tango.PMR.Common.MessageType Type = 1;</code> */ - public Tango.PMR.Common.MessageTypeOuterClass.MessageType getType() { - Tango.PMR.Common.MessageTypeOuterClass.MessageType result = Tango.PMR.Common.MessageTypeOuterClass.MessageType.valueOf(type_); - return result == null ? Tango.PMR.Common.MessageTypeOuterClass.MessageType.UNRECOGNIZED : result; + public com.twine.tango.pmr.common.MessageTypeOuterClass.MessageType getType() { + com.twine.tango.pmr.common.MessageTypeOuterClass.MessageType result = com.twine.tango.pmr.common.MessageTypeOuterClass.MessageType.valueOf(type_); + return result == null ? com.twine.tango.pmr.common.MessageTypeOuterClass.MessageType.UNRECOGNIZED : result; } /** * <code>.Tango.PMR.Common.MessageType Type = 1;</code> */ - public Builder setType(Tango.PMR.Common.MessageTypeOuterClass.MessageType value) { + public Builder setType(com.twine.tango.pmr.common.MessageTypeOuterClass.MessageType value) { if (value == null) { throw new NullPointerException(); } @@ -523,12 +523,12 @@ public final class MessageContainerOuterClass { } // @@protoc_insertion_point(class_scope:Tango.PMR.Common.MessageContainer) - private static final Tango.PMR.Common.MessageContainerOuterClass.MessageContainer DEFAULT_INSTANCE; + private static final com.twine.tango.pmr.common.MessageContainerOuterClass.MessageContainer DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new Tango.PMR.Common.MessageContainerOuterClass.MessageContainer(); + DEFAULT_INSTANCE = new com.twine.tango.pmr.common.MessageContainerOuterClass.MessageContainer(); } - public static Tango.PMR.Common.MessageContainerOuterClass.MessageContainer getDefaultInstance() { + public static com.twine.tango.pmr.common.MessageContainerOuterClass.MessageContainer getDefaultInstance() { return DEFAULT_INSTANCE; } @@ -551,7 +551,7 @@ public final class MessageContainerOuterClass { return PARSER; } - public Tango.PMR.Common.MessageContainerOuterClass.MessageContainer getDefaultInstanceForType() { + public com.twine.tango.pmr.common.MessageContainerOuterClass.MessageContainer getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -574,7 +574,8 @@ public final class MessageContainerOuterClass { "\n\026MessageContainer.proto\022\020Tango.PMR.Comm" + "on\032\021MessageType.proto\"M\n\020MessageContaine" + "r\022+\n\004Type\030\001 \001(\0162\035.Tango.PMR.Common.Messa" + - "geType\022\014\n\004Data\030\002 \001(\014b\006proto3" + "geType\022\014\n\004Data\030\002 \001(\014B\034\n\032com.twine.tango." + + "pmr.commonb\006proto3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { @@ -587,7 +588,7 @@ public final class MessageContainerOuterClass { com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { - Tango.PMR.Common.MessageTypeOuterClass.getDescriptor(), + com.twine.tango.pmr.common.MessageTypeOuterClass.getDescriptor(), }, assigner); internal_static_Tango_PMR_Common_MessageContainer_descriptor = getDescriptor().getMessageTypes().get(0); @@ -595,7 +596,7 @@ public final class MessageContainerOuterClass { com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_Tango_PMR_Common_MessageContainer_descriptor, new java.lang.String[] { "Type", "Data", }); - Tango.PMR.Common.MessageTypeOuterClass.getDescriptor(); + com.twine.tango.pmr.common.MessageTypeOuterClass.getDescriptor(); } // @@protoc_insertion_point(outer_class_scope) diff --git a/Software/Android-Studio/Tango.PMR/src/main/java/Tango/PMR/Common/MessageTypeOuterClass.java b/Software/Android-Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/common/MessageTypeOuterClass.java index dcdd6b0e3..c34d789d0 100644 --- a/Software/Android-Studio/Tango.PMR/src/main/java/Tango/PMR/Common/MessageTypeOuterClass.java +++ b/Software/Android-Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/common/MessageTypeOuterClass.java @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: MessageType.proto -package Tango.PMR.Common; +package com.twine.tango.pmr.common; public final class MessageTypeOuterClass { private MessageTypeOuterClass() {} @@ -95,7 +95,7 @@ public final class MessageTypeOuterClass { } public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return Tango.PMR.Common.MessageTypeOuterClass.getDescriptor().getEnumTypes().get(0); + return com.twine.tango.pmr.common.MessageTypeOuterClass.getDescriptor().getEnumTypes().get(0); } private static final MessageType[] VALUES = values(); @@ -132,7 +132,8 @@ public final class MessageTypeOuterClass { java.lang.String[] descriptorData = { "\n\021MessageType.proto\022\020Tango.PMR.Common*,\n" + "\013MessageType\022\007\n\003RGB\020\000\022\007\n\003Job\020\001\022\013\n\007Segmen" + - "t\020\002b\006proto3" + "t\020\002B\034\n\032com.twine.tango.pmr.commonb\006proto" + + "3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { diff --git a/Software/Android-Studio/Tango.PMR/src/main/java/Tango/PMR/Common/RGBOuterClass.java b/Software/Android-Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/common/RGBOuterClass.java index 7838d31f6..4e751dd48 100644 --- a/Software/Android-Studio/Tango.PMR/src/main/java/Tango/PMR/Common/RGBOuterClass.java +++ b/Software/Android-Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/common/RGBOuterClass.java @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: RGB.proto -package Tango.PMR.Common; +package com.twine.tango.pmr.common; public final class RGBOuterClass { private RGBOuterClass() {} @@ -108,14 +108,14 @@ public final class RGBOuterClass { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return Tango.PMR.Common.RGBOuterClass.internal_static_Tango_PMR_Common_RGB_descriptor; + return com.twine.tango.pmr.common.RGBOuterClass.internal_static_Tango_PMR_Common_RGB_descriptor; } protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return Tango.PMR.Common.RGBOuterClass.internal_static_Tango_PMR_Common_RGB_fieldAccessorTable + return com.twine.tango.pmr.common.RGBOuterClass.internal_static_Tango_PMR_Common_RGB_fieldAccessorTable .ensureFieldAccessorsInitialized( - Tango.PMR.Common.RGBOuterClass.RGB.class, Tango.PMR.Common.RGBOuterClass.RGB.Builder.class); + com.twine.tango.pmr.common.RGBOuterClass.RGB.class, com.twine.tango.pmr.common.RGBOuterClass.RGB.Builder.class); } public static final int R_FIELD_NUMBER = 1; @@ -196,10 +196,10 @@ public final class RGBOuterClass { if (obj == this) { return true; } - if (!(obj instanceof Tango.PMR.Common.RGBOuterClass.RGB)) { + if (!(obj instanceof com.twine.tango.pmr.common.RGBOuterClass.RGB)) { return super.equals(obj); } - Tango.PMR.Common.RGBOuterClass.RGB other = (Tango.PMR.Common.RGBOuterClass.RGB) obj; + com.twine.tango.pmr.common.RGBOuterClass.RGB other = (com.twine.tango.pmr.common.RGBOuterClass.RGB) obj; boolean result = true; result = result && (getR() @@ -230,69 +230,69 @@ public final class RGBOuterClass { return hash; } - public static Tango.PMR.Common.RGBOuterClass.RGB parseFrom( + public static com.twine.tango.pmr.common.RGBOuterClass.RGB parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static Tango.PMR.Common.RGBOuterClass.RGB parseFrom( + public static com.twine.tango.pmr.common.RGBOuterClass.RGB parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static Tango.PMR.Common.RGBOuterClass.RGB parseFrom( + public static com.twine.tango.pmr.common.RGBOuterClass.RGB parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static Tango.PMR.Common.RGBOuterClass.RGB parseFrom( + public static com.twine.tango.pmr.common.RGBOuterClass.RGB parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static Tango.PMR.Common.RGBOuterClass.RGB parseFrom(byte[] data) + public static com.twine.tango.pmr.common.RGBOuterClass.RGB parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static Tango.PMR.Common.RGBOuterClass.RGB parseFrom( + public static com.twine.tango.pmr.common.RGBOuterClass.RGB parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static Tango.PMR.Common.RGBOuterClass.RGB parseFrom(java.io.InputStream input) + public static com.twine.tango.pmr.common.RGBOuterClass.RGB parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static Tango.PMR.Common.RGBOuterClass.RGB parseFrom( + public static com.twine.tango.pmr.common.RGBOuterClass.RGB parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static Tango.PMR.Common.RGBOuterClass.RGB parseDelimitedFrom(java.io.InputStream input) + public static com.twine.tango.pmr.common.RGBOuterClass.RGB parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static Tango.PMR.Common.RGBOuterClass.RGB parseDelimitedFrom( + public static com.twine.tango.pmr.common.RGBOuterClass.RGB parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static Tango.PMR.Common.RGBOuterClass.RGB parseFrom( + public static com.twine.tango.pmr.common.RGBOuterClass.RGB parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static Tango.PMR.Common.RGBOuterClass.RGB parseFrom( + public static com.twine.tango.pmr.common.RGBOuterClass.RGB parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -304,7 +304,7 @@ public final class RGBOuterClass { public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(Tango.PMR.Common.RGBOuterClass.RGB prototype) { + public static Builder newBuilder(com.twine.tango.pmr.common.RGBOuterClass.RGB prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } public Builder toBuilder() { @@ -324,20 +324,20 @@ public final class RGBOuterClass { public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:Tango.PMR.Common.RGB) - Tango.PMR.Common.RGBOuterClass.RGBOrBuilder { + com.twine.tango.pmr.common.RGBOuterClass.RGBOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return Tango.PMR.Common.RGBOuterClass.internal_static_Tango_PMR_Common_RGB_descriptor; + return com.twine.tango.pmr.common.RGBOuterClass.internal_static_Tango_PMR_Common_RGB_descriptor; } protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return Tango.PMR.Common.RGBOuterClass.internal_static_Tango_PMR_Common_RGB_fieldAccessorTable + return com.twine.tango.pmr.common.RGBOuterClass.internal_static_Tango_PMR_Common_RGB_fieldAccessorTable .ensureFieldAccessorsInitialized( - Tango.PMR.Common.RGBOuterClass.RGB.class, Tango.PMR.Common.RGBOuterClass.RGB.Builder.class); + com.twine.tango.pmr.common.RGBOuterClass.RGB.class, com.twine.tango.pmr.common.RGBOuterClass.RGB.Builder.class); } - // Construct using Tango.PMR.Common.RGBOuterClass.RGB.newBuilder() + // Construct using com.twine.tango.pmr.common.RGBOuterClass.RGB.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -365,23 +365,23 @@ public final class RGBOuterClass { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return Tango.PMR.Common.RGBOuterClass.internal_static_Tango_PMR_Common_RGB_descriptor; + return com.twine.tango.pmr.common.RGBOuterClass.internal_static_Tango_PMR_Common_RGB_descriptor; } - public Tango.PMR.Common.RGBOuterClass.RGB getDefaultInstanceForType() { - return Tango.PMR.Common.RGBOuterClass.RGB.getDefaultInstance(); + public com.twine.tango.pmr.common.RGBOuterClass.RGB getDefaultInstanceForType() { + return com.twine.tango.pmr.common.RGBOuterClass.RGB.getDefaultInstance(); } - public Tango.PMR.Common.RGBOuterClass.RGB build() { - Tango.PMR.Common.RGBOuterClass.RGB result = buildPartial(); + public com.twine.tango.pmr.common.RGBOuterClass.RGB build() { + com.twine.tango.pmr.common.RGBOuterClass.RGB result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public Tango.PMR.Common.RGBOuterClass.RGB buildPartial() { - Tango.PMR.Common.RGBOuterClass.RGB result = new Tango.PMR.Common.RGBOuterClass.RGB(this); + public com.twine.tango.pmr.common.RGBOuterClass.RGB buildPartial() { + com.twine.tango.pmr.common.RGBOuterClass.RGB result = new com.twine.tango.pmr.common.RGBOuterClass.RGB(this); result.r_ = r_; result.g_ = g_; result.b_ = b_; @@ -416,16 +416,16 @@ public final class RGBOuterClass { return (Builder) super.addRepeatedField(field, value); } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof Tango.PMR.Common.RGBOuterClass.RGB) { - return mergeFrom((Tango.PMR.Common.RGBOuterClass.RGB)other); + if (other instanceof com.twine.tango.pmr.common.RGBOuterClass.RGB) { + return mergeFrom((com.twine.tango.pmr.common.RGBOuterClass.RGB)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(Tango.PMR.Common.RGBOuterClass.RGB other) { - if (other == Tango.PMR.Common.RGBOuterClass.RGB.getDefaultInstance()) return this; + public Builder mergeFrom(com.twine.tango.pmr.common.RGBOuterClass.RGB other) { + if (other == com.twine.tango.pmr.common.RGBOuterClass.RGB.getDefaultInstance()) return this; if (other.getR() != 0) { setR(other.getR()); } @@ -448,11 +448,11 @@ public final class RGBOuterClass { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - Tango.PMR.Common.RGBOuterClass.RGB parsedMessage = null; + com.twine.tango.pmr.common.RGBOuterClass.RGB parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (Tango.PMR.Common.RGBOuterClass.RGB) e.getUnfinishedMessage(); + parsedMessage = (com.twine.tango.pmr.common.RGBOuterClass.RGB) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -554,12 +554,12 @@ public final class RGBOuterClass { } // @@protoc_insertion_point(class_scope:Tango.PMR.Common.RGB) - private static final Tango.PMR.Common.RGBOuterClass.RGB DEFAULT_INSTANCE; + private static final com.twine.tango.pmr.common.RGBOuterClass.RGB DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new Tango.PMR.Common.RGBOuterClass.RGB(); + DEFAULT_INSTANCE = new com.twine.tango.pmr.common.RGBOuterClass.RGB(); } - public static Tango.PMR.Common.RGBOuterClass.RGB getDefaultInstance() { + public static com.twine.tango.pmr.common.RGBOuterClass.RGB getDefaultInstance() { return DEFAULT_INSTANCE; } @@ -582,7 +582,7 @@ public final class RGBOuterClass { return PARSER; } - public Tango.PMR.Common.RGBOuterClass.RGB getDefaultInstanceForType() { + public com.twine.tango.pmr.common.RGBOuterClass.RGB getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -603,7 +603,8 @@ public final class RGBOuterClass { static { java.lang.String[] descriptorData = { "\n\tRGB.proto\022\020Tango.PMR.Common\"&\n\003RGB\022\t\n\001" + - "R\030\001 \001(\005\022\t\n\001G\030\002 \001(\005\022\t\n\001B\030\003 \001(\005b\006proto3" + "R\030\001 \001(\005\022\t\n\001G\030\002 \001(\005\022\t\n\001B\030\003 \001(\005B\034\n\032com.twi" + + "ne.tango.pmr.commonb\006proto3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { diff --git a/Software/Android-Studio/Tango.PMR/src/main/java/Tango/PMR/Jobs/JobOuterClass.java b/Software/Android-Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/jobs/JobOuterClass.java index 827ab3f95..79c17d6a8 100644 --- a/Software/Android-Studio/Tango.PMR/src/main/java/Tango/PMR/Jobs/JobOuterClass.java +++ b/Software/Android-Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/jobs/JobOuterClass.java @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: Job.proto -package Tango.PMR.Jobs; +package com.twine.tango.pmr.jobs; public final class JobOuterClass { private JobOuterClass() {} @@ -31,12 +31,12 @@ public final class JobOuterClass { /** * <code>repeated .Tango.PMR.Jobs.Segment Segments = 2;</code> */ - java.util.List<Tango.PMR.Jobs.SegmentOuterClass.Segment> + java.util.List<com.twine.tango.pmr.jobs.SegmentOuterClass.Segment> getSegmentsList(); /** * <code>repeated .Tango.PMR.Jobs.Segment Segments = 2;</code> */ - Tango.PMR.Jobs.SegmentOuterClass.Segment getSegments(int index); + com.twine.tango.pmr.jobs.SegmentOuterClass.Segment getSegments(int index); /** * <code>repeated .Tango.PMR.Jobs.Segment Segments = 2;</code> */ @@ -44,12 +44,12 @@ public final class JobOuterClass { /** * <code>repeated .Tango.PMR.Jobs.Segment Segments = 2;</code> */ - java.util.List<? extends Tango.PMR.Jobs.SegmentOuterClass.SegmentOrBuilder> + java.util.List<? extends com.twine.tango.pmr.jobs.SegmentOuterClass.SegmentOrBuilder> getSegmentsOrBuilderList(); /** * <code>repeated .Tango.PMR.Jobs.Segment Segments = 2;</code> */ - Tango.PMR.Jobs.SegmentOuterClass.SegmentOrBuilder getSegmentsOrBuilder( + com.twine.tango.pmr.jobs.SegmentOuterClass.SegmentOrBuilder getSegmentsOrBuilder( int index); } /** @@ -105,11 +105,11 @@ public final class JobOuterClass { } case 18: { if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { - segments_ = new java.util.ArrayList<Tango.PMR.Jobs.SegmentOuterClass.Segment>(); + segments_ = new java.util.ArrayList<com.twine.tango.pmr.jobs.SegmentOuterClass.Segment>(); mutable_bitField0_ |= 0x00000002; } segments_.add( - input.readMessage(Tango.PMR.Jobs.SegmentOuterClass.Segment.parser(), extensionRegistry)); + input.readMessage(com.twine.tango.pmr.jobs.SegmentOuterClass.Segment.parser(), extensionRegistry)); break; } } @@ -129,14 +129,14 @@ public final class JobOuterClass { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return Tango.PMR.Jobs.JobOuterClass.internal_static_Tango_PMR_Jobs_Job_descriptor; + return com.twine.tango.pmr.jobs.JobOuterClass.internal_static_Tango_PMR_Jobs_Job_descriptor; } protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return Tango.PMR.Jobs.JobOuterClass.internal_static_Tango_PMR_Jobs_Job_fieldAccessorTable + return com.twine.tango.pmr.jobs.JobOuterClass.internal_static_Tango_PMR_Jobs_Job_fieldAccessorTable .ensureFieldAccessorsInitialized( - Tango.PMR.Jobs.JobOuterClass.Job.class, Tango.PMR.Jobs.JobOuterClass.Job.Builder.class); + com.twine.tango.pmr.jobs.JobOuterClass.Job.class, com.twine.tango.pmr.jobs.JobOuterClass.Job.Builder.class); } private int bitField0_; @@ -175,17 +175,17 @@ public final class JobOuterClass { } public static final int SEGMENTS_FIELD_NUMBER = 2; - private java.util.List<Tango.PMR.Jobs.SegmentOuterClass.Segment> segments_; + private java.util.List<com.twine.tango.pmr.jobs.SegmentOuterClass.Segment> segments_; /** * <code>repeated .Tango.PMR.Jobs.Segment Segments = 2;</code> */ - public java.util.List<Tango.PMR.Jobs.SegmentOuterClass.Segment> getSegmentsList() { + public java.util.List<com.twine.tango.pmr.jobs.SegmentOuterClass.Segment> getSegmentsList() { return segments_; } /** * <code>repeated .Tango.PMR.Jobs.Segment Segments = 2;</code> */ - public java.util.List<? extends Tango.PMR.Jobs.SegmentOuterClass.SegmentOrBuilder> + public java.util.List<? extends com.twine.tango.pmr.jobs.SegmentOuterClass.SegmentOrBuilder> getSegmentsOrBuilderList() { return segments_; } @@ -198,13 +198,13 @@ public final class JobOuterClass { /** * <code>repeated .Tango.PMR.Jobs.Segment Segments = 2;</code> */ - public Tango.PMR.Jobs.SegmentOuterClass.Segment getSegments(int index) { + public com.twine.tango.pmr.jobs.SegmentOuterClass.Segment getSegments(int index) { return segments_.get(index); } /** * <code>repeated .Tango.PMR.Jobs.Segment Segments = 2;</code> */ - public Tango.PMR.Jobs.SegmentOuterClass.SegmentOrBuilder getSegmentsOrBuilder( + public com.twine.tango.pmr.jobs.SegmentOuterClass.SegmentOrBuilder getSegmentsOrBuilder( int index) { return segments_.get(index); } @@ -252,10 +252,10 @@ public final class JobOuterClass { if (obj == this) { return true; } - if (!(obj instanceof Tango.PMR.Jobs.JobOuterClass.Job)) { + if (!(obj instanceof com.twine.tango.pmr.jobs.JobOuterClass.Job)) { return super.equals(obj); } - Tango.PMR.Jobs.JobOuterClass.Job other = (Tango.PMR.Jobs.JobOuterClass.Job) obj; + com.twine.tango.pmr.jobs.JobOuterClass.Job other = (com.twine.tango.pmr.jobs.JobOuterClass.Job) obj; boolean result = true; result = result && getName() @@ -284,69 +284,69 @@ public final class JobOuterClass { return hash; } - public static Tango.PMR.Jobs.JobOuterClass.Job parseFrom( + public static com.twine.tango.pmr.jobs.JobOuterClass.Job parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static Tango.PMR.Jobs.JobOuterClass.Job parseFrom( + public static com.twine.tango.pmr.jobs.JobOuterClass.Job parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static Tango.PMR.Jobs.JobOuterClass.Job parseFrom( + public static com.twine.tango.pmr.jobs.JobOuterClass.Job parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static Tango.PMR.Jobs.JobOuterClass.Job parseFrom( + public static com.twine.tango.pmr.jobs.JobOuterClass.Job parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static Tango.PMR.Jobs.JobOuterClass.Job parseFrom(byte[] data) + public static com.twine.tango.pmr.jobs.JobOuterClass.Job parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static Tango.PMR.Jobs.JobOuterClass.Job parseFrom( + public static com.twine.tango.pmr.jobs.JobOuterClass.Job parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static Tango.PMR.Jobs.JobOuterClass.Job parseFrom(java.io.InputStream input) + public static com.twine.tango.pmr.jobs.JobOuterClass.Job parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static Tango.PMR.Jobs.JobOuterClass.Job parseFrom( + public static com.twine.tango.pmr.jobs.JobOuterClass.Job parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static Tango.PMR.Jobs.JobOuterClass.Job parseDelimitedFrom(java.io.InputStream input) + public static com.twine.tango.pmr.jobs.JobOuterClass.Job parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static Tango.PMR.Jobs.JobOuterClass.Job parseDelimitedFrom( + public static com.twine.tango.pmr.jobs.JobOuterClass.Job parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static Tango.PMR.Jobs.JobOuterClass.Job parseFrom( + public static com.twine.tango.pmr.jobs.JobOuterClass.Job parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static Tango.PMR.Jobs.JobOuterClass.Job parseFrom( + public static com.twine.tango.pmr.jobs.JobOuterClass.Job parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -358,7 +358,7 @@ public final class JobOuterClass { public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(Tango.PMR.Jobs.JobOuterClass.Job prototype) { + public static Builder newBuilder(com.twine.tango.pmr.jobs.JobOuterClass.Job prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } public Builder toBuilder() { @@ -378,20 +378,20 @@ public final class JobOuterClass { public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:Tango.PMR.Jobs.Job) - Tango.PMR.Jobs.JobOuterClass.JobOrBuilder { + com.twine.tango.pmr.jobs.JobOuterClass.JobOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return Tango.PMR.Jobs.JobOuterClass.internal_static_Tango_PMR_Jobs_Job_descriptor; + return com.twine.tango.pmr.jobs.JobOuterClass.internal_static_Tango_PMR_Jobs_Job_descriptor; } protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return Tango.PMR.Jobs.JobOuterClass.internal_static_Tango_PMR_Jobs_Job_fieldAccessorTable + return com.twine.tango.pmr.jobs.JobOuterClass.internal_static_Tango_PMR_Jobs_Job_fieldAccessorTable .ensureFieldAccessorsInitialized( - Tango.PMR.Jobs.JobOuterClass.Job.class, Tango.PMR.Jobs.JobOuterClass.Job.Builder.class); + com.twine.tango.pmr.jobs.JobOuterClass.Job.class, com.twine.tango.pmr.jobs.JobOuterClass.Job.Builder.class); } - // Construct using Tango.PMR.Jobs.JobOuterClass.Job.newBuilder() + // Construct using com.twine.tango.pmr.jobs.JobOuterClass.Job.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -422,23 +422,23 @@ public final class JobOuterClass { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return Tango.PMR.Jobs.JobOuterClass.internal_static_Tango_PMR_Jobs_Job_descriptor; + return com.twine.tango.pmr.jobs.JobOuterClass.internal_static_Tango_PMR_Jobs_Job_descriptor; } - public Tango.PMR.Jobs.JobOuterClass.Job getDefaultInstanceForType() { - return Tango.PMR.Jobs.JobOuterClass.Job.getDefaultInstance(); + public com.twine.tango.pmr.jobs.JobOuterClass.Job getDefaultInstanceForType() { + return com.twine.tango.pmr.jobs.JobOuterClass.Job.getDefaultInstance(); } - public Tango.PMR.Jobs.JobOuterClass.Job build() { - Tango.PMR.Jobs.JobOuterClass.Job result = buildPartial(); + public com.twine.tango.pmr.jobs.JobOuterClass.Job build() { + com.twine.tango.pmr.jobs.JobOuterClass.Job result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public Tango.PMR.Jobs.JobOuterClass.Job buildPartial() { - Tango.PMR.Jobs.JobOuterClass.Job result = new Tango.PMR.Jobs.JobOuterClass.Job(this); + public com.twine.tango.pmr.jobs.JobOuterClass.Job buildPartial() { + com.twine.tango.pmr.jobs.JobOuterClass.Job result = new com.twine.tango.pmr.jobs.JobOuterClass.Job(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; result.name_ = name_; @@ -483,16 +483,16 @@ public final class JobOuterClass { return (Builder) super.addRepeatedField(field, value); } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof Tango.PMR.Jobs.JobOuterClass.Job) { - return mergeFrom((Tango.PMR.Jobs.JobOuterClass.Job)other); + if (other instanceof com.twine.tango.pmr.jobs.JobOuterClass.Job) { + return mergeFrom((com.twine.tango.pmr.jobs.JobOuterClass.Job)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(Tango.PMR.Jobs.JobOuterClass.Job other) { - if (other == Tango.PMR.Jobs.JobOuterClass.Job.getDefaultInstance()) return this; + public Builder mergeFrom(com.twine.tango.pmr.jobs.JobOuterClass.Job other) { + if (other == com.twine.tango.pmr.jobs.JobOuterClass.Job.getDefaultInstance()) return this; if (!other.getName().isEmpty()) { name_ = other.name_; onChanged(); @@ -536,11 +536,11 @@ public final class JobOuterClass { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - Tango.PMR.Jobs.JobOuterClass.Job parsedMessage = null; + com.twine.tango.pmr.jobs.JobOuterClass.Job parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (Tango.PMR.Jobs.JobOuterClass.Job) e.getUnfinishedMessage(); + parsedMessage = (com.twine.tango.pmr.jobs.JobOuterClass.Job) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -620,22 +620,22 @@ public final class JobOuterClass { return this; } - private java.util.List<Tango.PMR.Jobs.SegmentOuterClass.Segment> segments_ = + private java.util.List<com.twine.tango.pmr.jobs.SegmentOuterClass.Segment> segments_ = java.util.Collections.emptyList(); private void ensureSegmentsIsMutable() { if (!((bitField0_ & 0x00000002) == 0x00000002)) { - segments_ = new java.util.ArrayList<Tango.PMR.Jobs.SegmentOuterClass.Segment>(segments_); + segments_ = new java.util.ArrayList<com.twine.tango.pmr.jobs.SegmentOuterClass.Segment>(segments_); bitField0_ |= 0x00000002; } } private com.google.protobuf.RepeatedFieldBuilderV3< - Tango.PMR.Jobs.SegmentOuterClass.Segment, Tango.PMR.Jobs.SegmentOuterClass.Segment.Builder, Tango.PMR.Jobs.SegmentOuterClass.SegmentOrBuilder> segmentsBuilder_; + com.twine.tango.pmr.jobs.SegmentOuterClass.Segment, com.twine.tango.pmr.jobs.SegmentOuterClass.Segment.Builder, com.twine.tango.pmr.jobs.SegmentOuterClass.SegmentOrBuilder> segmentsBuilder_; /** * <code>repeated .Tango.PMR.Jobs.Segment Segments = 2;</code> */ - public java.util.List<Tango.PMR.Jobs.SegmentOuterClass.Segment> getSegmentsList() { + public java.util.List<com.twine.tango.pmr.jobs.SegmentOuterClass.Segment> getSegmentsList() { if (segmentsBuilder_ == null) { return java.util.Collections.unmodifiableList(segments_); } else { @@ -655,7 +655,7 @@ public final class JobOuterClass { /** * <code>repeated .Tango.PMR.Jobs.Segment Segments = 2;</code> */ - public Tango.PMR.Jobs.SegmentOuterClass.Segment getSegments(int index) { + public com.twine.tango.pmr.jobs.SegmentOuterClass.Segment getSegments(int index) { if (segmentsBuilder_ == null) { return segments_.get(index); } else { @@ -666,7 +666,7 @@ public final class JobOuterClass { * <code>repeated .Tango.PMR.Jobs.Segment Segments = 2;</code> */ public Builder setSegments( - int index, Tango.PMR.Jobs.SegmentOuterClass.Segment value) { + int index, com.twine.tango.pmr.jobs.SegmentOuterClass.Segment value) { if (segmentsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -683,7 +683,7 @@ public final class JobOuterClass { * <code>repeated .Tango.PMR.Jobs.Segment Segments = 2;</code> */ public Builder setSegments( - int index, Tango.PMR.Jobs.SegmentOuterClass.Segment.Builder builderForValue) { + int index, com.twine.tango.pmr.jobs.SegmentOuterClass.Segment.Builder builderForValue) { if (segmentsBuilder_ == null) { ensureSegmentsIsMutable(); segments_.set(index, builderForValue.build()); @@ -696,7 +696,7 @@ public final class JobOuterClass { /** * <code>repeated .Tango.PMR.Jobs.Segment Segments = 2;</code> */ - public Builder addSegments(Tango.PMR.Jobs.SegmentOuterClass.Segment value) { + public Builder addSegments(com.twine.tango.pmr.jobs.SegmentOuterClass.Segment value) { if (segmentsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -713,7 +713,7 @@ public final class JobOuterClass { * <code>repeated .Tango.PMR.Jobs.Segment Segments = 2;</code> */ public Builder addSegments( - int index, Tango.PMR.Jobs.SegmentOuterClass.Segment value) { + int index, com.twine.tango.pmr.jobs.SegmentOuterClass.Segment value) { if (segmentsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -730,7 +730,7 @@ public final class JobOuterClass { * <code>repeated .Tango.PMR.Jobs.Segment Segments = 2;</code> */ public Builder addSegments( - Tango.PMR.Jobs.SegmentOuterClass.Segment.Builder builderForValue) { + com.twine.tango.pmr.jobs.SegmentOuterClass.Segment.Builder builderForValue) { if (segmentsBuilder_ == null) { ensureSegmentsIsMutable(); segments_.add(builderForValue.build()); @@ -744,7 +744,7 @@ public final class JobOuterClass { * <code>repeated .Tango.PMR.Jobs.Segment Segments = 2;</code> */ public Builder addSegments( - int index, Tango.PMR.Jobs.SegmentOuterClass.Segment.Builder builderForValue) { + int index, com.twine.tango.pmr.jobs.SegmentOuterClass.Segment.Builder builderForValue) { if (segmentsBuilder_ == null) { ensureSegmentsIsMutable(); segments_.add(index, builderForValue.build()); @@ -758,7 +758,7 @@ public final class JobOuterClass { * <code>repeated .Tango.PMR.Jobs.Segment Segments = 2;</code> */ public Builder addAllSegments( - java.lang.Iterable<? extends Tango.PMR.Jobs.SegmentOuterClass.Segment> values) { + java.lang.Iterable<? extends com.twine.tango.pmr.jobs.SegmentOuterClass.Segment> values) { if (segmentsBuilder_ == null) { ensureSegmentsIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( @@ -798,14 +798,14 @@ public final class JobOuterClass { /** * <code>repeated .Tango.PMR.Jobs.Segment Segments = 2;</code> */ - public Tango.PMR.Jobs.SegmentOuterClass.Segment.Builder getSegmentsBuilder( + public com.twine.tango.pmr.jobs.SegmentOuterClass.Segment.Builder getSegmentsBuilder( int index) { return getSegmentsFieldBuilder().getBuilder(index); } /** * <code>repeated .Tango.PMR.Jobs.Segment Segments = 2;</code> */ - public Tango.PMR.Jobs.SegmentOuterClass.SegmentOrBuilder getSegmentsOrBuilder( + public com.twine.tango.pmr.jobs.SegmentOuterClass.SegmentOrBuilder getSegmentsOrBuilder( int index) { if (segmentsBuilder_ == null) { return segments_.get(index); } else { @@ -815,7 +815,7 @@ public final class JobOuterClass { /** * <code>repeated .Tango.PMR.Jobs.Segment Segments = 2;</code> */ - public java.util.List<? extends Tango.PMR.Jobs.SegmentOuterClass.SegmentOrBuilder> + public java.util.List<? extends com.twine.tango.pmr.jobs.SegmentOuterClass.SegmentOrBuilder> getSegmentsOrBuilderList() { if (segmentsBuilder_ != null) { return segmentsBuilder_.getMessageOrBuilderList(); @@ -826,31 +826,31 @@ public final class JobOuterClass { /** * <code>repeated .Tango.PMR.Jobs.Segment Segments = 2;</code> */ - public Tango.PMR.Jobs.SegmentOuterClass.Segment.Builder addSegmentsBuilder() { + public com.twine.tango.pmr.jobs.SegmentOuterClass.Segment.Builder addSegmentsBuilder() { return getSegmentsFieldBuilder().addBuilder( - Tango.PMR.Jobs.SegmentOuterClass.Segment.getDefaultInstance()); + com.twine.tango.pmr.jobs.SegmentOuterClass.Segment.getDefaultInstance()); } /** * <code>repeated .Tango.PMR.Jobs.Segment Segments = 2;</code> */ - public Tango.PMR.Jobs.SegmentOuterClass.Segment.Builder addSegmentsBuilder( + public com.twine.tango.pmr.jobs.SegmentOuterClass.Segment.Builder addSegmentsBuilder( int index) { return getSegmentsFieldBuilder().addBuilder( - index, Tango.PMR.Jobs.SegmentOuterClass.Segment.getDefaultInstance()); + index, com.twine.tango.pmr.jobs.SegmentOuterClass.Segment.getDefaultInstance()); } /** * <code>repeated .Tango.PMR.Jobs.Segment Segments = 2;</code> */ - public java.util.List<Tango.PMR.Jobs.SegmentOuterClass.Segment.Builder> + public java.util.List<com.twine.tango.pmr.jobs.SegmentOuterClass.Segment.Builder> getSegmentsBuilderList() { return getSegmentsFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilderV3< - Tango.PMR.Jobs.SegmentOuterClass.Segment, Tango.PMR.Jobs.SegmentOuterClass.Segment.Builder, Tango.PMR.Jobs.SegmentOuterClass.SegmentOrBuilder> + com.twine.tango.pmr.jobs.SegmentOuterClass.Segment, com.twine.tango.pmr.jobs.SegmentOuterClass.Segment.Builder, com.twine.tango.pmr.jobs.SegmentOuterClass.SegmentOrBuilder> getSegmentsFieldBuilder() { if (segmentsBuilder_ == null) { segmentsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< - Tango.PMR.Jobs.SegmentOuterClass.Segment, Tango.PMR.Jobs.SegmentOuterClass.Segment.Builder, Tango.PMR.Jobs.SegmentOuterClass.SegmentOrBuilder>( + com.twine.tango.pmr.jobs.SegmentOuterClass.Segment, com.twine.tango.pmr.jobs.SegmentOuterClass.Segment.Builder, com.twine.tango.pmr.jobs.SegmentOuterClass.SegmentOrBuilder>( segments_, ((bitField0_ & 0x00000002) == 0x00000002), getParentForChildren(), @@ -874,12 +874,12 @@ public final class JobOuterClass { } // @@protoc_insertion_point(class_scope:Tango.PMR.Jobs.Job) - private static final Tango.PMR.Jobs.JobOuterClass.Job DEFAULT_INSTANCE; + private static final com.twine.tango.pmr.jobs.JobOuterClass.Job DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new Tango.PMR.Jobs.JobOuterClass.Job(); + DEFAULT_INSTANCE = new com.twine.tango.pmr.jobs.JobOuterClass.Job(); } - public static Tango.PMR.Jobs.JobOuterClass.Job getDefaultInstance() { + public static com.twine.tango.pmr.jobs.JobOuterClass.Job getDefaultInstance() { return DEFAULT_INSTANCE; } @@ -902,7 +902,7 @@ public final class JobOuterClass { return PARSER; } - public Tango.PMR.Jobs.JobOuterClass.Job getDefaultInstanceForType() { + public com.twine.tango.pmr.jobs.JobOuterClass.Job getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -924,7 +924,8 @@ public final class JobOuterClass { java.lang.String[] descriptorData = { "\n\tJob.proto\022\016Tango.PMR.Jobs\032\rSegment.pro" + "to\">\n\003Job\022\014\n\004Name\030\001 \001(\t\022)\n\010Segments\030\002 \003(" + - "\0132\027.Tango.PMR.Jobs.Segmentb\006proto3" + "\0132\027.Tango.PMR.Jobs.SegmentB\032\n\030com.twine." + + "tango.pmr.jobsb\006proto3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { @@ -937,7 +938,7 @@ public final class JobOuterClass { com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { - Tango.PMR.Jobs.SegmentOuterClass.getDescriptor(), + com.twine.tango.pmr.jobs.SegmentOuterClass.getDescriptor(), }, assigner); internal_static_Tango_PMR_Jobs_Job_descriptor = getDescriptor().getMessageTypes().get(0); @@ -945,7 +946,7 @@ public final class JobOuterClass { com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_Tango_PMR_Jobs_Job_descriptor, new java.lang.String[] { "Name", "Segments", }); - Tango.PMR.Jobs.SegmentOuterClass.getDescriptor(); + com.twine.tango.pmr.jobs.SegmentOuterClass.getDescriptor(); } // @@protoc_insertion_point(outer_class_scope) diff --git a/Software/Android-Studio/Tango.PMR/src/main/java/Tango/PMR/Jobs/SegmentOuterClass.java b/Software/Android-Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/jobs/SegmentOuterClass.java index bca42e8b0..eb19e884e 100644 --- a/Software/Android-Studio/Tango.PMR/src/main/java/Tango/PMR/Jobs/SegmentOuterClass.java +++ b/Software/Android-Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/jobs/SegmentOuterClass.java @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: Segment.proto -package Tango.PMR.Jobs; +package com.twine.tango.pmr.jobs; public final class SegmentOuterClass { private SegmentOuterClass() {} @@ -40,11 +40,11 @@ public final class SegmentOuterClass { /** * <code>.Tango.PMR.Common.RGB Color = 3;</code> */ - Tango.PMR.Common.RGBOuterClass.RGB getColor(); + com.twine.tango.pmr.common.RGBOuterClass.RGB getColor(); /** * <code>.Tango.PMR.Common.RGB Color = 3;</code> */ - Tango.PMR.Common.RGBOuterClass.RGBOrBuilder getColorOrBuilder(); + com.twine.tango.pmr.common.RGBOuterClass.RGBOrBuilder getColorOrBuilder(); } /** * Protobuf type {@code Tango.PMR.Jobs.Segment} @@ -103,11 +103,11 @@ public final class SegmentOuterClass { break; } case 26: { - Tango.PMR.Common.RGBOuterClass.RGB.Builder subBuilder = null; + com.twine.tango.pmr.common.RGBOuterClass.RGB.Builder subBuilder = null; if (color_ != null) { subBuilder = color_.toBuilder(); } - color_ = input.readMessage(Tango.PMR.Common.RGBOuterClass.RGB.parser(), extensionRegistry); + color_ = input.readMessage(com.twine.tango.pmr.common.RGBOuterClass.RGB.parser(), extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(color_); color_ = subBuilder.buildPartial(); @@ -129,14 +129,14 @@ public final class SegmentOuterClass { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return Tango.PMR.Jobs.SegmentOuterClass.internal_static_Tango_PMR_Jobs_Segment_descriptor; + return com.twine.tango.pmr.jobs.SegmentOuterClass.internal_static_Tango_PMR_Jobs_Segment_descriptor; } protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return Tango.PMR.Jobs.SegmentOuterClass.internal_static_Tango_PMR_Jobs_Segment_fieldAccessorTable + return com.twine.tango.pmr.jobs.SegmentOuterClass.internal_static_Tango_PMR_Jobs_Segment_fieldAccessorTable .ensureFieldAccessorsInitialized( - Tango.PMR.Jobs.SegmentOuterClass.Segment.class, Tango.PMR.Jobs.SegmentOuterClass.Segment.Builder.class); + com.twine.tango.pmr.jobs.SegmentOuterClass.Segment.class, com.twine.tango.pmr.jobs.SegmentOuterClass.Segment.Builder.class); } public static final int NAME_FIELD_NUMBER = 1; @@ -183,7 +183,7 @@ public final class SegmentOuterClass { } public static final int COLOR_FIELD_NUMBER = 3; - private Tango.PMR.Common.RGBOuterClass.RGB color_; + private com.twine.tango.pmr.common.RGBOuterClass.RGB color_; /** * <code>.Tango.PMR.Common.RGB Color = 3;</code> */ @@ -193,13 +193,13 @@ public final class SegmentOuterClass { /** * <code>.Tango.PMR.Common.RGB Color = 3;</code> */ - public Tango.PMR.Common.RGBOuterClass.RGB getColor() { - return color_ == null ? Tango.PMR.Common.RGBOuterClass.RGB.getDefaultInstance() : color_; + public com.twine.tango.pmr.common.RGBOuterClass.RGB getColor() { + return color_ == null ? com.twine.tango.pmr.common.RGBOuterClass.RGB.getDefaultInstance() : color_; } /** * <code>.Tango.PMR.Common.RGB Color = 3;</code> */ - public Tango.PMR.Common.RGBOuterClass.RGBOrBuilder getColorOrBuilder() { + public com.twine.tango.pmr.common.RGBOuterClass.RGBOrBuilder getColorOrBuilder() { return getColor(); } @@ -253,10 +253,10 @@ public final class SegmentOuterClass { if (obj == this) { return true; } - if (!(obj instanceof Tango.PMR.Jobs.SegmentOuterClass.Segment)) { + if (!(obj instanceof com.twine.tango.pmr.jobs.SegmentOuterClass.Segment)) { return super.equals(obj); } - Tango.PMR.Jobs.SegmentOuterClass.Segment other = (Tango.PMR.Jobs.SegmentOuterClass.Segment) obj; + com.twine.tango.pmr.jobs.SegmentOuterClass.Segment other = (com.twine.tango.pmr.jobs.SegmentOuterClass.Segment) obj; boolean result = true; result = result && getName() @@ -292,69 +292,69 @@ public final class SegmentOuterClass { return hash; } - public static Tango.PMR.Jobs.SegmentOuterClass.Segment parseFrom( + public static com.twine.tango.pmr.jobs.SegmentOuterClass.Segment parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static Tango.PMR.Jobs.SegmentOuterClass.Segment parseFrom( + public static com.twine.tango.pmr.jobs.SegmentOuterClass.Segment parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static Tango.PMR.Jobs.SegmentOuterClass.Segment parseFrom( + public static com.twine.tango.pmr.jobs.SegmentOuterClass.Segment parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static Tango.PMR.Jobs.SegmentOuterClass.Segment parseFrom( + public static com.twine.tango.pmr.jobs.SegmentOuterClass.Segment parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static Tango.PMR.Jobs.SegmentOuterClass.Segment parseFrom(byte[] data) + public static com.twine.tango.pmr.jobs.SegmentOuterClass.Segment parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static Tango.PMR.Jobs.SegmentOuterClass.Segment parseFrom( + public static com.twine.tango.pmr.jobs.SegmentOuterClass.Segment parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static Tango.PMR.Jobs.SegmentOuterClass.Segment parseFrom(java.io.InputStream input) + public static com.twine.tango.pmr.jobs.SegmentOuterClass.Segment parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static Tango.PMR.Jobs.SegmentOuterClass.Segment parseFrom( + public static com.twine.tango.pmr.jobs.SegmentOuterClass.Segment parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static Tango.PMR.Jobs.SegmentOuterClass.Segment parseDelimitedFrom(java.io.InputStream input) + public static com.twine.tango.pmr.jobs.SegmentOuterClass.Segment parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static Tango.PMR.Jobs.SegmentOuterClass.Segment parseDelimitedFrom( + public static com.twine.tango.pmr.jobs.SegmentOuterClass.Segment parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static Tango.PMR.Jobs.SegmentOuterClass.Segment parseFrom( + public static com.twine.tango.pmr.jobs.SegmentOuterClass.Segment parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static Tango.PMR.Jobs.SegmentOuterClass.Segment parseFrom( + public static com.twine.tango.pmr.jobs.SegmentOuterClass.Segment parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -366,7 +366,7 @@ public final class SegmentOuterClass { public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(Tango.PMR.Jobs.SegmentOuterClass.Segment prototype) { + public static Builder newBuilder(com.twine.tango.pmr.jobs.SegmentOuterClass.Segment prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } public Builder toBuilder() { @@ -386,20 +386,20 @@ public final class SegmentOuterClass { public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:Tango.PMR.Jobs.Segment) - Tango.PMR.Jobs.SegmentOuterClass.SegmentOrBuilder { + com.twine.tango.pmr.jobs.SegmentOuterClass.SegmentOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return Tango.PMR.Jobs.SegmentOuterClass.internal_static_Tango_PMR_Jobs_Segment_descriptor; + return com.twine.tango.pmr.jobs.SegmentOuterClass.internal_static_Tango_PMR_Jobs_Segment_descriptor; } protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return Tango.PMR.Jobs.SegmentOuterClass.internal_static_Tango_PMR_Jobs_Segment_fieldAccessorTable + return com.twine.tango.pmr.jobs.SegmentOuterClass.internal_static_Tango_PMR_Jobs_Segment_fieldAccessorTable .ensureFieldAccessorsInitialized( - Tango.PMR.Jobs.SegmentOuterClass.Segment.class, Tango.PMR.Jobs.SegmentOuterClass.Segment.Builder.class); + com.twine.tango.pmr.jobs.SegmentOuterClass.Segment.class, com.twine.tango.pmr.jobs.SegmentOuterClass.Segment.Builder.class); } - // Construct using Tango.PMR.Jobs.SegmentOuterClass.Segment.newBuilder() + // Construct using com.twine.tango.pmr.jobs.SegmentOuterClass.Segment.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -431,23 +431,23 @@ public final class SegmentOuterClass { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return Tango.PMR.Jobs.SegmentOuterClass.internal_static_Tango_PMR_Jobs_Segment_descriptor; + return com.twine.tango.pmr.jobs.SegmentOuterClass.internal_static_Tango_PMR_Jobs_Segment_descriptor; } - public Tango.PMR.Jobs.SegmentOuterClass.Segment getDefaultInstanceForType() { - return Tango.PMR.Jobs.SegmentOuterClass.Segment.getDefaultInstance(); + public com.twine.tango.pmr.jobs.SegmentOuterClass.Segment getDefaultInstanceForType() { + return com.twine.tango.pmr.jobs.SegmentOuterClass.Segment.getDefaultInstance(); } - public Tango.PMR.Jobs.SegmentOuterClass.Segment build() { - Tango.PMR.Jobs.SegmentOuterClass.Segment result = buildPartial(); + public com.twine.tango.pmr.jobs.SegmentOuterClass.Segment build() { + com.twine.tango.pmr.jobs.SegmentOuterClass.Segment result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public Tango.PMR.Jobs.SegmentOuterClass.Segment buildPartial() { - Tango.PMR.Jobs.SegmentOuterClass.Segment result = new Tango.PMR.Jobs.SegmentOuterClass.Segment(this); + public com.twine.tango.pmr.jobs.SegmentOuterClass.Segment buildPartial() { + com.twine.tango.pmr.jobs.SegmentOuterClass.Segment result = new com.twine.tango.pmr.jobs.SegmentOuterClass.Segment(this); result.name_ = name_; result.length_ = length_; if (colorBuilder_ == null) { @@ -486,16 +486,16 @@ public final class SegmentOuterClass { return (Builder) super.addRepeatedField(field, value); } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof Tango.PMR.Jobs.SegmentOuterClass.Segment) { - return mergeFrom((Tango.PMR.Jobs.SegmentOuterClass.Segment)other); + if (other instanceof com.twine.tango.pmr.jobs.SegmentOuterClass.Segment) { + return mergeFrom((com.twine.tango.pmr.jobs.SegmentOuterClass.Segment)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(Tango.PMR.Jobs.SegmentOuterClass.Segment other) { - if (other == Tango.PMR.Jobs.SegmentOuterClass.Segment.getDefaultInstance()) return this; + public Builder mergeFrom(com.twine.tango.pmr.jobs.SegmentOuterClass.Segment other) { + if (other == com.twine.tango.pmr.jobs.SegmentOuterClass.Segment.getDefaultInstance()) return this; if (!other.getName().isEmpty()) { name_ = other.name_; onChanged(); @@ -519,11 +519,11 @@ public final class SegmentOuterClass { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - Tango.PMR.Jobs.SegmentOuterClass.Segment parsedMessage = null; + com.twine.tango.pmr.jobs.SegmentOuterClass.Segment parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (Tango.PMR.Jobs.SegmentOuterClass.Segment) e.getUnfinishedMessage(); + parsedMessage = (com.twine.tango.pmr.jobs.SegmentOuterClass.Segment) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -628,9 +628,9 @@ public final class SegmentOuterClass { return this; } - private Tango.PMR.Common.RGBOuterClass.RGB color_ = null; + private com.twine.tango.pmr.common.RGBOuterClass.RGB color_ = null; private com.google.protobuf.SingleFieldBuilderV3< - Tango.PMR.Common.RGBOuterClass.RGB, Tango.PMR.Common.RGBOuterClass.RGB.Builder, Tango.PMR.Common.RGBOuterClass.RGBOrBuilder> colorBuilder_; + com.twine.tango.pmr.common.RGBOuterClass.RGB, com.twine.tango.pmr.common.RGBOuterClass.RGB.Builder, com.twine.tango.pmr.common.RGBOuterClass.RGBOrBuilder> colorBuilder_; /** * <code>.Tango.PMR.Common.RGB Color = 3;</code> */ @@ -640,9 +640,9 @@ public final class SegmentOuterClass { /** * <code>.Tango.PMR.Common.RGB Color = 3;</code> */ - public Tango.PMR.Common.RGBOuterClass.RGB getColor() { + public com.twine.tango.pmr.common.RGBOuterClass.RGB getColor() { if (colorBuilder_ == null) { - return color_ == null ? Tango.PMR.Common.RGBOuterClass.RGB.getDefaultInstance() : color_; + return color_ == null ? com.twine.tango.pmr.common.RGBOuterClass.RGB.getDefaultInstance() : color_; } else { return colorBuilder_.getMessage(); } @@ -650,7 +650,7 @@ public final class SegmentOuterClass { /** * <code>.Tango.PMR.Common.RGB Color = 3;</code> */ - public Builder setColor(Tango.PMR.Common.RGBOuterClass.RGB value) { + public Builder setColor(com.twine.tango.pmr.common.RGBOuterClass.RGB value) { if (colorBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -667,7 +667,7 @@ public final class SegmentOuterClass { * <code>.Tango.PMR.Common.RGB Color = 3;</code> */ public Builder setColor( - Tango.PMR.Common.RGBOuterClass.RGB.Builder builderForValue) { + com.twine.tango.pmr.common.RGBOuterClass.RGB.Builder builderForValue) { if (colorBuilder_ == null) { color_ = builderForValue.build(); onChanged(); @@ -680,11 +680,11 @@ public final class SegmentOuterClass { /** * <code>.Tango.PMR.Common.RGB Color = 3;</code> */ - public Builder mergeColor(Tango.PMR.Common.RGBOuterClass.RGB value) { + public Builder mergeColor(com.twine.tango.pmr.common.RGBOuterClass.RGB value) { if (colorBuilder_ == null) { if (color_ != null) { color_ = - Tango.PMR.Common.RGBOuterClass.RGB.newBuilder(color_).mergeFrom(value).buildPartial(); + com.twine.tango.pmr.common.RGBOuterClass.RGB.newBuilder(color_).mergeFrom(value).buildPartial(); } else { color_ = value; } @@ -712,7 +712,7 @@ public final class SegmentOuterClass { /** * <code>.Tango.PMR.Common.RGB Color = 3;</code> */ - public Tango.PMR.Common.RGBOuterClass.RGB.Builder getColorBuilder() { + public com.twine.tango.pmr.common.RGBOuterClass.RGB.Builder getColorBuilder() { onChanged(); return getColorFieldBuilder().getBuilder(); @@ -720,23 +720,23 @@ public final class SegmentOuterClass { /** * <code>.Tango.PMR.Common.RGB Color = 3;</code> */ - public Tango.PMR.Common.RGBOuterClass.RGBOrBuilder getColorOrBuilder() { + public com.twine.tango.pmr.common.RGBOuterClass.RGBOrBuilder getColorOrBuilder() { if (colorBuilder_ != null) { return colorBuilder_.getMessageOrBuilder(); } else { return color_ == null ? - Tango.PMR.Common.RGBOuterClass.RGB.getDefaultInstance() : color_; + com.twine.tango.pmr.common.RGBOuterClass.RGB.getDefaultInstance() : color_; } } /** * <code>.Tango.PMR.Common.RGB Color = 3;</code> */ private com.google.protobuf.SingleFieldBuilderV3< - Tango.PMR.Common.RGBOuterClass.RGB, Tango.PMR.Common.RGBOuterClass.RGB.Builder, Tango.PMR.Common.RGBOuterClass.RGBOrBuilder> + com.twine.tango.pmr.common.RGBOuterClass.RGB, com.twine.tango.pmr.common.RGBOuterClass.RGB.Builder, com.twine.tango.pmr.common.RGBOuterClass.RGBOrBuilder> getColorFieldBuilder() { if (colorBuilder_ == null) { colorBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - Tango.PMR.Common.RGBOuterClass.RGB, Tango.PMR.Common.RGBOuterClass.RGB.Builder, Tango.PMR.Common.RGBOuterClass.RGBOrBuilder>( + com.twine.tango.pmr.common.RGBOuterClass.RGB, com.twine.tango.pmr.common.RGBOuterClass.RGB.Builder, com.twine.tango.pmr.common.RGBOuterClass.RGBOrBuilder>( getColor(), getParentForChildren(), isClean()); @@ -759,12 +759,12 @@ public final class SegmentOuterClass { } // @@protoc_insertion_point(class_scope:Tango.PMR.Jobs.Segment) - private static final Tango.PMR.Jobs.SegmentOuterClass.Segment DEFAULT_INSTANCE; + private static final com.twine.tango.pmr.jobs.SegmentOuterClass.Segment DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new Tango.PMR.Jobs.SegmentOuterClass.Segment(); + DEFAULT_INSTANCE = new com.twine.tango.pmr.jobs.SegmentOuterClass.Segment(); } - public static Tango.PMR.Jobs.SegmentOuterClass.Segment getDefaultInstance() { + public static com.twine.tango.pmr.jobs.SegmentOuterClass.Segment getDefaultInstance() { return DEFAULT_INSTANCE; } @@ -787,7 +787,7 @@ public final class SegmentOuterClass { return PARSER; } - public Tango.PMR.Jobs.SegmentOuterClass.Segment getDefaultInstanceForType() { + public com.twine.tango.pmr.jobs.SegmentOuterClass.Segment getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -810,7 +810,7 @@ public final class SegmentOuterClass { "\n\rSegment.proto\022\016Tango.PMR.Jobs\032\tRGB.pro" + "to\"M\n\007Segment\022\014\n\004Name\030\001 \001(\t\022\016\n\006Length\030\002 " + "\001(\005\022$\n\005Color\030\003 \001(\0132\025.Tango.PMR.Common.RG" + - "Bb\006proto3" + "BB\032\n\030com.twine.tango.pmr.jobsb\006proto3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { @@ -823,7 +823,7 @@ public final class SegmentOuterClass { com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { - Tango.PMR.Common.RGBOuterClass.getDescriptor(), + com.twine.tango.pmr.common.RGBOuterClass.getDescriptor(), }, assigner); internal_static_Tango_PMR_Jobs_Segment_descriptor = getDescriptor().getMessageTypes().get(0); @@ -831,7 +831,7 @@ public final class SegmentOuterClass { com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_Tango_PMR_Jobs_Segment_descriptor, new java.lang.String[] { "Name", "Length", "Color", }); - Tango.PMR.Common.RGBOuterClass.getDescriptor(); + com.twine.tango.pmr.common.RGBOuterClass.getDescriptor(); } // @@protoc_insertion_point(outer_class_scope) diff --git a/Software/Android-Studio/app/src/test/java/com/twine/tango/PMR_TST.java b/Software/Android-Studio/app/src/test/java/com/twine/tango/PMR_TST.java index e37996343..78799bc74 100644 --- a/Software/Android-Studio/app/src/test/java/com/twine/tango/PMR_TST.java +++ b/Software/Android-Studio/app/src/test/java/com/twine/tango/PMR_TST.java @@ -2,11 +2,11 @@ package com.twine.tango; import org.junit.Test; -import Tango.PMR.Common.MessageContainerOuterClass.MessageContainer; -import Tango.PMR.Common.MessageTypeOuterClass.MessageType; -import Tango.PMR.Common.RGBOuterClass.RGB; -import Tango.PMR.Jobs.JobOuterClass.Job; -import Tango.PMR.Jobs.SegmentOuterClass.Segment; +import com.twine.tango.pmr.common.MessageContainerOuterClass.MessageContainer; +import com.twine.tango.pmr.common.MessageTypeOuterClass.MessageType; +import com.twine.tango.pmr.common.RGBOuterClass.RGB; +import com.twine.tango.pmr.jobs.JobOuterClass.Job; +import com.twine.tango.pmr.jobs.SegmentOuterClass.Segment; import static org.junit.Assert.assertEquals; diff --git a/Software/PMR/Messages/Common/MessageContainer.proto b/Software/PMR/Messages/Common/MessageContainer.proto index 319f3fd8f..ac76d28dd 100644 --- a/Software/PMR/Messages/Common/MessageContainer.proto +++ b/Software/PMR/Messages/Common/MessageContainer.proto @@ -1,6 +1,7 @@ syntax = "proto3"; package Tango.PMR.Common; +option java_package = "com.twine.tango.pmr.common"; import "MessageType.proto"; diff --git a/Software/PMR/Messages/Common/MessageType.proto b/Software/PMR/Messages/Common/MessageType.proto index a4e84b9b1..f1a284679 100644 --- a/Software/PMR/Messages/Common/MessageType.proto +++ b/Software/PMR/Messages/Common/MessageType.proto @@ -1,6 +1,7 @@ syntax = "proto3"; package Tango.PMR.Common; +option java_package = "com.twine.tango.pmr.common"; enum MessageType { diff --git a/Software/PMR/Messages/Common/RGB.proto b/Software/PMR/Messages/Common/RGB.proto index 827c362c4..aefc6dc0a 100644 --- a/Software/PMR/Messages/Common/RGB.proto +++ b/Software/PMR/Messages/Common/RGB.proto @@ -1,6 +1,7 @@ syntax = "proto3"; package Tango.PMR.Common; +option java_package = "com.twine.tango.pmr.common"; message RGB { diff --git a/Software/PMR/Messages/Jobs/Job.proto b/Software/PMR/Messages/Jobs/Job.proto index 13e5a91aa..29f3b112b 100644 --- a/Software/PMR/Messages/Jobs/Job.proto +++ b/Software/PMR/Messages/Jobs/Job.proto @@ -3,6 +3,7 @@ syntax = "proto3"; import "Segment.proto"; package Tango.PMR.Jobs; +option java_package = "com.twine.tango.pmr.jobs"; message Job { diff --git a/Software/PMR/Messages/Jobs/Segment.proto b/Software/PMR/Messages/Jobs/Segment.proto index 14986170f..1e608aae9 100644 --- a/Software/PMR/Messages/Jobs/Segment.proto +++ b/Software/PMR/Messages/Jobs/Segment.proto @@ -3,6 +3,7 @@ syntax = "proto3"; import "RGB.proto"; package Tango.PMR.Jobs; +option java_package = "com.twine.tango.pmr.jobs"; message Segment diff --git a/Software/Visual Studio/Tango.Core/ExtensionMethods/StringExtensions.cs b/Software/Visual Studio/Tango.Core/ExtensionMethods/StringExtensions.cs index 5baaac72b..049c9c4af 100644 --- a/Software/Visual Studio/Tango.Core/ExtensionMethods/StringExtensions.cs +++ b/Software/Visual Studio/Tango.Core/ExtensionMethods/StringExtensions.cs @@ -15,4 +15,14 @@ public static class StringExtensions { return obj != null ? obj.ToString() : String.Empty; } + + /// <summary> + /// Splits the string to lines. + /// </summary> + /// <param name="str">The string.</param> + /// <returns></returns> + public static List<String> ToLines(this String str) + { + return str.Split(new[] { '\r', '\n' }).ToList(); + } } diff --git a/Software/Visual Studio/Tango.Protobuf/CompilerFileResult.cs b/Software/Visual Studio/Tango.Protobuf/CompilerFileResult.cs index a72ae28e5..244ee3857 100644 --- a/Software/Visual Studio/Tango.Protobuf/CompilerFileResult.cs +++ b/Software/Visual Studio/Tango.Protobuf/CompilerFileResult.cs @@ -35,17 +35,23 @@ namespace Tango.Protobuf public String Content { get; private set; } /// <summary> + /// Gets or sets the relative file path. + /// </summary> + internal String RelativePath { get; private set; } + + /// <summary> /// Initializes a new instance of the <see cref="CompilerFileResult"/> class. /// </summary> /// <param name="language">The language.</param> /// <param name="sourcePath">The source path.</param> /// <param name="fileName">Name of the file.</param> /// <param name="content">File contents.</param> - public CompilerFileResult(CompilerLanguage language, String sourcePath, String fileName, String content) + public CompilerFileResult(CompilerLanguage language, String sourcePath, String fileName, String relativePath, String content) { Language = language; SourcePath = sourcePath; Name = fileName; + RelativePath = relativePath; Content = content; } diff --git a/Software/Visual Studio/Tango.Protobuf/Compilers/JavaCompiler.cs b/Software/Visual Studio/Tango.Protobuf/Compilers/JavaCompiler.cs index 78d754aa5..55f0cf77f 100644 --- a/Software/Visual Studio/Tango.Protobuf/Compilers/JavaCompiler.cs +++ b/Software/Visual Studio/Tango.Protobuf/Compilers/JavaCompiler.cs @@ -1,8 +1,11 @@ using System; using System.Collections.Generic; +using System.IO; using System.Linq; using System.Text; using System.Threading.Tasks; +using Tango.Core.Helpers; +using Tango.Logging; namespace Tango.Protobuf.Compilers { @@ -25,5 +28,10 @@ namespace Tango.Protobuf.Compilers { return "--java_out"; } + + /// <summary> + /// Gets a value indicating whether this compiler uses the default folder structure when generating code. + /// </summary> + public override bool UsesDefaultStructure => true; } } diff --git a/Software/Visual Studio/Tango.Protobuf/IProtoCompiler.cs b/Software/Visual Studio/Tango.Protobuf/IProtoCompiler.cs index ede2f79fb..db5303515 100644 --- a/Software/Visual Studio/Tango.Protobuf/IProtoCompiler.cs +++ b/Software/Visual Studio/Tango.Protobuf/IProtoCompiler.cs @@ -48,5 +48,10 @@ namespace Tango.Protobuf /// Gets the proto imports folders. /// </summary> List<String> ImportsFolders { get; } + + /// <summary> + /// Gets a value indicating whether this compiler uses the default folder structure when generating code. + /// </summary> + bool UsesDefaultStructure { get; } } } diff --git a/Software/Visual Studio/Tango.Protobuf/ProtoCompiler.cs b/Software/Visual Studio/Tango.Protobuf/ProtoCompiler.cs index c48ec6a70..3501dfe76 100644 --- a/Software/Visual Studio/Tango.Protobuf/ProtoCompiler.cs +++ b/Software/Visual Studio/Tango.Protobuf/ProtoCompiler.cs @@ -20,6 +20,7 @@ namespace Tango.Protobuf { private const String COMPILERS_FOLDER_NAME = "ProtoCompilers"; //Compilers folder name. protected String _compilersPath; //Compilers folder path. + private Dictionary<String, CompilerFileResult> _lastResults; /// <summary> /// Gets the compiler language. @@ -32,6 +33,11 @@ namespace Tango.Protobuf public List<String> ImportsFolders { get; private set; } /// <summary> + /// Gets a value indicating whether this compiler uses the default folder structure when generating code. + /// </summary> + public virtual bool UsesDefaultStructure { get; } + + /// <summary> /// Initializes a new instance of the <see cref="ProtoCompiler"/> class. /// </summary> public ProtoCompiler() @@ -113,7 +119,7 @@ namespace Tango.Protobuf foreach (var file in Directory.GetFiles(tmpPath, "*.*", SearchOption.AllDirectories)) { - CompilerFileResult result = new CompilerFileResult(Language, inputFile, Path.GetFileName(file), File.ReadAllText(file)); + CompilerFileResult result = new CompilerFileResult(Language, inputFile, Path.GetFileName(file), Path.GetDirectoryName(file).Replace(tmpPath, "").TrimStart('\\','\\'), File.ReadAllText(file)); results.Add(result); } @@ -153,15 +159,22 @@ namespace Tango.Protobuf /// </returns> public virtual CompilerFolderResult CompileFolder(string sourceFolder) { - LogManager.Log("Compiling folder: " + sourceFolder); + if (!UsesDefaultStructure) + { + LogManager.Log("Compiling folder: " + sourceFolder); - ImportsFolders.Clear(); - ImportsFolders.AddRange(Directory.GetDirectories(sourceFolder, "*.*", SearchOption.AllDirectories)); - var result = CompileFolder(sourceFolder, sourceFolder); + ImportsFolders.Clear(); + ImportsFolders.AddRange(Directory.GetDirectories(sourceFolder, "*.*", SearchOption.AllDirectories)); + var result = CompileFolder(sourceFolder, sourceFolder); - LogManager.Log(Path.GetFileName(sourceFolder) + "compiled!"); + LogManager.Log(Path.GetFileName(sourceFolder) + "compiled!"); - return result; + return OnPostProcessFolderCompilation(result); + } + else + { + return CompileFolderDefault(sourceFolder); + } } /// <summary> @@ -171,7 +184,7 @@ namespace Tango.Protobuf /// <returns> /// Compilation result. /// </returns> - private CompilerFolderResult CompileFolder(string rootFolder, string sourceFolder) + protected virtual CompilerFolderResult CompileFolder(string rootFolder, string sourceFolder) { List<ICompilerResult> currentFolderResults = new List<ICompilerResult>(); CompilerFolderResult currentFolder = new CompilerFolderResult(currentFolderResults, Language, sourceFolder, sourceFolder.Replace(rootFolder, "")); @@ -204,6 +217,80 @@ namespace Tango.Protobuf } /// <summary> + /// Compiles all files in the specified folder recursively using the default structure. + /// </summary> + /// <param name="sourceFolder">The source folder</param> + /// <returns> + /// Compilation result. + /// </returns> + private CompilerFolderResult CompileFolderDefault(string sourceFolder) + { + LogManager.Log("Compiling folder: " + sourceFolder); + + _lastResults = new Dictionary<string, CompilerFileResult>(); + ImportsFolders.Clear(); + ImportsFolders.AddRange(Directory.GetDirectories(sourceFolder, "*.*", SearchOption.AllDirectories)); + + String tempPath = PathHelper.GetTempFolderPath(); + + foreach (var file in Directory.GetFiles(sourceFolder, "*.proto", SearchOption.AllDirectories)) + { + foreach (var fileResult in CompileFile(file)) + { + String targetFolder = Path.Combine(tempPath, fileResult.RelativePath); + String targetFile = Path.Combine(targetFolder, fileResult.Name); + Directory.CreateDirectory(targetFolder); + File.WriteAllText(targetFile, fileResult.Content); + + _lastResults.Add(targetFile, fileResult); + } + } + + var result = CompileFolderDefault(tempPath, tempPath); + + PathHelper.TryDeleteFolder(tempPath); + + LogManager.Log(Path.GetFileName(sourceFolder) + "compiled!"); + + return OnPostProcessFolderCompilation(result); + } + + /// <summary> + /// Compiles all files in the specified folder recursively using the default structure. + /// </summary> + /// <param name="rootFolder"></param> + /// <param name="sourceFolder">The source folder</param> + /// <returns> + /// Compilation result. + /// </returns> + private CompilerFolderResult CompileFolderDefault(string rootFolder, string sourceFolder) + { + List<ICompilerResult> currentFolderResults = new List<ICompilerResult>(); + CompilerFolderResult currentFolder = new CompilerFolderResult(currentFolderResults, Language, sourceFolder, Path.GetFileName(sourceFolder)); + + foreach (String file in Directory.GetFiles(sourceFolder, "*.*")) + { + currentFolderResults.Add(_lastResults[file]); + } + foreach (string folder in Directory.GetDirectories(sourceFolder)) + { + currentFolderResults.Add(CompileFolderDefault(rootFolder, folder)); + } + + return currentFolder; + } + + /// <summary> + /// Override in order to manipulate the folder compilation result. + /// </summary> + /// <param name="result">The result.</param> + /// <returns></returns> + protected virtual CompilerFolderResult OnPostProcessFolderCompilation(CompilerFolderResult result) + { + return result; + } + + /// <summary> /// Gets the protobuf compiler CLI arguments (without input/output files!). /// </summary> /// <returns></returns> |