removed some unused code

git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@423996 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Patrick Linskey 2006-07-20 17:24:09 +00:00
parent 09e89d9cbb
commit fc9321f35e
3 changed files with 10 additions and 38 deletions

View File

@ -733,7 +733,7 @@ public class BrokerImpl
// make sure all the configured fields are loaded; do this
// after making instance transactional for locking
if (!sm.isTransactional()
&& useTransactionalState(sm, fetchState.
&& useTransactionalState(fetchState.
getFetchConfiguration()))
sm.transactional();
boolean loaded = sm.isLoading();
@ -824,7 +824,7 @@ public class BrokerImpl
} else {
FetchConfiguration fetch = (fetchState == null)
? _fc : fetchState.getFetchConfiguration();
PCState state = (useTransactionalState(sm, fetch))
PCState state = (useTransactionalState(fetch))
? PCState.PCLEAN : PCState.PNONTRANS;
sm.setLoading(true);
try {
@ -878,7 +878,7 @@ public class BrokerImpl
List load = null;
StateManagerImpl sm;
boolean initialized;
boolean transState = useTransactionalState(null, fetch);
boolean transState = useTransactionalState(fetch);
Object obj, oid;
int idx = 0;
for (Iterator itr = oids.iterator(); itr.hasNext(); idx++) {
@ -898,7 +898,7 @@ public class BrokerImpl
_loading.put(obj, sm);
if (requiresLoad(sm, initialized, edata, flags)) {
transState = transState || useTransactionalState(sm, fetch);
transState = transState || useTransactionalState(fetch);
if (initialized && !sm.isTransactional() && transState)
sm.transactional();
if (load == null)
@ -984,8 +984,7 @@ public class BrokerImpl
/**
* Return whether to use a transactional state.
*/
private boolean useTransactionalState(StateManagerImpl sm,
FetchConfiguration fetch) {
private boolean useTransactionalState(FetchConfiguration fetch) {
return (_flags & FLAG_ACTIVE) != 0 && (!_optimistic
|| _autoClear == CLEAR_ALL
|| fetch.getReadLockLevel() != LOCK_NONE);
@ -3328,8 +3327,7 @@ public class BrokerImpl
try {
StoreQuery sq = _store.newQuery(language);
if (sq == null) {
ExpressionParser ep = (ExpressionParser)
QueryLanguages.parserForLanguage(language);
ExpressionParser ep = QueryLanguages.parserForLanguage(language);
if (ep != null)
sq = new ExpressionStoreQuery(ep);
else if (QueryLanguages.LANG_METHODQL.equals(language))
@ -4475,7 +4473,7 @@ public class BrokerImpl
// size may not be entirely accurate due to refs expiring, so
// manually copy each object; doesn't matter this way if size too
// big by some
ArrayList copy = new ArrayList(size());
List copy = new ArrayList(size());
if (_dirty != null)
for (Iterator itr = _dirty.iterator(); itr.hasNext();)
copy.add(itr.next());

View File

@ -71,7 +71,7 @@ public interface Configuration
* the property's name in XML format (i.e. two-words instead of TwoWords).
*/
public static final String ATTRIBUTE_XML = "xmlName";
/**
* Return the product name. Defaults to <code>solarmetric</code>.
*/
@ -110,16 +110,6 @@ public interface Configuration
*/
public Log getConfigurationLog();
/**
* Return the log to use for management messages.
*/
public Log getManagementLog();
/**
* Return the log to use for profiling messages.
*/
public Log getProfilingLog();
/**
* Return the {@link Value} for the given property, or null if none.
*/

View File

@ -204,27 +204,11 @@ public class ConfigurationImpl
}
/**
* Returns the logging channel <code>org.apache.openjpa.lib.Runtime</code> by
* Returns the logging channel <code>org.apache.openjpa.Runtime</code> by
* default.
*/
public Log getConfigurationLog() {
return getLog("org.apache.openjpa.lib.Runtime");
}
/**
* Returns the logging channel <code>org.apache.openjpa.lib.Manage</code> by
* default.
*/
public Log getManagementLog() {
return getLog("org.apache.openjpa.lib.Manage");
}
/**
* Returns the logging channel <code>org.apache.openjpa.lib.Profile</code> by
* default.
*/
public Log getProfilingLog() {
return getLog("org.apache.openjpa.lib.Profile");
return getLog("org.apache.openjpa.Runtime");
}
public Value[] getValues() {