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

(-)ide/golden/deps.txt (+2 lines)
Lines 3221-3226 Link Here
3221
  REQUIRES org.netbeans.modules.httpserver/2 (ide)
3221
  REQUIRES org.netbeans.modules.httpserver/2 (ide)
3222
MODULE org.netbeans.spi.debugger.ui/1 (ide)
3222
MODULE org.netbeans.spi.debugger.ui/1 (ide)
3223
  REQUIRES org.netbeans.api.debugger/1 (ide)
3223
  REQUIRES org.netbeans.api.debugger/1 (ide)
3224
  REQUIRES org.netbeans.modules.projectapi/1 (ide)
3225
  REQUIRES org.netbeans.modules.projectuiapi/1 (ide)
3224
  REQUIRES org.netbeans.spi.viewmodel/2 (ide)
3226
  REQUIRES org.netbeans.spi.viewmodel/2 (ide)
3225
  REQUIRES org.openide.awt (platform)
3227
  REQUIRES org.openide.awt (platform)
3226
  REQUIRES org.openide.dialogs (platform)
3228
  REQUIRES org.openide.dialogs (platform)
(-)projects/projectui/src/org/netbeans/modules/project/ui/actions/Actions.java (-31 lines)
Lines 275-291 Link Here
275
        return a;
275
        return a;
276
    }
276
    }
277
    
277
    
278
    public static Action debugSingle() {
279
        Action a = new FileCommandAction (
280
            "debug.single", // XXX Define standard
281
            NbBundle.getMessage(Actions.class, "LBL_DebugSingleAction_Name"), // NOI18N
282
            new ImageIcon( Utilities.loadImage( "org/netbeans/modules/project/ui/resources/debugSingle.png" ) ), //NOI18N
283
            null);
284
        a.putValue("iconBase","org/netbeans/modules/project/ui/resources/debugSingle.png"); //NOI18N
285
        a.putValue("noIconInMenu", Boolean.TRUE); //NOI18N
286
        return a;
287
    }
288
    
289
    public static Action testSingle() {
278
    public static Action testSingle() {
290
        Action a = new FileCommandAction (
279
        Action a = new FileCommandAction (
291
            "test.single", // XXX Define standard
280
            "test.single", // XXX Define standard
Lines 297-313 Link Here
297
        return a;
286
        return a;
298
    }
287
    }
299
    
288
    
300
    public static Action debugTestSingle()  {
301
        Action a = new FileCommandAction (
302
            "debug.test.single", // XXX Define standard
303
            NbBundle.getMessage(Actions.class, "LBL_DebugTestSingleAction_Name" ),// NOI18N
304
            new ImageIcon( Utilities.loadImage( "org/netbeans/modules/project/ui/resources/debugTestSingle.png" ) ), //NOI18N
305
            null ); //NOI18N
306
        a.putValue("iconBase","org/netbeans/modules/project/ui/resources/debugTestSingle.png"); //NOI18N
307
        a.putValue("noIconInMenu", Boolean.TRUE); //NOI18N
308
        return a;
309
    }
310
        
311
    // Main Project actions ----------------------------------------------------
289
    // Main Project actions ----------------------------------------------------
312
    
290
    
313
    
291
    
Lines 347-361 Link Here
347
        return a;
325
        return a;
348
    }
326
    }
349
    
327
    
350
    public static Action debugMainProject() {
351
        Action a = new MainProjectAction(
352
            ActionProvider.COMMAND_DEBUG, 
353
            NbBundle.getMessage(Actions.class, "LBL_DebugMainProjectAction_Name" ), // NOI18N
354
            new ImageIcon( Utilities.loadImage( "org/netbeans/modules/project/ui/resources/debugProject.png" ) ) ); //NOI18N
355
        a.putValue("iconBase","org/netbeans/modules/project/ui/resources/debugProject.png"); //NOI18N
356
        return a;
357
    }
358
359
    public Action setProjectConfigurationAction() {
328
    public Action setProjectConfigurationAction() {
360
        return SystemAction.get(ActiveConfigAction.class);
329
        return SystemAction.get(ActiveConfigAction.class);
361
    }
330
    }
(-)projects/projectui/src/org/netbeans/modules/project/ui/actions/Bundle.properties (-5 lines)
Lines 60-66 Link Here
60
LBL_RenameProjectAction_Name=Rename Project
60
LBL_RenameProjectAction_Name=Rename Project
61
61
62
LBL_RunProjectAction_Name=Run {0,choice,0#Project|1#"{1}" Project|1<{0} Projects}
62
LBL_RunProjectAction_Name=Run {0,choice,0#Project|1#"{1}" Project|1<{0} Projects}
63
LBL_DebugProjectAction_Name=Run {0,choice,0#Project|1#"{1}" Project|1<{0} Projects} in Debugger
64
63
65
# Names of main project actions
64
# Names of main project actions
66
LBL_BuildMainProjectAction_Name=&Build Main Project
65
LBL_BuildMainProjectAction_Name=&Build Main Project
Lines 69-81 Link Here
69
LBL_RunMainProjectAction_Name=&Run Main Project
68
LBL_RunMainProjectAction_Name=&Run Main Project
70
LBL_SetMainProjectAction_Name=Set Main Project
69
LBL_SetMainProjectAction_Name=Set Main Project
71
MNE_SetMainProjectAction_Name=M
70
MNE_SetMainProjectAction_Name=M
72
LBL_DebugMainProjectAction_Name=&Debug Main Project
73
71
74
LBL_RunSingleAction_Name=Run {0,choice,0#File|1#"{1}"|1<Files}
72
LBL_RunSingleAction_Name=Run {0,choice,0#File|1#"{1}"|1<Files}
75
LBL_DebugSingleAction_Name=Debug {0,choice,0#File|1#"{1}"|1<Files}
76
LBL_TestSingleAction_Name=Test {0,choice,0#File|1#"{1}"|1<Files}
73
LBL_TestSingleAction_Name=Test {0,choice,0#File|1#"{1}"|1<Files}
77
LBL_DebugTestSingleAction_Name=Debug Test for {0,choice,0#File|1#"{1}"|1<Files}
78
LBL_DebugFixAction_Name=Fix
79
74
80
# OpenProject.java
75
# OpenProject.java
81
MSG_notProjectDir=Directory does not contain any project.
76
MSG_notProjectDir=Directory does not contain any project.
(-)projects/projectui/src/org/netbeans/modules/project/ui/resources/layer.xml (-62 / +4 lines)
Lines 72-81 Link Here
72
                <attr name="instanceCreate" methodvalue="org.netbeans.modules.project.ui.actions.Actions.runMainProject"/>
72
                <attr name="instanceCreate" methodvalue="org.netbeans.modules.project.ui.actions.Actions.runMainProject"/>
73
            </file>
73
            </file>
74
            
74
            
75
            <file name="org-netbeans-modules-project-ui-DebugMainProject.instance">
76
                <attr name="instanceCreate" methodvalue="org.netbeans.modules.project.ui.actions.Actions.debugMainProject"/>
77
            </file>
78
            
79
            <!-- Current project -->            
75
            <!-- Current project -->            
80
            <file name="org-netbeans-modules-project-ui-TestProject.instance">
76
            <file name="org-netbeans-modules-project-ui-TestProject.instance">
81
                <attr name="instanceCreate" methodvalue="org.netbeans.modules.project.ui.actions.Actions.testProject"/>
77
                <attr name="instanceCreate" methodvalue="org.netbeans.modules.project.ui.actions.Actions.testProject"/>
Lines 110-127 Link Here
110
                <attr name="instanceCreate" methodvalue="org.netbeans.modules.project.ui.actions.Actions.runSingle"/>
106
                <attr name="instanceCreate" methodvalue="org.netbeans.modules.project.ui.actions.Actions.runSingle"/>
111
            </file>
107
            </file>
112
            
108
            
113
            <file name="org-netbeans-modules-project-ui-DebugSingle.instance">
114
                <attr name="instanceCreate" methodvalue="org.netbeans.modules.project.ui.actions.Actions.debugSingle"/>
115
            </file>
116
            
117
            <file name="org-netbeans-modules-project-ui-TestSingle.instance">
109
            <file name="org-netbeans-modules-project-ui-TestSingle.instance">
118
                <attr name="instanceCreate" methodvalue="org.netbeans.modules.project.ui.actions.Actions.testSingle"/>
110
                <attr name="instanceCreate" methodvalue="org.netbeans.modules.project.ui.actions.Actions.testSingle"/>
119
            </file>
111
            </file>
120
            
112
            
121
            <file name="org-netbeans-modules-project-ui-DebugTestSingle.instance">
122
                <attr name="instanceCreate" methodvalue="org.netbeans.modules.project.ui.actions.Actions.debugTestSingle"/>
123
            </file>
124
                                    
125
            <!-- Project tabs opening -->
113
            <!-- Project tabs opening -->
126
            <file name="org-netbeans-modules-project-ui-logical-tab-action.instance">
114
            <file name="org-netbeans-modules-project-ui-logical-tab-action.instance">
127
                <attr name="instanceCreate" methodvalue="org.netbeans.modules.project.ui.ProjectTabAction.projectsLogical"/>
115
                <attr name="instanceCreate" methodvalue="org.netbeans.modules.project.ui.ProjectTabAction.projectsLogical"/>
Lines 411-423 Link Here
411
                <attr name="originalFile" stringvalue="Actions/Project/org-netbeans-modules-project-ui-RunMainProject.instance"/>
399
                <attr name="originalFile" stringvalue="Actions/Project/org-netbeans-modules-project-ui-RunMainProject.instance"/>
412
            </file>
400
            </file>
413
            
401
            
414
            <attr name="org-netbeans-modules-project-ui-RunMainProject.shadow/org-netbeans-modules-project-ui-DebugMainProject.shadow" boolvalue="true" />                
402
            <attr name="org-netbeans-modules-project-ui-RunMainProject.shadow/org-netbeans-modules-project-ui-TestProject.shadow" boolvalue="true" />                             
415
            
416
            <file name="org-netbeans-modules-project-ui-DebugMainProject.shadow">
417
                <attr name="originalFile" stringvalue="Actions/Project/org-netbeans-modules-project-ui-DebugMainProject.instance"/>
418
            </file>
419
           
420
            <attr name="org-netbeans-modules-project-ui-DebugMainProject.shadow/org-netbeans-modules-project-ui-TestProject.shadow" boolvalue="true" />                             
421
                
403
                
422
            <file name="org-netbeans-modules-project-ui-TestProject.shadow">
404
            <file name="org-netbeans-modules-project-ui-TestProject.shadow">
423
                    <attr name="originalFile" stringvalue="Actions/Project/org-netbeans-modules-project-ui-TestProject.instance"/>
405
                    <attr name="originalFile" stringvalue="Actions/Project/org-netbeans-modules-project-ui-TestProject.instance"/>
Lines 434-456 Link Here
434
                    <attr name="originalFile" stringvalue="Actions/Project/org-netbeans-modules-project-ui-RunSingle.instance"/>
416
                    <attr name="originalFile" stringvalue="Actions/Project/org-netbeans-modules-project-ui-RunSingle.instance"/>
435
                </file>
417
                </file>
436
418
437
                <attr name="org-netbeans-modules-project-ui-RunSingle.shadow/org-netbeans-modules-project-ui-DebugSingle.shadow" boolvalue="true" />
419
                <attr name="org-netbeans-modules-project-ui-RunSingle.shadow/org-netbeans-modules-project-ui-TestSingle.shadow" boolvalue="true" />                
438
439
                <file name="org-netbeans-modules-project-ui-DebugSingle.shadow">
440
                    <attr name="originalFile" stringvalue="Actions/Project/org-netbeans-modules-project-ui-DebugSingle.instance"/>
441
                </file>
442
443
                <attr name="org-netbeans-modules-project-ui-DebugSingle.instance/org-netbeans-modules-project-ui-TestSingle.shadow" boolvalue="true" />                
444
                <file name="org-netbeans-modules-project-ui-TestSingle.shadow">
420
                <file name="org-netbeans-modules-project-ui-TestSingle.shadow">
445
                    <attr name="originalFile" stringvalue="Actions/Project/org-netbeans-modules-project-ui-TestSingle.instance"/>
421
                    <attr name="originalFile" stringvalue="Actions/Project/org-netbeans-modules-project-ui-TestSingle.instance"/>
446
                </file>
422
                </file>
447
448
449
                <attr name="org-netbeans-modules-project-ui-TestSingle.shadow/org-netbeans-modules-project-ui-DebugTestSingle.shadow" boolvalue="true" />                
450
                <file name="org-netbeans-modules-project-ui-DebugTestSingle.shadow">
451
                    <attr name="originalFile" stringvalue="Actions/Project/org-netbeans-modules-project-ui-DebugTestSingle.instance"/>
452
                </file>
453
454
            
423
            
455
           </folder>     
424
           </folder>     
456
425
Lines 532-543 Link Here
532
                <attr name="originalFile" stringvalue="Actions/Project/org-netbeans-modules-project-ui-RunMainProject.instance"/>
501
                <attr name="originalFile" stringvalue="Actions/Project/org-netbeans-modules-project-ui-RunMainProject.instance"/>
533
            </file>
502
            </file>
534
503
535
            <attr name="org-netbeans-modules-project-ui-RunMainProject.shadow/org-netbeans-modules-project-ui-DebugMainProject.shadow" boolvalue="true"/>
536
537
            <file name="org-netbeans-modules-project-ui-DebugMainProject.shadow">
538
                <attr name="originalFile" stringvalue="Actions/Project/org-netbeans-modules-project-ui-DebugMainProject.instance"/>
539
            </file>
540
    
541
        </folder>
504
        </folder>
542
                
505
                
543
    </folder>
506
    </folder>
Lines 580-589 Link Here
580
            <attr name="originalFile" stringvalue="Actions/Project/org-netbeans-modules-project-ui-RunMainProject.instance"/>
543
            <attr name="originalFile" stringvalue="Actions/Project/org-netbeans-modules-project-ui-RunMainProject.instance"/>
581
	</file>
544
	</file>
582
                
545
                
583
        <file name="F5.shadow">
584
            <attr name="originalFile" stringvalue="Actions/Project/org-netbeans-modules-project-ui-DebugMainProject.instance"/>
585
	</file>
586
                     
587
        <file name="O-F6.shadow">
546
        <file name="O-F6.shadow">
588
            <attr name="originalFile" stringvalue="Actions/Project/org-netbeans-modules-project-ui-TestProject.instance"/>
547
            <attr name="originalFile" stringvalue="Actions/Project/org-netbeans-modules-project-ui-TestProject.instance"/>
589
	</file> 
548
	</file> 
Lines 592-609 Link Here
592
            <attr name="originalFile" stringvalue="Actions/Project/org-netbeans-modules-project-ui-RunSingle.instance"/>
551
            <attr name="originalFile" stringvalue="Actions/Project/org-netbeans-modules-project-ui-RunSingle.instance"/>
593
	</file>
552
	</file>
594
        
553
        
595
        <file name="DS-F5.shadow">
596
            <attr name="originalFile" stringvalue="Actions/Project/org-netbeans-modules-project-ui-DebugSingle.instance"/>
597
	</file>
598
        
599
        <file name="D-F6.shadow">
554
        <file name="D-F6.shadow">
600
            <attr name="originalFile" stringvalue="Actions/Project/org-netbeans-modules-project-ui-TestSingle.instance"/>
555
            <attr name="originalFile" stringvalue="Actions/Project/org-netbeans-modules-project-ui-TestSingle.instance"/>
601
	</file>
556
	</file>
602
        
557
        
603
        <file name="DS-F6.shadow">
604
            <attr name="originalFile" stringvalue="Actions/Project/org-netbeans-modules-project-ui-DebugTestSingle.instance"/>
605
	</file>
606
        
607
        <file name="F11.shadow">
558
        <file name="F11.shadow">
608
            <attr name="originalFile" stringvalue="Actions/Project/org-netbeans-modules-project-ui-BuildMainProject.instance"/>
559
            <attr name="originalFile" stringvalue="Actions/Project/org-netbeans-modules-project-ui-BuildMainProject.instance"/>
609
	</file>
560
	</file>
Lines 623-634 Link Here
623
                    <file name="org-netbeans-modules-project-ui-RunSingle.shadow">
574
                    <file name="org-netbeans-modules-project-ui-RunSingle.shadow">
624
                        <attr name="originalFile" stringvalue="Actions/Project/org-netbeans-modules-project-ui-RunSingle.instance"/>
575
                        <attr name="originalFile" stringvalue="Actions/Project/org-netbeans-modules-project-ui-RunSingle.instance"/>
625
                    </file>
576
                    </file>
626
                    <attr name="org-netbeans-modules-project-ui-RunSingle.shadow/org-netbeans-modules-project-ui-DebugSingle.shadow" boolvalue="true"/>
577
                    <attr name="org-netbeans-modules-project-ui-RunSingle.shadow/SeparatorBeforeCut.instance" boolvalue="true"/>
627
                    <file name="org-netbeans-modules-project-ui-DebugSingle.shadow">
628
                        <attr name="originalFile" stringvalue="Actions/Project/org-netbeans-modules-project-ui-DebugSingle.instance"/>
629
                    </file>
630
                    <attr name="org-netbeans-modules-project-ui-DebugSingle.shadow/SeparatorBeforeCut.instance" boolvalue="true"/>
631
                    <attr name="org-netbeans-modules-project-ui-DebugSingle.shadow/org-netbeans-modules-debugger-ui-actions-RunIntoMethodAction.shadow" boolvalue="true"/>
632
                </folder>
578
                </folder>
633
            </folder>
579
            </folder>
634
        </folder>
580
        </folder>
Lines 704-714 Link Here
704
        <file name="org-netbeans-modules-project-ui-RunMainProject.shadow">
650
        <file name="org-netbeans-modules-project-ui-RunMainProject.shadow">
705
            <attr name="originalFile" stringvalue="Actions/Project/org-netbeans-modules-project-ui-RunMainProject.instance"/>
651
            <attr name="originalFile" stringvalue="Actions/Project/org-netbeans-modules-project-ui-RunMainProject.instance"/>
706
        </file>
652
        </file>
707
        <attr name="org-netbeans-modules-project-ui-RunMainProject.shadow/org-netbeans-modules-project-ui-DebugMainProject.shadow" boolvalue="true"/>
653
        <attr name="org-netbeans-modules-project-ui-RunMainProject.shadow/sep-4.instance" boolvalue="true"/>
708
        <file name="org-netbeans-modules-project-ui-DebugMainProject.shadow">
709
            <attr name="originalFile" stringvalue="Actions/Project/org-netbeans-modules-project-ui-DebugMainProject.instance"/>
710
        </file>
711
        <attr name="org-netbeans-modules-project-ui-DebugMainProject.shadow/sep-4.instance" boolvalue="true"/>
712
        <file name="sep-4.instance">
654
        <file name="sep-4.instance">
713
            <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
655
            <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
714
        </file>
656
        </file>
(-)debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/resources/mf-layer.xml (+7 lines)
Lines 35-40 Link Here
35
                    </file>
35
                    </file>
36
                </folder>
36
                </folder>
37
                <folder name="Popup">
37
                <folder name="Popup">
38
                    <attr name="org-netbeans-modules-project-ui-RunSingle.shadow/org-netbeans-modules-debugger-ui-actions-DebugFileAction.shadow" boolvalue="true"/>
39
                    <file name="org-netbeans-modules-debugger-ui-actions-DebugFileAction.shadow">
40
                        <attr name="originalFile" stringvalue="Actions/Debug/org-netbeans-modules-debugger-ui-actions-DebugFileAction.instance"/>
41
                    </file>
42
                    <attr name="org-netbeans-modules-debugger-ui-actions-DebugFileAction.shadow/SeparatorBeforeCut.instance" boolvalue="true"/>
43
                    <attr name="org-netbeans-modules-debugger-ui-actions-DebugFileAction.shadow/org-netbeans-modules-debugger-ui-actions-RunIntoMethodAction.shadow" boolvalue="true"/>
44
                    
38
                    <file name="SeparatorAfterFormat.instance">
45
                    <file name="SeparatorAfterFormat.instance">
39
			<attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
46
			<attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
40
                    </file>
47
                    </file>
(-)debuggercore/src/org/netbeans/modules/debugger/resources/mf-layer.xml (+54 lines)
Lines 106-111 Link Here
106
                <attr name="instanceOf" stringvalue="javax.swing.Action"/>
106
                <attr name="instanceOf" stringvalue="javax.swing.Action"/>
107
            </file>    
107
            </file>    
108
108
109
            <file name="org-netbeans-modules-debugger-ui-actions-DebugMainProjectAction.instance" />
110
            <file name="org-netbeans-modules-debugger-ui-actions-DebugFileAction.instance">
111
                <attr name="instanceCreate" methodvalue="org.netbeans.modules.debugger.ui.actions.DebuggerAction.createDebugFileAction"/>
112
            </file>
113
            <file name="org-netbeans-modules-debugger-ui-actions-DebugTestFileAction.instance">
114
                <attr name="instanceCreate" methodvalue="org.netbeans.modules.debugger.ui.actions.DebuggerAction.createDebugTestFileAction"/>
115
            </file>
116
            
109
            <file name="org-netbeans-modules-debugger-ui-actions-ConnectAction.instance" />
117
            <file name="org-netbeans-modules-debugger-ui-actions-ConnectAction.instance" />
110
            <file name="org-netbeans-modules-debugger-ui-actions-AddBreakpointAction.instance" />
118
            <file name="org-netbeans-modules-debugger-ui-actions-AddBreakpointAction.instance" />
111
            <file name="org-netbeans-modules-debugger-ui-actions-PauseAction.instance">
119
            <file name="org-netbeans-modules-debugger-ui-actions-PauseAction.instance">
Lines 138-143 Link Here
138
    </folder>
146
    </folder>
139
    
147
    
140
    <folder name="Menu">
148
    <folder name="Menu">
149
        <folder name="RunProject">
150
            <attr name="org-netbeans-modules-project-ui-RunMainProject.shadow/org-netbeans-modules-debugger-ui-actions-DebugMainProjectAction.shadow" boolvalue="true" />
151
            <file name="org-netbeans-modules-debugger-ui-actions-DebugMainProjectAction.shadow">
152
                <attr name="originalFile" stringvalue="Actions/Debug/org-netbeans-modules-debugger-ui-actions-DebugMainProjectAction.instance"/>
153
            </file>
154
            <attr name="org-netbeans-modules-debugger-ui-actions-DebugMainProjectAction.shadow/org-netbeans-modules-project-ui-TestProject.shadow" boolvalue="true" />
155
            
156
            <folder name="RunOther">
157
                <attr name="org-netbeans-modules-project-ui-RunSingle.shadow/org-netbeans-modules-debugger-ui-actions-DebugFileAction.shadow" boolvalue="true" />
158
                <file name="org-netbeans-modules-debugger-ui-actions-DebugFileAction.shadow">
159
                    <attr name="originalFile" stringvalue="Actions/Debug/org-netbeans-modules-debugger-ui-actions-DebugFileAction.instance"/>
160
                </file>
161
                <attr name="org-netbeans-modules-debugger-ui-actions-DebugFileAction.shadow/org-netbeans-modules-project-ui-TestSingle.shadow" boolvalue="true" />
162
                <attr name="org-netbeans-modules-project-ui-TestSingle.shadow/org-netbeans-modules-debugger-ui-actions-DebugTestFileAction.shadow" boolvalue="true" />
163
                <file name="org-netbeans-modules-debugger-ui-actions-DebugTestFileAction.shadow">
164
                    <attr name="originalFile" stringvalue="Actions/Debug/org-netbeans-modules-debugger-ui-actions-DebugTestFileAction.instance"/>
165
                </file>
166
            </folder>
167
        </folder>
168
        
141
        <folder name="Window">
169
        <folder name="Window">
142
            <attr name="Output/Debug" boolvalue="true" />
170
            <attr name="Output/Debug" boolvalue="true" />
143
            <attr name="Navigator/Debug" boolvalue="true" />
171
            <attr name="Navigator/Debug" boolvalue="true" />
Lines 179-186 Link Here
179
            <attr name="Debug/Separator3.instance" boolvalue="true" />
207
            <attr name="Debug/Separator3.instance" boolvalue="true" />
180
        </folder>
208
        </folder>
181
    </folder>
209
    </folder>
210
    
211
    <folder name="ProjectsTabActions">
212
        <attr name="org-netbeans-modules-project-ui-RunMainProject.shadow/org-netbeans-modules-debugger-ui-actions-DebugMainProjectAction.shadow" boolvalue="true"/>
213
        <file name="org-netbeans-modules-debugger-ui-actions-DebugMainProjectAction.shadow">
214
            <attr name="originalFile" stringvalue="Actions/Debug/org-netbeans-modules-debugger-ui-actions-DebugMainProjectAction.instance"/>
215
        </file>
216
        <attr name="org-netbeans-modules-debugger-ui-actions-DebugMainProjectAction.shadow/sep-4.instance" boolvalue="true"/>
217
    </folder>
182
218
183
    <folder name="Shortcuts">
219
    <folder name="Shortcuts">
220
        <file name="F5.shadow">
221
            <attr name="originalFile" stringvalue="Actions/Debug/org-netbeans-modules-debugger-ui-actions-DebugMainProjectAction.instance"/>
222
	</file>
223
        <file name="DS-F5.shadow">
224
            <attr name="originalFile" stringvalue="Actions/Debug/org-netbeans-modules-debugger-ui-actions-DebugFileAction.instance"/>
225
	</file>
226
        <file name="DS-F6.shadow">
227
            <attr name="originalFile" stringvalue="Actions/Debug/org-netbeans-modules-debugger-ui-actions-DebugTestFileAction.instance"/>
228
	</file>
184
        <file name="SO-6.shadow">
229
        <file name="SO-6.shadow">
185
            <attr name="originalFile" stringvalue="Actions/Window/Debug/org-netbeans-modules-debugger-ui-actions-SessionsViewAction.instance"/>
230
            <attr name="originalFile" stringvalue="Actions/Window/Debug/org-netbeans-modules-debugger-ui-actions-SessionsViewAction.instance"/>
186
        </file>
231
        </file>
Lines 280-286 Link Here
280
        </folder>
325
        </folder>
281
326
282
    </folder>
327
    </folder>
328
    
329
    <folder name="Toolbars">
330
        <folder name="Build">
331
            <attr name="org-netbeans-modules-project-ui-RunMainProject.shadow/org-netbeans-modules-debugger-ui-actions-DebugMainProjectAction.shadow" boolvalue="true"/>
283
332
333
            <file name="org-netbeans-modules-debugger-ui-actions-DebugMainProjectAction.shadow">
334
                <attr name="originalFile" stringvalue="Actions/Debug/org-netbeans-modules-debugger-ui-actions-DebugMainProjectAction.instance"/>
335
            </file>
336
        </folder>
337
    </folder>
284
       
338
       
285
    <folder name="Editors"> 
339
    <folder name="Editors"> 
286
        <folder name="AnnotationTypes">
340
        <folder name="AnnotationTypes">
(-)debuggercore/src/org/netbeans/modules/debugger/ui/actions/Bundle.properties (+8 lines)
Lines 30-35 Link Here
30
CTL_WatchesAction=&Watches
30
CTL_WatchesAction=&Watches
31
CTL_BreakpointsAction=&Breakpoints
31
CTL_BreakpointsAction=&Breakpoints
32
32
33
# DebugMainProjectAction
34
LBL_DebugMainProjectAction_Name=&Debug Main Project
35
LBL_DebugProjectAction_Name=Run {0,choice,0#Project|1#"{1}" Project|1<{0} Projects} in Debugger
36
37
# DebuggerAction
38
LBL_DebugSingleAction_Name=Debug {0,choice,0#File|1#"{1}"|1<Files}
39
LBL_DebugTestSingleAction_Name=Debug Test for {0,choice,0#File|1#"{1}"|1<Files}
40
33
41
34
#NewWatch
42
#NewWatch
35
CTL_New_Watch=New &Watch...
43
CTL_New_Watch=New &Watch...
(-)debuggercore/src/org/netbeans/modules/debugger/ui/actions/DebuggerAction.java (-1 / +28 lines)
Lines 24-38 Link Here
24
import java.lang.ref.WeakReference;
24
import java.lang.ref.WeakReference;
25
import javax.swing.AbstractAction;
25
import javax.swing.AbstractAction;
26
import javax.swing.Action;
26
import javax.swing.Action;
27
import javax.swing.ImageIcon;
27
import javax.swing.SwingUtilities;
28
import javax.swing.SwingUtilities;
28
import org.netbeans.api.debugger.ActionsManager;
29
29
30
import org.netbeans.api.debugger.ActionsManager;
30
import org.netbeans.api.debugger.ActionsManagerListener;
31
import org.netbeans.api.debugger.ActionsManagerListener;
31
import org.netbeans.api.debugger.DebuggerEngine;
32
import org.netbeans.api.debugger.DebuggerEngine;
32
import org.netbeans.api.debugger.DebuggerManager;
33
import org.netbeans.api.debugger.DebuggerManager;
33
import org.netbeans.api.debugger.DebuggerManagerAdapter;
34
import org.netbeans.api.debugger.DebuggerManagerAdapter;
35
34
import org.netbeans.modules.debugger.ui.Utils;
36
import org.netbeans.modules.debugger.ui.Utils;
37
38
import org.netbeans.spi.project.ui.support.FileSensitiveActions;
39
35
import org.openide.util.NbBundle;
40
import org.openide.util.NbBundle;
41
import org.openide.util.Utilities;
36
42
37
43
38
/**
44
/**
Lines 278-283 Link Here
278
        return action;
284
        return action;
279
    }
285
    }
280
    
286
    
287
    // Debug File Actions:
288
    
289
    public static Action createDebugFileAction() {
290
        Action a = FileSensitiveActions.fileCommandAction(
291
            "debug.single", // XXX Define standard
292
            NbBundle.getMessage(DebuggerAction.class, "LBL_DebugSingleAction_Name"), // NOI18N
293
            new ImageIcon( Utilities.loadImage( "org/netbeans/modules/debugger/resources/debugSingle.png" ) )); //NOI18N
294
        a.putValue("iconBase","org/netbeans/modules/debugger/resources/debugSingle.png"); //NOI18N
295
        a.putValue("noIconInMenu", Boolean.TRUE); //NOI18N
296
        return a;
297
    }
298
    
299
    public static Action createDebugTestFileAction()  {
300
        Action a = FileSensitiveActions.fileCommandAction(
301
            "debug.test.single", // XXX Define standard
302
            NbBundle.getMessage(DebuggerAction.class, "LBL_DebugTestSingleAction_Name" ),// NOI18N
303
            new ImageIcon( Utilities.loadImage( "org/netbeans/modules/debugger/resources/debugTestSingle.png" ) )); //NOI18N
304
        a.putValue("iconBase","org/netbeans/modules/debugger/resources/debugTestSingle.png"); //NOI18N
305
        a.putValue("noIconInMenu", Boolean.TRUE); //NOI18N
306
        return a;
307
    }
281
    
308
    
282
    // innerclasses ............................................................
309
    // innerclasses ............................................................
283
    
310
    
(-)debuggercore/nbproject/project.xml (-31 / +49 lines)
Lines 24-50 Link Here
24
            <code-name-base>org.netbeans.spi.debugger.ui</code-name-base>
24
            <code-name-base>org.netbeans.spi.debugger.ui</code-name-base>
25
            <module-dependencies>
25
            <module-dependencies>
26
                <dependency>
26
                <dependency>
27
                    <code-name-base>org.openide.util</code-name-base>
27
                    <code-name-base>org.netbeans.api.debugger</code-name-base>
28
                    <build-prerequisite/>
28
                    <build-prerequisite/>
29
                    <compile-dependency/>
29
                    <compile-dependency/>
30
                    <run-dependency>
30
                    <run-dependency>
31
                        <specification-version>6.2</specification-version>
31
                        <release-version>1</release-version>
32
                    </run-dependency>
32
                    </run-dependency>
33
                </dependency>
33
                </dependency>
34
                <dependency>
34
                <dependency>
35
                    <code-name-base>org.openide.modules</code-name-base>
35
                    <code-name-base>org.netbeans.modules.projectapi</code-name-base>
36
                    <build-prerequisite/>
36
                    <build-prerequisite/>
37
                    <compile-dependency/>
37
                    <compile-dependency/>
38
                    <run-dependency>
38
                    <run-dependency>
39
                        <specification-version>6.2</specification-version>
39
                        <release-version>1</release-version>
40
                        <specification-version>1.13</specification-version>
40
                    </run-dependency>
41
                    </run-dependency>
41
                </dependency>
42
                </dependency>
42
                <dependency>
43
                <dependency>
43
                    <code-name-base>org.openide.nodes</code-name-base>
44
                    <code-name-base>org.netbeans.modules.projectuiapi</code-name-base>
44
                    <build-prerequisite/>
45
                    <build-prerequisite/>
45
                    <compile-dependency/>
46
                    <compile-dependency/>
46
                    <run-dependency>
47
                    <run-dependency>
47
                        <specification-version>6.2</specification-version>
48
                        <release-version>1</release-version>
49
                        <specification-version>1.24</specification-version>
50
                    </run-dependency>
51
                </dependency>
52
                <dependency>
53
                    <code-name-base>org.netbeans.spi.viewmodel</code-name-base>
54
                    <build-prerequisite/>
55
                    <compile-dependency/>
56
                    <run-dependency>
57
                        <release-version>2</release-version>
48
                    </run-dependency>
58
                    </run-dependency>
49
                </dependency>
59
                </dependency>
50
                <dependency>
60
                <dependency>
Lines 64-70 Link Here
64
                    </run-dependency>
74
                    </run-dependency>
65
                </dependency>
75
                </dependency>
66
                <dependency>
76
                <dependency>
67
                    <code-name-base>org.openide.windows</code-name-base>
77
                    <code-name-base>org.openide.loaders</code-name-base>
78
                    <build-prerequisite/>
79
                    <compile-dependency/>
80
                    <run-dependency/>
81
                </dependency>
82
                <dependency>
83
                    <code-name-base>org.openide.modules</code-name-base>
68
                    <build-prerequisite/>
84
                    <build-prerequisite/>
69
                    <compile-dependency/>
85
                    <compile-dependency/>
70
                    <run-dependency>
86
                    <run-dependency>
Lines 72-78 Link Here
72
                    </run-dependency>
88
                    </run-dependency>
73
                </dependency>
89
                </dependency>
74
                <dependency>
90
                <dependency>
75
                    <code-name-base>org.openide.text</code-name-base>
91
                    <code-name-base>org.openide.nodes</code-name-base>
76
                    <build-prerequisite/>
92
                    <build-prerequisite/>
77
                    <compile-dependency/>
93
                    <compile-dependency/>
78
                    <run-dependency>
94
                    <run-dependency>
Lines 80-124 Link Here
80
                    </run-dependency>
96
                    </run-dependency>
81
                </dependency>
97
                </dependency>
82
                <dependency>
98
                <dependency>
83
                    <code-name-base>org.openide.loaders</code-name-base>
99
                    <code-name-base>org.openide.text</code-name-base>
84
                    <build-prerequisite/>
100
                    <build-prerequisite/>
85
                    <compile-dependency/>
101
                    <compile-dependency/>
86
                    <run-dependency/>
102
                    <run-dependency>
103
                        <specification-version>6.2</specification-version>
104
                    </run-dependency>
87
                </dependency>
105
                </dependency>
88
                <dependency>
106
                <dependency>
89
                    <code-name-base>org.netbeans.spi.viewmodel</code-name-base>
107
                    <code-name-base>org.openide.util</code-name-base>
90
                    <build-prerequisite/>
108
                    <build-prerequisite/>
91
                    <compile-dependency/>
109
                    <compile-dependency/>
92
                    <run-dependency>
110
                    <run-dependency>
93
                        <release-version>2</release-version>
111
                        <specification-version>6.2</specification-version>
94
                    </run-dependency>
112
                    </run-dependency>
95
                </dependency>
113
                </dependency>
96
                <dependency>
114
                <dependency>
97
                    <code-name-base>org.netbeans.api.debugger</code-name-base>
115
                    <code-name-base>org.openide.windows</code-name-base>
98
                    <build-prerequisite/>
116
                    <build-prerequisite/>
99
                    <compile-dependency/>
117
                    <compile-dependency/>
100
                    <run-dependency>
118
                    <run-dependency>
101
                        <release-version>1</release-version>
119
                        <specification-version>6.2</specification-version>
102
                    </run-dependency>
120
                    </run-dependency>
103
                </dependency>
121
                </dependency>
104
            </module-dependencies>
122
            </module-dependencies>
105
          <test-dependencies>
123
            <test-dependencies>
106
              <test-type>
124
                <test-type>
107
                  <name>unit</name>
125
                    <name>unit</name>
108
                  <test-dependency>
126
                    <test-dependency>
109
                      <code-name-base>org.netbeans.spi.debugger.ui</code-name-base>
127
                        <code-name-base>org.netbeans.spi.debugger.ui</code-name-base>
110
                      <recursive/>
128
                        <recursive/>
111
                      <compile-dependency/>
129
                        <compile-dependency/>
112
                  </test-dependency>
130
                    </test-dependency>
113
              </test-type>
131
                </test-type>
114
              <test-type>
132
                <test-type>
115
                  <name>qa-functional</name>
133
                    <name>qa-functional</name>
116
                  <test-dependency>
134
                    <test-dependency>
117
                      <code-name-base>org.netbeans.spi.debugger.ui</code-name-base>
135
                        <code-name-base>org.netbeans.spi.debugger.ui</code-name-base>
118
                      <recursive/>
136
                        <recursive/>
119
                      <compile-dependency/>
137
                        <compile-dependency/>
120
                  </test-dependency>
138
                    </test-dependency>
121
              </test-type>
139
                </test-type>
122
            </test-dependencies>
140
            </test-dependencies>
123
            <public-packages>
141
            <public-packages>
124
                <package>org.netbeans.spi.debugger.ui</package>
142
                <package>org.netbeans.spi.debugger.ui</package>

Return to bug 106539