Revision 38564

View differences:

branches/v2_0_0_prep/libraries/libUIComponent/src/org/gvsig/gui/beans/controls/IControl.java
73 73
	 */
74 74
	public Object setValue(Object value);
75 75

  
76
	public Object getValue();
77

  
76 78
	/**
77 79
	 * Gets the name of the control, used to identify it
78 80
	 * @return the name of the control
......
86 88
	 * @return
87 89
	 */
88 90
	public void setName(String name);
91
	
89 92
}
branches/v2_0_0_prep/libraries/libUIComponent/src/org/gvsig/gui/beans/controls/combobutton/ComboButton.java
362 362
	public void setAlwaysMenuOnClick(boolean alwaysMenuOnClick) {
363 363
		this.alwaysMenuOnClick = alwaysMenuOnClick;
364 364
	}
365
	
366
	public Object getValue() {
367
		return null;
368
	}
365 369
}
branches/v2_0_0_prep/libraries/libUIComponent/src/org/gvsig/gui/beans/controls/label/Label.java
82 82
		}
83 83
	}
84 84

  
85
	public Object getValue() {
86
		return null;
87
	}
85 88
}
branches/v2_0_0_prep/libraries/libUIComponent/src/org/gvsig/gui/beans/controls/comboscale/ComboScale.java
54 54

  
55 55
    static private int eventId = Integer.MIN_VALUE;
56 56

  
57
    private Long lastValue = null;
58
    
57 59
    // jaume
58 60
    private class ComboScaleItem {
59 61

  
......
155 157
        }
156 158
        return jComboBox;
157 159
    }
160
    
161
	public Object getValue() {
162
		return lastValue;
163
	}
158 164

  
159 165
    public void setItems(long[] items) {
160 166
        ComboScaleItem[] scales = new ComboScaleItem[items.length];
......
216 222
        if (!bDoCallListeners)
217 223
            return;
218 224

  
225
        lastValue = new Long(scale);
219 226
        Iterator<ActionListener> acIterator = actionCommandListeners.iterator();
220 227
        while (acIterator.hasNext()) {
221 228
            ActionListener listener = acIterator.next();
222
            listener.actionPerformed(new ActionEvent(this, eventId,
223
                "CHANGE_SCALE_" + scale));
229
            listener.actionPerformed(new ActionEvent(this, eventId,"view-change-scale"));
224 230
        }
225 231
        eventId++;
226 232
    }
branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/IconThemeHelper.java
1
package org.gvsig.fmap;
2

  
3
import java.awt.Image;
4

  
5
import javax.swing.ImageIcon;
6

  
7
import org.gvsig.tools.swing.api.ToolsSwingLocator;
8
import org.gvsig.tools.swing.icontheme.IconTheme;
9
import org.slf4j.Logger;
10
import org.slf4j.LoggerFactory;
11

  
12
public class IconThemeHelper {
13

  
14
	private static Logger logger = LoggerFactory.getLogger(IconThemeHelper.class);
15
	
16
	public static void registerIcon(String group, String name, Object obj) {
17
		String resourceName;
18
		ClassLoader loader;
19
		IconTheme iconTheme = ToolsSwingLocator.getIconThemeManager().getCurrent();
20
		if( group == null || group.trim().length()==0 ) {
21
			resourceName = "images/"+name+".png";
22
		} else {
23
			resourceName = "images/"+group+"/"+name+".png";
24
		}
25
		if( obj instanceof Class ) {
26
			loader = ((Class) obj).getClassLoader();
27
		} else {
28
			loader = obj.getClass().getClassLoader();
29
		}
30
		try {
31
			iconTheme.registerDefault("mapcontrol", group, name, null, loader.getResource(resourceName));
32
		} catch( Throwable e) {
33
			logger.info(e.getMessage());
34
		}
35
	}
36

  
37
	public static ImageIcon getImageIcon(String iconName) {
38
		IconTheme iconTheme = ToolsSwingLocator.getIconThemeManager().getCurrent();
39
		return iconTheme.get(iconName);
40
	}
41
	
42
	public static Image getImage(String iconName) {
43
		IconTheme iconTheme = ToolsSwingLocator.getIconThemeManager().getCurrent();
44
		return iconTheme.get(iconName).getImage();
45
	}
46
}
0 47

  
branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/dal/swing/datastore/DefaultDataStoreParametersCreationPanel.java
33 33
import javax.swing.JButton;
34 34
import javax.swing.JComboBox;
35 35

  
36
import org.slf4j.Logger;
37
import org.slf4j.LoggerFactory;
38

  
39 36
import org.gvsig.fmap.dal.DALLocator;
40 37
import org.gvsig.fmap.dal.DataManager;
41 38
import org.gvsig.fmap.dal.DataServerExplorer;
......
46 43
import org.gvsig.fmap.dal.exception.ValidateDataParametersException;
47 44
import org.gvsig.fmap.mapcontrol.swing.dynobject.DynObjectEditor;
48 45
import org.gvsig.tools.service.ServiceException;
46
import org.slf4j.Logger;
47
import org.slf4j.LoggerFactory;
49 48

  
50 49

  
51 50
/**
branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/dal/feature/swing/table/TextAreaCellEditor.java
26 26
 */
27 27
package org.gvsig.fmap.mapcontrol.dal.feature.swing.table;
28 28

  
29
import javax.swing.*;
29
import javax.swing.DefaultCellEditor;
30
import javax.swing.JScrollPane;
31
import javax.swing.JTextArea;
32
import javax.swing.JTextField;
30 33

  
31 34
/**
32 35
 * <p>
branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/dal/feature/swing/table/GeometryWKTCellEditor.java
36 36
import javax.swing.JTable;
37 37

  
38 38
import org.gvsig.fmap.geom.Geometry;
39
import org.gvsig.fmap.geom.Geometry.SUBTYPES;
39 40
import org.gvsig.fmap.geom.GeometryLocator;
40 41
import org.gvsig.fmap.geom.GeometryManager;
41
import org.gvsig.fmap.geom.Geometry.SUBTYPES;
42 42
import org.gvsig.fmap.geom.exception.CreateGeometryException;
43 43
import org.gvsig.fmap.geom.operation.fromwkt.FromWKT;
44 44
import org.gvsig.fmap.geom.operation.fromwkt.FromWKTGeometryOperationContext;
branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/dal/feature/swing/FeatureTypesTablePanel.java
27 27
import javax.swing.JPanel;
28 28
import javax.swing.JSplitPane;
29 29

  
30
import org.slf4j.Logger;
31
import org.slf4j.LoggerFactory;
32

  
33 30
import org.gvsig.fmap.dal.exception.DataException;
34 31
import org.gvsig.fmap.dal.feature.Feature;
35 32
import org.gvsig.fmap.dal.feature.FeatureQuery;
......
40 37
import org.gvsig.fmap.mapcontrol.dal.feature.swing.table.FeatureTypeList;
41 38
import org.gvsig.fmap.mapcontrol.dal.feature.swing.table.SelectedFeatureTypeChangeListener;
42 39
import org.gvsig.tools.exception.BaseException;
40
import org.slf4j.Logger;
41
import org.slf4j.LoggerFactory;
43 42

  
44 43
/**
45 44
 * Panel to show a table of Features. It is able to take into account the
branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/dal/feature/swing/FeatureSelectionModel.java
31 31
import javax.swing.event.ListSelectionEvent;
32 32
import javax.swing.event.ListSelectionListener;
33 33

  
34
import org.slf4j.Logger;
35
import org.slf4j.LoggerFactory;
36

  
37 34
import org.gvsig.fmap.dal.exception.DataException;
38 35
import org.gvsig.fmap.dal.feature.Feature;
39 36
import org.gvsig.fmap.dal.feature.FeatureSelection;
......
43 40
import org.gvsig.fmap.mapcontrol.dal.feature.swing.table.FeatureTableModel;
44 41
import org.gvsig.tools.observer.Observable;
45 42
import org.gvsig.tools.observer.Observer;
43
import org.slf4j.Logger;
44
import org.slf4j.LoggerFactory;
46 45

  
47 46
/**
48 47
 * @author 2010- C?sar Ordi?ana - gvSIG team
branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/ZoomOutListenerImpl.java
45 45

  
46 46
import javax.swing.ImageIcon;
47 47

  
48
import org.gvsig.fmap.IconThemeHelper;
49
import org.gvsig.fmap.geom.Geometry.SUBTYPES;
48 50
import org.gvsig.fmap.geom.GeometryLocator;
49 51
import org.gvsig.fmap.geom.GeometryManager;
50
import org.gvsig.fmap.geom.Geometry.SUBTYPES;
51 52
import org.gvsig.fmap.geom.exception.CreateEnvelopeException;
52 53
import org.gvsig.fmap.geom.primitive.Envelope;
53
import org.gvsig.fmap.geom.util.UtilFunctions;
54 54
import org.gvsig.fmap.mapcontext.MapContext;
55 55
import org.gvsig.fmap.mapcontext.ViewPort;
56 56
import org.gvsig.fmap.mapcontrol.MapControl;
......
98 98
	/**
99 99
	 * The image to display when the cursor is active.
100 100
	 */
101
	private final Image izoomout = new ImageIcon(MapControl.class.getClassLoader().getResource(
102
				"org/gvsig/fmap/mapcontrol/images/ZoomOutCursor.gif")).getImage();
101
//	private final Image izoomout = new ImageIcon(MapControl.class.getClassLoader().getResource(
102
//				"org/gvsig/fmap/mapcontrol/images/ZoomOutCursor.gif")).getImage();
103 103

  
104 104
	/**
105 105
	 * Reference to the <code>MapControl</code> object that uses.
......
148 148
	 * @see com.iver.cit.gvsig.fmap.tools.Listeners.ToolListener#getImageCursor()
149 149
	 */
150 150
	public Image getImageCursor() {
151
		return izoomout;
151
		return IconThemeHelper.getImage("cursor-zoom-out");
152 152
	}
153 153

  
154 154
	/*
branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/PointSelectionListener.java
43 43
import java.awt.Image;
44 44
import java.awt.geom.Point2D;
45 45

  
46
import javax.swing.ImageIcon;
47

  
46
import org.gvsig.fmap.IconThemeHelper;
48 47
import org.gvsig.fmap.dal.exception.DataException;
49 48
import org.gvsig.fmap.dal.feature.FeatureSelection;
50 49
import org.gvsig.fmap.dal.feature.FeatureSet;
......
64 63
	/**
65 64
	 * The image to display when the cursor is active.
66 65
	 */
67
	private final Image img = new ImageIcon(MapControl.class.getClassLoader().getResource(
68
				"org/gvsig/fmap/mapcontrol/images/PointSelectCursor.gif")).getImage();
66
//	private final Image img = PluginServices.getIconTheme().get("cursor-select-by-point").getImage();
69 67

  
70 68
	/**
71 69
	 * Reference to the <code>MapControl</code> object that uses.
......
133 131
	 * @see com.iver.cit.gvsig.fmap.tools.Listeners.ToolListener#getCursor()
134 132
	 */
135 133
	public Image getImageCursor() {
136
		return img;
134
		return IconThemeHelper.getImage("cursor-select-by-point");
137 135
	}
138 136

  
139 137
	/*
branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/PanListenerImpl.java
44 44
import java.awt.geom.Point2D;
45 45
import java.awt.geom.Rectangle2D;
46 46

  
47
import javax.swing.ImageIcon;
48

  
47
import org.gvsig.fmap.IconThemeHelper;
48
import org.gvsig.fmap.geom.Geometry.SUBTYPES;
49 49
import org.gvsig.fmap.geom.GeometryLocator;
50 50
import org.gvsig.fmap.geom.GeometryManager;
51
import org.gvsig.fmap.geom.Geometry.SUBTYPES;
52 51
import org.gvsig.fmap.geom.exception.CreateEnvelopeException;
53 52
import org.gvsig.fmap.geom.primitive.Envelope;
54
import org.gvsig.fmap.geom.util.UtilFunctions;
55 53
import org.gvsig.fmap.mapcontext.ViewPort;
56 54
import org.gvsig.fmap.mapcontrol.MapControl;
57 55
import org.gvsig.fmap.mapcontrol.tools.Events.MoveEvent;
......
76 74
	/**
77 75
	 * The image to display when the cursor is active.
78 76
	 */
79
	private final Image ipan = new ImageIcon(MapControl.class.getClassLoader().getResource(
80
				"org/gvsig/fmap/mapcontrol/images/Hand.gif")).getImage();
77
//	private final Image ipan = PluginServices.getIconTheme().get("cursor-pan").getImage();
81 78
	
82 79
	/**
83 80
	 * Reference to the <code>MapControl</code> object that uses.
......
124 121
	 * @see com.iver.cit.gvsig.fmap.tools.Listeners.ToolListener#getCursor()
125 122
	 */
126 123
	public Image getImageCursor() {
127
		return ipan;
124
		return IconThemeHelper.getImage("cursor-pan");
128 125
	}
129 126

  
130 127
	/*
branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/SelectImageListenerImpl.java
40 40
*/
41 41
package org.gvsig.fmap.mapcontrol.tools;
42 42

  
43
import java.awt.Cursor;
44 43
import java.awt.Image;
45
import java.awt.Point;
46
import java.awt.Toolkit;
47 44
import java.awt.geom.Point2D;
48 45

  
49
import javax.swing.ImageIcon;
50

  
46
import org.gvsig.fmap.IconThemeHelper;
51 47
import org.gvsig.fmap.mapcontrol.MapControl;
52 48
import org.gvsig.fmap.mapcontrol.tools.Events.PointEvent;
53 49
import org.gvsig.fmap.mapcontrol.tools.Listeners.PointListener;
......
65 61
	/**
66 62
	 * The image to display when the cursor is active.
67 63
	 */
68
	private final Image isaveraster = new ImageIcon(MapControl.class.getClassLoader().getResource(
69
				"org/gvsig/fmap/mapcontrol/images/PointSelectCursor.gif")).getImage();
64
//	private final Image isaveraster = PluginServices.getIconTheme().get("cursor-select-by-point").getImage();
70 65

  
71 66
	/**
72 67
	 * Reference to the <code>MapControl</code> object that uses.
......
100 95
	 * @see com.iver.cit.gvsig.fmap.tools.Listeners.ToolListener#getImageCursor()
101 96
	 */
102 97
	public Image getImageCursor() {
103
		return isaveraster;
98
		return IconThemeHelper.getImage("cursor-select-by-point");
104 99
	}
105 100

  
106 101
	/*
branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/ZoomOutRightButtonListener.java
44 44
import java.awt.event.MouseEvent;
45 45
import java.awt.geom.Point2D;
46 46

  
47
import javax.swing.ImageIcon;
48

  
47
import org.gvsig.fmap.IconThemeHelper;
48
import org.gvsig.fmap.geom.Geometry.SUBTYPES;
49 49
import org.gvsig.fmap.geom.GeometryLocator;
50 50
import org.gvsig.fmap.geom.GeometryManager;
51
import org.gvsig.fmap.geom.Geometry.SUBTYPES;
52 51
import org.gvsig.fmap.geom.exception.CreateEnvelopeException;
53 52
import org.gvsig.fmap.geom.primitive.Envelope;
54
import org.gvsig.fmap.geom.util.UtilFunctions;
55 53
import org.gvsig.fmap.mapcontext.MapContext;
56 54
import org.gvsig.fmap.mapcontext.ViewPort;
57 55
import org.gvsig.fmap.mapcontrol.MapControl;
......
99 97
	/**
100 98
	 * The image to display when the cursor is active.
101 99
	 */
102
	private final Image izoomout = new ImageIcon(MapControl.class.getClassLoader().getResource(
103
	"org/gvsig/fmap/mapcontrol/images/ZoomOutCursor.gif")).getImage();
100
//	private final Image izoomout = PluginServices.getIconTheme().get("cursor-zoom-out").getImage();
104 101
	
105 102
	/**
106 103
	 * Reference to the <code>MapControl</code> object that uses.
......
153 150
	 * @see com.iver.cit.gvsig.fmap.tools.Listeners.ToolListener#getImageCursor()
154 151
	 */
155 152
	public Image getImageCursor() {
156
		return izoomout;
153
		return IconThemeHelper.getImage("cursor-zoom-out");
157 154
	}
158 155

  
159 156
	/*
branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/BehaviorException.java
40 40
 */
41 41
package org.gvsig.fmap.mapcontrol.tools;
42 42

  
43
import org.gvsig.fmap.mapcontrol.MapControl;
44

  
43 45
/**
44 46
 * <p>Exception produced when fails the process that interacts with a {@link MapControl MapControl} object,
45 47
 *  using some tool.</p>
branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/Behavior/DraggerBehavior.java
40 40
 */
41 41
package org.gvsig.fmap.mapcontrol.tools.Behavior;
42 42

  
43
import java.awt.Graphics;
44 43
import java.awt.event.MouseEvent;
45 44
import java.awt.geom.Point2D;
46 45

  
branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/Behavior/Behavior.java
49 49
import java.awt.geom.Point2D;
50 50
import java.awt.image.BufferedImage;
51 51

  
52
import org.slf4j.Logger;
53
import org.slf4j.LoggerFactory;
54

  
55 52
import org.gvsig.fmap.dal.feature.exception.CreateGeometryException;
56 53
import org.gvsig.fmap.geom.Geometry.SUBTYPES;
57 54
import org.gvsig.fmap.geom.Geometry.TYPES;
......
66 63
import org.gvsig.fmap.mapcontrol.MapControlDrawer;
67 64
import org.gvsig.fmap.mapcontrol.tools.BehaviorException;
68 65
import org.gvsig.fmap.mapcontrol.tools.Listeners.ToolListener;
66
import org.slf4j.Logger;
67
import org.slf4j.LoggerFactory;
69 68

  
70 69

  
71 70

  
branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/Behavior/RectangleBehavior.java
41 41
package org.gvsig.fmap.mapcontrol.tools.Behavior;
42 42

  
43 43
import java.awt.Color;
44
import java.awt.Graphics;
45 44
import java.awt.Point;
46 45
import java.awt.Rectangle;
47 46
import java.awt.event.MouseEvent;
......
49 48
import java.awt.geom.Rectangle2D;
50 49
import java.awt.image.BufferedImage;
51 50

  
51
import org.gvsig.fmap.geom.Geometry.SUBTYPES;
52 52
import org.gvsig.fmap.geom.GeometryLocator;
53 53
import org.gvsig.fmap.geom.GeometryManager;
54
import org.gvsig.fmap.geom.Geometry.SUBTYPES;
55 54
import org.gvsig.fmap.geom.exception.CreateEnvelopeException;
56 55
import org.gvsig.fmap.geom.primitive.Envelope;
57
import org.gvsig.fmap.geom.util.UtilFunctions;
58 56
import org.gvsig.fmap.mapcontext.ViewPort;
59 57
import org.gvsig.fmap.mapcontrol.MapControlDrawer;
60 58
import org.gvsig.fmap.mapcontrol.tools.BehaviorException;
branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/Behavior/PolygonBehavior.java
40 40
 */
41 41
package org.gvsig.fmap.mapcontrol.tools.Behavior;
42 42

  
43
import java.awt.Graphics;
44 43
import java.awt.event.MouseEvent;
45 44
import java.awt.geom.Point2D;
46 45

  
branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/Behavior/IBehavior.java
1 1
package org.gvsig.fmap.mapcontrol.tools.Behavior;
2 2

  
3
import java.awt.Graphics;
3 4
import java.awt.Image;
4 5
import java.awt.event.MouseEvent;
5 6
import java.awt.event.MouseWheelEvent;
branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/RectangleSelectionListener.java
42 42

  
43 43
import java.awt.Image;
44 44

  
45
import javax.swing.ImageIcon;
46

  
45
import org.gvsig.fmap.IconThemeHelper;
47 46
import org.gvsig.fmap.dal.exception.DataException;
48 47
import org.gvsig.fmap.dal.feature.FeatureSelection;
49 48
import org.gvsig.fmap.dal.feature.FeatureSet;
......
65 64
	/**
66 65
	 * The image to display when the cursor is active.
67 66
	 */
68
	private final Image img = new ImageIcon(MapControl.class.getClassLoader().getResource(
69
				"org/gvsig/fmap/mapcontrol/images/RectSelectCursor.gif")).getImage();
67
//	private final Image img = PluginServices.getIconTheme().get("cursor-select-by-polygon").getImage();
70 68

  
71 69
	/**
72 70
	 * Reference to the <code>MapControl</code> object that uses.
......
123 121
	 * @see com.iver.cit.gvsig.fmap.tools.Listeners.ToolListener#getImageCursor()
124 122
	 */
125 123
	public Image getImageCursor() {
126
		return img;
124
		return IconThemeHelper.getImage("cursor-select-by-polygon");
127 125
	}
128 126

  
129 127
	/*
branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/Events/PointEvent.java
43 43
import java.awt.event.MouseEvent;
44 44
import java.awt.geom.Point2D;
45 45

  
46
import org.gvsig.fmap.geom.Geometry;
47
import org.gvsig.fmap.geom.GeometryLocator;
48
import org.gvsig.fmap.geom.GeometryManager;
49
import org.gvsig.fmap.geom.exception.CreateGeometryException;
50 46
import org.gvsig.fmap.geom.primitive.Point;
51 47
import org.gvsig.fmap.mapcontrol.MapControl;
52 48

  
branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/Listeners/RectangleListener.java
40 40
 */
41 41
package org.gvsig.fmap.mapcontrol.tools.Listeners;
42 42

  
43
import org.gvsig.fmap.mapcontrol.MapControl;
43 44
import org.gvsig.fmap.mapcontrol.tools.BehaviorException;
44 45
import org.gvsig.fmap.mapcontrol.tools.Events.EnvelopeEvent;
45 46

  
branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/Listeners/PointListener.java
40 40
 */
41 41
package org.gvsig.fmap.mapcontrol.tools.Listeners;
42 42

  
43
import org.gvsig.fmap.mapcontrol.MapControl;
43 44
import org.gvsig.fmap.mapcontrol.tools.BehaviorException;
44 45
import org.gvsig.fmap.mapcontrol.tools.Events.PointEvent;
45 46

  
branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/Listeners/PolylineListener.java
40 40
 */
41 41
package org.gvsig.fmap.mapcontrol.tools.Listeners;
42 42

  
43
import org.gvsig.fmap.mapcontrol.MapControl;
43 44
import org.gvsig.fmap.mapcontrol.tools.BehaviorException;
44 45
import org.gvsig.fmap.mapcontrol.tools.Events.MeasureEvent;
45 46

  
branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/Listeners/PanListener.java
40 40
 */
41 41
package org.gvsig.fmap.mapcontrol.tools.Listeners;
42 42

  
43
import org.gvsig.fmap.mapcontrol.MapControl;
43 44
import org.gvsig.fmap.mapcontrol.tools.BehaviorException;
44 45
import org.gvsig.fmap.mapcontrol.tools.Events.MoveEvent;
45 46

  
branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/Listeners/CircleListener.java
40 40
 */
41 41
package org.gvsig.fmap.mapcontrol.tools.Listeners;
42 42

  
43
import org.gvsig.fmap.mapcontrol.MapControl;
43 44
import org.gvsig.fmap.mapcontrol.tools.BehaviorException;
44 45
import org.gvsig.fmap.mapcontrol.tools.Events.MeasureEvent;
45 46

  
branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/MeasureListenerImpl.java
43 43
import java.awt.Image;
44 44
import java.awt.Point;
45 45

  
46
import javax.swing.ImageIcon;
47

  
46
import org.gvsig.fmap.IconThemeHelper;
48 47
import org.gvsig.fmap.mapcontext.ViewPort;
49 48
import org.gvsig.fmap.mapcontrol.MapControl;
50 49
import org.gvsig.fmap.mapcontrol.tools.Events.MeasureEvent;
......
66 65
	/**
67 66
	 * The image to display when the cursor is active.
68 67
	 */
69
	private final Image iruler = new ImageIcon(MapControl.class.getClassLoader().getResource(
70
				"org/gvsig/fmap/mapcontrol/images/RulerCursor.gif")).getImage();
71

  
68
//	private final Image iruler = PluginServices.getIconTheme().get("cursor-query-area").getImage();
72 69
	/**
73 70
	 * Reference to the <code>MapControl</code> object that uses.
74 71
	 */
......
114 111
	 * @see com.iver.cit.gvsig.fmap.tools.Listeners.ToolListener#getImageCursor()
115 112
	 */
116 113
	public Image getImageCursor() {
117
		return iruler;
114
		return IconThemeHelper.getImage("cursor-query-area");
118 115
	}
119 116

  
120 117
	/*
branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/snapping/GeometriesSnappingVisitor.java
4 4
import java.util.ArrayList;
5 5

  
6 6
import org.gvsig.fmap.geom.operation.tojts.ToJTS;
7
import org.gvsig.fmap.mapcontrol.tools.snapping.snappers.ISnapperGeometriesVectorial;
8 7
import org.gvsig.fmap.mapcontrol.tools.snapping.snappers.ISnapperVectorial;
9 8

  
10 9
import com.vividsolutions.jts.geom.Coordinate;
branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/AreaListenerImpl.java
40 40
 */
41 41
package org.gvsig.fmap.mapcontrol.tools;
42 42

  
43
import java.awt.Cursor;
44 43
import java.awt.Image;
45 44
import java.awt.Point;
46
import java.awt.Toolkit;
47 45
import java.awt.geom.Point2D;
48 46

  
49
import javax.swing.ImageIcon;
50

  
51 47
import org.cresques.cts.IProjection;
48
import org.gvsig.fmap.IconThemeHelper;
52 49
import org.gvsig.fmap.crs.CRSFactory;
50
import org.gvsig.fmap.geom.primitive.GeneralPathX;
53 51
import org.gvsig.fmap.mapcontext.MapContext;
54 52
import org.gvsig.fmap.mapcontext.ViewPort;
55 53
import org.gvsig.fmap.mapcontrol.MapControl;
56 54
import org.gvsig.fmap.mapcontrol.tools.Events.MeasureEvent;
57 55
import org.gvsig.fmap.mapcontrol.tools.Listeners.PolylineListener;
58 56
import org.gvsig.fmap.mapcontrol.tools.geo.Geo;
57
import org.gvsig.tools.swing.api.ToolsSwingLocator;
58
import org.gvsig.tools.swing.icontheme.IconThemeManager;
59 59
import org.slf4j.Logger;
60 60
import org.slf4j.LoggerFactory;
61 61

  
......
77 77
	/**
78 78
	 * The image to display when the cursor is active.
79 79
	 */
80
	private final Image iarea = new ImageIcon(MapControl.class.getClassLoader().getResource(
81
				"org/gvsig/fmap/mapcontrol/images/AreaCursor.gif")).getImage();
80
//	private final Image iarea = PluginServices.getIconTheme().get("cursor-query-area").getImage();
82 81
	
83 82
	/**
84 83
	 * Reference to the <code>MapControl</code> object that uses.
......
258 257
	 * @see com.iver.cit.gvsig.fmap.tools.Listeners.ToolListener#getImageCursor()
259 258
	 */
260 259
	public Image getImageCursor() {
261
		return iarea;
260
		return IconThemeHelper.getImage("cursor-query-area");
262 261
	}
263 262

  
264 263
	/*
branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/PolygonSelectionListener.java
42 42

  
43 43
import java.awt.Image;
44 44

  
45
import javax.swing.ImageIcon;
46

  
45
import org.gvsig.fmap.IconThemeHelper;
47 46
import org.gvsig.fmap.dal.exception.DataException;
48 47
import org.gvsig.fmap.dal.feature.FeatureSelection;
49 48
import org.gvsig.fmap.dal.feature.FeatureSet;
50 49
import org.gvsig.fmap.dal.feature.exception.CreateGeometryException;
51
import org.gvsig.fmap.geom.Geometry;
52
import org.gvsig.fmap.geom.GeometryLocator;
53
import org.gvsig.fmap.geom.GeometryManager;
54 50
import org.gvsig.fmap.geom.Geometry.SUBTYPES;
55 51
import org.gvsig.fmap.geom.Geometry.TYPES;
52
import org.gvsig.fmap.geom.GeometryLocator;
53
import org.gvsig.fmap.geom.GeometryManager;
56 54
import org.gvsig.fmap.geom.primitive.GeneralPathX;
57 55
import org.gvsig.fmap.geom.primitive.Surface;
58 56
import org.gvsig.fmap.mapcontext.layers.FLayer;
......
78 76
	/**
79 77
	 * The image to display when the cursor is active.
80 78
	 */
81
	private final Image img = new ImageIcon(MapControl.class.getClassLoader().getResource(
82
				"org/gvsig/fmap/mapcontrol/images/PoligonCursor.png")).getImage();
79
//	private final Image img = PluginServices.getIconTheme().get("cursor-select-by-polygon").getImage();
83 80
	
84 81
	/**
85 82
	 * The cursor used to work with this tool listener.
......
102 99
	 * @see com.iver.cit.gvsig.fmap.tools.Listeners.ToolListener#getImageCursor()
103 100
	 */
104 101
	public Image getImageCursor() {
105
		return img;
102
		return IconThemeHelper.getImage("cursor-select-by-polygon");
106 103
	}
107 104

  
108 105
	/*
branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/ZoomInListenerImpl.java
42 42

  
43 43
import java.awt.Image;
44 44
import java.awt.geom.Rectangle2D;
45
import java.net.URL;
46 45

  
47
import javax.swing.ImageIcon;
48

  
49
import org.slf4j.Logger;
50
import org.slf4j.LoggerFactory;
51

  
46
import org.gvsig.fmap.IconThemeHelper;
52 47
import org.gvsig.fmap.geom.Geometry.SUBTYPES;
53 48
import org.gvsig.fmap.geom.GeometryLocator;
54 49
import org.gvsig.fmap.geom.GeometryManager;
......
59 54
import org.gvsig.fmap.mapcontrol.MapControl;
60 55
import org.gvsig.fmap.mapcontrol.tools.Events.EnvelopeEvent;
61 56
import org.gvsig.fmap.mapcontrol.tools.Listeners.RectangleListener;
57
import org.slf4j.Logger;
58
import org.slf4j.LoggerFactory;
62 59

  
63 60

  
64 61

  
......
101 98
	/**
102 99
	 * The image to display when the cursor is active.
103 100
	 */
104
	private final Image izoomin;
101
//	private final Image izoomin;
105 102

  
106 103
	/**
107 104
	 * Reference to the <code>MapControl</code> object that uses.
......
113 110
     * 
114 111
     */
115 112
    public ZoomInListenerImpl() {
116
        URL res = MapControl.class.getClassLoader().getResource("org/gvsig/fmap/mapcontrol/images/ZoomInCursor.gif");
117
        if( res == null ) {
118
            this.izoomin = new ImageIcon().getImage();
119
            logger.error("Can't load icon 'org/gvsig/fmap/mapcontrol/images/ZoomInCursor.gif'");
120
        } else {
121
            this.izoomin = new ImageIcon(res).getImage();
122
        }
113
//        this.izoomin = PluginServices.getIconTheme().get("cursor-zoom-in").getImage();
123 114
    }
124 115

  
125 116
    /**
......
174 165
	 * @see com.iver.cit.gvsig.fmap.tools.Listeners.ToolListener#getImageCursor()
175 166
	 */
176 167
	public Image getImageCursor() {
177
		return izoomin;
168
		return IconThemeHelper.getImage("cursor-zoom-in");
178 169
	}
179 170

  
180 171
	/*
branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/impl/DefaultPrimitivesDrawer.java
25 25
import java.awt.Graphics;
26 26
import java.awt.Graphics2D;
27 27

  
28
import org.gvsig.fmap.mapcontrol.PrimitivesDrawer;
28 29
import org.slf4j.Logger;
29 30
import org.slf4j.LoggerFactory;
30 31

  
31
import org.gvsig.fmap.mapcontrol.PrimitivesDrawer;
32

  
33 32
/**
34 33
 * @author <a href="mailto:jpiera@gvsig.org">Jorge Piera</a>
35 34
 */
branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/impl/DefaultMapControlManager.java
33 33
import java.util.Map;
34 34
import java.util.prefs.Preferences;
35 35

  
36
import org.slf4j.Logger;
37
import org.slf4j.LoggerFactory;
38

  
39 36
import org.gvsig.fmap.geom.Geometry;
40 37
import org.gvsig.fmap.mapcontext.MapContextLocator;
41 38
import org.gvsig.fmap.mapcontext.MapContextManager;
......
52 49
import org.gvsig.tools.extensionpoint.ExtensionPoint;
53 50
import org.gvsig.tools.extensionpoint.ExtensionPoint.Extension;
54 51
import org.gvsig.tools.extensionpoint.ExtensionPointManager;
52
import org.slf4j.Logger;
53
import org.slf4j.LoggerFactory;
55 54

  
56 55
/**
57 56
 * @author <a href="mailto:jpiera@gvsig.org">Jorge Piera</a>
branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/MapControlLibrary.java
28 28

  
29 29
import java.util.Locale;
30 30

  
31
import org.gvsig.fmap.IconThemeHelper;
31 32
import org.gvsig.fmap.mapcontext.MapContextLibrary;
32 33
import org.gvsig.i18n.Messages;
33 34
import org.gvsig.tools.library.AbstractLibrary;
......
59 60
	
60 61
	@Override
61 62
	protected void doPostInitialize() throws LibraryException {
63
	   	IconThemeHelper.registerIcon("cursor", "cursor-crux", this);
64
	   	IconThemeHelper.registerIcon("cursor", "cursor-info-by-point",this);
65
	   	IconThemeHelper.registerIcon("cursor", "cursor-pan", this);
66
	   	IconThemeHelper.registerIcon("cursor", "cursor-query-area", this);
67
	   	IconThemeHelper.registerIcon("cursor", "cursor-select-by-point", this);
68
	   	IconThemeHelper.registerIcon("cursor", "cursor-select-by-polygon", this);
69
	   	IconThemeHelper.registerIcon("cursor", "cursor-zoom-in", this);
70
	   	IconThemeHelper.registerIcon("cursor", "cursor-zoom-out", this);
71

  
72
	   	IconThemeHelper.registerIcon("layer", "layer-icon", this);
73
	   	IconThemeHelper.registerIcon("layer", "layer-icon-group", this);
74
	   	IconThemeHelper.registerIcon("layer", "layer-icon-vectorial", this);
62 75
	}
63 76
}
branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/swing/dynobject/impl/DefaultLayersDynObjectSetComponent.java
31 31
import javax.swing.event.ListSelectionEvent;
32 32
import javax.swing.event.ListSelectionListener;
33 33

  
34
import org.slf4j.Logger;
35
import org.slf4j.LoggerFactory;
36

  
37 34
import org.gvsig.fmap.mapcontrol.swing.dynobject.LayersDynObjectSetComponent;
38 35
import org.gvsig.tools.dynobject.DynObjectSet;
39 36
import org.gvsig.tools.exception.BaseException;
40 37
import org.gvsig.tools.swing.api.ToolsSwingLocator;
41 38
import org.gvsig.tools.swing.api.dynobject.set.JDynObjectSetComponent;
39
import org.slf4j.Logger;
40
import org.slf4j.LoggerFactory;
42 41

  
43 42
/**
44 43
 * @author gvSIG Team
branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/swing/dynobject/DynObjectViewer.java
36 36
import javax.swing.JTextField;
37 37

  
38 38
import org.cresques.cts.IProjection;
39

  
40 39
import org.gvsig.i18n.Messages;
41 40
import org.gvsig.tools.dynobject.DynClass;
42 41
import org.gvsig.tools.dynobject.DynField;
branches/v2_0_0_prep/libraries/libCorePlugin/config/config.xml
1 1
<?xml version="1.0" encoding="ISO-8859-1"?>
2 2
<plugin-config>
3
	<libraries library-dir="lib"/>
4
	<resourceBundle name="text"/>
5
	<extensions>
6
		<extension class-name="org.gvsig.coreplugin.menus.ToolbarMenus"
7
			description="Active toolbar menues"
8
			active="true"
9
			priority="99999">
10
		</extension>
11
		<extension class-name="org.gvsig.coreplugin.Consola"
12
			description="Extensi?n encargada de abrir la ventana de la consola."
13
			active="true" priority="1">
14
			<menu text="Ver/Consola" action-command="unico" key="s"
15
				icon="application-console"
16
				tooltip="titulo_consola"
17
				position="20090"/>
18
			<tool-bar name="core" position="20">
19
				<action-tool icon="application-console"
20
					action-command="consola" tooltip="titulo_consola"
21
					enable-text="debe_estar_activada" last="true" position="1"/>
22
			</tool-bar>
23
		</extension>
24
		<extension class-name="org.gvsig.coreplugin.PreferencesExtension"
25
			description="Extensi?n encargada de abrir la ventana de preferencias de ANDAMI."
26
			active="true" priority="3">
27
			<menu text="Ver/Preferencias" action-command="preferences"
28
				icon="application-preferences"
29
				tooltip="preferencias"
30
				position="20094"/>
31
			<tool-bar name="core" position="20">
32
				<action-tool icon="application-preferences"
33
					action-command="preferences" tooltip="preferencias"
34
					enable-text="debe_estar_activada" position="2"/>
35
			</tool-bar>
36
		</extension>
37
		<extension class-name="org.gvsig.coreplugin.StatusBar"
38
			description="Recoge los mensajes del NotificationManager y los muestra por la StatusBar"
39
			active="true">
40
		</extension>
41
		<skin-extension class-name="org.gvsig.coreplugin.mdiManager.NewSkin">
42
			<menu text="Ventana/Cascada" action-command="cascada" key="c"
43
				tooltip="cascada_tooltip" position="80080"/>
44
			<menu text="Ventana/Tile" action-command="mosaico" key="m"
45
				tooltip="mosaico_tooltip" position="80084"/>
46
		</skin-extension>
47
	</extensions>
48
</plugin-config>
3
  <libraries library-dir="lib"/>
4
  <resourceBundle name="text"/>
5
  <extensions>
6
    <extension class-name="org.gvsig.coreplugin.menus.ToolbarMenus"
7
      description="Active toolbar menues"
8
      active="true"
9
      priority="99999">
10
    </extension>
11
    <extension class-name="org.gvsig.coreplugin.Consola"
12
      description="Extensi?n encargada de abrir la ventana de la consola."
13
      active="true" priority="1">
14
      <action 
15
        name= "show-console"
16
        label="Consola"
17
        tooltip="_Show_console_error_messages"
18
        action-command="show-console" 
19
        icon="show-console"
20
        accelerator="Alt+S"
21
        position="400200000"
22
        />
23
        
24
      <menu
25
        name="show-console"
26
        text="Show/Console" 
27
        />
28
        
29
      <tool-bar name="core" position="20">
30
        <action-tool name="show-console" last="true" />
31
      </tool-bar>
32
      
33
    </extension>
34
    <extension class-name="org.gvsig.coreplugin.PreferencesExtension"
35
      description="Extensi?n encargada de abrir la ventana de preferencias de ANDAMI."
36
      active="true" priority="3">
37
      <action 
38
        name= "edit-setup"
39
        label="Setup"
40
        tooltip="_Show_application_setup"
41
        action-command="edit-setup" 
42
        icon="edit-setup"
43
        accelerator=""
44
        position="209000000"
45
        />
46
        
49 47

  
50
<!--
51
<?xml version="1.0" encoding="ISO-8859-1"?>
52
<!DOCTYPE plugin SYSTEM "../../plugin.dtd">
53
<plugin>
54
	<libraries>
55
		<library file="org.gvsig.coreplugin.jar"/>
56
		<library file="prulib.jar"/>
57
	</libraries>
58
	<resourceBundle name="text"/>
59
	<labelSet class="org.gvsig.coreplugin.ConsolaFrame">
60
		<label text="label1"/>
61
		<label text="label2"/>
62
	</labelSet>
63
	<extension>
64
		<class name="org.gvsig.coreplugin.Consola"/>
65
		<menu text="Ver/Consola" key="s"/>
66
		<toolBar name="Ver">
67
			<tool icon="application-console"
68
				actionCommand="CONSOLA"/>
69
		</toolBar>
70
	</extension>
71
	<extension>
72
		<class name="org.gvsig.coreplugin.Cascade"/>
73
		<menu text="Window/Tile" key="t" mnemonic="t"
74
			tooltip="tile_tooltip"
75
			enableText="cascada_enable"
76
			actionCommand="TILE"/>
77
		<menu text="Window/Cascada" key="c" mnemonic="c"
78
			tooltip="cascada_tooltip"
79
			enableText="cascada_enable"
80
			actionCommand="CASCADA"/>
81
		<toolBar name="Window">
82
			<tool icon="images/cascada.gif"
83
				tooltip="cascada_tooltip"
84
				enableText="cascada_enable"
85
				actionCommand="CASCADA"/>
86
			<tool icon="images/tile.gif"
87
				tooltip="tile_tooltip"
88
				enableText="cascada_enable"
89
				actionCommand="TILE"/>
90
		</toolBar>
91
		<popupMenu name="cascada">
92
			<entry text="Cascada"
93
				tooltip="cascada_tooltip"
94
				enableText="cascada_enable" actionCommand="CASCADA"/>
95
			<entry text="Tile"
96
				tooltip="tile_tooltip"
97
				enableText="cascada_enable" actionCommand="CASCADA"/>
98
		</popupMenu>
99
	</extension>
100
	<extension>
101
		<class name="org.gvsig.coreplugin.StatusBar"/>
102
	</extension>
103
</plugin>
104
-->
48
      <menu
49
        name="edit-setup" 
50
        text="Edit/Setup" 
51
        />
52
        
53
      <tool-bar name="core" position="20">
54
        <action-tool name="edit-setup"/>
55
      </tool-bar>
56
      
57
    </extension>
58
    
59
    
60
    <extension class-name="org.gvsig.coreplugin.StatusBar"
61
      description="Recoge los mensajes del NotificationManager y los muestra por la StatusBar"
62
      active="true">
63
    </extension>
64
    <skin-extension class-name="org.gvsig.coreplugin.mdiManager.NewSkin">
65
      <action 
66
        name= "window-cascade"
67
        label="cascade"
68
        tooltip="_Show_windows_in_cascade"
69
        action-command="window-cascade" 
70
        icon="window-cascade"
71
        position="960100000"
72
        accelerator="Alt+C"
73
        />
74
      <action 
75
        name= "window-tile"
76
        label="tile"
77
        tooltip="_Show_windows_tile"
78
        action-command="window-tile" 
79
        icon="window-tile"
80
        position="960200000"
81
        accelerator="Alt+T"
82
        />
83
        
84
      <menu
85
        name="window-cascade" 
86
        text="Window/Cascade"
87
        />
88
      <menu
89
        name="window-tile" 
90
        text="Window/Tile"
91
        />
92
    </skin-extension>
93
  </extensions>
94
</plugin-config>
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff