[java-intentions] CreateLocalVarFromInstanceofAction: exact preview+tests

GitOrigin-RevId: acf0c175cda663c43d5feb5b503ed462c5acf92d
2026-04-20 05:21:29 +07:00 · 2022-07-27 15:18:07 +02:00
parent 7e76f57f5b
commit c642b9a580
39 changed files with 64 additions and 51 deletions
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateLocalVarFromInstanceofAction.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateLocalVarFromInstanceofAction.java
@@ -200,11 +200,7 @@ public class CreateLocalVarFromInstanceofAction extends BaseIntentionAction {
      List<String> names = new VariableNameGenerator(initializer, VariableKind.LOCAL_VARIABLE).byExpression(initializer)
        .byType(localVariable.getType()).generateAll(true);
      PsiIdentifier identifier = Objects.requireNonNull(localVariable.getNameIdentifier());
-      if (!file.isPhysical()) {
-        identifier.replace(JavaPsiFacade.getElementFactory(project).createIdentifier(names.get(0)));
-        return;
-      }
-      
+
      TemplateBuilderImpl builder = new TemplateBuilderImpl(localVariable);
      builder.setEndVariableAfter(localVariable.getNameIdentifier());

@@ -255,7 +251,7 @@ public class CreateLocalVarFromInstanceofAction extends BaseIntentionAction {

        @Override
        public void templateFinished(@NotNull Template template, boolean brokenOff) {
-          ApplicationManager.getApplication().runWriteAction(() -> {
+          Runnable action = () -> {
            PsiDocumentManager.getInstance(project).commitDocument(editor.getDocument());

            CaretModel caretModel = editor.getCaretModel();
@@ -264,8 +260,13 @@ public class CreateLocalVarFromInstanceofAction extends BaseIntentionAction {
            if (declarationStatement != null) {
              caretModel.moveToOffset(declarationStatement.getTextRange().getEndOffset());
            }
-            new EnterAction().actionPerformed(editor, DataManager.getInstance().getDataContext());
-          });
+            new EnterAction().getHandler().execute(editor, null, DataManager.getInstance().getDataContext());
+          };
+          if (file.isPhysical()) {
+            ApplicationManager.getApplication().runWriteAction(action);
+          } else {
+            action.run();
+          }
        }
      });
    }
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/after1.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/after1.java
@@ -1,4 +1,4 @@
-// "Insert '(Runnable)this' declaration" "true"
+// "Insert '(Runnable)this' declaration" "true-preview"
 class C {
  void f() {
    if (this instanceof Runnable) {
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/after2.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/after2.java
@@ -1,4 +1,4 @@
-// "Insert '(Runnable)this' declaration" "true"
+// "Insert '(Runnable)this' declaration" "true-preview"
 class C {
  void f() {
      if (!(this instanceof Runnable)) {
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/after3.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/after3.java
@@ -1,4 +1,4 @@
-// "Insert '(Runnable)this' declaration" "true"
+// "Insert '(Runnable)this' declaration" "true-preview"
 class C {
  void f() {
      while (!(this instanceof Runnable)) {
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/after4.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/after4.java
@@ -1,4 +1,4 @@
-// "Insert '(Runnable)this' declaration" "true"
+// "Insert '(Runnable)this' declaration" "true-preview"
 class C {
  void f() {
      while (this instanceof Runnable) {
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/after5.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/after5.java
@@ -1,4 +1,4 @@
-// "Insert '(Runnable)this' declaration" "true"
+// "Insert '(Runnable)this' declaration" "true-preview"
 class C {
  void f() {
      if (this instanceof Runnable) {
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/after7.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/after7.java
@@ -1,4 +1,4 @@
-// "Insert '(String)s' declaration" "true"
+// "Insert '(String)s' declaration" "true-preview"
 class C {
    void f() {
        String s = "";
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/after8.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/after8.java
@@ -1,4 +1,4 @@
-// "Insert '(String)o' declaration" "true"
+// "Insert '(String)o' declaration" "true-preview"
 class C {
    void f(Object o) {
        if (o instanceof String) {
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/afterBrokenCode.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/afterBrokenCode.java
@@ -1,4 +1,4 @@
-// "Insert '(String)o' declaration" "true"
+// "Insert '(String)o' declaration" "true-preview"
 class X {
    void foo(Object o) {
        if (o instanceof String) {
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/afterConflictingVariable.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/afterConflictingVariable.java
@@ -1,4 +1,4 @@
-// "Insert '(String)o' declaration" "true"
+// "Insert '(String)o' declaration" "true-preview"
 class C {
  void f(Object o, Object f) {
    if (o instanceof String) {
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/afterFormatting.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/afterFormatting.java
@@ -1,4 +1,4 @@
-// "Insert '(IOException)o' declaration" "true"
+// "Insert '(IOException)o' declaration" "true-preview"
 import java.io.IOException;

 class C {
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/afterInSimpleMethod.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/afterInSimpleMethod.java
@@ -1,4 +1,4 @@
-// "Insert '(NodeInfo)parent' declaration" "true"
+// "Insert '(NodeInfo)parent' declaration" "true-preview"
 public abstract class A {
    public void getNodeElements(Object parent) {
        if (!(parent instanceof NodeInfo)) return;
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/afterInsertInEmptyLine.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/afterInsertInEmptyLine.java
@@ -1,4 +1,4 @@
-// "Insert '(String)o' declaration" "true"
+// "Insert '(String)o' declaration" "true-preview"
 class X {
    void foo(Object o) {
        if (o instanceof String) {
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/afterIntersection.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/afterIntersection.java
@@ -1,4 +1,4 @@
-// "Insert '(String)o' declaration" "true"
+// "Insert '(String)o' declaration" "true-preview"
 class C {
    void f(Object o, Object f) {
        if (o instanceof String && f == null) {
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/afterLineEndComment.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/afterLineEndComment.java
@@ -1,4 +1,4 @@
-// "Insert '(String)o' declaration" "true"
+// "Insert '(String)o' declaration" "true-preview"
 class C {
    void f(Object o, Object f) {
        if (o instanceof String) {//todo comment
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/afterMultipleDeclarations.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/afterMultipleDeclarations.java
@@ -1,4 +1,4 @@
-// "Insert '(String)f' declaration" "true"
+// "Insert '(String)f' declaration" "true-preview"
 class C {
  void f(Object o, Object f) {
    if (o instanceof String && f instanceof String) {
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/afterOnRef.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/afterOnRef.java
@@ -1,4 +1,4 @@
-// "Insert '(Runnable)o' declaration" "true"
+// "Insert '(Runnable)o' declaration" "true-preview"
 class C {
  void f(Object o) {
    if (o instanceof Runnable) {
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/afterShadowField.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/afterShadowField.java
@@ -1,4 +1,4 @@
-// "Insert '(String)x' declaration" "true"
+// "Insert '(String)x' declaration" "true-preview"

 class C {
  Object s = new Object();
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/before1.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/before1.java
@@ -1,4 +1,4 @@
-// "Insert '(Runnable)this' declaration" "true"
+// "Insert '(Runnable)this' declaration" "true-preview"
 class C {
  void f() {
    if (this <caret>instanceof Runnable)
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/before2.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/before2.java
@@ -1,4 +1,4 @@
-// "Insert '(Runnable)this' declaration" "true"
+// "Insert '(Runnable)this' declaration" "true-preview"
 class C {
  void f() {
      if (!(this instanceof <caret>Runnable)) {
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/before3.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/before3.java
@@ -1,4 +1,4 @@
-// "Insert '(Runnable)this' declaration" "true"
+// "Insert '(Runnable)this' declaration" "true-preview"
 class C {
  void f() {
      while (!(<caret>this instanceof Runnable)) {
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/before4.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/before4.java
@@ -1,4 +1,4 @@
-// "Insert '(Runnable)this' declaration" "true"
+// "Insert '(Runnable)this' declaration" "true-preview"
 class C {
  void f() {
      while (<caret>this instanceof Runnable
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/before5.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/before5.java
@@ -1,4 +1,4 @@
-// "Insert '(Runnable)this' declaration" "true"
+// "Insert '(Runnable)this' declaration" "true-preview"
 class C {
  void f() {
      if (this instanceof Runnable) {   <caret>
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/before7.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/before7.java
@@ -1,4 +1,4 @@
-// "Insert '(String)s' declaration" "true"
+// "Insert '(String)s' declaration" "true-preview"
 class C {
    void f() {
        String s = "";
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/before8.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/before8.java
@@ -1,4 +1,4 @@
-// "Insert '(String)o' declaration" "true"
+// "Insert '(String)o' declaration" "true-preview"
 class C {
    void f(Object o) {
        if (o instanceof String<caret>)
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/beforeBrokenCode.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/beforeBrokenCode.java
@@ -1,4 +1,4 @@
-// "Insert '(String)o' declaration" "true"
+// "Insert '(String)o' declaration" "true-preview"
 class X {
    void foo(Object o) {
        if (o insta<caret>nceof String) {
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/beforeConflictingVariable.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/beforeConflictingVariable.java
@@ -1,4 +1,4 @@
-// "Insert '(String)o' declaration" "true"
+// "Insert '(String)o' declaration" "true-preview"
 class C {
  void f(Object o, Object f) {
    if (<caret>o instanceof String) {
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/beforeFormatting.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/beforeFormatting.java
@@ -1,4 +1,4 @@
-// "Insert '(IOException)o' declaration" "true"
+// "Insert '(IOException)o' declaration" "true-preview"
 import java.io.IOException;

 class C {
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/beforeInSimpleMethod.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/beforeInSimpleMethod.java
@@ -1,4 +1,4 @@
-// "Insert '(NodeInfo)parent' declaration" "true"
+// "Insert '(NodeInfo)parent' declaration" "true-preview"
 public abstract class A {
    public void getNodeElements(Object parent) {
        if (!(parent instanceof <caret>NodeInfo)) return;
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/beforeInsertInEmptyLine.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/beforeInsertInEmptyLine.java
@@ -1,4 +1,4 @@
-// "Insert '(String)o' declaration" "true"
+// "Insert '(String)o' declaration" "true-preview"
 class X {
    void foo(Object o) {
        if (o insta<caret>nceof String) {
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/beforeIntersection.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/beforeIntersection.java
@@ -1,4 +1,4 @@
-// "Insert '(String)o' declaration" "true"
+// "Insert '(String)o' declaration" "true-preview"
 class C {
    void f(Object o, Object f) {
        if (o instanceof String && f == null) {
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/beforeLineEndComment.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/beforeLineEndComment.java
@@ -1,4 +1,4 @@
-// "Insert '(String)o' declaration" "true"
+// "Insert '(String)o' declaration" "true-preview"
 class C {
    void f(Object o, Object f) {
        if (o instanceof String) {//todo comment
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/beforeMultipleDeclarations.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/beforeMultipleDeclarations.java
@@ -1,4 +1,4 @@
-// "Insert '(String)f' declaration" "true"
+// "Insert '(String)f' declaration" "true-preview"
 class C {
  void f(Object o, Object f) {
    if (o instanceof String && f<caret> instanceof String) {
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/beforeOnRef.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/beforeOnRef.java
@@ -1,4 +1,4 @@
-// "Insert '(Runnable)o' declaration" "true"
+// "Insert '(Runnable)o' declaration" "true-preview"
 class C {
  void f(Object o) {
    if (o instanceof Runnable) {
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/beforeShadowField.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalVarFromInstanceof/beforeShadowField.java
@@ -1,4 +1,4 @@
-// "Insert '(String)x' declaration" "true"
+// "Insert '(String)x' declaration" "true-preview"

 class C {
  Object s = new Object();
--- a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/preview/IntentionPreviewEditor.kt
+++ b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/preview/IntentionPreviewEditor.kt
@@ -21,6 +21,8 @@ internal class IntentionPreviewEditor(psiFileCopy: PsiFile, caretOffset: Int, pr

  override fun isViewer(): Boolean = true

+  override fun isOneLineMode(): Boolean = false
+
  override fun getSettings(): EditorSettings {
    return settings
  }
--- a/platform/platform-api/src/com/intellij/openapi/editor/actionSystem/EditorWriteActionHandler.java
+++ b/platform/platform-api/src/com/intellij/openapi/editor/actionSystem/EditorWriteActionHandler.java
@@ -15,6 +15,7 @@
 */
 package com.intellij.openapi.editor.actionSystem;

+import com.intellij.codeInsight.intention.preview.IntentionPreviewUtils;
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.editor.*;
@@ -39,8 +40,11 @@ public abstract class EditorWriteActionHandler extends EditorActionHandler {

  @Override
  public void doExecute(@NotNull final Editor editor, @Nullable final Caret caret, final DataContext dataContext) {
-    if (!EditorModificationUtil.checkModificationAllowed(editor)) return;
-    if (!ApplicationManager.getApplication().isWriteAccessAllowed() && !EditorModificationUtil.requestWriting(editor)) return;
+    boolean preview = IntentionPreviewUtils.getPreviewEditor() == editor;
+    if (!preview) {
+      if (!EditorModificationUtil.checkModificationAllowed(editor)) return;
+      if (!ApplicationManager.getApplication().isWriteAccessAllowed() && !EditorModificationUtil.requestWriting(editor)) return;
+    }

    DocumentRunnable runnable = new DocumentRunnable(editor.getDocument(), editor.getProject()) {
      @Override
@@ -59,7 +63,7 @@ public abstract class EditorWriteActionHandler extends EditorActionHandler {
        }
      }
    };
-    if (editor instanceof TextComponentEditor) {
+    if (preview || editor instanceof TextComponentEditor) {
      runnable.run();
    }
    else {
--- a/platform/platform-impl/src/com/intellij/openapi/editor/actions/EnterAction.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/actions/EnterAction.java
@@ -2,6 +2,7 @@

 package com.intellij.openapi.editor.actions;

+import com.intellij.codeInsight.intention.preview.IntentionPreviewUtils;
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.command.CommandProcessor;
 import com.intellij.openapi.editor.*;
@@ -22,7 +23,9 @@ public class EnterAction extends EditorAction implements LatencyAwareEditorActio
  private static class Handler extends EditorWriteActionHandler.ForEachCaret {
    @Override
    public void executeWriteAction(@NotNull Editor editor, @NotNull Caret caret, DataContext dataContext) {
-      CommandProcessor.getInstance().setCurrentCommandName(EditorBundle.message("typing.command.name"));
+      if (IntentionPreviewUtils.getPreviewEditor() != editor) {
+        CommandProcessor.getInstance().setCurrentCommandName(EditorBundle.message("typing.command.name"));
+      }
      insertNewLineAtCaret(editor);
    }

--- a/platform/testFramework/src/com/intellij/testFramework/TestDataProvider.java
+++ b/platform/testFramework/src/com/intellij/testFramework/TestDataProvider.java
@@ -7,6 +7,7 @@ import com.intellij.openapi.actionSystem.DataProvider;
 import com.intellij.openapi.actionSystem.PlatformCoreDataKeys;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.impl.EditorComponentImpl;
+import com.intellij.openapi.editor.impl.ImaginaryEditor;
 import com.intellij.openapi.fileEditor.OpenFileDescriptor;
 import com.intellij.openapi.fileEditor.ex.FileEditorManagerEx;
 import com.intellij.openapi.fileEditor.impl.FileEditorManagerImpl;
@@ -74,11 +75,13 @@ public class TestDataProvider implements DataProvider {
        if (managerData != null) {
          return managerData;
        }
-        JComponent component = editor.getContentComponent();
-        if (component instanceof EditorComponentImpl) {
-          Object editorComponentData = ((EditorComponentImpl)component).getData(dataId);
-          if (editorComponentData != null) {
-            return editorComponentData;
+        if (!(editor instanceof ImaginaryEditor)) {
+          JComponent component = editor.getContentComponent();
+          if (component instanceof EditorComponentImpl) {
+            Object editorComponentData = ((EditorComponentImpl)component).getData(dataId);
+            if (editorComponentData != null) {
+              return editorComponentData;
+            }
          }
        }
      }