apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/content/driver/TabPaneDesignInfoX.java

rev 9240 : 8076423: JEP 253: Prepare JavaFX UI Controls & CSS APIs for Modularization

@@ -30,11 +30,11 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.oracle.javafx.scenebuilder.kit.editor.panel.content.driver;
 
 import com.oracle.javafx.scenebuilder.kit.util.Deprecation;
-import com.sun.javafx.scene.control.skin.TabPaneSkin;
+import javafx.scene.control.skin.TabPaneSkin;
 import java.util.Iterator;
 import java.util.Set;
 import javafx.geometry.BoundingBox;
 import javafx.geometry.Bounds;
 import javafx.geometry.Point2D;

@@ -88,14 +88,21 @@
     public Node getContentNode(TabPane tabPane) {
         assert tabPane != null;
         
         final Node result;
        
-        if (tabPane.getSkin() != null) {
-            assert tabPane.getSkin() instanceof TabPaneSkin;
-            final TabPaneSkin tabPaneSkin = (TabPaneSkin) tabPane.getSkin();
-            result = tabPaneSkin.getSelectedTabContentRegion();
+//        if (tabPane.getSkin() != null) {
+//            assert tabPane.getSkin() instanceof TabPaneSkin;
+//            final TabPaneSkin tabPaneSkin = (TabPaneSkin) tabPane.getSkin();
+//            result = tabPaneSkin.getSelectedTabContentRegion();
+//        } else {
+//            result = null;
+//        }
+
+        Tab selectedTab = tabPane.getSelectionModel().getSelectedItem();
+        if (selectedTab != null) {
+            result = selectedTab.getContent();
         } else {
             result = null;
         }
 
         return result;