diff --git a/platform/icons/src/actions/Reset_to_empty.png b/platform/icons/src/actions/Reset_to_empty.png new file mode 100644 index 000000000000..825d4e433c4c Binary files /dev/null and b/platform/icons/src/actions/Reset_to_empty.png differ diff --git a/platform/icons/src/actions/Reset_to_empty@2x.png b/platform/icons/src/actions/Reset_to_empty@2x.png new file mode 100644 index 000000000000..b76c24b3a87d Binary files /dev/null and b/platform/icons/src/actions/Reset_to_empty@2x.png differ diff --git a/platform/icons/src/actions/Reset_to_empty@2x_dark.png b/platform/icons/src/actions/Reset_to_empty@2x_dark.png new file mode 100644 index 000000000000..f37a675a3048 Binary files /dev/null and b/platform/icons/src/actions/Reset_to_empty@2x_dark.png differ diff --git a/platform/icons/src/actions/Reset_to_empty_dark.png b/platform/icons/src/actions/Reset_to_empty_dark.png new file mode 100644 index 000000000000..d270cf05915d Binary files /dev/null and b/platform/icons/src/actions/Reset_to_empty_dark.png differ diff --git a/platform/icons/src/actions/addFacesSupport.png b/platform/icons/src/actions/addFacesSupport.png index e2ddb5f55397..d0b6cd31c9c1 100644 Binary files a/platform/icons/src/actions/addFacesSupport.png and b/platform/icons/src/actions/addFacesSupport.png differ diff --git a/platform/icons/src/actions/addFacesSupport@2x.png b/platform/icons/src/actions/addFacesSupport@2x.png new file mode 100644 index 000000000000..7d76d3557b0f Binary files /dev/null and b/platform/icons/src/actions/addFacesSupport@2x.png differ diff --git a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/SingleInspectionProfilePanel.java b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/SingleInspectionProfilePanel.java index b9c796e9c4b1..63e1664912b9 100644 --- a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/SingleInspectionProfilePanel.java +++ b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/SingleInspectionProfilePanel.java @@ -337,7 +337,7 @@ public class SingleInspectionProfilePanel extends JPanel { actions.add(actionManager.createCollapseAllAction(myTreeExpander, myTree)); actions.add(new AnAction(CommonBundle.message("button.reset.to.default"), CommonBundle.message("button.reset.to.default"), - AllIcons.Actions.Reset_to_default) { + AllIcons.General.Reset) { { registerCustomShortcutSet(new CustomShortcutSet(KeyStroke.getKeyStroke(KeyEvent.VK_R, InputEvent.CTRL_MASK)), myTree); } @@ -353,7 +353,7 @@ public class SingleInspectionProfilePanel extends JPanel { } }); - actions.add(new AnAction("Reset to Empty", "Reset to empty", AllIcons.General.Reset){ + actions.add(new AnAction("Reset to Empty", "Reset to empty", AllIcons.Actions.Reset_to_empty){ @Override public void update(AnActionEvent e) { diff --git a/platform/util/src/com/intellij/icons/AllIcons.java b/platform/util/src/com/intellij/icons/AllIcons.java index 84cd93886b38..322fda10be06 100644 --- a/platform/util/src/com/intellij/icons/AllIcons.java +++ b/platform/util/src/com/intellij/icons/AllIcons.java @@ -122,6 +122,7 @@ public class AllIcons { public static final Icon Rerun = IconLoader.getIcon("/actions/rerun.png"); // 16x16 public static final Icon Reset_to_default = IconLoader.getIcon("/actions/reset-to-default.png"); // 16x16 public static final Icon Reset = IconLoader.getIcon("/actions/reset.png"); // 16x16 + public static final Icon Reset_to_empty = IconLoader.getIcon("/actions/Reset_to_empty.png"); // 16x16 public static final Icon Restart = IconLoader.getIcon("/actions/restart.png"); // 16x16 public static final Icon Resume = IconLoader.getIcon("/actions/resume.png"); // 16x16 public static final Icon Right = IconLoader.getIcon("/actions/right.png"); // 16x16 diff --git a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXHighlightingTest.java b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXHighlightingTest.java index f66c68429f01..f6a1a408a01c 100644 --- a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXHighlightingTest.java +++ b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXHighlightingTest.java @@ -93,6 +93,11 @@ public class JavaFXHighlightingTest extends DaemonAnalyzerTestCase { doDoTest(false, false); } + public void testNoParamsHandler() throws Exception { + configureByFiles(null, getTestName(true) + ".fxml", getTestName(false) + ".java"); + doDoTest(false, false); + } + private void doTestIdController() throws Exception { final String controllerClassName = getTestName(false) + "Controller"; configureByFiles(null, getTestName(true) + ".fxml", controllerClassName + ".java"); diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/inspections/UnwrapTagFix.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/inspections/UnwrapTagFix.java index 1723db0a79fd..2e20e6f720c8 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/inspections/UnwrapTagFix.java +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/inspections/UnwrapTagFix.java @@ -17,18 +17,22 @@ package org.jetbrains.plugins.javaFX.fxml.codeInsight.inspections; import com.intellij.codeInspection.LocalQuickFix; import com.intellij.codeInspection.ProblemDescriptor; +import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; +import com.intellij.psi.PsiFile; import com.intellij.psi.codeStyle.CodeStyleManager; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.xml.XmlTag; import com.intellij.psi.xml.XmlTagChild; import org.jetbrains.annotations.NotNull; +import org.jetbrains.plugins.javaFX.fxml.JavaFxFileTypeFactory; /** * User: anna */ public class UnwrapTagFix implements LocalQuickFix { + private static final Logger LOG = Logger.getInstance("#" + UnwrapTagFix.class.getName()); private final String myTagName; public UnwrapTagFix(String tagName) { @@ -51,6 +55,8 @@ public class UnwrapTagFix implements LocalQuickFix { public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement(); if (element != null) { + final PsiFile containingFile = element.getContainingFile(); + LOG.assertTrue(containingFile != null && JavaFxFileTypeFactory.isFxml(containingFile), containingFile == null ? "no containing file found" : "containing file: " + containingFile.getName()); final XmlTag xmlTag = PsiTreeUtil.getParentOfType(element, XmlTag.class); if (xmlTag != null) { final XmlTag parentTag = xmlTag.getParentTag(); diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxEventHandlerReference.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxEventHandlerReference.java index ed34c51a9cb5..432e3eeabe25 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxEventHandlerReference.java +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxEventHandlerReference.java @@ -79,6 +79,7 @@ public class JavaFxEventHandlerReference extends PsiReferenceBase + + +