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 135985
Collapse All | Expand All

(-)a/editor.macros/src/org/netbeans/modules/editor/macros/storage/ui/MacrosPanel.form (+3 lines)
Lines 9-14 Link Here
9
      <ResourceString bundle="org/netbeans/modules/editor/macros/storage/ui/Bundle.properties" key="AD_MacrosPanel" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
9
      <ResourceString bundle="org/netbeans/modules/editor/macros/storage/ui/Bundle.properties" key="AD_MacrosPanel" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
10
    </Property>
10
    </Property>
11
  </AccessibilityProperties>
11
  </AccessibilityProperties>
12
  <SyntheticProperties>
13
    <SyntheticProperty name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,50,0,0,1,-26"/>
14
  </SyntheticProperties>
12
  <AuxValues>
15
  <AuxValues>
13
    <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="0"/>
16
    <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="0"/>
14
    <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
17
    <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
(-)a/editor.macros/src/org/netbeans/modules/editor/macros/storage/ui/MacrosPanel.java (-1 / +15 lines)
Lines 42-47 Link Here
42
42
43
import java.awt.Color;
43
import java.awt.Color;
44
import java.awt.Component;
44
import java.awt.Component;
45
import java.awt.event.KeyAdapter;
46
import java.awt.event.KeyEvent;
45
import java.util.Collections;
47
import java.util.Collections;
46
import java.util.Iterator;
48
import java.util.Iterator;
47
import java.util.List;
49
import java.util.List;
Lines 114-119 Link Here
114
                tMacrosTableChanged(evt);
116
                tMacrosTableChanged(evt);
115
            }
117
            }
116
        });
118
        });
119
120
        // Fix for #135985
121
        tMacros.addKeyListener(new KeyAdapter() {
122
            @Override
123
            public void keyPressed(KeyEvent e) {
124
                if( KeyEvent.VK_ENTER == e.getKeyCode()) {
125
                    epMacroCode.requestFocusInWindow();
126
                    e.consume();
127
                }
128
            }
129
        });
117
        
130
        
118
        epMacroCode.setEnabled(false);
131
        epMacroCode.setEnabled(false);
119
        epMacroCode.setEditorKit(JEditorPane.createEditorKitForContentType("text/plain")); //NOI18N
132
        epMacroCode.setEditorKit(JEditorPane.createEditorKitForContentType("text/plain")); //NOI18N
Lines 311-317 Link Here
311
            epMacroCode.setText(model.getMacroByIndex(index).getCode()); //NOI18N
324
            epMacroCode.setText(model.getMacroByIndex(index).getCode()); //NOI18N
312
            epMacroCode.getCaret().setDot(0);
325
            epMacroCode.getCaret().setDot(0);
313
            epMacroCode.setEnabled(true);
326
            epMacroCode.setEnabled(true);
314
            epMacroCode.requestFocusInWindow();
327
            // Fix for #135985 commented to avoid focus
328
            //epMacroCode.requestFocusInWindow();
315
            bRemove.setEnabled(true);
329
            bRemove.setEnabled(true);
316
            bSetShortcut.setEnabled(true);
330
            bSetShortcut.setEnabled(true);
317
        }
331
        }

Return to bug 135985