diff --git a/versioning.system.cvss/src/org/netbeans/modules/versioning/system/cvss/ui/actions/annotate/AnnotationBar.java b/versioning.system.cvss/src/org/netbeans/modules/versioning/system/cvss/ui/actions/annotate/AnnotationBar.java --- a/versioning.system.cvss/src/org/netbeans/modules/versioning/system/cvss/ui/actions/annotate/AnnotationBar.java +++ b/versioning.system.cvss/src/org/netbeans/modules/versioning/system/cvss/ui/actions/annotate/AnnotationBar.java @@ -418,6 +418,19 @@ }); 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(); @@ -472,12 +485,18 @@ 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 })); diff --git a/versioning.system.cvss/src/org/netbeans/modules/versioning/system/cvss/ui/actions/annotate/Bundle.properties b/versioning.system.cvss/src/org/netbeans/modules/versioning/system/cvss/ui/actions/annotate/Bundle.properties --- a/versioning.system.cvss/src/org/netbeans/modules/versioning/system/cvss/ui/actions/annotate/Bundle.properties +++ b/versioning.system.cvss/src/org/netbeans/modules/versioning/system/cvss/ui/actions/annotate/Bundle.properties @@ -43,6 +43,7 @@ CTL_MenuItem_CloseAnnotations = Hide Annotations CTL_MenuItem_DiffToRevision = Diff {0} to {1} CTL_MenuItem_RollbackToRevision = Rollback to {0} +CTL_MenuItem_RollbackToPreviousRevision = Rollback to {0} CTL_MenuItem_FindCommitInProject = Find Commit in "{0}" CTL_MenuItem_FindCommitInProjects = Find Commit in Open Projects