remove stubs presuming to build jar locally before we move to java 7

2026-09-27 10:03:11 +07:00 · 2014-01-24 21:54:59 +04:00
parent 3d8a6d0969
commit 8b70d81f8d
26 changed files with 22 additions and 225 deletions
@@ -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" />
@@ -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");
      }
    }

@@ -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>

@@ -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>
-
@@ -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
-  }
-}
@@ -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();
-}
@@ -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
-  }
-}
@@ -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
-  }
-}
@@ -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
-  }
-}
@@ -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
-  }
-}
@@ -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
-  }
-}
@@ -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
-  }
-}
@@ -1,7 +0,0 @@
-package javafx.application;
-
-public class Platform {
-    public static void runLater(Runnable runnable) {
-        // TODO: Auto-generated method stub
-    }
-}
@@ -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);
-}
@@ -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
-    }
-}
@@ -1,7 +0,0 @@
-package javafx.fxml;
-
-public class FXMLLoader {
-  public static void setDefaultClassLoader(ClassLoader defaultClassLoader) {
-    // TODO: Auto-generated method stub
-  }
-}
@@ -1,8 +0,0 @@
-package javafx.geometry;
-
-/**
- * @author Alexander Lobas
- */
-public enum Orientation {
-  HORIZONTAL, VERTICAL
-}
@@ -1,7 +0,0 @@
-package javafx.scene;
-
-/**
- * @author Alexander Lobas
- */
-public class Node {
-}
@@ -1,7 +0,0 @@
-package javafx.scene;
-
-/**
- * @author Alexander Lobas
- */
-public abstract class Parent extends Node {
-}
@@ -1,7 +0,0 @@
-package javafx.scene;
-
-public class Scene {
-  public Scene(Parent root, double width, double height) {
-    // TODO: Auto-generated method stub
-  }
-}
@@ -1,9 +0,0 @@
-package javafx.scene.control;
-
-import javafx.scene.layout.Region;
-
-/**
- * @author Alexander Lobas
- */
-public abstract class Control extends Region {
-}
@@ -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
-  }
-}
@@ -1,4 +0,0 @@
-package javafx.scene.input;
-
-public class DataFormat {
-}
@@ -1,9 +0,0 @@
-package javafx.scene.layout;
-
-import javafx.scene.Parent;
-
-/**
- * @author Alexander Lobas
- */
-public class Region extends Parent {
-}
@@ -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()]));
  }