diff --git a/.idea/libraries/JPS_facade.xml b/.idea/libraries/JPS_facade.xml deleted file mode 100644 index 1bdcedaa7c74..000000000000 --- a/.idea/libraries/JPS_facade.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index 3f3ac6ad570c..cf671d6decff 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -12,6 +12,7 @@ + @@ -56,6 +57,9 @@ + + + diff --git a/build/scripts/layouts.gant b/build/scripts/layouts.gant index 7d8d4c74b2d7..afa7acd9f79d 100644 --- a/build/scripts/layouts.gant +++ b/build/scripts/layouts.gant @@ -149,10 +149,6 @@ def layoutFull(String home, String targetDirectory, String patchedDescriptorDir module("notNull") } - jar("compile-server.jar") { - module("compile-server") - } - fileset(dir: "$home/lib", includesfile: "${home}/lib/required_for_dist.txt") fileset(dir: "$home/lib/src") { diff --git a/java/compiler/compile-server/compile-server.iml b/java/compiler/compile-server/compile-server.iml deleted file mode 100644 index abe9c08a3d30..000000000000 --- a/java/compiler/compile-server/compile-server.iml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/java/compiler/compile-server/src/org/jetbrains/jpsservice/Bootstrap.java b/java/compiler/compile-server/src/org/jetbrains/jpsservice/Bootstrap.java deleted file mode 100644 index 528acbe32e3e..000000000000 --- a/java/compiler/compile-server/src/org/jetbrains/jpsservice/Bootstrap.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright 2000-2011 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jetbrains.jpsservice; - -import com.intellij.openapi.application.PathManager; - -import java.io.File; -import java.util.ArrayList; -import java.util.List; - -/** - * @author Eugene Zhuravlev - * Date: 9/12/11 - */ -public class Bootstrap { - - public static final String JPS_RUNTIME_PATH = "rt/jps-incremental"; - - public static List getApplicationClasspath() { - final List cp = new ArrayList(); - cp.add(getResourcePath(Server.class)); - cp.add(getResourcePath(com.google.protobuf.Message.class)); // protobuf - cp.add(getResourcePath(org.jboss.netty.bootstrap.Bootstrap.class)); // netty - cp.addAll(org.jetbrains.jps.server.Bootstrap.getApplicationClasspath()); // jps incremental builders and dependencies - - //final File jpsRuntime = new File(jpsFacadeJar.getParentFile(), JPS_RUNTIME_PATH); - //final File[] files = jpsRuntime.listFiles(); - //if (files != null) { - // for (File file : files) { - // final String name = file.getName(); - // final boolean shouldAdd = - // name.endsWith("jar") && - // (name.startsWith("ant") || - // name.startsWith("jps") || - // name.startsWith("asm") || - // name.startsWith("gant")|| - // name.startsWith("groovy") || - // name.startsWith("javac2") || - // name.startsWith("util") || - // name.startsWith("trove") - // ); - // if (shouldAdd) { - // cp.add(file); - // } - // } - //} - return cp; - } - - private static File getResourcePath(Class aClass) { - return new File(PathManager.getResourceRoot(aClass, "/" + aClass.getName().replace('.', '/') + ".class")); - } - -} diff --git a/java/compiler/impl/compiler-impl.iml b/java/compiler/impl/compiler-impl.iml index c369c21ca760..f517eff750db 100644 --- a/java/compiler/impl/compiler-impl.iml +++ b/java/compiler/impl/compiler-impl.iml @@ -22,7 +22,7 @@ - + diff --git a/java/compiler/impl/src/com/intellij/compiler/JpsServerManager.java b/java/compiler/impl/src/com/intellij/compiler/JpsServerManager.java index eec7fd18a247..db4d66f5e5b9 100644 --- a/java/compiler/impl/src/com/intellij/compiler/JpsServerManager.java +++ b/java/compiler/impl/src/com/intellij/compiler/JpsServerManager.java @@ -19,6 +19,8 @@ import com.intellij.ProjectTopics; import com.intellij.execution.ExecutionException; import com.intellij.execution.configurations.GeneralCommandLine; import com.intellij.execution.process.OSProcessHandler; +import com.intellij.execution.process.ProcessAdapter; +import com.intellij.execution.process.ProcessEvent; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.PathMacros; import com.intellij.openapi.application.PathManager; @@ -36,6 +38,7 @@ import com.intellij.openapi.roots.ModuleRootListener; import com.intellij.openapi.roots.OrderRootType; import com.intellij.openapi.roots.libraries.Library; import com.intellij.openapi.roots.libraries.LibraryTablesRegistrar; +import com.intellij.openapi.util.Key; import com.intellij.openapi.util.ShutDownTracker; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; @@ -45,10 +48,10 @@ import com.intellij.util.messages.MessageBusConnection; import com.intellij.util.net.NetUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jps.server.GlobalLibrary; -import org.jetbrains.jps.server.SdkLibrary; -import org.jetbrains.jpsservice.Bootstrap; -import org.jetbrains.jpsservice.Client; +import org.jetbrains.jps.api.GlobalLibrary; +import org.jetbrains.jps.api.SdkLibrary; +import org.jetbrains.jps.client.Client; +import org.jetbrains.jps.server.ClasspathBootstrap; import java.io.File; import java.util.*; @@ -102,46 +105,77 @@ public class JpsServerManager implements ApplicationComponent{ return "com.intellij.compiler.JpsServerManager"; } - private volatile boolean myStartupFailed = false; - private boolean ensureServerStarted() { if (myProcessHandler != null) { return true; } - if (!myStartupFailed) { - try { - final int port = NetUtils.findAvailableSocketPort(); - final Process process = launchServer(port); - final OSProcessHandler processHandler = new OSProcessHandler(process, null); - processHandler.startNotify(); - myServerClient = new Client(); - - if (myServerClient.connect(NetUtils.getLocalHostString(), port)) { - - final PathMacros pathVars = PathMacros.getInstance(); - final Map data = new HashMap(); - for (String name : pathVars.getAllMacroNames()) { - final String path = pathVars.getValue(name); - if (path != null) { - data.put(name, FileUtil.toSystemIndependentName(path)); - } + try { + final int port = NetUtils.findAvailableSocketPort(); + final Process process = launchServer(port); + final OSProcessHandler processHandler = new OSProcessHandler(process, null); + processHandler.addProcessListener(new ProcessAdapter() { + public void startNotified(ProcessEvent event) { + final boolean connected = createClient(port); + if (!connected) { + shutdownServer(myServerClient, processHandler); + } + else { + myProcessHandler = processHandler; } - - final List globals = new ArrayList(); - - fillSdks(globals); - fillGlobalLibraries(globals); - - myServerClient.sendSetupRequest(data, globals); } - myProcessHandler = processHandler; + public void processTerminated(ProcessEvent event) { + myProcessHandler = null; + myServerClient = null; + } + + public void processWillTerminate(ProcessEvent event, boolean willBeDestroyed) { + final Client client = myServerClient; + if (client != null) { + client.disconnect(); + } + } + + public void onTextAvailable(ProcessEvent event, Key outputType) { + System.out.println(event.getText()); + LOG.info(event.getText()); + } + }); + processHandler.startNotify(); + + return true; + } + catch (Throwable e) { + LOG.error(e); // todo + } + return false; + } + + private boolean createClient(int port) { + final Client client = new Client(); + try { + if (client.connect(NetUtils.getLocalHostString(), port)) { + final PathMacros pathVars = PathMacros.getInstance(); + final Map data = new HashMap(); + for (String name : pathVars.getAllMacroNames()) { + final String path = pathVars.getValue(name); + if (path != null) { + data.put(name, FileUtil.toSystemIndependentName(path)); + } + } + + final List globals = new ArrayList(); + + fillSdks(globals); + fillGlobalLibraries(globals); + + client.sendSetupRequest(data, globals); + myServerClient = client; return true; } - catch (Throwable e) { - myStartupFailed = true; - LOG.error(e); // todo - } + } + catch (Throwable e) { + LOG.error(e); } return false; } @@ -185,14 +219,14 @@ public class JpsServerManager implements ApplicationComponent{ final Sdk projectJdk = JavaAwareProjectJdkTableImpl.getInstanceEx().getInternalJdk(); final GeneralCommandLine cmdLine = new GeneralCommandLine(); cmdLine.setExePath(((JavaSdkType)projectJdk.getSdkType()).getVMExecutablePath(projectJdk)); - //cmdLine.addParameter("-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5007"); + cmdLine.addParameter("-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5008"); cmdLine.addParameter("-Xmx256m"); cmdLine.addParameter("-classpath"); - final List cp = Bootstrap.getApplicationClasspath(); + final List cp = ClasspathBootstrap.getApplicationClasspath(); cmdLine.addParameter(classpathToString(cp)); - cmdLine.addParameter("org.jetbrains.jpsservice.Server"); + cmdLine.addParameter("org.jetbrains.jps.server.Server"); cmdLine.addParameter(Integer.toString(port)); final File workDirectory = new File(PathManager.getSystemPath(), COMPILE_SERVER_SYSTEM_ROOT); diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java b/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java index ff498df14b60..9ad0c3a796bf 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java @@ -86,9 +86,9 @@ import gnu.trove.TObjectHashingStrategy; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jpsservice.Client; -import org.jetbrains.jpsservice.JpsRemoteProto; -import org.jetbrains.jpsservice.JpsServerResponseHandlerAdapter; +import org.jetbrains.jps.api.JpsRemoteProto; +import org.jetbrains.jps.api.JpsServerResponseHandlerAdapter; +import org.jetbrains.jps.client.Client; import java.io.*; import java.util.*; diff --git a/jps/serverFacade/serverFacade.iml b/jps/jps-builders/jps-builders.iml similarity index 87% rename from jps/serverFacade/serverFacade.iml rename to jps/jps-builders/jps-builders.iml index dde7457123ee..35b220c1453c 100644 --- a/jps/serverFacade/serverFacade.iml +++ b/jps/jps-builders/jps-builders.iml @@ -16,6 +16,8 @@ + + diff --git a/java/compiler/compile-server/proto/gen_proto.bat b/jps/jps-builders/proto/gen_proto.bat similarity index 100% rename from java/compiler/compile-server/proto/gen_proto.bat rename to jps/jps-builders/proto/gen_proto.bat diff --git a/java/compiler/compile-server/proto/jps_remote_proto.proto b/jps/jps-builders/proto/jps_remote_proto.proto similarity index 98% rename from java/compiler/compile-server/proto/jps_remote_proto.proto rename to jps/jps-builders/proto/jps_remote_proto.proto index 49127c9e0b3e..f5d676276d31 100644 --- a/java/compiler/compile-server/proto/jps_remote_proto.proto +++ b/jps/jps-builders/proto/jps_remote_proto.proto @@ -1,6 +1,6 @@ package org.jetbrains.jpsservice; -option java_package = "org.jetbrains.jpsservice"; +option java_package = "org.jetbrains.jps.api"; option optimize_for = LITE_RUNTIME; message Message { diff --git a/jps/serverFacade/src/org/jetbrains/jps/server/BuildParameters.java b/jps/jps-builders/src/org/jetbrains/jps/api/BuildParameters.java similarity index 89% rename from jps/serverFacade/src/org/jetbrains/jps/server/BuildParameters.java rename to jps/jps-builders/src/org/jetbrains/jps/api/BuildParameters.java index d3d844a8760a..f25d17fde118 100644 --- a/jps/serverFacade/src/org/jetbrains/jps/server/BuildParameters.java +++ b/jps/jps-builders/src/org/jetbrains/jps/api/BuildParameters.java @@ -1,4 +1,4 @@ -package org.jetbrains.jps.server; +package org.jetbrains.jps.api; /** * @author Eugene Zhuravlev diff --git a/jps/serverFacade/src/org/jetbrains/jps/server/BuildType.java b/jps/jps-builders/src/org/jetbrains/jps/api/BuildType.java similarity index 76% rename from jps/serverFacade/src/org/jetbrains/jps/server/BuildType.java rename to jps/jps-builders/src/org/jetbrains/jps/api/BuildType.java index ab756345b4a7..632c3043e2a8 100644 --- a/jps/serverFacade/src/org/jetbrains/jps/server/BuildType.java +++ b/jps/jps-builders/src/org/jetbrains/jps/api/BuildType.java @@ -1,4 +1,4 @@ -package org.jetbrains.jps.server; +package org.jetbrains.jps.api; /** * @author Eugene Zhuravlev diff --git a/jps/serverFacade/src/org/jetbrains/jps/server/GlobalLibrary.java b/jps/jps-builders/src/org/jetbrains/jps/api/GlobalLibrary.java similarity index 92% rename from jps/serverFacade/src/org/jetbrains/jps/server/GlobalLibrary.java rename to jps/jps-builders/src/org/jetbrains/jps/api/GlobalLibrary.java index fb25f1d704af..5e0157866176 100644 --- a/jps/serverFacade/src/org/jetbrains/jps/server/GlobalLibrary.java +++ b/jps/jps-builders/src/org/jetbrains/jps/api/GlobalLibrary.java @@ -1,4 +1,4 @@ -package org.jetbrains.jps.server; +package org.jetbrains.jps.api; import java.util.List; diff --git a/java/compiler/compile-server/src/org/jetbrains/jpsservice/JpsRemoteProto.java b/jps/jps-builders/src/org/jetbrains/jps/api/JpsRemoteProto.java similarity index 73% rename from java/compiler/compile-server/src/org/jetbrains/jpsservice/JpsRemoteProto.java rename to jps/jps-builders/src/org/jetbrains/jps/api/JpsRemoteProto.java index a59c0dbeaf68..75ac3c09aec5 100644 --- a/java/compiler/compile-server/src/org/jetbrains/jpsservice/JpsRemoteProto.java +++ b/jps/jps-builders/src/org/jetbrains/jps/api/JpsRemoteProto.java @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: jps_remote_proto.proto -package org.jetbrains.jpsservice; +package org.jetbrains.jps.api; public final class JpsRemoteProto { private JpsRemoteProto() {} @@ -134,41 +134,41 @@ public final class JpsRemoteProto { return size; } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.UUID parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.UUID parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data).buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.UUID parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.UUID parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data, extensionRegistry) .buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.UUID parseFrom(byte[] data) + public static org.jetbrains.jps.api.JpsRemoteProto.Message.UUID parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data).buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.UUID parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.UUID parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data, extensionRegistry) .buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.UUID parseFrom(java.io.InputStream input) + public static org.jetbrains.jps.api.JpsRemoteProto.Message.UUID parseFrom(java.io.InputStream input) throws java.io.IOException { return newBuilder().mergeFrom(input).buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.UUID parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.UUID parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return newBuilder().mergeFrom(input, extensionRegistry) .buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.UUID parseDelimitedFrom(java.io.InputStream input) + public static org.jetbrains.jps.api.JpsRemoteProto.Message.UUID parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { Builder builder = newBuilder(); if (builder.mergeDelimitedFrom(input)) { @@ -177,7 +177,7 @@ public final class JpsRemoteProto { return null; } } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.UUID parseDelimitedFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.UUID parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -188,12 +188,12 @@ public final class JpsRemoteProto { return null; } } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.UUID parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.UUID parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return newBuilder().mergeFrom(input).buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.UUID parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.UUID parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -203,26 +203,26 @@ public final class JpsRemoteProto { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.jetbrains.jpsservice.JpsRemoteProto.Message.UUID prototype) { + public static Builder newBuilder(org.jetbrains.jps.api.JpsRemoteProto.Message.UUID prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } public static final class Builder extends com.google.protobuf.GeneratedMessageLite.Builder< - org.jetbrains.jpsservice.JpsRemoteProto.Message.UUID, Builder> { - private org.jetbrains.jpsservice.JpsRemoteProto.Message.UUID result; + org.jetbrains.jps.api.JpsRemoteProto.Message.UUID, Builder> { + private org.jetbrains.jps.api.JpsRemoteProto.Message.UUID result; - // Construct using org.jetbrains.jpsservice.JpsRemoteProto.Message.UUID.newBuilder() + // Construct using org.jetbrains.jps.api.JpsRemoteProto.Message.UUID.newBuilder() private Builder() {} private static Builder create() { Builder builder = new Builder(); - builder.result = new org.jetbrains.jpsservice.JpsRemoteProto.Message.UUID(); + builder.result = new org.jetbrains.jps.api.JpsRemoteProto.Message.UUID(); return builder; } - protected org.jetbrains.jpsservice.JpsRemoteProto.Message.UUID internalGetResult() { + protected org.jetbrains.jps.api.JpsRemoteProto.Message.UUID internalGetResult() { return result; } @@ -231,7 +231,7 @@ public final class JpsRemoteProto { throw new IllegalStateException( "Cannot call clear() after build()."); } - result = new org.jetbrains.jpsservice.JpsRemoteProto.Message.UUID(); + result = new org.jetbrains.jps.api.JpsRemoteProto.Message.UUID(); return this; } @@ -239,21 +239,21 @@ public final class JpsRemoteProto { return create().mergeFrom(result); } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.UUID getDefaultInstanceForType() { - return org.jetbrains.jpsservice.JpsRemoteProto.Message.UUID.getDefaultInstance(); + public org.jetbrains.jps.api.JpsRemoteProto.Message.UUID getDefaultInstanceForType() { + return org.jetbrains.jps.api.JpsRemoteProto.Message.UUID.getDefaultInstance(); } public boolean isInitialized() { return result.isInitialized(); } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.UUID build() { + public org.jetbrains.jps.api.JpsRemoteProto.Message.UUID build() { if (result != null && !isInitialized()) { throw newUninitializedMessageException(result); } return buildPartial(); } - private org.jetbrains.jpsservice.JpsRemoteProto.Message.UUID buildParsed() + private org.jetbrains.jps.api.JpsRemoteProto.Message.UUID buildParsed() throws com.google.protobuf.InvalidProtocolBufferException { if (!isInitialized()) { throw newUninitializedMessageException( @@ -262,18 +262,18 @@ public final class JpsRemoteProto { return buildPartial(); } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.UUID buildPartial() { + public org.jetbrains.jps.api.JpsRemoteProto.Message.UUID buildPartial() { if (result == null) { throw new IllegalStateException( "build() has already been called on this Builder."); } - org.jetbrains.jpsservice.JpsRemoteProto.Message.UUID returnMe = result; + org.jetbrains.jps.api.JpsRemoteProto.Message.UUID returnMe = result; result = null; return returnMe; } - public Builder mergeFrom(org.jetbrains.jpsservice.JpsRemoteProto.Message.UUID other) { - if (other == org.jetbrains.jpsservice.JpsRemoteProto.Message.UUID.getDefaultInstance()) return this; + public Builder mergeFrom(org.jetbrains.jps.api.JpsRemoteProto.Message.UUID other) { + if (other == org.jetbrains.jps.api.JpsRemoteProto.Message.UUID.getDefaultInstance()) return this; if (other.hasMostSigBits()) { setMostSigBits(other.getMostSigBits()); } @@ -352,7 +352,7 @@ public final class JpsRemoteProto { static { defaultInstance = new UUID(true); - org.jetbrains.jpsservice.JpsRemoteProto.internalForceInit(); + org.jetbrains.jps.api.JpsRemoteProto.internalForceInit(); defaultInstance.initFields(); } @@ -439,41 +439,41 @@ public final class JpsRemoteProto { return size; } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Failure parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Failure parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data).buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Failure parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Failure parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data, extensionRegistry) .buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Failure parseFrom(byte[] data) + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Failure parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data).buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Failure parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Failure parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data, extensionRegistry) .buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Failure parseFrom(java.io.InputStream input) + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Failure parseFrom(java.io.InputStream input) throws java.io.IOException { return newBuilder().mergeFrom(input).buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Failure parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Failure parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return newBuilder().mergeFrom(input, extensionRegistry) .buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Failure parseDelimitedFrom(java.io.InputStream input) + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Failure parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { Builder builder = newBuilder(); if (builder.mergeDelimitedFrom(input)) { @@ -482,7 +482,7 @@ public final class JpsRemoteProto { return null; } } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Failure parseDelimitedFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Failure parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -493,12 +493,12 @@ public final class JpsRemoteProto { return null; } } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Failure parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Failure parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return newBuilder().mergeFrom(input).buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Failure parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Failure parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -508,26 +508,26 @@ public final class JpsRemoteProto { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.jetbrains.jpsservice.JpsRemoteProto.Message.Failure prototype) { + public static Builder newBuilder(org.jetbrains.jps.api.JpsRemoteProto.Message.Failure prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } public static final class Builder extends com.google.protobuf.GeneratedMessageLite.Builder< - org.jetbrains.jpsservice.JpsRemoteProto.Message.Failure, Builder> { - private org.jetbrains.jpsservice.JpsRemoteProto.Message.Failure result; + org.jetbrains.jps.api.JpsRemoteProto.Message.Failure, Builder> { + private org.jetbrains.jps.api.JpsRemoteProto.Message.Failure result; - // Construct using org.jetbrains.jpsservice.JpsRemoteProto.Message.Failure.newBuilder() + // Construct using org.jetbrains.jps.api.JpsRemoteProto.Message.Failure.newBuilder() private Builder() {} private static Builder create() { Builder builder = new Builder(); - builder.result = new org.jetbrains.jpsservice.JpsRemoteProto.Message.Failure(); + builder.result = new org.jetbrains.jps.api.JpsRemoteProto.Message.Failure(); return builder; } - protected org.jetbrains.jpsservice.JpsRemoteProto.Message.Failure internalGetResult() { + protected org.jetbrains.jps.api.JpsRemoteProto.Message.Failure internalGetResult() { return result; } @@ -536,7 +536,7 @@ public final class JpsRemoteProto { throw new IllegalStateException( "Cannot call clear() after build()."); } - result = new org.jetbrains.jpsservice.JpsRemoteProto.Message.Failure(); + result = new org.jetbrains.jps.api.JpsRemoteProto.Message.Failure(); return this; } @@ -544,21 +544,21 @@ public final class JpsRemoteProto { return create().mergeFrom(result); } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Failure getDefaultInstanceForType() { - return org.jetbrains.jpsservice.JpsRemoteProto.Message.Failure.getDefaultInstance(); + public org.jetbrains.jps.api.JpsRemoteProto.Message.Failure getDefaultInstanceForType() { + return org.jetbrains.jps.api.JpsRemoteProto.Message.Failure.getDefaultInstance(); } public boolean isInitialized() { return result.isInitialized(); } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Failure build() { + public org.jetbrains.jps.api.JpsRemoteProto.Message.Failure build() { if (result != null && !isInitialized()) { throw newUninitializedMessageException(result); } return buildPartial(); } - private org.jetbrains.jpsservice.JpsRemoteProto.Message.Failure buildParsed() + private org.jetbrains.jps.api.JpsRemoteProto.Message.Failure buildParsed() throws com.google.protobuf.InvalidProtocolBufferException { if (!isInitialized()) { throw newUninitializedMessageException( @@ -567,18 +567,18 @@ public final class JpsRemoteProto { return buildPartial(); } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Failure buildPartial() { + public org.jetbrains.jps.api.JpsRemoteProto.Message.Failure buildPartial() { if (result == null) { throw new IllegalStateException( "build() has already been called on this Builder."); } - org.jetbrains.jpsservice.JpsRemoteProto.Message.Failure returnMe = result; + org.jetbrains.jps.api.JpsRemoteProto.Message.Failure returnMe = result; result = null; return returnMe; } - public Builder mergeFrom(org.jetbrains.jpsservice.JpsRemoteProto.Message.Failure other) { - if (other == org.jetbrains.jpsservice.JpsRemoteProto.Message.Failure.getDefaultInstance()) return this; + public Builder mergeFrom(org.jetbrains.jps.api.JpsRemoteProto.Message.Failure other) { + if (other == org.jetbrains.jps.api.JpsRemoteProto.Message.Failure.getDefaultInstance()) return this; if (other.hasErrorCode()) { setErrorCode(other.getErrorCode()); } @@ -688,7 +688,7 @@ public final class JpsRemoteProto { static { defaultInstance = new Failure(true); - org.jetbrains.jpsservice.JpsRemoteProto.internalForceInit(); + org.jetbrains.jps.api.JpsRemoteProto.internalForceInit(); defaultInstance.initFields(); } @@ -818,9 +818,9 @@ public final class JpsRemoteProto { // required .org.jetbrains.jpsservice.Message.Request.CompilationRequest.Type command_type = 1; public static final int COMMAND_TYPE_FIELD_NUMBER = 1; private boolean hasCommandType; - private org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.CompilationRequest.Type commandType_; + private org.jetbrains.jps.api.JpsRemoteProto.Message.Request.CompilationRequest.Type commandType_; public boolean hasCommandType() { return hasCommandType; } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.CompilationRequest.Type getCommandType() { return commandType_; } + public org.jetbrains.jps.api.JpsRemoteProto.Message.Request.CompilationRequest.Type getCommandType() { return commandType_; } // optional string project_id = 2; public static final int PROJECT_ID_FIELD_NUMBER = 2; @@ -842,7 +842,7 @@ public final class JpsRemoteProto { } private void initFields() { - commandType_ = org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.CompilationRequest.Type.REBUILD; + commandType_ = org.jetbrains.jps.api.JpsRemoteProto.Message.Request.CompilationRequest.Type.REBUILD; } public final boolean isInitialized() { if (!hasCommandType) return false; @@ -890,41 +890,41 @@ public final class JpsRemoteProto { return size; } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.CompilationRequest parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.CompilationRequest parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data).buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.CompilationRequest parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.CompilationRequest parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data, extensionRegistry) .buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.CompilationRequest parseFrom(byte[] data) + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.CompilationRequest parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data).buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.CompilationRequest parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.CompilationRequest parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data, extensionRegistry) .buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.CompilationRequest parseFrom(java.io.InputStream input) + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.CompilationRequest parseFrom(java.io.InputStream input) throws java.io.IOException { return newBuilder().mergeFrom(input).buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.CompilationRequest parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.CompilationRequest parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return newBuilder().mergeFrom(input, extensionRegistry) .buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.CompilationRequest parseDelimitedFrom(java.io.InputStream input) + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.CompilationRequest parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { Builder builder = newBuilder(); if (builder.mergeDelimitedFrom(input)) { @@ -933,7 +933,7 @@ public final class JpsRemoteProto { return null; } } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.CompilationRequest parseDelimitedFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.CompilationRequest parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -944,12 +944,12 @@ public final class JpsRemoteProto { return null; } } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.CompilationRequest parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.CompilationRequest parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return newBuilder().mergeFrom(input).buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.CompilationRequest parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.CompilationRequest parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -959,26 +959,26 @@ public final class JpsRemoteProto { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.CompilationRequest prototype) { + public static Builder newBuilder(org.jetbrains.jps.api.JpsRemoteProto.Message.Request.CompilationRequest prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } public static final class Builder extends com.google.protobuf.GeneratedMessageLite.Builder< - org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.CompilationRequest, Builder> { - private org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.CompilationRequest result; + org.jetbrains.jps.api.JpsRemoteProto.Message.Request.CompilationRequest, Builder> { + private org.jetbrains.jps.api.JpsRemoteProto.Message.Request.CompilationRequest result; - // Construct using org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.CompilationRequest.newBuilder() + // Construct using org.jetbrains.jps.api.JpsRemoteProto.Message.Request.CompilationRequest.newBuilder() private Builder() {} private static Builder create() { Builder builder = new Builder(); - builder.result = new org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.CompilationRequest(); + builder.result = new org.jetbrains.jps.api.JpsRemoteProto.Message.Request.CompilationRequest(); return builder; } - protected org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.CompilationRequest internalGetResult() { + protected org.jetbrains.jps.api.JpsRemoteProto.Message.Request.CompilationRequest internalGetResult() { return result; } @@ -987,7 +987,7 @@ public final class JpsRemoteProto { throw new IllegalStateException( "Cannot call clear() after build()."); } - result = new org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.CompilationRequest(); + result = new org.jetbrains.jps.api.JpsRemoteProto.Message.Request.CompilationRequest(); return this; } @@ -995,21 +995,21 @@ public final class JpsRemoteProto { return create().mergeFrom(result); } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.CompilationRequest getDefaultInstanceForType() { - return org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.CompilationRequest.getDefaultInstance(); + public org.jetbrains.jps.api.JpsRemoteProto.Message.Request.CompilationRequest getDefaultInstanceForType() { + return org.jetbrains.jps.api.JpsRemoteProto.Message.Request.CompilationRequest.getDefaultInstance(); } public boolean isInitialized() { return result.isInitialized(); } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.CompilationRequest build() { + public org.jetbrains.jps.api.JpsRemoteProto.Message.Request.CompilationRequest build() { if (result != null && !isInitialized()) { throw newUninitializedMessageException(result); } return buildPartial(); } - private org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.CompilationRequest buildParsed() + private org.jetbrains.jps.api.JpsRemoteProto.Message.Request.CompilationRequest buildParsed() throws com.google.protobuf.InvalidProtocolBufferException { if (!isInitialized()) { throw newUninitializedMessageException( @@ -1018,7 +1018,7 @@ public final class JpsRemoteProto { return buildPartial(); } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.CompilationRequest buildPartial() { + public org.jetbrains.jps.api.JpsRemoteProto.Message.Request.CompilationRequest buildPartial() { if (result == null) { throw new IllegalStateException( "build() has already been called on this Builder."); @@ -1027,13 +1027,13 @@ public final class JpsRemoteProto { result.moduleName_ = java.util.Collections.unmodifiableList(result.moduleName_); } - org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.CompilationRequest returnMe = result; + org.jetbrains.jps.api.JpsRemoteProto.Message.Request.CompilationRequest returnMe = result; result = null; return returnMe; } - public Builder mergeFrom(org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.CompilationRequest other) { - if (other == org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.CompilationRequest.getDefaultInstance()) return this; + public Builder mergeFrom(org.jetbrains.jps.api.JpsRemoteProto.Message.Request.CompilationRequest other) { + if (other == org.jetbrains.jps.api.JpsRemoteProto.Message.Request.CompilationRequest.getDefaultInstance()) return this; if (other.hasCommandType()) { setCommandType(other.getCommandType()); } @@ -1066,7 +1066,7 @@ public final class JpsRemoteProto { } case 8: { int rawValue = input.readEnum(); - org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.CompilationRequest.Type value = org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.CompilationRequest.Type.valueOf(rawValue); + org.jetbrains.jps.api.JpsRemoteProto.Message.Request.CompilationRequest.Type value = org.jetbrains.jps.api.JpsRemoteProto.Message.Request.CompilationRequest.Type.valueOf(rawValue); if (value != null) { setCommandType(value); } @@ -1089,10 +1089,10 @@ public final class JpsRemoteProto { public boolean hasCommandType() { return result.hasCommandType(); } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.CompilationRequest.Type getCommandType() { + public org.jetbrains.jps.api.JpsRemoteProto.Message.Request.CompilationRequest.Type getCommandType() { return result.getCommandType(); } - public Builder setCommandType(org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.CompilationRequest.Type value) { + public Builder setCommandType(org.jetbrains.jps.api.JpsRemoteProto.Message.Request.CompilationRequest.Type value) { if (value == null) { throw new NullPointerException(); } @@ -1102,7 +1102,7 @@ public final class JpsRemoteProto { } public Builder clearCommandType() { result.hasCommandType = false; - result.commandType_ = org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.CompilationRequest.Type.REBUILD; + result.commandType_ = org.jetbrains.jps.api.JpsRemoteProto.Message.Request.CompilationRequest.Type.REBUILD; return this; } @@ -1172,7 +1172,7 @@ public final class JpsRemoteProto { static { defaultInstance = new CompilationRequest(true); - org.jetbrains.jpsservice.JpsRemoteProto.internalForceInit(); + org.jetbrains.jps.api.JpsRemoteProto.internalForceInit(); defaultInstance.initFields(); } @@ -1238,12 +1238,12 @@ public final class JpsRemoteProto { // required .org.jetbrains.jpsservice.Message.Request.ShutdownCommand.ShutdownPolicy shutdownPolicy = 1; public static final int SHUTDOWNPOLICY_FIELD_NUMBER = 1; private boolean hasShutdownPolicy; - private org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ShutdownCommand.ShutdownPolicy shutdownPolicy_; + private org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ShutdownCommand.ShutdownPolicy shutdownPolicy_; public boolean hasShutdownPolicy() { return hasShutdownPolicy; } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ShutdownCommand.ShutdownPolicy getShutdownPolicy() { return shutdownPolicy_; } + public org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ShutdownCommand.ShutdownPolicy getShutdownPolicy() { return shutdownPolicy_; } private void initFields() { - shutdownPolicy_ = org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ShutdownCommand.ShutdownPolicy.CANCEL_RUNNING_BUILDS; + shutdownPolicy_ = org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ShutdownCommand.ShutdownPolicy.CANCEL_RUNNING_BUILDS; } public final boolean isInitialized() { if (!hasShutdownPolicy) return false; @@ -1272,41 +1272,41 @@ public final class JpsRemoteProto { return size; } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ShutdownCommand parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ShutdownCommand parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data).buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ShutdownCommand parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ShutdownCommand parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data, extensionRegistry) .buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ShutdownCommand parseFrom(byte[] data) + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ShutdownCommand parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data).buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ShutdownCommand parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ShutdownCommand parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data, extensionRegistry) .buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ShutdownCommand parseFrom(java.io.InputStream input) + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ShutdownCommand parseFrom(java.io.InputStream input) throws java.io.IOException { return newBuilder().mergeFrom(input).buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ShutdownCommand parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ShutdownCommand parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return newBuilder().mergeFrom(input, extensionRegistry) .buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ShutdownCommand parseDelimitedFrom(java.io.InputStream input) + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ShutdownCommand parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { Builder builder = newBuilder(); if (builder.mergeDelimitedFrom(input)) { @@ -1315,7 +1315,7 @@ public final class JpsRemoteProto { return null; } } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ShutdownCommand parseDelimitedFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ShutdownCommand parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -1326,12 +1326,12 @@ public final class JpsRemoteProto { return null; } } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ShutdownCommand parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ShutdownCommand parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return newBuilder().mergeFrom(input).buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ShutdownCommand parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ShutdownCommand parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -1341,26 +1341,26 @@ public final class JpsRemoteProto { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ShutdownCommand prototype) { + public static Builder newBuilder(org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ShutdownCommand prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } public static final class Builder extends com.google.protobuf.GeneratedMessageLite.Builder< - org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ShutdownCommand, Builder> { - private org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ShutdownCommand result; + org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ShutdownCommand, Builder> { + private org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ShutdownCommand result; - // Construct using org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ShutdownCommand.newBuilder() + // Construct using org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ShutdownCommand.newBuilder() private Builder() {} private static Builder create() { Builder builder = new Builder(); - builder.result = new org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ShutdownCommand(); + builder.result = new org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ShutdownCommand(); return builder; } - protected org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ShutdownCommand internalGetResult() { + protected org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ShutdownCommand internalGetResult() { return result; } @@ -1369,7 +1369,7 @@ public final class JpsRemoteProto { throw new IllegalStateException( "Cannot call clear() after build()."); } - result = new org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ShutdownCommand(); + result = new org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ShutdownCommand(); return this; } @@ -1377,21 +1377,21 @@ public final class JpsRemoteProto { return create().mergeFrom(result); } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ShutdownCommand getDefaultInstanceForType() { - return org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ShutdownCommand.getDefaultInstance(); + public org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ShutdownCommand getDefaultInstanceForType() { + return org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ShutdownCommand.getDefaultInstance(); } public boolean isInitialized() { return result.isInitialized(); } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ShutdownCommand build() { + public org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ShutdownCommand build() { if (result != null && !isInitialized()) { throw newUninitializedMessageException(result); } return buildPartial(); } - private org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ShutdownCommand buildParsed() + private org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ShutdownCommand buildParsed() throws com.google.protobuf.InvalidProtocolBufferException { if (!isInitialized()) { throw newUninitializedMessageException( @@ -1400,18 +1400,18 @@ public final class JpsRemoteProto { return buildPartial(); } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ShutdownCommand buildPartial() { + public org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ShutdownCommand buildPartial() { if (result == null) { throw new IllegalStateException( "build() has already been called on this Builder."); } - org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ShutdownCommand returnMe = result; + org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ShutdownCommand returnMe = result; result = null; return returnMe; } - public Builder mergeFrom(org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ShutdownCommand other) { - if (other == org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ShutdownCommand.getDefaultInstance()) return this; + public Builder mergeFrom(org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ShutdownCommand other) { + if (other == org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ShutdownCommand.getDefaultInstance()) return this; if (other.hasShutdownPolicy()) { setShutdownPolicy(other.getShutdownPolicy()); } @@ -1435,7 +1435,7 @@ public final class JpsRemoteProto { } case 8: { int rawValue = input.readEnum(); - org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ShutdownCommand.ShutdownPolicy value = org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ShutdownCommand.ShutdownPolicy.valueOf(rawValue); + org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ShutdownCommand.ShutdownPolicy value = org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ShutdownCommand.ShutdownPolicy.valueOf(rawValue); if (value != null) { setShutdownPolicy(value); } @@ -1450,10 +1450,10 @@ public final class JpsRemoteProto { public boolean hasShutdownPolicy() { return result.hasShutdownPolicy(); } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ShutdownCommand.ShutdownPolicy getShutdownPolicy() { + public org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ShutdownCommand.ShutdownPolicy getShutdownPolicy() { return result.getShutdownPolicy(); } - public Builder setShutdownPolicy(org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ShutdownCommand.ShutdownPolicy value) { + public Builder setShutdownPolicy(org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ShutdownCommand.ShutdownPolicy value) { if (value == null) { throw new NullPointerException(); } @@ -1463,7 +1463,7 @@ public final class JpsRemoteProto { } public Builder clearShutdownPolicy() { result.hasShutdownPolicy = false; - result.shutdownPolicy_ = org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ShutdownCommand.ShutdownPolicy.CANCEL_RUNNING_BUILDS; + result.shutdownPolicy_ = org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ShutdownCommand.ShutdownPolicy.CANCEL_RUNNING_BUILDS; return this; } @@ -1472,7 +1472,7 @@ public final class JpsRemoteProto { static { defaultInstance = new ShutdownCommand(true); - org.jetbrains.jpsservice.JpsRemoteProto.internalForceInit(); + org.jetbrains.jps.api.JpsRemoteProto.internalForceInit(); defaultInstance.initFields(); } @@ -1564,41 +1564,41 @@ public final class JpsRemoteProto { return size; } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.PathVariable parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data).buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.PathVariable parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data, extensionRegistry) .buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.PathVariable parseFrom(byte[] data) + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data).buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.PathVariable parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data, extensionRegistry) .buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.PathVariable parseFrom(java.io.InputStream input) + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable parseFrom(java.io.InputStream input) throws java.io.IOException { return newBuilder().mergeFrom(input).buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.PathVariable parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return newBuilder().mergeFrom(input, extensionRegistry) .buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.PathVariable parseDelimitedFrom(java.io.InputStream input) + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { Builder builder = newBuilder(); if (builder.mergeDelimitedFrom(input)) { @@ -1607,7 +1607,7 @@ public final class JpsRemoteProto { return null; } } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.PathVariable parseDelimitedFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -1618,12 +1618,12 @@ public final class JpsRemoteProto { return null; } } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.PathVariable parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return newBuilder().mergeFrom(input).buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.PathVariable parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -1633,26 +1633,26 @@ public final class JpsRemoteProto { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.PathVariable prototype) { + public static Builder newBuilder(org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } public static final class Builder extends com.google.protobuf.GeneratedMessageLite.Builder< - org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.PathVariable, Builder> { - private org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.PathVariable result; + org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable, Builder> { + private org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable result; - // Construct using org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.PathVariable.newBuilder() + // Construct using org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable.newBuilder() private Builder() {} private static Builder create() { Builder builder = new Builder(); - builder.result = new org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.PathVariable(); + builder.result = new org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable(); return builder; } - protected org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.PathVariable internalGetResult() { + protected org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable internalGetResult() { return result; } @@ -1661,7 +1661,7 @@ public final class JpsRemoteProto { throw new IllegalStateException( "Cannot call clear() after build()."); } - result = new org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.PathVariable(); + result = new org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable(); return this; } @@ -1669,21 +1669,21 @@ public final class JpsRemoteProto { return create().mergeFrom(result); } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.PathVariable getDefaultInstanceForType() { - return org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.PathVariable.getDefaultInstance(); + public org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable getDefaultInstanceForType() { + return org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable.getDefaultInstance(); } public boolean isInitialized() { return result.isInitialized(); } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.PathVariable build() { + public org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable build() { if (result != null && !isInitialized()) { throw newUninitializedMessageException(result); } return buildPartial(); } - private org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.PathVariable buildParsed() + private org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable buildParsed() throws com.google.protobuf.InvalidProtocolBufferException { if (!isInitialized()) { throw newUninitializedMessageException( @@ -1692,18 +1692,18 @@ public final class JpsRemoteProto { return buildPartial(); } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.PathVariable buildPartial() { + public org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable buildPartial() { if (result == null) { throw new IllegalStateException( "build() has already been called on this Builder."); } - org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.PathVariable returnMe = result; + org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable returnMe = result; result = null; return returnMe; } - public Builder mergeFrom(org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.PathVariable other) { - if (other == org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.PathVariable.getDefaultInstance()) return this; + public Builder mergeFrom(org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable other) { + if (other == org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable.getDefaultInstance()) return this; if (other.hasName()) { setName(other.getName()); } @@ -1788,7 +1788,7 @@ public final class JpsRemoteProto { static { defaultInstance = new PathVariable(true); - org.jetbrains.jpsservice.JpsRemoteProto.internalForceInit(); + org.jetbrains.jps.api.JpsRemoteProto.internalForceInit(); defaultInstance.initFields(); } @@ -1886,41 +1886,41 @@ public final class JpsRemoteProto { return size; } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data).buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data, extensionRegistry) .buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary parseFrom(byte[] data) + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data).buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data, extensionRegistry) .buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary parseFrom(java.io.InputStream input) + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary parseFrom(java.io.InputStream input) throws java.io.IOException { return newBuilder().mergeFrom(input).buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return newBuilder().mergeFrom(input, extensionRegistry) .buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary parseDelimitedFrom(java.io.InputStream input) + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { Builder builder = newBuilder(); if (builder.mergeDelimitedFrom(input)) { @@ -1929,7 +1929,7 @@ public final class JpsRemoteProto { return null; } } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary parseDelimitedFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -1940,12 +1940,12 @@ public final class JpsRemoteProto { return null; } } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return newBuilder().mergeFrom(input).buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -1955,26 +1955,26 @@ public final class JpsRemoteProto { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary prototype) { + public static Builder newBuilder(org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } public static final class Builder extends com.google.protobuf.GeneratedMessageLite.Builder< - org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary, Builder> { - private org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary result; + org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary, Builder> { + private org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary result; - // Construct using org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary.newBuilder() + // Construct using org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary.newBuilder() private Builder() {} private static Builder create() { Builder builder = new Builder(); - builder.result = new org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary(); + builder.result = new org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary(); return builder; } - protected org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary internalGetResult() { + protected org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary internalGetResult() { return result; } @@ -1983,7 +1983,7 @@ public final class JpsRemoteProto { throw new IllegalStateException( "Cannot call clear() after build()."); } - result = new org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary(); + result = new org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary(); return this; } @@ -1991,21 +1991,21 @@ public final class JpsRemoteProto { return create().mergeFrom(result); } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary getDefaultInstanceForType() { - return org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary.getDefaultInstance(); + public org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary getDefaultInstanceForType() { + return org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary.getDefaultInstance(); } public boolean isInitialized() { return result.isInitialized(); } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary build() { + public org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary build() { if (result != null && !isInitialized()) { throw newUninitializedMessageException(result); } return buildPartial(); } - private org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary buildParsed() + private org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary buildParsed() throws com.google.protobuf.InvalidProtocolBufferException { if (!isInitialized()) { throw newUninitializedMessageException( @@ -2014,7 +2014,7 @@ public final class JpsRemoteProto { return buildPartial(); } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary buildPartial() { + public org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary buildPartial() { if (result == null) { throw new IllegalStateException( "build() has already been called on this Builder."); @@ -2023,13 +2023,13 @@ public final class JpsRemoteProto { result.path_ = java.util.Collections.unmodifiableList(result.path_); } - org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary returnMe = result; + org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary returnMe = result; result = null; return returnMe; } - public Builder mergeFrom(org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary other) { - if (other == org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary.getDefaultInstance()) return this; + public Builder mergeFrom(org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary other) { + if (other == org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary.getDefaultInstance()) return this; if (other.hasName()) { setName(other.getName()); } @@ -2164,7 +2164,7 @@ public final class JpsRemoteProto { static { defaultInstance = new GlobalLibrary(true); - org.jetbrains.jpsservice.JpsRemoteProto.internalForceInit(); + org.jetbrains.jps.api.JpsRemoteProto.internalForceInit(); defaultInstance.initFields(); } @@ -2173,35 +2173,35 @@ public final class JpsRemoteProto { // repeated .org.jetbrains.jpsservice.Message.Request.SetupCommand.PathVariable path_variable = 1; public static final int PATH_VARIABLE_FIELD_NUMBER = 1; - private java.util.List pathVariable_ = + private java.util.List pathVariable_ = java.util.Collections.emptyList(); - public java.util.List getPathVariableList() { + public java.util.List getPathVariableList() { return pathVariable_; } public int getPathVariableCount() { return pathVariable_.size(); } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.PathVariable getPathVariable(int index) { + public org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable getPathVariable(int index) { return pathVariable_.get(index); } // repeated .org.jetbrains.jpsservice.Message.Request.SetupCommand.GlobalLibrary global_library = 2; public static final int GLOBAL_LIBRARY_FIELD_NUMBER = 2; - private java.util.List globalLibrary_ = + private java.util.List globalLibrary_ = java.util.Collections.emptyList(); - public java.util.List getGlobalLibraryList() { + public java.util.List getGlobalLibraryList() { return globalLibrary_; } public int getGlobalLibraryCount() { return globalLibrary_.size(); } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary getGlobalLibrary(int index) { + public org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary getGlobalLibrary(int index) { return globalLibrary_.get(index); } private void initFields() { } public final boolean isInitialized() { - for (org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.PathVariable element : getPathVariableList()) { + for (org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable element : getPathVariableList()) { if (!element.isInitialized()) return false; } - for (org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary element : getGlobalLibraryList()) { + for (org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary element : getGlobalLibraryList()) { if (!element.isInitialized()) return false; } return true; @@ -2210,10 +2210,10 @@ public final class JpsRemoteProto { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); - for (org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.PathVariable element : getPathVariableList()) { + for (org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable element : getPathVariableList()) { output.writeMessage(1, element); } - for (org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary element : getGlobalLibraryList()) { + for (org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary element : getGlobalLibraryList()) { output.writeMessage(2, element); } } @@ -2224,11 +2224,11 @@ public final class JpsRemoteProto { if (size != -1) return size; size = 0; - for (org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.PathVariable element : getPathVariableList()) { + for (org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable element : getPathVariableList()) { size += com.google.protobuf.CodedOutputStream .computeMessageSize(1, element); } - for (org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary element : getGlobalLibraryList()) { + for (org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary element : getGlobalLibraryList()) { size += com.google.protobuf.CodedOutputStream .computeMessageSize(2, element); } @@ -2236,41 +2236,41 @@ public final class JpsRemoteProto { return size; } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data).buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data, extensionRegistry) .buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand parseFrom(byte[] data) + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data).buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data, extensionRegistry) .buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand parseFrom(java.io.InputStream input) + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand parseFrom(java.io.InputStream input) throws java.io.IOException { return newBuilder().mergeFrom(input).buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return newBuilder().mergeFrom(input, extensionRegistry) .buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand parseDelimitedFrom(java.io.InputStream input) + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { Builder builder = newBuilder(); if (builder.mergeDelimitedFrom(input)) { @@ -2279,7 +2279,7 @@ public final class JpsRemoteProto { return null; } } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand parseDelimitedFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -2290,12 +2290,12 @@ public final class JpsRemoteProto { return null; } } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return newBuilder().mergeFrom(input).buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -2305,26 +2305,26 @@ public final class JpsRemoteProto { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand prototype) { + public static Builder newBuilder(org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } public static final class Builder extends com.google.protobuf.GeneratedMessageLite.Builder< - org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand, Builder> { - private org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand result; + org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand, Builder> { + private org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand result; - // Construct using org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.newBuilder() + // Construct using org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.newBuilder() private Builder() {} private static Builder create() { Builder builder = new Builder(); - builder.result = new org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand(); + builder.result = new org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand(); return builder; } - protected org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand internalGetResult() { + protected org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand internalGetResult() { return result; } @@ -2333,7 +2333,7 @@ public final class JpsRemoteProto { throw new IllegalStateException( "Cannot call clear() after build()."); } - result = new org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand(); + result = new org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand(); return this; } @@ -2341,21 +2341,21 @@ public final class JpsRemoteProto { return create().mergeFrom(result); } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand getDefaultInstanceForType() { - return org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.getDefaultInstance(); + public org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand getDefaultInstanceForType() { + return org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.getDefaultInstance(); } public boolean isInitialized() { return result.isInitialized(); } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand build() { + public org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand build() { if (result != null && !isInitialized()) { throw newUninitializedMessageException(result); } return buildPartial(); } - private org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand buildParsed() + private org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand buildParsed() throws com.google.protobuf.InvalidProtocolBufferException { if (!isInitialized()) { throw newUninitializedMessageException( @@ -2364,7 +2364,7 @@ public final class JpsRemoteProto { return buildPartial(); } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand buildPartial() { + public org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand buildPartial() { if (result == null) { throw new IllegalStateException( "build() has already been called on this Builder."); @@ -2377,22 +2377,22 @@ public final class JpsRemoteProto { result.globalLibrary_ = java.util.Collections.unmodifiableList(result.globalLibrary_); } - org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand returnMe = result; + org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand returnMe = result; result = null; return returnMe; } - public Builder mergeFrom(org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand other) { - if (other == org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.getDefaultInstance()) return this; + public Builder mergeFrom(org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand other) { + if (other == org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.getDefaultInstance()) return this; if (!other.pathVariable_.isEmpty()) { if (result.pathVariable_.isEmpty()) { - result.pathVariable_ = new java.util.ArrayList(); + result.pathVariable_ = new java.util.ArrayList(); } result.pathVariable_.addAll(other.pathVariable_); } if (!other.globalLibrary_.isEmpty()) { if (result.globalLibrary_.isEmpty()) { - result.globalLibrary_ = new java.util.ArrayList(); + result.globalLibrary_ = new java.util.ArrayList(); } result.globalLibrary_.addAll(other.globalLibrary_); } @@ -2415,13 +2415,13 @@ public final class JpsRemoteProto { break; } case 10: { - org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.PathVariable.Builder subBuilder = org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.PathVariable.newBuilder(); + org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable.Builder subBuilder = org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable.newBuilder(); input.readMessage(subBuilder, extensionRegistry); addPathVariable(subBuilder.buildPartial()); break; } case 18: { - org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary.Builder subBuilder = org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary.newBuilder(); + org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary.Builder subBuilder = org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary.newBuilder(); input.readMessage(subBuilder, extensionRegistry); addGlobalLibrary(subBuilder.buildPartial()); break; @@ -2432,47 +2432,47 @@ public final class JpsRemoteProto { // repeated .org.jetbrains.jpsservice.Message.Request.SetupCommand.PathVariable path_variable = 1; - public java.util.List getPathVariableList() { + public java.util.List getPathVariableList() { return java.util.Collections.unmodifiableList(result.pathVariable_); } public int getPathVariableCount() { return result.getPathVariableCount(); } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.PathVariable getPathVariable(int index) { + public org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable getPathVariable(int index) { return result.getPathVariable(index); } - public Builder setPathVariable(int index, org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.PathVariable value) { + public Builder setPathVariable(int index, org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable value) { if (value == null) { throw new NullPointerException(); } result.pathVariable_.set(index, value); return this; } - public Builder setPathVariable(int index, org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.PathVariable.Builder builderForValue) { + public Builder setPathVariable(int index, org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable.Builder builderForValue) { result.pathVariable_.set(index, builderForValue.build()); return this; } - public Builder addPathVariable(org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.PathVariable value) { + public Builder addPathVariable(org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable value) { if (value == null) { throw new NullPointerException(); } if (result.pathVariable_.isEmpty()) { - result.pathVariable_ = new java.util.ArrayList(); + result.pathVariable_ = new java.util.ArrayList(); } result.pathVariable_.add(value); return this; } - public Builder addPathVariable(org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.PathVariable.Builder builderForValue) { + public Builder addPathVariable(org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable.Builder builderForValue) { if (result.pathVariable_.isEmpty()) { - result.pathVariable_ = new java.util.ArrayList(); + result.pathVariable_ = new java.util.ArrayList(); } result.pathVariable_.add(builderForValue.build()); return this; } public Builder addAllPathVariable( - java.lang.Iterable values) { + java.lang.Iterable values) { if (result.pathVariable_.isEmpty()) { - result.pathVariable_ = new java.util.ArrayList(); + result.pathVariable_ = new java.util.ArrayList(); } super.addAll(values, result.pathVariable_); return this; @@ -2483,47 +2483,47 @@ public final class JpsRemoteProto { } // repeated .org.jetbrains.jpsservice.Message.Request.SetupCommand.GlobalLibrary global_library = 2; - public java.util.List getGlobalLibraryList() { + public java.util.List getGlobalLibraryList() { return java.util.Collections.unmodifiableList(result.globalLibrary_); } public int getGlobalLibraryCount() { return result.getGlobalLibraryCount(); } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary getGlobalLibrary(int index) { + public org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary getGlobalLibrary(int index) { return result.getGlobalLibrary(index); } - public Builder setGlobalLibrary(int index, org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary value) { + public Builder setGlobalLibrary(int index, org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary value) { if (value == null) { throw new NullPointerException(); } result.globalLibrary_.set(index, value); return this; } - public Builder setGlobalLibrary(int index, org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary.Builder builderForValue) { + public Builder setGlobalLibrary(int index, org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary.Builder builderForValue) { result.globalLibrary_.set(index, builderForValue.build()); return this; } - public Builder addGlobalLibrary(org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary value) { + public Builder addGlobalLibrary(org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary value) { if (value == null) { throw new NullPointerException(); } if (result.globalLibrary_.isEmpty()) { - result.globalLibrary_ = new java.util.ArrayList(); + result.globalLibrary_ = new java.util.ArrayList(); } result.globalLibrary_.add(value); return this; } - public Builder addGlobalLibrary(org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary.Builder builderForValue) { + public Builder addGlobalLibrary(org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary.Builder builderForValue) { if (result.globalLibrary_.isEmpty()) { - result.globalLibrary_ = new java.util.ArrayList(); + result.globalLibrary_ = new java.util.ArrayList(); } result.globalLibrary_.add(builderForValue.build()); return this; } public Builder addAllGlobalLibrary( - java.lang.Iterable values) { + java.lang.Iterable values) { if (result.globalLibrary_.isEmpty()) { - result.globalLibrary_ = new java.util.ArrayList(); + result.globalLibrary_ = new java.util.ArrayList(); } super.addAll(values, result.globalLibrary_); return this; @@ -2538,7 +2538,7 @@ public final class JpsRemoteProto { static { defaultInstance = new SetupCommand(true); - org.jetbrains.jpsservice.JpsRemoteProto.internalForceInit(); + org.jetbrains.jps.api.JpsRemoteProto.internalForceInit(); defaultInstance.initFields(); } @@ -2607,41 +2607,41 @@ public final class JpsRemoteProto { return size; } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ReloadProjectCommand parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ReloadProjectCommand parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data).buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ReloadProjectCommand parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ReloadProjectCommand parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data, extensionRegistry) .buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ReloadProjectCommand parseFrom(byte[] data) + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ReloadProjectCommand parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data).buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ReloadProjectCommand parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ReloadProjectCommand parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data, extensionRegistry) .buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ReloadProjectCommand parseFrom(java.io.InputStream input) + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ReloadProjectCommand parseFrom(java.io.InputStream input) throws java.io.IOException { return newBuilder().mergeFrom(input).buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ReloadProjectCommand parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ReloadProjectCommand parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return newBuilder().mergeFrom(input, extensionRegistry) .buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ReloadProjectCommand parseDelimitedFrom(java.io.InputStream input) + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ReloadProjectCommand parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { Builder builder = newBuilder(); if (builder.mergeDelimitedFrom(input)) { @@ -2650,7 +2650,7 @@ public final class JpsRemoteProto { return null; } } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ReloadProjectCommand parseDelimitedFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ReloadProjectCommand parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -2661,12 +2661,12 @@ public final class JpsRemoteProto { return null; } } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ReloadProjectCommand parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ReloadProjectCommand parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return newBuilder().mergeFrom(input).buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ReloadProjectCommand parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ReloadProjectCommand parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -2676,26 +2676,26 @@ public final class JpsRemoteProto { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ReloadProjectCommand prototype) { + public static Builder newBuilder(org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ReloadProjectCommand prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } public static final class Builder extends com.google.protobuf.GeneratedMessageLite.Builder< - org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ReloadProjectCommand, Builder> { - private org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ReloadProjectCommand result; + org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ReloadProjectCommand, Builder> { + private org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ReloadProjectCommand result; - // Construct using org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ReloadProjectCommand.newBuilder() + // Construct using org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ReloadProjectCommand.newBuilder() private Builder() {} private static Builder create() { Builder builder = new Builder(); - builder.result = new org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ReloadProjectCommand(); + builder.result = new org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ReloadProjectCommand(); return builder; } - protected org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ReloadProjectCommand internalGetResult() { + protected org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ReloadProjectCommand internalGetResult() { return result; } @@ -2704,7 +2704,7 @@ public final class JpsRemoteProto { throw new IllegalStateException( "Cannot call clear() after build()."); } - result = new org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ReloadProjectCommand(); + result = new org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ReloadProjectCommand(); return this; } @@ -2712,21 +2712,21 @@ public final class JpsRemoteProto { return create().mergeFrom(result); } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ReloadProjectCommand getDefaultInstanceForType() { - return org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ReloadProjectCommand.getDefaultInstance(); + public org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ReloadProjectCommand getDefaultInstanceForType() { + return org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ReloadProjectCommand.getDefaultInstance(); } public boolean isInitialized() { return result.isInitialized(); } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ReloadProjectCommand build() { + public org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ReloadProjectCommand build() { if (result != null && !isInitialized()) { throw newUninitializedMessageException(result); } return buildPartial(); } - private org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ReloadProjectCommand buildParsed() + private org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ReloadProjectCommand buildParsed() throws com.google.protobuf.InvalidProtocolBufferException { if (!isInitialized()) { throw newUninitializedMessageException( @@ -2735,7 +2735,7 @@ public final class JpsRemoteProto { return buildPartial(); } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ReloadProjectCommand buildPartial() { + public org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ReloadProjectCommand buildPartial() { if (result == null) { throw new IllegalStateException( "build() has already been called on this Builder."); @@ -2744,13 +2744,13 @@ public final class JpsRemoteProto { result.projectId_ = java.util.Collections.unmodifiableList(result.projectId_); } - org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ReloadProjectCommand returnMe = result; + org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ReloadProjectCommand returnMe = result; result = null; return returnMe; } - public Builder mergeFrom(org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ReloadProjectCommand other) { - if (other == org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ReloadProjectCommand.getDefaultInstance()) return this; + public Builder mergeFrom(org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ReloadProjectCommand other) { + if (other == org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ReloadProjectCommand.getDefaultInstance()) return this; if (!other.projectId_.isEmpty()) { if (result.projectId_.isEmpty()) { result.projectId_ = new java.util.ArrayList(); @@ -2829,7 +2829,7 @@ public final class JpsRemoteProto { static { defaultInstance = new ReloadProjectCommand(true); - org.jetbrains.jpsservice.JpsRemoteProto.internalForceInit(); + org.jetbrains.jps.api.JpsRemoteProto.internalForceInit(); defaultInstance.initFields(); } @@ -2839,44 +2839,44 @@ public final class JpsRemoteProto { // required .org.jetbrains.jpsservice.Message.Request.Type request_type = 1; public static final int REQUEST_TYPE_FIELD_NUMBER = 1; private boolean hasRequestType; - private org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.Type requestType_; + private org.jetbrains.jps.api.JpsRemoteProto.Message.Request.Type requestType_; public boolean hasRequestType() { return hasRequestType; } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.Type getRequestType() { return requestType_; } + public org.jetbrains.jps.api.JpsRemoteProto.Message.Request.Type getRequestType() { return requestType_; } // optional .org.jetbrains.jpsservice.Message.Request.CompilationRequest compile_request = 2; public static final int COMPILE_REQUEST_FIELD_NUMBER = 2; private boolean hasCompileRequest; - private org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.CompilationRequest compileRequest_; + private org.jetbrains.jps.api.JpsRemoteProto.Message.Request.CompilationRequest compileRequest_; public boolean hasCompileRequest() { return hasCompileRequest; } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.CompilationRequest getCompileRequest() { return compileRequest_; } + public org.jetbrains.jps.api.JpsRemoteProto.Message.Request.CompilationRequest getCompileRequest() { return compileRequest_; } // optional .org.jetbrains.jpsservice.Message.Request.ShutdownCommand shutdown_command = 3; public static final int SHUTDOWN_COMMAND_FIELD_NUMBER = 3; private boolean hasShutdownCommand; - private org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ShutdownCommand shutdownCommand_; + private org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ShutdownCommand shutdownCommand_; public boolean hasShutdownCommand() { return hasShutdownCommand; } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ShutdownCommand getShutdownCommand() { return shutdownCommand_; } + public org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ShutdownCommand getShutdownCommand() { return shutdownCommand_; } // optional .org.jetbrains.jpsservice.Message.Request.SetupCommand setup_command = 4; public static final int SETUP_COMMAND_FIELD_NUMBER = 4; private boolean hasSetupCommand; - private org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand setupCommand_; + private org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand setupCommand_; public boolean hasSetupCommand() { return hasSetupCommand; } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand getSetupCommand() { return setupCommand_; } + public org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand getSetupCommand() { return setupCommand_; } // optional .org.jetbrains.jpsservice.Message.Request.ReloadProjectCommand reload_project_command = 5; public static final int RELOAD_PROJECT_COMMAND_FIELD_NUMBER = 5; private boolean hasReloadProjectCommand; - private org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ReloadProjectCommand reloadProjectCommand_; + private org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ReloadProjectCommand reloadProjectCommand_; public boolean hasReloadProjectCommand() { return hasReloadProjectCommand; } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ReloadProjectCommand getReloadProjectCommand() { return reloadProjectCommand_; } + public org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ReloadProjectCommand getReloadProjectCommand() { return reloadProjectCommand_; } private void initFields() { - requestType_ = org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.Type.COMPILE_REQUEST; - compileRequest_ = org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.CompilationRequest.getDefaultInstance(); - shutdownCommand_ = org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ShutdownCommand.getDefaultInstance(); - setupCommand_ = org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.getDefaultInstance(); - reloadProjectCommand_ = org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ReloadProjectCommand.getDefaultInstance(); + requestType_ = org.jetbrains.jps.api.JpsRemoteProto.Message.Request.Type.COMPILE_REQUEST; + compileRequest_ = org.jetbrains.jps.api.JpsRemoteProto.Message.Request.CompilationRequest.getDefaultInstance(); + shutdownCommand_ = org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ShutdownCommand.getDefaultInstance(); + setupCommand_ = org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.getDefaultInstance(); + reloadProjectCommand_ = org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ReloadProjectCommand.getDefaultInstance(); } public final boolean isInitialized() { if (!hasRequestType) return false; @@ -2942,41 +2942,41 @@ public final class JpsRemoteProto { return size; } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data).buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data, extensionRegistry) .buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request parseFrom(byte[] data) + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data).buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data, extensionRegistry) .buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request parseFrom(java.io.InputStream input) + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request parseFrom(java.io.InputStream input) throws java.io.IOException { return newBuilder().mergeFrom(input).buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return newBuilder().mergeFrom(input, extensionRegistry) .buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request parseDelimitedFrom(java.io.InputStream input) + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { Builder builder = newBuilder(); if (builder.mergeDelimitedFrom(input)) { @@ -2985,7 +2985,7 @@ public final class JpsRemoteProto { return null; } } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request parseDelimitedFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -2996,12 +2996,12 @@ public final class JpsRemoteProto { return null; } } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return newBuilder().mergeFrom(input).buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Request parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -3011,26 +3011,26 @@ public final class JpsRemoteProto { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.jetbrains.jpsservice.JpsRemoteProto.Message.Request prototype) { + public static Builder newBuilder(org.jetbrains.jps.api.JpsRemoteProto.Message.Request prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } public static final class Builder extends com.google.protobuf.GeneratedMessageLite.Builder< - org.jetbrains.jpsservice.JpsRemoteProto.Message.Request, Builder> { - private org.jetbrains.jpsservice.JpsRemoteProto.Message.Request result; + org.jetbrains.jps.api.JpsRemoteProto.Message.Request, Builder> { + private org.jetbrains.jps.api.JpsRemoteProto.Message.Request result; - // Construct using org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.newBuilder() + // Construct using org.jetbrains.jps.api.JpsRemoteProto.Message.Request.newBuilder() private Builder() {} private static Builder create() { Builder builder = new Builder(); - builder.result = new org.jetbrains.jpsservice.JpsRemoteProto.Message.Request(); + builder.result = new org.jetbrains.jps.api.JpsRemoteProto.Message.Request(); return builder; } - protected org.jetbrains.jpsservice.JpsRemoteProto.Message.Request internalGetResult() { + protected org.jetbrains.jps.api.JpsRemoteProto.Message.Request internalGetResult() { return result; } @@ -3039,7 +3039,7 @@ public final class JpsRemoteProto { throw new IllegalStateException( "Cannot call clear() after build()."); } - result = new org.jetbrains.jpsservice.JpsRemoteProto.Message.Request(); + result = new org.jetbrains.jps.api.JpsRemoteProto.Message.Request(); return this; } @@ -3047,21 +3047,21 @@ public final class JpsRemoteProto { return create().mergeFrom(result); } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Request getDefaultInstanceForType() { - return org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.getDefaultInstance(); + public org.jetbrains.jps.api.JpsRemoteProto.Message.Request getDefaultInstanceForType() { + return org.jetbrains.jps.api.JpsRemoteProto.Message.Request.getDefaultInstance(); } public boolean isInitialized() { return result.isInitialized(); } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Request build() { + public org.jetbrains.jps.api.JpsRemoteProto.Message.Request build() { if (result != null && !isInitialized()) { throw newUninitializedMessageException(result); } return buildPartial(); } - private org.jetbrains.jpsservice.JpsRemoteProto.Message.Request buildParsed() + private org.jetbrains.jps.api.JpsRemoteProto.Message.Request buildParsed() throws com.google.protobuf.InvalidProtocolBufferException { if (!isInitialized()) { throw newUninitializedMessageException( @@ -3070,18 +3070,18 @@ public final class JpsRemoteProto { return buildPartial(); } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Request buildPartial() { + public org.jetbrains.jps.api.JpsRemoteProto.Message.Request buildPartial() { if (result == null) { throw new IllegalStateException( "build() has already been called on this Builder."); } - org.jetbrains.jpsservice.JpsRemoteProto.Message.Request returnMe = result; + org.jetbrains.jps.api.JpsRemoteProto.Message.Request returnMe = result; result = null; return returnMe; } - public Builder mergeFrom(org.jetbrains.jpsservice.JpsRemoteProto.Message.Request other) { - if (other == org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.getDefaultInstance()) return this; + public Builder mergeFrom(org.jetbrains.jps.api.JpsRemoteProto.Message.Request other) { + if (other == org.jetbrains.jps.api.JpsRemoteProto.Message.Request.getDefaultInstance()) return this; if (other.hasRequestType()) { setRequestType(other.getRequestType()); } @@ -3117,14 +3117,14 @@ public final class JpsRemoteProto { } case 8: { int rawValue = input.readEnum(); - org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.Type value = org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.Type.valueOf(rawValue); + org.jetbrains.jps.api.JpsRemoteProto.Message.Request.Type value = org.jetbrains.jps.api.JpsRemoteProto.Message.Request.Type.valueOf(rawValue); if (value != null) { setRequestType(value); } break; } case 18: { - org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.CompilationRequest.Builder subBuilder = org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.CompilationRequest.newBuilder(); + org.jetbrains.jps.api.JpsRemoteProto.Message.Request.CompilationRequest.Builder subBuilder = org.jetbrains.jps.api.JpsRemoteProto.Message.Request.CompilationRequest.newBuilder(); if (hasCompileRequest()) { subBuilder.mergeFrom(getCompileRequest()); } @@ -3133,7 +3133,7 @@ public final class JpsRemoteProto { break; } case 26: { - org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ShutdownCommand.Builder subBuilder = org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ShutdownCommand.newBuilder(); + org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ShutdownCommand.Builder subBuilder = org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ShutdownCommand.newBuilder(); if (hasShutdownCommand()) { subBuilder.mergeFrom(getShutdownCommand()); } @@ -3142,7 +3142,7 @@ public final class JpsRemoteProto { break; } case 34: { - org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.Builder subBuilder = org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.newBuilder(); + org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.Builder subBuilder = org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.newBuilder(); if (hasSetupCommand()) { subBuilder.mergeFrom(getSetupCommand()); } @@ -3151,7 +3151,7 @@ public final class JpsRemoteProto { break; } case 42: { - org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ReloadProjectCommand.Builder subBuilder = org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ReloadProjectCommand.newBuilder(); + org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ReloadProjectCommand.Builder subBuilder = org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ReloadProjectCommand.newBuilder(); if (hasReloadProjectCommand()) { subBuilder.mergeFrom(getReloadProjectCommand()); } @@ -3168,10 +3168,10 @@ public final class JpsRemoteProto { public boolean hasRequestType() { return result.hasRequestType(); } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.Type getRequestType() { + public org.jetbrains.jps.api.JpsRemoteProto.Message.Request.Type getRequestType() { return result.getRequestType(); } - public Builder setRequestType(org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.Type value) { + public Builder setRequestType(org.jetbrains.jps.api.JpsRemoteProto.Message.Request.Type value) { if (value == null) { throw new NullPointerException(); } @@ -3181,7 +3181,7 @@ public final class JpsRemoteProto { } public Builder clearRequestType() { result.hasRequestType = false; - result.requestType_ = org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.Type.COMPILE_REQUEST; + result.requestType_ = org.jetbrains.jps.api.JpsRemoteProto.Message.Request.Type.COMPILE_REQUEST; return this; } @@ -3189,10 +3189,10 @@ public final class JpsRemoteProto { public boolean hasCompileRequest() { return result.hasCompileRequest(); } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.CompilationRequest getCompileRequest() { + public org.jetbrains.jps.api.JpsRemoteProto.Message.Request.CompilationRequest getCompileRequest() { return result.getCompileRequest(); } - public Builder setCompileRequest(org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.CompilationRequest value) { + public Builder setCompileRequest(org.jetbrains.jps.api.JpsRemoteProto.Message.Request.CompilationRequest value) { if (value == null) { throw new NullPointerException(); } @@ -3200,16 +3200,16 @@ public final class JpsRemoteProto { result.compileRequest_ = value; return this; } - public Builder setCompileRequest(org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.CompilationRequest.Builder builderForValue) { + public Builder setCompileRequest(org.jetbrains.jps.api.JpsRemoteProto.Message.Request.CompilationRequest.Builder builderForValue) { result.hasCompileRequest = true; result.compileRequest_ = builderForValue.build(); return this; } - public Builder mergeCompileRequest(org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.CompilationRequest value) { + public Builder mergeCompileRequest(org.jetbrains.jps.api.JpsRemoteProto.Message.Request.CompilationRequest value) { if (result.hasCompileRequest() && - result.compileRequest_ != org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.CompilationRequest.getDefaultInstance()) { + result.compileRequest_ != org.jetbrains.jps.api.JpsRemoteProto.Message.Request.CompilationRequest.getDefaultInstance()) { result.compileRequest_ = - org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.CompilationRequest.newBuilder(result.compileRequest_).mergeFrom(value).buildPartial(); + org.jetbrains.jps.api.JpsRemoteProto.Message.Request.CompilationRequest.newBuilder(result.compileRequest_).mergeFrom(value).buildPartial(); } else { result.compileRequest_ = value; } @@ -3218,7 +3218,7 @@ public final class JpsRemoteProto { } public Builder clearCompileRequest() { result.hasCompileRequest = false; - result.compileRequest_ = org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.CompilationRequest.getDefaultInstance(); + result.compileRequest_ = org.jetbrains.jps.api.JpsRemoteProto.Message.Request.CompilationRequest.getDefaultInstance(); return this; } @@ -3226,10 +3226,10 @@ public final class JpsRemoteProto { public boolean hasShutdownCommand() { return result.hasShutdownCommand(); } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ShutdownCommand getShutdownCommand() { + public org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ShutdownCommand getShutdownCommand() { return result.getShutdownCommand(); } - public Builder setShutdownCommand(org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ShutdownCommand value) { + public Builder setShutdownCommand(org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ShutdownCommand value) { if (value == null) { throw new NullPointerException(); } @@ -3237,16 +3237,16 @@ public final class JpsRemoteProto { result.shutdownCommand_ = value; return this; } - public Builder setShutdownCommand(org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ShutdownCommand.Builder builderForValue) { + public Builder setShutdownCommand(org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ShutdownCommand.Builder builderForValue) { result.hasShutdownCommand = true; result.shutdownCommand_ = builderForValue.build(); return this; } - public Builder mergeShutdownCommand(org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ShutdownCommand value) { + public Builder mergeShutdownCommand(org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ShutdownCommand value) { if (result.hasShutdownCommand() && - result.shutdownCommand_ != org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ShutdownCommand.getDefaultInstance()) { + result.shutdownCommand_ != org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ShutdownCommand.getDefaultInstance()) { result.shutdownCommand_ = - org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ShutdownCommand.newBuilder(result.shutdownCommand_).mergeFrom(value).buildPartial(); + org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ShutdownCommand.newBuilder(result.shutdownCommand_).mergeFrom(value).buildPartial(); } else { result.shutdownCommand_ = value; } @@ -3255,7 +3255,7 @@ public final class JpsRemoteProto { } public Builder clearShutdownCommand() { result.hasShutdownCommand = false; - result.shutdownCommand_ = org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ShutdownCommand.getDefaultInstance(); + result.shutdownCommand_ = org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ShutdownCommand.getDefaultInstance(); return this; } @@ -3263,10 +3263,10 @@ public final class JpsRemoteProto { public boolean hasSetupCommand() { return result.hasSetupCommand(); } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand getSetupCommand() { + public org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand getSetupCommand() { return result.getSetupCommand(); } - public Builder setSetupCommand(org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand value) { + public Builder setSetupCommand(org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand value) { if (value == null) { throw new NullPointerException(); } @@ -3274,16 +3274,16 @@ public final class JpsRemoteProto { result.setupCommand_ = value; return this; } - public Builder setSetupCommand(org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.Builder builderForValue) { + public Builder setSetupCommand(org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.Builder builderForValue) { result.hasSetupCommand = true; result.setupCommand_ = builderForValue.build(); return this; } - public Builder mergeSetupCommand(org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand value) { + public Builder mergeSetupCommand(org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand value) { if (result.hasSetupCommand() && - result.setupCommand_ != org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.getDefaultInstance()) { + result.setupCommand_ != org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.getDefaultInstance()) { result.setupCommand_ = - org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.newBuilder(result.setupCommand_).mergeFrom(value).buildPartial(); + org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.newBuilder(result.setupCommand_).mergeFrom(value).buildPartial(); } else { result.setupCommand_ = value; } @@ -3292,7 +3292,7 @@ public final class JpsRemoteProto { } public Builder clearSetupCommand() { result.hasSetupCommand = false; - result.setupCommand_ = org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.SetupCommand.getDefaultInstance(); + result.setupCommand_ = org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.getDefaultInstance(); return this; } @@ -3300,10 +3300,10 @@ public final class JpsRemoteProto { public boolean hasReloadProjectCommand() { return result.hasReloadProjectCommand(); } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ReloadProjectCommand getReloadProjectCommand() { + public org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ReloadProjectCommand getReloadProjectCommand() { return result.getReloadProjectCommand(); } - public Builder setReloadProjectCommand(org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ReloadProjectCommand value) { + public Builder setReloadProjectCommand(org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ReloadProjectCommand value) { if (value == null) { throw new NullPointerException(); } @@ -3311,16 +3311,16 @@ public final class JpsRemoteProto { result.reloadProjectCommand_ = value; return this; } - public Builder setReloadProjectCommand(org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ReloadProjectCommand.Builder builderForValue) { + public Builder setReloadProjectCommand(org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ReloadProjectCommand.Builder builderForValue) { result.hasReloadProjectCommand = true; result.reloadProjectCommand_ = builderForValue.build(); return this; } - public Builder mergeReloadProjectCommand(org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ReloadProjectCommand value) { + public Builder mergeReloadProjectCommand(org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ReloadProjectCommand value) { if (result.hasReloadProjectCommand() && - result.reloadProjectCommand_ != org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ReloadProjectCommand.getDefaultInstance()) { + result.reloadProjectCommand_ != org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ReloadProjectCommand.getDefaultInstance()) { result.reloadProjectCommand_ = - org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ReloadProjectCommand.newBuilder(result.reloadProjectCommand_).mergeFrom(value).buildPartial(); + org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ReloadProjectCommand.newBuilder(result.reloadProjectCommand_).mergeFrom(value).buildPartial(); } else { result.reloadProjectCommand_ = value; } @@ -3329,7 +3329,7 @@ public final class JpsRemoteProto { } public Builder clearReloadProjectCommand() { result.hasReloadProjectCommand = false; - result.reloadProjectCommand_ = org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.ReloadProjectCommand.getDefaultInstance(); + result.reloadProjectCommand_ = org.jetbrains.jps.api.JpsRemoteProto.Message.Request.ReloadProjectCommand.getDefaultInstance(); return this; } @@ -3338,7 +3338,7 @@ public final class JpsRemoteProto { static { defaultInstance = new Request(true); - org.jetbrains.jpsservice.JpsRemoteProto.internalForceInit(); + org.jetbrains.jps.api.JpsRemoteProto.internalForceInit(); defaultInstance.initFields(); } @@ -3464,9 +3464,9 @@ public final class JpsRemoteProto { // required .org.jetbrains.jpsservice.Message.Response.BuildEvent.Type event_type = 1; public static final int EVENT_TYPE_FIELD_NUMBER = 1; private boolean hasEventType; - private org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.BuildEvent.Type eventType_; + private org.jetbrains.jps.api.JpsRemoteProto.Message.Response.BuildEvent.Type eventType_; public boolean hasEventType() { return hasEventType; } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.BuildEvent.Type getEventType() { return eventType_; } + public org.jetbrains.jps.api.JpsRemoteProto.Message.Response.BuildEvent.Type getEventType() { return eventType_; } // optional string description = 2; public static final int DESCRIPTION_FIELD_NUMBER = 2; @@ -3476,7 +3476,7 @@ public final class JpsRemoteProto { public java.lang.String getDescription() { return description_; } private void initFields() { - eventType_ = org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.BuildEvent.Type.BUILD_STARTED; + eventType_ = org.jetbrains.jps.api.JpsRemoteProto.Message.Response.BuildEvent.Type.BUILD_STARTED; } public final boolean isInitialized() { if (!hasEventType) return false; @@ -3512,41 +3512,41 @@ public final class JpsRemoteProto { return size; } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.BuildEvent parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Response.BuildEvent parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data).buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.BuildEvent parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Response.BuildEvent parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data, extensionRegistry) .buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.BuildEvent parseFrom(byte[] data) + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Response.BuildEvent parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data).buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.BuildEvent parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Response.BuildEvent parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data, extensionRegistry) .buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.BuildEvent parseFrom(java.io.InputStream input) + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Response.BuildEvent parseFrom(java.io.InputStream input) throws java.io.IOException { return newBuilder().mergeFrom(input).buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.BuildEvent parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Response.BuildEvent parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return newBuilder().mergeFrom(input, extensionRegistry) .buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.BuildEvent parseDelimitedFrom(java.io.InputStream input) + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Response.BuildEvent parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { Builder builder = newBuilder(); if (builder.mergeDelimitedFrom(input)) { @@ -3555,7 +3555,7 @@ public final class JpsRemoteProto { return null; } } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.BuildEvent parseDelimitedFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Response.BuildEvent parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -3566,12 +3566,12 @@ public final class JpsRemoteProto { return null; } } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.BuildEvent parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Response.BuildEvent parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return newBuilder().mergeFrom(input).buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.BuildEvent parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Response.BuildEvent parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -3581,26 +3581,26 @@ public final class JpsRemoteProto { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.BuildEvent prototype) { + public static Builder newBuilder(org.jetbrains.jps.api.JpsRemoteProto.Message.Response.BuildEvent prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } public static final class Builder extends com.google.protobuf.GeneratedMessageLite.Builder< - org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.BuildEvent, Builder> { - private org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.BuildEvent result; + org.jetbrains.jps.api.JpsRemoteProto.Message.Response.BuildEvent, Builder> { + private org.jetbrains.jps.api.JpsRemoteProto.Message.Response.BuildEvent result; - // Construct using org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.BuildEvent.newBuilder() + // Construct using org.jetbrains.jps.api.JpsRemoteProto.Message.Response.BuildEvent.newBuilder() private Builder() {} private static Builder create() { Builder builder = new Builder(); - builder.result = new org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.BuildEvent(); + builder.result = new org.jetbrains.jps.api.JpsRemoteProto.Message.Response.BuildEvent(); return builder; } - protected org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.BuildEvent internalGetResult() { + protected org.jetbrains.jps.api.JpsRemoteProto.Message.Response.BuildEvent internalGetResult() { return result; } @@ -3609,7 +3609,7 @@ public final class JpsRemoteProto { throw new IllegalStateException( "Cannot call clear() after build()."); } - result = new org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.BuildEvent(); + result = new org.jetbrains.jps.api.JpsRemoteProto.Message.Response.BuildEvent(); return this; } @@ -3617,21 +3617,21 @@ public final class JpsRemoteProto { return create().mergeFrom(result); } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.BuildEvent getDefaultInstanceForType() { - return org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.BuildEvent.getDefaultInstance(); + public org.jetbrains.jps.api.JpsRemoteProto.Message.Response.BuildEvent getDefaultInstanceForType() { + return org.jetbrains.jps.api.JpsRemoteProto.Message.Response.BuildEvent.getDefaultInstance(); } public boolean isInitialized() { return result.isInitialized(); } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.BuildEvent build() { + public org.jetbrains.jps.api.JpsRemoteProto.Message.Response.BuildEvent build() { if (result != null && !isInitialized()) { throw newUninitializedMessageException(result); } return buildPartial(); } - private org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.BuildEvent buildParsed() + private org.jetbrains.jps.api.JpsRemoteProto.Message.Response.BuildEvent buildParsed() throws com.google.protobuf.InvalidProtocolBufferException { if (!isInitialized()) { throw newUninitializedMessageException( @@ -3640,18 +3640,18 @@ public final class JpsRemoteProto { return buildPartial(); } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.BuildEvent buildPartial() { + public org.jetbrains.jps.api.JpsRemoteProto.Message.Response.BuildEvent buildPartial() { if (result == null) { throw new IllegalStateException( "build() has already been called on this Builder."); } - org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.BuildEvent returnMe = result; + org.jetbrains.jps.api.JpsRemoteProto.Message.Response.BuildEvent returnMe = result; result = null; return returnMe; } - public Builder mergeFrom(org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.BuildEvent other) { - if (other == org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.BuildEvent.getDefaultInstance()) return this; + public Builder mergeFrom(org.jetbrains.jps.api.JpsRemoteProto.Message.Response.BuildEvent other) { + if (other == org.jetbrains.jps.api.JpsRemoteProto.Message.Response.BuildEvent.getDefaultInstance()) return this; if (other.hasEventType()) { setEventType(other.getEventType()); } @@ -3678,7 +3678,7 @@ public final class JpsRemoteProto { } case 8: { int rawValue = input.readEnum(); - org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.BuildEvent.Type value = org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.BuildEvent.Type.valueOf(rawValue); + org.jetbrains.jps.api.JpsRemoteProto.Message.Response.BuildEvent.Type value = org.jetbrains.jps.api.JpsRemoteProto.Message.Response.BuildEvent.Type.valueOf(rawValue); if (value != null) { setEventType(value); } @@ -3697,10 +3697,10 @@ public final class JpsRemoteProto { public boolean hasEventType() { return result.hasEventType(); } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.BuildEvent.Type getEventType() { + public org.jetbrains.jps.api.JpsRemoteProto.Message.Response.BuildEvent.Type getEventType() { return result.getEventType(); } - public Builder setEventType(org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.BuildEvent.Type value) { + public Builder setEventType(org.jetbrains.jps.api.JpsRemoteProto.Message.Response.BuildEvent.Type value) { if (value == null) { throw new NullPointerException(); } @@ -3710,7 +3710,7 @@ public final class JpsRemoteProto { } public Builder clearEventType() { result.hasEventType = false; - result.eventType_ = org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.BuildEvent.Type.BUILD_STARTED; + result.eventType_ = org.jetbrains.jps.api.JpsRemoteProto.Message.Response.BuildEvent.Type.BUILD_STARTED; return this; } @@ -3740,7 +3740,7 @@ public final class JpsRemoteProto { static { defaultInstance = new BuildEvent(true); - org.jetbrains.jpsservice.JpsRemoteProto.internalForceInit(); + org.jetbrains.jps.api.JpsRemoteProto.internalForceInit(); defaultInstance.initFields(); } @@ -3810,9 +3810,9 @@ public final class JpsRemoteProto { // required .org.jetbrains.jpsservice.Message.Response.CompileMessage.Kind kind = 1; public static final int KIND_FIELD_NUMBER = 1; private boolean hasKind; - private org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.CompileMessage.Kind kind_; + private org.jetbrains.jps.api.JpsRemoteProto.Message.Response.CompileMessage.Kind kind_; public boolean hasKind() { return hasKind; } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.CompileMessage.Kind getKind() { return kind_; } + public org.jetbrains.jps.api.JpsRemoteProto.Message.Response.CompileMessage.Kind getKind() { return kind_; } // optional string text = 2; public static final int TEXT_FIELD_NUMBER = 2; @@ -3864,7 +3864,7 @@ public final class JpsRemoteProto { public long getColumn() { return column_; } private void initFields() { - kind_ = org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.CompileMessage.Kind.ERROR; + kind_ = org.jetbrains.jps.api.JpsRemoteProto.Message.Response.CompileMessage.Kind.ERROR; } public final boolean isInitialized() { if (!hasKind) return false; @@ -3942,41 +3942,41 @@ public final class JpsRemoteProto { return size; } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.CompileMessage parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Response.CompileMessage parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data).buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.CompileMessage parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Response.CompileMessage parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data, extensionRegistry) .buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.CompileMessage parseFrom(byte[] data) + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Response.CompileMessage parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data).buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.CompileMessage parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Response.CompileMessage parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data, extensionRegistry) .buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.CompileMessage parseFrom(java.io.InputStream input) + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Response.CompileMessage parseFrom(java.io.InputStream input) throws java.io.IOException { return newBuilder().mergeFrom(input).buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.CompileMessage parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Response.CompileMessage parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return newBuilder().mergeFrom(input, extensionRegistry) .buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.CompileMessage parseDelimitedFrom(java.io.InputStream input) + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Response.CompileMessage parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { Builder builder = newBuilder(); if (builder.mergeDelimitedFrom(input)) { @@ -3985,7 +3985,7 @@ public final class JpsRemoteProto { return null; } } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.CompileMessage parseDelimitedFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Response.CompileMessage parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -3996,12 +3996,12 @@ public final class JpsRemoteProto { return null; } } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.CompileMessage parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Response.CompileMessage parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return newBuilder().mergeFrom(input).buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.CompileMessage parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Response.CompileMessage parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -4011,26 +4011,26 @@ public final class JpsRemoteProto { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.CompileMessage prototype) { + public static Builder newBuilder(org.jetbrains.jps.api.JpsRemoteProto.Message.Response.CompileMessage prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } public static final class Builder extends com.google.protobuf.GeneratedMessageLite.Builder< - org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.CompileMessage, Builder> { - private org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.CompileMessage result; + org.jetbrains.jps.api.JpsRemoteProto.Message.Response.CompileMessage, Builder> { + private org.jetbrains.jps.api.JpsRemoteProto.Message.Response.CompileMessage result; - // Construct using org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.CompileMessage.newBuilder() + // Construct using org.jetbrains.jps.api.JpsRemoteProto.Message.Response.CompileMessage.newBuilder() private Builder() {} private static Builder create() { Builder builder = new Builder(); - builder.result = new org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.CompileMessage(); + builder.result = new org.jetbrains.jps.api.JpsRemoteProto.Message.Response.CompileMessage(); return builder; } - protected org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.CompileMessage internalGetResult() { + protected org.jetbrains.jps.api.JpsRemoteProto.Message.Response.CompileMessage internalGetResult() { return result; } @@ -4039,7 +4039,7 @@ public final class JpsRemoteProto { throw new IllegalStateException( "Cannot call clear() after build()."); } - result = new org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.CompileMessage(); + result = new org.jetbrains.jps.api.JpsRemoteProto.Message.Response.CompileMessage(); return this; } @@ -4047,21 +4047,21 @@ public final class JpsRemoteProto { return create().mergeFrom(result); } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.CompileMessage getDefaultInstanceForType() { - return org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.CompileMessage.getDefaultInstance(); + public org.jetbrains.jps.api.JpsRemoteProto.Message.Response.CompileMessage getDefaultInstanceForType() { + return org.jetbrains.jps.api.JpsRemoteProto.Message.Response.CompileMessage.getDefaultInstance(); } public boolean isInitialized() { return result.isInitialized(); } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.CompileMessage build() { + public org.jetbrains.jps.api.JpsRemoteProto.Message.Response.CompileMessage build() { if (result != null && !isInitialized()) { throw newUninitializedMessageException(result); } return buildPartial(); } - private org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.CompileMessage buildParsed() + private org.jetbrains.jps.api.JpsRemoteProto.Message.Response.CompileMessage buildParsed() throws com.google.protobuf.InvalidProtocolBufferException { if (!isInitialized()) { throw newUninitializedMessageException( @@ -4070,18 +4070,18 @@ public final class JpsRemoteProto { return buildPartial(); } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.CompileMessage buildPartial() { + public org.jetbrains.jps.api.JpsRemoteProto.Message.Response.CompileMessage buildPartial() { if (result == null) { throw new IllegalStateException( "build() has already been called on this Builder."); } - org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.CompileMessage returnMe = result; + org.jetbrains.jps.api.JpsRemoteProto.Message.Response.CompileMessage returnMe = result; result = null; return returnMe; } - public Builder mergeFrom(org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.CompileMessage other) { - if (other == org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.CompileMessage.getDefaultInstance()) return this; + public Builder mergeFrom(org.jetbrains.jps.api.JpsRemoteProto.Message.Response.CompileMessage other) { + if (other == org.jetbrains.jps.api.JpsRemoteProto.Message.Response.CompileMessage.getDefaultInstance()) return this; if (other.hasKind()) { setKind(other.getKind()); } @@ -4126,7 +4126,7 @@ public final class JpsRemoteProto { } case 8: { int rawValue = input.readEnum(); - org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.CompileMessage.Kind value = org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.CompileMessage.Kind.valueOf(rawValue); + org.jetbrains.jps.api.JpsRemoteProto.Message.Response.CompileMessage.Kind value = org.jetbrains.jps.api.JpsRemoteProto.Message.Response.CompileMessage.Kind.valueOf(rawValue); if (value != null) { setKind(value); } @@ -4169,10 +4169,10 @@ public final class JpsRemoteProto { public boolean hasKind() { return result.hasKind(); } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.CompileMessage.Kind getKind() { + public org.jetbrains.jps.api.JpsRemoteProto.Message.Response.CompileMessage.Kind getKind() { return result.getKind(); } - public Builder setKind(org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.CompileMessage.Kind value) { + public Builder setKind(org.jetbrains.jps.api.JpsRemoteProto.Message.Response.CompileMessage.Kind value) { if (value == null) { throw new NullPointerException(); } @@ -4182,7 +4182,7 @@ public final class JpsRemoteProto { } public Builder clearKind() { result.hasKind = false; - result.kind_ = org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.CompileMessage.Kind.ERROR; + result.kind_ = org.jetbrains.jps.api.JpsRemoteProto.Message.Response.CompileMessage.Kind.ERROR; return this; } @@ -4323,7 +4323,7 @@ public final class JpsRemoteProto { static { defaultInstance = new CompileMessage(true); - org.jetbrains.jpsservice.JpsRemoteProto.internalForceInit(); + org.jetbrains.jps.api.JpsRemoteProto.internalForceInit(); defaultInstance.initFields(); } @@ -4333,28 +4333,28 @@ public final class JpsRemoteProto { // required .org.jetbrains.jpsservice.Message.Response.Type response_type = 1; public static final int RESPONSE_TYPE_FIELD_NUMBER = 1; private boolean hasResponseType; - private org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.Type responseType_; + private org.jetbrains.jps.api.JpsRemoteProto.Message.Response.Type responseType_; public boolean hasResponseType() { return hasResponseType; } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.Type getResponseType() { return responseType_; } + public org.jetbrains.jps.api.JpsRemoteProto.Message.Response.Type getResponseType() { return responseType_; } // optional .org.jetbrains.jpsservice.Message.Response.BuildEvent build_event = 2; public static final int BUILD_EVENT_FIELD_NUMBER = 2; private boolean hasBuildEvent; - private org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.BuildEvent buildEvent_; + private org.jetbrains.jps.api.JpsRemoteProto.Message.Response.BuildEvent buildEvent_; public boolean hasBuildEvent() { return hasBuildEvent; } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.BuildEvent getBuildEvent() { return buildEvent_; } + public org.jetbrains.jps.api.JpsRemoteProto.Message.Response.BuildEvent getBuildEvent() { return buildEvent_; } // optional .org.jetbrains.jpsservice.Message.Response.CompileMessage compile_message = 3; public static final int COMPILE_MESSAGE_FIELD_NUMBER = 3; private boolean hasCompileMessage; - private org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.CompileMessage compileMessage_; + private org.jetbrains.jps.api.JpsRemoteProto.Message.Response.CompileMessage compileMessage_; public boolean hasCompileMessage() { return hasCompileMessage; } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.CompileMessage getCompileMessage() { return compileMessage_; } + public org.jetbrains.jps.api.JpsRemoteProto.Message.Response.CompileMessage getCompileMessage() { return compileMessage_; } private void initFields() { - responseType_ = org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.Type.BUILD_EVENT; - buildEvent_ = org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.BuildEvent.getDefaultInstance(); - compileMessage_ = org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.CompileMessage.getDefaultInstance(); + responseType_ = org.jetbrains.jps.api.JpsRemoteProto.Message.Response.Type.BUILD_EVENT; + buildEvent_ = org.jetbrains.jps.api.JpsRemoteProto.Message.Response.BuildEvent.getDefaultInstance(); + compileMessage_ = org.jetbrains.jps.api.JpsRemoteProto.Message.Response.CompileMessage.getDefaultInstance(); } public final boolean isInitialized() { if (!hasResponseType) return false; @@ -4403,41 +4403,41 @@ public final class JpsRemoteProto { return size; } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Response parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Response parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data).buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Response parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Response parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data, extensionRegistry) .buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Response parseFrom(byte[] data) + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Response parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data).buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Response parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Response parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data, extensionRegistry) .buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Response parseFrom(java.io.InputStream input) + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Response parseFrom(java.io.InputStream input) throws java.io.IOException { return newBuilder().mergeFrom(input).buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Response parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Response parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return newBuilder().mergeFrom(input, extensionRegistry) .buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Response parseDelimitedFrom(java.io.InputStream input) + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Response parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { Builder builder = newBuilder(); if (builder.mergeDelimitedFrom(input)) { @@ -4446,7 +4446,7 @@ public final class JpsRemoteProto { return null; } } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Response parseDelimitedFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Response parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -4457,12 +4457,12 @@ public final class JpsRemoteProto { return null; } } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Response parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Response parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return newBuilder().mergeFrom(input).buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message.Response parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message.Response parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -4472,26 +4472,26 @@ public final class JpsRemoteProto { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.jetbrains.jpsservice.JpsRemoteProto.Message.Response prototype) { + public static Builder newBuilder(org.jetbrains.jps.api.JpsRemoteProto.Message.Response prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } public static final class Builder extends com.google.protobuf.GeneratedMessageLite.Builder< - org.jetbrains.jpsservice.JpsRemoteProto.Message.Response, Builder> { - private org.jetbrains.jpsservice.JpsRemoteProto.Message.Response result; + org.jetbrains.jps.api.JpsRemoteProto.Message.Response, Builder> { + private org.jetbrains.jps.api.JpsRemoteProto.Message.Response result; - // Construct using org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.newBuilder() + // Construct using org.jetbrains.jps.api.JpsRemoteProto.Message.Response.newBuilder() private Builder() {} private static Builder create() { Builder builder = new Builder(); - builder.result = new org.jetbrains.jpsservice.JpsRemoteProto.Message.Response(); + builder.result = new org.jetbrains.jps.api.JpsRemoteProto.Message.Response(); return builder; } - protected org.jetbrains.jpsservice.JpsRemoteProto.Message.Response internalGetResult() { + protected org.jetbrains.jps.api.JpsRemoteProto.Message.Response internalGetResult() { return result; } @@ -4500,7 +4500,7 @@ public final class JpsRemoteProto { throw new IllegalStateException( "Cannot call clear() after build()."); } - result = new org.jetbrains.jpsservice.JpsRemoteProto.Message.Response(); + result = new org.jetbrains.jps.api.JpsRemoteProto.Message.Response(); return this; } @@ -4508,21 +4508,21 @@ public final class JpsRemoteProto { return create().mergeFrom(result); } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Response getDefaultInstanceForType() { - return org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.getDefaultInstance(); + public org.jetbrains.jps.api.JpsRemoteProto.Message.Response getDefaultInstanceForType() { + return org.jetbrains.jps.api.JpsRemoteProto.Message.Response.getDefaultInstance(); } public boolean isInitialized() { return result.isInitialized(); } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Response build() { + public org.jetbrains.jps.api.JpsRemoteProto.Message.Response build() { if (result != null && !isInitialized()) { throw newUninitializedMessageException(result); } return buildPartial(); } - private org.jetbrains.jpsservice.JpsRemoteProto.Message.Response buildParsed() + private org.jetbrains.jps.api.JpsRemoteProto.Message.Response buildParsed() throws com.google.protobuf.InvalidProtocolBufferException { if (!isInitialized()) { throw newUninitializedMessageException( @@ -4531,18 +4531,18 @@ public final class JpsRemoteProto { return buildPartial(); } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Response buildPartial() { + public org.jetbrains.jps.api.JpsRemoteProto.Message.Response buildPartial() { if (result == null) { throw new IllegalStateException( "build() has already been called on this Builder."); } - org.jetbrains.jpsservice.JpsRemoteProto.Message.Response returnMe = result; + org.jetbrains.jps.api.JpsRemoteProto.Message.Response returnMe = result; result = null; return returnMe; } - public Builder mergeFrom(org.jetbrains.jpsservice.JpsRemoteProto.Message.Response other) { - if (other == org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.getDefaultInstance()) return this; + public Builder mergeFrom(org.jetbrains.jps.api.JpsRemoteProto.Message.Response other) { + if (other == org.jetbrains.jps.api.JpsRemoteProto.Message.Response.getDefaultInstance()) return this; if (other.hasResponseType()) { setResponseType(other.getResponseType()); } @@ -4572,14 +4572,14 @@ public final class JpsRemoteProto { } case 8: { int rawValue = input.readEnum(); - org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.Type value = org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.Type.valueOf(rawValue); + org.jetbrains.jps.api.JpsRemoteProto.Message.Response.Type value = org.jetbrains.jps.api.JpsRemoteProto.Message.Response.Type.valueOf(rawValue); if (value != null) { setResponseType(value); } break; } case 18: { - org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.BuildEvent.Builder subBuilder = org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.BuildEvent.newBuilder(); + org.jetbrains.jps.api.JpsRemoteProto.Message.Response.BuildEvent.Builder subBuilder = org.jetbrains.jps.api.JpsRemoteProto.Message.Response.BuildEvent.newBuilder(); if (hasBuildEvent()) { subBuilder.mergeFrom(getBuildEvent()); } @@ -4588,7 +4588,7 @@ public final class JpsRemoteProto { break; } case 26: { - org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.CompileMessage.Builder subBuilder = org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.CompileMessage.newBuilder(); + org.jetbrains.jps.api.JpsRemoteProto.Message.Response.CompileMessage.Builder subBuilder = org.jetbrains.jps.api.JpsRemoteProto.Message.Response.CompileMessage.newBuilder(); if (hasCompileMessage()) { subBuilder.mergeFrom(getCompileMessage()); } @@ -4605,10 +4605,10 @@ public final class JpsRemoteProto { public boolean hasResponseType() { return result.hasResponseType(); } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.Type getResponseType() { + public org.jetbrains.jps.api.JpsRemoteProto.Message.Response.Type getResponseType() { return result.getResponseType(); } - public Builder setResponseType(org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.Type value) { + public Builder setResponseType(org.jetbrains.jps.api.JpsRemoteProto.Message.Response.Type value) { if (value == null) { throw new NullPointerException(); } @@ -4618,7 +4618,7 @@ public final class JpsRemoteProto { } public Builder clearResponseType() { result.hasResponseType = false; - result.responseType_ = org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.Type.BUILD_EVENT; + result.responseType_ = org.jetbrains.jps.api.JpsRemoteProto.Message.Response.Type.BUILD_EVENT; return this; } @@ -4626,10 +4626,10 @@ public final class JpsRemoteProto { public boolean hasBuildEvent() { return result.hasBuildEvent(); } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.BuildEvent getBuildEvent() { + public org.jetbrains.jps.api.JpsRemoteProto.Message.Response.BuildEvent getBuildEvent() { return result.getBuildEvent(); } - public Builder setBuildEvent(org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.BuildEvent value) { + public Builder setBuildEvent(org.jetbrains.jps.api.JpsRemoteProto.Message.Response.BuildEvent value) { if (value == null) { throw new NullPointerException(); } @@ -4637,16 +4637,16 @@ public final class JpsRemoteProto { result.buildEvent_ = value; return this; } - public Builder setBuildEvent(org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.BuildEvent.Builder builderForValue) { + public Builder setBuildEvent(org.jetbrains.jps.api.JpsRemoteProto.Message.Response.BuildEvent.Builder builderForValue) { result.hasBuildEvent = true; result.buildEvent_ = builderForValue.build(); return this; } - public Builder mergeBuildEvent(org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.BuildEvent value) { + public Builder mergeBuildEvent(org.jetbrains.jps.api.JpsRemoteProto.Message.Response.BuildEvent value) { if (result.hasBuildEvent() && - result.buildEvent_ != org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.BuildEvent.getDefaultInstance()) { + result.buildEvent_ != org.jetbrains.jps.api.JpsRemoteProto.Message.Response.BuildEvent.getDefaultInstance()) { result.buildEvent_ = - org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.BuildEvent.newBuilder(result.buildEvent_).mergeFrom(value).buildPartial(); + org.jetbrains.jps.api.JpsRemoteProto.Message.Response.BuildEvent.newBuilder(result.buildEvent_).mergeFrom(value).buildPartial(); } else { result.buildEvent_ = value; } @@ -4655,7 +4655,7 @@ public final class JpsRemoteProto { } public Builder clearBuildEvent() { result.hasBuildEvent = false; - result.buildEvent_ = org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.BuildEvent.getDefaultInstance(); + result.buildEvent_ = org.jetbrains.jps.api.JpsRemoteProto.Message.Response.BuildEvent.getDefaultInstance(); return this; } @@ -4663,10 +4663,10 @@ public final class JpsRemoteProto { public boolean hasCompileMessage() { return result.hasCompileMessage(); } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.CompileMessage getCompileMessage() { + public org.jetbrains.jps.api.JpsRemoteProto.Message.Response.CompileMessage getCompileMessage() { return result.getCompileMessage(); } - public Builder setCompileMessage(org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.CompileMessage value) { + public Builder setCompileMessage(org.jetbrains.jps.api.JpsRemoteProto.Message.Response.CompileMessage value) { if (value == null) { throw new NullPointerException(); } @@ -4674,16 +4674,16 @@ public final class JpsRemoteProto { result.compileMessage_ = value; return this; } - public Builder setCompileMessage(org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.CompileMessage.Builder builderForValue) { + public Builder setCompileMessage(org.jetbrains.jps.api.JpsRemoteProto.Message.Response.CompileMessage.Builder builderForValue) { result.hasCompileMessage = true; result.compileMessage_ = builderForValue.build(); return this; } - public Builder mergeCompileMessage(org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.CompileMessage value) { + public Builder mergeCompileMessage(org.jetbrains.jps.api.JpsRemoteProto.Message.Response.CompileMessage value) { if (result.hasCompileMessage() && - result.compileMessage_ != org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.CompileMessage.getDefaultInstance()) { + result.compileMessage_ != org.jetbrains.jps.api.JpsRemoteProto.Message.Response.CompileMessage.getDefaultInstance()) { result.compileMessage_ = - org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.CompileMessage.newBuilder(result.compileMessage_).mergeFrom(value).buildPartial(); + org.jetbrains.jps.api.JpsRemoteProto.Message.Response.CompileMessage.newBuilder(result.compileMessage_).mergeFrom(value).buildPartial(); } else { result.compileMessage_ = value; } @@ -4692,7 +4692,7 @@ public final class JpsRemoteProto { } public Builder clearCompileMessage() { result.hasCompileMessage = false; - result.compileMessage_ = org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.CompileMessage.getDefaultInstance(); + result.compileMessage_ = org.jetbrains.jps.api.JpsRemoteProto.Message.Response.CompileMessage.getDefaultInstance(); return this; } @@ -4701,7 +4701,7 @@ public final class JpsRemoteProto { static { defaultInstance = new Response(true); - org.jetbrains.jpsservice.JpsRemoteProto.internalForceInit(); + org.jetbrains.jps.api.JpsRemoteProto.internalForceInit(); defaultInstance.initFields(); } @@ -4711,44 +4711,44 @@ public final class JpsRemoteProto { // required .org.jetbrains.jpsservice.Message.UUID session_id = 1; public static final int SESSION_ID_FIELD_NUMBER = 1; private boolean hasSessionId; - private org.jetbrains.jpsservice.JpsRemoteProto.Message.UUID sessionId_; + private org.jetbrains.jps.api.JpsRemoteProto.Message.UUID sessionId_; public boolean hasSessionId() { return hasSessionId; } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.UUID getSessionId() { return sessionId_; } + public org.jetbrains.jps.api.JpsRemoteProto.Message.UUID getSessionId() { return sessionId_; } // required .org.jetbrains.jpsservice.Message.Type message_type = 2; public static final int MESSAGE_TYPE_FIELD_NUMBER = 2; private boolean hasMessageType; - private org.jetbrains.jpsservice.JpsRemoteProto.Message.Type messageType_; + private org.jetbrains.jps.api.JpsRemoteProto.Message.Type messageType_; public boolean hasMessageType() { return hasMessageType; } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Type getMessageType() { return messageType_; } + public org.jetbrains.jps.api.JpsRemoteProto.Message.Type getMessageType() { return messageType_; } // optional .org.jetbrains.jpsservice.Message.Request request = 3; public static final int REQUEST_FIELD_NUMBER = 3; private boolean hasRequest; - private org.jetbrains.jpsservice.JpsRemoteProto.Message.Request request_; + private org.jetbrains.jps.api.JpsRemoteProto.Message.Request request_; public boolean hasRequest() { return hasRequest; } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Request getRequest() { return request_; } + public org.jetbrains.jps.api.JpsRemoteProto.Message.Request getRequest() { return request_; } // optional .org.jetbrains.jpsservice.Message.Response response = 4; public static final int RESPONSE_FIELD_NUMBER = 4; private boolean hasResponse; - private org.jetbrains.jpsservice.JpsRemoteProto.Message.Response response_; + private org.jetbrains.jps.api.JpsRemoteProto.Message.Response response_; public boolean hasResponse() { return hasResponse; } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Response getResponse() { return response_; } + public org.jetbrains.jps.api.JpsRemoteProto.Message.Response getResponse() { return response_; } // optional .org.jetbrains.jpsservice.Message.Failure failure = 5; public static final int FAILURE_FIELD_NUMBER = 5; private boolean hasFailure; - private org.jetbrains.jpsservice.JpsRemoteProto.Message.Failure failure_; + private org.jetbrains.jps.api.JpsRemoteProto.Message.Failure failure_; public boolean hasFailure() { return hasFailure; } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Failure getFailure() { return failure_; } + public org.jetbrains.jps.api.JpsRemoteProto.Message.Failure getFailure() { return failure_; } private void initFields() { - sessionId_ = org.jetbrains.jpsservice.JpsRemoteProto.Message.UUID.getDefaultInstance(); - messageType_ = org.jetbrains.jpsservice.JpsRemoteProto.Message.Type.REQUEST; - request_ = org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.getDefaultInstance(); - response_ = org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.getDefaultInstance(); - failure_ = org.jetbrains.jpsservice.JpsRemoteProto.Message.Failure.getDefaultInstance(); + sessionId_ = org.jetbrains.jps.api.JpsRemoteProto.Message.UUID.getDefaultInstance(); + messageType_ = org.jetbrains.jps.api.JpsRemoteProto.Message.Type.REQUEST; + request_ = org.jetbrains.jps.api.JpsRemoteProto.Message.Request.getDefaultInstance(); + response_ = org.jetbrains.jps.api.JpsRemoteProto.Message.Response.getDefaultInstance(); + failure_ = org.jetbrains.jps.api.JpsRemoteProto.Message.Failure.getDefaultInstance(); } public final boolean isInitialized() { if (!hasSessionId) return false; @@ -4813,41 +4813,41 @@ public final class JpsRemoteProto { return size; } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data).buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data, extensionRegistry) .buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message parseFrom(byte[] data) + public static org.jetbrains.jps.api.JpsRemoteProto.Message parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data).buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data, extensionRegistry) .buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message parseFrom(java.io.InputStream input) + public static org.jetbrains.jps.api.JpsRemoteProto.Message parseFrom(java.io.InputStream input) throws java.io.IOException { return newBuilder().mergeFrom(input).buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return newBuilder().mergeFrom(input, extensionRegistry) .buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message parseDelimitedFrom(java.io.InputStream input) + public static org.jetbrains.jps.api.JpsRemoteProto.Message parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { Builder builder = newBuilder(); if (builder.mergeDelimitedFrom(input)) { @@ -4856,7 +4856,7 @@ public final class JpsRemoteProto { return null; } } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message parseDelimitedFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -4867,12 +4867,12 @@ public final class JpsRemoteProto { return null; } } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return newBuilder().mergeFrom(input).buildParsed(); } - public static org.jetbrains.jpsservice.JpsRemoteProto.Message parseFrom( + public static org.jetbrains.jps.api.JpsRemoteProto.Message parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -4882,26 +4882,26 @@ public final class JpsRemoteProto { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.jetbrains.jpsservice.JpsRemoteProto.Message prototype) { + public static Builder newBuilder(org.jetbrains.jps.api.JpsRemoteProto.Message prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } public static final class Builder extends com.google.protobuf.GeneratedMessageLite.Builder< - org.jetbrains.jpsservice.JpsRemoteProto.Message, Builder> { - private org.jetbrains.jpsservice.JpsRemoteProto.Message result; + org.jetbrains.jps.api.JpsRemoteProto.Message, Builder> { + private org.jetbrains.jps.api.JpsRemoteProto.Message result; - // Construct using org.jetbrains.jpsservice.JpsRemoteProto.Message.newBuilder() + // Construct using org.jetbrains.jps.api.JpsRemoteProto.Message.newBuilder() private Builder() {} private static Builder create() { Builder builder = new Builder(); - builder.result = new org.jetbrains.jpsservice.JpsRemoteProto.Message(); + builder.result = new org.jetbrains.jps.api.JpsRemoteProto.Message(); return builder; } - protected org.jetbrains.jpsservice.JpsRemoteProto.Message internalGetResult() { + protected org.jetbrains.jps.api.JpsRemoteProto.Message internalGetResult() { return result; } @@ -4910,7 +4910,7 @@ public final class JpsRemoteProto { throw new IllegalStateException( "Cannot call clear() after build()."); } - result = new org.jetbrains.jpsservice.JpsRemoteProto.Message(); + result = new org.jetbrains.jps.api.JpsRemoteProto.Message(); return this; } @@ -4918,21 +4918,21 @@ public final class JpsRemoteProto { return create().mergeFrom(result); } - public org.jetbrains.jpsservice.JpsRemoteProto.Message getDefaultInstanceForType() { - return org.jetbrains.jpsservice.JpsRemoteProto.Message.getDefaultInstance(); + public org.jetbrains.jps.api.JpsRemoteProto.Message getDefaultInstanceForType() { + return org.jetbrains.jps.api.JpsRemoteProto.Message.getDefaultInstance(); } public boolean isInitialized() { return result.isInitialized(); } - public org.jetbrains.jpsservice.JpsRemoteProto.Message build() { + public org.jetbrains.jps.api.JpsRemoteProto.Message build() { if (result != null && !isInitialized()) { throw newUninitializedMessageException(result); } return buildPartial(); } - private org.jetbrains.jpsservice.JpsRemoteProto.Message buildParsed() + private org.jetbrains.jps.api.JpsRemoteProto.Message buildParsed() throws com.google.protobuf.InvalidProtocolBufferException { if (!isInitialized()) { throw newUninitializedMessageException( @@ -4941,18 +4941,18 @@ public final class JpsRemoteProto { return buildPartial(); } - public org.jetbrains.jpsservice.JpsRemoteProto.Message buildPartial() { + public org.jetbrains.jps.api.JpsRemoteProto.Message buildPartial() { if (result == null) { throw new IllegalStateException( "build() has already been called on this Builder."); } - org.jetbrains.jpsservice.JpsRemoteProto.Message returnMe = result; + org.jetbrains.jps.api.JpsRemoteProto.Message returnMe = result; result = null; return returnMe; } - public Builder mergeFrom(org.jetbrains.jpsservice.JpsRemoteProto.Message other) { - if (other == org.jetbrains.jpsservice.JpsRemoteProto.Message.getDefaultInstance()) return this; + public Builder mergeFrom(org.jetbrains.jps.api.JpsRemoteProto.Message other) { + if (other == org.jetbrains.jps.api.JpsRemoteProto.Message.getDefaultInstance()) return this; if (other.hasSessionId()) { mergeSessionId(other.getSessionId()); } @@ -4987,7 +4987,7 @@ public final class JpsRemoteProto { break; } case 10: { - org.jetbrains.jpsservice.JpsRemoteProto.Message.UUID.Builder subBuilder = org.jetbrains.jpsservice.JpsRemoteProto.Message.UUID.newBuilder(); + org.jetbrains.jps.api.JpsRemoteProto.Message.UUID.Builder subBuilder = org.jetbrains.jps.api.JpsRemoteProto.Message.UUID.newBuilder(); if (hasSessionId()) { subBuilder.mergeFrom(getSessionId()); } @@ -4997,14 +4997,14 @@ public final class JpsRemoteProto { } case 16: { int rawValue = input.readEnum(); - org.jetbrains.jpsservice.JpsRemoteProto.Message.Type value = org.jetbrains.jpsservice.JpsRemoteProto.Message.Type.valueOf(rawValue); + org.jetbrains.jps.api.JpsRemoteProto.Message.Type value = org.jetbrains.jps.api.JpsRemoteProto.Message.Type.valueOf(rawValue); if (value != null) { setMessageType(value); } break; } case 26: { - org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.Builder subBuilder = org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.newBuilder(); + org.jetbrains.jps.api.JpsRemoteProto.Message.Request.Builder subBuilder = org.jetbrains.jps.api.JpsRemoteProto.Message.Request.newBuilder(); if (hasRequest()) { subBuilder.mergeFrom(getRequest()); } @@ -5013,7 +5013,7 @@ public final class JpsRemoteProto { break; } case 34: { - org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.Builder subBuilder = org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.newBuilder(); + org.jetbrains.jps.api.JpsRemoteProto.Message.Response.Builder subBuilder = org.jetbrains.jps.api.JpsRemoteProto.Message.Response.newBuilder(); if (hasResponse()) { subBuilder.mergeFrom(getResponse()); } @@ -5022,7 +5022,7 @@ public final class JpsRemoteProto { break; } case 42: { - org.jetbrains.jpsservice.JpsRemoteProto.Message.Failure.Builder subBuilder = org.jetbrains.jpsservice.JpsRemoteProto.Message.Failure.newBuilder(); + org.jetbrains.jps.api.JpsRemoteProto.Message.Failure.Builder subBuilder = org.jetbrains.jps.api.JpsRemoteProto.Message.Failure.newBuilder(); if (hasFailure()) { subBuilder.mergeFrom(getFailure()); } @@ -5039,10 +5039,10 @@ public final class JpsRemoteProto { public boolean hasSessionId() { return result.hasSessionId(); } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.UUID getSessionId() { + public org.jetbrains.jps.api.JpsRemoteProto.Message.UUID getSessionId() { return result.getSessionId(); } - public Builder setSessionId(org.jetbrains.jpsservice.JpsRemoteProto.Message.UUID value) { + public Builder setSessionId(org.jetbrains.jps.api.JpsRemoteProto.Message.UUID value) { if (value == null) { throw new NullPointerException(); } @@ -5050,16 +5050,16 @@ public final class JpsRemoteProto { result.sessionId_ = value; return this; } - public Builder setSessionId(org.jetbrains.jpsservice.JpsRemoteProto.Message.UUID.Builder builderForValue) { + public Builder setSessionId(org.jetbrains.jps.api.JpsRemoteProto.Message.UUID.Builder builderForValue) { result.hasSessionId = true; result.sessionId_ = builderForValue.build(); return this; } - public Builder mergeSessionId(org.jetbrains.jpsservice.JpsRemoteProto.Message.UUID value) { + public Builder mergeSessionId(org.jetbrains.jps.api.JpsRemoteProto.Message.UUID value) { if (result.hasSessionId() && - result.sessionId_ != org.jetbrains.jpsservice.JpsRemoteProto.Message.UUID.getDefaultInstance()) { + result.sessionId_ != org.jetbrains.jps.api.JpsRemoteProto.Message.UUID.getDefaultInstance()) { result.sessionId_ = - org.jetbrains.jpsservice.JpsRemoteProto.Message.UUID.newBuilder(result.sessionId_).mergeFrom(value).buildPartial(); + org.jetbrains.jps.api.JpsRemoteProto.Message.UUID.newBuilder(result.sessionId_).mergeFrom(value).buildPartial(); } else { result.sessionId_ = value; } @@ -5068,7 +5068,7 @@ public final class JpsRemoteProto { } public Builder clearSessionId() { result.hasSessionId = false; - result.sessionId_ = org.jetbrains.jpsservice.JpsRemoteProto.Message.UUID.getDefaultInstance(); + result.sessionId_ = org.jetbrains.jps.api.JpsRemoteProto.Message.UUID.getDefaultInstance(); return this; } @@ -5076,10 +5076,10 @@ public final class JpsRemoteProto { public boolean hasMessageType() { return result.hasMessageType(); } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Type getMessageType() { + public org.jetbrains.jps.api.JpsRemoteProto.Message.Type getMessageType() { return result.getMessageType(); } - public Builder setMessageType(org.jetbrains.jpsservice.JpsRemoteProto.Message.Type value) { + public Builder setMessageType(org.jetbrains.jps.api.JpsRemoteProto.Message.Type value) { if (value == null) { throw new NullPointerException(); } @@ -5089,7 +5089,7 @@ public final class JpsRemoteProto { } public Builder clearMessageType() { result.hasMessageType = false; - result.messageType_ = org.jetbrains.jpsservice.JpsRemoteProto.Message.Type.REQUEST; + result.messageType_ = org.jetbrains.jps.api.JpsRemoteProto.Message.Type.REQUEST; return this; } @@ -5097,10 +5097,10 @@ public final class JpsRemoteProto { public boolean hasRequest() { return result.hasRequest(); } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Request getRequest() { + public org.jetbrains.jps.api.JpsRemoteProto.Message.Request getRequest() { return result.getRequest(); } - public Builder setRequest(org.jetbrains.jpsservice.JpsRemoteProto.Message.Request value) { + public Builder setRequest(org.jetbrains.jps.api.JpsRemoteProto.Message.Request value) { if (value == null) { throw new NullPointerException(); } @@ -5108,16 +5108,16 @@ public final class JpsRemoteProto { result.request_ = value; return this; } - public Builder setRequest(org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.Builder builderForValue) { + public Builder setRequest(org.jetbrains.jps.api.JpsRemoteProto.Message.Request.Builder builderForValue) { result.hasRequest = true; result.request_ = builderForValue.build(); return this; } - public Builder mergeRequest(org.jetbrains.jpsservice.JpsRemoteProto.Message.Request value) { + public Builder mergeRequest(org.jetbrains.jps.api.JpsRemoteProto.Message.Request value) { if (result.hasRequest() && - result.request_ != org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.getDefaultInstance()) { + result.request_ != org.jetbrains.jps.api.JpsRemoteProto.Message.Request.getDefaultInstance()) { result.request_ = - org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.newBuilder(result.request_).mergeFrom(value).buildPartial(); + org.jetbrains.jps.api.JpsRemoteProto.Message.Request.newBuilder(result.request_).mergeFrom(value).buildPartial(); } else { result.request_ = value; } @@ -5126,7 +5126,7 @@ public final class JpsRemoteProto { } public Builder clearRequest() { result.hasRequest = false; - result.request_ = org.jetbrains.jpsservice.JpsRemoteProto.Message.Request.getDefaultInstance(); + result.request_ = org.jetbrains.jps.api.JpsRemoteProto.Message.Request.getDefaultInstance(); return this; } @@ -5134,10 +5134,10 @@ public final class JpsRemoteProto { public boolean hasResponse() { return result.hasResponse(); } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Response getResponse() { + public org.jetbrains.jps.api.JpsRemoteProto.Message.Response getResponse() { return result.getResponse(); } - public Builder setResponse(org.jetbrains.jpsservice.JpsRemoteProto.Message.Response value) { + public Builder setResponse(org.jetbrains.jps.api.JpsRemoteProto.Message.Response value) { if (value == null) { throw new NullPointerException(); } @@ -5145,16 +5145,16 @@ public final class JpsRemoteProto { result.response_ = value; return this; } - public Builder setResponse(org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.Builder builderForValue) { + public Builder setResponse(org.jetbrains.jps.api.JpsRemoteProto.Message.Response.Builder builderForValue) { result.hasResponse = true; result.response_ = builderForValue.build(); return this; } - public Builder mergeResponse(org.jetbrains.jpsservice.JpsRemoteProto.Message.Response value) { + public Builder mergeResponse(org.jetbrains.jps.api.JpsRemoteProto.Message.Response value) { if (result.hasResponse() && - result.response_ != org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.getDefaultInstance()) { + result.response_ != org.jetbrains.jps.api.JpsRemoteProto.Message.Response.getDefaultInstance()) { result.response_ = - org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.newBuilder(result.response_).mergeFrom(value).buildPartial(); + org.jetbrains.jps.api.JpsRemoteProto.Message.Response.newBuilder(result.response_).mergeFrom(value).buildPartial(); } else { result.response_ = value; } @@ -5163,7 +5163,7 @@ public final class JpsRemoteProto { } public Builder clearResponse() { result.hasResponse = false; - result.response_ = org.jetbrains.jpsservice.JpsRemoteProto.Message.Response.getDefaultInstance(); + result.response_ = org.jetbrains.jps.api.JpsRemoteProto.Message.Response.getDefaultInstance(); return this; } @@ -5171,10 +5171,10 @@ public final class JpsRemoteProto { public boolean hasFailure() { return result.hasFailure(); } - public org.jetbrains.jpsservice.JpsRemoteProto.Message.Failure getFailure() { + public org.jetbrains.jps.api.JpsRemoteProto.Message.Failure getFailure() { return result.getFailure(); } - public Builder setFailure(org.jetbrains.jpsservice.JpsRemoteProto.Message.Failure value) { + public Builder setFailure(org.jetbrains.jps.api.JpsRemoteProto.Message.Failure value) { if (value == null) { throw new NullPointerException(); } @@ -5182,16 +5182,16 @@ public final class JpsRemoteProto { result.failure_ = value; return this; } - public Builder setFailure(org.jetbrains.jpsservice.JpsRemoteProto.Message.Failure.Builder builderForValue) { + public Builder setFailure(org.jetbrains.jps.api.JpsRemoteProto.Message.Failure.Builder builderForValue) { result.hasFailure = true; result.failure_ = builderForValue.build(); return this; } - public Builder mergeFailure(org.jetbrains.jpsservice.JpsRemoteProto.Message.Failure value) { + public Builder mergeFailure(org.jetbrains.jps.api.JpsRemoteProto.Message.Failure value) { if (result.hasFailure() && - result.failure_ != org.jetbrains.jpsservice.JpsRemoteProto.Message.Failure.getDefaultInstance()) { + result.failure_ != org.jetbrains.jps.api.JpsRemoteProto.Message.Failure.getDefaultInstance()) { result.failure_ = - org.jetbrains.jpsservice.JpsRemoteProto.Message.Failure.newBuilder(result.failure_).mergeFrom(value).buildPartial(); + org.jetbrains.jps.api.JpsRemoteProto.Message.Failure.newBuilder(result.failure_).mergeFrom(value).buildPartial(); } else { result.failure_ = value; } @@ -5200,7 +5200,7 @@ public final class JpsRemoteProto { } public Builder clearFailure() { result.hasFailure = false; - result.failure_ = org.jetbrains.jpsservice.JpsRemoteProto.Message.Failure.getDefaultInstance(); + result.failure_ = org.jetbrains.jps.api.JpsRemoteProto.Message.Failure.getDefaultInstance(); return this; } @@ -5209,7 +5209,7 @@ public final class JpsRemoteProto { static { defaultInstance = new Message(true); - org.jetbrains.jpsservice.JpsRemoteProto.internalForceInit(); + org.jetbrains.jps.api.JpsRemoteProto.internalForceInit(); defaultInstance.initFields(); } diff --git a/java/compiler/compile-server/src/org/jetbrains/jpsservice/JpsServerResponseHandler.java b/jps/jps-builders/src/org/jetbrains/jps/api/JpsServerResponseHandler.java similarity index 93% rename from java/compiler/compile-server/src/org/jetbrains/jpsservice/JpsServerResponseHandler.java rename to jps/jps-builders/src/org/jetbrains/jps/api/JpsServerResponseHandler.java index 0ebd1b400379..d0838afe9fbb 100644 --- a/java/compiler/compile-server/src/org/jetbrains/jpsservice/JpsServerResponseHandler.java +++ b/jps/jps-builders/src/org/jetbrains/jps/api/JpsServerResponseHandler.java @@ -1,4 +1,4 @@ -package org.jetbrains.jpsservice; +package org.jetbrains.jps.api; /** * @author Eugene Zhuravlev diff --git a/java/compiler/compile-server/src/org/jetbrains/jpsservice/JpsServerResponseHandlerAdapter.java b/jps/jps-builders/src/org/jetbrains/jps/api/JpsServerResponseHandlerAdapter.java similarity index 93% rename from java/compiler/compile-server/src/org/jetbrains/jpsservice/JpsServerResponseHandlerAdapter.java rename to jps/jps-builders/src/org/jetbrains/jps/api/JpsServerResponseHandlerAdapter.java index 87ef7fd75153..1d4add51996f 100644 --- a/java/compiler/compile-server/src/org/jetbrains/jpsservice/JpsServerResponseHandlerAdapter.java +++ b/jps/jps-builders/src/org/jetbrains/jps/api/JpsServerResponseHandlerAdapter.java @@ -1,4 +1,4 @@ -package org.jetbrains.jpsservice; +package org.jetbrains.jps.api; /** * @author Eugene Zhuravlev diff --git a/java/compiler/compile-server/src/org/jetbrains/jpsservice/impl/ProtoUtil.java b/jps/jps-builders/src/org/jetbrains/jps/api/ProtoUtil.java similarity index 98% rename from java/compiler/compile-server/src/org/jetbrains/jpsservice/impl/ProtoUtil.java rename to jps/jps-builders/src/org/jetbrains/jps/api/ProtoUtil.java index 0e522b6ef37c..0a1c2d3d6a87 100644 --- a/java/compiler/compile-server/src/org/jetbrains/jpsservice/impl/ProtoUtil.java +++ b/jps/jps-builders/src/org/jetbrains/jps/api/ProtoUtil.java @@ -1,11 +1,8 @@ -package org.jetbrains.jpsservice.impl; +package org.jetbrains.jps.api; import org.jetbrains.annotations.Nullable; import org.jetbrains.jps.incremental.messages.BuildMessage; import org.jetbrains.jps.incremental.messages.CompilerMessage; -import org.jetbrains.jps.server.GlobalLibrary; -import org.jetbrains.jps.server.SdkLibrary; -import org.jetbrains.jpsservice.JpsRemoteProto; import java.io.ByteArrayOutputStream; import java.io.PrintStream; diff --git a/java/compiler/compile-server/src/org/jetbrains/jpsservice/RequestFuture.java b/jps/jps-builders/src/org/jetbrains/jps/api/RequestFuture.java similarity index 98% rename from java/compiler/compile-server/src/org/jetbrains/jpsservice/RequestFuture.java rename to jps/jps-builders/src/org/jetbrains/jps/api/RequestFuture.java index 81c3f3f8f039..9424ce8a8ff4 100644 --- a/java/compiler/compile-server/src/org/jetbrains/jpsservice/RequestFuture.java +++ b/jps/jps-builders/src/org/jetbrains/jps/api/RequestFuture.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jetbrains.jpsservice; +package org.jetbrains.jps.api; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/jps/serverFacade/src/org/jetbrains/jps/server/SdkLibrary.java b/jps/jps-builders/src/org/jetbrains/jps/api/SdkLibrary.java similarity index 79% rename from jps/serverFacade/src/org/jetbrains/jps/server/SdkLibrary.java rename to jps/jps-builders/src/org/jetbrains/jps/api/SdkLibrary.java index df77fa1d2e63..891d87d490d9 100644 --- a/jps/serverFacade/src/org/jetbrains/jps/server/SdkLibrary.java +++ b/jps/jps-builders/src/org/jetbrains/jps/api/SdkLibrary.java @@ -1,4 +1,4 @@ -package org.jetbrains.jps.server; +package org.jetbrains.jps.api; import java.util.List; @@ -6,7 +6,7 @@ import java.util.List; * @author Eugene Zhuravlev * Date: 10/4/11 */ -public class SdkLibrary extends GlobalLibrary{ +public class SdkLibrary extends GlobalLibrary { private final String myHomePath; diff --git a/java/compiler/compile-server/src/org/jetbrains/jpsservice/Client.java b/jps/jps-builders/src/org/jetbrains/jps/client/Client.java similarity index 95% rename from java/compiler/compile-server/src/org/jetbrains/jpsservice/Client.java rename to jps/jps-builders/src/org/jetbrains/jps/client/Client.java index f2c394ca376b..53d5d2e8f50d 100644 --- a/java/compiler/compile-server/src/org/jetbrains/jpsservice/Client.java +++ b/jps/jps-builders/src/org/jetbrains/jps/client/Client.java @@ -1,4 +1,4 @@ -package org.jetbrains.jpsservice; +package org.jetbrains.jps.client; import org.jboss.netty.bootstrap.ClientBootstrap; import org.jboss.netty.channel.*; @@ -9,9 +9,7 @@ import org.jboss.netty.handler.codec.protobuf.ProtobufVarint32FrameDecoder; import org.jboss.netty.handler.codec.protobuf.ProtobufVarint32LengthFieldPrepender; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jps.server.GlobalLibrary; -import org.jetbrains.jpsservice.impl.JpsClientMessageHandler; -import org.jetbrains.jpsservice.impl.ProtoUtil; +import org.jetbrains.jps.api.*; import java.net.InetSocketAddress; import java.util.*; @@ -44,11 +42,11 @@ public class Client { new ProtobufDecoder(JpsRemoteProto.Message.getDefaultInstance()), new ProtobufVarint32LengthFieldPrepender(), new ProtobufEncoder(), - new JpsClientMessageHandler() { + new ClientMessageHandler() { protected JpsServerResponseHandler getHandler(UUID sessionId) { final RequestFuture future = myHandlers.get(sessionId); - return future != null? future.getHandler() : null; + return future != null ? future.getHandler() : null; } protected void terminateSession(UUID sessionId) { diff --git a/java/compiler/compile-server/src/org/jetbrains/jpsservice/impl/JpsClientMessageHandler.java b/jps/jps-builders/src/org/jetbrains/jps/client/ClientMessageHandler.java similarity index 90% rename from java/compiler/compile-server/src/org/jetbrains/jpsservice/impl/JpsClientMessageHandler.java rename to jps/jps-builders/src/org/jetbrains/jps/client/ClientMessageHandler.java index 7533b181926c..67033c7a64e6 100644 --- a/java/compiler/compile-server/src/org/jetbrains/jpsservice/impl/JpsClientMessageHandler.java +++ b/jps/jps-builders/src/org/jetbrains/jps/client/ClientMessageHandler.java @@ -1,12 +1,13 @@ -package org.jetbrains.jpsservice.impl; +package org.jetbrains.jps.client; import org.jboss.netty.channel.ChannelHandlerContext; import org.jboss.netty.channel.ExceptionEvent; import org.jboss.netty.channel.MessageEvent; import org.jboss.netty.channel.SimpleChannelHandler; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jpsservice.JpsRemoteProto; -import org.jetbrains.jpsservice.JpsServerResponseHandler; +import org.jetbrains.jps.api.JpsRemoteProto; +import org.jetbrains.jps.api.JpsServerResponseHandler; +import org.jetbrains.jps.api.ProtoUtil; import java.util.UUID; @@ -14,7 +15,7 @@ import java.util.UUID; * @author Eugene Zhuravlev * Date: 8/11/11 */ -public abstract class JpsClientMessageHandler extends SimpleChannelHandler{ +abstract class ClientMessageHandler extends SimpleChannelHandler{ public final void messageReceived(ChannelHandlerContext ctx, MessageEvent e) throws Exception { final JpsRemoteProto.Message message = (JpsRemoteProto.Message)e.getMessage(); diff --git a/jps/serverFacade/src/org/jetbrains/jps/incremental/BuildTask.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/BuildTask.java similarity index 100% rename from jps/serverFacade/src/org/jetbrains/jps/incremental/BuildTask.java rename to jps/jps-builders/src/org/jetbrains/jps/incremental/BuildTask.java diff --git a/jps/serverFacade/src/org/jetbrains/jps/incremental/Builder.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/Builder.java similarity index 100% rename from jps/serverFacade/src/org/jetbrains/jps/incremental/Builder.java rename to jps/jps-builders/src/org/jetbrains/jps/incremental/Builder.java diff --git a/jps/serverFacade/src/org/jetbrains/jps/incremental/BuilderCategory.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/BuilderCategory.java similarity index 100% rename from jps/serverFacade/src/org/jetbrains/jps/incremental/BuilderCategory.java rename to jps/jps-builders/src/org/jetbrains/jps/incremental/BuilderCategory.java diff --git a/jps/serverFacade/src/org/jetbrains/jps/incremental/BuilderRegistry.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/BuilderRegistry.java similarity index 100% rename from jps/serverFacade/src/org/jetbrains/jps/incremental/BuilderRegistry.java rename to jps/jps-builders/src/org/jetbrains/jps/incremental/BuilderRegistry.java diff --git a/jps/serverFacade/src/org/jetbrains/jps/incremental/CompileContext.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/CompileContext.java similarity index 100% rename from jps/serverFacade/src/org/jetbrains/jps/incremental/CompileContext.java rename to jps/jps-builders/src/org/jetbrains/jps/incremental/CompileContext.java diff --git a/jps/serverFacade/src/org/jetbrains/jps/incremental/CompileScope.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/CompileScope.java similarity index 100% rename from jps/serverFacade/src/org/jetbrains/jps/incremental/CompileScope.java rename to jps/jps-builders/src/org/jetbrains/jps/incremental/CompileScope.java diff --git a/jps/serverFacade/src/org/jetbrains/jps/incremental/FSSnapshot.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/FSSnapshot.java similarity index 100% rename from jps/serverFacade/src/org/jetbrains/jps/incremental/FSSnapshot.java rename to jps/jps-builders/src/org/jetbrains/jps/incremental/FSSnapshot.java diff --git a/jps/serverFacade/src/org/jetbrains/jps/incremental/FSSnapshotBuilder.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/FSSnapshotBuilder.java similarity index 100% rename from jps/serverFacade/src/org/jetbrains/jps/incremental/FSSnapshotBuilder.java rename to jps/jps-builders/src/org/jetbrains/jps/incremental/FSSnapshotBuilder.java diff --git a/jps/serverFacade/src/org/jetbrains/jps/incremental/FileProcessor.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/FileProcessor.java similarity index 100% rename from jps/serverFacade/src/org/jetbrains/jps/incremental/FileProcessor.java rename to jps/jps-builders/src/org/jetbrains/jps/incremental/FileProcessor.java diff --git a/jps/serverFacade/src/org/jetbrains/jps/incremental/FilesCollector.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/FilesCollector.java similarity index 100% rename from jps/serverFacade/src/org/jetbrains/jps/incremental/FilesCollector.java rename to jps/jps-builders/src/org/jetbrains/jps/incremental/FilesCollector.java diff --git a/jps/serverFacade/src/org/jetbrains/jps/incremental/IncProjectBuilder.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java similarity index 100% rename from jps/serverFacade/src/org/jetbrains/jps/incremental/IncProjectBuilder.java rename to jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java diff --git a/jps/serverFacade/src/org/jetbrains/jps/incremental/MessageHandler.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/MessageHandler.java similarity index 100% rename from jps/serverFacade/src/org/jetbrains/jps/incremental/MessageHandler.java rename to jps/jps-builders/src/org/jetbrains/jps/incremental/MessageHandler.java diff --git a/jps/serverFacade/src/org/jetbrains/jps/incremental/ProjectBuildException.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/ProjectBuildException.java similarity index 100% rename from jps/serverFacade/src/org/jetbrains/jps/incremental/ProjectBuildException.java rename to jps/jps-builders/src/org/jetbrains/jps/incremental/ProjectBuildException.java diff --git a/jps/serverFacade/src/org/jetbrains/jps/incremental/ResourcePatterns.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/ResourcePatterns.java similarity index 100% rename from jps/serverFacade/src/org/jetbrains/jps/incremental/ResourcePatterns.java rename to jps/jps-builders/src/org/jetbrains/jps/incremental/ResourcePatterns.java diff --git a/jps/serverFacade/src/org/jetbrains/jps/incremental/forms/FormsBuilder.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/forms/FormsBuilder.java similarity index 100% rename from jps/serverFacade/src/org/jetbrains/jps/incremental/forms/FormsBuilder.java rename to jps/jps-builders/src/org/jetbrains/jps/incremental/forms/FormsBuilder.java diff --git a/jps/serverFacade/src/org/jetbrains/jps/incremental/java/EmbeddedJavac.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/java/EmbeddedJavac.java similarity index 100% rename from jps/serverFacade/src/org/jetbrains/jps/incremental/java/EmbeddedJavac.java rename to jps/jps-builders/src/org/jetbrains/jps/incremental/java/EmbeddedJavac.java diff --git a/jps/serverFacade/src/org/jetbrains/jps/incremental/java/FormsParsing.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/java/FormsParsing.java similarity index 100% rename from jps/serverFacade/src/org/jetbrains/jps/incremental/java/FormsParsing.java rename to jps/jps-builders/src/org/jetbrains/jps/incremental/java/FormsParsing.java diff --git a/jps/serverFacade/src/org/jetbrains/jps/incremental/java/JavaBuilder.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java similarity index 100% rename from jps/serverFacade/src/org/jetbrains/jps/incremental/java/JavaBuilder.java rename to jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java diff --git a/jps/serverFacade/src/org/jetbrains/jps/incremental/java/JavacFileManager.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavacFileManager.java similarity index 100% rename from jps/serverFacade/src/org/jetbrains/jps/incremental/java/JavacFileManager.java rename to jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavacFileManager.java diff --git a/jps/serverFacade/src/org/jetbrains/jps/incremental/java/LineOutputWriter.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/java/LineOutputWriter.java similarity index 100% rename from jps/serverFacade/src/org/jetbrains/jps/incremental/java/LineOutputWriter.java rename to jps/jps-builders/src/org/jetbrains/jps/incremental/java/LineOutputWriter.java diff --git a/jps/serverFacade/src/org/jetbrains/jps/incremental/java/OutputFileObject.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/java/OutputFileObject.java similarity index 100% rename from jps/serverFacade/src/org/jetbrains/jps/incremental/java/OutputFileObject.java rename to jps/jps-builders/src/org/jetbrains/jps/incremental/java/OutputFileObject.java diff --git a/jps/serverFacade/src/org/jetbrains/jps/incremental/java/PlainMessageDiagnostic.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/java/PlainMessageDiagnostic.java similarity index 92% rename from jps/serverFacade/src/org/jetbrains/jps/incremental/java/PlainMessageDiagnostic.java rename to jps/jps-builders/src/org/jetbrains/jps/incremental/java/PlainMessageDiagnostic.java index ca8f9d9f1fbf..e35b152d9f2e 100644 --- a/jps/serverFacade/src/org/jetbrains/jps/incremental/java/PlainMessageDiagnostic.java +++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/java/PlainMessageDiagnostic.java @@ -1,7 +1,6 @@ package org.jetbrains.jps.incremental.java; -import javax.tools.Diagnostic; -import javax.tools.JavaFileObject; +import javax.tools.*; import java.util.Locale; /** diff --git a/jps/serverFacade/src/org/jetbrains/jps/incremental/java/SequentialTaskExecutor.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/java/SequentialTaskExecutor.java similarity index 100% rename from jps/serverFacade/src/org/jetbrains/jps/incremental/java/SequentialTaskExecutor.java rename to jps/jps-builders/src/org/jetbrains/jps/incremental/java/SequentialTaskExecutor.java diff --git a/jps/serverFacade/src/org/jetbrains/jps/incremental/messages/BuildMessage.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/messages/BuildMessage.java similarity index 100% rename from jps/serverFacade/src/org/jetbrains/jps/incremental/messages/BuildMessage.java rename to jps/jps-builders/src/org/jetbrains/jps/incremental/messages/BuildMessage.java diff --git a/jps/serverFacade/src/org/jetbrains/jps/incremental/messages/CompilerMessage.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/messages/CompilerMessage.java similarity index 100% rename from jps/serverFacade/src/org/jetbrains/jps/incremental/messages/CompilerMessage.java rename to jps/jps-builders/src/org/jetbrains/jps/incremental/messages/CompilerMessage.java diff --git a/jps/serverFacade/src/org/jetbrains/jps/incremental/messages/ProgressMessage.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/messages/ProgressMessage.java similarity index 100% rename from jps/serverFacade/src/org/jetbrains/jps/incremental/messages/ProgressMessage.java rename to jps/jps-builders/src/org/jetbrains/jps/incremental/messages/ProgressMessage.java diff --git a/jps/serverFacade/src/org/jetbrains/jps/incremental/resourses/ResourcesBuilder.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/resourses/ResourcesBuilder.java similarity index 100% rename from jps/serverFacade/src/org/jetbrains/jps/incremental/resourses/ResourcesBuilder.java rename to jps/jps-builders/src/org/jetbrains/jps/incremental/resourses/ResourcesBuilder.java diff --git a/jps/serverFacade/src/org/jetbrains/jps/incremental/storage/AbstractStateStorage.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/storage/AbstractStateStorage.java similarity index 100% rename from jps/serverFacade/src/org/jetbrains/jps/incremental/storage/AbstractStateStorage.java rename to jps/jps-builders/src/org/jetbrains/jps/incremental/storage/AbstractStateStorage.java diff --git a/jps/serverFacade/src/org/jetbrains/jps/incremental/storage/BuildDataManager.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/storage/BuildDataManager.java similarity index 100% rename from jps/serverFacade/src/org/jetbrains/jps/incremental/storage/BuildDataManager.java rename to jps/jps-builders/src/org/jetbrains/jps/incremental/storage/BuildDataManager.java diff --git a/jps/serverFacade/src/org/jetbrains/jps/incremental/storage/TimestampStorage.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/storage/TimestampStorage.java similarity index 100% rename from jps/serverFacade/src/org/jetbrains/jps/incremental/storage/TimestampStorage.java rename to jps/jps-builders/src/org/jetbrains/jps/incremental/storage/TimestampStorage.java diff --git a/jps/serverFacade/src/org/jetbrains/jps/incremental/storage/TimestampValidityState.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/storage/TimestampValidityState.java similarity index 100% rename from jps/serverFacade/src/org/jetbrains/jps/incremental/storage/TimestampValidityState.java rename to jps/jps-builders/src/org/jetbrains/jps/incremental/storage/TimestampValidityState.java diff --git a/jps/serverFacade/src/org/jetbrains/jps/incremental/storage/ValidityState.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/storage/ValidityState.java similarity index 100% rename from jps/serverFacade/src/org/jetbrains/jps/incremental/storage/ValidityState.java rename to jps/jps-builders/src/org/jetbrains/jps/incremental/storage/ValidityState.java diff --git a/jps/serverFacade/src/org/jetbrains/jps/server/Bootstrap.java b/jps/jps-builders/src/org/jetbrains/jps/server/ClasspathBootstrap.java similarity index 69% rename from jps/serverFacade/src/org/jetbrains/jps/server/Bootstrap.java rename to jps/jps-builders/src/org/jetbrains/jps/server/ClasspathBootstrap.java index 3a6c2a92c562..5381394f8124 100644 --- a/jps/serverFacade/src/org/jetbrains/jps/server/Bootstrap.java +++ b/jps/jps-builders/src/org/jetbrains/jps/server/ClasspathBootstrap.java @@ -32,17 +32,20 @@ import java.util.ArrayList; import java.util.List; /** - * Bootstrap class for dependency handling * @author Eugene Zhuravlev * Date: 9/12/11 */ -public class Bootstrap { - private Bootstrap() { +public class ClasspathBootstrap { + private ClasspathBootstrap() { } + public static final String JPS_RUNTIME_PATH = "rt/jps-incremental"; + public static List getApplicationClasspath() { final List cp = new ArrayList(); - cp.add(getResourcePath(Facade.class)); // server facade module + cp.add(getResourcePath(Server.class)); + cp.add(getResourcePath(com.google.protobuf.Message.class)); // protobuf + cp.add(getResourcePath(org.jboss.netty.bootstrap.Bootstrap.class)); // netty cp.add(getResourcePath(TIntHash.class)); // trove cp.add(getResourcePath(FileUtil.class)); // util module cp.add(getResourcePath(ClassWriter.class)); // asm @@ -56,6 +59,27 @@ public class Bootstrap { cp.add(getResourcePath(NotNullVerifyingInstrumenter.class)); // not-null cp.add(getResourcePath(IXMLBuilder.class)); // nano-xml + //final File jpsRuntime = new File(jpsFacadeJar.getParentFile(), JPS_RUNTIME_PATH); + //final File[] files = jpsRuntime.listFiles(); + //if (files != null) { + // for (File file : files) { + // final String name = file.getName(); + // final boolean shouldAdd = + // name.endsWith("jar") && + // (name.startsWith("ant") || + // name.startsWith("jps") || + // name.startsWith("asm") || + // name.startsWith("gant")|| + // name.startsWith("groovy") || + // name.startsWith("javac2") || + // name.startsWith("util") || + // name.startsWith("trove") + // ); + // if (shouldAdd) { + // cp.add(file); + // } + // } + //} return cp; } diff --git a/java/compiler/compile-server/src/org/jetbrains/jpsservice/Server.java b/jps/jps-builders/src/org/jetbrains/jps/server/Server.java similarity index 94% rename from java/compiler/compile-server/src/org/jetbrains/jpsservice/Server.java rename to jps/jps-builders/src/org/jetbrains/jps/server/Server.java index 08dfb941f1cd..cd9db52a0c62 100644 --- a/java/compiler/compile-server/src/org/jetbrains/jpsservice/Server.java +++ b/jps/jps-builders/src/org/jetbrains/jps/server/Server.java @@ -1,4 +1,4 @@ -package org.jetbrains.jpsservice; +package org.jetbrains.jps.server; import org.jboss.netty.bootstrap.ServerBootstrap; import org.jboss.netty.channel.*; @@ -10,7 +10,7 @@ import org.jboss.netty.handler.codec.protobuf.ProtobufDecoder; import org.jboss.netty.handler.codec.protobuf.ProtobufEncoder; import org.jboss.netty.handler.codec.protobuf.ProtobufVarint32FrameDecoder; import org.jboss.netty.handler.codec.protobuf.ProtobufVarint32LengthFieldPrepender; -import org.jetbrains.jpsservice.impl.JpsServerMessageHandler; +import org.jetbrains.jps.api.JpsRemoteProto; import java.net.InetSocketAddress; import java.util.concurrent.ExecutorService; @@ -34,7 +34,7 @@ public class Server { myBuildsExecutor = Executors.newFixedThreadPool(MAX_SIMULTANEOUS_BUILD_SESSIONS); myChannelFactory = new NioServerSocketChannelFactory(threadPool, threadPool, 1); final ChannelRegistrar channelRegistrar = new ChannelRegistrar(); - final JpsServerMessageHandler messageHandler = new JpsServerMessageHandler(myBuildsExecutor, this); + final ServerMessageHandler messageHandler = new ServerMessageHandler(myBuildsExecutor, this); myPipelineFactory = new ChannelPipelineFactory() { public ChannelPipeline getPipeline() throws Exception { return Channels.pipeline( diff --git a/java/compiler/compile-server/src/org/jetbrains/jpsservice/impl/JpsServerMessageHandler.java b/jps/jps-builders/src/org/jetbrains/jps/server/ServerMessageHandler.java similarity index 94% rename from java/compiler/compile-server/src/org/jetbrains/jpsservice/impl/JpsServerMessageHandler.java rename to jps/jps-builders/src/org/jetbrains/jps/server/ServerMessageHandler.java index d311abeedc1b..9ce881d8d327 100644 --- a/java/compiler/compile-server/src/org/jetbrains/jpsservice/impl/JpsServerMessageHandler.java +++ b/jps/jps-builders/src/org/jetbrains/jps/server/ServerMessageHandler.java @@ -1,13 +1,11 @@ -package org.jetbrains.jpsservice.impl; +package org.jetbrains.jps.server; import org.jboss.netty.channel.*; import org.jetbrains.annotations.Nullable; +import org.jetbrains.jps.api.*; import org.jetbrains.jps.incremental.MessageHandler; import org.jetbrains.jps.incremental.messages.BuildMessage; import org.jetbrains.jps.incremental.messages.CompilerMessage; -import org.jetbrains.jps.server.*; -import org.jetbrains.jpsservice.JpsRemoteProto; -import org.jetbrains.jpsservice.Server; import java.io.ByteArrayOutputStream; import java.io.PrintStream; @@ -19,12 +17,12 @@ import java.util.concurrent.ExecutorService; * @author Eugene Zhuravlev * Date: 8/11/11 */ -public class JpsServerMessageHandler extends SimpleChannelHandler { +class ServerMessageHandler extends SimpleChannelHandler { private final ConcurrentHashMap myBuildsInProgress = new ConcurrentHashMap(); private final ExecutorService myBuildsExecutor; private final Server myServer; - public JpsServerMessageHandler(ExecutorService buildsExecutor, Server server) { + public ServerMessageHandler(ExecutorService buildsExecutor, Server server) { myBuildsExecutor = buildsExecutor; myServer = server; } @@ -44,7 +42,7 @@ public class JpsServerMessageHandler extends SimpleChannelHandler { else { final JpsRemoteProto.Message.Request request = message.getRequest(); final JpsRemoteProto.Message.Request.Type requestType = request.getRequestType(); - final Facade facade = Facade.getInstance(); + final ServerState facade = ServerState.getInstance(); switch (requestType) { case COMPILE_REQUEST : reply = startBuild(sessionId, ctx, request.getCompileRequest()); @@ -160,7 +158,7 @@ public class JpsServerMessageHandler extends SimpleChannelHandler { Channels.write(myChannelContext.getChannel(), ProtoUtil.toMessage(mySessionId, ProtoUtil.createBuildStartedEvent("build started"))); Throwable error = null; try { - Facade.getInstance().startBuild(myProjectPath, myModules, myParams, new MessageHandler() { + ServerState.getInstance().startBuild(myProjectPath, myModules, myParams, new MessageHandler() { public void processMessage(BuildMessage buildMessage) { final JpsRemoteProto.Message.Response response; if (buildMessage instanceof CompilerMessage) { diff --git a/jps/serverFacade/src/org/jetbrains/jps/server/Facade.java b/jps/jps-builders/src/org/jetbrains/jps/server/ServerState.java similarity index 94% rename from jps/serverFacade/src/org/jetbrains/jps/server/Facade.java rename to jps/jps-builders/src/org/jetbrains/jps/server/ServerState.java index 418c07718876..ff1cd7c09307 100644 --- a/jps/serverFacade/src/org/jetbrains/jps/server/Facade.java +++ b/jps/jps-builders/src/org/jetbrains/jps/server/ServerState.java @@ -5,6 +5,9 @@ import org.jetbrains.jps.JavaSdk; import org.jetbrains.jps.Library; import org.jetbrains.jps.Module; import org.jetbrains.jps.Project; +import org.jetbrains.jps.api.BuildParameters; +import org.jetbrains.jps.api.GlobalLibrary; +import org.jetbrains.jps.api.SdkLibrary; import org.jetbrains.jps.idea.IdeaProjectLoader; import org.jetbrains.jps.incremental.BuilderRegistry; import org.jetbrains.jps.incremental.CompileScope; @@ -19,7 +22,7 @@ import java.util.*; * Date: 9/10/11 * @noinspection UnusedDeclaration */ -public class Facade { +class ServerState { public static final String IDEA_PROJECT_DIRNAME = ".idea"; private final Map myProjects = new HashMap(); @@ -135,10 +138,10 @@ public class Facade { } private static class InstanceHolder { - static final Facade ourInstance = new Facade(); + static final ServerState ourInstance = new ServerState(); } - public static Facade getInstance() { + public static ServerState getInstance() { return InstanceHolder.ourInstance; } diff --git a/jps/serverFacade/jps-builders.iml b/jps/serverFacade/jps-builders.iml new file mode 100644 index 000000000000..1c5e2811824b --- /dev/null +++ b/jps/serverFacade/jps-builders.iml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lib/jps-facade.jar b/lib/jps-facade.jar deleted file mode 100644 index 84fc53d25228..000000000000 Binary files a/lib/jps-facade.jar and /dev/null differ diff --git a/lib/required_for_dist.txt b/lib/required_for_dist.txt index 18d003287dd8..839d72212d9b 100644 --- a/lib/required_for_dist.txt +++ b/lib/required_for_dist.txt @@ -44,4 +44,3 @@ xstream.jar swingx-core-1.6.2.jar netty-3.2.5.Final.jar protobuf-2.3.0.jar -jps-facade.jar diff --git a/lib/rt/jps-incremental/groovy-all-1.7.1.jar b/lib/rt/jps-incremental/groovy-all-1.7.1.jar deleted file mode 100644 index ac515a39ac4a..000000000000 Binary files a/lib/rt/jps-incremental/groovy-all-1.7.1.jar and /dev/null differ diff --git a/lib/rt/jps-incremental/src/jps-sources.zip b/lib/rt/jps-incremental/src/jps-sources.zip deleted file mode 100644 index 41b5f5a1023a..000000000000 Binary files a/lib/rt/jps-incremental/src/jps-sources.zip and /dev/null differ diff --git a/lib/rt/required_for_dist.txt b/lib/rt/required_for_dist.txt index d928269ee93f..e69de29bb2d1 100644 --- a/lib/rt/required_for_dist.txt +++ b/lib/rt/required_for_dist.txt @@ -1,12 +0,0 @@ -jps-incremental/ant-1.7.1.jar -jps-incremental/ant-launcher.jar -jps-incremental/asm-all-3.3.1.jar -jps-incremental/gant-1.9.5_groovy-1.7.10.jar -jps-incremental/groovy-all-1.7.1.jar -jps-incremental/javac2-all.jar -jps-incremental/jps.jar -jps-incremental/jps-gwt.jar -jps-incremental/jps-javaee.jar -jps-incremental/jps-jpa.jar -jps-incremental/util.jar -jps-incremental/trove4j.jar