svn commit: r1236845 - in /jmeter/trunk: docs/images/screenshots/changes/23_confirm_remove.png src/core/org/apache/jmeter/gui/action/Remove.java xdocs/changes.xml xdocs/images/screenshots/changes/23_confirm_remove.png

[mi...@apache.org]

Author: milamber
Date: Fri Jan 27 19:13:59 2012
New Revision: 1236845

URL: http://svn.apache.org/viewvc?rev=1236845&view=rev
Log:
Change Icon box to a green question mark (?) and buttons to Yes/No

Modified:
    jmeter/trunk/docs/images/screenshots/changes/23_confirm_remove.png
    jmeter/trunk/src/core/org/apache/jmeter/gui/action/Remove.java
    jmeter/trunk/xdocs/changes.xml
    jmeter/trunk/xdocs/images/screenshots/changes/23_confirm_remove.png

Modified: jmeter/trunk/docs/images/screenshots/changes/23_confirm_remove.png
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/images/screenshots/changes/23_confirm_remove.png?rev=1236845&r1=1236844&r2=1236845&view=diff
==============================================================================
Binary files - no diff available.

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/Remove.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Remove.java?rev=1236845&r1=1236844&r2=1236845&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/Remove.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/Remove.java Fri Jan 27 19:13:59 2012
@@ -61,11 +61,12 @@ public class Remove implements Command {
 
     public void doAction(ActionEvent e) {
         
-        int isConfirm = SKIP_CONFIRM ? JOptionPane.YES_OPTION : JOptionPane.showConfirmDialog(null, 
+        int isConfirm = SKIP_CONFIRM ? JOptionPane.YES_OPTION : 
+            JOptionPane.showConfirmDialog(GuiPackage.getInstance().getMainFrame(), 
                 JMeterUtils.getResString("remove_confirm_msg"),// $NON-NLS-1$
                 JMeterUtils.getResString("remove_confirm_title"), // $NON-NLS-1$
-                JOptionPane.WARNING_MESSAGE,
-                JOptionPane.YES_NO_OPTION);
+                JOptionPane.YES_NO_OPTION,
+                JOptionPane.QUESTION_MESSAGE);
         if (isConfirm == JOptionPane.YES_OPTION) {
             // TODO - removes the nodes from the CheckDirty map - should it be done later, in case some can't be removed?
             ActionRouter.getInstance().actionPerformed(new ActionEvent(e.getSource(), e.getID(), ActionNames.CHECK_REMOVE));

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1236845&r1=1236844&r2=1236845&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Fri Jan 27 19:13:59 2012
@@ -173,7 +173,7 @@ Earlier changes are detailed in the <a h
 
 <h3>Confirm Remove Dialog box</h3>
 <p>Add a dialog box to confirm removing the element(s) when Remove action is called
-<figure width="606" height="229" image="changes/23_confirm_remove.png"></figure>
+<figure width="583" height="210" image="changes/23_confirm_remove.png"></figure>
 The dialogue can be skipped by setting the JMeter property <code>confirm.delete.skip=true</code> 
 </p>
 

Modified: jmeter/trunk/xdocs/images/screenshots/changes/23_confirm_remove.png
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/images/screenshots/changes/23_confirm_remove.png?rev=1236845&r1=1236844&r2=1236845&view=diff
==============================================================================
Binary files - no diff available.