) 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;
}