MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

javafx: accept references inside define

Browse Source
This commit is contained in:
anna
2013-03-27 21:56:13 +01:00
parent a65990753e
commit 4f14051a49
3 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXHighlightingTest.java
+4
View File
@@ -295,6 +295,10 @@ public class JavaFXHighlightingTest extends AbstractJavaFXTestCase {
doTest();
}
public void testAcceptReferenceInsideDefine() throws Exception {
doTest();
}
public void testIncludedForm() throws Exception {
myFixture.addFileToProject("sample.fxml", "<?import javafx.scene.layout.GridPane?>\n" +
"<fx:root type=\"javafx.scene.layout.GridPane\" xmlns:fx=\"http://javafx.com/fxml\"/>\n");
plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/descriptors/JavaFxDefaultPropertyElementDescriptor.java
+3 -3
View File
@@ -76,14 +76,14 @@ public class JavaFxDefaultPropertyElementDescriptor implements XmlElementDescrip
@Override
public XmlElementDescriptor getElementDescriptor(XmlTag childTag, XmlTag contextTag) {
final String name = childTag.getName();
if (myName.equals(FxmlConstants.FX_DEFINE)) {
if (name.equals(FxmlConstants.FX_INCLUDE)) {
if (FxmlConstants.FX_DEFINE.equals(myName)) {
if (FxmlConstants.FX_INCLUDE.equals(name) || FxmlConstants.FX_REFERENCE.equals(name)) {
return new JavaFxDefaultPropertyElementDescriptor(name, childTag);
}
return new JavaFxClassBackedElementDescriptor(name, childTag);
}
if (myName.equals(FxmlConstants.FX_ROOT)) {
if (FxmlConstants.FX_ROOT.equals(myName)) {
final JavaFxClassBackedElementDescriptor tagDescriptor = getRootTagDescriptor(contextTag);
if (tagDescriptor != null) {
return tagDescriptor.getElementDescriptor(childTag, contextTag);
plugins/javaFX/testData/highlighting/acceptReferenceInsideDefine.fxml
+8
View File
@@ -0,0 +1,8 @@
<?import javafx.scene.layout.GridPane?>
<?import javafx.scene.control.Button?>
<GridPane xmlns:fx="http://javafx.com/fxml">
<Button fx:id="btn1"/>
<fx:define>
<fx:reference source="btn1"/>
</fx:define>
</GridPane>