Révision 1603

tmp/org.txm.chartsengine.jfreechart.rcp/src/org/txm/chartsengine/jfreechart/rcp/events/DefaultChartMouseListener.java (revision 1603)
241 241
		// Set the composite current menu
242 242
		final int a = eventArea;
243 243
		final String t = menuText;
244
		
244 245
		this.chartComponent.getChartEditor().getComposite().getDisplay().syncExec(new Runnable () {
245 246
			public void run() {
246 247
				chartComponent.getChartEditor().getComposite().setCurrentContextMenu(a);
247
				if(!t.isEmpty() && chartComponent.getChartEditor().getComposite().getMenu() != null
248
						&& chartComponent.getChartEditor().getComposite().getMenu().getItemCount() > 0
249
						)	{
248
				
249
				if(!t.isEmpty() && chartComponent.getChartEditor().getComposite().getMenu() != null && chartComponent.getChartEditor().getComposite().getMenu().getItemCount() > 0)	{
250 250

  
251 251
					// FIXME: Debug
252 252
					Log.finest("DefaultChartMouseListener.chartMouseClicked(...).new Runnable() {...}.run(): menu = " + chartComponent.getChartEditor().getComposite().getMenu());
253 253
					
254
					
255 254
					chartComponent.getChartEditor().getComposite().getMenu().getItem(0).setText(t);
256
					
257 255
				}
258 256
				
259 257
				// FIXME: SJ: temporary workaround to fix the popup menu visibility bug on Linux/Gnome (see: http://forge.cbp.ens-lyon.fr/redmine/issues/1519)
tmp/org.txm.rcp/src/main/java/org/txm/rcp/ApplicationWorkbenchAdvisor.java (revision 1603)
186 186

  
187 187
	private void openCGU() {
188 188
		try {
189
			if (!RCPPreferences.getInstance().getBoolean(RCPPreferences.CGU)) {
189
			if (!TBXPreferences.getInstance().getBoolean(RCPPreferences.CGU)) {
190 190

  
191 191
				//System.out.println("Opening CGU...");
192 192
				//Display.getCurrent() works because this code is run during the splash screen

Formats disponibles : Unified diff