Attachment #114270 for bug #206479

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 206479
Collapse All | Expand All

Lines 162-168 Link Here

(-)a/coherence/nbproject/project.xml (-1 / +1 lines)
162	<compile-dependency/>	162	<compile-dependency/>
163	<run-dependency>	163	<run-dependency>
164	<release-version>0</release-version>	164	<release-version>0</release-version>
165	<specification-version>1.14</specification-version>	165	<specification-version>1.18</specification-version>
166	</run-dependency>	166	</run-dependency>
167	</dependency>	167	</dependency>
168	<dependency>	168	<dependency>

Lines 57-62 Link Here

(-)a/coherence/src/org/netbeans/modules/coherence/wizards/BottomWizardPanel.java (-1 / +7 lines)
57	import org.netbeans.api.project.libraries.LibrariesCustomizer;	57	import org.netbeans.api.project.libraries.LibrariesCustomizer;
58	import org.netbeans.api.project.libraries.Library;	58	import org.netbeans.api.project.libraries.Library;
59	import org.netbeans.api.project.libraries.LibraryManager;	59	import org.netbeans.api.project.libraries.LibraryManager;
		60	import org.netbeans.api.server.CommonServerUIs;
		61	import org.netbeans.api.server.ServerInstance;
60	import org.netbeans.modules.coherence.library.LibraryUtils;	62	import org.netbeans.modules.coherence.library.LibraryUtils;
61	import org.netbeans.modules.coherence.project.CoherenceProjectUtils;	63	import org.netbeans.modules.coherence.project.CoherenceProjectUtils;
62	import org.netbeans.spi.project.ui.templates.support.Templates;	64	import org.netbeans.spi.project.ui.templates.support.Templates;
Lines 222-228 Link Here
222	initLibrariesPanel();	224	initLibrariesPanel();
223	}	225	}
224	} else {	226	} else {
225	// waiting for new API for new server creation	227	ServerInstance serverInstance = CommonServerUIs.showAddServerInstanceWizard();
		228	if (serverInstance != null) {
		229	cleanInitialized();
		230	initLibrariesPanel();
		231	}
226	}	232	}
227	}	233	}
228	}	234	}

Lines 52-59 Link Here

(-)a/coherence/src/org/netbeans/modules/coherence/wizards/ServerOrLibraryPanel.java (-2 lines)
52	*/	52	*/
53	public ServerOrLibraryPanel() {	53	public ServerOrLibraryPanel() {
54	initComponents();	54	initComponents();
55	// waiting for new API for new server creation
56	platformRadioButton.setEnabled(false);
57	}	55	}
58		56
59	public boolean getLibraryChecked() {	57	public boolean getLibraryChecked() {




    <!-- ACTUAL CHANGES BEGIN HERE: -->

    <changes>
        <change id="CommonServerUIs-showAddServerInstanceWizard">
            <api name="common_server_api"/>
            <summary>Added UI helper method CommonServerUIs.showAddServerInstanceWizard</summary>
            <version major="1" minor="18"/>
            <date day="22" month="12" year="2011"/>
            <author login="marfous"/>
            <compatibility addition="yes"/>
            <description>
                Added helper method invoking wizard for adding new server instance.
            </description>
            <issue number="206479"/>
        </change>
        <change id="cloud">
            <api name="common_server_api"/>
            <summary>Establish layer to register cloud providers</summary>

Lines 2-8 Link Here

(-)a/server/manifest.mf (-1 / +1 lines)
2	OpenIDE-Module: org.netbeans.modules.server/0	2	OpenIDE-Module: org.netbeans.modules.server/0
3	OpenIDE-Module-Layer: org/netbeans/modules/server/resources/layer.xml	3	OpenIDE-Module-Layer: org/netbeans/modules/server/resources/layer.xml
4	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/server/resources/Bundle.properties	4	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/server/resources/Bundle.properties
5	OpenIDE-Module-Specification-Version: 1.17	5	OpenIDE-Module-Specification-Version: 1.18
6	AutoUpdate-Show-In-Client: false	6	AutoUpdate-Show-In-Client: false
7	OpenIDE-Module-Provides: org.netbeans.modules.server	7	OpenIDE-Module-Provides: org.netbeans.modules.server
8		8




            <code-name-base>org.netbeans.modules.server</code-name-base>
            <module-dependencies>
                <dependency>
                    <code-name-base>org.netbeans.api.annotations.common</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>1</release-version>
                        <specification-version>1.13</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.core.ide</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>1</release-version>
                        <specification-version>1.15</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.awt</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>

                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.core.ide</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>1</release-version>
                        <specification-version>1.15</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.util</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>




import org.openide.util.NbBundle;
import javax.swing.JButton;
import javax.swing.SwingUtilities;
import org.netbeans.api.annotations.common.CheckForNull;
import org.netbeans.modules.server.ServerRegistry;
import org.netbeans.modules.server.ui.manager.ServerManagerPanel;
import org.netbeans.modules.server.ui.wizard.AddServerInstanceWizard;

/**
 * Class providing access to UI dialogs managing instances.

            dlg.dispose();
        }
    }

    /**
     * Displays the modal wizard for creating new server instance. This method must be
     * called from the AWT event dispatch thread.
     *
     * @return created instance or {@code null} if user canceled the operation
     * @since 1.18
     */
    @CheckForNull
    public static ServerInstance showAddServerInstanceWizard() {
        assert SwingUtilities.isEventDispatchThread() : "Invocation of the UI dialog outside of the EDT"; //NOI18N

        final ServerInstance instance = AddServerInstanceWizard.showAddServerInstanceWizard();
        return instance;
    }
}

Return to bug 206479

Lines 110-115 Link Here

(-)a/server/apichanges.xml (+12 lines)
110	<!-- ACTUAL CHANGES BEGIN HERE: -->	110	<!-- ACTUAL CHANGES BEGIN HERE: -->
111		111
112	<changes>	112	<changes>
		113	<change id="CommonServerUIs-showAddServerInstanceWizard">
		114	<api name="common_server_api"/>
		115	<summary>Added UI helper method CommonServerUIs.showAddServerInstanceWizard</summary>
		116	<version major="1" minor="18"/>
		117	<date day="22" month="12" year="2011"/>
		118	<author login="marfous"/>
		119	<compatibility addition="yes"/>
		120	<description>
		121	Added helper method invoking wizard for adding new server instance.
		122	</description>
		123	<issue number="206479"/>
		124	</change>
113	<change id="cloud">	125	<change id="cloud">
114	<api name="common_server_api"/>	126	<api name="common_server_api"/>
115	<summary>Establish layer to register cloud providers</summary>	127	<summary>Establish layer to register cloud providers</summary>

Lines 50-55 Link Here

(-)a/server/nbproject/project.xml (-9 / +18 lines)
50	<code-name-base>org.netbeans.modules.server</code-name-base>	50	<code-name-base>org.netbeans.modules.server</code-name-base>
51	<module-dependencies>	51	<module-dependencies>
52	<dependency>	52	<dependency>
		53	<code-name-base>org.netbeans.api.annotations.common</code-name-base>
		54	<build-prerequisite/>
		55	<compile-dependency/>
		56	<run-dependency>
		57	<release-version>1</release-version>
		58	<specification-version>1.13</specification-version>
		59	</run-dependency>
		60	</dependency>
		61	<dependency>
		62	<code-name-base>org.netbeans.core.ide</code-name-base>
		63	<build-prerequisite/>
		64	<compile-dependency/>
		65	<run-dependency>
		66	<release-version>1</release-version>
		67	<specification-version>1.15</specification-version>
		68	</run-dependency>
		69	</dependency>
		70	<dependency>
53	<code-name-base>org.openide.awt</code-name-base>	71	<code-name-base>org.openide.awt</code-name-base>
54	<build-prerequisite/>	72	<build-prerequisite/>
55	<compile-dependency/>	73	<compile-dependency/>
Lines 98-112 Link Here
98	</run-dependency>	116	</run-dependency>
99	</dependency>	117	</dependency>
100	<dependency>	118	<dependency>
101	<code-name-base>org.netbeans.core.ide</code-name-base>
102	<build-prerequisite/>
103	<compile-dependency/>
104	<run-dependency>
105	<release-version>1</release-version>
106	<specification-version>1.15</specification-version>
107	</run-dependency>
108	</dependency>
109	<dependency>
110	<code-name-base>org.openide.util</code-name-base>	119	<code-name-base>org.openide.util</code-name-base>
111	<build-prerequisite/>	120	<build-prerequisite/>
112	<compile-dependency/>	121	<compile-dependency/>

Lines 50-57 Link Here

(-)a/server/src/org/netbeans/api/server/CommonServerUIs.java (+17 lines)
50	import org.openide.util.NbBundle;	50	import org.openide.util.NbBundle;
51	import javax.swing.JButton;	51	import javax.swing.JButton;
52	import javax.swing.SwingUtilities;	52	import javax.swing.SwingUtilities;
		53	import org.netbeans.api.annotations.common.CheckForNull;
53	import org.netbeans.modules.server.ServerRegistry;	54	import org.netbeans.modules.server.ServerRegistry;
54	import org.netbeans.modules.server.ui.manager.ServerManagerPanel;	55	import org.netbeans.modules.server.ui.manager.ServerManagerPanel;
		56	import org.netbeans.modules.server.ui.wizard.AddServerInstanceWizard;
55		57
56	/**	58	/**
57	* Class providing access to UI dialogs managing instances.	59	* Class providing access to UI dialogs managing instances.
Lines 113-116 Link Here
113	dlg.dispose();	115	dlg.dispose();
114	}	116	}
115	}	117	}
		118
		119	/**
		120	* Displays the modal wizard for creating new server instance. This method must be
		121	* called from the AWT event dispatch thread.
		122	*
		123	* @return created instance or {@code null} if user canceled the operation
		124	* @since 1.18
		125	*/
		126	@CheckForNull
		127	public static ServerInstance showAddServerInstanceWizard() {
		128	assert SwingUtilities.isEventDispatchThread() : "Invocation of the UI dialog outside of the EDT"; //NOI18N
		129
		130	final ServerInstance instance = AddServerInstanceWizard.showAddServerInstanceWizard();
		131	return instance;
		132	}
116	}	133	}