Include incubation feature in setup

Use Realm.getDefault rather than SWTObservables.getRealm. Accommodate generates in generics in GEF. #527
eclipse · Jan 22, 2024 · bce90c1 · bce90c1
1 parent d7d1bd0
commit bce90c1
Show file tree

Hide file tree

Showing 5 changed files with 100 additions and 13 deletions.
diff --git a/oomph.setup b/oomph.setup
@@ -122,15 +122,21 @@
  </annotation>
  <description>${scope.project.label}</description>
  </setupTask>
+ <setupTask
+ xsi:type="setup:StringSubstitutionTask"
+ name="nebula.git.clone.location"
+ value="${git.clone.location}"/>
  <setupTask
  xsi:type="setup.targlets:TargletTask">
  <targlet
  name="${scope.project.label}"
  activeRepositoryList="Nebula Dependencies">
+ <requirement
+ name="org.eclipse.sdk.feature.group"/>
  <requirement
  name="org.eclipse.nebula.feature.feature.group"/>
  <requirement
- name="org.eclipse.sdk.feature.group"/>
+ name="org.eclipse.nebula.incubation.feature.feature.group"/>
  <sourceLocator
  rootFolder="${git.clone.location}"
  locateNestedProjects="true"/>
@@ -153,7 +159,7 @@
  project="org.eclipse.nebula.feature"/>
  <operand
  xsi:type="workingsets:ExclusionPredicate"
- excludedWorkingSet="//'nebula.workingsets'/@workingSets[name='Nebula%20Badged%20Label'] //'nebula.workingsets'/@workingSets[name='Nebula%20Common%20Widget%20Toolkit'] //'nebula.workingsets'/@workingSets[name='Nebula%20Tiles'] //'nebula.workingsets'/@workingSets[name='Nebula%20XViewer'] //'nebula.workingsets'/@workingSets[name='Nebula%20Table%20Combo'] //'nebula.workingsets'/@workingSets[name='Nebula%20Step%20Bar'] //'nebula.workingsets'/@workingSets[name='Nebula%20Split%20Button'] //'nebula.workingsets'/@workingSets[name='Nebula%20Segmented%20Bar'] //'nebula.workingsets'/@workingSets[name='Nebula%20Rounded%20Switch'] //'nebula.workingsets'/@workingSets[name='Nebula%20Rounded%20Checkbox'] //'nebula.workingsets'/@workingSets[name='Nebula%20Rich%20Text'] //'nebula.workingsets'/@workingSets[name='Nebula%20PShelf'] //'nebula.workingsets'/@workingSets[name='Nebula%20Progress%20Circle'] //'nebula.workingsets'/@workingSets[name='Nebula%20PGroup'] //'nebula.workingsets'/@workingSets[name='Nebula%20Password%20Revealer'] //'nebula.workingsets'/@workingSets[name='Nebula%20Paperclips'] //'nebula.workingsets'/@workingSets[name='Nebula%20Oscilloscope'] //'nebula.workingsets'/@workingSets[name='Nebula%20Opal%20Titled%20Separator'] //'nebula.workingsets'/@workingSets[name='Nebula%20Opal%20Tip%20of%20the%20Day'] //'nebula.workingsets'/@workingSets[name='Nebula%20Opal%20Text%20Assist'] //'nebula.workingsets'/@workingSets[name='Nebula%20Opal%20Switch%20Button'] //'nebula.workingsets'/@workingSets[name='Nebula%20Opal%20Star%20Rating'] //'nebula.workingsets'/@workingSets[name='Nebula%20Opal%20Rounded%20Toolbar'] //'nebula.workingsets'/@workingSets[name='Nebula%20Opal%20Range%20Slider'] //'nebula.workingsets'/@workingSets[name='Nebula%20Opal%20Property%20Table'] //'nebula.workingsets'/@workingSets[name='Nebula%20Opal%20Prompt%20Support'] //'nebula.workingsets'/@workingSets[name='Nebula%20Opal%20Preference%20Window'] //'nebula.workingsets'/@workingSets[name='Nebula%20Opal%20Panels'] //'nebula.workingsets'/@workingSets[name='Nebula%20Opal%20Notifier'] //'nebula.workingsets'/@workingSets[name='Nebula%20Opal%20Multi%20Choice'] //'nebula.workingsets'/@workingSets[name='Nebula%20Opal%20Login%20Dialog'] //'nebula.workingsets'/@workingSets[name='Nebula%20Opal%20Launcher'] //'nebula.workingsets'/@workingSets[name='Nebula%20Opal%20Horizontal%20Spinner'] //'nebula.workingsets'/@workingSets[name='Nebula%20Opal%20Heap%20Manager'] //'nebula.workingsets'/@workingSets[name='Nebula%20Opal%20Header'] //'nebula.workingsets'/@workingSets[name='Nebula%20Opal%20Dual%20List'] //'nebula.workingsets'/@workingSets[name='Nebula%20Opal%20Dialog'] //'nebula.workingsets'/@workingSets[name='Nebula%20Opal%20Commons'] //'nebula.workingsets'/@workingSets[name='Nebula%20Opal%20Column%20Browser'] //'nebula.workingsets'/@workingSets[name='Nebula%20Opal%20Checkbox%20Group'] //'nebula.workingsets'/@workingSets[name='Nebula%20Opal%20Calculator'] //'nebula.workingsets'/@workingSets[name='Nebula%20Opal%20Breadcrumb'] //'nebula.workingsets'/@workingSets[name='Nebula%20Slider'] //'nebula.workingsets'/@workingSets[name='Nebula%20LED'] //'nebula.workingsets'/@workingSets[name='Nebula%20Grid'] //'nebula.workingsets'/@workingSets[name='Nebula%20Geo%20Map'] //'nebula.workingsets'/@workingSets[name='Nebula%20Gantt%20Chart'] //'nebula.workingsets'/@workingSets[name='Nebula%20Gallery'] //'nebula.workingsets'/@workingSets[name='Nebula%20Formatted%20Text'] //'nebula.workingsets'/@workingSets[name='Nebula%20Font%20Awesome'] //'nebula.workingsets'/@workingSets[name='Nebula%20Floating%20Text'] //'nebula.workingsets'/@workingSets[name='Nebula%20CTree%20Combo'] //'nebula.workingsets'/@workingSets[name='Nebula%20Composite%20Table'] //'nebula.workingsets'/@workingSets[name='Nebula%20Chips'] //'nebula.workingsets'/@workingSets[name='Nebula%20CDate%20TIme'] //'nebula.workingsets'/@workingSets[name='Nebula%20Carousel'] //'nebula.workingsets'/@workingSets[name='Nebula%20Visualization'] //'nebula.workingsets'/@workingSets[name='Nebula%20Effects']"/>
+ 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']"/>
  </predicate>
  </workingSet>
  <workingSet
@@ -167,13 +173,13 @@
  </predicate>
  </workingSet>
  <workingSet
- name="Nebula Common Widget Toolkit">
+ name="Nebula Calandar Combo">
  <predicate
  xsi:type="predicates:AndPredicate">
  <operand
  xsi:type="predicates:RepositoryPredicate"
  project="org.eclipse.nebula.feature"
- relativePathPattern="widgets/cwt/.*"/>
+ relativePathPattern="widgets/calendarcombo/.*"/>
  </predicate>
  </workingSet>
  <workingSet
@@ -216,6 +222,26 @@
  relativePathPattern="widgets/ctreecombo/.*"/>
  </predicate>
  </workingSet>
+ <workingSet
+ name="Nebula Collapsible Buttons ">
+ <predicate
+ xsi:type="predicates:AndPredicate">
+ <operand
+ xsi:type="predicates:RepositoryPredicate"
+ project="org.eclipse.nebula.feature"
+ relativePathPattern="widgets/collapsiblebuttons/.*"/>
+ </predicate>
+ </workingSet>
+ <workingSet
+ name="Nebula Common Widget Toolkit">
+ <predicate
+ xsi:type="predicates:AndPredicate">
+ <operand
+ xsi:type="predicates:RepositoryPredicate"
+ project="org.eclipse.nebula.feature"
+ relativePathPattern="widgets/cwt/.*"/>
+ </predicate>
+ </workingSet>
  <workingSet
  name="Nebula Composite Table">
  <predicate
@@ -226,6 +252,16 @@
  relativePathPattern="widgets/compositetable/.*"/>
  </predicate>
  </workingSet>
+ <workingSet
+ name="Nebula Date Chooser">
+ <predicate
+ xsi:type="predicates:AndPredicate">
+ <operand
+ xsi:type="predicates:RepositoryPredicate"
+ project="org.eclipse.nebula.feature"
+ relativePathPattern="widgets/datechooser/.*"/>
+ </predicate>
+ </workingSet>
  <workingSet
  name="Nebula Effects">
  <predicate
@@ -576,6 +612,16 @@
  relativePathPattern="widgets/oscilloscope/.*"/>
  </predicate>
  </workingSet>
+ <workingSet
+ name="Nebula Pagination">
+ <predicate
+ xsi:type="predicates:AndPredicate">
+ <operand
+ xsi:type="predicates:RepositoryPredicate"
+ project="org.eclipse.nebula.feature"
+ relativePathPattern="widgets/pagination/.*"/>
+ </predicate>
+ </workingSet>
  <workingSet
  name="Nebula Paperclips">
  <predicate
@@ -606,6 +652,16 @@
  relativePathPattern="widgets/pgroup/.*"/>
  </predicate>
  </workingSet>
+ <workingSet
+ name="Nebula Picture">
+ <predicate
+ xsi:type="predicates:AndPredicate">
+ <operand
+ xsi:type="predicates:RepositoryPredicate"
+ project="org.eclipse.nebula.feature"
+ relativePathPattern="widgets/picture/.*"/>
+ </predicate>
+ </workingSet>
  <workingSet
  name="Nebula Progress Circle">
  <predicate
@@ -626,6 +682,16 @@
  relativePathPattern="widgets/pshelf/.*"/>
  </predicate>
  </workingSet>
+ <workingSet
+ name="Nebula Radio Group">
+ <predicate
+ xsi:type="predicates:AndPredicate">
+ <operand
+ xsi:type="predicates:RepositoryPredicate"
+ project="org.eclipse.nebula.feature"
+ relativePathPattern="widgets/radiogroup/.*"/>
+ </predicate>
+ </workingSet>
  <workingSet
  name="Nebula Rich Text">
  <predicate
@@ -716,6 +782,26 @@
  relativePathPattern="widgets/tiles/.*"/>
  </predicate>
  </workingSet>
+ <workingSet
+ name="Nebula Timeline">
+ <predicate
+ xsi:type="predicates:AndPredicate">
+ <operand
+ xsi:type="predicates:RepositoryPredicate"
+ project="org.eclipse.nebula.feature"
+ relativePathPattern="widgets/timeline/.*"/>
+ </predicate>
+ </workingSet>
+ <workingSet
+ name="Nebula Tree Mapper">
+ <predicate
+ xsi:type="predicates:AndPredicate">
+ <operand
+ xsi:type="predicates:RepositoryPredicate"
+ project="org.eclipse.nebula.feature"
+ relativePathPattern="widgets/treemapper/.*"/>
+ </predicate>
+ </workingSet>
  <workingSet
  name="Nebula Visualization">
  <predicate

diff --git a/...techooser/src/org/eclipse/nebula/widgets/datechooser/DateChooserComboObservableValue.java b/...techooser/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/...ts.datechooser/src/org/eclipse/nebula/widgets/datechooser/DateChooserObservableValue.java b/...ts.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/...mattedtext/src/org/eclipse/nebula/widgets/formattedtext/FormattedTextObservableValue.java b/...mattedtext/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/...e.nebula.widgets.timeline/src/org/eclipse/nebula/widgets/timeline/figures/RootFigure.java b/...e.nebula.widgets.timeline/src/org/eclipse/nebula/widgets/timeline/figures/RootFigure.java
@@ -94,8 +94,12 @@ private static List<LaneFigure> 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;
  }