Revision 42068

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/StyleSelector.java
77 77
import java.awt.event.ActionListener;
78 78
import java.io.File;
79 79
import java.io.FileOutputStream;
80
import java.io.FileWriter;
81
import java.util.prefs.Preferences;
82 80

  
83 81
import javax.swing.BorderFactory;
84 82
import javax.swing.BoxLayout;
......
94 92
import javax.swing.event.ListSelectionEvent;
95 93
import javax.swing.event.ListSelectionListener;
96 94

  
97
import org.exolab.castor.xml.Marshaller;
98
import org.slf4j.Logger;
99
import org.slf4j.LoggerFactory;
100

  
101 95
import org.gvsig.andami.PluginServices;
102 96
import org.gvsig.andami.messages.NotificationManager;
103 97
import org.gvsig.app.gui.JComboBoxUnits;
104 98
import org.gvsig.app.gui.panels.ImageSizePanel;
105 99
import org.gvsig.fmap.mapcontext.MapContextLocator;
106 100
import org.gvsig.fmap.mapcontext.rendering.symbols.CartographicSupport;
107
import org.gvsig.fmap.mapcontext.rendering.symbols.ISymbol;
108 101
import org.gvsig.fmap.mapcontext.rendering.symbols.styles.ILabelStyle;
109 102
import org.gvsig.fmap.mapcontext.rendering.symbols.styles.IStyle;
110 103
import org.gvsig.gui.beans.AcceptCancelPanel;
111 104
import org.gvsig.gui.beans.controls.dnd.JDnDList;
112 105
import org.gvsig.gui.beans.swing.GridBagLayoutPanel;
113 106
import org.gvsig.i18n.Messages;
107
import org.gvsig.symbology.SymbologyLocator;
114 108
import org.gvsig.tools.ToolsLocator;
115 109
import org.gvsig.tools.persistence.PersistenceManager;
116 110
import org.gvsig.tools.persistence.PersistentState;
117
import org.gvsig.utils.XMLEntity;
111
import org.slf4j.Logger;
112
import org.slf4j.LoggerFactory;
118 113

  
119 114

  
120 115
/**
......
435 430
	protected void newPressed() {
436 431
        IStyle curr_sty = ((StylePreviewer) jPanelPreview).getStyle();
437 432
        
438
        try {
439
            curr_sty = (IStyle) curr_sty.clone();
440
        } catch (Exception cnse) {
441
            logger.info("Unable to clone style. "
442
                + "This can cause an empty style if user cancels dialog.",
443
                cnse);
433
        if(curr_sty != null){
434
	        try {
435
	            curr_sty = (IStyle) curr_sty.clone();
436
	        } catch (Exception cnse) {
437
	            logger.info("Unable to clone style. "
438
	                + "Creating a new empty SimpleLabelStyle...",
439
	                cnse);
440
	            curr_sty = SymbologyLocator.getSymbologyManager().createDefaultLabelStyle();
441
	        }
442
        }else{
443
        	curr_sty = SymbologyLocator.getSymbologyManager().createDefaultLabelStyle();
444 444
        }
445

  
446
         StyleEditor se = new StyleEditor(curr_sty);
445
        
446
        StyleEditor se = new StyleEditor(curr_sty);
447 447
        PluginServices.getMDIManager().addWindow(se);
448 448
        this.setStyle(se.getStyle());
449 449
    }

Also available in: Unified diff