From 50db873e2c4fac1619595a8758f71153fdae0563 Mon Sep 17 00:00:00 2001 From: Strong Liu Date: Thu, 15 Sep 2011 22:45:08 +0800 Subject: [PATCH] correct unmappable non-utf-8 characters --- .../main/java/org/hibernate/dialect/Cache71Dialect.java | 8 ++++---- .../main/java/org/hibernate/dialect/MimerSQLDialect.java | 2 +- .../source/annotations/xml/mocker/EntityMocker.java | 2 -- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/Cache71Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/Cache71Dialect.java index 74601a3004..856b316bb7 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/Cache71Dialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/Cache71Dialect.java @@ -57,9 +57,9 @@ import org.hibernate.sql.JoinFragment; import org.hibernate.type.StandardBasicTypes; /** - * Caché 2007.1 dialect. This class is required in order to use Hibernate with Intersystems Cach� SQL.
+ * Caché 2007.1 dialect. This class is required in order to use Hibernate with Intersystems Caché SQL.
*
- * Compatible with Cach� 2007.1. + * Compatible with Caché 2007.1. *
* * Caché and Hibernate @@ -214,8 +214,8 @@ import org.hibernate.type.StandardBasicTypes; public class Cache71Dialect extends Dialect { /** - * Creates new Cach�71Dialect instance. Sets up the JDBC / - * Cach� type mappings. + * Creates new Cache71Dialect instance. Sets up the JDBC / + * Caché type mappings. */ public Cache71Dialect() { super(); diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/MimerSQLDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/MimerSQLDialect.java index 69f712e4ff..0e1fe39fc5 100755 --- a/hibernate-core/src/main/java/org/hibernate/dialect/MimerSQLDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/MimerSQLDialect.java @@ -30,7 +30,7 @@ import org.hibernate.type.StandardBasicTypes; /** * An Hibernate 3 SQL dialect for Mimer SQL. This dialect requires Mimer SQL 9.2.1 or later * because of the mappings to NCLOB, BINARY, and BINARY VARYING. - * @author Fredrik �lund + * @author Fredrik lund */ public class MimerSQLDialect extends Dialect { diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/EntityMocker.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/EntityMocker.java index 04561f55a8..dead7aa407 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/EntityMocker.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/EntityMocker.java @@ -135,8 +135,6 @@ class EntityMocker extends AbstractEntityObjectMocker { } protected AccessType getAccessFromIndex(DotName className) { - //todo 这里实际上不应该从getIndexedAnnotations获取，而是应该先处理完所有的entity，mapped-superclass，先不处理attributes呢 - //然后获取这个 Map> indexedAnnotations = indexBuilder.getIndexedAnnotations( className ); List accessAnnotationInstances = indexedAnnotations.get( ACCESS ); if ( MockHelper.isNotEmpty( accessAnnotationInstances ) ) {