[jbosstools-commits] JBoss Tools SVN: r23035 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm.

[jbosstools-commits at lists.jboss.org]

Author: dgeraskov
Date: 2010-06-25 08:10:01 -0400 (Fri, 25 Jun 2010)
New Revision: 23035

Added:
   trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmPersistentType.java
Modified:
   trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmXmlContextNodeFactory.java
Log:
https://jira.jboss.org/browse/JBIDE-6538

Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmPersistentType.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmPersistentType.java	                        (rev 0)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmPersistentType.java	2010-06-25 12:10:01 UTC (rev 23035)
@@ -0,0 +1,46 @@
+/*******************************************************************************
+ * Copyright (c) 2010 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.orm;
+
+import org.eclipse.jpt.core.context.AccessType;
+import org.eclipse.jpt.core.context.orm.EntityMappings;
+import org.eclipse.jpt.core.internal.jpa1.context.orm.GenericOrmPersistentType;
+import org.eclipse.jpt.core.resource.orm.XmlTypeMapping;
+
+/**
+ * @author Dmitry Geraskov
+ *
+ */
+public class HibernateOrmPersistentType extends GenericOrmPersistentType {
+
+	public HibernateOrmPersistentType(EntityMappings parent,
+			XmlTypeMapping resourceMapping) {
+		super(parent, resourceMapping);
+	}
+
+	protected AccessType buildDefaultAccess() {
+		if ( ! this.mapping.isMetadataComplete()) {
+			if (this.javaPersistentType != null) {
+				if (this.javaPersistentTypeHasSpecifiedAccess()) {
+					return this.javaPersistentType.getAccess();
+				}
+				if (this.superPersistentType != null) {
+					return this.superPersistentType.getAccess();
+				}
+			}
+		}
+		AccessType access = this.getMappingFileRoot().getAccess();
+		//fix for https://jira.jboss.org/browse/JBIDE-6538
+		return (access != null) ? access : AccessType.PROPERTY; //default to PROPERTY if no specified access found
+	}
+
+
+}

Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmXmlContextNodeFactory.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmXmlContextNodeFactory.java	2010-06-25 11:57:27 UTC (rev 23034)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmXmlContextNodeFactory.java	2010-06-25 12:10:01 UTC (rev 23035)
@@ -11,6 +11,7 @@
 package org.jboss.tools.hibernate.jpt.core.internal.context.orm;
 
 import org.eclipse.jpt.core.context.XmlContextNode;
+import org.eclipse.jpt.core.context.orm.EntityMappings;
 import org.eclipse.jpt.core.context.orm.OrmBasicMapping;
 import org.eclipse.jpt.core.context.orm.OrmColumn;
 import org.eclipse.jpt.core.context.orm.OrmEntity;
@@ -35,6 +36,7 @@
 import org.eclipse.jpt.core.resource.orm.XmlManyToOne;
 import org.eclipse.jpt.core.resource.orm.XmlOneToMany;
 import org.eclipse.jpt.core.resource.orm.XmlOneToOne;
+import org.eclipse.jpt.core.resource.orm.XmlTypeMapping;
 
 /**
  * @author Dmitry Geraskov
@@ -109,5 +111,11 @@
 			OrmPersistentAttribute parent, XmlManyToMany resourceMapping) {
 		return new HibernateOrmManyToManyMapping(parent, resourceMapping);
 	}
+	
+	@Override
+	public OrmPersistentType buildOrmPersistentType(EntityMappings parent,
+			XmlTypeMapping resourceMapping) {
+		return new HibernateOrmPersistentType(parent, resourceMapping);
+	}
 
 }