Revision 28706
branches/v2_0_0_prep/applications/appgvSIG/src/com/iver/cit/gvsig/project/documents/view/legend/gui/VectorialUniqueValue.java | ||
---|---|---|
325 | 325 |
symbolTable.fillTableFromSymbolList(auxLegend.getSymbols(), |
326 | 326 |
auxLegend.getValues(), auxLegend.getDescriptions()); |
327 | 327 |
// elRs.stop(); |
328 |
set.dispose(); |
|
328 |
// set.dispose();
|
|
329 | 329 |
} catch (DataException e) { |
330 | 330 |
NotificationManager.addError(PluginServices.getText(this, "recovering_recordset"), e); |
331 | 331 |
} |
... | ... | |
454 | 454 |
} |
455 | 455 |
clave = new NullUniqueValue(); |
456 | 456 |
if(chbUseDefault.isSelected()){ |
457 |
if(defaultSymbolPrev.getSymbol() != null){ |
|
457 |
theSymbol = defaultSymbolPrev.getSymbol(); |
|
458 |
if(theSymbol != null){ |
|
458 | 459 |
String description = PluginServices.getText(this,"default"); |
459 |
defaultSymbolPrev.getSymbol().setDescription(description);
|
|
460 |
theSymbol.setDescription(description);
|
|
460 | 461 |
ISymbol legendSymbol = null; |
461 | 462 |
if (auxLegend != null){ |
462 | 463 |
legendSymbol = auxLegend.getSymbolByValue(clave); |
463 | 464 |
} |
464 |
theSymbol = defaultSymbolPrev.getSymbol(); |
|
465 | 465 |
if( legendSymbol == null){ |
466 | 466 |
auxLegend.addSymbol(clave, theSymbol); |
467 | 467 |
} else { |
468 |
if(!legendSymbol.equals(theSymbol)){ |
|
468 |
// if(!legendSymbol.equals(theSymbol)){ |
|
469 |
if(legendSymbol!=theSymbol){ |
|
469 | 470 |
auxLegend.replace(legendSymbol, theSymbol); |
470 | 471 |
} |
471 | 472 |
} |
... | ... | |
591 | 592 |
ISymbol defaultSymbolLegend = auxLegend.getDefaultSymbol(); |
592 | 593 |
ISymbol symbol = defaultSymbolPrev.getSymbol(); |
593 | 594 |
if(symbol != null){ |
594 |
if(!symbol.equals(defaultSymbolLegend)){
|
|
595 |
if(symbol!=defaultSymbolLegend){
|
|
595 | 596 |
auxLegend.setDefaultSymbol(symbol); |
596 | 597 |
} |
597 | 598 |
} |
Also available in: Unified diff