Index: netbeans/modules/bpel/nodes/actions/AddVariableAction.java =================================================================== RCS file: /cvs/enterprise/bpel/editors/src/org/netbeans/modules/bpel/nodes/actions/Attic/AddVariableAction.java,v retrieving revision 1.1.2.8 diff -u -r1.1.2.8 AddVariableAction.java --- netbeans/modules/bpel/nodes/actions/AddVariableAction.java 25 Sep 2006 14:37:34 -0000 1.1.2.8 +++ netbeans/modules/bpel/nodes/actions/AddVariableAction.java 9 Oct 2006 12:39:43 -0000 @@ -18,10 +18,8 @@ */ package org.netbeans.modules.bpel.nodes.actions; -import java.awt.Component; import java.awt.Dialog; import java.util.concurrent.Callable; -import javax.swing.JComponent; import org.netbeans.modules.bpel.model.api.BPELElementsBuilder; import org.netbeans.modules.bpel.model.api.BaseScope; import org.netbeans.modules.bpel.model.api.BpelEntity; @@ -38,7 +36,6 @@ import org.netbeans.modules.bpel.nodes.BpelNode; import org.netbeans.modules.bpel.properties.ExtendedLookup; import org.netbeans.modules.bpel.properties.editors.controls.filter.VisibilityScope; -import org.openide.explorer.view.BeanTreeView; import org.openide.nodes.Node; import org.openide.util.Lookup; import org.openide.util.NbBundle; @@ -94,10 +91,6 @@ SimpleCustomEditor customEditor = new SimpleCustomEditor( variableNode, VariableMainPanel.class, EditingMode.CREATE_NEW_INSTANCE); - - // hack - disableDefaultActionsInBeenTreeViews(customEditor); - NodeEditorDescriptor descriptor = new NodeEditorDescriptor(customEditor, dialogTitle); descriptor.setOkButtonProcessor(new Callable() { @@ -119,22 +112,6 @@ dialog.setVisible(true); } - - private void disableDefaultActionsInBeenTreeViews(JComponent c) { - if (c instanceof BeanTreeView) { - ((BeanTreeView) c).setDefaultActionAllowed(false); - return; - } - - for (int i = c.getComponentCount() - 1; i >= 0; i--) { - Component child = c.getComponent(i); - if (child instanceof JComponent) { - disableDefaultActionsInBeenTreeViews((JComponent) child); - } - } - } - - protected boolean enable(BpelEntity[] bpelEntities) { if (!super.enable(bpelEntities)) { return false; Index: netbeans/modules/bpel/properties/Util.java =================================================================== RCS file: /cvs/enterprise/bpel/editors/src/org/netbeans/modules/bpel/properties/Attic/Util.java,v retrieving revision 1.1.2.25 diff -u -r1.1.2.25 Util.java --- netbeans/modules/bpel/properties/Util.java 25 Sep 2006 06:57:05 -0000 1.1.2.25 +++ netbeans/modules/bpel/properties/Util.java 9 Oct 2006 12:39:43 -0000 @@ -43,6 +43,7 @@ import org.netbeans.modules.xml.xam.ModelSource; import org.openide.DialogDescriptor; import org.openide.awt.Mnemonics; +import org.openide.explorer.view.BeanTreeView; import org.openide.filesystems.FileObject; import org.openide.filesystems.FileUtil; import org.openide.util.HelpCtx; @@ -442,4 +443,16 @@ } } + public static void disableDefaultActionsInBeenTreeViews(Component comp) { + if (comp instanceof BeanTreeView) { + ((BeanTreeView)comp).setDefaultActionAllowed(false); + return; + } + if (comp instanceof Container) { + for (Component child : ((Container)comp).getComponents()) { + disableDefaultActionsInBeenTreeViews(child); + } + } + } + } Index: netbeans/modules/bpel/properties/editors/CorrelationPropertyMainPanel.java =================================================================== RCS file: /cvs/enterprise/bpel/editors/src/org/netbeans/modules/bpel/properties/editors/Attic/CorrelationPropertyMainPanel.java,v retrieving revision 1.1.2.9 diff -u -r1.1.2.9 CorrelationPropertyMainPanel.java --- netbeans/modules/bpel/properties/editors/CorrelationPropertyMainPanel.java 29 Sep 2006 11:56:08 -0000 1.1.2.9 +++ netbeans/modules/bpel/properties/editors/CorrelationPropertyMainPanel.java 9 Oct 2006 12:39:44 -0000 @@ -114,6 +114,7 @@ bindControls2PropertyNames(); // ((EditorLifeCycle)pnlTypeChooser).createContent(); + Util.disableDefaultActionsInBeenTreeViews(pnlTypeChooser); // myEditor.getValidStateManager().addValidStateListener( new ValidStateListener() { Index: netbeans/modules/bpel/properties/editors/PropertyAliasMainPanel2.java =================================================================== RCS file: /cvs/enterprise/bpel/editors/src/org/netbeans/modules/bpel/properties/editors/Attic/PropertyAliasMainPanel2.java,v retrieving revision 1.1.2.11 diff -u -r1.1.2.11 PropertyAliasMainPanel2.java --- netbeans/modules/bpel/properties/editors/PropertyAliasMainPanel2.java 29 Sep 2006 11:38:42 -0000 1.1.2.11 +++ netbeans/modules/bpel/properties/editors/PropertyAliasMainPanel2.java 9 Oct 2006 12:39:44 -0000 @@ -192,10 +192,9 @@ }; // btnBrowseProp.addActionListener(listener); - - // ((EditorLifeCycle)pnlTypeChooser).createContent(); + Util.disableDefaultActionsInBeenTreeViews(pnlTypeChooser); // myEditor.getValidStateManager().addValidStateListener( new ValidStateListener() { Index: netbeans/modules/bpel/properties/editors/VariableMainPanel.java =================================================================== RCS file: /cvs/enterprise/bpel/editors/src/org/netbeans/modules/bpel/properties/editors/Attic/VariableMainPanel.java,v retrieving revision 1.1.2.20 diff -u -r1.1.2.20 VariableMainPanel.java --- netbeans/modules/bpel/properties/editors/VariableMainPanel.java 6 Sep 2006 16:43:46 -0000 1.1.2.20 +++ netbeans/modules/bpel/properties/editors/VariableMainPanel.java 9 Oct 2006 12:39:44 -0000 @@ -26,6 +26,7 @@ import org.netbeans.modules.bpel.model.api.references.SchemaReference; import org.netbeans.modules.bpel.model.api.references.WSDLReference; import org.netbeans.modules.bpel.properties.TypeContainer; +import org.netbeans.modules.bpel.properties.Util; import org.netbeans.modules.bpel.properties.choosers.TypeChooserPanel; import org.netbeans.modules.bpel.properties.editors.controls.CustomNodeEditor; import org.netbeans.modules.bpel.properties.editors.controls.EditorLifeCycle; @@ -91,6 +92,7 @@ bindControls2PropertyNames(); // ((EditorLifeCycle)pnlTypeChooser).createContent(); + Util.disableDefaultActionsInBeenTreeViews(pnlTypeChooser); // myEditor.getValidStateManager().addValidStateListener( new ValidStateListener() { Index: netbeans/modules/bpel/properties/props/editors/FaultNamePropertyCustomizer.java =================================================================== RCS file: /cvs/enterprise/bpel/editors/src/org/netbeans/modules/bpel/properties/props/editors/Attic/FaultNamePropertyCustomizer.java,v retrieving revision 1.1.2.17 diff -u -r1.1.2.17 FaultNamePropertyCustomizer.java --- netbeans/modules/bpel/properties/props/editors/FaultNamePropertyCustomizer.java 19 Sep 2006 11:58:02 -0000 1.1.2.17 +++ netbeans/modules/bpel/properties/props/editors/FaultNamePropertyCustomizer.java 9 Oct 2006 12:39:44 -0000 @@ -80,11 +80,9 @@ this(); myLookup = lookup; } - + public FaultNamePropertyCustomizer() { - initComponents(); createContent(); - getChooserPanel().createContent(); } public void init(PropertyEnv propertyEnv, PropertyEditor propertyEditor) { @@ -111,14 +109,16 @@ // Expand the "WSDL Faults" node Node root = getChooserPanel().getExplorerManager().getRootContext(); Node wsdlFilesNode = NodeUtils.findFirstNode( - NodeType.WSDL_FILES_FOLDER, + NodeType.WSDL_FILES_FOLDER, CategoryFolderNode.class, root, 2); if (wsdlFilesNode != null) { getChooserPanel().getTreeView().expandNode(wsdlFilesNode); } } - + public void createContent() { + initComponents(); + // ActionListener timerListener = new ActionListener() { public void actionPerformed(ActionEvent e) { setFaultName(calculateFaultNameFromText(), e.getSource()); @@ -211,6 +211,9 @@ } }); // + getChooserPanel().createContent(); + Util.disableDefaultActionsInBeenTreeViews(getChooserPanel()); + // Util.activateInlineMnemonics(this); // HelpCtx.setHelpIDString(this, this.getClass().getName()); @@ -292,7 +295,7 @@ public boolean doFastValidation() { /* issue 85149 No way to clear the Fault Name field in Reply editor QName currFaultName = getFaultName(); - + if (currFaultName == null) { addReasonKey("ERR_FAULT_NOT_SPECIFIED"); // NOI18N return false; @@ -309,7 +312,7 @@ return false; } } -*/ + */ return true; } }; @@ -321,15 +324,15 @@ public void setDescriptor(NodeChooserDescriptor descriptor) { } - + public boolean unsubscribeListeners() { return true; } - + public boolean subscribeListeners() { return true; } - + public boolean initControls() { Lookup lookup = getLookup(); // @@ -367,11 +370,11 @@ // return true; } - + public Object getSelectedValue() { return getFaultName(); } - + public void setSelectedValue(Object newValue) { if (newValue != null && newValue instanceof QName) { setFaultName((QName)newValue, null); @@ -381,7 +384,7 @@ // getValidator().revalidate(true); } - + public Lookup getLookup() { if (myLookup != null) { // This used by chooser @@ -395,7 +398,7 @@ } return null; } - + public boolean afterClose() { return true; } Index: netbeans/modules/bpel/properties/props/editors/TreeChooserPropertyCustomizer.java =================================================================== RCS file: /cvs/enterprise/bpel/editors/src/org/netbeans/modules/bpel/properties/props/editors/Attic/TreeChooserPropertyCustomizer.java,v retrieving revision 1.1.2.4 diff -u -r1.1.2.4 TreeChooserPropertyCustomizer.java --- netbeans/modules/bpel/properties/props/editors/TreeChooserPropertyCustomizer.java 28 Aug 2006 14:35:35 -0000 1.1.2.4 +++ netbeans/modules/bpel/properties/props/editors/TreeChooserPropertyCustomizer.java 9 Oct 2006 12:39:44 -0000 @@ -45,8 +45,10 @@ protected TreeChooserPropertyCustomizer() { initComponents(); - getChooserPanel().createContent(); + T pnlChooser = getChooserPanel(); + pnlChooser.createContent(); // + Util.disableDefaultActionsInBeenTreeViews(pnlChooser); Util.activateInlineMnemonics(this); }