# HG changeset patch
# Parent cacf3efc223f6df8ec0428986dc58d734f8a0204
# User Jesse Glick <jglick@netbeans.org>
#204661: restore SAF as an experimental module.

diff --git a/form/src/org/netbeans/modules/form/GandalfPersistenceManager.java b/form/src/org/netbeans/modules/form/GandalfPersistenceManager.java
--- a/form/src/org/netbeans/modules/form/GandalfPersistenceManager.java
+++ b/form/src/org/netbeans/modules/form/GandalfPersistenceManager.java
@@ -2004,6 +2004,9 @@
      * @throws PersistenceException with explanation for the user.
      */
     private void swingappEncountered() throws PersistenceException {
+        if (Lookup.getDefault().lookup(ResourceService.class) != null) {
+            return;
+        }
         String msg = FormUtils.getBundleString("MSG_ERR_SwingAppEncountered"); // NOI18N
         throw new PersistenceException(msg);
     }
diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties
--- a/nbbuild/cluster.properties
+++ b/nbbuild/cluster.properties
@@ -1150,6 +1150,7 @@
         o.n.bluej.ui,\
         php.phpdoc,\
         projectimport.jbuilder,\
+        swingapp,\
         uihandler.interactive,\
         web.client.tools.common,\
         web.client.tools.firefox,\
diff --git a/swingapp/nbproject/project.xml b/swingapp/nbproject/project.xml
--- a/swingapp/nbproject/project.xml
+++ b/swingapp/nbproject/project.xml
@@ -103,6 +103,15 @@
                     </run-dependency>
                 </dependency>
                 <dependency>
+                    <code-name-base>org.netbeans.modules.form.nb</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <release-version>0</release-version>
+                        <implementation-version/>
+                    </run-dependency>
+                </dependency>
+                <dependency>
                     <code-name-base>org.netbeans.modules.java.j2seproject</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
diff --git a/swingapp/src/org/netbeans/modules/swingapp/ActionManager.java b/swingapp/src/org/netbeans/modules/swingapp/ActionManager.java
--- a/swingapp/src/org/netbeans/modules/swingapp/ActionManager.java
+++ b/swingapp/src/org/netbeans/modules/swingapp/ActionManager.java
@@ -102,9 +102,9 @@
 import org.netbeans.api.java.source.WorkingCopy;
 import org.netbeans.api.project.SourceGroup;
 import org.netbeans.api.project.Sources;
-import org.netbeans.modules.form.FormEditorSupport;
 import org.netbeans.modules.form.FormModelEvent;
 import org.netbeans.modules.form.FormModelListener;
+import org.netbeans.modules.nbform.FormEditorSupport;
 import org.openide.cookies.EditorCookie;
 import org.openide.loaders.DataObject;
 import org.openide.text.Line;
@@ -1362,10 +1362,11 @@
     
     private FormModel getFormModel(final FileObject formfile) throws DataObjectNotFoundException {
         FormDataObject obj = (FormDataObject) FormDataObject.find(formfile);
-        if(!obj.getFormEditor().isOpened()) {
-            obj.getFormEditor().loadForm();
+        FormEditorSupport fes = (FormEditorSupport) obj.getFormEditorSupport();
+        if(!fes.isOpened()) {
+            fes.loadForm();
         }
-        FormModel mod = obj.getFormEditor().getFormModel();
+        FormModel mod = fes.getFormModel();
         return mod;
     }
     
diff --git a/swingapp/src/org/netbeans/modules/swingapp/ActionRescanJavaSourceTaskFactoryImpl.java b/swingapp/src/org/netbeans/modules/swingapp/ActionRescanJavaSourceTaskFactoryImpl.java
--- a/swingapp/src/org/netbeans/modules/swingapp/ActionRescanJavaSourceTaskFactoryImpl.java
+++ b/swingapp/src/org/netbeans/modules/swingapp/ActionRescanJavaSourceTaskFactoryImpl.java
@@ -50,6 +50,7 @@
 import org.netbeans.api.java.source.support.EditorAwareJavaSourceTaskFactory;
 import org.netbeans.api.project.FileOwnerQuery;
 import org.netbeans.modules.form.FormDataObject;
+import org.netbeans.modules.nbform.FormEditorSupport;
 import org.openide.filesystems.FileObject;
 import org.openide.loaders.DataObject;
 import org.openide.loaders.DataObjectNotFoundException;
@@ -116,7 +117,7 @@
                     DataObject dobj = DataObject.find(fo);
                     if (dobj instanceof FormDataObject) {
                         FormDataObject formDO = (FormDataObject) dobj;
-                        return formDO.getFormEditor().isOpened();
+                        return ((FormEditorSupport) formDO.getFormEditorSupport()).isOpened();
                     }
                 } catch(DataObjectNotFoundException ex) {
                     assert false;
diff --git a/swingapp/src/org/netbeans/modules/swingapp/resources/layer.xml b/swingapp/src/org/netbeans/modules/swingapp/resources/layer.xml
--- a/swingapp/src/org/netbeans/modules/swingapp/resources/layer.xml
+++ b/swingapp/src/org/netbeans/modules/swingapp/resources/layer.xml
@@ -49,6 +49,7 @@
         <folder name="Libraries">
             <file name="app_framework.xml" url="app_framework.xml">
                 <attr name="displayName" bundlevalue="org.netbeans.modules.swingapp.resources.Bundle#swing-app-framework"/>
+                <attr name="weight" intvalue="100"/> <!-- override variant from swingapplib -->
             </file>
         </folder>
     </folder>