Skip to content

Commit 6c538c0

Browse files
wimjongmanwimjongman
authored
Merge pull request #546 from merks/issue-527-incubation
Include incubation feature in setup
2 parents d7d1bd0 + f96e243 commit 6c538c0

File tree

5 files changed

+95
-12
lines changed

5 files changed

+95
-12
lines changed

‎oomph.setup

+90-4
Original file line numberDiff line numberDiff line change
@@ -122,15 +122,21 @@
122122
</annotation>
123123
<description>${scope.project.label}</description>
124124
</setupTask>
125+
<setupTask
126+
xsi:type="setup:StringSubstitutionTask"
127+
name="nebula.git.clone.location"
128+
value="${git.clone.location}"/>
125129
<setupTask
126130
xsi:type="setup.targlets:TargletTask">
127131
<targlet
128132
name="${scope.project.label}"
129133
activeRepositoryList="Nebula Dependencies">
134+
<requirement
135+
name="org.eclipse.sdk.feature.group"/>
130136
<requirement
131137
name="org.eclipse.nebula.feature.feature.group"/>
132138
<requirement
133-
name="org.eclipse.sdk.feature.group"/>
139+
name="org.eclipse.nebula.incubation.feature.feature.group"/>
134140
<sourceLocator
135141
rootFolder="${git.clone.location}"
136142
locateNestedProjects="true"/>
@@ -153,7 +159,7 @@
153159
project="org.eclipse.nebula.feature"/>
154160
<operand
155161
xsi:type="workingsets:ExclusionPredicate"
156-
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']"/>
162+
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']"/>
157163
</predicate>
158164
</workingSet>
159165
<workingSet
@@ -167,13 +173,13 @@
167173
</predicate>
168174
</workingSet>
169175
<workingSet
170-
name="Nebula Common Widget Toolkit">
176+
name="Nebula Calandar Combo">
171177
<predicate
172178
xsi:type="predicates:AndPredicate">
173179
<operand
174180
xsi:type="predicates:RepositoryPredicate"
175181
project="org.eclipse.nebula.feature"
176-
relativePathPattern="widgets/cwt/.*"/>
182+
relativePathPattern="widgets/calendarcombo/.*"/>
177183
</predicate>
178184
</workingSet>
179185
<workingSet
@@ -216,6 +222,26 @@
216222
relativePathPattern="widgets/ctreecombo/.*"/>
217223
</predicate>
218224
</workingSet>
225+
<workingSet
226+
name="Nebula Collapsible Buttons ">
227+
<predicate
228+
xsi:type="predicates:AndPredicate">
229+
<operand
230+
xsi:type="predicates:RepositoryPredicate"
231+
project="org.eclipse.nebula.feature"
232+
relativePathPattern="widgets/collapsiblebuttons/.*"/>
233+
</predicate>
234+
</workingSet>
235+
<workingSet
236+
name="Nebula Common Widget Toolkit">
237+
<predicate
238+
xsi:type="predicates:AndPredicate">
239+
<operand
240+
xsi:type="predicates:RepositoryPredicate"
241+
project="org.eclipse.nebula.feature"
242+
relativePathPattern="widgets/cwt/.*"/>
243+
</predicate>
244+
</workingSet>
219245
<workingSet
220246
name="Nebula Composite Table">
221247
<predicate
@@ -226,6 +252,16 @@
226252
relativePathPattern="widgets/compositetable/.*"/>
227253
</predicate>
228254
</workingSet>
255+
<workingSet
256+
name="Nebula Date Chooser">
257+
<predicate
258+
xsi:type="predicates:AndPredicate">
259+
<operand
260+
xsi:type="predicates:RepositoryPredicate"
261+
project="org.eclipse.nebula.feature"
262+
relativePathPattern="widgets/datechooser/.*"/>
263+
</predicate>
264+
</workingSet>
229265
<workingSet
230266
name="Nebula Effects">
231267
<predicate
@@ -576,6 +612,16 @@
576612
relativePathPattern="widgets/oscilloscope/.*"/>
577613
</predicate>
578614
</workingSet>
615+
<workingSet
616+
name="Nebula Pagination">
617+
<predicate
618+
xsi:type="predicates:AndPredicate">
619+
<operand
620+
xsi:type="predicates:RepositoryPredicate"
621+
project="org.eclipse.nebula.feature"
622+
relativePathPattern="widgets/pagination/.*"/>
623+
</predicate>
624+
</workingSet>
579625
<workingSet
580626
name="Nebula Paperclips">
581627
<predicate
@@ -606,6 +652,16 @@
606652
relativePathPattern="widgets/pgroup/.*"/>
607653
</predicate>
608654
</workingSet>
655+
<workingSet
656+
name="Nebula Picture">
657+
<predicate
658+
xsi:type="predicates:AndPredicate">
659+
<operand
660+
xsi:type="predicates:RepositoryPredicate"
661+
project="org.eclipse.nebula.feature"
662+
relativePathPattern="widgets/picture/.*"/>
663+
</predicate>
664+
</workingSet>
609665
<workingSet
610666
name="Nebula Progress Circle">
611667
<predicate
@@ -626,6 +682,16 @@
626682
relativePathPattern="widgets/pshelf/.*"/>
627683
</predicate>
628684
</workingSet>
685+
<workingSet
686+
name="Nebula Radio Group">
687+
<predicate
688+
xsi:type="predicates:AndPredicate">
689+
<operand
690+
xsi:type="predicates:RepositoryPredicate"
691+
project="org.eclipse.nebula.feature"
692+
relativePathPattern="widgets/radiogroup/.*"/>
693+
</predicate>
694+
</workingSet>
629695
<workingSet
630696
name="Nebula Rich Text">
631697
<predicate
@@ -716,6 +782,26 @@
716782
relativePathPattern="widgets/tiles/.*"/>
717783
</predicate>
718784
</workingSet>
785+
<workingSet
786+
name="Nebula Timeline">
787+
<predicate
788+
xsi:type="predicates:AndPredicate">
789+
<operand
790+
xsi:type="predicates:RepositoryPredicate"
791+
project="org.eclipse.nebula.feature"
792+
relativePathPattern="widgets/timeline/.*"/>
793+
</predicate>
794+
</workingSet>
795+
<workingSet
796+
name="Nebula Tree Mapper">
797+
<predicate
798+
xsi:type="predicates:AndPredicate">
799+
<operand
800+
xsi:type="predicates:RepositoryPredicate"
801+
project="org.eclipse.nebula.feature"
802+
relativePathPattern="widgets/treemapper/.*"/>
803+
</predicate>
804+
</workingSet>
719805
<workingSet
720806
name="Nebula Visualization">
721807
<predicate

‎widgets/datechooser/org.eclipse.nebula.widgets.datechooser/src/org/eclipse/nebula/widgets/datechooser/DateChooserComboObservableValue.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import org.eclipse.core.databinding.observable.Diffs;
66
import org.eclipse.core.databinding.observable.Realm;
77
import org.eclipse.core.databinding.observable.value.AbstractObservableValue;
8-
import org.eclipse.jface.databinding.swt.SWTObservables;
98
import org.eclipse.swt.SWT;
109
import org.eclipse.swt.events.DisposeEvent;
1110
import org.eclipse.swt.events.DisposeListener;
@@ -63,7 +62,7 @@ public void widgetDisposed(DisposeEvent e) {
6362
};
6463

6564
public DateChooserComboObservableValue(final DateChooserCombo combo, int updateEventType) {
66-
this(SWTObservables.getRealm(combo.getDisplay()), combo, updateEventType);
65+
this(Realm.getDefault(), combo, updateEventType);
6766
}
6867

6968
public DateChooserComboObservableValue(final Realm realm, final DateChooserCombo combo, int updateEventType) {

‎widgets/datechooser/org.eclipse.nebula.widgets.datechooser/src/org/eclipse/nebula/widgets/datechooser/DateChooserObservableValue.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import org.eclipse.core.databinding.observable.Diffs;
66
import org.eclipse.core.databinding.observable.Realm;
77
import org.eclipse.core.databinding.observable.value.AbstractObservableValue;
8-
import org.eclipse.jface.databinding.swt.SWTObservables;
98
import org.eclipse.swt.SWT;
109
import org.eclipse.swt.events.DisposeEvent;
1110
import org.eclipse.swt.events.DisposeListener;
@@ -63,7 +62,7 @@ public void widgetDisposed(DisposeEvent e) {
6362
};
6463

6564
public DateChooserObservableValue(final DateChooser dateChooser, int updateEventType) {
66-
this(SWTObservables.getRealm(dateChooser.getDisplay()), dateChooser, updateEventType);
65+
this(Realm.getDefault(), dateChooser, updateEventType);
6766
}
6867

6968
public DateChooserObservableValue(final Realm realm, final DateChooser dateChooser, int updateEventType) {

‎widgets/formattedtext/org.eclipse.nebula.widgets.formattedtext/src/org/eclipse/nebula/widgets/formattedtext/FormattedTextObservableValue.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import org.eclipse.core.databinding.observable.Diffs;
44
import org.eclipse.core.databinding.observable.Realm;
55
import org.eclipse.core.databinding.observable.value.AbstractObservableValue;
6-
import org.eclipse.jface.databinding.swt.DisplayRealm;
76
import org.eclipse.jface.databinding.swt.ISWTObservable;
87
import org.eclipse.swt.SWT;
98
import org.eclipse.swt.events.DisposeEvent;
@@ -63,11 +62,11 @@ public void widgetDisposed(DisposeEvent e) {
6362
};
6463

6564
public FormattedTextObservableValue(final FormattedText formattedText) {
66-
this(DisplayRealm.getRealm(formattedText.getControl().getDisplay()), formattedText, SWT.Modify);
65+
this(Realm.getDefault(), formattedText, SWT.Modify);
6766
}
6867

6968
public FormattedTextObservableValue(final FormattedText formattedText, int updateEventType) {
70-
this(DisplayRealm.getRealm(formattedText.getControl().getDisplay()), formattedText, updateEventType);
69+
this(Realm.getDefault(), formattedText, updateEventType);
7170
}
7271

7372
public FormattedTextObservableValue(final Realm realm, final FormattedText formattedText, int updateEventType) {

‎widgets/timeline/org.eclipse.nebula.widgets.timeline/src/org/eclipse/nebula/widgets/timeline/figures/RootFigure.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ private static List<LaneFigure> getLanes(IFigure figure) {
9595
final TracksLayer tracksLayer = getFigure(figure, TracksLayer.class);
9696

9797
for (final Object trackFigure : tracksLayer.getChildren())
98-
lanes.addAll(((IFigure) trackFigure).getChildren());
98+
lanes.addAll((List) ((IFigure) trackFigure).getChildren());
9999

100100
return lanes;
101101
}

0 commit comments

Comments
 (0)