Skip to content

Commit 3f72ec7

Browse files
merksmerks
committed
Replace deprecated ObservablesManager.runAndCollect(Runnable) calls
1 parent 1910afa commit 3f72ec7

7 files changed

Lines changed: 46 additions & 41 deletions

File tree

‎examples/org.eclipse.emf.examples-feature/feature.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<feature
33
id="org.eclipse.emf.examples"
44
label="%featureName"
5-
version="2.25.0.qualifier"
5+
version="2.26.0.qualifier"
66
provider-name="%providerName"
77
license-feature="org.eclipse.emf.license"
88
license-feature-version="2.11.0">

‎examples/org.eclipse.emf.examples-feature/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<groupId>org.eclipse.emf.features</groupId>
1414
<artifactId>org.eclipse.emf.examples</artifactId>
15-
<version>2.25.0-SNAPSHOT</version>
15+
<version>2.26.0-SNAPSHOT</version>
1616
<packaging>eclipse-feature</packaging>
1717

1818
</project>

‎examples/org.eclipse.emf.examples.databinding.project.ui.rcp/META-INF/MANIFEST.MF‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Bundle-Name: %pluginName
44
Bundle-Vendor: %providerName
55
Bundle-Localization: plugin
66
Bundle-SymbolicName: org.eclipse.emf.examples.databinding.project.ui.rcp;singleton:=true
7-
Bundle-Version: 1.12.0.qualifier
7+
Bundle-Version: 1.13.0.qualifier
88
Bundle-Activator: org.eclipse.emf.example.databinding.project.ui.rcp.Activator
99
Require-Bundle: org.eclipse.ui;bundle-version="[3.105.0,4.0.0)",
1010
org.eclipse.core.runtime;bundle-version="[3.9.0,4.0.0)",
@@ -16,13 +16,13 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.105.0,4.0.0)",
1616
org.eclipse.emf.databinding.edit;bundle-version="[1.10.0,2.0.0)",
1717
org.eclipse.emf.examples.databinding.project.core;bundle-version="[1.5.0,2.0.0)",
1818
org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)",
19-
org.eclipse.emf.ecore.xmi;bundle-version="[2.38.0,3.0.0)"
19+
org.eclipse.emf.ecore.xmi;bundle-version="[2.39.0,3.0.0)"
2020
Bundle-ActivationPolicy: lazy
2121
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
2222
Import-Package: org.eclipse.emf.examples.databinding.project.core.model.project;version="[1.5.0,2.0.0)"
23-
Export-Package: org.eclipse.emf.example.databinding.project.ui.rcp;version="1.12.0",
24-
org.eclipse.emf.example.databinding.project.ui.rcp.databinding;version="1.12.0",
25-
org.eclipse.emf.example.databinding.project.ui.rcp.dialogs;version="1.12.0",
26-
org.eclipse.emf.example.databinding.project.ui.rcp.handlers;version="1.12.0",
27-
org.eclipse.emf.example.databinding.project.ui.rcp.views;version="1.12.0"
23+
Export-Package: org.eclipse.emf.example.databinding.project.ui.rcp;version="1.13.0",
24+
org.eclipse.emf.example.databinding.project.ui.rcp.databinding;version="1.13.0",
25+
org.eclipse.emf.example.databinding.project.ui.rcp.dialogs;version="1.13.0",
26+
org.eclipse.emf.example.databinding.project.ui.rcp.handlers;version="1.13.0",
27+
org.eclipse.emf.example.databinding.project.ui.rcp.views;version="1.13.0"
2828
Automatic-Module-Name: org.eclipse.emf.examples.databinding.project.ui.rcp

‎examples/org.eclipse.emf.examples.databinding.project.ui.rcp/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<groupId>org.eclipse.emf</groupId>
1414
<artifactId>org.eclipse.emf.examples.databinding.project.ui.rcp</artifactId>
15-
<version>1.12.0-SNAPSHOT</version>
15+
<version>1.13.0-SNAPSHOT</version>
1616
<packaging>eclipse-plugin</packaging>
1717

1818
</project>

‎examples/org.eclipse.emf.examples.databinding.project.ui.rcp/src/org/eclipse/emf/example/databinding/project/ui/rcp/dialogs/CommitterShipDialog.java‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
import org.eclipse.core.databinding.DataBindingContext;
1414
import org.eclipse.core.databinding.ObservablesManager;
1515
import org.eclipse.core.databinding.conversion.Converter;
16+
import org.eclipse.core.databinding.observable.IObservable;
17+
import org.eclipse.core.databinding.observable.ObservableTracker;
1618
import org.eclipse.emf.common.command.Command;
1719
import org.eclipse.emf.databinding.EMFDataBindingContext;
1820
import org.eclipse.emf.databinding.EMFUpdateValueStrategy;
@@ -82,15 +84,16 @@ protected Control createDialogArea(Composite parent)
8284
final Composite comp = (Composite)super.createDialogArea(parent);
8385

8486
ObservablesManager mgr = new EMFObservablesManager();
85-
mgr.runAndCollect(new Runnable()
87+
IObservable[] collected = ObservableTracker.runAndCollect(new Runnable()
88+
{
89+
public void run()
8690
{
87-
88-
public void run()
89-
{
90-
createForm(comp).setLayoutData(new GridData(GridData.FILL_BOTH));
91-
}
92-
93-
});
91+
createForm(comp).setLayoutData(new GridData(GridData.FILL_BOTH));
92+
}
93+
});
94+
for (IObservable observable : collected) {
95+
mgr.addObservable(observable);
96+
}
9497

9598
return comp;
9699
}

‎examples/org.eclipse.emf.examples.databinding.project.ui.rcp/src/org/eclipse/emf/example/databinding/project/ui/rcp/dialogs/PersonDialog.java‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818

1919
import org.eclipse.core.databinding.DataBindingContext;
2020
import org.eclipse.core.databinding.ObservablesManager;
21+
import org.eclipse.core.databinding.observable.IObservable;
22+
import org.eclipse.core.databinding.observable.ObservableTracker;
2123
import org.eclipse.core.runtime.IStatus;
2224
import org.eclipse.core.runtime.Status;
2325
import org.eclipse.emf.common.command.Command;
@@ -87,15 +89,17 @@ protected Control createDialogArea(Composite parent)
8789
final Composite comp = (Composite)super.createDialogArea(parent);
8890

8991
ObservablesManager mgr = new EMFObservablesManager();
90-
mgr.runAndCollect(new Runnable()
92+
IObservable[] collected = ObservableTracker.runAndCollect(new Runnable()
9193
{
92-
9394
public void run()
9495
{
9596
createForm(comp).setLayoutData(new GridData(GridData.FILL_BOTH));
9697
}
9798
});
98-
99+
for (IObservable observable : collected)
100+
{
101+
mgr.addObservable(observable);
102+
}
99103
return comp;
100104
}
101105

‎examples/org.eclipse.emf.examples.databinding.project.ui.rcp/src/org/eclipse/emf/example/databinding/project/ui/rcp/views/ProjectAdminViewPart.java‎

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,15 @@
1111
package org.eclipse.emf.example.databinding.project.ui.rcp.views;
1212

1313
import org.eclipse.core.databinding.ObservablesManager;
14+
import org.eclipse.core.databinding.observable.IObservable;
15+
import org.eclipse.core.databinding.observable.ObservableTracker;
1416
import org.eclipse.core.runtime.IProgressMonitor;
1517
import org.eclipse.core.runtime.IStatus;
18+
import org.eclipse.emf.example.databinding.project.ui.rcp.Activator;
19+
import org.eclipse.emf.example.databinding.project.ui.rcp.ResourceProvider;
20+
import org.eclipse.emf.example.databinding.project.ui.rcp.databinding.EMFObservablesManager;
21+
import org.eclipse.emf.examples.databinding.project.core.IModelResource;
22+
import org.eclipse.emf.examples.databinding.project.core.model.project.Project;
1623
import org.eclipse.swt.SWT;
1724
import org.eclipse.swt.custom.SashForm;
1825
import org.eclipse.swt.widgets.Composite;
@@ -27,12 +34,6 @@
2734
import org.eclipse.ui.part.ViewPart;
2835
import org.eclipse.ui.services.ISourceProviderService;
2936

30-
import org.eclipse.emf.examples.databinding.project.core.IModelResource;
31-
import org.eclipse.emf.examples.databinding.project.core.model.project.Project;
32-
import org.eclipse.emf.example.databinding.project.ui.rcp.Activator;
33-
import org.eclipse.emf.example.databinding.project.ui.rcp.ResourceProvider;
34-
import org.eclipse.emf.example.databinding.project.ui.rcp.databinding.EMFObservablesManager;
35-
3637

3738
/**
3839
* The workbench part displayed to the user
@@ -121,21 +122,18 @@ public void commandStackChanged()
121122
*/
122123
mgr = new EMFObservablesManager();
123124
defaultMgr = new ObservablesManager();
124-
mgr.runAndCollect(new Runnable()
125+
IObservable[] collected = ObservableTracker.runAndCollect(new Runnable()
126+
{
127+
public void run()
125128
{
126-
127-
public void run()
128-
{
129-
projectExplorer = new ProjectExplorerPart(getViewSite(), sashForm, toolkit, resource.getFoundation(), defaultMgr);
130-
projectDataForm = new ProjectFormAreaPart(
131-
getViewSite(),
132-
sashForm,
133-
toolkit,
134-
resource,
135-
defaultMgr,
136-
projectExplorer.getProjectObservable());
137-
}
138-
});
129+
projectExplorer = new ProjectExplorerPart(getViewSite(), sashForm, toolkit, resource.getFoundation(), defaultMgr);
130+
projectDataForm = new ProjectFormAreaPart(getViewSite(), sashForm, toolkit, resource, defaultMgr, projectExplorer.getProjectObservable());
131+
}
132+
});
133+
for (IObservable observable : collected)
134+
{
135+
mgr.addObservable(observable);
136+
}
139137

140138
int left = (int)(100 * divider);
141139
sashForm.setWeights(new int []{ left, 100 - left });

0 commit comments

Comments
 (0)