Attachment #57080 for bug #128147

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




                    logger.output(
                                NbBundle.getMessage(StripAction.class,
                                "MSG_ROLLBACK_INFO_SEP", root.getAbsolutePath())); // NOI18N
                    NotifyDescriptor descriptor = new NotifyDescriptor.Confirmation(NbBundle.getMessage(RollbackAction.class, "MSG_ROLLBACK_CONFIRM_QUERY")); // NOI18N
                    descriptor.setTitle(NbBundle.getMessage(RollbackAction.class, "MSG_ROLLBACK_CONFIRM")); // NOI18N
                    descriptor.setMessageType(JOptionPane.WARNING_MESSAGE);
                    descriptor.setOptionType(NotifyDescriptor.YES_NO_OPTION);

                    Object res = DialogDisplayer.getDefault().notify(descriptor);
                    if (res == NotifyDescriptor.NO_OPTION) {
                        logger.outputInRed(
                                NbBundle.getMessage(RollbackAction.class,
                                "MSG_ROLLBACK_CANCELED", root.getAbsolutePath())); // NOI18N

                        }else{
                            logger.output(list.get(0));
                            if (HgCommand.hasHistory(root)) {
                                int response = JOptionPane.showOptionDialog(null,
                                        NbBundle.getMessage(RollbackAction.class,"MSG_ROLLBACK_CONFIRM_UPDATE_QUERY") ,  // NOI18N
                                        NbBundle.getMessage(RollbackAction.class,"MSG_ROLLBACK_CONFIRM_UPDATE"), // NOI18N
                                        JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE,null, null, null);

Return to bug 128147

Lines 100-111 public class RollbackAction extends Cont Link Here

(-)a/mercurial/src/org/netbeans/modules/mercurial/ui/rollback/RollbackAction.java (-6 / +7 lines)
100	logger.output(	100	logger.output(
101	NbBundle.getMessage(StripAction.class,	101	NbBundle.getMessage(StripAction.class,
102	"MSG_ROLLBACK_INFO_SEP", root.getAbsolutePath())); // NOI18N	102	"MSG_ROLLBACK_INFO_SEP", root.getAbsolutePath())); // NOI18N
103	int response = JOptionPane.showOptionDialog(null,	103	NotifyDescriptor descriptor = new NotifyDescriptor.Confirmation(NbBundle.getMessage(RollbackAction.class, "MSG_ROLLBACK_CONFIRM_QUERY")); // NOI18N
104	NbBundle.getMessage(RollbackAction.class, "MSG_ROLLBACK_CONFIRM_QUERY"), // NOI18N	104	descriptor.setTitle(NbBundle.getMessage(RollbackAction.class, "MSG_ROLLBACK_CONFIRM")); // NOI18N
105	NbBundle.getMessage(RollbackAction.class, "MSG_ROLLBACK_CONFIRM"), // NOI18N	105	descriptor.setMessageType(JOptionPane.WARNING_MESSAGE);
106	JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, null, null, null);	106	descriptor.setOptionType(NotifyDescriptor.YES_NO_OPTION);
107		107
108	if (response == JOptionPane.NO_OPTION) {	108	Object res = DialogDisplayer.getDefault().notify(descriptor);
		109	if (res == NotifyDescriptor.NO_OPTION) {
109	logger.outputInRed(	110	logger.outputInRed(
110	NbBundle.getMessage(RollbackAction.class,	111	NbBundle.getMessage(RollbackAction.class,
111	"MSG_ROLLBACK_CANCELED", root.getAbsolutePath())); // NOI18N	112	"MSG_ROLLBACK_CANCELED", root.getAbsolutePath())); // NOI18N
Lines 124-130 public class RollbackAction extends Cont Link Here
124	}else{	125	}else{
125	logger.output(list.get(0));	126	logger.output(list.get(0));
126	if (HgCommand.hasHistory(root)) {	127	if (HgCommand.hasHistory(root)) {
127	response = JOptionPane.showOptionDialog(null,	128	int response = JOptionPane.showOptionDialog(null,
128	NbBundle.getMessage(RollbackAction.class,"MSG_ROLLBACK_CONFIRM_UPDATE_QUERY") , // NOI18N	129	NbBundle.getMessage(RollbackAction.class,"MSG_ROLLBACK_CONFIRM_UPDATE_QUERY") , // NOI18N
129	NbBundle.getMessage(RollbackAction.class,"MSG_ROLLBACK_CONFIRM_UPDATE"), // NOI18N	130	NbBundle.getMessage(RollbackAction.class,"MSG_ROLLBACK_CONFIRM_UPDATE"), // NOI18N
130	JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE,null, null, null);	131	JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE,null, null, null);