Revision 30011 branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/gui/styling/SymbolSelector.java
SymbolSelector.java | ||
---|---|---|
87 | 87 |
import org.gvsig.fmap.geom.Geometry.SUBTYPES; |
88 | 88 |
import org.gvsig.fmap.geom.exception.CreateGeometryException; |
89 | 89 |
import org.gvsig.fmap.geom.primitive.GeneralPathX; |
90 |
import org.gvsig.fmap.geom.util.UtilFunctions;
|
|
90 |
import org.gvsig.fmap.mapcontext.MapContextLocator;
|
|
91 | 91 |
import org.gvsig.fmap.mapcontext.rendering.symbols.CartographicSupport; |
92 |
import org.gvsig.fmap.mapcontext.rendering.symbols.IFillSymbol; |
|
93 |
import org.gvsig.fmap.mapcontext.rendering.symbols.ILineSymbol; |
|
94 |
import org.gvsig.fmap.mapcontext.rendering.symbols.IMarkerSymbol; |
|
95 | 92 |
import org.gvsig.fmap.mapcontext.rendering.symbols.IMultiLayerSymbol; |
96 | 93 |
import org.gvsig.fmap.mapcontext.rendering.symbols.ISymbol; |
97 | 94 |
import org.gvsig.fmap.mapcontext.rendering.symbols.ITextSymbol; |
98 |
import org.gvsig.fmap.mapcontext.rendering.symbols.MultiLayerFillSymbol; |
|
99 |
import org.gvsig.fmap.mapcontext.rendering.symbols.MultiLayerLineSymbol; |
|
100 |
import org.gvsig.fmap.mapcontext.rendering.symbols.MultiLayerMarkerSymbol; |
|
101 |
import org.gvsig.fmap.mapcontext.rendering.symbols.SymbologyFactory; |
|
102 | 95 |
import org.gvsig.gui.beans.AcceptCancelPanel; |
103 | 96 |
import org.gvsig.gui.beans.swing.GridBagLayoutPanel; |
104 | 97 |
import org.gvsig.gui.beans.swing.JButton; |
... | ... | |
106 | 99 |
import org.gvsig.gui.beans.swing.JComboBoxFonts; |
107 | 100 |
import org.gvsig.gui.beans.swing.JFileChooser; |
108 | 101 |
import org.gvsig.gui.beans.swing.JIncrementalNumberField; |
102 |
import org.gvsig.symbology.fmap.mapcontext.rendering.symbol.fill.IFillSymbol; |
|
103 |
import org.gvsig.symbology.fmap.mapcontext.rendering.symbol.fill.impl.MultiLayerFillSymbol; |
|
104 |
import org.gvsig.symbology.fmap.mapcontext.rendering.symbol.line.ILineSymbol; |
|
105 |
import org.gvsig.symbology.fmap.mapcontext.rendering.symbol.line.impl.MultiLayerLineSymbol; |
|
106 |
import org.gvsig.symbology.fmap.mapcontext.rendering.symbol.marker.IMarkerSymbol; |
|
107 |
import org.gvsig.symbology.fmap.mapcontext.rendering.symbol.marker.impl.MultiLayerMarkerSymbol; |
|
109 | 108 |
import org.gvsig.utils.XMLException; |
110 | 109 |
import org.slf4j.Logger; |
111 | 110 |
import org.slf4j.LoggerFactory; |
... | ... | |
214 | 213 |
if (currentElement != null && currentElement instanceof ISymbol) { |
215 | 214 |
ISymbol sym = (ISymbol) currentElement; |
216 | 215 |
try { |
217 |
currentElement = SymbologyFactory.createSymbolFromXML( |
|
218 |
sym.getXMLEntity(), ""); |
|
219 |
} catch (XMLException e) { |
|
216 |
currentElement = sym.clone(); |
|
217 |
} catch (CloneNotSupportedException e) { |
|
220 | 218 |
NotificationManager.addWarning("Symbol layer", e); |
221 | 219 |
} |
222 | 220 |
String desc = sym.getDescription(); |
... | ... | |
231 | 229 |
|
232 | 230 |
this.shapeType = shapeType; |
233 | 231 |
// Preferences prefs = Preferences.userRoot().node( "gvsig.foldering" ); |
234 |
rootDir = new File(SymbologyFactory.SymbolLibraryPath); |
|
232 |
rootDir = new File(MapContextLocator.getMapContextManager() |
|
233 |
.getSymbolLibraryPath()); |
|
235 | 234 |
// prefs.get("SymbolLibraryFolder", System.getProperty("user.home")+"/gvSIG/Symbols")); |
236 | 235 |
if (!rootDir.exists()) { |
237 | 236 |
rootDir.mkdir(); |
... | ... | |
366 | 365 |
if (jListSymbols.getSelectedValue()!=null) { |
367 | 366 |
ISymbol selSym=null; |
368 | 367 |
try { |
369 |
selSym = SymbologyFactory.createSymbolFromXML(
|
|
370 |
((ISymbol) jListSymbols.getSelectedValue()).getXMLEntity(), null);
|
|
371 |
} catch (XMLException e1) {
|
|
372 |
NotificationManager.addWarning("Symbol layer", e1);
|
|
368 |
selSym = (ISymbol) ((ISymbol) jListSymbols
|
|
369 |
.getSelectedValue()).clone();
|
|
370 |
} catch (CloneNotSupportedException ex) {
|
|
371 |
NotificationManager.addWarning("Symbol layer", ex);
|
|
373 | 372 |
} |
374 | 373 |
setSymbol(selSym); |
375 | 374 |
updateOptionsPanel(); |
... | ... | |
853 | 852 |
|
854 | 853 |
ISymbol clonedSymbol=null; |
855 | 854 |
try { |
856 |
clonedSymbol = SymbologyFactory.createSymbolFromXML( |
|
857 |
mySelectedElement.getXMLEntity(), null); |
|
858 |
} catch (XMLException e) { |
|
855 |
clonedSymbol = (ISymbol) mySelectedElement.clone(); |
|
856 |
} catch (CloneNotSupportedException e) { |
|
859 | 857 |
NotificationManager.addWarning("Symbol layer", e); |
860 | 858 |
} |
861 | 859 |
SymbolEditor se = new SymbolEditor(clonedSymbol, shapeType); |
Also available in: Unified diff