Revision 727 org.gvsig.topology/trunk/org.gvsig.topology/org.gvsig.topology.swing/org.gvsig.topology.swing.impl/src/main/java/org/gvsig/topology/swing/impl/DefaultJTopologyPlanProperties.java

View differences:

DefaultJTopologyPlanProperties.java
3 3
import java.awt.Dimension;
4 4
import java.awt.event.ActionEvent;
5 5
import java.awt.event.ActionListener;
6
import java.net.URL;
7
import java.util.List;
6 8
import javax.swing.DefaultListModel;
9
import javax.swing.ImageIcon;
7 10
import javax.swing.JComponent;
8 11
import javax.swing.event.ListSelectionEvent;
9 12
import javax.swing.event.ListSelectionListener;
13
import org.apache.commons.io.FilenameUtils;
10 14
import org.gvsig.tools.ToolsLocator;
11 15
import org.gvsig.tools.i18n.I18nManager;
12 16
import org.gvsig.tools.swing.api.ListElement;
......
14 18
import org.gvsig.tools.swing.api.ToolsSwingManager;
15 19
import org.gvsig.tools.swing.api.windowmanager.Dialog;
16 20
import org.gvsig.tools.swing.api.windowmanager.WindowManager_v2;
21
import org.gvsig.tools.swing.icontheme.IconTheme;
17 22
import org.gvsig.topology.lib.api.TopologyDataSet;
18 23
import org.gvsig.topology.lib.api.TopologyLocator;
19 24
import org.gvsig.topology.lib.api.TopologyPlan;
......
80 85
        this.setPreferredSize(new Dimension(450, 300));
81 86
    }
82 87

  
88
    @Override
89
    public ImageIcon loadImage(String imageName) {
90
        String name = FilenameUtils.getBaseName(imageName);
91
        IconTheme theme = ToolsSwingLocator.getIconThemeManager().getDefault();
92
        if (theme.exists(name)) {
93
            return theme.get(name);
94
        }
95
        URL url = this.getClass().getResource("/"+imageName);
96
        if (url == null) {
97
            return null;
98
        }
99
        return new ImageIcon(url);
100
    }
83 101
    
84 102
    private void translate() {
85 103
        ToolsSwingManager tsm = ToolsSwingLocator.getToolsSwingManager();
......
162 180
    }
163 181

  
164 182
    private void performAddDataSet() {
183
        I18nManager i18n = ToolsLocator.getI18nManager();
165 184
        WindowManager_v2 winManager = (WindowManager_v2) ToolsSwingLocator.getWindowManager();
166 185
        SelectDataSetDialog panel = new SelectDataSetDialog();
167 186
        Dialog dlg = winManager.createDialog(
168 187
                panel,
169
                "_Select_a_dataset",
188
                i18n.getTranslation("_Select_a_dataset"),
170 189
                null, 
171 190
                WindowManager_v2.BUTTONS_OK_CANCEL
172 191
        );
173 192
        panel.setDialog(dlg);
174 193
        dlg.show(WindowManager_v2.MODE.DIALOG);
175 194
        if( dlg.getAction()==WindowManager_v2.BUTTON_OK) {
176
            TopologyDataSet dataSet = panel.getDataSet();
177
            if( dataSet != null ) {
178
                this.plan.addDataSet(dataSet);
179
                DefaultListModel model = (DefaultListModel) this.lstDataSets.getModel();
180
                model.addElement(dataSet);
195
            List<TopologyDataSet> dataSets = panel.getDataSets();
196
            if( dataSets != null ) {
197
                for (TopologyDataSet dataSet : dataSets) {
198
                    this.plan.addDataSet(dataSet);
199
                    DefaultListModel model = (DefaultListModel) this.lstDataSets.getModel();
200
                    model.addElement(dataSet);
201
                }
181 202
            }
182 203
        }
183 204
    }
......
189 210
        if( lstDataSets.isSelectionEmpty() ) {
190 211
            return;
191 212
        }
213
        int index = lstRules.getSelectedIndex();
192 214
        TopologyDataSet dataSet = (TopologyDataSet) lstDataSets.getSelectedValue();
193 215
        this.plan.removeDataSet(dataSet);
194
        lstDataSets.remove(lstDataSets.getSelectedIndex());
216
        ((DefaultListModel)(lstRules.getModel())).remove(index);
195 217
    }
196 218

  
197 219
    private void performAddRule() {
......
230 252
        int index = lstRules.getSelectedIndex();
231 253
        TopologyRule rule = (TopologyRule) ListElement.getSelected(lstRules);
232 254
        this.plan.removeRule(rule);
233
        lstRules.remove(index);
255
        ((DefaultListModel)(lstRules.getModel())).remove(index);
234 256
    }
235 257

  
236 258
}

Also available in: Unified diff