Attachment #110256 for bug #192207

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

Lines 67-73 Link Here

(-)a/core.windows/nbproject/project.xml (-2 / +2 lines)
67	<specification-version>1.6</specification-version>	67	<specification-version>1.6</specification-version>
68	</run-dependency>	68	</run-dependency>
69	</dependency>	69	</dependency>
70	<dependency>	70	<dependency>
71	<code-name-base>org.netbeans.modules.settings</code-name-base>	71	<code-name-base>org.netbeans.modules.settings</code-name-base>
72	<build-prerequisite/>	72	<build-prerequisite/>
73	<compile-dependency/>	73	<compile-dependency/>
Lines 133-139 Link Here
133	<build-prerequisite/>	133	<build-prerequisite/>
134	<compile-dependency/>	134	<compile-dependency/>
135	<run-dependency>	135	<run-dependency>
136	<specification-version>4.15</specification-version>	136	<specification-version>7.30</specification-version>
137	</run-dependency>	137	</run-dependency>
138	</dependency>	138	</dependency>
139	<dependency>	139	<dependency>

Lines 151-162 Link Here

(-)a/core.windows/src/org/netbeans/core/windows/view/ui/toolbars/ToolbarConfiguration.java (-1 / +12 lines)
151	}	151	}
152	}	152	}
153		153
		154	@NbBundle.Messages({
		155	"MSG_ToolbarsInitializing=Initializing..."
		156	})
154	private void fillToolbarsMenu (JComponent menu, boolean isContextMenu) {	157	private void fillToolbarsMenu (JComponent menu, boolean isContextMenu) {
		158	final ToolbarPool pool = getToolbarPool();
		159	if (!pool.isFinished()) {
		160	final JMenuItem mi = new JMenuItem();
		161	mi.setText(Bundle.MSG_ToolbarsInitializing());
		162	mi.setEnabled(false);
		163	menu.add(mi);
		164	return;
		165	}
155	boolean fullScreen = MainWindow.getInstance().isFullScreenMode();	166	boolean fullScreen = MainWindow.getInstance().isFullScreenMode();
156		167
157	Map<String, ToolbarConstraints> name2constr = collectAllConstraints();	168	Map<String, ToolbarConstraints> name2constr = collectAllConstraints();
158	// generate list of available toolbars	169	// generate list of available toolbars
159	for( Toolbar tb : getToolbarPool().getToolbars() ) {	170	for( Toolbar tb : pool.getToolbars() ) {
160	final Toolbar bar = tb;	171	final Toolbar bar = tb;
161	final String tbName = tb.getName();	172	final String tbName = tb.getName();
162	ToolbarConstraints tc = name2constr.get(tbName);	173	ToolbarConstraints tc = name2constr.get(tbName);




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

  <changes>
      <change id="ToolbarPool.isFinished">
          <api name="awt"/>
          <summary>Introduced <code>Template</code></summary>
          <version major="7" minor="30"/>
          <date day="3" month="9" year="2011"/>
          <author login="jtulach"/>
          <compatibility addition="yes"/>
          <description>
              <p>
                  One can find out if <code>ToolbarPool</code> is initialized.
              </p>
          </description>
          <class package="org.openide.awt" name="ToolbarPool"/>
          <issue number="192207"/>
      </change>
      <change id="Template">
          <api name="loaders"/>
          <summary>Introduced <code>Template</code></summary>

Lines 1-6 Link Here

(-)a/openide.loaders/manifest.mf (-1 / +1 lines)
1	Manifest-Version: 1.0	1	Manifest-Version: 1.0
2	OpenIDE-Module: org.openide.loaders	2	OpenIDE-Module: org.openide.loaders
3	OpenIDE-Module-Specification-Version: 7.29	3	OpenIDE-Module-Specification-Version: 7.30
4	OpenIDE-Module-Localizing-Bundle: org/openide/loaders/Bundle.properties	4	OpenIDE-Module-Localizing-Bundle: org/openide/loaders/Bundle.properties
5	OpenIDE-Module-Provides: org.netbeans.modules.templates.v1_0	5	OpenIDE-Module-Provides: org.netbeans.modules.templates.v1_0
6	OpenIDE-Module-Layer: org/netbeans/modules/openide/loaders/layer.xml	6	OpenIDE-Module-Layer: org/netbeans/modules/openide/loaders/layer.xml

Lines 199-204 Link Here

(-)a/openide.loaders/src/org/openide/awt/ToolbarPool.java (+9 lines)
199	public final void waitFinished () {	199	public final void waitFinished () {
200	instance.waitFinished();	200	instance.waitFinished();
201	}	201	}
		202
		203	/** Check whether all data needed for the toolbar are read from disk.
		204	*
		205	* @return true if {@link #waitFinished} and other getters will return immediately
		206	* @since 7.30
		207	*/
		208	public final boolean isFinished() {
		209	return instance.isFinished();
		210	}
202		211
203	/** Initialization of new values.	212	/** Initialization of new values.
204	* @param toolbars map (String, Toolbar) of toolbars	213	* @param toolbars map (String, Toolbar) of toolbars

Return to bug 192207

Lines 109-114 Link Here

(-)a/openide.loaders/apichanges.xml (+15 lines)
109	<!-- ACTUAL CHANGES BEGIN HERE: -->	109	<!-- ACTUAL CHANGES BEGIN HERE: -->
110		110
111	<changes>	111	<changes>
		112	<change id="ToolbarPool.isFinished">
		113	<api name="awt"/>
		114	<summary>Introduced <code>Template</code></summary>
		115	<version major="7" minor="30"/>
		116	<date day="3" month="9" year="2011"/>
		117	<author login="jtulach"/>
		118	<compatibility addition="yes"/>
		119	<description>
		120	<p>
		121	One can find out if <code>ToolbarPool</code> is initialized.
		122	</p>
		123	</description>
		124	<class package="org.openide.awt" name="ToolbarPool"/>
		125	<issue number="192207"/>
		126	</change>
112	<change id="Template">	127	<change id="Template">
113	<api name="loaders"/>	128	<api name="loaders"/>
114	<summary>Introduced <code>Template</code></summary>	129	<summary>Introduced <code>Template</code></summary>