diff --git a/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/access/PutFromLoadValidator.java b/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/access/PutFromLoadValidator.java index 3fddd35350..22da3cd2f4 100644 --- a/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/access/PutFromLoadValidator.java +++ b/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/access/PutFromLoadValidator.java @@ -42,7 +42,7 @@ /** * Encapsulates logic to allow a {@link TransactionalAccessDelegate} to determine - * whether a {@link TransactionalAccessDelegate#putFromLoad(Object, Object, long, Object, boolean) + * whether a {@link TransactionalAccessDelegate#putFromLoad(Object, Object, long, Object, boolean)} * call should be allowed to update the cache. A putFromLoad has * the potential to store stale data, since the data may have been removed from the * database and the cache between the time when the data was read from the database diff --git a/core/src/main/java/org/hibernate/Session.java b/core/src/main/java/org/hibernate/Session.java index 74a327666e..97c99655e6 100644 --- a/core/src/main/java/org/hibernate/Session.java +++ b/core/src/main/java/org/hibernate/Session.java @@ -882,7 +882,7 @@ public interface Session extends Serializable { * entities and proxies that are loaded into the session: * @see org.hibernate.Session#isDefaultReadOnly() * - * @param entityOrProxy, an entity or HibernateProxy + * @param entityOrProxy an entity or HibernateProxy * @return true, the entity or proxy is read-only; * false, the entity or proxy is modifiable. */ @@ -904,8 +904,8 @@ public interface Session extends Serializable { * and proxies loaded by a Query: * @see Query#setReadOnly(boolean) * - * @param entityOrProxy, an entity or HibernateProxy - * @param readOnly, if true, the entity or proxy is made read-only; + * @param entityOrProxy an entity or HibernateProxy + * @param readOnly if true, the entity or proxy is made read-only; * if false, the entity or proxy is made modifiable. */ public void setReadOnly(Object entityOrProxy, boolean readOnly); diff --git a/core/src/main/java/org/hibernate/bytecode/buildtime/AbstractInstrumenter.java b/core/src/main/java/org/hibernate/bytecode/buildtime/AbstractInstrumenter.java index 0e7e4ecc95..929b2f22cb 100644 --- a/core/src/main/java/org/hibernate/bytecode/buildtime/AbstractInstrumenter.java +++ b/core/src/main/java/org/hibernate/bytecode/buildtime/AbstractInstrumenter.java @@ -131,7 +131,7 @@ public void execute(Set files) { } /** - * Extract the names of classes from file, addding them to the classNames collection. + * Extract the names of classes from file, adding them to the classNames collection. *

* IMPL NOTE : file here may be either a class file or a jar. If a jar, all entries in the jar file are * processed. diff --git a/core/src/main/java/org/hibernate/bytecode/cglib/AccessOptimizerAdapter.java b/core/src/main/java/org/hibernate/bytecode/cglib/AccessOptimizerAdapter.java index 77491334f6..3ae5c9c9e8 100644 --- a/core/src/main/java/org/hibernate/bytecode/cglib/AccessOptimizerAdapter.java +++ b/core/src/main/java/org/hibernate/bytecode/cglib/AccessOptimizerAdapter.java @@ -35,8 +35,8 @@ import java.io.ObjectInputStream; /** - * The {@link ReflectionOptimizer.AccessOptimizer} implementation for CGLIB - * which simply acts as an adpater to the {@link BulkBean} class. + * The {@link ReflectionOptimizer#AccessOptimizer} implementation for CGLIB + * which simply acts as an adapter to the {@link BulkBean} class. * * @author Steve Ebersole * diff --git a/core/src/main/java/org/hibernate/bytecode/javassist/AccessOptimizerAdapter.java b/core/src/main/java/org/hibernate/bytecode/javassist/AccessOptimizerAdapter.java index 7ca1015af1..6057f0883f 100644 --- a/core/src/main/java/org/hibernate/bytecode/javassist/AccessOptimizerAdapter.java +++ b/core/src/main/java/org/hibernate/bytecode/javassist/AccessOptimizerAdapter.java @@ -30,8 +30,8 @@ import java.io.Serializable; /** - * The {@link ReflectionOptimizer.AccessOptimizer} implementation for Javassist - * which simply acts as an adpater to the {@link BulkAccessor} class. + * The {@link ReflectionOptimizer#AccessOptimizer} implementation for Javassist + * which simply acts as an adapter to the {@link BulkAccessor} class. * * @author Steve Ebersole */ diff --git a/core/src/main/java/org/hibernate/bytecode/javassist/InstantiationOptimizerAdapter.java b/core/src/main/java/org/hibernate/bytecode/javassist/InstantiationOptimizerAdapter.java index 6b2ce91146..2509011528 100644 --- a/core/src/main/java/org/hibernate/bytecode/javassist/InstantiationOptimizerAdapter.java +++ b/core/src/main/java/org/hibernate/bytecode/javassist/InstantiationOptimizerAdapter.java @@ -30,8 +30,8 @@ import java.io.Serializable; /** - * The {@link ReflectionOptimizer.InstantiationOptimizer} implementation for Javassist - * which simply acts as an adpater to the {@link FastClass} class. + * The {@link ReflectionOptimizer#InstantiationOptimizer} implementation for Javassist + * which simply acts as an adapter to the {@link FastClass} class. * * @author Steve Ebersole */ diff --git a/core/src/main/java/org/hibernate/dialect/Oracle9iDialect.java b/core/src/main/java/org/hibernate/dialect/Oracle9iDialect.java index 8ba954d753..d5f17619de 100644 --- a/core/src/main/java/org/hibernate/dialect/Oracle9iDialect.java +++ b/core/src/main/java/org/hibernate/dialect/Oracle9iDialect.java @@ -32,7 +32,7 @@ /** * A dialect for Oracle 9i databases. *

- * Unlike the older (deprecated) {@link Oracle9Dialect), this version specifies + * Unlike the older (deprecated) {@link Oracle9Dialect}, this version specifies * to not use "ANSI join syntax" because 9i does not seem to properly * handle it in all cases. * diff --git a/core/src/main/java/org/hibernate/engine/PersistenceContext.java b/core/src/main/java/org/hibernate/engine/PersistenceContext.java index d2247e3971..ab1c95aad2 100644 --- a/core/src/main/java/org/hibernate/engine/PersistenceContext.java +++ b/core/src/main/java/org/hibernate/engine/PersistenceContext.java @@ -148,7 +148,7 @@ public Object[] getNaturalIdSnapshot(Serializable id, EntityPersister persister) public void addEntity(EntityUniqueKey euk, Object entity); /** - * Retreive the EntityEntry representation of the given entity. + * Retrieve the EntityEntry representation of the given entity. * * @param entity The entity for which to locate the EntityEntry. * @return The EntityEntry for the given entity. @@ -437,7 +437,7 @@ public CollectionEntry addInitializedCollection(CollectionPersister persister, public void setFlushing(boolean flushing); /** - * Call this before begining a two-phase load + * Call this before beginning a two-phase load */ public void beforeLoad(); @@ -562,7 +562,7 @@ public CollectionEntry addInitializedCollection(CollectionPersister persister, * @see org.hibernate.Query#setReadOnly(boolean) * * @param entityOrProxy, an entity or HibernateProxy - * @param readOnly, if true, the entity or proxy is made read-only; + * @param readOnly if true, the entity or proxy is made read-only; * if false, the entity or proxy is made modifiable. * * @see org.hibernate.Session#setReadOnly(Object, boolean) @@ -580,7 +580,7 @@ public CollectionEntry addInitializedCollection(CollectionPersister persister, /** * Remove child/parent relation from cache - * @param parent + * @param child */ public void removeChildParent(Object child); diff --git a/core/src/main/java/org/hibernate/loader/Loader.java b/core/src/main/java/org/hibernate/loader/Loader.java index 70d8d0b797..e4c28121c5 100644 --- a/core/src/main/java/org/hibernate/loader/Loader.java +++ b/core/src/main/java/org/hibernate/loader/Loader.java @@ -1025,7 +1025,7 @@ protected List getResultList(List results, ResultTransformer resultTransformer) /** * Are rows transformed immediately after being read from the ResultSet? - * @param transformer, the specified transformer + * @param transformer the specified transformer * @return true, if getResultColumnOrRow() transforms the results; false, otherwise */ protected boolean areResultSetRowsTransformedImmediately(ResultTransformer transformer) { diff --git a/core/src/main/java/org/hibernate/sql/InFragment.java b/core/src/main/java/org/hibernate/sql/InFragment.java index 0440bfaba0..5373aaf5f4 100644 --- a/core/src/main/java/org/hibernate/sql/InFragment.java +++ b/core/src/main/java/org/hibernate/sql/InFragment.java @@ -46,7 +46,7 @@ public class InFragment { private List values = new ArrayList(); /** - * @param value, an SQL literal, NULL, or NOT_NULL + * @param value an SQL literal, NULL, or NOT_NULL */ public InFragment addValue(Object value) { values.add(value); diff --git a/parent/pom.xml b/parent/pom.xml index a94801f02c..d6ca43043f 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -269,8 +269,8 @@ 2.5 - http://java.sun.com/j2se/1.4.2/docs/api/ - http://java.sun.com/j2ee/1.4/docs/api/ + http://download.oracle.com/javase/1.5.0/docs/api/ + http://download.oracle.com/javaee/5/api/ Hibernate Packages Hibernate Core ${project.version}