diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.examples.installer')
2 files changed, 5 insertions, 4 deletions
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/META-INF/MANIFEST.MF index daa4ff632c..230a1d8c4b 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: CDO Electronic Restaurant Example RCP Bundle-SymbolicName: org.gastro.rcp; singleton:=true -Bundle-Version: 4.1.200.qualifier +Bundle-Version: 4.1.300.qualifier Bundle-Activator: org.gastro.internal.rcp.Activator Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";visibility:=reexport, org.eclipse.emf.cdo.net4j;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, @@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";visibili org.eclipse.nebula.widgets.pshelf;bundle-version="[1.0.0,2.0.0)";visibility:=reexport Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Export-Package: org.gastro.internal.rcp;version="4.1.200";x-internal:=true, - org.gastro.rcp;version="4.1.200" +Export-Package: org.gastro.internal.rcp;version="4.1.300";x-internal:=true, + org.gastro.rcp;version="4.1.300" Bundle-ClassPath: . Bundle-Vendor: Eclipse Modeling Project diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/src/org/gastro/internal/rcp/Model.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/src/org/gastro/internal/rcp/Model.java index 9029c9ad16..ba098ca39c 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/src/org/gastro/internal/rcp/Model.java +++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/src/org/gastro/internal/rcp/Model.java @@ -53,7 +53,7 @@ public class Model extends Lifecycle implements IModel { public static final Model INSTANCE = new Model(); - private AdapterFactory adapterFactory; + private final ComposedAdapterFactory adapterFactory; private CDONet4jSession session; @@ -228,6 +228,7 @@ public class Model extends Lifecycle implements IModel view = null; restaurant = null; station = null; + adapterFactory.dispose(); super.doDeactivate(); } } |