Merge remote-tracking branch 'origin/master' into nre/removeTextBound…

…sEstimation

plugins/de.cau.cs.kieler.kgraph.text.ide/META-INF/MANIFEST.MF

@@ -11,4 +11,5 @@ Require-Bundle: de.cau.cs.kieler.kgraph.text,
 Export-Package: de.cau.cs.kieler.kgraph.text.ide,
  de.cau.cs.kieler.kgraph.text.ide.contentassist.antlr,
  de.cau.cs.kieler.kgraph.text.ide.contentassist.antlr.internal
+Automatic-Module-Name: de.cau.cs.kieler.kgraph.text.ide
 

plugins/de.cau.cs.kieler.kgraph.text.ui/META-INF/MANIFEST.MF

@@ -31,3 +31,4 @@ Export-Package: de.cau.cs.kieler.kgraph.text.ui,
  de.cau.cs.kieler.kgraph.text.ui.random,
  de.cau.cs.kieler.kgraph.text.ui.random.wizard
 Bundle-Activator: de.cau.cs.kieler.kgraph.text.ui.internal.TextActivator
+Automatic-Module-Name: de.cau.cs.kieler.kgraph.text.ui

plugins/de.cau.cs.kieler.kgraph.text.ui/src/de/cau/cs/kieler/kgraph/text/ui/contentassist/KGraphProposalProvider.java

@@ -14,6 +14,7 @@
 package de.cau.cs.kieler.kgraph.text.ui.contentassist;
 
 import java.lang.annotation.Annotation;
+import java.lang.reflect.InvocationTargetException;
 import java.util.Arrays;
 
 import javax.inject.Inject;
@@ -471,13 +472,19 @@ private void valueProposal(final ContentAssistContext context,
                         break;
                     case OBJECT:
                         try {
+
                             proposal = "\""
-                                    + optionData.getOptionClass().newInstance().toString()
+                                    + optionData.getOptionClass().getDeclaredConstructor().newInstance().toString()
                                     + "\"";
-                        } catch (final InstantiationException e) {
+
+                        } catch (final InstantiationException 
+                                | IllegalAccessException 
+                                | IllegalArgumentException 
+                                | NoSuchMethodException e) {
                             proposal = "\"\"";
-                        } catch (final IllegalAccessException e) {
+                        } catch (final InvocationTargetException e) {
                             proposal = "\"\"";
+                            e.printStackTrace();
                         }
                         break;
 

plugins/de.cau.cs.kieler.kgraph.text/META-INF/MANIFEST.MF

@@ -36,4 +36,5 @@ Export-Package: de.cau.cs.kieler.kgraph.text,
  de.cau.cs.kieler.kgraph.text.serializer,
  de.cau.cs.kieler.kgraph.text.services,
  de.cau.cs.kieler.kgraph.text.validation
+Automatic-Module-Name: de.cau.cs.kieler.kgraph.text
 

plugins/de.cau.cs.kieler.klighd.incremental/META-INF/MANIFEST.MF

@@ -9,3 +9,4 @@ Require-Bundle: de.cau.cs.kieler.klighd,
  de.cau.cs.kieler.klighd.krendering.extensions;bundle-version="0.8.0",
  com.google.guava
 Export-Package: de.cau.cs.kieler.klighd.incremental
+Automatic-Module-Name: de.cau.cs.kieler.klighd.incremental

plugins/de.cau.cs.kieler.klighd.kgraph/META-INF/MANIFEST.MF

@@ -16,3 +16,4 @@ Require-Bundle: org.eclipse.core.runtime,
 Bundle-Vendor: Kiel University
 Bundle-Localization: plugin
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: de.cau.cs.kieler.klighd.kgraph

plugins/de.cau.cs.kieler.klighd.kgraph/src/de/cau/cs/kieler/klighd/kgraph/KLayoutData.java

@@ -13,8 +13,6 @@
  */
 package de.cau.cs.kieler.klighd.kgraph;
 
-import org.eclipse.elk.graph.properties.IPropertyHolder;
-import org.eclipse.emf.ecore.EObject;
 
 
 /**

plugins/de.cau.cs.kieler.klighd.kgraph/src/de/cau/cs/kieler/klighd/kgraph/util/KGraphUtil.java

@@ -20,7 +20,6 @@
 import org.eclipse.elk.core.math.KVector;
 import org.eclipse.elk.core.options.CoreOptions;
 import org.eclipse.elk.core.options.Direction;
-import org.eclipse.elk.core.options.EdgeLabelPlacement;
 import org.eclipse.elk.core.options.NodeLabelPlacement;
 import org.eclipse.elk.core.options.PortSide;
 import org.eclipse.elk.core.options.SizeConstraint;

plugins/de.cau.cs.kieler.klighd.krendering.extensions/META-INF/MANIFEST.MF

@@ -15,3 +15,4 @@ Require-Bundle: org.eclipse.core.runtime,
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Export-Package: de.cau.cs.kieler.klighd.krendering.extensions
+Automatic-Module-Name: de.cau.cs.kieler.klighd.krendering.extensions

plugins/de.cau.cs.kieler.klighd.krendering.extensions/src/de/cau/cs/kieler/klighd/krendering/extensions/KEdgeExtensions.xtend

@@ -22,7 +22,6 @@ import de.cau.cs.kieler.klighd.krendering.KRenderingFactory
 import de.cau.cs.kieler.klighd.krendering.KRoundedBendsPolyline
 import de.cau.cs.kieler.klighd.krendering.KSpline
 import de.cau.cs.kieler.klighd.krendering.ViewSynthesisShared
-import java.util.ArrayList
 import java.util.List
 import javax.inject.Inject
 import org.eclipse.elk.graph.properties.IProperty

plugins/de.cau.cs.kieler.klighd.krendering.extensions/src/de/cau/cs/kieler/klighd/krendering/extensions/KNodeExtensions.xtend

@@ -19,7 +19,6 @@ import de.cau.cs.kieler.klighd.kgraph.KGraphElement
 import de.cau.cs.kieler.klighd.kgraph.KNode
 import de.cau.cs.kieler.klighd.kgraph.util.KGraphUtil
 import de.cau.cs.kieler.klighd.krendering.ViewSynthesisShared
-import java.util.ArrayList
 import javax.inject.Inject
 import org.eclipse.elk.core.math.KVector
 import org.eclipse.elk.core.options.CoreOptions

plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/IDiagramOptionsLanguageServerExtension.xtend

@@ -13,15 +13,10 @@
 package de.cau.cs.kieler.klighd.lsp
 
 import de.cau.cs.kieler.klighd.SynthesisOption
-import de.cau.cs.kieler.klighd.lsp.model.GetOptionsParam
-import de.cau.cs.kieler.klighd.lsp.model.GetOptionsResult
 import de.cau.cs.kieler.klighd.lsp.model.PerformActionParam
 import de.cau.cs.kieler.klighd.lsp.model.SetLayoutOptionsParam
 import de.cau.cs.kieler.klighd.lsp.model.SetSynthesisOptionsParam
-import de.cau.cs.kieler.klighd.lsp.model.ValuedSynthesisOption
-import java.util.concurrent.CompletableFuture
 import org.eclipse.lsp4j.jsonrpc.services.JsonNotification
-import org.eclipse.lsp4j.jsonrpc.services.JsonRequest
 import org.eclipse.lsp4j.jsonrpc.services.JsonSegment
 
 /**

plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphDiagramGenerator.xtend

@@ -154,6 +154,8 @@ class KGraphDiagramGenerator implements IDiagramGenerator {
         // Do post processing.
         postProcess()
 
+        LOG.info("Completed generating diagram for input: '" + uri + "'")
+
         return if (cancelIndicator.canceled) 
                null
            else 

plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphDiagramUpdater.xtend

@@ -3,7 +3,7 @@
  * 
  * http://rtsys.informatik.uni-kiel.de/kieler
  * 
- * Copyright 2019, 2021 by
+ * Copyright 2019, 2020, 2021 by
  * + Kiel University
  *   + Department of Computer Science
  *     + Real-Time and Embedded Systems Group
@@ -45,7 +45,6 @@ import org.eclipse.xtext.util.CancelIndicator
  * @author nre
  */
 class KGraphDiagramUpdater extends DiagramUpdater {
-
     /**
      * The {@link Provider} to call an injected {@link KGraphDiagramGenerator} to generate {@link KNode KGraphs} and 
      * {@link SKGraph}s from that.
@@ -338,18 +337,22 @@ class KGraphDiagramUpdater extends DiagramUpdater {
             val List<String> configuredOptions = newArrayList
             for (option : synthesisOptions.entrySet) {
                 val optionId = option.key
-                val optionValue = option.value.asJsonPrimitive
-                // Search an option with the same ID in the view context and configure it with the new value.
-                val availableOptions = viewContext.displayedSynthesisOptions
-                val matchedOption = availableOptions.findFirst [ it.id == optionId ]
-                if (matchedOption !== null) {
-                    val Object optionValueObject = optionValue.isBoolean ? optionValue.asBoolean
-                                                 : optionValue.isNumber  ? optionValue.asNumber
-                                                 : optionValue.isString  ? optionValue.asString
-                    KGraphLanguageServerExtension.configureOption(matchedOption, optionValueObject, viewContext)
-                    // Store the option with the new value in the recent options.
-                    recentSynthesisOptions.put(matchedOption, viewContext.getOptionValue(matchedOption))
-                    configuredOptions.add(optionId)
+                if (option.value.isJsonPrimitive){
+                    val optionValue = option.value.asJsonPrimitive
+                    // Search an option with the same ID in the view context and configure it with the new value.
+                    val availableOptions = viewContext.displayedSynthesisOptions
+                    val matchedOption = availableOptions.findFirst [ it.id == optionId ]
+                    if (matchedOption !== null) {
+                        val Object optionValueObject = optionValue.isBoolean ? optionValue.asBoolean
+                                                     : optionValue.isNumber  ? optionValue.asNumber
+                                                     : optionValue.isString  ? optionValue.asString
+                        KGraphLanguageServerExtension.configureOption(matchedOption, optionValueObject, viewContext)
+                        // Store the option with the new value in the recent options.
+                        recentSynthesisOptions.put(matchedOption, viewContext.getOptionValue(matchedOption))
+                        configuredOptions.add(optionId)
+                    }
+                } else {
+                   println("Not a JSON Primitive: " + option.value)
                 }
             }
             // These options now already have been configured here, so remove them from being configured again.

plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/launch/AbstractLanguageServer.xtend

@@ -134,21 +134,25 @@ abstract class AbstractLanguageServer implements Runnable {
                 println(e.stackTrace)
                 return
             }
-            println("Connection to: " + host + ":" + port)
+            LOG.info("Connection to: " + host + ":" + port)
             // Register all languages
-            println("Starting language server socket")
+            LOG.info("Starting language server socket")
             bindAndRegisterLanguages()
 
             val serverSocket = AsynchronousServerSocketChannel.open.bind(new InetSocketAddress(host, port))
             val threadPool = Executors.newCachedThreadPool()
+
+            LOG.info("Language Server Socket ready!")
+
             while (true) {
                 val socketChannel = serverSocket.accept.get            
                 val in = Channels.newInputStream(socketChannel)
                 val out = Channels.newOutputStream(socketChannel)
                 val injector = Guice.createInjector(createLSModules(true))
                 val ls = injector.getInstance(LanguageServerImpl)
+                LOG.info("Starting language server for client " + socketChannel.remoteAddress)
                 buildAndStartLS(injector, ls, in, out, threadPool, [it], true)
-                LOG.info("Started language server for client " + socketChannel.remoteAddress)
+                LOG.info("Finished language server for client " + socketChannel.remoteAddress)
             }
         } else {
             LanguageServerLauncher.launch(languageRegistration, creator)

plugins/de.cau.cs.kieler.klighd.piccolo.batik/META-INF/MANIFEST.MF

@@ -32,3 +32,4 @@ Bundle-ClassPath: .,
  lib/lib/pdf-transcoder.jar,
  lib/lib/xalan-2.6.0.jar,
  lib/lib/xerces_2_5_0.jar
+Automatic-Module-Name: de.cau.cs.kieler.klighd.piccolo.batik

plugins/de.cau.cs.kieler.klighd.piccolo.draw2d/META-INF/MANIFEST.MF

@@ -8,3 +8,4 @@ Fragment-Host: de.cau.cs.kieler.klighd.piccolo
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: com.google.guava;bundle-version="10.0.0",
  org.eclipse.draw2d;bundle-version="3.7.0"
+Automatic-Module-Name: de.cau.cs.kieler.klighd.piccolo.draw2d

plugins/de.cau.cs.kieler.klighd.piccolo.freehep/META-INF/MANIFEST.MF

@@ -13,3 +13,4 @@ Bundle-ClassPath: .,
  lib/freehep-graphicsio-svg-2.3.jar,
  lib/freehep-graphicsio-tests-2.3.jar,
  lib/freehep-io-2.2.2.jar
+Automatic-Module-Name: de.cau.cs.kieler.klighd.piccolo.freehep

plugins/de.cau.cs.kieler.klighd.piccolo/META-INF/MANIFEST.MF

@@ -36,3 +36,4 @@ Export-Package: de.cau.cs.kieler.klighd.piccolo,
    de.cau.cs.kieler.klighd.piccolo.test,
    de.cau.cs.kieler.klighd.ui",
  de.cau.cs.kieler.klighd.piccolo.viewer
+Automatic-Module-Name: de.cau.cs.kieler.klighd.piccolo

plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/controller/KEdgeRenderingController.java

@@ -28,7 +28,6 @@
 import de.cau.cs.kieler.klighd.krendering.KCustomRendering;
 import de.cau.cs.kieler.klighd.krendering.KPolyline;
 import de.cau.cs.kieler.klighd.krendering.KRendering;
-import de.cau.cs.kieler.klighd.krendering.KRenderingFactory;
 import de.cau.cs.kieler.klighd.krendering.KRenderingPackage;
 import de.cau.cs.kieler.klighd.krendering.KRenderingRef;
 import de.cau.cs.kieler.klighd.krendering.KRoundedBendsPolyline;

plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/controller/KLabelRenderingController.java

@@ -22,7 +22,6 @@
 
 import de.cau.cs.kieler.klighd.kgraph.KLabel;
 import de.cau.cs.kieler.klighd.krendering.KRendering;
-import de.cau.cs.kieler.klighd.krendering.KRenderingFactory;
 import de.cau.cs.kieler.klighd.krendering.KRenderingUtil;
 import de.cau.cs.kieler.klighd.krendering.KText;
 import de.cau.cs.kieler.klighd.microlayout.Bounds;

plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/controller/KNodeRenderingController.java

@@ -19,7 +19,6 @@
 import de.cau.cs.kieler.klighd.kgraph.KNode;
 import de.cau.cs.kieler.klighd.krendering.KChildArea;
 import de.cau.cs.kieler.klighd.krendering.KRendering;
-import de.cau.cs.kieler.klighd.krendering.KRenderingFactory;
 import de.cau.cs.kieler.klighd.microlayout.Bounds;
 import de.cau.cs.kieler.klighd.microlayout.PlacementUtil;
 import de.cau.cs.kieler.klighd.piccolo.IKlighdNode;

plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/controller/KPortRenderingController.java

@@ -14,11 +14,7 @@
 package de.cau.cs.kieler.klighd.piccolo.internal.controller;
 
 import de.cau.cs.kieler.klighd.kgraph.KPort;
-import de.cau.cs.kieler.klighd.krendering.KBackground;
-import de.cau.cs.kieler.klighd.krendering.KForeground;
-import de.cau.cs.kieler.klighd.krendering.KRectangle;
 import de.cau.cs.kieler.klighd.krendering.KRendering;
-import de.cau.cs.kieler.klighd.krendering.KRenderingFactory;
 import de.cau.cs.kieler.klighd.piccolo.internal.nodes.KPortNode;
 
 /**

plugins/de.cau.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/nodes/KlighdImage.java

@@ -235,7 +235,7 @@ public void setImage(final URL url) {
         final ImageDescriptor descr = IMAGE_REGISTRY.getDescriptor(imageKey);
 
         if (descr != null) {
-            setImage(descr.getImageData());
+            setImage(descr.getImageData(100));
 
         } else {
             try {

plugins/de.cau.cs.kieler.klighd.standalone/META-INF/MANIFEST.MF

@@ -19,3 +19,4 @@ Require-Bundle: org.eclipse.emf.ecore.xmi,
  org.eclipse.elk.alg.mrtree;resolution:=optional,
  org.eclipse.elk.alg.radial;resolution:=optional
 Export-Package: de.cau.cs.kieler.klighd.standalone
+Automatic-Module-Name: de.cau.cs.kieler.klighd.standalone

plugins/de.cau.cs.kieler.klighd.ui.contrib3x/META-INF/MANIFEST.MF

@@ -7,3 +7,4 @@ Bundle-Vendor: Kiel University
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.ui;bundle-version="3.105.0",
  de.cau.cs.kieler.klighd.ui;bundle-version="0.5.0"
+Automatic-Module-Name: de.cau.cs.kieler.klighd.ui.contrib3x

plugins/de.cau.cs.kieler.klighd.ui.emf/META-INF/MANIFEST.MF

@@ -8,3 +8,4 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.emf.transaction,
  org.eclipse.emf.workspace
 Bundle-Vendor: Kiel University
+Automatic-Module-Name: de.cau.cs.kieler.klighd.ui.emf

plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/controller/ViewUpdateControllerFactory.java

@@ -320,7 +320,7 @@ public static AbstractViewUpdateController getNewInstance(final String controlle
                     mucm.idControllerMapping.get(controllerID);
             if (clazz != null) {
                 try {
-                    AbstractViewUpdateController newInstance = clazz.newInstance();
+                    AbstractViewUpdateController newInstance = clazz.getDeclaredConstructor().newInstance();
                     newInstance.initialize(diagramView);
                     return newInstance;
                 } catch (Exception e) {

plugins/de.cau.cs.kieler.klighd.ui.wizard/META-INF/MANIFEST.MF

@@ -22,3 +22,4 @@ Require-Bundle: org.apache.log4j,
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: Kiel University
+Automatic-Module-Name: de.cau.cs.kieler.klighd.ui.wizard

plugins/de.cau.cs.kieler.klighd.ui.wizard/src/de/cau/cs/kieler/klighd/ui/wizard/KlighdNewProjectCreationPage.java

@@ -383,7 +383,7 @@ protected boolean validatePage() {
         }
         status =
                 JavaConventions.validateJavaTypeName(transformationName.getText(),
-                        JavaCore.VERSION_1_5, JavaCore.VERSION_1_5);
+                        JavaCore.VERSION_1_5, JavaCore.VERSION_1_5, null);
         if (!status.isOK()) {
             setErrorMessage(JavaUIMessages.KlighdNewProjectCreationPage_MsgInvalidTransformationName
                     + status.getMessage());
@@ -402,7 +402,7 @@ protected boolean validatePage() {
         }
         status =
                 JavaConventions.validateJavaTypeName(sourceModel.getText(), JavaCore.VERSION_1_5,
-                        JavaCore.VERSION_1_5);
+                        JavaCore.VERSION_1_5, null);
         if (!status.isOK()) {
             setErrorMessage(JavaUIMessages.KlighdNewProjectCreationPage_MsgInvalidSourceModelType
                     + status.getMessage());

plugins/de.cau.cs.kieler.klighd.ui/META-INF/MANIFEST.MF

@@ -18,7 +18,8 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400",
  org.eclipse.core.databinding;bundle-version="1.4.1",
  org.eclipse.core.databinding.beans;bundle-version="1.2.200",
  org.eclipse.jface.databinding;bundle-version="1.6.200",
- org.eclipse.elk.core.service;bundle-version="0.1.0"
+ org.eclipse.elk.core.service;bundle-version="0.1.0",
+ org.eclipse.core.databinding.property;bundle-version="1.8.0"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: Kiel University
@@ -32,3 +33,4 @@ Export-Package: de.cau.cs.kieler.klighd.ui,
  de.cau.cs.kieler.klighd.ui.printing,
  de.cau.cs.kieler.klighd.ui.printing.dialog,
  de.cau.cs.kieler.klighd.ui.viewers
+Automatic-Module-Name: de.cau.cs.kieler.klighd.ui

plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/internal/options/DiagramSideBar.java

@@ -461,7 +461,7 @@ private void initializeZoomButtons(final Composite parent) {
             @Override
             public void widgetSelected(final SelectionEvent e) {
                 viewContext.setZoomStyle(
-                        ZoomStyle.create(false, zoomToFitBtn.getSelection(), false));
+                        ZoomStyle.create(false, zoomToFitBtn.getSelection(), false, false, false));
 
                 // perform zoom to fit upon activation of the toggle button
                 if (zoomToFitBtn.getSelection()) {
@@ -486,7 +486,7 @@ public void widgetSelected(final SelectionEvent e) {
             @Override
             public void widgetSelected(final SelectionEvent e) {
                 viewContext.setZoomStyle(
-                        ZoomStyle.create(false, false, zoomToFocusBtn.getSelection()));
+                        ZoomStyle.create(false, false, false, zoomToFocusBtn.getSelection(), false));
 
                 // perform zoom to focus upon activation of the toggle button
                 if (zoomToFocusBtn.getSelection()) {

plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/parts/DiagramEditorPart.java

@@ -62,7 +62,6 @@
 import de.cau.cs.kieler.klighd.IDiagramWorkbenchPart;
 import de.cau.cs.kieler.klighd.IViewer;
 import de.cau.cs.kieler.klighd.Klighd;
-import de.cau.cs.kieler.klighd.KlighdPlugin;
 import de.cau.cs.kieler.klighd.LightDiagramLayoutConfig;
 import de.cau.cs.kieler.klighd.ViewContext;
 import de.cau.cs.kieler.klighd.ZoomStyle;

plugins/de.cau.cs.kieler.klighd.ui/src/de/cau/cs/kieler/klighd/ui/printing/dialog/AlignmentBlock.java

@@ -14,10 +14,11 @@
 package de.cau.cs.kieler.klighd.ui.printing.dialog;
 
 import org.eclipse.core.databinding.DataBindingContext;
-import org.eclipse.core.databinding.beans.BeansObservables;
+import org.eclipse.core.databinding.beans.typed.BeanProperties;
 import org.eclipse.core.databinding.observable.Realm;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
-import org.eclipse.jface.databinding.swt.SWTObservables;
+import org.eclipse.jface.databinding.swt.ISWTObservableValue;
+import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
@@ -77,13 +78,16 @@ public static Group createContents(final Composite parent, final DataBindingCont
 
         final Realm realm = bindings.getValidationRealm();
 
-        final IObservableValue centerHorValue =
-                BeansObservables.observeValue(realm, options, PrintOptions.PROPERTY_CENTER_HORIZONTALLY);
-        bindings.bindValue(SWTObservables.observeSelection(centerHorizontally), centerHorValue);
+        final IObservableValue<Object> centerHorValue = 
+                BeanProperties.value(options.getClass().asSubclass(PrintOptions.class), PrintOptions.PROPERTY_CENTER_HORIZONTALLY)
+                    .observe(realm, options);
+        ISWTObservableValue<Object> horObservation = WidgetProperties.selection().observe(centerHorizontally);
+        bindings.bindValue(horObservation, centerHorValue);
 
-        final IObservableValue centerVerValue =
-                BeansObservables.observeValue(realm, options, PrintOptions.PROPERTY_CENTER_VERTICALLY);
-        bindings.bindValue(SWTObservables.observeSelection(centerVertically), centerVerValue);
+        final IObservableValue<Object> centerVerValue = BeanProperties.value(options.getClass().asSubclass(PrintOptions.class), PrintOptions.PROPERTY_CENTER_VERTICALLY)
+                .observe(realm, options);
+        ISWTObservableValue<Object> vertObservation = WidgetProperties.selection().observe(centerVertically);
+        bindings.bindValue(vertObservation, centerVerValue);
 
         result.addListener(SWT.Dispose, new Listener() {