Commit ac0a6db3 authored by Nico Mack's avatar Nico Mack
Browse files

Relocated STRETCH_TO_FIT and MAINTAIN_ASPECT_RATIO properties into TULIP

Core package
parent ab7d9815
...@@ -25,7 +25,6 @@ LOWER_BOUND_VARIABLE_NODE=lowerBoundVariable ...@@ -25,7 +25,6 @@ LOWER_BOUND_VARIABLE_NODE=lowerBoundVariable
LOWER_STOP_ANGLE_NODE=lowerStopAngle LOWER_STOP_ANGLE_NODE=lowerStopAngle
MAPPING_NODE=mapping MAPPING_NODE=mapping
MAPPINGS_NODE=mappings MAPPINGS_NODE=mappings
MAINTAIN_ASPECT_RATIO_NODE=maintainAspectRatio
MINIMUM_RANGE_NODE=minimumRange MINIMUM_RANGE_NODE=minimumRange
MODIFY_VALUE_ON_ROTATION_NODE=modifyValueOnRotation MODIFY_VALUE_ON_ROTATION_NODE=modifyValueOnRotation
MODIFY_VALUE_ON_TRANSLATION_NODE=modifyValueOnTranslation MODIFY_VALUE_ON_TRANSLATION_NODE=modifyValueOnTranslation
...@@ -41,7 +40,6 @@ SCALES_NODE=scales ...@@ -41,7 +40,6 @@ SCALES_NODE=scales
SELECTED_ITEMS_VARIABLE_NODE=selectedItemsVariable SELECTED_ITEMS_VARIABLE_NODE=selectedItemsVariable
SELECTED_RADIUS_NODE=selectedRadius SELECTED_RADIUS_NODE=selectedRadius
STEP_SIZE_NODE=stepSize STEP_SIZE_NODE=stepSize
STRETCH_TO_FIT_NODE=stretchToFit
TRACK_ROTATION_CONTINUOUSLY_NODE=trackRotationContinuously TRACK_ROTATION_CONTINUOUSLY_NODE=trackRotationContinuously
TRACK_DEFLECTION_CONTINUOUSLY_NODE=trackDeflectionContinuously TRACK_DEFLECTION_CONTINUOUSLY_NODE=trackDeflectionContinuously
TRACK_TRANSLATION_CONTINUOUSLY_NODE=trackTranslationContinuously TRACK_TRANSLATION_CONTINUOUSLY_NODE=trackTranslationContinuously
......
...@@ -64,7 +64,6 @@ public class CpsNamespace extends NLS { ...@@ -64,7 +64,6 @@ public class CpsNamespace extends NLS {
public static String MAPPING_NODE; public static String MAPPING_NODE;
public static String MAPPINGS_NODE; public static String MAPPINGS_NODE;
public static String MAINTAIN_ASPECT_RATIO_NODE;
public static String MINIMUM_RANGE_NODE; public static String MINIMUM_RANGE_NODE;
public static String MODIFY_VALUE_ON_ROTATION_NODE; public static String MODIFY_VALUE_ON_ROTATION_NODE;
public static String MODIFY_VALUE_ON_TRANSLATION_NODE; public static String MODIFY_VALUE_ON_TRANSLATION_NODE;
...@@ -85,7 +84,6 @@ public class CpsNamespace extends NLS { ...@@ -85,7 +84,6 @@ public class CpsNamespace extends NLS {
public static String SELECTED_RADIUS_NODE; public static String SELECTED_RADIUS_NODE;
public static String STEP_SIZE_NODE; public static String STEP_SIZE_NODE;
public static String STRETCH_TO_FIT_NODE;
public static String TRACK_ROTATION_CONTINUOUSLY_NODE; public static String TRACK_ROTATION_CONTINUOUSLY_NODE;
public static String TRACK_DEFLECTION_CONTINUOUSLY_NODE; public static String TRACK_DEFLECTION_CONTINUOUSLY_NODE;
......
...@@ -131,7 +131,7 @@ public class BaseArcGraphBuilder<B extends BaseArcGraphBuilder<B>> extends Value ...@@ -131,7 +131,7 @@ public class BaseArcGraphBuilder<B extends BaseArcGraphBuilder<B>> extends Value
labelFormat = BootstrappingUtils.getContentAsString(rootElement, Externalization.LABEL_FORMAT_NODE, BootstrappingUtils.OPTIONAL, null, context); labelFormat = BootstrappingUtils.getContentAsString(rootElement, Externalization.LABEL_FORMAT_NODE, BootstrappingUtils.OPTIONAL, null, context);
labelGap = BootstrappingUtils.getContentAsInteger(rootElement, Externalization.LABEL_GAP_NODE, BootstrappingUtils.OPTIONAL, 0, context); labelGap = BootstrappingUtils.getContentAsInteger(rootElement, Externalization.LABEL_GAP_NODE, BootstrappingUtils.OPTIONAL, 0, context);
insetBorder = BootstrappingUtils.getContentAsInteger(rootElement, Externalization.INSET_BORDER_NODE, BootstrappingUtils.OPTIONAL, 0, context); insetBorder = BootstrappingUtils.getContentAsInteger(rootElement, Externalization.INSET_BORDER_NODE, BootstrappingUtils.OPTIONAL, 0, context);
stretchToFit = BootstrappingUtils.getContentAsBoolean(rootElement, CpsNamespace.STRETCH_TO_FIT_NODE, BootstrappingUtils.OPTIONAL, Boolean.FALSE, context); stretchToFit = BootstrappingUtils.getContentAsBoolean(rootElement, Externalization.STRETCH_TO_FIT_NODE, BootstrappingUtils.OPTIONAL, Boolean.FALSE, context);
centered = BootstrappingUtils.getContentAsBoolean(rootElement, Externalization.CENTRED_NODE, BootstrappingUtils.OPTIONAL, Boolean.FALSE, context); centered = BootstrappingUtils.getContentAsBoolean(rootElement, Externalization.CENTRED_NODE, BootstrappingUtils.OPTIONAL, Boolean.FALSE, context);
title = BootstrappingUtils.getContentAsString(rootElement, Externalization.TITLE_NODE, BootstrappingUtils.OPTIONAL, Externalization.EMPTY_STRING, context); title = BootstrappingUtils.getContentAsString(rootElement, Externalization.TITLE_NODE, BootstrappingUtils.OPTIONAL, Externalization.EMPTY_STRING, context);
......
...@@ -20,7 +20,6 @@ import lu.list.itis.dkd.tui.bootstrapping.BootstrappingUtils; ...@@ -20,7 +20,6 @@ import lu.list.itis.dkd.tui.bootstrapping.BootstrappingUtils;
import lu.list.itis.dkd.tui.bootstrapping.ShapeBootstrapper; import lu.list.itis.dkd.tui.bootstrapping.ShapeBootstrapper;
import lu.list.itis.dkd.tui.exception.BuildException; import lu.list.itis.dkd.tui.exception.BuildException;
import lu.list.itis.dkd.tui.utility.ColorPair; import lu.list.itis.dkd.tui.utility.ColorPair;
import lu.list.itis.dkd.tui.utility.CpsNamespace;
import lu.list.itis.dkd.tui.utility.Externalization; import lu.list.itis.dkd.tui.utility.Externalization;
import lu.list.itis.dkd.tui.utility.Point; import lu.list.itis.dkd.tui.utility.Point;
import lu.list.itis.dkd.tui.widget.corona.Indicator; import lu.list.itis.dkd.tui.widget.corona.Indicator;
...@@ -113,8 +112,8 @@ public abstract class BaseIndicatorBuilder<B extends BaseIndicatorBuilder<B>> ex ...@@ -113,8 +112,8 @@ public abstract class BaseIndicatorBuilder<B extends BaseIndicatorBuilder<B>> ex
labelShape = ShapeBootstrapper.getShape(rootElement.getChild(Externalization.LABEL_SHAPE_NODE), context, callback); labelShape = ShapeBootstrapper.getShape(rootElement.getChild(Externalization.LABEL_SHAPE_NODE), context, callback);
stretchToFit = BootstrappingUtils.getContentAsBoolean(rootElement, CpsNamespace.STRETCH_TO_FIT_NODE, BootstrappingUtils.OPTIONAL, Boolean.FALSE); stretchToFit = BootstrappingUtils.getContentAsBoolean(rootElement, Externalization.STRETCH_TO_FIT_NODE, BootstrappingUtils.OPTIONAL, Boolean.FALSE);
maintainAspectRatio = BootstrappingUtils.getContentAsBoolean(rootElement, CpsNamespace.MAINTAIN_ASPECT_RATIO_NODE, BootstrappingUtils.OPTIONAL, Boolean.FALSE); maintainAspectRatio = BootstrappingUtils.getContentAsBoolean(rootElement, Externalization.MAINTAIN_ASPECT_RATIO_NODE, BootstrappingUtils.OPTIONAL, Boolean.FALSE);
labelFormat = BootstrappingUtils.getContentAsString(rootElement, Externalization.LABEL_FORMAT_NODE, BootstrappingUtils.OPTIONAL, null); labelFormat = BootstrappingUtils.getContentAsString(rootElement, Externalization.LABEL_FORMAT_NODE, BootstrappingUtils.OPTIONAL, null);
textFont = BootstrappingUtils.getContentAsFont(rootElement, Externalization.FONT_NODE, BootstrappingUtils.OPTIONAL, new Font("Monospaced", Font.BOLD, 14), context); textFont = BootstrappingUtils.getContentAsFont(rootElement, Externalization.FONT_NODE, BootstrappingUtils.OPTIONAL, new Font("Monospaced", Font.BOLD, 14), context);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment