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

(-)java/j2seproject/src/org/netbeans/modules/java/j2seproject/ui/J2SELogicalViewProvider.java (-11 / +13 lines)
Lines 481-486 Link Here
481
            actions.add(null);
481
            actions.add(null);
482
            actions.add(ProjectSensitiveActions.projectCommandAction(ActionProvider.COMMAND_RUN, bundle.getString("LBL_RunAction_Name"), null)); // NOI18N
482
            actions.add(ProjectSensitiveActions.projectCommandAction(ActionProvider.COMMAND_RUN, bundle.getString("LBL_RunAction_Name"), null)); // NOI18N
483
            actions.add(ProjectSensitiveActions.projectCommandAction(ActionProvider.COMMAND_DEBUG, bundle.getString("LBL_DebugAction_Name"), null)); // NOI18N
483
            actions.add(ProjectSensitiveActions.projectCommandAction(ActionProvider.COMMAND_DEBUG, bundle.getString("LBL_DebugAction_Name"), null)); // NOI18N
484
            addFromLayers(actions, "Projects/Profiler_Actions_temporary"); //NOI18N
484
            actions.add(ProjectSensitiveActions.projectCommandAction(ActionProvider.COMMAND_TEST, bundle.getString("LBL_TestAction_Name"), null)); // NOI18N
485
            actions.add(ProjectSensitiveActions.projectCommandAction(ActionProvider.COMMAND_TEST, bundle.getString("LBL_TestAction_Name"), null)); // NOI18N
485
            actions.add(CommonProjectActions.setProjectConfigurationAction());
486
            actions.add(CommonProjectActions.setProjectConfigurationAction());
486
            actions.add(null);
487
            actions.add(null);
Lines 496-512 Link Here
496
            actions.add(SystemAction.get(FindAction.class));
497
            actions.add(SystemAction.get(FindAction.class));
497
            
498
            
498
            // honor 57874 contact
499
            // honor 57874 contact
499
            
500
            addFromLayers(actions, "Projects/Actions"); //NOI18N
500
            FileObject fo = Repository.getDefault().getDefaultFileSystem().findResource("Projects/Actions"); // NOI18N
501
            if (fo != null) {
502
                for (Object next : new FolderLookup(DataFolder.findFolder(fo)).getLookup().lookupAll(Object.class)) {
503
                    if (next instanceof Action) {
504
                        actions.add((Action) next);
505
                    } else if (next instanceof JSeparator) {
506
                        actions.add(null);
507
                    }
508
                }
509
            }
510
            
501
            
511
            actions.add(null);
502
            actions.add(null);
512
            if (broken) {
503
            if (broken) {
Lines 516-521 Link Here
516
            
507
            
517
            return actions.toArray(new Action[actions.size()]);
508
            return actions.toArray(new Action[actions.size()]);
518
            
509
            
510
        }
511
        
512
        private void addFromLayers(List<Action> actions, String path) {
513
            Lookup look = Lookups.forPath(path);
514
            for (Object next : look.lookupAll(Object.class)) {
515
                if (next instanceof Action) {
516
                    actions.add((Action) next);
517
                } else if (next instanceof JSeparator) {
518
                    actions.add(null);
519
                }
520
            }
519
        }
521
        }
520
        
522
        
521
        private boolean isBroken() {
523
        private boolean isBroken() {
(-)web/project/src/org/netbeans/modules/web/project/ui/WebLogicalViewProvider.java (-10 / +13 lines)
Lines 487-492 Link Here
487
            actions.add(ProjectSensitiveActions.projectCommandAction( ActionProvider.COMMAND_RUN, bundle.getString( "LBL_RunAction_Name" ), null )); // NOI18N
487
            actions.add(ProjectSensitiveActions.projectCommandAction( ActionProvider.COMMAND_RUN, bundle.getString( "LBL_RunAction_Name" ), null )); // NOI18N
488
            actions.add(ProjectSensitiveActions.projectCommandAction( ActionProvider.COMMAND_DEBUG, bundle.getString( "LBL_DebugAction_Name" ), null )); // NOI18N
488
            actions.add(ProjectSensitiveActions.projectCommandAction( ActionProvider.COMMAND_DEBUG, bundle.getString( "LBL_DebugAction_Name" ), null )); // NOI18N
489
            actions.add(ProjectSensitiveActions.projectCommandAction( WebProjectConstants.COMMAND_REDEPLOY, bundle.getString( "LBL_RedeployAction_Name" ), null )); // NOI18N
489
            actions.add(ProjectSensitiveActions.projectCommandAction( WebProjectConstants.COMMAND_REDEPLOY, bundle.getString( "LBL_RedeployAction_Name" ), null )); // NOI18N
490
            addFromLayers(actions, "Projects/Profiler_Actions_temporary"); //NOI18N
490
            actions.add(ProjectSensitiveActions.projectCommandAction( RestSupport.COMMAND_TEST_RESTBEANS, bundle.getString( "LBL_TestRestBeansAction_Name" ), null )); // NOI18N
491
            actions.add(ProjectSensitiveActions.projectCommandAction( RestSupport.COMMAND_TEST_RESTBEANS, bundle.getString( "LBL_TestRestBeansAction_Name" ), null )); // NOI18N
491
            actions.add(null);
492
            actions.add(null);
492
            actions.add(CommonProjectActions.setAsMainProjectAction());
493
            actions.add(CommonProjectActions.setAsMainProjectAction());
Lines 502-517 Link Here
502
            
503
            
503
            // honor 57874 contact
504
            // honor 57874 contact
504
            
505
            
505
            FileObject fo = Repository.getDefault().getDefaultFileSystem().findResource("Projects/Actions"); // NOI18N
506
            addFromLayers(actions, "Projects/Actions"); //NOI18N
506
            if (fo != null) {
507
                for (Object next : new FolderLookup(DataFolder.findFolder(fo)).getLookup().lookupAll(Object.class)) {
508
                    if (next instanceof Action) {
509
                        actions.add((Action) next);
510
                    } else if (next instanceof JSeparator) {
511
                        actions.add(null);
512
                    }
513
                }
514
            }
515
            
507
            
516
            actions.add(null);
508
            actions.add(null);
517
            
509
            
Lines 528-533 Link Here
528
            
520
            
529
            return actions.toArray(new Action[actions.size()]);
521
            return actions.toArray(new Action[actions.size()]);
530
        }
522
        }
523
        
524
        private void addFromLayers(List<Action> actions, String path) {
525
            Lookup look = Lookups.forPath(path);
526
            for (Object next : look.lookupAll(Object.class)) {
527
                if (next instanceof Action) {
528
                    actions.add((Action) next);
529
                } else if (next instanceof JSeparator) {
530
                    actions.add(null);
531
                }
532
            }
533
        }        
531
534
532
        /** This action is created only when project has broken references.
535
        /** This action is created only when project has broken references.
533
         * Once these are resolved the action is disabled.
536
         * Once these are resolved the action is disabled.
(-)j2ee/earproject/src/org/netbeans/modules/j2ee/earproject/ui/J2eeArchiveLogicalViewProvider.java (-41 / +30 lines)
Lines 487-534 Link Here
487
            if (provider != null && provider.hasVerifierSupport()) {
487
            if (provider != null && provider.hasVerifierSupport()) {
488
                actions.add(ProjectSensitiveActions.projectCommandAction( "verify", bundle.getString( "LBL_VerifyAction_Name" ), null )); // NOI18N
488
                actions.add(ProjectSensitiveActions.projectCommandAction( "verify", bundle.getString( "LBL_VerifyAction_Name" ), null )); // NOI18N
489
            }
489
            }
490
            actions.addAll(Arrays.asList(new Action[] {
490
            actions.add(null);
491
                null,
491
            actions.add(ProjectSensitiveActions.projectCommandAction( ActionProvider.COMMAND_RUN, bundle.getString( "LBL_RunAction_Name" ), null )); // NOI18N
492
                ProjectSensitiveActions.projectCommandAction( ActionProvider.COMMAND_RUN, bundle.getString( "LBL_RunAction_Name" ), null ), // NOI18N
492
            actions.add(ProjectSensitiveActions.projectCommandAction( EjbProjectConstants.COMMAND_REDEPLOY, bundle.getString( "LBL_DeployAction_Name" ), null));
493
                ProjectSensitiveActions.projectCommandAction( EjbProjectConstants.COMMAND_REDEPLOY, bundle.getString( "LBL_DeployAction_Name" ), null ), // NOI18N
493
            actions.add(ProjectSensitiveActions.projectCommandAction( ActionProvider.COMMAND_DEBUG, bundle.getString( "LBL_DebugAction_Name" ), null )); // NOI18N
494
                ProjectSensitiveActions.projectCommandAction( ActionProvider.COMMAND_DEBUG, bundle.getString( "LBL_DebugAction_Name" ), null ), // NOI18N
494
            addFromLayers(actions, "Projects/Profiler_Actions_temporary"); //NOI18N
495
                null,
495
                
496
                CommonProjectActions.setAsMainProjectAction(),
496
            actions.add(null);
497
                CommonProjectActions.openSubprojectsAction(),
497
            actions.add(CommonProjectActions.setAsMainProjectAction());
498
                CommonProjectActions.closeProjectAction(),
498
            actions.add(CommonProjectActions.openSubprojectsAction());
499
                null,
499
            actions.add(CommonProjectActions.closeProjectAction());
500
                CommonProjectActions.renameProjectAction(),
500
            actions.add(null);
501
                CommonProjectActions.moveProjectAction(),
501
            actions.add(CommonProjectActions.renameProjectAction());
502
                CommonProjectActions.copyProjectAction(),
502
            actions.add(CommonProjectActions.moveProjectAction());
503
                CommonProjectActions.deleteProjectAction(),
503
            actions.add(CommonProjectActions.copyProjectAction());
504
                null,
504
            actions.add(CommonProjectActions.deleteProjectAction());
505
                SystemAction.get( FindAction.class ),
505
            actions.add(null);
506
            }));
506
            actions.add(SystemAction.get( FindAction.class ));
507
            
508
           try {
509
                Repository repository  = Repository.getDefault();
510
                FileSystem sfs = repository.getDefaultFileSystem();
511
                FileObject fo = sfs.findResource("Projects/Actions");  // NOI18N
512
                if (fo != null) {
513
                    DataObject dobj = DataObject.find(fo);
514
                    FolderLookup actionRegistry = new FolderLookup((DataFolder)dobj);
515
                    Lookup.Template<Object> query = new Lookup.Template<Object>(Object.class);
516
                    Lookup lookup = actionRegistry.getLookup();
517
                    Iterator<? extends Object> it = lookup.lookup(query).allInstances().iterator();
518
                    while (it.hasNext()) {
519
                        Object next = it.next();
520
                        if (next instanceof Action) {
521
                            actions.add((Action) next);
522
                        } else if (next instanceof JSeparator) {
523
                            actions.add(null);
524
                        }
525
                    }
526
                }
527
            } catch (DataObjectNotFoundException ex) {
528
                // data folder for existing fileobject expected
529
                Exceptions.printStackTrace(ex);
530
            }
531
            
507
            
508
            addFromLayers(actions, "Projects/Actions"); //NOI18N
509
532
            actions.add(null);
510
            actions.add(null);
533
            
511
            
534
            if (broken) {
512
            if (broken) {
Lines 540-545 Link Here
540
            actions.add(CommonProjectActions.customizeProjectAction());
518
            actions.add(CommonProjectActions.customizeProjectAction());
541
            return actions.toArray(new Action[actions.size()]);
519
            return actions.toArray(new Action[actions.size()]);
542
        }
520
        }
521
        
522
        private void addFromLayers(List<Action> actions, String path) {
523
            Lookup look = Lookups.forPath(path);
524
            for (Object next : look.lookupAll(Object.class)) {
525
                if (next instanceof Action) {
526
                    actions.add((Action) next);
527
                } else if (next instanceof JSeparator) {
528
                    actions.add(null);
529
                }
530
            }
531
        }                   
543
        
532
        
544
        /** This action is created only when project has broken references.
533
        /** This action is created only when project has broken references.
545
         * Once these are resolved the action is disabled.
534
         * Once these are resolved the action is disabled.
(-)j2ee/ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/EjbJarLogicalViewProvider.java (-25 / +15 lines)
Lines 463-469 Link Here
463
            
463
            
464
            J2eeModuleProvider provider = 
464
            J2eeModuleProvider provider = 
465
                           project.getLookup().lookup(J2eeModuleProvider.class);
465
                           project.getLookup().lookup(J2eeModuleProvider.class);
466
            List actions = new ArrayList(30);
466
            List<Action> actions = new ArrayList<Action>(30);
467
            actions.add(CommonProjectActions.newFileAction());
467
            actions.add(CommonProjectActions.newFileAction());
468
            actions.add(null);
468
            actions.add(null);
469
            actions.add(ProjectSensitiveActions.projectCommandAction( ActionProvider.COMMAND_BUILD, bundle.getString( "LBL_BuildAction_Name" ), null )); // NOI18N
469
            actions.add(ProjectSensitiveActions.projectCommandAction( ActionProvider.COMMAND_BUILD, bundle.getString( "LBL_BuildAction_Name" ), null )); // NOI18N
Lines 477-482 Link Here
477
            actions.add(ProjectSensitiveActions.projectCommandAction( ActionProvider.COMMAND_RUN, bundle.getString( "LBL_RunAction_Name" ), null )); // NOI18N
477
            actions.add(ProjectSensitiveActions.projectCommandAction( ActionProvider.COMMAND_RUN, bundle.getString( "LBL_RunAction_Name" ), null )); // NOI18N
478
            actions.add(ProjectSensitiveActions.projectCommandAction( EjbProjectConstants.COMMAND_REDEPLOY, bundle.getString( "LBL_RedeployAction_Name" ), null )); // NOI18N
478
            actions.add(ProjectSensitiveActions.projectCommandAction( EjbProjectConstants.COMMAND_REDEPLOY, bundle.getString( "LBL_RedeployAction_Name" ), null )); // NOI18N
479
            actions.add(ProjectSensitiveActions.projectCommandAction( ActionProvider.COMMAND_DEBUG, bundle.getString( "LBL_DebugAction_Name" ), null )); // NOI18N
479
            actions.add(ProjectSensitiveActions.projectCommandAction( ActionProvider.COMMAND_DEBUG, bundle.getString( "LBL_DebugAction_Name" ), null )); // NOI18N
480
            addFromLayers(actions, "Projects/Profiler_Actions_temporary"); //NOI18N
480
            actions.add(null);
481
            actions.add(null);
481
            actions.add(CommonProjectActions.setAsMainProjectAction());
482
            actions.add(CommonProjectActions.setAsMainProjectAction());
482
            actions.add(CommonProjectActions.openSubprojectsAction());
483
            actions.add(CommonProjectActions.openSubprojectsAction());
Lines 491-519 Link Here
491
            
492
            
492
            // honor 57874 contract
493
            // honor 57874 contract
493
            
494
            
494
            try {
495
            addFromLayers(actions, "Projects/Actions"); //NOI18N
495
                Repository repository  = Repository.getDefault();
496
                FileSystem sfs = repository.getDefaultFileSystem();
497
                FileObject fo = sfs.findResource("Projects/Actions");  // NOI18N
498
                if (fo != null) {
499
                    DataObject dobj = DataObject.find(fo);
500
                    FolderLookup actionRegistry = new FolderLookup((DataFolder)dobj);
501
                    Lookup.Template query = new Lookup.Template(Object.class);
502
                    Lookup lookup = actionRegistry.getLookup();
503
                    Iterator it = lookup.lookup(query).allInstances().iterator();
504
                    while (it.hasNext()) {
505
                        Object next = it.next();
506
                        if (next instanceof Action) {
507
                            actions.add(next);
508
                        } else if (next instanceof JSeparator) {
509
                            actions.add(null);
510
                        }
511
                    }
512
                }
513
            } catch (DataObjectNotFoundException ex) {
514
                // data folder for existing fileobject expected
515
                Exceptions.printStackTrace(ex);
516
            }
517
            
496
            
518
            actions.add(null);
497
            actions.add(null);
519
            
498
            
Lines 525-532 Link Here
525
            }
504
            }
526
            actions.add(CommonProjectActions.customizeProjectAction());
505
            actions.add(CommonProjectActions.customizeProjectAction());
527
506
528
            return (Action[])actions.toArray(new Action[actions.size()]);
507
            return actions.toArray(new javax.swing.Action[actions.size()]);
529
        }
508
        }
509
        
510
        private void addFromLayers(List<Action> actions, String path) {
511
            Lookup look = Lookups.forPath(path);
512
            for (Object next : look.lookupAll(Object.class)) {
513
                if (next instanceof Action) {
514
                    actions.add((Action) next);
515
                } else if (next instanceof JSeparator) {
516
                    actions.add(null);
517
                }
518
            }
519
        }                
530
520
531
        /** This action is created only when project has broken references.
521
        /** This action is created only when project has broken references.
532
         * Once these are resolved the action is disabled.
522
         * Once these are resolved the action is disabled.

Return to bug 107239