Revision 47426 trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.swing/org.gvsig.fmap.dal.swing.impl/src/main/java/org/gvsig/fmap/dal/swing/impl/DefaultDataSwingManager.java

View differences:

DefaultDataSwingManager.java
24 24

  
25 25
import java.awt.Component;
26 26
import java.awt.event.ActionEvent;
27
import java.net.URL;
28 27
import java.util.ArrayList;
29 28
import java.util.Collection;
30 29
import java.util.Collections;
......
161 160
import org.gvsig.tools.exception.BaseException;
162 161
import org.gvsig.tools.i18n.I18nManager;
163 162
import org.gvsig.tools.swing.api.ToolsSwingLocator;
164
import org.gvsig.tools.swing.api.pickercontroller.PickerController;
165 163
import org.gvsig.tools.swing.api.threadsafedialogs.ThreadSafeDialogsManager;
166 164
import org.gvsig.tools.swing.api.windowmanager.WindowManager;
167
import org.gvsig.tools.util.Factory;
165
import org.gvsig.tools.swing.icontheme.IconTheme;
168 166
import org.slf4j.Logger;
169 167
import org.slf4j.LoggerFactory;
170 168

  
......
806 804
            if (!store.isFeatureSelectionEmpty()) {
807 805
                name = name + "-sel";
808 806
            }
809
            name = name + ".png";
810
            URL url = this.getClass().getResource("/storegeomtypes/" + name);
811
            if (url == null) {
812
                return null;
813
            }
814
            Icon icon = new ImageIcon(url);
807
            IconTheme themeIcon = ToolsSwingLocator.getIconThemeManager().getActive();
808
            ImageIcon icon = themeIcon.get(name);
809
//            name = name + ".png";
810
//            URL url = this.getClass().getResource("/storegeomtypes/" + name);
811
//            if (url == null) {
812
//                return null;
813
//            }
814
//            Icon icon = new ImageIcon(url);
815 815
            return icon;
816 816
        } catch (Exception ex) {
817 817
            return null;

Also available in: Unified diff