Apache
/
openjpa
mirror of https://github.com/apache/openjpa.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cleaned up some imports; fixed a typo; changed test case to reduce output 

git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@427472 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Patrick Linskey 2006-08-01 07:05:08 +00:00
parent eb96e89f4d
commit e889cd2aef
5 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCDataGenerator.java
View File

@ -20,7 +20,6 @@ import java.util.Collection;
import java.util.Iterator; import java.util.Iterator;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.Map; import java.util.Map;
import java.util.Set;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.apache.openjpa.conf.OpenJPAConfiguration; import org.apache.openjpa.conf.OpenJPAConfiguration;

15
openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java
View File

@ -2793,20 +2793,7 @@ public class StateManagerImpl
} }
/** /**
* Return whether the second field has any custom fetch groups in common * Helper method to provide the given field number to the given
* with the first.
*/
private static boolean sharesCustomFetchGroups(FieldMetaData fmd1,
FieldMetaData fmd2) {
String[] fgs = fmd1.getCustomFetchGroups();
for (int i = 0; i < fgs.length; i++)
if (fmd2.isInFetchGroup(fgs[i]))
return true;
return false;
}
/**
* Helper method to privde the given field number to the given
* field manager. * field manager.
*/ */
void provideField(PersistenceCapable pc, FieldManager store, int field) { void provideField(PersistenceCapable pc, FieldManager store, int field) {

3
openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/DelegatingStatement.java
View File

@ -266,5 +266,4 @@ public class DelegatingStatement implements Statement, Closeable {
public int getResultSetHoldability() throws SQLException { public int getResultSetHoldability() throws SQLException {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
} }

2
openjpa-lib/src/main/java/org/apache/openjpa/lib/xml/XMLFactory.java
View File

@ -20,7 +20,6 @@ import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory; import javax.xml.parsers.SAXParserFactory;
import javax.xml.transform.sax.SAXTransformerFactory;
import org.apache.commons.lang.exception.NestableRuntimeException; import org.apache.commons.lang.exception.NestableRuntimeException;
import org.w3c.dom.Document; import org.w3c.dom.Document;
@ -42,7 +41,6 @@ public class XMLFactory {
// cache parsers and transformers in all possible configurations // cache parsers and transformers in all possible configurations
private static SAXParserFactory[] _saxFactories = null; private static SAXParserFactory[] _saxFactories = null;
private static DocumentBuilderFactory[] _domFactories = null; private static DocumentBuilderFactory[] _domFactories = null;
private static SAXTransformerFactory _transFactory = null;
private static ErrorHandler _validating; private static ErrorHandler _validating;
static { static {

8
openjpa-lib/src/test/java/org/apache/openjpa/lib/conf/test/TestConfigurationImpl.java
View File

@ -36,7 +36,6 @@ import org.apache.openjpa.lib.test.AbstractTestCase;
public class TestConfigurationImpl extends AbstractTestCase { public class TestConfigurationImpl extends AbstractTestCase {
private ConfigurationTest _conf = new ConfigurationTest(); private ConfigurationTest _conf = new ConfigurationTest();
private String _def;
public TestConfigurationImpl(String test) { public TestConfigurationImpl(String test) {
super(test); super(test);
@ -308,5 +307,12 @@ public class TestConfigurationImpl extends AbstractTestCase {
public void deriveObjectKey(Object val) { public void deriveObjectKey(Object val) {
_objectKey.set(val, true); _objectKey.set(val, true);
} }
protected boolean isInvalidProperty(String s) {
if ("openjpatest.properties".equals(s))
return false;
else
return super.isInvalidProperty(s);
}
} }
} }