Snapshot e242282deb41c328afbe971fc167e47ddfb26df9 from master branch of git://git.jetbrains.org/idea/community.git

Change-Id: Ifdc1818cde7b63f6d7bf42801f18c7f1557b8d85

3 files changed, 15 insertions, 10 deletions

diff --git a/platform/platform-api/src/com/intellij/util/net/IOExceptionDialog.java b/platform/platform-api/src/com/intellij/util/net/IOExceptionDialog.java
index 1159c61c5339..1b544ac2b21e 100644
--- a/platform/platform-api/src/com/intellij/util/net/IOExceptionDialog.java
+++ b/platform/platform-api/src/com/intellij/util/net/IOExceptionDialog.java
@@ -19,7 +19,6 @@ import com.intellij.openapi.MnemonicHelper;
 import com.intellij.ui.GuiUtils;
 
 import javax.swing.*;
-import java.awt.*;
 import java.awt.event.*;
 import java.lang.reflect.InvocationTargetException;
 
@@ -83,14 +82,8 @@ public class IOExceptionDialog extends JDialog {
       }
     });
 
-    setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
-
-    Dimension parentSize = Toolkit.getDefaultToolkit().getScreenSize();
-    Dimension ownSize = getPreferredSize();
-
-    setLocation((parentSize.width - ownSize.width) / 2, (parentSize.height - ownSize.height) / 2);
-
     pack();
+    setLocationRelativeTo(null);
     setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
     addWindowListener(new WindowAdapter() {
       @Override
diff --git a/platform/platform-api/src/com/intellij/util/proxy/CommonProxy.java b/platform/platform-api/src/com/intellij/util/proxy/CommonProxy.java
index c131810a20e6..eff28a5fbd1e 100644
--- a/platform/platform-api/src/com/intellij/util/proxy/CommonProxy.java
+++ b/platform/platform-api/src/com/intellij/util/proxy/CommonProxy.java
@@ -244,9 +244,9 @@ public class CommonProxy extends ProxySelector {
   private int correctPortByProtocol(@NotNull URI uri) {
     if (uri.getPort() == -1) {
       if ("http".equals(uri.getScheme())) {
-        return 80;
+        return ProtocolDefaultPorts.HTTP;
       } else if ("https".equals(uri.getScheme())) {
-        return 443;
+        return ProtocolDefaultPorts.SSL;
       }
     }
     return uri.getPort();
diff --git a/platform/platform-api/src/com/intellij/util/proxy/ProtocolDefaultPorts.java b/platform/platform-api/src/com/intellij/util/proxy/ProtocolDefaultPorts.java
new file mode 100644
index 000000000000..fbfa45dba816
--- /dev/null
+++ b/platform/platform-api/src/com/intellij/util/proxy/ProtocolDefaultPorts.java
@@ -0,0 +1,12 @@
+package com.intellij.util.proxy;
+
+/**
+ * Created with IntelliJ IDEA.
+ * User: Irina.Chernushina
+ * Date: 4/22/13
+ * Time: 6:49 PM
+ */
+public interface ProtocolDefaultPorts {
+  int HTTP = 80;
+  int SSL = 443;
+}