[Releng] Consolidate isTrackConstruction naming

4 files changed, 33 insertions, 29 deletions

diff --git a/plugins/org.eclipse.emf.cdo.server.db/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.server.db/META-INF/MANIFEST.MF
index 4f4646c087..6f660850cf 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.server.db/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.server.db;singleton:=true
-Bundle-Version: 4.3.0.qualifier
+Bundle-Version: 4.3.100.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -12,10 +12,10 @@ Bundle-ClassPath: .
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.net4j.db;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
  org.eclipse.emf.cdo.server;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
-Export-Package: org.eclipse.emf.cdo.server.db;version="4.3.0",
- org.eclipse.emf.cdo.server.db.mapping;version="4.3.0",
- org.eclipse.emf.cdo.server.internal.db;version="4.3.0";x-friends:="org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo.tests.db,org.eclipse.emf.cdo.explorer.ui",
- org.eclipse.emf.cdo.server.internal.db.bundle;version="4.3.0";x-internal:=true,
- org.eclipse.emf.cdo.server.internal.db.mapping;version="4.3.0";x-friends:="org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo.tests.db",
- org.eclipse.emf.cdo.server.internal.db.mapping.horizontal;version="4.3.0";x-friends:="org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo.tests.db",
- org.eclipse.emf.cdo.server.internal.db.messages;version="4.3.0";x-internal:=true
+Export-Package: org.eclipse.emf.cdo.server.db;version="4.3.100",
+ org.eclipse.emf.cdo.server.db.mapping;version="4.3.100",
+ org.eclipse.emf.cdo.server.internal.db;version="4.3.100";x-friends:="org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo.tests.db,org.eclipse.emf.cdo.explorer.ui",
+ org.eclipse.emf.cdo.server.internal.db.bundle;version="4.3.100";x-internal:=true,
+ org.eclipse.emf.cdo.server.internal.db.mapping;version="4.3.100";x-friends:="org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo.tests.db",
+ org.eclipse.emf.cdo.server.internal.db.mapping.horizontal;version="4.3.100";x-friends:="org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo.tests.db",
+ org.eclipse.emf.cdo.server.internal.db.messages;version="4.3.100";x-internal:=true
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreAccessor.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreAccessor.java
index 9865e8477b..834cbca7b9 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreAccessor.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreAccessor.java
@@ -161,7 +161,7 @@ public class DBStoreAccessor extends StoreAccessor implements IDBStoreAccessor,
       public IDBPreparedStatement getPreparedStatement(String sql, ReuseProbability reuseProbability)
       {
         org.eclipse.net4j.db.IDBPreparedStatement.ReuseProbability converted = //
-            org.eclipse.net4j.db.IDBPreparedStatement.ReuseProbability.values()[reuseProbability.ordinal()];
+        org.eclipse.net4j.db.IDBPreparedStatement.ReuseProbability.values()[reuseProbability.ordinal()];
 
         return connection.prepareStatement(sql, converted);
       }
@@ -801,18 +801,21 @@ public class DBStoreAccessor extends StoreAccessor implements IDBStoreAccessor,
 
   public EPackage[] loadPackageUnit(InternalCDOPackageUnit packageUnit)
   {
-    return getStore().getMetaDataManager().loadPackageUnit(getConnection(), packageUnit);
+    IMetaDataManager metaDataManager = getStore().getMetaDataManager();
+    return metaDataManager.loadPackageUnit(getConnection(), packageUnit);
   }
 
   public Collection<InternalCDOPackageUnit> readPackageUnits()
   {
-    return getStore().getMetaDataManager().readPackageUnits(getConnection());
+    IMetaDataManager metaDataManager = getStore().getMetaDataManager();
+    return metaDataManager.readPackageUnits(getConnection());
   }
 
   @Override
   protected void doWrite(InternalCommitContext context, OMMonitor monitor)
   {
-    boolean oldValue = DBField.isTrackConstruction();
+    boolean wasTrackConstruction = DBField.isTrackConstruction();
+
     try
     {
       Map<String, String> properties = getStore().getProperties();
@@ -829,7 +832,7 @@ public class DBStoreAccessor extends StoreAccessor implements IDBStoreAccessor,
     }
     finally
     {
-      DBField.trackConstruction(oldValue);
+      DBField.trackConstruction(wasTrackConstruction);
     }
   }
 
@@ -1259,7 +1262,7 @@ public class DBStoreAccessor extends StoreAccessor implements IDBStoreAccessor,
       Connection connection = getConnection();
 
       Collection<InternalCDOPackageUnit> imported = //
-          metaDataManager.rawImport(connection, in, fromCommitTime, toCommitTime, monitor.fork());
+      metaDataManager.rawImport(connection, in, fromCommitTime, toCommitTime, monitor.fork());
       packageUnits.addAll(imported);
 
       if (!packageUnits.isEmpty())
diff --git a/plugins/org.eclipse.net4j.db/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.db/META-INF/MANIFEST.MF
index bc5490edf3..01089f321b 100644
--- a/plugins/org.eclipse.net4j.db/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.db/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.net4j.db;singleton:=true
-Bundle-Version: 4.4.0.qualifier
+Bundle-Version: 4.4.100.qualifier
 Bundle-Activator: org.eclipse.net4j.internal.db.bundle.OM$Activator
 Bundle-Vendor: %providerName
 Bundle-ClassPath: .
@@ -11,16 +11,16 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.net4j.util;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
  org.eclipse.net4j.db.jdbc;bundle-version="[4.0.0,5.0.0)"
-Export-Package: org.eclipse.net4j.db;version="4.4.0",
- org.eclipse.net4j.db.ddl;version="4.4.0",
- org.eclipse.net4j.db.ddl.delta;version="4.4.0",
- org.eclipse.net4j.db.dml;version="4.4.0",
- org.eclipse.net4j.internal.db;version="4.4.0";x-internal:=true,
- org.eclipse.net4j.internal.db.bundle;version="4.4.0";x-internal:=true,
- org.eclipse.net4j.internal.db.ddl;version="4.4.0";x-friends:="org.eclipse.emf.cdo.server.db",
- org.eclipse.net4j.internal.db.ddl.delta;version="4.4.0";x-internal:=true,
- org.eclipse.net4j.internal.db.dml;version="4.4.0";x-internal:=true,
- org.eclipse.net4j.spi.db;version="4.4.0",
- org.eclipse.net4j.spi.db.ddl;version="4.4.0"
+Export-Package: org.eclipse.net4j.db;version="4.4.100",
+ org.eclipse.net4j.db.ddl;version="4.4.100",
+ org.eclipse.net4j.db.ddl.delta;version="4.4.100",
+ org.eclipse.net4j.db.dml;version="4.4.100",
+ org.eclipse.net4j.internal.db;version="4.4.100";x-internal:=true,
+ org.eclipse.net4j.internal.db.bundle;version="4.4.100";x-internal:=true,
+ org.eclipse.net4j.internal.db.ddl;version="4.4.100";x-friends:="org.eclipse.emf.cdo.server.db",
+ org.eclipse.net4j.internal.db.ddl.delta;version="4.4.100";x-internal:=true,
+ org.eclipse.net4j.internal.db.dml;version="4.4.100";x-internal:=true,
+ org.eclipse.net4j.spi.db;version="4.4.100",
+ org.eclipse.net4j.spi.db.ddl;version="4.4.100"
 Bundle-ActivationPolicy: lazy
 Eclipse-BuddyPolicy: registered
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/spi/db/DBAdapter.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/spi/db/DBAdapter.java
index a9e416299c..030fa78a1d 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/spi/db/DBAdapter.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/spi/db/DBAdapter.java
@@ -155,10 +155,11 @@ public abstract class DBAdapter implements IDBAdapter
    */
   public void readSchema(Connection connection, IDBSchema schema)
   {
-    boolean isTrackConstruction = DBField.isTrackConstruction();
+    boolean wasTrackConstruction = DBField.isTrackConstruction();
+    DBField.trackConstruction(false);
+
     try
     {
-      DBField.trackConstruction(false);
       String schemaName = schema.getName();
 
       DatabaseMetaData metaData = connection.getMetaData();
@@ -184,7 +185,7 @@ public abstract class DBAdapter implements IDBAdapter
     }
     finally
     {
-      DBField.trackConstruction(isTrackConstruction);
+      DBField.trackConstruction(wasTrackConstruction);
     }
   }