modules/controls/src/main/java/javafx/scene/control/skin/ColorPalette.java

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

*** 21,32 ****
   * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  
! package com.sun.javafx.scene.control.skin;
  
  import com.sun.javafx.scene.traversal.Algorithm;
  import com.sun.javafx.scene.traversal.Direction;
  import com.sun.javafx.scene.traversal.ParentTraversalEngine;
  import com.sun.javafx.scene.traversal.TraversalContext;
  import javafx.collections.FXCollections;
--- 21,34 ----
   * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  
! package javafx.scene.control.skin;
  
+ import com.sun.javafx.scene.control.CustomColorDialog;
+ import com.sun.javafx.scene.control.skin.Utils;
  import com.sun.javafx.scene.traversal.Algorithm;
  import com.sun.javafx.scene.traversal.Direction;
  import com.sun.javafx.scene.traversal.ParentTraversalEngine;
  import com.sun.javafx.scene.traversal.TraversalContext;
  import javafx.collections.FXCollections;
*** 60,84 ****
  import javafx.scene.shape.Rectangle;
  import javafx.scene.shape.StrokeType;
  
  import java.util.List;
  
! import static com.sun.javafx.scene.control.skin.ColorPickerSkin.getString;
  
! public class ColorPalette extends Region {
  
      private static final int SQUARE_SIZE = 15;
  
      // package protected for testing purposes
      ColorPickerGrid colorPickerGrid;
!     final Hyperlink customColorLink = new Hyperlink(getString("customColorLink"));
      CustomColorDialog customColorDialog = null;
  
      private ColorPicker colorPicker;
      private final GridPane customColorGrid = new GridPane();
      private final Separator separator = new Separator();
!     private final Label customColorLabel = new Label(getString("customColorLabel"));
  
      private PopupControl popupControl;
      private ColorSquare focusedSquare;
      private ContextMenu contextMenu = null;
      
--- 62,87 ----
  import javafx.scene.shape.Rectangle;
  import javafx.scene.shape.StrokeType;
  
  import java.util.List;
  
! import static com.sun.javafx.scene.control.Properties.getColorPickerString;
  
! // Not public API - this is (presently) an implementation detail only
! class ColorPalette extends Region {
  
      private static final int SQUARE_SIZE = 15;
  
      // package protected for testing purposes
      ColorPickerGrid colorPickerGrid;
!     final Hyperlink customColorLink = new Hyperlink(getColorPickerString("customColorLink"));
      CustomColorDialog customColorDialog = null;
  
      private ColorPicker colorPicker;
      private final GridPane customColorGrid = new GridPane();
      private final Separator separator = new Separator();
!     private final Label customColorLabel = new Label(getColorPickerString("customColorLabel"));
  
      private PopupControl popupControl;
      private ColorSquare focusedSquare;
      private ContextMenu contextMenu = null;
      
*** 203,213 ****
              customColorLabel.setVisible(true);
              customColorLabel.setManaged(true);
              customColorGrid.setVisible(true);
              customColorGrid.setManaged(true);
              if (contextMenu == null) {
!                 MenuItem item = new MenuItem(getString("removeColor"));
                  item.setOnAction(e -> {
                      ColorSquare square = (ColorSquare)contextMenu.getOwnerNode();
                      customColors.remove(square.rectangle.getFill());
                      buildCustomColors();
                  });
--- 206,216 ----
              customColorLabel.setVisible(true);
              customColorLabel.setManaged(true);
              customColorGrid.setVisible(true);
              customColorGrid.setManaged(true);
              if (contextMenu == null) {
!                 MenuItem item = new MenuItem(getColorPickerString("removeColor"));
                  item.setOnAction(e -> {
                      ColorSquare square = (ColorSquare)contextMenu.getOwnerNode();
                      customColors.remove(square.rectangle.getFill());
                      buildCustomColors();
                  });