Author: vyemialyanchyk Date: 2008-12-17 09:55:41 -0500 (Wed, 17 Dec 2008) New Revision: 12643 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUiMessages.java trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUiMessages.properties trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActor.java trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/AllEntitiesInfoCollector.java Log: JBIDE-2991 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUiMessages.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUiMessages.java 2008-12-17 14:24:38 UTC (rev 12642) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUiMessages.java 2008-12-17 14:55:41 UTC (rev 12643) @@ -26,6 +26,8 @@ public static String SaveQueryEditorListener_replacetitle_info; public static String SaveQueryEditorListener_replacequestion_confirm; public static String SaveQueryEditorListener_errormessage; + public static String JPAMapToolActor_message_title; + public static String JPAMapToolActor_message; static { // initialize resource bundle NLS.initializeMessages(BUNDLE_NAME, JdtUiMessages.class); Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUiMessages.properties =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUiMessages.properties 2008-12-17 14:24:38 UTC (rev 12642) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUiMessages.properties 2008-12-17 14:55:41 UTC (rev 12643) @@ -30,3 +30,5 @@ SaveQueryEditorListener_replacetitle_info= Query replace SaveQueryEditorListener_replacequestion_confirm= ''{0}'' was changed. It is not possible to update the query. SaveQueryEditorListener_errormessage=Error while query refactoring +JPAMapToolActor_message_title=Hibernate/JPA +JPAMapToolActor_message=Cannot generate annotations for an interface or enumeration Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActor.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActor.java 2008-12-17 14:24:38 UTC (rev 12642) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActor.java 2008-12-17 14:55:41 UTC (rev 12643) @@ -37,16 +37,19 @@ import org.eclipse.jdt.internal.core.PackageFragment; import org.eclipse.jdt.internal.core.PackageFragmentRoot; import org.eclipse.jdt.internal.ui.javaeditor.CompilationUnitEditor; +import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.TextSelection; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.TreeSelection; +import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPage; import org.hibernate.eclipse.console.HibernateConsolePlugin; import org.hibernate.eclipse.jdt.ui.Activator; +import org.hibernate.eclipse.jdt.ui.internal.JdtUiMessages; import org.hibernate.eclipse.jdt.ui.internal.jpa.collect.AllEntitiesInfoCollector; import org.hibernate.eclipse.jdt.ui.internal.jpa.common.EntityInfo; import org.hibernate.eclipse.jdt.ui.internal.jpa.common.Utils; @@ -135,8 +138,7 @@ new HashMap<IJavaProject, Set<ICompilationUnit>>(); while (it.hasNext()) { ICompilationUnit cu = it.next(); - Set<ICompilationUnit> set = - mapJP_CUSet.get(cu.getJavaProject()); + Set<ICompilationUnit> set = mapJP_CUSet.get(cu.getJavaProject()); if (set == null) { set = new HashSet<ICompilationUnit>(); mapJP_CUSet.put(cu.getJavaProject(), set); @@ -156,12 +158,23 @@ collector.collect(icu); } collector.resolveRelations(); - processor.setAnnotationStylePreference(collector.getAnnotationStylePreference()); - processor.modify(javaProject, collector.getMapCUs_Info(), true); + if (collector.getNonAbstractCUNumber() > 0) { + processor.setAnnotationStylePreference(collector.getAnnotationStylePreference()); + processor.modify(javaProject, collector.getMapCUs_Info(), true); + } + else { + MessageDialog.openInformation(getShell(), + JdtUiMessages.JPAMapToolActor_message_title, + JdtUiMessages.JPAMapToolActor_message); + } } processor.saveAnnotationStylePreference(); } + private Shell getShell() { + return Activator.getDefault().getWorkbench().getActiveWorkbenchWindow().getShell(); + } + public void updateOpen() { IWorkbench workbench = Activator.getDefault().getWorkbench(); IWorkbenchPage page = workbench.getActiveWorkbenchWindow().getActivePage(); @@ -175,7 +188,14 @@ collector.initCollector(javaProject); collector.collect(cu); collector.resolveRelations(); - processor.modify(javaProject, collector.getMapCUs_Info(), true); + if (collector.getNonAbstractCUNumber() > 0) { + processor.modify(javaProject, collector.getMapCUs_Info(), true); + } + else { + MessageDialog.openInformation(getShell(), + JdtUiMessages.JPAMapToolActor_message_title, + JdtUiMessages.JPAMapToolActor_message); + } } } } Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/AllEntitiesInfoCollector.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/AllEntitiesInfoCollector.java 2008-12-17 14:24:38 UTC (rev 12642) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/AllEntitiesInfoCollector.java 2008-12-17 14:55:41 UTC (rev 12643) @@ -490,6 +490,21 @@ return mapCUs_Info; } + public int getNonAbstractCUNumber() { + Iterator<Map.Entry<String, EntityInfo>> it = null; + int nonAbstractCUNumber = 0; + // generate RefFieldInfoMap (for simple process) + it = mapCUs_Info.entrySet().iterator(); + while (it.hasNext()) { + Map.Entry<String, EntityInfo> entry = it.next(); + EntityInfo entryInfo = entry.getValue(); + if (!entryInfo.isAbstractFlag()) { + nonAbstractCUNumber++; + } + } + return nonAbstractCUNumber; + } + public AnnotStyle getAnnotationStylePreference() { return annotationStylePreference; }