Attachment #127898 for bug #222178

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




        });
        popupMenu.add(rollbackMenu);

        // add action 'rollback to previous revision'
        final JMenuItem rollbackToPreviousMenu = new JMenuItem(loc.getString("CTL_MenuItem_RollbackToPreviousRevision"));
        rollbackToPreviousMenu.addActionListener(new ActionListener() {
            public void actionPerformed (ActionEvent e) {
                final String previousRevision = Utils.previousRevision(recentRevision);
                if (null != previousRevision) {
                    File file = getCurrentFile();
                    GetCleanAction.rollback(file, previousRevision);
                }
            }
        });
        popupMenu.add(rollbackToPreviousMenu);

        Project prj = Utils.getProject(getCurrentFile());
        if (prj != null) {
            String prjName = ProjectUtils.getInformation(prj).getDisplayName();


        diffMenu.setVisible(false);
        rollbackMenu.setVisible(false);
        rollbackToPreviousMenu.setVisible(false);
        if (recentRevision != null) {
            String prevRevision = Utils.previousRevision(recentRevision);
            if (prevRevision != null) {
                String format = loc.getString("CTL_MenuItem_DiffToRevision");
                diffMenu.setText(MessageFormat.format(format, new Object [] { recentRevision, prevRevision }));
                diffMenu.setVisible(true);
                
                String format2 = loc.getString("CTL_MenuItem_RollbackToPreviousRevision");
                rollbackToPreviousMenu.setText(MessageFormat.format(format2, new Object [] { prevRevision}));
                rollbackToPreviousMenu.setVisible(true);
                
            }
            String format = loc.getString("CTL_MenuItem_RollbackToRevision");
            rollbackMenu.setText(MessageFormat.format(format, new Object [] { recentRevision }));

Lines 43-48 Link Here

(-)a/versioning.system.cvss/src/org/netbeans/modules/versioning/system/cvss/ui/actions/annotate/Bundle.properties (+1 lines)
43	CTL_MenuItem_CloseAnnotations = Hide Annotations	43	CTL_MenuItem_CloseAnnotations = Hide Annotations
44	CTL_MenuItem_DiffToRevision = Diff {0} to {1}	44	CTL_MenuItem_DiffToRevision = Diff {0} to {1}
45	CTL_MenuItem_RollbackToRevision = Rollback to {0}	45	CTL_MenuItem_RollbackToRevision = Rollback to {0}
		46	CTL_MenuItem_RollbackToPreviousRevision = Rollback to {0}
46	CTL_MenuItem_FindCommitInProject = Find Commit in "{0}"	47	CTL_MenuItem_FindCommitInProject = Find Commit in "{0}"
47	CTL_MenuItem_FindCommitInProjects = Find Commit in Open Projects	48	CTL_MenuItem_FindCommitInProjects = Find Commit in Open Projects
48		49

Return to bug 222178

Lines 418-423 Link Here

(-)a/versioning.system.cvss/src/org/netbeans/modules/versioning/system/cvss/ui/actions/annotate/AnnotationBar.java (+19 lines)
418	});	418	});
419	popupMenu.add(rollbackMenu);	419	popupMenu.add(rollbackMenu);
420		420
		421	// add action 'rollback to previous revision'
		422	final JMenuItem rollbackToPreviousMenu = new JMenuItem(loc.getString("CTL_MenuItem_RollbackToPreviousRevision"));
		423	rollbackToPreviousMenu.addActionListener(new ActionListener() {
		424	public void actionPerformed (ActionEvent e) {
		425	final String previousRevision = Utils.previousRevision(recentRevision);
		426	if (null != previousRevision) {
		427	File file = getCurrentFile();
		428	GetCleanAction.rollback(file, previousRevision);
		429	}
		430	}
		431	});
		432	popupMenu.add(rollbackToPreviousMenu);
		433
421	Project prj = Utils.getProject(getCurrentFile());	434	Project prj = Utils.getProject(getCurrentFile());
422	if (prj != null) {	435	if (prj != null) {
423	String prjName = ProjectUtils.getInformation(prj).getDisplayName();	436	String prjName = ProjectUtils.getInformation(prj).getDisplayName();
Lines 472-483 Link Here
472		485
473	diffMenu.setVisible(false);	486	diffMenu.setVisible(false);
474	rollbackMenu.setVisible(false);	487	rollbackMenu.setVisible(false);
		488	rollbackToPreviousMenu.setVisible(false);
475	if (recentRevision != null) {	489	if (recentRevision != null) {
476	String prevRevision = Utils.previousRevision(recentRevision);	490	String prevRevision = Utils.previousRevision(recentRevision);
477	if (prevRevision != null) {	491	if (prevRevision != null) {
478	String format = loc.getString("CTL_MenuItem_DiffToRevision");	492	String format = loc.getString("CTL_MenuItem_DiffToRevision");
479	diffMenu.setText(MessageFormat.format(format, new Object [] { recentRevision, prevRevision }));	493	diffMenu.setText(MessageFormat.format(format, new Object [] { recentRevision, prevRevision }));
480	diffMenu.setVisible(true);	494	diffMenu.setVisible(true);
		495
		496	String format2 = loc.getString("CTL_MenuItem_RollbackToPreviousRevision");
		497	rollbackToPreviousMenu.setText(MessageFormat.format(format2, new Object [] { prevRevision}));
		498	rollbackToPreviousMenu.setVisible(true);
		499
481	}	500	}
482	String format = loc.getString("CTL_MenuItem_RollbackToRevision");	501	String format = loc.getString("CTL_MenuItem_RollbackToRevision");
483	rollbackMenu.setText(MessageFormat.format(format, new Object [] { recentRevision }));	502	rollbackMenu.setText(MessageFormat.format(format, new Object [] { recentRevision }));