Index: openide/dialogs/apichanges.xml =================================================================== RCS file: /shared/data/ccvs/repository/openide/dialogs/apichanges.xml,v retrieving revision 1.8 diff -u -r1.8 apichanges.xml --- openide/dialogs/apichanges.xml 6 Aug 2006 15:58:36 -0000 1.8 +++ openide/dialogs/apichanges.xml 1 Feb 2007 16:40:39 -0000 @@ -23,6 +23,22 @@ Dialogs API + + + Generified WizardDescriptor.Panel + + + + + + WizardDescriptor.Panel and WizardDescriptor.Iterator + has been generified to take generic type for data passed + into readSettings and storeSettings + objects. + + + + Interface ProgressInstantiatingIterator added Index: openide/dialogs/manifest.mf =================================================================== RCS file: /shared/data/ccvs/repository/openide/dialogs/manifest.mf,v retrieving revision 1.9 diff -u -r1.9 manifest.mf --- openide/dialogs/manifest.mf 6 Aug 2006 15:58:36 -0000 1.9 +++ openide/dialogs/manifest.mf 1 Feb 2007 16:40:39 -0000 @@ -1,5 +1,5 @@ Manifest-Version: 1.0 OpenIDE-Module: org.openide.dialogs -OpenIDE-Module-Specification-Version: 7.1 +OpenIDE-Module-Specification-Version: 7.2 OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties Index: openide/dialogs/nbproject/project.properties =================================================================== RCS file: /shared/data/ccvs/repository/openide/dialogs/nbproject/project.properties,v retrieving revision 1.7 diff -u -r1.7 project.properties --- openide/dialogs/nbproject/project.properties 16 Aug 2006 06:28:31 -0000 1.7 +++ openide/dialogs/nbproject/project.properties 1 Feb 2007 16:40:39 -0000 @@ -16,6 +16,8 @@ # Microsystems, Inc. All Rights Reserved. is.autoload=true +javac.compilerargs=-Xlint:unchecked +javac.source=1.5 #javadoc.main.page=org/openide/doc-files/api.html javadoc.arch=${basedir}/../arch/arch-openide-dialogs.xml javadoc.apichanges=${basedir}/apichanges.xml Index: openide/dialogs/src/org/openide/DialogDisplayer.java =================================================================== RCS file: /shared/data/ccvs/repository/openide/dialogs/src/org/openide/DialogDisplayer.java,v retrieving revision 1.5 diff -u -r1.5 DialogDisplayer.java --- openide/dialogs/src/org/openide/DialogDisplayer.java 20 Sep 2006 05:25:12 -0000 1.5 +++ openide/dialogs/src/org/openide/DialogDisplayer.java 1 Feb 2007 16:40:39 -0000 @@ -286,7 +286,7 @@ } public void updateOptions() { - Set addedOptions = new HashSet(5); + Set addedOptions = new HashSet(5); Object[] options = nd.getOptions(); if (options == null) { 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.40 diff -u -r1.40 WizardDescriptor.java --- openide/dialogs/src/org/openide/WizardDescriptor.java 11 Jan 2007 14:35:09 -0000 1.40 +++ openide/dialogs/src/org/openide/WizardDescriptor.java 1 Feb 2007 16:40:42 -0000 @@ -253,8 +253,8 @@ /** 'North' or 'South' */ private String imageAlignment = "North"; // NOI18N - /** Iterator between panels in the wizard */ - private Iterator panels; + /** Iterator between panels in the wizard and its settings */ + private SettingsAndIterator data; /** Change listener that invokes method update state */ private ChangeListener weakChangeListener; @@ -267,19 +267,13 @@ // base listener which won't be directly attached, will only wrapped by WeakListener private Listener baseListener; - /** current panel */ - private Panel current; - - /** settings to be used for the panels */ - private Object settings; - /** message format to create title of the document */ private MessageFormat titleFormat; /** hashtable with additional settings that is usually used * by Panels to store their data */ - private Map properties; + private Map properties; ResourceBundle bundle = NbBundle.getBundle(WizardDescriptor.class); /** Request processor that is used for asynchronous jobs (background validation, @@ -320,19 +314,18 @@ * @param settings the settings to pass to panels, or null * @see #WizardDescriptor(WizardDescriptor.Iterator, Object) */ - public WizardDescriptor(Panel[] wizardPanels, Object settings) { - this(new ArrayIterator(wizardPanels), settings); + public WizardDescriptor(Panel[] wizardPanels, Data settings) { + this(new SettingsAndIterator(new ArrayIterator(wizardPanels), settings)); } - + /** Create a new wizard from a fixed list of panels with settings * defaulted to this. * * @param wizardPanels the panels to use * @see #WizardDescriptor(WizardDescriptor.Iterator, Object) */ - public WizardDescriptor(Panel[] wizardPanels) { - // passing CLOSE_PREVENTER which is treated especially - this(wizardPanels, CLOSE_PREVENTER); + public WizardDescriptor(Panel[] wizardPanels) { + this(SettingsAndIterator.create(new ArrayIterator(wizardPanels))); } /** Create wizard for a sequence of panels, passing some settings to the panels. @@ -341,29 +334,29 @@ * @see WizardDescriptor.Panel#readSettings * @see WizardDescriptor.Panel#storeSettings */ - public WizardDescriptor(Iterator panels, Object settings) { + public WizardDescriptor(Iterator panels, Data settings) { + this(new SettingsAndIterator(panels, settings)); + } + + private WizardDescriptor(SettingsAndIterator data) { super("", "", true, DEFAULT_OPTION, null, CLOSE_PREVENTER); // NOI18N - this.settings = (settings == CLOSE_PREVENTER) ? this : settings; + this.data = data; baseListener = new Listener(); - try { - weakNextButtonListener = (ActionListener) WeakListeners.create( - Class.forName("java.awt.event.ActionListener"), baseListener, nextButton - ); // NOI18N - weakPreviousButtonListener = (ActionListener) WeakListeners.create( - Class.forName("java.awt.event.ActionListener"), baseListener, previousButton - ); // NOI18N - weakFinishButtonListener = (ActionListener) WeakListeners.create( - Class.forName("java.awt.event.ActionListener"), baseListener, finishButton - ); // NOI18N - weakCancelButtonListener = (ActionListener) WeakListeners.create( - Class.forName("java.awt.event.ActionListener"), baseListener, cancelButton - ); // NOI18N - } catch (ClassNotFoundException e) { - // cannot happen, java.awt.event.ActionListener listener can always be found - } + weakNextButtonListener = WeakListeners.create(ActionListener.class, + baseListener, nextButton + ); // NOI18N + weakPreviousButtonListener = WeakListeners.create( + ActionListener.class, baseListener, previousButton + ); // NOI18N + weakFinishButtonListener = WeakListeners.create( + ActionListener.class, baseListener, finishButton + ); // NOI18N + weakCancelButtonListener = WeakListeners.create( + ActionListener.class, baseListener, cancelButton + ); // NOI18N nextButton.addActionListener(weakNextButtonListener); previousButton.addActionListener(weakPreviousButtonListener); @@ -375,11 +368,9 @@ super.setOptions(new Object[] { previousButton, nextButton, finishButton, cancelButton }); super.setClosingOptions(new Object[] { finishOption, cancelButton }); - this.panels = panels; - // attach the change listener to iterator - weakChangeListener = WeakListeners.change(baseListener, panels); - panels.addChangeListener(weakChangeListener); + weakChangeListener = WeakListeners.change(baseListener, data.getIterator(this)); + data.getIterator(this).addChangeListener(weakChangeListener); callInitialize(); } @@ -389,9 +380,8 @@ * * @param panels iterator over all {@link WizardDescriptor.Panel}s that can appear in the wizard */ - public WizardDescriptor(Iterator panels) { - // passing CLOSE_PREVENTER which is treated especially - this(panels, CLOSE_PREVENTER); + public WizardDescriptor(Iterator panels) { + this(SettingsAndIterator.create(panels)); } /** Initializes settings. @@ -434,15 +424,37 @@ /** Set a different list of panels. * Correctly updates the buttons. * @param panels the new list of {@link WizardDescriptor.Panel}s + * @deprecated use setPanelsAndSettings if needed. */ + @Deprecated + @SuppressWarnings("unchecked") public final synchronized void setPanels(Iterator panels) { - if (this.panels != null) { - this.panels.removeChangeListener(weakChangeListener); + if (data.getIterator(this) != null) { + data.getIterator(this).removeChangeListener(weakChangeListener); } - this.panels = panels; - weakChangeListener = WeakListeners.change(baseListener, panels); - panels.addChangeListener(weakChangeListener); + data = data.clone(panels); + weakChangeListener = WeakListeners.change(baseListener, data.getIterator(this)); + data.getIterator(this).addChangeListener(weakChangeListener); + init = false; + + updateState(); + } + + /** Set a different list of panels. + * Correctly updates the buttons. + * @param panels the new list of {@link WizardDescriptor.Panel}s + * @param settings the new settings that will be passed to the panels + * @since 7.2 + */ + public final synchronized void setPanelsAndSettings(Iterator panels, Data settings) { + if (data.getIterator(this) != null) { + data.getIterator(this).removeChangeListener(weakChangeListener); + } + + data = new SettingsAndIterator(panels, settings); + weakChangeListener = WeakListeners.change(baseListener, data.getIterator(this)); + data.getIterator(this).addChangeListener(weakChangeListener); init = false; updateState(); @@ -474,7 +486,7 @@ /** Converts some options. */ private Object[] convertOptions(Object[] options) { - Object[] clonedOptions = (Object[]) options.clone(); + Object[] clonedOptions = options.clone(); for (int i = clonedOptions.length - 1; i >= 0; i--) { if (clonedOptions[i] == NEXT_OPTION) { @@ -576,7 +588,7 @@ synchronized (this) { if (properties == null) { - properties = new HashMap(7); + properties = new HashMap(7); } oldValue = properties.get(name); @@ -653,33 +665,36 @@ * */ protected synchronized void updateState() { - Panel p = panels.current(); + updateStateOpen(data); + } + private void updateStateOpen(SettingsAndIterator data) { + Panel p = data.getIterator(this).current(); // listeners on the panel - if (current != p) { - if (current != null) { + if (data.current != p) { + if (data.current != null) { // remove - current.removeChangeListener(weakChangeListener); - current.storeSettings(settings); + data.current.removeChangeListener(weakChangeListener); + data.current.storeSettings(data.getSettings(this)); } // Hack - obtain current panel again // It's here to allow dynamic change of panels in wizard // (which can be done in storeSettings method) - p = panels.current(); + p = data.getIterator(this).current(); // add to new, detach old change listener and attach new one - panels.removeChangeListener(weakChangeListener); + data.getIterator(this).removeChangeListener(weakChangeListener); weakChangeListener = WeakListeners.change(baseListener, p); - panels.addChangeListener(weakChangeListener); + data.getIterator(this).addChangeListener(weakChangeListener); p.addChangeListener(weakChangeListener); - current = p; - current.readSettings(settings); + data.current = p; + p.readSettings(data.getSettings(this)); } - boolean next = panels.hasNext(); - boolean prev = panels.hasPrevious(); + boolean next = data.getIterator(this).hasNext(); + boolean prev = data.getIterator(this).hasPrevious(); boolean valid = p.isValid(); // AWT sensitive code @@ -774,7 +789,7 @@ panelName = ""; // NOI18N } - Object[] args = { panelName, panels.name() }; + Object[] args = { panelName, data.getIterator(this).name() }; MessageFormat mf = getTitleFormat(); if (autoWizardStyle) { @@ -792,22 +807,22 @@ // for xtesting usage only boolean isForwardEnabled () { - return panels.current ().isValid () && !validationRuns; + return data.getIterator(this).current ().isValid () && !validationRuns; } private void updateStateInAWT () { - Panel p = panels.current (); - boolean next = panels.hasNext (); - boolean prev = panels.hasPrevious (); + Panel p = data.getIterator(this).current (); + boolean next = data.getIterator(this).hasNext (); + boolean prev = data.getIterator(this).hasPrevious (); boolean valid = p.isValid () && !validationRuns; nextButton.setEnabled (next && valid); previousButton.setEnabled (prev); cancelButton.setEnabled (true); - if (current instanceof FinishablePanel) { + if (data.current instanceof FinishablePanel) { // check if isFinishPanel - if (((FinishablePanel)current).isFinishPanel ()) { + if (((FinishablePanel)data.current).isFinishPanel ()) { finishButton.setEnabled (valid); } else { // XXX What if the last panel is not FinishPanel ??? enable ? @@ -817,7 +832,7 @@ // original way finishButton.setEnabled ( valid && - (!next || (current instanceof FinishPanel)) + (!next || (data.current instanceof FinishPanel)) ); } } @@ -877,7 +892,7 @@ * wizard window exceeds screen bounds after resize. */ private void resizeWizard(Window parentWindow, Dimension prevSize) { - Dimension curSize = panels.current().getComponent().getPreferredSize(); + Dimension curSize = data.getIterator(this).current().getComponent().getPreferredSize(); // only enlarge if needed, don't shrink if ((curSize.width > prevSize.width) || (curSize.height > prevSize.height)) { @@ -1113,8 +1128,11 @@ /** Overrides superclass method. Adds reseting of wizard * for CLOSED_OPTION. */ public void setValue(Object value) { + setValueOpen(value, data); + } + + private void setValueOpen(Object value, SettingsAndIterator data) { Object convertedValue = backConvertOption(value); - // set new value w/o fire PROP_VALUE change Object oldValue = getValue(); setValueWithoutPCH(convertedValue); @@ -1125,8 +1143,8 @@ } else if (FINISH_OPTION.equals(convertedValue) || NEXT_OPTION.equals(convertedValue)) { //Bugfix #25820: make sure that storeSettings //is called before propertyChange. - if (current != null) { - current.storeSettings(settings); + if (data.current != null) { + data.current.storeSettings(data.getSettings(this)); } } @@ -1136,10 +1154,14 @@ /** Resets wizard when after closed/cancelled/finished the wizard dialog. */ private void resetWizard() { - if (current != null) { - current.storeSettings(settings); - current.removeChangeListener(weakChangeListener); - current = null; + resetWizardOpen(data); + } + + private void resetWizardOpen(SettingsAndIterator data) { + if (data.current != null) { + data.current.storeSettings(data.getSettings(this)); + data.current.removeChangeListener(weakChangeListener); + data.current = null; if (wizardPanel != null) { wizardPanel.resetPreferredSize(); @@ -1149,7 +1171,7 @@ callUninitialize(); // detach the change listener at the end of wizard - panels.removeChangeListener(weakChangeListener); + data.getIterator(this).removeChangeListener(weakChangeListener); } private int getIntFromBundle(String key) { @@ -1210,7 +1232,7 @@ } // focus source of this problem - final JComponent comp = (JComponent) wve.getSource(); + final JComponent comp = wve.getSource(); if (comp != null && comp.isFocusable()) { comp.requestFocus(); } @@ -1239,24 +1261,30 @@ // helper methods which call to InstantiatingIterator private void callInitialize() { - assert panels != null; + assert data.getIterator(this) != null; - if (panels instanceof InstantiatingIterator) { - ((InstantiatingIterator) panels).initialize(this); + if (data.getIterator(this) instanceof InstantiatingIterator) { + ((InstantiatingIterator) data.getIterator(this)).initialize(this); } newObjects = Collections.EMPTY_SET; } private void callUninitialize() { - assert panels != null; + assert data.getIterator(this) != null; - if (panels instanceof InstantiatingIterator) { - ((InstantiatingIterator) panels).uninitialize(this); + if (data.getIterator(this) instanceof InstantiatingIterator) { + ((InstantiatingIterator) data.getIterator(this)).uninitialize(this); } } private void callInstantiate() throws IOException { + callInstantiateOpen(data); + } + + private void callInstantiateOpen(SettingsAndIterator data) throws IOException { + Iterator panels = data.getIterator(this); + assert panels != null; err.log (Level.FINE, "Is AsynchronousInstantiatingIterator? " + (panels instanceof AsynchronousInstantiatingIterator)); @@ -1283,7 +1311,7 @@ } // bugfix #44444, force store settings before do instantiate new objects - panels.current().storeSettings(settings); + panels.current().storeSettings(data.getSettings(this)); if (panels instanceof InstantiatingIterator) { showWaitCursor(); @@ -1357,11 +1385,11 @@ /** Iterator on the sequence of panels. * @see WizardDescriptor.Panel */ - public interface Iterator { + public interface Iterator { /** Get the current panel. * @return the panel */ - public Panel current(); + public Panel current(); /** Get the name of the current panel. * @return the name @@ -1410,7 +1438,7 @@ * * Please see complete guide at http://performance.netbeans.org/howto/dialogs/wizard-panels.html */ - public interface Panel { + public interface Panel { /** Get the component displayed in this panel. * * Note; method can be called from any thread, but not concurrently @@ -1438,7 +1466,7 @@ * @exception IllegalStateException if the the data provided * by the wizard are not valid. */ - public void readSettings(Object settings); + public void readSettings(Data settings); /** Provides the wizard panel with the opportunity to update the * settings with its current customized state. @@ -1453,7 +1481,7 @@ * in fact the TemplateWizard. * @param settings the object representing wizard panel state */ - public void storeSettings(Object settings); + public void storeSettings(Data settings); /** Test whether the panel is finished and it is safe to proceed to the next one. * If the panel is valid, the "Next" (or "Finish") button will be enabled. @@ -1483,14 +1511,15 @@ * implementing this interface. * @deprecated 4.28 Use FinishablePanel instead. */ - public interface FinishPanel extends Panel { + @Deprecated + public interface FinishPanel extends Panel { } /** A special interface for panels that need to do additional * validation when Next or Finish button is clicked. * @since 4.28 */ - public interface ValidatingPanel extends Panel { + public interface ValidatingPanel extends Panel { /** * Is called when Next of Finish buttons are clicked and * allows deeper check to find out that panel is in valid @@ -1516,7 +1545,7 @@ * * @since 6.2 (16 May 2005) */ - public interface AsynchronousValidatingPanel extends ValidatingPanel { + public interface AsynchronousValidatingPanel extends ValidatingPanel { /** * Called synchronously from UI thread when Next @@ -1540,7 +1569,7 @@ * Finish button. * @since 4.28 */ - public interface FinishablePanel extends Panel { + public interface FinishablePanel extends Panel { /** Specify if this panel would enable Finish button. Finish button is * enabled if and only if isValid() returns true and isFinishPanel() * returns true. @@ -1558,7 +1587,7 @@ * in a template's declaration.) * @since org.openide/1 4.33 */ - public interface InstantiatingIterator extends Iterator { + public interface InstantiatingIterator extends Iterator { /** Returns set of instantiated objects. If instantiation fails then wizard remains open to enable correct values. * * @throws IOException @@ -1587,7 +1616,7 @@ * in a template's declaration.) * @since org.openide/1 6.5 */ - public interface AsynchronousInstantiatingIterator extends InstantiatingIterator { + public interface AsynchronousInstantiatingIterator extends InstantiatingIterator { /** * Is called in separate thread when the Finish button @@ -1609,7 +1638,7 @@ * in a template's declaration.) * @since org.openide.dialogs 7.1 */ - public interface ProgressInstantiatingIterator extends AsynchronousInstantiatingIterator { + public interface ProgressInstantiatingIterator extends AsynchronousInstantiatingIterator { /** * Is called in separate thread when the Finish button @@ -1629,10 +1658,10 @@ /** Special iterator that works on an array of Panels. */ - public static class ArrayIterator extends Object implements Iterator { + public static class ArrayIterator extends Object implements Iterator { /** Array of items. */ - private Panel[] panels; + private Panel[] panels; /** Index into the array */ @@ -1649,7 +1678,7 @@ /** Construct an iterator. * @param array the list of panels to use */ - public ArrayIterator(Panel[] array) { + public ArrayIterator(Panel[] array) { panels = array; index = 0; } @@ -1658,13 +1687,14 @@ * constructed using default constructor. * (for example during deserialization. * Default implementation returns empty array. */ - protected Panel[] initializePanels() { + @SuppressWarnings("unchecked") + protected Panel[] initializePanels() { return new Panel[0]; } /* The current panel. */ - public Panel current() { + public Panel current() { return panels[index]; } @@ -1742,6 +1772,7 @@ /** Action listener */ public void actionPerformed(ActionEvent ev) { + final Iterator panels = data.getIterator(WizardDescriptor.this); if (wizardPanel != null) { wizardPanel.setErrorMessage(" ", null); //NOI18N } @@ -2546,6 +2577,7 @@ /** Overriden to delegate call to user component. */ + @Deprecated public boolean requestDefaultFocus() { if (rightComponent instanceof JComponent) { return ((JComponent) rightComponent).requestDefaultFocus(); @@ -2633,6 +2665,41 @@ assert ESTIMATED_HEIGHT == Utilities.loadImage ("org/netbeans/modules/dialogs/warning.gif").getHeight (null) : "Use only 16px icon."; preferredSize.height = Math.max (ESTIMATED_HEIGHT, preferredSize.height); return preferredSize; + } + } + + private static final class SettingsAndIterator { + private final Iterator panels; + private final Data settings; + private final boolean useThis; + /** current panel */ + private Panel current; + + + public SettingsAndIterator(Iterator iterator, Data settings) { + this(iterator, settings, false); + } + public SettingsAndIterator(Iterator iterator, Data settings, boolean useThis) { + this.panels = iterator; + this.settings = settings; + this.useThis = useThis; + } + public static SettingsAndIterator create(Iterator iterator) { + return new SettingsAndIterator(iterator, null, true); + } + + public Iterator getIterator(WizardDescriptor caller) { + return panels; + } + + @SuppressWarnings("unchecked") + public Data getSettings(WizardDescriptor caller) { + return useThis ? (Data)caller : settings; + } + + public SettingsAndIterator clone(Iterator it) { + SettingsAndIterator s = new SettingsAndIterator(it, settings, useThis); + return s; } } } Index: openide/loaders/src/org/openide/loaders/NewObjectWizardPanel.java =================================================================== RCS file: /shared/data/ccvs/repository/openide/loaders/src/org/openide/loaders/NewObjectWizardPanel.java,v retrieving revision 1.7 diff -u -r1.7 NewObjectWizardPanel.java --- openide/loaders/src/org/openide/loaders/NewObjectWizardPanel.java 1 Jul 2006 09:08:22 -0000 1.7 +++ openide/loaders/src/org/openide/loaders/NewObjectWizardPanel.java 1 Feb 2007 16:40:42 -0000 @@ -30,7 +30,7 @@ * * @author Jiri Rechtacek */ -final class NewObjectWizardPanel implements WizardDescriptor.FinishablePanel { +final class NewObjectWizardPanel implements WizardDescriptor.FinishablePanel { private NewObjectPanel newObjectPanelUI; /** listener to changes in the wizard */ private ChangeListener listener; @@ -135,7 +135,7 @@ * This method can be called multiple times on one instance of WizardDescriptor.Panel. * @param settings the object representing wizard panel state, as originally supplied to {@link WizardDescriptor#WizardDescriptor(WizardDescriptor.Iterator,Object)} */ - public void readSettings(Object settings) { + public void readSettings(WizardDescriptor settings) { this.wizard = (TemplateWizard)settings; DataObject template = wizard.getTemplate (); if (template != null) { @@ -159,7 +159,7 @@ * This method can be called multiple times on one instance of WizardDescriptor.Panel. * @param settings the object representing a settings of the wizard */ - public void storeSettings(Object settings) { + public void storeSettings(WizardDescriptor settings) { String name = getPanelUI ().getNewObjectName (); if (name.equals (NewObjectPanel.defaultNewObjectName ())) { name = null; Index: openide/loaders/src/org/openide/loaders/TemplateWizard.java =================================================================== RCS file: /shared/data/ccvs/repository/openide/loaders/src/org/openide/loaders/TemplateWizard.java,v retrieving revision 1.25 diff -u -r1.25 TemplateWizard.java --- openide/loaders/src/org/openide/loaders/TemplateWizard.java 23 Dec 2006 16:02:46 -0000 1.25 +++ openide/loaders/src/org/openide/loaders/TemplateWizard.java 1 Feb 2007 16:40:43 -0000 @@ -68,9 +68,9 @@ static java.awt.Dimension PREF_DIM = new java.awt.Dimension (560, 350); /** panel */ - private Panel templateChooser; + private Panel templateChooser; /** panel */ - private Panel targetChooser; + private Panel targetChooser; /** whether to show target chooser */ private boolean showTargetChooser = true; @@ -271,7 +271,7 @@ /** Returns wizard panel that is used to choose a template. * @return wizard panel */ - public Panel templateChooser () { + public Panel templateChooser () { synchronized (this) { if (templateChooser == null) { templateChooser = createTemplateChooser (); @@ -284,7 +284,7 @@ * name of the template. * @return wizard panel */ - public Panel targetChooser () { + public Panel targetChooser () { synchronized (this) { if (targetChooser == null) { targetChooser = createTargetChooser (); @@ -307,7 +307,7 @@ * * @return the panel */ - protected Panel createTemplateChooser () { + protected Panel createTemplateChooser () { return new TemplateWizardPanel1 (); } @@ -315,8 +315,12 @@ * * @return the panel */ - protected Panel createTargetChooser () { - return showTargetChooser ? (Panel)new TemplateWizardPanel2 () : (Panel)new NewObjectWizardPanel (); + protected Panel createTargetChooser () { + if (showTargetChooser) { + return new TemplateWizardPanel2 (); + } else { + return new NewObjectWizardPanel (); + } } /** Allows subclasses to provide their own default iterator @@ -661,6 +665,7 @@ * @param obj the data object * @return custom iterator or null */ + @SuppressWarnings("unchecked") public static Iterator getIterator (DataObject obj) { Object unknownIterator = obj.getPrimaryFile ().getAttribute(CUSTOM_ITERATOR); if (unknownIterator == null) { @@ -672,7 +677,7 @@ it = (Iterator)unknownIterator; // own brigde for each one iterator type } if (unknownIterator instanceof WizardDescriptor.InstantiatingIterator) { - it = new InstantiatingIteratorBridge((WizardDescriptor.InstantiatingIterator) unknownIterator); + it = new InstantiatingIteratorBridge((WizardDescriptor.InstantiatingIterator) unknownIterator); } if (it != null) { return it; @@ -808,7 +813,7 @@ *

* Implements Node.Cookie since version 2.13 */ - public interface Iterator extends WizardDescriptor.Iterator, + public interface Iterator extends WizardDescriptor.Iterator, java.io.Serializable, org.openide.nodes.Node.Cookie { /** Instantiates the template using information provided by * the wizard. If instantiation fails then wizard remains open to enable correct values. @@ -890,7 +895,7 @@ /** Get the current panel. * @return the panel */ - public Panel current() { + public Panel current() { return targetChooser (); } @@ -939,8 +944,8 @@ } private static class InstantiatingIteratorBridge implements TemplateWizard.Iterator { - private WizardDescriptor.InstantiatingIterator instantiatingIterator; - public InstantiatingIteratorBridge (WizardDescriptor.InstantiatingIterator it) { + private WizardDescriptor.InstantiatingIterator instantiatingIterator; + public InstantiatingIteratorBridge (WizardDescriptor.InstantiatingIterator it) { instantiatingIterator = it; } @@ -952,7 +957,7 @@ instantiatingIterator.addChangeListener (l); } - public org.openide.WizardDescriptor.Panel current () { + public org.openide.WizardDescriptor.Panel current () { return instantiatingIterator.current (); } Index: openide/loaders/src/org/openide/loaders/TemplateWizardIterImpl.java =================================================================== RCS file: /shared/data/ccvs/repository/openide/loaders/src/org/openide/loaders/TemplateWizardIterImpl.java,v retrieving revision 1.10 diff -u -r1.10 TemplateWizardIterImpl.java --- openide/loaders/src/org/openide/loaders/TemplateWizardIterImpl.java 6 Aug 2006 15:58:35 -0000 1.10 +++ openide/loaders/src/org/openide/loaders/TemplateWizardIterImpl.java 1 Feb 2007 16:40:43 -0000 @@ -57,7 +57,7 @@ /** Getter for the first panel. * @return the first and default panel */ - private WizardDescriptor.Panel firstPanel () { + private WizardDescriptor.Panel firstPanel () { return wizardInstance.templateChooser(); } @@ -114,7 +114,7 @@ /** Get the current panel. * @return the panel */ - public WizardDescriptor.Panel current() { + public WizardDescriptor.Panel current() { return showingPanel ? firstPanel () : getIterator ().current (); } Index: openide/loaders/src/org/openide/loaders/TemplateWizardIteratorWrapper.java =================================================================== RCS file: /shared/data/ccvs/repository/openide/loaders/src/org/openide/loaders/TemplateWizardIteratorWrapper.java,v retrieving revision 1.2 diff -u -r1.2 TemplateWizardIteratorWrapper.java --- openide/loaders/src/org/openide/loaders/TemplateWizardIteratorWrapper.java 6 Aug 2006 15:58:35 -0000 1.2 +++ openide/loaders/src/org/openide/loaders/TemplateWizardIteratorWrapper.java 1 Feb 2007 16:40:43 -0000 @@ -29,7 +29,7 @@ * * @author Jiri Rechtacek */ -class TemplateWizardIteratorWrapper implements WizardDescriptor.Iterator, ChangeListener { +class TemplateWizardIteratorWrapper implements WizardDescriptor.Iterator, ChangeListener { private TemplateWizardIterImpl iterImpl; @@ -63,7 +63,7 @@ /** Get the current panel. * @return the panel */ - public WizardDescriptor.Panel current() { + public WizardDescriptor.Panel current() { return iterImpl.current (); } @@ -143,19 +143,19 @@ return iterImpl.instantiate (handle); } - static class InstantiatingIterator extends TemplateWizardIteratorWrapper implements WizardDescriptor.InstantiatingIterator { + static class InstantiatingIterator extends TemplateWizardIteratorWrapper implements WizardDescriptor.InstantiatingIterator { public InstantiatingIterator (TemplateWizardIterImpl it) { super (it); } } - static class AsynchronousInstantiatingIterator extends InstantiatingIterator implements WizardDescriptor.AsynchronousInstantiatingIterator { + static class AsynchronousInstantiatingIterator extends InstantiatingIterator implements WizardDescriptor.AsynchronousInstantiatingIterator { public AsynchronousInstantiatingIterator (TemplateWizardIterImpl it) { super (it); } } - static class ProgressInstantiatingIterator extends InstantiatingIterator implements WizardDescriptor.ProgressInstantiatingIterator { + static class ProgressInstantiatingIterator extends InstantiatingIterator implements WizardDescriptor.ProgressInstantiatingIterator { private TemplateWizardIterImpl itImpl; public ProgressInstantiatingIterator (TemplateWizardIterImpl it) { super (it); Index: openide/loaders/src/org/openide/loaders/TemplateWizardPanel1.java =================================================================== RCS file: /shared/data/ccvs/repository/openide/loaders/src/org/openide/loaders/TemplateWizardPanel1.java,v retrieving revision 1.3 diff -u -r1.3 TemplateWizardPanel1.java --- openide/loaders/src/org/openide/loaders/TemplateWizardPanel1.java 1 Jul 2006 09:08:23 -0000 1.3 +++ openide/loaders/src/org/openide/loaders/TemplateWizardPanel1.java 1 Feb 2007 16:40:43 -0000 @@ -28,7 +28,7 @@ * * @author Jiri Rechtacek */ -final class TemplateWizardPanel1 implements WizardDescriptor.Panel { +final class TemplateWizardPanel1 implements WizardDescriptor.Panel { private TemplateWizard1 templateWizard1UI; /** listener to changes in the wizard */ private ChangeListener listener; @@ -101,7 +101,7 @@ * This method can be called multiple times on one instance of WizardDescriptor.Panel. * @param settings the object representing wizard panel state, as originally supplied to {@link WizardDescriptor#WizardDescriptor(WizardDescriptor.Iterator,Object)} */ - public void readSettings(Object settings) { + public void readSettings(WizardDescriptor settings) { getPanelUI ().implReadSettings (settings); } @@ -114,7 +114,7 @@ * This method can be called multiple times on one instance of WizardDescriptor.Panel. * @param settings the object representing a settings of the wizard */ - public void storeSettings(Object settings) { + public void storeSettings(WizardDescriptor settings) { getPanelUI ().implStoreSettings (settings); } Index: openide/loaders/src/org/openide/loaders/TemplateWizardPanel2.java =================================================================== RCS file: /shared/data/ccvs/repository/openide/loaders/src/org/openide/loaders/TemplateWizardPanel2.java,v retrieving revision 1.5 diff -u -r1.5 TemplateWizardPanel2.java --- openide/loaders/src/org/openide/loaders/TemplateWizardPanel2.java 2 Aug 2006 06:53:33 -0000 1.5 +++ openide/loaders/src/org/openide/loaders/TemplateWizardPanel2.java 1 Feb 2007 16:40:43 -0000 @@ -27,7 +27,7 @@ * * @author Jiri Rechtacek */ -final class TemplateWizardPanel2 implements WizardDescriptor.FinishablePanel { +final class TemplateWizardPanel2 implements WizardDescriptor.FinishablePanel { private TemplateWizard2 templateWizard2UI; /** listener to changes in the wizard */ private ChangeListener listener; @@ -111,7 +111,7 @@ * by the wizard are not valid. * */ - public void readSettings(Object settings) { + public void readSettings(WizardDescriptor settings) { this.settings = (WizardDescriptor)settings; getPanelUI ().implReadSettings (settings); } @@ -130,7 +130,7 @@ * @param settings the object representing wizard panel state * */ - public void storeSettings(Object settings) { + public void storeSettings(WizardDescriptor settings) { getPanelUI ().implStoreSettings (settings); this.settings = null; }