Keep view options for popped out editor

Author: Hanseter

pom.xml

@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.github.hanseter</groupId>
     <artifactId>json-properties-fx</artifactId>
-    <version>2.0.4</version>
+    <version>2.0.5</version>
 
     <packaging>bundle</packaging>
     <name>JSON Properties Editor Fx</name>

src/main/kotlin/com/github/hanseter/json/editor/JsonPropertiesEditor.kt

@@ -66,8 +66,10 @@ class JsonPropertiesEditor @JvmOverloads constructor(
 
     private val actions =
         actions + PreviewAction(
+            viewOptions,
             { referenceProposalProvider },
-            { resolutionScopeProvider }) + arrayActions
+            { resolutionScopeProvider }
+        ) + arrayActions
 
     private val idsToPanes = mutableMapOf<String, JsonPropertiesPane>()
     private val rootItem: FilterableTreeItem<TreeItemData> =

src/main/kotlin/com/github/hanseter/json/editor/actions/PreviewAction.kt

@@ -3,8 +3,10 @@ package com.github.hanseter.json.editor.actions
 import com.github.hanseter.json.editor.*
 import com.github.hanseter.json.editor.controls.IdReferenceControl
 import com.github.hanseter.json.editor.i18n.JsonPropertiesMl
+import com.github.hanseter.json.editor.types.IdReferenceModel
 import com.github.hanseter.json.editor.types.SupportedType
 import com.github.hanseter.json.editor.types.TypeModel
+import com.github.hanseter.json.editor.util.ViewOptions
 import javafx.event.Event
 import javafx.geometry.Pos
 import javafx.scene.Node
@@ -22,11 +24,13 @@ import org.everit.json.schema.StringSchema
 import java.util.function.Supplier
 
 class PreviewAction(
+    private val viewOptions: ViewOptions,
     private val idReferenceProposalProvider: Supplier<IdReferenceProposalProvider>,
     private val resolutionScopeProvider: Supplier<ResolutionScopeProvider>
 ) : EditorAction {
     override val text: String = "⤴"
-    override val description: String = JsonPropertiesMl.bundle.getString("jsonEditor.actions.preview")
+    override val description: String =
+        JsonPropertiesMl.bundle.getString("jsonEditor.actions.preview")
     override val selector: TargetSelector =
         TargetSelector.SchemaType(SupportedType.SimpleType.IdReferenceType)
 
@@ -35,12 +39,11 @@ class PreviewAction(
         model: TypeModel<*, *>,
         mouseEvent: Event?
     ): PropertiesEditResult? {
-        val value = (model as TypeModel<String?, SupportedType.SimpleType.IdReferenceType>).value
-        if (value != null) {
-            val dataAndSchema = idReferenceProposalProvider.get().getDataAndSchema(value)
-            if (dataAndSchema != null && mouseEvent != null) {
-                showPreviewPopup(dataAndSchema, value, mouseEvent?.target as? Node)
-            }
+        val value = model.value as? String ?: return null
+
+        val dataAndSchema = idReferenceProposalProvider.get().getDataAndSchema(value)
+        if (dataAndSchema != null && mouseEvent != null) {
+            showPreviewPopup(dataAndSchema, value, mouseEvent.target as? Node)
         }
         return null
     }
@@ -55,12 +58,13 @@ class PreviewAction(
     private fun showPreviewPopup(
         dataAndSchema: IdReferenceProposalProvider.DataWithSchema,
         value: String,
-        parent: Node?
+        parent: Node?,
     ) {
         val (data, previewSchema) = dataAndSchema
         val preview = JsonPropertiesEditor(true)
         preview.referenceProposalProvider = idReferenceProposalProvider.get()
         preview.resolutionScopeProvider = resolutionScopeProvider.get()
+        preview.viewOptions = viewOptions
         preview.display(value, value, data, previewSchema) { it }
         val scrollPane = ScrollPane(preview)
         scrollPane.maxHeight = 500.0

src/main/kotlin/com/github/hanseter/json/editor/schemaExtensions/MultiLineFormat.kt

@@ -1,12 +1,3 @@
-/*
- *
- *  * SWEETS - Software Engineering Tooling Suite
- *  *
- *  * Copyright (c) Siemens Mobility GmbH 2024, All Rights Reserved, Confidential.
- *  *
- *
- */
-
 package com.github.hanseter.json.editor.schemaExtensions
 
 import java.util.*

src/main/kotlin/com/github/hanseter/json/editor/types/FormattedIntegerModel.kt

@@ -1,8 +1,3 @@
-/*
- * SWEETS - Software Engineering Tooling Suite
- *
- * Copyright (c) Siemens Mobility GmbH 2022, All Rights Reserved, Confidential.
- */
 package com.github.hanseter.json.editor.types
 
 import com.github.hanseter.json.editor.controls.DoubleControl
@@ -15,10 +10,6 @@ import java.text.ParsePosition
 import kotlin.math.pow
 import kotlin.math.roundToInt
 
-/**
- *
- * @author Henrik Frühling (henrik.fruehling@siemens.com)
- */
 class FormattedIntegerModel(
     schema: EffectiveSchema<NumberSchema>,
     decimalFormatSymbols: DecimalFormatSymbols

src/main/kotlin/com/github/hanseter/json/editor/types/IdReferenceModel.kt

@@ -4,6 +4,8 @@ import com.github.hanseter.json.editor.extensions.EffectiveSchema
 import com.github.hanseter.json.editor.util.BindableJsonType
 import com.github.hanseter.json.editor.util.EditorContext
 import com.github.hanseter.json.editor.util.IdRefDisplayMode
+import com.github.hanseter.json.editor.util.PropertyGrouping
+import com.github.hanseter.json.editor.util.ViewOptions
 import org.everit.json.schema.StringSchema
 
 class IdReferenceModel(
@@ -51,8 +53,8 @@ class IdReferenceModel(
 
     override val previewString: PreviewString
         get() = PreviewString.create(
-            idToString(value,context,schema),
-            idToString(defaultValue,context,schema),
+            idToString(value, context, schema),
+            idToString(defaultValue, context, schema),
             rawValue
         )
 

src/main/kotlin/com/github/hanseter/json/editor/types/PreviewString.kt

@@ -1,17 +1,8 @@
-/*
- * SWEETS - Software Engineering Tooling Suite
- *
- * Copyright (c) Siemens Mobility GmbH 2022, All Rights Reserved, Confidential.
- */
 package com.github.hanseter.json.editor.types
 
 import com.github.hanseter.json.editor.i18n.JsonPropertiesMl
 import org.json.JSONObject
 
-/**
- *
- * @author Henrik Frühling (henrik.fruehling@siemens.com)
- */
 class PreviewString private constructor(
     val string: String,
     val isDefaultValue: Boolean = false,

src/main/kotlin/com/github/hanseter/json/editor/ui/TreeTableNavigation.kt

@@ -1,19 +1,10 @@
-/*
- * SWEETS - Software Engineering Tooling Suite
- *
- * Copyright (c) Siemens Mobility GmbH 2022, All Rights Reserved, Confidential.
- */
 package com.github.hanseter.json.editor.ui
 
 import javafx.scene.control.TreeItem
 import javafx.scene.control.TreeTableView
 import javafx.scene.input.KeyCode
 import javafx.scene.input.KeyEvent
 
-/**
- *
- * @author Henrik Frühling (henrik.fruehling@siemens.com)
- */
 object TreeTableNavigation {
 
     fun addNavigationToTreeTableView(treeTableView: TreeTableView<TreeItemData>) {

src/test/kotlin/com/github/hanseter/json/editor/app/ControlsPreviewTestApp.kt

@@ -1,8 +1,3 @@
-/*
- * SWEETS - Software Engineering Tooling Suite
- *
- * Copyright (c) Siemens Mobility GmbH 2022, All Rights Reserved, Confidential.
- */
 package com.github.hanseter.json.editor.app
 
 import com.github.hanseter.json.editor.ControlFactory
@@ -25,10 +20,6 @@ import javafx.stage.Stage
 import org.json.JSONObject
 
 
-/**
- *
- * @author Henrik Frühling (henrik.fruehling@siemens.com)
- */
 class ControlsPreviewTestApp : Application() {
 
     companion object {