Author: dgeraskov Date: 2009-07-31 02:46:28 -0400 (Fri, 31 Jul 2009) New Revision: 16924 Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/CacheModeType.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/FlushModeType.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/GenericGeneratorHolder.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernateQuery.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernateQueryContainer.java Removed: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/CacheModeType.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/FlushModeType.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/GenericGeneratorHolder.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateQuery.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateQueryContainer.java Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernateEntity.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernateNamedNativeQuery.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernateNamedQuery.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaIdMapping.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateNamedNativeQueryImpl.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateNamedQueryImpl.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/resource/java/HibernateQueryAnnotation.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/resource/java/HibernateSourceNamedNativeQueryAnnotation.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/resource/java/HibernateSourceNamedQueryAnnotation.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/java/details/HibernateJavaEntityComposite.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/GenericGeneratorsComposite.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateGenerationComposite.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateGeneratorsComposite.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateQueriesComposite.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateQueryPropertyComposite.java Log: https://jira.jboss.org/jira/browse/JBIDE-4663 Classes moved to right packages Copied: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/CacheModeType.java (from rev 16518, trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/CacheModeType.java) =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/CacheModeType.java (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/CacheModeType.java 2009-07-31 06:46:28 UTC (rev 16924) @@ -0,0 +1,72 @@ +/******************************************************************************* + * Copyright (c) 2007-2009 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.hibernate.jpt.core.internal.context; + +import org.jboss.tools.hibernate.jpt.core.internal.context.basic.Hibernate; + +/** + * @author Dmitry Geraskov + * + */ + +/** + * Corresponds to the Hibernate enum + * org.hibernate.annotations.CacheModeType + * + * Provisional API: This interface is part of an interim API that is still + * under development and expected to change significantly before reaching + * stability. It is available at this early stage to solicit feedback from + * pioneering adopters on the understanding that any code that uses this API + * will almost certainly be broken (repeatedly) as the API evolves. + */ +public enum CacheModeType { + + GET(Hibernate.CACHE_MODE_TYPE__GET), + IGNORE(Hibernate.CACHE_MODE_TYPE__IGNORE), + NORMAL(Hibernate.CACHE_MODE_TYPE__NORMAL), + PUT(Hibernate.CACHE_MODE_TYPE__PUT), + REFRESH(Hibernate.CACHE_MODE_TYPE__REFRESH); + + + private String javaAnnotationValue; + + CacheModeType(String javaAnnotationValue) { + if (javaAnnotationValue == null) { + throw new NullPointerException(); + } + this.javaAnnotationValue = javaAnnotationValue; + } + + public String getJavaAnnotationValue() { + return this.javaAnnotationValue; + } + + + // ********** static methods ********** + + public static CacheModeType fromJavaAnnotationValue(Object javaAnnotationValue) { + return (javaAnnotationValue == null) ? null : fromJavaAnnotationValue_(javaAnnotationValue); + } + + private static CacheModeType fromJavaAnnotationValue_(Object javaAnnotationValue) { + for (CacheModeType cacheModeType : CacheModeType.values()) { + if (cacheModeType.getJavaAnnotationValue().equals(javaAnnotationValue)) { + return cacheModeType; + } + } + return null; + } + + public static String toJavaAnnotationValue(CacheModeType cacheModeType) { + return (cacheModeType == null) ? null : cacheModeType.getJavaAnnotationValue(); + } + +} Copied: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/FlushModeType.java (from rev 16518, trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/FlushModeType.java) =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/FlushModeType.java (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/FlushModeType.java 2009-07-31 06:46:28 UTC (rev 16924) @@ -0,0 +1,72 @@ +/******************************************************************************* + * Copyright (c) 2007-2009 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.hibernate.jpt.core.internal.context; + +import org.jboss.tools.hibernate.jpt.core.internal.context.basic.Hibernate; + +/** + * @author Dmitry Geraskov + * + */ + +/** + * Corresponds to the Hibernate enum + * org.hibernate.annotations.FlushModeType + * + * Provisional API: This interface is part of an interim API that is still + * under development and expected to change significantly before reaching + * stability. It is available at this early stage to solicit feedback from + * pioneering adopters on the understanding that any code that uses this API + * will almost certainly be broken (repeatedly) as the API evolves. + */ +public enum FlushModeType { + + ALWAYS(Hibernate.FLUSH_MODE_TYPE__ALWAYS), + AUTO(Hibernate.FLUSH_MODE_TYPE__AUTO), + COMMIT(Hibernate.FLUSH_MODE_TYPE__COMMIT), + NEVER(Hibernate.FLUSH_MODE_TYPE__NEVER), + MANUAL(Hibernate.FLUSH_MODE_TYPE__MANUAL); + + + private String javaAnnotationValue; + + FlushModeType(String javaAnnotationValue) { + if (javaAnnotationValue == null) { + throw new NullPointerException(); + } + this.javaAnnotationValue = javaAnnotationValue; + } + + public String getJavaAnnotationValue() { + return this.javaAnnotationValue; + } + + + // ********** static methods ********** + + public static FlushModeType fromJavaAnnotationValue(Object javaAnnotationValue) { + return (javaAnnotationValue == null) ? null : fromJavaAnnotationValue_(javaAnnotationValue); + } + + private static FlushModeType fromJavaAnnotationValue_(Object javaAnnotationValue) { + for (FlushModeType flushModeType : FlushModeType.values()) { + if (flushModeType.getJavaAnnotationValue().equals(javaAnnotationValue)) { + return flushModeType; + } + } + return null; + } + + public static String toJavaAnnotationValue(FlushModeType flushModeType) { + return (flushModeType == null) ? null : flushModeType.getJavaAnnotationValue(); + } + +} Copied: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/GenericGeneratorHolder.java (from rev 16923, trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/GenericGeneratorHolder.java) =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/GenericGeneratorHolder.java (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/GenericGeneratorHolder.java 2009-07-31 06:46:28 UTC (rev 16924) @@ -0,0 +1,56 @@ +/******************************************************************************* + * Copyright (c) 2007-2009 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.hibernate.jpt.core.internal.context; + +import java.util.ListIterator; + +import org.eclipse.jpt.core.context.GeneratorHolder; + +/** + * @author Dmitry Geraskov + * + */ +public interface GenericGeneratorHolder extends GeneratorHolder { + + String GENERIC_GENERATORS_LIST = "genericGenerators"; //$NON-NLS-1$ + + /** + * Return a list iterator of the generic generators. + * This will not be null. + */ + <T extends GenericGenerator> ListIterator<T> genericGenerators(); + + /** + * Return the number of generic generators. + */ + int genericGeneratorsSize(); + + /** + * Add a generic generator to the entity return the object representing it. + */ + GenericGenerator addGenericGenerator(int index); + + /** + * Remove the generic generator at the index from the entity. + */ + void removeGenericGenerator(int index); + + /** + * Remove the generic generator from the entity. + */ + void removeGenericGenerator(GenericGenerator generator); + + /** + * Move the generic generator from the source index to the target index. + */ + void moveGenericGenerator(int targetIndex, int sourceIndex); + +} Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernateEntity.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernateEntity.java 2009-07-31 06:31:57 UTC (rev 16923) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernateEntity.java 2009-07-31 06:46:28 UTC (rev 16924) @@ -11,8 +11,6 @@ package org.jboss.tools.hibernate.jpt.core.internal.context; import org.eclipse.jpt.core.context.Entity; -import org.jboss.tools.hibernate.jpt.core.internal.context.java.GenericGeneratorHolder; -import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateQueryContainer; /** * @author Dmitry Geraskov Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernateNamedNativeQuery.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernateNamedNativeQuery.java 2009-07-31 06:31:57 UTC (rev 16923) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernateNamedNativeQuery.java 2009-07-31 06:46:28 UTC (rev 16924) @@ -11,7 +11,6 @@ package org.jboss.tools.hibernate.jpt.core.internal.context; import org.eclipse.jpt.core.context.java.JavaNamedNativeQuery; -import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateQuery; import org.jboss.tools.hibernate.jpt.core.internal.resource.java.HibernateNamedNativeQueryAnnotation; /** Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernateNamedQuery.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernateNamedQuery.java 2009-07-31 06:31:57 UTC (rev 16923) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernateNamedQuery.java 2009-07-31 06:46:28 UTC (rev 16924) @@ -11,7 +11,6 @@ package org.jboss.tools.hibernate.jpt.core.internal.context; import org.eclipse.jpt.core.context.java.JavaNamedQuery; -import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateQuery; import org.jboss.tools.hibernate.jpt.core.internal.resource.java.HibernateNamedQueryAnnotation; /** Copied: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernateQuery.java (from rev 16544, trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateQuery.java) =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernateQuery.java (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernateQuery.java 2009-07-31 06:46:28 UTC (rev 16924) @@ -0,0 +1,106 @@ +/******************************************************************************* + * Copyright (c) 2007-2009 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.hibernate.jpt.core.internal.context; + +import org.eclipse.jpt.core.context.Query; +import org.eclipse.jpt.utility.model.Model; + +/** + * @author Dmitry Geraskov + * + */ +public interface HibernateQuery extends Query, Model { + + // **************** flushMode *************************************************** + + FlushModeType getFlushMode(); + FlushModeType getSpecifiedFlushMode(); + String SPECIFIED_FLUSH_MODE_PROPERTY = "specifiedFlushMode"; //$NON-NLS-1$ + FlushModeType getDefaultFlushMode(); + String DEFAULT_FLUSH_MODE_PROPERTY = "defaultFlushMode"; //$NON-NLS-1$ + FlushModeType DEFAULT_FLUSH_MODE_TYPE = FlushModeType.AUTO; + + void setSpecifiedFlushMode(FlushModeType flushMode); + + //************************ cacheMode ********************************* + + CacheModeType getCacheMode(); + CacheModeType getSpecifiedCacheMode(); + String SPECIFIED_CACHE_MODE_PROPERTY = "specifiedCacheMode"; //$NON-NLS-1$ + CacheModeType getDefaultCacheMode(); + String DEFAULT_CACHE_MODE_PROPERTY = "defaultCacheMode"; //$NON-NLS-1$ + CacheModeType DEFAULT_CACHE_MODE_TYPE = CacheModeType.NORMAL; + + void setSpecifiedCacheMode(CacheModeType cacheMode); + + //************************ cacheable ********************************* + boolean isCacheable(); + Boolean getSpecifiedCacheable(); + void setSpecifiedCacheable(Boolean value); + String SPECIFIED_CACHEABLE_PROPERTY = "specifiedCacheable"; //$NON-NLS-1$ + + boolean isDefaultCacheable(); + boolean DEFAULT_CACHEABLE = false; + String DEFAULT_CACHEABLE_PROPERTY = "defaultCacheable"; //$NON-NLS-1$ + + //************************ cacheRegion ********************************* + String getCacheRegion(); + String getSpecifiedCacheRegion(); + void setSpecifiedCacheRegion(String value); + String SPECIFIED_CACHE_REGION_PROPERTY = "specifiedCacheRegion"; //$NON-NLS-1$ + + String getDefaultCacheRegion(); + String DEFAULT_CACHE_REGION = ""; //$NON-NLS-1$ + String DEFAULT_CACHE_REGION_PROPERTY = "defaultCacheRegion"; //$NON-NLS-1$ + + //************************ fetchSize ********************************* + int getFetchSize(); + + Integer getSpecifiedFetchSize(); + void setSpecifiedFetchSize(Integer value); + String SPECIFIED_FETCH_SIZE_PROPERTY = "specifiedFetchSize"; //$NON-NLS-1$ + + int getDefaultFetchSize(); + int DEFAULT_FETCH_SIZE = -1; + String DEFAULT_FETCH_SIZE_PROPERTY = "defaultFetchSize"; //$NON-NLS-1$ + + //************************ timeout ********************************* + int getTimeout(); + + Integer getSpecifiedTimeout(); + void setSpecifiedTimeout(Integer value); + String SPECIFIED_TIMEOUT_PROPERTY = "specifiedTimeout"; //$NON-NLS-1$ + + int getDefaultTimeout(); + int DEFAULT_TIMEOUT = -1; + String DEFAULT_TIMEOUT_PROPERTY = "defaultTimeout"; //$NON-NLS-1$ + + //************************ comment ********************************* + String getComment(); + String getSpecifiedComment(); + void setSpecifiedComment(String value); + String SPECIFIED_COMMENT_PROPERTY = "specifiedComment"; //$NON-NLS-1$ + + String getDefaultComment(); + String DEFAULT_COMMENT = ""; //$NON-NLS-1$ + String DEFAULT_COMMENT_PROPERTY = "defaultComment"; //$NON-NLS-1$ + + //************************ readOnly ********************************* + boolean isReadOnly(); + Boolean getSpecifiedReadOnly(); + void setSpecifiedReadOnly(Boolean value); + String SPECIFIED_READ_ONLY_PROPERTY = "specifiedReadOnly"; //$NON-NLS-1$ + + boolean isDefaultReadOnly(); + boolean DEFAULT_READ_ONLY = false; + String DEFAULT_READ_ONLY_PROPERTY = "defaultReadOnly"; //$NON-NLS-1$ + +} Copied: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernateQueryContainer.java (from rev 16923, trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateQueryContainer.java) =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernateQueryContainer.java (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernateQueryContainer.java 2009-07-31 06:46:28 UTC (rev 16924) @@ -0,0 +1,93 @@ +/******************************************************************************* + * Copyright (c) 2007-2009 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.hibernate.jpt.core.internal.context; + +import java.util.ListIterator; + +import org.eclipse.jpt.core.context.QueryContainer; + +/** + * @author Dmitry Geraskov + * + */ +public interface HibernateQueryContainer extends QueryContainer { + + String HIBERNATE_NAMED_QUERIES_LIST = "hibernateNamedQueries"; //$NON-NLS-1$ + + String HIBERNATE_NAMED_NATIVE_QUERIES_LIST = "hibernateNamedNativeQueries"; //$NON-NLS-1$ + // ********** named queries ********** + + /** + * Return a list iterator of the named queries. + * This will not be null. + */ + <T extends HibernateNamedQuery> ListIterator<T> hibernateNamedQueries(); + + /** + * Return the number of named queries. + */ + int hibernateNamedQueriesSize(); + + /** + * Add a named query to the entity return the object representing it. + */ + HibernateNamedQuery addHibernateNamedQuery(int index); + + /** + * Remove the named query at the index from the entity. + */ + void removeHibernateNamedQuery(int index); + + /** + * Remove the named query at from the entity. + */ + void removeHibernateNamedQuery(HibernateNamedQuery namedQuery); + + /** + * Move the named query from the source index to the target index. + */ + void moveHibernateNamedQuery(int targetIndex, int sourceIndex); + + // ********** named native queries ********** + + /** + * Return a list iterator of the specified named native queries. + * This will not be null. + */ + <T extends HibernateNamedNativeQuery> ListIterator<T> hibernateNamedNativeQueries(); + + /** + * Return the number of named native queries. + */ + int hibernateNamedNativeQueriesSize(); + + /** + * Add a named native query to the entity return the object representing it. + */ + HibernateNamedNativeQuery addHibernateNamedNativeQuery(int index); + + /** + * Remove the named native query at the index from the entity. + */ + void removeHibernateNamedNativeQuery(int index); + + /** + * Remove the named native query at from the entity. + */ + void removeHibernateNamedNativeQuery(HibernateNamedNativeQuery namedNativeQuery); + + /** + * Move the named native query from the source index to the target index. + */ + void moveHibernateNamedNativeQuery(int targetIndex, int sourceIndex); + + +} Deleted: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/CacheModeType.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/CacheModeType.java 2009-07-31 06:31:57 UTC (rev 16923) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/CacheModeType.java 2009-07-31 06:46:28 UTC (rev 16924) @@ -1,72 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007-2009 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributor: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.hibernate.jpt.core.internal.context.java; - -import org.jboss.tools.hibernate.jpt.core.internal.context.basic.Hibernate; - -/** - * @author Dmitry Geraskov - * - */ - -/** - * Corresponds to the Hibernate enum - * org.hibernate.annotations.CacheModeType - * - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public enum CacheModeType { - - GET(Hibernate.CACHE_MODE_TYPE__GET), - IGNORE(Hibernate.CACHE_MODE_TYPE__IGNORE), - NORMAL(Hibernate.CACHE_MODE_TYPE__NORMAL), - PUT(Hibernate.CACHE_MODE_TYPE__PUT), - REFRESH(Hibernate.CACHE_MODE_TYPE__REFRESH); - - - private String javaAnnotationValue; - - CacheModeType(String javaAnnotationValue) { - if (javaAnnotationValue == null) { - throw new NullPointerException(); - } - this.javaAnnotationValue = javaAnnotationValue; - } - - public String getJavaAnnotationValue() { - return this.javaAnnotationValue; - } - - - // ********** static methods ********** - - public static CacheModeType fromJavaAnnotationValue(Object javaAnnotationValue) { - return (javaAnnotationValue == null) ? null : fromJavaAnnotationValue_(javaAnnotationValue); - } - - private static CacheModeType fromJavaAnnotationValue_(Object javaAnnotationValue) { - for (CacheModeType cacheModeType : CacheModeType.values()) { - if (cacheModeType.getJavaAnnotationValue().equals(javaAnnotationValue)) { - return cacheModeType; - } - } - return null; - } - - public static String toJavaAnnotationValue(CacheModeType cacheModeType) { - return (cacheModeType == null) ? null : cacheModeType.getJavaAnnotationValue(); - } - -} Deleted: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/FlushModeType.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/FlushModeType.java 2009-07-31 06:31:57 UTC (rev 16923) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/FlushModeType.java 2009-07-31 06:46:28 UTC (rev 16924) @@ -1,72 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007-2009 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributor: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.hibernate.jpt.core.internal.context.java; - -import org.jboss.tools.hibernate.jpt.core.internal.context.basic.Hibernate; - -/** - * @author Dmitry Geraskov - * - */ - -/** - * Corresponds to the Hibernate enum - * org.hibernate.annotations.FlushModeType - * - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public enum FlushModeType { - - ALWAYS(Hibernate.FLUSH_MODE_TYPE__ALWAYS), - AUTO(Hibernate.FLUSH_MODE_TYPE__AUTO), - COMMIT(Hibernate.FLUSH_MODE_TYPE__COMMIT), - NEVER(Hibernate.FLUSH_MODE_TYPE__NEVER), - MANUAL(Hibernate.FLUSH_MODE_TYPE__MANUAL); - - - private String javaAnnotationValue; - - FlushModeType(String javaAnnotationValue) { - if (javaAnnotationValue == null) { - throw new NullPointerException(); - } - this.javaAnnotationValue = javaAnnotationValue; - } - - public String getJavaAnnotationValue() { - return this.javaAnnotationValue; - } - - - // ********** static methods ********** - - public static FlushModeType fromJavaAnnotationValue(Object javaAnnotationValue) { - return (javaAnnotationValue == null) ? null : fromJavaAnnotationValue_(javaAnnotationValue); - } - - private static FlushModeType fromJavaAnnotationValue_(Object javaAnnotationValue) { - for (FlushModeType flushModeType : FlushModeType.values()) { - if (flushModeType.getJavaAnnotationValue().equals(javaAnnotationValue)) { - return flushModeType; - } - } - return null; - } - - public static String toJavaAnnotationValue(FlushModeType flushModeType) { - return (flushModeType == null) ? null : flushModeType.getJavaAnnotationValue(); - } - -} Deleted: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/GenericGeneratorHolder.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/GenericGeneratorHolder.java 2009-07-31 06:31:57 UTC (rev 16923) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/GenericGeneratorHolder.java 2009-07-31 06:46:28 UTC (rev 16924) @@ -1,57 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007-2009 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributor: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.hibernate.jpt.core.internal.context.java; - -import java.util.ListIterator; - -import org.eclipse.jpt.core.context.GeneratorHolder; -import org.jboss.tools.hibernate.jpt.core.internal.context.GenericGenerator; - -/** - * @author Dmitry Geraskov - * - */ -public interface GenericGeneratorHolder extends GeneratorHolder { - - String GENERIC_GENERATORS_LIST = "genericGenerators"; //$NON-NLS-1$ - - /** - * Return a list iterator of the generic generators. - * This will not be null. - */ - <T extends GenericGenerator> ListIterator<T> genericGenerators(); - - /** - * Return the number of generic generators. - */ - int genericGeneratorsSize(); - - /** - * Add a generic generator to the entity return the object representing it. - */ - GenericGenerator addGenericGenerator(int index); - - /** - * Remove the generic generator at the index from the entity. - */ - void removeGenericGenerator(int index); - - /** - * Remove the generic generator from the entity. - */ - void removeGenericGenerator(GenericGenerator generator); - - /** - * Move the generic generator from the source index to the target index. - */ - void moveGenericGenerator(int targetIndex, int sourceIndex); - -} Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaIdMapping.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaIdMapping.java 2009-07-31 06:31:57 UTC (rev 16923) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaIdMapping.java 2009-07-31 06:46:28 UTC (rev 16924) @@ -28,6 +28,7 @@ import org.eclipse.wst.validation.internal.provisional.core.IReporter; import org.jboss.tools.hibernate.jpt.core.internal.HibernateJpaFactory; import org.jboss.tools.hibernate.jpt.core.internal.context.GenericGenerator; +import org.jboss.tools.hibernate.jpt.core.internal.context.GenericGeneratorHolder; import org.jboss.tools.hibernate.jpt.core.internal.resource.java.GenericGeneratorAnnotation; /** Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateNamedNativeQueryImpl.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateNamedNativeQueryImpl.java 2009-07-31 06:31:57 UTC (rev 16923) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateNamedNativeQueryImpl.java 2009-07-31 06:46:28 UTC (rev 16924) @@ -12,6 +12,8 @@ import org.eclipse.jpt.core.context.java.JavaJpaContextNode; import org.eclipse.jpt.core.internal.context.java.GenericJavaNamedNativeQuery; +import org.jboss.tools.hibernate.jpt.core.internal.context.CacheModeType; +import org.jboss.tools.hibernate.jpt.core.internal.context.FlushModeType; import org.jboss.tools.hibernate.jpt.core.internal.context.HibernateNamedNativeQuery; import org.jboss.tools.hibernate.jpt.core.internal.resource.java.HibernateNamedNativeQueryAnnotation; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateNamedQueryImpl.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateNamedQueryImpl.java 2009-07-31 06:31:57 UTC (rev 16923) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateNamedQueryImpl.java 2009-07-31 06:46:28 UTC (rev 16924) @@ -12,6 +12,8 @@ import org.eclipse.jpt.core.context.java.JavaJpaContextNode; import org.eclipse.jpt.core.internal.context.java.GenericJavaNamedQuery; +import org.jboss.tools.hibernate.jpt.core.internal.context.CacheModeType; +import org.jboss.tools.hibernate.jpt.core.internal.context.FlushModeType; import org.jboss.tools.hibernate.jpt.core.internal.context.HibernateNamedQuery; import org.jboss.tools.hibernate.jpt.core.internal.resource.java.HibernateNamedQueryAnnotation; Deleted: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateQuery.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateQuery.java 2009-07-31 06:31:57 UTC (rev 16923) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateQuery.java 2009-07-31 06:46:28 UTC (rev 16924) @@ -1,106 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007-2009 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributor: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.hibernate.jpt.core.internal.context.java; - -import org.eclipse.jpt.core.context.Query; -import org.eclipse.jpt.utility.model.Model; - -/** - * @author Dmitry Geraskov - * - */ -public interface HibernateQuery extends Query, Model { - - // **************** flushMode *************************************************** - - FlushModeType getFlushMode(); - FlushModeType getSpecifiedFlushMode(); - String SPECIFIED_FLUSH_MODE_PROPERTY = "specifiedFlushMode"; //$NON-NLS-1$ - FlushModeType getDefaultFlushMode(); - String DEFAULT_FLUSH_MODE_PROPERTY = "defaultFlushMode"; //$NON-NLS-1$ - FlushModeType DEFAULT_FLUSH_MODE_TYPE = FlushModeType.AUTO; - - void setSpecifiedFlushMode(FlushModeType flushMode); - - //************************ cacheMode ********************************* - - CacheModeType getCacheMode(); - CacheModeType getSpecifiedCacheMode(); - String SPECIFIED_CACHE_MODE_PROPERTY = "specifiedCacheMode"; //$NON-NLS-1$ - CacheModeType getDefaultCacheMode(); - String DEFAULT_CACHE_MODE_PROPERTY = "defaultCacheMode"; //$NON-NLS-1$ - CacheModeType DEFAULT_CACHE_MODE_TYPE = CacheModeType.NORMAL; - - void setSpecifiedCacheMode(CacheModeType cacheMode); - - //************************ cacheable ********************************* - boolean isCacheable(); - Boolean getSpecifiedCacheable(); - void setSpecifiedCacheable(Boolean value); - String SPECIFIED_CACHEABLE_PROPERTY = "specifiedCacheable"; //$NON-NLS-1$ - - boolean isDefaultCacheable(); - boolean DEFAULT_CACHEABLE = false; - String DEFAULT_CACHEABLE_PROPERTY = "defaultCacheable"; //$NON-NLS-1$ - - //************************ cacheRegion ********************************* - String getCacheRegion(); - String getSpecifiedCacheRegion(); - void setSpecifiedCacheRegion(String value); - String SPECIFIED_CACHE_REGION_PROPERTY = "specifiedCacheRegion"; //$NON-NLS-1$ - - String getDefaultCacheRegion(); - String DEFAULT_CACHE_REGION = ""; //$NON-NLS-1$ - String DEFAULT_CACHE_REGION_PROPERTY = "defaultCacheRegion"; //$NON-NLS-1$ - - //************************ fetchSize ********************************* - int getFetchSize(); - - Integer getSpecifiedFetchSize(); - void setSpecifiedFetchSize(Integer value); - String SPECIFIED_FETCH_SIZE_PROPERTY = "specifiedFetchSize"; //$NON-NLS-1$ - - int getDefaultFetchSize(); - int DEFAULT_FETCH_SIZE = -1; - String DEFAULT_FETCH_SIZE_PROPERTY = "defaultFetchSize"; //$NON-NLS-1$ - - //************************ timeout ********************************* - int getTimeout(); - - Integer getSpecifiedTimeout(); - void setSpecifiedTimeout(Integer value); - String SPECIFIED_TIMEOUT_PROPERTY = "specifiedTimeout"; //$NON-NLS-1$ - - int getDefaultTimeout(); - int DEFAULT_TIMEOUT = -1; - String DEFAULT_TIMEOUT_PROPERTY = "defaultTimeout"; //$NON-NLS-1$ - - //************************ comment ********************************* - String getComment(); - String getSpecifiedComment(); - void setSpecifiedComment(String value); - String SPECIFIED_COMMENT_PROPERTY = "specifiedComment"; //$NON-NLS-1$ - - String getDefaultComment(); - String DEFAULT_COMMENT = ""; //$NON-NLS-1$ - String DEFAULT_COMMENT_PROPERTY = "defaultComment"; //$NON-NLS-1$ - - //************************ readOnly ********************************* - boolean isReadOnly(); - Boolean getSpecifiedReadOnly(); - void setSpecifiedReadOnly(Boolean value); - String SPECIFIED_READ_ONLY_PROPERTY = "specifiedReadOnly"; //$NON-NLS-1$ - - boolean isDefaultReadOnly(); - boolean DEFAULT_READ_ONLY = false; - String DEFAULT_READ_ONLY_PROPERTY = "defaultReadOnly"; //$NON-NLS-1$ - -} Deleted: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateQueryContainer.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateQueryContainer.java 2009-07-31 06:31:57 UTC (rev 16923) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateQueryContainer.java 2009-07-31 06:46:28 UTC (rev 16924) @@ -1,95 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007-2009 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributor: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.hibernate.jpt.core.internal.context.java; - -import java.util.ListIterator; - -import org.eclipse.jpt.core.context.QueryContainer; -import org.jboss.tools.hibernate.jpt.core.internal.context.HibernateNamedNativeQuery; -import org.jboss.tools.hibernate.jpt.core.internal.context.HibernateNamedQuery; - -/** - * @author Dmitry Geraskov - * - */ -public interface HibernateQueryContainer extends QueryContainer { - - String HIBERNATE_NAMED_QUERIES_LIST = "hibernateNamedQueries"; //$NON-NLS-1$ - - String HIBERNATE_NAMED_NATIVE_QUERIES_LIST = "hibernateNamedNativeQueries"; //$NON-NLS-1$ - // ********** named queries ********** - - /** - * Return a list iterator of the named queries. - * This will not be null. - */ - <T extends HibernateNamedQuery> ListIterator<T> hibernateNamedQueries(); - - /** - * Return the number of named queries. - */ - int hibernateNamedQueriesSize(); - - /** - * Add a named query to the entity return the object representing it. - */ - HibernateNamedQuery addHibernateNamedQuery(int index); - - /** - * Remove the named query at the index from the entity. - */ - void removeHibernateNamedQuery(int index); - - /** - * Remove the named query at from the entity. - */ - void removeHibernateNamedQuery(HibernateNamedQuery namedQuery); - - /** - * Move the named query from the source index to the target index. - */ - void moveHibernateNamedQuery(int targetIndex, int sourceIndex); - - // ********** named native queries ********** - - /** - * Return a list iterator of the specified named native queries. - * This will not be null. - */ - <T extends HibernateNamedNativeQuery> ListIterator<T> hibernateNamedNativeQueries(); - - /** - * Return the number of named native queries. - */ - int hibernateNamedNativeQueriesSize(); - - /** - * Add a named native query to the entity return the object representing it. - */ - HibernateNamedNativeQuery addHibernateNamedNativeQuery(int index); - - /** - * Remove the named native query at the index from the entity. - */ - void removeHibernateNamedNativeQuery(int index); - - /** - * Remove the named native query at from the entity. - */ - void removeHibernateNamedNativeQuery(HibernateNamedNativeQuery namedNativeQuery); - - /** - * Move the named native query from the source index to the target index. - */ - void moveHibernateNamedNativeQuery(int targetIndex, int sourceIndex); - - -} Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/resource/java/HibernateQueryAnnotation.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/resource/java/HibernateQueryAnnotation.java 2009-07-31 06:31:57 UTC (rev 16923) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/resource/java/HibernateQueryAnnotation.java 2009-07-31 06:46:28 UTC (rev 16924) @@ -12,8 +12,8 @@ import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.core.utility.TextRange; -import org.jboss.tools.hibernate.jpt.core.internal.context.java.CacheModeType; -import org.jboss.tools.hibernate.jpt.core.internal.context.java.FlushModeType; +import org.jboss.tools.hibernate.jpt.core.internal.context.CacheModeType; +import org.jboss.tools.hibernate.jpt.core.internal.context.FlushModeType; /** * @author Dmitry Geraskov Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/resource/java/HibernateSourceNamedNativeQueryAnnotation.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/resource/java/HibernateSourceNamedNativeQueryAnnotation.java 2009-07-31 06:31:57 UTC (rev 16923) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/resource/java/HibernateSourceNamedNativeQueryAnnotation.java 2009-07-31 06:46:28 UTC (rev 16924) @@ -36,9 +36,9 @@ import org.eclipse.jpt.core.utility.jdt.IndexedDeclarationAnnotationAdapter; import org.eclipse.jpt.core.utility.jdt.Member; import org.eclipse.jpt.utility.internal.iterators.EmptyListIterator; +import org.jboss.tools.hibernate.jpt.core.internal.context.CacheModeType; +import org.jboss.tools.hibernate.jpt.core.internal.context.FlushModeType; import org.jboss.tools.hibernate.jpt.core.internal.context.basic.Hibernate; -import org.jboss.tools.hibernate.jpt.core.internal.context.java.CacheModeType; -import org.jboss.tools.hibernate.jpt.core.internal.context.java.FlushModeType; /** Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/resource/java/HibernateSourceNamedQueryAnnotation.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/resource/java/HibernateSourceNamedQueryAnnotation.java 2009-07-31 06:31:57 UTC (rev 16923) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/resource/java/HibernateSourceNamedQueryAnnotation.java 2009-07-31 06:46:28 UTC (rev 16924) @@ -34,9 +34,9 @@ import org.eclipse.jpt.core.utility.jdt.IndexedDeclarationAnnotationAdapter; import org.eclipse.jpt.core.utility.jdt.Member; import org.eclipse.jpt.utility.internal.iterators.EmptyListIterator; +import org.jboss.tools.hibernate.jpt.core.internal.context.CacheModeType; +import org.jboss.tools.hibernate.jpt.core.internal.context.FlushModeType; import org.jboss.tools.hibernate.jpt.core.internal.context.basic.Hibernate; -import org.jboss.tools.hibernate.jpt.core.internal.context.java.CacheModeType; -import org.jboss.tools.hibernate.jpt.core.internal.context.java.FlushModeType; /** * @author Dmitry Geraskov Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/java/details/HibernateJavaEntityComposite.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/java/details/HibernateJavaEntityComposite.java 2009-07-31 06:31:57 UTC (rev 16923) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/java/details/HibernateJavaEntityComposite.java 2009-07-31 06:46:28 UTC (rev 16924) @@ -16,8 +16,8 @@ import org.eclipse.jpt.ui.internal.widgets.Pane; import org.eclipse.jpt.utility.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; +import org.jboss.tools.hibernate.jpt.core.internal.context.HibernateQueryContainer; import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJavaEntity; -import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateQueryContainer; import org.jboss.tools.hibernate.jpt.ui.internal.mapping.details.HibernateGeneratorsComposite; import org.jboss.tools.hibernate.jpt.ui.internal.mapping.details.HibernateQueriesComposite; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/GenericGeneratorsComposite.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/GenericGeneratorsComposite.java 2009-07-31 06:31:57 UTC (rev 16923) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/GenericGeneratorsComposite.java 2009-07-31 06:46:28 UTC (rev 16924) @@ -40,7 +40,7 @@ import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; import org.jboss.tools.hibernate.jpt.core.internal.context.GenericGenerator; -import org.jboss.tools.hibernate.jpt.core.internal.context.java.GenericGeneratorHolder; +import org.jboss.tools.hibernate.jpt.core.internal.context.GenericGeneratorHolder; import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJavaIdMapping; import org.jboss.tools.hibernate.jpt.core.internal.context.java.JavaGenericGeneratorImpl; import org.jboss.tools.hibernate.jpt.ui.internal.widgets.EnterNameDialog; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateGenerationComposite.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateGenerationComposite.java 2009-07-31 06:31:57 UTC (rev 16923) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateGenerationComposite.java 2009-07-31 06:46:28 UTC (rev 16924) @@ -27,7 +27,7 @@ import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.jboss.tools.hibernate.jpt.core.internal.context.GenericGenerator; -import org.jboss.tools.hibernate.jpt.core.internal.context.java.GenericGeneratorHolder; +import org.jboss.tools.hibernate.jpt.core.internal.context.GenericGeneratorHolder; import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJavaIdMapping; /** Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateGeneratorsComposite.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateGeneratorsComposite.java 2009-07-31 06:31:57 UTC (rev 16923) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateGeneratorsComposite.java 2009-07-31 06:46:28 UTC (rev 16924) @@ -19,7 +19,7 @@ import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.jboss.tools.hibernate.jpt.core.internal.context.GenericGenerator; -import org.jboss.tools.hibernate.jpt.core.internal.context.java.GenericGeneratorHolder; +import org.jboss.tools.hibernate.jpt.core.internal.context.GenericGeneratorHolder; /** * @author Dmitry Geraskov Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateQueriesComposite.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateQueriesComposite.java 2009-07-31 06:31:57 UTC (rev 16923) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateQueriesComposite.java 2009-07-31 06:46:28 UTC (rev 16924) @@ -48,7 +48,7 @@ import org.eclipse.ui.part.PageBook; import org.jboss.tools.hibernate.jpt.core.internal.context.HibernateNamedNativeQuery; import org.jboss.tools.hibernate.jpt.core.internal.context.HibernateNamedQuery; -import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateQueryContainer; +import org.jboss.tools.hibernate.jpt.core.internal.context.HibernateQueryContainer; /** * @author Dmitry Geraskov Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateQueryPropertyComposite.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateQueryPropertyComposite.java 2009-07-31 06:31:57 UTC (rev 16923) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateQueryPropertyComposite.java 2009-07-31 06:46:28 UTC (rev 16924) @@ -28,10 +28,10 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Spinner; +import org.jboss.tools.hibernate.jpt.core.internal.context.CacheModeType; +import org.jboss.tools.hibernate.jpt.core.internal.context.FlushModeType; import org.jboss.tools.hibernate.jpt.core.internal.context.HibernateNamedQuery; -import org.jboss.tools.hibernate.jpt.core.internal.context.java.CacheModeType; -import org.jboss.tools.hibernate.jpt.core.internal.context.java.FlushModeType; -import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateQuery; +import org.jboss.tools.hibernate.jpt.core.internal.context.HibernateQuery; /** * @author Dmitry Geraskov