|
From: <hib...@li...> - 2006-03-22 22:35:19
|
Author: epbernard
Date: 2006-03-22 17:34:54 -0500 (Wed, 22 Mar 2006)
New Revision: 9677
Modified:
trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/EJB3DTDEntityResolver.java
Log:
style
Modified: trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/EJB3DTDEntityResolver.java
===================================================================
--- trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/EJB3DTDEntityResolver.java 2006-03-22 17:38:55 UTC (rev 9676)
+++ trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/EJB3DTDEntityResolver.java 2006-03-22 22:34:54 UTC (rev 9677)
@@ -6,8 +6,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.hibernate.util.DTDEntityResolver;
+import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
-import org.xml.sax.EntityResolver;
/**
* @author Emmanuel Bernard
@@ -17,19 +17,20 @@
private static final Log log = LogFactory.getLog( EJB3DTDEntityResolver.class );
- boolean resolved = false;
+ boolean resolved = false;
- public boolean isResolved()
- {
- return resolved;
- }
+ public boolean isResolved() {
+ return resolved;
+ }
- public InputSource resolveEntity(String publicId, String systemId) {
+ public InputSource resolveEntity(String publicId, String systemId) {
InputSource is = super.resolveEntity( publicId, systemId );
- if (is == null) {
+ if ( is == null ) {
if ( systemId != null ) {
if ( systemId.endsWith( "orm_1_0.xsd" ) ) {
- log.debug( "recognized EJB3 ORM namespace; attempting to resolve on classpath under org/hibernate/ejb" );
+ log.debug(
+ "recognized EJB3 ORM namespace; attempting to resolve on classpath under org/hibernate/ejb"
+ );
String path = "org/hibernate/ejb/" + "orm_1_0.xsd";
InputStream dtdStream = resolveInHibernateNamespace( path );
if ( dtdStream == null ) {
@@ -40,12 +41,14 @@
InputSource source = new InputSource( dtdStream );
source.setPublicId( publicId );
source.setSystemId( systemId );
- resolved = false;
- return source;
+ resolved = false;
+ return source;
}
}
else if ( systemId.endsWith( "persistence_1_0.xsd" ) ) {
- log.debug( "recognized EJB3 ORM namespace; attempting to resolve on classpath under org/hibernate/ejb" );
+ log.debug(
+ "recognized EJB3 ORM namespace; attempting to resolve on classpath under org/hibernate/ejb"
+ );
String path = "org/hibernate/ejb/" + "persistence_1_0.xsd";
InputStream dtdStream = resolveInHibernateNamespace( path );
if ( dtdStream == null ) {
@@ -56,15 +59,15 @@
InputSource source = new InputSource( dtdStream );
source.setPublicId( publicId );
source.setSystemId( systemId );
- resolved = true;
- return source;
+ resolved = true;
+ return source;
}
}
}
}
else {
- resolved = true;
- return is;
+ resolved = true;
+ return is;
}
//use the default behavior
return null;
|