From 4027169d2293beb4e641c6b62e31aba2468fac27 Mon Sep 17 00:00:00 2001
From: nik <Nikolay.Chashnikov@jetbrains.com>
Date: Wed, 13 Oct 2010 11:49:06 +0400
Subject: [PATCH] constructor replaced with factory method

---
 .../io/socketConnection/SocketConnection.java |  2 ++
 .../SocketConnectionFactory.java              | 36 +++++++++++++++++++
 .../impl/SocketConnectionImpl.java            | 27 +++++++-------
 3 files changed, 52 insertions(+), 13 deletions(-)
 create mode 100644 platform/platform-impl/src/com/intellij/util/io/socketConnection/SocketConnectionFactory.java

diff --git a/platform/platform-impl/src/com/intellij/util/io/socketConnection/SocketConnection.java b/platform/platform-impl/src/com/intellij/util/io/socketConnection/SocketConnection.java
index 52d22fd19ad3..54367aba1a36 100644
--- a/platform/platform-impl/src/com/intellij/util/io/socketConnection/SocketConnection.java
+++ b/platform/platform-impl/src/com/intellij/util/io/socketConnection/SocketConnection.java
@@ -45,4 +45,6 @@ public interface SocketConnection<Request extends AbstractRequest, Response exte
 
   void sendRequest(@NotNull Request request, @Nullable AbstractResponseToRequestHandler<? extends Response> handler,
                    int timeout, @NotNull Runnable onTimeout);
+
+  boolean isStopping();
 }
diff --git a/platform/platform-impl/src/com/intellij/util/io/socketConnection/SocketConnectionFactory.java b/platform/platform-impl/src/com/intellij/util/io/socketConnection/SocketConnectionFactory.java
new file mode 100644
index 000000000000..8c2b31519890
--- /dev/null
+++ b/platform/platform-impl/src/com/intellij/util/io/socketConnection/SocketConnectionFactory.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2000-2010 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 com.intellij.util.io.socketConnection;
+
+import com.intellij.util.io.socketConnection.impl.SocketConnectionImpl;
+
+/**
+ * @author nik
+ */
+public class SocketConnectionFactory {
+  private SocketConnectionFactory() {
+  }
+
+  public static <Request extends AbstractRequest, Response extends AbstractResponse> SocketConnection<Request, Response>
+                  createConnection(int defaultPort, int attempts, RequestResponseExternalizerFactory<Request, Response> factory) {
+    return new SocketConnectionImpl<Request, Response>(defaultPort, attempts, factory);
+  }
+
+  public static <Request extends AbstractRequest, Response extends AbstractResponse> SocketConnection<Request, Response>
+                  createConnection(int defaultPort, RequestResponseExternalizerFactory<Request, Response> factory) {
+    return new SocketConnectionImpl<Request, Response>(defaultPort, 1, factory);
+  }
+}
diff --git a/platform/platform-impl/src/com/intellij/util/io/socketConnection/impl/SocketConnectionImpl.java b/platform/platform-impl/src/com/intellij/util/io/socketConnection/impl/SocketConnectionImpl.java
index a93da5318700..c21e02e5ebd7 100644
--- a/platform/platform-impl/src/com/intellij/util/io/socketConnection/impl/SocketConnectionImpl.java
+++ b/platform/platform-impl/src/com/intellij/util/io/socketConnection/impl/SocketConnectionImpl.java
@@ -40,21 +40,21 @@ public class SocketConnectionImpl<Request extends AbstractRequest, Response exte
   private final Object myLock = new Object();
   private int myPort = -1;
   private ConnectionStatus myStatus = ConnectionStatus.NOT_CONNECTED;
-  private boolean myStopped;
+  private boolean myStopping;
   private final EventDispatcher<SocketConnectionListener> myDispatcher = EventDispatcher.create(SocketConnectionListener.class);
   private ServerSocket myServerSocket;
   private String myStatusMessage;
   private Thread myProcessingThread;
-  private final int myInitialPort;
-  private final int myPortsAttemptsNumber;
+  private final int myDefaultPort;
+  private final int myConnectionAttempts;
   private final RequestResponseExternalizerFactory<Request, Response> myExternalizerFactory;
   private final LinkedBlockingQueue<Request> myRequests = new LinkedBlockingQueue<Request>();
   private final TIntObjectHashMap<TimeoutInfo> myTimeouts = new TIntObjectHashMap<TimeoutInfo>();
   private final ResponseProcessor<Response> myResponseProcessor;
 
-  public SocketConnectionImpl(int initialPort, int portsAttemptsNumber, @NotNull RequestResponseExternalizerFactory<Request, Response> factory) {
-    myInitialPort = initialPort;
-    myPortsAttemptsNumber = portsAttemptsNumber;
+  public SocketConnectionImpl(int defaultPort, int connectionAttempts, @NotNull RequestResponseExternalizerFactory<Request, Response> factory) {
+    myDefaultPort = defaultPort;
+    myConnectionAttempts = connectionAttempts;
     myExternalizerFactory = factory;
     myResponseProcessor = new ResponseProcessor<Response>(this);
   }
@@ -79,8 +79,8 @@ public class SocketConnectionImpl<Request extends AbstractRequest, Response exte
   @NotNull
   private ServerSocket createSocket() throws IOException {
     IOException exc = null;
-    for (int i = 0; i < myPortsAttemptsNumber; i++) {
-      int port = myInitialPort + i;
+    for (int i = 0; i < myConnectionAttempts; i++) {
+      int port = myDefaultPort + i;
       try {
         return new ServerSocket(port);
       }
@@ -149,8 +149,8 @@ public class SocketConnectionImpl<Request extends AbstractRequest, Response exte
   @Override
   public void close() {
     synchronized (myLock) {
-      if (myStopped) return;
-      myStopped = true;
+      if (myStopping) return;
+      myStopping = true;
     }
     LOG.debug("closing connection");
     if (myProcessingThread != null) {
@@ -160,15 +160,16 @@ public class SocketConnectionImpl<Request extends AbstractRequest, Response exte
     Disposer.dispose(this);
   }
 
-  public boolean isStopped() {
+  @Override
+  public boolean isStopping() {
     synchronized (myLock) {
-      return myStopped;
+      return myStopping;
     }
   }
 
   private void processRequests(RequestWriter<Request> writer) throws IOException {
     try {
-      while (!isStopped()) {
+      while (!isStopping()) {
         final Request request = myRequests.take();
         LOG.debug("sending request: " + request);
         final TimeoutInfo timeoutInfo = myTimeouts.remove(request.getId());