azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor, rename protobuf field according to style guide

Browse Source
This commit is contained in:
Alexander Udalov
2016-06-27 20:18:57 +03:00
parent 4c8e8b099a
commit 601dc96a34
4 changed files with 152 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.serializer/src/js.proto
+1 -1
View File
@@ -74,5 +74,5 @@ message Library {
repeated FileEntry entry = 1;
optional Kind kind = 2 [default = PLAIN];
repeated string importedModules = 3;
repeated string imported_module = 3;
}
js/js.serializer/src/org/jetbrains/kotlin/serialization/js/JsProtoBuf.java
+73 -73
View File
@@ -533,23 +533,23 @@ public final class JsProtoBuf {
org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library.Kind getKind();
/**
* <code>repeated string importedModules = 3;</code>
* <code>repeated string imported_module = 3;</code>
*/
org.jetbrains.kotlin.protobuf.ProtocolStringList
getImportedModulesList();
getImportedModuleList();
/**
* <code>repeated string importedModules = 3;</code>
* <code>repeated string imported_module = 3;</code>
*/
int getImportedModulesCount();
int getImportedModuleCount();
/**
* <code>repeated string importedModules = 3;</code>
* <code>repeated string imported_module = 3;</code>
*/
java.lang.String getImportedModules(int index);
java.lang.String getImportedModule(int index);
/**
* <code>repeated string importedModules = 3;</code>
* <code>repeated string imported_module = 3;</code>
*/
org.jetbrains.kotlin.protobuf.ByteString
getImportedModulesBytes(int index);
getImportedModuleBytes(int index);
}
/**
* Protobuf type {@code org.jetbrains.kotlin.serialization.js.Library}
@@ -624,10 +624,10 @@ public final class JsProtoBuf {
case 26: {
org.jetbrains.kotlin.protobuf.ByteString bs = input.readBytes();
if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
importedModules_ = new org.jetbrains.kotlin.protobuf.LazyStringArrayList();
importedModule_ = new org.jetbrains.kotlin.protobuf.LazyStringArrayList();
mutable_bitField0_ |= 0x00000004;
}
importedModules_.add(bs);
importedModule_.add(bs);
break;
}
}
@@ -642,7 +642,7 @@ public final class JsProtoBuf {
entry_ = java.util.Collections.unmodifiableList(entry_);
}
if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
importedModules_ = importedModules_.getUnmodifiableView();
importedModule_ = importedModule_.getUnmodifiableView();
}
try {
unknownFieldsCodedOutput.flush();
@@ -1322,39 +1322,39 @@ public final class JsProtoBuf {
return kind_;
}
public static final int IMPORTEDMODULES_FIELD_NUMBER = 3;
private org.jetbrains.kotlin.protobuf.LazyStringList importedModules_;
public static final int IMPORTED_MODULE_FIELD_NUMBER = 3;
private org.jetbrains.kotlin.protobuf.LazyStringList importedModule_;
/**
* <code>repeated string importedModules = 3;</code>
* <code>repeated string imported_module = 3;</code>
*/
public org.jetbrains.kotlin.protobuf.ProtocolStringList
getImportedModulesList() {
return importedModules_;
getImportedModuleList() {
return importedModule_;
}
/**
* <code>repeated string importedModules = 3;</code>
* <code>repeated string imported_module = 3;</code>
*/
public int getImportedModulesCount() {
return importedModules_.size();
public int getImportedModuleCount() {
return importedModule_.size();
}
/**
* <code>repeated string importedModules = 3;</code>
* <code>repeated string imported_module = 3;</code>
*/
public java.lang.String getImportedModules(int index) {
return importedModules_.get(index);
public java.lang.String getImportedModule(int index) {
return importedModule_.get(index);
}
/**
* <code>repeated string importedModules = 3;</code>
* <code>repeated string imported_module = 3;</code>
*/
public org.jetbrains.kotlin.protobuf.ByteString
getImportedModulesBytes(int index) {
return importedModules_.getByteString(index);
getImportedModuleBytes(int index) {
return importedModule_.getByteString(index);
}
private void initFields() {
entry_ = java.util.Collections.emptyList();
kind_ = org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library.Kind.PLAIN;
importedModules_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
importedModule_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
}
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
@@ -1381,8 +1381,8 @@ public final class JsProtoBuf {
if (((bitField0_ & 0x00000001) == 0x00000001)) {
output.writeEnum(2, kind_.getNumber());
}
for (int i = 0; i < importedModules_.size(); i++) {
output.writeBytes(3, importedModules_.getByteString(i));
for (int i = 0; i < importedModule_.size(); i++) {
output.writeBytes(3, importedModule_.getByteString(i));
}
output.writeRawBytes(unknownFields);
}
@@ -1403,12 +1403,12 @@ public final class JsProtoBuf {
}
{
int dataSize = 0;
for (int i = 0; i < importedModules_.size(); i++) {
for (int i = 0; i < importedModule_.size(); i++) {
dataSize += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeBytesSizeNoTag(importedModules_.getByteString(i));
.computeBytesSizeNoTag(importedModule_.getByteString(i));
}
size += dataSize;
size += 1 * getImportedModulesList().size();
size += 1 * getImportedModuleList().size();
}
size += unknownFields.size();
memoizedSerializedSize = size;
@@ -1508,7 +1508,7 @@ public final class JsProtoBuf {
bitField0_ = (bitField0_ & ~0x00000001);
kind_ = org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library.Kind.PLAIN;
bitField0_ = (bitField0_ & ~0x00000002);
importedModules_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
importedModule_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
bitField0_ = (bitField0_ & ~0x00000004);
return this;
}
@@ -1543,10 +1543,10 @@ public final class JsProtoBuf {
}
result.kind_ = kind_;
if (((bitField0_ & 0x00000004) == 0x00000004)) {
importedModules_ = importedModules_.getUnmodifiableView();
importedModule_ = importedModule_.getUnmodifiableView();
bitField0_ = (bitField0_ & ~0x00000004);
}
result.importedModules_ = importedModules_;
result.importedModule_ = importedModule_;
result.bitField0_ = to_bitField0_;
return result;
}
@@ -1566,13 +1566,13 @@ public final class JsProtoBuf {
if (other.hasKind()) {
setKind(other.getKind());
}
if (!other.importedModules_.isEmpty()) {
if (importedModules_.isEmpty()) {
importedModules_ = other.importedModules_;
if (!other.importedModule_.isEmpty()) {
if (importedModule_.isEmpty()) {
importedModule_ = other.importedModule_;
bitField0_ = (bitField0_ & ~0x00000004);
} else {
ensureImportedModulesIsMutable();
importedModules_.addAll(other.importedModules_);
ensureImportedModuleIsMutable();
importedModule_.addAll(other.importedModule_);
}
}
@@ -1770,95 +1770,95 @@ public final class JsProtoBuf {
return this;
}
private org.jetbrains.kotlin.protobuf.LazyStringList importedModules_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
private void ensureImportedModulesIsMutable() {
private org.jetbrains.kotlin.protobuf.LazyStringList importedModule_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
private void ensureImportedModuleIsMutable() {
if (!((bitField0_ & 0x00000004) == 0x00000004)) {
importedModules_ = new org.jetbrains.kotlin.protobuf.LazyStringArrayList(importedModules_);
importedModule_ = new org.jetbrains.kotlin.protobuf.LazyStringArrayList(importedModule_);
bitField0_ |= 0x00000004;
}
}
/**
* <code>repeated string importedModules = 3;</code>
* <code>repeated string imported_module = 3;</code>
*/
public org.jetbrains.kotlin.protobuf.ProtocolStringList
getImportedModulesList() {
return importedModules_.getUnmodifiableView();
getImportedModuleList() {
return importedModule_.getUnmodifiableView();
}
/**
* <code>repeated string importedModules = 3;</code>
* <code>repeated string imported_module = 3;</code>
*/
public int getImportedModulesCount() {
return importedModules_.size();
public int getImportedModuleCount() {
return importedModule_.size();
}
/**
* <code>repeated string importedModules = 3;</code>
* <code>repeated string imported_module = 3;</code>
*/
public java.lang.String getImportedModules(int index) {
return importedModules_.get(index);
public java.lang.String getImportedModule(int index) {
return importedModule_.get(index);
}
/**
* <code>repeated string importedModules = 3;</code>
* <code>repeated string imported_module = 3;</code>
*/
public org.jetbrains.kotlin.protobuf.ByteString
getImportedModulesBytes(int index) {
return importedModules_.getByteString(index);
getImportedModuleBytes(int index) {
return importedModule_.getByteString(index);
}
/**
* <code>repeated string importedModules = 3;</code>
* <code>repeated string imported_module = 3;</code>
*/
public Builder setImportedModules(
public Builder setImportedModule(
int index, java.lang.String value) {
if (value == null) {
throw new NullPointerException();
}
ensureImportedModulesIsMutable();
importedModules_.set(index, value);
ensureImportedModuleIsMutable();
importedModule_.set(index, value);
return this;
}
/**
* <code>repeated string importedModules = 3;</code>
* <code>repeated string imported_module = 3;</code>
*/
public Builder addImportedModules(
public Builder addImportedModule(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
}
ensureImportedModulesIsMutable();
importedModules_.add(value);
ensureImportedModuleIsMutable();
importedModule_.add(value);
return this;
}
/**
* <code>repeated string importedModules = 3;</code>
* <code>repeated string imported_module = 3;</code>
*/
public Builder addAllImportedModules(
public Builder addAllImportedModule(
java.lang.Iterable<java.lang.String> values) {
ensureImportedModulesIsMutable();
ensureImportedModuleIsMutable();
org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
values, importedModules_);
values, importedModule_);
return this;
}
/**
* <code>repeated string importedModules = 3;</code>
* <code>repeated string imported_module = 3;</code>
*/
public Builder clearImportedModules() {
importedModules_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
public Builder clearImportedModule() {
importedModule_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
bitField0_ = (bitField0_ & ~0x00000004);
return this;
}
/**
* <code>repeated string importedModules = 3;</code>
* <code>repeated string imported_module = 3;</code>
*/
public Builder addImportedModulesBytes(
public Builder addImportedModuleBytes(
org.jetbrains.kotlin.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
}
ensureImportedModulesIsMutable();
importedModules_.add(value);
ensureImportedModuleIsMutable();
importedModule_.add(value);
return this;
}
js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializationUtil.kt
+3 -3
View File
@@ -95,7 +95,7 @@ object KotlinJavascriptSerializationUtil {
ModuleKind.UMD -> JsProtoBuf.Library.Kind.UMD
}
importedModules.forEach { contentBuilder.addImportedModules(it) }
importedModules.forEach { contentBuilder.addImportedModule(it) }
contentMap.forEach {
val entry = JsProtoBuf.Library.FileEntry.newBuilder().setPath(it.key).setContent(ByteString.copyFrom(it.value)).build()
@@ -251,6 +251,6 @@ private fun ByteArray.readAsContentMap(name: String): JsModuleDescriptor<Map<Str
JsProtoBuf.Library.Kind.COMMON_JS -> ModuleKind.COMMON_JS
JsProtoBuf.Library.Kind.UMD -> ModuleKind.UMD
},
imported = content.importedModulesList
imported = content.importedModuleList
)
}
}