Author: scabanovich Date: 2010-09-07 08:58:50 -0400 (Tue, 07 Sep 2010) New Revision: 24762 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/CDIAnnotationSelectionProvider.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/InterceptorBindingSelectionProvider.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewInterceptorWizardPage.java Log: https://jira.jboss.org/browse/JBIDE-7009 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/CDIAnnotationSelectionProvider.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/CDIAnnotationSelectionProvider.java 2010-09-07 12:50:09 UTC (rev 24761) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/CDIAnnotationSelectionProvider.java 2010-09-07 12:58:50 UTC (rev 24762) @@ -11,6 +11,7 @@ package org.jboss.tools.cdi.ui.wizard; +import org.eclipse.jdt.core.IPackageFragment; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.dialogs.FilteredItemsSelectionDialog; @@ -24,6 +25,8 @@ public abstract class CDIAnnotationSelectionProvider implements ListFieldEditorProvider<ICDIAnnotation> { protected ICDIProject project; protected IFieldEditor editor; + + protected IPackageFragment packageFragment = null; public CDIAnnotationSelectionProvider() {} @@ -39,6 +42,10 @@ return project; } + public void setPackageFragment(IPackageFragment f) { + packageFragment = f; + } + public FilteredItemsSelectionDialog createSelectionDialog() { Shell shell = CDIUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getShell(); SelectCDIAnnotationDialog dialog = new SelectCDIAnnotationDialog(shell); Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/InterceptorBindingSelectionProvider.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/InterceptorBindingSelectionProvider.java 2010-09-07 12:50:09 UTC (rev 24761) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/InterceptorBindingSelectionProvider.java 2010-09-07 12:58:50 UTC (rev 24762) @@ -14,6 +14,11 @@ import java.util.ArrayList; import java.util.List; +import org.eclipse.jdt.core.Flags; +import org.eclipse.jdt.core.IPackageFragment; +import org.eclipse.jdt.core.IType; +import org.eclipse.jdt.core.JavaModelException; +import org.jboss.tools.cdi.core.CDICorePlugin; import org.jboss.tools.cdi.core.ICDIAnnotation; import org.jboss.tools.cdi.core.IInterceptorBinding; import org.jboss.tools.cdi.ui.CDIUIMessages; @@ -29,6 +34,21 @@ List c = (List)editor.getValue(); for (IInterceptorBinding s: ss) { if(c.contains(s)) continue; + IType t = s.getSourceType(); + if(t != null) { + int kind = 0; + try { + kind = t.getFlags(); + } catch (JavaModelException e) { + CDICorePlugin.getDefault().logError(e); + } + if(!Flags.isPublic(kind)) { + IPackageFragment p = t.getPackageFragment(); + if(packageFragment != null && !packageFragment.equals(p)) { + continue; + } + } + } as.add(s); } return as.toArray(new ICDIAnnotation[0]); Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewInterceptorWizardPage.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewInterceptorWizardPage.java 2010-09-07 12:50:09 UTC (rev 24761) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewInterceptorWizardPage.java 2010-09-07 12:58:50 UTC (rev 24762) @@ -224,6 +224,7 @@ interceptorBindingsProvider.setProject(cdi); } } + interceptorBindingsProvider.setPackageFragment(getPackageFragment()); } void onMethodNameChange() { @@ -315,4 +316,12 @@ updateStatus(StatusUtil.getMostSevere(status)); } + protected IStatus packageChanged() { + IStatus result = super.packageChanged(); + if(result != null && result.isOK()) { + interceptorBindingsProvider.setPackageFragment(getPackageFragment()); + } + return result; + } + } \ No newline at end of file