Author: dgolovin Date: 2009-07-30 20:39:17 -0400 (Thu, 30 Jul 2009) New Revision: 16921 Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.jpt.core.test/src/org/jboss/tools/hibernate/jpt/core/test/HibernateJPACoreTests.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JspContentAssistProcessor.java Log: fix compilation errors Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.jpt.core.test/src/org/jboss/tools/hibernate/jpt/core/test/HibernateJPACoreTests.java =================================================================== --- trunk/hibernatetools/tests/org.jboss.tools.hibernate.jpt.core.test/src/org/jboss/tools/hibernate/jpt/core/test/HibernateJPACoreTests.java 2009-07-30 23:53:39 UTC (rev 16920) +++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.jpt.core.test/src/org/jboss/tools/hibernate/jpt/core/test/HibernateJPACoreTests.java 2009-07-31 00:39:17 UTC (rev 16921) @@ -15,6 +15,8 @@ import java.util.ArrayList; import java.util.List; +import junit.framework.TestCase; + import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; @@ -53,13 +55,11 @@ import org.jboss.tools.hibernate.jpt.core.internal.HibernateJpaPlatformFactory; import org.jboss.tools.hibernate.jpt.core.internal.JPAPostInstallFasetListener; import org.jboss.tools.hibernate.jpt.core.internal.context.basic.Hibernate; -import org.jboss.tools.hibernate.jpt.core.internal.context.java.GenericGeneratorAnnotationImpl; +import org.jboss.tools.hibernate.jpt.core.internal.resource.java.GenericGeneratorAnnotationImpl; import org.jmock.Expectations; import org.jmock.Mockery; import org.jmock.lib.legacy.ClassImposteriser; -import junit.framework.TestCase; - /** * JUnit plugin test class for core Hibernate JPA platform * (org.jboss.tools.hibernate.jpt.core) @@ -215,7 +215,7 @@ //resourceAttributesList2.add(jrpa1); // final GenericGeneratorAnnotationImpl genericGeneratorAnnotation = new GenericGeneratorAnnotationImpl( - javaResourcePersistentType, null); + javaResourcePersistentType, null, null, null); // final InputStream classPathIStream = new MockClassPathInputStream(); final InputStream javaIStream = new MockJavaInputStream(); Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JspContentAssistProcessor.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JspContentAssistProcessor.java 2009-07-30 23:53:39 UTC (rev 16920) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JspContentAssistProcessor.java 2009-07-31 00:39:17 UTC (rev 16921) @@ -145,7 +145,7 @@ * @param context The context object instance * @return */ - protected ITagLibrary[] getTagLibraries(IPageContext context) { + public ITagLibrary[] getTagLibraries(IPageContext context) { Map<String, INameSpace> nameSpaces = context.getNameSpaces(getOffset()); if (nameSpaces == null || nameSpaces.isEmpty()) return EMPTY_LIBRARIES;