Attachment #102408 for bug #148805

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 148805
Collapse All | Expand All




        ArrayList<DesignComponent> list = new ArrayList<DesignComponent> ();
        HashMap<DesignComponent, HashSet<DesignComponent>> map = new HashMap<DesignComponent, HashSet<DesignComponent>> ();

        for (DesignComponent component : DocumentSupport.gatherAllComponents (document)) {
            if (document.getDescriptorRegistry().isInHierarchy(ClassCD.TYPEID, component.getType())) {
                if (! MidpTypes.getBoolean (component.readProperty (ClassCD.PROP_LAZY_INIT))) {
                    list.add (component);
                }
            }

            ArrayList<DesignComponent> requiredComponents = new ArrayList<DesignComponent> ();
            collectRequiredComponents (component, requiredComponents);





import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import org.netbeans.modules.vmd.api.model.presenters.actions.ActionsPresenter;
import org.netbeans.modules.vmd.midp.codegen.ui.RenameCommandAction;
import org.netbeans.modules.vmd.midp.components.general.ClassCD;
import org.netbeans.modules.vmd.midp.components.general.ClassCode;
import org.netbeans.modules.vmd.midp.components.general.RootCode;
import org.openide.util.actions.SystemAction;



        return Arrays.asList (
            // info
            InfoPresenter.create (EventSourceSupport.createCommandEventSourceInfoResolver ()),
            // code
            new RootCode.CodeComponentDependencyPresenter () {
                protected void collectRequiredComponents (Collection<DesignComponent> requiredComponents) {
                    PropertyValue propertyValue = getComponent ().readProperty (PROP_COMMAND);
                    DesignComponent component = propertyValue.getComponent();
                    if (component != null)
                        requiredComponents.add(component);
                }
            },
            // general
            new GoToSourcePresenter() {
                protected boolean matches (GuardedSection section) {

Lines 53-59 Link Here

(-)a/vmd.model/src/org/netbeans/modules/vmd/api/model/common/DocumentSupport.java (-1 / +19 lines)
53	* @author David Kaspar	53	* @author David Kaspar
54	*/	54	*/
55	public class DocumentSupport {	55	public class DocumentSupport {
56		56
		57	/**
		58	* Gathers all components the main tree of components in a specific document.
		59	* @param document the document
		60	* @return the list of components
		61	*/
		62	public static Iterable<DesignComponent> gatherAllComponents(DesignDocument document) {
		63	ArrayList<DesignComponent> list = new ArrayList<DesignComponent> ();
		64	gatherAllComponents(list, document.getRootComponent());
		65	return list;
		66	}
		67
57	/**	68	/**
58	* Gathers all components in main tree of components in a specific document.	69	* Gathers all components in main tree of components in a specific document.
59	* It returns a list of components that are or inherits a specific type-id using DescriptorRegistry.isInHierarchy method.	70	* It returns a list of components that are or inherits a specific type-id using DescriptorRegistry.isInHierarchy method.
Lines 80-85 Link Here
80	gatherAllComponentsContainingPresenterClass(list, rootComponent, presenterClass);	91	gatherAllComponentsContainingPresenterClass(list, rootComponent, presenterClass);
81	return list;	92	return list;
82	}	93	}
		94
		95	private static void gatherAllComponents(List<DesignComponent> list, DesignComponent component) {
		96	list.add (component);
		97	for (DesignComponent child : component.getComponents())
		98	gatherAllComponents(list, child);
		99	}
		100
83		101
84	private static <T extends Presenter> void gatherAllComponentsContainingPresenterClass(ArrayList<DesignComponent> list, DesignComponent component, Class<T> presenterClass) {	102	private static <T extends Presenter> void gatherAllComponentsContainingPresenterClass(ArrayList<DesignComponent> list, DesignComponent component, Class<T> presenterClass) {
85	if (component.getPresenter(presenterClass) != null)	103	if (component.getPresenter(presenterClass) != null)

Return to bug 148805

Lines 112-122 Link Here

(-)a/vmd.midp/src/org/netbeans/modules/vmd/midp/components/general/RootCode.java (-5 / +6 lines)
112	ArrayList<DesignComponent> list = new ArrayList<DesignComponent> ();	112	ArrayList<DesignComponent> list = new ArrayList<DesignComponent> ();
113	HashMap<DesignComponent, HashSet<DesignComponent>> map = new HashMap<DesignComponent, HashSet<DesignComponent>> ();	113	HashMap<DesignComponent, HashSet<DesignComponent>> map = new HashMap<DesignComponent, HashSet<DesignComponent>> ();
114		114
115	for (DesignComponent component : DocumentSupport.gatherAllComponentsOfTypeID (document, ClassCD.TYPEID)) {	115	for (DesignComponent component : DocumentSupport.gatherAllComponents (document)) {
116	if (MidpTypes.getBoolean (component.readProperty (ClassCD.PROP_LAZY_INIT)))	116	if (document.getDescriptorRegistry().isInHierarchy(ClassCD.TYPEID, component.getType())) {
117	continue;	117	if (! MidpTypes.getBoolean (component.readProperty (ClassCD.PROP_LAZY_INIT))) {
118		118	list.add (component);
119	list.add (component);	119	}
		120	}
120		121
121	ArrayList<DesignComponent> requiredComponents = new ArrayList<DesignComponent> ();	122	ArrayList<DesignComponent> requiredComponents = new ArrayList<DesignComponent> ();
122	collectRequiredComponents (component, requiredComponents);	123	collectRequiredComponents (component, requiredComponents);

Lines 64-74 Link Here

(-)a/vmd.midp/src/org/netbeans/modules/vmd/midp/components/sources/CommandEventSourceCD.java (+11 lines)
64		64
65	import java.util.ArrayList;	65	import java.util.ArrayList;
66	import java.util.Arrays;	66	import java.util.Arrays;
		67	import java.util.Collection;
67	import java.util.List;	68	import java.util.List;
68	import org.netbeans.modules.vmd.api.model.presenters.actions.ActionsPresenter;	69	import org.netbeans.modules.vmd.api.model.presenters.actions.ActionsPresenter;
69	import org.netbeans.modules.vmd.midp.codegen.ui.RenameCommandAction;	70	import org.netbeans.modules.vmd.midp.codegen.ui.RenameCommandAction;
70	import org.netbeans.modules.vmd.midp.components.general.ClassCD;	71	import org.netbeans.modules.vmd.midp.components.general.ClassCD;
71	import org.netbeans.modules.vmd.midp.components.general.ClassCode;	72	import org.netbeans.modules.vmd.midp.components.general.ClassCode;
		73	import org.netbeans.modules.vmd.midp.components.general.RootCode;
72	import org.openide.util.actions.SystemAction;	74	import org.openide.util.actions.SystemAction;
73		75
74		76
Lines 115-120 Link Here
115	return Arrays.asList (	117	return Arrays.asList (
116	// info	118	// info
117	InfoPresenter.create (EventSourceSupport.createCommandEventSourceInfoResolver ()),	119	InfoPresenter.create (EventSourceSupport.createCommandEventSourceInfoResolver ()),
		120	// code
		121	new RootCode.CodeComponentDependencyPresenter () {
		122	protected void collectRequiredComponents (Collection<DesignComponent> requiredComponents) {
		123	PropertyValue propertyValue = getComponent ().readProperty (PROP_COMMAND);
		124	DesignComponent component = propertyValue.getComponent();
		125	if (component != null)
		126	requiredComponents.add(component);
		127	}
		128	},
118	// general	129	// general
119	new GoToSourcePresenter() {	130	new GoToSourcePresenter() {
120	protected boolean matches (GuardedSection section) {	131	protected boolean matches (GuardedSection section) {