From f7fb5320267818f650aaa80650a238e6c567d147 Mon Sep 17 00:00:00 2001 From: Ed Merks Date: Tue, 26 Dec 2023 10:10:10 +0100 Subject: [PATCH] Include incubation feature in setup Use Realm.getDefault rather than SWTObservables.getRealm. Accommodate generates in generics in GEF. https://github.com/eclipse/nebula/issues/527 --- oomph.setup | 94 ++++++++++++++++++- widgets/badgedlabel/pom.xml | 2 +- widgets/calendarcombo/pom.xml | 2 +- widgets/carousel/pom.xml | 2 +- widgets/cdatetime/pom.xml | 2 +- widgets/chips/pom.xml | 2 +- widgets/compositetable/pom.xml | 2 +- widgets/ctreecombo/pom.xml | 2 +- widgets/cwt/pom.xml | 2 +- .../DateChooserComboObservableValue.java | 3 +- .../DateChooserObservableValue.java | 3 +- widgets/effects/pom.xml | 2 +- widgets/floatingtext/pom.xml | 2 +- widgets/fontawesome/pom.xml | 2 +- .../FormattedTextObservableValue.java | 5 +- widgets/gallery/pom.xml | 2 +- widgets/ganttchart/pom.xml | 2 +- widgets/grid/pom.xml | 2 +- widgets/led/pom.xml | 2 +- widgets/nebulaslider/pom.xml | 2 +- widgets/opal/pom.xml | 2 +- widgets/oscilloscope/pom.xml | 2 +- widgets/paperclips/pom.xml | 2 +- widgets/passwordrevealer/pom.xml | 2 +- widgets/pgroup/pom.xml | 2 +- widgets/progresscircle/pom.xml | 2 +- widgets/pshelf/pom.xml | 2 +- widgets/richtext/pom.xml | 2 +- widgets/roundedcheckbox/pom.xml | 2 +- widgets/roundedswitch/pom.xml | 2 +- widgets/segmentedbar/pom.xml | 2 +- widgets/splitbutton/pom.xml | 2 +- widgets/stepbar/pom.xml | 2 +- widgets/tablecombo/pom.xml | 2 +- widgets/tiles/pom.xml | 2 +- .../widgets/timeline/figures/RootFigure.java | 8 +- widgets/visualization/pom.xml | 2 +- widgets/xviewer/pom.xml | 2 +- 38 files changed, 133 insertions(+), 46 deletions(-) diff --git a/oomph.setup b/oomph.setup index 0206b70c4..f48325962 100644 --- a/oomph.setup +++ b/oomph.setup @@ -122,15 +122,21 @@ ${scope.project.label} + + + name="org.eclipse.nebula.incubation.feature.feature.group"/> @@ -153,7 +159,7 @@ project="org.eclipse.nebula.feature"/> + excludedWorkingSet="//'nebula.workingsets'/@workingSets[name='Nebula%20Badged%20Label'] //'nebula.workingsets'/@workingSets[name='Nebula%20Calandar%20Combo'] //'nebula.workingsets'/@workingSets[name='Nebula%20Carousel'] //'nebula.workingsets'/@workingSets[name='Nebula%20CDate%20TIme'] //'nebula.workingsets'/@workingSets[name='Nebula%20Chips'] //'nebula.workingsets'/@workingSets[name='Nebula%20Collapsible%20Buttons%20'] //'nebula.workingsets'/@workingSets[name='Nebula%20Common%20Widget%20Toolkit'] //'nebula.workingsets'/@workingSets[name='Nebula%20Composite%20Table'] //'nebula.workingsets'/@workingSets[name='Nebula%20CTree%20Combo'] //'nebula.workingsets'/@workingSets[name='Nebula%20Date%20Chooser'] //'nebula.workingsets'/@workingSets[name='Nebula%20Effects'] //'nebula.workingsets'/@workingSets[name='Nebula%20Floating%20Text'] //'nebula.workingsets'/@workingSets[name='Nebula%20Font%20Awesome'] //'nebula.workingsets'/@workingSets[name='Nebula%20Formatted%20Text'] //'nebula.workingsets'/@workingSets[name='Nebula%20Gallery'] //'nebula.workingsets'/@workingSets[name='Nebula%20Gantt%20Chart'] //'nebula.workingsets'/@workingSets[name='Nebula%20Geo%20Map'] //'nebula.workingsets'/@workingSets[name='Nebula%20Grid'] //'nebula.workingsets'/@workingSets[name='Nebula%20LED'] //'nebula.workingsets'/@workingSets[name='Nebula%20Opal%20Breadcrumb'] //'nebula.workingsets'/@workingSets[name='Nebula%20Opal%20Calculator'] //'nebula.workingsets'/@workingSets[name='Nebula%20Opal%20Checkbox%20Group'] //'nebula.workingsets'/@workingSets[name='Nebula%20Opal%20Column%20Browser'] //'nebula.workingsets'/@workingSets[name='Nebula%20Opal%20Commons'] //'nebula.workingsets'/@workingSets[name='Nebula%20Opal%20Dialog'] //'nebula.workingsets'/@workingSets[name='Nebula%20Opal%20Dual%20List'] //'nebula.workingsets'/@workingSets[name='Nebula%20Opal%20Header'] //'nebula.workingsets'/@workingSets[name='Nebula%20Opal%20Heap%20Manager'] //'nebula.workingsets'/@workingSets[name='Nebula%20Opal%20Horizontal%20Spinner'] //'nebula.workingsets'/@workingSets[name='Nebula%20Opal%20Launcher'] //'nebula.workingsets'/@workingSets[name='Nebula%20Opal%20Login%20Dialog'] //'nebula.workingsets'/@workingSets[name='Nebula%20Opal%20Multi%20Choice'] //'nebula.workingsets'/@workingSets[name='Nebula%20Opal%20Notifier'] //'nebula.workingsets'/@workingSets[name='Nebula%20Opal%20Panels'] //'nebula.workingsets'/@workingSets[name='Nebula%20Opal%20Preference%20Window'] //'nebula.workingsets'/@workingSets[name='Nebula%20Opal%20Prompt%20Support'] //'nebula.workingsets'/@workingSets[name='Nebula%20Opal%20Property%20Table'] //'nebula.workingsets'/@workingSets[name='Nebula%20Opal%20Range%20Slider'] //'nebula.workingsets'/@workingSets[name='Nebula%20Opal%20Rounded%20Toolbar'] //'nebula.workingsets'/@workingSets[name='Nebula%20Opal%20Star%20Rating'] //'nebula.workingsets'/@workingSets[name='Nebula%20Opal%20Switch%20Button'] //'nebula.workingsets'/@workingSets[name='Nebula%20Opal%20Text%20Assist'] //'nebula.workingsets'/@workingSets[name='Nebula%20Opal%20Tip%20of%20the%20Day'] //'nebula.workingsets'/@workingSets[name='Nebula%20Opal%20Titled%20Separator'] //'nebula.workingsets'/@workingSets[name='Nebula%20Oscilloscope'] //'nebula.workingsets'/@workingSets[name='Nebula%20Pagination'] //'nebula.workingsets'/@workingSets[name='Nebula%20Paperclips'] //'nebula.workingsets'/@workingSets[name='Nebula%20Password%20Revealer'] //'nebula.workingsets'/@workingSets[name='Nebula%20PGroup'] //'nebula.workingsets'/@workingSets[name='Nebula%20Picture'] //'nebula.workingsets'/@workingSets[name='Nebula%20Progress%20Circle'] //'nebula.workingsets'/@workingSets[name='Nebula%20PShelf'] //'nebula.workingsets'/@workingSets[name='Nebula%20Radio%20Group'] //'nebula.workingsets'/@workingSets[name='Nebula%20Rich%20Text'] //'nebula.workingsets'/@workingSets[name='Nebula%20Rounded%20Checkbox'] //'nebula.workingsets'/@workingSets[name='Nebula%20Rounded%20Switch'] //'nebula.workingsets'/@workingSets[name='Nebula%20Segmented%20Bar'] //'nebula.workingsets'/@workingSets[name='Nebula%20Slider'] //'nebula.workingsets'/@workingSets[name='Nebula%20Split%20Button'] //'nebula.workingsets'/@workingSets[name='Nebula%20Step%20Bar'] //'nebula.workingsets'/@workingSets[name='Nebula%20Table%20Combo'] //'nebula.workingsets'/@workingSets[name='Nebula%20Tiles'] //'nebula.workingsets'/@workingSets[name='Nebula%20Timeline'] //'nebula.workingsets'/@workingSets[name='Nebula%20Tree%20Mapper'] //'nebula.workingsets'/@workingSets[name='Nebula%20Visualization'] //'nebula.workingsets'/@workingSets[name='Nebula%20XViewer']"/> + name="Nebula Calandar Combo"> + relativePathPattern="widgets/calendarcombo/.*"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + org.eclipse.nebula - 3.0.0-SNAPSHOT + 3.1.0-SNAPSHOT nebula-release ../../releng/org.eclipse.nebula.nebula-release diff --git a/widgets/calendarcombo/pom.xml b/widgets/calendarcombo/pom.xml index 34f70744a..505bcf0bd 100644 --- a/widgets/calendarcombo/pom.xml +++ b/widgets/calendarcombo/pom.xml @@ -8,7 +8,7 @@ org.eclipse.nebula - 3.0.0-SNAPSHOT + 3.1.0-SNAPSHOT nebula-release ../../releng/org.eclipse.nebula.nebula-release diff --git a/widgets/carousel/pom.xml b/widgets/carousel/pom.xml index 905f69335..90d0d9db6 100644 --- a/widgets/carousel/pom.xml +++ b/widgets/carousel/pom.xml @@ -9,7 +9,7 @@ org.eclipse.nebula - 3.0.0-SNAPSHOT + 3.1.0-SNAPSHOT nebula-release ../../releng/org.eclipse.nebula.nebula-release diff --git a/widgets/cdatetime/pom.xml b/widgets/cdatetime/pom.xml index 374de8fd8..db9a10fe4 100644 --- a/widgets/cdatetime/pom.xml +++ b/widgets/cdatetime/pom.xml @@ -4,7 +4,7 @@ org.eclipse.nebula - 3.0.0-SNAPSHOT + 3.1.0-SNAPSHOT nebula-release ../../releng/org.eclipse.nebula.nebula-release diff --git a/widgets/chips/pom.xml b/widgets/chips/pom.xml index e047ba6db..23f9f2a98 100644 --- a/widgets/chips/pom.xml +++ b/widgets/chips/pom.xml @@ -9,7 +9,7 @@ org.eclipse.nebula - 3.0.0-SNAPSHOT + 3.1.0-SNAPSHOT nebula-release ../../releng/org.eclipse.nebula.nebula-release diff --git a/widgets/compositetable/pom.xml b/widgets/compositetable/pom.xml index 296e9304d..95a217f80 100644 --- a/widgets/compositetable/pom.xml +++ b/widgets/compositetable/pom.xml @@ -10,7 +10,7 @@ org.eclipse.nebula nebula-release - 3.0.0-SNAPSHOT + 3.1.0-SNAPSHOT ../../releng/org.eclipse.nebula.nebula-release diff --git a/widgets/ctreecombo/pom.xml b/widgets/ctreecombo/pom.xml index 987be19ae..73ad1bebd 100644 --- a/widgets/ctreecombo/pom.xml +++ b/widgets/ctreecombo/pom.xml @@ -16,7 +16,7 @@ http://www.eclipse.org/legal/epl-v10.html org.eclipse.nebula - 3.0.0-SNAPSHOT + 3.1.0-SNAPSHOT nebula-release ../../releng/org.eclipse.nebula.nebula-release diff --git a/widgets/cwt/pom.xml b/widgets/cwt/pom.xml index 62f55bb82..4ef3b1e90 100644 --- a/widgets/cwt/pom.xml +++ b/widgets/cwt/pom.xml @@ -4,7 +4,7 @@ org.eclipse.nebula - 3.0.0-SNAPSHOT + 3.1.0-SNAPSHOT nebula-release ../../releng/org.eclipse.nebula.nebula-release diff --git a/widgets/datechooser/org.eclipse.nebula.widgets.datechooser/src/org/eclipse/nebula/widgets/datechooser/DateChooserComboObservableValue.java b/widgets/datechooser/org.eclipse.nebula.widgets.datechooser/src/org/eclipse/nebula/widgets/datechooser/DateChooserComboObservableValue.java index ec862461e..4068a3e88 100644 --- a/widgets/datechooser/org.eclipse.nebula.widgets.datechooser/src/org/eclipse/nebula/widgets/datechooser/DateChooserComboObservableValue.java +++ b/widgets/datechooser/org.eclipse.nebula.widgets.datechooser/src/org/eclipse/nebula/widgets/datechooser/DateChooserComboObservableValue.java @@ -5,7 +5,6 @@ import org.eclipse.core.databinding.observable.Diffs; import org.eclipse.core.databinding.observable.Realm; import org.eclipse.core.databinding.observable.value.AbstractObservableValue; -import org.eclipse.jface.databinding.swt.SWTObservables; import org.eclipse.swt.SWT; import org.eclipse.swt.events.DisposeEvent; import org.eclipse.swt.events.DisposeListener; @@ -63,7 +62,7 @@ public void widgetDisposed(DisposeEvent e) { }; public DateChooserComboObservableValue(final DateChooserCombo combo, int updateEventType) { - this(SWTObservables.getRealm(combo.getDisplay()), combo, updateEventType); + this(Realm.getDefault(), combo, updateEventType); } public DateChooserComboObservableValue(final Realm realm, final DateChooserCombo combo, int updateEventType) { diff --git a/widgets/datechooser/org.eclipse.nebula.widgets.datechooser/src/org/eclipse/nebula/widgets/datechooser/DateChooserObservableValue.java b/widgets/datechooser/org.eclipse.nebula.widgets.datechooser/src/org/eclipse/nebula/widgets/datechooser/DateChooserObservableValue.java index 6ac8a6f53..01b5f3214 100644 --- a/widgets/datechooser/org.eclipse.nebula.widgets.datechooser/src/org/eclipse/nebula/widgets/datechooser/DateChooserObservableValue.java +++ b/widgets/datechooser/org.eclipse.nebula.widgets.datechooser/src/org/eclipse/nebula/widgets/datechooser/DateChooserObservableValue.java @@ -5,7 +5,6 @@ import org.eclipse.core.databinding.observable.Diffs; import org.eclipse.core.databinding.observable.Realm; import org.eclipse.core.databinding.observable.value.AbstractObservableValue; -import org.eclipse.jface.databinding.swt.SWTObservables; import org.eclipse.swt.SWT; import org.eclipse.swt.events.DisposeEvent; import org.eclipse.swt.events.DisposeListener; @@ -63,7 +62,7 @@ public void widgetDisposed(DisposeEvent e) { }; public DateChooserObservableValue(final DateChooser dateChooser, int updateEventType) { - this(SWTObservables.getRealm(dateChooser.getDisplay()), dateChooser, updateEventType); + this(Realm.getDefault(), dateChooser, updateEventType); } public DateChooserObservableValue(final Realm realm, final DateChooser dateChooser, int updateEventType) { diff --git a/widgets/effects/pom.xml b/widgets/effects/pom.xml index 48410d01d..32dfa67d6 100644 --- a/widgets/effects/pom.xml +++ b/widgets/effects/pom.xml @@ -4,7 +4,7 @@ org.eclipse.nebula - 3.0.0-SNAPSHOT + 3.1.0-SNAPSHOT nebula-release ../../releng/org.eclipse.nebula.nebula-release diff --git a/widgets/floatingtext/pom.xml b/widgets/floatingtext/pom.xml index e47f2d702..00681d68a 100644 --- a/widgets/floatingtext/pom.xml +++ b/widgets/floatingtext/pom.xml @@ -4,7 +4,7 @@ org.eclipse.nebula - 3.0.0-SNAPSHOT + 3.1.0-SNAPSHOT nebula-release ../../releng/org.eclipse.nebula.nebula-release diff --git a/widgets/fontawesome/pom.xml b/widgets/fontawesome/pom.xml index a0e289153..dcc12b544 100644 --- a/widgets/fontawesome/pom.xml +++ b/widgets/fontawesome/pom.xml @@ -9,7 +9,7 @@ org.eclipse.nebula - 3.0.0-SNAPSHOT + 3.1.0-SNAPSHOT nebula-release ../../releng/org.eclipse.nebula.nebula-release diff --git a/widgets/formattedtext/org.eclipse.nebula.widgets.formattedtext/src/org/eclipse/nebula/widgets/formattedtext/FormattedTextObservableValue.java b/widgets/formattedtext/org.eclipse.nebula.widgets.formattedtext/src/org/eclipse/nebula/widgets/formattedtext/FormattedTextObservableValue.java index 32ee33633..1bb044a78 100644 --- a/widgets/formattedtext/org.eclipse.nebula.widgets.formattedtext/src/org/eclipse/nebula/widgets/formattedtext/FormattedTextObservableValue.java +++ b/widgets/formattedtext/org.eclipse.nebula.widgets.formattedtext/src/org/eclipse/nebula/widgets/formattedtext/FormattedTextObservableValue.java @@ -3,7 +3,6 @@ import org.eclipse.core.databinding.observable.Diffs; import org.eclipse.core.databinding.observable.Realm; import org.eclipse.core.databinding.observable.value.AbstractObservableValue; -import org.eclipse.jface.databinding.swt.DisplayRealm; import org.eclipse.jface.databinding.swt.ISWTObservable; import org.eclipse.swt.SWT; import org.eclipse.swt.events.DisposeEvent; @@ -63,11 +62,11 @@ public void widgetDisposed(DisposeEvent e) { }; public FormattedTextObservableValue(final FormattedText formattedText) { - this(DisplayRealm.getRealm(formattedText.getControl().getDisplay()), formattedText, SWT.Modify); + this(Realm.getDefault(), formattedText, SWT.Modify); } public FormattedTextObservableValue(final FormattedText formattedText, int updateEventType) { - this(DisplayRealm.getRealm(formattedText.getControl().getDisplay()), formattedText, updateEventType); + this(Realm.getDefault(), formattedText, updateEventType); } public FormattedTextObservableValue(final Realm realm, final FormattedText formattedText, int updateEventType) { diff --git a/widgets/gallery/pom.xml b/widgets/gallery/pom.xml index 0d43d160f..8f6c20dcb 100644 --- a/widgets/gallery/pom.xml +++ b/widgets/gallery/pom.xml @@ -4,7 +4,7 @@ org.eclipse.nebula - 3.0.0-SNAPSHOT + 3.1.0-SNAPSHOT nebula-release ../../releng/org.eclipse.nebula.nebula-release diff --git a/widgets/ganttchart/pom.xml b/widgets/ganttchart/pom.xml index 0e8378dc2..612caa4c0 100644 --- a/widgets/ganttchart/pom.xml +++ b/widgets/ganttchart/pom.xml @@ -4,7 +4,7 @@ org.eclipse.nebula - 3.0.0-SNAPSHOT + 3.1.0-SNAPSHOT nebula-release ../../releng/org.eclipse.nebula.nebula-release diff --git a/widgets/grid/pom.xml b/widgets/grid/pom.xml index b8d2e98d0..46155e9da 100644 --- a/widgets/grid/pom.xml +++ b/widgets/grid/pom.xml @@ -4,7 +4,7 @@ org.eclipse.nebula - 3.0.0-SNAPSHOT + 3.1.0-SNAPSHOT nebula-release ../../releng/org.eclipse.nebula.nebula-release diff --git a/widgets/led/pom.xml b/widgets/led/pom.xml index 94c0ff25c..3c23434d2 100644 --- a/widgets/led/pom.xml +++ b/widgets/led/pom.xml @@ -9,7 +9,7 @@ org.eclipse.nebula - 3.0.0-SNAPSHOT + 3.1.0-SNAPSHOT nebula-release ../../releng/org.eclipse.nebula.nebula-release diff --git a/widgets/nebulaslider/pom.xml b/widgets/nebulaslider/pom.xml index b6696e20a..313bb1bb3 100644 --- a/widgets/nebulaslider/pom.xml +++ b/widgets/nebulaslider/pom.xml @@ -14,7 +14,7 @@ org.eclipse.nebula - 3.0.0-SNAPSHOT + 3.1.0-SNAPSHOT nebula-release ../../releng/org.eclipse.nebula.nebula-release diff --git a/widgets/opal/pom.xml b/widgets/opal/pom.xml index 62df24edf..c3509d335 100644 --- a/widgets/opal/pom.xml +++ b/widgets/opal/pom.xml @@ -8,7 +8,7 @@ org.eclipse.nebula - 3.0.0-SNAPSHOT + 3.1.0-SNAPSHOT nebula-release ../../releng/org.eclipse.nebula.nebula-release diff --git a/widgets/oscilloscope/pom.xml b/widgets/oscilloscope/pom.xml index 1da4a8aea..cc9e18d7a 100644 --- a/widgets/oscilloscope/pom.xml +++ b/widgets/oscilloscope/pom.xml @@ -4,7 +4,7 @@ org.eclipse.nebula - 3.0.0-SNAPSHOT + 3.1.0-SNAPSHOT nebula-release ../../releng/org.eclipse.nebula.nebula-release diff --git a/widgets/paperclips/pom.xml b/widgets/paperclips/pom.xml index c2e56f194..a8ee4841d 100644 --- a/widgets/paperclips/pom.xml +++ b/widgets/paperclips/pom.xml @@ -4,7 +4,7 @@ org.eclipse.nebula - 3.0.0-SNAPSHOT + 3.1.0-SNAPSHOT nebula-release ../../releng/org.eclipse.nebula.nebula-release diff --git a/widgets/passwordrevealer/pom.xml b/widgets/passwordrevealer/pom.xml index b1981b4b0..e79f9f442 100644 --- a/widgets/passwordrevealer/pom.xml +++ b/widgets/passwordrevealer/pom.xml @@ -8,7 +8,7 @@ org.eclipse.nebula - 3.0.0-SNAPSHOT + 3.1.0-SNAPSHOT nebula-release ../../releng/org.eclipse.nebula.nebula-release diff --git a/widgets/pgroup/pom.xml b/widgets/pgroup/pom.xml index 9341491bb..55ed4aeb6 100644 --- a/widgets/pgroup/pom.xml +++ b/widgets/pgroup/pom.xml @@ -4,7 +4,7 @@ org.eclipse.nebula - 3.0.0-SNAPSHOT + 3.1.0-SNAPSHOT nebula-release ../../releng/org.eclipse.nebula.nebula-release diff --git a/widgets/progresscircle/pom.xml b/widgets/progresscircle/pom.xml index 86106af2e..55281478d 100644 --- a/widgets/progresscircle/pom.xml +++ b/widgets/progresscircle/pom.xml @@ -8,7 +8,7 @@ org.eclipse.nebula - 3.0.0-SNAPSHOT + 3.1.0-SNAPSHOT nebula-release ../../releng/org.eclipse.nebula.nebula-release diff --git a/widgets/pshelf/pom.xml b/widgets/pshelf/pom.xml index d69b675e2..211180d17 100644 --- a/widgets/pshelf/pom.xml +++ b/widgets/pshelf/pom.xml @@ -4,7 +4,7 @@ org.eclipse.nebula - 3.0.0-SNAPSHOT + 3.1.0-SNAPSHOT nebula-release ../../releng/org.eclipse.nebula.nebula-release diff --git a/widgets/richtext/pom.xml b/widgets/richtext/pom.xml index 56e113680..7d7130f45 100644 --- a/widgets/richtext/pom.xml +++ b/widgets/richtext/pom.xml @@ -4,7 +4,7 @@ org.eclipse.nebula - 3.0.0-SNAPSHOT + 3.1.0-SNAPSHOT nebula-release ../../releng/org.eclipse.nebula.nebula-release diff --git a/widgets/roundedcheckbox/pom.xml b/widgets/roundedcheckbox/pom.xml index fe35d2dfd..6a29cc568 100644 --- a/widgets/roundedcheckbox/pom.xml +++ b/widgets/roundedcheckbox/pom.xml @@ -16,7 +16,7 @@ http://www.eclipse.org/legal/epl-v10.html org.eclipse.nebula - 3.0.0-SNAPSHOT + 3.1.0-SNAPSHOT nebula-release ../../releng/org.eclipse.nebula.nebula-release diff --git a/widgets/roundedswitch/pom.xml b/widgets/roundedswitch/pom.xml index 7794cd025..53c4f5b53 100644 --- a/widgets/roundedswitch/pom.xml +++ b/widgets/roundedswitch/pom.xml @@ -9,7 +9,7 @@ org.eclipse.nebula - 3.0.0-SNAPSHOT + 3.1.0-SNAPSHOT nebula-release ../../releng/org.eclipse.nebula.nebula-release diff --git a/widgets/segmentedbar/pom.xml b/widgets/segmentedbar/pom.xml index cbe213ebf..14d06aac3 100644 --- a/widgets/segmentedbar/pom.xml +++ b/widgets/segmentedbar/pom.xml @@ -9,7 +9,7 @@ org.eclipse.nebula - 3.0.0-SNAPSHOT + 3.1.0-SNAPSHOT nebula-release ../../releng/org.eclipse.nebula.nebula-release diff --git a/widgets/splitbutton/pom.xml b/widgets/splitbutton/pom.xml index 351919e34..af9672fe4 100644 --- a/widgets/splitbutton/pom.xml +++ b/widgets/splitbutton/pom.xml @@ -9,7 +9,7 @@ org.eclipse.nebula - 3.0.0-SNAPSHOT + 3.1.0-SNAPSHOT nebula-release ../../releng/org.eclipse.nebula.nebula-release diff --git a/widgets/stepbar/pom.xml b/widgets/stepbar/pom.xml index e0bffae7f..5b2a9d9cb 100644 --- a/widgets/stepbar/pom.xml +++ b/widgets/stepbar/pom.xml @@ -9,7 +9,7 @@ org.eclipse.nebula - 3.0.0-SNAPSHOT + 3.1.0-SNAPSHOT nebula-release ../../releng/org.eclipse.nebula.nebula-release diff --git a/widgets/tablecombo/pom.xml b/widgets/tablecombo/pom.xml index 328c2b926..aa4f4da9b 100644 --- a/widgets/tablecombo/pom.xml +++ b/widgets/tablecombo/pom.xml @@ -4,7 +4,7 @@ org.eclipse.nebula - 3.0.0-SNAPSHOT + 3.1.0-SNAPSHOT nebula-release ../../releng/org.eclipse.nebula.nebula-release diff --git a/widgets/tiles/pom.xml b/widgets/tiles/pom.xml index a925821bd..49a994c18 100644 --- a/widgets/tiles/pom.xml +++ b/widgets/tiles/pom.xml @@ -9,7 +9,7 @@ org.eclipse.nebula - 3.0.0-SNAPSHOT + 3.1.0-SNAPSHOT nebula-release ../../releng/org.eclipse.nebula.nebula-release diff --git a/widgets/timeline/org.eclipse.nebula.widgets.timeline/src/org/eclipse/nebula/widgets/timeline/figures/RootFigure.java b/widgets/timeline/org.eclipse.nebula.widgets.timeline/src/org/eclipse/nebula/widgets/timeline/figures/RootFigure.java index 6c9bc2ad9..947d3cbbe 100644 --- a/widgets/timeline/org.eclipse.nebula.widgets.timeline/src/org/eclipse/nebula/widgets/timeline/figures/RootFigure.java +++ b/widgets/timeline/org.eclipse.nebula.widgets.timeline/src/org/eclipse/nebula/widgets/timeline/figures/RootFigure.java @@ -94,8 +94,12 @@ private static List getLanes(IFigure figure) { final TracksLayer tracksLayer = getFigure(figure, TracksLayer.class); - for (final Object trackFigure : tracksLayer.getChildren()) - lanes.addAll(((IFigure) trackFigure).getChildren()); + for (final IFigure trackFigure : tracksLayer.getChildren()) + for (final IFigure lane : trackFigure.getChildren()) { + if (lane instanceof LaneFigure) { + lanes.add((LaneFigure) lane); + } + } return lanes; } diff --git a/widgets/visualization/pom.xml b/widgets/visualization/pom.xml index 69dc414be..384f81b1d 100644 --- a/widgets/visualization/pom.xml +++ b/widgets/visualization/pom.xml @@ -4,7 +4,7 @@ org.eclipse.nebula - 3.0.0-SNAPSHOT + 3.1.0-SNAPSHOT nebula-release ../../releng/org.eclipse.nebula.nebula-release diff --git a/widgets/xviewer/pom.xml b/widgets/xviewer/pom.xml index 1778fcbed..aa02f3cee 100644 --- a/widgets/xviewer/pom.xml +++ b/widgets/xviewer/pom.xml @@ -4,7 +4,7 @@ org.eclipse.nebula - 3.0.0-SNAPSHOT + 3.1.0-SNAPSHOT nebula-release ../../releng/org.eclipse.nebula.nebula-release