Revision 19339

View differences:

trunk/extensions/extGraph/src/com/iver/cit/gvsig/graph/NetworkUtils.java
44 44
import java.awt.geom.Point2D;
45 45
import java.awt.geom.Rectangle2D;
46 46
import java.io.File;
47
import java.io.IOException;
47 48
import java.util.ArrayList;
48
import java.util.Collection;
49 49
import java.util.Iterator;
50 50

  
51 51
import javax.swing.ImageIcon;
52 52

  
53
import org.gvsig.symbology.fmap.symbols.PictureMarkerSymbol;
54

  
53 55
import com.iver.cit.gvsig.fmap.MapControl;
54 56
import com.iver.cit.gvsig.fmap.ViewPort;
55 57
import com.iver.cit.gvsig.fmap.core.IFeature;
......
59 61
import com.iver.cit.gvsig.fmap.core.styles.ILineStyle;
60 62
import com.iver.cit.gvsig.fmap.core.styles.SimpleLineStyle;
61 63
import com.iver.cit.gvsig.fmap.core.symbols.IMarkerSymbol;
62
import com.iver.cit.gvsig.fmap.core.symbols.PictureMarkerSymbol;
63 64
import com.iver.cit.gvsig.fmap.core.symbols.SimpleLineSymbol;
64 65
import com.iver.cit.gvsig.fmap.layers.FLayer;
65 66
import com.iver.cit.gvsig.fmap.layers.GraphicLayer;
......
227 228
	 */
228 229
	public static IMarkerSymbol getDefaultSymbolFlag() {
229 230
		if (simFlag == null) {
230
			simFlag = new PictureMarkerSymbol();
231
			
232
			try {
233
				simFlag = new PictureMarkerSymbol(NetworkUtils.class.getClassLoader()
234
						.getResource("images/pushpin.png"),NetworkUtils.class.getClassLoader()
235
						.getResource("images/pushpin.png"));
236
			} catch (IOException e) {
237
				//FIXME: ?????
238
				e.printStackTrace();
239
				return null;
240
			}
231 241
			simFlag.setSize(24);
232
			ImageIcon icon = new ImageIcon(NetworkUtils.class.getClassLoader()
233
					.getResource("images/pushpin.png"));
234
			((PictureMarkerSymbol) simFlag).setImg(icon.getImage());
235 242
		}
236 243
		return simFlag;
237 244
	}
trunk/extensions/extGraph/src/com/iver/cit/gvsig/graph/solvers/EdgesMemoryDriver.java
70 70
import java.awt.Color;
71 71
import java.awt.geom.Line2D;
72 72
import java.awt.geom.Rectangle2D;
73
import java.io.IOException;
74 73
import java.sql.Types;
75 74
import java.text.NumberFormat;
76 75

  
77 76
import com.hardcode.gdbms.driver.exceptions.ReadDriverException;
78 77
import com.hardcode.gdbms.engine.data.DataSourceFactory;
79
import com.hardcode.gdbms.engine.data.driver.DriverException;
80 78
import com.hardcode.gdbms.engine.data.driver.ObjectDriver;
81 79
import com.hardcode.gdbms.engine.data.edition.DataWare;
82 80
import com.hardcode.gdbms.engine.values.Value;
......
88 86
import com.iver.cit.gvsig.fmap.core.ShapeFactory;
89 87
import com.iver.cit.gvsig.fmap.core.symbols.ILineSymbol;
90 88
import com.iver.cit.gvsig.fmap.core.symbols.SimpleLineSymbol;
91
import com.iver.cit.gvsig.fmap.core.v02.FSymbol;
92 89
import com.iver.cit.gvsig.fmap.drivers.BoundedShapes;
93 90
import com.iver.cit.gvsig.fmap.drivers.DriverAttributes;
94 91
import com.iver.cit.gvsig.fmap.drivers.FieldDescription;
......
97 94
import com.iver.cit.gvsig.fmap.rendering.FInterval;
98 95
import com.iver.cit.gvsig.fmap.rendering.ILegend;
99 96
import com.iver.cit.gvsig.fmap.rendering.VectorialIntervalLegend;
100
import com.iver.cit.gvsig.fmap.rendering.styling.AttrInTableLabeling;
101
import com.iver.cit.gvsig.fmap.rendering.styling.ILabelingStrategy;
97
import com.iver.cit.gvsig.fmap.rendering.styling.labeling.ILabelingStrategy;
102 98
import com.iver.cit.gvsig.graph.core.GvEdge;
103 99
import com.iver.cit.gvsig.graph.core.GvNode;
104 100
import com.iver.cit.gvsig.graph.core.Network;
101
import com.iver.cit.gvsig.project.documents.view.legend.gui.AttrInTableLabeling;
105 102

  
106 103
/**
107 104
 * Driver wrapper around arcs from a network. It may be useful to show the arcs
......
377 374
	}
378 375

  
379 376
	public ILabelingStrategy getDefaultLabelingStrategy() {
380
		return labeling;
377
		return (ILabelingStrategy) labeling;
381 378
	}
382 379

  
383 380
	public Rectangle2D getShapeBounds(int index) throws ReadDriverException, ExpansionFileReadException {
......
392 389
	public int getShapeType(int index) throws ReadDriverException {
393 390
		return getShapeType();
394 391
	}
392

  
393

  
395 394
}
trunk/extensions/extGraph/src/com/iver/cit/gvsig/graph/tools/BarrierListener.java
48 48
import javax.swing.ImageIcon;
49 49
import javax.swing.JOptionPane;
50 50

  
51
import org.gvsig.symbology.fmap.symbols.PictureMarkerSymbol;
52

  
51 53
import com.iver.andami.PluginServices;
52 54
import com.iver.cit.gvsig.fmap.MapControl;
53 55
import com.iver.cit.gvsig.fmap.core.IGeometry;
54 56
import com.iver.cit.gvsig.fmap.core.ShapeFactory;
55
import com.iver.cit.gvsig.fmap.core.symbols.PictureMarkerSymbol;
56 57
import com.iver.cit.gvsig.fmap.layers.FLayer;
57 58
import com.iver.cit.gvsig.fmap.layers.GraphicLayer;
58 59
import com.iver.cit.gvsig.fmap.layers.SingleLayerIterator;

Also available in: Unified diff