From 558b4bac4bd8050236c6cd75d0345674f9dcac3c Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Mon, 23 Dec 2013 13:17:37 +0100
Subject: [PATCH] overrides, prefer to use our utils methods

---
 .../execution/runners/ProcessProxyImpl.java   | 10 ++++---
 .../src/com/intellij/util/net/NetUtils.java   |  3 ---
 .../impl/SocketConnectionImpl.java            |  3 ++-
 .../console/pydev/PydevXmlRpcClient.java      | 26 +++++++------------
 .../ide/browsers/impl/DefaultUrlOpener.java   |  1 +
 5 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/java/execution/impl/src/com/intellij/execution/runners/ProcessProxyImpl.java b/java/execution/impl/src/com/intellij/execution/runners/ProcessProxyImpl.java
index db2f5df90eb2..525966359763 100644
--- a/java/execution/impl/src/com/intellij/execution/runners/ProcessProxyImpl.java
+++ b/java/execution/impl/src/com/intellij/execution/runners/ProcessProxyImpl.java
@@ -17,13 +17,13 @@ package com.intellij.execution.runners;
 
 import com.intellij.execution.process.ProcessHandler;
 import com.intellij.openapi.util.Key;
+import com.intellij.util.net.NetUtils;
 import org.jetbrains.annotations.NonNls;
 
 import java.io.BufferedWriter;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
-import java.net.InetAddress;
 import java.net.ServerSocket;
 import java.net.Socket;
 
@@ -37,7 +37,6 @@ class ProcessProxyImpl implements ProcessProxy {
   @NonNls public static final String PROPERTY_PORT_NUMBER = "idea.launcher.port";
   @NonNls public static final String LAUNCH_MAIN_CLASS = "com.intellij.rt.execution.application.AppMain";
 
-  @NonNls protected static final String LOCALHOST = "localhost";
   @NonNls private static final String DONT_USE_LAUNCHER_PROPERTY = "idea.no.launcher";
   private static final int SOCKET_NUMBER_START = 7532;
   private static final int SOCKET_NUMBER = 100;
@@ -71,10 +70,12 @@ class ProcessProxyImpl implements ProcessProxy {
     return -1;
   }
 
+  @Override
   public int getPortNumber() {
     return myPortNumber;
   }
 
+  @Override
   @SuppressWarnings("FinalizeDeclaration")
   protected synchronized void finalize() throws Throwable {
     if (myWriter != null) {
@@ -84,6 +85,7 @@ class ProcessProxyImpl implements ProcessProxy {
     super.finalize();
   }
 
+  @Override
   public void attach(final ProcessHandler processHandler) {
     processHandler.putUserData(KEY, this);
   }
@@ -93,7 +95,7 @@ class ProcessProxyImpl implements ProcessProxy {
     if (myWriter == null) {
       try {
         if (mySocket == null) {
-          mySocket = new Socket(InetAddress.getByName(LOCALHOST), myPortNumber);
+          mySocket = new Socket(NetUtils.getLoopbackAddress(), myPortNumber);
         }
         myWriter = new PrintWriter(new BufferedWriter(new OutputStreamWriter(mySocket.getOutputStream())));
       }
@@ -105,10 +107,12 @@ class ProcessProxyImpl implements ProcessProxy {
     myWriter.flush();
   }
 
+  @Override
   public void sendBreak() {
     writeLine("BREAK");
   }
 
+  @Override
   public void sendStop() {
     writeLine("STOP");
   }
diff --git a/platform/platform-api/src/com/intellij/util/net/NetUtils.java b/platform/platform-api/src/com/intellij/util/net/NetUtils.java
index ae18326d1836..eb56e08e4d64 100644
--- a/platform/platform-api/src/com/intellij/util/net/NetUtils.java
+++ b/platform/platform-api/src/com/intellij/util/net/NetUtils.java
@@ -29,9 +29,6 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.*;
 
-/**
- * @author yole
- */
 public class NetUtils {
   private static final Logger LOG = Logger.getInstance(NetUtils.class);
 
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 6ef2f31c062a..32b1aa56b214 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
@@ -18,6 +18,7 @@ package com.intellij.util.io.socketConnection.impl;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.util.io.socketConnection.*;
+import com.intellij.util.net.NetUtils;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.IOException;
@@ -71,7 +72,7 @@ public class SocketConnectionImpl<Request extends AbstractRequest, Response exte
         host = InetAddress.getLocalHost();
       }
       catch (UnknownHostException ignored) {
-        host = InetAddress.getByName(null);
+        host = NetUtils.getLoopbackAddress();
       }
     }
 
diff --git a/python/pydevSrc/com/jetbrains/python/console/pydev/PydevXmlRpcClient.java b/python/pydevSrc/com/jetbrains/python/console/pydev/PydevXmlRpcClient.java
index 695704fa7874..ad9991f51736 100644
--- a/python/pydevSrc/com/jetbrains/python/console/pydev/PydevXmlRpcClient.java
+++ b/python/pydevSrc/com/jetbrains/python/console/pydev/PydevXmlRpcClient.java
@@ -1,17 +1,12 @@
 package com.jetbrains.python.console.pydev;
 
 import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.util.SystemInfo;
 import com.intellij.util.net.NetUtils;
 import org.apache.xmlrpc.*;
 
-import java.io.IOException;
-import java.io.PrintWriter;
 import java.net.MalformedURLException;
-import java.net.Socket;
 import java.net.URL;
 import java.util.Arrays;
-import java.util.Scanner;
 import java.util.Vector;
 
 /**
@@ -25,12 +20,12 @@ public class PydevXmlRpcClient implements IPydevXmlRpcClient {
   /**
    * Internal xml-rpc client (responsible for the actual communication with the server)
    */
-  private XmlRpcClient impl;
+  private final XmlRpcClient impl;
 
   /**
    * The process where the server is being executed.
    */
-  private Process process;
+  private final Process process;
 
   /**
    * ItelliJ Logging
@@ -43,15 +38,9 @@ public class PydevXmlRpcClient implements IPydevXmlRpcClient {
   /**
    * Constructor (see fields description)
    */
-  public PydevXmlRpcClient(Process process, int port)
-    throws MalformedURLException {
-
-    String hostname = NetUtils.getLocalHostString();
-
-    URL url = new URL("http://" + hostname + ':' + port + "/RPC2");
-
-    XmlRpc.setDefaultInputEncoding("UTF8"); //eventhough it uses UTF anyway
-    this.impl = new XmlRpcClientLite(url);
+  public PydevXmlRpcClient(Process process, int port) throws MalformedURLException {
+    XmlRpc.setDefaultInputEncoding("UTF8"); //even though it uses UTF anyway
+    impl = new XmlRpcClientLite(NetUtils.getLocalHostString(), port);
     //this.impl = new XmlRpcClient(url, new CommonsXmlRpcTransportFactory(url));
     this.process = process;
   }
@@ -64,16 +53,19 @@ public class PydevXmlRpcClient implements IPydevXmlRpcClient {
    *
    * @return the result from executing the given command in the server.
    */
+  @Override
   public Object execute(String command, Object[] args) throws XmlRpcException {
     final Object[] result = new Object[]{null};
 
     //make an async call so that we can keep track of not actually having an answer.
-    this.impl.executeAsync(command, new Vector(Arrays.asList(args)), new AsyncCallback() {
+    impl.executeAsync(command, new Vector(Arrays.asList(args)), new AsyncCallback() {
 
+      @Override
       public void handleError(Exception error, URL url, String method) {
         result[0] = new Object[]{error.getMessage()};
       }
 
+      @Override
       public void handleResult(Object recievedResult, URL url, String method) {
         result[0] = recievedResult;
       }
diff --git a/xml/impl/src/com/intellij/ide/browsers/impl/DefaultUrlOpener.java b/xml/impl/src/com/intellij/ide/browsers/impl/DefaultUrlOpener.java
index 07f221f5d3e5..1fc9bdf84503 100644
--- a/xml/impl/src/com/intellij/ide/browsers/impl/DefaultUrlOpener.java
+++ b/xml/impl/src/com/intellij/ide/browsers/impl/DefaultUrlOpener.java
@@ -38,6 +38,7 @@ import java.util.List;
 public class DefaultUrlOpener extends UrlOpener {
   private static final Logger LOG = Logger.getInstance(DefaultUrlOpener.class);
 
+  @Override
   public boolean openUrl(final @NotNull WebBrowser browser, final @NotNull String url) {
     return launchBrowser(browser, url, false);
   }