Merge remote-tracking branch 'origin/master'

java/debugger/impl/src/com/intellij/debugger/memory/utils/StackFrameItem.java

@@ -145,12 +145,8 @@ public class StackFrameItem {
   private static VariableItem createVariable(Value value, String name, VariableItem.VarType varType) {
     String type = null;
     String valueText = "null";
-    if (value instanceof StringReference) {
-      valueText = ((StringReference)value).value();
-      type = value.type().name() + "@" + ((ObjectReference)value).uniqueID();
-    }
-    else if (value instanceof ObjectReference) {
-      valueText = "";
+    if (value instanceof ObjectReference) {
+      valueText = value instanceof StringReference ? ((StringReference)value).value() : "";
       type = value.type().name() + "@" + ((ObjectReference)value).uniqueID();
     }
     else if (value != null) {

java/java-impl/src/com/intellij/openapi/roots/impl/LanguageLevelProjectExtensionImpl.java

@@ -21,6 +21,7 @@ import com.intellij.openapi.projectRoots.JavaSdkVersion;
 import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.roots.LanguageLevelProjectExtension;
 import com.intellij.openapi.roots.ProjectExtension;
+import com.intellij.openapi.roots.ProjectRootManager;
 import com.intellij.pom.java.LanguageLevel;
 import com.intellij.util.ObjectUtils;
 import org.jdom.Element;
@@ -96,6 +97,7 @@ public class LanguageLevelProjectExtensionImpl extends LanguageLevelProjectExten
   @Override
   public void languageLevelsChanged() {
     if (!myProject.isDefault()) {
+      ProjectRootManager.getInstance(myProject).incModificationCount();
       JavaLanguageLevelPusher.pushLanguageLevel(myProject);
     }
   }

platform/platform-api/src/com/intellij/openapi/diff/DiffRequestFactory.java

@@ -24,7 +24,9 @@ import org.jetbrains.annotations.Nullable;
 
 /**
  * Allows to initiate 3-way merge operations for multiple versions of content of a particular virtual file.
+ * @deprecated use {@link com.intellij.diff.DiffRequestFactory} instead
  */
+@Deprecated
 public abstract class DiffRequestFactory {
   public static DiffRequestFactory getInstance() {
     return ServiceManager.getService(DiffRequestFactory.class);

platform/platform-impl/src/com/intellij/openapi/diff/ex/DiffContentFactory.java

@@ -22,6 +22,10 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import org.jetbrains.annotations.Nullable;
 
+/**
+ * @deprecated use {@link com.intellij.diff.DiffContentFactory} instead
+ */
+@Deprecated
 public class DiffContentFactory {
   private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.diff.ex.DiffContentFactory");