Skip to content

Move color service to core/ui #3716

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
UrbanBobek wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Move color service to core/ui #3716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
29da894
Add color service to org.phoebus.ui.color
UrbanBobek Feb 27, 2026
09ac0ef
Migrate color classes to org.phoebus.ui.color
UrbanBobek Feb 27, 2026
2bd0238
Move ConfigFileParser and FileToStreamFunction to org.phoebus.util.co…
UrbanBobek Feb 28, 2026
bcde7e6
Reorder the imports so they are grouped by package
UrbanBobek Mar 4, 2026
22cee1b
Revert the line endings in DelayedStream.java
UrbanBobek Mar 4, 2026
79da41c
Fix CRLF line endings in ColorUnitTest
UrbanBobek Mar 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/display/convert-edm/src/main/java/org/csstudio/display/converter/edm/EdmConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
import org.csstudio.display.builder.model.Widget;
import org.csstudio.display.builder.model.WidgetProperty;
import org.csstudio.display.builder.model.persist.ModelWriter;
import org.csstudio.display.builder.model.persist.NamedWidgetColors;
import org.csstudio.display.builder.model.properties.CommonWidgetProperties;
import org.csstudio.display.builder.model.properties.ActionInfos;
import org.csstudio.display.builder.model.spi.ActionInfo;
Expand All @@ -23,6 +22,7 @@
import org.csstudio.opibuilder.converter.model.EdmEntity;
import org.csstudio.opibuilder.converter.model.EdmWidget;
import org.csstudio.opibuilder.converter.parser.EdmDisplayParser;
import org.phoebus.ui.color.NamedWidgetColors;

import java.awt.geom.Rectangle2D;
import java.io.File;
Expand Down
2 changes: 1 addition & 1 deletion ...m/src/main/java/org/csstudio/display/converter/edm/widgets/Convert_activeButtonClass.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
package org.csstudio.display.converter.edm.widgets;

import org.csstudio.display.builder.model.Widget;
import org.csstudio.display.builder.model.properties.WidgetColor;
import org.csstudio.display.builder.model.widgets.BoolButtonWidget;
import org.csstudio.display.converter.edm.EdmConverter;
import org.csstudio.opibuilder.converter.model.EdmWidget;
import org.csstudio.opibuilder.converter.model.Edm_activeButtonClass;
import org.phoebus.ui.color.WidgetColor;

/** Convert an EDM widget into Display Builder counterpart
* @author Kay Kasemir
Expand Down
2 changes: 1 addition & 1 deletion ...ain/java/org/csstudio/display/converter/edm/widgets/Convert_activeMessageButtonClass.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
package org.csstudio.display.converter.edm.widgets;

import org.csstudio.display.builder.model.Widget;
import org.csstudio.display.builder.model.persist.NamedWidgetColors;
import org.csstudio.display.builder.model.properties.ConfirmDialog;
import org.csstudio.display.builder.model.properties.ActionInfos;
import org.csstudio.display.builder.model.widgets.ActionButtonWidget;
Expand All @@ -17,6 +16,7 @@
import org.csstudio.opibuilder.converter.model.EdmWidget;
import org.csstudio.opibuilder.converter.model.Edm_activeMessageButtonClass;
import org.csstudio.display.actions.WritePVAction;
import org.phoebus.ui.color.NamedWidgetColors;

import java.util.List;
import java.util.logging.Level;
Expand Down
6 changes: 3 additions & 3 deletions ...rc/main/java/org/csstudio/display/converter/edm/widgets/Convert_activeRectangleClass.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@

import org.csstudio.display.builder.model.ChildrenProperty;
import org.csstudio.display.builder.model.Widget;
import org.csstudio.display.builder.model.persist.NamedWidgetColors;
import org.csstudio.display.builder.model.persist.WidgetColorService;
import org.csstudio.display.builder.model.properties.WidgetColor;
import org.csstudio.display.builder.model.widgets.BaseLEDWidget;
import org.csstudio.display.builder.model.widgets.LEDWidget;
import org.csstudio.display.builder.model.widgets.MultiStateLEDWidget;
Expand All @@ -30,6 +27,9 @@
import org.csstudio.opibuilder.converter.model.EdmModel;
import org.csstudio.opibuilder.converter.model.EdmWidget;
import org.csstudio.opibuilder.converter.model.Edm_activeRectangleClass;
import org.phoebus.ui.color.NamedWidgetColors;
import org.phoebus.ui.color.WidgetColor;
import org.phoebus.ui.color.WidgetColorService;

/** Convert an EDM widget into Display Builder counterpart
* @author Kay Kasemir
Expand Down
4 changes: 2 additions & 2 deletions ...src/main/java/org/csstudio/display/converter/edm/widgets/Convert_relatedDisplayClass.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@
package org.csstudio.display.converter.edm.widgets;

import org.csstudio.display.builder.model.Widget;
import org.csstudio.display.builder.model.persist.NamedWidgetColors;
import org.csstudio.display.builder.model.properties.ActionInfos;
import org.csstudio.display.builder.model.properties.WidgetColor;
import org.csstudio.display.builder.model.spi.ActionInfo;
import org.csstudio.display.builder.model.widgets.ActionButtonWidget;
import org.csstudio.display.converter.edm.EdmConverter;
Expand All @@ -19,6 +17,8 @@
import org.csstudio.opibuilder.converter.model.EdmWidget;
import org.csstudio.opibuilder.converter.model.Edm_relatedDisplayClass;
import org.csstudio.display.actions.OpenDisplayAction;
import org.phoebus.ui.color.NamedWidgetColors;
import org.phoebus.ui.color.WidgetColor;
import org.phoebus.framework.macros.Macros;

import java.util.ArrayList;
Expand Down
2 changes: 1 addition & 1 deletion ...t-edm/src/main/java/org/csstudio/display/converter/edm/widgets/Convert_shellCmdClass.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
package org.csstudio.display.converter.edm.widgets;

import org.csstudio.display.builder.model.Widget;
import org.csstudio.display.builder.model.persist.NamedWidgetColors;
import org.csstudio.display.builder.model.properties.ActionInfos;
import org.csstudio.display.builder.model.spi.ActionInfo;
import org.csstudio.display.builder.model.widgets.ActionButtonWidget;
Expand All @@ -19,6 +18,7 @@
import org.csstudio.opibuilder.converter.model.Edm_shellCmdClass;
import org.csstudio.display.actions.ExecuteCommandAction;
import org.csstudio.display.actions.OpenFileAction;
import org.phoebus.ui.color.NamedWidgetColors;

import java.util.ArrayList;
import java.util.List;
Expand Down
4 changes: 2 additions & 2 deletions ...y/convert-edm/src/main/java/org/csstudio/display/converter/edm/widgets/ConverterBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,8 @@
import org.csstudio.display.builder.model.Widget;
import org.csstudio.display.builder.model.WidgetProperty;
import org.csstudio.display.builder.model.properties.CommonWidgetProperties;
import org.csstudio.display.builder.model.properties.NamedWidgetColor;
import org.csstudio.display.builder.model.properties.ScriptInfo;
import org.csstudio.display.builder.model.properties.ScriptPV;
import org.csstudio.display.builder.model.properties.WidgetColor;
import org.csstudio.display.builder.model.properties.WidgetFont;
import org.csstudio.display.builder.model.properties.WidgetFontStyle;
import org.csstudio.display.builder.model.rules.RuleInfo;
Expand All @@ -39,6 +37,8 @@
import org.csstudio.opibuilder.converter.model.EdmFont;
import org.csstudio.opibuilder.converter.model.EdmModel;
import org.csstudio.opibuilder.converter.model.EdmWidget;
import org.phoebus.ui.color.NamedWidgetColor;
import org.phoebus.ui.color.WidgetColor;
import org.phoebus.core.vtypes.VTypeHelper;

/** Base for each converter
Expand Down
2 changes: 1 addition & 1 deletion app/display/convert-medm/src/main/java/org/csstudio/display/converter/medm/Converter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import org.csstudio.display.builder.model.DisplayModel;
import org.csstudio.display.builder.model.Widget;
import org.csstudio.display.builder.model.persist.ModelWriter;
import org.csstudio.display.builder.model.properties.WidgetColor;
import org.csstudio.opibuilder.adl2boy.translator.Arc2Model;
import org.csstudio.opibuilder.adl2boy.translator.Bar2Model;
import org.csstudio.opibuilder.adl2boy.translator.Byte2Model;
Expand Down Expand Up @@ -48,6 +47,7 @@
import org.csstudio.utility.adlparser.fileParser.ADLWidget;
import org.csstudio.utility.adlparser.fileParser.ColorMap;
import org.csstudio.utility.adlparser.fileParser.ParserADL;
import org.phoebus.ui.color.WidgetColor;
import org.phoebus.framework.workbench.FileHelper;

/** MEDM Converter
Expand Down
2 changes: 1 addition & 1 deletion ...vert-medm/src/main/java/org/csstudio/opibuilder/adl2boy/translator/AbstractADL2Model.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import org.csstudio.display.builder.model.properties.LineStyle;
import org.csstudio.display.builder.model.properties.ScriptInfo;
import org.csstudio.display.builder.model.properties.ScriptPV;
import org.csstudio.display.builder.model.properties.WidgetColor;
import org.csstudio.display.builder.model.rules.RuleInfo;
import org.csstudio.utility.adlparser.fileParser.ADLWidget;
import org.csstudio.utility.adlparser.fileParser.widgetParts.ADLBasicAttribute;
Expand All @@ -28,6 +27,7 @@
import org.csstudio.utility.adlparser.fileParser.widgetParts.ADLObject;
import org.csstudio.utility.adlparser.fileParser.widgets.ADLAbstractWidget;
import org.csstudio.utility.adlparser.fileParser.widgets.IWidgetWithColorsInBase;
import org.phoebus.ui.color.WidgetColor;
import org.phoebus.framework.macros.Macros;

/**
Expand Down
2 changes: 1 addition & 1 deletion ...play/convert-medm/src/main/java/org/csstudio/opibuilder/adl2boy/translator/Arc2Model.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@

import org.csstudio.display.builder.model.ChildrenProperty;
import org.csstudio.display.builder.model.Widget;
import org.csstudio.display.builder.model.properties.WidgetColor;
import org.csstudio.display.builder.model.widgets.ArcWidget;
import org.csstudio.utility.adlparser.fileParser.ADLWidget;
import org.csstudio.utility.adlparser.fileParser.widgets.Arc;
import org.phoebus.ui.color.WidgetColor;

public class Arc2Model extends AbstractADL2Model<ArcWidget> {

Expand Down
2 changes: 1 addition & 1 deletion ...play/convert-medm/src/main/java/org/csstudio/opibuilder/adl2boy/translator/Bar2Model.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@

import org.csstudio.display.builder.model.ChildrenProperty;
import org.csstudio.display.builder.model.Widget;
import org.csstudio.display.builder.model.properties.WidgetColor;
import org.csstudio.display.builder.model.widgets.ProgressBarWidget;
import org.csstudio.utility.adlparser.fileParser.ADLWidget;
import org.csstudio.utility.adlparser.fileParser.widgets.BarMonitor;
import org.phoebus.ui.color.WidgetColor;

public class Bar2Model extends AbstractADL2Model<ProgressBarWidget> {

Expand Down
2 changes: 1 addition & 1 deletion ...lay/convert-medm/src/main/java/org/csstudio/opibuilder/adl2boy/translator/Byte2Model.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@

import org.csstudio.display.builder.model.ChildrenProperty;
import org.csstudio.display.builder.model.Widget;
import org.csstudio.display.builder.model.properties.WidgetColor;
import org.csstudio.display.builder.model.widgets.ByteMonitorWidget;
import org.csstudio.utility.adlparser.fileParser.ADLWidget;
import org.csstudio.utility.adlparser.fileParser.widgets.ByteMonitor;
import org.phoebus.ui.color.WidgetColor;

public class Byte2Model extends AbstractADL2Model<ByteMonitorWidget> {

Expand Down
2 changes: 1 addition & 1 deletion ...rt-medm/src/main/java/org/csstudio/opibuilder/adl2boy/translator/CartesianPlot2Model.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@

import org.csstudio.display.builder.model.ChildrenProperty;
import org.csstudio.display.builder.model.Widget;
import org.csstudio.display.builder.model.properties.WidgetColor;
import org.csstudio.display.builder.model.widgets.plots.PlotWidgetProperties.TraceWidgetProperty;
import org.csstudio.display.builder.model.widgets.plots.XYPlotWidget;
import org.csstudio.utility.adlparser.fileParser.ADLWidget;
import org.csstudio.utility.adlparser.fileParser.widgetParts.ADLPlotTrace;
import org.csstudio.utility.adlparser.fileParser.widgetParts.ADLPlotcom;
import org.csstudio.utility.adlparser.fileParser.widgets.CartesianPlot;
import org.phoebus.ui.color.WidgetColor;

/** Turn CartesianPlot into XYPlot
*
Expand Down
2 changes: 1 addition & 1 deletion ...ert-medm/src/main/java/org/csstudio/opibuilder/adl2boy/translator/ChoiceButton2Model.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
import org.csstudio.display.builder.model.ChildrenProperty;
import org.csstudio.display.builder.model.Widget;
import org.csstudio.display.builder.model.properties.CommonWidgetProperties;
import org.csstudio.display.builder.model.properties.WidgetColor;
import org.csstudio.display.builder.model.widgets.ChoiceButtonWidget;
import org.csstudio.utility.adlparser.fileParser.ADLWidget;
import org.csstudio.utility.adlparser.fileParser.widgets.ChoiceButton;
import org.phoebus.ui.color.WidgetColor;

public class ChoiceButton2Model extends AbstractADL2Model<ChoiceButtonWidget> {

Expand Down
2 changes: 1 addition & 1 deletion ...onvert-medm/src/main/java/org/csstudio/opibuilder/adl2boy/translator/Composite2Model.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@

import org.csstudio.display.builder.model.ChildrenProperty;
import org.csstudio.display.builder.model.Widget;
import org.csstudio.display.builder.model.properties.WidgetColor;
import org.csstudio.display.builder.model.widgets.EmbeddedDisplayWidget;
import org.csstudio.display.builder.model.widgets.EmbeddedDisplayWidget.Resize;
import org.csstudio.display.builder.model.widgets.GroupWidget;
import org.csstudio.display.builder.model.widgets.GroupWidget.Style;
import org.csstudio.display.converter.medm.Converter;
import org.csstudio.utility.adlparser.fileParser.ADLWidget;
import org.csstudio.utility.adlparser.fileParser.widgets.Composite;
import org.phoebus.ui.color.WidgetColor;

// Turns into either GroupWidget or EmbeddedDisplayWidget
@SuppressWarnings("nls")
Expand Down
2 changes: 1 addition & 1 deletion .../convert-medm/src/main/java/org/csstudio/opibuilder/adl2boy/translator/Display2Model.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
import org.csstudio.display.builder.model.DisplayModel;
import org.csstudio.display.builder.model.Widget;
import org.csstudio.display.builder.model.properties.CommonWidgetProperties;
import org.csstudio.display.builder.model.properties.WidgetColor;
import org.csstudio.utility.adlparser.fileParser.ADLWidget;
import org.csstudio.utility.adlparser.fileParser.widgets.ADLDisplay;
import org.phoebus.ui.color.WidgetColor;

/**
*
Expand Down
2 changes: 1 addition & 1 deletion ...ay/convert-medm/src/main/java/org/csstudio/opibuilder/adl2boy/translator/Image2Model.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@

import org.csstudio.display.builder.model.ChildrenProperty;
import org.csstudio.display.builder.model.Widget;
import org.csstudio.display.builder.model.properties.WidgetColor;
import org.csstudio.display.builder.model.widgets.PictureWidget;
import org.csstudio.utility.adlparser.fileParser.ADLWidget;
import org.csstudio.utility.adlparser.fileParser.widgets.Image;
import org.phoebus.ui.color.WidgetColor;

public class Image2Model extends AbstractADL2Model<PictureWidget> {

Expand Down
2 changes: 1 addition & 1 deletion ...onvert-medm/src/main/java/org/csstudio/opibuilder/adl2boy/translator/Indicator2Model.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@

import org.csstudio.display.builder.model.ChildrenProperty;
import org.csstudio.display.builder.model.Widget;
import org.csstudio.display.builder.model.properties.WidgetColor;
import org.csstudio.display.builder.model.widgets.TextUpdateWidget;
import org.csstudio.utility.adlparser.fileParser.ADLWidget;
import org.csstudio.utility.adlparser.fileParser.widgets.Indicator;
import org.phoebus.ui.color.WidgetColor;

// TODO Better 'indicator' representation than TextUpdate
public class Indicator2Model extends AbstractADL2Model<TextUpdateWidget> {
Expand Down
2 changes: 1 addition & 1 deletion ...lay/convert-medm/src/main/java/org/csstudio/opibuilder/adl2boy/translator/Menu2Model.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
import org.csstudio.display.builder.model.ChildrenProperty;
import org.csstudio.display.builder.model.Widget;
import org.csstudio.display.builder.model.properties.CommonWidgetProperties;
import org.csstudio.display.builder.model.properties.WidgetColor;
import org.csstudio.display.builder.model.widgets.ComboWidget;
import org.csstudio.utility.adlparser.fileParser.ADLWidget;
import org.csstudio.utility.adlparser.fileParser.widgets.Menu;
import org.phoebus.ui.color.WidgetColor;

public class Menu2Model extends AbstractADL2Model<ComboWidget> {

Expand Down
2 changes: 1 addition & 1 deletion ...rt-medm/src/main/java/org/csstudio/opibuilder/adl2boy/translator/MessageButton2Model.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

import org.csstudio.display.builder.model.ChildrenProperty;
import org.csstudio.display.builder.model.Widget;
import org.csstudio.display.builder.model.properties.WidgetColor;
import org.csstudio.display.builder.model.spi.ActionInfo;
import org.csstudio.display.builder.model.widgets.ActionButtonWidget;
import org.csstudio.display.builder.model.widgets.BoolButtonWidget;
Expand All @@ -17,6 +16,7 @@
import org.csstudio.utility.adlparser.fileParser.ADLWidget;
import org.csstudio.utility.adlparser.fileParser.widgets.MessageButton;
import org.csstudio.display.actions.WritePVAction;
import org.phoebus.ui.color.WidgetColor;

import java.util.ArrayList;
import java.util.List;
Expand Down
2 changes: 1 addition & 1 deletion ...ay/convert-medm/src/main/java/org/csstudio/opibuilder/adl2boy/translator/Meter2Model.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
import org.csstudio.display.builder.model.ChildrenProperty;
import org.csstudio.display.builder.model.Widget;
import org.csstudio.display.builder.model.properties.CommonWidgetProperties;
import org.csstudio.display.builder.model.properties.WidgetColor;
import org.csstudio.display.builder.model.widgets.MeterWidget;
import org.csstudio.utility.adlparser.fileParser.ADLWidget;
import org.csstudio.utility.adlparser.fileParser.widgets.Meter;
import org.phoebus.ui.color.WidgetColor;

public class Meter2Model extends AbstractADL2Model<MeterWidget> {

Expand Down
6 changes: 3 additions & 3 deletions ...lay/convert-medm/src/main/java/org/csstudio/opibuilder/adl2boy/translator/Oval2Model.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@

import org.csstudio.display.builder.model.ChildrenProperty;
import org.csstudio.display.builder.model.Widget;
import org.csstudio.display.builder.model.persist.NamedWidgetColors;
import org.csstudio.display.builder.model.persist.WidgetColorService;
import org.csstudio.display.builder.model.properties.WidgetColor;
import org.csstudio.display.builder.model.widgets.EllipseWidget;
import org.csstudio.display.builder.model.widgets.MultiStateLEDWidget;
import org.csstudio.display.builder.model.widgets.RectangleWidget;
import org.csstudio.utility.adlparser.fileParser.ADLWidget;
import org.csstudio.utility.adlparser.fileParser.widgetParts.ADLDynamicAttribute;
import org.csstudio.utility.adlparser.fileParser.widgets.ADLAbstractWidget;
import org.csstudio.utility.adlparser.fileParser.widgets.Oval;
import org.phoebus.ui.color.NamedWidgetColors;
import org.phoebus.ui.color.WidgetColor;
import org.phoebus.ui.color.WidgetColorService;

public class Oval2Model extends AbstractADL2Model<Widget> {

Expand Down
2 changes: 1 addition & 1 deletion ...ay/convert-medm/src/main/java/org/csstudio/opibuilder/adl2boy/translator/Placeholder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
import org.csstudio.display.builder.model.Widget;
import org.csstudio.display.builder.model.properties.HorizontalAlignment;
import org.csstudio.display.builder.model.properties.VerticalAlignment;
import org.csstudio.display.builder.model.properties.WidgetColor;
import org.csstudio.display.builder.model.widgets.LabelWidget;
import org.csstudio.utility.adlparser.fileParser.ADLWidget;
import org.csstudio.utility.adlparser.fileParser.widgets.TextWidget;
import org.phoebus.ui.color.WidgetColor;

/** Placeholder for widget that's not handled
* @author Kay Kasemir
Expand Down
2 changes: 1 addition & 1 deletion ...convert-medm/src/main/java/org/csstudio/opibuilder/adl2boy/translator/PolyLine2Model.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
import org.csstudio.display.builder.model.properties.CommonWidgetProperties;
import org.csstudio.display.builder.model.properties.LineStyle;
import org.csstudio.display.builder.model.properties.Points;
import org.csstudio.display.builder.model.properties.WidgetColor;
import org.csstudio.display.builder.model.widgets.PolylineWidget;
import org.csstudio.utility.adlparser.fileParser.ADLWidget;
import org.csstudio.utility.adlparser.fileParser.widgets.PolyLine;
import org.phoebus.ui.color.WidgetColor;

public class PolyLine2Model extends AbstractADL2Model<PolylineWidget> {

Expand Down
2 changes: 1 addition & 1 deletion .../convert-medm/src/main/java/org/csstudio/opibuilder/adl2boy/translator/Polygon2Model.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
import org.csstudio.display.builder.model.ChildrenProperty;
import org.csstudio.display.builder.model.Widget;
import org.csstudio.display.builder.model.properties.CommonWidgetProperties;
import org.csstudio.display.builder.model.properties.WidgetColor;
import org.csstudio.display.builder.model.widgets.PolygonWidget;
import org.csstudio.utility.adlparser.fileParser.ADLWidget;
import org.csstudio.utility.adlparser.fileParser.widgets.ADLAbstractWidget;
import org.csstudio.utility.adlparser.fileParser.widgets.Polygon;
import org.phoebus.ui.color.WidgetColor;

public class Polygon2Model extends AbstractADL2Model<PolygonWidget> {

Expand Down
2 changes: 1 addition & 1 deletion ...onvert-medm/src/main/java/org/csstudio/opibuilder/adl2boy/translator/Rectangle2Model.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@

import org.csstudio.display.builder.model.ChildrenProperty;
import org.csstudio.display.builder.model.Widget;
import org.csstudio.display.builder.model.properties.WidgetColor;
import org.csstudio.display.builder.model.widgets.RectangleWidget;
import org.csstudio.utility.adlparser.fileParser.ADLWidget;
import org.csstudio.utility.adlparser.fileParser.widgets.ADLAbstractWidget;
import org.csstudio.utility.adlparser.fileParser.widgets.Rectangle;
import org.phoebus.ui.color.WidgetColor;

public class Rectangle2Model extends AbstractADL2Model<Widget> {

Expand Down
2 changes: 1 addition & 1 deletion ...t-medm/src/main/java/org/csstudio/opibuilder/adl2boy/translator/RelatedDisplay2Model.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
import org.csstudio.display.builder.model.ChildrenProperty;
import org.csstudio.display.builder.model.Widget;
import org.csstudio.display.builder.model.properties.ActionInfos;
import org.csstudio.display.builder.model.properties.WidgetColor;
import org.csstudio.display.builder.model.spi.ActionInfo;
import org.csstudio.display.builder.model.widgets.ActionButtonWidget;
import org.csstudio.utility.adlparser.fileParser.ADLWidget;
import org.csstudio.utility.adlparser.fileParser.widgetParts.RelatedDisplayItem;
import org.csstudio.utility.adlparser.fileParser.widgets.RelatedDisplay;
import org.csstudio.display.actions.OpenDisplayAction;
import org.phoebus.ui.color.WidgetColor;
import org.phoebus.framework.macros.Macros;

/**
Expand Down
Loading