You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ge...@apache.org on 2018/05/03 10:11:15 UTC

[incubator-netbeans] branch master updated: [NETBEANS-373] Removing synchronization from refactoring dialog. (#530)

This is an automated email from the ASF dual-hosted git repository.

geertjan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git


The following commit(s) were added to refs/heads/master by this push:
     new f12b0f4  [NETBEANS-373] Removing synchronization from refactoring dialog. (#530)
f12b0f4 is described below

commit f12b0f42e0d60d475d3c6fd9e11336f381407733
Author: Geertjan Wielenga <ge...@oracle.com>
AuthorDate: Thu May 3 12:11:09 2018 +0200

    [NETBEANS-373] Removing synchronization from refactoring dialog. (#530)
    
    * [NETBEANS-373] Removing synchronization from refactoring dialog.
    
    * Update ParametersPanel.form
    
    * [NETBEANS-373] Undoing change to .form (after removing synchronization from refactoring dialog).
---
 .../org/netbeans/modules/refactoring/spi/impl/ParametersPanel.java    | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/refactoring.api/src/org/netbeans/modules/refactoring/spi/impl/ParametersPanel.java b/refactoring.api/src/org/netbeans/modules/refactoring/spi/impl/ParametersPanel.java
index 26a248b..c29f4f0 100644
--- a/refactoring.api/src/org/netbeans/modules/refactoring/spi/impl/ParametersPanel.java
+++ b/refactoring.api/src/org/netbeans/modules/refactoring/spi/impl/ParametersPanel.java
@@ -349,7 +349,6 @@ public class ParametersPanel extends JPanel implements ProgressListener, ChangeL
     }//GEN-LAST:event_backActionPerformed
 
     private void cancelActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cancelActionPerformed
-        synchronized (this) {
             canceledDialog = true;
             if (evt != null && evt.getSource() instanceof Cancellable) {
                 putResult(null);
@@ -365,7 +364,6 @@ public class ParametersPanel extends JPanel implements ProgressListener, ChangeL
                 }
                 cancelRequest = true;
             }
-        }
     }//GEN-LAST:event_cancelActionPerformed
     private void refactor(final boolean previewAll) {
         LOGGER.log(Level.FINEST, "refactor - currentState={0}", currentState);
@@ -587,7 +585,7 @@ public class ParametersPanel extends JPanel implements ProgressListener, ChangeL
      * operation or
      * <code>null</code> if the operation was cancelled.
      */
-    public synchronized RefactoringSession showDialog() {
+    public RefactoringSession showDialog() {
         RefactoringPanel.checkEventThread();
         putClientProperty(JUMP_TO_FIRST_OCCURENCE, false);
         if (rui != null) {

-- 
To stop receiving notification emails like this one, please contact
geertjan@apache.org.

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists