Merge branch 'master' into upsource-master

Conflicts:
	plugins/gettext/src/com/jetbrains/gettext/highlighter/GetTextHighlighterData.java

java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/AccessStaticViaInstanceTest.java

@@ -1,17 +1,27 @@
-
+/*
+ * Copyright 2000-2012 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.codeInsight.daemon.quickFix;
 
 import com.intellij.codeInspection.accessStaticViaInstance.AccessStaticViaInstance;
 
-
 public class AccessStaticViaInstanceTest extends LightQuickFixTestCase {
-
-  public void test() throws Exception { enableInspectionTool(new AccessStaticViaInstance()); doAllTests(); }
-
   @Override
   protected String getBasePath() {
     return "/codeInsight/daemonCodeAnalyzer/quickFix/accessStaticViaInstance";
   }
 
+  public void test() throws Exception { enableInspectionTool(new AccessStaticViaInstance()); doAllTests(); }
 }
-

java/java-tests/testSrc/com/intellij/roots/ManagingContentRootFoldersTest.java

@@ -5,6 +5,7 @@ import com.intellij.openapi.roots.ContentEntry;
 import com.intellij.openapi.roots.ContentFolder;
 import com.intellij.openapi.roots.ModifiableRootModel;
 import com.intellij.openapi.roots.ModuleRootManager;
+import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.testFramework.IdeaTestCase;
@@ -53,7 +54,7 @@ public class ManagingContentRootFoldersTest extends IdeaTestCase {
   private void initModifiableModel() {
     myModel = ModuleRootManager.getInstance(myModule).getModifiableModel();
     for (ContentEntry e : myModel.getContentEntries()) {
-      if (e.getFile() == root) entry = e;
+      if (Comparing.equal(e.getFile(), root)) entry = e;
     }
   }