diff options
Diffstat (limited to 'platform/script-debugger/protocol/protocol-reader/src')
5 files changed, 14 insertions, 15 deletions
diff --git a/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/FieldProcessor.java b/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/FieldProcessor.java index eabc8d8e4337..111e58caa3a6 100644 --- a/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/FieldProcessor.java +++ b/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/FieldProcessor.java @@ -1,6 +1,9 @@ package org.jetbrains.protocolReader; -import org.chromium.protocolReader.*; +import org.jetbrains.jsonProtocol.JsonField; +import org.jetbrains.jsonProtocol.JsonNullable; +import org.jetbrains.jsonProtocol.JsonOptionalField; +import org.jetbrains.jsonProtocol.JsonSubtypeCasting; import java.lang.reflect.Method; import java.lang.reflect.Type; diff --git a/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/InterfaceReader.java b/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/InterfaceReader.java index f80b8c54bb42..cc4e2566f4dd 100644 --- a/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/InterfaceReader.java +++ b/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/InterfaceReader.java @@ -1,10 +1,10 @@ package org.jetbrains.protocolReader; import gnu.trove.THashSet; -import org.chromium.protocolReader.JsonField; -import org.chromium.protocolReader.JsonSubtype; import org.jetbrains.annotations.Nullable; import org.jetbrains.io.JsonReaderEx; +import org.jetbrains.jsonProtocol.JsonField; +import org.jetbrains.jsonProtocol.JsonSubtype; import org.jetbrains.jsonProtocol.StringIntPair; import java.lang.annotation.RetentionPolicy; @@ -249,7 +249,7 @@ class InterfaceReader { argumentType = wildcard.getUpperBounds()[0]; } } - return new ArrayReader(getFieldTypeParser(argumentType, false, false, null), true, declaredNullable); + return new ArrayReader(getFieldTypeParser(argumentType, false, false, method), true, declaredNullable); } else if (parameterizedType.getRawType() == Map.class) { return declaredNullable ? NULLABLE_MAP_PARSER : MAP_PARSER; diff --git a/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/ReaderRoot.java b/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/ReaderRoot.java index a76971dc5da7..7914a5103ac6 100644 --- a/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/ReaderRoot.java +++ b/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/ReaderRoot.java @@ -2,7 +2,7 @@ package org.jetbrains.protocolReader; import org.jetbrains.io.JsonReaderEx; import gnu.trove.THashSet; -import org.chromium.protocolReader.JsonParseMethod; +import org.jetbrains.jsonProtocol.JsonParseMethod; import java.lang.reflect.Method; import java.lang.reflect.ParameterizedType; diff --git a/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/TextOutput.java b/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/TextOutput.java index cd5afa1c27ff..77d4bd1e275f 100644 --- a/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/TextOutput.java +++ b/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/TextOutput.java @@ -9,7 +9,7 @@ public class TextOutput { private int identLevel; private final static int indentGranularity = 2; private char[][] indents = {EMPTY_CHARS}; - private boolean justNewlined; + private boolean justNewLined; private final StringBuilder out; public TextOutput(StringBuilder out) { @@ -41,7 +41,7 @@ public class TextOutput { public TextOutput newLine() { out.append('\n'); - justNewlined = true; + justNewLined = true; return this; } @@ -122,14 +122,14 @@ public class TextOutput { return append("/**").newLine().append(" * ").append(description).newLine().append(" */").newLine(); } - public TextOutput quoute(CharSequence s) { + public TextOutput quote(CharSequence s) { return append('"').append(s).append('"'); } public void maybeIndent() { - if (justNewlined) { + if (justNewLined) { out.append(indents[identLevel]); - justNewlined = false; + justNewLined = false; } } } diff --git a/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/ValueReader.java b/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/ValueReader.java index 7ef6b3e0fc82..442167687b40 100644 --- a/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/ValueReader.java +++ b/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/ValueReader.java @@ -1,7 +1,3 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - package org.jetbrains.protocolReader; import org.jetbrains.annotations.Nullable; @@ -51,7 +47,7 @@ abstract class ValueReader { out.append("name"); } else { - out.quoute(fieldName); + out.quote(fieldName); } } } |