Revision 30232

View differences:

trunk/extensions/extCAD/src/com/iver/cit/gvsig/project/documents/view/snapping/gui/SnapConfig.java
42 42

  
43 43
import java.awt.Component;
44 44
import java.util.ArrayList;
45
import java.util.HashMap;
46 45
import java.util.TreeMap;
47 46

  
48 47
import javax.swing.JButton;
......
311 310
		return getJChkBoxRefentActive().isSelected();
312 311
	}
313 312

  
314
	public void selectSnappers(HashMap selected) {
313
	public void selectSnappers(TreeMap selected) {
315 314
		for (int i=0;i<snappers.size();i++) {
316 315
			Boolean b=(Boolean)selected.get(snappers.get(i));
317 316
			if (b!=null)
trunk/extensions/extCAD/src/com/iver/cit/gvsig/gui/preferences/SnapConfigPage.java
1 1
package com.iver.cit.gvsig.gui.preferences;
2 2

  
3 3
import java.util.ArrayList;
4
import java.util.HashMap;
4
import java.util.Comparator;
5 5
import java.util.Iterator;
6
import java.util.TreeMap;
6 7
import java.util.prefs.Preferences;
7 8

  
8 9
import javax.swing.ImageIcon;
......
31 32
    private ArrayList<ISnapper> snappers = new ArrayList<ISnapper>();
32 33
	private static boolean applySnappers=true;
33 34
    @SuppressWarnings("unchecked")
34
	public static HashMap<ISnapper,Boolean> selected = new HashMap<ISnapper,Boolean>();
35
	public static TreeMap<ISnapper,Boolean> selected = new TreeMap<ISnapper,Boolean>(new Comparator<ISnapper>(){
36

  
37
		public int compare(ISnapper o1, ISnapper o2) {
38
			if (o1.getClass().equals(o2.getClass()))
39
				return 0;
40
			if (o1.getPriority()>o2.getPriority())
41
				return 1;
42
			else
43
				return -1;
44
		}
45

  
46
	});
35 47
    static {
36 48
    	new SnapConfigPage().initializeValues();
37 49
    }
......
151 163
            String nameClass=snp.getClass().getName();
152 164
            nameClass=nameClass.substring(nameClass.lastIndexOf('.'));
153 165
            boolean select = prefs.getBoolean("snapper_activated" + nameClass, false);
166
            int priority = prefs.getInt("snapper_priority" + nameClass,3);
167
            snp.setPriority(priority);
154 168
            if (select)
155 169
            	selected.put(snp, new Boolean(select));
156
            int priority = prefs.getInt("snapper_priority" + nameClass,3);
157
            snp.setPriority(priority);
170

  
158 171
        }
159 172
        applySnappers = prefs.getBoolean("apply-snappers",true);
160 173
        snapConfig.setApplySnappers(applySnappers);

Also available in: Unified diff