? core/javahelp/src/org/netbeans/modules/javahelp/JavaHelp.java_inMainWindow Index: core/javahelp/nbproject/project.xml =================================================================== RCS file: /cvs/core/javahelp/nbproject/project.xml,v retrieving revision 1.7 diff -c -r1.7 project.xml *** core/javahelp/nbproject/project.xml 4 Jun 2005 05:10:55 -0000 1.7 --- core/javahelp/nbproject/project.xml 2 Aug 2005 15:17:15 -0000 *************** *** 73,78 **** --- 73,87 ---- 5.3 + + org.netbeans.api.progress + + + + 1 + 1.0 + + org.netbeans.api.javahelp Index: core/javahelp/src/org/netbeans/modules/javahelp/Bundle.properties =================================================================== RCS file: /cvs/core/javahelp/src/org/netbeans/modules/javahelp/Bundle.properties,v retrieving revision 1.7 diff -c -r1.7 Bundle.properties *** core/javahelp/src/org/netbeans/modules/javahelp/Bundle.properties 3 Apr 2005 01:24:38 -0000 1.7 --- core/javahelp/src/org/netbeans/modules/javahelp/Bundle.properties 2 Aug 2005 15:17:16 -0000 *************** *** 20,29 **** # master index menu item #LBL_MasterIndex=Master Index TITLE_loading_help_sets=Loading help sets... - LBL_parsing_help_sets=Parsing help sets... - LBL_merging_help_sets=Merging help sets... ACSD_JavaHelp_viewer=Displays one or more online help references in JavaHelp format ! ACSD_Loading_Dialog=Loadintg help sets # HelpAction LBL_HelpAction=Help --- 20,27 ---- # master index menu item #LBL_MasterIndex=Master Index TITLE_loading_help_sets=Loading help sets... ACSD_JavaHelp_viewer=Displays one or more online help references in JavaHelp format ! ACSD_Loading_Dialog=Loading help sets # HelpAction LBL_HelpAction=Help Index: core/javahelp/src/org/netbeans/modules/javahelp/JavaHelp.java =================================================================== RCS file: /cvs/core/javahelp/src/org/netbeans/modules/javahelp/JavaHelp.java,v retrieving revision 1.29 diff -c -r1.29 JavaHelp.java *** core/javahelp/src/org/netbeans/modules/javahelp/JavaHelp.java 5 Jan 2005 00:14:23 -0000 1.29 --- core/javahelp/src/org/netbeans/modules/javahelp/JavaHelp.java 2 Aug 2005 15:17:21 -0000 *************** *** 7,13 **** * http://www.sun.com/ * * The Original Code is NetBeans. The Initial Developer of the Original ! * Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun * Microsystems, Inc. All Rights Reserved. */ --- 7,13 ---- * http://www.sun.com/ * * The Original Code is NetBeans. The Initial Developer of the Original ! * Code is Sun Microsystems, Inc. Portions Copyright 1997-2005 Sun * Microsystems, Inc. All Rights Reserved. */ *************** *** 16,22 **** import java.awt.*; import java.awt.event.AWTEventListener; import java.awt.event.WindowEvent; - import java.io.ObjectStreamException; import java.lang.ref.Reference; import java.lang.ref.SoftReference; import java.lang.reflect.Method; --- 16,21 ---- *************** *** 29,38 **** import javax.help.HelpSet; import javax.help.HelpSetException; import javax.help.JHelp; import org.openide.ErrorManager; import org.openide.util.*; - import org.openide.windows.CloneableTopComponent; import org.openide.windows.WindowManager; // [PENDING] should event dispatch thread be used thruout? --- 28,38 ---- import javax.help.HelpSet; import javax.help.HelpSetException; import javax.help.JHelp; + import org.netbeans.api.progress.ProgressHandle; + import org.netbeans.api.progress.ProgressHandleFactory; import org.openide.ErrorManager; import org.openide.util.*; import org.openide.windows.WindowManager; // [PENDING] should event dispatch thread be used thruout? *************** *** 83,88 **** --- 83,90 ---- /** progress of merging help sets; max is # of sets to merge */ private static final BoundedRangeModel mergeModel = new DefaultBoundedRangeModel(0, 0, 0, 0); + + private ProgressHandle progressHandle = null; /** Get the master help set that others will be merged into. * @return the master help set *************** *** 319,324 **** --- 321,331 ---- final HelpSet[] hs_ = new HelpSet[1]; Runnable run = new Runnable() { public void run() { + //Wait so there is enough time to display modal dialog with progress + /*try { + Thread.currentThread().sleep(500); + } catch (InterruptedException exc) { + }*/ String id = ctx2.getHelpID(); if (showmaster || ctx2.equals(HelpCtx.DEFAULT_HELP) || id == null) { Installer.err.log("getting master..."); *************** *** 339,345 **** --- 346,354 ---- // in a separate thread. When finished, the progress dialog will hide // itself and control will return to event thread. Installer.err.log("showing progress dialog..."); + progressHandle = ProgressHandleFactory.createHandle(""); createProgressDialog(run, currentModalDialog()).show(); + progressHandle.finish(); Installer.err.log("dialog done."); } else { // Nothing much to do, run it synchronously in event thread. *************** *** 614,620 **** new ProgressDialog(run, WindowManager.getDefault().getMainWindow()) : new ProgressDialog(run, parent); } ! private static final class ProgressDialog extends JDialog implements TaskListener, Runnable { private Runnable run; public ProgressDialog(Runnable run, Dialog parent) { super(parent, NbBundle.getMessage(JavaHelp.class, "TITLE_loading_help_sets"), true); --- 623,630 ---- new ProgressDialog(run, WindowManager.getDefault().getMainWindow()) : new ProgressDialog(run, parent); } ! ! private final class ProgressDialog extends JDialog implements TaskListener, Runnable { private Runnable run; public ProgressDialog(Runnable run, Dialog parent) { super(parent, NbBundle.getMessage(JavaHelp.class, "TITLE_loading_help_sets"), true); *************** *** 626,644 **** } private void init(Runnable run) { this.run = run; ! // XXX poor UI appearance, could use borders, better layout, ... ! getContentPane().setLayout(new GridLayout(2, 2)); ! //a11y fix for issue 31669, add accessible description, labelfor - TDB ! JLabel pLabel = new JLabel(NbBundle.getMessage(JavaHelp.class, "LBL_parsing_help_sets")); //NOI18N ! JLabel mLabel = new JLabel(NbBundle.getMessage(JavaHelp.class, "LBL_merging_help_sets")); //NOI18N ! JProgressBar pBar = new JProgressBar (HelpSetProcessor.parseModel); ! JProgressBar mBar = new JProgressBar(mergeModel); ! getContentPane().add(pLabel); ! getContentPane().add(pBar); ! getContentPane().add(mLabel); ! getContentPane().add(mBar); ! pLabel.setLabelFor(pBar); ! mLabel.setLabelFor(mBar); getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(JavaHelp.class, "ACSD_Loading_Dialog")); //NOI18N pack(); Dimension screen = Toolkit.getDefaultToolkit().getScreenSize(); --- 636,646 ---- } private void init(Runnable run) { this.run = run; ! JComponent c = ProgressHandleFactory.createProgressComponent(progressHandle); ! c.setPreferredSize(new Dimension(3 * c.getPreferredSize().width, 3 * c.getPreferredSize().height)); ! c.setBorder(BorderFactory.createEmptyBorder(10,10,10,10)); ! getContentPane().add(c); ! progressHandle.start(); getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(JavaHelp.class, "ACSD_Loading_Dialog")); //NOI18N pack(); Dimension screen = Toolkit.getDefaultToolkit().getScreenSize();