Revision 42455

View differences:

trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.symbology/org.gvsig.symbology.swing/org.gvsig.symbology.swing.api/src/main/java/org/gvsig/app/gui/styling/SymbolSelector.java
189 189
	protected JComboBoxUnitsReferenceSystem cmbReferenceSystem;
190 190
	private JComboBoxFontSizes cmbFontSize;
191 191
	protected LibraryBrowser libraryBrowser;
192
	private SymbolSelectorListModel listModel;
192 193

  
193 194
	/**
194 195
	 * Constructor method
......
289 290
		this.add(getJEastPanel(), BorderLayout.EAST);
290 291
		ActionListener okAction = new ActionListener() {
291 292
			public void actionPerformed(ActionEvent e) {
293
				if(SymbolSelector.this.listModel != null){
294
					SymbolSelector.this.listModel.dispose();
295
				}
292 296
				PluginServices.getMDIManager().closeWindow(SymbolSelector.this);
297
				
293 298
			}
294 299
		}, cancelAction = new ActionListener() {
295 300
			public void actionPerformed(ActionEvent e) {
296 301
				accepted = false;
297

  
298 302
				setSymbol(null);
303
				if(SymbolSelector.this.listModel != null){
304
					SymbolSelector.this.listModel.dispose();
305
				}
299 306
				PluginServices.getMDIManager().closeWindow(SymbolSelector.this);
300 307
			}
301 308
		};
......
322 329
	 * @return listModel SymbolSelectorListModel
323 330
	 */
324 331
	protected ListModel newListModel() {
325
		SymbolSelectorListModel listModel = new SymbolSelectorListModel(
332
		listModel = new SymbolSelectorListModel(
326 333
				dir,
327 334
				sFilter,
328 335
						manager.getSymbolPreferences().getSymbolFileExtension());

Also available in: Unified diff