diff options
author | Eike Stepper | 2011-07-07 12:22:32 +0000 |
---|---|---|
committer | Eike Stepper | 2011-07-07 12:22:32 +0000 |
commit | 142c270c33b750fbec802aa1f762339b3578a73e (patch) | |
tree | b5e1dbc985e3d4d4050334de5934e64dad1b2dc3 /plugins/org.gastro.rcp | |
parent | 790f4cef4375ee84aa1696a198cb49bbb71c4678 (diff) | |
download | cdo-142c270c33b750fbec802aa1f762339b3578a73e.tar.gz cdo-142c270c33b750fbec802aa1f762339b3578a73e.tar.xz cdo-142c270c33b750fbec802aa1f762339b3578a73e.zip |
[351405] Rename cdo.net4j.CDOSession to cdo.net4j.CDONet4jSession
https://bugs.eclipse.org/bugs/show_bug.cgi?id=351405
Diffstat (limited to 'plugins/org.gastro.rcp')
-rw-r--r-- | plugins/org.gastro.rcp/META-INF/MANIFEST.MF | 6 | ||||
-rw-r--r-- | plugins/org.gastro.rcp/src/org/gastro/internal/rcp/Model.java | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/plugins/org.gastro.rcp/META-INF/MANIFEST.MF b/plugins/org.gastro.rcp/META-INF/MANIFEST.MF index 911cdb0fda..e0bcabf7ef 100644 --- a/plugins/org.gastro.rcp/META-INF/MANIFEST.MF +++ b/plugins/org.gastro.rcp/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: CDO Gastro Example RCP Bundle-SymbolicName: org.gastro.rcp; singleton:=true -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 4.0.100.qualifier Bundle-Activator: org.gastro.internal.rcp.Activator Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)";visibility:=reexport, org.eclipse.emf.cdo.net4j;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, @@ -21,8 +21,8 @@ Export-Package: org.eclipse.nebula.animation;version="0.5.2", org.eclipse.nebula.jface.galleryviewer;version="0.5.2", org.eclipse.nebula.widgets.gallery;version="0.5.2", org.eclipse.nebula.widgets.pshelf;version="1.0.0", - org.gastro.internal.rcp;version="4.0.0";x-internal:=true, - org.gastro.rcp;version="4.0.0" + org.gastro.internal.rcp;version="4.0.100";x-internal:=true, + org.gastro.rcp;version="4.0.100" Bundle-ClassPath: ., org.eclipse.nebula.widgets.pshelf_1.0.0.HEAD.jar, org.eclipse.nebula.widgets.gallery_0.5.2.R_0_20090418.jar diff --git a/plugins/org.gastro.rcp/src/org/gastro/internal/rcp/Model.java b/plugins/org.gastro.rcp/src/org/gastro/internal/rcp/Model.java index c5e882c8c3..3d79508245 100644 --- a/plugins/org.gastro.rcp/src/org/gastro/internal/rcp/Model.java +++ b/plugins/org.gastro.rcp/src/org/gastro/internal/rcp/Model.java @@ -15,9 +15,9 @@ package org.gastro.internal.rcp; import org.eclipse.emf.cdo.CDOObject; import org.eclipse.emf.cdo.eresource.CDOResource; +import org.eclipse.emf.cdo.net4j.CDONet4jSession; +import org.eclipse.emf.cdo.net4j.CDONet4jSessionConfiguration; import org.eclipse.emf.cdo.net4j.CDONet4jUtil; -import org.eclipse.emf.cdo.net4j.CDOSession; -import org.eclipse.emf.cdo.net4j.CDOSessionConfiguration; import org.eclipse.emf.cdo.transaction.CDOTransaction; import org.eclipse.emf.cdo.util.CommitException; import org.eclipse.emf.cdo.view.CDOAdapterPolicy; @@ -55,7 +55,7 @@ public class Model extends Lifecycle implements IModel private AdapterFactory adapterFactory; - private CDOSession session; + private CDONet4jSession session; private CDOView view; @@ -211,11 +211,11 @@ public class Model extends Lifecycle implements IModel IConnector connector = Net4jUtil.getConnector(IPluginContainer.INSTANCE, "tcp", server); - CDOSessionConfiguration config = CDONet4jUtil.createSessionConfiguration(); + CDONet4jSessionConfiguration config = CDONet4jUtil.createNet4jSessionConfiguration(); config.setConnector(connector); config.setRepositoryName(repository); - session = config.openSession(); + session = config.openNet4jSession(); view = session.openView(); view.options().addChangeSubscriptionPolicy(CDOAdapterPolicy.ALL); } |