Skip to content

Commit f3ad32b

Browse files
WIP for server changes to allow client layout. Next up: these new
properties should only be sent if client layout is used, otherwise they just take unnecessary space in the JSON messages. Server/Client should also communicate server layout capabilities in general for these changes.
1 parent 82b0bae commit f3ad32b

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/gson_utils/EObjectSerializer.xtend

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* http://rtsys.informatik.uni-kiel.de/kieler
55
*
6-
* Copyright 2019-2021 by
6+
* Copyright 2019-2026 by
77
* + Kiel University
88
* + Department of Computer Science
99
* + Real-Time and Embedded Systems Group
@@ -23,7 +23,7 @@ import com.google.gson.JsonSerializer
2323
import de.cau.cs.kieler.klighd.kgraph.EMapPropertyHolder
2424
import de.cau.cs.kieler.klighd.kgraph.KInsets
2525
import de.cau.cs.kieler.klighd.kgraph.impl.EMapPropertyHolderImpl
26-
import de.cau.cs.kieler.klighd.krendering.KContainerRendering
26+
import de.cau.cs.kieler.klighd.krendering.KPlacementData
2727
import de.cau.cs.kieler.klighd.krendering.KRendering
2828
import de.cau.cs.kieler.klighd.krendering.KRenderingLibrary
2929
import de.cau.cs.kieler.klighd.krendering.KRenderingRef
@@ -103,8 +103,8 @@ class EObjectSerializer implements JsonSerializer<EObject> {
103103
def shouldSkipField(Field f) {
104104
return Modifier.isStatic(f.modifiers)
105105
|| KRenderingRef .isAssignableFrom(f.declaringClass) && (f.getName().equals("rendering"))
106-
|| KRendering .isAssignableFrom(f.declaringClass) && (f.getName().equals("placementData"))
107-
|| KContainerRendering.isAssignableFrom(f.declaringClass) && (f.getName().equals("childPlacement"))
106+
// || KRendering .isAssignableFrom(f.declaringClass) && (f.getName().equals("placementData"))
107+
// || KContainerRendering.isAssignableFrom(f.declaringClass) && (f.getName().equals("childPlacement"))
108108
}
109109

110110
/**
@@ -128,6 +128,7 @@ class EObjectSerializer implements JsonSerializer<EObject> {
128128
|| KStyle .isAssignableFrom(c)
129129
|| KXPosition .isAssignableFrom(c)
130130
|| KYPosition .isAssignableFrom(c)
131+
|| KPlacementData .isAssignableFrom(c)
131132
}
132133

133134
// TODO: Special handling of default values

0 commit comments

Comments
 (0)