updated painting system.

Author: JavaSaBr

src/main/java/com/ss/editor/Messages.java

@@ -213,7 +213,7 @@ public class Messages {
 
     public static final String SCENE_FILE_EDITOR_NAME;
     public static final String SCENE_FILE_EDITOR_TOOL_OBJECTS;
-    public static final String SCENE_FILE_EDITOR_TOOL_EDITING;
+    public static final String SCENE_FILE_EDITOR_TOOL_PAINTING;
     public static final String SCENE_FILE_EDITOR_TOOL_SCRIPTING;
     public static final String SCENE_FILE_EDITOR_TOOL_APP_STATES;
     public static final String SCENE_FILE_EDITOR_TOOL_FILTERS;
@@ -901,7 +901,7 @@ public class Messages {
 
         SCENE_FILE_EDITOR_NAME = bundle.getString("SceneFileEditorName");
         SCENE_FILE_EDITOR_TOOL_OBJECTS = bundle.getString("SceneFileEditorToolObjects");
-        SCENE_FILE_EDITOR_TOOL_EDITING = bundle.getString("SceneFileEditorToolEditing");
+        SCENE_FILE_EDITOR_TOOL_PAINTING = bundle.getString("SceneFileEditorToolPainting");
         SCENE_FILE_EDITOR_TOOL_SCRIPTING = bundle.getString("SceneFileEditorToolScripting");
         SCENE_FILE_EDITOR_TOOL_APP_STATES = bundle.getString("SceneFileEditorToolAppStates");
         SCENE_FILE_EDITOR_TOOL_FILTERS = bundle.getString("SceneFileEditorToolFilters");

src/main/java/com/ss/editor/ui/component/editor/impl/scene/AbstractSceneFileEditor.java

@@ -657,10 +657,11 @@ public void notifyFxReplaced(@NotNull final Object parent, @Nullable final Objec
         final MA editor3DPart = getEditor3DPart();
         final Spatial currentModel = getCurrentModel();
 
-        if (currentModel == oldChild && newChild != null) {
+        if (currentModel == oldChild && newChild instanceof Spatial) {
             handleRemovedObject(currentModel);
             editor3DPart.openModel(unsafeCast(newChild));
             handleAddedObject((Spatial) newChild);
+            setCurrentModel(unsafeCast(newChild));
         } else {
 
             if (oldChild instanceof Spatial) {
@@ -769,7 +770,7 @@ public void selectNodeFromTree(@Nullable final Object object) {
         modelPropertyEditor.buildFor(element, parent);
 
         final PaintingComponentContainer editingComponentContainer = getPaintingComponentContainer();
-        editingComponentContainer.showComponentFor(element);
+        editingComponentContainer.prepareFor(element);
     }
 
     @FxThread
@@ -1029,7 +1030,7 @@ protected void createToolComponents(@NotNull final EditorToolComponent container
         container.addComponent(buildSplitComponent(getModelNodeTreeObjectsContainer(), getPropertyEditorObjectsContainer(), root),
                 Messages.SCENE_FILE_EDITOR_TOOL_OBJECTS);
         container.addComponent(buildSplitComponent(getModelNodeTreeEditingContainer(), getPaintingComponentContainer(), root),
-                Messages.SCENE_FILE_EDITOR_TOOL_EDITING);
+                Messages.SCENE_FILE_EDITOR_TOOL_PAINTING);
         container.addComponent(getScriptingComponent(), Messages.SCENE_FILE_EDITOR_TOOL_SCRIPTING);
     }
 

src/main/java/com/ss/editor/ui/component/painting/PaintingComponent.java

@@ -4,6 +4,8 @@
 import com.ss.editor.annotation.FxThread;
 import com.ss.editor.ui.component.editor.state.EditorState;
 import com.ss.rlib.util.HasName;
+import com.sun.istack.internal.Nullable;
+import javafx.scene.image.Image;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -24,6 +26,16 @@ public interface PaintingComponent extends HasName {
         return getClass().getSimpleName();
     }
 
+    /**
+     * Get the icon of this component.
+     *
+     * @return the icon.
+     */
+    @FxThread
+    default @Nullable Image getIcon() {
+        return null;
+    }
+
     /**
      * Get the container.
      *
@@ -67,15 +79,15 @@ default void startPainting(@NotNull Object object) {
      * @return the painted object.
      */
     @FxThread
-    default @NotNull Object getPaintedObject() {
+    default @Nullable Object getPaintedObject() {
         throw new RuntimeException("not implemented");
     }
 
     /**
      * Stop painting of the last object.
      */
     @FxThread
-    default void stopProcessing() {
+    default void stopPainting() {
     }
 
     /**

src/main/java/com/ss/editor/ui/component/painting/PaintingComponentContainer.java

@@ -10,6 +10,7 @@
 import com.ss.editor.ui.css.CssClasses;
 import com.ss.rlib.ui.util.FXUtils;
 import com.ss.rlib.util.array.Array;
+import javafx.beans.value.ObservableValue;
 import javafx.collections.ObservableList;
 import javafx.scene.Node;
 import javafx.scene.control.ComboBox;
@@ -66,6 +67,18 @@ public class PaintingComponentContainer extends ScrollPane {
     @NotNull
     protected final ComboBox<PaintingComponent> componentBox;
 
+    /**
+     * The painted object.
+     */
+    @Nullable
+    private Object paintedObject;
+
+    /**
+     * The current component.
+     */
+    @Nullable
+    private PaintingComponent currentComponent;
+
     /**
      * The flag of showing this container.
      */
@@ -87,8 +100,14 @@ public PaintingComponentContainer(@NotNull final ModelChangeConsumer changeConsu
                 .multiply(LABEL_PERCENT));
 
         componentBox = new ComboBox<>();
+        componentBox.setCellFactory(PaintingComponentListCell::new);
+        componentBox.setButtonCell(new PaintingComponentListCell(null));
+        componentBox.setPromptText("No tools");
         componentBox.prefWidthProperty().bind(horContainer.widthProperty()
                 .multiply(FIELD_PERCENT));
+        componentBox.getSelectionModel()
+                .selectedItemProperty()
+                .addListener(this::activate);
 
         final VBox resultContainer = new VBox();
 
@@ -104,6 +123,81 @@ public PaintingComponentContainer(@NotNull final ModelChangeConsumer changeConsu
         this.components = registry.createComponents(this);
     }
 
+    /**
+     * Get the painted object.
+     *
+     * @return the painted object.
+     */
+    @FxThread
+    private @Nullable Object getPaintedObject() {
+        return paintedObject;
+    }
+
+    /**
+     * Set the painted object.
+     *
+     * @param paintedObject the painted object.
+     */
+    @FxThread
+    private void setPaintedObject(@Nullable final Object paintedObject) {
+        this.paintedObject = paintedObject;
+    }
+
+    /**
+     * Get the current painting component.
+     *
+     * @return the current painting component.
+     */
+    @FxThread
+    private @Nullable PaintingComponent getCurrentComponent() {
+        return currentComponent;
+    }
+
+    /**
+     * Set the current painting component.
+     *
+     * @param currentComponent the current painting component.
+     */
+    @FxThread
+    private void setCurrentComponent(@Nullable final PaintingComponent currentComponent) {
+        this.currentComponent = currentComponent;
+    }
+
+    /**
+     * Activate the selected painting component.
+     *
+     * @param observable the component box's property.
+     * @param oldValue   the previous component.
+     * @param newValue   the new component.
+     */
+    @FxThread
+    private void activate(@NotNull final ObservableValue<? extends PaintingComponent> observable,
+                          @Nullable final PaintingComponent oldValue, @Nullable final PaintingComponent newValue) {
+
+        final ObservableList<Node> items = getContainer()
+                .getChildren();
+
+        if (oldValue != null) {
+            oldValue.notifyHided();
+            oldValue.stopPainting();
+            items.remove(oldValue);
+        }
+
+        final Object paintedObject = getPaintedObject();
+
+        if (newValue != null) {
+            if (paintedObject != null) {
+                newValue.startPainting(paintedObject);
+            }
+            if (isShowed()) {
+                newValue.notifyShowed();
+            }
+            items.add((Node) newValue);
+        }
+
+        setCurrentComponent(newValue);
+    }
+
     /**
      * Get the container.
      *
@@ -125,33 +219,35 @@ public PaintingComponentContainer(@NotNull final ModelChangeConsumer changeConsu
     }
 
     /**
-     * Show a painting component to process with the element.
+     * Get the component box.
      *
-     * @param element the element to process.
+     * @return the component box.
      */
     @FxThread
-    public void showComponentFor(@Nullable final Object element) {
-
-        final VBox container = getContainer();
-        final ObservableList<Node> children = container.getChildren();
-        children.stream().filter(PaintingComponent.class::isInstance)
-                .map(PaintingComponent.class::cast)
-                .peek(PaintingComponent::notifyHided)
-                .forEach(PaintingComponent::stopProcessing);
-
-        children.clear();
-
-        if (element == null) return;
+    private @NotNull ComboBox<PaintingComponent> getComponentBox() {
+        return componentBox;
+    }
 
-        final PaintingComponent processingComponent = getComponents().search(element, PaintingComponent::isSupport);
-        if (processingComponent == null) return;
+    /**
+     * Prepare painting components to work with the element
+     *
+     * @param element the element.
+     */
+    @FxThread
+    public void prepareFor(@Nullable final Object element) {
+        setPaintedObject(element);
 
-        children.add((Node) processingComponent);
+        final ComboBox<PaintingComponent> componentBox = getComponentBox();
+        final ObservableList<PaintingComponent> items = componentBox.getItems();
+        items.clear();
 
-        processingComponent.startPainting(element);
+        if (element != null) {
+            getComponents().forEach(toCheck -> toCheck.isSupport(element),
+                    toAdd -> items.add(toAdd));
+        }
 
-        if (isShowed()) {
-            processingComponent.notifyShowed();
+        if (!items.isEmpty()) {
+            componentBox.getSelectionModel().select(0);
         }
     }
 
@@ -161,12 +257,10 @@ public void showComponentFor(@Nullable final Object element) {
     @FxThread
     public void notifyShowed() {
         setShowed(true);
-
-        final VBox container = getContainer();
-        final ObservableList<Node> children = container.getChildren();
-        children.stream().filter(PaintingComponent.class::isInstance)
-                .map(PaintingComponent.class::cast)
-                .forEach(PaintingComponent::notifyShowed);
+        final PaintingComponent currentComponent = getCurrentComponent();
+        if (currentComponent != null) {
+            currentComponent.notifyShowed();
+        }
     }
 
     /**
@@ -175,12 +269,10 @@ public void notifyShowed() {
     @FxThread
     public void notifyHided() {
         setShowed(false);
-
-        final VBox container = getContainer();
-        final ObservableList<Node> children = container.getChildren();
-        children.stream().filter(PaintingComponent.class::isInstance)
-                .map(PaintingComponent.class::cast)
-                .forEach(PaintingComponent::notifyHided);
+        final PaintingComponent currentComponent = getCurrentComponent();
+        if (currentComponent != null) {
+            currentComponent.notifyHided();
+        }
     }
 
     /**
@@ -204,7 +296,7 @@ public void notifyHided() {
     }
 
     /**
-     * Is showed boolean.
+     * Return the showed state.
      *
      * @return true if this component is showed.
      */
@@ -214,7 +306,7 @@ protected boolean isShowed() {
     }
 
     /**
-     * Sets showed.
+     * Set the showed state.
      *
      * @param showed true if this component is showed.
      */
@@ -226,20 +318,14 @@ protected void setShowed(final boolean showed) {
     /**
      * Notify about changed property.
      *
-     * @param object       the object
-     * @param propertyName the property name
+     * @param object       the object.
+     * @param propertyName the property name.
      */
     @FxThread
     public void notifyChangeProperty(@NotNull final Object object, @NotNull final String propertyName) {
-
-        final VBox container = getContainer();
-        final ObservableList<Node> children = container.getChildren();
-        if (children.isEmpty()) {
-            return;
+        final PaintingComponent currentComponent = getCurrentComponent();
+        if (currentComponent != null) {
+            currentComponent.notifyChangeProperty(object, propertyName);
         }
-
-        children.stream().map(PaintingComponent.class::cast)
-                .filter(component -> component.getPaintedObject() == object)
-                .forEach(c -> c.notifyChangeProperty(object, propertyName));
     }
 }

src/main/java/com/ss/editor/ui/component/painting/PaintingComponentListCell.java

@@ -0,0 +1,43 @@
+package com.ss.editor.ui.component.painting;
+
+import com.ss.editor.annotation.FxThread;
+import com.ss.rlib.util.StringUtils;
+import javafx.scene.control.ListCell;
+import javafx.scene.control.ListView;
+import javafx.scene.image.ImageView;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * The implementation of {@link ListCell} to show {@link PaintingComponent}.
+ *
+ * @author JavaSaBr
+ */
+public class PaintingComponentListCell extends ListCell<PaintingComponent> {
+
+    /**
+     * The image view to show icons.
+     */
+    @NotNull
+    private final ImageView imageView;
+
+    public PaintingComponentListCell(@Nullable final ListView<PaintingComponent> listView) {
+        this.imageView = new ImageView();
+        setGraphic(imageView);
+    }
+
+    @Override
+    @FxThread
+    protected void updateItem(@Nullable final PaintingComponent item, final boolean empty) {
+        super.updateItem(item, empty);
+
+        if (item == null) {
+            imageView.setImage(null);
+            setText(StringUtils.EMPTY);
+            return;
+        }
+
+        imageView.setImage(item.getIcon());
+        setText(item.getName());
+    }
+}