From 8b70d81f8d4e11ca5f542020c032398e42298534 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Fri, 24 Jan 2014 21:49:16 +0400
Subject: [PATCH] remove stubs presuming to build jar locally before we move to
 java 7

---
 .idea/modules.xml                             |   2 --
 build/scripts/layouts.gant                    |   4 +---
 .../FxBuilderEmbedder/FxBuilderEmbedder.iml   |  10 +++++++-
 .../Stubs/FxBuilderStubs.iml                  |  12 ----------
 .../kit/editor/EditorController.java          |  14 -----------
 .../drag/source/AbstractDragSource.java       |   7 ------
 .../panel/content/ContentPanelController.java |  13 -----------
 .../treeview/HierarchyTreeViewController.java |  13 -----------
 .../inspector/InspectorPanelController.java   |  13 -----------
 .../panel/library/LibraryPanelController.java |  13 -----------
 .../panel/util/AbstractPanelController.java   |  12 ----------
 .../scenebuilder/kit/fxom/FXOMDocument.java   |  13 -----------
 .../stubsSrc/javafx/application/Platform.java |   7 ------
 .../javafx/collections/ObservableList.java    |  10 --------
 .../stubsSrc/javafx/embed/swing/JFXPanel.java |  11 ---------
 .../stubsSrc/javafx/fxml/FXMLLoader.java      |   7 ------
 .../stubsSrc/javafx/geometry/Orientation.java |   8 -------
 .../Stubs/stubsSrc/javafx/scene/Node.java     |   7 ------
 .../Stubs/stubsSrc/javafx/scene/Parent.java   |   7 ------
 .../Stubs/stubsSrc/javafx/scene/Scene.java    |   7 ------
 .../javafx/scene/control/Control.java         |   9 -------
 .../javafx/scene/control/SplitPane.java       |  22 ------------------
 .../javafx/scene/input/DataFormat.java        |   4 ----
 .../stubsSrc/javafx/scene/layout/Region.java  |   9 -------
 .../javaFX/FxBuilderEmbedder/lib/embedder.jar | Bin 0 -> 7312 bytes
 .../sceneBuilder/SceneBuilderEditor.java      |  13 ++++++++++-
 26 files changed, 22 insertions(+), 225 deletions(-)
 delete mode 100644 plugins/javaFX/FxBuilderEmbedder/Stubs/FxBuilderStubs.iml
 delete mode 100644 plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/com/oracle/javafx/scenebuilder/kit/editor/EditorController.java
 delete mode 100644 plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/com/oracle/javafx/scenebuilder/kit/editor/drag/source/AbstractDragSource.java
 delete mode 100644 plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/com/oracle/javafx/scenebuilder/kit/editor/panel/content/ContentPanelController.java
 delete mode 100644 plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/com/oracle/javafx/scenebuilder/kit/editor/panel/hierarchy/treeview/HierarchyTreeViewController.java
 delete mode 100644 plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/InspectorPanelController.java
 delete mode 100644 plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/com/oracle/javafx/scenebuilder/kit/editor/panel/library/LibraryPanelController.java
 delete mode 100644 plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/com/oracle/javafx/scenebuilder/kit/editor/panel/util/AbstractPanelController.java
 delete mode 100644 plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/com/oracle/javafx/scenebuilder/kit/fxom/FXOMDocument.java
 delete mode 100644 plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/javafx/application/Platform.java
 delete mode 100644 plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/javafx/collections/ObservableList.java
 delete mode 100644 plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/javafx/embed/swing/JFXPanel.java
 delete mode 100644 plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/javafx/fxml/FXMLLoader.java
 delete mode 100644 plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/javafx/geometry/Orientation.java
 delete mode 100644 plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/javafx/scene/Node.java
 delete mode 100644 plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/javafx/scene/Parent.java
 delete mode 100644 plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/javafx/scene/Scene.java
 delete mode 100644 plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/javafx/scene/control/Control.java
 delete mode 100644 plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/javafx/scene/control/SplitPane.java
 delete mode 100644 plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/javafx/scene/input/DataFormat.java
 delete mode 100644 plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/javafx/scene/layout/Region.java
 create mode 100644 plugins/javaFX/FxBuilderEmbedder/lib/embedder.jar

diff --git a/.idea/modules.xml b/.idea/modules.xml
index aee60deaaf2c..00437da65030 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,8 +3,6 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/plugins/ByteCodeViewer/ByteCodeViewer.iml" filepath="$PROJECT_DIR$/plugins/ByteCodeViewer/ByteCodeViewer.iml" group="plugins" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/javaFX/FxBuilderEmbedder/FxBuilderEmbedder.iml" filepath="$PROJECT_DIR$/plugins/javaFX/FxBuilderEmbedder/FxBuilderEmbedder.iml" group="plugins/JavaFX" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/javaFX/FxBuilderEmbedder/Stubs/FxBuilderStubs.iml" filepath="$PROJECT_DIR$/plugins/javaFX/FxBuilderEmbedder/Stubs/FxBuilderStubs.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/IntelliLang/IntelliLang.iml" filepath="$PROJECT_DIR$/plugins/IntelliLang/IntelliLang.iml" group="plugins/IntelliLang" />
       <module fileurl="file://$PROJECT_DIR$/plugins/IntelliLang/IntelliLang-java.iml" filepath="$PROJECT_DIR$/plugins/IntelliLang/IntelliLang-java.iml" group="plugins/IntelliLang" />
       <module fileurl="file://$PROJECT_DIR$/plugins/IntelliLang/IntelliLang-javaee.iml" filepath="$PROJECT_DIR$/plugins/IntelliLang/IntelliLang-javaee.iml" group="plugins/IntelliLang" />
diff --git a/build/scripts/layouts.gant b/build/scripts/layouts.gant
index d803b35af28f..4974934852ba 100644
--- a/build/scripts/layouts.gant
+++ b/build/scripts/layouts.gant
@@ -217,9 +217,7 @@ def layoutFull(String home, String targetDirectory, String patchedDescriptorDir
           }
         }
 
-        jar("embedder.jar") {
-          module("FxBuilderEmbedder")
-        }
+        fileset(dir: "${home}/plugins/JavaFX/FxBuilderEmbedder/lib", includes: "embedder.jar");
       }
     }
 
diff --git a/plugins/javaFX/FxBuilderEmbedder/FxBuilderEmbedder.iml b/plugins/javaFX/FxBuilderEmbedder/FxBuilderEmbedder.iml
index 9379a8f49a6f..94b91b59e731 100644
--- a/plugins/javaFX/FxBuilderEmbedder/FxBuilderEmbedder.iml
+++ b/plugins/javaFX/FxBuilderEmbedder/FxBuilderEmbedder.iml
@@ -5,10 +5,18 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
-    <orderEntry type="module" module-name="FxBuilderStubs" scope="PROVIDED" />
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="util" />
+    <orderEntry type="module-library" scope="PROVIDED">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/lib/SceneBuilderKit.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
   </component>
 </module>
 
diff --git a/plugins/javaFX/FxBuilderEmbedder/Stubs/FxBuilderStubs.iml b/plugins/javaFX/FxBuilderEmbedder/Stubs/FxBuilderStubs.iml
deleted file mode 100644
index 826058ac32c6..000000000000
--- a/plugins/javaFX/FxBuilderEmbedder/Stubs/FxBuilderStubs.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/stubsSrc" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
-
diff --git a/plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/com/oracle/javafx/scenebuilder/kit/editor/EditorController.java b/plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/com/oracle/javafx/scenebuilder/kit/editor/EditorController.java
deleted file mode 100644
index cd941b40fa31..000000000000
--- a/plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/com/oracle/javafx/scenebuilder/kit/editor/EditorController.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.oracle.javafx.scenebuilder.kit.editor;
-
-import java.io.IOException;
-import java.net.URL;
-
-public class EditorController {
-  public URL getFxmlLocation() {
-    return null; // TODO: Auto-generated method stub
-  }
-
-  public void setFxmlTextAndLocation(String fxmlText, URL fxmlLocation) throws IOException {
-    // TODO: Auto-generated method stub
-  }
-}
diff --git a/plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/com/oracle/javafx/scenebuilder/kit/editor/drag/source/AbstractDragSource.java b/plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/com/oracle/javafx/scenebuilder/kit/editor/drag/source/AbstractDragSource.java
deleted file mode 100644
index 22ffd7276a04..000000000000
--- a/plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/com/oracle/javafx/scenebuilder/kit/editor/drag/source/AbstractDragSource.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.oracle.javafx.scenebuilder.kit.editor.drag.source;
-
-import javafx.scene.input.DataFormat;
-
-public class AbstractDragSource {
-    public static final DataFormat INTERNAL_DATA_FORMAT = new DataFormat();
-}
diff --git a/plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/com/oracle/javafx/scenebuilder/kit/editor/panel/content/ContentPanelController.java b/plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/com/oracle/javafx/scenebuilder/kit/editor/panel/content/ContentPanelController.java
deleted file mode 100644
index 18b5b2966e80..000000000000
--- a/plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/com/oracle/javafx/scenebuilder/kit/editor/panel/content/ContentPanelController.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.oracle.javafx.scenebuilder.kit.editor.panel.content;
-
-import com.oracle.javafx.scenebuilder.kit.editor.EditorController;
-import com.oracle.javafx.scenebuilder.kit.editor.panel.util.AbstractPanelController;
-
-/**
- * @author Alexander Lobas
- */
-public class ContentPanelController extends AbstractPanelController {
-  public ContentPanelController(EditorController editorController) {
-    // TODO: Auto-generated method stub
-  }
-}
diff --git a/plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/com/oracle/javafx/scenebuilder/kit/editor/panel/hierarchy/treeview/HierarchyTreeViewController.java b/plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/com/oracle/javafx/scenebuilder/kit/editor/panel/hierarchy/treeview/HierarchyTreeViewController.java
deleted file mode 100644
index 813295c13175..000000000000
--- a/plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/com/oracle/javafx/scenebuilder/kit/editor/panel/hierarchy/treeview/HierarchyTreeViewController.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.oracle.javafx.scenebuilder.kit.editor.panel.hierarchy.treeview;
-
-import com.oracle.javafx.scenebuilder.kit.editor.EditorController;
-import com.oracle.javafx.scenebuilder.kit.editor.panel.util.AbstractPanelController;
-
-/**
- * @author Alexander Lobas
- */
-public class HierarchyTreeViewController extends AbstractPanelController {
-  public HierarchyTreeViewController(EditorController editorController) {
-    // TODO: Auto-generated method stub
-  }
-}
diff --git a/plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/InspectorPanelController.java b/plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/InspectorPanelController.java
deleted file mode 100644
index 186705e65cb5..000000000000
--- a/plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/InspectorPanelController.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.oracle.javafx.scenebuilder.kit.editor.panel.inspector;
-
-import com.oracle.javafx.scenebuilder.kit.editor.EditorController;
-import com.oracle.javafx.scenebuilder.kit.editor.panel.util.AbstractPanelController;
-
-/**
- * @author Alexander Lobas
- */
-public class InspectorPanelController extends AbstractPanelController {
-  public InspectorPanelController(EditorController editorController) {
-    // TODO: Auto-generated method stub
-  }
-}
diff --git a/plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/com/oracle/javafx/scenebuilder/kit/editor/panel/library/LibraryPanelController.java b/plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/com/oracle/javafx/scenebuilder/kit/editor/panel/library/LibraryPanelController.java
deleted file mode 100644
index a09bdf803ddf..000000000000
--- a/plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/com/oracle/javafx/scenebuilder/kit/editor/panel/library/LibraryPanelController.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.oracle.javafx.scenebuilder.kit.editor.panel.library;
-
-import com.oracle.javafx.scenebuilder.kit.editor.EditorController;
-import com.oracle.javafx.scenebuilder.kit.editor.panel.util.AbstractPanelController;
-
-/**
- * @author Alexander Lobas
- */
-public class LibraryPanelController extends AbstractPanelController {
-  public LibraryPanelController(EditorController c) {
-    // TODO: Auto-generated method stub
-  }
-}
diff --git a/plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/com/oracle/javafx/scenebuilder/kit/editor/panel/util/AbstractPanelController.java b/plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/com/oracle/javafx/scenebuilder/kit/editor/panel/util/AbstractPanelController.java
deleted file mode 100644
index 2ea76a51a154..000000000000
--- a/plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/com/oracle/javafx/scenebuilder/kit/editor/panel/util/AbstractPanelController.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.oracle.javafx.scenebuilder.kit.editor.panel.util;
-
-import javafx.scene.Parent;
-
-/**
- * @author Alexander Lobas
- */
-public class AbstractPanelController {
-  public Parent getPanelRoot() {
-    return null; // TODO: Auto-generated method stub
-  }
-}
diff --git a/plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/com/oracle/javafx/scenebuilder/kit/fxom/FXOMDocument.java b/plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/com/oracle/javafx/scenebuilder/kit/fxom/FXOMDocument.java
deleted file mode 100644
index c5760658a79a..000000000000
--- a/plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/com/oracle/javafx/scenebuilder/kit/fxom/FXOMDocument.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.oracle.javafx.scenebuilder.kit.fxom;
-
-import java.io.IOException;
-import java.net.URL;
-
-/**
- * @author Alexander Lobas
- */
-public class FXOMDocument {
-  public static String readContentFromURL(URL url) throws IOException {
-    return null; // TODO: Auto-generated method stub
-  }
-}
diff --git a/plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/javafx/application/Platform.java b/plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/javafx/application/Platform.java
deleted file mode 100644
index 7015b4e9e4d5..000000000000
--- a/plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/javafx/application/Platform.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package javafx.application;
-
-public class Platform {
-    public static void runLater(Runnable runnable) {
-        // TODO: Auto-generated method stub
-    }
-}
\ No newline at end of file
diff --git a/plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/javafx/collections/ObservableList.java b/plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/javafx/collections/ObservableList.java
deleted file mode 100644
index f79e5136e489..000000000000
--- a/plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/javafx/collections/ObservableList.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package javafx.collections;
-
-import java.util.List;
-
-/**
- * @author Alexander Lobas
- */
-public interface ObservableList<E> extends List<E> {
-  public boolean addAll(E... elements);
-}
\ No newline at end of file
diff --git a/plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/javafx/embed/swing/JFXPanel.java b/plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/javafx/embed/swing/JFXPanel.java
deleted file mode 100644
index e3ad145eef5a..000000000000
--- a/plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/javafx/embed/swing/JFXPanel.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package javafx.embed.swing;
-
-import javafx.scene.Scene;
-
-import javax.swing.*;
-
-public class JFXPanel extends JComponent {
-    public void setScene(final Scene newScene) {
-        // TODO: Auto-generated method stub
-    }
-}
\ No newline at end of file
diff --git a/plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/javafx/fxml/FXMLLoader.java b/plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/javafx/fxml/FXMLLoader.java
deleted file mode 100644
index ade5272ec4e0..000000000000
--- a/plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/javafx/fxml/FXMLLoader.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package javafx.fxml;
-
-public class FXMLLoader {
-  public static void setDefaultClassLoader(ClassLoader defaultClassLoader) {
-    // TODO: Auto-generated method stub
-  }
-}
\ No newline at end of file
diff --git a/plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/javafx/geometry/Orientation.java b/plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/javafx/geometry/Orientation.java
deleted file mode 100644
index 39c5dc971f94..000000000000
--- a/plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/javafx/geometry/Orientation.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package javafx.geometry;
-
-/**
- * @author Alexander Lobas
- */
-public enum Orientation {
-  HORIZONTAL, VERTICAL
-}
\ No newline at end of file
diff --git a/plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/javafx/scene/Node.java b/plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/javafx/scene/Node.java
deleted file mode 100644
index d3e351aee893..000000000000
--- a/plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/javafx/scene/Node.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package javafx.scene;
-
-/**
- * @author Alexander Lobas
- */
-public class Node {
-}
\ No newline at end of file
diff --git a/plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/javafx/scene/Parent.java b/plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/javafx/scene/Parent.java
deleted file mode 100644
index b51a0ef9683c..000000000000
--- a/plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/javafx/scene/Parent.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package javafx.scene;
-
-/**
- * @author Alexander Lobas
- */
-public abstract class Parent extends Node {
-}
\ No newline at end of file
diff --git a/plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/javafx/scene/Scene.java b/plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/javafx/scene/Scene.java
deleted file mode 100644
index f3c8bd7c7776..000000000000
--- a/plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/javafx/scene/Scene.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package javafx.scene;
-
-public class Scene {
-  public Scene(Parent root, double width, double height) {
-    // TODO: Auto-generated method stub
-  }
-}
\ No newline at end of file
diff --git a/plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/javafx/scene/control/Control.java b/plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/javafx/scene/control/Control.java
deleted file mode 100644
index 6a1d0fb4078b..000000000000
--- a/plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/javafx/scene/control/Control.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package javafx.scene.control;
-
-import javafx.scene.layout.Region;
-
-/**
- * @author Alexander Lobas
- */
-public abstract class Control extends Region {
-}
\ No newline at end of file
diff --git a/plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/javafx/scene/control/SplitPane.java b/plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/javafx/scene/control/SplitPane.java
deleted file mode 100644
index 6a56a5826f99..000000000000
--- a/plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/javafx/scene/control/SplitPane.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package javafx.scene.control;
-
-import javafx.collections.ObservableList;
-import javafx.geometry.Orientation;
-import javafx.scene.Node;
-
-/**
- * @author Alexander Lobas
- */
-public class SplitPane extends Control {
-  public final void setOrientation(Orientation value) {
-    // TODO: Auto-generated method stub
-  }
-
-  public void setDividerPositions(double... positions) {
-    // TODO: Auto-generated method stub
-  }
-
-  public ObservableList<Node> getItems() {
-    return null; // TODO: Auto-generated method stub
-  }
-}
\ No newline at end of file
diff --git a/plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/javafx/scene/input/DataFormat.java b/plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/javafx/scene/input/DataFormat.java
deleted file mode 100644
index 7674469f6731..000000000000
--- a/plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/javafx/scene/input/DataFormat.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package javafx.scene.input;
-
-public class DataFormat {
-}
\ No newline at end of file
diff --git a/plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/javafx/scene/layout/Region.java b/plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/javafx/scene/layout/Region.java
deleted file mode 100644
index 5bd724c71684..000000000000
--- a/plugins/javaFX/FxBuilderEmbedder/Stubs/stubsSrc/javafx/scene/layout/Region.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package javafx.scene.layout;
-
-import javafx.scene.Parent;
-
-/**
- * @author Alexander Lobas
- */
-public class Region extends Parent {
-}
\ No newline at end of file
diff --git a/plugins/javaFX/FxBuilderEmbedder/lib/embedder.jar b/plugins/javaFX/FxBuilderEmbedder/lib/embedder.jar
new file mode 100644
index 0000000000000000000000000000000000000000..c975af501ba1da2026849f73800c5af0053126ea
GIT binary patch
literal 7312
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

literal 0
HcmV?d00001

diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/sceneBuilder/SceneBuilderEditor.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/sceneBuilder/SceneBuilderEditor.java
index 891ab95c0550..6194570d9ba9 100644
--- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/sceneBuilder/SceneBuilderEditor.java
+++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/sceneBuilder/SceneBuilderEditor.java
@@ -3,6 +3,8 @@ package org.jetbrains.plugins.javaFX.sceneBuilder;
 import com.intellij.codeHighlighting.BackgroundEditorHighlighter;
 import com.intellij.ide.plugins.cl.PluginClassLoader;
 import com.intellij.ide.structureView.StructureViewBuilder;
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.application.PathManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.fileEditor.FileEditor;
 import com.intellij.openapi.fileEditor.FileEditorLocation;
@@ -159,7 +161,16 @@ public class SceneBuilderEditor extends UserDataHolderBase implements FileEditor
     if (SceneBuilderEditor.class.getClassLoader() instanceof PluginClassLoader) {
       urls.add(new File(new File(parent).getParent(), "embedder.jar").toURI().toURL());
     } else {
-      urls.add(new File(parent, "FXBuilderEmbedder").toURI().toURL());
+      final File localEmbedder = new File(parent, "FXBuilderEmbedder");
+      if (localEmbedder.exists()) {
+        urls.add(localEmbedder.toURI().toURL());
+      } else {
+        File home = new File(PathManager.getHomePath(), "community");
+        if (!home.exists()) {
+          home = new File(PathManager.getHomePath());
+        }
+        urls.add(new File(home, "plugins/JavaFX/FxBuilderEmbedder/lib/embedder.jar").toURI().toURL());
+      }
     }
     return new URLClassLoader(urls.toArray(new URL[urls.size()]));
   }