Implemented editable string property.

JavaSaBr · JavaSaBr · commit 3372bdc754d1 · 2017-01-27T06:11:22.000+03:00
diff --git a/jme3-spaceshift-extension/src/com/ss/extension/property/EditablePropertyType.java b/jme3-spaceshift-extension/src/com/ss/extension/property/EditablePropertyType.java
@@ -14,6 +14,7 @@ public enum EditablePropertyType {
     QUATERNION,
     COLOR,
     ENUM,
+    STRING,
     DIRECTION_LIGHT_FROM_SCENE,
     POINT_LIGHT_FROM_SCENE;
 
diff --git a/libs/extensions/jme3-spaceshift-extension-sources.jar b/libs/extensions/jme3-spaceshift-extension-sources.jar
diff --git a/libs/extensions/jme3-spaceshift-extension.jar b/libs/extensions/jme3-spaceshift-extension.jar
diff --git a/libs/jME/jme3-core-3.2.0-sources.jar b/libs/jME/jme3-core-3.2.0-sources.jar
diff --git a/libs/jME/jme3-core-3.2.0.jar b/libs/jME/jme3-core-3.2.0.jar
diff --git a/src/com/ss/editor/ui/control/app/state/property/builder/impl/AppStatePropertyBuilder.java b/src/com/ss/editor/ui/control/app/state/property/builder/impl/AppStatePropertyBuilder.java
@@ -9,6 +9,7 @@
 import com.ss.editor.ui.control.app.state.property.control.EnumAppStatePropertyControl;
 import com.ss.editor.ui.control.app.state.property.control.FloatAppStatePropertyControl;
 import com.ss.editor.ui.control.app.state.property.control.IntegerAppStatePropertyControl;
+import com.ss.editor.ui.control.app.state.property.control.StringAppStatePropertyControl;
 import com.ss.editor.ui.control.app.state.property.control.Vector2fAppStatePropertyControl;
 import com.ss.editor.ui.control.app.state.property.control.Vector3fAppStatePropertyControl;
 import com.ss.editor.ui.control.property.AbstractPropertyControl;
@@ -91,7 +92,7 @@ protected void buildForImpl(@NotNull final Object object, @Nullable final Object
                 case COLOR: {
 
                     final EditableProperty<ColorRGBA, ?> property = cast(editableProperty);
-                    final ColorRGBA color = Objects.requireNonNull(property.getValue(), "Color value can't be null.");
+                    final ColorRGBA color = property.getValue();
 
                     final ColorAppStatePropertyControl<EditableProperty<ColorRGBA, ?>> propertyControl =
                             new ColorAppStatePropertyControl<>(color, property.getName(), changeConsumer);
@@ -110,6 +111,17 @@ protected void buildForImpl(@NotNull final Object object, @Nullable final Object
                     addControl(container, property, propertyControl);
                     break;
                 }
+                case STRING: {
+
+                    final EditableProperty<String, ?> property = cast(editableProperty);
+                    final String value = property.getValue();
+
+                    final StringAppStatePropertyControl<EditableProperty<String, ?>> propertyControl =
+                            new StringAppStatePropertyControl<>(value, property.getName(), changeConsumer);
+
+                    addControl(container, property, propertyControl);
+                    break;
+                }
                 case VECTOR_2F: {
 
                     final EditableProperty<Vector2f, ?> property = cast(editableProperty);
diff --git a/src/com/ss/editor/ui/control/app/state/property/control/StringAppStatePropertyControl.java b/src/com/ss/editor/ui/control/app/state/property/control/StringAppStatePropertyControl.java
@@ -0,0 +1,23 @@
+package com.ss.editor.ui.control.app.state.property.control;
+
+import static com.ss.editor.ui.control.app.state.property.control.AppStatePropertyControl.newChangeHandler;
+
+import com.ss.editor.model.undo.editor.SceneChangeConsumer;
+import com.ss.editor.ui.control.property.AbstractPropertyControl;
+import com.ss.editor.ui.control.property.impl.AbstractStringPropertyControl;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * The implementation of the {@link AbstractPropertyControl} to edit string values.
+ *
+ * @author JavaSaBr
+ */
+public class StringAppStatePropertyControl<T> extends AbstractStringPropertyControl<SceneChangeConsumer, T> {
+
+    public StringAppStatePropertyControl(@Nullable final String propertyValue, @NotNull final String propertyName,
+                                         @NotNull final SceneChangeConsumer changeConsumer) {
+        super(propertyValue, propertyName, changeConsumer, newChangeHandler());
+    }
+}
diff --git a/src/com/ss/editor/ui/control/filter/property/builder/impl/FilterPropertyBuilder.java b/src/com/ss/editor/ui/control/filter/property/builder/impl/FilterPropertyBuilder.java
@@ -13,6 +13,7 @@
 import com.ss.editor.ui.control.filter.property.control.FloatFilterPropertyControl;
 import com.ss.editor.ui.control.filter.property.control.IntegerFilterPropertyControl;
 import com.ss.editor.ui.control.filter.property.control.PointLightElementPropertyControl;
+import com.ss.editor.ui.control.filter.property.control.StringFilterPropertyControl;
 import com.ss.editor.ui.control.filter.property.control.Vector2fFilterPropertyControl;
 import com.ss.editor.ui.control.filter.property.control.Vector3fFilterPropertyControl;
 import com.ss.editor.ui.control.property.AbstractPropertyControl;
@@ -95,7 +96,7 @@ protected void buildForImpl(@NotNull final Object object, @Nullable final Object
                 case COLOR: {
 
                     final EditableProperty<ColorRGBA, ?> property = cast(editableProperty);
-                    final ColorRGBA color = Objects.requireNonNull(property.getValue(), "Color value can't be null.");
+                    final ColorRGBA color = property.getValue();
 
                     final ColorFilterPropertyControl<EditableProperty<ColorRGBA, ?>> propertyControl =
                             new ColorFilterPropertyControl<>(color, property.getName(), changeConsumer);
@@ -114,6 +115,17 @@ protected void buildForImpl(@NotNull final Object object, @Nullable final Object
                     addControl(container, property, propertyControl);
                     break;
                 }
+                case STRING: {
+
+                    final EditableProperty<String, ?> property = cast(editableProperty);
+                    final String value = property.getValue();
+
+                    final StringFilterPropertyControl<EditableProperty<String, ?>> propertyControl =
+                            new StringFilterPropertyControl<>(value, property.getName(), changeConsumer);
+
+                    addControl(container, property, propertyControl);
+                    break;
+                }
                 case VECTOR_2F: {
 
                     final EditableProperty<Vector2f, ?> property = cast(editableProperty);
diff --git a/src/com/ss/editor/ui/control/filter/property/control/StringFilterPropertyControl.java b/src/com/ss/editor/ui/control/filter/property/control/StringFilterPropertyControl.java
@@ -0,0 +1,23 @@
+package com.ss.editor.ui.control.filter.property.control;
+
+import static com.ss.editor.ui.control.filter.property.control.FilterPropertyControl.newChangeHandler;
+
+import com.ss.editor.model.undo.editor.SceneChangeConsumer;
+import com.ss.editor.ui.control.property.AbstractPropertyControl;
+import com.ss.editor.ui.control.property.impl.AbstractStringPropertyControl;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * The implementation of the {@link AbstractPropertyControl} to edit string values.
+ *
+ * @author JavaSaBr
+ */
+public class StringFilterPropertyControl<T> extends AbstractStringPropertyControl<SceneChangeConsumer, T> {
+
+    public StringFilterPropertyControl(@Nullable final String propertyValue, @NotNull final String propertyName,
+                                       @NotNull final SceneChangeConsumer changeConsumer) {
+        super(propertyValue, propertyName, changeConsumer, newChangeHandler());
+    }
+}
diff --git a/src/com/ss/editor/ui/control/model/property/builder/impl/EditableControlPropertyBuilder.java b/src/com/ss/editor/ui/control/model/property/builder/impl/EditableControlPropertyBuilder.java
@@ -10,6 +10,7 @@
 import com.ss.editor.ui.control.model.property.control.EnumControlPropertyControl;
 import com.ss.editor.ui.control.model.property.control.FloatModelPropertyControl;
 import com.ss.editor.ui.control.model.property.control.IntegerModelPropertyControl;
+import com.ss.editor.ui.control.model.property.control.StringModelPropertyControl;
 import com.ss.editor.ui.control.model.property.control.Vector2fModelPropertyControl;
 import com.ss.editor.ui.control.model.property.control.Vector3fModelPropertyControl;
 import com.ss.editor.ui.control.property.AbstractPropertyControl;
@@ -92,7 +93,7 @@ protected void buildForImpl(@NotNull final Object object, @Nullable final Object
                 case COLOR: {
 
                     final EditableProperty<ColorRGBA, ?> property = cast(editableProperty);
-                    final ColorRGBA color = Objects.requireNonNull(property.getValue(), "Color value can't be null.");
+                    final ColorRGBA color = property.getValue();
 
                     final ColorModelPropertyControl<EditableProperty<ColorRGBA, ?>> propertyControl =
                             new ColorModelPropertyControl<>(color, property.getName(), changeConsumer);
@@ -111,6 +112,17 @@ protected void buildForImpl(@NotNull final Object object, @Nullable final Object
                     addControl(container, property, propertyControl);
                     break;
                 }
+                case STRING: {
+
+                    final EditableProperty<String, ?> property = cast(editableProperty);
+                    final String value = property.getValue();
+
+                    final StringModelPropertyControl<EditableProperty<String, ?>> propertyControl =
+                            new StringModelPropertyControl<>(value, property.getName(), changeConsumer);
+
+                    addControl(container, property, propertyControl);
+                    break;
+                }
                 case VECTOR_2F: {
 
                     final EditableProperty<Vector2f, ?> property = cast(editableProperty);
diff --git a/src/com/ss/editor/ui/control/model/property/builder/impl/SpatialPropertyBuilder.java b/src/com/ss/editor/ui/control/model/property/builder/impl/SpatialPropertyBuilder.java
@@ -14,12 +14,12 @@
 import com.ss.editor.model.undo.editor.SceneChangeConsumer;
 import com.ss.editor.ui.control.model.property.control.BooleanModelPropertyControl;
 import com.ss.editor.ui.control.model.property.control.ColorModelPropertyControl;
-import com.ss.editor.ui.control.model.property.control.DefaultModelSinglePropertyControl;
 import com.ss.editor.ui.control.model.property.control.EnumModelPropertyControl;
 import com.ss.editor.ui.control.model.property.control.FloatModelPropertyControl;
 import com.ss.editor.ui.control.model.property.control.IntegerModelPropertyControl;
 import com.ss.editor.ui.control.model.property.control.LayerModelPropertyControl;
 import com.ss.editor.ui.control.model.property.control.QuaternionModelPropertyControl;
+import com.ss.editor.ui.control.model.property.control.StringModelPropertyControl;
 import com.ss.editor.ui.control.model.property.control.Vector2fModelPropertyControl;
 import com.ss.editor.ui.control.model.property.control.Vector3fModelPropertyControl;
 import com.ss.editor.ui.control.property.builder.PropertyBuilder;
@@ -215,7 +215,7 @@ protected void buildForImpl(@NotNull final Object object, @Nullable final Object
 
                 final String value = (String) data;
 
-                final DefaultModelSinglePropertyControl<Spatial, String> control = new DefaultModelSinglePropertyControl<>(value, key, changeConsumer);
+                final StringModelPropertyControl<Spatial> control = new StringModelPropertyControl<>(value, key, changeConsumer);
                 control.setApplyHandler((sp, newValue) -> sp.setUserData(key, newValue));
                 control.setSyncHandler(sp -> sp.getUserData(key));
                 control.setEditObject(spatial);
diff --git a/src/com/ss/editor/ui/control/model/property/control/StringModelPropertyControl.java b/src/com/ss/editor/ui/control/model/property/control/StringModelPropertyControl.java
@@ -0,0 +1,23 @@
+package com.ss.editor.ui.control.model.property.control;
+
+import static com.ss.editor.ui.control.model.property.control.ModelPropertyControl.newChangeHandler;
+
+import com.ss.editor.model.undo.editor.ModelChangeConsumer;
+import com.ss.editor.ui.control.property.AbstractPropertyControl;
+import com.ss.editor.ui.control.property.impl.AbstractStringPropertyControl;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * The implementation of the {@link AbstractPropertyControl} to edit string values.
+ *
+ * @author JavaSaBr
+ */
+public class StringModelPropertyControl<T> extends AbstractStringPropertyControl<ModelChangeConsumer, T> {
+
+    public StringModelPropertyControl(@Nullable final String propertyValue, @NotNull final String propertyName,
+                                      @NotNull final ModelChangeConsumer changeConsumer) {
+        super(propertyValue, propertyName, changeConsumer, newChangeHandler());
+    }
+}
diff --git a/src/com/ss/editor/ui/control/model/tree/dialog/AddUserDataDialog.java b/src/com/ss/editor/ui/control/model/tree/dialog/AddUserDataDialog.java
@@ -47,6 +47,7 @@ private enum DataType {
         VECTOR2F,
         COLOR,
         BOOLEAN,
+        STRING,
     }
 
     private static final ObservableList<DataType> DATA_TYPES = observableArrayList(DataType.values());
@@ -164,6 +165,9 @@ protected void processOk() {
             case COLOR:
                 value = new ColorRGBA();
                 break;
+            case STRING:
+                value = "empty string";
+                break;
         }
 
         final ModelPropertyCountOperation<Spatial, Object> operation = new ModelPropertyCountOperation<>(spatial, "userData", value, null);
diff --git a/src/com/ss/editor/ui/control/property/impl/AbstractFloatPropertyControl.java b/src/com/ss/editor/ui/control/property/impl/AbstractFloatPropertyControl.java
@@ -42,7 +42,7 @@ protected void createComponents(@NotNull final HBox container) {
 
         valueField = new FloatTextField();
         valueField.setId(CSSIds.ABSTRACT_PARAM_CONTROL_COMBO_BOX);
-        valueField.setOnKeyPressed(UIUtils::consumeIfIsNotHotKey);
+        valueField.setOnKeyReleased(UIUtils::consumeIfIsNotHotKey);
         valueField.addChangeListener((observable, oldValue, newValue) -> updateValue());
         valueField.prefWidthProperty().bind(widthProperty().multiply(CONTROL_WIDTH_PERCENT));
 
diff --git a/src/com/ss/editor/ui/control/property/impl/AbstractIntegerPropertyControl.java b/src/com/ss/editor/ui/control/property/impl/AbstractIntegerPropertyControl.java
@@ -41,7 +41,7 @@ protected void createComponents(@NotNull final HBox container) {
 
         valueField = new IntegerTextField();
         valueField.setId(CSSIds.ABSTRACT_PARAM_CONTROL_COMBO_BOX);
-        valueField.setOnKeyPressed(UIUtils::consumeIfIsNotHotKey);
+        valueField.setOnKeyReleased(UIUtils::consumeIfIsNotHotKey);
         valueField.addChangeListener((observable, oldValue, newValue) -> updateValue());
         valueField.prefWidthProperty().bind(widthProperty().multiply(CONTROL_WIDTH_PERCENT));
 
diff --git a/src/com/ss/editor/ui/control/property/impl/AbstractStringPropertyControl.java b/src/com/ss/editor/ui/control/property/impl/AbstractStringPropertyControl.java
@@ -0,0 +1,89 @@
+package com.ss.editor.ui.control.property.impl;
+
+import com.ss.editor.model.undo.editor.ChangeConsumer;
+import com.ss.editor.ui.control.property.AbstractPropertyControl;
+import com.ss.editor.ui.css.CSSClasses;
+import com.ss.editor.ui.css.CSSIds;
+import com.ss.editor.ui.util.UIUtils;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.function.BiConsumer;
+
+import javafx.scene.control.TextField;
+import javafx.scene.input.KeyCode;
+import javafx.scene.input.KeyEvent;
+import javafx.scene.layout.HBox;
+import rlib.function.SixObjectConsumer;
+import rlib.ui.util.FXUtils;
+
+/**
+ * The implementation of the {@link AbstractPropertyControl} to edit string values.
+ *
+ * @author JavaSaBr
+ */
+public abstract class AbstractStringPropertyControl<C extends ChangeConsumer, T>
+        extends AbstractPropertyControl<C, T, String> {
+
+    /**
+     * The filed with current value.
+     */
+    private TextField valueField;
+
+    public AbstractStringPropertyControl(@Nullable final String propertyValue, @NotNull final String propertyName,
+                                         @NotNull final C changeConsumer,
+                                         @NotNull final SixObjectConsumer<C, T, String, String, String, BiConsumer<T, String>> changeHandler) {
+        super(propertyValue, propertyName, changeConsumer, changeHandler);
+    }
+
+    @Override
+    protected void createComponents(@NotNull final HBox container) {
+        super.createComponents(container);
+
+        valueField = new TextField();
+        valueField.setId(CSSIds.ABSTRACT_PARAM_CONTROL_COMBO_BOX);
+        valueField.setOnKeyReleased(this::updateValue);
+        valueField.prefWidthProperty().bind(widthProperty().multiply(CONTROL_WIDTH_PERCENT));
+
+        FXUtils.addClassTo(valueField, CSSClasses.SPECIAL_FONT_13);
+        FXUtils.addToPane(valueField, container);
+    }
+
+    @Override
+    protected boolean isSingleRow() {
+        return true;
+    }
+
+    /**
+     * @return the filed with current value.
+     */
+    private TextField getValueField() {
+        return valueField;
+    }
+
+    @Override
+    protected void reload() {
+        final String value = getPropertyValue();
+        final TextField valueField = getValueField();
+        final int caretPosition = valueField.getCaretPosition();
+        valueField.setText(value == null ? "" : value);
+        valueField.positionCaret(caretPosition);
+    }
+
+    /**
+     * Update the value.
+     */
+    private void updateValue(@NotNull final KeyEvent event) {
+        UIUtils.consumeIfIsNotHotKey(event);
+
+        if (isIgnoreListener() || event.getCode() != KeyCode.ENTER) return;
+
+        final TextField valueField = getValueField();
+
+        final String oldValue = getPropertyValue();
+        final String newValue = valueField.getText();
+
+        changed(newValue, oldValue);
+    }
+}
