From 8b55dadedcb10c9bfc9a8653b4fec7ccfb1b8154 Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Wed, 1 Feb 2017 18:25:58 +0300 Subject: [PATCH 1/3] diff: @Deprecate --- .../src/com/intellij/openapi/diff/DiffRequestFactory.java | 2 ++ .../src/com/intellij/openapi/diff/ex/DiffContentFactory.java | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/platform/platform-api/src/com/intellij/openapi/diff/DiffRequestFactory.java b/platform/platform-api/src/com/intellij/openapi/diff/DiffRequestFactory.java index 98181fda8f03..2d324740ba8f 100644 --- a/platform/platform-api/src/com/intellij/openapi/diff/DiffRequestFactory.java +++ b/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); diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/ex/DiffContentFactory.java b/platform/platform-impl/src/com/intellij/openapi/diff/ex/DiffContentFactory.java index 44bc0b7f0af3..2baba15e8faa 100644 --- a/platform/platform-impl/src/com/intellij/openapi/diff/ex/DiffContentFactory.java +++ b/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"); From a3e9044a24ea250b372301762eba596261064475 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Wed, 1 Feb 2017 17:01:17 +0100 Subject: [PATCH 2/3] IDEA-167493 Java project language level is not serialized --- .../openapi/roots/impl/LanguageLevelProjectExtensionImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/java/java-impl/src/com/intellij/openapi/roots/impl/LanguageLevelProjectExtensionImpl.java b/java/java-impl/src/com/intellij/openapi/roots/impl/LanguageLevelProjectExtensionImpl.java index 454bcbb133ef..6464ad868774 100644 --- a/java/java-impl/src/com/intellij/openapi/roots/impl/LanguageLevelProjectExtensionImpl.java +++ b/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); } } From 586dcd60a510321dd6253ab247b6dea514ffe9ac Mon Sep 17 00:00:00 2001 From: "Egor.Ushakov" Date: Wed, 1 Feb 2017 19:20:20 +0300 Subject: [PATCH 3/3] cleanup --- .../intellij/debugger/memory/utils/StackFrameItem.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/java/debugger/impl/src/com/intellij/debugger/memory/utils/StackFrameItem.java b/java/debugger/impl/src/com/intellij/debugger/memory/utils/StackFrameItem.java index d6549d41d50d..afa3e0cfbadc 100644 --- a/java/debugger/impl/src/com/intellij/debugger/memory/utils/StackFrameItem.java +++ b/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) {