Index: openide/dialogs/src/org/openide/Bundle.properties =================================================================== RCS file: /shared/data/ccvs/repository/openide/dialogs/src/org/openide/Bundle.properties,v retrieving revision 1.8 diff -u -r1.8 Bundle.properties --- openide/dialogs/src/org/openide/Bundle.properties 10 Aug 2006 09:16:37 -0000 1.8 +++ openide/dialogs/src/org/openide/Bundle.properties 22 Aug 2006 14:11:15 -0000 @@ -106,4 +106,4 @@ #NOI18N STRING_WizardImageAlignment=South -CTL_InstantiateProgress_Title=Please wait a while until the wizard is completed. +CTL_InstantiateProgress_Title=Please wait. Index: openide/dialogs/src/org/openide/WizardDescriptor.java =================================================================== RCS file: /shared/data/ccvs/repository/openide/dialogs/src/org/openide/WizardDescriptor.java,v retrieving revision 1.34 diff -u -r1.34 WizardDescriptor.java --- openide/dialogs/src/org/openide/WizardDescriptor.java 15 Aug 2006 08:29:42 -0000 1.34 +++ openide/dialogs/src/org/openide/WizardDescriptor.java 22 Aug 2006 14:11:16 -0000 @@ -2259,13 +2259,26 @@ errorPanel.add(m_lblMessage, BorderLayout.CENTER); progressBarPanel = new JPanel (new BorderLayout ()); - // placeholder for progress bar components - progressBarPanel.add (new JLabel (), BorderLayout.NORTH); - progressBarPanel.add (new JProgressBar (), BorderLayout.CENTER); progressBarPanel.setVisible (false); - progressBarPanel.setBorder (BorderFactory.createEmptyBorder (4, 0, 0, 0)); - errorPanel.add (progressBarPanel, BorderLayout.SOUTH); + if (contentDisplayed) { + // place for visualize progress bar in content panel (if contentDisplayed) + progressBarPanel.setOpaque (false); + progressBarPanel.setBorder (BorderFactory.createEmptyBorder (0, 4, 7, 4)); + contentPanel.add (progressBarPanel, BorderLayout.SOUTH); + } else { + // placeholder for progress bar components in WizardPanel (if no contentDisplayed set) + progressBarPanel.add (new JLabel (), BorderLayout.NORTH); + JProgressBar pb = new JProgressBar (); + pb.setOrientation (JProgressBar.HORIZONTAL); + pb.setAlignmentX(0.5f); + pb.setAlignmentY(0.5f); + pb.setString ("0"); // NOI18N + progressBarPanel.add (pb, BorderLayout.CENTER); + + progressBarPanel.setBorder (BorderFactory.createEmptyBorder (4, 0, 0, 0)); + errorPanel.add (progressBarPanel, BorderLayout.SOUTH); + } JPanel fullRightPanel = new JPanel(new BorderLayout()); fullRightPanel.add(labelPanel, BorderLayout.NORTH); @@ -2299,14 +2312,12 @@ } private void setProgressComponent (JComponent progressComp, JLabel progressLabel) { - progressBarPanel.removeAll (); if (progressLabel != null) { progressLabel.setText (PROGRESS_BAR_DISPLAY_NAME); progressBarPanel.add (progressLabel, BorderLayout.NORTH); } progressBarPanel.add (progressComp, BorderLayout.CENTER); progressBarPanel.setVisible (true); - progressBarPanel.revalidate (); } /** Creates content panel.