Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2015-02-23 18:59:50 +0000
committerEike Stepper2015-02-23 18:59:50 +0000
commit5b364c40cdb008a9d60bae2299009403b53b0e65 (patch)
tree8aa90412302d3ed014a7afb57839b419eeb8254e /plugins/org.eclipse.emf.cdo.tests.db4o
parent3e26f06ef438fac2010c3bc9f42b00be5f151345 (diff)
downloadcdo-5b364c40cdb008a9d60bae2299009403b53b0e65.tar.gz
cdo-5b364c40cdb008a9d60bae2299009403b53b0e65.tar.xz
cdo-5b364c40cdb008a9d60bae2299009403b53b0e65.zip
[458349] Consolidate UI (Update to Mars)
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=458349
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.tests.db4o')
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.db4o/META-INF/MANIFEST.MF8
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.db4o/src/org/eclipse/emf/cdo/tests/db4o/DB4OConfig.java15
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.db4o/src/org/eclipse/emf/cdo/tests/db4o/MEMDB4OStore.java.ERROR (renamed from plugins/org.eclipse.emf.cdo.tests.db4o/src/org/eclipse/emf/cdo/tests/db4o/MEMDB4OStore.java)0
3 files changed, 12 insertions, 11 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests.db4o/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.db4o/META-INF/MANIFEST.MF
index 19ccca9ab4..514f145b15 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db4o/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.tests.db4o/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.cdo.tests.db4o
-Bundle-Version: 4.0.300.qualifier
+Bundle-Version: 4.0.400.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.emf.cdo.tests;bundle-version="[4.0.0,5.0.0)",
org.eclipse.emf.cdo.server.db4o;bundle-version="[4.0.0,5.0.0)"
Bundle-Vendor: %providerName
-Export-Package: org.eclipse.emf.cdo.tests.db4o;version="4.0.300";x-internal:=true
+Export-Package: org.eclipse.emf.cdo.tests.db4o;version="4.0.400";x-internal:=true
Bundle-Localization: plugin
-Import-Package: com.db4o;version="[7.4.0,8.0.0)",
- com.db4o.ext;version="[7.4.0,8.0.0)"
+Import-Package: com.db4o;version="[7.4.0,9.0.0)",
+ com.db4o.ext;version="[7.4.0,9.0.0)"
diff --git a/plugins/org.eclipse.emf.cdo.tests.db4o/src/org/eclipse/emf/cdo/tests/db4o/DB4OConfig.java b/plugins/org.eclipse.emf.cdo.tests.db4o/src/org/eclipse/emf/cdo/tests/db4o/DB4OConfig.java
index d1240e17d1..336a80043c 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db4o/src/org/eclipse/emf/cdo/tests/db4o/DB4OConfig.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db4o/src/org/eclipse/emf/cdo/tests/db4o/DB4OConfig.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Eike Stepper - initial API and implementation
*/
@@ -75,12 +75,13 @@ public class DB4OConfig extends RepositoryConfig
{
if (mem)
{
- if (!isRestarting())
- {
- MEMDB4OStore.clearContainer();
- }
-
- return new MEMDB4OStore();
+ throw new UnsupportedOperationException();
+ // if (!isRestarting())
+ // {
+ // MEMDB4OStore.clearContainer();
+ // }
+ //
+ // return new MEMDB4OStore();
}
File tempFolder = TMPUtil.getTempFolder();
diff --git a/plugins/org.eclipse.emf.cdo.tests.db4o/src/org/eclipse/emf/cdo/tests/db4o/MEMDB4OStore.java b/plugins/org.eclipse.emf.cdo.tests.db4o/src/org/eclipse/emf/cdo/tests/db4o/MEMDB4OStore.java.ERROR
index 0f2e85fb00..0f2e85fb00 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db4o/src/org/eclipse/emf/cdo/tests/db4o/MEMDB4OStore.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db4o/src/org/eclipse/emf/cdo/tests/db4o/MEMDB4OStore.java.ERROR

Back to the top