[Opencadtools-commits] r148 - in branches/extCAD_sprint/src/com/iver/cit/gvsig: gui/cad gui/cad/tools listeners

[amaneiro at osor.eu]

Author: amaneiro
Date: 2011-08-09 17:54:27 +0200 (Tue, 09 Aug 2011)
New Revision: 148

Modified:
   branches/extCAD_sprint/src/com/iver/cit/gvsig/gui/cad/DefaultCADTool.java
   branches/extCAD_sprint/src/com/iver/cit/gvsig/gui/cad/tools/InsertionCADTool.java
   branches/extCAD_sprint/src/com/iver/cit/gvsig/gui/cad/tools/JoinCADTool.java
   branches/extCAD_sprint/src/com/iver/cit/gvsig/listeners/CADListenerManager.java
   branches/extCAD_sprint/src/com/iver/cit/gvsig/listeners/EndGeometryListener.java
Log:
Make the listener to know which cadtool is responsible for the action

Modified: branches/extCAD_sprint/src/com/iver/cit/gvsig/gui/cad/DefaultCADTool.java
===================================================================
--- branches/extCAD_sprint/src/com/iver/cit/gvsig/gui/cad/DefaultCADTool.java	2011-08-09 15:54:16 UTC (rev 147)
+++ branches/extCAD_sprint/src/com/iver/cit/gvsig/gui/cad/DefaultCADTool.java	2011-08-09 15:54:27 UTC (rev 148)
@@ -613,7 +613,7 @@
 
     }
 
-    public void fireEndGeometry(){
-	CADListenerManager.endGeometry(getActiveLayer());
+    public void fireEndGeometry(String cadToolKey){
+	CADListenerManager.endGeometry(getActiveLayer(), cadToolKey);
     }
 }

Modified: branches/extCAD_sprint/src/com/iver/cit/gvsig/gui/cad/tools/InsertionCADTool.java
===================================================================
--- branches/extCAD_sprint/src/com/iver/cit/gvsig/gui/cad/tools/InsertionCADTool.java	2011-08-09 15:54:16 UTC (rev 147)
+++ branches/extCAD_sprint/src/com/iver/cit/gvsig/gui/cad/tools/InsertionCADTool.java	2011-08-09 15:54:27 UTC (rev 148)
@@ -37,7 +37,7 @@
 	 * Throws end geometry event to every class listening to an EndGeometryListener.
 	 */
 	public void fireEndGeometry() {
-		CADListenerManager.endGeometry(getActiveLayer());
+		CADListenerManager.endGeometry(getActiveLayer(), "cad-tool-non-specified");
 	}
 
 }

Modified: branches/extCAD_sprint/src/com/iver/cit/gvsig/gui/cad/tools/JoinCADTool.java
===================================================================
--- branches/extCAD_sprint/src/com/iver/cit/gvsig/gui/cad/tools/JoinCADTool.java	2011-08-09 15:54:16 UTC (rev 147)
+++ branches/extCAD_sprint/src/com/iver/cit/gvsig/gui/cad/tools/JoinCADTool.java	2011-08-09 15:54:27 UTC (rev 148)
@@ -197,7 +197,7 @@
     		vea.endComplexRow(getName());
     		vle.setSelectionCache(VectorialLayerEdited.NOTSAVEPREVIOUS, selectedRowAux);
     		refresh();
-    		fireEndGeometry();
+    		fireEndGeometry("_join");
     	} catch (ReadDriverException e) {
     		NotificationManager.addError(e.getMessage(),e);
     	} catch (ValidateRowException e) {

Modified: branches/extCAD_sprint/src/com/iver/cit/gvsig/listeners/CADListenerManager.java
===================================================================
--- branches/extCAD_sprint/src/com/iver/cit/gvsig/listeners/CADListenerManager.java	2011-08-09 15:54:16 UTC (rev 147)
+++ branches/extCAD_sprint/src/com/iver/cit/gvsig/listeners/CADListenerManager.java	2011-08-09 15:54:27 UTC (rev 148)
@@ -44,14 +44,14 @@
 	}
 
 
-	public static void endGeometry(FLayer layer) {
+	public static void endGeometry(FLayer layer, String cadToolKey) {
 
 		Set<String> keys = endGeometryListeners.keySet();
 		Iterator<String> iterator = keys.iterator();
 
 		while (iterator.hasNext()) {
 			String key = iterator.next();
-			endGeometryListeners.get(key).endGeometry(layer);
+			endGeometryListeners.get(key).endGeometry(layer, cadToolKey);
 		}
 	}
 

Modified: branches/extCAD_sprint/src/com/iver/cit/gvsig/listeners/EndGeometryListener.java
===================================================================
--- branches/extCAD_sprint/src/com/iver/cit/gvsig/listeners/EndGeometryListener.java	2011-08-09 15:54:16 UTC (rev 147)
+++ branches/extCAD_sprint/src/com/iver/cit/gvsig/listeners/EndGeometryListener.java	2011-08-09 15:54:27 UTC (rev 148)
@@ -28,6 +28,6 @@
 
 public interface EndGeometryListener {
 
-	public void endGeometry(FLayer layer);
+	public void endGeometry(FLayer layer, String cadToolKey);
 
 }