Index: java/j2seproject/src/org/netbeans/modules/java/j2seproject/ui/resources/layer.xml
===================================================================
RCS file: /cvs/java/j2seproject/src/org/netbeans/modules/java/j2seproject/ui/resources/layer.xml,v
retrieving revision 1.4
diff -u -r1.4 layer.xml
--- java/j2seproject/src/org/netbeans/modules/java/j2seproject/ui/resources/layer.xml 19 Apr 2004 12:39:33 -0000 1.4
+++ java/j2seproject/src/org/netbeans/modules/java/j2seproject/ui/resources/layer.xml 3 May 2004 15:50:16 -0000
@@ -21,18 +21,18 @@
-
+
-
+
-
+
-
+
Index: java/project/src/org/netbeans/modules/java/project/JavaTargetChooserPanel.java
===================================================================
RCS file: /cvs/java/project/src/org/netbeans/modules/java/project/JavaTargetChooserPanel.java,v
retrieving revision 1.3
diff -u -r1.3 JavaTargetChooserPanel.java
--- java/project/src/org/netbeans/modules/java/project/JavaTargetChooserPanel.java 28 Apr 2004 13:27:27 -0000 1.3
+++ java/project/src/org/netbeans/modules/java/project/JavaTargetChooserPanel.java 3 May 2004 15:50:16 -0000
@@ -28,7 +28,6 @@
import org.openide.WizardDescriptor;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
-import org.openide.loaders.TemplateWizard;
import org.openide.util.HelpCtx;
/**
@@ -83,23 +82,23 @@
public void readSettings( Object settings ) {
- TemplateWizard templateWizard = (TemplateWizard)settings;
+ WizardDescriptor wizard = (WizardDescriptor) settings;
if ( gui != null ) {
- Project project = Templates.getProject( templateWizard );
+ Project project = Templates.getProject( wizard );
// Try to preselect a folder
// XXX The test should be rewritten if external project dirs are supported
- FileObject preselectedTarget = Templates.getTargetFolder( templateWizard );
+ FileObject preselectedTarget = Templates.getTargetFolder( wizard );
String targetFolder = null;
if ( preselectedTarget != null && FileUtil.isParentOf( project.getProjectDirectory(), preselectedTarget ) ) {
targetFolder = FileUtil.getRelativePath( project.getProjectDirectory(), preselectedTarget );
}
// Init values
- gui.initValues( project, folders, Templates.getTemplate( templateWizard ), targetFolder );
+ gui.initValues( project, folders, Templates.getTemplate( wizard ), targetFolder );
}
}
Index: java/project/src/org/netbeans/modules/java/project/NewJavaFileWizardIterator.java
===================================================================
RCS file: /cvs/java/project/src/org/netbeans/modules/java/project/NewJavaFileWizardIterator.java,v
retrieving revision 1.2
diff -u -r1.2 NewJavaFileWizardIterator.java
--- java/project/src/org/netbeans/modules/java/project/NewJavaFileWizardIterator.java 28 Apr 2004 13:27:28 -0000 1.2
+++ java/project/src/org/netbeans/modules/java/project/NewJavaFileWizardIterator.java 3 May 2004 15:50:16 -0000
@@ -40,14 +40,13 @@
import org.openide.filesystems.Repository;
import org.openide.loaders.DataFolder;
import org.openide.loaders.DataObject;
-import org.openide.loaders.TemplateWizard;
import org.openide.nodes.Node;
/**
* Wizard to create a new J2SE project.
* @author Jesse Glick
*/
-public class NewJavaFileWizardIterator implements TemplateWizard.Iterator {
+public class NewJavaFileWizardIterator implements WizardDescriptor.InstantiatingIterator {
private static final long serialVersionUID = 1L;
@@ -87,7 +86,7 @@
};
}
- public Set/**/ instantiate(TemplateWizard wiz) throws IOException {
+ public Set/**/ instantiate (/*WizardDescriptor wizardDescriptor*/) throws IOException {
FileObject dir = Templates.getTargetFolder( wiz );
DataFolder df = DataFolder.findFolder( dir );
@@ -116,9 +115,9 @@
private transient int index;
private transient WizardDescriptor.Panel[] panels;
- private transient TemplateWizard wiz;
+ private transient WizardDescriptor wiz;
- public void initialize(TemplateWizard wiz) {
+ public void initialize(WizardDescriptor wiz) {
this.wiz = wiz;
index = 0;
panels = createPanels( wiz );
@@ -141,7 +140,7 @@
}
}
}
- public void uninitialize(TemplateWizard wiz) {
+ public void uninitialize (WizardDescriptor wiz) {
this.wiz = null;
panels = null;
}
Index: java/project/src/org/netbeans/modules/java/project/layer.xml
===================================================================
RCS file: /cvs/java/project/src/org/netbeans/modules/java/project/layer.xml,v
retrieving revision 1.2
diff -u -r1.2 layer.xml
--- java/project/src/org/netbeans/modules/java/project/layer.xml 26 Apr 2004 08:33:08 -0000 1.2
+++ java/project/src/org/netbeans/modules/java/project/layer.xml 3 May 2004 15:50:16 -0000
@@ -36,7 +36,7 @@
-
+
@@ -45,25 +45,25 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
Index: java/project/src/org/netbeans/spi/java/project/support/ui/templates/JavaTemplates.java
===================================================================
RCS file: /cvs/java/project/src/org/netbeans/spi/java/project/support/ui/templates/JavaTemplates.java,v
retrieving revision 1.4
diff -u -r1.4 JavaTemplates.java
--- java/project/src/org/netbeans/spi/java/project/support/ui/templates/JavaTemplates.java 28 Apr 2004 13:27:28 -0000 1.4
+++ java/project/src/org/netbeans/spi/java/project/support/ui/templates/JavaTemplates.java 3 May 2004 15:50:16 -0000
@@ -15,11 +15,11 @@
import org.netbeans.api.project.Project;
import org.netbeans.modules.java.project.JavaTargetChooserPanel;
+import org.netbeans.modules.java.project.NewJavaFileWizardIterator;
import org.netbeans.spi.project.SourceGroup;
import org.netbeans.spi.project.ui.templates.support.Templates;
import org.openide.WizardDescriptor;
import org.openide.filesystems.FileObject;
-import org.openide.loaders.TemplateWizard;
/**
* Default implementations of Java-specific template UI.
@@ -39,6 +39,10 @@
*/
public static WizardDescriptor.Panel createPackageChooser(Project project, SourceGroup[] folders) {
return new JavaTargetChooserPanel(project, folders);
+ }
+
+ public static WizardDescriptor.InstantiatingIterator createJavaTemplatesIterator () {
+ return new NewJavaFileWizardIterator ();
}
}
Index: projects/projectui/nbproject/project.xml
===================================================================
RCS file: /cvs/projects/projectui/nbproject/project.xml,v
retrieving revision 1.3
diff -u -r1.3 project.xml
--- projects/projectui/nbproject/project.xml 3 Apr 2004 06:51:48 -0000 1.3
+++ projects/projectui/nbproject/project.xml 3 May 2004 15:50:17 -0000
@@ -47,7 +47,7 @@
1
- 4.13
+ 4.29
Index: projects/projectui/src/org/netbeans/modules/project/ui/NewFileWizard.java
===================================================================
RCS file: /cvs/projects/projectui/src/org/netbeans/modules/project/ui/NewFileWizard.java,v
retrieving revision 1.4
diff -u -r1.4 NewFileWizard.java
--- projects/projectui/src/org/netbeans/modules/project/ui/NewFileWizard.java 26 Apr 2004 13:17:16 -0000 1.4
+++ projects/projectui/src/org/netbeans/modules/project/ui/NewFileWizard.java 3 May 2004 15:50:17 -0000
@@ -37,7 +37,7 @@
import org.openide.loaders.TemplateWizard;
import org.openide.util.HelpCtx;
-public final class NewFileWizard extends TemplateWizard {
+public final class NewFileWizard extends TemplateWizard {
private Project p;
private String[] recommendedTypes;
@@ -64,7 +64,7 @@
}
}
-
+
/** Old impl might be usefull later in Wizards API
///** Wizard for creating new files in a project.
Index: projects/projectui/src/org/netbeans/modules/project/ui/SimpleTargetChooserPanel.java
===================================================================
RCS file: /cvs/projects/projectui/src/org/netbeans/modules/project/ui/SimpleTargetChooserPanel.java,v
retrieving revision 1.3
diff -u -r1.3 SimpleTargetChooserPanel.java
--- projects/projectui/src/org/netbeans/modules/project/ui/SimpleTargetChooserPanel.java 6 Apr 2004 14:24:51 -0000 1.3
+++ projects/projectui/src/org/netbeans/modules/project/ui/SimpleTargetChooserPanel.java 3 May 2004 15:50:17 -0000
@@ -26,7 +26,6 @@
import org.openide.WizardDescriptor;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
-import org.openide.loaders.TemplateWizard;
import org.openide.util.HelpCtx;
/**
@@ -81,23 +80,23 @@
public void readSettings( Object settings ) {
- TemplateWizard templateWizard = (TemplateWizard)settings;
+ WizardDescriptor wd = (WizardDescriptor)settings;
if ( gui != null ) {
- Project project = Templates.getProject( templateWizard );
+ Project project = Templates.getProject( wd );
// Try to preselect a folder
// XXX The test should be rewritten if external project dirs are supported
- FileObject preselectedTarget = Templates.getTargetFolder( templateWizard );
+ FileObject preselectedTarget = Templates.getTargetFolder( wd );
String targetFolder = null;
if ( preselectedTarget != null && FileUtil.isParentOf( project.getProjectDirectory(), preselectedTarget ) ) {
targetFolder = FileUtil.getRelativePath( project.getProjectDirectory(), preselectedTarget );
}
// Init values
- gui.initValues( project, Templates.getTemplate( templateWizard ), targetFolder );
+ gui.initValues( project, Templates.getTemplate( wd ), targetFolder );
}
}
Index: projects/projectui/src/org/netbeans/modules/project/ui/TemplateChooserPanel.java
===================================================================
RCS file: /cvs/projects/projectui/src/org/netbeans/modules/project/ui/TemplateChooserPanel.java,v
retrieving revision 1.2
diff -u -r1.2 TemplateChooserPanel.java
--- projects/projectui/src/org/netbeans/modules/project/ui/TemplateChooserPanel.java 2 Apr 2004 13:54:45 -0000 1.2
+++ projects/projectui/src/org/netbeans/modules/project/ui/TemplateChooserPanel.java 3 May 2004 15:50:17 -0000
@@ -22,6 +22,7 @@
import org.netbeans.api.project.Project;
import org.netbeans.modules.project.uiapi.ProjectChooserFactory;
import org.netbeans.spi.project.SourceGroup;
+import org.netbeans.spi.project.ui.templates.support.Templates;
import org.openide.NotifyDescriptor;
import org.openide.WizardDescriptor;
import org.openide.filesystems.FileObject;
@@ -88,7 +89,7 @@
gui.initValues( p );
}
- TemplateWizard wd = (TemplateWizard)settings;
+ WizardDescriptor wd = (WizardDescriptor)settings;
wd.setTitle( "New File - Choose File Type" );
wd.putProperty( "WizardPanel_contentData", new String[] { "Choose Template", "..." } ); // NOI18N
wd.putProperty( "WizardPanel_contentSelectedIndex", new Integer( 0 ) ); // NOI18N
@@ -96,16 +97,21 @@
public void storeSettings(Object settings) {
- TemplateWizard templateWizard = (TemplateWizard)settings;
+ WizardDescriptor wd = (WizardDescriptor)settings;
- Object value = templateWizard.getValue();
+ Object value = wd.getValue();
if ( NotifyDescriptor.CANCEL_OPTION != value &&
NotifyDescriptor.CLOSED_OPTION != value ) {
try {
- templateWizard.putProperty( ProjectChooserFactory.WIZARD_KEY_PROJECT, gui.getProject() );
- templateWizard.setTemplate( DataObject.find( gui.getTemplate() ) );
+ wd.putProperty( ProjectChooserFactory.WIZARD_KEY_PROJECT, gui.getProject() );
+
+ if (wd instanceof TemplateWizard) {
+ ((TemplateWizard)wd).setTemplate( DataObject.find( gui.getTemplate() ) );
+ } else {
+ wd.putProperty( ProjectChooserFactory.WIZARD_KEY_TEMPLATE, gui.getTemplate () );
+ }
}
catch( DataObjectNotFoundException e ) {
// XXX
Index: projects/projectui/src/org/netbeans/modules/project/ui/actions/NewFile.java
===================================================================
RCS file: /cvs/projects/projectui/src/org/netbeans/modules/project/ui/actions/NewFile.java,v
retrieving revision 1.2
diff -u -r1.2 NewFile.java
--- projects/projectui/src/org/netbeans/modules/project/ui/actions/NewFile.java 19 Apr 2004 17:57:08 -0000 1.2
+++ projects/projectui/src/org/netbeans/modules/project/ui/actions/NewFile.java 3 May 2004 15:50:17 -0000
@@ -24,7 +24,6 @@
import org.netbeans.modules.project.ui.OpenProjectList;
import org.openide.loaders.DataFolder;
import org.openide.loaders.DataObject;
-import org.openide.loaders.TemplateWizard;
import org.openide.util.Lookup;
import org.openide.util.NbBundle;
import org.openide.util.Utilities;
@@ -56,7 +55,7 @@
protected void actionPerformed( Lookup context ) {
- TemplateWizard wd = new NewFileWizard( preselectedProject( context ), null ); //wizardIterator );
+ NewFileWizard wd = new NewFileWizard( preselectedProject( context ), null );
DataFolder preselectedFolder = preselectedFolder( context );
if ( preselectedFolder != null ) {
Index: projects/projectui/src/org/netbeans/modules/project/ui/actions/NewProject.java
===================================================================
RCS file: /cvs/projects/projectui/src/org/netbeans/modules/project/ui/actions/NewProject.java,v
retrieving revision 1.2
diff -u -r1.2 NewProject.java
--- projects/projectui/src/org/netbeans/modules/project/ui/actions/NewProject.java 19 Apr 2004 17:57:08 -0000 1.2
+++ projects/projectui/src/org/netbeans/modules/project/ui/actions/NewProject.java 3 May 2004 15:50:17 -0000
@@ -46,7 +46,7 @@
public void actionPerformed( ActionEvent evt ) {
if ( wizard == null ) {
- wizard = new TemplateWizard();
+ wizard = new TemplateWizard(); // XXX Create NewProjectWizard instead of TemplateWizard
FileObject fo = Repository.getDefault().getDefaultFileSystem().findResource( "Templates/Project" ); //NOI18N
DataFolder templates = DataFolder.findFolder( fo );
Index: projects/projectuiapi/src/org/netbeans/spi/project/ui/templates/support/Templates.java
===================================================================
RCS file: /cvs/projects/projectuiapi/src/org/netbeans/spi/project/ui/templates/support/Templates.java,v
retrieving revision 1.7
diff -u -r1.7 Templates.java
--- projects/projectuiapi/src/org/netbeans/spi/project/ui/templates/support/Templates.java 30 Apr 2004 04:22:01 -0000 1.7
+++ projects/projectuiapi/src/org/netbeans/spi/project/ui/templates/support/Templates.java 3 May 2004 15:50:17 -0000
@@ -24,8 +24,9 @@
import org.netbeans.api.project.Project;
import org.netbeans.modules.project.uiapi.ProjectChooserFactory;
import org.netbeans.modules.project.uiapi.Utilities;
-import org.netbeans.api.project.Sources;
-import org.netbeans.api.project.SourceGroup;
+import org.netbeans.spi.project.Sources;
+import org.netbeans.spi.project.SourceGroup;
+import org.netbeans.spi.project.support.GenericSources;
import org.openide.WizardDescriptor;
import org.openide.filesystems.FileObject;
import org.openide.loaders.DataFolder;
Index: openide/loaders/src/org/openide/loaders/TemplateWizard.java
===================================================================
RCS file: /cvs/openide/loaders/src/org/openide/loaders/TemplateWizard.java,v
retrieving revision 1.9
diff -u -r1.9 TemplateWizard.java
--- openide/loaders/src/org/openide/loaders/TemplateWizard.java 1 Apr 2004 13:32:06 -0000 1.9
+++ openide/loaders/src/org/openide/loaders/TemplateWizard.java 3 May 2004 15:50:18 -0000
@@ -47,12 +47,17 @@
public class TemplateWizard extends WizardDescriptor {
/** EA that defines the wizards description */
private static final String EA_DESCRIPTION = "templateWizardURL"; // NOI18N
- /** EA that defines custom iterator */
+ /** EA that defines custom iterator*/
private static final String EA_ITERATOR = "templateWizardIterator"; // NOI18N
/** EA that defines resource string to the description instead of raw URL
* @deprecated
*/
private static final String EA_DESC_RESOURCE = "templateWizardDescResource"; // NOI18N
+
+ /** Defines the wizards description */
+ private static final String CUSTOM_DESCRIPTION = "instantiatingWizardURL"; // NOI18N
+ /** Defines custom iterator */
+ private static final String CUSTOM_ITERATOR = "instantiatingIterator"; // NOI18N
/** See org.openide.WizardDescriptor.PROP_CONTENT_SELECTED_INDEX
*/
@@ -537,6 +542,7 @@
*/
public static void setDescription (DataObject obj, URL url) throws IOException {
obj.getPrimaryFile().setAttribute(EA_DESCRIPTION, url);
+ obj.getPrimaryFile().setAttribute(CUSTOM_DESCRIPTION, url);
}
/** Method to get a description for a data object.
@@ -544,7 +550,9 @@
* @return the url with description or null
*/
public static URL getDescription (DataObject obj) {
- URL desc = (URL)obj.getPrimaryFile().getAttribute(EA_DESCRIPTION);
+ URL desc = (URL)obj.getPrimaryFile().getAttribute(CUSTOM_DESCRIPTION);
+ if (desc != null) return desc;
+ desc = (URL)obj.getPrimaryFile().getAttribute(EA_DESCRIPTION);
if (desc != null) return desc;
// Backwards compatibility:
String rsrc = (String) obj.getPrimaryFile ().getAttribute (EA_DESC_RESOURCE);
@@ -603,6 +611,7 @@
*/
public static void setIterator (DataObject obj, Iterator iter)
throws IOException {
+ obj.getPrimaryFile().setAttribute(CUSTOM_ITERATOR, iter);
obj.getPrimaryFile().setAttribute(EA_ITERATOR, iter);
}
@@ -615,7 +624,17 @@
* @return custom iterator or null
*/
public static Iterator getIterator (DataObject obj) {
- Iterator it = (Iterator)obj.getPrimaryFile ().getAttribute(EA_ITERATOR);
+ Object unknownIterator = obj.getPrimaryFile ().getAttribute(CUSTOM_ITERATOR);
+ if (unknownIterator == null) {
+ unknownIterator = obj.getPrimaryFile ().getAttribute(EA_ITERATOR);
+ }
+ Iterator it = null;
+ if (unknownIterator instanceof Iterator) {
+ // old style iterator
+ it = (Iterator)unknownIterator;
+ } if (unknownIterator instanceof WizardDescriptor.InstantiatingIterator) {
+ it = new TemplateWizard.Brigde2Iterator ((WizardDescriptor.InstantiatingIterator) unknownIterator);
+ }
if (it != null) {
return it;
}
@@ -874,7 +893,58 @@
public void removeChangeListener(javax.swing.event.ChangeListener l) {
}
}
-
+
+ static class Brigde2Iterator implements TemplateWizard.Iterator {
+ private WizardDescriptor.InstantiatingIterator instantiatingIterator;
+ public Brigde2Iterator (WizardDescriptor.InstantiatingIterator it) {
+ instantiatingIterator = it;
+ }
+
+ public void addChangeListener (javax.swing.event.ChangeListener l) {
+ instantiatingIterator.addChangeListener (l);
+ }
+
+ public org.openide.WizardDescriptor.Panel current () {
+ return instantiatingIterator.current ();
+ }
+
+ public boolean hasNext () {
+ return instantiatingIterator.hasNext ();
+ }
+
+ public boolean hasPrevious () {
+ return instantiatingIterator.hasPrevious ();
+ }
+
+ public String name () {
+ return instantiatingIterator.name ();
+ }
+
+ public void nextPanel () {
+ instantiatingIterator.nextPanel ();
+ }
+
+ public void previousPanel () {
+ instantiatingIterator.previousPanel ();
+ }
+
+ public void removeChangeListener (javax.swing.event.ChangeListener l) {
+ instantiatingIterator.removeChangeListener (l);
+ }
+
+ public void initialize (TemplateWizard wiz) {
+ instantiatingIterator.initialize (wiz);
+ }
+
+ public java.util.Set instantiate (TemplateWizard wiz) throws IOException {
+ return instantiatingIterator.instantiate ();
+ }
+
+ public void uninitialize (TemplateWizard wiz) {
+ instantiatingIterator.uninitialize (wiz);
+ }
+
+ }
/*
public static void main (String[] args) throws java.lang.Exception {
TemplateWizard wiz = new TemplateWizard ();
Index: openide/src/org/openide/WizardDescriptor.java
===================================================================
RCS file: /cvs/openide/src/org/openide/WizardDescriptor.java,v
retrieving revision 1.96
diff -u -r1.96 WizardDescriptor.java
--- openide/src/org/openide/WizardDescriptor.java 26 Apr 2004 16:31:18 -0000 1.96
+++ openide/src/org/openide/WizardDescriptor.java 3 May 2004 15:50:18 -0000
@@ -35,6 +35,7 @@
import java.awt.Window;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeEvent;
+import java.io.IOException;
import java.net.URL;
import java.lang.ref.WeakReference;
@@ -259,6 +260,7 @@
*/
public WizardDescriptor (Iterator panels, Object settings) {
super ("", "", true, DEFAULT_OPTION, null, CLOSE_PREVENTER); // NOI18N
+
this.settings = settings == CLOSE_PREVENTER ? this : settings;
listener = new Listener ();
@@ -273,9 +275,13 @@
super.setOptions (new Object[] { previousButton, nextButton, finishButton, cancelButton });
super.setClosingOptions (new Object[] { finishOption, cancelButton });
+ // must be there?
+ if (panels instanceof InstantiatingIterator) {
+ ((InstantiatingIterator)panels).initialize (this);
+ }
+
this.panels = panels;
panels.addChangeListener (listener);
-
}
/** Create wizard for a sequence of panels, with settings
@@ -292,6 +298,8 @@
*/
protected void initialize () {
super.initialize ();
+
+
updateState ();
}
@@ -853,6 +861,9 @@
}
}
panels.removeChangeListener(listener);
+ if (panels instanceof InstantiatingIterator) {
+ ((InstantiatingIterator)panels).uninitialize (this);
+ }
}
ResourceBundle bundle = NbBundle.getBundle(WizardDescriptor.class);
@@ -1162,6 +1173,31 @@
}
+ /** Instantiating iterator. PENDING
+ */
+ public interface InstantiatingIterator extends Iterator {
+
+ /** PENDING
+ *
+ * @param settings
+ * @throws IOException
+ * @return
+ */
+ public java.util.Set instantiate () throws IOException;
+
+ /** PENDING
+ *
+ * @param wizard
+ */
+ public void initialize (WizardDescriptor wizard);
+
+ /** PENDING
+ *
+ * @param wizard
+ */
+ public void uninitialize (WizardDescriptor wizard);
+ }
+
private boolean lazyValidate (WizardDescriptor.Panel panel, WizardDescriptor.WizardPanel wizard) {
if (panel instanceof ValidatingPanel) {
ValidatingPanel v = (ValidatingPanel)panel;
@@ -1252,6 +1288,13 @@
resetWizard();
}
firePropertyChange (PROP_VALUE, oldValue, OK_OPTION);
+ if (panels instanceof InstantiatingIterator) {
+ try {
+ ((InstantiatingIterator)panels).instantiate ();
+ } catch (IOException ioe) {
+ ErrorManager.getDefault ().notify (ioe);
+ }
+ }
}
if (ev.getSource () == cancelButton) {
Index: beans/nbproject/project.xml
===================================================================
RCS file: /cvs/beans/nbproject/project.xml,v
retrieving revision 1.2
diff -u -r1.2 project.xml
--- beans/nbproject/project.xml 16 Mar 2004 15:27:54 -0000 1.2
+++ beans/nbproject/project.xml 3 May 2004 15:50:18 -0000
@@ -36,6 +36,14 @@
+ org.netbeans.modules.java.project
+
+
+
+ 0
+
+
+
org.openide
Index: beans/src/org/netbeans/modules/beans/resources/mf-layer.xml
===================================================================
RCS file: /cvs/beans/src/org/netbeans/modules/beans/resources/mf-layer.xml,v
retrieving revision 1.14
diff -u -r1.14 mf-layer.xml
--- beans/src/org/netbeans/modules/beans/resources/mf-layer.xml 23 Oct 2002 11:36:56 -0000 1.14
+++ beans/src/org/netbeans/modules/beans/resources/mf-layer.xml 3 May 2004 15:50:18 -0000
@@ -19,36 +19,42 @@
-
+
-
+
+
-
+
+
-
+
+
-
+
+
-
+
+
-
+
+
Index: form/nbproject/project.xml
===================================================================
RCS file: /cvs/form/nbproject/project.xml,v
retrieving revision 1.5
diff -u -r1.5 project.xml
--- form/nbproject/project.xml 21 Apr 2004 12:23:21 -0000 1.5
+++ form/nbproject/project.xml 3 May 2004 15:50:18 -0000
@@ -35,6 +35,14 @@
+ org.netbeans.modules.java.project
+
+
+
+ 0
+
+
+
org.netbeans.modules.java.platform
Index: form/src/org/netbeans/modules/form/resources/layer.xml
===================================================================
RCS file: /cvs/form/src/org/netbeans/modules/form/resources/layer.xml,v
retrieving revision 1.62
diff -u -r1.62 layer.xml
--- form/src/org/netbeans/modules/form/resources/layer.xml 16 Mar 2004 15:29:17 -0000 1.62
+++ form/src/org/netbeans/modules/form/resources/layer.xml 3 May 2004 15:50:18 -0000
@@ -529,17 +529,17 @@
-
+
-
+
-
+
@@ -548,10 +548,10 @@
-
+
-
+
@@ -560,10 +560,10 @@
-
+
-
+
@@ -572,10 +572,10 @@
-
+
-
+
@@ -584,10 +584,10 @@
-
+
-
+
@@ -596,8 +596,8 @@
-
-
+
+
@@ -605,16 +605,16 @@
-
+
-
+
-
+
@@ -623,9 +623,9 @@
-
+
-
+
@@ -634,9 +634,9 @@
-
+
-
+
@@ -645,9 +645,9 @@
-
+
-
+
@@ -656,15 +656,15 @@
-
+
-
+
-
+
@@ -673,10 +673,10 @@
-
+
-
+
@@ -685,10 +685,10 @@
-
+
-
+