Author: dgeraskov Date: 2009-12-08 05:05:24 -0500 (Tue, 08 Dec 2009) New Revision: 19100 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/AddRemoveTableComposite.java trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFileWizard.java Log: https://jira.jboss.org/jira/browse/JBIDE-5411 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/AddRemoveTableComposite.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/AddRemoveTableComposite.java 2009-12-08 10:04:19 UTC (rev 19099) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/AddRemoveTableComposite.java 2009-12-08 10:05:24 UTC (rev 19100) @@ -11,11 +11,16 @@ package org.hibernate.eclipse.jdt.ui.wizards; +import java.util.ArrayList; +import java.util.List; + import org.eclipse.jdt.core.IJavaProject; +import org.eclipse.jdt.core.IPackageFragment; import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jdt.core.search.IJavaSearchScope; import org.eclipse.jdt.core.search.SearchEngine; import org.eclipse.jdt.internal.core.JavaModelManager; +import org.eclipse.jdt.internal.ui.dialogs.PackageSelectionDialog; import org.eclipse.jdt.ui.IJavaElementSearchConstants; import org.eclipse.jdt.ui.JavaElementLabelProvider; import org.eclipse.jdt.ui.JavaUI; @@ -23,6 +28,7 @@ import org.eclipse.jface.viewers.ArrayContentProvider; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableColumn; import org.eclipse.ui.PlatformUI; @@ -75,21 +81,13 @@ dialog.setTitle(JdtUiMessages.AddRemoveTableComposite_java_types_title); dialog.setMessage(JdtUiMessages.AddRemoveTableComposite_java_select_types); } else if (i == 1){ - dialog= - JavaUI.createPackageDialog( - getShell(), - PlatformUI.getWorkbench().getProgressService(), - scope, - true, - true, - null); - dialog.setTitle(JdtUiMessages.AddRemoveTableComposite_java_packages_title); - dialog.setMessage(JdtUiMessages.AddRemoveTableComposite_java_select_packages); + dialog = new JavaPackageSelectionDialog(getShell(), scope); + dialog.setTitle(JdtUiMessages.AddRemoveTableComposite_java_packages_title); + dialog.setMessage(JdtUiMessages.AddRemoveTableComposite_java_select_packages); } else { return null; - } - - + } + if (dialog.open() == IDialogConstants.CANCEL_ID) return null; @@ -98,8 +96,36 @@ return null; } } + +} + +@SuppressWarnings("restriction") +class JavaPackageSelectionDialog extends PackageSelectionDialog { + public JavaPackageSelectionDialog(Shell parent, IJavaSearchScope scope) { + super(parent, + PlatformUI.getWorkbench().getProgressService(), + PackageSelectionDialog.F_HIDE_EMPTY_INNER, + scope); + setIgnoreCase(false); + setMultipleSelection(true); + } - + @Override + public void setElements(Object[] elements) { + List<IPackageFragment> javaPackages = new ArrayList<IPackageFragment>(); + for (Object element : elements) { + if (element instanceof IPackageFragment) { + IPackageFragment pkg = (IPackageFragment) element; + try { + if (pkg.containsJavaResources()) javaPackages.add(pkg); + } catch (JavaModelException e) { + e.printStackTrace(); + } + } + } + super.setElements(javaPackages.toArray()); + } + } Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFileWizard.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFileWizard.java 2009-12-08 10:04:19 UTC (rev 19099) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFileWizard.java 2009-12-08 10:05:24 UTC (rev 19100) @@ -33,8 +33,8 @@ import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.core.IJavaElement; import org.eclipse.jdt.core.IJavaProject; +import org.eclipse.jdt.core.IPackageFragment; import org.eclipse.jdt.core.IPackageFragmentRoot; -import org.eclipse.jdt.core.IParent; import org.eclipse.jdt.core.IType; import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jdt.internal.core.JavaElement; @@ -163,8 +163,14 @@ if (!roots[j].isArchive()){ IJavaElement[] rootChildren = roots[j].getChildren(); for (int k = 0; k < rootChildren.length; k++) { - if (rootChildren[k] instanceof IParent && ((IParent)rootChildren[k]).hasChildren()){ - filteredElements.add(rootChildren[k]); + if (rootChildren[k] instanceof IPackageFragment) { + IPackageFragment pkg = (IPackageFragment) rootChildren[k]; + try { + if (pkg.containsJavaResources()) + filteredElements.add(rootChildren[k]); + } catch (JavaModelException e1) { + e1.printStackTrace(); + } } } }