[hg] main-silver: #226117: requesting confirmation before recurs...

  • From: Jan Lahoda < >
  • To:
  • Subject: [hg] main-silver: #226117: requesting confirmation before recurs...
  • Date: Thu, 18 Jul 2013 15:52:38 -0700

changeset c0d55a1efe9e in main-silver ((none))
details: http://hg.netbeans.org/main-silver/rev/c0d55a1efe9e
description:
        #226117: requesting confirmation before recursive formatting.

diffstat:

 editor.global.format/nbproject/project.xml                                   
              |   10 +-
 
editor.global.format/src/org/netbeans/modules/editor/global/format/ConfirmationPanel.form
  |   35 +++
 
editor.global.format/src/org/netbeans/modules/editor/global/format/ConfirmationPanel.java
  |  109 ++++++++++
 
editor.global.format/src/org/netbeans/modules/editor/global/format/GlobalFormatAction.java
 |   85 ++++--
 4 files changed, 206 insertions(+), 33 deletions(-)

diffs (327 lines):

diff --git a/editor.global.format/nbproject/project.xml 
b/editor.global.format/nbproject/project.xml
--- a/editor.global.format/nbproject/project.xml
+++ b/editor.global.format/nbproject/project.xml
@@ -86,11 +86,19 @@
                     </run-dependency>
                 </dependency>
                 <dependency>
+                    <code-name-base>org.openide.dialogs</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>7.32</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
                     <code-name-base>org.openide.filesystems</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>7.57</specification-version>
+                        <specification-version>8.0</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff --git 
a/editor.global.format/src/org/netbeans/modules/editor/global/format/ConfirmationPanel.form
 
b/editor.global.format/src/org/netbeans/modules/editor/global/format/ConfirmationPanel.form
new file mode 100644
--- /dev/null
+++ 
b/editor.global.format/src/org/netbeans/modules/editor/global/format/ConfirmationPanel.form
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<Form version="1.5" maxVersion="1.9" 
type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
+  <Properties>
+    <Property name="border" type="javax.swing.border.Border" 
editor="org.netbeans.modules.form.editors2.BorderEditor">
+      <Border 
info="org.netbeans.modules.form.compat2.border.EmptyBorderInfo">
+        <EmptyBorder bottom="0" left="12" right="12" top="12"/>
+      </Border>
+    </Property>
+  </Properties>
+  <AuxValues>
+    <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" 
value="1"/>
+    <AuxValue name="FormSettings_autoSetComponentName" 
type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" 
value="true"/>
+    <AuxValue name="FormSettings_generateMnemonicsCode" 
type="java.lang.Boolean" value="true"/>
+    <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" 
value="true"/>
+    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" 
value="1"/>
+    <AuxValue name="FormSettings_listenerGenerationStyle" 
type="java.lang.Integer" value="0"/>
+    <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" 
value="false"/>
+    <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" 
value="2"/>
+  </AuxValues>
+
+  <Layout>
+    <DimensionLayout dim="0">
+      <Group type="103" groupAlignment="0" attributes="0">
+          <EmptySpace min="0" pref="354" max="32767" attributes="0"/>
+      </Group>
+    </DimensionLayout>
+    <DimensionLayout dim="1">
+      <Group type="103" groupAlignment="0" attributes="0">
+          <EmptySpace min="0" pref="288" max="32767" attributes="0"/>
+      </Group>
+    </DimensionLayout>
+  </Layout>
+</Form>
diff --git 
a/editor.global.format/src/org/netbeans/modules/editor/global/format/ConfirmationPanel.java
 
b/editor.global.format/src/org/netbeans/modules/editor/global/format/ConfirmationPanel.java
new file mode 100644
--- /dev/null
+++ 
b/editor.global.format/src/org/netbeans/modules/editor/global/format/ConfirmationPanel.java
@@ -0,0 +1,109 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2013 Sun Microsystems, Inc.
+ */
+package org.netbeans.modules.editor.global.format;
+
+import java.awt.BorderLayout;
+import java.awt.CardLayout;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.border.EmptyBorder;
+import org.netbeans.api.progress.ProgressHandle;
+import org.netbeans.api.progress.ProgressHandleFactory;
+import org.openide.util.NbBundle.Messages;
+
+/**
+ *
+ * @author lahvac
+ */
+public class ConfirmationPanel extends javax.swing.JPanel {
+
+    private static final String PANEL_PROGRESS = "progress";
+    private static final String PANEL_QUESTION = "question";
+    
+    @Messages({
+        "LBL_FormattingQuestion=Recursivelly format the selected files and 
folders?",
+        "LBL_FormattingInProgress=Formatting:"
+    })
+    public ConfirmationPanel(ProgressHandle handle) {
+        initComponents();
+        setLayout(new CardLayout());
+        add(new JLabel(Bundle.LBL_FormattingQuestion()), PANEL_QUESTION);
+        JPanel progress = new JPanel(new BorderLayout());
+        JLabel inProgressLabel = new 
JLabel(Bundle.LBL_FormattingInProgress());
+        inProgressLabel.setBorder(new EmptyBorder(0, 0, 6, 0));
+        progress.add(inProgressLabel, BorderLayout.NORTH);
+        progress.add(ProgressHandleFactory.createProgressComponent(handle), 
BorderLayout.CENTER);
+        add(progress, PANEL_PROGRESS);
+        ((CardLayout) getLayout()).show(this, PANEL_QUESTION);
+    }
+    
+    public void started() {
+        ((CardLayout) getLayout()).show(this, PANEL_PROGRESS);
+    }
+
+    /**
+     * This method is called from within the constructor to initialize the 
form.
+     * WARNING: Do NOT modify this code. The content of this method is always
+     * regenerated by the Form Editor.
+     */
+    @SuppressWarnings("unchecked")
+    // <editor-fold defaultstate="collapsed" desc="Generated 
Code">//GEN-BEGIN:initComponents
+    private void initComponents() {
+
+        setBorder(javax.swing.BorderFactory.createEmptyBorder(12, 12, 0, 
12));
+
+        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
+        this.setLayout(layout);
+        layout.setHorizontalGroup(
+            
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGap(0, 354, Short.MAX_VALUE)
+        );
+        layout.setVerticalGroup(
+            
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGap(0, 288, Short.MAX_VALUE)
+        );
+    }// </editor-fold>//GEN-END:initComponents
+
+
+    // Variables declaration - do not modify//GEN-BEGIN:variables
+    // End of variables declaration//GEN-END:variables
+}
diff --git 
a/editor.global.format/src/org/netbeans/modules/editor/global/format/GlobalFormatAction.java
 
b/editor.global.format/src/org/netbeans/modules/editor/global/format/GlobalFormatAction.java
--- 
a/editor.global.format/src/org/netbeans/modules/editor/global/format/GlobalFormatAction.java
+++ 
b/editor.global.format/src/org/netbeans/modules/editor/global/format/GlobalFormatAction.java
@@ -41,7 +41,9 @@
  */
 package org.netbeans.modules.editor.global.format;
 
+import java.awt.Dialog;
 import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -58,6 +60,8 @@
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 import javax.swing.AbstractAction;
+import javax.swing.JButton;
+import javax.swing.SwingUtilities;
 import javax.swing.text.BadLocationException;
 import javax.swing.text.Document;
 import javax.swing.text.StyledDocument;
@@ -66,7 +70,6 @@
 import org.netbeans.api.java.classpath.GlobalPathRegistry;
 import org.netbeans.api.progress.ProgressHandle;
 import org.netbeans.api.progress.ProgressHandleFactory;
-import org.netbeans.api.progress.ProgressUtils;
 import org.netbeans.api.project.FileOwnerQuery;
 import org.netbeans.api.project.Project;
 import org.netbeans.api.project.ProjectUtils;
@@ -87,36 +90,80 @@
 import org.netbeans.modules.refactoring.spi.RefactoringPlugin;
 import org.netbeans.modules.refactoring.spi.RefactoringPluginFactory;
 import org.netbeans.modules.refactoring.spi.Transaction;
+import org.openide.DialogDescriptor;
+import org.openide.DialogDisplayer;
 import org.openide.cookies.EditorCookie;
 import org.openide.filesystems.FileObject;
 import org.openide.filesystems.FileUtil;
 import org.openide.loaders.DataObject;
 import org.openide.text.NbDocument;
-import org.openide.util.Cancellable;
 import org.openide.util.Exceptions;
 import org.openide.util.Lookup;
 import org.openide.util.NbBundle.Messages;
+import org.openide.util.RequestProcessor;
 import org.openide.util.UserQuestionException;
 import org.openide.util.Utilities;
 import org.openide.util.lookup.ServiceProvider;
 
 public final class GlobalFormatAction extends AbstractAction {
 
+    private static final RequestProcessor WORKER = new 
RequestProcessor(GlobalFormatAction.class.getName(), 1, false, false);
+    
     public GlobalFormatAction() {
         putValue(NAME, BaseKit.formatAction);
     }
 
     @Override
+    @Messages({"BTN_OK=OK",
+               "BTN_Cancel=Cancel",
+               "CAP_Reformat=Format Recursively"
+    })
     public void actionPerformed(ActionEvent e) {
-        ProgressHandle handle = ProgressHandleFactory.createHandle("Format");
-        ProgressUtils.showProgressDialogAndRun(new 
ProgressRunnableImpl(handle), handle, true);
+        final JButton ok = new JButton(Bundle.BTN_OK());
+        JButton cancelButton = new JButton(Bundle.BTN_Cancel());
+        final ProgressHandle handle = 
ProgressHandleFactory.createHandle("Format");
+        final ConfirmationPanel panel = new ConfirmationPanel(handle);
+        DialogDescriptor nd = new DialogDescriptor(panel, 
Bundle.CAP_Reformat(), true, new Object[] {ok, cancelButton}, ok, 
DialogDescriptor.DEFAULT_ALIGN, null, new ActionListener() {
+            @Override public void actionPerformed(ActionEvent e) {}
+        });
+        final Dialog[] d = new Dialog[1];
+        final AtomicBoolean cancel = new AtomicBoolean();
+        ok.addActionListener(new ActionListener() {
+            @Override public void actionPerformed(ActionEvent e) {
+                ok.setEnabled(false);
+                panel.started();
+                WORKER.post(new Runnable() {
+                    @Override public void run() {
+                        try {
+                            doFormat(handle, cancel);
+                        } catch (IOException ex) {
+                            Exceptions.printStackTrace(ex);
+                        } finally {
+                            SwingUtilities.invokeLater(new Runnable() {
+                                @Override public void run() {
+                                    d[0].setVisible(false);
+                                    d[0].dispose();
+                                }
+                            });
+                        }
+                    }
+                });
+            }
+        });
+        cancelButton.addActionListener(new ActionListener() {
+            @Override public void actionPerformed(ActionEvent e) {
+                cancel.set(true);
+            }
+        });
+        handle.start(1);//need to "start" the progress, so that the 
progressbars have reasonable size
+        d[0] = DialogDisplayer.getDefault().createDialog(nd);
+        d[0].setVisible(true);
     }
 
     @Messages({"LBL_Preparing=Preparing...", "#{0} - the name of the file 
being formatted", "LBL_Formatting=Formatting: {0}", 
"LBL_BulkFormatting=Formatting"})
     private static void doFormat(ProgressHandle handle, AtomicBoolean 
cancel) throws IOException {
-        handle.start();
-
         try {
+            handle.switchToIndeterminate();
             handle.progress(Bundle.LBL_Preparing());
 
             Set<String> sourceIds = new HashSet<String>();
@@ -356,32 +403,6 @@
         }
     }
 
-    private static class ProgressRunnableImpl implements Runnable, 
Cancellable {
-
-        private final ProgressHandle handle;
-        private final AtomicBoolean cancel = new AtomicBoolean();
-
-        public ProgressRunnableImpl(ProgressHandle handle) {
-            this.handle = handle;
-        }
-
-        @Override
-        public void run() {
-            try {
-                doFormat(handle, cancel);
-            } catch (IOException ex) {
-                Exceptions.printStackTrace(ex);
-            }
-        }
-
-        @Override
-        public boolean cancel() {
-            cancel.set(true);
-            return true;
-        }
-
-    }
-
     static final class FormatRefactoring extends AbstractRefactoring {
         private final Transaction transaction;
         public FormatRefactoring(Transaction transaction) {

[hg] main-silver: #226117: requesting confirmation before recurs...

Jan Lahoda 07/18/2013

Project Features

About this Project

Editor was started in November 2009, is owned by Martin Ryzl, and has 147 members.
By use of this website, you agree to the NetBeans Policies and Terms of Use (revision 20140418.2d69abc). © 2013, Oracle Corporation and/or its affiliates. Sponsored by Oracle logo
 
 
Close
loading
Please Confirm
Close