Merge branch 'master' of git.labs.intellij.net:idea/community

This commit is contained in:
Eugene Kudelevsky
2011-10-17 14:43:34 +04:00
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
* 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.
@@ -41,10 +41,10 @@ public class ProxySettings implements JDOMExternalizable, Cloneable {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
ProxySettings that = (ProxySettings)o;
final ProxySettings that = (ProxySettings)o;
if (USE_PROXY != that.USE_PROXY) return false;
if (!USE_PROXY) {
return false;
return true;
}
return PROXY_PORT == that.PROXY_PORT &&
TYPE == that.TYPE &&