This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 204661
Collapse All | Expand All

(-)a/form/src/org/netbeans/modules/form/GandalfPersistenceManager.java (+3 lines)
Lines 2004-2009 Link Here
2004 
     * @throws PersistenceException with explanation for the user.
 2004 
     * @throws PersistenceException with explanation for the user.
2005 
     */
 2005 
     */
2006 
    private void swingappEncountered() throws PersistenceException {
 2006 
    private void swingappEncountered() throws PersistenceException {
2007 
        if (Lookup.getDefault().lookup(ResourceService.class) != null) {
2008 
            return;
2009 
        }
2007 
        String msg = FormUtils.getBundleString("MSG_ERR_SwingAppEncountered"); // NOI18N
 2010 
        String msg = FormUtils.getBundleString("MSG_ERR_SwingAppEncountered"); // NOI18N
2008 
        throw new PersistenceException(msg);
 2011 
        throw new PersistenceException(msg);
2009 
    }
 2012 
    }
(-)a/nbbuild/cluster.properties (+1 lines)
Lines 1150-1155 Link Here
1150 
        o.n.bluej.ui,\
 1150 
        o.n.bluej.ui,\
1151 
        php.phpdoc,\
 1151 
        php.phpdoc,\
1152 
        projectimport.jbuilder,\
 1152 
        projectimport.jbuilder,\
1153 
        swingapp,\
1153 
        uihandler.interactive,\
 1154 
        uihandler.interactive,\
1154 
        web.client.tools.common,\
 1155 
        web.client.tools.common,\
1155 
        web.client.tools.firefox,\
 1156 
        web.client.tools.firefox,\
(-)a/swingapp/nbproject/project.xml (+9 lines)
Lines 103-108 Link Here
103 
                    </run-dependency>
 103 
                    </run-dependency>
104 
                </dependency>
 104 
                </dependency>
105 
                <dependency>
 105 
                <dependency>
106 
                    <code-name-base>org.netbeans.modules.form.nb</code-name-base>
107 
                    <build-prerequisite/>
108 
                    <compile-dependency/>
109 
                    <run-dependency>
110 
                        <release-version>0</release-version>
111 
                        <implementation-version/>
112 
                    </run-dependency>
113 
                </dependency>
114 
                <dependency>
106 
                    <code-name-base>org.netbeans.modules.java.j2seproject</code-name-base>
 115 
                    <code-name-base>org.netbeans.modules.java.j2seproject</code-name-base>
107 
                    <build-prerequisite/>
 116 
                    <build-prerequisite/>
108 
                    <compile-dependency/>
 117 
                    <compile-dependency/>
(-)a/swingapp/src/org/netbeans/modules/swingapp/ActionManager.java (-4 / +5 lines)
Lines 102-110 Link Here
102 
import org.netbeans.api.java.source.WorkingCopy;
 102 
import org.netbeans.api.java.source.WorkingCopy;
103 
import org.netbeans.api.project.SourceGroup;
 103 
import org.netbeans.api.project.SourceGroup;
104 
import org.netbeans.api.project.Sources;
 104 
import org.netbeans.api.project.Sources;
105 
import org.netbeans.modules.form.FormEditorSupport;
106 
import org.netbeans.modules.form.FormModelEvent;
 105 
import org.netbeans.modules.form.FormModelEvent;
107 
import org.netbeans.modules.form.FormModelListener;
 106 
import org.netbeans.modules.form.FormModelListener;
107 
import org.netbeans.modules.nbform.FormEditorSupport;
108 
import org.openide.cookies.EditorCookie;
 108 
import org.openide.cookies.EditorCookie;
109 
import org.openide.loaders.DataObject;
 109 
import org.openide.loaders.DataObject;
110 
import org.openide.text.Line;
 110 
import org.openide.text.Line;
Lines 1362-1371 Link Here
1362
1362
1363 
    private FormModel getFormModel(final FileObject formfile) throws DataObjectNotFoundException {
 1363 
    private FormModel getFormModel(final FileObject formfile) throws DataObjectNotFoundException {
1364 
        FormDataObject obj = (FormDataObject) FormDataObject.find(formfile);
 1364 
        FormDataObject obj = (FormDataObject) FormDataObject.find(formfile);
1365 
        if(!obj.getFormEditor().isOpened()) {
 1365 
        FormEditorSupport fes = (FormEditorSupport) obj.getFormEditorSupport();
1366 
            obj.getFormEditor().loadForm();
 1366 
        if(!fes.isOpened()) {
1367 
            fes.loadForm();
1367 
        }
 1368 
        }
1368 
        FormModel mod = obj.getFormEditor().getFormModel();
 1369 
        FormModel mod = fes.getFormModel();
1369 
        return mod;
 1370 
        return mod;
1370 
    }
 1371 
    }
1371
1372
(-)a/swingapp/src/org/netbeans/modules/swingapp/ActionRescanJavaSourceTaskFactoryImpl.java (-1 / +2 lines)
Lines 50-55 Link Here
50 
import org.netbeans.api.java.source.support.EditorAwareJavaSourceTaskFactory;
 50 
import org.netbeans.api.java.source.support.EditorAwareJavaSourceTaskFactory;
51 
import org.netbeans.api.project.FileOwnerQuery;
 51 
import org.netbeans.api.project.FileOwnerQuery;
52 
import org.netbeans.modules.form.FormDataObject;
 52 
import org.netbeans.modules.form.FormDataObject;
53 
import org.netbeans.modules.nbform.FormEditorSupport;
53 
import org.openide.filesystems.FileObject;
 54 
import org.openide.filesystems.FileObject;
54 
import org.openide.loaders.DataObject;
 55 
import org.openide.loaders.DataObject;
55 
import org.openide.loaders.DataObjectNotFoundException;
 56 
import org.openide.loaders.DataObjectNotFoundException;
Lines 116-122 Link Here
116 
                    DataObject dobj = DataObject.find(fo);
 117 
                    DataObject dobj = DataObject.find(fo);
117 
                    if (dobj instanceof FormDataObject) {
 118 
                    if (dobj instanceof FormDataObject) {
118 
                        FormDataObject formDO = (FormDataObject) dobj;
 119 
                        FormDataObject formDO = (FormDataObject) dobj;
119 
                        return formDO.getFormEditor().isOpened();
 120 
                        return ((FormEditorSupport) formDO.getFormEditorSupport()).isOpened();
120 
                    }
 121 
                    }
121 
                } catch(DataObjectNotFoundException ex) {
 122 
                } catch(DataObjectNotFoundException ex) {
122 
                    assert false;
 123 
                    assert false;
(-)a/swingapp/src/org/netbeans/modules/swingapp/resources/layer.xml (+1 lines)
Lines 49-54 Link Here
49 
        <folder name="Libraries">
 49 
        <folder name="Libraries">
50 
            <file name="app_framework.xml" url="app_framework.xml">
 50 
            <file name="app_framework.xml" url="app_framework.xml">
51 
                <attr name="displayName" bundlevalue="org.netbeans.modules.swingapp.resources.Bundle#swing-app-framework"/>
 51 
                <attr name="displayName" bundlevalue="org.netbeans.modules.swingapp.resources.Bundle#swing-app-framework"/>
52 
                <attr name="weight" intvalue="100"/> <!-- override variant from swingapplib -->
52 
            </file>
 53 
            </file>
53 
        </folder>
 54 
        </folder>
54 
    </folder>
 55 
    </folder>

Return to bug 204661