/ - Diff - Application: gvSIG desktop - gvSIG

Revision 42352

     import java.util.Collections;
     import java.util.Comparator;
     import java.util.HashMap;
     import java.util.Iterator;
     import java.util.List;
     import java.util.Map;
     import java.util.Random;
     import org.apache.commons.io.FileUtils;
     import org.apache.commons.io.FilenameUtils;
     import org.apache.commons.io.filefilter.FileFilterUtils;
     import org.apache.commons.lang3.StringUtils;
     import org.slf4j.Logger;
     import org.slf4j.LoggerFactory;
     import org.gvsig.fmap.geom.Geometry;
     import org.gvsig.fmap.geom.GeometryLocator;
     import org.gvsig.fmap.geom.GeometryManager;
     import org.gvsig.fmap.geom.type.GeometryType;
     import org.gvsig.fmap.geom.type.GeometryTypeNotSupportedException;
     import org.gvsig.fmap.geom.type.GeometryTypeNotValidException;
     import org.gvsig.fmap.mapcontext.MapContextRuntimeException;
     import org.gvsig.fmap.mapcontext.impl.InvalidRegisteredClassException;
     import org.gvsig.fmap.mapcontext.impl.RegisteredClassInstantiationException;
-...
     import org.gvsig.tools.task.TaskStatusManager;
     import org.gvsig.tools.visitor.VisitCanceledException;
     import org.gvsig.tools.visitor.Visitor;
     import org.slf4j.Logger;
     import org.slf4j.LoggerFactory;
     /**
      * Default {@link SymbolManager} implementation.
-...
         public ISymbol createSymbol(int shapeType)
                 throws MapContextRuntimeException {
             String symbolName
                     = (String) symbolsByShapeType.get(new Integer(shapeType));
             String symbolName = getSymbolName(symbolsByShapeType, shapeType);
             return symbolName == null ? null : createSymbol(symbolName);
+        }
-...
         public ISymbol createSymbol(int shapeType, Color color)
                 throws MapContextRuntimeException {
             String symbolName
                     = (String) symbolsByShapeType.get(new Integer(shapeType));
             String symbolName = getSymbolName(symbolsByShapeType, shapeType);
             return symbolName == null ? null : createSymbol(symbolName, color);
+        }
-...
         public IMultiLayerSymbol createMultiLayerSymbol(int shapeType)
                 throws MapContextRuntimeException {
             String symbolName
                     = (String) multiLineSymbolsByShapeType.get(new Integer(shapeType));
             String symbolName = getSymbolName(multiLineSymbolsByShapeType, shapeType);
             return symbolName == null ? null : createMultiLayerSymbol(symbolName);
+        }
         /**
          * @param shapeType
          * @return
          */
         private String getSymbolName(Map symbols, int shapeType) {
             String symbolName
                     = (String) symbols.get(new Integer(shapeType));
             if (symbolName == null) {
                 GeometryManager geomManager = GeometryLocator.getGeometryManager();
                 GeometryType shapeGeometryType;
                 try {
                     shapeGeometryType = geomManager.getGeometryType(shapeType, Geometry.SUBTYPES.UNKNOWN);
                     Iterator it = symbols.keySet().iterator();
                     while (it.hasNext()) {
                         Integer geomType = (Integer) it.next();
                         GeometryType geomGeometryType =
                             geomManager.getGeometryType(geomType.intValue(), Geometry.SUBTYPES.UNKNOWN);
                         if (shapeGeometryType.isSubTypeOf(geomGeometryType)) {
                             symbolName = (String) symbols.get(geomType);
                             break;
+                        }
+                    }
                 } catch (GeometryTypeNotSupportedException e) {
                     // do nothing
                 } catch (GeometryTypeNotValidException e) {
                     // do nothing
+                }
+            }
             return symbolName;
+        }
         public void registerSymbol(String symbolName, Class symbolClass)
                 throws MapContextRuntimeException {
             if (symbolClass == null || !ISymbol.class.isAssignableFrom(symbolClass)) {
-...
                 // ...else resp remains the same
+            }
             // finally add some dark noise
             // finally add some dark noise
             resp = addDarkNoise(resp);
             return resp;
+        }

      * @author 2009-     <a href="cordinyana@gvsig.org">C?sar Ordi?ana</a> - gvSIG team
      */
     public class SimpleFillSymbol extends AbstractFillSymbol implements ISimpleFillSymbol {
     	private static final String SIMPLE_FILL_SYMBOL_PERSISTENCE_DEFINITION_NAME = "SimpleFillSymbol";
     	private static final Logger LOG = LoggerFactory.getLogger(SimpleFillSymbol.class);
     	private static final GeometryManager geomManager = GeometryLocator.getGeometryManager();
-...
     			getOutline().print(g, at, geom, properties);
+    		}
+    	}
     	public Object clone() throws CloneNotSupportedException {
     		SimpleFillSymbol copy = (SimpleFillSymbol) super.clone();
-...
     		return copy;
+    	}
     	private void setSymbolForSelection(SimpleFillSymbol symbolForSelection) {
     		this.symbolForSelection = symbolForSelection;
+    	}
-...
     						SimpleFillSymbol.class,
     						SIMPLE_FILL_SYMBOL_PERSISTENCE_DEFINITION_NAME,
     						SIMPLE_FILL_SYMBOL_PERSISTENCE_DEFINITION_NAME+" Persistence definition",
     						null,
     						null,
     						null
     				);
-...
+    			}
     			return Boolean.TRUE;
+    		}
+    	}
     	public static class RegisterSymbol implements Callable {
-...
     		public Object call() throws Exception {
     	        int[] shapeTypes;
     	        SymbolManager manager = MapContextLocator.getSymbolManager();
     	        shapeTypes =
     	            new int[] { Geometry.TYPES.SURFACE, Geometry.TYPES.CIRCLE,
     	                Geometry.TYPES.ELLIPSE, Geometry.TYPES.MULTISURFACE };
     	                Geometry.TYPES.ELLIPSE, Geometry.TYPES.MULTISURFACE,
     	                Geometry.TYPES.ELLIPTICARC, Geometry.TYPES.FILLEDSPLINE,
                         Geometry.TYPES.MULTIPOLYGON
                         };
     	        manager.registerSymbol(IFillSymbol.SYMBOL_NAME,
     	            shapeTypes,
     	            SimpleFillSymbol.class);
     			return Boolean.TRUE;
+    		}
+    	}
+    }

trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.symbology/org.gvsig.symbology.lib/org.gvsig.symbology.lib.impl/src/main/java/org/gvsig/symbology/fmap/mapcontext/rendering/symbol/line/impl/SimpleLineSymbol.java
64	64
65	65	private static final Logger LOG = LoggerFactory.getLogger(SimpleLineSymbol.class);
66	66	public static final String SIMPLE_LINE_SYMBOL_PERSISTENCE_DEFINITION_NAME = "SimpleLineSymbol";
67
	67
68	68	private static final String SELECTION_SYMBOL = "symbolForSelection";
69	69
70	70	SimpleLineSymbol symbolForSelection;
...	...
74	74	super();
75	75	setLineWidth(1d);
76	76	}
77
	77
78	78	public ISymbol getSymbolForSelection() {
79	79	if (symbolForSelection == null) {
80		symbolForSelection = (SimpleLineSymbol) cloneForSelection();
	80	symbolForSelection = (SimpleLineSymbol) cloneForSelection();
81	81	}
82	82	return symbolForSelection;
83	83	}
...	...
98	98	LOG.error("Creating a Surface", e);
99	99	}
100	100	}
101		g.setColor(getColor());
	101	g.setColor(getColor());
102	102	g.draw(geomToDraw.getShape(affineTransform));
103	103
104	104	ArrowDecoratorStyle arrowDecorator = (ArrowDecoratorStyle) getLineStyle().getArrowDecorator();
...	...
141	141
142	142	return copy;
143	143	}
144
	144
145	145	public void loadFromState(PersistentState state) throws PersistenceException {
146	146	// Set parent style properties
147	147	super.loadFromState(state);
...	...
170	170	SimpleLineSymbol.class,
171	171	SIMPLE_LINE_SYMBOL_PERSISTENCE_DEFINITION_NAME,
172	172	SIMPLE_LINE_SYMBOL_PERSISTENCE_DEFINITION_NAME+" Persistence definition",
173		null,
	173	null,
174	174	null
175	175	);
176	176	// Extend the LineSymbol base definition
177	177	definition.extend(manager.getDefinition(LINE_SYMBOL_PERSISTENCE_DEFINITION_NAME));
178
	178
179	179	definition.addDynFieldObject(SELECTION_SYMBOL).setClassOfValue(SimpleLineSymbol.class);
180	180
181	181	}
182	182	return Boolean.TRUE;
183	183	}
184
	184
185	185	}
186	186
187	187	public static class RegisterSymbol implements Callable {
...	...
191	191	SymbolManager manager = MapContextLocator.getSymbolManager();
192	192
193	193	shapeTypes = new int[] { Geometry.TYPES.CURVE, Geometry.TYPES.ARC,
194		Geometry.TYPES.ELLIPTICARC, Geometry.TYPES.MULTICURVE };
	194	Geometry.TYPES.MULTICURVE, Geometry.TYPES.CIRCUMFERENCE,
	195	Geometry.TYPES.PERIELLIPSE, Geometry.TYPES.SPLINE,
	196	Geometry.TYPES.LINE, Geometry.TYPES.MULTILINE};
195	197	manager.registerSymbol(ILineSymbol.SYMBOL_NAME,
196	198	shapeTypes,
197	199	SimpleLineSymbol.class);
198	200
199	201	return Boolean.TRUE;
200	202	}
201
	203
202	204	}
203	205
204	206	}

Also available in: Unified diff