Index: branches/v2_0_0_prep/applications/appgvSIG/config/config.xml
===================================================================
--- branches/v2_0_0_prep/applications/appgvSIG/config/config.xml	(revision 38563)
+++ branches/v2_0_0_prep/applications/appgvSIG/config/config.xml	(revision 38564)
@@ -1,325 +1,871 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <plugin-config>
-	<libraries library-dir="lib"/>
-	<resourceBundle name="text"/>
-	<label-set class-name="org.gvsig.app.project.documents.view.gui.DefaultViewPanel">
-		<label id="units" size="75"/>
-		<label id="x" size="120"/>
-		<label id="y" size="120"/>
-		<label id="4" size="110"/>
-		<label id="5" size="110"/>
-		<label id="distancearea" size="30"/>
-		<label id="projection" size="110"/>
-	</label-set>
-	<extensions>
-		<extension class-name="org.gvsig.app.extension.InitialWarningExtension"
-			description="Initial warning message"
-			active="true"
-			priority="1">
-		</extension>
-		<extension class-name="org.gvsig.app.extension.InitializeApplicationExtension"
-			description="Initialize application extension"
-			active="true"
-			priority="99999">
-		</extension>
-		<extension class-name="org.gvsig.app.extension.ProjectExtension"
-			description="Extensi�n encargada de gestionar los proyectos."
-			active="true"
-			priority="10">
-			<menu text="Archivo"
-				position="100"
-				is_separator="true"/>
-			<menu text="Ver"
-				position="200"
-				is_separator="true"/>
+  <icon src="gvsig-logo-icon" text="gvSIG"/>
+  <libraries library-dir="lib"/>
+  <resourceBundle name="text"/>
+  <label-set class-name="org.gvsig.app.project.documents.view.gui.DefaultViewPanel">
+    <label id="units" size="75"/>
+    <label id="x" size="120"/>
+    <label id="y" size="120"/>
+    <label id="4" size="110"/>
+    <label id="5" size="110"/>
+    <label id="distancearea" size="30"/>
+    <label id="projection" size="110"/>
+  </label-set>
+  
+  <popup-menus>
+    <popup-menu name="view.toc.context.menu">
+      <menu name="view-layer-add"/>
+    </popup-menu>
+  </popup-menus>
+  
+  <extensions>
+    <extension class-name="org.gvsig.app.extension.InitialWarningExtension"
+      description="Initial warning message"
+      active="true"
+      priority="1">
+    </extension>
 
-			<menu text="Vista"
-				position="300"
-				is_separator="true"/>
-			<menu text="Capa"
-				position="350"
-				is_separator="true"/>
-				
-			<menu text="geometry"
-				position="370"
-				is_separator="true"/>
+    <extension class-name="org.gvsig.app.extension.InitializeApplicationExtension"
+      description="Initialize application extension"
+      active="true"
+      priority="99999">
+    </extension>
 
-			<menu text="tools"
-				position="700"
-				is_separator="true"/>
-			<menu text="Ventana"
-				position="800"
-				is_separator="true"/>
-			<menu text="Ayuda"
-				position="900"
-				is_separator="true"/>
+    <extension class-name="org.gvsig.app.extension.ProjectExtension"
+      description="Extensi�n encargada de gestionar los proyectos."
+      active="true"
+      priority="10">
 
-			<menu text="Archivo/nuevo_proyecto"
-				key="n"
-				tooltip="nuevo_tooltip"
-				action-command="NUEVO" icon="project-new"
-				position="10010"/>
-			<menu text="Archivo/abrir_proyecto"
-				key="a"
-				tooltip="abrir_tooltip"
-				action-command="ABRIR" icon="project-open"
-				position="10020"/>
-			<menu text="Archivo/guardar_proyecto"
-				key="g"
-				tooltip="guardar_tooltip"
-				action-command="GUARDAR" icon="project-save"
-				position="10030"/>
-			<menu text="Archivo/guardar_como"
-				tooltip="guardar_tooltip"
-				action-command="GUARDAR_COMO" icon="project-save-as"
-				position="10040"
-				last="true"/>
-			<menu text="Archivo/salir"
-				tooltip="salir_tooltip"
-				key="x"
-				action-command="SALIR" icon="application-exit"
-				position="10099"
-				/>
-			<tool-bar name="gvSIG" position="1">
-				<action-tool icon="project-new" tooltip="nuevo_tooltip"
-					action-command="NUEVO" position="1"/>
-				<action-tool icon="project-open" tooltip="abrir_tooltip"
-					action-command="ABRIR" position="2"/>
-				<action-tool icon="project-save" tooltip="guardar_tooltip"
-					action-command="GUARDAR" position="3"/>
-			</tool-bar>
-		</extension>
+      <action 
+        name= "application-project-new"
+        label="nuevo_proyecto"
+        tooltip="_create_a_new_proyect"
+        action-command="application-project-new" 
+        icon="application-project-new"
+        position="100100000"
+        accelerator="Ctrl+N"
+        />
+      <action
+        name="application-project-open"
+        label="abrir_proyecto"
+        tooltip="_open_a_project"
+        action-command="application-project-open" 
+        icon="application-project-open"
+        position="100200000"
+        accelerator="Ctrl+O"
+        />
+      <action 
+        name="application-project-save"
+        label="guardar_proyecto"
+        tooltip="_save_the_current_project"
+        action-command="application-project-save" 
+        icon="application-project-save"
+        position="100300000"
+        accelerator="Ctrl+S"
+        />
+      <action 
+        name="application-project-saveas"
+        label="guardar_proyecto_como"
+        tooltip="_save_the_current_project_in_a_new_file"
+        action-command="application-project-save-as" 
+        icon="application-project-save-as"
+        position="100400000"
+        accelerator="Ctrl+Shift+S"
+        />
+      <action 
+        name="application-exit"
+        label="salir"
+        tooltip="_exit_of_application"
+        action-command="application-exit" 
+        icon="application-exit"
+        position="109000000"
+        accelerator="Ctrl+Q"
+        />
 
-		<extension class-name="org.gvsig.app.extension.ViewProjectWindow"
-			description="Extensi�n encargada de abrir la ventana de gesti�n del proyecto."
-			active="true">
-			<menu text="Ver/titulo"
-				key="p"
-				tooltip="ver_tooltip"
-				position="20010" 
-				action-command="SHOW"/>
-		</extension>
 
-		<extension class-name="org.gvsig.app.extension.AddLayer"
-			description="Extensi�n encargada de abrir las diferentes capas."
-			active="true"
-			priority="20">
-			<menu text="Vista/Anadir_Capa" position="30010" key="o" icon="layer-add"/>
-			<tool-bar name="View" position="30010">
-				<action-tool icon="layer-add" tooltip="Anadir_Capa" position="1"/>
-			</tool-bar>
-		</extension>
+      <menu text="File"
+        position="100000000"
+        is_separator="true"/>
+      <menu text="File/Export"
+        position="100900000"
+        is_separator="true"/>
+      <menu text="Edit"
+        position="200000000"
+        is_separator="true"/>
+      <menu text="Selection"
+        position="300000000"
+        is_separator="true"/>
+      <menu text="Show"
+        position="400000000"
+        is_separator="true"/>
 
-		<extension class-name="org.gvsig.app.extension.BasicSymbologyExtension"
-			description="Enables the  symbology."
-			active="true"
-			priority="20">
-		</extension>
+      <menu text="Layer"
+        position="600000000"
+        is_separator="true"/>
+      <menu text="Layer/Set_to"
+        position="600400000"
+        is_separator="true"/>
 
-		<extension class-name="org.gvsig.app.extension.ZoomPrev"
-			description="Extensi�n encargada de gestionar los zooms previos al actual."
-			active="true">
-			<menu text="Vista/navegacion"
-				position="30020"
-				is_separator="true"/>
-			<menu text="Vista/navegacion/Zoom_Previo"  position="3002010"  icon="view-zoom-back"/>
-			<tool-bar name="View_Tools_Zooms" position ="3">
-				<action-tool icon="view-zoom-back" action-command="ZOOM_PREV" tooltip="Zoom_Previo" position="1"/>
-			</tool-bar>
-		</extension>
+      <menu text="View"
+        position="650000000"
+        is_separator="true"/>
+      <menu text="View/Navigation"
+        position="650100000"
+        is_separator="true"/>
+      <menu text="View/Query"
+        position="650700000"
+        is_separator="true"/>
+        
+      <menu text="tools"
+        position="900000000"
+        is_separator="true"/>
+      <menu text="tools/Development"
+        position="908500000" 
+        is_separator="true"/>
+      <menu text="tools/Development/Disposables"
+        position="908500200" 
+        is_separator="true"/>
+        
+        
+      <menu text="Window"
+        position="960000000"
+        is_separator="true"/>
+      <menu text="Help"
+        position="990000000"
+        is_separator="true"/>
 
-		<extension class-name="org.gvsig.app.extension.InfoToolExtension"
-			description="Extensi�n encargada de gestionar la herramienta de info."
-			active="true"
-			priority="29">
-			<menu text="Vista/consulta"
-				position="30030"
-				is_separator="true"/>
-			<menu text="Vista/consulta/informacion" position="3003010" action-command="INFO" icon="view-query-information"/>
-			<tool-bar name="View_Tools_Query" position="5">
-				<selectable-tool icon="view-query-information" action-command="INFO"  tooltip="informacion" position="1"/>
-			</tool-bar>
-		</extension>
-		
-		
-		<extension class-name="org.gvsig.app.extension.MetadataPropertiesExtension"
-			description="Extensi�n encargada de mostrar los metadatos de la capa seleccionada."
-			active="true">
-		</extension>
-		
+      <menu 
+        text="File/New_project"
+        name= "application-project-new"
+        />
+      <menu 
+        text="File/Open_project"
+        name="application-project-open"
+        />
+      <menu 
+        text="File/Save_project"
+        name="application-project-save"
+        />
+      <menu 
+        text="File/Save_project_as"
+        name="application-project-saveas"
+        />
+      <menu 
+        text="File/Exit"
+        name="application-exit"
+        />
+      <tool-bar name="project" position="1">
+        <action-tool name="application-project-new"/>
+        <action-tool name="application-project-open"/>
+        <action-tool name="application-project-save"/>
+      </tool-bar>
+    </extension>
 
-		<extension class-name="org.gvsig.app.extension.ViewControls"
-			description="Extensi�n encargada de gestionar la vista."
-			active="true"
-			priority="30">
-			<combo-scale name="scale"
-				label="1:"
-				elements="1000;2000;5000;10000;25000;50000;100000;200000;500000;1000000;2000000;5000000"
-  				value="10000"
-  				action-command="CHANGE_SCALE" />
-  			<menu text="Vista/navegacion/Zoom_Mas" position="3002020" action-command="ZOOM_IN" icon="view-zoom-in"/>
-			<menu text="Vista/navegacion/Zoom_Menos" position="3002030" action-command="ZOOM_OUT" icon="view-zoom-out"/>
-			<menu text="Vista/navegacion/Zoom_Completo" position="3002040" action-command="FULL" icon="view-zoom-map-contents"/>
-			<menu text="Vista/navegacion/Zoom_Acercar" position="3002050" action-command="ACTION_ZOOM_IN" tooltip="Zoom_Acercar" icon="view-zoom-center-in"/>
-			<menu text="Vista/navegacion/Zoom_Alejar" position="3002060" action-command="ACTION_ZOOM_OUT" tooltip="Zoom_Alejar" icon="view-zoom-center-out"/>
-			<menu text="Vista/navegacion/Desplazamiento" position="3002070" action-command="PAN" icon="view-pan"/>
-			<menu text="Vista/navegacion/Encuadre" position="3002080" action-command="ENCUADRE" icon="view-zoom-manager"/>
-			
-			<menu text="Vista/poner_capas_a"
-				position="30040"
-				is_separator="true"/>
-			<menu text="Vista/poner_capas_a/visibles" position="3004010" action-command="CAPAS_VISIBLES"/>
-			<menu text="Vista/poner_capas_a/no_visibles" position="3004020" action-command="CAPAS_NOVISIBLES"/>
-			<menu text="Vista/poner_capas_a/activos" position="3004030" action-command="CAPAS_ACTIVAS"/>
-			<menu text="Vista/poner_capas_a/no_activos" position="3004040" action-command="CAPAS_NOACTIVAS"/>
+    <extension class-name="org.gvsig.app.extension.ViewProjectWindow"
+      description="Extensi�n encargada de abrir la ventana de gesti�n del proyecto."
+      active="true">
 
-			<menu text="Vista/configurar_localizador" position="30050" action-command="CONFIG_LOCATOR"/>
-			<tool-bar name="View_Tools_Zooms" position="3">
-				<selectable-tool is-default="true" icon="view-zoom-in" action-command="ZOOM_IN" tooltip="Zoom_Mas" position="2"/>
-				<selectable-tool icon="view-zoom-out" action-command="ZOOM_OUT"  tooltip="Zoom_Menos" position="3"/>
-				<action-tool icon="view-zoom-map-contents" action-command="FULL" tooltip="Zoom_Completo" position="4"/>
-				<action-tool icon="view-zoom-center-in" action-command="ACTION_ZOOM_IN" tooltip="Zoom_Acercar" position="5"/>
-				<action-tool icon="view-zoom-center-out" action-command="ACTION_ZOOM_OUT" tooltip="Zoom_Alejar" position="6"/>
-			</tool-bar>
-			<tool-bar name="View_Tools" position ="4">
-				<selectable-tool icon="view-pan" action-command="PAN"  tooltip="Desplazamiento"/>
-				<action-tool icon="view-zoom-manager" action-command="ENCUADRE" tooltip="gestion_encuadre"/>
-			</tool-bar>
-		</extension>
+      <action 
+        name="show-project-manager"
+        label="_Show_project"
+        tooltip="_Show_project_window"
+        action-command="show-project-manager" 
+        icon="show-project-manager"
+        position="400100000"
+        accelerator="Alt+P"
+        />
 
-		<extension class-name="org.gvsig.app.extension.MeasureExtension"
-			description="Extensi�n encargada de gestionar las operaciones de medir sobre la vista."
-			active="true"
-			priority="30">
-			<menu text="Vista/consulta"
-				position="30060"
-				is_separator="true"/>
-			<menu text="Vista/consulta/medir_distancias" position="3006010" action-command="MEDICION" icon="view-query-distance"/>
-			<menu text="Vista/consulta/medir_area" position="3006020" action-command="AREA" icon="view-query-area"/>
-			<tool-bar name="View_Tools_Query" position="5">
-				<selectable-tool icon="view-query-distance" action-command="MEDICION"  tooltip="medir_distancias" position="2"/>
-				<selectable-tool icon="view-query-area" action-command="AREA"  tooltip="medir_area" position="6"/>
-			</tool-bar>
-		</extension>
+      <menu 
+        text="Show/proyecto"
+        name="show-project-manager"
+        />
+    </extension>
 
-		<extension class-name="org.gvsig.app.extension.LinkControls"
-			description="Extensi�n encargada de gestionar el hiperlink."
-			active="true">
-			<menu text="Vista/consulta/Hiperenlace" position="3006030" action-command="LINK" icon="view-query-link"/>
-			<tool-bar name="View_Tools_Query" position="5">
-				<selectable-tool icon="view-query-link" action-command="LINK"  tooltip="Hiperenlace" position="7"/>
-			</tool-bar>
-		</extension>
+    <extension class-name="org.gvsig.app.extension.AddLayer"
+      description="Extensi�n encargada de abrir las diferentes capas."
+      active="true"
+      priority="20">
+      <action 
+        name="view-layer-add"
+        label="_add_layer"
+        tooltip="_Add_layer_to_view"
+        action-command="view-layer-add" 
+        icon="view-layer-add"
+        position="650300000"
+        accelerator="Alt+O"
+        />
 
-		<extension class-name="org.gvsig.app.extension.ViewSelectionControls"
-			description="Extensi�n encargada de gestionar la vista."
-			active="true"
-			priority="30">
-			<menu text="Vista/seleccion"
-				position="30070"
-				is_separator="true"/>
-			<menu text="Vista/seleccion/seleccionar_por_punto" position="3007010" action-command="SELPOINT" icon="view-select-geometry"/>
-			<menu text="Vista/seleccion/seleccionar_por_rectangulo" position="3007020" action-command="SELRECT" icon="view-select-by-rectangle"/>
-			<menu text="Vista/seleccion/seleccionar_por_poligono" position="3007030" action-command="SELPOL" icon="view-select-by-polygon"/>
-			<menu text="Vista/seleccion/separator" position="3007040" action-command="separator" is_separator="true"/>
-			<tool-bar name="Tools_Select" position="6">
-				<selectable-tool icon="view-select-geometry" action-command="SELPOINT"  tooltip="seleccionar_por_punto" position="1"/>
-				<selectable-tool icon="view-select-by-rectangle" action-command="SELRECT"  tooltip="seleccionar_por_rectangulo" position="2"/>
-				<selectable-tool icon="view-select-by-polygon" action-command="SELPOL"  tooltip="seleccionar_por_poligono" position="3"/>
-			</tool-bar>
-		</extension>
-		<extension class-name="org.gvsig.app.extension.ViewSelectionByTheme"
-            description="Extensi�n encargada de la selecci�n por tema."
-            active="true"
-            priority="30">
-            <menu text="Vista/seleccion/Seleccion_por_capa" action-command="SELECTIONBYSHAPE"/>
-        </extension>
-        <extension class-name="org.gvsig.app.extension.ViewInvertSelection"
-            description="Extensi�n encargada de hacer la selecci�n inversa."
-            active="true"
-            priority="30">
-            <menu text="Vista/seleccion/separator" position="3007050" action-command="separator" is_separator="true"/>
-            <menu text="Vista/seleccion/invert_selection" position="3007060" action-command="INVERT_SELECTION" icon="view-select-invert"/>
-            <tool-bar name="Tools_Select" position="6">
-                <action-tool icon="view-select-invert" action-command="INVERT_SELECTION"  tooltip="invert_selection" position="4"/>
-            </tool-bar>
-        </extension>
-		<extension class-name="org.gvsig.app.extension.ViewPropertiesExtension"
-			description="Extensi�n encargada de gestionar el di�logo de propiedades de la vista."
-			active="true">
-			<menu text="Vista/propiedades" position="30080" action-command="PROPERTIES"/>
-		</extension>
+      <menu 
+        name="view-layer-add"
+        text="View/Add_layer" 
+        />
+      <tool-bar name="view" position="30010">
+        <action-tool name="view-layer-add"/>
+      </tool-bar>
+    </extension>
 
-		<extension class-name="org.gvsig.app.extension.ZoomToSelectExtension"
-			description="Extensi�n encargada de gestionar los eventos realizados sobre una capa."
-			active="true">
-			<menu text="Vista/navegacion/Zoom_Select" position="3002090" action-command="ZOOM_SELECT" icon="view-zoom-to-seleccion"/>
-			<tool-bar name="View_Tools_Zooms" position="3">
-				<action-tool icon="view-zoom-to-seleccion" action-command="ZOOM_SELECT"  tooltip="Zoom_Select" position="7"/>
-			</tool-bar>
-		</extension>
+    <extension class-name="org.gvsig.app.extension.BasicSymbologyExtension"
+      description="Enables the  symbology."
+      active="true"
+      priority="20">
+    </extension>
 
-		<extension class-name="org.gvsig.app.extension.ClearSelectionExtension"
-			description="Extensi�n encargada de limpiar la selecci�n."
-			active="true">
-			<menu text="Capa/clear_selection" position="35010" action-command="DEL_SELECTION" icon="view-clear-selection"/>
-			<tool-bar name="Tools_Select" position="6">
-				<action-tool icon="view-clear-selection" action-command="DEL_SELECTION"  tooltip="clear_selection" position="4"/>
-			</tool-bar>
-		</extension>
+    <extension class-name="org.gvsig.app.extension.ZoomPrev"
+      description="Extensi�n encargada de gestionar los zooms previos al actual."
+      active="true">
+      <action 
+        name="view-navigation-zoom-back"
+        label="_zoom_back"
+        tooltip="_zoom_back"
+        action-command="view-navigation-zoom-back" 
+        icon="view-navigation-zoom-back"
+        position="650100700"
+        accelerator=""
+        />
 
-		<extension class-name="org.gvsig.app.extension.FiltroExtension"
-			description="Extensi�n encargada de abrir el di�logo para filtrar una vista."
-			active="true">
-			<menu text="Capa/filtro" position="40074" icon="table-filter" action-command="FILTRO"/>
-			<tool-bar name="Herramientas" position="12">
-				<action-tool icon="table-filter" action-command="FILTRO" tooltip="filtro" position="7"/>
-			</tool-bar>
-		</extension>
+      <menu 
+        name="view-navigation-zoom-back"
+        text="View/Navigation/Zoom_back"  
+        />
+      <tool-bar name="view_navigation" position ="3">
+        <action-tool name="view-navigation-zoom-back"/>
+      </tool-bar>
+    </extension>
 
-		<extension class-name="org.gvsig.app.extension.dispose.DisposableManagementExtension"
-			description="Extensi�n con informaci�n sobre disposables."
-			active="true"
-			priority="1000">
-			<menu text="tools/Development"
-				position="70090" 
-				is_separator="true"/>
-			<menu text="tools/Development/Disposables"
-				position="7009010" 
-				is_separator="true"/>
-			<menu text="tools/Development/Disposables/Mostrar pendientes" position="700901010"  key="m" action-command="show"/>
-			<menu text="tools/Development/Disposables/Librerar todos" position="700901020" key="l" action-command="releaseAll"/>
-		</extension>
+    <extension class-name="org.gvsig.app.extension.InfoToolExtension"
+      description="Extensi�n encargada de gestionar la herramienta de info."
+      active="true"
+      priority="29">
+      <action 
+        name="layer-info-by-point"
+        label="_point_information"
+        tooltip="_Show_point_information"
+        action-command="layer-info-by-point" 
+        icon="layer-info-by-point"
+        position="600200000"
+        accelerator=""
+        />
+      <menu 
+        name="layer-info-by-point"
+        text="View/Query/Information" 
+        />
+      <tool-bar name="view_tools_query" position="5">
+        <selectable-tool name="layer-info-by-point" />
+      </tool-bar>
+    </extension>
+    
+    
+    <extension class-name="org.gvsig.app.extension.MetadataPropertiesExtension"
+      description="Extensi�n encargada de mostrar los metadatos de la capa seleccionada."
+      active="true">
+    </extension>
+    
 
-		<extension class-name="org.gvsig.app.extension.ShowDevelInfoExtension"
-			description="Presenta informacion relevante para debug."
-			active="true"
-			priority="30">
-			<menu text="tools/Development/Show persistence factories" position="7009020" action-command="ShowPersistenceFactories"/>
-			<menu text="tools/Development/Show icon theme information" position="7009023" action-command="ShowIconThemeInformation"/>
-			<menu text="tools/Development/Show actions information" position="7009026" action-command="ShowActionsInformation"/>
-		</extension>
+    <extension class-name="org.gvsig.app.extension.ViewControls"
+      description="Extensi�n encargada de gestionar la vista."
+      active="true"
+      priority="30">
+      <combo-scale name="view-change-scale"
+        label="1:"
+        elements="1000;2000;5000;10000;25000;50000;100000;200000;500000;1000000;2000000;5000000"
+          value="10000"
+          action-command="view-change-scale" />
+         
+      <action 
+        name="view-change-scale"
+        label="_Change_scale" 
+        action-command="view-change-scale" 
+        />
 
+      <action 
+        name="view-navigation-zoom-in-topoint"
+        label="_Zoom_in_to_point" 
+        position="650100400" 
+        action-command="view-navigation-zoom-in-topoint" 
+        icon="view-navigation-zoom-in-topoint"
+        tooltip="_Zoom_in_to_point"
+        accelerator=""
+        />
+      <action 
+        name="view-navigation-zoom-out-topoint"
+        label="_Zoom_out_to_point" 
+        position="650100500" 
+        action-command="view-navigation-zoom-out-topoint" 
+        icon="view-navigation-zoom-out-topoint"
+        tooltip="_Zoom_out_to_point"
+        accelerator=""
+        />
+      <action 
+        name="view-navigation-zoom-all"
+        label="_Zoom_all" 
+        position="650100800" 
+        action-command="view-navigation-zoom-all" 
+        icon="view-navigation-zoom-all"
+        tooltip="_Zoom_all" 
+        accelerator=""
+        />
+      <action 
+        name="view-navigation-zoom-in-center"
+        label="_Zoom_in_center" 
+        position="650100200" 
+        action-command="view-navigation-zoom-in-center" 
+        tooltip="_Zoom_in_center" 
+        icon="view-navigation-zoom-in-center"
+        accelerator=""
+        />
+      <action 
+        name="view-navigation-zoom-out-center"
+        label="_Zoom_out_center" 
+        position="650100300" 
+        action-command="view-navigation-zoom-out-center" 
+        tooltip="_Zoom_out_center" 
+        icon="view-navigation-zoom-out-center"
+        accelerator=""
+        />
+      <action 
+        name="view-navigation-pan"
+        label="_Move_the_map" 
+        position="650100100" 
+        action-command="view-navigation-pan" 
+        icon="view-navigation-pan"
+        tooltip="_Move_the_map"
+        accelerator=""
+        />
+      <action 
+        name="view-navigation-frame-manager"
+        label="_Frame_manager" 
+        position="650109000" 
+        action-command="view-navigation-frame-manager" 
+        icon="view-navigation-frame-manager"
+        tooltip="_Show_frame_manager"
+        accelerator=""
+        />
 
-		<extension class-name="org.gvsig.app.extension.PaletteViewInfoExtension"
-			description="Extensi�n encargada transformar la vista activa en palette."
-			active="true">
-			<menu text="Ventana/to_palette" position="80010" action-command="PALETTE"/>
-		</extension>
+      
+      <action 
+        name="layer-set-visible"
+        label="_Show_layers" 
+        position="600400100" 
+        action-command="layer-set-visible"
+        icon="layer-set-visible"
+        tooltip="_Show_layers"
+        accelerator=""
+        />
+      <action 
+        name="layer-set-hide"
+        label="_Hide_layers" 
+        position="600400200"
+        action-command="layer-set-hide"
+        icon="layer-set-hide"
+        tooltip="_Hide_layers"
+        accelerator=""
+        />
+      <action 
+        name="layer-set-active"
+        label="_Set_Layers_active" 
+        position="600400300"
+        action-command="layer-set-active"
+        icon="layer-set-active"
+        tooltip="_Set_Layers_active"
+        accelerator=""
+        />
+      <action 
+        name="layer-set-inactive"
+        label="_Set_Layers_inactive" 
+        position="600400400" 
+        action-command="layer-set-inactive"
+        icon="layer-set-inactive"
+        tooltip="_Set_Layers_inactive"
+        accelerator=""
+        />
 
-		<extension class-name="org.gvsig.app.extension.RestoreViewInfoExtension"
-			description="Extensi�n encargada transformar la vista palette en su original."
-			active="true">
-			<menu text="Ventana/restore_palette" position="80020" action-command="RESTORE"/>
-		</extension>
+      <action 
+        name="view-locator-setup"
+        label="_Locator_setup" 
+        position="658000000" 
+        action-command="view-locator-setup"
+        icon="view-locator-setup"
+        tooltip="_Locator_setup"
+        accelerator=""
+        />
 
-		<extension class-name="org.gvsig.app.extension.About"
-			description="Extensi�n encargada de abrir una ventana con la informaci�n relativa al programa."
-			active="true"
-			priority="90090">
-			<menu text="Ayuda/acerca_de" />
-		</extension>
+      <menu 
+        name="view-navigation-zoom-in-topoint"
+        text="View/Navigation/Zoom_in" 
+        />
+      <menu 
+        name="view-navigation-zoom-out-topoint"
+        text="View/Navigation/Zoom_out" 
+        />
+      <menu 
+        name="view-navigation-zoom-all"
+        text="View/Navigation/Zoom_all" 
+        />
+      <menu 
+        name="view-navigation-zoom-in-center"
+        text="View/Navigation/Zoom_in_to_center" 
+        />
+      <menu 
+        name="view-navigation-zoom-out-center"
+        text="View/Navigation/Zoom_out_to_center" 
+        />
+      <menu 
+        name="view-navigation-pan"
+        text="View/Navigation/Pan" 
+        />
+      <menu 
+        name="view-navigation-frame-manager"
+        text="View/Navigation/Frame_manager" 
+        />
 
-	</extensions>
-	<icon src="gvsig-logo-icon" text="gvSIG"/>
+      
+      <menu 
+        name="layer-set-visible"
+        text="Layer/Set_to/visible" 
+        />
+      <menu 
+        name="layer-set-hide"
+        text="Layer/Set_to/Hidden" 
+        />
+      <menu 
+        name="layer-set-active"
+        text="Layer/Set_to/Active" 
+        />
+      <menu 
+        name="layer-set-inactive"
+        text="Layer/Set_to/Inactive" 
+        />
+
+      <menu 
+        name="view-locator-setup"
+        text="View/Locator_setup" 
+        />
+      
+      
+      <tool-bar name="view_navigation" position="3">
+        <selectable-tool name="view-navigation-zoom-in-topoint" is-default="true" />
+        <selectable-tool name="view-navigation-zoom-out-topoint" />
+        <action-tool name="view-navigation-zoom-all"  />
+        <action-tool name="view-navigation-zoom-in-center"  />
+        <action-tool name="view-navigation-zoom-out-center"  />
+      </tool-bar>
+      
+      <tool-bar name="view_navigation" position ="4">
+        <selectable-tool name="view-navigation-pan"/>
+        <action-tool name="view-navigation-frame-manager" />
+      </tool-bar>
+
+    </extension>
+
+    <extension class-name="org.gvsig.app.extension.MeasureExtension"
+      description="Extensi�n encargada de gestionar las operaciones de medir sobre la vista."
+      active="true"
+      priority="30">
+      <action 
+        name="view-query-distance"
+        label="_Query_distance" 
+        position="650700200" 
+        action-command="view-query-distance" 
+        icon="view-query-distance"
+        tooltip="_Query_distance" 
+        accelerator=""
+        />
+      <action 
+        name="view-query-area"
+        label="_Query_area" 
+        position="650700100" 
+        action-command="view-query-area" 
+        icon="view-query-area"
+        tooltip="_Query_area"
+        accelerator=""
+        />
+
+
+      <menu 
+        name="view-query-distance"
+        text="View/Query/Distance" 
+        />
+      <menu 
+        name="view-query-area"
+        text="View/Query/Area" 
+        />
+
+      <tool-bar name="view_tools_query" position="5">
+        <selectable-tool name="view-query-distance" />
+        <selectable-tool name="view-query-area" />
+      </tool-bar>
+
+    </extension>
+
+    <extension class-name="org.gvsig.app.extension.ViewSelectionControls"
+      description="Extensi�n encargada de gestionar la vista."
+      active="true"
+      priority="30">
+      <action 
+        name="selection-simple-select-view"
+        label="_Simple_select" 
+        position="300700000" 
+        action-command="selection-simple-select" 
+        icon="selection-simple-select"
+        tooltip="_Simple_select" 
+        accelerator=""
+        />
+      <action 
+        name="selection-select-by-rectangle-view"
+        label="_Select_by_rectangle" 
+        position="301200000" 
+        action-command="selection-select-by-rectangle-view" 
+        icon="selection-select-by-rectangle"
+        tooltip="_Select_by_rectangle" 
+        accelerator=""
+        />
+      <action
+        name="selection-select-by-polygon"
+        label="_Select_by_polygon" 
+        position="301300000" 
+        action-command="selection-select-by-polygon" 
+        icon="selection-select-by-polygon"
+        tooltip="_Select_by_polygon" 
+        accelerator=""
+        />
+
+
+      <menu 
+        name="selection-simple-select-view"
+        text="Selection/Simple" 
+        />
+      <menu 
+        name="selection-select-by-rectangle-view"
+        text="Selection/Select_by_rectangle" 
+        />
+      <menu 
+        name="selection-select-by-polygon"
+        text="Selection/Select_by_polygon" 
+        />
+
+      <tool-bar name="view_selection" position="6">
+        <selectable-tool name="selection-simple-select-view" />
+        <selectable-tool name="selection-select-by-rectangle-view" />
+        <selectable-tool name="selection-select-by-polygon" />
+      </tool-bar>
+
+    </extension>
+    
+    <extension class-name="org.gvsig.app.extension.ViewSelectionByTheme"
+      description="Extensi�n encargada de la selecci�n por tema."
+      active="true"
+      priority="30">
+      <action 
+        name="selection-select-by-layer"
+        position="301100000"
+        label="_Select_by_layer" 
+        action-command="selection-select-by-layer"
+        icon="selection-select-by-layer"
+        tooltip="_Select_by_layer" 
+        accelerator=""
+        />
+
+      <menu 
+        name="selection-select-by-layer"
+        text="Selection/Select_by_layer" 
+        />
+    </extension>
+        
+    <extension class-name="org.gvsig.app.extension.ViewInvertSelection"
+      description="Extensi�n encargada de hacer la selecci�n inversa."
+      active="true"
+      priority="30">
+      <action 
+        name="selection-reverse-view"
+        label="_Reverse_selection" 
+        position="300500000" 
+        action-command="selection-reverse-view" 
+        icon="selection-reverse"
+        tooltip="_Reverse_selection" 
+        accelerator=""
+        />
+
+      <menu 
+        name="selection-reverse-view"
+        text="Selection/Reverse" 
+        />
+
+      <tool-bar name="view_selection" position="6">
+          <action-tool name="selection-reverse-view" />
+      </tool-bar>
+
+    </extension>
+        
+    <extension class-name="org.gvsig.app.extension.ViewPropertiesExtension"
+      description="Extensi�n encargada de gestionar el di�logo de propiedades de la vista."
+      active="true">
+      <action 
+        name="view-properties"
+        label="_View_properties" 
+        position="659000000" 
+        action-command="view-properties"
+        icon="view-properties"
+        tooltip="_Show_view_properties" 
+        accelerator=""
+        />
+
+
+      <menu 
+        name="view-properties"
+        text="View/Properties" 
+        />
+
+    </extension>
+
+    <extension class-name="org.gvsig.app.extension.ZoomToSelectExtension"
+      description="Extensi�n encargada de gestionar los eventos realizados sobre una capa."
+      active="true">
+
+      <action 
+        name="view-navigation-zoom-to-selection"
+        label="_Zoom_to_selection" 
+        position="650100900" 
+        action-command="view-navigation-zoom-to-selection" 
+        icon="view-navigation-zoom-to-selection"
+        tooltip="_Zoom_to_selection" 
+        accelerator=""
+        />
+
+      <menu 
+        name="view-navigation-zoom-to-selection"
+        text="View/Navigation/Zoom_to_selection" 
+        />
+
+      <tool-bar name="view_navigation" position="3">
+        <action-tool name="view-navigation-zoom-to-selection" />
+      </tool-bar>
+
+    </extension>
+
+    <extension class-name="org.gvsig.app.extension.ClearSelectionExtension"
+      description="Extensi�n encargada de limpiar la selecci�n."
+      active="true">
+
+      <action 
+        name="selection-clear-view"
+        label="_Clear_selection" 
+        position="300300000" 
+        action-command="selection-clear-view" 
+        icon="edit-clear"
+        tooltip="_Clear_selection" 
+        accelerator=""
+        />
+
+      <menu 
+        name="selection-clear-view"
+        text="Selection/clear" 
+        />
+
+      <tool-bar name="view_selection" position="6">
+        <action-tool name="selection-clear-view" />
+      </tool-bar>
+
+    </extension>
+
+    <extension class-name="org.gvsig.app.extension.FiltroExtension"
+      description="Extensi�n encargada de abrir el di�logo para filtrar una vista."
+      active="true">
+
+      <action 
+        name="layer-filter"
+        label="_Filter_layer" 
+        position="600100000" 
+        icon="layer-filter" 
+        tooltip="_Filter_layer" 
+        action-command="layer-filter"
+        accelerator=""
+        />
+
+      <menu 
+        name="layer-filter"
+        text="Layer/Filter" 
+        />
+
+      <tool-bar name="layer_tools" position="12">
+        <action-tool name="layer-filter" />
+      </tool-bar>
+
+    </extension>
+
+    <extension class-name="org.gvsig.app.extension.dispose.DisposableManagementExtension"
+      description="Extensi�n con informaci�n sobre disposables."
+      active="true"
+      priority="1000">
+
+      <action 
+        name="tools-devel-disposables-show-pendings"
+        label="_Show_pendings_disposables" 
+        position="908500200"  
+        tooltip="_Show_pendings_disposables" 
+        action-command="tools-devel-disposables-show-pendings"
+        icon="tools-devel-disposables-show-pendings"
+        accelerator=""
+        />
+      <action 
+        name="tools-devel-disposables-free-all"
+        label="_Free_all_disposables" 
+        position="908500201" 
+        action-command="tools-devel-disposables-free-all"
+        icon="tools-devel-disposables-free-all"
+        tooltip="_Free_all_disposables" 
+        accelerator=""
+        />
+
+      <menu 
+        name="tools-devel-disposables-show-pendings"
+        text="tools/Development/Disposables/Show_pendings" 
+        />
+      <menu 
+        name="tools-devel-disposables-free-all"
+        text="tools/Development/Disposables/Free_all" 
+        />
+
+    </extension>
+
+    <extension class-name="org.gvsig.app.extension.ShowDevelInfoExtension"
+      description="Presenta informacion relevante para debug."
+      active="true"
+      priority="30">
+      <action 
+        name="tools-devel-show-persistencefactories"
+        label="_Show_persistence_factories" 
+        tooltip="_Show_persistence_factories" 
+        position="908500400" 
+        action-command="tools-devel-show-persistencefactories"
+        icon="tools-devel-show-persistencefactories"
+        accelerator=""
+        />
+      <action 
+        name="tools-devel-show-icontheme"
+        label="_Show_icon_theme_information" 
+        tooltip="_Show_icon_theme_information" 
+        position="908500300" 
+        action-command="tools-devel-show-icontheme"
+        icon="tools-devel-show-icontheme"
+        accelerator=""
+        />
+      <action 
+        name="tools-devel-show-actions"
+        label="_Show_actions_information" 
+        tooltip="_Show_actions_information" 
+        position="908500100" 
+        action-command="tools-devel-show-actions"
+        icon="tools-devel-show-actions"
+        accelerator=""
+        />
+      <action 
+        name="tools-devel-show-menus"
+        label="_Show_menu_information" 
+        tooltip="_Show_menu_information" 
+        position="908500200" 
+        action-command="tools-devel-show-menus"
+        icon="tools-devel-show-menus"
+        accelerator=""
+        />
+      <action 
+        name="tools-devel-show-menus-by-plugin"
+        label="_Show_menu_by_plugin_information" 
+        tooltip="_Show_menu_ordered_by_plugin_information" 
+        position="908500300" 
+        action-command="tools-devel-show-menus-by-plugin"
+        icon="tools-devel-show-menus-by-plugin"
+        accelerator=""
+        />
+      <menu 
+        name="tools-devel-show-persistencefactories"
+        text="tools/Development/Show persistence factories" 
+        />
+      <menu 
+        name="tools-devel-show-icontheme"
+        text="tools/Development/Show icon theme information" 
+        />
+      <menu 
+        name="tools-devel-show-actions"
+        text="tools/Development/Show actions information" 
+        />
+      <menu 
+        name="tools-devel-show-menus"
+        text="tools/Development/Show menu information" 
+        />
+      <menu 
+        name="tools-devel-show-menus-by-plugin"
+        text="tools/Development/Show menu by plugin information" 
+        />
+
+    </extension>
+
+
+    <extension class-name="org.gvsig.app.extension.PaletteViewInfoExtension"
+      description="Extensi�n encargada transformar la ventana activa en palette."
+      active="true">
+
+      <action 
+        name="window-convert-to-tool"
+        label="_Convert_to_tool" 
+        tooltip="_Convert_regular_window_to_tool_window" 
+        position="960300000" 
+        action-command="window-convert-to-tool"
+        icon="window-convert-to-tool"
+        accelerator=""
+        />
+
+      <menu 
+        name="window-convert-to-tool"
+        text="Window/Convert_to_tool" 
+        />
+
+    </extension>
+
+    <extension class-name="org.gvsig.app.extension.RestoreViewInfoExtension"
+      description="Extensi�n encargada transformar la ventana palette en su original."
+      active="true">
+
+      <action
+        name="window-restore-from-tool"
+        label="_Restore_tool" 
+        tooltip="_Restore_tool_window_to_regular_window" 
+        position="960400000" 
+        action-command="window-restore-from-tool"
+        icon="window-restore-from-tool"
+        accelerator=""
+        />
+
+
+      <menu 
+        name="window-restore-from-tool"
+        text="Windows/Restore_from_tool" 
+        />
+
+    </extension>
+
+    <extension class-name="org.gvsig.app.extension.About"
+      description="Extensi�n encargada de abrir una ventana con la informaci�n relativa al programa."
+      active="true"
+      priority="90090">
+
+      <action
+        name="help-about"
+        label="_About" 
+        tooltip="_Show_about" 
+        position="999000000" 
+        action-command="help-about"
+        icon="help-about"
+        accelerator=""
+        />
+
+      <menu 
+        name="help-about"
+        text="Help/About" 
+        />
+
+    </extension>
+
+  </extensions>
+
 </plugin-config>
Index: branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/project/documents/view/ViewManager.java
===================================================================
--- branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/project/documents/view/ViewManager.java	(revision 38563)
+++ branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/project/documents/view/ViewManager.java	(revision 38564)
@@ -2,9 +2,7 @@
 
 import javax.swing.ImageIcon;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.ui.mdiManager.IWindow;
 import org.gvsig.app.project.ProjectManager;
@@ -18,14 +16,14 @@
 import org.gvsig.app.project.documents.gui.WindowLayout;
 import org.gvsig.app.project.documents.view.gui.DefaultViewPanel;
 import org.gvsig.app.project.documents.view.gui.ViewProperties;
-import org.gvsig.app.project.documents.view.legend.gui.SingleSymbol;
-import org.gvsig.app.project.documents.view.legend.gui.VectorialInterval;
-import org.gvsig.app.project.documents.view.legend.gui.VectorialUniqueValue;
 import org.gvsig.fmap.mapcontext.MapContext;
-import org.gvsig.fmap.mapcontrol.MapControl;
+import org.gvsig.fmap.mapcontext.MapContextLocator;
+import org.gvsig.fmap.mapcontext.MapContextManager;
 import org.gvsig.tools.ToolsLocator;
 import org.gvsig.tools.dynobject.DynStruct;
 import org.gvsig.tools.persistence.PersistenceManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Factory of View.
@@ -110,57 +108,38 @@
         ProjectManager.getInstance().registerDocumentAction(TYPENAME,new CutDocumentAction());
         ProjectManager.getInstance().registerDocumentAction(TYPENAME,new PasteDocumentAction());
 
-        PluginServices.getIconTheme().registerDefault(
-        		"document-view-icon",
-        		DefaultViewDocument.class.getClassLoader().getResource("images/Vista.png")
-        	);
-        PluginServices.getIconTheme().registerDefault(
-        		"document-view-icon-sel",
-        		DefaultViewDocument.class.getClassLoader().getResource("images/Vista_sel.png")
-        	);
+	   	IconThemeHelper.registerIcon("document", "document-view-icon", ViewManager.class);
+	   	IconThemeHelper.registerIcon("document", "document-view-icon-sel", ViewManager.class);
+	   	
+	   	IconThemeHelper.registerIcon("cursor", "cursor-crux", ViewManager.class);
+	   	IconThemeHelper.registerIcon("cursor", "cursor-info-by-point", ViewManager.class);
+	   	IconThemeHelper.registerIcon("cursor", "cursor-pan", ViewManager.class);
+	   	IconThemeHelper.registerIcon("cursor", "cursor-query-area", ViewManager.class);
+	   	IconThemeHelper.registerIcon("cursor", "cursor-select-by-point", ViewManager.class);
+	   	IconThemeHelper.registerIcon("cursor", "cursor-select-by-polygon", ViewManager.class);
+	   	IconThemeHelper.registerIcon("cursor", "cursor-zoom-in", ViewManager.class);
+	   	IconThemeHelper.registerIcon("cursor", "cursor-zoom-out", ViewManager.class);
 
+	   	IconThemeHelper.registerIcon("layer", "layer-icon", ViewManager.class);
+	   	IconThemeHelper.registerIcon("layer", "layer-icon-group", ViewManager.class);
+	   	IconThemeHelper.registerIcon("layer", "layer-icon-vectorial", ViewManager.class);
+	   	IconThemeHelper.registerIcon("layer", "layer-icon-dgn", ViewManager.class);
+	   	IconThemeHelper.registerIcon("layer", "layer-icon-dxf", ViewManager.class);
+	   	IconThemeHelper.registerIcon("layer", "layer-icon-postgresq", ViewManager.class);
+	   	IconThemeHelper.registerIcon("layer", "layer-icon-mysql", ViewManager.class);
+	   	IconThemeHelper.registerIcon("layer", "layer-icon-jdbc", ViewManager.class);
 
+	   	IconThemeHelper.registerIcon("legend", "legend-overview-single-symbol", ViewManager.class);
+	   	IconThemeHelper.registerIcon("legend", "legend-overview-vectorial-interval", ViewManager.class);
+	   	IconThemeHelper.registerIcon("legend", "legend-overview-vectorial-unique-value", ViewManager.class);
 
-        PluginServices.getIconTheme().registerDefault(
-        		"cursor-query-distance",
-        		MapControl.class.getClassLoader().getResource("org/gvsig/fmap/mapcontrol/images/RulerCursor.gif")
-        	);
-
-        PluginServices.getIconTheme().registerDefault(
-        		"cursor-query-information",
-        		MapControl.class.getResource("org/gvsig/fmap/mapcontrol/images/InfoCursor.gif")
-        	);
-        PluginServices.getIconTheme().registerDefault(
-        		"cursor-hiperlink",
-        		MapControl.class.getResource("org/gvsig/fmap/mapcontrol/images/LinkCursor.gif")
-        	);
-        PluginServices.getIconTheme().registerDefault(
-        		"cursor-zoom-in",
-        		MapControl.class.getClassLoader().getResource("org/gvsig/fmap/mapcontrol/images/ZoomInCursor.gif")
-        	);
-        PluginServices.getIconTheme().registerDefault(
-        		"cursor-zoom-out",
-        		MapControl.class.getClassLoader().getResource("org/gvsig/fmap/mapcontrol/images/ZoomOutCursor.gif")
-        	);
-
-
-        PluginServices.getIconTheme().registerDefault(
-           		"single-symbol",
-           		SingleSymbol.class.getClassLoader().getResource("images/single-symbol.png")
-           	);
-        PluginServices.getIconTheme().registerDefault(
-           		"vectorial-interval",
-           		VectorialInterval.class.getClassLoader().getResource("images/Intervalos.png")
-           	);
-        PluginServices.getIconTheme().registerDefault(
-           		"vectorial-unique-value",
-           		VectorialUniqueValue.class.getClassLoader().getResource("images/ValoresUnicos.png")
-           	);
-        PluginServices.getIconTheme().registerDefault(
-           		"crux-cursor",
-           		MapControl.class.getClassLoader().getResource("org/gvsig/fmap/mapcontrol/images/CruxCursor.png")
-           	);
-
+	   	MapContextManager mapContextMgr = MapContextLocator.getMapContextManager();
+	   	mapContextMgr.registerIconLayer("DGN", "layer-icon-dgn");
+	   	mapContextMgr.registerIconLayer("DXF", "layer-icon-dfx");
+	   	mapContextMgr.registerIconLayer("jdbc", "layer-icon-jdbc");
+	   	mapContextMgr.registerIconLayer("PostgreSQL", "layer-icon-postgresql");
+	   	mapContextMgr.registerIconLayer("MySQL", "layer-icon-mysql");
+	   	
         if (factory.persistenceDefinition == null){
             factory.persistenceDefinition = manager.addDefinition(
                 ViewDocument.class,
Index: branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/project/documents/view/toolListeners/LinkListener.java
===================================================================
--- branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/project/documents/view/toolListeners/LinkListener.java	(revision 38563)
+++ branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/project/documents/view/toolListeners/LinkListener.java	(revision 38564)
@@ -1,180 +0,0 @@
-/* gvSIG. Sistema de Informaci�n Geogr�fica de la Generalitat Valenciana
- *
- * Copyright (C) 2004 IVER T.I. and Generalitat Valenciana.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
- *
- * For more information, contact:
- *
- *  Generalitat Valenciana
- *   Conselleria d'Infraestructures i Transport
- *   Av. Blasco Ib��ez, 50
- *   46010 VALENCIA
- *   SPAIN
- *
- *      +34 963862235
- *   gvsig@gva.es
- *      www.gvsig.gva.es
- *
- *    or
- *
- *   IVER T.I. S.A
- *   Salamanca 50
- *   46005 Valencia
- *   Spain
- *
- *   +34 963163400
- *   dac@iver.es
- */
-package org.gvsig.app.project.documents.view.toolListeners;
-
-import java.awt.Component;
-import java.awt.Image;
-import java.awt.geom.Point2D;
-import java.net.URI;
-
-import javax.swing.JOptionPane;
-
-import org.gvsig.andami.PluginServices;
-import org.gvsig.app.gui.panels.LinkPanel;
-import org.gvsig.app.project.documents.view.gui.DefaultViewPanel;
-import org.gvsig.fmap.dal.exception.ReadException;
-import org.gvsig.fmap.mapcontext.layers.FLayer;
-import org.gvsig.fmap.mapcontext.layers.vectorial.FLyrVect;
-import org.gvsig.fmap.mapcontrol.MapControl;
-import org.gvsig.fmap.mapcontrol.tools.BehaviorException;
-import org.gvsig.fmap.mapcontrol.tools.Events.PointEvent;
-import org.gvsig.fmap.mapcontrol.tools.Listeners.PointListener;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-
-/**
- * <p>Listener that gets, if exists, the associated link at the feature that's at the position selection of an active, selected
- *  and vector layer of the associated <code>MapControl</code>; and displays
- *  that linked data (image, text, ...) on a dialog.</p>
- *
- * <p>Listens a single click of any mouse's button.</p>
- *
- * @author Vicente Caballero Navarro
- */
-public class LinkListener implements PointListener {
-	/**
-	 * Object used to log messages for this listener.
-	 */
-	private static final Logger logger = LoggerFactory
-            .getLogger(InfoListener.class);
-
-	/**
-	 * The image to display when the cursor is active.
-	 */
-	private final Image img = PluginServices.getIconTheme()
-		.get("cursor-hiperlink").getImage();
-
-	/**
-	 * The cursor used to work with this tool listener.
-	 *
-	 * @see #getCursor()
-	 */
-//	private Cursor cur = Toolkit.getDefaultToolkit().createCustomCursor(img,
-//			new Point(16, 16), "");
-
-	/**
-	 * Reference to the <code>MapControl</code> object that uses.
-	 */
-	private MapControl mapCtrl;
-
-	/**
-	 * Identifies the link as an image.
-	 */
-	public static final int TYPELINKIMAGE=0;
-
-	/**
-	 * Identifies the link as text.
-	 */
-	public static final int TYPELINKTEXT=1;
-
-	/**
-	 * <p>Creates a new <code>LinkListener</code> object.</p>
-	 *
-	 * @param mc the <code>MapControl</code> where will be applied the changes
-	 */
-	public LinkListener(MapControl mc) {
-		this.mapCtrl = mc;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see com.iver.cit.gvsig.fmap.tools.Listeners.PointListener#point(com.iver.cit.gvsig.fmap.tools.Events.PointEvent)
-	 */
-	public void point(PointEvent event) throws BehaviorException {
-		Point2D pReal = mapCtrl.getMapContext().getViewPort().toMapPoint(event.getPoint());
-		DefaultViewPanel view=(DefaultViewPanel)PluginServices.getMDIManager().getActiveWindow();
-		FLayer[] sel = mapCtrl.getMapContext().getLayers().getActives();
-
-		URI[] uri=null;
-
-		for (int i = 0; i < sel.length; i++) {
-			FLayer laCapa = sel[i];
-            if (laCapa.allowLinks())
-            {
-            	FLyrVect lyrVect = (FLyrVect) laCapa;
-            	double tol = mapCtrl.getViewPort().toMapDistance(3);
-            	try {
-					uri=lyrVect.getLink(pReal,tol);
-				} catch (ReadException e) {
-					JOptionPane.showMessageDialog((Component)PluginServices.getMainFrame(),"Error" +
-    				" Error accediendo a la fuente de datos.");
-    		return;
-				}
-            	if (uri == null){
-            		JOptionPane.showMessageDialog((Component)PluginServices.getMainFrame(),"Error" +
-            				" no has seleccionado una geometr�a para realizar HyperLink.");
-            		return;
-            	}
-            	for(int j=0; j<uri.length;j++){
-            		if(uri[j]!=null){
-            			LinkPanel lpanel = new LinkPanel (uri[j], lyrVect.getLinkProperties().getType());
-            			PluginServices.getMDIManager().addWindow(lpanel);
-            		}
-            	}
-            }
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see com.iver.cit.gvsig.fmap.tools.Listeners.ToolListener#getImageCursor()
-	 */
-	public Image getImageCursor() {
-		return img;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see com.iver.cit.gvsig.fmap.tools.Listeners.ToolListener#cancelDrawing()
-	 */
-	public boolean cancelDrawing() {
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see com.iver.cit.gvsig.fmap.tools.Listeners.PointListener#pointDoubleClick(com.iver.cit.gvsig.fmap.tools.Events.PointEvent)
-	 */
-	public void pointDoubleClick(PointEvent event) throws BehaviorException {
-	}
-}
Index: branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/project/documents/view/toolListeners/MapOverviewListener.java
===================================================================
--- branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/project/documents/view/toolListeners/MapOverviewListener.java	(revision 38563)
+++ branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/project/documents/view/toolListeners/MapOverviewListener.java	(revision 38564)
@@ -79,7 +79,7 @@
 	/**
 	 * The image to display when the cursor is active.
 	 */
-	private final Image izoomout = PluginServices.getIconTheme().get("crux-cursor").getImage();
+	private final Image izoomout = PluginServices.getIconTheme().get("cursor-crux").getImage();
 
 	/**
 	 * The cursor used to work with this tool listener.
Index: branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/project/documents/view/toolListeners/InfoListener.java
===================================================================
--- branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/project/documents/view/toolListeners/InfoListener.java	(revision 38563)
+++ branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/project/documents/view/toolListeners/InfoListener.java	(revision 38564)
@@ -105,7 +105,7 @@
      * The image to display when the cursor is active.
      */
     private final Image img = PluginServices.getIconTheme()
-        .get("cursor-query-information").getImage();
+        .get("cursor-info-by-point").getImage();
 
     /**
      * Reference to the <code>MapControl</code> object that uses.
Index: branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/project/documents/view/toolListeners/MapOverviewPanListener.java
===================================================================
--- branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/project/documents/view/toolListeners/MapOverviewPanListener.java	(revision 38563)
+++ branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/project/documents/view/toolListeners/MapOverviewPanListener.java	(revision 38564)
@@ -81,8 +81,7 @@
 	/**
 	 * The image to display when the cursor is active.
 	 */
-	private final Image icursor = PluginServices
-		.getIconTheme().get("crux-cursor").getImage();
+	private final Image icursor = PluginServices.getIconTheme().get("cursor-crux").getImage();
 
 	/**
 	 * The cursor used to work with this tool listener.
Index: branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/project/documents/view/gui/DefaultViewPanel.java
===================================================================
--- branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/project/documents/view/gui/DefaultViewPanel.java	(revision 38563)
+++ branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/project/documents/view/gui/DefaultViewPanel.java	(revision 38564)
@@ -50,7 +50,6 @@
 import org.gvsig.app.project.documents.view.toc.gui.TOC;
 import org.gvsig.app.project.documents.view.toolListeners.AreaListener;
 import org.gvsig.app.project.documents.view.toolListeners.InfoListener;
-import org.gvsig.app.project.documents.view.toolListeners.LinkListener;
 import org.gvsig.app.project.documents.view.toolListeners.MeasureListener;
 import org.gvsig.app.project.documents.view.toolListeners.PanListener;
 import org.gvsig.app.project.documents.view.toolListeners.PointSelectListener;
@@ -437,11 +436,6 @@
 		m_MapControl.addBehavior("info", new Behavior[] {
             new PointBehavior(il), new MouseMovementBehavior(sbl) });
 
-		// Link por punto
-		LinkListener ll = new LinkListener(m_MapControl);
-		m_MapControl.addBehavior("link", new Behavior[] {
-            new PointBehavior(ll), new MouseMovementBehavior(sbl) });
-
 		// Selecci�n por rect�ngulo
 		RectangleSelectListener rsl = new RectangleSelectListener(m_MapControl);
 		m_MapControl.addBehavior("rectSelection", new Behavior[] {
Index: branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/LinkControls.java
===================================================================
--- branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/LinkControls.java	(revision 38563)
+++ branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/LinkControls.java	(revision 38564)
@@ -1,155 +0,0 @@
-/*
- * Created on 01-jun-2004
- *
- * To change the template for this generated file go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-/* gvSIG. Sistema de Informaci�n Geogr�fica de la Generalitat Valenciana
- *
- * Copyright (C) 2004 IVER T.I. and Generalitat Valenciana.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
- *
- * For more information, contact:
- *
- *  Generalitat Valenciana
- *   Conselleria d'Infraestructures i Transport
- *   Av. Blasco Ib��ez, 50
- *   46010 VALENCIA
- *   SPAIN
- *
- *      +34 963862235
- *   gvsig@gva.es
- *      www.gvsig.gva.es
- *
- *    or
- *
- *   IVER T.I. S.A
- *   Salamanca 50
- *   46005 Valencia
- *   Spain
- *
- *   +34 963163400
- *   dac@iver.es
- */
-package org.gvsig.app.extension;
-
-import org.gvsig.andami.PluginServices;
-import org.gvsig.andami.plugins.Extension;
-import org.gvsig.app.project.documents.view.ViewDocument;
-import org.gvsig.app.project.documents.view.gui.DefaultViewPanel;
-import org.gvsig.fmap.mapcontext.MapContext;
-import org.gvsig.fmap.mapcontext.layers.FLayer;
-import org.gvsig.fmap.mapcontrol.MapControl;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-
-/**
- * Extensi�n para gestionar los hiperlinks.
- *
- * @author Vicente Caballero Navarro
- */
-public class LinkControls extends Extension {
-    private static final Logger logger = LoggerFactory
-            .getLogger(LinkControls.class);
-
-	/**
-	 * @see org.gvsig.andami.plugins.IExtension#execute(java.lang.String)
-	 */
-	public void execute(String s) {
-		DefaultViewPanel vista = (DefaultViewPanel) PluginServices.getMDIManager().getActiveWindow();
-		//ProjectView model = vista.getModel();
-		//FMap mapa = model.getMapContext();
-		MapControl mapCtrl = vista.getMapControl();
-		logger.debug("Comand : " + s);
-
-		if (s.compareTo("LINK") == 0) {
-			mapCtrl.setTool("link");
-		}
-	}
-
-	/**
-	 * @see com.iver.mdiApp.plugins.IExtension#isVisible()
-	 */
-	public boolean isVisible() {
-		org.gvsig.andami.ui.mdiManager.IWindow f = PluginServices.getMDIManager()
-															 .getActiveWindow();
-
-		if (f == null) {
-			return false;
-		}
-
-		if (f instanceof DefaultViewPanel) {
-
-		  MapContext mapa = ((DefaultViewPanel) f).getModel().getMapContext();
-
-		  return mapa.getLayers().getLayersCount() > 0;
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * @see org.gvsig.andami.plugins.IExtension#isEnabled()
-	 */
-	public boolean isEnabled() {
-		DefaultViewPanel f = (DefaultViewPanel) PluginServices.getMDIManager().getActiveWindow();
-
-		if (f == null) {
-			return false;
-		}
-
-		if (f instanceof org.gvsig.app.project.documents.view.gui.DefaultViewPanel) {
-			org.gvsig.app.project.documents.view.gui.DefaultViewPanel view = (org.gvsig.app.project.documents.view.gui.DefaultViewPanel) f;
-			ViewDocument model = view.getModel();
-			Boolean p=null;
-
-
-			FLayer[] activas = model.getMapContext().getLayers().getActives();
-
-			//Utilizo esta comprobaci�n para poner el bot�n de la herramienta desactivado
-			//cuando se carga la ventana (comprobar que hay alguna capa activa)
-			if(activas.length==0)
-				return false;
-
-			for (int i = 0; i < activas.length; i++) {
-				if (!activas[i].isAvailable()) {
-					return false;
-				}
-				if(!activas[i].allowLinks())return false;
-				if(activas[i].getLinkProperties()==null || activas[i].getLinkProperties().getField()==null)
-					return false;
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * @see org.gvsig.andami.plugins.IExtension#initialize()
-	 */
-	public void initialize() {
-		registerIcons();
-	}
-
-	private void registerIcons(){
-
-		PluginServices.getIconTheme().registerDefault(
-				"view-query-link",
-				this.getClass().getClassLoader().getResource("images/Link.png")
-			);
-	}
-}
Index: branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/ViewInvertSelection.java
===================================================================
--- branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/ViewInvertSelection.java	(revision 38563)
+++ branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/ViewInvertSelection.java	(revision 38564)
@@ -95,6 +95,7 @@
  */
 package org.gvsig.app.extension;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.messages.NotificationManager;
 import org.gvsig.andami.plugins.Extension;
@@ -125,14 +126,19 @@
     private static final Logger logger = LoggerFactory
             .getLogger(ViewInvertSelection.class);
 	private DefaultViewPanel vista;
+	
 	public void initialize() {
+		IconThemeHelper.registerIcon("action", "selection-reverse", this);
 	}
 
+	public void postInitialize() {
+	}
+	
 	public void execute(String actionCommand) {
 		ViewDocument model = vista.getModel();
 		MapContext mapa = model.getMapContext();
 		logger.debug("Comand : " + actionCommand);
-		if (actionCommand.equals("INVERT_SELECTION")) {
+		if (actionCommand.equalsIgnoreCase("selection-reverse-view")) {
 			FLayer[] actives = mapa.getLayers().getActives();
 			for (int i = 0; i < actives.length; i++) {
 				FLayer lyr = actives[i];
Index: branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/ShowDevelInfoExtension.java
===================================================================
--- branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/ShowDevelInfoExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/ShowDevelInfoExtension.java	(revision 38564)
@@ -1,50 +1,19 @@
 package org.gvsig.app.extension;
 
-import java.awt.BorderLayout;
-import java.awt.Dimension;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
-
-import javax.swing.BorderFactory;
-import javax.swing.Box;
-import javax.swing.BoxLayout;
-import javax.swing.JButton;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTextPane;
-
-import org.gvsig.andami.iconthemes.IIconTheme;
-import org.gvsig.andami.iconthemes.IconThemeManager;
 import org.gvsig.andami.plugins.Extension;
-import org.gvsig.andami.ui.mdiManager.MDIManager.UIActionTool;
-import org.gvsig.andami.ui.mdiManager.MDIManagerFactory;
-import org.gvsig.app.ApplicationLocator;
+import org.gvsig.app.extension.develtools.ActionsInfoDevelTool;
+import org.gvsig.app.extension.develtools.IconThemeDevelTool;
+import org.gvsig.app.extension.develtools.MenusDevelTool;
+import org.gvsig.app.extension.develtools.PersistenceDevelTool;
 import org.gvsig.tools.ToolsLocator;
-import org.gvsig.tools.dataTypes.DataTypesManager;
-import org.gvsig.tools.dynobject.DynField;
-import org.gvsig.tools.dynobject.DynStruct;
-import org.gvsig.tools.persistence.PersistenceFactory;
 import org.gvsig.tools.persistence.PersistenceManager;
-import org.gvsig.tools.persistence.Persistent;
 import org.gvsig.tools.persistence.exception.PersistenceException;
-import org.gvsig.tools.swing.api.ToolsSwingLocator;
-import org.gvsig.tools.swing.api.windowmanager.WindowManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class ShowDevelInfoExtension extends Extension {
 
-	private Logger logger = LoggerFactory
+	private static Logger logger = LoggerFactory
 			.getLogger(ShowDevelInfoExtension.class);
 
 	public void initialize() {
@@ -66,125 +35,20 @@
 	}
 
 	public void execute(String actionCommand) {
-		if ("ShowPersistenceFactories".equalsIgnoreCase(actionCommand)) {
-			showInfoPanel("Persistence factories", WindowManager.MODE.WINDOW,
-					this.getPersistenceFactories());
-		} else if ("ShowIconThemeInformation".equalsIgnoreCase(actionCommand)) {
-			showInfoPanel("Icon theme information", WindowManager.MODE.WINDOW,
-					this.getIconThemeInformation());
-		} else if ("ShowActionsInformation".equalsIgnoreCase(actionCommand)) {
-			showInfoPanel("Actions information", WindowManager.MODE.WINDOW,
-					this.getActionsInformation());
+		if ("tools-devel-show-persistencefactories".equalsIgnoreCase(actionCommand)) {
+			new PersistenceDevelTool().showPersistenceFactories();
+		} else if ("tools-devel-show-icontheme".equalsIgnoreCase(actionCommand)) {
+			new IconThemeDevelTool().showDefaultIconTheme();
+		} else if ("tools-devel-show-actions".equalsIgnoreCase(actionCommand)) {
+			new ActionsInfoDevelTool().showActions();
+		} else if ("tools-devel-show-menus".equalsIgnoreCase(actionCommand)) {
+			new MenusDevelTool().showAllMenus();
+		} else if ("tools-devel-show-menus-by-plugin".equalsIgnoreCase(actionCommand)) {
+			new MenusDevelTool().showAllMenusByPlugin();
 		}
-
 	}
 
-	private String getActionsInformation() {
-		StringBuffer buffer = new StringBuffer();
 
-		buffer.append("<html>\n");
-		buffer.append("<body>\n");
-		buffer.append("<h2>Actions information</h2>\n");
-		buffer.append("<br>\n");
-
-		buffer.append("<table border=\"0\">\n");
-		buffer.append("  <tr>\n");
-		buffer.append("    <td>Name</td>\n");
-		buffer.append("    <td>Extension</td>\n");
-		buffer.append("    <td>Position</td>\n");
-		buffer.append("    <td>Text</td>\n");
-		buffer.append("    <td>Command</td>\n");
-		buffer.append("    <td>Icon</td>\n");
-		buffer.append("    <td>Tip</td>\n");
-		buffer.append("    <td>Enabled text</td>\n");
-		buffer.append("  </tr>\n");
-		Iterator<UIActionTool> actions = MDIManagerFactory.createManager()
-				.getActionTools();
-		while (actions.hasNext()) {
-			UIActionTool action = actions.next();
-			buffer.append("  <tr>\n");
-			buffer.append("    <td>").append(action.getName())
-					.append("</td>\n");
-			buffer.append("    <td>").append(action.getExtensionName())
-					.append("</td>\n");
-			buffer.append("    <td>").append(action.getPosition())
-					.append("</td>\n");
-			buffer.append("    <td>").append(action.getText())
-					.append("</td>\n");
-			buffer.append("    <td>").append(action.getCommand())
-					.append("</td>\n");
-			buffer.append("    <td>").append(action.getIconName())
-					.append("</td>\n");
-			buffer.append("    <td>").append(action.getTooptip())
-					.append("</td>\n");
-			buffer.append("    <td>").append(action.getEnableText())
-					.append("</td>\n");
-			buffer.append("  </tr>\n");
-		}
-		buffer.append("</table>\n");
-		buffer.append("</body>\n");
-		buffer.append("</html>\n");
-
-		save2file("actionsinfo", buffer.toString());
-
-		return buffer.toString();
-	}
-
-	private String getIconThemeInformation() {
-		StringBuffer buffer = new StringBuffer();
-
-		IconThemeManager manager = IconThemeManager.getIconThemeManager();
-		IIconTheme theme = manager.getCurrent();
-
-		buffer.append("<html>\n");
-		buffer.append("<body>\n");
-		buffer.append("<h2>Icon theme information</h2>\n");
-		buffer.append("<br>\n");
-		buffer.append("Theme: ");
-		buffer.append(theme.getName());
-		buffer.append("<br>\n");
-		buffer.append("Description: ");
-		buffer.append(theme.getDescription());
-		buffer.append("<br>\n");
-		buffer.append("Version: ");
-		buffer.append(theme.getVersion());
-		buffer.append("<br>\n");
-
-		buffer.append("<table border=\"0\">\n");
-		buffer.append("  <tr>\n");
-		buffer.append("    <td>Name</td>\n");
-		buffer.append("    <td>Resource id</td>\n");
-		buffer.append("  </tr>\n");
-		Iterator<String> names = theme.iterator();
-		while (names.hasNext()) {
-			String name = names.next();
-			buffer.append("  <tr>\n");
-			buffer.append("    <td>").append(name).append("</td>\n");
-			buffer.append("    <td>").append(theme.getResourceID(name))
-					.append("</td>\n");
-			buffer.append("  </tr>\n");
-		}
-		buffer.append("</table>\n");
-		buffer.append("</body>\n");
-		buffer.append("</html>\n");
-
-		save2file("iconthemeinfo", buffer.toString());
-
-		return buffer.toString();
-	}
-
-	private void save2file(String name, String contents) {
-		File file;
-		try {
-			file = File.createTempFile("gvsig-" + name, ".html");
-			FileWriter fwriter = new FileWriter(file);
-			fwriter.append(contents);
-			fwriter.close();
-		} catch (IOException e) {
-			logger.warn("Can't save contents to temp file gvsig-" + name, e);
-		}
-	}
-
 	public boolean isEnabled() {
 		return true;
 	}
@@ -192,280 +56,4 @@
 	public boolean isVisible() {
 		return true;
 	}
-
-	private void showInfoPanel(String title, WindowManager.MODE mode,
-			String html) {
-		JPanel panel = new JInfoPanel(html);
-		WindowManager wm = ToolsSwingLocator.getWindowManager();
-		wm.showWindow(panel, title, mode);
-	}
-
-	private class JInfoPanel extends JPanel {
-		/**
-		 * 
-		 */
-		private static final long serialVersionUID = 7164653790859770568L;
-
-		private JButton accept = null;
-		private JButton copy = null;
-		private JTextPane text = null;
-
-		public JInfoPanel(final String html) {
-			this.setLayout(new BorderLayout());
-			this.setPreferredSize(new Dimension(500, 300));
-			this.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4));
-
-			text = new JTextPane();
-			text.setContentType("text/html");
-			text.setEditable(false);
-			text.setText(html);
-			text.setCaretPosition(0);
-
-			JScrollPane scrollPane = new JScrollPane(text);
-			scrollPane.setPreferredSize(new Dimension(500, 220));
-
-			accept = new JButton("Accept");
-			accept.addActionListener(new ActionListener() {
-				public void actionPerformed(ActionEvent arg0) {
-					setVisible(false);
-				}
-			});
-			copy = new JButton("Copy to clipboard");
-			copy.addActionListener(new ActionListener() {
-				public void actionPerformed(ActionEvent arg0) {
-					ApplicationLocator.getManager().putInClipboard(
-							text.getText());
-				}
-			});
-
-			JPanel buttonsPanel = new JPanel();
-			buttonsPanel.setLayout(new BoxLayout(buttonsPanel,
-					BoxLayout.LINE_AXIS));
-			buttonsPanel.setBorder(BorderFactory.createEmptyBorder(2, 2, 2, 2));
-
-			buttonsPanel.add(Box.createHorizontalGlue());
-			buttonsPanel.add(copy);
-			buttonsPanel.add(accept);
-
-			this.add(scrollPane, BorderLayout.CENTER);
-			this.add(buttonsPanel, BorderLayout.SOUTH);
-			this.setVisible(true);
-		}
-	}
-
-	public class PersistenceInfo implements Comparable<PersistenceInfo> {
-		PersistenceFactory factory;
-		@SuppressWarnings("rawtypes")
-		Class theClass;
-		DynStruct definition;
-
-		PersistenceInfo(PersistenceFactory factory,
-				@SuppressWarnings("rawtypes") Class theClass,
-				DynStruct definition) {
-			this.factory = factory;
-			this.theClass = theClass;
-			this.definition = definition;
-		}
-
-		String getDefinitionName() {
-			if (definition == null) {
-				return "";
-			}
-			return definition.getFullName();
-		}
-
-		String getDefinitionDescription() {
-			if (definition == null) {
-				return "";
-			}
-			return definition.getDescription();
-		}
-
-		String getClassName() {
-			if (theClass == null) {
-				return "";
-			}
-			return theClass.getName();
-		}
-
-		String getFactoryName() {
-			if (factory == null) {
-				return "";
-			}
-			return factory.getClass().getName();
-		}
-
-		public int compareTo(PersistenceInfo other) {
-			int r = this.factory.getClass().getName()
-					.compareTo(other.factory.getClass().getName());
-			if (r == 0) {
-				return this.theClass.getName().compareTo(
-						other.theClass.getName());
-			}
-			return r;
-		}
-	}
-
-	@SuppressWarnings("rawtypes")
-	public class ClassComparator implements Comparator {
-
-		public int compare(Object o1, Object o2) {
-			if (o1 == null || o2 == null || ((Class) o1).getName() == null) {
-				logger.warn("Esto no deberia estar pasando.");
-				return 0; // FIXME
-			}
-			return ((Class) o1).getName().compareTo(((Class) o2).getName());
-		}
-
-	}
-
-	@SuppressWarnings({ "unchecked", "rawtypes" })
-	private String getPersistenceFactories() {
-		int warningsCounter = 0;
-		List<PersistenceInfo> classes = new ArrayList<PersistenceInfo>();
-		Set<Class> referencedClasses = new TreeSet<Class>(new ClassComparator());
-
-		PersistenceManager manager = ToolsLocator.getPersistenceManager();
-
-		List<PersistenceFactory> factories = manager.getFactories();
-		for (PersistenceFactory factory : factories) {
-			List<Class> theClasses = factory.getManagedClasses();
-			for (Class theClass : theClasses) {
-
-				DynStruct definition = manager.getDefinition(theClass);
-				List defs = factory.getDefinitions();
-				if (definition == null && defs != null && !defs.isEmpty()) {
-					for (int i = 0; i < defs.size(); i++) {
-						definition = (DynStruct) defs.get(i);
-						classes.add(new PersistenceInfo(factory, theClass,
-								definition));
-					}
-				} else {
-					classes.add(new PersistenceInfo(factory, theClass,
-							definition));
-				}
-			}
-		}
-		Collections.sort(classes);
-
-		StringBuffer buffer = new StringBuffer();
-		StringBuffer warnings = new StringBuffer();
-
-		buffer.append("<html>\n");
-		buffer.append("<body>\n");
-		buffer.append("<h2>Supported persistent classes</h2>\n");
-		buffer.append("<br>\n");
-
-		buffer.append("<ol>\n");
-		for (PersistenceInfo classInfo : classes) {
-			StringBuffer classBuffer = new StringBuffer();
-			boolean warning = false;
-			classBuffer.append("  <li>\n    ");
-			classBuffer.append("Class: <i>");
-			classBuffer.append(classInfo.getClassName());
-			classBuffer.append("</i><br>\n    Persistent: <i>");
-			if (Persistent.class.isAssignableFrom(classInfo.theClass)) {
-				classBuffer.append(" yes.");
-			} else {
-				classBuffer.append(" through a factory.");
-			}
-			classBuffer.append("<br>\n    Factory: <i>");
-			classBuffer.append(classInfo.getFactoryName()).append(
-					"</i><br>\n    Definition name: <i>");
-			classBuffer.append(classInfo.getDefinitionName()).append(
-					"</i><br>\n    Description: \n");
-			classBuffer.append(classInfo.getDefinitionDescription()).append(
-					"<br>\n    ");
-			DataTypesManager dataTypesManager = ToolsLocator
-					.getDataTypesManager();
-			DynStruct definition = classInfo.definition;
-			if (definition == null) {
-				classBuffer.append("Definition for ")
-						.append(classInfo.getClassName())
-						.append(" is null.<br>\n    ");
-				warningsCounter++;
-				warning = true;
-			} else {
-				DynField[] fields = definition.getDynFields();
-				for (int i = 0; i < fields.length; i++) {
-					DynField field = fields[i];
-					if (dataTypesManager.isContainer(field.getType())) {
-						if (field.getClassOfItems() == null) {
-							classBuffer
-									.append("Field <b>")
-									.append(field.getName())
-									.append("</b>, container,  can't has class for value of items.<br>\n    ");
-							warningsCounter++;
-							warning = true;
-						} else {
-							classBuffer.append("Field ")
-									.append(field.getName())
-									.append(", container of '")
-									.append(field.getClassOfItems().getName())
-									.append("'.<br>\n    ");
-							referencedClasses.add(field.getClassOfItems());
-						}
-					} else if (dataTypesManager.isObject(field.getType())) {
-						if (field.getClassOfValue() == null) {
-							classBuffer
-									.append("Field <b>")
-									.append(field.getName())
-									.append("</b> can't has class of value.<br>\n    ");
-							warningsCounter++;
-							warning = true;
-						} else {
-							classBuffer.append("Field ")
-									.append(field.getName()).append(" of '")
-									.append(field.getClassOfValue())
-									.append("'.<br>\n    ");
-							referencedClasses.add(field.getClassOfValue());
-						}
-					}
-				}
-			}
-			classBuffer.append("<br>\n  </li>\n");
-			buffer.append(classBuffer);
-			if (warning) {
-				warnings.append(classBuffer);
-			}
-		}
-		buffer.append("</ol>\n");
-		buffer.append("<br>\n");
-		buffer.append("<br>\n");
-
-		buffer.append("<h2>Persistent classes with problems</h2>\n");
-		buffer.append("<ol>\n");
-		buffer.append(warnings);
-		buffer.append("</ol>\n");
-		buffer.append("<br>\n<p>Total warnigs: ").append(warningsCounter)
-				.append("</p>");
-
-		buffer.append("<h2>Not persistents used classes</h2>\n");
-		buffer.append("<ol>\n");
-		for (Class theClass : referencedClasses) {
-			// if( manager.canPersist(theClass) ) {
-			// continue;
-			// }
-			if (Persistent.class.isAssignableFrom(theClass)) {
-				continue;
-			}
-			if (manager.getFactories().get(theClass) != null) {
-				continue;
-			}
-			buffer.append("  <li>\n");
-			buffer.append("    <i>").append(theClass.getName())
-					.append("</i><br>\n");
-			buffer.append("  </li>\n");
-			warningsCounter++;
-		}
-		buffer.append("</ol>\n");
-
-		buffer.append("</body>\n");
-		buffer.append("</html>\n");
-
-		save2file("persistenceinfo", buffer.toString());
-
-		return buffer.toString();
-	}
-
 }
Index: branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/ZoomPrev.java
===================================================================
--- branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/ZoomPrev.java	(revision 38563)
+++ branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/ZoomPrev.java	(revision 38564)
@@ -40,6 +40,7 @@
  */
 package org.gvsig.app.extension;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.plugins.Extension;
 import org.gvsig.app.project.documents.AbstractDocument;
@@ -94,11 +95,10 @@
 	/**
 	 * @see org.gvsig.andami.plugins.IExtension#initialize()
 	 */
+	public void postInitialize() {
+	}
+	
 	public void initialize() {
-
-		PluginServices.getIconTheme().registerDefault(
-				"view-zoom-back",
-				this.getClass().getClassLoader().getResource("images/ZoomPrevio.png")
-			);
+		IconThemeHelper.registerIcon("action", "view-navigation-zoom-back", this);
 	}
 }
Index: branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/InitializeApplicationExtension.java
===================================================================
--- branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/InitializeApplicationExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/InitializeApplicationExtension.java	(revision 38564)
@@ -6,10 +6,7 @@
 import java.io.StringWriter;
 import java.util.Properties;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.gvsig.andami.PluginServices;
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginsLocator;
 import org.gvsig.andami.PluginsManager;
 import org.gvsig.andami.plugins.Extension;
@@ -30,6 +27,8 @@
 import org.gvsig.tools.evaluator.sqljep.SQLJEPEvaluator;
 import org.gvsig.tools.service.spi.ServiceManager;
 import org.gvsig.tools.swing.spi.ToolsSwingServiceLocator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class InitializeApplicationExtension extends Extension {
     private static final Logger logger = LoggerFactory
@@ -59,7 +58,7 @@
         //CRS Definition
         dsManager.addServiceFactory(new JCRSDynFieldComponentFactory());
   
-		registerObservers();
+//		registerObservers();
 		
 		DALLocator.getResourceManager().startResourceCollector(
 				3 * (60 * 1000), // minutes --> miliseconds
@@ -69,75 +68,34 @@
 
 	}
 	
-	private void registerObservers() {
-//		FIXME
-//		ResourceManager resMan = DALLocator.getResourceManager();//.getResource(PostgresqlStore.DATASTORE_NAME);
-//		dbPasswordResorceObserver = new DBResourceManager();
-//		resMan.addObserver(dbPasswordResorceObserver);
-	}
+//	private void registerObservers() {
+////		FIXME
+////		ResourceManager resMan = DALLocator.getResourceManager();//.getResource(PostgresqlStore.DATASTORE_NAME);
+////		dbPasswordResorceObserver = new DBResourceManager();
+////		resMan.addObserver(dbPasswordResorceObserver);
+//	}
 
-	//Registro en esta extension los iconos que no se donde registrarlos.
 	private void registerIcons(){
+		IconThemeHelper.registerIcon("action", "edit-clear", this);
+		IconThemeHelper.registerIcon("action", "edit-copy", this);
+		IconThemeHelper.registerIcon("action", "edit-cut", this);
+		IconThemeHelper.registerIcon("action", "edit-delete", this);
+		IconThemeHelper.registerIcon("action", "edit-find", this);
+		IconThemeHelper.registerIcon("action", "edit-find-replace", this);
+		IconThemeHelper.registerIcon("action", "edit-paste", this);
+		IconThemeHelper.registerIcon("action", "edit-redo", this);
+		IconThemeHelper.registerIcon("action", "edit-select-all", this);
+		IconThemeHelper.registerIcon("action", "edit-undo", this);
+		IconThemeHelper.registerIcon("action", "edit-undo-redo-actions", this);
+    	IconThemeHelper.registerIcon("action", "document-print", this);
+		
+    	IconThemeHelper.registerIcon("toolbar-go", "go-next", this);
+    	IconThemeHelper.registerIcon("toolbar-go", "go-previous", this);
+    	IconThemeHelper.registerIcon("toolbar-go", "go-next-fast", this);
+    	IconThemeHelper.registerIcon("toolbar-go", "go-previous-fast", this);
+    	IconThemeHelper.registerIcon("toolbar-go", "go-first", this);
+    	IconThemeHelper.registerIcon("toolbar-go", "go-last", this);
 
-		PluginServices.getIconTheme().registerDefault(
-				"view-add-event-layer",
-				this.getClass().getClassLoader().getResource("images/addeventtheme.png")
-			);
-		PluginServices.getIconTheme().registerDefault(
-				"gvsig-logo-icon",
-				this.getClass().getClassLoader().getResource("images/icon_gvsig.png")
-			);
-
-
-
-		PluginServices.getIconTheme().registerDefault(
-				"mapa-icono",
-				this.getClass().getClassLoader().getResource("images/mapas.png")
-			);
-
-		PluginServices.getIconTheme().registerDefault(
-				"layout-insert-view",
-				this.getClass().getClassLoader().getResource("images/MapaVista.png")
-			);
-
-		PluginServices.getIconTheme().registerDefault(
-				"vista-icono",
-				this.getClass().getClassLoader().getResource("images/Vista.png")
-			);
-
-		PluginServices.getIconTheme().registerDefault(
-				"hand-icono",
-				this.getClass().getClassLoader().getResource("images/Hand.png")
-			);
-
-		PluginServices.getIconTheme().registerDefault(
-				"add-layer-icono",
-				this.getClass().getClassLoader().getResource("images/add-layer.png")
-			);
-
-		PluginServices.getIconTheme().registerDefault(
-				"delete-icono",
-				this.getClass().getClassLoader().getResource("images/delete.png")
-			);
-
-		PluginServices.getIconTheme().registerDefault(
-				"arrow-up-icono",
-				this.getClass().getClassLoader().getResource("images/up-arrow.png")
-			);
-
-		PluginServices.getIconTheme().registerDefault(
-				"arrow-down-icono",
-				this.getClass().getClassLoader().getResource("images/down-arrow.png")
-			);
-//		PluginServices.getIconTheme().register(
-//				"arrow-down-icono",
-//				PrintPropertiesPage.class.getClassLoader().getResource("images/prepare-page.png")
-//			);
-		PluginServices.getIconTheme().registerDefault(
-            "editdelete-icon",
-            this.getClass().getClassLoader().getResource("images/editdelete.png")
-        );
-
 	}
 
 	public void execute(String actionCommand) {
Index: branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/BasicSymbologyExtension.java
===================================================================
--- branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/BasicSymbologyExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/BasicSymbologyExtension.java	(revision 38564)
@@ -133,15 +133,6 @@
 //	private SymbologyDefaultImplLibrary simbologyDefaultImplLibrary;
 
 	public void initialize() {
-//		// Simbology initialization
-//		simbologyLibrary = new SymbologyLibrary();
-//		simbologyLibrary.initialize();
-//		
-//		simbologyDefaultImplLibrary = new SymbologyDefaultImplLibrary();
-//		simbologyDefaultImplLibrary.initialize();
-		
-		// Install required features
-
 		// modules for symbol editor
 		SymbolEditor.addSymbolEditorPanel(SimpleFill.class, Geometry.TYPES.SURFACE);
 		SymbolEditor.addSymbolEditorPanel(SimpleMarker.class, Geometry.TYPES.POINT);
@@ -192,36 +183,32 @@
 		
 		SymbologySwingLocator.getSwingManager().setColorTablesFactory(
 				ApplicationLocator.getManager().getColorTablesFactory());
-		
-		
-//		simbologyLibrary.postInitialize();
-//		simbologyDefaultImplLibrary.postInitialize();
 	}
 
 	private void registerIcons(){
-		PluginServices.getIconTheme().registerDefault(
-				"chain",
-				this.getClass().getClassLoader().getResource("images/chain.png")
-			);
-		PluginServices.getIconTheme().registerDefault(
-				"broken-chain",
-				this.getClass().getClassLoader().getResource("images/broken-chain.png")
-			);
-		PluginServices.getIconTheme().registerDefault(
-				"underline-icon",
-				this.getClass().getClassLoader().getResource("images/underlined.png")
-			);
-		PluginServices.getIconTheme().registerDefault(
-				"italic-icon",
-				this.getClass().getClassLoader().getResource("images/italic.png")
-			);
-		PluginServices.getIconTheme().registerDefault(
-				"bold-icon",
-				this.getClass().getClassLoader().getResource("images/bold.png")
-			);
-		PluginServices.getIconTheme().registerDefault(
-				"symbol-pref",
-				this.getClass().getClassLoader().getResource("images/QuantitiesByCategory.png"));
+//		PluginServices.getIconTheme().registerDefault(
+//				"chain",
+//				this.getClass().getClassLoader().getResource("images/chain.png")
+//			);
+//		PluginServices.getIconTheme().registerDefault(
+//				"broken-chain",
+//				this.getClass().getClassLoader().getResource("images/broken-chain.png")
+//			);
+//		PluginServices.getIconTheme().registerDefault(
+//				"underline-icon",
+//				this.getClass().getClassLoader().getResource("images/underlined.png")
+//			);
+//		PluginServices.getIconTheme().registerDefault(
+//				"italic-icon",
+//				this.getClass().getClassLoader().getResource("images/italic.png")
+//			);
+//		PluginServices.getIconTheme().registerDefault(
+//				"bold-icon",
+//				this.getClass().getClassLoader().getResource("images/bold.png")
+//			);
+//		PluginServices.getIconTheme().registerDefault(
+//				"symbol-pref",
+//				this.getClass().getClassLoader().getResource("images/QuantitiesByCategory.png"));
 
 	}
 
Index: branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/ViewPropertiesExtension.java
===================================================================
--- branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/ViewPropertiesExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/ViewPropertiesExtension.java	(revision 38564)
@@ -106,7 +106,7 @@
         DefaultViewPanel vista = (DefaultViewPanel) PluginServices.getMDIManager().getActiveWindow();
         ViewDocument model = vista.getModel();
 
-        if (s.compareTo("PROPERTIES") == 0) {
+        if (s.equalsIgnoreCase("view-properties") ) {
         	DefaultViewDocument viewModel = (DefaultViewDocument)model;
         	if (viewModel != null) {
               ViewProperties viewProperties = new ViewProperties(viewModel);
Index: branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/ZoomToSelectExtension.java
===================================================================
--- branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/ZoomToSelectExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/ZoomToSelectExtension.java	(revision 38564)
@@ -46,6 +46,7 @@
  */
 package org.gvsig.app.extension;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.messages.NotificationManager;
 import org.gvsig.andami.plugins.Extension;
@@ -137,13 +138,6 @@
 	 * @see org.gvsig.andami.plugins.IExtension#initialize()
 	 */
 	public void initialize() {
-		registerIcons();
+	   	IconThemeHelper.registerIcon("action", "view-navigation-zoom-to-selection", this);
 	}
-
-	private void registerIcons(){
-		PluginServices.getIconTheme().registerDefault(
-				"view-zoom-to-seleccion",
-				this.getClass().getClassLoader().getResource("images/ZoomSeleccion.png")
-			);
-	}
 }
Index: branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/AddLayer.java
===================================================================
--- branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/AddLayer.java	(revision 38563)
+++ branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/AddLayer.java	(revision 38564)
@@ -26,7 +26,7 @@
 
 import org.cresques.cts.ICoordTrans;
 import org.cresques.cts.IProjection;
-
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.plugins.Extension;
 import org.gvsig.app.addlayer.AddLayerDialog;
@@ -253,23 +253,6 @@
 	 * @see com.iver.andami.plugins.IExtension#initialize()
 	 */
 	public void initialize() {
-		//Listener para resolver un FileDriverNotFoundException
-//		LayerFactory.addSolveErrorForLayer(FileNotFoundDriverException.class,new FileNotFoundSolve());
-
-
-
-		//		Register.selfRegister();
-		//		org.gvsig.fmap.data.feature.file.dgn.Register.selfRegister();
-		//		org.gvsig.fmap.data.feature.file.dgn.operation.Register.selfRegister();
-		//		org.gvsig.fmap.data.feature.file.dxf.Register.selfRegister();
-		//		org.gvsig.fmap.data.feature.file.dxf.operation.Register.selfRegister();
-		//		org.gvsig.fmap.data.feature.file.shp.Register.selfRegister();
-		//		org.gvsig.fmap.data.feature.db.jdbc.postgresql.Register.selfRegister();
-		//		org.gvsig.fmap.data.feature.db.jdbc.h2.Register.selfRegister();
-		PluginServices.getIconTheme().registerDefault(
-				"layer-add",
-				this.getClass().getClassLoader().getResource("images/addlayer.png")
-			);
-
+	   	IconThemeHelper.registerIcon("action", "view-layer-add", this);
 	}
 }
Index: branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/InfoToolExtension.java
===================================================================
--- branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/InfoToolExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/InfoToolExtension.java	(revision 38564)
@@ -46,10 +46,7 @@
  */
 package org.gvsig.app.extension;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.gvsig.andami.PluginServices;
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.plugins.Extension;
 import org.gvsig.andami.ui.mdiManager.IWindow;
 import org.gvsig.app.ApplicationLocator;
@@ -57,6 +54,8 @@
 import org.gvsig.fmap.mapcontext.MapContext;
 import org.gvsig.fmap.mapcontext.layers.FLayer;
 import org.gvsig.fmap.mapcontrol.MapControl;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 
@@ -69,19 +68,10 @@
             .getLogger(InfoToolExtension.class);
 
     public void initialize() {
-        registerIcons();
+    	IconThemeHelper.registerIcon("action", "layer-info-by-point", this);
     }
 
-    private void registerIcons(){
-        PluginServices.getIconTheme().registerDefault(
-                "view-query-information",
-                InfoToolExtension.class.getClassLoader().getResource("images/Identify.png")
-        );
-    }
-
 	public void execute(String s) {
-        logger.debug("Comand : " + s);
-
         IWindow window = ApplicationLocator.getManager().getActiveWindow();
         if( window instanceof IView ) {
             IView view = (IView) window;
Index: branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/RestoreViewInfoExtension.java
===================================================================
--- branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/RestoreViewInfoExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/RestoreViewInfoExtension.java	(revision 38564)
@@ -65,7 +65,7 @@
 	 */
 	public void execute(String s) {
 		IWindow view = PluginServices.getMDIManager().getFocusWindow();
-        if (s.equals("RESTORE")){
+        if (s.equalsIgnoreCase("window-restore-from-tool")){
         	IWindowTransform vt=(IWindowTransform)view;
         	vt.restore();
         }
Index: branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/ClearSelectionExtension.java
===================================================================
--- branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/ClearSelectionExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/ClearSelectionExtension.java	(revision 38564)
@@ -46,6 +46,7 @@
  */
 package org.gvsig.app.extension;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.messages.NotificationManager;
 import org.gvsig.andami.plugins.Extension;
@@ -73,7 +74,7 @@
 	 * @see com.iver.mdiApp.plugins.IExtension#updateUI(java.lang.String)
 	 */
 	public void execute(String s) {
-		if (s.compareTo("DEL_SELECTION") == 0) {
+		if (s.equalsIgnoreCase("selection-clear-view") ) {
 			boolean refresh = false;
 			org.gvsig.andami.ui.mdiManager.IWindow view =PluginServices.getMDIManager().getActiveWindow();
 
@@ -186,13 +187,6 @@
 	 * @see org.gvsig.andami.plugins.IExtension#initialize()
 	 */
 	public void initialize() {
-		registerIcons();
+		IconThemeHelper.registerIcon("action", "edit-clear", this);
 	}
-
-	private void registerIcons(){
-		PluginServices.getIconTheme().registerDefault(
-				"view-clear-selection",
-				this.getClass().getClassLoader().getResource("images/delselection.png")
-			);
-	}
 }
Index: branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/ViewProjectWindow.java
===================================================================
--- branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/ViewProjectWindow.java	(revision 38563)
+++ branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/ViewProjectWindow.java	(revision 38564)
@@ -54,7 +54,7 @@
 	 * @see com.iver.mdiApp.plugins.IExtension#updateUI(java.lang.String)
 	 */
 	public void execute(String arg0) {
-		if (arg0.equals("SHOW")) {
+		if (arg0.equalsIgnoreCase("show-project-manager")) {
 			ProjectExtension pe = (ProjectExtension) PluginServices.getExtension(org.gvsig.app.extension.ProjectExtension.class);
 			pe.showProjectWindow();
 		}
Index: branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/FiltroExtension.java
===================================================================
--- branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/FiltroExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/FiltroExtension.java	(revision 38564)
@@ -45,6 +45,7 @@
 
 import javax.swing.JOptionPane;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.messages.NotificationManager;
 import org.gvsig.andami.plugins.Extension;
@@ -79,14 +80,9 @@
      * DOCUMENT ME!
      */
     public void initialize() {
-        registerIcons();
+    	IconThemeHelper.registerIcon("action", "layer-filter", this);
     }
 
-    private void registerIcons() {
-        PluginServices.getIconTheme().registerDefault("table-filter",
-            this.getClass().getClassLoader().getResource("images/Filtro.png"));
-    }
-
     /**
      * DOCUMENT ME!
      * 
@@ -94,7 +90,7 @@
      *            DOCUMENT ME!
      */
     public void execute(String actionCommand) {
-        if ("FILTRO".equals(actionCommand)) {
+        if ("layer-filter".equalsIgnoreCase(actionCommand)) {
             // try {
             IWindow v = PluginServices.getMDIManager().getActiveWindow();
 
Index: branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/ViewSelectionByTheme.java
===================================================================
--- branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/ViewSelectionByTheme.java	(revision 38563)
+++ branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/ViewSelectionByTheme.java	(revision 38564)
@@ -128,8 +128,7 @@
 	}
 
 	public void execute(String actionCommand) {
-		logger.debug("Comand : " + actionCommand);
-		if (actionCommand.equals("SELECTIONBYSHAPE")) {
+		if (actionCommand.equalsIgnoreCase("selection-select-by-layer")) {
 			SelectionByTheme dlg = new SelectionByTheme();
 			dlg.setModel(new DefaultSelectionByThemeModel());
 			dlg.addSelectionListener(new MySelectionByThemeListener());
Index: branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/ViewControls.java
===================================================================
--- branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/ViewControls.java	(revision 38563)
+++ branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/ViewControls.java	(revision 38564)
@@ -46,6 +46,9 @@
  */
 package org.gvsig.app.extension;
 
+import javax.swing.JOptionPane;
+
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.plugins.Extension;
 import org.gvsig.andami.preferences.IPreference;
@@ -53,13 +56,12 @@
 import org.gvsig.app.gui.preferencespage.GridPage;
 import org.gvsig.app.gui.preferencespage.ViewPage;
 import org.gvsig.app.project.Project;
-import org.gvsig.app.project.documents.AbstractDocument;
 import org.gvsig.app.project.documents.view.Encuadrator;
 import org.gvsig.app.project.documents.view.ViewDocument;
+import org.gvsig.app.project.documents.view.gui.DefaultViewPanel;
 import org.gvsig.app.project.documents.view.gui.ExtentListSelectorModel;
 import org.gvsig.app.project.documents.view.gui.FPanelExtentSelector;
 import org.gvsig.app.project.documents.view.gui.FPanelLocConfig;
-import org.gvsig.app.project.documents.view.gui.DefaultViewPanel;
 import org.gvsig.app.project.documents.view.toc.gui.FPopupMenu;
 import org.gvsig.app.project.documents.view.toolListeners.snapping.Snapping;
 import org.gvsig.fmap.mapcontext.MapContext;
@@ -67,6 +69,7 @@
 import org.gvsig.fmap.mapcontext.layers.FLayers;
 import org.gvsig.fmap.mapcontrol.MapControl;
 import org.gvsig.tools.ToolsLocator;
+import org.gvsig.tools.dataTypes.DataTypes;
 import org.gvsig.tools.extensionpoint.ExtensionPointManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -90,17 +93,21 @@
 	 * @see com.iver.mdiApp.plugins.IExtension#updateUI(java.lang.String)
 	 */
 	public void execute(String s) {
-		ViewDocument model = vista.getModel();
-		MapContext mapa = model.getMapContext();
+		execute(s,null);
+	}
+	
+	public void execute(String command, Object[] args) {
+		ViewDocument document = vista.getViewDocument();
+		MapContext mapa = document.getMapContext();
 		MapControl mapCtrl = vista.getMapControl();
-		logger.debug("Comand : " + s);
 
-		if (s.equals("FULL") ) {
+		if (command.equalsIgnoreCase("view-navigation-zoom-all") ) {
 			// mapa.beginAtomicEvent();
 			mapa.getViewPort().setEnvelope(mapa.getLayers().getFullEnvelope());
-			((AbstractDocument)vista.getModel()).setModified(true);
+			document.setModified(true);
 			// mapa.endAtomicEvent();
-		} else if (s.equals("ENCUADRE") ) {
+			
+		} else if (command.equalsIgnoreCase("view-navigation-frame-manager") ) {
 			FPanelExtentSelector l = new FPanelExtentSelector();
 
 			ProjectExtension p = (ProjectExtension) PluginServices.getExtension(org.gvsig.app.extension.ProjectExtension.class);
@@ -110,50 +117,61 @@
 			project.addPropertyChangeListener(modelo);
 			l.setModel(modelo);
 			l.addSelectionListener(new Encuadrator(project, mapa, vista));
-			((AbstractDocument)vista.getModel()).setModified(true);
+			document.setModified(true);
 			PluginServices.getMDIManager().addWindow(l);
-		} else if (s.equals("CONFIG_LOCATOR") ) {
+			
+		} else if (command.equalsIgnoreCase("view-locator-setup") ) {
 			//Set up the map overview
 			FPanelLocConfig m_panelLoc = new FPanelLocConfig(vista.getMapOverview());
 			PluginServices.getMDIManager().addWindow(m_panelLoc);
 			m_panelLoc.setPreferredSize(m_panelLoc.getSize());
-			((AbstractDocument)vista.getModel()).setModified(true);
-		} else if (s.equals("PAN") ) {
+			document.setModified(true);
+			
+		} else if (command.equalsIgnoreCase("view-navigation-pan") ) {
 			mapCtrl.setTool("pan");
-			((AbstractDocument)vista.getModel()).setModified(true);
-		} else if (s.equals("ZOOM_IN") ) {
+			document.setModified(true);
+			
+		} else if (command.equalsIgnoreCase("view-navigation-zoom-in-topoint") ) {
 			mapCtrl.setTool("zoomIn");
-			((AbstractDocument)vista.getModel()).setModified(true);
-		} else if (s.equals("ZOOM_OUT") ) {
+			document.setModified(true);
+			
+		} else if (command.equalsIgnoreCase("view-navigation-zoom-out-topoint") ) {
 			mapCtrl.setTool("zoomOut");
-			((AbstractDocument)vista.getModel()).setModified(true);
-		} else if (s.equals("CAPAS_VISIBLES") ) {
+			document.setModified(true);
+			
+		} else if (command.equalsIgnoreCase("layer-set-visible") ) {
 			setVisibles(true, mapa.getLayers());
-			((AbstractDocument)vista.getModel()).setModified(true);
-		} else if (s.equals("CAPAS_NOVISIBLES") ) {
+			document.setModified(true);
+			
+		} else if (command.equalsIgnoreCase("layer-set-hide") ) {
 			setVisibles(false, mapa.getLayers());
-			((AbstractDocument)vista.getModel()).setModified(true);
-		} else if (s.equals("CAPAS_ACTIVAS") ) {
+			document.setModified(true);
+			
+		} else if (command.equalsIgnoreCase("layer-set-active") ) {
 			setActives(true, mapa.getLayers());
-			((AbstractDocument)vista.getModel()).setModified(true);
-		} else if (s.equals("CAPAS_NOACTIVAS") ) {
+			document.setModified(true);
+			
+		} else if (command.equalsIgnoreCase("layer-set-inactive") ) {
 			setActives(false, mapa.getLayers());
-			((AbstractDocument)vista.getModel()).setModified(true);
-		} else if (s.equals("SAVERASTER") ) {
-			mapCtrl.setTool("saveRaster");
-		} else if (s.equals("SELECTIMAGE") ) {
-			mapCtrl.setTool("selectImage");
-		} else if (s.equals("ACTION_ZOOM_IN") ) {
+			document.setModified(true);
+			
+		} else if (command.equalsIgnoreCase("view-navigation-zoom-in-center") ) {
 			mapCtrl.zoomIn();
-			((AbstractDocument)vista.getModel()).setModified(true);
-		} else if (s.equals("ACTION_ZOOM_OUT") ) {
+			document.setModified(true);
+			
+		} else if (command.equalsIgnoreCase("view-navigation-zoom-out-center") ) {
 			mapCtrl.zoomOut();
-			((AbstractDocument)vista.getModel()).setModified(true);
-		} else if (s.startsWith("CHANGE_SCALE_")){
-			String scl=s.replaceAll("CHANGE_SCALE_","");
-			long scale=Long.parseLong(scl);
-			mapa.setScaleView(scale);
-			((AbstractDocument)vista.getModel()).setModified(true);
+			document.setModified(true);
+			
+		} else if (command.equalsIgnoreCase("view-change-scale")) {
+			try {
+				Long scale = (Long) ToolsLocator.getDataTypesManager().coerce(DataTypes.LONG, args[0]);
+				mapa.setScaleView(scale.longValue());
+				document.setModified(true);
+			} catch(Throwable ex) {
+				logger.info("Can't change scale of view.", ex);
+				PluginServices.getMainFrame().getStatusBar().message("Can't change scale of view.", JOptionPane.ERROR_MESSAGE);
+			}
 		}
 	}
 
@@ -205,7 +223,7 @@
 
 		if (f!=null && f instanceof DefaultViewPanel) {
 			vista = (DefaultViewPanel) f;
-			ViewDocument model = vista.getModel();
+			ViewDocument model = vista.getViewDocument();
 			MapContext mapa = model.getMapContext();
 
 			return mapa.getLayers().getLayersCount() > 0;
@@ -237,49 +255,20 @@
 	}
 
 	private void registerIcons(){
-
-		PluginServices.getIconTheme().registerDefault(
-				"view-zoom-in",
-				this.getClass().getClassLoader().getResource("images/ZoomIn.png")
-			);
-		PluginServices.getIconTheme().registerDefault(
-				"view-zoom-out",
-				this.getClass().getClassLoader().getResource("images/ZoomOut.png")
-			);
-		PluginServices.getIconTheme().registerDefault(
-				"view-zoom-map-contents",
-				this.getClass().getClassLoader().getResource("images/MapContents.png")
-			);
-		PluginServices.getIconTheme().registerDefault(
-				"view-zoom-center-in",
-				this.getClass().getClassLoader().getResource("images/zoommas.png")
-			);
-		PluginServices.getIconTheme().registerDefault(
-				"view-zoom-center-out",
-				this.getClass().getClassLoader().getResource("images/zoommenos.png")
-			);
-
-		PluginServices.getIconTheme().registerDefault(
-				"view-pan",
-				this.getClass().getClassLoader().getResource("images/Pan.png")
-			);
-
-		PluginServices.getIconTheme().registerDefault(
-				"view-zoom-manager",
-				this.getClass().getClassLoader().getResource("images/encuadre.png")
-			);
-		
-		PluginServices.getIconTheme().registerDefault(
-				"toc-layer-group",
-				this.getClass().getClassLoader().getResource("images/layerGroup.png")
-			);
+		IconThemeHelper.registerIcon("action", "view-navigation-zoom-in-topoint", this);
+		IconThemeHelper.registerIcon("action", "view-navigation-zoom-out-topoint", this);
+		IconThemeHelper.registerIcon("action", "view-navigation-zoom-all", this);
+		IconThemeHelper.registerIcon("action", "view-navigation-zoom-in-center", this);
+		IconThemeHelper.registerIcon("action", "view-navigation-zoom-out-center", this);
+		IconThemeHelper.registerIcon("action", "view-navigation-pan", this);
+		IconThemeHelper.registerIcon("action", "view-navigation-frame-manager", this);
 	}
 
 	/**
 	 * @see org.gvsig.andami.plugins.IExtension#isEnabled()
 	 */
 	public boolean isEnabled() {
-		ViewDocument model = vista.getModel();
+		ViewDocument model = vista.getViewDocument();
 		MapContext mapa = model.getMapContext();
 
 		FLayers layers = mapa.getLayers();
Index: branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/MeasureExtension.java
===================================================================
--- branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/MeasureExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/MeasureExtension.java	(revision 38564)
@@ -42,6 +42,7 @@
 
 package org.gvsig.app.extension;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.plugins.Extension;
 import org.gvsig.app.project.documents.view.ViewDocument;
@@ -77,15 +78,8 @@
     public void initialize() {
     	registerDistanceUnits();
     	registerAreaUnits();
-    	PluginServices.getIconTheme().registerDefault(
-				"view-query-distance",
-				this.getClass().getClassLoader().getResource("images/Distancia.png")
-			);
-
-    	PluginServices.getIconTheme().registerDefault(
-				"view-query-area",
-				this.getClass().getClassLoader().getResource("images/Poligono16.png")
-			);
+    	IconThemeHelper.registerIcon("action", "view-query-distance", this);
+    	IconThemeHelper.registerIcon("action", "view-query-area", this);
     }
 
     /* (non-Javadoc)
Index: branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/develtools/PersistenceDevelTool.java
===================================================================
--- branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/develtools/PersistenceDevelTool.java	(revision 0)
+++ branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/develtools/PersistenceDevelTool.java	(revision 38564)
@@ -0,0 +1,245 @@
+package org.gvsig.app.extension.develtools;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
+
+import org.gvsig.tools.ToolsLocator;
+import org.gvsig.tools.dataTypes.DataTypesManager;
+import org.gvsig.tools.dynobject.DynField;
+import org.gvsig.tools.dynobject.DynStruct;
+import org.gvsig.tools.persistence.PersistenceFactory;
+import org.gvsig.tools.persistence.PersistenceManager;
+import org.gvsig.tools.persistence.Persistent;
+import org.gvsig.tools.swing.api.windowmanager.WindowManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class PersistenceDevelTool {
+	private static Logger logger = LoggerFactory.getLogger(PersistenceDevelTool.class);
+
+	public void showPersistenceFactories() {
+		String html = this.getPersistenceFactories();
+		InfoPanel.save2file("persistenceinfo", html);
+		InfoPanel.showPanel("Persistence factories", WindowManager.MODE.WINDOW, html);
+	}
+	
+
+	public class PersistenceInfo implements Comparable<PersistenceInfo> {
+		PersistenceFactory factory;
+		@SuppressWarnings("rawtypes")
+		Class theClass;
+		DynStruct definition;
+
+		PersistenceInfo(PersistenceFactory factory,
+				@SuppressWarnings("rawtypes") Class theClass,
+				DynStruct definition) {
+			this.factory = factory;
+			this.theClass = theClass;
+			this.definition = definition;
+		}
+
+		String getDefinitionName() {
+			if (definition == null) {
+				return "";
+			}
+			return definition.getFullName();
+		}
+
+		String getDefinitionDescription() {
+			if (definition == null) {
+				return "";
+			}
+			return definition.getDescription();
+		}
+
+		String getClassName() {
+			if (theClass == null) {
+				return "";
+			}
+			return theClass.getName();
+		}
+
+		String getFactoryName() {
+			if (factory == null) {
+				return "";
+			}
+			return factory.getClass().getName();
+		}
+
+		public int compareTo(PersistenceInfo other) {
+			int r = this.factory.getClass().getName()
+					.compareTo(other.factory.getClass().getName());
+			if (r == 0) {
+				return this.theClass.getName().compareTo(
+						other.theClass.getName());
+			}
+			return r;
+		}
+	}
+
+	@SuppressWarnings("rawtypes")
+	public class ClassComparator implements Comparator {
+
+		public int compare(Object o1, Object o2) {
+			if (o1 == null || o2 == null || ((Class) o1).getName() == null) {
+				logger.warn("Esto no deberia estar pasando.");
+				return 0; // FIXME
+			}
+			return ((Class) o1).getName().compareTo(((Class) o2).getName());
+		}
+
+	}
+
+	@SuppressWarnings({ "unchecked", "rawtypes" })
+	public String getPersistenceFactories() {
+		int warningsCounter = 0;
+		List<PersistenceInfo> classes = new ArrayList<PersistenceInfo>();
+		Set<Class> referencedClasses = new TreeSet<Class>(new ClassComparator());
+
+		PersistenceManager manager = ToolsLocator.getPersistenceManager();
+
+		List<PersistenceFactory> factories = manager.getFactories();
+		for (PersistenceFactory factory : factories) {
+			List<Class> theClasses = factory.getManagedClasses();
+			for (Class theClass : theClasses) {
+
+				DynStruct definition = manager.getDefinition(theClass);
+				List defs = factory.getDefinitions();
+				if (definition == null && defs != null && !defs.isEmpty()) {
+					for (int i = 0; i < defs.size(); i++) {
+						definition = (DynStruct) defs.get(i);
+						classes.add(new PersistenceInfo(factory, theClass,
+								definition));
+					}
+				} else {
+					classes.add(new PersistenceInfo(factory, theClass,
+							definition));
+				}
+			}
+		}
+		Collections.sort(classes);
+
+		StringBuffer buffer = new StringBuffer();
+		StringBuffer warnings = new StringBuffer();
+
+		buffer.append("<html>\n");
+		buffer.append("<body>\n");
+		buffer.append("<h2>Supported persistent classes</h2>\n");
+		buffer.append("<br>\n");
+
+		buffer.append("<ol>\n");
+		for (PersistenceInfo classInfo : classes) {
+			StringBuffer classBuffer = new StringBuffer();
+			boolean warning = false;
+			classBuffer.append("  <li>\n    ");
+			classBuffer.append("Class: <i>");
+			classBuffer.append(classInfo.getClassName());
+			classBuffer.append("</i><br>\n    Persistent: <i>");
+			if (Persistent.class.isAssignableFrom(classInfo.theClass)) {
+				classBuffer.append(" yes.");
+			} else {
+				classBuffer.append(" through a factory.");
+			}
+			classBuffer.append("<br>\n    Factory: <i>");
+			classBuffer.append(classInfo.getFactoryName()).append(
+					"</i><br>\n    Definition name: <i>");
+			classBuffer.append(classInfo.getDefinitionName()).append(
+					"</i><br>\n    Description: \n");
+			classBuffer.append(classInfo.getDefinitionDescription()).append(
+					"<br>\n    ");
+			DataTypesManager dataTypesManager = ToolsLocator
+					.getDataTypesManager();
+			DynStruct definition = classInfo.definition;
+			if (definition == null) {
+				classBuffer.append("Definition for ")
+						.append(classInfo.getClassName())
+						.append(" is null.<br>\n    ");
+				warningsCounter++;
+				warning = true;
+			} else {
+				DynField[] fields = definition.getDynFields();
+				for (int i = 0; i < fields.length; i++) {
+					DynField field = fields[i];
+					if (dataTypesManager.isContainer(field.getType())) {
+						if (field.getClassOfItems() == null) {
+							classBuffer
+									.append("Field <b>")
+									.append(field.getName())
+									.append("</b>, container,  can't has class for value of items.<br>\n    ");
+							warningsCounter++;
+							warning = true;
+						} else {
+							classBuffer.append("Field ")
+									.append(field.getName())
+									.append(", container of '")
+									.append(field.getClassOfItems().getName())
+									.append("'.<br>\n    ");
+							referencedClasses.add(field.getClassOfItems());
+						}
+					} else if (dataTypesManager.isObject(field.getType())) {
+						if (field.getClassOfValue() == null) {
+							classBuffer
+									.append("Field <b>")
+									.append(field.getName())
+									.append("</b> can't has class of value.<br>\n    ");
+							warningsCounter++;
+							warning = true;
+						} else {
+							classBuffer.append("Field ")
+									.append(field.getName()).append(" of '")
+									.append(field.getClassOfValue())
+									.append("'.<br>\n    ");
+							referencedClasses.add(field.getClassOfValue());
+						}
+					}
+				}
+			}
+			classBuffer.append("<br>\n  </li>\n");
+			buffer.append(classBuffer);
+			if (warning) {
+				warnings.append(classBuffer);
+			}
+		}
+		buffer.append("</ol>\n");
+		buffer.append("<br>\n");
+		buffer.append("<br>\n");
+
+		buffer.append("<h2>Persistent classes with problems</h2>\n");
+		buffer.append("<ol>\n");
+		buffer.append(warnings);
+		buffer.append("</ol>\n");
+		buffer.append("<br>\n<p>Total warnigs: ").append(warningsCounter)
+				.append("</p>");
+
+		buffer.append("<h2>Not persistents used classes</h2>\n");
+		buffer.append("<ol>\n");
+		for (Class theClass : referencedClasses) {
+			// if( manager.canPersist(theClass) ) {
+			// continue;
+			// }
+			if (Persistent.class.isAssignableFrom(theClass)) {
+				continue;
+			}
+			if (manager.getFactories().get(theClass) != null) {
+				continue;
+			}
+			buffer.append("  <li>\n");
+			buffer.append("    <i>").append(theClass.getName())
+					.append("</i><br>\n");
+			buffer.append("  </li>\n");
+			warningsCounter++;
+		}
+		buffer.append("</ol>\n");
+
+		buffer.append("</body>\n");
+		buffer.append("</html>\n");
+
+		return buffer.toString();
+	}
+
+
+}

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/develtools/PersistenceDevelTool.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/develtools/MenusDevelTool.java
===================================================================
--- branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/develtools/MenusDevelTool.java	(revision 0)
+++ branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/develtools/MenusDevelTool.java	(revision 38564)
@@ -0,0 +1,119 @@
+package org.gvsig.app.extension.develtools;
+
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+import org.gvsig.andami.Launcher;
+import org.gvsig.andami.Launcher.PluginMenuItem;
+import org.gvsig.andami.actioninfo.ActionInfo;
+import org.gvsig.tools.swing.api.windowmanager.WindowManager;
+
+public class MenusDevelTool {
+	public void showAllMenus() {
+		String html = this.getAllMenus();
+		InfoPanel.save2file("menusinfo", html);
+		InfoPanel.showPanel("Menu information", WindowManager.MODE.WINDOW, html);
+	}
+	public void showAllMenusByPlugin() {
+		String html = this.getAllMenusByPlugin();
+		InfoPanel.save2file("menusbyplugininfo", html);
+		InfoPanel.showPanel("Menu by plugin information", WindowManager.MODE.WINDOW, html);
+	}
+	
+	public String getAllMenus() {
+		Launcher launcher = Launcher.getInstance();
+		List<PluginMenuItem> menuItems = launcher.getPluginMenuItems();
+		
+		return this.getAllMenus(menuItems);
+	}
+	
+	public String getAllMenusByPlugin() {
+		Launcher launcher = Launcher.getInstance();
+		List<PluginMenuItem> menuItems = launcher.getPluginMenuItems();
+		
+		Collections.sort(menuItems, new Comparator<PluginMenuItem>() {
+			public int compare(PluginMenuItem o1, PluginMenuItem o2) {
+				String s1 = String.format("%s:%012d:%s", o1.getPluginName(), o1.getPosition(), o1.getText());
+				String s2 = String.format("%s:%012d:%s", o2.getPluginName(), o2.getPosition(), o2.getText());
+				return s1.compareTo(s2);
+			}
+		});
+		return this.getAllMenus(menuItems);
+	}
+	
+	private String getAllMenus(List<PluginMenuItem> menuItems) {
+		StringBuffer buffer = new StringBuffer();
+
+//		String warning_open = "<b>";
+//		String warning_close = "</b>";
+		
+		String error_open = "<b><font color=\"red\">";
+		String error_close = "</font></b>";
+		
+		buffer.append("<html>\n");
+		buffer.append("<body>\n");
+		buffer.append("<h2>Menu information </h2>\n");
+		buffer.append("<br>\n");
+		
+		buffer.append("<table border=\"0\">\n");
+		buffer.append("  <tr>\n");
+		buffer.append("    <td>Position</td>\n");
+		buffer.append("    <td>Text</td>\n");
+		buffer.append("    <td>Action</td>\n");
+		buffer.append("    <td>Plugin</td>\n");
+		buffer.append("  </tr>\n");
+
+		
+		for (PluginMenuItem menu : menuItems) {
+			buffer.append("  <tr valign=\"top\">\n");
+			buffer
+				.append("    <td>")
+				.append(String.format("%012d", menu.getPosition()))
+				.append("</td>\n");			
+			buffer
+				.append("    <td>")
+				.append(menu.getText())
+				.append("</td>\n");		
+			if( menu.isParent() ) {
+				buffer
+					.append("    <td>")
+					.append("----")
+					.append("</td>\n");
+				buffer
+					.append("    <td>")
+					.append(menu.getPluginName())
+					.append("</td>\n");			
+			} else {
+				ActionInfo action = menu.getAction();
+				if( action == null ) {
+					buffer
+						.append("    <td>")
+						.append(error_open)
+						.append(menu.getName())
+						.append(error_close)
+						.append("</td>\n");
+					buffer
+						.append("    <td>")
+						.append(menu.getPluginName())
+						.append("</td>\n");			
+				} else {
+					buffer
+						.append("    <td>")
+						.append(action.getName())
+						.append("</td>\n");
+					buffer
+						.append("    <td>")
+						.append(action.getPluginName())
+						.append("</td>\n");			
+				}
+			}
+			buffer.append("  </tr>\n");
+		}
+		buffer.append("</table>\n");
+		buffer.append("</body>\n");
+		buffer.append("</html>\n");
+
+		return buffer.toString();
+	}
+}

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/develtools/MenusDevelTool.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/develtools/IconThemeDevelTool.java
===================================================================
--- branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/develtools/IconThemeDevelTool.java	(revision 0)
+++ branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/develtools/IconThemeDevelTool.java	(revision 38564)
@@ -0,0 +1,535 @@
+package org.gvsig.app.extension.develtools;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import javax.swing.ImageIcon;
+
+import org.gvsig.andami.PluginsLocator;
+import org.gvsig.andami.actioninfo.ActionInfo;
+import org.gvsig.tools.swing.api.ToolsSwingLocator;
+import org.gvsig.tools.swing.api.windowmanager.WindowManager;
+import org.gvsig.tools.swing.icontheme.IconTheme;
+import org.gvsig.tools.swing.icontheme.IconThemeManager;
+
+public class IconThemeDevelTool {
+
+	public void showDefaultIconTheme() {
+		String html = this.getIconThemeInformationByGroup();
+		InfoPanel.save2file("iconthemeinfo", html);
+		InfoPanel.showPanel("Icon theme information", WindowManager.MODE.WINDOW, html);
+	}
+
+	public void showDefaultIconThemeByPlugin() {
+		String html = this.getIconThemeInformationByPlugin();
+		InfoPanel.save2file("iconthemeinfo", html);
+		InfoPanel.showPanel("Icon theme information", WindowManager.MODE.WINDOW, html);
+	}
+
+	private String getIconThemeInformationByPlugin() {
+		IconThemeManager manager = ToolsSwingLocator.getIconThemeManager();
+		IconTheme theme = manager.getDefault();
+		
+		List<IconTheme.Icon>themeIcons = new ArrayList<IconTheme.Icon>();
+		Iterator<IconTheme.Icon> themeIconsIt = theme.getThemeIcons();
+		while (themeIconsIt.hasNext()) {
+			themeIcons.add(themeIconsIt.next());
+		}
+		Collections.sort(themeIcons, new Comparator<IconTheme.Icon>() {
+			public int compare(IconTheme.Icon o1, IconTheme.Icon o2) {
+				String s1 = String.format("%s:%s:%s", o1.getProviderName(), o1.getGroup(), o1.getName());
+				String s2 = String.format("%s:%s:%s", o2.getProviderName(), o2.getGroup(), o2.getName());
+				return s1.compareTo(s2);
+			}
+		});
+		themeIconsIt = themeIcons.iterator();
+		return getIconThemeInformation(theme, themeIconsIt);
+	}
+	
+	private String getIconThemeInformationByGroup() {
+		IconThemeManager manager = ToolsSwingLocator.getIconThemeManager();
+		IconTheme theme = manager.getDefault();
+		
+		List<IconTheme.Icon>themeIcons = new ArrayList<IconTheme.Icon>();
+		Iterator<IconTheme.Icon> themeIconsIt = theme.getThemeIcons();
+		while (themeIconsIt.hasNext()) {
+			themeIcons.add(themeIconsIt.next());
+		}
+		Collections.sort(themeIcons, new Comparator<IconTheme.Icon>() {
+			public int compare(IconTheme.Icon o1, IconTheme.Icon o2) {
+				String s1 = String.format("%s:%s:%s", o1.getGroup(), o1.getName(), o1.getProviderName());
+				String s2 = String.format("%s:%s:%s", o2.getGroup(), o2.getName(), o2.getProviderName());
+				return s1.compareTo(s2);
+			}
+		});
+		themeIconsIt = themeIcons.iterator();
+		return getIconThemeInformation(theme,themeIconsIt);
+	}
+
+	private String getIconThemeInformation(IconTheme theme, Iterator<IconTheme.Icon> themeIconsIt) {
+		Set<String> actionIcons = new HashSet<String>();
+		Iterator<ActionInfo> actions = PluginsLocator.getActionInfoManager().getActions(); 
+		while (actions.hasNext()) {
+			ActionInfo action = actions.next();
+			if( action.getIconName()!=null ) {
+				actionIcons.add(action.getIconName());
+			}
+		}
+		Set<String> tangoIconNames = getTangoIconNames();
+		
+		StringBuffer buffer = new StringBuffer();
+
+		String warning_open = "<b>";
+		String warning_close = "</b>";
+		
+		String error_open = "<b><font color=\"red\">";
+		String error_close = "</font></b>";
+
+		String tangoicon_open = "<b><font color=\"green\">";
+		String tangoicon_close = "</font></b>";
+		
+		String previousPluginName = null;
+
+		buffer.append("<html>\n");
+		buffer.append("<body>\n");
+		buffer.append("<h2>Icon theme information</h2>\n");
+		buffer.append("<br>\n");
+		buffer.append("Theme: ");
+		buffer.append(theme.getName());
+		buffer.append("<br>\n");
+		buffer.append("Description: ");
+		buffer.append(theme.getDescription());
+		buffer.append("<br>\n");
+
+		buffer.append("<table border=\"0\">\n");
+		buffer.append("  <tr>\n");
+		buffer.append("    <td>Preview</td>\n");
+		buffer.append("    <td>Group</td>\n");
+		buffer.append("    <td>Name</td>\n");
+		buffer.append("    <td>Plugin</td>\n");
+		buffer.append("    <td>Resource</td>\n");
+		buffer.append("  </tr>\n");
+		
+		
+		while (themeIconsIt.hasNext()) {
+			IconTheme.Icon themeIcon = themeIconsIt.next();
+			if( previousPluginName!=null && !themeIcon.getProviderName().equals(previousPluginName) ) {
+				buffer
+					.append("  <tr>\n")
+					.append("    <td colspan=\"4\"><hr></td>\n")
+					.append("  </tr>\n");
+				previousPluginName = themeIcon.getProviderName();
+			}
+			
+			buffer.append("  <tr valign=\"top\">\n");
+			
+			// Preview			
+			if( themeIcon.getLabel().length()>0 && themeIcon.getImageIcon()!=null ) {
+				try {
+					ImageIcon img = themeIcon.getImageIcon();
+					if( img.getIconHeight() > 48 || img.getIconWidth() > 48 ) {
+						buffer
+							.append("    <td nowrap>")
+							.append("<img width=\"48\" height=\"48\" src=\"")
+							.append(themeIcon.getLabel())
+							.append("\">(*)</td>");
+					} else {
+						buffer
+							.append("    <td>")
+							.append("<img src=\"")
+							.append(themeIcon.getLabel())
+							.append("\"></td>");
+					}
+				} catch(Exception ex) {
+					buffer
+						.append("    <td>")
+						.append("<img src=\"")
+						.append(themeIcon.getLabel())
+						.append("\"></td>");
+				}
+			} else {
+				buffer.append("    <td></td>");
+			}
+		
+			// Group
+			if( themeIcon.getGroup()==null ) {
+				buffer.append("    <td title=\"missing recomended group\">")
+					.append(warning_open)
+					.append(themeIcon.getGroup())
+					.append(warning_close)
+					.append("</td>\n");
+			} else {
+				buffer.append("    <td>")
+					.append(themeIcon.getGroup())
+					.append("</td>\n");
+			}
+
+			// Name
+			if( "action".equals(themeIcon.getGroup()) && !actionIcons.contains(themeIcon.getName())) {
+				buffer.append("    <td title=\"Don't exists an action associated to this icon\">")
+					.append(error_open)
+					.append(themeIcon.getName())
+					.append(error_close)
+					.append("</td>\n");
+			} else if( !themeIcon.getName().contains("-") ) {
+				buffer.append("    <td title=\"Name don't have recomended format\">")
+					.append(warning_open)
+					.append(themeIcon.getName())
+					.append(warning_close)
+					.append("</td>\n");
+			} else if( tangoIconNames.contains(themeIcon.getName()) ){
+				buffer.append("    <td>")
+					.append(tangoicon_open)
+					.append(themeIcon.getName())
+					.append(tangoicon_close)
+					.append("</td>\n");
+			} else {
+				buffer.append("    <td>")
+					.append(themeIcon.getName())
+					.append("</td>\n");
+			}
+
+			// Plugin
+			if( themeIcon.getProviderName()== null ) {
+				buffer.append("    <td title=\"missing recomended associated plugin\">")
+					.append(warning_open)
+					.append(themeIcon.getProviderName())
+					.append(warning_close)
+					.append("</td>\n");
+				
+			}  else {
+				buffer.append("    <td>")
+					.append(themeIcon.getProviderName())
+					.append("</td>\n");
+			}			
+			
+			// Resource
+			if( themeIcon.getLabel().length()<1 ) {
+				buffer.append("    <td title=\"Resource icon not specified\">")
+					.append(error_open)
+					.append("(missing)")
+					.append(error_close)
+					.append("</td>\n");
+			} else if( themeIcon.getImageIcon()==null ) {
+				buffer.append("    <td title=\"Can't locate icon\">")
+					.append(error_open)
+					.append(themeIcon.getLabel())
+					.append(error_close)
+					.append("</td>\n");
+			} else {
+				buffer.append("    <td>")
+					.append(themeIcon.getLabel())
+					.append("</td>\n");
+
+			}
+			buffer.append("  </tr>\n");
+		}
+		buffer.append("</table>\n");
+		buffer.append("</body>\n");
+		buffer.append("</html>\n");
+
+		return buffer.toString();
+	}
+
+	private Set<String> getTangoIconNames() {
+		String[] iconNames = new String[] {
+				"address-book-new",
+				"application-exit",
+				"appointment-new",
+				"call-start",
+				"call-stop",
+				"contact-new",
+				"document-new",
+				"document-open",
+				"document-open-recent",
+				"document-page-setup",
+				"document-print",
+				"document-print-preview",
+				"document-properties",
+				"document-revert",
+				"document-save",
+				"document-save-as",
+				"document-send",
+				"edit-clear",
+				"edit-copy",
+				"edit-cut",
+				"edit-delete",
+				"edit-find",
+				"edit-find-replace",
+				"edit-paste",
+				"edit-redo",
+				"edit-select-all",
+				"edit-undo",
+				"folder-new",
+				"format-indent-less",
+				"format-indent-more",
+				"format-justify-center",
+				"format-justify-fill",
+				"format-justify-left",
+				"format-justify-right",
+				"format-text-direction-ltr",
+				"format-text-direction-rtl",
+				"format-text-bold",
+				"format-text-italic",
+				"format-text-underline",
+				"format-text-strikethrough",
+				"go-bottom",
+				"go-down",
+				"go-first",
+				"go-home",
+				"go-jump",
+				"go-last",
+				"go-next",
+				"go-previous",
+				"go-top",
+				"go-up",
+				"help-about",
+				"help-contents",
+				"help-faq",
+				"insert-image",
+				"insert-link",
+				"insert-object",
+				"insert-text",
+				"list-add",
+				"list-remove",
+				"mail-forward",
+				"mail-mark-important",
+				"mail-mark-junk",
+				"mail-mark-notjunk",
+				"mail-mark-read",
+				"mail-mark-unread",
+				"mail-message-new",
+				"mail-reply-all",
+				"mail-reply-sender",
+				"mail-send",
+				"mail-send-receive",
+				"media-eject",
+				"media-playback-pause",
+				"media-playback-start",
+				"media-playback-stop",
+				"media-record",
+				"media-seek-backward",
+				"media-seek-forward",
+				"media-skip-backward",
+				"media-skip-forward",
+				"object-flip-horizontal",
+				"object-flip-vertical",
+				"object-rotate-left",
+				"object-rotate-right",
+				"process-stop",
+				"system-lock-screen",
+				"system-log-out",
+				"system-run",
+				"system-search",
+				"system-reboot",
+				"system-shutdown",
+				"tools-check-spelling",
+				"view-fullscreen",
+				"view-refresh",
+				"view-restore",
+				"view-sort-ascending",
+				"view-sort-descending",
+				"window-close",
+				"window-new",
+				"zoom-fit-best",
+				"zoom-in",
+				"zoom-original",
+				"zoom-out",
+				"process-working",
+				"accessories-calculator",
+				"accessories-character-map",
+				"accessories-dictionary",
+				"accessories-text-editor",
+				"help-browser",
+				"multimedia-volume-control",
+				"preferences-desktop-accessibility",
+				"preferences-desktop-font",
+				"preferences-desktop-keyboard",
+				"preferences-desktop-locale",
+				"preferences-desktop-multimedia",
+				"preferences-desktop-screensaver",
+				"preferences-desktop-theme",
+				"preferences-desktop-wallpaper",
+				"system-file-manager",
+				"system-software-install",
+				"system-software-update",
+				"utilities-system-monitor",
+				"utilities-terminal",
+				"applications-accessories",
+				"applications-development",
+				"applications-engineering",
+				"applications-games",
+				"applications-graphics",
+				"applications-internet",
+				"applications-multimedia",
+				"applications-office",
+				"applications-other",
+				"applications-science",
+				"applications-system",
+				"applications-utilities",
+				"preferences-desktop",
+				"preferences-desktop-peripherals",
+				"preferences-desktop-personal",
+				"preferences-other",
+				"preferences-system",
+				"preferences-system-network",
+				"system-help",
+				"audio-card",
+				"audio-input-microphone",
+				"battery",
+				"camera-photo",
+				"camera-video",
+				"camera-web",
+				"computer",
+				"drive-harddisk",
+				"drive-optical",
+				"drive-removable-media",
+				"input-gaming",
+				"input-keyboard",
+				"input-mouse",
+				"input-tablet",
+				"media-flash",
+				"media-floppy",
+				"media-optical",
+				"media-tape",
+				"modem",
+				"multimedia-player",
+				"network-wired",
+				"network-wireless",
+				"pda",
+				"phone",
+				"printer",
+				"scanner",
+				"video-display",
+				"emblem-default",
+				"emblem-documents",
+				"emblem-downloads",
+				"emblem-favorite",
+				"emblem-important",
+				"emblem-mail",
+				"emblem-photos",
+				"emblem-readonly",
+				"emblem-shared",
+				"emblem-symbolic-link",
+				"emblem-synchronized",
+				"emblem-system",
+				"emblem-unreadable",
+				"face-angel",
+				"face-angry",
+				"face-cool",
+				"face-crying",
+				"face-devilish",
+				"face-embarrassed",
+				"face-kiss",
+				"face-laugh",
+				"face-monkey",
+				"face-plain",
+				"face-raspberry",
+				"face-sad",
+				"face-sick",
+				"face-smile",
+				"face-smile-big",
+				"face-smirk",
+				"face-surprise",
+				"face-tired",
+				"face-uncertain",
+				"face-wink",
+				"face-worried",
+				"flag-aa",
+				"application-x-executable",
+				"audio-x-generic",
+				"font-x-generic",
+				"image-x-generic",
+				"package-x-generic",
+				"text-html",
+				"text-x-generic",
+				"text-x-generic-template",
+				"text-x-script",
+				"video-x-generic",
+				"x-office-address-book",
+				"x-office-calendar",
+				"x-office-document",
+				"x-office-presentation",
+				"x-office-spreadsheet",
+				"folder",
+				"folder-remote",
+				"network-server",
+				"network-workgroup",
+				"start-here",
+				"user-bookmarks",
+				"user-desktop",
+				"user-home",
+				"user-trash",
+				"appointment-missed",
+				"appointment-soon",
+				"audio-volume-high",
+				"audio-volume-low",
+				"audio-volume-medium",
+				"audio-volume-muted",
+				"battery-caution",
+				"battery-low",
+				"dialog-error",
+				"dialog-information",
+				"dialog-password",
+				"dialog-question",
+				"dialog-warning",
+				"folder-drag-accept",
+				"folder-open",
+				"folder-visiting",
+				"image-loading",
+				"image-missing",
+				"mail-attachment",
+				"mail-unread",
+				"mail-read",
+				"mail-replied",
+				"mail-signed",
+				"mail-signed-verified",
+				"media-playlist-repeat",
+				"media-playlist-shuffle",
+				"network-error",
+				"network-idle",
+				"network-offline",
+				"network-receive",
+				"network-transmit",
+				"network-transmit-receive",
+				"printer-error",
+				"printer-printing",
+				"security-high",
+				"security-medium",
+				"security-low",
+				"software-update-available",
+				"software-update-urgent",
+				"sync-error",
+				"sync-synchronizing",
+				"task-due",
+				"task-past-due",
+				"user-available",
+				"user-away",
+				"user-idle",
+				"user-offline",
+				"user-trash-full",
+				"weather-clear",
+				"weather-clear-night",
+				"weather-few-clouds",
+				"weather-few-clouds-night",
+				"weather-fog",
+				"weather-overcast",
+				"weather-severe-alert",
+				"weather-showers",
+				"weather-showers-scattered",
+				"weather-snow",
+				"weather-storm"
+		};
+		Set<String> icons = new HashSet<String>();
+		for (int i = 0; i < iconNames.length; i++) {
+			icons.add(iconNames[i]);
+		}
+		return icons;
+	}
+
+}

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/develtools/IconThemeDevelTool.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/develtools/ActionsInfoDevelTool.java
===================================================================
--- branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/develtools/ActionsInfoDevelTool.java	(revision 0)
+++ branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/develtools/ActionsInfoDevelTool.java	(revision 38564)
@@ -0,0 +1,187 @@
+package org.gvsig.app.extension.develtools;
+
+import java.util.Iterator;
+
+import org.gvsig.andami.PluginsLocator;
+import org.gvsig.andami.actioninfo.ActionInfo;
+import org.gvsig.tools.swing.api.windowmanager.WindowManager;
+
+public class ActionsInfoDevelTool {
+
+	public void showActions() {
+		String html = this.getActionsInformation();
+		InfoPanel.save2file("actionsinfo", html);
+		InfoPanel.showPanel("Actions information", WindowManager.MODE.WINDOW, html);
+	}
+	
+	public String getActionsInformation() {
+		
+		String previousPluginName = null;
+		
+		String warning_open = "<b>";
+		String warning_close = "</b>";
+		
+		String error_open = "<b><font color=\"red\">";
+		String error_close = "</font></b>";
+
+		StringBuffer buffer = new StringBuffer();
+
+		buffer.append("<html>\n");
+		buffer.append("<body>\n");
+		buffer.append("<h2>Actions information </h2>\n");
+		buffer.append("<br>\n");
+
+		buffer.append("<table border=\"0\">\n");
+		buffer.append("  <tr>\n");
+		buffer.append("    <td>Plugin</td>\n");
+		buffer.append("    <td>Extension</td>\n");
+		buffer.append("    <td>Name</td>\n");
+		buffer.append("    <td>Position</td>\n");
+		buffer.append("    <td>Text</td>\n");
+		buffer.append("    <td>Command</td>\n");
+		buffer.append("    <td>Icon</td>\n");
+		buffer.append("    <td>Tip</td>\n");
+		buffer.append("    <td>Accelerator</td>\n");
+		buffer.append("  </tr>\n");
+		Iterator<ActionInfo> actions = PluginsLocator.getActionInfoManager().getActions(); 
+		while (actions.hasNext()) {
+			ActionInfo action = actions.next();
+			if( previousPluginName!=null && !action.getPluginName().equals(previousPluginName) ) {
+				buffer
+					.append("  <tr>\n")
+					.append("    <td colspan=\"9\"><hr></td>\n")
+					.append("  </tr>\n");
+				previousPluginName = action.getPluginName();
+			}
+			buffer.append("  <tr valign=\"top\">\n");
+			buffer.append("    <td>")
+				.append(action.getPluginName())
+				.append("</td>\n");
+			buffer.append("    <td>")
+				.append(action.getExtensionName())
+				.append("</td>\n");
+			if( action.getName().startsWith("anonymous__") ) {
+				buffer.append("    <td title=\"Missing action name, asigned one by default\">")
+					.append(error_open)
+					.append(action.getName())
+					.append(error_close)
+					.append("</td>\n");
+			} else if( !action.getName().contains("-") ) {
+				buffer.append("    <td title=\"Name don't have recomended syntax\">")
+					.append(warning_open)
+					.append(action.getName())
+					.append(warning_close)
+					.append("</td>\n");
+			} else {
+				buffer.append("    <td>")
+					.append(action.getName())
+					.append("</td>\n");
+			}  
+			if( action.getPosition()<100000000 ) {
+				buffer.append("    <td title=\"Incorrect position\">")
+					.append(error_open)
+					.append(action.getPosition())
+					.append(error_close)
+					.append("</td>\n");
+			} else {
+				buffer.append("    <td>")
+					.append(action.getPosition())
+					.append("</td>\n");
+			}
+			if( action.getLabel()==null ) {
+				buffer.append("    <td title=\"Missing label of action\">")
+					.append(error_open)
+					.append("(missing)")
+					.append(error_close)
+					.append("</td>\n");
+			} else {
+				buffer.append("    <td>")
+					.append(action.getLabel())
+					.append("</td>\n");
+			}
+			if( action.getCommand()==null ) {
+				buffer.append("    <td title=\"Missing command of action\">")
+					.append(error_open)
+					.append(action.getCommand())
+					.append(error_close)
+					.append("</td>\n");
+				
+			} else if(!action.getCommand().contains("-") && !action.getCommand().equals(action.getName())) {
+				buffer.append("    <td title=\"Command don't have recomended syntax and differ fron action name\">")
+					.append(warning_open)
+					.append(action.getCommand())
+					.append(warning_close)
+					.append("</td>\n");
+				
+			} else if(!action.getCommand().contains("-") ) {
+				buffer.append("    <td title=\"Command don't have recomended syntax\">")
+					.append(warning_open)
+					.append(action.getCommand())
+					.append(warning_close)
+					.append("</td>\n");
+				
+			} else if(!action.getCommand().equals(action.getName())) {
+				buffer.append("    <td title=\"Command differ fron action name\">")
+					.append(warning_open)
+					.append(action.getCommand())
+					.append(warning_close)
+					.append("</td>\n");
+				
+			} else {
+				buffer.append("    <td>")
+					.append(action.getCommand())
+					.append("</td>\n");
+			}
+			if( action.getIconName()==null ) {
+				buffer.append("    <td title=\"Missing icon name\">")
+					.append(error_open)
+					.append("(missing)")
+					.append(error_close)
+					.append("</td>\n");
+			} else if( action.getIcon()==null ) {
+				buffer.append("    <td title=\"Missing icon\">")
+					.append(error_open)
+					.append(action.getIconName())
+					.append(error_close)
+					.append("</td>\n");
+			} else {
+				buffer.append("    <td>")
+					.append(action.getIconName())
+					.append("</td>\n");
+			}
+			if( action.getTooltip()==null ) {
+				buffer.append("    <td title=\"Missing tooltip\">")
+					.append(error_open)
+					.append(action.getTooltip())
+					.append(error_close)
+					.append("</td>\n");
+				
+			} else {
+				buffer.append("    <td>")
+					.append(action.getTooltip())
+					.append("</td>\n");
+			}
+			if( action.getAccelerator()!=null && action.getKeyStroke()==null ) {
+				buffer.append("    <td title=\"Incorrect syntax of the accelerator key\">")
+					.append(error_open)
+					.append(action.getAccelerator())
+					.append(error_close)
+					.append("</td>\n");
+				
+			} else {
+				buffer.append("    <td>")
+					.append(action.getAccelerator())
+					.append("</td>\n");
+			}
+			buffer.append("  </tr>\n");
+			
+		}
+		buffer.append("</table>\n");
+		buffer.append("</body>\n");
+		buffer.append("</html>\n");
+
+		return buffer.toString();
+	}
+
+
+}

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/develtools/ActionsInfoDevelTool.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/develtools/InfoPanel.java
===================================================================
--- branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/develtools/InfoPanel.java	(revision 0)
+++ branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/develtools/InfoPanel.java	(revision 38564)
@@ -0,0 +1,95 @@
+package org.gvsig.app.extension.develtools;
+
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+
+import javax.swing.BorderFactory;
+import javax.swing.Box;
+import javax.swing.BoxLayout;
+import javax.swing.JButton;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTextPane;
+
+import org.gvsig.app.ApplicationLocator;
+import org.gvsig.tools.swing.api.ToolsSwingLocator;
+import org.gvsig.tools.swing.api.windowmanager.WindowManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class InfoPanel extends JPanel {
+	private static Logger logger = LoggerFactory.getLogger(InfoPanel.class);
+
+
+	private static final long serialVersionUID = 7164653790859770568L;
+
+	private JButton accept = null;
+	private JButton copy = null;
+	private JTextPane text = null;
+
+	public static void showPanel(String title, WindowManager.MODE mode,
+			String html) {
+		JPanel panel = new InfoPanel(html);
+		WindowManager wm = ToolsSwingLocator.getWindowManager();
+		wm.showWindow(panel, title, mode);
+	}
+
+	public static void save2file(String name, String contents) {
+		File file;
+		try {
+			file = File.createTempFile("gvsig-" + name, ".html");
+			FileWriter fwriter = new FileWriter(file);
+			fwriter.append(contents);
+			fwriter.close();
+		} catch (IOException e) {
+			logger.warn("Can't save contents to temp file gvsig-" + name, e);
+		}
+	}
+	public InfoPanel(final String html) {
+		this.setLayout(new BorderLayout());
+		this.setPreferredSize(new Dimension(500, 300));
+		this.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4));
+
+		text = new JTextPane();
+		text.setContentType("text/html");
+		text.setEditable(false);
+		text.setText(html);
+		text.setCaretPosition(0);
+
+		JScrollPane scrollPane = new JScrollPane(text);
+		scrollPane.setPreferredSize(new Dimension(500, 220));
+
+		accept = new JButton("Accept");
+		accept.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent arg0) {
+				setVisible(false);
+			}
+		});
+		copy = new JButton("Copy to clipboard");
+		copy.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent arg0) {
+				ApplicationLocator.getManager().putInClipboard(
+						text.getText());
+			}
+		});
+
+		JPanel buttonsPanel = new JPanel();
+		buttonsPanel.setLayout(new BoxLayout(buttonsPanel,
+				BoxLayout.LINE_AXIS));
+		buttonsPanel.setBorder(BorderFactory.createEmptyBorder(2, 2, 2, 2));
+
+		buttonsPanel.add(Box.createHorizontalGlue());
+		buttonsPanel.add(copy);
+		buttonsPanel.add(accept);
+
+		this.add(scrollPane, BorderLayout.CENTER);
+		this.add(buttonsPanel, BorderLayout.SOUTH);
+		this.setVisible(true);
+	}
+
+}

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/develtools/InfoPanel.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/PaletteViewInfoExtension.java
===================================================================
--- branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/PaletteViewInfoExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/PaletteViewInfoExtension.java	(revision 38564)
@@ -64,12 +64,12 @@
 	 * @see org.gvsig.andami.plugins.IExtension#execute(java.lang.String)
 	 */
 	public void execute(String s) {
-		IWindow view = PluginServices.getMDIManager().getActiveWindow();
-        if (s.equals("PALETTE")){
+        if (s.equals("window-convert-to-tool")){
+    		IWindow view = PluginServices.getMDIManager().getActiveWindow();
         	IWindowTransform vt=(IWindowTransform)view;
         	vt.toPalette();
+            PluginServices.getMainFrame().enableControls();
         }
-        PluginServices.getMainFrame().enableControls();
 	}
 
 	/**
Index: branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/ProjectExtension.java
===================================================================
--- branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/ProjectExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/ProjectExtension.java	(revision 38564)
@@ -31,9 +31,7 @@
 
 import javax.swing.JOptionPane;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.Launcher;
 import org.gvsig.andami.Launcher.TerminationProcess;
 import org.gvsig.andami.PluginServices;
@@ -59,6 +57,8 @@
 import org.gvsig.utils.save.BeforeSavingListener;
 import org.gvsig.utils.save.SaveEvent;
 import org.gvsig.utils.swing.threads.IMonitorableTask;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Extension que proporciona controles para crear proyectos nuevos, abrirlos y
@@ -114,20 +114,11 @@
     }
 
     private void registerIcons() {
-        PluginServices.getIconTheme().registerDefault("project-new",
-            this.getClass().getClassLoader().getResource("images/new.png"));
-
-        PluginServices.getIconTheme().registerDefault("project-open",
-            this.getClass().getClassLoader().getResource("images/open.png"));
-
-        PluginServices.getIconTheme().registerDefault("project-save",
-            this.getClass().getClassLoader().getResource("images/save.png"));
-
-        PluginServices.getIconTheme().registerDefault("project-save-as",
-            this.getClass().getClassLoader().getResource("images/save.png"));
-
-        PluginServices.getIconTheme().registerDefault("application-exit",
-            this.getClass().getClassLoader().getResource("images/salir.png"));
+    	IconThemeHelper.registerIcon("action", "application-project-new", this);
+    	IconThemeHelper.registerIcon("action", "application-project-open", this);
+    	IconThemeHelper.registerIcon("action", "application-project-save", this);
+    	IconThemeHelper.registerIcon("action", "application-project-save-as", this);
+    	IconThemeHelper.registerIcon("action", "application-exit", this);
     }
 
     private void loadInitialProject() {
Index: branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/ViewSelectionControls.java
===================================================================
--- branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/ViewSelectionControls.java	(revision 38563)
+++ branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/ViewSelectionControls.java	(revision 38564)
@@ -95,6 +95,7 @@
  */
 package org.gvsig.app.extension;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.plugins.Extension;
 import org.gvsig.andami.ui.mdiManager.IWindow;
@@ -127,43 +128,30 @@
 	}
 
 	private void registerIcons(){
-
-		PluginServices.getIconTheme().registerDefault(
-				"view-select-geometry",
-				this.getClass().getClassLoader().getResource("images/Select.png")
-			);
-
-		PluginServices.getIconTheme().registerDefault(
-				"view-select-by-rectangle",
-				this.getClass().getClassLoader().getResource("images/SelEspacial2b.png")
-			);
-
-		PluginServices.getIconTheme().registerDefault(
-				"view-select-by-polygon",
-				this.getClass().getClassLoader().getResource("images/SelectByPolygon.png")
-			);
-
-		PluginServices.getIconTheme().registerDefault(
-				"view-select-invert",
-				this.getClass().getClassLoader().getResource("images/invertSelection.png")
-			);
+		IconThemeHelper.registerIcon("action", "selection-simple-select", this);
+		IconThemeHelper.registerIcon("action", "selection-select-by-rectangle", this);
+		IconThemeHelper.registerIcon("action", "selection-select-by-polygon", this);
+		IconThemeHelper.registerIcon("action", "selection-clear", this);
 	}
 
 	public void execute(String actionCommand) {
 		MapControl mapCtrl = vista.getMapControl();
 		logger.debug("Comand : " + actionCommand);
-		if (actionCommand.equals("SELRECT")) {
+		if (actionCommand.equalsIgnoreCase("selection-select-by-rectangle-view")) {
 			mapCtrl.setTool("rectSelection");
 			((AbstractDocument)vista.getModel()).setModified(true);
-		} else if (actionCommand.equals("SELPOINT")) {
+			
+		} else if (actionCommand.equalsIgnoreCase("selection-simple-select-view")) {
 			mapCtrl.setTool("pointSelection");
 			((AbstractDocument)vista.getModel()).setModified(true);
-		} else if (actionCommand.equals("SELPOL")) {
+			
+		} else if (actionCommand.equalsIgnoreCase("selection-select-by-polygon")) {
 			mapCtrl.setTool("polSelection");
 			((AbstractDocument)vista.getModel()).setModified(true);
+			
 		}
 	}
-
+	
 	public boolean isEnabled() {
 		ViewDocument model = vista.getModel();
 		MapContext mapa = model.getMapContext();
Index: branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/ApplicationManager.java
===================================================================
--- branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/ApplicationManager.java	(revision 38563)
+++ branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/ApplicationManager.java	(revision 38564)
@@ -32,7 +32,6 @@
 import org.cresques.cts.IProjection;
 
 import org.gvsig.about.AboutManager;
-import org.gvsig.andami.iconthemes.IconThemeManager;
 import org.gvsig.andami.ui.mdiManager.IWindow;
 import org.gvsig.andami.ui.mdiManager.MDIManager;
 import org.gvsig.app.extension.Version;
@@ -58,6 +57,7 @@
 import org.gvsig.tools.dynobject.DynObjectManager;
 import org.gvsig.tools.extensionpoint.ExtensionPointManager;
 import org.gvsig.tools.persistence.PersistenceManager;
+import org.gvsig.tools.swing.icontheme.IconThemeManager;
 
 
 public interface ApplicationManager {
Index: branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/gui/command/CommandStackDialog.java
===================================================================
--- branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/gui/command/CommandStackDialog.java	(revision 38563)
+++ branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/gui/command/CommandStackDialog.java	(revision 38564)
@@ -16,6 +16,7 @@
 import javax.swing.table.DefaultTableCellRenderer;
 import javax.swing.table.TableColumn;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.ui.mdiManager.IWindowListener;
 import org.gvsig.andami.ui.mdiManager.SingletonWindow;
@@ -46,12 +47,9 @@
 	private JScrollPane jScrollPane = null;
 	private JPanel tablePanel = null;
 	
-	private static final ImageIcon imodify = PluginServices.getIconTheme()
-		.get("edition-modify-command");
-	private static final ImageIcon iadd = PluginServices.getIconTheme()
-		.get("edition-add-command");
-	private static final ImageIcon idel = PluginServices.getIconTheme()
-		.get("edition-del-command");
+	private static final ImageIcon imodify = IconThemeHelper.getImageIcon("layout-tool-undo-redo-actions-modify"); 
+	private static final ImageIcon iadd = IconThemeHelper.getImageIcon("layout-tool-undo-redo-actions-add");
+	private static final ImageIcon idel = IconThemeHelper.getImageIcon("layout-tool-undo-redo-actions-delete");
 
 	private CommandTableModel commandTableModel = null;
 	/**
Index: branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/gui/panels/LinkPanel.java
===================================================================
--- branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/gui/panels/LinkPanel.java	(revision 38563)
+++ branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/gui/panels/LinkPanel.java	(revision 38564)
@@ -1,539 +0,0 @@
-/* gvSIG. Sistema de Informaci�n Geogr�fica de la Generalitat Valenciana
- *
- * Copyright (C) 2004 IVER T.I. and Generalitat Valenciana.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
- *
- * For more information, contact:
- *
- *  Generalitat Valenciana
- *   Conselleria d'Infraestructures i Transport
- *   Av. Blasco Ib��ez, 50
- *   46010 VALENCIA
- *   SPAIN
- *
- *      +34 963862235
- *   gvsig@gva.es
- *      www.gvsig.gva.es
- *
- *    or
- *
- *   IVER T.I. S.A
- *   Salamanca 50
- *   46005 Valencia
- *   Spain
- *
- *   +34 963163400
- *   dac@iver.es
- */
-package org.gvsig.app.gui.panels;
-
-import java.awt.BorderLayout;
-import java.awt.Dimension;
-import java.awt.Graphics2D;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.GridLayout;
-import java.awt.RenderingHints;
-import java.awt.event.ComponentEvent;
-import java.awt.event.ComponentListener;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Rectangle2D;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URL;
-
-import javax.swing.ImageIcon;
-import javax.swing.JButton;
-import javax.swing.JDialog;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTextPane;
-import javax.swing.event.HyperlinkEvent;
-
-import org.apache.batik.bridge.BridgeContext;
-import org.apache.batik.bridge.DocumentLoader;
-import org.apache.batik.bridge.GVTBuilder;
-import org.apache.batik.bridge.UserAgentAdapter;
-import org.apache.batik.bridge.ViewBox;
-import org.apache.batik.gvt.GraphicsNode;
-import org.apache.batik.gvt.renderer.StaticRenderer;
-import org.gvsig.andami.PluginServices;
-import org.gvsig.andami.messages.NotificationManager;
-import org.gvsig.andami.ui.mdiManager.IWindow;
-import org.gvsig.andami.ui.mdiManager.WindowInfo;
-import org.gvsig.app.project.documents.gui.PDFViewerWindow;
-import org.gvsig.app.project.documents.view.toolListeners.LinkListener;
-import org.gvsig.utils.BrowserControl;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.svg.SVGDocument;
-
-import com.sun.jimi.core.Jimi;
-
-
-/**
- * This class extends JPanel. This class implements a Panel to show the content of the URI
- * that the constructor of the class receives. The URI is interpreted according to the type
- * of the HyperLink. The allowed types are Text, WWW, image (jpg,gif,tiff,bmp,ico), PDF
- * documents and SVG images. Implements listener to resize the component that contains the
- * text when resize the window.
- *
- * @author Vicente Caballero Navarro
- *
- */
-public class LinkPanel extends JPanel implements IWindow, ComponentListener {
-    private static final Logger logger = LoggerFactory
-            .getLogger(LinkPanel.class);
-    
-	private JPanel jPane = null;
-	private JScrollPane jScrollPane = null;
-//	private JEditorPane jEditorPane1 = null;
-	private JPanel jPanel = null; //  @jve:decl-index=0:visual-constraint="220,10"
-	private URI uri=null;
-	private int type=LinkListener.TYPELINKIMAGE;
-	private JPanel jPanel1Izq = null;
-	private JPanel jPanel1Der = null;
-	private JLabel jLabelUri = null;
-	private JButton jButtonCerrar = null;
-	private JScrollPane scroll=null;
-	private int alto;
-	private int ancho;
-	private WindowInfo m_ViewInfo;
-	private JTextPane textPane;
-	private Element elt;
-    private GVTBuilder gvtBuilder = new GVTBuilder();
-    private GraphicsNode gvtRoot = null;
-    private BridgeContext ctx = null;
-    private StaticRenderer renderer = new StaticRenderer();
-    protected static RenderingHints defaultRenderingHints;
-    static {
-        defaultRenderingHints = new RenderingHints(null);
-        defaultRenderingHints.put(RenderingHints.KEY_ANTIALIASING,
-            RenderingHints.VALUE_ANTIALIAS_ON);
-
-        defaultRenderingHints.put(RenderingHints.KEY_INTERPOLATION,
-            RenderingHints.VALUE_INTERPOLATION_BILINEAR);
-    }
-	/**
-	 * This is the default constructor. Needs the URI with the information of the HyperLink
-	 * and the type of the HyperLink
-	 */
-	public LinkPanel(URI Uri, int t){
-		super();
-		type=t;
-		uri=Uri;
-		addComponentListener(this);
-		initialize();
-	}
-
-	/**
-	 * This method initializes this
-	 */
-	private void initialize() {
-		this.setLayout(new BorderLayout());
-		this.setSize(600, 450);
-		alto=this.getHeight()-100;
-		ancho=this.getWidth()-100;
-		this.add(getJScrollPane(), java.awt.BorderLayout.CENTER);
-		this.add(getJPanel(), java.awt.BorderLayout.SOUTH);
-	}
-
-
-	/**
-	 * This method initializes jScrollPane
-	 *
-	 * @return javax.swing.JScrollPane
-	 */
-	private JScrollPane getJScrollPane() {
-		if (jScrollPane == null) {
-			jScrollPane = new JScrollPane();
-			jScrollPane.setPreferredSize(new java.awt.Dimension(300, 400));
-			jScrollPane.setViewportView(getJPane());
-		}
-		return jScrollPane;
-	}
-
-	/**
-	 * This method initializes jEditorPane1. Check the type of the HyperLink and analize the
-	 * URI. According to the type, adds to the panel the necessary components to show the
-	 * content of the URI. If the type is "0" (text/WWW) adds a ScrollPane with the text.
-	 * If the type "1" (smages) adds a ImageIcon with a label. If the type is "2" uses the
-	 * library "JPedal" to open PDF documents and if the type is "3" implements some methods
-	 * to open SVG images
-	 *
-	 * @return javax.swing.JEditorPane
-	 */
-	private JPanel getJPane() {
-
-		if (jPane == null) {
-			jPane=new JPanel();
-			System.out.println(type);
-
-			//Enlazar a documento de texto o WWW
-			if (type==1){
-				textPane = new JTextPane();
-
-				scroll = new JScrollPane(textPane);
-				scroll.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_ALWAYS );
-		        scroll.setPreferredSize(new Dimension(ancho-100,alto-100));
-		        scroll.setMinimumSize(new Dimension(ancho-100,alto-100));
-		        textPane.setEditable(false);
-
-				if(uri==null) {
-					System.out.println("NULO");
-				}
-				if (uri != null) {
-					URL url=null;
-					try {
-						url=uri.normalize().toURL();
-					} catch (MalformedURLException e1) {
-						NotificationManager.addError(e1);
-					}
-					try {
-
-						textPane.setPage(url);
-						textPane.addHyperlinkListener(new javax.swing.event.HyperlinkListener() {
-							public void hyperlinkUpdate(javax.swing.event.HyperlinkEvent e) {
-								if (e.getEventType() == HyperlinkEvent.EventType.ACTIVATED) {
-									System.out.println("hyperlinkUpdate()");
-									BrowserControl.displayURL(e.getURL().toString());
-
-									}
-								}
-							});
-					} catch (IOException e) {
-						System.err.println("Attempted to read a bad URL: " +
-						uri);
-					}
-					jPane.add(scroll);
-				} else {
-					System.err.println("Couldn't find file.");
-				}
-			}
-			//Enlazar a archivo de Im�gen
-			else if (type==0){
-
-				ImageIcon image = null;
-				String iString=uri.toString();
-				iString=iString.toLowerCase();
-				if (uri == null){
-					System.out.println("Uri creada incorrectamente");
-					return null;}
-
-				if (iString.endsWith("jpg") || iString.endsWith("jpeg") ||
-		                iString.endsWith("gif")) {
-		            try {
-						image = new ImageIcon(Jimi.getImage(uri.toURL()));
-					} catch (MalformedURLException e) {
-						e.printStackTrace();
-					}
-		        } else
-		        	if (iString.endsWith("png") || iString.endsWith("tiff") ||
-		                iString.endsWith("ico") || iString.endsWith("xpm")) {
-		            try {
-						image = new ImageIcon(Jimi.getImage(uri.toURL()));
-					} catch (MalformedURLException e) {
-						e.printStackTrace();
-					}
-
-		        }else {
-		        	try {
-						image=new ImageIcon(uri.toURL());
-					} catch (MalformedURLException e) {
-						e.printStackTrace();
-					}
-		        }
-				if (image==null) {
-					return null;
-				}
-
-				JLabel label = new JLabel(image);
-				jPane.add(label);
-
-				jPane.setVisible(true);
-			}
-
-			//Tipo 2: Enlazar a documentos PDF
-			else if (type==2){
-
-				String aux=null;
-				try {
-					aux = uri.normalize().toURL().toString();
-				} catch (MalformedURLException e) {
-					e.printStackTrace();
-				}
-				aux=aux.replaceFirst("file:/","");
-				System.out.println(aux);
-				PDFViewerWindow pdf =new PDFViewerWindow(aux);
-				jPane.add(pdf);
-				jPane.setVisible(true);
-			}
-
-			//Tipo 3: Enlazar a im�genes SDV
-			else if (type==3){
-				String iString=uri.toString();
-				iString=iString.toLowerCase();
-				if (uri == null){
-					System.out.println("Uri creada incorrectamente");
-					return null;}
-				File file=new File(uri);
-				iString=uri.toString().replaceFirst("file:/","");
-				if (iString.endsWith("svg")){
-					paintSVGToPanel(file);
-				}
-			}
-		}
-		return jPane;
-	 }
-
-	/**
-	 * Allows paint SVG images in the panel.
-	 *
-	 * @param file, this file has been extracted from the URI
-	 */
-	private void paintSVGToPanel(File file) {
-		BufferedImage image = new BufferedImage(this.getWidth(), this.getHeight(),
-				BufferedImage.TYPE_INT_ARGB);
-	    Graphics2D g = image.createGraphics();
-		Rectangle2D rect = new Rectangle2D.Double();
-		rect.setFrame(0,0,this.getWidth(),this.getHeight());
-		obtainStaticRenderer(file);
-		drawSVG(g,rect, null);
-		jPane.setVisible(true);
-		ImageIcon icon=new ImageIcon(image);
-		JLabel label = new JLabel(icon);
-		jPane.add(label);
-	}
-
-	/**
-	 * Render the image to add to the panel.
-	 * @param file, this file has been extracted from the URI
-	 */
-	private void obtainStaticRenderer(File file) {
-        try {
-            UserAgentAdapter userAgent = new UserAgentAdapter();
-            DocumentLoader loader = new DocumentLoader(userAgent);
-            ctx = new BridgeContext(userAgent, loader);
-            Document svgDoc = loader.loadDocument(file.toURI().toString());
-            gvtRoot = gvtBuilder.build(ctx, svgDoc);
-            renderer.setTree(gvtRoot);
-            elt = ((SVGDocument) svgDoc).getRootElement();
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-    }
-
-	 /**
-	 * Draw SVG in the Graphics that receives like parameter.
-     *
-     * @param g Graphics
-     * @param rect Rectangle that fills the Graphic.
-     * @param rv Rectangle. This forms the visible part in the Layout
-     */
-    private void drawSVG(Graphics2D g, Rectangle2D rect, Rectangle2D rv) {
-        if ((rv == null) || rv.contains(rect)) {
-            AffineTransform ataux = new AffineTransform();
-
-            ataux.translate(rect.getX(), rect.getY());
-            try {
-                ataux.concatenate(ViewBox.getViewTransform(null, elt,
-                        (float) rect.getWidth(), (float) rect.getHeight(), ctx));
-                gvtRoot.setTransform(ataux);
-
-            } catch (Exception e) {
-                // TODO: handle exception
-            }
-        } else {
-            AffineTransform ataux = new AffineTransform();
-
-            ataux.translate(rect.getX(), rect.getY());
-            ataux.concatenate(ViewBox.getViewTransform(null, elt,
-                    (float) rect.getWidth(), (float) rect.getHeight(), ctx));
-
-            gvtRoot.setTransform(ataux);
-        }
-
-        RenderingHints renderingHints = defaultRenderingHints;
-        g.setRenderingHints(renderingHints);
-
-        if (gvtRoot != null) {
-            gvtRoot.paint(g);
-        }
-    }
-
-	/**
-	 * This method initializes jPanel
-	 *
-	 * @return javax.swing.JPanel
-	 */
-	private JPanel getJPanel() {
-		if (jPanel == null) {
-			//JLabel name = new JLabel();
-			GridLayout gridLayout = new GridLayout();
-			gridLayout.setRows(1);
-			jPanel = new JPanel();
-			jPanel.setLayout(gridLayout);
-			jPanel.setPreferredSize(new java.awt.Dimension(10, 50));
-			jPanel.setSize(411, 50);
-			jPanel.add(getJPanel1Izq(), null);
-			jPanel.add(getJPanel1Der(), null);
-			String auxext="";
-		}
-
-		return jPanel;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.iver.mdiApp.ui.MDIManager.View#getViewInfo()
-	 */
-	public WindowInfo getWindowInfo() {
-		m_ViewInfo = new WindowInfo(WindowInfo.RESIZABLE | WindowInfo.MAXIMIZABLE | WindowInfo.ICONIFIABLE);
-		m_ViewInfo.setTitle(PluginServices.getText(this,"Hiperenlace"));
-
-		return m_ViewInfo;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.iver.mdiApp.ui.MDIManager.View#viewActivated()
-	 */
-	public void viewActivated() {
-		// TODO Auto-generated method stub
-	}
-
-	/**
-	 * This method initializes jPanel1Izq
-	 *
-	 * @return javax.swing.JPanel
-	 */
-	private JPanel getJPanel1Izq() {
-		if (jPanel1Izq == null) {
-			GridBagConstraints gridBagConstraints = new GridBagConstraints();
-			gridBagConstraints.gridx = 0;
-			gridBagConstraints.gridy = 0;
-			jLabelUri = new JLabel();
-			jLabelUri.setText(uri.toString());
-			jLabelUri.setPreferredSize(new java.awt.Dimension(172,17));
-			jPanel1Izq = new JPanel();
-			jPanel1Izq.setLayout(new GridBagLayout());
-			jPanel1Izq.setPreferredSize(new java.awt.Dimension(10,10));
-			jPanel1Izq.setAlignmentX(0.5F);
-			jPanel1Izq.add(jLabelUri, gridBagConstraints);
-		}
-		return jPanel1Izq;
-	}
-
-	/**
-	 * This method initializes jPanel1Der
-	 *
-	 * @return javax.swing.JPanel
-	 */
-	private JPanel getJPanel1Der() {
-		if (jPanel1Der == null) {
-			GridBagConstraints gridBagConstraints1 = new GridBagConstraints();
-			gridBagConstraints1.gridx = 0;
-			gridBagConstraints1.gridy = 0;
-			jPanel1Der = new JPanel();
-			jPanel1Der.setLayout(new GridBagLayout());
-			jPanel1Der.add(getJButtonCerrar(), gridBagConstraints1);
-		}
-		return jPanel1Der;
-	}
-
-	/**
-	 * Initializes jButtonCerrar, and implements the Listener to close the window
-	 *
-	 * @return javax.swing.JButton
-	 */
-	private JButton getJButtonCerrar() {
-		if (jButtonCerrar == null) {
-			jButtonCerrar = new JButton();
-			jButtonCerrar.setPreferredSize(new java.awt.Dimension(94,25));
-			jButtonCerrar.setText(PluginServices.getText(this,"Cerrar"));
-			jButtonCerrar.addActionListener(new java.awt.event.ActionListener() {
-				public void actionPerformed(java.awt.event.ActionEvent e) {
-					System.out.println("actionPerformed()"); // TODO Auto-generated Event stub actionPerformed()
-
-					if (PluginServices.getMainFrame() != null) {
-						PluginServices.getMDIManager().closeWindow(LinkPanel.this);
-					} else {
-						((JDialog) (getParent().getParent().getParent()
-										.getParent())).dispose();
-					}
-				}
-			});
-
-		}
-		return jButtonCerrar;
-	}
-	/**
-	 * Resizes the scroll that contains the text when the window changes its own size
-	 */
-	private void redimensionarScroll(){
-		Dimension currentSize = getSize();
-		scroll.setPreferredSize(new Dimension(currentSize.width-100,currentSize.height-100));
-        scroll.setMinimumSize(new Dimension(currentSize.width-100,currentSize.height-100));
-		scroll.updateUI();
-		System.out.println(scroll.getSize().toString());
-	}
-
-	/**
-	 * Invoked when the frame�s size changes
-	 */
-	public void componentResized(ComponentEvent e) {
-		if(type==1) {
-			redimensionarScroll();
-		}
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see java.awt.event.ComponentListener#componentMoved(java.awt.event.ComponentEvent)
-	 */
-	public void componentMoved(ComponentEvent e) {
-		// TODO Auto-generated method stub
-
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see java.awt.event.ComponentListener#componentShown(java.awt.event.ComponentEvent)
-	 */
-	public void componentShown(ComponentEvent e) {
-		// TODO Auto-generated method stub
-
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see java.awt.event.ComponentListener#componentHidden(java.awt.event.ComponentEvent)
-	 */
-	public void componentHidden(ComponentEvent e) {
-		// TODO Auto-generated method stub
-
-	}
-
-	public Object getWindowProfile() {
-		return WindowInfo.TOOL_PROFILE;
-	}
-}
Index: branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/imp/DefaultAppgvSIGManager.java
===================================================================
--- branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/imp/DefaultAppgvSIGManager.java	(revision 38563)
+++ branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/imp/DefaultAppgvSIGManager.java	(revision 38564)
@@ -37,14 +37,10 @@
 import javax.swing.JOptionPane;
 
 import org.cresques.cts.IProjection;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import org.gvsig.about.AboutLocator;
 import org.gvsig.about.AboutManager;
 import org.gvsig.andami.Launcher;
 import org.gvsig.andami.PluginServices;
-import org.gvsig.andami.iconthemes.IconThemeManager;
 import org.gvsig.andami.ui.mdiManager.IWindow;
 import org.gvsig.andami.ui.mdiManager.MDIManager;
 import org.gvsig.app.ApplicationManager;
@@ -81,6 +77,10 @@
 import org.gvsig.tools.extensionpoint.ExtensionPoint.Extension;
 import org.gvsig.tools.extensionpoint.ExtensionPointManager;
 import org.gvsig.tools.persistence.PersistenceManager;
+import org.gvsig.tools.swing.api.ToolsSwingLocator;
+import org.gvsig.tools.swing.icontheme.IconThemeManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 
@@ -316,7 +316,7 @@
 	}
 
 	public IconThemeManager getIconThemeManager() {
-		return IconThemeManager.getIconThemeManager();
+		return ToolsSwingLocator.getIconThemeManager();
 	}
 
 	public String getArgument(String name) {
Index: branches/v2_0_0_prep/applications/appgvSIG/resources/images/layer/layer-icon-postgresql.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/resources/images/layer/layer-icon-postgresql.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/applications/appgvSIG/resources/images/layer/layer-icon-mysql.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/resources/images/layer/layer-icon-mysql.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/applications/appgvSIG/resources/images/layer/layer-icon-dgn.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/resources/images/layer/layer-icon-dgn.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/applications/appgvSIG/resources/images/layer/layer-icon-vectorial.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/resources/images/layer/layer-icon-vectorial.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/applications/appgvSIG/resources/images/layer/layer-icon-group.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/resources/images/layer/layer-icon-group.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/applications/appgvSIG/resources/images/layer/layer-icon-dxf.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/resources/images/layer/layer-icon-dxf.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/applications/appgvSIG/resources/images/layer/layer-icon-jdbc.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/resources/images/layer/layer-icon-jdbc.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/applications/appgvSIG/resources/images/layer/layer-icon.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/resources/images/layer/layer-icon.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/application-project-save.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/application-project-save.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/layer-info-by-point.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/layer-info-by-point.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/application-project-save-as.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/application-project-save-as.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/view-query-distance.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/view-query-distance.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/view-navigation-frame-manager.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/view-navigation-frame-manager.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/edit-select-all.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/edit-select-all.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/selection-clear.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/selection-clear.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/view-layer-add.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/view-layer-add.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/application-exit.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/application-exit.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/view-navigation-zoom-in-center.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/view-navigation-zoom-in-center.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/selection-select-by-rectangle.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/selection-select-by-rectangle.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/edit-find-replace.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/edit-find-replace.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/view-navigation-zoom-in-topoint.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/view-navigation-zoom-in-topoint.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/view-navigation-zoom-out-topoint.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/view-navigation-zoom-out-topoint.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/edit-undo.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/edit-undo.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/selection-simple-select.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/selection-simple-select.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/view-navigation-zoom-to-selection.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/view-navigation-zoom-to-selection.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/edit-copy.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/edit-copy.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/application-project-new.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/application-project-new.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/layer-filter.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/layer-filter.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/selection-select-by-polygon.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/selection-select-by-polygon.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/edit-find.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/edit-find.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/application-project-open.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/application-project-open.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/document-print.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/document-print.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/edit-clear.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/edit-clear.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/edit-redo.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/edit-redo.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/view-navigation-zoom-out-center.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/view-navigation-zoom-out-center.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/edit-undo-redo-actions.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/edit-undo-redo-actions.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/edit-cut.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/edit-cut.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/view-navigation-pan.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/view-navigation-pan.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/view-query-area.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/view-query-area.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/edit-delete.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/edit-delete.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/view-navigation-zoom-back.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/view-navigation-zoom-back.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/selection-reverse.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/selection-reverse.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/view-navigation-zoom-all.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/view-navigation-zoom-all.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/edit-paste.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/resources/images/action/edit-paste.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/applications/appgvSIG/resources/images/cursor/cursor-crux.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/resources/images/cursor/cursor-crux.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/applications/appgvSIG/resources/images/cursor/cursor-zoom-in.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/resources/images/cursor/cursor-zoom-in.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/applications/appgvSIG/resources/images/cursor/cursor-zoom-out.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/resources/images/cursor/cursor-zoom-out.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/applications/appgvSIG/resources/images/cursor/cursor-info-by-point.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/resources/images/cursor/cursor-info-by-point.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/applications/appgvSIG/resources/images/cursor/cursor-query-area.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/resources/images/cursor/cursor-query-area.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/applications/appgvSIG/resources/images/cursor/cursor-select-by-polygon.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/resources/images/cursor/cursor-select-by-polygon.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/applications/appgvSIG/resources/images/cursor/cursor-query-distance.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/resources/images/cursor/cursor-query-distance.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/applications/appgvSIG/resources/images/cursor/cursor-pan.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/resources/images/cursor/cursor-pan.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/applications/appgvSIG/resources/images/cursor/cursor-select-by-point.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/resources/images/cursor/cursor-select-by-point.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/applications/appgvSIG/resources/images/document/document-view-icon.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/resources/images/document/document-view-icon.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/applications/appgvSIG/resources/images/document/document-view-icon-sel.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/resources/images/document/document-view-icon-sel.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/applications/appgvSIG/resources/images/toolbar-go/go-first.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/resources/images/toolbar-go/go-first.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/applications/appgvSIG/resources/images/toolbar-go/go-previous-fast.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/resources/images/toolbar-go/go-previous-fast.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/applications/appgvSIG/resources/images/toolbar-go/go-next-fast.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/resources/images/toolbar-go/go-next-fast.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/applications/appgvSIG/resources/images/toolbar-go/go-previous.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/resources/images/toolbar-go/go-previous.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/applications/appgvSIG/resources/images/toolbar-go/go-next.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/resources/images/toolbar-go/go-next.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/applications/appgvSIG/resources/images/toolbar-go/go-last.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/resources/images/toolbar-go/go-last.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/applications/appgvSIG/resources/images/legend/legend-overview-single-symbol.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/resources/images/legend/legend-overview-single-symbol.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/applications/appgvSIG/resources/images/legend/legend-overview-vectorial-unique-value.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/resources/images/legend/legend-overview-vectorial-unique-value.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/applications/appgvSIG/resources/images/legend/legend-overview-vectorial-interval.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/applications/appgvSIG/resources/images/legend/legend-overview-vectorial-interval.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/libraries/libUIComponent/src/org/gvsig/gui/beans/controls/label/Label.java
===================================================================
--- branches/v2_0_0_prep/libraries/libUIComponent/src/org/gvsig/gui/beans/controls/label/Label.java	(revision 38563)
+++ branches/v2_0_0_prep/libraries/libUIComponent/src/org/gvsig/gui/beans/controls/label/Label.java	(revision 38564)
@@ -82,4 +82,7 @@
 		}
 	}
 
+	public Object getValue() {
+		return null;
+	}
 }
Index: branches/v2_0_0_prep/libraries/libUIComponent/src/org/gvsig/gui/beans/controls/comboscale/ComboScale.java
===================================================================
--- branches/v2_0_0_prep/libraries/libUIComponent/src/org/gvsig/gui/beans/controls/comboscale/ComboScale.java	(revision 38563)
+++ branches/v2_0_0_prep/libraries/libUIComponent/src/org/gvsig/gui/beans/controls/comboscale/ComboScale.java	(revision 38564)
@@ -54,6 +54,8 @@
 
     static private int eventId = Integer.MIN_VALUE;
 
+    private Long lastValue = null;
+    
     // jaume
     private class ComboScaleItem {
 
@@ -155,6 +157,10 @@
         }
         return jComboBox;
     }
+    
+	public Object getValue() {
+		return lastValue;
+	}
 
     public void setItems(long[] items) {
         ComboScaleItem[] scales = new ComboScaleItem[items.length];
@@ -216,11 +222,11 @@
         if (!bDoCallListeners)
             return;
 
+        lastValue = new Long(scale);
         Iterator<ActionListener> acIterator = actionCommandListeners.iterator();
         while (acIterator.hasNext()) {
             ActionListener listener = acIterator.next();
-            listener.actionPerformed(new ActionEvent(this, eventId,
-                "CHANGE_SCALE_" + scale));
+            listener.actionPerformed(new ActionEvent(this, eventId,"view-change-scale"));
         }
         eventId++;
     }
Index: branches/v2_0_0_prep/libraries/libUIComponent/src/org/gvsig/gui/beans/controls/IControl.java
===================================================================
--- branches/v2_0_0_prep/libraries/libUIComponent/src/org/gvsig/gui/beans/controls/IControl.java	(revision 38563)
+++ branches/v2_0_0_prep/libraries/libUIComponent/src/org/gvsig/gui/beans/controls/IControl.java	(revision 38564)
@@ -73,6 +73,8 @@
 	 */
 	public Object setValue(Object value);
 
+	public Object getValue();
+
 	/**
 	 * Gets the name of the control, used to identify it
 	 * @return the name of the control
@@ -86,4 +88,5 @@
 	 * @return
 	 */
 	public void setName(String name);
+	
 }
Index: branches/v2_0_0_prep/libraries/libUIComponent/src/org/gvsig/gui/beans/controls/combobutton/ComboButton.java
===================================================================
--- branches/v2_0_0_prep/libraries/libUIComponent/src/org/gvsig/gui/beans/controls/combobutton/ComboButton.java	(revision 38563)
+++ branches/v2_0_0_prep/libraries/libUIComponent/src/org/gvsig/gui/beans/controls/combobutton/ComboButton.java	(revision 38564)
@@ -362,4 +362,8 @@
 	public void setAlwaysMenuOnClick(boolean alwaysMenuOnClick) {
 		this.alwaysMenuOnClick = alwaysMenuOnClick;
 	}
+	
+	public Object getValue() {
+		return null;
+	}
 }
\ No newline at end of file
Index: branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/dal/feature/swing/FeatureSelectionModel.java
===================================================================
--- branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/dal/feature/swing/FeatureSelectionModel.java	(revision 38563)
+++ branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/dal/feature/swing/FeatureSelectionModel.java	(revision 38564)
@@ -31,9 +31,6 @@
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import org.gvsig.fmap.dal.exception.DataException;
 import org.gvsig.fmap.dal.feature.Feature;
 import org.gvsig.fmap.dal.feature.FeatureSelection;
@@ -43,6 +40,8 @@
 import org.gvsig.fmap.mapcontrol.dal.feature.swing.table.FeatureTableModel;
 import org.gvsig.tools.observer.Observable;
 import org.gvsig.tools.observer.Observer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @author 2010- C�sar Ordi�ana - gvSIG team
Index: branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/dal/feature/swing/table/TextAreaCellEditor.java
===================================================================
--- branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/dal/feature/swing/table/TextAreaCellEditor.java	(revision 38563)
+++ branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/dal/feature/swing/table/TextAreaCellEditor.java	(revision 38564)
@@ -26,7 +26,10 @@
  */
 package org.gvsig.fmap.mapcontrol.dal.feature.swing.table;
 
-import javax.swing.*;
+import javax.swing.DefaultCellEditor;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+import javax.swing.JTextField;
 
 /**
  * <p>
Index: branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/dal/feature/swing/table/GeometryWKTCellEditor.java
===================================================================
--- branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/dal/feature/swing/table/GeometryWKTCellEditor.java	(revision 38563)
+++ branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/dal/feature/swing/table/GeometryWKTCellEditor.java	(revision 38564)
@@ -36,9 +36,9 @@
 import javax.swing.JTable;
 
 import org.gvsig.fmap.geom.Geometry;
+import org.gvsig.fmap.geom.Geometry.SUBTYPES;
 import org.gvsig.fmap.geom.GeometryLocator;
 import org.gvsig.fmap.geom.GeometryManager;
-import org.gvsig.fmap.geom.Geometry.SUBTYPES;
 import org.gvsig.fmap.geom.exception.CreateGeometryException;
 import org.gvsig.fmap.geom.operation.fromwkt.FromWKT;
 import org.gvsig.fmap.geom.operation.fromwkt.FromWKTGeometryOperationContext;
Index: branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/dal/feature/swing/FeatureTypesTablePanel.java
===================================================================
--- branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/dal/feature/swing/FeatureTypesTablePanel.java	(revision 38563)
+++ branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/dal/feature/swing/FeatureTypesTablePanel.java	(revision 38564)
@@ -27,9 +27,6 @@
 import javax.swing.JPanel;
 import javax.swing.JSplitPane;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import org.gvsig.fmap.dal.exception.DataException;
 import org.gvsig.fmap.dal.feature.Feature;
 import org.gvsig.fmap.dal.feature.FeatureQuery;
@@ -40,6 +37,8 @@
 import org.gvsig.fmap.mapcontrol.dal.feature.swing.table.FeatureTypeList;
 import org.gvsig.fmap.mapcontrol.dal.feature.swing.table.SelectedFeatureTypeChangeListener;
 import org.gvsig.tools.exception.BaseException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Panel to show a table of Features. It is able to take into account the
Index: branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/dal/swing/datastore/DefaultDataStoreParametersCreationPanel.java
===================================================================
--- branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/dal/swing/datastore/DefaultDataStoreParametersCreationPanel.java	(revision 38563)
+++ branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/dal/swing/datastore/DefaultDataStoreParametersCreationPanel.java	(revision 38564)
@@ -33,9 +33,6 @@
 import javax.swing.JButton;
 import javax.swing.JComboBox;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import org.gvsig.fmap.dal.DALLocator;
 import org.gvsig.fmap.dal.DataManager;
 import org.gvsig.fmap.dal.DataServerExplorer;
@@ -46,6 +43,8 @@
 import org.gvsig.fmap.dal.exception.ValidateDataParametersException;
 import org.gvsig.fmap.mapcontrol.swing.dynobject.DynObjectEditor;
 import org.gvsig.tools.service.ServiceException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 /**
Index: branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/snapping/GeometriesSnappingVisitor.java
===================================================================
--- branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/snapping/GeometriesSnappingVisitor.java	(revision 38563)
+++ branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/snapping/GeometriesSnappingVisitor.java	(revision 38564)
@@ -4,7 +4,6 @@
 import java.util.ArrayList;
 
 import org.gvsig.fmap.geom.operation.tojts.ToJTS;
-import org.gvsig.fmap.mapcontrol.tools.snapping.snappers.ISnapperGeometriesVectorial;
 import org.gvsig.fmap.mapcontrol.tools.snapping.snappers.ISnapperVectorial;
 
 import com.vividsolutions.jts.geom.Coordinate;
Index: branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/AreaListenerImpl.java
===================================================================
--- branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/AreaListenerImpl.java	(revision 38563)
+++ branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/AreaListenerImpl.java	(revision 38564)
@@ -40,22 +40,22 @@
  */
 package org.gvsig.fmap.mapcontrol.tools;
 
-import java.awt.Cursor;
 import java.awt.Image;
 import java.awt.Point;
-import java.awt.Toolkit;
 import java.awt.geom.Point2D;
 
-import javax.swing.ImageIcon;
-
 import org.cresques.cts.IProjection;
+import org.gvsig.fmap.IconThemeHelper;
 import org.gvsig.fmap.crs.CRSFactory;
+import org.gvsig.fmap.geom.primitive.GeneralPathX;
 import org.gvsig.fmap.mapcontext.MapContext;
 import org.gvsig.fmap.mapcontext.ViewPort;
 import org.gvsig.fmap.mapcontrol.MapControl;
 import org.gvsig.fmap.mapcontrol.tools.Events.MeasureEvent;
 import org.gvsig.fmap.mapcontrol.tools.Listeners.PolylineListener;
 import org.gvsig.fmap.mapcontrol.tools.geo.Geo;
+import org.gvsig.tools.swing.api.ToolsSwingLocator;
+import org.gvsig.tools.swing.icontheme.IconThemeManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -77,8 +77,7 @@
 	/**
 	 * The image to display when the cursor is active.
 	 */
-	private final Image iarea = new ImageIcon(MapControl.class.getClassLoader().getResource(
-				"org/gvsig/fmap/mapcontrol/images/AreaCursor.gif")).getImage();
+//	private final Image iarea = PluginServices.getIconTheme().get("cursor-query-area").getImage();
 	
 	/**
 	 * Reference to the <code>MapControl</code> object that uses.
@@ -258,7 +257,7 @@
 	 * @see com.iver.cit.gvsig.fmap.tools.Listeners.ToolListener#getImageCursor()
 	 */
 	public Image getImageCursor() {
-		return iarea;
+		return IconThemeHelper.getImage("cursor-query-area");
 	}
 
 	/*
Index: branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/PolygonSelectionListener.java
===================================================================
--- branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/PolygonSelectionListener.java	(revision 38563)
+++ branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/PolygonSelectionListener.java	(revision 38564)
@@ -42,17 +42,15 @@
 
 import java.awt.Image;
 
-import javax.swing.ImageIcon;
-
+import org.gvsig.fmap.IconThemeHelper;
 import org.gvsig.fmap.dal.exception.DataException;
 import org.gvsig.fmap.dal.feature.FeatureSelection;
 import org.gvsig.fmap.dal.feature.FeatureSet;
 import org.gvsig.fmap.dal.feature.exception.CreateGeometryException;
-import org.gvsig.fmap.geom.Geometry;
-import org.gvsig.fmap.geom.GeometryLocator;
-import org.gvsig.fmap.geom.GeometryManager;
 import org.gvsig.fmap.geom.Geometry.SUBTYPES;
 import org.gvsig.fmap.geom.Geometry.TYPES;
+import org.gvsig.fmap.geom.GeometryLocator;
+import org.gvsig.fmap.geom.GeometryManager;
 import org.gvsig.fmap.geom.primitive.GeneralPathX;
 import org.gvsig.fmap.geom.primitive.Surface;
 import org.gvsig.fmap.mapcontext.layers.FLayer;
@@ -78,8 +76,7 @@
 	/**
 	 * The image to display when the cursor is active.
 	 */
-	private final Image img = new ImageIcon(MapControl.class.getClassLoader().getResource(
-				"org/gvsig/fmap/mapcontrol/images/PoligonCursor.png")).getImage();
+//	private final Image img = PluginServices.getIconTheme().get("cursor-select-by-polygon").getImage();
 	
 	/**
 	 * The cursor used to work with this tool listener.
@@ -102,7 +99,7 @@
 	 * @see com.iver.cit.gvsig.fmap.tools.Listeners.ToolListener#getImageCursor()
 	 */
 	public Image getImageCursor() {
-		return img;
+		return IconThemeHelper.getImage("cursor-select-by-polygon");
 	}
 
 	/*
Index: branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/ZoomInListenerImpl.java
===================================================================
--- branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/ZoomInListenerImpl.java	(revision 38563)
+++ branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/ZoomInListenerImpl.java	(revision 38564)
@@ -42,13 +42,8 @@
 
 import java.awt.Image;
 import java.awt.geom.Rectangle2D;
-import java.net.URL;
 
-import javax.swing.ImageIcon;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
+import org.gvsig.fmap.IconThemeHelper;
 import org.gvsig.fmap.geom.Geometry.SUBTYPES;
 import org.gvsig.fmap.geom.GeometryLocator;
 import org.gvsig.fmap.geom.GeometryManager;
@@ -59,6 +54,8 @@
 import org.gvsig.fmap.mapcontrol.MapControl;
 import org.gvsig.fmap.mapcontrol.tools.Events.EnvelopeEvent;
 import org.gvsig.fmap.mapcontrol.tools.Listeners.RectangleListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 
@@ -101,7 +98,7 @@
 	/**
 	 * The image to display when the cursor is active.
 	 */
-	private final Image izoomin;
+//	private final Image izoomin;
 
 	/**
 	 * Reference to the <code>MapControl</code> object that uses.
@@ -113,13 +110,7 @@
      * 
      */
     public ZoomInListenerImpl() {
-        URL res = MapControl.class.getClassLoader().getResource("org/gvsig/fmap/mapcontrol/images/ZoomInCursor.gif");
-        if( res == null ) {
-            this.izoomin = new ImageIcon().getImage();
-            logger.error("Can't load icon 'org/gvsig/fmap/mapcontrol/images/ZoomInCursor.gif'");
-        } else {
-            this.izoomin = new ImageIcon(res).getImage();
-        }
+//        this.izoomin = PluginServices.getIconTheme().get("cursor-zoom-in").getImage();
     }
 
     /**
@@ -174,7 +165,7 @@
 	 * @see com.iver.cit.gvsig.fmap.tools.Listeners.ToolListener#getImageCursor()
 	 */
 	public Image getImageCursor() {
-		return izoomin;
+		return IconThemeHelper.getImage("cursor-zoom-in");
 	}
 
 	/*
Index: branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/ZoomOutListenerImpl.java
===================================================================
--- branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/ZoomOutListenerImpl.java	(revision 38563)
+++ branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/ZoomOutListenerImpl.java	(revision 38564)
@@ -45,12 +45,12 @@
 
 import javax.swing.ImageIcon;
 
+import org.gvsig.fmap.IconThemeHelper;
+import org.gvsig.fmap.geom.Geometry.SUBTYPES;
 import org.gvsig.fmap.geom.GeometryLocator;
 import org.gvsig.fmap.geom.GeometryManager;
-import org.gvsig.fmap.geom.Geometry.SUBTYPES;
 import org.gvsig.fmap.geom.exception.CreateEnvelopeException;
 import org.gvsig.fmap.geom.primitive.Envelope;
-import org.gvsig.fmap.geom.util.UtilFunctions;
 import org.gvsig.fmap.mapcontext.MapContext;
 import org.gvsig.fmap.mapcontext.ViewPort;
 import org.gvsig.fmap.mapcontrol.MapControl;
@@ -98,8 +98,8 @@
 	/**
 	 * The image to display when the cursor is active.
 	 */
-	private final Image izoomout = new ImageIcon(MapControl.class.getClassLoader().getResource(
-				"org/gvsig/fmap/mapcontrol/images/ZoomOutCursor.gif")).getImage();
+//	private final Image izoomout = new ImageIcon(MapControl.class.getClassLoader().getResource(
+//				"org/gvsig/fmap/mapcontrol/images/ZoomOutCursor.gif")).getImage();
 
 	/**
 	 * Reference to the <code>MapControl</code> object that uses.
@@ -148,7 +148,7 @@
 	 * @see com.iver.cit.gvsig.fmap.tools.Listeners.ToolListener#getImageCursor()
 	 */
 	public Image getImageCursor() {
-		return izoomout;
+		return IconThemeHelper.getImage("cursor-zoom-out");
 	}
 
 	/*
Index: branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/PointSelectionListener.java
===================================================================
--- branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/PointSelectionListener.java	(revision 38563)
+++ branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/PointSelectionListener.java	(revision 38564)
@@ -43,8 +43,7 @@
 import java.awt.Image;
 import java.awt.geom.Point2D;
 
-import javax.swing.ImageIcon;
-
+import org.gvsig.fmap.IconThemeHelper;
 import org.gvsig.fmap.dal.exception.DataException;
 import org.gvsig.fmap.dal.feature.FeatureSelection;
 import org.gvsig.fmap.dal.feature.FeatureSet;
@@ -64,8 +63,7 @@
 	/**
 	 * The image to display when the cursor is active.
 	 */
-	private final Image img = new ImageIcon(MapControl.class.getClassLoader().getResource(
-				"org/gvsig/fmap/mapcontrol/images/PointSelectCursor.gif")).getImage();
+//	private final Image img = PluginServices.getIconTheme().get("cursor-select-by-point").getImage();
 
 	/**
 	 * Reference to the <code>MapControl</code> object that uses.
@@ -133,7 +131,7 @@
 	 * @see com.iver.cit.gvsig.fmap.tools.Listeners.ToolListener#getCursor()
 	 */
 	public Image getImageCursor() {
-		return img;
+		return IconThemeHelper.getImage("cursor-select-by-point");
 	}
 
 	/*
Index: branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/PanListenerImpl.java
===================================================================
--- branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/PanListenerImpl.java	(revision 38563)
+++ branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/PanListenerImpl.java	(revision 38564)
@@ -44,14 +44,12 @@
 import java.awt.geom.Point2D;
 import java.awt.geom.Rectangle2D;
 
-import javax.swing.ImageIcon;
-
+import org.gvsig.fmap.IconThemeHelper;
+import org.gvsig.fmap.geom.Geometry.SUBTYPES;
 import org.gvsig.fmap.geom.GeometryLocator;
 import org.gvsig.fmap.geom.GeometryManager;
-import org.gvsig.fmap.geom.Geometry.SUBTYPES;
 import org.gvsig.fmap.geom.exception.CreateEnvelopeException;
 import org.gvsig.fmap.geom.primitive.Envelope;
-import org.gvsig.fmap.geom.util.UtilFunctions;
 import org.gvsig.fmap.mapcontext.ViewPort;
 import org.gvsig.fmap.mapcontrol.MapControl;
 import org.gvsig.fmap.mapcontrol.tools.Events.MoveEvent;
@@ -76,8 +74,7 @@
 	/**
 	 * The image to display when the cursor is active.
 	 */
-	private final Image ipan = new ImageIcon(MapControl.class.getClassLoader().getResource(
-				"org/gvsig/fmap/mapcontrol/images/Hand.gif")).getImage();
+//	private final Image ipan = PluginServices.getIconTheme().get("cursor-pan").getImage();
 	
 	/**
 	 * Reference to the <code>MapControl</code> object that uses.
@@ -124,7 +121,7 @@
 	 * @see com.iver.cit.gvsig.fmap.tools.Listeners.ToolListener#getCursor()
 	 */
 	public Image getImageCursor() {
-		return ipan;
+		return IconThemeHelper.getImage("cursor-pan");
 	}
 
 	/*
Index: branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/SelectImageListenerImpl.java
===================================================================
--- branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/SelectImageListenerImpl.java	(revision 38563)
+++ branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/SelectImageListenerImpl.java	(revision 38564)
@@ -40,14 +40,10 @@
 */
 package org.gvsig.fmap.mapcontrol.tools;
 
-import java.awt.Cursor;
 import java.awt.Image;
-import java.awt.Point;
-import java.awt.Toolkit;
 import java.awt.geom.Point2D;
 
-import javax.swing.ImageIcon;
-
+import org.gvsig.fmap.IconThemeHelper;
 import org.gvsig.fmap.mapcontrol.MapControl;
 import org.gvsig.fmap.mapcontrol.tools.Events.PointEvent;
 import org.gvsig.fmap.mapcontrol.tools.Listeners.PointListener;
@@ -65,8 +61,7 @@
 	/**
 	 * The image to display when the cursor is active.
 	 */
-	private final Image isaveraster = new ImageIcon(MapControl.class.getClassLoader().getResource(
-				"org/gvsig/fmap/mapcontrol/images/PointSelectCursor.gif")).getImage();
+//	private final Image isaveraster = PluginServices.getIconTheme().get("cursor-select-by-point").getImage();
 
 	/**
 	 * Reference to the <code>MapControl</code> object that uses.
@@ -100,7 +95,7 @@
 	 * @see com.iver.cit.gvsig.fmap.tools.Listeners.ToolListener#getImageCursor()
 	 */
 	public Image getImageCursor() {
-		return isaveraster;
+		return IconThemeHelper.getImage("cursor-select-by-point");
 	}
 
 	/*
Index: branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/ZoomOutRightButtonListener.java
===================================================================
--- branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/ZoomOutRightButtonListener.java	(revision 38563)
+++ branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/ZoomOutRightButtonListener.java	(revision 38564)
@@ -44,14 +44,12 @@
 import java.awt.event.MouseEvent;
 import java.awt.geom.Point2D;
 
-import javax.swing.ImageIcon;
-
+import org.gvsig.fmap.IconThemeHelper;
+import org.gvsig.fmap.geom.Geometry.SUBTYPES;
 import org.gvsig.fmap.geom.GeometryLocator;
 import org.gvsig.fmap.geom.GeometryManager;
-import org.gvsig.fmap.geom.Geometry.SUBTYPES;
 import org.gvsig.fmap.geom.exception.CreateEnvelopeException;
 import org.gvsig.fmap.geom.primitive.Envelope;
-import org.gvsig.fmap.geom.util.UtilFunctions;
 import org.gvsig.fmap.mapcontext.MapContext;
 import org.gvsig.fmap.mapcontext.ViewPort;
 import org.gvsig.fmap.mapcontrol.MapControl;
@@ -99,8 +97,7 @@
 	/**
 	 * The image to display when the cursor is active.
 	 */
-	private final Image izoomout = new ImageIcon(MapControl.class.getClassLoader().getResource(
-	"org/gvsig/fmap/mapcontrol/images/ZoomOutCursor.gif")).getImage();
+//	private final Image izoomout = PluginServices.getIconTheme().get("cursor-zoom-out").getImage();
 	
 	/**
 	 * Reference to the <code>MapControl</code> object that uses.
@@ -153,7 +150,7 @@
 	 * @see com.iver.cit.gvsig.fmap.tools.Listeners.ToolListener#getImageCursor()
 	 */
 	public Image getImageCursor() {
-		return izoomout;
+		return IconThemeHelper.getImage("cursor-zoom-out");
 	}
 
 	/*
Index: branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/BehaviorException.java
===================================================================
--- branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/BehaviorException.java	(revision 38563)
+++ branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/BehaviorException.java	(revision 38564)
@@ -40,6 +40,8 @@
  */
 package org.gvsig.fmap.mapcontrol.tools;
 
+import org.gvsig.fmap.mapcontrol.MapControl;
+
 /**
  * <p>Exception produced when fails the process that interacts with a {@link MapControl MapControl} object,
  *  using some tool.</p>
Index: branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/Behavior/Behavior.java
===================================================================
--- branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/Behavior/Behavior.java	(revision 38563)
+++ branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/Behavior/Behavior.java	(revision 38564)
@@ -49,9 +49,6 @@
 import java.awt.geom.Point2D;
 import java.awt.image.BufferedImage;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import org.gvsig.fmap.dal.feature.exception.CreateGeometryException;
 import org.gvsig.fmap.geom.Geometry.SUBTYPES;
 import org.gvsig.fmap.geom.Geometry.TYPES;
@@ -66,6 +63,8 @@
 import org.gvsig.fmap.mapcontrol.MapControlDrawer;
 import org.gvsig.fmap.mapcontrol.tools.BehaviorException;
 import org.gvsig.fmap.mapcontrol.tools.Listeners.ToolListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 
Index: branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/Behavior/RectangleBehavior.java
===================================================================
--- branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/Behavior/RectangleBehavior.java	(revision 38563)
+++ branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/Behavior/RectangleBehavior.java	(revision 38564)
@@ -41,7 +41,6 @@
 package org.gvsig.fmap.mapcontrol.tools.Behavior;
 
 import java.awt.Color;
-import java.awt.Graphics;
 import java.awt.Point;
 import java.awt.Rectangle;
 import java.awt.event.MouseEvent;
@@ -49,12 +48,11 @@
 import java.awt.geom.Rectangle2D;
 import java.awt.image.BufferedImage;
 
+import org.gvsig.fmap.geom.Geometry.SUBTYPES;
 import org.gvsig.fmap.geom.GeometryLocator;
 import org.gvsig.fmap.geom.GeometryManager;
-import org.gvsig.fmap.geom.Geometry.SUBTYPES;
 import org.gvsig.fmap.geom.exception.CreateEnvelopeException;
 import org.gvsig.fmap.geom.primitive.Envelope;
-import org.gvsig.fmap.geom.util.UtilFunctions;
 import org.gvsig.fmap.mapcontext.ViewPort;
 import org.gvsig.fmap.mapcontrol.MapControlDrawer;
 import org.gvsig.fmap.mapcontrol.tools.BehaviorException;
Index: branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/Behavior/PolygonBehavior.java
===================================================================
--- branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/Behavior/PolygonBehavior.java	(revision 38563)
+++ branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/Behavior/PolygonBehavior.java	(revision 38564)
@@ -40,7 +40,6 @@
  */
 package org.gvsig.fmap.mapcontrol.tools.Behavior;
 
-import java.awt.Graphics;
 import java.awt.event.MouseEvent;
 import java.awt.geom.Point2D;
 
Index: branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/Behavior/IBehavior.java
===================================================================
--- branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/Behavior/IBehavior.java	(revision 38563)
+++ branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/Behavior/IBehavior.java	(revision 38564)
@@ -1,5 +1,6 @@
 package org.gvsig.fmap.mapcontrol.tools.Behavior;
 
+import java.awt.Graphics;
 import java.awt.Image;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseWheelEvent;
Index: branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/Behavior/DraggerBehavior.java
===================================================================
--- branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/Behavior/DraggerBehavior.java	(revision 38563)
+++ branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/Behavior/DraggerBehavior.java	(revision 38564)
@@ -40,7 +40,6 @@
  */
 package org.gvsig.fmap.mapcontrol.tools.Behavior;
 
-import java.awt.Graphics;
 import java.awt.event.MouseEvent;
 import java.awt.geom.Point2D;
 
Index: branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/RectangleSelectionListener.java
===================================================================
--- branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/RectangleSelectionListener.java	(revision 38563)
+++ branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/RectangleSelectionListener.java	(revision 38564)
@@ -42,8 +42,7 @@
 
 import java.awt.Image;
 
-import javax.swing.ImageIcon;
-
+import org.gvsig.fmap.IconThemeHelper;
 import org.gvsig.fmap.dal.exception.DataException;
 import org.gvsig.fmap.dal.feature.FeatureSelection;
 import org.gvsig.fmap.dal.feature.FeatureSet;
@@ -65,8 +64,7 @@
 	/**
 	 * The image to display when the cursor is active.
 	 */
-	private final Image img = new ImageIcon(MapControl.class.getClassLoader().getResource(
-				"org/gvsig/fmap/mapcontrol/images/RectSelectCursor.gif")).getImage();
+//	private final Image img = PluginServices.getIconTheme().get("cursor-select-by-polygon").getImage();
 
 	/**
 	 * Reference to the <code>MapControl</code> object that uses.
@@ -123,7 +121,7 @@
 	 * @see com.iver.cit.gvsig.fmap.tools.Listeners.ToolListener#getImageCursor()
 	 */
 	public Image getImageCursor() {
-		return img;
+		return IconThemeHelper.getImage("cursor-select-by-polygon");
 	}
 
 	/*
Index: branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/Events/PointEvent.java
===================================================================
--- branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/Events/PointEvent.java	(revision 38563)
+++ branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/Events/PointEvent.java	(revision 38564)
@@ -43,10 +43,6 @@
 import java.awt.event.MouseEvent;
 import java.awt.geom.Point2D;
 
-import org.gvsig.fmap.geom.Geometry;
-import org.gvsig.fmap.geom.GeometryLocator;
-import org.gvsig.fmap.geom.GeometryManager;
-import org.gvsig.fmap.geom.exception.CreateGeometryException;
 import org.gvsig.fmap.geom.primitive.Point;
 import org.gvsig.fmap.mapcontrol.MapControl;
 
Index: branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/Listeners/RectangleListener.java
===================================================================
--- branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/Listeners/RectangleListener.java	(revision 38563)
+++ branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/Listeners/RectangleListener.java	(revision 38564)
@@ -40,6 +40,7 @@
  */
 package org.gvsig.fmap.mapcontrol.tools.Listeners;
 
+import org.gvsig.fmap.mapcontrol.MapControl;
 import org.gvsig.fmap.mapcontrol.tools.BehaviorException;
 import org.gvsig.fmap.mapcontrol.tools.Events.EnvelopeEvent;
 
Index: branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/Listeners/PointListener.java
===================================================================
--- branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/Listeners/PointListener.java	(revision 38563)
+++ branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/Listeners/PointListener.java	(revision 38564)
@@ -40,6 +40,7 @@
  */
 package org.gvsig.fmap.mapcontrol.tools.Listeners;
 
+import org.gvsig.fmap.mapcontrol.MapControl;
 import org.gvsig.fmap.mapcontrol.tools.BehaviorException;
 import org.gvsig.fmap.mapcontrol.tools.Events.PointEvent;
 
Index: branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/Listeners/PolylineListener.java
===================================================================
--- branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/Listeners/PolylineListener.java	(revision 38563)
+++ branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/Listeners/PolylineListener.java	(revision 38564)
@@ -40,6 +40,7 @@
  */
 package org.gvsig.fmap.mapcontrol.tools.Listeners;
 
+import org.gvsig.fmap.mapcontrol.MapControl;
 import org.gvsig.fmap.mapcontrol.tools.BehaviorException;
 import org.gvsig.fmap.mapcontrol.tools.Events.MeasureEvent;
 
Index: branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/Listeners/PanListener.java
===================================================================
--- branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/Listeners/PanListener.java	(revision 38563)
+++ branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/Listeners/PanListener.java	(revision 38564)
@@ -40,6 +40,7 @@
  */
 package org.gvsig.fmap.mapcontrol.tools.Listeners;
 
+import org.gvsig.fmap.mapcontrol.MapControl;
 import org.gvsig.fmap.mapcontrol.tools.BehaviorException;
 import org.gvsig.fmap.mapcontrol.tools.Events.MoveEvent;
 
Index: branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/Listeners/CircleListener.java
===================================================================
--- branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/Listeners/CircleListener.java	(revision 38563)
+++ branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/Listeners/CircleListener.java	(revision 38564)
@@ -40,6 +40,7 @@
  */
 package org.gvsig.fmap.mapcontrol.tools.Listeners;
 
+import org.gvsig.fmap.mapcontrol.MapControl;
 import org.gvsig.fmap.mapcontrol.tools.BehaviorException;
 import org.gvsig.fmap.mapcontrol.tools.Events.MeasureEvent;
 
Index: branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/MeasureListenerImpl.java
===================================================================
--- branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/MeasureListenerImpl.java	(revision 38563)
+++ branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/tools/MeasureListenerImpl.java	(revision 38564)
@@ -43,8 +43,7 @@
 import java.awt.Image;
 import java.awt.Point;
 
-import javax.swing.ImageIcon;
-
+import org.gvsig.fmap.IconThemeHelper;
 import org.gvsig.fmap.mapcontext.ViewPort;
 import org.gvsig.fmap.mapcontrol.MapControl;
 import org.gvsig.fmap.mapcontrol.tools.Events.MeasureEvent;
@@ -66,9 +65,7 @@
 	/**
 	 * The image to display when the cursor is active.
 	 */
-	private final Image iruler = new ImageIcon(MapControl.class.getClassLoader().getResource(
-				"org/gvsig/fmap/mapcontrol/images/RulerCursor.gif")).getImage();
-
+//	private final Image iruler = PluginServices.getIconTheme().get("cursor-query-area").getImage();
 	/**
 	 * Reference to the <code>MapControl</code> object that uses.
 	 */
@@ -114,7 +111,7 @@
 	 * @see com.iver.cit.gvsig.fmap.tools.Listeners.ToolListener#getImageCursor()
 	 */
 	public Image getImageCursor() {
-		return iruler;
+		return IconThemeHelper.getImage("cursor-query-area");
 	}
 
 	/*
Index: branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/impl/DefaultPrimitivesDrawer.java
===================================================================
--- branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/impl/DefaultPrimitivesDrawer.java	(revision 38563)
+++ branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/impl/DefaultPrimitivesDrawer.java	(revision 38564)
@@ -25,11 +25,10 @@
 import java.awt.Graphics;
 import java.awt.Graphics2D;
 
+import org.gvsig.fmap.mapcontrol.PrimitivesDrawer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.gvsig.fmap.mapcontrol.PrimitivesDrawer;
-
 /**
  * @author <a href="mailto:jpiera@gvsig.org">Jorge Piera</a>
  */
Index: branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/impl/DefaultMapControlManager.java
===================================================================
--- branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/impl/DefaultMapControlManager.java	(revision 38563)
+++ branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/impl/DefaultMapControlManager.java	(revision 38564)
@@ -33,9 +33,6 @@
 import java.util.Map;
 import java.util.prefs.Preferences;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import org.gvsig.fmap.geom.Geometry;
 import org.gvsig.fmap.mapcontext.MapContextLocator;
 import org.gvsig.fmap.mapcontext.MapContextManager;
@@ -52,6 +49,8 @@
 import org.gvsig.tools.extensionpoint.ExtensionPoint;
 import org.gvsig.tools.extensionpoint.ExtensionPoint.Extension;
 import org.gvsig.tools.extensionpoint.ExtensionPointManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @author <a href="mailto:jpiera@gvsig.org">Jorge Piera</a>
Index: branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/MapControlLibrary.java
===================================================================
--- branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/MapControlLibrary.java	(revision 38563)
+++ branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/MapControlLibrary.java	(revision 38564)
@@ -28,6 +28,7 @@
 
 import java.util.Locale;
 
+import org.gvsig.fmap.IconThemeHelper;
 import org.gvsig.fmap.mapcontext.MapContextLibrary;
 import org.gvsig.i18n.Messages;
 import org.gvsig.tools.library.AbstractLibrary;
@@ -59,5 +60,17 @@
 	
 	@Override
 	protected void doPostInitialize() throws LibraryException {
+	   	IconThemeHelper.registerIcon("cursor", "cursor-crux", this);
+	   	IconThemeHelper.registerIcon("cursor", "cursor-info-by-point",this);
+	   	IconThemeHelper.registerIcon("cursor", "cursor-pan", this);
+	   	IconThemeHelper.registerIcon("cursor", "cursor-query-area", this);
+	   	IconThemeHelper.registerIcon("cursor", "cursor-select-by-point", this);
+	   	IconThemeHelper.registerIcon("cursor", "cursor-select-by-polygon", this);
+	   	IconThemeHelper.registerIcon("cursor", "cursor-zoom-in", this);
+	   	IconThemeHelper.registerIcon("cursor", "cursor-zoom-out", this);
+
+	   	IconThemeHelper.registerIcon("layer", "layer-icon", this);
+	   	IconThemeHelper.registerIcon("layer", "layer-icon-group", this);
+	   	IconThemeHelper.registerIcon("layer", "layer-icon-vectorial", this);
 	}
 }
\ No newline at end of file
Index: branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/swing/dynobject/impl/DefaultLayersDynObjectSetComponent.java
===================================================================
--- branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/swing/dynobject/impl/DefaultLayersDynObjectSetComponent.java	(revision 38563)
+++ branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/swing/dynobject/impl/DefaultLayersDynObjectSetComponent.java	(revision 38564)
@@ -31,14 +31,13 @@
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import org.gvsig.fmap.mapcontrol.swing.dynobject.LayersDynObjectSetComponent;
 import org.gvsig.tools.dynobject.DynObjectSet;
 import org.gvsig.tools.exception.BaseException;
 import org.gvsig.tools.swing.api.ToolsSwingLocator;
 import org.gvsig.tools.swing.api.dynobject.set.JDynObjectSetComponent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @author gvSIG Team
Index: branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/swing/dynobject/DynObjectViewer.java
===================================================================
--- branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/swing/dynobject/DynObjectViewer.java	(revision 38563)
+++ branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/swing/dynobject/DynObjectViewer.java	(revision 38564)
@@ -36,7 +36,6 @@
 import javax.swing.JTextField;
 
 import org.cresques.cts.IProjection;
-
 import org.gvsig.i18n.Messages;
 import org.gvsig.tools.dynobject.DynClass;
 import org.gvsig.tools.dynobject.DynField;
Index: branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/IconThemeHelper.java
===================================================================
--- branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/IconThemeHelper.java	(revision 0)
+++ branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/IconThemeHelper.java	(revision 38564)
@@ -0,0 +1,46 @@
+package org.gvsig.fmap;
+
+import java.awt.Image;
+
+import javax.swing.ImageIcon;
+
+import org.gvsig.tools.swing.api.ToolsSwingLocator;
+import org.gvsig.tools.swing.icontheme.IconTheme;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class IconThemeHelper {
+
+	private static Logger logger = LoggerFactory.getLogger(IconThemeHelper.class);
+	
+	public static void registerIcon(String group, String name, Object obj) {
+		String resourceName;
+		ClassLoader loader;
+		IconTheme iconTheme = ToolsSwingLocator.getIconThemeManager().getCurrent();
+		if( group == null || group.trim().length()==0 ) {
+			resourceName = "images/"+name+".png";
+		} else {
+			resourceName = "images/"+group+"/"+name+".png";
+		}
+		if( obj instanceof Class ) {
+			loader = ((Class) obj).getClassLoader();
+		} else {
+			loader = obj.getClass().getClassLoader();
+		}
+		try {
+			iconTheme.registerDefault("mapcontrol", group, name, null, loader.getResource(resourceName));
+		} catch( Throwable e) {
+			logger.info(e.getMessage());
+		}
+	}
+
+	public static ImageIcon getImageIcon(String iconName) {
+		IconTheme iconTheme = ToolsSwingLocator.getIconThemeManager().getCurrent();
+		return iconTheme.get(iconName);
+	}
+	
+	public static Image getImage(String iconName) {
+		IconTheme iconTheme = ToolsSwingLocator.getIconThemeManager().getCurrent();
+		return iconTheme.get(iconName).getImage();
+	}
+}

Property changes on: branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/IconThemeHelper.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: branches/v2_0_0_prep/libraries/libFMap_controls/resources/images/layer/layer-icon-vectorial.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/libraries/libFMap_controls/resources/images/layer/layer-icon-vectorial.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/libraries/libFMap_controls/resources/images/layer/layer-icon-group.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/libraries/libFMap_controls/resources/images/layer/layer-icon-group.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/libraries/libFMap_controls/resources/images/layer/layer-icon.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/libraries/libFMap_controls/resources/images/layer/layer-icon.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/libraries/libFMap_controls/resources/images/cursor/cursor-select-by-polygon.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/libraries/libFMap_controls/resources/images/cursor/cursor-select-by-polygon.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/libraries/libFMap_controls/resources/images/cursor/cursor-query-distance.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/libraries/libFMap_controls/resources/images/cursor/cursor-query-distance.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/libraries/libFMap_controls/resources/images/cursor/cursor-pan.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/libraries/libFMap_controls/resources/images/cursor/cursor-pan.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/libraries/libFMap_controls/resources/images/cursor/cursor-select-by-point.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/libraries/libFMap_controls/resources/images/cursor/cursor-select-by-point.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/libraries/libFMap_controls/resources/images/cursor/cursor-crux.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/libraries/libFMap_controls/resources/images/cursor/cursor-crux.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/libraries/libFMap_controls/resources/images/cursor/cursor-zoom-in.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/libraries/libFMap_controls/resources/images/cursor/cursor-zoom-in.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/libraries/libFMap_controls/resources/images/cursor/cursor-zoom-out.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/libraries/libFMap_controls/resources/images/cursor/cursor-zoom-out.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/libraries/libFMap_controls/resources/images/cursor/cursor-info-by-point.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/libraries/libFMap_controls/resources/images/cursor/cursor-info-by-point.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/libraries/libFMap_controls/resources/images/cursor/cursor-query-area.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/libraries/libFMap_controls/resources/images/cursor/cursor-query-area.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/libraries/libCorePlugin/pom.xml
===================================================================
--- branches/v2_0_0_prep/libraries/libCorePlugin/pom.xml	(revision 38563)
+++ branches/v2_0_0_prep/libraries/libCorePlugin/pom.xml	(revision 38564)
@@ -11,48 +11,54 @@
 		<groupId>org.gvsig</groupId>
 		<artifactId>gvsig-base-extension-pom</artifactId>
 		<version>2.0-SNAPSHOT</version>
-	</parent>	
+	</parent>
 	<dependencies>
-        <dependency>
-            <groupId>org.gvsig</groupId>
-            <artifactId>org.gvsig.tools.lib</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.gvsig</groupId>
-            <artifactId>org.gvsig.tools.swing.api</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.gvsig</groupId>
-            <artifactId>org.gvsig.ui</artifactId>
-            <scope>compile</scope>
-        </dependency>
 		<dependency>
 			<groupId>org.gvsig</groupId>
+			<artifactId>org.gvsig.tools.lib</artifactId>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.gvsig</groupId>
+			<artifactId>org.gvsig.tools.swing.api</artifactId>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.gvsig</groupId>
+			<artifactId>org.gvsig.ui</artifactId>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.gvsig</groupId>
 			<artifactId>org.gvsig.andami</artifactId>
-            <scope>compile</scope>
+			<scope>compile</scope>
 		</dependency>
-        <dependency>
-            <groupId>org.gvsig</groupId>
-            <artifactId>org.gvsig.utils</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.gvsig</groupId>
-            <artifactId>org.gvsig.i18n</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>castor</groupId>
-            <artifactId>castor</artifactId>
-            <scope>compile</scope>
-        </dependency>
+		<dependency>
+			<groupId>org.gvsig</groupId>
+			<artifactId>org.gvsig.utils</artifactId>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.gvsig</groupId>
+			<artifactId>org.gvsig.i18n</artifactId>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>castor</groupId>
+			<artifactId>castor</artifactId>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.jgoodies</groupId>
+			<artifactId>forms</artifactId>
+			<version>1.0.4</version>
+			<scope>compile</scope>
+		</dependency>
 	</dependencies>
 	<properties>
 		<build-dir>${basedir}/../build</build-dir>
Index: branches/v2_0_0_prep/libraries/libCorePlugin/config/config.xml
===================================================================
--- branches/v2_0_0_prep/libraries/libCorePlugin/config/config.xml	(revision 38563)
+++ branches/v2_0_0_prep/libraries/libCorePlugin/config/config.xml	(revision 38564)
@@ -1,104 +1,94 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <plugin-config>
-	<libraries library-dir="lib"/>
-	<resourceBundle name="text"/>
-	<extensions>
-		<extension class-name="org.gvsig.coreplugin.menus.ToolbarMenus"
-			description="Active toolbar menues"
-			active="true"
-			priority="99999">
-		</extension>
-		<extension class-name="org.gvsig.coreplugin.Consola"
-			description="Extensi�n encargada de abrir la ventana de la consola."
-			active="true" priority="1">
-			<menu text="Ver/Consola" action-command="unico" key="s"
-				icon="application-console"
-				tooltip="titulo_consola"
-				position="20090"/>
-			<tool-bar name="core" position="20">
-				<action-tool icon="application-console"
-					action-command="consola" tooltip="titulo_consola"
-					enable-text="debe_estar_activada" last="true" position="1"/>
-			</tool-bar>
-		</extension>
-		<extension class-name="org.gvsig.coreplugin.PreferencesExtension"
-			description="Extensi�n encargada de abrir la ventana de preferencias de ANDAMI."
-			active="true" priority="3">
-			<menu text="Ver/Preferencias" action-command="preferences"
-				icon="application-preferences"
-				tooltip="preferencias"
-				position="20094"/>
-			<tool-bar name="core" position="20">
-				<action-tool icon="application-preferences"
-					action-command="preferences" tooltip="preferencias"
-					enable-text="debe_estar_activada" position="2"/>
-			</tool-bar>
-		</extension>
-		<extension class-name="org.gvsig.coreplugin.StatusBar"
-			description="Recoge los mensajes del NotificationManager y los muestra por la StatusBar"
-			active="true">
-		</extension>
-		<skin-extension class-name="org.gvsig.coreplugin.mdiManager.NewSkin">
-			<menu text="Ventana/Cascada" action-command="cascada" key="c"
-				tooltip="cascada_tooltip" position="80080"/>
-			<menu text="Ventana/Tile" action-command="mosaico" key="m"
-				tooltip="mosaico_tooltip" position="80084"/>
-		</skin-extension>
-	</extensions>
-</plugin-config>
+  <libraries library-dir="lib"/>
+  <resourceBundle name="text"/>
+  <extensions>
+    <extension class-name="org.gvsig.coreplugin.menus.ToolbarMenus"
+      description="Active toolbar menues"
+      active="true"
+      priority="99999">
+    </extension>
+    <extension class-name="org.gvsig.coreplugin.Consola"
+      description="Extensi�n encargada de abrir la ventana de la consola."
+      active="true" priority="1">
+      <action 
+        name= "show-console"
+        label="Consola"
+        tooltip="_Show_console_error_messages"
+        action-command="show-console" 
+        icon="show-console"
+        accelerator="Alt+S"
+        position="400200000"
+        />
+        
+      <menu
+        name="show-console"
+        text="Show/Console" 
+        />
+        
+      <tool-bar name="core" position="20">
+        <action-tool name="show-console" last="true" />
+      </tool-bar>
+      
+    </extension>
+    <extension class-name="org.gvsig.coreplugin.PreferencesExtension"
+      description="Extensi�n encargada de abrir la ventana de preferencias de ANDAMI."
+      active="true" priority="3">
+      <action 
+        name= "edit-setup"
+        label="Setup"
+        tooltip="_Show_application_setup"
+        action-command="edit-setup" 
+        icon="edit-setup"
+        accelerator=""
+        position="209000000"
+        />
+        
 
-<!--
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE plugin SYSTEM "../../plugin.dtd">
-<plugin>
-	<libraries>
-		<library file="org.gvsig.coreplugin.jar"/>
-		<library file="prulib.jar"/>
-	</libraries>
-	<resourceBundle name="text"/>
-	<labelSet class="org.gvsig.coreplugin.ConsolaFrame">
-		<label text="label1"/>
-		<label text="label2"/>
-	</labelSet>
-	<extension>
-		<class name="org.gvsig.coreplugin.Consola"/>
-		<menu text="Ver/Consola" key="s"/>
-		<toolBar name="Ver">
-			<tool icon="application-console"
-				actionCommand="CONSOLA"/>
-		</toolBar>
-	</extension>
-	<extension>
-		<class name="org.gvsig.coreplugin.Cascade"/>
-		<menu text="Window/Tile" key="t" mnemonic="t"
-			tooltip="tile_tooltip"
-			enableText="cascada_enable"
-			actionCommand="TILE"/>
-		<menu text="Window/Cascada" key="c" mnemonic="c"
-			tooltip="cascada_tooltip"
-			enableText="cascada_enable"
-			actionCommand="CASCADA"/>
-		<toolBar name="Window">
-			<tool icon="images/cascada.gif"
-				tooltip="cascada_tooltip"
-				enableText="cascada_enable"
-				actionCommand="CASCADA"/>
-			<tool icon="images/tile.gif"
-				tooltip="tile_tooltip"
-				enableText="cascada_enable"
-				actionCommand="TILE"/>
-		</toolBar>
-		<popupMenu name="cascada">
-			<entry text="Cascada"
-				tooltip="cascada_tooltip"
-				enableText="cascada_enable" actionCommand="CASCADA"/>
-			<entry text="Tile"
-				tooltip="tile_tooltip"
-				enableText="cascada_enable" actionCommand="CASCADA"/>
-		</popupMenu>
-	</extension>
-	<extension>
-		<class name="org.gvsig.coreplugin.StatusBar"/>
-	</extension>
-</plugin>
--->
+      <menu
+        name="edit-setup" 
+        text="Edit/Setup" 
+        />
+        
+      <tool-bar name="core" position="20">
+        <action-tool name="edit-setup"/>
+      </tool-bar>
+      
+    </extension>
+    
+    
+    <extension class-name="org.gvsig.coreplugin.StatusBar"
+      description="Recoge los mensajes del NotificationManager y los muestra por la StatusBar"
+      active="true">
+    </extension>
+    <skin-extension class-name="org.gvsig.coreplugin.mdiManager.NewSkin">
+      <action 
+        name= "window-cascade"
+        label="cascade"
+        tooltip="_Show_windows_in_cascade"
+        action-command="window-cascade" 
+        icon="window-cascade"
+        position="960100000"
+        accelerator="Alt+C"
+        />
+      <action 
+        name= "window-tile"
+        label="tile"
+        tooltip="_Show_windows_tile"
+        action-command="window-tile" 
+        icon="window-tile"
+        position="960200000"
+        accelerator="Alt+T"
+        />
+        
+      <menu
+        name="window-cascade" 
+        text="Window/Cascade"
+        />
+      <menu
+        name="window-tile" 
+        text="Window/Tile"
+        />
+    </skin-extension>
+  </extensions>
+</plugin-config>
Index: branches/v2_0_0_prep/libraries/libCorePlugin/images/save/kde-network-offline.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/libraries/libCorePlugin/images/save/kde-network-offline.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/libraries/libCorePlugin/images/save/folder.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/libraries/libCorePlugin/images/save/folder.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/libraries/libCorePlugin/images/save/kde-network-online.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/libraries/libCorePlugin/images/save/kde-network-online.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/libraries/libCorePlugin/images/save/tile.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/libraries/libCorePlugin/images/save/tile.gif
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/libraries/libCorePlugin/images/save/emblem-work.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/libraries/libCorePlugin/images/save/emblem-work.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/libraries/libCorePlugin/images/save/browser.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/libraries/libCorePlugin/images/save/browser.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/libraries/libCorePlugin/images/save/stop.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/libraries/libCorePlugin/images/save/stop.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/libraries/libCorePlugin/images/save/file-manager.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/libraries/libCorePlugin/images/save/file-manager.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/libraries/libCorePlugin/images/save/network.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/libraries/libCorePlugin/images/save/network.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/libraries/libCorePlugin/images/save/enabled.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/libraries/libCorePlugin/images/save/enabled.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/libraries/libCorePlugin/images/save/console.jpg
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/libraries/libCorePlugin/images/save/console.jpg
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/libraries/libCorePlugin/images/save/bonobo-component-browser.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/libraries/libCorePlugin/images/save/bonobo-component-browser.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/libraries/libCorePlugin/images/save/cascada.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/libraries/libCorePlugin/images/save/cascada.gif
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/libraries/libCorePlugin/images/save/config.jpg
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/libraries/libCorePlugin/images/save/config.jpg
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/libraries/libCorePlugin/images/save/console.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/libraries/libCorePlugin/images/save/console.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/libraries/libCorePlugin/images/save/resolution.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/libraries/libCorePlugin/images/save/resolution.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/libraries/libCorePlugin/images/save/gnome-settings-theme.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/libraries/libCorePlugin/images/save/gnome-settings-theme.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/libraries/libCorePlugin/images/save/babel.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/libraries/libCorePlugin/images/save/babel.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/libraries/libCorePlugin/images/save/config.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/libraries/libCorePlugin/images/save/config.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/libraries/libCorePlugin/images/save/shield.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/libraries/libCorePlugin/images/save/shield.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/libraries/libCorePlugin/images/preferences/edit-setup-browsercontrol.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/libraries/libCorePlugin/images/preferences/edit-setup-browsercontrol.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/libraries/libCorePlugin/images/preferences/edit-setup-skin.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/libraries/libCorePlugin/images/preferences/edit-setup-skin.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/libraries/libCorePlugin/images/preferences/edit-setup-firewall.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/libraries/libCorePlugin/images/preferences/edit-setup-firewall.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/libraries/libCorePlugin/images/preferences/edit-setup-foldering.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/libraries/libCorePlugin/images/preferences/edit-setup-foldering.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/libraries/libCorePlugin/images/preferences/edit-setup-network.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/libraries/libCorePlugin/images/preferences/edit-setup-network.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/libraries/libCorePlugin/images/preferences/edit-setup-dirextension.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/libraries/libCorePlugin/images/preferences/edit-setup-dirextension.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/libraries/libCorePlugin/images/preferences/edit-setup-extension.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/libraries/libCorePlugin/images/preferences/edit-setup-extension.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/libraries/libCorePlugin/images/preferences/edit-setup-general.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/libraries/libCorePlugin/images/preferences/edit-setup-general.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/libraries/libCorePlugin/images/preferences/edit-setup-screensetting.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/libraries/libCorePlugin/images/preferences/edit-setup-screensetting.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/libraries/libCorePlugin/images/preferences/edit-setup-appearance.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/libraries/libCorePlugin/images/preferences/edit-setup-appearance.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/libraries/libCorePlugin/images/preferences/edit-setup-extensions.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/libraries/libCorePlugin/images/preferences/edit-setup-extensions.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/libraries/libCorePlugin/images/preferences/edit-setup-language.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/libraries/libCorePlugin/images/preferences/edit-setup-language.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/libraries/libCorePlugin/images/action/show-console.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/libraries/libCorePlugin/images/action/show-console.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/libraries/libCorePlugin/images/action/edit-setup.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/libraries/libCorePlugin/images/action/edit-setup.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/StatusBar.java
===================================================================
--- branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/StatusBar.java	(revision 38563)
+++ branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/StatusBar.java	(revision 38564)
@@ -21,6 +21,8 @@
  */
 package org.gvsig.coreplugin;
 
+import javax.swing.JOptionPane;
+
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.messages.MessageEvent;
 import org.gvsig.andami.messages.NotificationListener;
@@ -44,8 +46,8 @@
      * @see com.iver.mdiApp.NotificationListener#errorEvent(java.lang.String)
      */
     public void errorEvent(MessageEvent e) {
-        PluginServices.getMainFrame().getStatusBar()
-            .setErrorText(e.getMessages()[0]);
+    	String msg = e.getMessages()[0];
+        PluginServices.getMainFrame().getStatusBar().message(msg, JOptionPane.ERROR_MESSAGE);
     }
 
     /**
Index: branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/Consola.java
===================================================================
--- branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/Consola.java	(revision 38563)
+++ branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/Consola.java	(revision 38564)
@@ -40,6 +40,7 @@
  */
 package org.gvsig.coreplugin;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.messages.NotificationManager;
 import org.gvsig.andami.plugins.Extension;
@@ -59,6 +60,8 @@
      * @see com.iver.mdiApp.IExtension#initialize()
      */
     public void initialize() {
+    	IconThemeHelper.registerIcon("action", "show-console", this);
+    	
     	ps = PluginServices.getPluginServices(this);
     	consolaFrame = new ConsolaFrame();
     	NotificationManager.addNotificationListener(consolaFrame);
@@ -69,19 +72,17 @@
 //    	notificationDialog= new NotificationDialog();
 //    	NotificationManager.addNotificationListener(notificationDialog);
 
-    	PluginServices.getIconTheme().registerDefault(
-				"application-console",
-				this.getClass().getClassLoader().getResource("images/console.png")
-			);
     }
 
 	/* (non-Javadoc)
 	 * @see com.iver.andami.plugins.Extension#execute(java.lang.String)
 	 */
 	public void execute(String actionCommand) {
-		consolaFrame.setSize(400, 325);
-		consolaFrame.setVisible(true);
-        PluginServices.getMDIManager().addWindow(consolaFrame);
+		if( "show-console".equalsIgnoreCase(actionCommand) ) {
+			consolaFrame.setSize(400, 325);
+			consolaFrame.setVisible(true);
+	        PluginServices.getMDIManager().addWindow(consolaFrame);
+		}
 	}
 
 	/* (non-Javadoc)
Index: branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/PreferencesExtension.java
===================================================================
--- branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/PreferencesExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/PreferencesExtension.java	(revision 38564)
@@ -4,6 +4,7 @@
 import java.util.HashMap;
 import java.util.Iterator;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.Launcher;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.plugins.Extension;
@@ -63,106 +64,32 @@
 	}
 
 	private void registerIcons(){
-		PluginServices.getIconTheme().registerDefault(
-				"application-preferences",
-				this.getClass().getClassLoader().getResource("images/config.png")
-			);
+		IconThemeHelper.registerIcon("action", "edit-setup", this);
 
-			// AppearancePage.java
-			PluginServices.getIconTheme().registerDefault(
-					"aplication-preferences-appearance",
-					this.getClass().getClassLoader().getResource("images/gnome-settings-theme.png")
-				);
-
-			// BrowserControlPage.java
-			PluginServices.getIconTheme().registerDefault(
-					"aplication-preferences-browsercontrol",
-					this.getClass().getClassLoader().getResource("images/browser.png")
-				);
-
-
-			// DirExtensionPage.java
-			PluginServices.getIconTheme().registerDefault(
-					"aplication-preferences-dirextension",
-					this.getClass().getClassLoader().getResource("images/file-manager.png")
-				);
-
-			// ExtensionPage.java
-			PluginServices.getIconTheme().registerDefault(
-					"aplication-preferences-extension",
-					this.getClass().getClassLoader().getResource("images/emblem-work.png")
-				);
-
-			// ExtensionsPage.java
-			PluginServices.getIconTheme().registerDefault(
-					"aplication-preferences-extensions",
-					this.getClass().getClassLoader().getResource("images/bonobo-component-browser.png")
-				);
-
-			// FolderingPage.java
-			PluginServices.getIconTheme().registerDefault(
-					"aplication-preferences-foldering",
-					this.getClass().getClassLoader().getResource("images/folder.png")
-				);
-
-			// LanguagePage.java
-			PluginServices.getIconTheme().registerDefault(
-					"aplication-preferences-language",
-					this.getClass().getClassLoader().getResource("images/babel.png")
-				);
-
-			// ScreenSettingsPage.java
-			PluginServices.getIconTheme().registerDefault(
-					"aplication-preferences-screensetting",
-					this.getClass().getClassLoader().getResource("images/resolution.png")
-				);
-			// FirewallPage.java
-			PluginServices.getIconTheme().registerDefault(
-					"aplication-preferences-firewall",
-					this.getClass().getClassLoader().getResource("images/shield.png")
-				);
-
-			// NetworkPage.java
-			//
-			PluginServices.getIconTheme().registerDefault(
-					"aplication-preferences-network",
-					this.getClass().getClassLoader().getResource("images/network.png")
-				);
-			PluginServices.getIconTheme().registerDefault(
-					"application-console",
-					this.getClass().getClassLoader().getResource("images/console.png")
-				);
-			PluginServices.getIconTheme().registerDefault(
-					"gnome-settings-theme",
-					this.getClass().getClassLoader().getResource("images/gnome-settings-theme.png")
-				);
-			PluginServices.getIconTheme().registerDefault(
-					"browser-icon",
-					this.getClass().getClassLoader().getResource("images/browser.png")
-				);
-			PluginServices.getIconTheme().registerDefault(
-					"file-manager",
-					this.getClass().getClassLoader().getResource("images/file-manager.png")
-				);
-			PluginServices.getIconTheme().registerDefault(
-					"emblem-work",
-					this.getClass().getClassLoader().getResource("images/emblem-work.png")
-				);
-			PluginServices.getIconTheme().registerDefault(
-					"folder-icon",
-					this.getClass().getClassLoader().getResource("images/folder.png")
-				);
-			PluginServices.getIconTheme().registerDefault(
-					"kde-network-online-icon",
-					this.getClass().getClassLoader().getResource("images/kde-network-online.png")
-				);
-			PluginServices.getIconTheme().registerDefault(
-					"kde-network-offline-icon",
-					this.getClass().getClassLoader().getResource("images/kde-network-offline.png")
-				);
-
-
-
+		// AppearancePage.java
+		IconThemeHelper.registerIcon("preferences", "edit-setup-appearance", this);
+		// BrowserControlPage.java
+		IconThemeHelper.registerIcon("preferences", "edit-setup-browsercontrol", this);
+		// DirExtensionPage.java
+		IconThemeHelper.registerIcon("preferences", "edit-setup-dirextension", this);
+		// ExtensionPage.java
+		IconThemeHelper.registerIcon("preferences", "edit-setup-extension", this);
+		// ExtensionsPage.java
+		IconThemeHelper.registerIcon("preferences", "edit-setup-extensions", this);
+		// GeneralPage.java
+		IconThemeHelper.registerIcon("preferences", "edit-setup-general", this);
+		// FolderingPage.java
+		IconThemeHelper.registerIcon("preferences", "edit-setup-foldering", this);
+		// LanguagePage.java
+		IconThemeHelper.registerIcon("preferences", "edit-setup-language", this);
+		// ScreenSettingsPage.java
+		IconThemeHelper.registerIcon("preferences", "edit-setup-screensetting", this);
+		// FirewallPage.java
+		IconThemeHelper.registerIcon("preferences", "edit-setup-firewall", this);
+		// NetworkPage.java
+		IconThemeHelper.registerIcon("preferences", "edit-setup-network", this);
+		// SkinPreferences.java
+		IconThemeHelper.registerIcon("preferences", "edit-setup-skin", this);
 	}
 
 	public void execute(String actionCommand) {
@@ -171,10 +98,11 @@
 			initializeExtensionsConfig();
 			this.initilizedExtensions = true;
 		}
-
-		DlgPreferences dlgPreferences=PluginServices.getDlgPreferences();
-		dlgPreferences.refreshExtensionPoints();
-		PluginServices.getMDIManager().addWindow(dlgPreferences);
+		if ("edit-setup".equalsIgnoreCase(actionCommand)) {
+			DlgPreferences dlgPreferences = PluginServices.getDlgPreferences();
+			dlgPreferences.refreshExtensionPoints();
+			PluginServices.getMDIManager().addWindow(dlgPreferences);
+		}
 	}
 	public boolean isEnabled() {
 		return true;
Index: branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/NotificationDialogNew.java
===================================================================
--- branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/NotificationDialogNew.java	(revision 38563)
+++ branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/NotificationDialogNew.java	(revision 38564)
@@ -8,10 +8,8 @@
 import java.awt.LayoutManager;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.net.URL;
 
 import javax.swing.BorderFactory;
-import javax.swing.ImageIcon;
 import javax.swing.JButton;
 import javax.swing.JComponent;
 import javax.swing.JLabel;
@@ -22,6 +20,7 @@
 import javax.swing.border.Border;
 import javax.swing.border.TitledBorder;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.messages.MessageEvent;
 import org.gvsig.andami.messages.NotificationListener;
@@ -114,8 +113,7 @@
 			this.setBorder(border);
 
 			this.image = new JLabel();
-			URL stopurl = this.getClass().getClassLoader().getResource("images/stop.png");
-			this.image.setIcon(new ImageIcon(stopurl));
+			this.image.setIcon(IconThemeHelper.getImageIcon("show-console") );
 			addComppnent(this, this.image, 0, 0, 1, 1, 0, 0,
 					GridBagConstraints.NONE, GridBagConstraints.CENTER);
 
Index: branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/preferences/network/FirewallPage.java
===================================================================
--- branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/preferences/network/FirewallPage.java	(revision 38563)
+++ branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/preferences/network/FirewallPage.java	(revision 38564)
@@ -160,7 +160,7 @@
 	public FirewallPage() {
 		super();
 		//icon = new ImageIcon(this.getClass().getClassLoader().getResource("images/shield.png"));
-		icon=PluginServices.getIconTheme().get("aplication-preferences-firewall");
+		icon=PluginServices.getIconTheme().get("edit-setup-firewall");
 		setParentID(NetworkPage.id);
 //		 checkbox
 		addComponent(httpEnabled = new JCheckBox(PluginServices.getText(this,
Index: branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/preferences/network/NetworkPage.java
===================================================================
--- branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/preferences/network/NetworkPage.java	(revision 38563)
+++ branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/preferences/network/NetworkPage.java	(revision 38564)
@@ -133,7 +133,7 @@
 		super();
 		id = this.getClass().getName();
 		// icon = new ImageIcon(this.getClass().getClassLoader().getResource("images/network.png"));
-		icon=PluginServices.getIconTheme().get("aplication-preferences-network");
+		icon=PluginServices.getIconTheme().get("edit-setup-network");
 		lblNetworkStatus = new JLabel();
 		lblNetworkStatus.setFont(lblNetworkStatus.getFont().deriveFont(Font.BOLD));
 		lblNetworkStatus.setText(PluginServices.getText(this, "optinos.network.click_to_test_connection"));
Index: branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/preferences/general/FolderingPage.java
===================================================================
--- branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/preferences/general/FolderingPage.java	(revision 38563)
+++ branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/preferences/general/FolderingPage.java	(revision 38564)
@@ -117,7 +117,7 @@
 	public FolderingPage() {
 		super();
 		setParentID(GeneralPage.id);
-		icon = PluginServices.getIconTheme().get("folder-icon");
+		icon = PluginServices.getIconTheme().get("edit-setup-foldering");
 
 		btnFileChooserAction = new ActionListener() {
 			public void actionPerformed(ActionEvent e) {
Index: branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/preferences/general/SkinPreferences.java
===================================================================
--- branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/preferences/general/SkinPreferences.java	(revision 38563)
+++ branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/preferences/general/SkinPreferences.java	(revision 38564)
@@ -39,7 +39,7 @@
 		// TODO Auto-generated constructor stub
 		id = this.getClass().getName();
 		setParentID(GeneralPage.id);
-		icon = PluginServices.getIconTheme().get("gnome-settings-theme");
+		icon = PluginServices.getIconTheme().get("edit-setup-skin");
 	}
 
 	public void setChangesApplied() {
Index: branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/preferences/general/IconThemePanelPage.xml
===================================================================
--- branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/preferences/general/IconThemePanelPage.xml	(revision 0)
+++ branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/preferences/general/IconThemePanelPage.xml	(revision 38564)
@@ -0,0 +1,412 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<object classname="com.jeta.forms.store.memento.FormPackage">
+ <at name="fileversion">
+  <object classname="com.jeta.forms.store.memento.FormsVersion2">
+   <at name="major">2</at>
+   <at name="minor">0</at>
+   <at name="sub">0</at>
+  </object>
+ </at>
+ <at name="form">
+  <object classname="com.jeta.forms.store.memento.FormMemento">
+   <super classname="com.jeta.forms.store.memento.ComponentMemento">
+    <at name="cellconstraints">
+     <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
+      <at name="column">1</at>
+      <at name="row">1</at>
+      <at name="colspan">1</at>
+      <at name="rowspan">1</at>
+      <at name="halign">default</at>
+      <at name="valign">default</at>
+      <at name="insets" object="insets">0,0,0,0</at>
+     </object>
+    </at>
+    <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
+   </super>
+   <at name="id">N593826fD13838cef220CB8000</at>
+   <at name="rowspecs">CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE</at>
+   <at name="colspecs">FILL:DEFAULT:NONE,FILL:DEFAULT:NONE,FILL:DEFAULT:GROW(1.0),FILL:DEFAULT:NONE</at>
+   <at name="components">
+    <object classname="java.util.LinkedList">
+     <item >
+      <at name="value">
+       <object classname="com.jeta.forms.store.memento.BeanMemento">
+        <super classname="com.jeta.forms.store.memento.ComponentMemento">
+         <at name="cellconstraints">
+          <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
+           <at name="column">2</at>
+           <at name="row">2</at>
+           <at name="colspan">3</at>
+           <at name="rowspan">1</at>
+           <at name="halign">default</at>
+           <at name="valign">default</at>
+           <at name="insets" object="insets">0,0,0,0</at>
+          </object>
+         </at>
+         <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
+        </super>
+        <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
+        <at name="beanclass">com.jeta.forms.components.label.JETALabel</at>
+        <at name="beanproperties">
+         <object classname="com.jeta.forms.store.memento.PropertiesMemento">
+          <at name="classname">com.jeta.forms.components.label.JETALabel</at>
+          <at name="properties">
+           <object classname="com.jeta.forms.store.support.PropertyMap">
+            <at name="text">_Icon_themes_availables</at>
+            <at name="height">17</at>
+            <at name="width">878</at>
+            <at name="name">label_title</at>
+            <at name="fill">
+             <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
+              <at name="name">fill</at>
+             </object>
+            </at>
+            <at name="border">
+             <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
+              <super classname="com.jeta.forms.store.properties.BorderProperty">
+               <at name="name">border</at>
+              </super>
+              <at name="borders">
+               <object classname="java.util.LinkedList">
+                <item >
+                 <at name="value">
+                  <object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
+                   <super classname="com.jeta.forms.store.properties.BorderProperty">
+                    <at name="name">border</at>
+                   </super>
+                  </object>
+                 </at>
+                </item>
+               </object>
+              </at>
+             </object>
+            </at>
+           </object>
+          </at>
+         </object>
+        </at>
+       </object>
+      </at>
+     </item>
+     <item >
+      <at name="value">
+       <object classname="com.jeta.forms.store.memento.BeanMemento">
+        <super classname="com.jeta.forms.store.memento.ComponentMemento">
+         <at name="cellconstraints">
+          <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
+           <at name="column">2</at>
+           <at name="row">3</at>
+           <at name="colspan">3</at>
+           <at name="rowspan">1</at>
+           <at name="halign">default</at>
+           <at name="valign">default</at>
+           <at name="insets" object="insets">0,0,0,0</at>
+          </object>
+         </at>
+         <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
+        </super>
+        <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
+        <at name="beanclass">com.jeta.forms.components.label.JETALabel</at>
+        <at name="beanproperties">
+         <object classname="com.jeta.forms.store.memento.PropertiesMemento">
+          <at name="classname">com.jeta.forms.components.label.JETALabel</at>
+          <at name="properties">
+           <object classname="com.jeta.forms.store.support.PropertyMap">
+            <at name="text">_Select_an_icon_theme_as_default_for_use_in_the_application</at>
+            <at name="height">17</at>
+            <at name="width">878</at>
+            <at name="name">label_selection</at>
+            <at name="fill">
+             <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
+              <at name="name">fill</at>
+             </object>
+            </at>
+            <at name="border">
+             <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
+              <super classname="com.jeta.forms.store.properties.BorderProperty">
+               <at name="name">border</at>
+              </super>
+              <at name="borders">
+               <object classname="java.util.LinkedList">
+                <item >
+                 <at name="value">
+                  <object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
+                   <super classname="com.jeta.forms.store.properties.BorderProperty">
+                    <at name="name">border</at>
+                   </super>
+                  </object>
+                 </at>
+                </item>
+               </object>
+              </at>
+             </object>
+            </at>
+           </object>
+          </at>
+         </object>
+        </at>
+       </object>
+      </at>
+     </item>
+     <item >
+      <at name="value">
+       <object classname="com.jeta.forms.store.memento.BeanMemento">
+        <super classname="com.jeta.forms.store.memento.ComponentMemento">
+         <at name="cellconstraints">
+          <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
+           <at name="column">2</at>
+           <at name="row">6</at>
+           <at name="colspan">3</at>
+           <at name="rowspan">1</at>
+           <at name="halign">default</at>
+           <at name="valign">default</at>
+           <at name="insets" object="insets">0,0,0,0</at>
+          </object>
+         </at>
+         <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
+        </super>
+        <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
+        <at name="beanclass">com.jeta.forms.components.label.JETALabel</at>
+        <at name="beanproperties">
+         <object classname="com.jeta.forms.store.memento.PropertiesMemento">
+          <at name="classname">com.jeta.forms.components.label.JETALabel</at>
+          <at name="properties">
+           <object classname="com.jeta.forms.store.support.PropertyMap">
+            <at name="text">_You_can_export_the_default_icon_theme_to_use_as_base_for_create_a_custom_icon_theme</at>
+            <at name="height">17</at>
+            <at name="width">878</at>
+            <at name="name">label_export</at>
+            <at name="fill">
+             <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
+              <at name="name">fill</at>
+             </object>
+            </at>
+            <at name="border">
+             <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
+              <super classname="com.jeta.forms.store.properties.BorderProperty">
+               <at name="name">border</at>
+              </super>
+              <at name="borders">
+               <object classname="java.util.LinkedList">
+                <item >
+                 <at name="value">
+                  <object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
+                   <super classname="com.jeta.forms.store.properties.BorderProperty">
+                    <at name="name">border</at>
+                   </super>
+                  </object>
+                 </at>
+                </item>
+               </object>
+              </at>
+             </object>
+            </at>
+           </object>
+          </at>
+         </object>
+        </at>
+       </object>
+      </at>
+     </item>
+     <item >
+      <at name="value">
+       <object classname="com.jeta.forms.store.memento.BeanMemento">
+        <super classname="com.jeta.forms.store.memento.ComponentMemento">
+         <at name="cellconstraints">
+          <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
+           <at name="column">3</at>
+           <at name="row">4</at>
+           <at name="colspan">1</at>
+           <at name="rowspan">1</at>
+           <at name="halign">default</at>
+           <at name="valign">default</at>
+           <at name="insets" object="insets">0,0,0,0</at>
+          </object>
+         </at>
+         <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
+        </super>
+        <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
+        <at name="beanclass">javax.swing.JComboBox</at>
+        <at name="beanproperties">
+         <object classname="com.jeta.forms.store.memento.PropertiesMemento">
+          <at name="classname">javax.swing.JComboBox</at>
+          <at name="properties">
+           <object classname="com.jeta.forms.store.support.PropertyMap">
+            <at name="height">23</at>
+            <at name="items">
+             <object classname="com.jeta.forms.store.properties.ItemsProperty">
+              <at name="name">items</at>
+             </object>
+            </at>
+            <at name="width">846</at>
+            <at name="name">combo_selection</at>
+            <at name="border">
+             <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
+              <super classname="com.jeta.forms.store.properties.BorderProperty">
+               <at name="name">border</at>
+              </super>
+              <at name="borders">
+               <object classname="java.util.LinkedList">
+                <item >
+                 <at name="value">
+                  <object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
+                   <super classname="com.jeta.forms.store.properties.BorderProperty">
+                    <at name="name">border</at>
+                   </super>
+                  </object>
+                 </at>
+                </item>
+               </object>
+              </at>
+             </object>
+            </at>
+           </object>
+          </at>
+         </object>
+        </at>
+       </object>
+      </at>
+     </item>
+     <item >
+      <at name="value">
+       <object classname="com.jeta.forms.store.memento.BeanMemento">
+        <super classname="com.jeta.forms.store.memento.ComponentMemento">
+         <at name="cellconstraints">
+          <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
+           <at name="column">3</at>
+           <at name="row">8</at>
+           <at name="colspan">1</at>
+           <at name="rowspan">1</at>
+           <at name="halign">left</at>
+           <at name="valign">default</at>
+           <at name="insets" object="insets">0,0,0,0</at>
+          </object>
+         </at>
+         <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
+        </super>
+        <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
+        <at name="beanclass">javax.swing.JButton</at>
+        <at name="beanproperties">
+         <object classname="com.jeta.forms.store.memento.PropertiesMemento">
+          <at name="classname">javax.swing.JButton</at>
+          <at name="properties">
+           <object classname="com.jeta.forms.store.support.PropertyMap">
+            <at name="text">_Export_default_icon_theme</at>
+            <at name="height">22</at>
+            <at name="width">212</at>
+            <at name="name">button_export</at>
+            <at name="actionCommand">_Export_default_icon_theme</at>
+            <at name="border">
+             <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
+              <super classname="com.jeta.forms.store.properties.BorderProperty">
+               <at name="name">border</at>
+              </super>
+              <at name="borders">
+               <object classname="java.util.LinkedList">
+                <item >
+                 <at name="value">
+                  <object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
+                   <super classname="com.jeta.forms.store.properties.BorderProperty">
+                    <at name="name">border</at>
+                   </super>
+                  </object>
+                 </at>
+                </item>
+               </object>
+              </at>
+             </object>
+            </at>
+           </object>
+          </at>
+         </object>
+        </at>
+       </object>
+      </at>
+     </item>
+    </object>
+   </at>
+   <at name="properties">
+    <object classname="com.jeta.forms.store.memento.PropertiesMemento">
+     <at name="classname">com.jeta.forms.gui.form.GridView</at>
+     <at name="properties">
+      <object classname="com.jeta.forms.store.support.PropertyMap">
+       <at name="name"></at>
+       <at name="fill">
+        <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
+         <at name="name">fill</at>
+        </object>
+       </at>
+       <at name="scollBars">
+        <object classname="com.jeta.forms.store.properties.ScrollBarsProperty">
+         <at name="name">scollBars</at>
+         <at name="verticalpolicy">21</at>
+         <at name="horizontalpolicy">31</at>
+        </object>
+       </at>
+       <at name="border">
+        <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
+         <super classname="com.jeta.forms.store.properties.BorderProperty">
+          <at name="name">border</at>
+         </super>
+         <at name="borders">
+          <object classname="java.util.LinkedList"/>
+         </at>
+        </object>
+       </at>
+      </object>
+     </at>
+    </object>
+   </at>
+   <at name="cellpainters">
+    <object classname="com.jeta.forms.store.support.Matrix">
+     <at name="rows">
+      <object classname="[Ljava.lang.Object;" size="9">
+       <at name="item" index="0">
+        <object classname="[Ljava.lang.Object;" size="4"/>
+       </at>
+       <at name="item" index="1">
+        <object classname="[Ljava.lang.Object;" size="4"/>
+       </at>
+       <at name="item" index="2">
+        <object classname="[Ljava.lang.Object;" size="4"/>
+       </at>
+       <at name="item" index="3">
+        <object classname="[Ljava.lang.Object;" size="4"/>
+       </at>
+       <at name="item" index="4">
+        <object classname="[Ljava.lang.Object;" size="4"/>
+       </at>
+       <at name="item" index="5">
+        <object classname="[Ljava.lang.Object;" size="4"/>
+       </at>
+       <at name="item" index="6">
+        <object classname="[Ljava.lang.Object;" size="4"/>
+       </at>
+       <at name="item" index="7">
+        <object classname="[Ljava.lang.Object;" size="4"/>
+       </at>
+       <at name="item" index="8">
+        <object classname="[Ljava.lang.Object;" size="4"/>
+       </at>
+      </object>
+     </at>
+    </object>
+   </at>
+   <at name="rowgroups">
+    <object classname="com.jeta.forms.store.memento.FormGroupSet">
+     <at name="groups">
+      <object classname="java.util.HashMap"/>
+     </at>
+    </object>
+   </at>
+   <at name="colgroups">
+    <object classname="com.jeta.forms.store.memento.FormGroupSet">
+     <at name="groups">
+      <object classname="java.util.HashMap"/>
+     </at>
+    </object>
+   </at>
+  </object>
+ </at>
+</object>

Property changes on: branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/preferences/general/IconThemePanelPage.xml
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/preferences/general/IconThemeExtensionsPage.java
===================================================================
--- branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/preferences/general/IconThemeExtensionsPage.java	(revision 0)
+++ branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/preferences/general/IconThemeExtensionsPage.java	(revision 38564)
@@ -0,0 +1,98 @@
+package org.gvsig.coreplugin.preferences.general;
+
+import java.awt.BorderLayout;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.swing.ComboBoxModel;
+import javax.swing.DefaultComboBoxModel;
+import javax.swing.ImageIcon;
+import javax.swing.JPanel;
+
+import org.gvsig.andami.PluginServices;
+import org.gvsig.andami.preferences.AbstractPreferencePage;
+import org.gvsig.tools.swing.api.ToolsSwingLocator;
+import org.gvsig.tools.swing.icontheme.IconTheme;
+import org.gvsig.tools.swing.icontheme.IconThemeManager;
+
+public class IconThemeExtensionsPage extends AbstractPreferencePage {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 4369071892027860769L;
+
+	private String id;
+	private boolean changed = false;
+
+	public IconThemeExtensionsPage() {
+		super();
+		initialize();
+		id = this.getClass().getName();
+		setParentID(GeneralPage.class.getName());
+	}
+
+	public String getID() {
+		return id;
+	}
+
+	public String getTitle() {
+		return PluginServices.getText(this, "_Icon_theme");
+	}
+
+	public JPanel getPanel() {
+		return this;
+	}
+
+	public void initializeValues() {
+	}
+
+	public void storeValues() {
+	}
+
+	public void initializeDefaults() {
+
+	}
+
+	public ImageIcon getIcon() {
+		return PluginServices.getIconTheme().get("edit-setup-icontheme");
+	}
+
+	public boolean isValueChanged() {
+		return changed;
+	}
+
+	public void setChangesApplied() {
+		changed = false;
+	}
+
+	private void initialize() {
+		IconThemeManager iconManager = ToolsSwingLocator.getIconThemeManager();
+		this.setLayout(new BorderLayout());
+		
+		IconThemePanelPage panel = new IconThemePanelPage();
+
+		// LLenar la lista con los temas disponibles
+		List<IconTheme> themes = new ArrayList<IconTheme>(); 
+		Iterator<IconTheme> themesIt = iconManager.iterator();
+		while( themesIt.hasNext() ) {
+			IconTheme theme = themesIt.next();
+			themes.add(theme);
+		}
+		ComboBoxModel model = new DefaultComboBoxModel(themes.toArray());
+		panel.combo_selection.setModel(model);
+		
+		// Traducir las etiquetas del panel
+		panel.label_title.setText(translate(panel.label_title.getText()));
+		panel.label_selection.setText(translate(panel.label_selection.getText()));
+		
+		this.add(panel, BorderLayout.CENTER);
+	}
+
+	private String translate(String s) {
+		return PluginServices.getText(this,s);
+	}
+	
+} 
+

Property changes on: branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/preferences/general/IconThemeExtensionsPage.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/preferences/general/IconThemePanelPage.java
===================================================================
--- branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/preferences/general/IconThemePanelPage.java	(revision 0)
+++ branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/preferences/general/IconThemePanelPage.java	(revision 38564)
@@ -0,0 +1,160 @@
+package org.gvsig.coreplugin.preferences.general;
+
+//import com.jeta.open.i18n.I18NUtils;
+import java.awt.BorderLayout;
+import java.awt.ComponentOrientation;
+import java.awt.Container;
+import java.awt.Dimension;
+
+import javax.swing.Box;
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+
+import com.jgoodies.forms.layout.CellConstraints;
+import com.jgoodies.forms.layout.FormLayout;
+
+public class IconThemePanelPage extends JPanel {
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 732724276675072878L;
+
+	JLabel label_title = new JLabel();
+	JLabel label_selection = new JLabel();
+	JLabel label_export = new JLabel();
+	JComboBox combo_selection = new JComboBox();
+	JButton button_export = new JButton();
+
+	/**
+	 * Default constructor
+	 */
+	public IconThemePanelPage() {
+		initializePanel();
+	}
+
+	/**
+	 * Adds fill components to empty cells in the first row and first column of
+	 * the grid. This ensures that the grid spacing will be the same as shown in
+	 * the designer.
+	 * 
+	 * @param cols
+	 *            an array of column indices in the first row where fill
+	 *            components should be added.
+	 * @param rows
+	 *            an array of row indices in the first column where fill
+	 *            components should be added.
+	 */
+	void addFillComponents(Container panel, int[] cols, int[] rows) {
+		Dimension filler = new Dimension(10, 10);
+
+		boolean filled_cell_11 = false;
+		CellConstraints cc = new CellConstraints();
+		if (cols.length > 0 && rows.length > 0) {
+			if (cols[0] == 1 && rows[0] == 1) {
+				/** add a rigid area */
+				panel.add(Box.createRigidArea(filler), cc.xy(1, 1));
+				filled_cell_11 = true;
+			}
+		}
+
+		for (int index = 0; index < cols.length; index++) {
+			if (cols[index] == 1 && filled_cell_11) {
+				continue;
+			}
+			panel.add(Box.createRigidArea(filler), cc.xy(cols[index], 1));
+		}
+
+		for (int index = 0; index < rows.length; index++) {
+			if (rows[index] == 1 && filled_cell_11) {
+				continue;
+			}
+			panel.add(Box.createRigidArea(filler), cc.xy(1, rows[index]));
+		}
+
+	}
+
+	/**
+	 * Helper method to load an image file from the CLASSPATH
+	 * 
+	 * @param imageName
+	 *            the package and name of the file to load relative to the
+	 *            CLASSPATH
+	 * @return an ImageIcon instance with the specified image file
+	 * @throws IllegalArgumentException
+	 *             if the image resource cannot be loaded.
+	 */
+	public ImageIcon loadImage(String imageName) {
+		try {
+			ClassLoader classloader = getClass().getClassLoader();
+			java.net.URL url = classloader.getResource(imageName);
+			if (url != null) {
+				ImageIcon icon = new ImageIcon(url);
+				return icon;
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		throw new IllegalArgumentException("Unable to load image: " + imageName);
+	}
+
+	/**
+	 * Method for recalculating the component orientation for right-to-left
+	 * Locales.
+	 * 
+	 * @param orientation
+	 *            the component orientation to be applied
+	 */
+	public void applyComponentOrientation(ComponentOrientation orientation) {
+		// Not yet implemented...
+		// I18NUtils.applyComponentOrientation(this, orientation);
+		super.applyComponentOrientation(orientation);
+	}
+
+	public JPanel createPanel() {
+		JPanel jpanel1 = new JPanel();
+		FormLayout formlayout1 = new FormLayout(
+				"FILL:DEFAULT:NONE,FILL:DEFAULT:NONE,FILL:DEFAULT:GROW(1.0),FILL:DEFAULT:NONE",
+				"CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE");
+		CellConstraints cc = new CellConstraints();
+		jpanel1.setLayout(formlayout1);
+
+		label_title.setName("label_title");
+		label_title.setText("_Icon_themes_availables");
+		jpanel1.add(label_title, cc.xywh(2, 2, 3, 1));
+
+		label_selection.setName("label_selection");
+		label_selection
+				.setText("_Select_an_icon_theme_as_default_for_use_in_the_application");
+		jpanel1.add(label_selection, cc.xywh(2, 3, 3, 1));
+
+		label_export.setName("label_export");
+		label_export
+				.setText("_You_can_export_the_default_icon_theme_to_use_as_base_for_create_a_custom_icon_theme");
+		jpanel1.add(label_export, cc.xywh(2, 6, 3, 1));
+
+		combo_selection.setName("combo_selection");
+		jpanel1.add(combo_selection, cc.xy(3, 4));
+
+		button_export.setActionCommand("_Export_default_icon_theme");
+		button_export.setName("button_export");
+		button_export.setText("_Export_default_icon_theme");
+		jpanel1.add(button_export, new CellConstraints(3, 8, 1, 1,
+				CellConstraints.LEFT, CellConstraints.DEFAULT));
+
+		addFillComponents(jpanel1, new int[] { 1, 2, 3, 4 }, new int[] { 1, 2,
+				3, 4, 5, 6, 7, 8, 9 });
+		return jpanel1;
+	}
+
+	/**
+	 * Initializer
+	 */
+	protected void initializePanel() {
+		setLayout(new BorderLayout());
+		add(createPanel(), BorderLayout.CENTER);
+	}
+
+}

Property changes on: branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/preferences/general/IconThemePanelPage.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/preferences/general/ExtensionPage.java
===================================================================
--- branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/preferences/general/ExtensionPage.java	(revision 38563)
+++ branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/preferences/general/ExtensionPage.java	(revision 38564)
@@ -61,7 +61,7 @@
 	 */
 	public ExtensionPage(Extension extension) {
 		super();
-		icon = PluginServices.getIconTheme().get("emblem-work");
+		icon = PluginServices.getIconTheme().get("edit-setup-extension");
 		this.extension=extension;
 		setParentID(ExtensionsPage.class.getName());
 		initialize();
Index: branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/preferences/general/GeneralPage.java
===================================================================
--- branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/preferences/general/GeneralPage.java	(revision 38563)
+++ branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/preferences/general/GeneralPage.java	(revision 38564)
@@ -84,7 +84,7 @@
 	}
 
 	private void initialize() {
-		icon = PluginServices.getIconTheme().get("emblem-work");
+		icon = PluginServices.getIconTheme().get("edit-setup-general");
 		// remember windows position check box
 		addComponent(rememberWindowPosition = new JCheckBox(PluginServices.getText(this, "options.general.remember_windows_pos")));
 		// remember windows sizes check box
Index: branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/preferences/general/DirExtensionsPage.java
===================================================================
--- branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/preferences/general/DirExtensionsPage.java	(revision 38563)
+++ branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/preferences/general/DirExtensionsPage.java	(revision 38564)
@@ -39,7 +39,7 @@
 	}
 
 	private void initialize() {
-		icon = PluginServices.getIconTheme().get("file-manager");
+		icon = PluginServices.getIconTheme().get("edit-setup-dirextension");
 	    this.setLayout(new BorderLayout());
 	    this.setSize(new java.awt.Dimension(386,177));
 	    this.add(getPN(), java.awt.BorderLayout.NORTH);
Index: branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/preferences/general/AppearancePage.java
===================================================================
--- branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/preferences/general/AppearancePage.java	(revision 38563)
+++ branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/preferences/general/AppearancePage.java	(revision 38564)
@@ -120,7 +120,7 @@
 	public AppearancePage() {
         super();
         id = this.getClass().getName();
-        icon = PluginServices.getIconTheme().get("gnome-settings-theme");
+        icon = PluginServices.getIconTheme().get("edit-setup-appearance");
         setParentID(GeneralPage.id);
         // install the plastic look and feel before getting the laf combobox
     	UIManager.installLookAndFeel("Plastic XP", "com.jgoodies.looks.plastic.PlasticXPLookAndFeel");
Index: branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/preferences/general/ExtensionsPage.java
===================================================================
--- branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/preferences/general/ExtensionsPage.java	(revision 38563)
+++ branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/preferences/general/ExtensionsPage.java	(revision 38564)
@@ -20,7 +20,7 @@
 	 */
 	public ExtensionsPage() {
 		super();
-		icon = PluginServices.getIconTheme().get("aplication-preferences-extensions");
+		icon = PluginServices.getIconTheme().get("edit-setup-extensions");
 		setParentID(GeneralPage.class.getName());
 		initialize();
 	}
Index: branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/preferences/general/ScreenSettingsPage.java
===================================================================
--- branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/preferences/general/ScreenSettingsPage.java	(revision 38563)
+++ branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/preferences/general/ScreenSettingsPage.java	(revision 38564)
@@ -48,7 +48,7 @@
     public ScreenSettingsPage() {
         super();
         setParentID(GeneralPage.id);
-        icon=PluginServices.getIconTheme().get("aplication-preferences-screensetting");
+        icon=PluginServices.getIconTheme().get("edit-setup-screensetting");
         addComponent(PluginServices.getText(this, "resolution") + ":",
     			txtResolution = new JTextField("", 15));
 
Index: branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/preferences/general/LanguagePage.java
===================================================================
--- branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/preferences/general/LanguagePage.java	(revision 38563)
+++ branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/preferences/general/LanguagePage.java	(revision 38564)
@@ -81,7 +81,7 @@
 	}
 
 	private void initialize() {
-		icon=PluginServices.getIconTheme().get("aplication-preferences-language");
+		icon=PluginServices.getIconTheme().get("edit-setup-language");
 		this.setLayout(new BorderLayout());
 		this.setSize(new java.awt.Dimension(386, 177));
 		this.add(getPN(), java.awt.BorderLayout.NORTH);
Index: branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/preferences/general/BrowserControlPage.java
===================================================================
--- branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/preferences/general/BrowserControlPage.java	(revision 38563)
+++ branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/preferences/general/BrowserControlPage.java	(revision 38564)
@@ -105,7 +105,7 @@
 	public BrowserControlPage() {
 		super();
 		id = this.getClass().getName();
-		icon = PluginServices.getIconTheme().get("browser-icon");
+		icon = PluginServices.getIconTheme().get("edit-setup-browsercontrol");
 		setParentID(GeneralPage.id);
 
 		JPanel aux;
Index: branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/mdiManager/NewSkin.java
===================================================================
--- branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/mdiManager/NewSkin.java	(revision 38563)
+++ branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/mdiManager/NewSkin.java	(revision 38564)
@@ -147,85 +147,7 @@
     private Cursor lastCursor = null;
 	private ImageIcon image;
 	private String typeDesktop;
-
-
-	private List<UIActionTool>actionTools = new ArrayList<UIActionTool>();
 	
-	private class MyActionTool implements UIActionTool {
-		private String extensionName;
-		private String name;
-		private String text;
-		private String command;
-		private String iconName;
-		private String enableText;
-		private int position;
-		private String tip;
-		
-		MyActionTool(String extensionName, ActionTool action) {
-			this.extensionName = extensionName;
-			this.name = action.getName();
-			this.text = action.getText();
-			this.command = action.getActionCommand();
-			this.iconName = action.getIcon();
-			this.enableText = action.getEnableText();
-			this.position = action.getPosition();
-			this.tip = action.getTooltip();
-		}
-
-		public MyActionTool(String extensionName, Menu action) {
-			this.extensionName = extensionName;
-			this.name = null;
-			this.text = action.getText();
-			this.command = action.getActionCommand();
-			this.iconName = action.getIcon();
-			this.enableText = action.getEnableText();
-			this.position = action.getPosition();
-			this.tip = action.getTooltip();
-		}
-
-		public MyActionTool(String extensionName, SelectableTool action) {
-			this.extensionName = extensionName;
-			this.name = action.getName();
-			this.text = action.getText();
-			this.command = action.getActionCommand();
-			this.iconName = action.getIcon();
-			this.enableText = action.getEnableText();
-			this.position = action.getPosition();
-			this.tip = action.getTooltip();
-		}
-
-		public String getExtensionName() {
-			return this.extensionName;
-		}
-
-		public String getName() {
-			return this.name;
-		}
-
-		public String getText() {
-			return this.text;
-		}
-
-		public String getCommand() {
-			return this.command;
-		}
-
-		public String getIconName() {
-			return this.iconName;
-		}
-
-		public String getEnableText() {
-			return this.enableText;
-		}
-
-		public int getPosition() {
-			return this.position;
-		}
-		public String getTooptip() {
-			return this.tip;
-		}
-	}
-	
 	//Anyade barras de scroll
 	private void addScrolledDesktopPanel( JFrame parent, MyDesktopPane desktopPane) {
 		JPanel toppanel;
@@ -851,8 +773,11 @@
      * @see com.iver.andami.plugins.IExtension#execute(java.lang.String)
      */
     public void execute(String actionCommand) {
-        if (actionCommand.equals("cascada")) {
-        } else if (actionCommand.equals("mosaico")) {
+        if ("window-cascade".equalsIgnoreCase(actionCommand)) {
+        	logger.info("action window-cascade not implemented.");
+
+        } else if ("window-tile".equalsIgnoreCase(actionCommand)) {
+        	logger.info("action window-tile not implemented.");
         }
     }
 
@@ -1322,19 +1247,4 @@
         ToolsSwingLocator.getWindowManager().showWindow(panel, title, mode);
     }
     
-    public void registerAction(String extensionName, ActionTool action) {
-    	this.actionTools.add(new MyActionTool(extensionName, action));
-    }
-    
-    public void registerAction(String extensionName, Menu action) {
-    	this.actionTools.add(new MyActionTool(extensionName, action));
-    }
-    
-    public void registerAction(String extensionName, SelectableTool action) {
-    	this.actionTools.add(new MyActionTool(extensionName, action));
-    }
-    
-    public Iterator<UIActionTool> getActionTools() {
-    	return this.actionTools.iterator();
-    }
 }
Index: branches/v2_0_0_prep/build/projects/gvsig-base/pom.xml
===================================================================
--- branches/v2_0_0_prep/build/projects/gvsig-base/pom.xml	(revision 38563)
+++ branches/v2_0_0_prep/build/projects/gvsig-base/pom.xml	(revision 38564)
@@ -58,7 +58,9 @@
         <module>../../../org.gvsig.personaldb</module>
 		<module>../../../appgvSIG</module>
         <module>../../../org.gvsig.app.document.table.app</module>
+        <!-- 
         <module>../../../org.gvsig.app.document.layout.app</module>
+         -->
 		<module>../../../org.gvsig.installer</module>
 		<module>../../../org.gvsig.installer.app</module>	
   </modules>
Index: branches/v2_0_0_prep/build/projects/gvsig-standard/pom.xml
===================================================================
--- branches/v2_0_0_prep/build/projects/gvsig-standard/pom.xml	(revision 38563)
+++ branches/v2_0_0_prep/build/projects/gvsig-standard/pom.xml	(revision 38564)
@@ -26,8 +26,10 @@
 	<modules>
 		<module>../gvsig-base</module>
 		
+		<!-- 
 		<module>../../../extIconThemeBase</module>
-
+        -->
+        
         <!-- developer -->
 		<module>../../../org.gvsig.mkmvnproject</module>
 
Index: branches/v2_0_0_prep/extensions/extGeoDB/images/jdbc.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: branches/v2_0_0_prep/extensions/extGeoDB/images/save/jdbc.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/extGeoDB/images/save/jdbc.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/extDwg/src/org/gvsig/dwg/DWGRegisterExtension.java
===================================================================
--- branches/v2_0_0_prep/extensions/extDwg/src/org/gvsig/dwg/DWGRegisterExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/extDwg/src/org/gvsig/dwg/DWGRegisterExtension.java	(revision 38564)
@@ -21,8 +21,11 @@
  */
 package org.gvsig.dwg;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.plugins.Extension;
 import org.gvsig.dwg.fmap.dal.store.dwg.DWGLibrary;
+import org.gvsig.dwg.fmap.dal.store.dwg.DWGStoreProvider;
+import org.gvsig.fmap.mapcontext.MapContextLocator;
 
 /**
  * Dummy DWG extension, as all the registration happens in the
@@ -37,12 +40,11 @@
 	}
 
 	public void initialize() {
-		// Nothing to do
+		IconThemeHelper.registerIcon("layer", "layer-icon-dwg", this);
 	}
 
 	public void postInitialize() {
-		super.postInitialize();
-		// Nothing to do
+		MapContextLocator.getMapContextManager().registerIconLayer(DWGStoreProvider.NAME, "layer-icon-dwg");
 	}
 
 	public boolean isEnabled() {
Index: branches/v2_0_0_prep/extensions/extDwg/resources/images/layer/layer-icon-dwg.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/extDwg/resources/images/layer/layer-icon-dwg.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/extDalTransformEventTheme/config/config.xml
===================================================================
--- branches/v2_0_0_prep/extensions/extDalTransformEventTheme/config/config.xml	(revision 38563)
+++ branches/v2_0_0_prep/extensions/extDalTransformEventTheme/config/config.xml	(revision 38564)
@@ -4,5 +4,7 @@
 	<depends plugin-name="org.gvsig.app"/>
 	<depends plugin-name="org.gvsig.daltransform.app.mainplugin"/>
 	<resourceBundle name="text"/>
-	<extensions><extension class-name="VOID" active="false"/></extensions>		
+	<extensions>
+	   <extension class-name="org.gvsig.andami.LibraryExtension" active="false"/>
+	</extensions>		
 </plugin-config>
\ No newline at end of file
Index: branches/v2_0_0_prep/extensions/extWFS2/images/icoLayer.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: branches/v2_0_0_prep/extensions/extWFS2/images/wfs-properties/wfs-properties-zoom-back.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/extWFS2/images/wfs-properties/wfs-properties-zoom-back.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/extWFS2/images/wfs-properties/wfs-properties-undo.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/extWFS2/images/wfs-properties/wfs-properties-undo.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/extWFS2/images/wfs-properties/wfs-properties-zoom-plus.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/extWFS2/images/wfs-properties/wfs-properties-zoom-plus.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/extWFS2/images/wfs-properties/wfs-properties-move.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/extWFS2/images/wfs-properties/wfs-properties-move.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/extWFS2/images/wfs-properties/wfs-properties-zoom-in.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/extWFS2/images/wfs-properties/wfs-properties-zoom-in.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/extWFS2/images/wfs-properties/wfs-properties-zoom-out.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/extWFS2/images/wfs-properties/wfs-properties-zoom-out.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/extWFS2/images/wfs-properties/wfs-properties-zoom-all.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/extWFS2/images/wfs-properties/wfs-properties-zoom-all.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/extWFS2/images/wfs-properties/wfs-properties-query-area.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/extWFS2/images/wfs-properties/wfs-properties-query-area.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/extWFS2/images/wfs-properties/wfs-properties-query-distance.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/extWFS2/images/wfs-properties/wfs-properties-query-distance.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/extWFS2/images/wfs-properties/wfs-properties-zoom-minus.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/extWFS2/images/wfs-properties/wfs-properties-zoom-minus.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/extWFS2/images/wfs-properties/wfs-properties-pan.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/extWFS2/images/wfs-properties/wfs-properties-pan.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/extWFS2/images/layer/layer-icon-wfs.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/extWFS2/images/layer/layer-icon-wfs.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/extWFS2/src/org/gvsig/fmap/dal/store/wfs/WFSStoreProvider.java
===================================================================
--- branches/v2_0_0_prep/extensions/extWFS2/src/org/gvsig/fmap/dal/store/wfs/WFSStoreProvider.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/extWFS2/src/org/gvsig/fmap/dal/store/wfs/WFSStoreProvider.java	(revision 38564)
@@ -35,9 +35,6 @@
 
 import org.cresques.cts.ICoordTrans;
 import org.cresques.cts.IProjection;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import org.gvsig.fmap.crs.CRSFactory;
 import org.gvsig.fmap.dal.DALLocator;
 import org.gvsig.fmap.dal.DataManager;
@@ -87,7 +84,6 @@
 import org.gvsig.remoteclient.wfs.request.WFSGetFeatureRequestInformation;
 import org.gvsig.remoteclient.wfs.request.WFSTransactionRequestInformation;
 import org.gvsig.tools.ToolsLocator;
-import org.gvsig.tools.dataTypes.DataTypesManager;
 import org.gvsig.tools.dynobject.DynStruct;
 import org.gvsig.tools.evaluator.EvaluatorFieldValue;
 import org.gvsig.tools.evaluator.EvaluatorFieldValueMatch;
@@ -96,6 +92,8 @@
 import org.gvsig.xmlschema.lib.api.XMLSchemaManager;
 import org.gvsig.xmlschema.lib.api.som.IXSGeometryTypeDefinition;
 import org.gvsig.xmlschema.lib.api.som.IXSTypeDefinition;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 /**
Index: branches/v2_0_0_prep/extensions/extWFS2/src/org/gvsig/fmap/dal/store/wfs/WFSFeatureFiller.java
===================================================================
--- branches/v2_0_0_prep/extensions/extWFS2/src/org/gvsig/fmap/dal/store/wfs/WFSFeatureFiller.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/extWFS2/src/org/gvsig/fmap/dal/store/wfs/WFSFeatureFiller.java	(revision 38564)
@@ -26,9 +26,6 @@
 import java.io.FileNotFoundException;
 import java.util.Iterator;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import org.gvsig.remoteclient.wfs.WFSFeature;
 import org.gvsig.tools.dataTypes.DataType;
 import org.gvsig.xmlschema.lib.api.XMLSchemaLocator;
@@ -45,6 +42,8 @@
 import org.gvsig.xmlschema.lib.api.som.IXSSimpleContent;
 import org.gvsig.xmlschema.lib.api.som.IXSSimpleTypeDefinition;
 import org.gvsig.xmlschema.lib.api.som.IXSTypeDefinition;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 /**
Index: branches/v2_0_0_prep/extensions/extWFS2/src/org/gvsig/wfs/gui/panels/model/WFSSelectedFeatureManager.java
===================================================================
--- branches/v2_0_0_prep/extensions/extWFS2/src/org/gvsig/wfs/gui/panels/model/WFSSelectedFeatureManager.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/extWFS2/src/org/gvsig/wfs/gui/panels/model/WFSSelectedFeatureManager.java	(revision 38564)
@@ -35,13 +35,12 @@
 import java.util.Iterator;
 import java.util.Locale;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import org.gvsig.fmap.dal.serverexplorer.wfs.WFSServerExplorer;
 import org.gvsig.remoteclient.wfs.WFSFeature;
 import org.gvsig.remoteclient.wfs.exceptions.WFSException;
 import org.gvsig.utils.StringComparator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 /**
Index: branches/v2_0_0_prep/extensions/extWFS2/src/org/gvsig/wfs/gui/panels/AbstractWFSPanel.java
===================================================================
--- branches/v2_0_0_prep/extensions/extWFS2/src/org/gvsig/wfs/gui/panels/AbstractWFSPanel.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/extWFS2/src/org/gvsig/wfs/gui/panels/AbstractWFSPanel.java	(revision 38564)
@@ -2,13 +2,12 @@
 
 import java.awt.Dimension;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import org.gvsig.fmap.dal.serverexplorer.wfs.WFSServerExplorer;
 import org.gvsig.gui.beans.panelGroup.panels.AbstractPanel;
 import org.gvsig.wfs.gui.panels.model.WFSSelectedFeature;
 import org.gvsig.wfs.gui.panels.model.WFSSelectedFeatureManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 
Index: branches/v2_0_0_prep/extensions/extWFS2/src/org/gvsig/wfs/gui/panels/WFSParamsPanel.java
===================================================================
--- branches/v2_0_0_prep/extensions/extWFS2/src/org/gvsig/wfs/gui/panels/WFSParamsPanel.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/extWFS2/src/org/gvsig/wfs/gui/panels/WFSParamsPanel.java	(revision 38564)
@@ -6,9 +6,6 @@
 
 import org.cresques.cts.IProjection;
 import org.geotools.filter.AbstractFilter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import org.gvsig.andami.PluginServices;
 import org.gvsig.app.gui.ILayerPanel;
 import org.gvsig.app.gui.WizardPanel;
@@ -39,6 +36,8 @@
 import org.gvsig.wfs.gui.panels.model.WFSSelectedFeature;
 import org.gvsig.wfs.gui.panels.model.WFSSelectedFeatureManager;
 import org.gvsig.wfs.gui.wizards.WFSWizard;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 /* gvSIG. Sistema de Informaci�n Geogr�fica de la Generalitat Valenciana
Index: branches/v2_0_0_prep/extensions/extWFS2/src/org/gvsig/wfs/gui/panels/WFSFilterPanel.java
===================================================================
--- branches/v2_0_0_prep/extensions/extWFS2/src/org/gvsig/wfs/gui/panels/WFSFilterPanel.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/extWFS2/src/org/gvsig/wfs/gui/panels/WFSFilterPanel.java	(revision 38564)
@@ -26,12 +26,6 @@
 import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreePath;
 
-import Zql.ZExp;
-import Zql.ZqlParser;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.messages.NotificationManager;
 import org.gvsig.app.gui.filter.ExpressionDataSource;
@@ -51,9 +45,14 @@
 import org.gvsig.wfs.gui.panels.fieldstree.FieldsTreeTableModel;
 import org.gvsig.wfs.gui.panels.model.WFSSelectedFeature;
 import org.gvsig.xmlschema.lib.api.som.IXSElementDeclaration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+import Zql.ZExp;
+import Zql.ZqlParser;
 
 
+
 /* gvSIG. Sistema de Informaci�n Geogr�fica de la Generalitat Valenciana
  *
  * Copyright (C) 2004 IVER T.I. and Generalitat Valenciana.
Index: branches/v2_0_0_prep/extensions/extWFS2/src/org/gvsig/wfs/gui/panels/WFSAreaPanel.java
===================================================================
--- branches/v2_0_0_prep/extensions/extWFS2/src/org/gvsig/wfs/gui/panels/WFSAreaPanel.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/extWFS2/src/org/gvsig/wfs/gui/panels/WFSAreaPanel.java	(revision 38564)
@@ -427,7 +427,7 @@
         if (jButtonUndo == null) {
             jButtonUndo = new JButton();
             jButtonUndo.setBounds(DEFAULT_UNDO_ICON_BUTTON_RECTANGLE);
-            jButtonUndo.setIcon(PluginServices.getIconTheme().get("edit-undo"));
+            jButtonUndo.setIcon(PluginServices.getIconTheme().get("wfs-properties-undo"));
             jButtonUndo.setToolTipText(PluginServices.getText(this, "previous_area"));
             jButtonUndo.addMouseListener(new MouseAdapter() {
                 public void mouseClicked(MouseEvent e) {
@@ -448,7 +448,7 @@
         if (jToggleButtonMove == null) {
             jToggleButtonMove = new JToggleButton();
             jToggleButtonMove.setBounds(DEFAULT_MOVE_ICON_TOGGLE_BUTTON_RECTANGLE);
-            jToggleButtonMove.setIcon(PluginServices.getIconTheme().get("WFS-move"));
+            jToggleButtonMove.setIcon(PluginServices.getIconTheme().get("wfs-properties-move"));
             jToggleButtonMove.setToolTipText(PluginServices.getText(this, "move") + ": " + PluginServices.getText(this, "area_move_explanation"));
             jToggleButtonMove.addItemListener(new ItemListener() {
                 public void itemStateChanged(ItemEvent e) {
@@ -471,7 +471,7 @@
         if (jToggleButtonScaling == null) {
             jToggleButtonScaling = new JToggleButton();
             jToggleButtonScaling.setBounds(DEFAULT_SCALING_ICON_TOGGLE_BUTTON_RECTANGLE);
-            jToggleButtonScaling.setIcon(PluginServices.getIconTheme().get("WFS-scaling"));
+            jToggleButtonScaling.setIcon(PluginServices.getIconTheme().get("wfs-properties-scaling"));
             jToggleButtonScaling.setToolTipText(PluginServices.getText(this, "scaling") + ": " + PluginServices.getText(this, "area_scaling_explanation"));
             jToggleButtonScaling.addItemListener(new ItemListener() {
                 public void itemStateChanged(ItemEvent e) {
@@ -493,7 +493,7 @@
         if (jButtonPan == null) {
             jButtonPan = new JButton();
             jButtonPan.setBounds(DEFAULT_PAN_ICON_BUTTON_RECTANGLE);
-            jButtonPan.setIcon(PluginServices.getIconTheme().get("view-pan"));
+            jButtonPan.setIcon(PluginServices.getIconTheme().get("wfs-properties-pan"));
             jButtonPan.setToolTipText(PluginServices.getText(this, "Desplazamiento"));
             jButtonPan.addMouseListener(new MouseAdapter() {
                 public void mouseClicked(MouseEvent e) {
@@ -513,8 +513,8 @@
         if (jComboBoxZoomInAndOut == null) {
             jComboBoxZoomInAndOut = new JComboBoxWithImageIconItems();
             jComboBoxZoomInAndOut.setBounds(DEFAULT_ZOOMINANDOUT_JCOMBOBOX_RECTANGLE);
-            jComboBoxZoomInAndOut.addImageIconItem(new ImageIconItemInfo("images/ZoomIn.png",PluginServices.getIconTheme().get("view-zoom-in"),PluginServices.getText(this, "Zoom_Mas"), ZOOM_IN_TOOL));
-            jComboBoxZoomInAndOut.addImageIconItem(new ImageIconItemInfo("images/ZoomOut.png",PluginServices.getIconTheme().get("view-zoom-out"), PluginServices.getText(this, "Zoom_Menos"), ZOOM_OUT_TOOL));
+            jComboBoxZoomInAndOut.addImageIconItem(new ImageIconItemInfo(null,PluginServices.getIconTheme().get("wfs-properties-zoom-in"),PluginServices.getText(this, "Zoom_Mas"), ZOOM_IN_TOOL));
+            jComboBoxZoomInAndOut.addImageIconItem(new ImageIconItemInfo(null,PluginServices.getIconTheme().get("wfs-properties-zoom-out"), PluginServices.getText(this, "Zoom_Menos"), ZOOM_OUT_TOOL));
             jComboBoxZoomInAndOut.addActionListener(new ActionListener() {
                 public void actionPerformed(ActionEvent e) {
                     JComboBoxWithImageIconItems cb = (JComboBoxWithImageIconItems)e.getSource();
@@ -536,7 +536,7 @@
         if (jButtonZoomPrevious == null) {
             jButtonZoomPrevious = new JButton();
             jButtonZoomPrevious.setBounds(DEFAULT_ZOOMPREVIOUS_ICON_BUTTON_RECTANGLE);
-            jButtonZoomPrevious.setIcon(PluginServices.getIconTheme().get("view-zoom-back"));
+            jButtonZoomPrevious.setIcon(PluginServices.getIconTheme().get("wfs-properties-zoom-back"));
             jButtonZoomPrevious.setToolTipText(PluginServices.getText(this, "Zoom_Previo"));
             jButtonZoomPrevious.addMouseListener(new MouseAdapter() {
                 public void mouseClicked(MouseEvent e) {
@@ -556,7 +556,7 @@
         if (jButtonZoomComplete == null) {
             jButtonZoomComplete = new JButton();
             jButtonZoomComplete.setBounds(DEFAULT_ZOOMCOMPLETE_ICON_BUTTON_RECTANGLE);
-            jButtonZoomComplete.setIcon(PluginServices.getIconTheme().get("view-zoom-map-contents"));
+            jButtonZoomComplete.setIcon(PluginServices.getIconTheme().get("wfs-properties-zoom-all"));
             jButtonZoomComplete.setToolTipText(PluginServices.getText(this, "Zoom_Completo"));
             jButtonZoomComplete.addMouseListener(new MouseAdapter() {
                 public void mouseClicked(MouseEvent e) {
@@ -578,8 +578,8 @@
         if (jComboBoxZoomInAndOutViewCentered == null) {
             jComboBoxZoomInAndOutViewCentered = new JComboBoxWithImageIconItems();
             jComboBoxZoomInAndOutViewCentered.setBounds(DEFAULT_ZOOMINANDOUTVIEWCENTERED_JCOMBOBOX_RECTANGLE);
-            jComboBoxZoomInAndOutViewCentered.addImageIconItem(new ImageIconItemInfo("images/zoommas.png",PluginServices.getIconTheme().get("view-zoom-mas"), PluginServices.getText(this, "Zoom_Acercar"), ZOOM_IN_VIEW_CENTERED_TOOL));
-            jComboBoxZoomInAndOutViewCentered.addImageIconItem(new ImageIconItemInfo("images/ZoomOut.png",PluginServices.getIconTheme().get("view-zoom-menos"), PluginServices.getText(this, "Zoom_Alejar"), ZOOM_OUT_VIEW_CENTERED_TOOL));
+            jComboBoxZoomInAndOutViewCentered.addImageIconItem(new ImageIconItemInfo(null,PluginServices.getIconTheme().get("wfs-properties-zoom-plus"), PluginServices.getText(this, "Zoom_Acercar"), ZOOM_IN_VIEW_CENTERED_TOOL));
+            jComboBoxZoomInAndOutViewCentered.addImageIconItem(new ImageIconItemInfo(null,PluginServices.getIconTheme().get("wfs-properties-zoom-minus"), PluginServices.getText(this, "Zoom_Alejar"), ZOOM_OUT_VIEW_CENTERED_TOOL));
             jComboBoxZoomInAndOutViewCentered.addActionListener(new ActionListener() {
                 public void actionPerformed(ActionEvent e) {
                     JComboBoxWithImageIconItems cb = (JComboBoxWithImageIconItems)e.getSource();
@@ -606,8 +606,8 @@
         if (jComboBoxOtherTools == null) {
             jComboBoxOtherTools = new JComboBoxWithImageIconItems();
             jComboBoxOtherTools.setBounds(DEFAULT_OTHER_TOOLS_JCOMBOBOX_RECTANGLE);
-            jComboBoxOtherTools.addImageIconItem(new ImageIconItemInfo("images/Distancia.png",PluginServices.getIconTheme().get("view-query-distance"),PluginServices.getText(this, "medir_distancias"), MEASURE_DISTANCES_TOOL));
-            jComboBoxOtherTools.addImageIconItem(new ImageIconItemInfo("images/Poligono16.png",PluginServices.getIconTheme().get("view-query-area"), PluginServices.getText(this, "medir_area"), MEASURE_AREA_TOOL));
+            jComboBoxOtherTools.addImageIconItem(new ImageIconItemInfo(null,PluginServices.getIconTheme().get("wfs-properties-query-distance"),PluginServices.getText(this, "medir_distancias"), MEASURE_DISTANCES_TOOL));
+            jComboBoxOtherTools.addImageIconItem(new ImageIconItemInfo(null,PluginServices.getIconTheme().get("wfs-properties-query-area"), PluginServices.getText(this, "medir_area"), MEASURE_AREA_TOOL));
             jComboBoxOtherTools.addActionListener(new ActionListener() {
                 public void actionPerformed(ActionEvent e) {
                     JComboBoxWithImageIconItems cb = (JComboBoxWithImageIconItems)e.getSource();
@@ -1563,7 +1563,7 @@
                 jButtonPreviewArea.setToolTipText(PluginServices.getText(this, "to_validate_coodinates"));
                 jButtonPreviewArea.setVerticalTextPosition(AbstractButton.CENTER);
                 jButtonPreviewArea.setHorizontalTextPosition(AbstractButton.CENTER);
-                jButtonPreviewArea.setIcon(PluginServices.getIconTheme().get("validate-area"));
+                jButtonPreviewArea.setIcon(PluginServices.getIconTheme().get("wfs-properties-validate-area"));
                 jButtonPreviewArea.addMouseListener(new MouseAdapter() {
                     public void mouseClicked(MouseEvent e) {
                         validVertexes();
Index: branches/v2_0_0_prep/extensions/extWFS2/src/org/gvsig/wfs/gui/wizards/WFSWizard.java
===================================================================
--- branches/v2_0_0_prep/extensions/extWFS2/src/org/gvsig/wfs/gui/wizards/WFSWizard.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/extWFS2/src/org/gvsig/wfs/gui/wizards/WFSWizard.java	(revision 38564)
@@ -20,9 +20,6 @@
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.messages.NotificationManager;
 import org.gvsig.andami.persistence.serverData.ServerDataPersistence;
@@ -42,6 +39,8 @@
 import org.gvsig.utils.swing.jcomboServer.JComboServer;
 import org.gvsig.utils.swing.jcomboServer.ServerData;
 import org.gvsig.wfs.gui.panels.WFSParamsPanel;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /* gvSIG. Sistema de Informaci�n Geogr�fica de la Generalitat Valenciana
  *
Index: branches/v2_0_0_prep/extensions/extWFS2/src/org/gvsig/wfs/gui/toc/WFSProperties.java
===================================================================
--- branches/v2_0_0_prep/extensions/extWFS2/src/org/gvsig/wfs/gui/toc/WFSProperties.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/extWFS2/src/org/gvsig/wfs/gui/toc/WFSProperties.java	(revision 38564)
@@ -29,9 +29,6 @@
 
 import java.awt.BorderLayout;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import org.gvsig.andami.PluginServices;
 import org.gvsig.app.panelGroup.loaders.PanelGroupLoaderFromExtensionPoint;
 import org.gvsig.app.project.documents.view.legend.gui.AbstractThemeManagerPage;
@@ -45,6 +42,8 @@
 import org.gvsig.gui.beans.panelGroup.PanelGroupManager;
 import org.gvsig.wfs.gui.panels.WFSParamsPanel;
 import org.gvsig.wfs.gui.panels.model.WFSSelectedFeatureManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 /**
Index: branches/v2_0_0_prep/extensions/extWFS2/src/org/gvsig/wfs/WFSClientExtension.java
===================================================================
--- branches/v2_0_0_prep/extensions/extWFS2/src/org/gvsig/wfs/WFSClientExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/extWFS2/src/org/gvsig/wfs/WFSClientExtension.java	(revision 38564)
@@ -1,9 +1,11 @@
 package org.gvsig.wfs;
 
-import org.gvsig.andami.PluginServices;
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.plugins.Extension;
 import org.gvsig.app.extension.AddLayer;
 import org.gvsig.app.project.documents.view.legend.gui.ThemeManagerWindow;
+import org.gvsig.fmap.dal.store.wfs.WFSStoreProvider;
+import org.gvsig.fmap.mapcontext.MapContextLocator;
 import org.gvsig.fmap.mapcontext.layers.vectorial.FLyrVect;
 import org.gvsig.gui.beans.panelGroup.PanelGroupManager;
 import org.gvsig.tools.ToolsLocator;
@@ -152,89 +154,23 @@
 	 * Prepares support for the icons that can be used in the WFS extension.
 	 */
 	void initilizeIcons(){
-		// FLyrWFS.java
-		PluginServices.getIconTheme().registerDefault(
-	    		"WFS-icolayer",
-	    		this.getClass().getClassLoader().getResource("images/icoLayer.png")
-	    	);
+		IconThemeHelper.registerIcon("layer", "layer-icon-wfs", this);
+		MapContextLocator.getMapContextManager().registerIconLayer(WFSStoreProvider.NAME, "layer-icon-wfs");
 
 		// WFSAreaPanel.java
-		PluginServices.getIconTheme().registerDefault(
-	    		"edit-undo",
-	    		this.getClass().getClassLoader().getResource("images/edit-undo.png")
-	    	);
-
-		// WFSAreaPanel.java
-		PluginServices.getIconTheme().registerDefault(
-	    		"WFS-move",
-	    		this.getClass().getClassLoader().getResource("images/move.png")
-	    	);
-
-		// WFSAreaPanel.java
-		PluginServices.getIconTheme().registerDefault(
-	    		"WFS-scaling",
-	    		this.getClass().getClassLoader().getResource("images/scaling.png")
-	    	);
-
-		// WFSAreaPanel.java
-		PluginServices.getIconTheme().registerDefault(
-	    		"view-pan",
-	    		this.getClass().getClassLoader().getResource("images/Pan.png")
-	    	);
-
-		// WFSAreaPanel.java
-		PluginServices.getIconTheme().registerDefault(
-	    		"view-zoom-in",
-	    		this.getClass().getClassLoader().getResource("images/ZoomIn.png")
-	    	);
-
-		// WFSAreaPanel.java
-		PluginServices.getIconTheme().registerDefault(
-	    		"view-zoom-out",
-	    		this.getClass().getClassLoader().getResource("images/ZoomOut.png")
-	    	);
-
-		// WFSAreaPanel.java
-		PluginServices.getIconTheme().registerDefault(
-	    		"view-zoom-back",
-	    		this.getClass().getClassLoader().getResource("images/ZoomPrevio.png")
-	    	);
-
-		// WFSAreaPanel.java
-		PluginServices.getIconTheme().registerDefault(
-	    		"view-zoom-map-contents",
-	    		this.getClass().getClassLoader().getResource("images/MapContents.png")
-	    	);
-
-		// WFSAreaPanel.java
-		PluginServices.getIconTheme().registerDefault(
-	    		"view-zoom-mas",
-	    		this.getClass().getClassLoader().getResource("images/zoommas.png")
-	    	);
-
-		//		 WFSAreaPanel.java
-		PluginServices.getIconTheme().registerDefault(
-	    		"view-zoom-menos",
-	    		this.getClass().getClassLoader().getResource("images/zoommenos.png")
-	    	);
-
-		//		 WFSAreaPanel.java
-		PluginServices.getIconTheme().registerDefault(
-	    		"view-query-distance",
-	    		this.getClass().getClassLoader().getResource("images/Distancia.png")
-	    	);
-
-		//	 	WFSAreaPanel.java
-		PluginServices.getIconTheme().registerDefault(
-	    		"view-query-area",
-	    		this.getClass().getClassLoader().getResource("images/Poligono16.png")
-	    	);
-
-		// 		WFSAreaPanel.java
-		PluginServices.getIconTheme().registerDefault(
-	    		"validate-area",
-	    		this.getClass().getClassLoader().getResource("images/validate-area.png")
-	    	);
+		IconThemeHelper.registerIcon("wfs-properties", "wfs-properties-undo", this);
+		IconThemeHelper.registerIcon("wfs-properties", "wfs-properties-move", this);
+		IconThemeHelper.registerIcon("wfs-properties", "wfs-properties-scaling", this); // ???
+		IconThemeHelper.registerIcon("wfs-properties", "wfs-properties-pan", this);
+		IconThemeHelper.registerIcon("wfs-properties", "wfs-properties-zoom-in", this);
+		IconThemeHelper.registerIcon("wfs-properties", "wfs-properties-zoom-out", this);
+		IconThemeHelper.registerIcon("wfs-properties", "wfs-properties-zoom-back", this);
+		IconThemeHelper.registerIcon("wfs-properties", "wfs-properties-zoom-all", this);
+		IconThemeHelper.registerIcon("wfs-properties", "wfs-properties-zoom-plus", this);
+		IconThemeHelper.registerIcon("wfs-properties", "wfs-properties-zoom-minus", this);
+		IconThemeHelper.registerIcon("wfs-properties", "wfs-properties-query-area", this);
+		IconThemeHelper.registerIcon("wfs-properties", "wfs-properties-query-distance", this);
+		IconThemeHelper.registerIcon("wfs-properties", "wfs-properties-validate-area", this); // ???
 	}
 
 }
Index: branches/v2_0_0_prep/extensions/extEditing/config/config.xml
===================================================================
--- branches/v2_0_0_prep/extensions/extEditing/config/config.xml	(revision 38563)
+++ branches/v2_0_0_prep/extensions/extEditing/config/config.xml	(revision 38564)
@@ -6,238 +6,698 @@
     <depends plugin-name="org.gvsig.exportto.app.extension" />
 	<resourceBundle name="text"/>
 	<extensions>
-<!-- 		<extension class-name="org.gvsig.editing.CreateNewLayer" -->
-<!-- 			description="Crear una nueva capa." -->
-<!-- 			active="true" > -->
-<!-- 			<menu text="Vista/new_layer/new_shp" action-command="SHP"/> -->
-<!-- 			<menu text="Vista/new_layer/new_dxf" action-command="DXF"/> -->
-<!-- 			<menu text="Vista/new_layer/new_postgis" action-command="POSTGIS"/> -->
-<!-- 		</extension> -->
-		<extension class-name="org.gvsig.editing.StartEditing"
-			description="Extensi�n encargada de comenzar la edici�n sobre la capa activa."
-			active="true">
-			<menu text="Capa/start_edition" action-command="STARTEDITING"/>
-		</extension>
 
-
-		<extension class-name="org.gvsig.editing.StopEditing"
-			description="Extensi�n encargada de terminar la edici�n sobre la capa activa y guardarla sobre s� misma."
-			active="true">
-			<menu text="Capa/stop_edition" action-command="STOPEDITING"/>
-		</extension>		
-
-		<!-- <extension class-name="org.gvsig.editing.StopEditingToGT2Shp"
-			description="Extensi�n encargada de terminar la edici�n sobre la capa activa y guardarla sobre s� misma si es un shapefile."
-			active="true">
-			<menu text="Capa/stop_edition/GT2shp" action-command="STOPEDITING"/>
-		</extension> -->
-		
 		<extension class-name="org.gvsig.editing.UndoViewExtension"
 			description="Extensi�n encargada de dehacer la edici�n sobre la capa activa."
 			active="true" >
-			<menu text="Capa/undo" action-command="UNDO" icon="view-undo"/>
-		<tool-bar name="undoredo" position="35">
-				<action-tool name="deshacer" icon="view-undo" action-command="UNDO" tooltip="undo" group="vista" position="1"/>
-		</tool-bar>
+			
+            <action 
+                name="edit-undo-layer"
+                label="_Undo" 
+                tooltip="_Undo_last_modification_in_the_active_layer" 
+                position="200100000" 
+                action-command="edit-undo-layer"
+                icon="edit-undo"
+                accelerator=""
+                />
+            
+            <menu
+                name="edit-undo-layer" 
+                text="Edit/Undo"
+                />
+                
+            <tool-bar name="edit_tools">
+                <action-tool name="edit-undo-layer"/>
+            </tool-bar>			
+			
 		</extension>
+
+
+
 		<extension class-name="org.gvsig.editing.RedoViewExtension"
             description="Extensi�n encargada de rehacer la edici�n sobre la capa activa."
             active="true">
-            <menu text="Capa/redo" action-command="REDO" icon="view-redo"/>
-        <tool-bar name="undoredo" position="35">
-                <action-tool name="redo" icon="view-redo" action-command="REDO" tooltip="redo" group="vista" position="2"/>
-        </tool-bar>
+
+            <action 
+                name="edit-redo-layer"
+                label="_Redo" 
+                tooltip="_Redo_last_modification_in_the_active_layer" 
+                position="200200000" 
+                action-command="edit-redo-layer"
+                icon="edit-redo"
+                accelerator=""
+                />
+            
+            <menu
+                name="edit-redo-layer" 
+                text="Edit/Redo"
+                />
+                
+            <tool-bar name="edit_tools">
+                <action-tool name="edit-redo-layer"/>
+            </tool-bar>         
+
         </extension>
+
 		<extension class-name="org.gvsig.editing.ViewCommandStackExtension"
 			description="Extensi�n encargada de administrar la pila de comados de edici�n sobre una vista."
 			active="true">
-			<menu text="Archivo/commands_stack" action-command="COMMANDSTACK" icon="commands-stack"/>
-		<tool-bar name="gvsig" position="32">
-			<action-tool name="commands_stack" icon="commands-stack" action-command="COMMANDSTACK" tooltip="commands_stack" group="vista" position="1"/>
-		</tool-bar>
+
+            <action 
+                name="edit-undo-redo-actions-layer"
+                label="_Undo_redo_history" 
+                tooltip="_History_of_undo_redo_actions" 
+                position="200300000" 
+                action-command="edit-undo-redo-actions-layer"
+                icon="edit-undo-redo-actions"
+                accelerator=""
+                />
+            
+            <menu
+                name="edit-undo-redo-actions-layer" 
+                text="Edit/Undo_redo_actions"
+                />
+                
+            <tool-bar name="edit_tools">
+                <action-tool name="edit-undo-redo-actions-layer"/>
+            </tool-bar>         
+
 		</extension>
+		
+		
+		
 		<extension class-name="org.gvsig.editing.TableCommandStackExtension"
 			description="Extensi�n encargada de administrar la pila de comados de edici�n sobre una tabla."
 			active="true">
-			<menu text="Archivo/commands_stack" action-command="COMMANDSTACK" icon="commands-stack"/>
-		<tool-bar name="gvsig">
-			<action-tool name="commands_stack" icon="commands-stack" action-command="COMMANDSTACK" tooltip="commands_stack" group="tabla" position="1"/>
-		</tool-bar>
+
+            <action 
+                name="edit-undo-redo-actions-table"
+                label="_Undo_redo_history" 
+                tooltip="_History_of_undo_redo_actions" 
+                position="200300000" 
+                action-command="edit-undo-redo-actions-table"
+                icon="edit-undo-redo-actions"
+                accelerator=""
+                />
+            
+            <menu
+                name="edit-undo-redo-actions-table" 
+                text="Edit/Undo_redo_actions"
+                />
+                
+            <tool-bar name="edit_tools">
+                <action-tool name="edit-undo-redo-actions-table"/>
+            </tool-bar> 			
+			
 		</extension>
 
 		<extension class-name="org.gvsig.editing.CADExtension"
 			description="Extensi�n encargada de gestionar los eventos realizados sobre las geometr�as."
 			active="true">
-			<menu text="geometry/modify/copy" action-command="_copy" icon="edition-geometry-copy"/>
-			<menu text="geometry/modify/symmetry" action-command="_symmetry" icon="edition-geometry-symmetry"/>
-			<menu text="geometry/modify/rotate" action-command="_rotate" icon="edition-geometry-rotate"/>
-			<menu text="geometry/modify/scale" action-command="_scale" icon="edition-geometry-scale"/>
+			
+            <action 
+                name="layer-modify-copy"
+                label="_Copy_geometry" 
+                tooltip="_Copy_geometry" 
+                position="601100100" 
+                action-command="layer-modify-copy"
+                icon="layer-modify-copy"
+                accelerator=""
+                />
+            
+            <action 
+                name="layer-modify-symmetry"
+                label="_Symmetry_geometry" 
+                tooltip="_Symmetry_geometry" 
+                position="601101100" 
+                action-command="layer-modify-symmetry"
+                icon="layer-modify-symmetry"
+                accelerator=""
+                />
+            
+            <action 
+                name="layer-modify-rotate"
+                label="_Rotate_geometry" 
+                tooltip="_Rotate_geometry" 
+                position="601100800" 
+                action-command="layer-modify-rotate"
+                icon="layer-modify-rotate"
+                accelerator=""
+                />
+            
+            <action 
+                name="layer-modify-scale"
+                label="_Scale_geometry" 
+                tooltip="_Scale_geometry" 
+                position="601100900" 
+                action-command="layer-modify-scale"
+                icon="layer-modify-scale"
+                accelerator=""
+                />
+            
+            <menu
+                name="layer-modify-copy"
+                text="Layer/Modify/Copy"
+                />
+                
+            <menu
+                name="layer-modify-symmetry"
+                text="Layer/Modify/Symmetry"
+                />
+                
+            <menu
+                name="layer-modify-rotate"
+                text="Layer/Modify/Rotate"
+                />
+                
+            <menu
+                name="layer-modify-scale"
+                text="Layer/Modify/Scale"
+                />
+                
+            <tool-bar name="layer_modify">
+                <action-tool 
+                    name="layer-modify-copy"
+                    />
+                <action-tool 
+                    name="layer-modify-symmetry"
+                    />
+                <action-tool 
+                    name="layer-modify-rotate"
+                    />
+                <action-tool 
+                    name="layer-modify-scale"
+                    />
+            </tool-bar>             
+		</extension>
 
-			<tool-bar name="modificar" position="31">
-				<selectable-tool icon="edition-geometry-copy" action-command="_copy" tooltip="copy" group="vista" position="4"/>
-				<selectable-tool icon="edition-geometry-symmetry" action-command="_symmetry" tooltip="symmetry" group="vista" position="5"/>
-				<selectable-tool icon="edition-geometry-rotate" action-command="_rotate" tooltip="rotate" group="vista" position="7"/>
-				<selectable-tool icon="edition-geometry-scale" action-command="_scale" tooltip="scale" group="vista" position="8"/>
-			</tool-bar>
-		</extension>
+
+
+
+
+
 		<extension class-name="org.gvsig.editing.ExploitExtension"
 			description="Extensi�n encargada de simplificar geometr�as complejas."
 			active="true">
-			<menu text="geometry/modify/exploit" action-command="_exploit" icon="edition-geometry-exploit"/>
-			<tool-bar name="modificar" position="31">
-				<action-tool icon="edition-geometry-exploit" action-command="_exploit" tooltip="exploit" group="vista" position="14"/>
-			</tool-bar>
+            
+            <action 
+                name="layer-modify-explode"
+                label="_Explode_geometry" 
+                tooltip="_Explode_geometry" 
+                position="601100300" 
+                action-command="layer-modify-explode"
+                icon="layer-modify-explode"
+                accelerator=""
+                />
+            
+            <menu
+                name="layer-modify-explode"
+                text="Layer/Modify/Explode"
+                />
+            
+            <tool-bar name="layer_modify">
+                <action-tool 
+                    name="layer-modify-explode"
+                    />
+            </tool-bar>             
 		</extension>
 
 		<extension class-name="org.gvsig.editing.MoveGeometryExtension"
 			description="Extensi�n encargada de mover las geometr�as."
 			active="true">
-			<menu text="geometry/modify/move" action-command="_move" icon="edition-geometry-move"/>
-			<tool-bar name="modificar" position="31">
-				<selectable-tool icon="edition-geometry-move" action-command="_move" tooltip="move" group="vista" position="3"/>
-			</tool-bar>
+            
+            <action 
+                name="layer-modify-move"
+                label="_Move_geometry" 
+                tooltip="_Move_geometry" 
+                position="601100700" 
+                action-command="layer-modify-move"
+                icon="layer-modify-move"
+                accelerator=""
+                />
+            
+            <menu
+                name="layer-modify-move"
+                text="Layer/Modify/Move"
+                />
+            
+            <tool-bar name="layer_modify">
+                <action-tool 
+                    name="layer-modify-move"
+                    />
+            </tool-bar>             
 		</extension>
 
 		<extension class-name="org.gvsig.editing.InsertPointExtension"
 			description="Extensi�n encargada de insertar puntos en una capa en edici�n."
 			active="true">
-			<menu text="geometry/insert/point" action-command="_point" icon="edition-insert-geometry-point"/>
-			<tool-bar name="insert" position="30">
-				<selectable-tool icon="edition-insert-geometry-point" action-command="_point" tooltip="point" group="vista" position="1"/>
-			</tool-bar>
+            
+            <action 
+                name="layer-insert-point"
+                label="_Insert_point" 
+                tooltip="_Insert_point" 
+                position="601000700" 
+                action-command="layer-insert-point"
+                icon="layer-insert-point"
+                accelerator=""
+                />
+            
+            <menu
+                name="layer-insert-point"
+                text="Layer/Insert/Point"
+                />
+            
+            <tool-bar name="layer_insert">
+                <action-tool 
+                    name="layer-insert-point"
+                    />
+            </tool-bar>             
 		</extension>
+		
+		
 		<extension class-name="org.gvsig.editing.InsertMultiPointExtension"
 			description="Extensi�n encargada de insertar multipuntos en una capa en edici�n."
 			active="true">
-			<menu text="geometry/insert/multipoint" action-command="_multipoint" icon="edition-insert-geometry-multipoint"/>
-			<tool-bar name="insert" position="30">
-				<selectable-tool icon="edition-insert-geometry-multipoint" action-command="_multipoint" tooltip="multipoint" group="vista" position="2"/>
-			</tool-bar>
+            
+            <action 
+                name="layer-insert-multipoint"
+                label="_Insert_multipoint" 
+                tooltip="_Insert_multipoint" 
+                position="601000600" 
+                action-command="layer-insert-multipoint"
+                icon="layer-insert-multipoint"
+                accelerator=""
+                />
+            
+            <menu
+                name="layer-insert-multipoint"
+                text="Layer/Insert/Multipoint"
+                />
+            
+            <tool-bar name="layer_insert">
+                <action-tool 
+                    name="layer-insert-multipoint"
+                    />
+            </tool-bar>             
 		</extension>
+
 		<extension class-name="org.gvsig.editing.InsertLineExtension"
 			description="Extensi�n encargada de insertar l�neas en una capa en edici�n."
 			active="true">
-			<menu text="geometry/insert/line" action-command="_line" icon="edition-insert-geometry-line"/>
-			<menu text="geometry/insert/arc" action-command="_arc" icon="edition-insert-geometry-arc"/>
 
-			<tool-bar name="insert" position="30">
-				<selectable-tool icon="edition-insert-geometry-line" action-command="_line" tooltip="line" group="vista" position="3"/>
-				<selectable-tool icon="edition-insert-geometry-arc" action-command="_arc" tooltip="arc" group="vista" position="4"/>
-			</tool-bar>
+            <action 
+                name="layer-insert-line"
+                label="_Insert_line" 
+                tooltip="_Insert_line" 
+                position="60100500" 
+                action-command="layer-insert-line"
+                icon="layer-insert-line"
+                accelerator=""
+                />
+            
+            <action 
+                name="layer-insert-arc"
+                label="_Insert_arc" 
+                tooltip="_Insert_arc" 
+                position="601000200" 
+                action-command="layer-insert-arc"
+                icon="layer-insert-arc"
+                accelerator=""
+                />
+            
+            <menu
+                name="layer-insert-line"
+                text="Layer/Insert/Line"
+                />
+            
+            <menu
+                name="layer-insert-arc"
+                text="Layer/Insert/Arc"
+                />
+            
+            <tool-bar name="layer_insert">
+                <action-tool 
+                    name="layer-insert-line"
+                    />
+                <action-tool 
+                    name="layer-insert-arc"
+                    />
+            </tool-bar>             
 		</extension>
+
 		<extension class-name="org.gvsig.editing.InsertPolyLineExtension"
 			description="Extensi�n encargada de insertar polil�neas en una capa en edici�n."
 			active="true">
-			<menu text="geometry/insert/polyline" action-command="_polyline" icon="edition-insert-geometry-polyline"/>
-			<menu text="geometry/insert/spline" action-command="_spline" icon="edition-insert-geometry-spline"/>
 
-			<tool-bar name="insert" position="30">
-				<selectable-tool icon="edition-insert-geometry-polyline" action-command="_polyline" tooltip="polyline" group="vista" position="5"/>
-				<selectable-tool icon="edition-insert-geometry-spline" action-command="_spline" tooltip="spline" group="vista" position="5"/>
-			</tool-bar>
+            <action 
+                name="layer-insert-polyline"
+                label="_Insert_polyline" 
+                tooltip="_Insert_polyline" 
+                position="601000900" 
+                action-command="layer-insert-polyline"
+                icon="layer-insert-polyline"
+                accelerator=""
+                />
+            
+            <action 
+                name="layer-insert-spline"
+                label="_Insert_spline" 
+                tooltip="_Insert_spline" 
+                position="601001100" 
+                action-command="layer-insert-spline"
+                icon="layer-insert-spline"
+                accelerator=""
+                />
+            
+            <menu
+                name="layer-insert-polyline"
+                text="Layer/Insert/Polyline"
+                />
+            
+            <menu
+                name="layer-insert-spline"
+                text="Layer/Insert/Spline"
+                />
+            
+            <tool-bar name="layer_insert">
+                <action-tool 
+                    name="layer-insert-polyline"
+                    />
+                <action-tool 
+                    name="layer-insert-spline"
+                    />
+            </tool-bar>             
 		</extension>
+		
 		<extension class-name="org.gvsig.editing.InsertPolygonExtension"
 			description="Extensi�n encargada de insertar poligonos en una capa en edici�n."
 			active="true">
-			<menu text="geometry/insert/polygon" action-command="_polygon" icon="edition-insert-geometry-poligon"/>
-			<menu text="geometry/insert/rectangle" action-command="_rectangle" icon="edition-insert-geometry-rectangle"/>
-			<menu text="geometry/insert/circle" action-command="_circle" icon="edition-insert-geometry-circle"/>
-			<menu text="geometry/insert/ellipse" action-command="_ellipse" icon="edition-insert-geometry-ellipse"/>
-			<menu text="geometry/modify/edit_vertex" action-command="_editvertex" icon="edition-geometry-edit-vertex"/>
-			<tool-bar name="insert" position="30">
-				<selectable-tool icon="edition-insert-geometry-poligon" action-command="_polygon" tooltip="polygon" group="vista" position="6"/>
-				<selectable-tool icon="edition-insert-geometry-rectangle" action-command="_rectangle" tooltip="rectangle" group="vista" position="7"/>
-				<selectable-tool icon="edition-insert-geometry-circle" action-command="_circle" tooltip="circle" group="vista" position="8"/>
-				<selectable-tool icon="edition-insert-geometry-ellipse" action-command="_ellipse" tooltip="ellipse" group="vista" position="9"/>
-			</tool-bar>
-			<tool-bar name="modificar" position="31">
-				<selectable-tool icon="edition-geometry-edit-vertex" action-command="_editvertex" tooltip="edit_vertex" group="vista" position="8"/>
-			</tool-bar>
+
+            <action 
+                name="layer-insert-polygon"
+                label="_Insert_polygon" 
+                tooltip="_Insert_polygon" 
+                position="601000800" 
+                action-command="layer-insert-polygon"
+                icon="layer-insert-polygon"
+                accelerator=""
+                />
+            
+            <action 
+                name="layer-insert-rectangle"
+                label="_Insert_rectangle" 
+                tooltip="_Insert_rectangle" 
+                position="601001000" 
+                action-command="layer-insert-rectangle"
+                icon="layer-insert-rectangle"
+                accelerator=""
+                />
+            
+            <action 
+                name="layer-insert-circle"
+                label="_Insert_circle" 
+                tooltip="_Insert_circle" 
+                position="601000300" 
+                action-command="layer-insert-circle"
+                icon="layer-insert-circle"
+                accelerator=""
+                />
+            
+            <action 
+                name="layer-insert-ellipse"
+                label="_Insert_ellipse" 
+                tooltip="_Insert_ellipse" 
+                position="601000400" 
+                action-command="layer-insert-ellipse"
+                icon="layer-insert-ellipse"
+                accelerator=""
+                />
+            
+            <action 
+                name="layer-modify-edit-vertex"
+                label="_Modify_vertex" 
+                tooltip="_Modify_vertex" 
+                position="601100200" 
+                action-command="layer-modify-edit-vertex"
+                icon="layer-modify-vertex"
+                accelerator=""
+                />
+            
+            <menu
+                name="layer-insert-polygon"
+                text="Layer/Insert/Polygon"
+                />
+            
+            <menu
+                name="layer-insert-rectangle"
+                text="Layer/Insert/Rectangle"
+                />
+            
+            <menu
+                name="layer-insert-circle"
+                text="Layer/Insert/Circle"
+                />
+            
+            <menu
+                name="layer-insert-ellipse"
+                text="Layer/Insert/Ellipse"
+                />
+            
+            <menu
+                name="layer-modify-edit-vertex"
+                text="Layer/Modify/Edit_vertex"
+                />
+            
+            <tool-bar name="layer_insert">
+                <action-tool 
+                    name="layer-insert-polygon"
+                    />
+                <action-tool 
+                    name="layer-insert-rectangle"
+                    />
+                <action-tool 
+                    name="layer-insert-circle"
+                    />
+                <action-tool 
+                    name="layer-insert-ellipse"
+                    />
+            </tool-bar>             
+            <tool-bar name="layer_modify">
+                <action-tool 
+                    name="layer-modify-edit-vertex"
+                    />
+            </tool-bar>             
 		</extension>
-		<!--extension class-name="org.gvsig.editing.BreakExtension"
-			description="Extensi�n encargada de partir una geomtr�a en edici�n."
-			active="true">
-			<menu text="geometry/modify/break" action-command="_break" icon="edition-geometry-break"/>
-			<tool-bar name="modificar" position="31">
-				<selectable-tool icon="edition-geometry-break" action-command="_break" tooltip="break" group="vista" position="9"/>
-			</tool-bar>
-		</extension-->
+
 		<extension class-name="org.gvsig.editing.JoinExtension"
 			description="Extensi�n encargada de unir varias geometr�a en edici�n."
 			active="true">
-			<menu text="geometry/modify/join" action-command="_join" icon="edition-geometry-Join"/>
-			<tool-bar name="modificar" position="31">
-				<selectable-tool icon="edition-geometry-Join" action-command="_join" tooltip="join" group="vista" position="10"/>
-			</tool-bar>
+			            
+            <action 
+                name="layer-modify-join"
+                label="_Modify_join" 
+                tooltip="_Modify_join" 
+                position="601100500" 
+                action-command="layer-modify-join"
+                icon="layer-modify-join"
+                accelerator=""
+                />
+            
+            <menu
+                name="layer-modify-join"
+                text="Layer/Modify/Join"
+                />
+            
+            <tool-bar name="layer_modify">
+                <action-tool 
+                    name="layer-modify-join"
+                    />
+            </tool-bar>             
 		</extension>
+		
 		<extension class-name="org.gvsig.editing.InternalPolygonExtension"
 			description="Extensi�n encargada de insertar poligonos internos en una capa en edici�n."
 			active="true">
-			<menu text="geometry/modify/internal_polygon" action-command="_internalpolygon" icon="edition-modify-geometry-internalpolygon"/>
-			<tool-bar name="modificar" position="31">
-				<selectable-tool icon="edition-modify-geometry-internalpolygon" action-command="_internalpolygon" tooltip="internal_polygon" group="vista" position="11"/>
-			</tool-bar>
+
+            <action 
+                name="layer-modify-internal-polygon"
+                label="_Modify_internal_polygon" 
+                tooltip="_Modify_internal_polygonn" 
+                position="601100400" 
+                action-command="layer-modify-internal-polygon"
+                icon="layer-modify-internal-polygon"
+                accelerator=""
+                />
+            
+            <menu
+                name="layer-modify-internal-polygon"
+                text="Layer/Modify/Internal_polygon"
+                />
+            
+            <tool-bar name="layer_modify">
+                <action-tool 
+                    name="layer-modify-internal-polygon"
+                    />
+            </tool-bar>   
 		</extension>
+		
 		<extension class-name="org.gvsig.editing.StretchExtension"
 			description="Extensi�n encargada de estirar geometr�as en una capa en edici�n."
 			active="true">
-			<menu text="geometry/modify/stretch" action-command="_stretch" icon="edition-geometry-stretch"/>
-			<tool-bar name="modificar" position="31">
-				<selectable-tool icon="edition-geometry-stretch" action-command="_stretch" tooltip="stretch" group="vista" position="12"/>
-			</tool-bar>
+
+            <action 
+                name="layer-modify-stretch"
+                label="_Stretch_geometry" 
+                tooltip="_Stretch_geometry" 
+                position="601101100" 
+                action-command="layer-modify-stretch"
+                icon="layer-modify-stretch"
+                accelerator=""
+                />
+            
+            <menu
+                name="layer-modify-stretch"
+                text="Layer/Modify/Stretch"
+                />
+            
+            <tool-bar name="layer_modify">
+                <action-tool 
+                    name="layer-modify-stretch"
+                    />
+            </tool-bar>             
 		</extension>
+		
 		<extension class-name="org.gvsig.editing.ComplexSelectionGeometryExtension"
 			description="Extensi�n encargada de la selecci�n compleja de geometr�as."
 			active="true">
-			<menu text="geometry/seleccion_compleja" action-command="_complex_selection" icon="edition-complex-selection"/>
-			<tool-bar name="modificar" position="31">
-				<selectable-tool icon="edition-complex-selection" action-command="_complex_selection" tooltip="complex_selection" group="vista" position="16"/>
-			</tool-bar>
+
+            <action 
+                name="selection-complex"
+                label="_Complex_selection" 
+                tooltip="_Complex_selection" 
+                position="300800000" 
+                action-command="selection-complex"
+                icon="selection-complex"
+                accelerator=""
+                />
+            
+            <menu
+                name="selection-complex"
+                text="Selection/Complex"
+                />
+            
+            <tool-bar name="view_selection">
+                <action-tool 
+                    name="selection-complex"
+                    />
+            </tool-bar>             
 		</extension>
+		
 		<extension class-name="org.gvsig.editing.SelectionGeometryExtension"
 			description="Extensi�n encargada de seleccionar las geometr�as."
 			active="true">
-			<menu text="geometry/seleccionar" action-command="_selection" icon="edition-geometry-select"/>
-			<tool-bar name="modificar" position="31">
-				<selectable-tool icon="edition-geometry-select" action-command="_selection" tooltip="selection" group="vista" position="15"/>
-			</tool-bar>
+
+
+            <action 
+                name="selection-simple"
+                label="_Simple_selection" 
+                tooltip="_Simple_selection" 
+                position="300700000" 
+                action-command="selection-simple"
+                icon="selection-simple"
+                accelerator=""
+                />
+            
+            <menu
+                name="selection-simple"
+                text="Selection/Simple"
+                />
+            
+            <tool-bar name="view_selection">
+                <action-tool 
+                    name="selection-simple"
+                    />
+            </tool-bar>             
 		</extension>
+		
 		<extension class-name="org.gvsig.editing.MatrixExtension"
 			description="Extensi�n encargada de crear una matriz a partir de la geometr�a seleccionada."
 			active="true">
-			<menu text="geometry/modify/matrix" action-command="_matrix" icon="edition-geometry-matrix"/>
-			<tool-bar name="modificar" position="31">
-				<selectable-tool icon="edition-geometry-matrix" action-command="_matrix" tooltip="matrix" group="vista" position="17"/>
-			</tool-bar>
+
+            <action 
+                name="layer-modify-matrix"
+                label="_Matrix" 
+                tooltip="_Matrix" 
+                position="601100600" 
+                action-command="layer-modify-matrix"
+                icon="layer-modify-matrix"
+                accelerator=""
+                />
+            
+            <menu
+                name="layer-modify-matrix"
+                text="Layer/Modify/Matrix"
+                />
+            
+            <tool-bar name="layer_modify">
+                <action-tool 
+                    name="layer-modify-matrix"
+                    />
+            </tool-bar>             
 		</extension>
-		<!--extension class-name="org.gvsig.editing.EquidistanceExtension"
-			description="Extensi�n encargada de crear una geometr�a equidistante a otra."
-			active="true">
-			<menu text="geometry/modify/equidistance" action-command="_equidistance" icon="edition-geometry-equidistance"/>
-			<tool-bar name="modificar" position="31">
-				<selectable-tool icon="edition-geometry-equidistance" action-command="_equidistance" tooltip="equidistance" group="vista" position="18"/>
-			</tool-bar>
-		</extension-->
+		
 		<extension class-name="org.gvsig.editing.AutoCompletePolygonExtension"
 			description="Extensi�n encargada de restablecer la selecci�n anterior."
 			active="true">
-			<menu text="geometry/insert/autopolygon" action-command="AUTOCOMPLETE_POLYGON" icon="edition-geometry-autocompletepolygon"/>
-			<tool-bar name="insert" position="30">
-				<action-tool icon="edition-geometry-autocompletepolygon" action-command="AUTOCOMPLETE_POLYGON" tooltip="autocomplete-polygon" group="vista" position="20"/>
-			</tool-bar>
+
+
+            <action 
+                name="layer-insert-autopolygon"
+                label="_Insert_autopolygon" 
+                tooltip="_Insert_autopolygon" 
+                position="601100100" 
+                action-command="layer-insert-autopolygon"
+                icon="layer-insert-autopolygon"
+                accelerator=""
+                />
+            
+            <menu
+                name="layer-insert-autopolygon"
+                text="Layer/Insert/Autopolygon"
+                />
+            
+            <tool-bar name="layer_insert">
+                <action-tool 
+                    name="layer-insert-autopolygon"
+                    />
+            </tool-bar>             
 		</extension>
+        
         <extension class-name="org.gvsig.editing.SplitGeometryCADToolExtension"
             description="herramienta para dividir una geometria con una linea"
             active="true">
-            <tool-bar name="Topology">
-                <selectable-tool icon="split-geometry" action-command="_split_geometry" tooltip="split_geometry" enable-text="select_geometry_to_split" last="false" position="8"/>
-            </tool-bar>
+
+            <action 
+                name="layer-modify-split"
+                label="_Split_geometry" 
+                tooltip="_Split_geometry" 
+                position="601101000" 
+                action-command="layer-modify-split"
+                icon="layer-modify-split"
+                accelerator=""
+                />
+            
+            <menu
+                name="layer-modify-split"
+                text="Layer/Modify/Split"
+                />
+            
+            <tool-bar name="layer_modify">
+                <action-tool 
+                    name="layer-modify-split"
+                    />
+            </tool-bar>             
         </extension>
-		<!--extension class-name="org.gvsig.editing.LayerPropertiesExtension"
-			description="Abre el di�logo de propiedades de la capa."
-			active="true" >
-			<menu text="Capa/Propiedades" action-command="PROPERTIES"/>
-		</extension-->
-
+		
 	</extensions>
 </plugin-config>
Index: branches/v2_0_0_prep/extensions/extEditing/images/action/selection-simple.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/extEditing/images/action/selection-simple.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/extEditing/images/action/edit-redo.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/extEditing/images/action/edit-redo.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/extEditing/images/action/edit-undo-redo-actions.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/extEditing/images/action/edit-undo-redo-actions.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/extEditing/images/action/layer-insert-circle.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/extEditing/images/action/layer-insert-circle.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/extEditing/images/action/layer-insert-rectangle.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/extEditing/images/action/layer-insert-rectangle.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/extEditing/images/action/layer-insert-multipoint.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/extEditing/images/action/layer-insert-multipoint.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/extEditing/images/action/layer-insert-poligon.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/extEditing/images/action/layer-insert-poligon.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/extEditing/images/action/layer-modify-scale.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/extEditing/images/action/layer-modify-scale.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/extEditing/images/action/edit-undo.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/extEditing/images/action/edit-undo.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/extEditing/images/action/layer-modify-symmetry.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/extEditing/images/action/layer-modify-symmetry.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/extEditing/images/action/selection-complex.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/extEditing/images/action/selection-complex.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/extEditing/images/action/layer-insert-autopolygon.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/extEditing/images/action/layer-insert-autopolygon.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/extEditing/images/action/layer-modify-rotate.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/extEditing/images/action/layer-modify-rotate.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/extEditing/images/action/layer-modify-join.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/extEditing/images/action/layer-modify-join.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/extEditing/images/action/layer-modify-edit-vertex.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/extEditing/images/action/layer-modify-edit-vertex.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/extEditing/images/action/layer-modify-explode.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/extEditing/images/action/layer-modify-explode.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/extEditing/images/action/layer-modify-internal-polygon.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/extEditing/images/action/layer-modify-internal-polygon.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/extEditing/images/action/layer-modify-matrix.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/extEditing/images/action/layer-modify-matrix.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/extEditing/images/action/layer-modify-move.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/extEditing/images/action/layer-modify-move.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/extEditing/images/action/layer-insert-point.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/extEditing/images/action/layer-insert-point.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/extEditing/images/action/layer-insert-spline.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/extEditing/images/action/layer-insert-spline.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/extEditing/images/action/layer-insert-ellipse.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/extEditing/images/action/layer-insert-ellipse.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/extEditing/images/action/layer-modify-copy.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/extEditing/images/action/layer-modify-copy.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/extEditing/images/action/layer-modify-stretch.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/extEditing/images/action/layer-modify-stretch.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/extEditing/images/preferences/preferences-layer-modify-flatness.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/extEditing/images/preferences/preferences-layer-modify-flatness.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/extEditing/images/editing-tools/layer-modify-matrix-addpoint.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/extEditing/images/editing-tools/layer-modify-matrix-addpoint.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/extEditing/images/editing-tools/layer-modify-matrix-lagxy.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/extEditing/images/editing-tools/layer-modify-matrix-lagxy.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/CreateNewLayer.java
===================================================================
--- branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/CreateNewLayer.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/CreateNewLayer.java	(revision 38564)
@@ -1,164 +0,0 @@
-package org.gvsig.editing;
-
-import javax.swing.ImageIcon;
-
-import org.gvsig.andami.PluginServices;
-import org.gvsig.andami.messages.NotificationManager;
-import org.gvsig.andami.plugins.Extension;
-import org.gvsig.andami.ui.wizard.WizardAndami;
-import org.gvsig.app.project.documents.view.gui.DefaultViewPanel;
-import org.gvsig.editing.gui.cad.CADToolAdapter;
-import org.gvsig.editing.gui.cad.MyFinishAction;
-import org.gvsig.editing.gui.cad.panels.ChooseGeometryType;
-import org.gvsig.editing.gui.cad.panels.FileBasedPanel;
-import org.gvsig.editing.gui.cad.panels.JPanelFieldDefinition;
-import org.gvsig.fmap.dal.DALLocator;
-import org.gvsig.fmap.dal.DataManager;
-import org.gvsig.fmap.dal.DataStoreParameters;
-import org.gvsig.fmap.dal.exception.InitializeException;
-import org.gvsig.fmap.dal.exception.ProviderNotRegisteredException;
-import org.gvsig.fmap.dal.exception.ValidateDataParametersException;
-import org.gvsig.fmap.dal.feature.FeatureStore;
-import org.gvsig.fmap.mapcontrol.MapControl;
-
-
-/**
- * DOCUMENT ME!
- *
- * @author Vicente Caballero Navarro
- */
-public class CreateNewLayer extends Extension {
-	static ImageIcon LOGO;
-
-	/**
-	 * @see org.gvsig.andami.plugins.IExtension#initialize()
-	 */
-	public void initialize() {
-	}
-
-	/**
-	 * @see org.gvsig.andami.plugins.IExtension#execute(java.lang.String)
-	 */
-public void execute(String actionCommand) {
-		org.gvsig.andami.ui.mdiManager.IWindow f = PluginServices.getMDIManager()
-				.getActiveWindow();
-
-		if (f instanceof DefaultViewPanel) {
-				DefaultViewPanel vista = (DefaultViewPanel) f;
-
-				LOGO = new javax.swing.ImageIcon(this.getClass()
-						.getClassLoader().getResource(
-								"images/package_graphics.png"));
-				CADToolAdapter cta = CADExtension.getCADToolAdapter();
-				MapControl mapControl = vista.getMapControl();
-				cta.setMapControl(mapControl);
-				/*
-				 * SimpleLogoJWizardFrame wizardFrame = new
-				 * SimpleLogoJWizardFrame( LOGO);
-				 * wizardFrame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-				 *
-				 * SwingUtilities.updateComponentTreeUI(wizardFrame);
-				 *
-				 * wizardFrame.setTitle("Creaci�n de un nuevo Tema");
-				 */
-				WizardAndami wizard = new WizardAndami(LOGO);
-
-//				DriverManager writerManager = LayerFactory.getDM();
-//				ArrayList spatialDrivers = new ArrayList();
-//				String[] writerNames = writerManager.getDriverNames();
-//				for (int i = 0; i < writerNames.length; i++) {
-//					Driver drv = writerManager.getDriver(writerNames[i]);
-//					if (drv instanceof ISpatialWriter)
-//						spatialDrivers.add(drv.getName());
-//				}
-
-				ChooseGeometryType panelChoose = new ChooseGeometryType(wizard
-						.getWizardComponents());
-				JPanelFieldDefinition panelFields = new JPanelFieldDefinition(
-						wizard.getWizardComponents());
-				DataManager dm=DALLocator.getDataManager();
-				if (actionCommand.equals("SHP")) {
-					wizard.getWizardComponents().addWizardPanel(panelChoose);
-					wizard.getWizardComponents().addWizardPanel(panelFields);
-
-
-//					DataStoreParameters parameters = dm.createStoreParameters("SHPStore");
-//					FeatureStore store=(FeatureStore)dm.createStore(parameters);
-//					panelChoose.setFeatureStore(store);
-					FileBasedPanel filePanel = new FileBasedPanel(wizard
-							.getWizardComponents());
-					filePanel.setFileExtension("shp");
-					wizard.getWizardComponents().addWizardPanel(filePanel);
-
-					wizard.getWizardComponents().setFinishAction(
-							new MyFinishAction(wizard.getWizardComponents(),
-									vista, actionCommand));
-				}
-				if (actionCommand.equals("DXF")) {
-					FileBasedPanel filePanel = new FileBasedPanel(wizard
-							.getWizardComponents());
-					filePanel.setFileExtension("dxf");
-					wizard.getWizardComponents().addWizardPanel(filePanel);
-					wizard.getWizardComponents().getBackButton().setEnabled(
-							false);
-					wizard.getWizardComponents().getNextButton().setEnabled(
-							false);
-
-					wizard.getWizardComponents().setFinishAction(
-							new MyFinishAction(wizard.getWizardComponents(),
-									vista, actionCommand));
-				}
-//				if (actionCommand.equals("POSTGIS")) {
-//					wizard.getWizardComponents().addWizardPanel(panelChoose);
-//					wizard.getWizardComponents().addWizardPanel(panelFields);
-//					Driver driver = writerManager
-//							.getDriver("PostGIS JDBC Driver");
-//					panelChoose.setFeatureStore(driver);
-//					panelFields.setWriter(((IWriteable) driver).getWriter());
-//					wizard.getWizardComponents().addWizardPanel(
-//							new PostGISpanel(wizard.getWizardComponents()));
-//
-//					wizard.getWizardComponents().setFinishAction(
-//							new MyFinishAction(wizard.getWizardComponents(),
-//									vista, actionCommand));
-//				}
-
-				wizard.getWizardComponents().getFinishButton()
-						.setEnabled(false);
-				wizard.getWindowInfo().setWidth(640);
-				wizard.getWindowInfo().setHeight(350);
-				wizard.getWindowInfo().setTitle(
-						PluginServices.getText(this, "new_layer"));
-				// Utilities.centerComponentOnScreen(wizard);
-				// wizardFrame.show();
-				PluginServices.getMDIManager().addWindow(wizard);
-				// System.out.println("Salgo con " + panelChoose.getLayerName());
-		}
-	}
-	/**
-	 * @see org.gvsig.andami.plugins.IExtension#isEnabled()
-	 */
-	public boolean isEnabled() {
-		DefaultViewPanel f = (DefaultViewPanel) PluginServices.getMDIManager().getActiveWindow();
-
-		if (f == null)
-			return false;
-		return true;
-	}
-
-	/**
-	 * @see org.gvsig.andami.plugins.IExtension#isVisible()
-	 */
-	public boolean isVisible() {
-		org.gvsig.andami.ui.mdiManager.IWindow f = PluginServices.getMDIManager()
-				.getActiveWindow();
-
-		if (f == null) {
-			return false;
-		}
-
-		if (f instanceof DefaultViewPanel)
-			return true;
-		return false;
-	}
-}
Index: branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/EquidistanceExtension.java
===================================================================
--- branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/EquidistanceExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/EquidistanceExtension.java	(revision 38564)
@@ -1,131 +0,0 @@
-/* gvSIG. Sistema de Informaci�n Geogr�fica de la Generalitat Valenciana
- *
- * Copyright (C) 2004 IVER T.I. and Generalitat Valenciana.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
- *
- * For more information, contact:
- *
- *  Generalitat Valenciana
- *   Conselleria d'Infraestructures i Transport
- *   Av. Blasco Ib��ez, 50
- *   46010 VALENCIA
- *   SPAIN
- *
- *      +34 963862235
- *   gvsig@gva.es
- *      www.gvsig.gva.es
- *
- *    or
- *
- *   IVER T.I. S.A
- *   Salamanca 50
- *   46005 Valencia
- *   Spain
- *
- *   +34 963163400
- *   dac@iver.es
- */
-package org.gvsig.editing;
-
-import org.gvsig.andami.PluginServices;
-import org.gvsig.andami.messages.NotificationManager;
-import org.gvsig.andami.plugins.Extension;
-import org.gvsig.app.project.documents.view.gui.DefaultViewPanel;
-import org.gvsig.editing.gui.cad.tools.EquidistanceCADTool;
-import org.gvsig.fmap.dal.exception.DataException;
-import org.gvsig.fmap.dal.exception.ReadException;
-import org.gvsig.fmap.dal.feature.FeatureSelection;
-import org.gvsig.fmap.mapcontext.layers.vectorial.FLyrVect;
-import org.gvsig.fmap.mapcontrol.MapControl;
-
-
-/**
- * Extensi�n para crear una geometr�a equidistante a otra.
- *
- * @author Vicente Caballero Navarro
- */
-public class EquidistanceExtension extends Extension {
-	private DefaultViewPanel view;
-
-	private MapControl mapControl;
-	private EquidistanceCADTool equidistanceCADTool;
-
-	/**
-	 * @see org.gvsig.andami.plugins.IExtension#initialize()
-	 */
-	public void initialize() {
-		equidistanceCADTool=new EquidistanceCADTool();
-		CADExtension.addCADTool("_equidistance",equidistanceCADTool);
-
-		registerIcons();
-	}
-
-	private void registerIcons(){
-		PluginServices.getIconTheme().registerDefault(
-				"edition-geometry-equidistance",
-				this.getClass().getClassLoader().getResource("images/Equidistance.png")
-			);
-	}
-
-	/**
-	 * @see org.gvsig.andami.plugins.IExtension#execute(java.lang.String)
-	 */
-	public void execute(String s) {
-		CADExtension.initFocus();
-		if (s.equals("_equidistance")) {
-        	CADExtension.setCADTool(s,true);
-        }
-		CADExtension.getEditionManager().setMapControl(mapControl);
-		CADExtension.getCADToolAdapter().configureMenu();
-	}
-
-	/**
-	 * @see org.gvsig.andami.plugins.IExtension#isEnabled()
-	 */
-	public boolean isEnabled() {
-
-		try {
-			if (EditionUtilities.getEditionStatus() == EditionUtilities.EDITION_STATUS_ONE_VECTORIAL_LAYER_ACTIVE_AND_EDITABLE) {
-				view = (DefaultViewPanel) PluginServices.getMDIManager().getActiveWindow();
-				mapControl = view.getMapControl();
-				EditionManager em=CADExtension.getEditionManager();
-				if (em.getActiveLayerEdited()==null)
-					return false;
-				FLyrVect lv=(FLyrVect)em.getActiveLayerEdited().getLayer();
-
-				if (((FeatureSelection)lv.getFeatureStore().getSelection()).getSize()!=1)
-					return false;
-				if (equidistanceCADTool.isApplicable(lv.getShapeType())){
-					return true;
-				}
-			}
-		} catch (ReadException e) {
-			NotificationManager.addError(e.getMessage(),e);
-		} catch (DataException e) {
-			NotificationManager.addError(e.getMessage(),e);
-		}
-		return false;
-	}
-
-	/**
-	 * @see org.gvsig.andami.plugins.IExtension#isVisible()
-	 */
-	public boolean isVisible() {
-		if (EditionUtilities.getEditionStatus() == EditionUtilities.EDITION_STATUS_ONE_VECTORIAL_LAYER_ACTIVE_AND_EDITABLE)
-			return true;
-		return false;
-	}
-}
Index: branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/BreakExtension.java
===================================================================
--- branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/BreakExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/BreakExtension.java	(revision 38564)
@@ -1,132 +0,0 @@
-/* gvSIG. Sistema de Informaci�n Geogr�fica de la Generalitat Valenciana
- *
- * Copyright (C) 2004 IVER T.I. and Generalitat Valenciana.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
- *
- * For more information, contact:
- *
- *  Generalitat Valenciana
- *   Conselleria d'Infraestructures i Transport
- *   Av. Blasco Ib��ez, 50
- *   46010 VALENCIA
- *   SPAIN
- *
- *      +34 963862235
- *   gvsig@gva.es
- *      www.gvsig.gva.es
- *
- *    or
- *
- *   IVER T.I. S.A
- *   Salamanca 50
- *   46005 Valencia
- *   Spain
- *
- *   +34 963163400
- *   dac@iver.es
- */
-package org.gvsig.editing;
-
-import org.gvsig.andami.PluginServices;
-import org.gvsig.andami.messages.NotificationManager;
-import org.gvsig.andami.plugins.Extension;
-import org.gvsig.app.project.documents.view.gui.DefaultViewPanel;
-import org.gvsig.editing.gui.cad.tools.BreakCADTool;
-import org.gvsig.fmap.dal.exception.DataException;
-import org.gvsig.fmap.dal.exception.ReadException;
-import org.gvsig.fmap.dal.feature.FeatureSelection;
-import org.gvsig.fmap.mapcontext.layers.vectorial.FLyrVect;
-import org.gvsig.fmap.mapcontrol.MapControl;
-
-
-/**
- * Extensi�n que gestiona la partici�n de geometr�as en edici�n.
- *
- * @author Vicente Caballero Navarro
- */
-public class BreakExtension extends Extension {
-	private DefaultViewPanel view;
-
-	private MapControl mapControl;
-	private BreakCADTool breakCADTool;
-
-	/**
-	 * @see org.gvsig.andami.plugins.IExtension#initialize()
-	 */
-	public void initialize() {
-		breakCADTool=new BreakCADTool();
-		CADExtension.addCADTool("_break",breakCADTool);
-
-		registerIcons();
-	}
-
-	private void registerIcons(){
-		PluginServices.getIconTheme().registerDefault(
-				"edition-geometry-break",
-				this.getClass().getClassLoader().getResource("images/Break.png")
-			);
-
-	}
-
-	/**
-	 * @see org.gvsig.andami.plugins.IExtension#execute(java.lang.String)
-	 */
-	public void execute(String s) {
-		CADExtension.initFocus();
-		if (s.equals("_break")) {
-        	CADExtension.setCADTool(s,true);
-        }
-		CADExtension.getEditionManager().setMapControl(mapControl);
-		CADExtension.getCADToolAdapter().configureMenu();
-	}
-
-	/**
-	 * @see org.gvsig.andami.plugins.IExtension#isEnabled()
-	 */
-	public boolean isEnabled() {
-
-		try {
-			if (EditionUtilities.getEditionStatus() == EditionUtilities.EDITION_STATUS_ONE_VECTORIAL_LAYER_ACTIVE_AND_EDITABLE) {
-				view = (DefaultViewPanel) PluginServices.getMDIManager().getActiveWindow();
-				mapControl = view.getMapControl();
-				EditionManager em=CADExtension.getEditionManager();
-				if (em.getActiveLayerEdited()==null)
-						return false;
-				FLyrVect lv=(FLyrVect)em.getActiveLayerEdited().getLayer();
-
-				if (((FeatureSelection)lv.getFeatureStore().getSelection()).getSize()!=1)
-					return false;
-				if (breakCADTool.isApplicable(lv.getShapeType())){
-					return true;
-				}
-			}
-		} catch (ReadException e) {
-			NotificationManager.addError(e.getMessage(),e);
-		} catch (DataException e) {
-			NotificationManager.addError(e.getMessage(),e);
-		}
-		return false;
-	}
-
-	/**
-	 * @see org.gvsig.andami.plugins.IExtension#isVisible()
-	 */
-	public boolean isVisible() {
-		if (EditionUtilities.getEditionStatus() == EditionUtilities.EDITION_STATUS_ONE_VECTORIAL_LAYER_ACTIVE_AND_EDITABLE)
-			return true;
-		return false;
-	}
-}
Index: branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/LayerPropertiesExtension.java
===================================================================
--- branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/LayerPropertiesExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/LayerPropertiesExtension.java	(revision 38564)
@@ -1,87 +0,0 @@
-package org.gvsig.editing;
-
-import org.gvsig.andami.PluginServices;
-import org.gvsig.andami.plugins.Extension;
-import org.gvsig.app.project.documents.view.ViewDocument;
-import org.gvsig.app.project.documents.view.gui.DefaultViewPanel;
-import org.gvsig.fmap.mapcontext.MapContext;
-import org.gvsig.fmap.mapcontext.layers.FLayer;
-import org.gvsig.fmap.mapcontext.layers.vectorial.FLyrVect;
-import org.gvsig.fmap.mapcontrol.MapControl;
-
-
-
-public class LayerPropertiesExtension extends Extension{
-
-	public void initialize() {
-		// TODO Auto-generated method stub
-		registerIcons();
-	}
-
-	private void registerIcons(){
-		PluginServices.getIconTheme().register(
-				"images-selected-icon",
-				this.getClass().getClassLoader().getResource("images/selected.png")
-		);
-		PluginServices.getIconTheme().register(
-				"images-notselected-icon",
-				this.getClass().getClassLoader().getResource("images/notSelected.png")
-		);
-		PluginServices.getIconTheme().register(
-				"images-blocked-icon",
-				this.getClass().getClassLoader().getResource("images/blocked.png")
-		);
-		PluginServices.getIconTheme().register(
-				"images-unblocked-icon",
-				this.getClass().getClassLoader().getResource("images/unblocked.png")
-		);
-		PluginServices.getIconTheme().register(
-				"images-defuse-icon",
-				this.getClass().getClassLoader().getResource("images/defuse.png")
-		);
-		PluginServices.getIconTheme().register(
-				"images-active-icon",
-				this.getClass().getClassLoader().getResource("images/active.png")
-		);
-		PluginServices.getIconTheme().register(
-				"images-disabled-icon",
-				this.getClass().getClassLoader().getResource("images/disabled.png")
-		);
-		PluginServices.getIconTheme().register(
-				"images-notdisabled-icon",
-				this.getClass().getClassLoader().getResource("images/notdisabled.png")
-		);
-		PluginServices.getIconTheme().register(
-				"images-fill-icon",
-				this.getClass().getClassLoader().getResource("images/fill.png")
-		);
-		PluginServices.getIconTheme().register(
-				"images-notfill-icon",
-				this.getClass().getClassLoader().getResource("images/notfill.png")
-		);
-	}
-
-	public void execute(String actionCommand) {
-		org.gvsig.andami.ui.mdiManager.IWindow view = PluginServices.getMDIManager().getActiveWindow();
-		if (!(view instanceof DefaultViewPanel))
-			return;
-		DefaultViewPanel vista=(DefaultViewPanel)view;
-		ViewDocument model = vista.getModel();
-		MapContext mapa = model.getMapContext();
-		MapControl mapCtrl = vista.getMapControl();
-		FLayer[] layers=mapa.getLayers().getActives();
-		//layers[0].
-		//REFACTORING
-		//LayerProperties layerProperties=new LayerProperties(layers[0],((FLyrVect)layers[0]).getLegend());
-		//PluginServices.getMDIManager().addWindow(layerProperties);
-	}
-
-	public boolean isEnabled() {
-		return true;
-	}
-
-	public boolean isVisible() {
-		return true;
-	}
-
-}
Index: branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/JoinExtension.java
===================================================================
--- branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/JoinExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/JoinExtension.java	(revision 38564)
@@ -40,6 +40,7 @@
  */
 package org.gvsig.editing;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.messages.NotificationManager;
 import org.gvsig.andami.plugins.Extension;
@@ -73,20 +74,16 @@
 	}
 
 	private void registerIcons(){
-		PluginServices.getIconTheme().registerDefault(
-				"edition-geometry-Join",
-				this.getClass().getClassLoader().getResource("images/Join.png")
-			);
-
+		IconThemeHelper.registerIcon("action", "layer-modify-join", this);
 	}
 	/**
 	 * @see org.gvsig.andami.plugins.IExtension#execute(java.lang.String)
 	 */
 	public void execute(String s) {
 		CADExtension.initFocus();
-		if (s.equals("_join")) {
-        	CADExtension.setCADTool(s,true);
-        }
+		if ("layer-modify-join".equalsIgnoreCase(s)) {
+			 CADExtension.setCADTool("_join",true);
+	    }
 		CADExtension.getEditionManager().setMapControl(mapControl);
 		CADExtension.getCADToolAdapter().configureMenu();
 	}
Index: branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/ViewCommandStackExtension.java
===================================================================
--- branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/ViewCommandStackExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/ViewCommandStackExtension.java	(revision 38564)
@@ -5,7 +5,6 @@
 import org.gvsig.app.gui.command.CommandStackDialog;
 import org.gvsig.app.project.documents.view.ViewDocument;
 import org.gvsig.app.project.documents.view.gui.DefaultViewPanel;
-import org.gvsig.fmap.dal.exception.DataException;
 import org.gvsig.fmap.dal.feature.FeatureStore;
 import org.gvsig.fmap.mapcontext.MapContext;
 import org.gvsig.fmap.mapcontext.layers.FLayers;
@@ -24,10 +23,6 @@
 	 * @see org.gvsig.andami.plugins.IExtension#initialize()
 	 */
 	public void initialize() {
-		PluginServices.getIconTheme().registerDefault(
-				"commands-stack",
-				this.getClass().getClassLoader().getResource("images/commandstack.png")
-			);
 	}
 
 	/**
@@ -41,38 +36,21 @@
 		ViewDocument model = vista.getModel();
 		MapContext mapa = model.getMapContext();
 		FLayers layers = mapa.getLayers();
-		if (s.equals("COMMANDSTACK")) {
+		if (s.equals("edit-undo-redo-actions-layer")) {
 			for (int i =0;i<layers.getLayersCount();i++){
 				if (layers.getLayer(i) instanceof FLyrVect){
 					FLyrVect lyrVect=(FLyrVect)layers.getLayer(i);
 					if (lyrVect.isEditing() && lyrVect.isActive()){
-//						try{
 						FeatureStore featureStore=lyrVect.getFeatureStore();
-//					CommandsRecord commandsRecord=null;
-//						try {
-//							commandsRecord = lyrVect.getFeatureStore().getCommandsRecord();
-//						} catch (ReadException e) {
-//							// TODO Auto-generated catch block
-//							e.printStackTrace();
-//						} catch (DataException e) {
-//							// TODO Auto-generated catch block
-//							e.printStackTrace();
-//						}
-//						commandsRecord.addObserver(this);
 						csd=new CommandStackDialog();
 						csd.setModel(featureStore);
 						PluginServices.getMDIManager().addWindow(csd);
-//						} catch (DataException e) {
-//							e.printStackTrace();
-//						}
 						return;
 					}
 				}
 			}
 		}
 
-		//PluginServices.getMainFrame().enableControls();
-
 	}
 
 	/**
Index: branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/UndoViewExtension.java
===================================================================
--- branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/UndoViewExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/UndoViewExtension.java	(revision 38564)
@@ -44,8 +44,6 @@
 import org.gvsig.andami.messages.NotificationManager;
 import org.gvsig.andami.plugins.Extension;
 import org.gvsig.app.project.documents.view.gui.DefaultViewPanel;
-import org.gvsig.fmap.dal.exception.DataException;
-import org.gvsig.fmap.dal.exception.ReadException;
 import org.gvsig.fmap.mapcontext.layers.FLayer;
 import org.gvsig.fmap.mapcontext.layers.FLayers;
 import org.gvsig.fmap.mapcontext.layers.vectorial.FLyrVect;
@@ -65,10 +63,6 @@
 	 * @see org.gvsig.andami.plugins.IExtension#initialize()
 	 */
 	public void initialize() {
-		PluginServices.getIconTheme().registerDefault(
-				"view-undo",
-				this.getClass().getClassLoader().getResource("images/Undo.png")
-			);
 	}
 
 	/**
@@ -78,7 +72,7 @@
 		DefaultViewPanel vista = (DefaultViewPanel) PluginServices.getMDIManager().getActiveWindow();
 
 
-		if (s.compareTo("UNDO") == 0) {
+		if (s.compareTo("edit-undo-layer") == 0) {
 			undo(vista);
 
 		}
Index: branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/SelectionGeometryExtension.java
===================================================================
--- branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/SelectionGeometryExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/SelectionGeometryExtension.java	(revision 38564)
@@ -40,7 +40,7 @@
  */
 package org.gvsig.editing;
 
-import org.gvsig.andami.PluginServices;
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.messages.NotificationManager;
 import org.gvsig.andami.plugins.Extension;
 import org.gvsig.editing.gui.cad.tools.SelectionCADTool;
@@ -70,18 +70,15 @@
 	}
 
 	private void registerIcons(){
-		PluginServices.getIconTheme().registerDefault(
-				"edition-geometry-select",
-				this.getClass().getClassLoader().getResource("images/SelCAD.png")
-			);
-
+		IconThemeHelper.registerIcon("action", "selection-simple", this);
 	}
+	
 	/**
 	 * @see org.gvsig.andami.plugins.IExtension#execute(java.lang.String)
 	 */
 	public void execute(String s) {
 		CADExtension.initFocus();
-		if (s.equals("_selection")) {
+		if (s.equals("selection-simple")) {
         	CADExtension.setCADTool("_selection",true);
         }
 		CADExtension.getEditionManager().setMapControl(mapControl);
Index: branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/MatrixExtension.java
===================================================================
--- branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/MatrixExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/MatrixExtension.java	(revision 38564)
@@ -40,6 +40,7 @@
  */
 package org.gvsig.editing;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.messages.NotificationManager;
 import org.gvsig.andami.plugins.Extension;
@@ -73,18 +74,9 @@
 	}
 
 	private void registerIcons(){
-		PluginServices.getIconTheme().registerDefault(
-				"edition-geometry-matrix",
-				this.getClass().getClassLoader().getResource("images/Matriz.png")
-			);
-		PluginServices.getIconTheme().registerDefault(
-				"edition-geometrymatrix-lagxy",
-				this.getClass().getClassLoader().getResource("images/lagxy.png")
-			);
-		PluginServices.getIconTheme().registerDefault(
-				"edition-geometrymatrix-addpoint",
-				this.getClass().getClassLoader().getResource("images/addpoint.png")
-			);
+		IconThemeHelper.registerIcon("action", "layer-modify-matrix", this);
+		IconThemeHelper.registerIcon("editing-tools", "layer-modify-matrix-addpoint", this);
+		IconThemeHelper.registerIcon("editing-tools", "layer-modify-matrix-lagxy", this);
 	}
 
 	/**
@@ -92,11 +84,9 @@
 	 */
 	public void execute(String s) {
 		CADExtension.initFocus();
-		if (s.equals("_matrix")) {
-
-
-			CADExtension.setCADTool(s,true);
-        }
+		if ("layer-modify-matrix".equalsIgnoreCase(s)) {
+			 CADExtension.setCADTool("_matrix",true);
+	    }
 		CADExtension.getEditionManager().setMapControl(mapControl);
 		CADExtension.getCADToolAdapter().configureMenu();
 	}
Index: branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/gui/preferences/FlatnessPage.java
===================================================================
--- branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/gui/preferences/FlatnessPage.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/gui/preferences/FlatnessPage.java	(revision 38564)
@@ -118,6 +118,7 @@
 import javax.swing.border.EmptyBorder;
 
 import org.apache.batik.ext.swing.GridBagConstants;
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.preferences.AbstractPreferencePage;
 import org.gvsig.andami.preferences.StoreException;
@@ -139,7 +140,7 @@
 
 	public FlatnessPage() {
 		super();
-		icon = PluginServices.getIconTheme().get("flatness-icon");
+		icon = IconThemeHelper.getImageIcon("preferences-layer-modify-flatness");
 		setLayout(new BorderLayout());
 		add(getNorthPanel(), BorderLayout.NORTH);
 	}
Index: branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/gui/accelerators/ForceCursorAccelerator.java
===================================================================
--- branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/gui/accelerators/ForceCursorAccelerator.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/gui/accelerators/ForceCursorAccelerator.java	(revision 38564)
@@ -66,7 +66,7 @@
 			return false;
 		MapControl mc=((DefaultViewPanel)v).getMapControl();
 		mc.setAdjustGrid(!mc.getGrid().isAdjustGrid());
-		System.err.println("Ponemos ForceCursor a " + mc.getGrid().isAdjustGrid());
+//		System.err.println("Ponemos ForceCursor a " + mc.getGrid().isAdjustGrid());
 		Preferences prefs=GridPage.prefs;
 		prefs.putBoolean("grid.adjustgrid",mc.getGrid().isAdjustGrid());
 		return false;
Index: branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/gui/cad/tools/SplitGeometryCADTool.java
===================================================================
--- branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/gui/cad/tools/SplitGeometryCADTool.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/gui/cad/tools/SplitGeometryCADTool.java	(revision 38564)
@@ -99,6 +99,7 @@
      * String representation of this tool (used for example to active the tool
      * in mapcontrol)
      */
+    public static final String SPLIT_GEOMETRY_ACTION_NAME = "layer-modify-split";
     public static final String SPLIT_GEOMETRY_TOOL_NAME = "_split_geometry";
 
     /**
Index: branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/gui/graphictools/ToolSelectGraphic.java
===================================================================
--- branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/gui/graphictools/ToolSelectGraphic.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/gui/graphictools/ToolSelectGraphic.java	(revision 38564)
@@ -67,7 +67,7 @@
 	/**
 	 * The image to display when the cursor is active.
 	 */
-	private final Image img = PluginServices.getIconTheme().get("rect-select-cursor").getImage();
+	private final Image img = PluginServices.getIconTheme().get("cursor-select-by-polygon").getImage();
 
 	/**
 	 * The cursor used to work with this tool listener.
Index: branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/AutoCompletePolygonExtension.java
===================================================================
--- branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/AutoCompletePolygonExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/AutoCompletePolygonExtension.java	(revision 38564)
@@ -1,5 +1,6 @@
 package org.gvsig.editing;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.messages.NotificationManager;
 import org.gvsig.andami.plugins.Extension;
@@ -23,15 +24,11 @@
 		registerIcons();
 	}
 	private void registerIcons(){
-		PluginServices.getIconTheme().registerDefault(
-				"edition-geometry-autocompletepolygon",
-				this.getClass().getClassLoader().getResource("images/polygon_autocomplete.png")
-			);
-
+		IconThemeHelper.registerIcon("action", "layer-insert-autopolygon", this);
 	}
 	public void execute(String actionCommand) {
 		CADExtension.initFocus();
-		if (actionCommand.equals("AUTOCOMPLETE_POLYGON")) {
+		if (actionCommand.equals("layer-insert-autopolygon")) {
 			CADExtension.setCADTool("_autocompletepolygon", true);
 			CADExtension.getEditionManager().setMapControl(mapControl);
 		}
Index: branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/TableCommandStackExtension.java
===================================================================
--- branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/TableCommandStackExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/TableCommandStackExtension.java	(revision 38564)
@@ -18,10 +18,6 @@
 	 * @see org.gvsig.andami.plugins.IExtension#initialize()
 	 */
 	public void initialize() {
-		PluginServices.getIconTheme().registerDefault(
-				"commands-stack",
-				this.getClass().getClassLoader().getResource("images/commandstack.png")
-			);
 	}
 
 	/**
@@ -33,7 +29,7 @@
 
 		FeatureTableDocumentPanel table = (FeatureTableDocumentPanel) f;
 		TableDocument model = table.getModel();
-		if (s.equals("COMMANDSTACK")) {
+		if (s.equals("edit-undo-redo-actions-table")) {
 			FeatureStore featureStore = model.getStore();
 			featureStore.addObserver(table);
 			CommandStackDialog csd = new CommandStackDialog();
Index: branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/StretchExtension.java
===================================================================
--- branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/StretchExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/StretchExtension.java	(revision 38564)
@@ -40,6 +40,7 @@
  */
 package org.gvsig.editing;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.messages.NotificationManager;
 import org.gvsig.andami.plugins.Extension;
@@ -75,11 +76,7 @@
 	}
 
 	private void registerIcons(){
-		PluginServices.getIconTheme().registerDefault(
-				"edition-geometry-stretch",
-				this.getClass().getClassLoader().getResource("images/Stretch.png")
-			);
-
+		IconThemeHelper.registerIcon("action", "layer-modify-stretch", this);
 	}
 
 
@@ -88,9 +85,9 @@
 	 */
 	public void execute(String s) {
 		CADExtension.initFocus();
-		if (s.equals("_stretch")) {
-        	CADExtension.setCADTool(s,true);
-        }
+		if ("layer-modify-stretch".equalsIgnoreCase(s)) {
+			 CADExtension.setCADTool("_stretch",true);
+	    }
 		CADExtension.getEditionManager().setMapControl(mapControl);
 		CADExtension.getCADToolAdapter().configureMenu();
 	}
Index: branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/InsertLineExtension.java
===================================================================
--- branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/InsertLineExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/InsertLineExtension.java	(revision 38564)
@@ -40,6 +40,7 @@
  */
 package org.gvsig.editing;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.messages.NotificationManager;
 import org.gvsig.andami.plugins.Extension;
@@ -74,15 +75,8 @@
 	}
 
 	private void registerIcons(){
-		PluginServices.getIconTheme().registerDefault(
-				"edition-insert-geometry-line",
-				this.getClass().getClassLoader().getResource("images/Rect.png")
-			);
-
-		PluginServices.getIconTheme().registerDefault(
-				"edition-insert-geometry-arc",
-				this.getClass().getClassLoader().getResource("images/Arc.png")
-			);
+		IconThemeHelper.registerIcon("action", "layer-insert-line", this);
+		IconThemeHelper.registerIcon("action", "layer-insert-arc", this);
 	}
 
 	/**
@@ -90,11 +84,13 @@
 	 */
 	public void execute(String s) {
 		CADExtension.initFocus();
-		if (s.equals("_line")||
-				s.equals("_arc")) {
-        	CADExtension.setCADTool(s,true);
+		if( "layer-insert-line".equalsIgnoreCase(s)) {
+        	CADExtension.setCADTool("_line",true);
         	CADExtension.getEditionManager().setMapControl(mapControl);
-        }
+		} else if( "layer-insert-arc".equalsIgnoreCase(s)) {
+        	CADExtension.setCADTool("_arc",true);
+        	CADExtension.getEditionManager().setMapControl(mapControl);
+		}
 		CADExtension.getCADToolAdapter().configureMenu();
 	}
 
Index: branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/InsertPolygonExtension.java
===================================================================
--- branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/InsertPolygonExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/InsertPolygonExtension.java	(revision 38564)
@@ -40,6 +40,7 @@
  */
 package org.gvsig.editing;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.messages.NotificationManager;
 import org.gvsig.andami.plugins.Extension;
@@ -84,30 +85,11 @@
 	}
 
 	private void registerIcons(){
-		PluginServices.getIconTheme().registerDefault(
-				"edition-insert-geometry-poligon",
-				this.getClass().getClassLoader().getResource("images/Poligon.png")
-			);
-
-		PluginServices.getIconTheme().registerDefault(
-				"edition-insert-geometry-rectangle",
-				this.getClass().getClassLoader().getResource("images/Rectangle.png")
-			);
-
-		PluginServices.getIconTheme().registerDefault(
-				"edition-insert-geometry-circle",
-				this.getClass().getClassLoader().getResource("images/Circle.png")
-			);
-
-		PluginServices.getIconTheme().registerDefault(
-				"edition-insert-geometry-ellipse",
-				this.getClass().getClassLoader().getResource("images/Ellipse.png")
-			);
-
-		PluginServices.getIconTheme().registerDefault(
-				"edition-geometry-edit-vertex",
-				this.getClass().getClassLoader().getResource("images/EditVertex.png")
-			);
+		IconThemeHelper.registerIcon("action", "layer-modify-edit-vertex", this);
+		IconThemeHelper.registerIcon("action", "layer-insert-ellipse", this);
+		IconThemeHelper.registerIcon("action", "layer-insert-circle", this);
+		IconThemeHelper.registerIcon("action", "layer-insert-rectangle", this);
+		IconThemeHelper.registerIcon("action", "layer-insert-polygon", this);
 	}
 
 	/**
@@ -115,13 +97,22 @@
 	 */
 	public void execute(String s) {
 		CADExtension.initFocus();
-		if (s.equals("_polygon")||
-				s.equals("_circle")||
-				s.equals("_ellipse")||
-				s.equals("_rectangle")||
-				s.equals("_editvertex")) {
-        	CADExtension.setCADTool(s,true);
-        }
+		if ("layer-modify-edit-vertex".equalsIgnoreCase(s)) {
+			CADExtension.setCADTool("_editvertex",true);
+			
+		} else if ("layer-insert-ellipse".equalsIgnoreCase(s)) {
+			CADExtension.setCADTool("_ellipse",true);
+		
+		} else if ("layer-insert-circle".equalsIgnoreCase(s)) {
+			CADExtension.setCADTool("_circle",true);
+		
+		} else if ("layer-insert-rectangle".equalsIgnoreCase(s)) {
+			CADExtension.setCADTool("_rectangle",true);
+		
+		} else if ("layer-insert-polygon".equalsIgnoreCase(s)) {
+			CADExtension.setCADTool("_polygon",true);
+	    
+		}
 		CADExtension.getEditionManager().setMapControl(mapControl);
 		CADExtension.getCADToolAdapter().configureMenu();
 	}
Index: branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/SplitGeometryCADToolExtension.java
===================================================================
--- branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/SplitGeometryCADToolExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/SplitGeometryCADToolExtension.java	(revision 38564)
@@ -48,6 +48,7 @@
  */
 package org.gvsig.editing;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.messages.NotificationManager;
 import org.gvsig.andami.plugins.Extension;
@@ -74,7 +75,7 @@
 
     public void execute(String actionCommand) {
         CADExtension.initFocus();
-        if (actionCommand.equals(SplitGeometryCADTool.SPLIT_GEOMETRY_TOOL_NAME)) {
+        if (actionCommand.equals(SplitGeometryCADTool.SPLIT_GEOMETRY_ACTION_NAME)) {
             CADExtension.setCADTool(SplitGeometryCADTool.SPLIT_GEOMETRY_TOOL_NAME, true);
         }
         CADExtension.getEditionManager().setMapControl(mapControl);
@@ -88,11 +89,7 @@
     }
 
     private void registerIcons(){
-        PluginServices.getIconTheme().registerDefault("split-geometry",
-            this.getClass().
-            getClassLoader().
-            getResource("images/split-poly.png")
-        );
+		IconThemeHelper.registerIcon("action", "layer-modify-split", this);
     }
 
     /**
Index: branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/InsertPointExtension.java
===================================================================
--- branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/InsertPointExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/InsertPointExtension.java	(revision 38564)
@@ -40,6 +40,7 @@
  */
 package org.gvsig.editing;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.messages.NotificationManager;
 import org.gvsig.andami.plugins.Extension;
@@ -70,11 +71,7 @@
     }
 
     private void registerIcons(){
-    	PluginServices.getIconTheme().registerDefault(
-				"edition-insert-geometry-point",
-				this.getClass().getClassLoader().getResource("images/Point.png")
-			);
-
+		IconThemeHelper.registerIcon("action", "layer-insert-point", this);
     }
 
     /**
@@ -83,12 +80,13 @@
     public void execute(String s) {
     	CADExtension.initFocus();
 
-        if (s.equals("_point")) {
+        if ("layer-insert-point".equalsIgnoreCase(s)) {
         	CADExtension.setCADTool("_point",true);
         	CADExtension.getEditionManager().setMapControl(mapControl);
         }
         CADExtension.getCADToolAdapter().configureMenu();
     }
+    
     /**
      * @see org.gvsig.andami.plugins.IExtension#isEnabled()
      */
Index: branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/InsertPolyLineExtension.java
===================================================================
--- branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/InsertPolyLineExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/InsertPolyLineExtension.java	(revision 38564)
@@ -40,6 +40,7 @@
  */
 package org.gvsig.editing;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.messages.NotificationManager;
 import org.gvsig.andami.plugins.Extension;
@@ -76,24 +77,17 @@
 	}
 
 	private void registerIcons(){
-		PluginServices.getIconTheme().registerDefault(
-				"edition-insert-geometry-polyline",
-				this.getClass().getClassLoader().getResource("images/Line.png")
-			);
-
-		PluginServices.getIconTheme().registerDefault(
-				"edition-insert-geometry-spline",
-				this.getClass().getClassLoader().getResource("images/Spline.png")
-			);
+		IconThemeHelper.registerIcon("action", "layer-insert-polyline", this);
+		IconThemeHelper.registerIcon("action", "layer-insert-spline", this);
 	}
 	/**
 	 * @see org.gvsig.andami.plugins.IExtension#execute(java.lang.String)
 	 */
 	public void execute(String s) {
 		CADExtension.initFocus();
-		if (s.equals("_polyline")) {
+		if ("layer-insert-polyline".equalsIgnoreCase(s)) {
 			CADExtension.setCADTool("_polyline",true);
-		}else if (s.equals("_spline")) {
+		}else if ("layer-insert-spline".equalsIgnoreCase(s) ) {
 			CADExtension.setCADTool("_spline",true);
 		}
 		CADExtension.getEditionManager().setMapControl(mapControl);
Index: branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/MoveGeometryExtension.java
===================================================================
--- branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/MoveGeometryExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/MoveGeometryExtension.java	(revision 38564)
@@ -40,7 +40,7 @@
  */
 package org.gvsig.editing;
 
-import org.gvsig.andami.PluginServices;
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.messages.NotificationManager;
 import org.gvsig.andami.plugins.Extension;
 import org.gvsig.editing.gui.cad.tools.MoveCADTool;
@@ -69,19 +69,16 @@
 	}
 
 	private void registerIcons(){
-		PluginServices.getIconTheme().registerDefault(
-				"edition-geometry-move",
-				this.getClass().getClassLoader().getResource("images/Move.png")
-			);
+		IconThemeHelper.registerIcon("action", "layer-modify-move", this);
 	}
 	/**
 	 * @see org.gvsig.andami.plugins.IExtension#execute(java.lang.String)
 	 */
 	public void execute(String s) {
 		CADExtension.initFocus();
-		 if (s.equals("_move")) {
+		if ("layer-modify-move".equalsIgnoreCase(s)) {
 			 CADExtension.setCADTool("_move",true);
-	        }
+	    }
 		CADExtension.getEditionManager().setMapControl(mapControl);
 		CADExtension.getCADToolAdapter().configureMenu();
 	}
Index: branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/InternalPolygonExtension.java
===================================================================
--- branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/InternalPolygonExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/InternalPolygonExtension.java	(revision 38564)
@@ -40,6 +40,7 @@
  */
 package org.gvsig.editing;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.messages.NotificationManager;
 import org.gvsig.andami.plugins.Extension;
@@ -75,10 +76,7 @@
 	}
 
 	private void registerIcons(){
-	    PluginServices.getIconTheme().registerDefault(
-	        "edition-modify-geometry-internalpolygon",
-	        this.getClass().getClassLoader().getResource("images/InternalPolygon.png")
-	    );
+		IconThemeHelper.registerIcon("action", "layer-modify-internal-polygon", this);
 	}
 
 	/**
@@ -86,8 +84,8 @@
 	 */
 	public void execute(String s) {
 	    CADExtension.initFocus();
-	    if (s.equals("_internalpolygon")) {
-	        CADExtension.setCADTool(s,true);
+		if ("layer-modify-internal-polygon".equalsIgnoreCase(s)) {
+			 CADExtension.setCADTool("_internalpolygon",true);
 	    }
 	    CADExtension.getEditionManager().setMapControl(mapControl);
 	    CADExtension.getCADToolAdapter().configureMenu();
Index: branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/ExploitExtension.java
===================================================================
--- branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/ExploitExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/ExploitExtension.java	(revision 38564)
@@ -44,9 +44,7 @@
 
 import javax.swing.JOptionPane;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.plugins.Extension;
 import org.gvsig.app.ApplicationLocator;
@@ -63,6 +61,8 @@
 import org.gvsig.fmap.geom.type.GeometryType;
 import org.gvsig.fmap.mapcontrol.MapControl;
 import org.gvsig.tools.dispose.DisposableIterator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 /**
@@ -89,10 +89,7 @@
 	}
 
 	private void registerIcons(){
-		PluginServices.getIconTheme().registerDefault(
-				"edition-geometry-exploit",
-				this.getClass().getClassLoader().getResource("images/Exploit.png")
-			);
+		IconThemeHelper.registerIcon("action", "layer-modify-explode", this);
 	}
 
 	/**
@@ -100,8 +97,8 @@
 	 */
 	public void execute(String s) {
 		CADExtension.initFocus();
-		if (s.equals("_exploit")) {
-        	CADExtension.setCADTool(s,true);
+		if ( "layer-modify-explode".equalsIgnoreCase(s) ) {
+        	CADExtension.setCADTool("_exploit",true);
         }
 		CADExtension.getEditionManager().setMapControl(mapControl);
 		CADExtension.getCADToolAdapter().configureMenu();
Index: branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/RedoViewExtension.java
===================================================================
--- branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/RedoViewExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/RedoViewExtension.java	(revision 38564)
@@ -44,8 +44,6 @@
 import org.gvsig.andami.messages.NotificationManager;
 import org.gvsig.andami.plugins.Extension;
 import org.gvsig.app.project.documents.view.gui.DefaultViewPanel;
-import org.gvsig.fmap.dal.exception.DataException;
-import org.gvsig.fmap.dal.exception.ReadException;
 import org.gvsig.fmap.mapcontext.layers.FLayer;
 import org.gvsig.fmap.mapcontext.layers.FLayers;
 import org.gvsig.fmap.mapcontext.layers.vectorial.FLyrVect;
@@ -65,10 +63,6 @@
 	 * @see org.gvsig.andami.plugins.IExtension#initialize()
 	 */
 	public void initialize() {
-		PluginServices.getIconTheme().registerDefault(
-				"view-redo",
-				this.getClass().getClassLoader().getResource("images/Redo.png")
-			);
 	}
 
 	/**
@@ -78,30 +72,19 @@
 		DefaultViewPanel vista = (DefaultViewPanel) PluginServices.getMDIManager().getActiveWindow();
 		MapControl mapControl = vista.getMapControl();
 
-		if (s.compareTo("REDO") == 0) {
+		if (s.compareTo("edit-redo-layer") == 0) {
 			try {
 					FLayers layers=mapControl.getMapContext().getLayers();
 					for (int i=0;i<layers.getLayersCount();i++){
 						if (layers.getLayer(i) instanceof FLyrVect && layers.getLayer(i).isEditing() && layers.getLayer(i).isActive()){
 							((FLyrVect)layers.getLayer(i)).getFeatureStore().redo();
-//							CommandsRecord commandsRecord=((FLyrVect)layers.getLayer(i)).getFeatureStore().getCommandsRecord();
-//							commandsRecord.redo();
 							mapControl.drawMap(false);
-//							vea.getCommandRecord().fireCommandsRepaint(null);
-//							vea.getSelection().clear();
-//							CADExtension.getCADTool().clearSelection();
 						}
 
 					}
-//			} catch (ReadException e) {
-//				NotificationManager.addError(e.getMessage(),e);
-//			} catch (DataException e) {
-//				NotificationManager.addError(e.getMessage(),e);
 			} catch (RedoException e) {
 				NotificationManager.addError(e.getMessage(),e);
 			}
-
-			//vista.getMapControl().drawMap(false);
 		}
 	}
 
Index: branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/CADExtension.java
===================================================================
--- branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/CADExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/CADExtension.java	(revision 38564)
@@ -55,6 +55,7 @@
 import javax.swing.KeyStroke;
 import javax.swing.text.JTextComponent;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.PluginsLocator;
 import org.gvsig.andami.PluginsManager;
@@ -84,6 +85,8 @@
 import org.gvsig.utils.console.JConsole;
 import org.gvsig.utils.console.ResponseListener;
 import org.gvsig.utils.console.jedit.JEditTextArea;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 /**
@@ -93,6 +96,8 @@
  * @author Vicente Caballero Navarro
  */
 public class CADExtension extends Extension implements IPreferenceExtension{
+	private static Logger logger = LoggerFactory.getLogger(CADExtension.class);
+	
 	private static HashMap adapters=new HashMap();
 
 	private static DefaultViewPanel view;
@@ -207,47 +212,19 @@
     }
 
     private void registerIcons(){
-		PluginServices.getIconTheme().registerDefault(
-				"edition-geometry-copy",
-				this.getClass().getClassLoader().getResource("images/Copy.png")
-			);
-
-		PluginServices.getIconTheme().registerDefault(
-				"edition-geometry-symmetry",
-				this.getClass().getClassLoader().getResource("images/Symmetry.png")
-			);
-
-		PluginServices.getIconTheme().registerDefault(
-				"edition-geometry-rotate",
-				this.getClass().getClassLoader().getResource("images/Rotation.png")
-			);
-
-		PluginServices.getIconTheme().registerDefault(
-				"edition-geometry-scale",
-				this.getClass().getClassLoader()
-						.getResource("images/Scale.png"));
-
-		PluginServices.getIconTheme().registerDefault(
-				"edition-properties",
-				CADExtension.class.getClassLoader().getResource(
-						"images/EditingProperties.png"));
-
-		PluginServices.getIconTheme().registerDefault(
-				"field-expresion",
-				CADExtension.class.getClassLoader().getResource(
-						"images/FieldExpresion.png"));
-		PluginServices.getIconTheme().registerDefault(
-				"flatness-icon",
-				CADExtension.class.getClassLoader().getResource(
-						"images/Flatness.png"));
-		PluginServices.getIconTheme().registerDefault(
-				"grid-icon",
-				CADExtension.class.getClassLoader().getResource(
-						"images/Grid.png"));
-		PluginServices.getIconTheme().registerDefault(
-				"snapper-icon",
-				CADExtension.class.getClassLoader().getResource(
-						"images/Snapper.png"));
+    	IconThemeHelper.registerIcon("action", "layer-modify-copy", this);
+    	IconThemeHelper.registerIcon("action", "layer-modify-symmetry", this);
+    	IconThemeHelper.registerIcon("action", "layer-modify-rotate", this);
+    	IconThemeHelper.registerIcon("action", "layer-modify-scale", this);
+    	IconThemeHelper.registerIcon("action", "layer-modify-edit-vertex", this);
+    	IconThemeHelper.registerIcon("action", "layer-modify-join", this);
+    	IconThemeHelper.registerIcon("action", "layer-modify-matrix", this);
+    	IconThemeHelper.registerIcon("action", "layer-modify-move", this);
+    	IconThemeHelper.registerIcon("action", "layer-modify-rotate", this);
+    	IconThemeHelper.registerIcon("action", "layer-modify-stretch", this);
+    	
+    	
+    	IconThemeHelper.registerIcon("preferences", "preferences-layer-modify-flatness", this);
 	}
 
 	/**
@@ -255,16 +232,29 @@
 	 */
 	public void execute(String s) {
 		initFocus();
-
-		if (s.equals("_spline") || s.equals("_copy")
-				|| s.equals("_equidistance") || s.equals("_matriz")
-				|| s.equals("_symmetry") || s.equals("_rotate")
-				|| s.equals("_stretch") || s.equals("_scale")
-				|| s.equals("_extend") || s.equals("_trim")
-				|| s.equals("_unit")
-				|| s.equals("_chaflan") || s.equals("_join")) {
-			setCADTool(s, true);
-		}
+    	if( "layer-modify-copy".equalsIgnoreCase(s) ) {
+    		setCADTool("_copy", true);
+    	} else if( "layer-modify-symmetry".equalsIgnoreCase(s) ) {
+    		setCADTool("_symmetry", true);
+    	} else if( "layer-modify-rotate".equalsIgnoreCase(s) ) {
+    		setCADTool("_rotate", true);
+    	} else if( "layer-modify-scale".equalsIgnoreCase(s) ) {
+    		setCADTool("_scale", true);
+    	} else if( "layer-modify-edit-vertex".equalsIgnoreCase(s) ) {
+    		setCADTool("_editvertex", true);
+    	} else if( "layer-modify-join".equalsIgnoreCase(s) ) {
+    		setCADTool("_join", true);
+    	} else if( "layer-modify-matrix".equalsIgnoreCase(s) ) {
+    		setCADTool("_matriz", true);
+    	} else if( "layer-modify-move".equalsIgnoreCase(s) ) {
+    		setCADTool("_move", true);
+    	} else if( "layer-modify-rotate".equalsIgnoreCase(s) ) {
+    		setCADTool("_rotate", true);
+    	} else if( "layer-modify-stretch".equalsIgnoreCase(s) ) {
+    		setCADTool("_stretch", true);
+    	} else {
+    		logger.info("Action command '"+s+"' not supportted in "+this.getClass().getName());
+    	}
 		CADToolAdapter cta=getCADToolAdapter();
 		cta.configureMenu();
 	}
Index: branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/InsertMultiPointExtension.java
===================================================================
--- branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/InsertMultiPointExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/InsertMultiPointExtension.java	(revision 38564)
@@ -40,6 +40,7 @@
  */
 package org.gvsig.editing;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.messages.NotificationManager;
 import org.gvsig.andami.plugins.Extension;
@@ -70,10 +71,7 @@
     }
 
     private void registerIcons(){
-    	PluginServices.getIconTheme().registerDefault(
-				"edition-insert-geometry-multipoint",
-				this.getClass().getClassLoader().getResource("images/MultiPoint.png")
-			);
+    	IconThemeHelper.registerIcon("action", "layer-insert-multipoint", this);
 
     }
     /**
@@ -82,7 +80,7 @@
     public void execute(String s) {
     	CADExtension.initFocus();
 
-        if (s.equals("_multipoint")) {
+        if (s.equals("layer-insert-multipoint")) {
         	CADExtension.setCADTool("_multipoint",true);
         	CADExtension.getEditionManager().setMapControl(mapControl);
         }
Index: branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/EditionManager.java
===================================================================
--- branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/EditionManager.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/EditionManager.java	(revision 38564)
@@ -32,9 +32,6 @@
 import javax.swing.JPanel;
 import javax.swing.SwingUtilities;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.messages.NotificationManager;
 import org.gvsig.andami.ui.mdiManager.IWindow;
@@ -69,6 +66,8 @@
 import org.gvsig.tools.swing.api.dynobject.DynObjectSwingManager;
 import org.gvsig.tools.swing.api.dynobject.JDynObjectComponent;
 import org.gvsig.tools.swing.api.windowmanager.WindowManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * 
Index: branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/ComplexSelectionGeometryExtension.java
===================================================================
--- branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/ComplexSelectionGeometryExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/ComplexSelectionGeometryExtension.java	(revision 38564)
@@ -40,7 +40,7 @@
  */
 package org.gvsig.editing;
 
-import org.gvsig.andami.PluginServices;
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.messages.NotificationManager;
 import org.gvsig.andami.plugins.Extension;
 import org.gvsig.editing.gui.cad.tools.ComplexSelectionCADTool;
@@ -70,10 +70,7 @@
 	}
 
 	private void registerIcons(){
-		PluginServices.getIconTheme().registerDefault(
-				"edition-complex-selection",
-				this.getClass().getClassLoader().getResource("images/ComplexSelCAD.png")
-			);
+		IconThemeHelper.registerIcon("action", "selection-complex", this);
 	}
 
 	/**
@@ -81,7 +78,7 @@
 	 */
 	public void execute(String s) {
 		CADExtension.initFocus();
-		if (s.equals("_complex_selection")) {
+		if (s.equals("selection-complex")) {
         	CADExtension.setCADTool("_complex_selection",true);
         }
 		CADExtension.getEditionManager().setMapControl(mapControl);
Index: branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/project/documents/table/TableManager.java
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/project/documents/table/TableManager.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/project/documents/table/TableManager.java	(revision 38564)
@@ -33,6 +33,7 @@
 
 import javax.swing.ImageIcon;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.messages.NotificationManager;
 import org.gvsig.andami.ui.mdiManager.IWindow;
@@ -159,28 +160,9 @@
         // ProjectFactory.getInstance().registerDocumentAction(TYPENAME,"paste",new
         // PasteDocumentContextMenuAction());
 
-        PluginServices.getIconTheme().registerDefault("document-table-icon",
-            AddLayer.class.getClassLoader().getResource("images/tablas.png"));//
+        IconThemeHelper.registerIcon("document", "document-table-icon", TableManager.class);
+        IconThemeHelper.registerIcon("document", "document-table-icon-sel", TableManager.class);
 
-        PluginServices.getIconTheme().registerDefault(
-            "document-table-icon-sel",
-            AddLayer.class.getClassLoader()
-                .getResource("images/tablas_sel.png"));
-
-        PluginServices.getIconTheme().registerDefault("edit-copy",
-            AddLayer.class.getClassLoader().getResource("images/editcopy.png"));//
-        PluginServices.getIconTheme().registerDefault("edit-cut",
-            AddLayer.class.getClassLoader().getResource("images/editcut.png"));
-        PluginServices.getIconTheme()
-            .registerDefault(
-                "edit-paste",
-                AddLayer.class.getClassLoader().getResource(
-                    "images/editpaste.png"));
-        PluginServices.getIconTheme().registerDefault(
-            "edit-delete",
-            AddLayer.class.getClassLoader()
-                .getResource("images/editdelete.png"));
-
         PersistenceManager manager = ToolsLocator.getPersistenceManager();
         manager.registerFactory(factory);
 
Index: branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/project/documents/table/gui/FeatureTypeEditingPanel.java
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/project/documents/table/gui/FeatureTypeEditingPanel.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/project/documents/table/gui/FeatureTypeEditingPanel.java	(revision 38564)
@@ -45,9 +45,6 @@
 import javax.swing.table.TableColumn;
 import javax.swing.table.TableModel;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.messages.NotificationManager;
 import org.gvsig.andami.ui.mdiManager.IWindow;
@@ -60,6 +57,8 @@
 import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor;
 import org.gvsig.fmap.dal.feature.FeatureStore;
 import org.gvsig.tools.swing.api.ToolsSwingLocator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * To modify FeatureTypes from the interface.
Index: branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/project/documents/table/gui/FeatureTableDocumentPanel.java
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/project/documents/table/gui/FeatureTableDocumentPanel.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/project/documents/table/gui/FeatureTableDocumentPanel.java	(revision 38564)
@@ -26,13 +26,9 @@
  */
 package org.gvsig.app.project.documents.table.gui;
 
-import java.lang.reflect.InvocationTargetException;
 
 import javax.swing.SwingUtilities;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.ui.mdiManager.IWindowTransform;
 import org.gvsig.andami.ui.mdiManager.WindowInfo;
@@ -47,6 +43,8 @@
 import org.gvsig.fmap.mapcontrol.dal.feature.swing.table.notification.ColumnHeaderSelectionChangeNotification;
 import org.gvsig.tools.observer.Observable;
 import org.gvsig.tools.observer.Observer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Feature table visualization panel.
Index: branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/project/documents/table/TableDocument.java
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/project/documents/table/TableDocument.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/project/documents/table/TableDocument.java	(revision 38564)
@@ -31,9 +31,6 @@
 import java.util.Iterator;
 import java.util.List;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import org.gvsig.andami.messages.NotificationManager;
 import org.gvsig.app.project.ProjectManager;
 import org.gvsig.app.project.documents.AbstractDocument;
@@ -59,6 +56,8 @@
 import org.gvsig.tools.persistence.Persistent;
 import org.gvsig.tools.persistence.PersistentState;
 import org.gvsig.tools.persistence.exception.PersistenceException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @author <a href="mailto:cordin@disid.com">C�sar Ordi�ana</a>
Index: branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/project/documents/table/ExportStatisticsFile.java
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/project/documents/table/ExportStatisticsFile.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/project/documents/table/ExportStatisticsFile.java	(revision 38564)
@@ -33,9 +33,6 @@
 import javax.swing.JOptionPane;
 import javax.swing.filechooser.FileFilter;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.messages.NotificationManager;
 import org.gvsig.app.project.documents.table.gui.CSVSeparatorOptionsPanel;
@@ -52,6 +49,8 @@
 import org.gvsig.fmap.dal.feature.FeatureStore;
 import org.gvsig.fmap.dal.feature.NewFeatureStoreParameters;
 import org.gvsig.fmap.dal.serverexplorer.filesystem.FilesystemServerExplorer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Class to create dbf and csv files at disk with the statistics group generated
Index: branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/extension/FiltroExtension.java
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/extension/FiltroExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/extension/FiltroExtension.java	(revision 38564)
@@ -25,6 +25,7 @@
 
 import javax.swing.JOptionPane;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.messages.NotificationManager;
 import org.gvsig.andami.plugins.Extension;
@@ -56,12 +57,11 @@
     }
 
     private void registerIcons() {
-        PluginServices.getIconTheme().registerDefault("table-filter",
-            this.getClass().getClassLoader().getResource("images/Filtro.png"));
+    	IconThemeHelper.registerIcon("action", "table-filter", this);
     }
 
     public void execute(String actionCommand) {
-        if ("FILTRO".equals(actionCommand)) {
+        if ("table-filter".equals(actionCommand)) {
             IWindow v = PluginServices.getMDIManager().getActiveWindow();
 
             if (v instanceof FeatureTableDocumentPanel) {
Index: branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/extension/RedoTableExtension.java
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/extension/RedoTableExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/extension/RedoTableExtension.java	(revision 38564)
@@ -40,14 +40,9 @@
      * @see org.gvsig.andami.plugins.IExtension#initialize()
      */
     public void initialize() {
-        registerIcons();
     }
 
-    private void registerIcons() {
 
-        PluginServices.getIconTheme().registerDefault("table-redo",
-            this.getClass().getClassLoader().getResource("images/Redo.png"));
-    }
 
     /**
      * @see org.gvsig.andami.plugins.IExtension#execute(java.lang.String)
@@ -57,7 +52,7 @@
             (FeatureTableDocumentPanel) PluginServices.getMDIManager()
                 .getActiveWindow();
 
-        if (s.compareTo("REDO") == 0) {
+        if ( "edit-redo-table".equalsIgnoreCase(s)) {
             if (tabla.getModel().getStore().isEditing()) {
                 FeatureStore fs = tabla.getModel().getStore();
                 try {
Index: branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/extension/TableFieldOperations.java
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/extension/TableFieldOperations.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/extension/TableFieldOperations.java	(revision 38564)
@@ -21,6 +21,7 @@
  */
 package org.gvsig.app.extension;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.plugins.Extension;
 import org.gvsig.andami.ui.mdiManager.IWindow;
@@ -42,22 +43,10 @@
      * @see org.gvsig.andami.plugins.IExtension#initialize()
      */
     public void initialize() {
-        registerIcons();
+        IconThemeHelper.registerIcon("action", "table-order-desc", this);
+        IconThemeHelper.registerIcon("action", "table-order-asc", this);
     }
 
-    private void registerIcons() {
-        PluginServices.getIconTheme()
-            .registerDefault(
-                "table-order-asc",
-                this.getClass().getClassLoader()
-                    .getResource("images/orderasc.png"));
-
-        PluginServices.getIconTheme().registerDefault(
-            "table-order-desc",
-            this.getClass().getClassLoader()
-                .getResource("images/orderdesc.png"));
-    }
-
     /**
      * @see org.gvsig.andami.plugins.IExtension#execute(java.lang.String)
      */
@@ -80,11 +69,11 @@
         ConfigurableFeatureTableModel cftm =
             table.getTablePanel().getTableModel();
         try {
-            if ("ORDERASC".equals(actionCommand)) {
+            if ("table-order-asc".equals(actionCommand)) {
                 cftm.orderByColumn(table.getTablePanel().getTable()
                     .getSelectedColumnsAttributeDescriptor()[0].getName(), true);
             } else
-                if ("ORDERDESC".equals(actionCommand)) {
+                if ("table-order-desc".equals(actionCommand)) {
                     cftm.orderByColumn(table.getTablePanel().getTable()
                         .getSelectedColumnsAttributeDescriptor()[0].getName(),
                         false);
Index: branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/extension/TableEditStopExtension.java
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/extension/TableEditStopExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/extension/TableEditStopExtension.java	(revision 38564)
@@ -26,6 +26,7 @@
 
 import javax.swing.JOptionPane;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.messages.NotificationManager;
 import org.gvsig.andami.plugins.IExtension;
@@ -47,18 +48,17 @@
 
 public class TableEditStopExtension extends AbstractTableEditExtension {
 
-    /**
-     * @see org.gvsig.andami.plugins.IExtension#execute(java.lang.String)
-     */
+	public void initialize() {
+		super.initialize();
+		IconThemeHelper.registerIcon("action", "table-stop-editing", this);
+	}
+	
     public void execute(String actionCommand) {
-        if ("STOPEDITING".equals(actionCommand)) {
+        if ("table-stop-editing".equals(actionCommand)) {
             stopEditing(table);
         }
     }
 
-    /**
-     * DOCUMENT ME!
-     */
     public void stopEditing(FeatureTableDocumentPanel table) {
         // FIXME
         int resp =
Index: branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/extension/TableEditRemoveRowExtension.java
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/extension/TableEditRemoveRowExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/extension/TableEditRemoveRowExtension.java	(revision 38564)
@@ -21,6 +21,7 @@
  */
 package org.gvsig.app.extension;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.fmap.dal.exception.DataException;
 
 /**
@@ -30,11 +31,15 @@
  */
 public class TableEditRemoveRowExtension extends AbstractTableEditExtension {
 
+	public void initialize() {
+		super.initialize();
+		IconThemeHelper.registerIcon("action", "table-remove-row", this);
+	}
     /**
      * @see org.gvsig.andami.plugins.IExtension#execute(java.lang.String)
      */
     public void execute(String actionCommand) {
-        if ("REMOVEROW".equals(actionCommand)) {
+        if ("table-remove-row".equals(actionCommand)) {
             try {
                 featureTableOperations.setStore(table.getModel().getStore());
                 featureTableOperations.deleteFeatures();
Index: branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/extension/TableEditChangeColumnsExtension.java
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/extension/TableEditChangeColumnsExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/extension/TableEditChangeColumnsExtension.java	(revision 38564)
@@ -21,6 +21,7 @@
  */
 package org.gvsig.app.extension;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.messages.NotificationManager;
 import org.gvsig.fmap.dal.exception.DataException;
@@ -32,21 +33,27 @@
  */
 public class TableEditChangeColumnsExtension extends AbstractTableEditExtension {
 
+	public void initialize() {
+		super.initialize();
+		IconThemeHelper.registerIcon("action", "table-add-column", this);
+		IconThemeHelper.registerIcon("action", "table-rename-column", this);
+		IconThemeHelper.registerIcon("action", "table-remove-column", this);
+	}
     /**
      * @see org.gvsig.andami.plugins.IExtension#execute(java.lang.String)
      */
     public void execute(String actionCommand) {
         try {
             featureTableOperations.setStore(table.getModel().getStore());
-            if ("REMOVECOLUMN".equals(actionCommand)) {
+            if ("table-remove-column".equals(actionCommand)) {
                 featureTableOperations.deleteAttributes(table.getTablePanel()
                     .getTable());
             } else
-                if ("ADDCOLUMN".equals(actionCommand)) {
+                if ("table-add-column".equals(actionCommand)) {
                     featureTableOperations.insertAttributes(table
                         .getTablePanel().getTable());
                 } else
-                    if ("RENAMECOLUMN".equals(actionCommand)) {
+                    if ("table-rename-column".equals(actionCommand)) {
                         featureTableOperations.renameAttributes(table
                             .getTablePanel().getTable());
                     }
Index: branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/extension/TableEditAttributes.java
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/extension/TableEditAttributes.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/extension/TableEditAttributes.java	(revision 38564)
@@ -21,6 +21,7 @@
  */
 package org.gvsig.app.extension;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.messages.NotificationManager;
 import org.gvsig.andami.plugins.Extension;
@@ -45,21 +46,24 @@
      * @see com.iver.mdiApp.plugins.IExtension#updateUI(java.lang.String)
      */
     public void execute(String s) {
-        TableDocument pt = table.getModel();
-        FeatureStore fs = pt.getStore();
-        try {
-            PluginServices.getMDIManager().addWindow(
-                new FeatureTypeEditingPanel(fs));
-        } catch (DataException e) {
-            NotificationManager.addError(
-                PluginServices.getText(this, "create_editabletype"), e);
-        }
+    	if( "table-column-manager".equalsIgnoreCase(s)) {
+	        TableDocument pt = table.getModel();
+	        FeatureStore fs = pt.getStore();
+	        try {
+	            PluginServices.getMDIManager().addWindow(
+	                new FeatureTypeEditingPanel(fs));
+	        } catch (DataException e) {
+	            NotificationManager.addError(
+	                PluginServices.getText(this, "create_editabletype"), e);
+	        }
+    	}
     }
 
     /**
      * @see org.gvsig.andami.plugins.IExtension#initialize()
      */
     public void initialize() {
+    	IconThemeHelper.registerIcon("action", "table-column-manager", this);
     }
 
     public boolean isEnabled() {
Index: branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/extension/PrintTable.java
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/extension/PrintTable.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/extension/PrintTable.java	(revision 38564)
@@ -31,6 +31,7 @@
 
 import javax.swing.JTable;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.messages.NotificationManager;
 import org.gvsig.andami.plugins.Extension;
@@ -47,26 +48,12 @@
 
     private JTable table = null;
 
-    /**
-     * DOCUMENT ME!
-     */
     public void initialize() {
-        registerIcons();
+    	IconThemeHelper.registerIcon("action", "document-print", this);
     }
 
-    private void registerIcons() {
-        PluginServices.getIconTheme().registerDefault("document-print",
-            this.getClass().getClassLoader().getResource("images/print.png"));
-    }
-
-    /**
-     * DOCUMENT ME!
-     * 
-     * @param actionCommand
-     *            DOCUMENT ME!
-     */
     public void execute(String s) {
-        if (s.compareTo("PRINTTABLE") == 0) {
+        if (s.compareTo("application-print-table") == 0) {
             IWindow f = PluginServices.getMDIManager().getActiveWindow();
             try {
                 table =
Index: branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/extension/TableEditCutExtension.java
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/extension/TableEditCutExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/extension/TableEditCutExtension.java	(revision 38564)
@@ -21,7 +21,6 @@
  */
 package org.gvsig.app.extension;
 
-import org.gvsig.andami.PluginServices;
 import org.gvsig.fmap.dal.exception.DataException;
 
 /**
@@ -36,19 +35,13 @@
      */
     public void initialize() {
         super.initialize();
-        registerIcons();
     }
 
-    private void registerIcons() {
-        PluginServices.getIconTheme().registerDefault("edit-cut",
-            this.getClass().getClassLoader().getResource("images/editcut.png"));
-    }
-
     /**
      * @see org.gvsig.andami.plugins.IExtension#execute(java.lang.String)
      */
     public void execute(String actionCommand) {
-        if ("CUT".equals(actionCommand)) {
+        if ("edit-cut-table".equals(actionCommand)) {
             try {
                 featureTableOperations.setStore(table.getModel().getStore());
                 featureTableOperations.cutFeatures();
Index: branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/extension/TableRowsOperations.java
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/extension/TableRowsOperations.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/extension/TableRowsOperations.java	(revision 38564)
@@ -21,6 +21,7 @@
  */
 package org.gvsig.app.extension;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.messages.NotificationManager;
 import org.gvsig.andami.plugins.Extension;
@@ -29,45 +30,23 @@
 import org.gvsig.fmap.dal.exception.DataException;
 import org.gvsig.fmap.dal.feature.FeatureStore;
 
-/**
- * DOCUMENT ME!
- * 
- * @author Vicente Caballero Navarro
- * @author gvSIG team
- */
 public class TableRowsOperations extends Extension {
 
-    /**
-     * DOCUMENT ME!
-     */
     public void initialize() {
         registerIcons();
     }
 
     private void registerIcons() {
-        PluginServices.getIconTheme().registerDefault(
-            "table-selection-up",
-            this.getClass().getClassLoader()
-                .getResource("images/selectionUp.png"));
-
-        PluginServices.getIconTheme().registerDefault(
-            "table-invert",
-            this.getClass().getClassLoader()
-                .getResource("images/invertSelection.png"));
+    	IconThemeHelper.registerIcon("action", "selection-move-up", this);
+    	IconThemeHelper.registerIcon("action", "selection-reverse", this);    
     }
 
-    /**
-     * DOCUMENT ME!
-     * 
-     * @param actionCommand
-     *            DOCUMENT ME!
-     */
     public void execute(String actionCommand) {
         FeatureTableDocumentPanel tableDocument = getTableDocument();
-        if (actionCommand.compareTo("SELECTIONUP") == 0) {
+        if (actionCommand.equalsIgnoreCase("selection-move-up") ) {
             showsSelectedRows(tableDocument);
         }
-        if (actionCommand.compareTo("INVERTSELECTION") == 0) {
+        if (actionCommand.equalsIgnoreCase("selection-reverse") ) {
             invertSelection(tableDocument);
         }
         tableDocument.getModel().setModified(true);
@@ -92,11 +71,6 @@
         table.setSelectionUp(true);
     }
 
-    /**
-     * DOCUMENT ME!
-     * 
-     * @return DOCUMENT ME!
-     */
     public boolean isEnabled() {
         FeatureTableDocumentPanel tableDocument = getTableDocument();
 
@@ -112,11 +86,6 @@
         return false;
     }
 
-    /**
-     * DOCUMENT ME!
-     * 
-     * @return DOCUMENT ME!
-     */
     public boolean isVisible() {
         return getTableDocument() != null;
     }
Index: branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/extension/TableEditStartExtension.java
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/extension/TableEditStartExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/extension/TableEditStartExtension.java	(revision 38564)
@@ -23,6 +23,7 @@
 
 import java.util.List;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.ui.mdiManager.IWindow;
 import org.gvsig.app.project.documents.table.TableDocument.TableLink;
@@ -37,11 +38,16 @@
  */
 public class TableEditStartExtension extends AbstractTableEditExtension {
 
+	
+	public void initialize() {
+		super.initialize();
+		IconThemeHelper.registerIcon("action", "table-start-editing", this);
+	}
     /**
      * @see org.gvsig.andami.plugins.IExtension#execute(java.lang.String)
      */
     public void execute(String actionCommand) {
-        if ("STARTEDIT".equals(actionCommand)) {
+        if ("table-start-editing".equals(actionCommand)) {
             try {
                 table.getModel().getStore().edit(FeatureStore.MODE_FULLEDIT);
             } catch (DataException e) {
Index: branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/extension/UndoTableExtension.java
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/extension/UndoTableExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/extension/UndoTableExtension.java	(revision 38564)
@@ -42,20 +42,13 @@
      * @see org.gvsig.andami.plugins.IExtension#initialize()
      */
     public void initialize() {
-        registerIcons();
     }
 
-    private void registerIcons() {
-        PluginServices.getIconTheme().registerDefault("table-undo",
-            this.getClass().getClassLoader().getResource("images/Undo.png"));
-    }
-
     /**
      * @see org.gvsig.andami.plugins.IExtension#execute(java.lang.String)
      */
     public void execute(String s) {
-
-        if (s.compareTo("UNDO") == 0) {
+    	if( "edit-undo-table".equalsIgnoreCase(s)) {
             if (table.getModel().getStore().isEditing()) {
                 FeatureStore fs = table.getModel().getStore();
                 try {
Index: branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/extension/TableEditInsertExtension.java
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/extension/TableEditInsertExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/extension/TableEditInsertExtension.java	(revision 38564)
@@ -21,6 +21,7 @@
  */
 package org.gvsig.app.extension;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.fmap.dal.exception.DataException;
 
 /**
@@ -30,11 +31,15 @@
  */
 public class TableEditInsertExtension extends AbstractTableEditExtension {
 
+	public void initialize() {
+		super.initialize();
+		IconThemeHelper.registerIcon("action", "table-add-row", this);
+	}
     /**
      * @see org.gvsig.andami.plugins.IExtension#execute(java.lang.String)
      */
     public void execute(String actionCommand) {
-        if ("INSERTROW".equals(actionCommand)) {
+        if ("table-add-row".equals(actionCommand)) {
             try {
                 featureTableOperations.setStore(table.getModel().getStore());
                 featureTableOperations.insertNewFeature();
Index: branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/extension/TableNumericFieldOperations.java
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/extension/TableNumericFieldOperations.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/extension/TableNumericFieldOperations.java	(revision 38564)
@@ -23,6 +23,7 @@
 
 import java.math.BigDecimal;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.messages.NotificationManager;
 import org.gvsig.andami.plugins.Extension;
@@ -52,30 +53,26 @@
      * @see org.gvsig.andami.plugins.IExtension#initialize()
      */
     public void initialize() {
-        registerIcons();
+       IconThemeHelper.registerIcon("action", "table-statistics", this);
     }
 
-    private void registerIcons() {
-        PluginServices.getIconTheme().registerDefault(
-            "table-statistics",
-            this.getClass().getClassLoader()
-                .getResource("images/statistics.png"));
-    }
-
     /**
      * @see org.gvsig.andami.plugins.IExtension#execute(java.lang.String)
      */
     public void execute(String actionCommand) {
-        IWindow v = PluginServices.getMDIManager().getActiveWindow();
-
-        if (v != null) {
-            if (v.getClass() == FeatureTableDocumentPanel.class) {
-
-                FeatureTableDocumentPanel table = (FeatureTableDocumentPanel) v;
-
-                doExecute(table);
-            }
-        }
+    	if( "table-statistics".equalsIgnoreCase(actionCommand)) {
+	        IWindow v = PluginServices.getMDIManager().getActiveWindow();
+	
+	        if (v != null) {
+	            if (v.getClass() == FeatureTableDocumentPanel.class) {
+	
+	                FeatureTableDocumentPanel table = (FeatureTableDocumentPanel) v;
+	
+	                doExecute(table);
+	            }
+	        }
+    	}
+    	
     }
 
     /**
Index: branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/extension/RemoveTableLink.java
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/extension/RemoveTableLink.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/extension/RemoveTableLink.java	(revision 38564)
@@ -21,6 +21,7 @@
  */
 package org.gvsig.app.extension;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.plugins.Extension;
 import org.gvsig.andami.ui.mdiManager.IWindow;
@@ -38,19 +39,21 @@
      * @see org.gvsig.andami.plugins.IExtension#initialize()
      */
     public void initialize() {
-        // TODO Auto-generated method stub
+    	IconThemeHelper.registerIcon("action", "table-remove-link", this);
     }
 
     /**
      * @see org.gvsig.andami.plugins.IExtension#execute(java.lang.String)
      */
     public void execute(String actionCommand) {
-        FeatureTableDocumentPanel t =
-            (FeatureTableDocumentPanel) PluginServices.getMDIManager()
-                .getActiveWindow();
-        TableDocument pt = t.getModel();
-        pt.removeLinkTable();// restoreDataSource();
-        t.getModel().setModified(true);
+    	if( "table-remove-link".equalsIgnoreCase(actionCommand)) {
+	        FeatureTableDocumentPanel t =
+	            (FeatureTableDocumentPanel) PluginServices.getMDIManager()
+	                .getActiveWindow();
+	        TableDocument pt = t.getModel();
+	        pt.removeLinkTable();// restoreDataSource();
+	        t.getModel().setModified(true);
+    	}
     }
 
     /**
Index: branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/extension/ZoomToSelectExtension.java
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/extension/ZoomToSelectExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/extension/ZoomToSelectExtension.java	(revision 38564)
@@ -21,6 +21,7 @@
  */
 package org.gvsig.app.extension;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.messages.NotificationManager;
 import org.gvsig.andami.plugins.Extension;
@@ -40,22 +41,23 @@
 public class ZoomToSelectExtension extends Extension {
 
     public void execute(String s) {
-        org.gvsig.andami.ui.mdiManager.IWindow f =
-            PluginServices.getMDIManager().getActiveWindow();
-        MapContext mapa = null;
-        Envelope selectedExtent = null;
-        if (f instanceof FeatureTableDocumentPanel) {
-            FeatureTableDocumentPanel table = (FeatureTableDocumentPanel) f;
-            mapa = (table.getModel().getAssociatedLayer()).getMapContext();
-        }
-
-        try {
-            selectedExtent = mapa.getSelectionBounds();
-            mapa.getViewPort().setEnvelope(selectedExtent);
-        } catch (BaseException e) {
-            NotificationManager.addError(e);
-        }
-
+    	if( "view-navigation-zoom-to-selection-table".equalsIgnoreCase(s) ) {
+	        org.gvsig.andami.ui.mdiManager.IWindow f =
+	            PluginServices.getMDIManager().getActiveWindow();
+	        MapContext mapa = null;
+	        Envelope selectedExtent = null;
+	        if (f instanceof FeatureTableDocumentPanel) {
+	            FeatureTableDocumentPanel table = (FeatureTableDocumentPanel) f;
+	            mapa = (table.getModel().getAssociatedLayer()).getMapContext();
+	        }
+	
+	        try {
+	            selectedExtent = mapa.getSelectionBounds();
+	            mapa.getViewPort().setEnvelope(selectedExtent);
+	        } catch (BaseException e) {
+	            NotificationManager.addError(e);
+	        }
+    	}
     }
 
     public boolean isVisible() {
@@ -122,9 +124,6 @@
     }
 
     private void registerIcons() {
-        PluginServices.getIconTheme().registerDefault(
-            "table-zoom-to-seleccion",
-            this.getClass().getClassLoader()
-                .getResource("images/ZoomSeleccion.png"));
+    	IconThemeHelper.registerIcon("action", "view-navigation-zoom-to-selection", this);
     }
 }
Index: branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/extension/TableEditCopyExtension.java
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/extension/TableEditCopyExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/extension/TableEditCopyExtension.java	(revision 38564)
@@ -21,7 +21,6 @@
  */
 package org.gvsig.app.extension;
 
-import org.gvsig.andami.PluginServices;
 import org.gvsig.fmap.dal.exception.DataException;
 
 /**
@@ -36,22 +35,13 @@
      */
     public void initialize() {
         super.initialize();
-        registerIcons();
     }
 
-    private void registerIcons() {
-        PluginServices.getIconTheme()
-            .registerDefault(
-                "edit-copy",
-                this.getClass().getClassLoader()
-                    .getResource("images/editcopy.png"));
-    }
-
     /**
      * @see org.gvsig.andami.plugins.IExtension#execute(java.lang.String)
      */
     public void execute(String actionCommand) {
-        if ("COPY".equals(actionCommand)) {
+        if ("edit-copy-table".equals(actionCommand)) {
             try {
                 featureTableOperations.setStore(table.getModel().getStore());
                 featureTableOperations.copyFeatures();
Index: branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/extension/TableEditPasteExtension.java
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/extension/TableEditPasteExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/extension/TableEditPasteExtension.java	(revision 38564)
@@ -21,7 +21,6 @@
  */
 package org.gvsig.app.extension;
 
-import org.gvsig.andami.PluginServices;
 import org.gvsig.fmap.dal.exception.DataException;
 
 /**
@@ -36,21 +35,13 @@
      */
     public void initialize() {
         super.initialize();
-        registerIcons();
     }
 
-    private void registerIcons() {
-        PluginServices.getIconTheme().registerDefault(
-            "edit-paste",
-            this.getClass().getClassLoader()
-                .getResource("images/editpaste.png"));
-    }
-
     /**
      * @see org.gvsig.andami.plugins.IExtension#execute(java.lang.String)
      */
     public void execute(String actionCommand) {
-        if ("PASTE".equals(actionCommand)) {
+        if ("edit-paste-table".equals(actionCommand)) {
             try {
                 featureTableOperations.setStore(table.getModel().getStore());
                 featureTableOperations.pasteFeatures();
Index: branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/extension/ShowTable.java
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/extension/ShowTable.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/extension/ShowTable.java	(revision 38564)
@@ -21,6 +21,7 @@
  */
 package org.gvsig.app.extension;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.plugins.Extension;
 import org.gvsig.app.project.ProjectManager;
@@ -98,46 +99,48 @@
      * @see com.iver.mdiApp.plugins.IExtension#updateUI(java.lang.String)
      */
     public void execute(String s) {
-        AbstractViewPanel vista =
-            (AbstractViewPanel) PluginServices.getMDIManager()
-                .getActiveWindow();
-        FLayer[] actives =
-            vista.getViewDocument().getMapContext().getLayers().getActives();
+		if ("layer-show-attributes-table".equalsIgnoreCase(s)) {
+			AbstractViewPanel vista = (AbstractViewPanel) PluginServices
+					.getMDIManager().getActiveWindow();
+			FLayer[] actives = vista.getViewDocument().getMapContext()
+					.getLayers().getActives();
 
-        for (int i = 0; i < actives.length; i++) {
-            if (actives[i] instanceof FLyrVect) {
-                FLyrVect co = (FLyrVect) actives[i];
+			for (int i = 0; i < actives.length; i++) {
+				if (actives[i] instanceof FLyrVect) {
+					FLyrVect co = (FLyrVect) actives[i];
 
-                ProjectManager projectManager = getProjectManager();
-                TableManager tableManager = getTableManager();
+					ProjectManager projectManager = getProjectManager();
+					TableManager tableManager = getTableManager();
 
-                TableDocument projectTable = tableManager.getTableDocument(co);
-                FeatureStore fs = ((FLyrVect) actives[i]).getFeatureStore();
+					TableDocument projectTable = tableManager
+							.getTableDocument(co);
+					FeatureStore fs = ((FLyrVect) actives[i]).getFeatureStore();
 
-                if (projectTable == null) {
-                    projectTable =
-                        (TableDocument) projectManager.createDocument(
-                            TableManager.TYPENAME,
-                            PluginServices.getText(this, "Tabla_de_Atributos")
-                                + ": " + actives[i].getName());
-                    projectTable.setStore(fs);
-                    projectTable.setAssociatedLayer(co);
-                    co.getParentLayer().addLayerCollectionListener(this);
-                    projectManager.getCurrentProject().add(projectTable);
-                }
+					if (projectTable == null) {
+						projectTable = (TableDocument) projectManager
+								.createDocument(
+										TableManager.TYPENAME,
+										PluginServices.getText(this,
+												"Tabla_de_Atributos")
+												+ ": "
+												+ actives[i].getName());
+						projectTable.setStore(fs);
+						projectTable.setAssociatedLayer(co);
+						co.getParentLayer().addLayerCollectionListener(this);
+						projectManager.getCurrentProject().add(projectTable);
+					}
 
-                FeatureTableDocumentPanel featureTableDocumentPanel =
-                    (FeatureTableDocumentPanel) projectTable.getFactory()
-                        .getMainWindow(projectTable);
+					FeatureTableDocumentPanel featureTableDocumentPanel = (FeatureTableDocumentPanel) projectTable
+							.getFactory().getMainWindow(projectTable);
 
-                featureTableDocumentPanel.getModel().setModified(true);
-                PluginServices.getMDIManager().addWindow(
-                    featureTableDocumentPanel);
-            }
-        }
+					featureTableDocumentPanel.getModel().setModified(true);
+					PluginServices.getMDIManager().addWindow(
+							featureTableDocumentPanel);
+				}
+			}
+		}
+	}
 
-    }
-
     private ProjectManager getProjectManager() {
         return ProjectManager.getInstance();
     }
@@ -153,16 +156,9 @@
      * @see org.gvsig.andami.plugins.IExtension#initialize()
      */
     public void initialize() {
-        registerIcons();
+    	IconThemeHelper.registerIcon("action", "layer-show-attributes-table", this);
     }
 
-    private void registerIcons() {
-        PluginServices.getIconTheme().registerDefault(
-            "layer-show-attribute-table",
-            this.getClass().getClassLoader()
-                .getResource("images/ResultConsulta.png"));
-    }
-
     public void layerAdded(LayerCollectionEvent e) {
         // Nothing to do
     }
Index: branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/extension/ClearSelectionExtension.java
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/extension/ClearSelectionExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/extension/ClearSelectionExtension.java	(revision 38564)
@@ -21,6 +21,7 @@
  */
 package org.gvsig.app.extension;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.messages.NotificationManager;
 import org.gvsig.andami.plugins.Extension;
@@ -37,7 +38,7 @@
 public class ClearSelectionExtension extends Extension {
 
     public void execute(String s) {
-        if (s.compareTo("DEL_SELECTION") == 0) {
+        if (s.compareTo("selection-clear-table") == 0) {
             IWindow activeWindow =
                 PluginServices.getMDIManager().getActiveWindow();
 
@@ -83,13 +84,7 @@
     }
 
     public void initialize() {
-        registerIcons();
+        IconThemeHelper.registerIcon("action", "selection-clear", this);
     }
 
-    private void registerIcons() {
-        PluginServices.getIconTheme().registerDefault(
-            "table-clear-selection",
-            this.getClass().getClassLoader()
-                .getResource("images/delselection.png"));
-    }
 }
Index: branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/extension/TableOperations.java
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/extension/TableOperations.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/extension/TableOperations.java	(revision 38564)
@@ -27,6 +27,7 @@
 
 import javax.swing.JOptionPane;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.messages.NotificationManager;
 import org.gvsig.andami.plugins.Extension;
@@ -75,7 +76,7 @@
             tableDcouments
                 .toArray(new TableDocument[tableDcouments.size()]);
 
-        if ("LINK".equals(actionCommand)) {
+        if ("table-create-link".equals(actionCommand)) {
             try {
                 final ObjectSelectionStep sourceTable =
                     new ObjectSelectionStep();
@@ -373,24 +374,10 @@
      * @see org.gvsig.andami.plugins.IExtension#initialize()
      */
     public void initialize() {
-        registerIcons();
-        // FIXME
-        // org.gvsig.fmap.data.feature.joinstore.Register.selfRegister();
+    	IconThemeHelper.registerIcon("action", "table-create-link", this);
 
     }
 
-    private void registerIcons() {
-        PluginServices.getIconTheme().registerDefault(
-            "table-join",
-            this.getClass().getClassLoader()
-                .getResource("images/tablejoin.png"));
-
-        PluginServices.getIconTheme().registerDefault(
-            "table-link",
-            this.getClass().getClassLoader()
-                .getResource("images/tablelink.png"));
-    }
-
     /**
      * @see org.gvsig.andami.plugins.IExtension#isEnabled()
      */
Index: branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/resources/config.xml
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/resources/config.xml	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/resources/config.xml	(revision 38564)
@@ -8,172 +8,609 @@
 			description="Extensi�n encargada de a�adir soporte a documentos tabla."
 			active="true"
 			priority="10">
-
-			<menu text="Tabla"
-				position="400"
-				is_separator="true"/>
-				
 		</extension>
 
 		<extension class-name="org.gvsig.app.extension.ClearSelectionExtension"
 			description="Extensi�n encargada de limpiar la selecci�n."
 			active="true">
-			<menu text="Capa/clear_selection" position="35010" action-command="DEL_SELECTION" icon="view-clear-selection"/>
-			<tool-bar name="Tools_Select" position="6">
-				<action-tool icon="view-clear-selection" action-command="DEL_SELECTION"  tooltip="clear_selection" position="4"/>
-			</tool-bar>
+			
+            <action 
+                name="selection-clear-table"
+                label="_Clear_selection" 
+                tooltip="_Clear_selection" 
+                position="300300000" 
+                action-command="selection-clear-table"
+                icon="selection-clear"
+                accelerator=""
+                />
+            
+            <menu
+                name="selection-clear-table"
+                text="Selection/Clear"
+                />
+            
+            <tool-bar name="view_selection">
+                <action-tool 
+                    name="selection-clear-table"
+                    />
+            </tool-bar>   
 		</extension>
 
 		<extension class-name="org.gvsig.app.extension.ShowTable"
 			description="Extensi�n encargada de abrir la tabla asociada a la capa seleccionado."
 			active="true">
-			<menu text="Capa/ver_tabla_atributos" position="35020" icon="layer-show-attribute-table"/>
-			<tool-bar name="Acciones" position="13">
-				<action-tool icon="layer-show-attribute-table"
-					enableText="Un_Layer"
-					tooltip="Muestra_atributos" position="1"/>
-			</tool-bar>
+
+            <action 
+                name="layer-show-attributes-table"
+                label="_Attributes_table" 
+                tooltip="_Show_attributes_table" 
+                position="601200000" 
+                action-command="layer-show-attributes-table"
+                icon="layer-show-attributes-table"
+                accelerator=""
+                />
+            
+            <menu
+                name="layer-show-attributes-table"
+                text="Layer/Show_Attributes_table"
+                />
+            
+            <tool-bar name="view_actions">
+                <action-tool 
+                    name="layer-show-attributes-table"
+                    />
+            </tool-bar>   
 		</extension>
 
 		<extension class-name="org.gvsig.app.extension.TableOperations"
 			description="Extensi�n encargada de gestionar las operaciones sobre las tablas."
 			active="true">
-			<menu text="Tabla/link" position="40010" icon="table-link" action-command="LINK"/>
-			<tool-bar name="Herramientas" position="12">
-				<action-tool icon="table-link" action-command="LINK" tooltip="link" position="2"/>
-			</tool-bar>
+
+            <action 
+                name="table-create-link"
+                label="_Create_link" 
+                tooltip="_Create_link_betwen_tables" 
+                position="501300000" 
+                action-command="table-create-link"
+                icon="table-create-link"
+                accelerator=""
+                />
+            
+            <menu
+                name="table-create-link"
+                text="Table/Create_link"
+                />
+            
+            <tool-bar name="table_tools">
+                <action-tool 
+                    name="table-create-link"
+                    />
+            </tool-bar>   
 		</extension>
 
 		<extension class-name="org.gvsig.app.extension.RedoTableExtension"
 			description="Extensi�n encargada de rehacer la edici�n sobre la capa activa."
 			active="true">
-			<menu text="Tabla/rehacer" position="40014" action-command="REDO" icon="table-redo"/>
-			<tool-bar name="modificar" position="12">
-				<action-tool name="rehacer" icon="table-redo" action-command="REDO" tooltip="rehacer" group="tabla" position="2"/>
-			</tool-bar>
+
+            <action 
+                name="edit-redo-table"
+                label="_Redo" 
+                tooltip="_Redo" 
+                position="0200200000" 
+                action-command="edit-redo-table"
+                icon="edit-redo"
+                accelerator=""
+                />
+            
+            <menu
+                name="edit-redo-table"
+                text="Edit/Redo"
+                />
+            
+            <tool-bar name="edit_actions">
+                <action-tool 
+                    name="edit-redo-table"
+                    />
+            </tool-bar>   
 		</extension>
 
 		<extension class-name="org.gvsig.app.extension.UndoTableExtension"
 			description="Extensi�n encargada de dehacer la edici�n sobre la capa activa."
 			active="true">
-			<menu text="Tabla/deshacer" position="40016" action-command="UNDO" icon="table-undo"/>
-			<tool-bar name="modificar" position="12">
-				<action-tool name="deshacer" icon="table-undo" action-command="UNDO" tooltip="deshacer" group="tabla" position="1"/>
-			</tool-bar>
+
+            <action 
+                name="edit-undo-table"
+                label="_Undo" 
+                tooltip="_Undo" 
+                position="0200100000" 
+                action-command="edit-undo-table"
+                icon="edit-undo"
+                accelerator=""
+                />
+            
+            <menu
+                name="edit-undo-table"
+                text="Edit/Undo"
+                />
+            
+            <tool-bar name="edit_actions">
+                <action-tool 
+                    name="edit-undo-table"
+                    />
+            </tool-bar>   
 		</extension>
 
 		<extension class-name="org.gvsig.app.extension.TableEditStopExtension"
 			description="Extensi�n encargada de gestionar las operaciones de edici�n sobre las tablas."
 			active="true">
-			<menu text="Tabla/stop_edition" position="40020" action-command="STOPEDITING"/>
+
+            <action 
+                name="table-stop-editing"
+                label="_Stop_editing" 
+                tooltip="_Stop_editing" 
+                position="500300000" 
+                action-command="table-stop-editing"
+                icon="table-stop-editing"
+                accelerator=""
+                />
+            
+            <menu
+                name="table-stop-editing"
+                text="Table/Stop_editing"
+                />
+            
+            <tool-bar name="table_actions">
+                <action-tool 
+                    name="table-stop-editing"
+                    />
+            </tool-bar>   
 		</extension>
 		<extension class-name="org.gvsig.app.extension.TableEditStartExtension"
 			description="Extensi�n encargada de gestionar las operaciones de edici�n sobre las tablas."
 			active="true">
-			<menu text="Tabla/start_edition" position="40024" action-command="STARTEDIT"/>
+
+            <action 
+                name="table-start-editing"
+                label="_Start_editing" 
+                tooltip="_Start_editing" 
+                position="500200000" 
+                action-command="table-start-editing"
+                icon="table-start-editing"
+                accelerator=""
+                />
+            
+            <menu
+                name="table-start-editing"
+                text="Table/Start_editing"
+                />
+            
+            <tool-bar name="table_actions">
+                <action-tool 
+                    name="table-start-editing"
+                    />
+            </tool-bar>   
 		</extension>
+		
 		<extension class-name="org.gvsig.app.extension.TableEditInsertExtension"
 			description="Extensi�n encargada de gestionar las operaciones de edici�n sobre las tablas."
 			active="true">
-			<menu text="Tabla/insert_row" position="40026" action-command="INSERTROW"/>
+            <action 
+                name="table-add-row"
+                label="_Add_row" 
+                tooltip="_Add_row" 
+                position="500500000" 
+                action-command="table-add-row"
+                icon="table-add-row"
+                accelerator=""
+                />
+            
+            <menu
+                name="table-add-row"
+                text="Table/Add_row"
+                />
+            
+            <tool-bar name="table_actions">
+                <action-tool 
+                    name="table-add-row"
+                    />
+            </tool-bar>   
 		</extension>
+		
 		<extension class-name="org.gvsig.app.extension.TableEditRemoveRowExtension"
 			description="Extensi�n encargada de gestionar las operaciones de edici�n sobre las tablas."
 			active="true">
-			<menu text="Tabla/remove_row" position="40030" action-command="REMOVEROW"/>
+
+            <action 
+                name="table-remove-row"
+                label="_Romeve_row" 
+                tooltip="_Romeve_row" 
+                position="500600000" 
+                action-command="table-remove-row"
+                icon="table-remove-row"
+                accelerator=""
+                />
+            
+            <menu
+                name="table-remove-row"
+                text="Table/Remove_row"
+                />
+            
+            <tool-bar name="table_actions">
+                <action-tool 
+                    name="table-remove-row"
+                    />
+            </tool-bar>   
 		</extension>
 		<extension class-name="org.gvsig.app.extension.TableEditChangeColumnsExtension"
 			description="Extensi�n encargada de gestionar las operaciones de edici�n de columnas sobre las tablas."
 			active="true">
-			<menu text="Tabla/add_column" position="40034" action-command="ADDCOLUMN"/>
-			<menu text="Tabla/rename_column" position="40036" action-command="RENAMECOLUMN"/>
-			<menu text="Tabla/remove_column" position="40040" action-command="REMOVECOLUMN"/>
+
+            <action 
+                name="table-add-column"
+                label="_Add_column" 
+                tooltip="_Add_column" 
+                position="500630000" 
+                action-command="table-add-column"
+                icon="table-add-column"
+                accelerator=""
+                />
+
+            <action 
+                name="table-rename-column"
+                label="_Rename_column" 
+                tooltip="_Rename_column" 
+                position="5006500000" 
+                action-command="table-add-column"
+                icon="table-add-column"
+                accelerator=""
+                />
+
+            <action 
+                name="table-remove-column"
+                label="_Remove_column" 
+                tooltip="_Remove_column" 
+                position="500670000" 
+                action-command="table-remove-column"
+                icon="table-remove-column"
+                accelerator=""
+                />
+
+            <menu
+                name="table-add-column"
+                text="Table/Add_column"
+                />
+            
+            <menu
+                name="table-remove-column"
+                text="Table/Remove_column"
+                />
+
+            <menu
+                name="table-rename-column"
+                text="Table/Rename_column"
+                />
+            
+            <tool-bar name="table_actions">
+                <action-tool 
+                    name="table-add-column"
+                    />
+                <action-tool 
+                    name="table-remove-column"
+                    />
+                <action-tool 
+                    name="table-rename-field"
+                    />
+            </tool-bar>   
+
 		</extension>
 		<extension class-name="org.gvsig.app.extension.TableEditAttributes"
 			description="Extensi�n encargada de gestionar los campos de las tablas."
 			active="true">
-			<menu text="Tabla/manage_fields" position="40044" action-command="MANAGE_FIELDS"/>
+            <action 
+                name="table-column-manager"
+                label="_Column_manager" 
+                tooltip="_Show_column_manager" 
+                position="0500700000" 
+                action-command="table-column-manager"
+                icon="table-column-manager"
+                accelerator=""
+                />
+            
+            <menu
+                name="table-column-manager"
+                text="Table/Column_manager"
+                />
+            
+            <tool-bar name="table_actions">
+                <action-tool 
+                    name="table-column-manager"
+                    />
+            </tool-bar>   
 		</extension>
 
 		<extension class-name="org.gvsig.app.extension.TableEditCopyExtension"
 			description="Extensi�n encargada de gestionar las operaciones de edici�n sobre las tablas."
 			active="true">
-			<menu text="Tabla/copy" position="40046" icon="edit-copy" action-command="COPY"/>
+            <action 
+                name="edit-copy-table"
+                label="_Copy" 
+                tooltip="_Copy" 
+                position="200500000" 
+                action-command="edit-copy-table"
+                icon="edit-copy"
+                accelerator=""
+                />
+            
+            <menu
+                name="edit-copy-table"
+                text="Edit/Copy"
+                />
+            
+            <tool-bar name="edit_actions">
+                <action-tool 
+                    name="edit-copy-table"
+                    />
+            </tool-bar>   
 		</extension>
 
 		<extension class-name="org.gvsig.app.extension.TableEditCutExtension"
 			description="Extensi�n encargada de gestionar las operaciones de edici�n sobre las tablas."
 			active="true">
-			<menu text="Tabla/cut" position="40050" icon="edit-cut" action-command="CUT"/>
+            <action 
+                name="edit-cut-table"
+                label="_Attributes_table" 
+                tooltip="_Show_attributes_table" 
+                position="200400000" 
+                action-command="edit-cut-table"
+                icon="edit-cut"
+                accelerator=""
+                />
+            
+            <menu
+                name="edit-cut-table"
+                text="Edit/Cut"
+                />
+            
+            <tool-bar name="edit_actions">
+                <action-tool 
+                    name="edit-cut-table"
+                    />
+            </tool-bar>   
 		</extension>
 
 		<extension class-name="org.gvsig.app.extension.TableEditPasteExtension"
 			description="Extensi�n encargada de gestionar las operaciones de edici�n sobre las tablas."
 			active="true">
-			<menu text="Tabla/paste" position="40054" icon="edit-paste" action-command="PASTE"/>
+            <action 
+                name="edit-paste-table"
+                label="_Paste" 
+                tooltip="_Paste" 
+                position="200600000" 
+                action-command="edit-paste-table"
+                icon="edit-paste"
+                accelerator=""
+                />
+            
+            <menu
+                name="edit-paste-table"
+                text="Edit/paste"
+                />
+            
+            <tool-bar name="edit_actions">
+                <action-tool 
+                    name="edit-paste-table"
+                    />
+            </tool-bar>   
 		</extension>
 
 		<extension active="true" class-name="org.gvsig.app.extension.TableFieldOperations"
 			description="Operaciones sobre los campos de las tablas">
-			<menu text="Tabla/ascending_order" position="40056" icon="table-order-asc" action-command="ORDERASC"/>
-			<menu text="Tabla/descending_order" position="40060" icon="table-order-desc" action-command="ORDERDESC"/>
-			<tool-bar name="Herramientas" position="12">
-				<action-tool icon="table-order-asc" tooltip="ascending_order_tooltip" action-command="ORDERASC" position="3"/>
-				<action-tool icon="table-order-desc" tooltip="descending_order_tooltip" action-command="ORDERDESC" position="4"/>
-			</tool-bar>
+            <action 
+                name="table-order-asc"
+                label="_Order_Ascending" 
+                tooltip="_Order_Ascending" 
+                position="500900000" 
+                action-command="table-order-asc"
+                icon="table-order-asc"
+                accelerator=""
+                />
+            
+            <action 
+                name="table-order-desc"
+                label="_Order_descending" 
+                tooltip="_Order_descending" 
+                position="501000000" 
+                action-command="table-order-desc"
+                icon="table-order-desc"
+                accelerator=""
+                />
+            
+            <menu
+                name="table-order-asc"
+                text="Table/Order_ascending"
+                />
+            
+            <menu
+                name="table-order-desc"
+                text="Table/Order_descending"
+                />
+            
+            <tool-bar name="table_actions">
+                <action-tool 
+                    name="table-order-asc"
+                    />
+                <action-tool 
+                    name="table-order-desc"
+                    />
+            </tool-bar>   
 		</extension>
 
 		<extension class-name="org.gvsig.app.extension.TableNumericFieldOperations"
 			description="Extensi�n encargada de gestionar las operaciones sobre los campos num�ricos."
 			active="true">
-			<menu text="Tabla/statistics" position="40064" icon="table-statistics"/>
-			<tool-bar name="Herramientas" position="12">
-				<action-tool icon="table-statistics" tooltip="statistics" position="5"/>
-			</tool-bar>
+            <action 
+                name="table-statistics"
+                label="_Statistics" 
+                tooltip="_Statistics" 
+                position="5080000000" 
+                action-command="table-statistics"
+                icon="table-statistics"
+                accelerator=""
+                />
+            
+            <menu
+                name="table-statistics"
+                text="Table/Statistics"
+                />
+            
+            <tool-bar name="table_actions">
+                <action-tool 
+                    name="table-statistics"
+                    />
+            </tool-bar>   
 		</extension>
 
 		<extension class-name="org.gvsig.app.extension.TableRowsOperations"
 			description="Extensi�n encargada de gestionar la selecci�n en la tabla."
 			active="true">
-			<menu text="Tabla/selection_up" position="40066" action-command="SELECTIONUP" icon="table-selection-up"/>
-			<menu text="Tabla/invert_selection" position="40070" action-command="INVERTSELECTION" icon="table-invert"/>
-			<tool-bar name="Herramientas" position="12">
-				<action-tool icon="table-selection-up" action-command="SELECTIONUP" tooltip="selection_up" position="6"/>
-				<action-tool icon="table-invert" action-command="INVERTSELECTION" tooltip="invert_selection" position="7"/>
-			</tool-bar>
+            <action 
+                name="selection-move-up"
+                label="_Move_up_selection" 
+                tooltip="_Move_up_selection" 
+                position="300600000" 
+                action-command="selection-move-up"
+                icon="selection-move-up"
+                accelerator=""
+                />
+            
+            <action 
+                name="selection-reverse"
+                label="_Reverse_selection" 
+                tooltip="_Reverse_selection" 
+                position="300500000" 
+                action-command="selection-reverse"
+                icon="selection-reverse"
+                accelerator=""
+                />
+            
+            <menu
+                name="selection-move-up"
+                text="Selection/Move_up"
+                />
+            
+            <menu
+                name="selection-reverse"
+                text="Selection/Reverse"
+                />
+            
+            <tool-bar name="selection_actions">
+                <action-tool 
+                    name="selection-move-up"
+                    />
+                <action-tool 
+                    name="selection-reverse"
+                    />
+            </tool-bar>   
 		</extension>
 
 		<extension class-name="org.gvsig.app.extension.RemoveTableLink"
 			description="Extensi�n encargada de quitar los enlaces de las tablas."
 			active="true">
-			<menu text="Tabla/quitar_enlaces" position="40076" />
+            <action 
+                name="table-remove-link"
+                label="_Remove_link" 
+                tooltip="_Remove_link" 
+                position="501400000" 
+                action-command="table-remove-link"
+                icon="table-remove-link"
+                accelerator=""
+                />
+            
+            <menu
+                name="table-remove-link"
+                text="Table/Remove_link"
+                />
+            
+            <tool-bar name="table_actions">
+                <action-tool 
+                    name="table-remove-link"
+                    />
+            </tool-bar>   
 		</extension>
 
 		<extension class-name="org.gvsig.app.extension.PrintTable"
 			description="Extensi�n encargada de la impresi�n de las tablas."
 			active="true">
-			<menu text="Tabla/Imprimir" position="40080" icon="document-print" action-command="PRINTTABLE" tooltip="Imprimir"/>
-			<tool-bar name="Tabla" position="10">
-				<action-tool icon="document-print" action-command="PRINTTABLE" tooltip="Imprimir"/>
-			</tool-bar>
+            <action 
+                name="application-print-table"
+                label="_Attributes_table" 
+                tooltip="_Show_attributes_table" 
+                position="100800000" 
+                action-command="application-print-table"
+                icon="document-print"
+                accelerator=""
+                />
+            
+            <menu
+                name="application-print-table"
+                text="File/Print"
+                />
+            
+            <tool-bar name="table_actions">
+                <action-tool 
+                    name="application-print-table"
+                    />
+            </tool-bar>   
 		</extension>
         
         <extension class-name="org.gvsig.app.extension.ZoomToSelectExtension"
             description="Extensi�n encargada de gestionar los eventos realizados sobre una capa."
             active="true">
-            <menu text="Vista/navegacion/Zoom_Select" position="3002090" action-command="ZOOM_SELECT" icon="view-zoom-to-seleccion"/>
-            <tool-bar name="View_Tools_Zooms" position="3">
-                <action-tool icon="view-zoom-to-seleccion" action-command="ZOOM_SELECT"  tooltip="Zoom_Select" position="7"/>
-            </tool-bar>
+            <action 
+                name="view-navigation-zoom-to-selection-table"
+                label="_Zoom_to_selection" 
+                tooltip="_Zoom_to_selection" 
+                position="650100900" 
+                action-command="view-navigation-zoom-to-selection-table"
+                icon="view-navigation-zoom-to-selection"
+                accelerator=""
+                />
+            
+            <menu
+                name="view-navigation-zoom-to-selection-table"
+                text="View/Navigation/Zoom_to_selection"
+                />
+            
+            <tool-bar name="view_navigation">
+                <action-tool 
+                    name="view-navigation-zoom-to-selection-table"
+                    />
+            </tool-bar>   
         </extension>
 
         <extension class-name="org.gvsig.app.extension.FiltroExtension"
             description="Extensi�n encargada de abrir el di�logo para filtrar una tabla."
             active="true">
-            <menu text="Tabla/filtro" position="40074" icon="table-filter" action-command="FILTRO"/>
-            <tool-bar name="Herramientas" position="12">
-                <action-tool icon="table-filter" action-command="FILTRO" tooltip="filtro" position="7"/>
-            </tool-bar>
+            <action 
+                name="table-filter"
+                label="_Filter" 
+                tooltip="_Filter_table_contents" 
+                position="500100000" 
+                action-command="table-filter"
+                icon="table-filter"
+                accelerator=""
+                />
+            
+            <menu
+                name="table-filter"
+                text="Table/Filter"
+                />
+            
+            <tool-bar name="table_actions">
+                <action-tool 
+                    name="table-filter"
+                    />
+            </tool-bar>   
         </extension>
 
 	</extensions>
Index: branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/resources/images/action/document-print.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/resources/images/action/document-print.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/resources/images/action/selection-clear.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/resources/images/action/selection-clear.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/resources/images/action/table-filter.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/resources/images/action/table-filter.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/resources/images/action/selection-move-up.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/resources/images/action/selection-move-up.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/resources/images/action/table-stop-editing.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/resources/images/action/table-stop-editing.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/resources/images/action/table-order-desc.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/resources/images/action/table-order-desc.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/resources/images/action/view-navigation-zoom-to-selection.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/resources/images/action/view-navigation-zoom-to-selection.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/resources/images/action/selection-reverse.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/resources/images/action/selection-reverse.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/resources/images/action/table-statistics.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/resources/images/action/table-statistics.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/resources/images/action/layer-show-attributes-table.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/resources/images/action/layer-show-attributes-table.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/resources/images/action/table-start-editing.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/resources/images/action/table-start-editing.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/resources/images/action/table-order-asc.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/resources/images/action/table-order-asc.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/resources/images/document/document-table-icon.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/resources/images/document/document-table-icon.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/resources/images/document/document-table-icon-sel.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/resources/images/document/document-table-icon-sel.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/org.gvsig.exportto.app/org.gvsig.exportto.app.extension/src/main/java/org/gvsig/exportto/app/extension/preferences/ExporttoPreferencesPage.java
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.exportto.app/org.gvsig.exportto.app.extension/src/main/java/org/gvsig/exportto/app/extension/preferences/ExporttoPreferencesPage.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.exportto.app/org.gvsig.exportto.app.extension/src/main/java/org/gvsig/exportto/app/extension/preferences/ExporttoPreferencesPage.java	(revision 38564)
@@ -29,6 +29,7 @@
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.PluginsLocator;
 import org.gvsig.andami.preferences.AbstractPreferencePage;
@@ -51,7 +52,7 @@
 
     private static final long serialVersionUID = -5751805016601819817L;
 
-    private ImageIcon icon;
+    //private ImageIcon icon;
 
     private ExporttoSwingProviderManager manager;
 
@@ -61,7 +62,7 @@
      * Constructor.
      */
     public ExporttoPreferencesPage() {
-        icon = PluginServices.getIconTheme().get("exportto-properties");
+        //icon = PluginServices.getIconTheme().get("exportto-properties");
 
         manager = ExporttoSwingProviderLocator.getManager();
         addComponent(new JLabel(
@@ -91,7 +92,7 @@
     }
 
     public ImageIcon getIcon() {
-        return icon;
+        return IconThemeHelper.getImageIcon("export-to-preferences");
     }
 
     public boolean isValueChanged() {
Index: branches/v2_0_0_prep/extensions/org.gvsig.exportto.app/org.gvsig.exportto.app.extension/src/main/java/org/gvsig/exportto/app/extension/ExporttoPreferencesExtension.java
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.exportto.app/org.gvsig.exportto.app.extension/src/main/java/org/gvsig/exportto/app/extension/ExporttoPreferencesExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.exportto.app/org.gvsig.exportto.app.extension/src/main/java/org/gvsig/exportto/app/extension/ExporttoPreferencesExtension.java	(revision 38564)
@@ -28,6 +28,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.plugins.Extension;
 import org.gvsig.exportto.app.extension.preferences.ExporttoPreferencesPage;
@@ -121,10 +122,7 @@
             ToolsLocator.getExtensionPointManager();
         ExtensionPoint ep = extensionPoints.add("AplicationPreferences", "");
 
-        PluginServices.getIconTheme().registerDefault(
-            "exportto-properties",
-            ExporttoPreferencesPage.class.getClassLoader().getResource(
-                "images/document-save-as.png"));
+        IconThemeHelper.registerIcon("preferences", "export-to-preferences", this);
 
         ep.append("ExporttoPreferencesPage", "", new ExporttoPreferencesPage());
     }
Index: branches/v2_0_0_prep/extensions/org.gvsig.exportto.app/org.gvsig.exportto.app.extension/src/main/resources/images/document-save-as.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: branches/v2_0_0_prep/extensions/org.gvsig.exportto.app/org.gvsig.exportto.app.extension/src/main/resources/images/preferences/export-to-preferences.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/org.gvsig.exportto.app/org.gvsig.exportto.app.extension/src/main/resources/images/preferences/export-to-preferences.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/org.gvsig.newlayer.app/org.gvsig.newlayer.app.extension/src/main/java/org/gvsig/newlayer/app/extension/preferences/NewLayerPreferencesPage.java
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.newlayer.app/org.gvsig.newlayer.app.extension/src/main/java/org/gvsig/newlayer/app/extension/preferences/NewLayerPreferencesPage.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.newlayer.app/org.gvsig.newlayer.app.extension/src/main/java/org/gvsig/newlayer/app/extension/preferences/NewLayerPreferencesPage.java	(revision 38564)
@@ -29,7 +29,7 @@
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 
-import org.gvsig.andami.PluginServices;
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginsLocator;
 import org.gvsig.andami.preferences.AbstractPreferencePage;
 import org.gvsig.andami.preferences.StoreException;
@@ -51,7 +51,7 @@
 
     private static final long serialVersionUID = -5751805016601819817L;
 
-    private ImageIcon icon;
+//    private ImageIcon icon;
 
     private NewLayerManager manager;
 
@@ -61,7 +61,7 @@
      * Constructor.
      */
     public NewLayerPreferencesPage() {
-        icon = PluginServices.getIconTheme().get("newlayer-properties");
+//        icon = PluginServices.getIconTheme().get("newlayer-properties");
 
         manager = NewLayerLocator.getManager();
         addComponent(new JLabel(
@@ -93,7 +93,7 @@
     }
 
     public ImageIcon getIcon() {
-        return icon;
+        return IconThemeHelper.getImageIcon("newlayer-preferences");
     }
 
     public boolean isValueChanged() {
Index: branches/v2_0_0_prep/extensions/org.gvsig.newlayer.app/org.gvsig.newlayer.app.extension/src/main/java/org/gvsig/newlayer/app/extension/NewLayerPreferencesExtension.java
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.newlayer.app/org.gvsig.newlayer.app.extension/src/main/java/org/gvsig/newlayer/app/extension/NewLayerPreferencesExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.newlayer.app/org.gvsig.newlayer.app.extension/src/main/java/org/gvsig/newlayer/app/extension/NewLayerPreferencesExtension.java	(revision 38564)
@@ -28,6 +28,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.plugins.Extension;
 import org.gvsig.i18n.Messages;
@@ -120,11 +121,8 @@
             ToolsLocator.getExtensionPointManager();
         ExtensionPoint ep = extensionPoints.add("AplicationPreferences", "");
 
-        PluginServices.getIconTheme().registerDefault(
-            "newlayer-properties",
-            NewLayerPreferencesPage.class.getClassLoader().getResource(
-                "images/document-new.png"));
-
+        IconThemeHelper.registerIcon("preferences", "newlayer-preferences", this);
+        
         ep.append("NewLayerPreferencesPage", "", new NewLayerPreferencesPage());
     }
 
Index: branches/v2_0_0_prep/extensions/org.gvsig.newlayer.app/org.gvsig.newlayer.app.extension/src/main/resources/images/document-new.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: branches/v2_0_0_prep/extensions/org.gvsig.newlayer.app/org.gvsig.newlayer.app.extension/src/main/resources/images/preferences/newlayer-preferences.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/org.gvsig.newlayer.app/org.gvsig.newlayer.app.extension/src/main/resources/images/preferences/newlayer-preferences.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/extCenterViewToPoint/config/config.xml
===================================================================
--- branches/v2_0_0_prep/extensions/extCenterViewToPoint/config/config.xml	(revision 38563)
+++ branches/v2_0_0_prep/extensions/extCenterViewToPoint/config/config.xml	(revision 38564)
@@ -5,16 +5,28 @@
 		<resourceBundle name="text"/>
 	<extensions>
 		<extension class-name="org.gvsig.centerviewpoint.CenterViewToPointExtension"
-			description="CenterViewToPoint 0.1RC1  Extensi�n que permite hacer zooms en funci�n de un par de coordenadas introducidas por el usuario."
+			description="Extensi�n que permite hacer zooms en funci�n de un par de coordenadas introducidas por el usuario."
 			active="true">
-			<menu text="Vista/Centrar_la_Vista_sobre_un_punto" tooltip="Centrar_la_Vista_sobre_un_punto" 
-				action-command="CENTERVIEWTOPOINT" 
-				icon="view-center-to-point" />
-			<tool-bar name="Herramientas">
-				<action-tool icon="view-center-to-point"
-					action-command="CENTERVIEWTOPOINT" tooltip="Centrar_la_Vista_sobre_un_punto"
-					enable-text="deber�a de estar activada" last="true"/>
+			
+			<action 
+                name="view-navigation-center-view-to-point"
+                label="_Center_view_to_point" 
+                tooltip="_Center_view_in_a_point_entered_by_the_user" 
+                position="650102100" 
+                action-command="view-navigation-center-view-to-point"
+                icon="view-navigation-center-view-to-point"
+                accelerator=""
+                />
+			
+			<menu
+			    name="view-navigation-center-view-to-point" 
+			    text="View/Navigation/Center_view_to_point"
+			    />
+			    
+			<tool-bar name="view_navigation">
+				<action-tool name="view-navigation-center-view-to-point"/>
 			</tool-bar>
+			
 		</extension>
 	</extensions>
 </plugin-config>
\ No newline at end of file
Index: branches/v2_0_0_prep/extensions/extCenterViewToPoint/images/centerviewtopoint.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: branches/v2_0_0_prep/extensions/extCenterViewToPoint/images/action/view-navigation-center-view-to-point.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/extCenterViewToPoint/images/action/view-navigation-center-view-to-point.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/extCenterViewToPoint/src/org/gvsig/centerviewpoint/CenterViewToPointExtension.java
===================================================================
--- branches/v2_0_0_prep/extensions/extCenterViewToPoint/src/org/gvsig/centerviewpoint/CenterViewToPointExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/extCenterViewToPoint/src/org/gvsig/centerviewpoint/CenterViewToPointExtension.java	(revision 38564)
@@ -45,6 +45,7 @@
 
 import java.awt.Color;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.plugins.Extension;
 import org.gvsig.app.project.documents.view.ViewDocument;
@@ -63,26 +64,22 @@
 public class CenterViewToPointExtension extends Extension {
 	private DefaultViewPanel vista;
 	public static Color COLOR=Color.red;
-    /* (non-Javadoc)
-     * @see com.iver.andami.plugins.Extension#inicializar()
-     */
-    public void initialize() {
-        // TODO Auto-generated method stub
-    	PluginServices.getIconTheme().registerDefault(
-				"view-center-to-point",
-				this.getClass().getClassLoader().getResource("images/centerviewtopoint.png")
-			);
+	
+	public void initialize() {
+		IconThemeHelper.registerIcon("action", "view-navigation-center-view-to-point", this);
     }
 
     /* (non-Javadoc)
      * @see com.iver.andami.plugins.Extension#execute(java.lang.String)
      */
     public void execute(String actionCommand) {
-		vista = (DefaultViewPanel)PluginServices.getMDIManager().getActiveWindow();
-        MapContext mapContext = vista.getModel().getMapContext();
-        InputCoordinatesPanel dataSelectionPanel = new InputCoordinatesPanel(mapContext);
-        //dataSelectionPanel.setColor(color);
-		PluginServices.getMDIManager().addWindow(dataSelectionPanel);
+    	if( "view-navigation-center-view-to-point".equalsIgnoreCase(actionCommand)) {
+			vista = (DefaultViewPanel)PluginServices.getMDIManager().getActiveWindow();
+	        MapContext mapContext = vista.getModel().getMapContext();
+	        InputCoordinatesPanel dataSelectionPanel = new InputCoordinatesPanel(mapContext);
+	        //dataSelectionPanel.setColor(color);
+			PluginServices.getMDIManager().addWindow(dataSelectionPanel);
+    	}
     }
 
     public DefaultViewPanel getView(){
Index: branches/v2_0_0_prep/extensions/extGPE-gvSIG/config/about.htm
===================================================================
--- branches/v2_0_0_prep/extensions/extGPE-gvSIG/config/about.htm	(revision 38563)
+++ branches/v2_0_0_prep/extensions/extGPE-gvSIG/config/about.htm	(revision 38564)
@@ -1,21 +0,0 @@
-<html>
-  <head>
-    <title>libGPE Extension.</title>
-    <meta content="">
-    <style></style>
-  </head>
-  <body>
-<table width="60%" border="0">
-  <tr>
-     <td width="64%"><img src="images/logo_horiz_bicolor_gva.png" width="329" height="50"></td>
-    <td width="36%"><div align="right"><img src="images/logoIver.png" width="87" height="50"></div></td>
-  </tr>
-  <tr>
-    <td colspan="2"><font face="Arial, Helvetica, sans-serif">&copy; Copyright
-      Generalitat Valenciana, IVER T.I. 2008.</font></td>
-  </tr>
-</table>
-  <h3>libGPE Extension.</h3>
-  <p><br><br><b> Build Number: #build.number#</b></p>
-  </body>
-</html>
\ No newline at end of file
Index: branches/v2_0_0_prep/extensions/extGPE-gvSIG/images/gpe.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: branches/v2_0_0_prep/extensions/extGPE-gvSIG/images/logo_horiz_bicolor_gva.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: branches/v2_0_0_prep/extensions/extGPE-gvSIG/images/logoIver.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: branches/v2_0_0_prep/extensions/extGPE-gvSIG/images/layer/layer-icon-gpe.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/extGPE-gvSIG/images/layer/layer-icon-gpe.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream
Added: svn:executable
   + *

Index: branches/v2_0_0_prep/extensions/extGPE-gvSIG/src/org/gvsig/fmap/dal/store/gpe/GPEStoreParameters.java
===================================================================
--- branches/v2_0_0_prep/extensions/extGPE-gvSIG/src/org/gvsig/fmap/dal/store/gpe/GPEStoreParameters.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/extGPE-gvSIG/src/org/gvsig/fmap/dal/store/gpe/GPEStoreParameters.java	(revision 38564)
@@ -30,7 +30,6 @@
 import java.io.File;
 
 import org.cresques.cts.IProjection;
-
 import org.gvsig.fmap.dal.DataStoreParameters;
 import org.gvsig.fmap.dal.FileHelper;
 import org.gvsig.fmap.dal.serverexplorer.filesystem.FilesystemStoreParameters;
Index: branches/v2_0_0_prep/extensions/extGPE-gvSIG/src/org/gvsig/fmap/dal/store/gpe/handlers/FmapContentHandler.java
===================================================================
--- branches/v2_0_0_prep/extensions/extGPE-gvSIG/src/org/gvsig/fmap/dal/store/gpe/handlers/FmapContentHandler.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/extGPE-gvSIG/src/org/gvsig/fmap/dal/store/gpe/handlers/FmapContentHandler.java	(revision 38564)
@@ -9,10 +9,6 @@
 import java.util.Map;
 
 import org.cresques.cts.IProjection;
-import org.jfree.util.Log;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import org.gvsig.fmap.dal.DataTypes;
 import org.gvsig.fmap.dal.feature.EditableFeatureAttributeDescriptor;
 import org.gvsig.fmap.dal.feature.EditableFeatureType;
@@ -45,6 +41,9 @@
 import org.gvsig.gpe.lib.api.parser.ICoordinateIterator;
 import org.gvsig.gpe.lib.api.parser.IGPEErrorHandler;
 import org.gvsig.gpe.lib.impl.parser.GPEContentHandler;
+import org.jfree.util.Log;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 /* gvSIG. Sistema de Informaci�n Geogr�fica de la Generalitat Valenciana
  *
  * Copyright (C) 2004 IVER T.I. and Generalitat Valenciana.
Index: branches/v2_0_0_prep/extensions/extGPE-gvSIG/src/org/gvsig/fmap/dal/store/gpe/model/GPEFeature.java
===================================================================
--- branches/v2_0_0_prep/extensions/extGPE-gvSIG/src/org/gvsig/fmap/dal/store/gpe/model/GPEFeature.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/extGPE-gvSIG/src/org/gvsig/fmap/dal/store/gpe/model/GPEFeature.java	(revision 38564)
@@ -2,14 +2,13 @@
 
 import java.util.LinkedHashMap;
 
-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.exception.CreateGeometryException;
 import org.gvsig.fmap.geom.primitive.Envelope;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /* gvSIG. Sistema de Informaci�n Geogr�fica de la Generalitat Valenciana
  *
Index: branches/v2_0_0_prep/extensions/extGPE-gvSIG/src/org/gvsig/fmap/dal/store/gpe/GPEStoreProvider.java
===================================================================
--- branches/v2_0_0_prep/extensions/extGPE-gvSIG/src/org/gvsig/fmap/dal/store/gpe/GPEStoreProvider.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/extGPE-gvSIG/src/org/gvsig/fmap/dal/store/gpe/GPEStoreProvider.java	(revision 38564)
@@ -31,7 +31,6 @@
 import java.util.Map;
 
 import org.cresques.cts.IProjection;
-
 import org.gvsig.fmap.dal.DALLocator;
 import org.gvsig.fmap.dal.DataManager;
 import org.gvsig.fmap.dal.DataServerExplorer;
Index: branches/v2_0_0_prep/extensions/extGPE-gvSIG/src/org/gvsig/gpe/GPELibraryExtension.java
===================================================================
--- branches/v2_0_0_prep/extensions/extGPE-gvSIG/src/org/gvsig/gpe/GPELibraryExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/extGPE-gvSIG/src/org/gvsig/gpe/GPELibraryExtension.java	(revision 38564)
@@ -27,48 +27,32 @@
  
 package org.gvsig.gpe;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.plugins.Extension;
+import org.gvsig.fmap.dal.store.gpe.GPEStoreProvider;
+import org.gvsig.fmap.mapcontext.MapContextLocator;
 
 
 /**
  * @author <a href="mailto:jpiera@gvsig.org">Jorge Piera</a>
  */
 public class GPELibraryExtension extends Extension{
-//	private DALGPELibrary lib = null;
 		
-	/* (non-Javadoc)
-	 * @see com.iver.andami.plugins.IExtension#execute(java.lang.String)
-	 */
 	public void execute(String actionCommand) {
-		// TODO Auto-generated method stub
-		
 	}
 
-	/* (non-Javadoc)
-	 * @see com.iver.andami.plugins.IExtension#initialize()
-	 */
 	public void initialize() {
-//		lib = new DALGPELibrary();
-//		lib.initialize();		
+		IconThemeHelper.registerIcon("layer", "layer-icon-gpe", this);
 	}	
 
-	/* (non-Javadoc)
-	 * @see com.iver.andami.plugins.Extension#postInitialize()
-	 */
 	public void postInitialize() {
-//		lib.postInitialize();		
+		MapContextLocator.getMapContextManager().registerIconLayer(GPEStoreProvider.NAME, "layer-icon-gpe");
 	}
 
-	/* (non-Javadoc)
-	 * @see com.iver.andami.plugins.IExtension#isEnabled()
-	 */
 	public boolean isEnabled() {
 		return false;
 	}
 
-	/* (non-Javadoc)
-	 * @see com.iver.andami.plugins.IExtension#isVisible()
-	 */
 	public boolean isVisible() {
 		return false;
 	}
Index: branches/v2_0_0_prep/extensions/extHelp/config/config.xml
===================================================================
--- branches/v2_0_0_prep/extensions/extHelp/config/config.xml	(revision 38563)
+++ branches/v2_0_0_prep/extensions/extHelp/config/config.xml	(revision 38564)
@@ -8,9 +8,21 @@
 			description=""
 			active="true"
 			priority="1">
-			<menu text="Ayuda/Ayuda"
-				position="90010"
-				action-command="Help"/>
+            
+            <action 
+                name="help-contents"
+                label="_Help" 
+                tooltip="_Help" 
+                position="990101000" 
+                action-command="help-contents"
+                icon="help-contents"
+                accelerator=""
+                />
+            
+            <menu
+                name="help-contents"
+                text="Help/Contents"
+                />
 		</extension>		
 	</extensions>
 </plugin-config>
\ No newline at end of file
Index: branches/v2_0_0_prep/extensions/extHelp/src/org/gvsig/help/HelpExtension.java
===================================================================
--- branches/v2_0_0_prep/extensions/extHelp/src/org/gvsig/help/HelpExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/extHelp/src/org/gvsig/help/HelpExtension.java	(revision 38564)
@@ -11,20 +11,16 @@
 
 public class HelpExtension  extends Extension {
 
+	private static Logger logger = LoggerFactory.getLogger(HelpExtension.class);
 
-	private Logger log() {
-		return LoggerFactory.getLogger("org.gvsig");
-	}
-
 	public void initialize() {
-		// TODO Auto-generated method stub
-
+		
 	}
 
 	public void execute(String actionCommand) {
 
 		// If the option pressed is help control the help panel is created.
-		if(actionCommand.equalsIgnoreCase("Help")){
+		if(actionCommand.equalsIgnoreCase("help-contents")){
 
 			Help help = Help.getHelp();	//My constructor.
 			help.show("docs.introduccion-a-gvsig.copy_of_queesgvsig.html");//Launch help panel.
Index: branches/v2_0_0_prep/extensions/extDataLocator/src/org/gvsig/datalocator/DataLocatorExtension.java
===================================================================
--- branches/v2_0_0_prep/extensions/extDataLocator/src/org/gvsig/datalocator/DataLocatorExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/extDataLocator/src/org/gvsig/datalocator/DataLocatorExtension.java	(revision 38564)
@@ -45,6 +45,7 @@
 
 import java.util.prefs.Preferences;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.plugins.Extension;
 import org.gvsig.andami.ui.mdiManager.IWindow;
@@ -80,29 +81,27 @@
     }
 
     private void registerIcons(){
-    	//view-locator
-    	PluginServices.getIconTheme().registerDefault(
-				"view-locator",
-				this.getClass().getClassLoader().getResource("images/locator.png")
-			);
+    	IconThemeHelper.registerIcon("action", "view-navigation-locator-by-attribute", this);
     }
 
     /* (non-Javadoc)
      * @see com.iver.andami.plugins.Extension#execute(java.lang.String)
      */
     public void execute(String actionCommand) {
-		DefaultViewPanel vista = (DefaultViewPanel)PluginServices.getMDIManager().getActiveWindow();
-		MapContext mapContext = vista.getModel().getMapContext();
-		DataSelectionPanel dataSelectionPanel = new DataSelectionPanel(mapContext);
-		WindowInfo vi = dataSelectionPanel.getWindowInfo();
-		vi.setX(Preferences.userRoot().getInt("gvSIG.DataLocator.x", vi.getX()));
-		vi.setY(Preferences.userRoot().getInt("gvSIG.DataLocator.y", vi.getY()));
-//		vi.setWidth(Preferences.userRoot().getInt("gvSIG.DataLocator.w", vi.getWidth()));
-//		vi.setHeight(Preferences.userRoot().getInt("gvSIG.DataLocator.h", vi.getHeight()));
-
-		PluginServices.getMDIManager().addWindow(dataSelectionPanel);
-		iWDataSelection = dataSelectionPanel;
-		iWDataSelection.getWindowInfo();
+    	if( "view-navigation-locator-by-attribute".equalsIgnoreCase(actionCommand))  {
+			DefaultViewPanel vista = (DefaultViewPanel)PluginServices.getMDIManager().getActiveWindow();
+			MapContext mapContext = vista.getViewDocument().getMapContext();
+			DataSelectionPanel dataSelectionPanel = new DataSelectionPanel(mapContext);
+			WindowInfo vi = dataSelectionPanel.getWindowInfo();
+			vi.setX(Preferences.userRoot().getInt("gvSIG.DataLocator.x", vi.getX()));
+			vi.setY(Preferences.userRoot().getInt("gvSIG.DataLocator.y", vi.getY()));
+	//		vi.setWidth(Preferences.userRoot().getInt("gvSIG.DataLocator.w", vi.getWidth()));
+	//		vi.setHeight(Preferences.userRoot().getInt("gvSIG.DataLocator.h", vi.getHeight()));
+	
+			PluginServices.getMDIManager().addWindow(dataSelectionPanel);
+			iWDataSelection = dataSelectionPanel;
+			iWDataSelection.getWindowInfo();
+    	}
     }
 
     /* (non-Javadoc)
Index: branches/v2_0_0_prep/extensions/extDataLocator/config/config.xml
===================================================================
--- branches/v2_0_0_prep/extensions/extDataLocator/config/config.xml	(revision 38563)
+++ branches/v2_0_0_prep/extensions/extDataLocator/config/config.xml	(revision 38564)
@@ -7,14 +7,26 @@
 		<extension class-name="org.gvsig.datalocator.DataLocatorExtension"
 			description="Extensi�n que permite hacer zooms en funci�n de los valores de la base de datos. Tambi�n permite guardar y recuperar estos zooms."
 			active="true">
-			<menu text="Vista/Localizador_por_atributo" tooltip="Localizador_por_atributo"
-				action-command="DATALOCATOR"
-				icon="view-locator" />
+			
+			<action 
+                name="view-navigation-locator-by-attribute"
+                label="_Locator_by_attribute" 
+                tooltip="_Locate_a_feature_searching_by_an_attribute" 
+                position="650102000" 
+                action-command="view-navigation-locator-by-attribute"
+                icon="view-navigation-locator-by-attribute"
+                accelerator=""
+                />
+            
+            <menu
+                name="view-navigation-locator-by-attribute" 
+                text="View/Navigation/Locator_by_attribute"
+                />
+                
 			<tool-bar name="Herramientas">
-				<action-tool icon="view-locator"
-					action-command="DATALOCATOR" tooltip="Localizador_por_atributo"
-				last="true"/>
-			</tool-bar>
+                <action-tool name="view-navigation-locator-by-attribute"/>
+            </tool-bar>
+
 		</extension>
 	</extensions>
 </plugin-config>
\ No newline at end of file
Index: branches/v2_0_0_prep/extensions/extDataLocator/images/Thumbs.db
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: branches/v2_0_0_prep/extensions/extDataLocator/images/locator.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: branches/v2_0_0_prep/extensions/extDataLocator/images/action/view-navigation-locator-by-attribute.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/extDataLocator/images/action/view-navigation-locator-by-attribute.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/org.gvsig.installer.app/org.gvsig.installer.app.extension/src/main/resources/config/config.xml
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.installer.app/org.gvsig.installer.app.extension/src/main/resources/config/config.xml	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.installer.app/org.gvsig.installer.app.extension/src/main/resources/config/config.xml	(revision 38564)
@@ -7,19 +7,36 @@
 		<extension class-name="org.gvsig.installer.app.extension.creation.MakePluginPackageExtension"
 			description="This extension is used to create a bundle for a plugin package from the current gvSIG application."
 			active="true">
-			<menu text="tools/Development/make_plugin_package"
-				  tooltip="make_plugin_package_description"
-				  position= "7009075"
-				  action-command="" />			
+			<action 
+			    name= "tools-devel-pack-plugin"
+				label="_pack_plugin"
+				tooltip="_Create_a_package_of_a_plugin"
+				action-command="tools-devel-pack-plugin" 
+				icon="tools-devel-pack-plugin"
+				position="908500600"/>
+				
+			<menu
+				name="tools-devel-pack-plugin" 
+				text="tools/Development/make_plugin_package"
+				 />			
 		</extension>
+		
 			<extension class-name="org.gvsig.installer.app.extension.execution.InstallPackageExtension"
 			description="This extension is used to install a package from a bundle in gvSIG"
 			active="true">
-			<menu text="tools/addons_manager"
-				  tooltip="addons_manager_description"
-				  position= "7009070"
-				  icon="images/system-software-update.png"
-				  action-command="" />			
+
+			<action 
+			    name= "tools-addonsmanager"
+				label="_addons_manager"
+				tooltip="_show_the_addons_manager"
+				action-command="tools-addonsmanager" 
+				icon="tools-addonsmanager"
+				position="900100000"/>
+
+			<menu
+				name="tools-addonsmanager" 
+				text="tools/addons_manager"
+				/>			
 		</extension>
 	</extensions>
 </plugin-config>
\ No newline at end of file
Index: branches/v2_0_0_prep/extensions/org.gvsig.installer.app/org.gvsig.installer.app.extension/src/main/resources/images/system-software-update.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: branches/v2_0_0_prep/extensions/org.gvsig.installer.app/org.gvsig.installer.app.extension/src/main/resources/images/action/tools-addonsmanager.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/org.gvsig.installer.app/org.gvsig.installer.app.extension/src/main/resources/images/action/tools-addonsmanager.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/org.gvsig.installer.app/org.gvsig.installer.app.extension/src/main/java/org/gvsig/installer/app/extension/execution/InstallPackageExtension.java
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.installer.app/org.gvsig.installer.app.extension/src/main/java/org/gvsig/installer/app/extension/execution/InstallPackageExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.installer.app/org.gvsig.installer.app.extension/src/main/java/org/gvsig/installer/app/extension/execution/InstallPackageExtension.java	(revision 38564)
@@ -33,6 +33,7 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.PluginsLocator;
 import org.gvsig.andami.PluginsManager;
@@ -54,15 +55,18 @@
 			.getLogger(InstallPackageExtension.class);
 
 	public void execute(String actionCommand) {
-		PluginsManager manager = PluginsLocator.getManager();
-		try {
-			PluginServices.getMDIManager().addCentredWindow(
-					new InstallPackageWindow(manager.getApplicationFolder(),
-							manager.getInstallFolder()));
-		} catch (Error e) {
-			LOG.error("Error creating the wizard to install a package ", e);
-		} catch (Exception e) {
-			LOG.error("Error creating the wizard to install a package ", e);
+		if ("tools-addonsmanager".equalsIgnoreCase(actionCommand)) {
+			PluginsManager manager = PluginsLocator.getManager();
+			try {
+				PluginServices.getMDIManager().addCentredWindow(
+						new InstallPackageWindow(
+								manager.getApplicationFolder(), manager
+										.getInstallFolder()));
+			} catch (Error e) {
+				LOG.error("Error creating the wizard to install a package ", e);
+			} catch (Exception e) {
+				LOG.error("Error creating the wizard to install a package ", e);
+			}
 		}
 	}
 
@@ -71,6 +75,8 @@
 		InstallerLocator.getInstallerManager().setVersion(
 				version.getFormat() + "-" + version.getBuildId());
 		try {
+			IconThemeHelper.registerIcon("action", "tools-addonsmanager", this);
+	    	
 			SwingInstallerManager manager = SwingInstallerLocator
 					.getSwingInstallerManager();
 			
Index: branches/v2_0_0_prep/extensions/org.gvsig.installer.app/org.gvsig.installer.app.extension/src/main/java/org/gvsig/installer/app/extension/creation/MakePluginPackageExtension.java
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.installer.app/org.gvsig.installer.app.extension/src/main/java/org/gvsig/installer/app/extension/creation/MakePluginPackageExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.installer.app/org.gvsig.installer.app.extension/src/main/java/org/gvsig/installer/app/extension/creation/MakePluginPackageExtension.java	(revision 38564)
@@ -47,14 +47,18 @@
 			.getLogger(MakePluginPackageExtension.class);
 
 	public void execute(String actionCommand) {
-		PluginsManager manager = PluginsLocator.getManager();
+		if ("tools-devel-pack-plugin".equalsIgnoreCase(actionCommand)) {
+			PluginsManager manager = PluginsLocator.getManager();
 
-		try {
-			PluginServices.getMDIManager().addCentredWindow(
-					new MakePluginPackageWindow(manager.getApplicationFolder(),
-							manager.getInstallFolder()));
-		} catch (Exception e) {
-			LOG.error("Error creating teh wizard to create an installer ", e);
+			try {
+				PluginServices.getMDIManager().addCentredWindow(
+						new MakePluginPackageWindow(manager
+								.getApplicationFolder(), manager
+								.getInstallFolder()));
+			} catch (Exception e) {
+				LOG.error("Error creating teh wizard to create an installer ",
+						e);
+			}
 		}
 	}
 
Index: branches/v2_0_0_prep/extensions/org.gvsig.daltransform.app.mainplugin/src/main/java/org/gvsig/daltransform/swing/impl/DefaultDataTransformWizard.java
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.daltransform.app.mainplugin/src/main/java/org/gvsig/daltransform/swing/impl/DefaultDataTransformWizard.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.daltransform.app.mainplugin/src/main/java/org/gvsig/daltransform/swing/impl/DefaultDataTransformWizard.java	(revision 38564)
@@ -29,6 +29,7 @@
 
 import java.util.List;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.ui.mdiManager.IWindow;
 import org.gvsig.andami.ui.wizard.WizardAndami;
@@ -61,7 +62,7 @@
      * @param wizard
      */
     public DefaultDataTransformWizard() {
-        super(PluginServices.getIconTheme().get("feature-transform"));
+        super(IconThemeHelper.getImageIcon("feature-transform-tools"));
         loadLayerWizardPanel = new LoadLayerWizardPanel();
         selectDataStoreWizardPanel = new SelectDataStoreWizardPanel();
         selectTransformWizardPanel = new SelectTransformWizardPanel();
Index: branches/v2_0_0_prep/extensions/org.gvsig.daltransform.app.mainplugin/src/main/java/org/gvsig/daltransform/app/mainplugin/DataTransformExtension.java
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.daltransform.app.mainplugin/src/main/java/org/gvsig/daltransform/app/mainplugin/DataTransformExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.daltransform.app.mainplugin/src/main/java/org/gvsig/daltransform/app/mainplugin/DataTransformExtension.java	(revision 38564)
@@ -32,6 +32,7 @@
 
 import javax.swing.JOptionPane;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.plugins.Extension;
 import org.gvsig.andami.ui.ToolsWindowManager;
@@ -98,7 +99,7 @@
      * @see com.iver.andami.plugins.IExtension#initialize()
      */
     public void initialize() {
-        registerIcons();
+    	IconThemeHelper.registerIcon("feature-transform-tools", "feature-transform-wizard", this);
     }
 
     /*
@@ -111,13 +112,6 @@
         super.postInitialize();
     }
 
-    private void registerIcons() {
-        PluginServices.getIconTheme().registerDefault(
-            "feature-transform",
-            this.getClass().getClassLoader()
-                .getResource("images/transform.png"));
-    }
-
     /*
      * (non-Javadoc)
      * 
Index: branches/v2_0_0_prep/extensions/org.gvsig.daltransform.app.mainplugin/src/main/resources/images/transform.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: branches/v2_0_0_prep/extensions/org.gvsig.daltransform.app.mainplugin/src/main/resources/images/feature-transform-tools/feature-transform-wizard.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/org.gvsig.daltransform.app.mainplugin/src/main/resources/images/feature-transform-tools/feature-transform-wizard.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/org.gvsig.geometrymeasurement.app/org.gvsig.geometrymeasurement.app.extension/src/main/java/org/gvsig/geometrymeasurement/app/extension/AddXYPointThemeExtension.java
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.geometrymeasurement.app/org.gvsig.geometrymeasurement.app.extension/src/main/java/org/gvsig/geometrymeasurement/app/extension/AddXYPointThemeExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.geometrymeasurement.app/org.gvsig.geometrymeasurement.app.extension/src/main/java/org/gvsig/geometrymeasurement/app/extension/AddXYPointThemeExtension.java	(revision 38564)
@@ -21,6 +21,7 @@
  */
 package org.gvsig.geometrymeasurement.app.extension;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.app.project.documents.table.TableDocument;
 import org.gvsig.fmap.dal.feature.FeatureStore;
@@ -38,13 +39,7 @@
 
     public void initialize() {
         super.initialize();
-        
-        //Register the icon
-        PluginServices.getIconTheme().registerDefault(
-            "add-xy-point",
-            this.getClass().getClassLoader().getResource(
-                "org/gvsig/geometrymeasurement/app/extension/images/xypoint.png")
-        );
+        IconThemeHelper.registerIcon("action", "table-add-xy", this);
     }
 
     @Override
Index: branches/v2_0_0_prep/extensions/org.gvsig.geometrymeasurement.app/org.gvsig.geometrymeasurement.app.extension/src/main/java/org/gvsig/geometrymeasurement/app/extension/AreaMeasurementExtension.java
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.geometrymeasurement.app/org.gvsig.geometrymeasurement.app.extension/src/main/java/org/gvsig/geometrymeasurement/app/extension/AreaMeasurementExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.geometrymeasurement.app/org.gvsig.geometrymeasurement.app.extension/src/main/java/org/gvsig/geometrymeasurement/app/extension/AreaMeasurementExtension.java	(revision 38564)
@@ -21,7 +21,7 @@
  */
 package org.gvsig.geometrymeasurement.app.extension;
 
-import org.gvsig.andami.PluginServices;
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.app.project.documents.table.TableDocument;
 import org.gvsig.fmap.dal.feature.FeatureStore;
 import org.gvsig.fmap.geom.Geometry;
@@ -38,13 +38,7 @@
 
     public void initialize() {
     super.initialize();
-        
-        //Register the icon
-        PluginServices.getIconTheme().registerDefault(
-            "add-area",
-            this.getClass().getClassLoader().getResource(
-                "org/gvsig/geometrymeasurement/app/extension/images/area.png")
-        );
+        IconThemeHelper.registerIcon("action", "table-add-area", this);
     }
 
     @Override
Index: branches/v2_0_0_prep/extensions/org.gvsig.geometrymeasurement.app/org.gvsig.geometrymeasurement.app.extension/src/main/java/org/gvsig/geometrymeasurement/app/extension/PerimeterMeasurementExtension.java
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.geometrymeasurement.app/org.gvsig.geometrymeasurement.app.extension/src/main/java/org/gvsig/geometrymeasurement/app/extension/PerimeterMeasurementExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.geometrymeasurement.app/org.gvsig.geometrymeasurement.app.extension/src/main/java/org/gvsig/geometrymeasurement/app/extension/PerimeterMeasurementExtension.java	(revision 38564)
@@ -21,6 +21,7 @@
  */
 package org.gvsig.geometrymeasurement.app.extension;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.app.project.documents.table.TableDocument;
 import org.gvsig.fmap.dal.feature.FeatureStore;
@@ -37,14 +38,8 @@
     AbstractGeometryMeasurementExtension {
 
     public void initialize() {
-    super.initialize();
-        
-        //Register the icon
-        PluginServices.getIconTheme().registerDefault(
-            "add-perimeter",
-            this.getClass().getClassLoader().getResource(
-                "org/gvsig/geometrymeasurement/app/extension/images/perimeter.png")
-        );
+    	super.initialize();
+        IconThemeHelper.registerIcon("action", "table-add-perimeter", this);
     }
 
     @Override
Index: branches/v2_0_0_prep/extensions/extExpressionField/config/config.xml
===================================================================
--- branches/v2_0_0_prep/extensions/extExpressionField/config/config.xml	(revision 38563)
+++ branches/v2_0_0_prep/extensions/extExpressionField/config/config.xml	(revision 38564)
@@ -8,15 +8,30 @@
 		<extension class-name="org.gvsig.expressionfield.ExpressionFieldExtension"
 			description="Extension that evaluate the expression to a column."
 			active="true">
-			<menu text="Tabla/fill_column" tooltip="expression"
-				action-command="EXPRESSION"
-				icon="ext-kcalc" />
-			<tool-bar name="field_toolbar">
-				<action-tool icon="ext-kcalc"
-					action-command="EXPRESSION" tooltip="expression"
-					last="true"/>
-			</tool-bar>
+
+            <action 
+                name="table-expression-field"
+                label="_Expression_field" 
+                tooltip="_Expression_field" 
+                position="501100000" 
+                action-command="table-expression-field"
+                icon="table-expression-field"
+                accelerator=""
+                />
+            
+            <menu
+                name="table-expression-field"
+                text="Table/Expression field"
+                />
+            
+            <tool-bar name="table_tools">
+                <action-tool 
+                    name="table-expression-field"
+                    />
+            </tool-bar>   
+            			
 		</extension>
+		
 		<extension class-name="org.gvsig.expressionfield.AboutExpressionFieldExtension"
 			description="Extension to add about panel."
 			active="false"
Index: branches/v2_0_0_prep/extensions/extExpressionField/images/action/table-expression-field.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/extExpressionField/images/action/table-expression-field.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/extExpressionField/images/preferences/expression-field-preferences.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/extExpressionField/images/preferences/expression-field-preferences.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/extExpressionField/src/org/gvsig/expressionfield/project/documents/table/gui/EvalExpressionDialog.java
===================================================================
--- branches/v2_0_0_prep/extensions/extExpressionField/src/org/gvsig/expressionfield/project/documents/table/gui/EvalExpressionDialog.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/extExpressionField/src/org/gvsig/expressionfield/project/documents/table/gui/EvalExpressionDialog.java	(revision 38564)
@@ -44,7 +44,6 @@
 import org.gvsig.expressionfield.project.documents.table.IOperator;
 import org.gvsig.expressionfield.project.documents.table.operators.Field;
 import org.gvsig.fmap.dal.exception.DataException;
-import org.gvsig.tools.dispose.DisposableIterator;
 import org.gvsig.fmap.dal.feature.Feature;
 import org.gvsig.fmap.dal.feature.FeatureSelection;
 import org.gvsig.fmap.dal.feature.FeatureSet;
@@ -53,6 +52,7 @@
 import org.gvsig.fmap.mapcontext.layers.vectorial.FLyrVect;
 import org.gvsig.gui.beans.AcceptCancelPanel;
 import org.gvsig.gui.beans.swing.JButton;
+import org.gvsig.tools.dispose.DisposableIterator;
 import org.gvsig.tools.dispose.DisposeUtils;
 import org.gvsig.utils.GenericFileFilter;
 
Index: branches/v2_0_0_prep/extensions/extExpressionField/src/org/gvsig/expressionfield/project/documents/table/GraphicOperator.java
===================================================================
--- branches/v2_0_0_prep/extensions/extExpressionField/src/org/gvsig/expressionfield/project/documents/table/GraphicOperator.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/extExpressionField/src/org/gvsig/expressionfield/project/documents/table/GraphicOperator.java	(revision 38564)
@@ -6,7 +6,6 @@
 import org.gvsig.fmap.geom.Geometry;
 import org.gvsig.fmap.geom.GeometryLocator;
 import org.gvsig.fmap.geom.GeometryManager;
-import org.gvsig.fmap.geom.util.Converter;
 import org.gvsig.fmap.mapcontext.layers.vectorial.FLyrVect;
 
 /**
Index: branches/v2_0_0_prep/extensions/extExpressionField/src/org/gvsig/expressionfield/ExpressionFieldExtension.java
===================================================================
--- branches/v2_0_0_prep/extensions/extExpressionField/src/org/gvsig/expressionfield/ExpressionFieldExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/extExpressionField/src/org/gvsig/expressionfield/ExpressionFieldExtension.java	(revision 38564)
@@ -5,12 +5,9 @@
 import java.util.Iterator;
 
 import javax.swing.JOptionPane;
-import javax.swing.plaf.OptionPaneUI;
 
 import org.apache.bsf.BSFManager;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.messages.NotificationManager;
 import org.gvsig.andami.plugins.Extension;
@@ -78,6 +75,8 @@
 import org.gvsig.tools.ToolsLocator;
 import org.gvsig.tools.extensionpoint.ExtensionPoint;
 import org.gvsig.utils.swing.threads.AbstractMonitorableTask;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @author Vicente Caballero Navarro
@@ -97,20 +96,22 @@
 	}
 
 	public void execute(String actionCommand) {
-		org.gvsig.andami.ui.mdiManager.IWindow window = PluginServices.getMDIManager().getActiveWindow();
-		table=(FeatureTableDocumentPanel)window;
-		if (!table.getModel().getStore().isEditing()){
-			int option=JOptionPane.showConfirmDialog((Component)PluginServices.getMainFrame(), PluginServices.getText(this,"is_not_in_editing_are_you_sure"));
-			if (option != JOptionPane.OK_OPTION){
-				return;
+		if( "table-expression-field".equalsIgnoreCase(actionCommand) ) {
+	 		org.gvsig.andami.ui.mdiManager.IWindow window = PluginServices.getMDIManager().getActiveWindow();
+			table=(FeatureTableDocumentPanel)window;
+			if (!table.getModel().getStore().isEditing()){
+				int option=JOptionPane.showConfirmDialog((Component)PluginServices.getMainFrame(), PluginServices.getText(this,"is_not_in_editing_are_you_sure"));
+				if (option != JOptionPane.OK_OPTION){
+					return;
+				}
 			}
+			if (operators.isEmpty()) {
+				PluginServices.cancelableBackgroundExecution(new EvalOperatorsTask());
+	        }else{
+	        	 EvalExpressionDialog eed=new EvalExpressionDialog(table,interpreter,operators);
+			     PluginServices.getMDIManager().addWindow(eed);
+	        }
 		}
-		if (operators.isEmpty()) {
-			PluginServices.cancelableBackgroundExecution(new EvalOperatorsTask());
-        }else{
-        	 EvalExpressionDialog eed=new EvalExpressionDialog(table,interpreter,operators);
-		     PluginServices.getMDIManager().addWindow(eed);
-        }
 	}
 	public void postInitialize() {
 
@@ -207,15 +208,8 @@
 	}
 
 	 private void registerIcons(){
-		 PluginServices.getIconTheme().registerDefault(
-					"ext-kcalc",
-					this.getClass().getClassLoader().getResource("images/kcalc.png")
-				);
-
-		 PluginServices.getIconTheme().registerDefault(
-					"field-expression-kcalc",
-					this.getClass().getClassLoader().getResource("images/FieldExpression.png")
-				);
+		 IconThemeHelper.registerIcon("action", "table-expression-field", this);
+		 IconThemeHelper.registerIcon("action", "expression-field-preferences", this);
 	 }
 
 	 private class EvalOperatorsTask extends AbstractMonitorableTask{
Index: branches/v2_0_0_prep/extensions/extExpressionField/src/org/gvsig/expressionfield/gui/FieldExpressionPage.java
===================================================================
--- branches/v2_0_0_prep/extensions/extExpressionField/src/org/gvsig/expressionfield/gui/FieldExpressionPage.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/extExpressionField/src/org/gvsig/expressionfield/gui/FieldExpressionPage.java	(revision 38564)
@@ -137,7 +137,7 @@
 
 	public FieldExpressionPage() {
 		super();
-		icon=PluginServices.getIconTheme().get("field-expression-kcalc");
+		icon=PluginServices.getIconTheme().get("expression-field-preferences");
 		addComponent(getJTextArea());
 
 		addComponent(PluginServices.getText(this, "limit_rows_in_memory") + ":",
Index: branches/v2_0_0_prep/extensions/org.gvsig.hyperlink.app/org.gvsig.hyperlink.app.extension/src/main/java/org/gvsig/hyperlink/app/extension/actions/PdfHyperlinkPanel.java
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.hyperlink.app/org.gvsig.hyperlink.app.extension/src/main/java/org/gvsig/hyperlink/app/extension/actions/PdfHyperlinkPanel.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.hyperlink.app/org.gvsig.hyperlink.app.extension/src/main/java/org/gvsig/hyperlink/app/extension/actions/PdfHyperlinkPanel.java	(revision 38564)
@@ -37,13 +37,11 @@
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.net.URI;
-import java.net.URL;
 
 import javax.print.attribute.HashPrintRequestAttributeSet;
 import javax.print.attribute.PrintRequestAttributeSet;
 import javax.print.attribute.SetOfIntegerSyntax;
 import javax.print.attribute.standard.PageRanges;
-import javax.swing.ImageIcon;
 import javax.swing.JButton;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
@@ -51,6 +49,7 @@
 import javax.swing.JScrollPane;
 import javax.swing.JTextField;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.messages.NotificationManager;
 import org.gvsig.andami.ui.mdiManager.IWindow;
@@ -75,6 +74,16 @@
     private JLabel pageCounter3 =
         new JLabel(PluginServices.getText(this, "de"));
 
+    public static void initializeIcons() {
+    	IconThemeHelper.registerIcon("toolbar-go", "go-next", PdfHyperlinkPanel.class);
+    	IconThemeHelper.registerIcon("toolbar-go", "go-previous", PdfHyperlinkPanel.class);
+    	IconThemeHelper.registerIcon("toolbar-go", "go-next-fast", PdfHyperlinkPanel.class);
+    	IconThemeHelper.registerIcon("toolbar-go", "go-previous-fast", PdfHyperlinkPanel.class);
+    	IconThemeHelper.registerIcon("toolbar-go", "go-first", PdfHyperlinkPanel.class);
+    	IconThemeHelper.registerIcon("toolbar-go", "go-last", PdfHyperlinkPanel.class);
+    	IconThemeHelper.registerIcon("action", "document-print", PdfHyperlinkPanel.class);
+    }
+
     public PdfHyperlinkPanel(URI doc) {
         super(doc);
         initialize();
@@ -176,8 +185,7 @@
         /** back to page 1 */
         JButton start = new JButton();
         start.setBorderPainted(false);
-        URL startImage = PluginServices.getPluginServices(this).getClassLoader().getResource("images/start.gif");
-        start.setIcon(new ImageIcon(startImage));
+        start.setIcon( IconThemeHelper.getImageIcon("go-first"));      
         start.setToolTipText(PluginServices.getText(this, "primera_pagina"));
         // currentBar1.add(start);
         list[0] = start;
@@ -204,8 +212,7 @@
         /** back 10 icon */
         JButton fback = new JButton();
         fback.setBorderPainted(false);
-        URL fbackImage = PluginServices.getPluginServices(this).getClassLoader().getResource("images/fback.gif");
-        fback.setIcon(new ImageIcon(fbackImage));
+        fback.setIcon( IconThemeHelper.getImageIcon("go-previous-fast"));
         fback.setToolTipText(PluginServices.getText(this, "diez_paginas_atras"));
         // currentBar1.add(fback);
         list[1] = fback;
@@ -232,8 +239,8 @@
         /** back icon */
         JButton back = new JButton();
         back.setBorderPainted(false);
-        URL backImage = PluginServices.getPluginServices(this).getClassLoader().getResource("images/back.gif");
-        back.setIcon(new ImageIcon(backImage));
+        back.setIcon( IconThemeHelper.getImageIcon("go-previous"));      
+
         back.setToolTipText(PluginServices.getText(this, "pagina_atras"));
         // currentBar1.add(back);
         list[2] = back;
@@ -309,8 +316,7 @@
         /** forward icon */
         JButton forward = new JButton();
         forward.setBorderPainted(false);
-        URL fowardImage = PluginServices.getPluginServices(this).getClassLoader().getResource("images/forward.gif");
-        forward.setIcon(new ImageIcon(fowardImage));
+        forward.setIcon( IconThemeHelper.getImageIcon("go-next"));      
         forward.setToolTipText(PluginServices.getText(this, "pagina_delante"));
         // currentBar1.add(forward);
         list[8] = forward;
@@ -337,8 +343,7 @@
         /** fast forward icon */
         JButton fforward = new JButton();
         fforward.setBorderPainted(false);
-        URL ffowardImage = PluginServices.getPluginServices(this).getClassLoader().getResource("images/fforward.gif");
-        fforward.setIcon(new ImageIcon(ffowardImage));
+        fforward.setIcon( IconThemeHelper.getImageIcon("go-next-fast"));      
         fforward.setToolTipText(PluginServices.getText(this,
             "10_paginas_delante"));
         // currentBar1.add(fforward);
@@ -366,8 +371,7 @@
         /** goto last page */
         JButton end = new JButton();
         end.setBorderPainted(false);
-        URL endImage = PluginServices.getPluginServices(this).getClassLoader().getResource("images/end.gif");
-        end.setIcon(new ImageIcon(endImage));
+        end.setIcon( IconThemeHelper.getImageIcon("go-last"));      
         end.setToolTipText(PluginServices.getText(this, "ultima_pagina"));
         // currentBar1.add(end);
         list[10] = end;
@@ -394,8 +398,7 @@
         /** Print */
         JButton print = new JButton();
         print.setBorderPainted(false);
-        URL printImage = PluginServices.getPluginServices(this).getClassLoader().getResource("images/print.gif");
-        print.setIcon(new ImageIcon(printImage));
+        print.setIcon( IconThemeHelper.getImageIcon("document-print"));      
         print.setToolTipText(PluginServices.getText(this, "imprimir"));
         // currentBar1.add(end);
         list[11] = print;
Index: branches/v2_0_0_prep/extensions/org.gvsig.hyperlink.app/org.gvsig.hyperlink.app.extension/src/main/java/org/gvsig/hyperlink/app/extension/HyperlinkExtension.java
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.hyperlink.app/org.gvsig.hyperlink.app.extension/src/main/java/org/gvsig/hyperlink/app/extension/HyperlinkExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.hyperlink.app/org.gvsig.hyperlink.app.extension/src/main/java/org/gvsig/hyperlink/app/extension/HyperlinkExtension.java	(revision 38564)
@@ -26,6 +26,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.plugins.Extension;
 import org.gvsig.andami.ui.mdiManager.IWindow;
@@ -270,8 +271,7 @@
     }
 
     public void initialize() {
-        // Do nothing
-        
+    	IconThemeHelper.registerIcon("action", "view-hyperlink", this);
     }
 
 }
Index: branches/v2_0_0_prep/extensions/org.gvsig.hyperlink.app/org.gvsig.hyperlink.app.extension/src/main/java/org/gvsig/hyperlink/app/extension/LinkListener.java
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.hyperlink.app/org.gvsig.hyperlink.app.extension/src/main/java/org/gvsig/hyperlink/app/extension/LinkListener.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.hyperlink.app/org.gvsig.hyperlink.app.extension/src/main/java/org/gvsig/hyperlink/app/extension/LinkListener.java	(revision 38564)
@@ -28,10 +28,8 @@
 import java.awt.Toolkit;
 import java.awt.geom.Point2D;
 import java.net.URI;
-import java.net.URL;
 
-import javax.swing.ImageIcon;
-
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.app.project.documents.view.toolListeners.InfoListener;
 import org.gvsig.fmap.mapcontext.layers.FLayer;
@@ -68,7 +66,7 @@
     private Cursor cur = null;
     private MapControl mapCtrl;
     private ManagerRegistry registry;
-    private Image imageCursor = null;
+//    private Image imageCursor = null;
     public static final int TYPELINKIMAGE = 0;
     public static final int TYPELINKTEXT = 1;
     public ExtensionPoint formatManagers;
@@ -89,21 +87,9 @@
     }
 
     private void initialize() {
-        URL url =
-            PluginServices.getPluginServices(this)
-                .getClassLoader()
-                .getResource("images/LinkCursor.gif");
-        if (url != null) {
-            ImageIcon img = new ImageIcon(url);
-            imageCursor = img.getImage();
-            cur =
-                Toolkit.getDefaultToolkit().createCustomCursor(imageCursor,
+        cur = Toolkit.getDefaultToolkit().createCustomCursor(this.getImageCursor(),
                     new Point(16, 16),
                     "Hyperlink");
-        } else {
-            PluginServices.getLogger()
-                .error("Icon not found: images/LinkCursor.gif");
-        }
     }
 
     /**
@@ -219,6 +205,6 @@
     }
 
     public Image getImageCursor() {
-        return imageCursor;
+    	return IconThemeHelper.getImage("cursor-hyperlink");
     }
 }
Index: branches/v2_0_0_prep/extensions/org.gvsig.hyperlink.app/org.gvsig.hyperlink.app.extension/src/main/resources/config.xml
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.hyperlink.app/org.gvsig.hyperlink.app.extension/src/main/resources/config.xml	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.hyperlink.app/org.gvsig.hyperlink.app.extension/src/main/resources/config.xml	(revision 38564)
@@ -8,7 +8,7 @@
 			description=""
 			active="true"
 			priority="20">
-			<menu text="Capa/Advanced_Hyperlink" action-command="HYPERLINK" icon="images/Link.png" position="5040"/>
+			<menu text="Capa/Advanced_Hyperlink" action-command="HYPERLINK" icon="view-hyperlink" position="5040"/>
 			<tool-bar name="View_Tools_Query" position="5">
 				<selectable-tool icon="view-query-link" action-command="HYPERLINK"  tooltip="Advanced_Hyperlink" position="7"/>
 			</tool-bar>
Index: branches/v2_0_0_prep/extensions/org.gvsig.hyperlink.app/org.gvsig.hyperlink.app.extension/src/main/resources/images/action/document-print.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/org.gvsig.hyperlink.app/org.gvsig.hyperlink.app.extension/src/main/resources/images/action/document-print.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/org.gvsig.hyperlink.app/org.gvsig.hyperlink.app.extension/src/main/resources/images/action/view-hyperlink.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/org.gvsig.hyperlink.app/org.gvsig.hyperlink.app.extension/src/main/resources/images/action/view-hyperlink.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/org.gvsig.hyperlink.app/org.gvsig.hyperlink.app.extension/src/main/resources/images/cursor/cursor-hyperlink.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/org.gvsig.hyperlink.app/org.gvsig.hyperlink.app.extension/src/main/resources/images/cursor/cursor-hyperlink.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/org.gvsig.hyperlink.app/org.gvsig.hyperlink.app.extension/src/main/resources/images/toolbar-go/go-last.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/org.gvsig.hyperlink.app/org.gvsig.hyperlink.app.extension/src/main/resources/images/toolbar-go/go-last.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/org.gvsig.hyperlink.app/org.gvsig.hyperlink.app.extension/src/main/resources/images/toolbar-go/go-first.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/org.gvsig.hyperlink.app/org.gvsig.hyperlink.app.extension/src/main/resources/images/toolbar-go/go-first.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/org.gvsig.hyperlink.app/org.gvsig.hyperlink.app.extension/src/main/resources/images/toolbar-go/go-previous-fast.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/org.gvsig.hyperlink.app/org.gvsig.hyperlink.app.extension/src/main/resources/images/toolbar-go/go-previous-fast.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/org.gvsig.hyperlink.app/org.gvsig.hyperlink.app.extension/src/main/resources/images/toolbar-go/go-next-fast.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/org.gvsig.hyperlink.app/org.gvsig.hyperlink.app.extension/src/main/resources/images/toolbar-go/go-next-fast.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/org.gvsig.hyperlink.app/org.gvsig.hyperlink.app.extension/src/main/resources/images/toolbar-go/go-previous.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/org.gvsig.hyperlink.app/org.gvsig.hyperlink.app.extension/src/main/resources/images/toolbar-go/go-previous.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/org.gvsig.hyperlink.app/org.gvsig.hyperlink.app.extension/src/main/resources/images/toolbar-go/go-next.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/org.gvsig.hyperlink.app/org.gvsig.hyperlink.app.extension/src/main/resources/images/toolbar-go/go-next.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/java/org/gvsig/selectiontools/app/extension/AboutSelectionToolsExtension.java
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/java/org/gvsig/selectiontools/app/extension/AboutSelectionToolsExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/java/org/gvsig/selectiontools/app/extension/AboutSelectionToolsExtension.java	(revision 38564)
@@ -1,96 +0,0 @@
-package org.gvsig.selectiontools.app.extension;
-
-import org.gvsig.about.AboutManager;
-import org.gvsig.about.AboutParticipant;
-import org.gvsig.andami.plugins.Extension;
-import org.gvsig.app.ApplicationLocator;
-import org.gvsig.app.ApplicationManager;
-
-/* gvSIG. Geographic Information System of the Valencian Government
- *
- * Copyright (C) 2007-2008 Infrastructures and Transports Department
- * of the Valencian Government (CIT)
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *  
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
- * MA  02110-1301, USA.
- * 
- */
-
-/**
- * <p>
- * Some selection tools for gvSIG of the <i>Consejer�a de Medio Ambiente de la
- * Junta de Castilla y Le�n.</i>
- * </p>
- * project.
- * 
- * @author Vicente Caballero Navarro (vicente.caballero@iver.es)
- * @author Jaume Dom�nguez Faus (jaume.dominguez@iver.es)
- * @author C�sar Mart�nez Izquierdo (cesar.martinez@iver.es)
- * @author Pablo Piqueras Bartolom� (pablo.piqueras@iver.es)
- * @author Jos� Manuel Viv� Arnal (josemanuel.vivo@iver.es)
- */
-public class AboutSelectionToolsExtension extends Extension {
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.iver.andami.plugins.IExtension#initialize()
-     */
-    public void initialize() {
-    }
-
-    public void postInitialize() {
-        // Register the about panel
-        ApplicationManager application = ApplicationLocator.getManager();
-
-        AboutManager about = application.getAbout();
-
-        about.addDeveloper("IVER", this.getClass().getClassLoader()
-            .getResource("iver.html"), 1);
-
-        AboutParticipant participant = about.getDeveloper("IVER");
-        participant.addContribution("SelectionToolsExtension",
-            "Selection tools", 2009, 1, 1, 2009, 12, 31);
-
-        about.addSponsor("Junta de Castilla y Le�n", // Junta de Castilla y Le�n
-            getClass().getClassLoader().getResource("jcyl.html"), 2);
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.iver.andami.plugins.IExtension#execute(java.lang.String)
-     */
-    public void execute(String actionCommand) {
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.iver.andami.plugins.IExtension#isEnabled()
-     */
-    public boolean isEnabled() {
-        return false;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.iver.andami.plugins.IExtension#isVisible()
-     */
-    public boolean isVisible() {
-        return false;
-    }
-}
Index: branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/java/org/gvsig/selectiontools/app/extension/SelectionToolsExtension.java
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/java/org/gvsig/selectiontools/app/extension/SelectionToolsExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/java/org/gvsig/selectiontools/app/extension/SelectionToolsExtension.java	(revision 38564)
@@ -1,55 +0,0 @@
-package org.gvsig.selectiontools.app.extension;
-
-/* gvSIG. Geographic Information System of the Valencian Government
- *
- * Copyright (C) 2007-2008 Infrastructures and Transports Department
- * of the Valencian Government (CIT)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- *
- */
-
-import org.gvsig.andami.plugins.Extension;
-
-/**
- * Andami extension to show SelectionTools in the application.
- * 
- * @author gvSIG Team
- * @version $Id$
- */
-public class SelectionToolsExtension extends Extension {
-
-    public void initialize() {
-        // Do nothing
-    }
-
-    @Override
-    public void postInitialize() {
-        super.postInitialize();
-    }
-
-    public void execute(String actionCommand) {
-    }
-
-    public boolean isEnabled() {
-        return true;
-    }
-
-    public boolean isVisible() {
-        return true;
-    }
-
-}
Index: branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/java/org/gvsig/selectiontools/app/extension/SelectByBufferExtension.java
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/java/org/gvsig/selectiontools/app/extension/SelectByBufferExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/java/org/gvsig/selectiontools/app/extension/SelectByBufferExtension.java	(revision 38564)
@@ -26,6 +26,7 @@
 
 import javax.swing.JOptionPane;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.plugins.Extension;
 import org.gvsig.andami.ui.mdiManager.IWindow;
@@ -54,16 +55,10 @@
      * @see com.iver.andami.plugins.IExtension#initialize()
      */
     public void initialize() {
-        registerIcons();
+    	IconThemeHelper.registerIcon("action", "selection-select-by-buffer", this);
+    	IconThemeHelper.registerIcon("cursor", "cursor-select-by-buffer", this);
     }
 
-    private void registerIcons() {
-        PluginServices.getIconTheme().registerDefault("select-by-buffer-icon",
-            this.getClass()
-                .getClassLoader()
-                .getResource("images/select-by-buffer-icon.png"));
-    }
-
     /*
      * (non-Javadoc)
      * 
Index: branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/java/org/gvsig/selectiontools/app/extension/SelectByPolylineExtension.java
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/java/org/gvsig/selectiontools/app/extension/SelectByPolylineExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/java/org/gvsig/selectiontools/app/extension/SelectByPolylineExtension.java	(revision 38564)
@@ -22,6 +22,7 @@
  * 
  */
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.plugins.Extension;
 import org.gvsig.andami.ui.mdiManager.IWindow;
@@ -54,22 +55,10 @@
      * @see com.iver.andami.plugins.IExtension#initialize()
      */
     public void initialize() {
-        registerIcons();
+    	IconThemeHelper.registerIcon("action", "selection-select-by-polyline", this);
+    	IconThemeHelper.registerIcon("cursor", "cursor-select-by-polyline", this);
     }
 
-    private void registerIcons() {
-        PluginServices.getIconTheme().registerDefault("polyline-cursor-icon",
-            this.getClass()
-                .getClassLoader()
-                .getResource("images/polyline-cursor-icon.png"));
-
-        PluginServices.getIconTheme()
-            .registerDefault("select-by-polyline-icon",
-                this.getClass()
-                    .getClassLoader()
-                    .getResource("images/select-by-polyline-icon.png"));
-    }
-
     /*
      * (non-Javadoc)
      * 
Index: branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/java/org/gvsig/selectiontools/app/extension/SelectAllExtension.java
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/java/org/gvsig/selectiontools/app/extension/SelectAllExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/java/org/gvsig/selectiontools/app/extension/SelectAllExtension.java	(revision 38564)
@@ -22,6 +22,7 @@
  * 
  */
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.messages.NotificationManager;
 import org.gvsig.andami.plugins.Extension;
@@ -48,16 +49,9 @@
      * @see com.iver.andami.plugins.IExtension#initialize()
      */
     public void initialize() {
-        registerIcons();
+    	IconThemeHelper.registerIcon("action", "selection-select-all", this);
     }
 
-    private void registerIcons() {
-        PluginServices.getIconTheme().registerDefault("select-all-icon",
-            this.getClass()
-                .getClassLoader()
-                .getResource("images/select-all-icon.png"));
-    }
-
     /*
      * (non-Javadoc)
      * 
Index: branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/java/org/gvsig/selectiontools/app/extension/SelectByCircleExtension.java
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/java/org/gvsig/selectiontools/app/extension/SelectByCircleExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/java/org/gvsig/selectiontools/app/extension/SelectByCircleExtension.java	(revision 38564)
@@ -1,5 +1,6 @@
 package org.gvsig.selectiontools.app.extension;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.plugins.Extension;
 import org.gvsig.andami.ui.mdiManager.IWindow;
@@ -53,21 +54,10 @@
      * @see com.iver.andami.plugins.IExtension#initialize()
      */
     public void initialize() {
-        registerIcons();
+    	IconThemeHelper.registerIcon("action", "selection-select-by-circle", this);
+    	IconThemeHelper.registerIcon("cursor", "cursor-select-by-circle", this);
     }
 
-    private void registerIcons() {
-        PluginServices.getIconTheme().registerDefault("circle-cursor-icon",
-            this.getClass()
-                .getClassLoader()
-                .getResource("images/circle-cursor-icon.png"));
-
-        PluginServices.getIconTheme().registerDefault("select-by-circle-icon",
-            this.getClass()
-                .getClassLoader()
-                .getResource("images/select-by-circle-icon.png"));
-    }
-
     /*
      * (non-Javadoc)
      * 
Index: branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/java/org/gvsig/selectiontools/app/extension/tools/CircleSelectionListener.java
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/java/org/gvsig/selectiontools/app/extension/tools/CircleSelectionListener.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/java/org/gvsig/selectiontools/app/extension/tools/CircleSelectionListener.java	(revision 38564)
@@ -29,6 +29,7 @@
 
 import javax.swing.ImageIcon;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.messages.NotificationManager;
 import org.gvsig.fmap.dal.exception.DataException;
@@ -66,18 +67,16 @@
     /**
      * The image to display when the cursor is active.
      */
-    private final Image img = new ImageIcon(this.getClass()
-        .getClassLoader()
-        .getResource("images/circle-cursor-icon.png")).getImage();
+//    private final Image img = new ImageIcon(this.getClass()
+//        .getClassLoader()
+//        .getResource("images/circle-cursor-icon.png")).getImage();
 
     /**
      * The cursor used to work with this tool listener.
      * 
      * @see #getCursor()
      */
-    private Cursor cur = Toolkit.getDefaultToolkit().createCustomCursor(img,
-        new java.awt.Point(16, 16),
-        "");
+    private Cursor cur = null ; 
 
     /**
      * Reference to the <code>MapControl</code> object that uses.
@@ -223,9 +222,13 @@
      * 
      * @see com.iver.cit.gvsig.fmap.tools.Listeners.ToolListener#getCursor()
      */
-    public Cursor getCursor() {
-        return cur;
-    }
+	public Cursor getCursor() {
+		if (cur == null) {
+			cur = Toolkit.getDefaultToolkit().createCustomCursor(
+					this.getImageCursor(), new java.awt.Point(16, 16), "");
+		}
+		return cur;
+	}
 
     /*
      * (non-Javadoc)
@@ -237,6 +240,6 @@
     }
 
     public Image getImageCursor() {
-        return img;
+        return IconThemeHelper.getImage("cursor-select-by-circle");
     }
 }
Index: branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/java/org/gvsig/selectiontools/app/extension/tools/PolyLineSelectionListener.java
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/java/org/gvsig/selectiontools/app/extension/tools/PolyLineSelectionListener.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/java/org/gvsig/selectiontools/app/extension/tools/PolyLineSelectionListener.java	(revision 38564)
@@ -29,6 +29,7 @@
 
 import javax.swing.ImageIcon;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.messages.NotificationManager;
 import org.gvsig.fmap.dal.feature.FeatureSelection;
@@ -67,18 +68,14 @@
     /**
      * The image to display when the cursor is active.
      */
-    private final Image img = new ImageIcon(this.getClass()
-        .getClassLoader()
-        .getResource("images/polyline-cursor-icon.png")).getImage();
+//    private final Image img = PluginServices.getIconTheme().get("cursor-select-by-polygon").getImage();
 
     /**
      * The cursor used to work with this tool listener.
      * 
      * @see #getCursor()
      */
-    private Cursor cur = Toolkit.getDefaultToolkit().createCustomCursor(img,
-        new Point(16, 16),
-        "");
+    private Cursor cur = null;
 
     /**
      * Reference to the <code>MapControl</code> object that uses.
@@ -103,6 +100,11 @@
      * @see com.iver.cit.gvsig.fmap.tools.Listeners.ToolListener#getCursor()
      */
     public Cursor getCursor() {
+    	if( cur == null ) {
+    		cur = Toolkit.getDefaultToolkit().createCustomCursor(this.getImageCursor(),
+    		        new Point(16, 16),
+    		        "");
+    	}
         return cur;
     }
 
@@ -191,6 +193,6 @@
     }
 
     public Image getImageCursor() {
-        return img;
+        return IconThemeHelper.getImage("cursor-select-by-polyline");
     }
 }
Index: branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/text_ro.properties
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/text_ro.properties	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/text_ro.properties	(revision 38564)
@@ -1,89 +0,0 @@
-#Translations for language [ro]
-#Mon Sep 21 10:02:12 CEST 2009
-add_buffer_layers=
-add_influence_areas_layers=Adaug\u0103 strate bufer
-addBufferLayers_checkbox_TOOLTIP_HTML_explanation=
-Added_buffer_areas_to_TOC=
-Added_layer_with_influence_areas_to_TOC=Adaug\u0103 stratele cu zonele de influen\u0163\u0103 la TOC.
-addInfluenceAreasLayers_checkbox_TOOLTIP_HTML_explanation=<html>Adaug\u0103 zonele de influen\u0163\u0103 a fiec\u0103rui strat activ<br> ca strate noi vectoriale.</ html>
-Both=Am\u00e2ndou\u0103
-Buffer_cap=Capac buffer
-Buffer_information=Informa\u021bie buffer
-Buffer_width=L\u0103\u021bime buffer
-bufferWidth_TOOLTIP_HTML_explanation=<html>L\u0103\u021bime buffer.</html>
-configuration=configurare
-Creating_layer_with_buffers=
-Creating_layer_with_influence_areas=Creare strat arie de influen\u021b\u0103
-Creating_temp_file=Creare fi\u0219ier temporar
-distanceUnitsLabel_TOOLTIP_HTML_explanation=<html>Unit\u0103\u021bi de distan\u021b\u0103.</html>
-Error=Eroare
-Error_fallo_geoproceso=Eroare \u00een timpul geoproces\u0103rii
-Error_preparar_escritura_resultados=Eroare \u00een preg\u0103tirea rezultatelor
-extSelectionTools=Extinde instrumente da selec\u021bie
-Failed_canceling_the_current_task_of_creation_a_buffer_layer=
-failed_creating_the_temporal_layer=E\u0219ec creare strat temporar
-Failed_creating_the_temporal_layer=E\u0219ec creare strat temporar
-Failed_reloading_the_layer=
-Failed_selecting_geometries=E\u0219ec selectare geometrii
-Failed_selecting_geometries_by_circle_topology_exception_explanation=E\u0219ec selectare geometrii din strat.\r\nAria circular\u0103 de selectare se intersecteaz\u0103 cu alt\u0103 geometrie definit\u0103 defectuos, e nevoie de revizuire.
-Failed_selecting_geometries_by_polyline_topology_exception_explanation=E\u0219ec selectare geometrii din strat.\r\nPolilinia se intersecteaz\u0103 cu alt\u0103 geometrie definit\u0103 defectuos, e nevoie de revizuire.
-Failed_selecting_geometries_in_layer=E\u0219ec selectare geometrii din strat
-Failed_selecting_layer=E\u0219ec selectare strat
-Failed_the_process=E\u0219ec de procesare
-Information=Informa\u021bie
-Inside=Interior
-Invalid_width=Interval nevalid
-Layer_with_buffers_created=
-Layer_with_buffers_reprojected=
-Layer_with_influence_areas_created=Stratul buffer a fost creat
-Layer_with_influence_areas_reprojected=Stratul buffer a fost reproiectat
-Layer_with_unsupported_geometries_type=Strat cu geometrie nesuportat\u0103
-Line=Linie
-lineSideLabel_TOOLTIP_HTML_explanation=<html>Geometrii de tip linie.</html>
-Multi_layer_selection_applied_for_influence_area=Selec\u021bie multistrat aplicat\u0103 pentru zona de influen\u021b\u0103
-multiLayer_selection=Selec\u021bie multistrat
-multiLayerSelection_checkbox_TOOLTIP_HTML_explanation=<html>Selec\u021bia va afecta toate stratele.</html>
-MultiPoint=Multipunct
-multiPointSideLabel_TOOLTIP_HTML_explanation=<html>Geometrii de tip multipunct.</html>
-Ongoing_process_please_wait=Proces \u00een derulare, v\u0103 rog s\u0103 a\u0219tepta\u021bi...
-Options=Op\u021biuni
-Outside=Exterior
-Outside_and_inside=Exterior \u0219i interior
-Percent=Procent
-Point=Punct
-pointSideLabel_TOOLTIP_HTML_explanation=<html>Geometrii de tip punct.</html>
-Polygon=Poligon
-polygonSideLabel_TOOLTIP_HTML_explanation=<html>Geometii de tip poligon.</html>
-Process_canceled=Proces anulat
-Process_cancelled=Proces anulat
-Process_finished=Proces finalizat
-Process_finished_wont_be_cancelled=Procesul s-a terminat, nu anulat.
-Removed_layer_with_influence_areas_to_TOC=\u015eterge strat cu zona de influen\u0163\u0103 a TOC.
-Round=Rotunjit
-Runtime_exception_refreshing_the_main_frame_by_a_Swing_thread=Eroare \u00een timpul execut\u0103rii actualiz\u0103rii component principal
-seleccion=Selec\u0163ie
-select_all=Selecteaz\u0103 tot
-select_all_info=
-select_by_buffer=Selecteaz\u0103 dup\u0103 zona de influen\u021b\u0103
-select_by_buffer_info=<html>Selecta\u021bi geometriile stratelor<br> vector active din actuala vedere care<br> intersecteaz\u0103 cu zona tampon creat\u0103 de<br> geometriile selectate anterior.</html>
-select_by_circle=Selec\u021bie dup\u0103 cerc
-select_by_circle_info=<html>Selec\u021bioneaz\u0103 geometriile stratelor<br> vector  active din actuala vedere care<br> se intersecteaz\u0103 cu cercul selectat.</html>
-select_by_polyline=Selec\u021bie dup\u0103 polilinie
-select_by_polyline_info=<html>Selec\u021bioneaz\u0103 geometriile stratelor<br> vector  active din actuala vedere care<br> se intersecteaz\u0103 cu polilinia selectat\u0103.</html>
-Selection_by_buffer_process=Proces de selectare dup\u0103 zon\u0103 de influen\u021b\u0103
-Selection_process_finished_succesfully=Procesul de selectare finalizat cu succes.
-Selection_restored=Selec\u021bie restaurat\u0103
-Side=Parte
-sideLabel_TOOLTIP_HTML_explanation=<html> Indica\u021bi direc\u021bia de a fi aleas\u0103 ca<br> tip buffer.</html>
-Starting_selection_of_layer=Ini\u021biere selec\u021bie strat
-Starting_selection_process=Ini\u021biere proces de selec\u021bie
-Summary_of_the_process_of_selecting_by_buffer=Rezumatul procesului "Selec\u021bie dup\u0103 zon\u0103 tampon"
-There_are_no_geometries_selected=Nu exist\u0103 geometrii selectate
-Tool_unavaliable_with_view_in_geographic_projection=Instrument indisponibil \u00een vederi proiectate
-Tools_Select=Selectare instrumente
-Undefined_layer=
-Unit=Unitate
-Vista=Vedere
-Warning=Avertisment
-Width=L\u0103\u021bime
-Wont_select_geometries_on_the_layer_because_has_incompatible_projection=Nu s-au selectat geometrii pentru c\u0103 are proiec\u021bie incompatibil\u0103
Index: branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/text.properties
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/text.properties	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/text.properties	(revision 38564)
@@ -1,92 +0,0 @@
-#Translations for language [es]
-#Mon Sep 21 10:02:11 CEST 2009
-add_buffer_layers=
-add_influence_areas_layers=Agrega capas de \u00e1reas de influencia.
-addBufferLayers_checkbox_TOOLTIP_HTML_explanation=
-Added_buffer_areas_to_TOC=
-Added_layer_with_influence_areas_to_TOC=Agregada capa con \u00e1reas de influencia al TOC.
-addInfluenceAreasLayers_checkbox_TOOLTIP_HTML_explanation=<html>Agrega las \u00e1reas de influencia de cada capa activa<br> como nuevas capas vectoriales.</html>
-Both=Ambos
-Buffer_cap=Sombrerete del buffer
-Buffer_information=Informaci\u00f3n del buffer
-Buffer_width=Anchura del buffer
-bufferWidth_TOOLTIP_HTML_explanation=<html>Anchura del buffer.</html>
-configuration=configuraci\u00f3n
-Creating_layer_with_buffers=
-Creating_layer_with_influence_areas=Creando capa con \u00e1reas de influencia.
-Creating_temp_file=Creando fichero temporal
-distanceUnitsLabel_TOOLTIP_HTML_explanation=<html>Unidad de distancia.</html>
-Error=Error
-Error_fallo_geoproceso=Fallo al ejecutar el geoproceso
-Error_preparar_escritura_resultados=Error generando el fichero de resultados
-extSelectionTools=Extensi\u00f3n Herramientas de Selecci\u00f3n
-Failed_canceling_the_current_task_of_creation_a_buffer_layer=
-failed_creating_geometry=Fall\u00f3 creando la geometr\u00eda
-failed_creating_the_temporal_layer=Fall\u00f3 creando la capa temporal
-Failed_creating_the_temporal_layer=Fall\u00f3 creando la capa temporal.
-Failed_performing_the_operation=Fall\u00f3 realizando la operaci\u00f3n.
-Failed_reloading_the_layer=
-Failed_selecting_geometries=Fall\u00f3 seleccionando geometr\u00edas.
-Failed_selecting_geometries_by_circle_topology_exception_explanation=Fall\u00f3 seleccionando geometr\u00edas en la capa.\nEl \u00e1rea circular de selecci\u00f3n intersecta con alguna geometr\u00eda mal definida, deber\u00eda revisarlas.
-Failed_selecting_geometries_by_polyline_topology_exception_explanation=Fall\u00f3 seleccionando geometr\u00edas en la capa.\nLa polil\u00ednea intersecta con alguna geometr\u00eda mal definida, deber\u00eda revisarlas.
-Failed_selecting_geometries_in_layer=Fall\u00f3 seleccionando geometr\u00edas en la capa
-Failed_selecting_layer=Fall\u00f3 seleccionando la capa
-Failed_the_process=Fall\u00f3 el proceso.
-Information=Informaci\u00f3n
-Inside=Interior
-Invalid_width=Anchura no v\u00e1lida.
-Layer_with_buffers_created=
-Layer_with_buffers_reprojected=
-Layer_with_influence_areas_created=Capa con \u00e1reas de influencia creada.
-Layer_with_influence_areas_reprojected=Capa con \u00e1reas de influencia reproyectada.
-Layer_with_unsupported_geometries_type=Capa con tipo de geometr\u00edas no soportadas.
-Line=L\u00ednea
-lineSideLabel_TOOLTIP_HTML_explanation=<html>Geometr\u00edas de tipo l\u00ednea.</html>
-Multi_layer_selection_applied_for_influence_area=Selecci\u00f3n multicapa aplicada para \u00e1rea de influencia.
-multiLayer_selection=Selecci\u00f3n multicapa.
-multiLayerSelection_checkbox_TOOLTIP_HTML_explanation=<html>La selecci\u00f3n de geometr\u00edas afecta a todas las capas.</html>
-MultiPoint=Multipunto
-multiPointSideLabel_TOOLTIP_HTML_explanation=<html>Geometr\u00edas de tipo multi punto.</html>
-Ongoing_process_please_wait=Proceso en marcha, por favor espere...
-Operation_not_supported=Operaci�n no soportada
-Options=Opciones
-Outside=Exterior
-Outside_and_inside=Exterior e interior
-Percent=Porcentaje
-Point=Punto
-pointSideLabel_TOOLTIP_HTML_explanation=<html>Geometr\u00edas de tipo punto.</html>
-Polygon=Pol\u00edgono
-polygonSideLabel_TOOLTIP_HTML_explanation=<html>Geometr\u00edas de tipo pol\u00edgono.</html>
-Process_canceled=Proceso cancelado.
-Process_cancelled=Proceso cancelado.
-Process_finished=Proceso finalizado.
-Process_finished_wont_be_cancelled=El proceso finaliz\u00f3, no se cancelar\u00e1.
-Removed_layer_with_influence_areas_to_TOC=Quitada capa con \u00e1reas de influencia del TOC.
-Round=Redondeado
-Runtime_exception_refreshing_the_main_frame_by_a_Swing_thread=Excepci\u00f3n en tiempo de ejecuci\u00f3n refrescando el componente principal desde un hilo Swing
-seleccion=Selecci\u00f3n
-select_all=Seleccionar todo
-select_all_info=
-select_by_buffer=Seleccionar por \u00e1rea de influencia
-select_by_buffer_info=<html>Selecciona las geometr\u00edas de las capas<br> vectoriales activas en la vista actual que<br> intersecten con el buffer creado de las<br> geometr\u00edas anteriormente seleccionadas.</html>
-select_by_circle=Seleccionar por c\u00edrculo
-select_by_circle_info=<html>Seleccciona las geometr\u00edas de las capas<br> vectoriales activas en la vista actual que<br> intersectan con el c\u00edrculo seleccionado.</html>
-select_by_polyline=Seleccionar por polil\u00ednea
-select_by_polyline_info=<html>Seleccciona las geometr\u00edas de las capas<br> vectoriales activas en la vista actual que<br> intersectan con la polil\u00ednea seleccionada.</html>
-Selection_by_buffer_process=Proceso de selecci\u00f3n por \u00e1rea de influencia
-Selection_process_finished_succesfully=Proceso de selecci\u00f3n finalizado satisfactoriamente.
-Selection_restored=Selecci\u00f3n restaurada.
-Side=Sentido
-sideLabel_TOOLTIP_HTML_explanation=<html>Indique el sentido que seleccionar\u00e1 el buffer seg\u00fan<br> el tipo de capa.</html>
-Starting_selection_of_layer=Iniciando selecci\u00f3n de capa
-Starting_selection_process=Iniciando proceso de selecci\u00f3n.
-Summary_of_the_process_of_selecting_by_buffer=Resumen del proceso de selecci\u00f3n por buffer
-There_are_no_geometries_selected=No hay geometr\u00edas seleccionadas..
-Tool_unavaliable_with_view_in_geographic_projection=Herramienta no disponible en vistas con proyecciones geogr\u00e1ficas.
-Tools_Select=Selecci\u00f3n de herramientas
-Undefined_layer=
-Unit=Unidad
-Vista=Vista
-Warning=Aviso
-Width=Anchura
-Wont_select_geometries_on_the_layer_because_has_incompatible_projection=No seleccionar\u00e1 gemetr\u00edas en la capa porque tiene proyecci\u00f3n incompatible.
Index: branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/text_zh.properties
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/text_zh.properties	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/text_zh.properties	(revision 38564)
@@ -1,89 +0,0 @@
-#Translations for language [zh]
-#Mon Sep 21 10:02:12 CEST 2009
-add_buffer_layers=
-add_influence_areas_layers=
-addBufferLayers_checkbox_TOOLTIP_HTML_explanation=
-Added_buffer_areas_to_TOC=
-Added_layer_with_influence_areas_to_TOC=
-addInfluenceAreasLayers_checkbox_TOOLTIP_HTML_explanation=
-Both=
-Buffer_cap=
-Buffer_information=
-Buffer_width=
-bufferWidth_TOOLTIP_HTML_explanation=
-configuration=
-Creating_layer_with_buffers=
-Creating_layer_with_influence_areas=
-Creating_temp_file=
-distanceUnitsLabel_TOOLTIP_HTML_explanation=
-Error=
-Error_fallo_geoproceso=Error during geoprocess execution
-Error_preparar_escritura_resultados=Error during preparation of result layer
-extSelectionTools=
-Failed_canceling_the_current_task_of_creation_a_buffer_layer=
-failed_creating_the_temporal_layer=
-Failed_creating_the_temporal_layer=
-Failed_reloading_the_layer=
-Failed_selecting_geometries=
-Failed_selecting_geometries_by_circle_topology_exception_explanation=
-Failed_selecting_geometries_by_polyline_topology_exception_explanation=
-Failed_selecting_geometries_in_layer=
-Failed_selecting_layer=
-Failed_the_process=
-Information=
-Inside=
-Invalid_width=
-Layer_with_buffers_created=
-Layer_with_buffers_reprojected=
-Layer_with_influence_areas_created=
-Layer_with_influence_areas_reprojected=
-Layer_with_unsupported_geometries_type=
-Line=
-lineSideLabel_TOOLTIP_HTML_explanation=
-Multi_layer_selection_applied_for_influence_area=
-multiLayer_selection=
-multiLayerSelection_checkbox_TOOLTIP_HTML_explanation=
-MultiPoint=
-multiPointSideLabel_TOOLTIP_HTML_explanation=
-Ongoing_process_please_wait=
-Options=
-Outside=
-Outside_and_inside=
-Percent=
-Point=
-pointSideLabel_TOOLTIP_HTML_explanation=
-Polygon=
-polygonSideLabel_TOOLTIP_HTML_explanation=
-Process_canceled=
-Process_cancelled=
-Process_finished=
-Process_finished_wont_be_cancelled=
-Removed_layer_with_influence_areas_to_TOC=
-Round=
-Runtime_exception_refreshing_the_main_frame_by_a_Swing_thread=
-seleccion=\u9009\u62e9
-select_all=\u9009\u62e9\u5168\u90e8
-select_all_info=
-select_by_buffer=
-select_by_buffer_info=
-select_by_circle=
-select_by_circle_info=
-select_by_polyline=
-select_by_polyline_info=
-Selection_by_buffer_process=
-Selection_process_finished_succesfully=
-Selection_restored=
-Side=
-sideLabel_TOOLTIP_HTML_explanation=
-Starting_selection_of_layer=
-Starting_selection_process=
-Summary_of_the_process_of_selecting_by_buffer=
-There_are_no_geometries_selected=
-Tool_unavaliable_with_view_in_geographic_projection=
-Tools_Select=
-Undefined_layer=
-Unit=
-Vista=\u89c6\u56fe
-Warning=
-Width=
-Wont_select_geometries_on_the_layer_because_has_incompatible_projection=
Index: branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/text_ca.properties
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/text_ca.properties	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/text_ca.properties	(revision 38564)
@@ -1,89 +0,0 @@
-#Translations for language [ca]
-#Mon Sep 21 10:02:11 CEST 2009
-add_buffer_layers=
-add_influence_areas_layers=Agrega capes d'\u00e0rees d'influ\u00e8ncia.
-addBufferLayers_checkbox_TOOLTIP_HTML_explanation=
-Added_buffer_areas_to_TOC=
-Added_layer_with_influence_areas_to_TOC=Agregada capa amb \u00e0rees d'influ\u00e8ncia al TOC
-addInfluenceAreasLayers_checkbox_TOOLTIP_HTML_explanation=<html>Agrega les \u00e0rees d'influ\u00e8ncia de cada capa activa<br> com a noves capes vectorials.</html>
-Both=Ambd\u00f3s
-Buffer_cap=Capellet de la mem\u00f2ria
-Buffer_information=Informaci\u00f3 de la mem\u00f2ria
-Buffer_width=Ampl\u00e0ria de la mem\u00f2ria
-bufferWidth_TOOLTIP_HTML_explanation=<html>Ampl\u00e0ria de la mem\u00f2ria.</html>
-configuration=configuraci\u00f3
-Creating_layer_with_buffers=
-Creating_layer_with_influence_areas=Creant capa amb \u00e0rees d'influ\u00e8ncia.
-Creating_temp_file=Creant fitxer temporal
-distanceUnitsLabel_TOOLTIP_HTML_explanation=<html>Unitat de dist\u00e0ncia.</html>
-Error=Error
-Error_fallo_geoproceso=S'ha produ\u00eft un error durant l'execuci\u00f3 del geoproc\u00e9s
-Error_preparar_escritura_resultados=S'ha produ\u00eft un error en preparar la capa de resultats
-extSelectionTools=Extensi\u00f3 eines de selecci\u00f3
-Failed_canceling_the_current_task_of_creation_a_buffer_layer=
-failed_creating_the_temporal_layer=Ha fallat en crear la capa temporal
-Failed_creating_the_temporal_layer=Ha fallat en crear la capa temporal.
-Failed_reloading_the_layer=
-Failed_selecting_geometries=Ha fallat en seleccionar geometries.
-Failed_selecting_geometries_by_circle_topology_exception_explanation=Ha fallat en seleccionar geometries en la capa.\nL'\u00e0rea circular de selecci\u00f3 intersecta amb alguna geometria mal definida, hauria de revisar-les.
-Failed_selecting_geometries_by_polyline_topology_exception_explanation=Ha fallat en seleccionar geometries en la capa.\nLa polil\u00ednia intersecta amb alguna geometria mal definida, hauria de revisar-les.
-Failed_selecting_geometries_in_layer=Ha fallat en seleccionar geometries en la capa
-Failed_selecting_layer=Ha fallat en seleccionar la capa
-Failed_the_process=Ha fallat el proc\u00e9s.
-Information=Informaci\u00f3
-Inside=Interior
-Invalid_width=Ampl\u00e0ria no v\u00e0lida
-Layer_with_buffers_created=
-Layer_with_buffers_reprojected=
-Layer_with_influence_areas_created=Capa amb \u00e0rees d'influ\u00e8ncia creada.
-Layer_with_influence_areas_reprojected=Capa amb \u00e0rees d'influ\u00e8ncia reprojectada.
-Layer_with_unsupported_geometries_type=Capa amb tipus de geometries no suportades.
-Line=L\u00ednia
-lineSideLabel_TOOLTIP_HTML_explanation=<html>Geometries de tipus l\u00ednia.</html>
-Multi_layer_selection_applied_for_influence_area=Selecci\u00f3 multicapa aplicada per a \u00e0rea d'influ\u00e8ncia.
-multiLayer_selection=Selecci\u00f3 multicapa.
-multiLayerSelection_checkbox_TOOLTIP_HTML_explanation=<html>La selecci\u00f3 de geometries afecta totes les capes.</html>
-MultiPoint=Multipunt
-multiPointSideLabel_TOOLTIP_HTML_explanation=<html>Geometries de tipus multi punt.</html>
-Ongoing_process_please_wait=Proc\u00e9s en marxa, per favor, espere...
-Options=Opcions
-Outside=Exterior
-Outside_and_inside=Exterior i interior
-Percent=Percentatge
-Point=Punt
-pointSideLabel_TOOLTIP_HTML_explanation=<html>Geometries de tipus punt.</html>
-Polygon=Pol\u00edgon
-polygonSideLabel_TOOLTIP_HTML_explanation=<html>Geometries de tipus pol\u00edgon.</html>
-Process_canceled=Proc\u00e9s cancel\u00b7lat.
-Process_cancelled=Proc\u00e9s cancel\u00b7lat.
-Process_finished=Proc\u00e9s finalitzat.
-Process_finished_wont_be_cancelled=El proc\u00e9s ha finalitzat, no es cancel\u00b7lar\u00e0.
-Removed_layer_with_influence_areas_to_TOC=Llevada capa amb \u00e0rees d'influ\u00e8ncia del TOC.
-Round=Arredonit
-Runtime_exception_refreshing_the_main_frame_by_a_Swing_thread=Excepci\u00f3 en temps d'execuci\u00f3 en refrescar el component principal des d'un fil Swing
-seleccion=Selecci\u00f3
-select_all=Seleccionar tot
-select_all_info=
-select_by_buffer=Seleccionar per \u00e0rea d'influ\u00e8ncia
-select_by_buffer_info=<html>Selecciona les geometries de les capes<br> vectorials actives en la vista actual que<br> intersecten amb el buffer creat de les<br> geometries anteriorment seleccionades.</html>
-select_by_circle=Seleccionar per cercle
-select_by_circle_info=<html>Seleccciona les geometries de les capes<br> vectorials actives en la vista actual que<br> intersecten amb el cercle seleccionat.</html>
-select_by_polyline=Seleccionar per polil\u00ednia
-select_by_polyline_info=<html>Seleccciona les geometries de les capes<br> vectorials actives en la vista actual que<br> intersecten amb la polil\u00ednia seleccionada.</html>
-Selection_by_buffer_process=Proc\u00e9s de selecci\u00f3 per \u00e0rea d'influ\u00e8ncia
-Selection_process_finished_succesfully=Proc\u00e9s de selecci\u00f3 finalizat satisfact\u00f2riament.
-Selection_restored=Selecci\u00f3 restaurada.
-Side=Sentit
-sideLabel_TOOLTIP_HTML_explanation=<html>Indique el sentit que seleccionar\u00e0 el buffer segons<br> el tipus de capa.</html>
-Starting_selection_of_layer=Iniciant selecci\u00f3 de capa
-Starting_selection_process=Iniciant proc\u00e9s de selecci\u00f3.
-Summary_of_the_process_of_selecting_by_buffer=Resum del proc\u00e9s de selecci\u00f3 per buffer
-There_are_no_geometries_selected=No hi ha geometries seleccionades.
-Tool_unavaliable_with_view_in_geographic_projection=Eina no disponible en vistes amb projeccions geogr\u00e0fiques.
-Tools_Select=Selecci\u00f3 d'eines
-Undefined_layer=
-Unit=Unitat
-Vista=Vista
-Warning=Av\u00eds
-Width=Amplada
-Wont_select_geometries_on_the_layer_because_has_incompatible_projection=No seleccionar\u00e0 geometries en la capa perqu\u00e8 t\u00e9 projecci\u00f3 incompatible.
Index: branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/text_pt.properties
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/text_pt.properties	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/text_pt.properties	(revision 38564)
@@ -1,89 +0,0 @@
-#Translations for language [pt]
-#Mon Sep 21 10:02:12 CEST 2009
-add_buffer_layers=
-add_influence_areas_layers=
-addBufferLayers_checkbox_TOOLTIP_HTML_explanation=
-Added_buffer_areas_to_TOC=
-Added_layer_with_influence_areas_to_TOC=
-addInfluenceAreasLayers_checkbox_TOOLTIP_HTML_explanation=
-Both=
-Buffer_cap=
-Buffer_information=
-Buffer_width=
-bufferWidth_TOOLTIP_HTML_explanation=
-configuration=
-Creating_layer_with_buffers=
-Creating_layer_with_influence_areas=
-Creating_temp_file=
-distanceUnitsLabel_TOOLTIP_HTML_explanation=
-Error=
-Error_fallo_geoproceso=Erro ao executar geoprocesso
-Error_preparar_escritura_resultados=Erro ao preparar o tema de saida
-extSelectionTools=
-Failed_canceling_the_current_task_of_creation_a_buffer_layer=
-failed_creating_the_temporal_layer=
-Failed_creating_the_temporal_layer=
-Failed_reloading_the_layer=
-Failed_selecting_geometries=
-Failed_selecting_geometries_by_circle_topology_exception_explanation=
-Failed_selecting_geometries_by_polyline_topology_exception_explanation=
-Failed_selecting_geometries_in_layer=
-Failed_selecting_layer=
-Failed_the_process=
-Information=
-Inside=
-Invalid_width=
-Layer_with_buffers_created=
-Layer_with_buffers_reprojected=
-Layer_with_influence_areas_created=
-Layer_with_influence_areas_reprojected=
-Layer_with_unsupported_geometries_type=
-Line=
-lineSideLabel_TOOLTIP_HTML_explanation=
-Multi_layer_selection_applied_for_influence_area=
-multiLayer_selection=
-multiLayerSelection_checkbox_TOOLTIP_HTML_explanation=
-MultiPoint=
-multiPointSideLabel_TOOLTIP_HTML_explanation=
-Ongoing_process_please_wait=
-Options=
-Outside=
-Outside_and_inside=
-Percent=
-Point=
-pointSideLabel_TOOLTIP_HTML_explanation=
-Polygon=
-polygonSideLabel_TOOLTIP_HTML_explanation=
-Process_canceled=
-Process_cancelled=
-Process_finished=
-Process_finished_wont_be_cancelled=
-Removed_layer_with_influence_areas_to_TOC=
-Round=
-Runtime_exception_refreshing_the_main_frame_by_a_Swing_thread=
-seleccion=Selec\u00e7\u00e3o
-select_all=Seleccionar todos
-select_all_info=
-select_by_buffer=
-select_by_buffer_info=
-select_by_circle=
-select_by_circle_info=
-select_by_polyline=
-select_by_polyline_info=
-Selection_by_buffer_process=
-Selection_process_finished_succesfully=
-Selection_restored=
-Side=
-sideLabel_TOOLTIP_HTML_explanation=
-Starting_selection_of_layer=
-Starting_selection_process=
-Summary_of_the_process_of_selecting_by_buffer=
-There_are_no_geometries_selected=
-Tool_unavaliable_with_view_in_geographic_projection=
-Tools_Select=
-Undefined_layer=
-Unit=
-Vista=Vista
-Warning=
-Width=
-Wont_select_geometries_on_the_layer_because_has_incompatible_projection=
Index: branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/text_sr.properties
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/text_sr.properties	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/text_sr.properties	(revision 38564)
@@ -1,89 +0,0 @@
-#Translations for language [sr]
-#Mon Nov 02 08:36:03 CET 2009
-add_buffer_layers=
-add_influence_areas_layers=Dodaj lejere bafera.
-addBufferLayers_checkbox_TOOLTIP_HTML_explanation=
-Added_buffer_areas_to_TOC=
-Added_layer_with_influence_areas_to_TOC=TOC-u dodat lejer sa baferom.
-addInfluenceAreasLayers_checkbox_TOOLTIP_HTML_explanation=<html>Dodaj bafere svakog aktivnog lejera<br> kao novi vektorski lejer.</html>
-Both=Oba
-Buffer_cap=Buffer cap
-Buffer_information=Podaci iz buffer-a
-Buffer_width=\u0160irina buffer-a
-bufferWidth_TOOLTIP_HTML_explanation=<html>\u0160irina bafera.</html>
-configuration=pode\u0161avanje
-Creating_layer_with_buffers=
-Creating_layer_with_influence_areas=U toku je kreiranje lejera sa baferima.
-Creating_temp_file=U toku je kreiranje temp datoteke
-distanceUnitsLabel_TOOLTIP_HTML_explanation=<html>Jedinica udaljenosti.</html>
-Error=Gre\u0161ka
-Error_fallo_geoproceso=Gre\u0161ka pri realizaciji geoprocesa
-Error_preparar_escritura_resultados=Gre\u0161ka u procesu pripreme lejera sa rezultatima
-extSelectionTools=Ekstenzija Alati za izbor
-Failed_canceling_the_current_task_of_creation_a_buffer_layer=
-failed_creating_the_temporal_layer=Neuspe\u0161no kreiranje privremenog lejera.
-Failed_creating_the_temporal_layer=Neuspe\u0161no kreiranje privremenog lejera.
-Failed_reloading_the_layer=
-Failed_selecting_geometries=Neuspe\u0161an izbor geometrija.
-Failed_selecting_geometries_by_circle_topology_exception_explanation=Neuspe\u0161an izbor geometrija na lejeru.\nIzabrana kru\u017ena oblast upisana sa nekom pogre\u0161no definisanom geometrijom, trebalo bi ih pregledati.
-Failed_selecting_geometries_by_polyline_topology_exception_explanation=Neuspe\u0161an izbor geometrija na lejeru.\nPoli-linija upisana sa nekom pogre\u0161no definisanom geometrijom, trebalo bi ih pregledati.
-Failed_selecting_geometries_in_layer=Neuspe\u0161an izbor geometrija na lejeru
-Failed_selecting_layer=Neuspe\u0161an izbor lejera
-Failed_the_process=Neuspe\u0161an proces.
-Information=Podaci
-Inside=Unutra
-Invalid_width=Pogre\u0161na \u0161irina.
-Layer_with_buffers_created=
-Layer_with_buffers_reprojected=
-Layer_with_influence_areas_created=Lejer sa kreiranim baferima.
-Layer_with_influence_areas_reprojected=Lejer sa ponovo projektovanim baferima.
-Layer_with_unsupported_geometries_type=Lejer sa tipom geometrija koje nemaju podr\u0161ku.
-Line=Linija
-lineSideLabel_TOOLTIP_HTML_explanation=<html>Geometrje linijskog tipa.</html>
-Multi_layer_selection_applied_for_influence_area=Izbran multi-lejer za bafer
-multiLayer_selection=Izbor multi-lejera.
-multiLayerSelection_checkbox_TOOLTIP_HTML_explanation=<html>Izbor geometrja uti\u010de na sve lejere.</html>
-MultiPoint=Multi-ta\u010dke
-multiPointSideLabel_TOOLTIP_HTML_explanation=<html>Geometrije tipa multi-ta\u010dke.</html>
-Ongoing_process_please_wait=Proces u toku, molimo sa\u010dekajte...
-Options=Opcije
-Outside=Spoljnji
-Outside_and_inside=Unutra\u0161nji i spoljnji
-Percent=Procenat
-Point=Ta\u010dka
-pointSideLabel_TOOLTIP_HTML_explanation=<html>Geometrije ta\u010dkastog tipa.</html>
-Polygon=Poligon
-polygonSideLabel_TOOLTIP_HTML_explanation=<html>Geometrije tipa poligon.</html>
-Process_canceled=Proces otkazan.
-Process_cancelled=Proces otkazan.
-Process_finished=Proces je zavr\u0161en.
-Process_finished_wont_be_cancelled=Proces je zavr\u0161en, ne\u0107e biti otkazan.
-Removed_layer_with_influence_areas_to_TOC=Lejer sa TOC baferima je uklonjen.
-Round=Zaobljeno
-Runtime_exception_refreshing_the_main_frame_by_a_Swing_thread=Izuzetak u vremenu realizacije osve\u017eavanjem glavne komponente po Swing niti
-seleccion=Izbor
-select_all=Izaberi sve
-select_all_info=
-select_by_buffer=Izaberi na osnovu bafera
-select_by_buffer_info=<html>Izaberi geometrje aktivnih vektorskih lejera<br> u aktivnom prikazu koji<br> se presecaju sa kreiranim baferom <br> od ranije ozna\u010denih geometrija.</html>
-select_by_circle=Izaberi po krugu
-select_by_circle_info=<html>Izaberi geometrije aktivnih vektorskih lejera<br> u aktivnom prikazu koji<br> se presecaju sa ozna\u010denim krugom.</html>
-select_by_polyline=Izaberi po poli-liniji
-select_by_polyline_info=<html>Izaberi geometrije aktivnih vektorskih lejera<br> u aktivnom prikazu koji<br> se presecaju sa ozna\u010denom poli-linijom.</html>
-Selection_by_buffer_process=Proces izbora po baferu
-Selection_process_finished_succesfully=Uspe\u0161no zavr\u0161en proces izbora.
-Selection_restored=Obnovljen izbor.
-Side=Smer
-sideLabel_TOOLTIP_HTML_explanation=<html>Navedi smer koji \u0107e napraviti izbor bafera prema<br> tipu lejera.</html>
-Starting_selection_of_layer=Po\u010dinje izbor lejera
-Starting_selection_process=Po\u010dinje proces izbora
-Summary_of_the_process_of_selecting_by_buffer=Rezime procesa izbora po baferima
-There_are_no_geometries_selected=Geometrija nije ozna\u010dena.
-Tool_unavaliable_with_view_in_geographic_projection=Nije dostupna alatka u prikazima sa geografskim projekcijama.
-Tools_Select=Izbor alatki
-Undefined_layer=
-Unit=Jedinica
-Vista=Prikaz
-Warning=Upozorenje
-Width=\u0160irina
-Wont_select_geometries_on_the_layer_because_has_incompatible_projection=Ne\u0107e sa\u010duvati gemetrije u lejeru zato \u0161to je projekcija nekompatibilna.
Index: branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/text_tr.properties
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/text_tr.properties	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/text_tr.properties	(revision 38564)
@@ -1,89 +0,0 @@
-#Translations for language [tr]
-#Mon Sep 21 10:02:12 CEST 2009
-add_buffer_layers=
-add_influence_areas_layers=
-addBufferLayers_checkbox_TOOLTIP_HTML_explanation=
-Added_buffer_areas_to_TOC=
-Added_layer_with_influence_areas_to_TOC=
-addInfluenceAreasLayers_checkbox_TOOLTIP_HTML_explanation=
-Both=
-Buffer_cap=
-Buffer_information=
-Buffer_width=
-bufferWidth_TOOLTIP_HTML_explanation=
-configuration=
-Creating_layer_with_buffers=
-Creating_layer_with_influence_areas=
-Creating_temp_file=
-distanceUnitsLabel_TOOLTIP_HTML_explanation=
-Error=Hata
-Error_fallo_geoproceso=Co\u011frafi i\u015flemi uygulamada hata
-Error_preparar_escritura_resultados=Sonu\u00e7 katman\u0131n\u0131 haz\u0131rlamada hata
-extSelectionTools=
-Failed_canceling_the_current_task_of_creation_a_buffer_layer=
-failed_creating_the_temporal_layer=
-Failed_creating_the_temporal_layer=
-Failed_reloading_the_layer=
-Failed_selecting_geometries=
-Failed_selecting_geometries_by_circle_topology_exception_explanation=
-Failed_selecting_geometries_by_polyline_topology_exception_explanation=
-Failed_selecting_geometries_in_layer=
-Failed_selecting_layer=
-Failed_the_process=\u0130\u015flemde hata
-Information=Bilgi
-Inside=
-Invalid_width=
-Layer_with_buffers_created=
-Layer_with_buffers_reprojected=
-Layer_with_influence_areas_created=
-Layer_with_influence_areas_reprojected=
-Layer_with_unsupported_geometries_type=
-Line=
-lineSideLabel_TOOLTIP_HTML_explanation=
-Multi_layer_selection_applied_for_influence_area=
-multiLayer_selection=
-multiLayerSelection_checkbox_TOOLTIP_HTML_explanation=
-MultiPoint=
-multiPointSideLabel_TOOLTIP_HTML_explanation=
-Ongoing_process_please_wait=
-Options=Se\u00e7enekler
-Outside=
-Outside_and_inside=
-Percent=Y\u00fczde
-Point=
-pointSideLabel_TOOLTIP_HTML_explanation=
-Polygon=
-polygonSideLabel_TOOLTIP_HTML_explanation=
-Process_canceled=\u0130\u015flem iptal edildi
-Process_cancelled=
-Process_finished=\u0130\u015flem tamamland\u0131
-Process_finished_wont_be_cancelled=
-Removed_layer_with_influence_areas_to_TOC=
-Round=
-Runtime_exception_refreshing_the_main_frame_by_a_Swing_thread=
-seleccion=Se\u00e7im
-select_all=T\u00fcm\u00fcn\u00fc se\u00e7
-select_all_info=
-select_by_buffer=
-select_by_buffer_info=
-select_by_circle=
-select_by_circle_info=
-select_by_polyline=
-select_by_polyline_info=
-Selection_by_buffer_process=
-Selection_process_finished_succesfully=
-Selection_restored=
-Side=
-sideLabel_TOOLTIP_HTML_explanation=
-Starting_selection_of_layer=
-Starting_selection_process=
-Summary_of_the_process_of_selecting_by_buffer=
-There_are_no_geometries_selected=
-Tool_unavaliable_with_view_in_geographic_projection=
-Tools_Select=Ara\u00e7 Se\u00e7im
-Undefined_layer=
-Unit=
-Vista=Pencere
-Warning=Uyar\u0131
-Width=
-Wont_select_geometries_on_the_layer_because_has_incompatible_projection=
Index: branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/text_ru.properties
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/text_ru.properties	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/text_ru.properties	(revision 38564)
@@ -1,89 +0,0 @@
-#Translations for language [ru]
-#Mon Sep 21 10:02:12 CEST 2009
-add_buffer_layers=
-add_influence_areas_layers=
-addBufferLayers_checkbox_TOOLTIP_HTML_explanation=
-Added_buffer_areas_to_TOC=
-Added_layer_with_influence_areas_to_TOC=
-addInfluenceAreasLayers_checkbox_TOOLTIP_HTML_explanation=
-Both=
-Buffer_cap=
-Buffer_information=
-Buffer_width=
-bufferWidth_TOOLTIP_HTML_explanation=
-configuration=
-Creating_layer_with_buffers=
-Creating_layer_with_influence_areas=
-Creating_temp_file=
-distanceUnitsLabel_TOOLTIP_HTML_explanation=
-Error=
-Error_fallo_geoproceso=\u041e\u0448\u0438\u0431\u043a\u0430 \u043f\u0440\u0438 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u0438 \u0438\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u0430 \u0433\u0435\u043e\u043e\u0431\u0440\u0430\u0431\u043e\u0442\u043a\u0438
-Error_preparar_escritura_resultados=\u041e\u0448\u0438\u0431\u043a\u0430 \u043f\u043e\u0434\u0433\u043e\u0442\u043e\u0432\u043a\u0438 \u0432\u044b\u0445\u043e\u0434\u043d\u043e\u0433\u043e \u0441\u043b\u043e\u044f
-extSelectionTools=
-Failed_canceling_the_current_task_of_creation_a_buffer_layer=
-failed_creating_the_temporal_layer=
-Failed_creating_the_temporal_layer=
-Failed_reloading_the_layer=
-Failed_selecting_geometries=
-Failed_selecting_geometries_by_circle_topology_exception_explanation=
-Failed_selecting_geometries_by_polyline_topology_exception_explanation=
-Failed_selecting_geometries_in_layer=
-Failed_selecting_layer=
-Failed_the_process=
-Information=
-Inside=
-Invalid_width=
-Layer_with_buffers_created=
-Layer_with_buffers_reprojected=
-Layer_with_influence_areas_created=
-Layer_with_influence_areas_reprojected=
-Layer_with_unsupported_geometries_type=
-Line=
-lineSideLabel_TOOLTIP_HTML_explanation=
-Multi_layer_selection_applied_for_influence_area=
-multiLayer_selection=
-multiLayerSelection_checkbox_TOOLTIP_HTML_explanation=
-MultiPoint=
-multiPointSideLabel_TOOLTIP_HTML_explanation=
-Ongoing_process_please_wait=
-Options=
-Outside=
-Outside_and_inside=
-Percent=
-Point=
-pointSideLabel_TOOLTIP_HTML_explanation=
-Polygon=
-polygonSideLabel_TOOLTIP_HTML_explanation=
-Process_canceled=
-Process_cancelled=
-Process_finished=
-Process_finished_wont_be_cancelled=
-Removed_layer_with_influence_areas_to_TOC=
-Round=
-Runtime_exception_refreshing_the_main_frame_by_a_Swing_thread=
-seleccion=\u0412\u044b\u0431\u043e\u0440
-select_all=\u0412\u044b\u0431\u0440\u0430\u0442\u044c \u0432\u0441\u0435
-select_all_info=
-select_by_buffer=
-select_by_buffer_info=
-select_by_circle=
-select_by_circle_info=
-select_by_polyline=
-select_by_polyline_info=
-Selection_by_buffer_process=
-Selection_process_finished_succesfully=
-Selection_restored=
-Side=
-sideLabel_TOOLTIP_HTML_explanation=
-Starting_selection_of_layer=
-Starting_selection_process=
-Summary_of_the_process_of_selecting_by_buffer=
-There_are_no_geometries_selected=
-Tool_unavaliable_with_view_in_geographic_projection=
-Tools_Select=
-Undefined_layer=
-Unit=
-Vista=\u041a\u0430\u0440\u0442\u0430
-Warning=
-Width=
-Wont_select_geometries_on_the_layer_because_has_incompatible_projection=
Index: branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/iver-logo.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/text_de.properties
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/text_de.properties	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/text_de.properties	(revision 38564)
@@ -1,89 +0,0 @@
-#Translations for language [de]
-#Mon Sep 21 10:02:11 CEST 2009
-add_buffer_layers=Layer f\u00fcr Puffer hinzuf\u00fcgen
-add_influence_areas_layers=Layer durch Pufferzone selektieren.
-addBufferLayers_checkbox_TOOLTIP_HTML_explanation=
-Added_buffer_areas_to_TOC=Puffer-Fl\u00e4che zu Legende hinzuf\u00fcgen
-Added_layer_with_influence_areas_to_TOC=Layer mit Pufferzone wurde in der Legende geladen. 
-addInfluenceAreasLayers_checkbox_TOOLTIP_HTML_explanation=<html>Pufferzonen f\u00fcr jeden aktiven Layer <br> als neuen Vektor-Layer hinzuf\u00fcgen.</html>
-Both=Beide
-Buffer_cap=Puffer Max.
-Buffer_information=Puffer Information
-Buffer_width=Puffer Weite
-bufferWidth_TOOLTIP_HTML_explanation=<html>Breite des Puffers.</html>
-configuration=Konfiguration
-Creating_layer_with_buffers=
-Creating_layer_with_influence_areas=Layer mit Pufferbereich wurde angelegt
-Creating_temp_file=Tempdatei wurde erzeugt
-distanceUnitsLabel_TOOLTIP_HTML_explanation=<html>Einheit einer Distanz.</html>
-Error=Fehler
-Error_fallo_geoproceso=Fehler\: Geoprozess fehlgeschlagen\!
-Error_preparar_escritura_resultados=Fehler beim Erstellen des Ergebnislayers
-extSelectionTools=Erweiterung Selektion
-Failed_canceling_the_current_task_of_creation_a_buffer_layer=
-failed_creating_the_temporal_layer=Fehler beim Anlegen eines tempor\u00e4ren Layers.
-Failed_creating_the_temporal_layer=Fehler beim Anlegen eines tempor\u00e4ren Layers.
-Failed_reloading_the_layer=
-Failed_selecting_geometries=Fehler beim Selektieren von Geometrien.
-Failed_selecting_geometries_by_circle_topology_exception_explanation=Fehler beim Selektieren von Geometrien eines Layers.\nDie Selektion durch Kreis ber\u00fchrt fehlerhafte Geometrien. Bitte \u00fcberpr\u00fcfen Sie die Eingabe-Daten.
-Failed_selecting_geometries_by_polyline_topology_exception_explanation=Fehler beim Selektieren von Geometrien eines Layers.\nDie Selektion durch Polygon ber\u00fchrt fehlerhafte Geometrien. Bitte \u00fcberpr\u00fcfen Sie die Eingabe-Daten.
-Failed_selecting_geometries_in_layer=Fehler beim Selektieren von Geometrien eines Layers
-Failed_selecting_layer=Fehler beim Selektieren.
-Failed_the_process=Vorgang abgebrochen
-Information=Information
-Inside=Innerhalb
-Invalid_width=Ung\u00fcltige Breite
-Layer_with_buffers_created=
-Layer_with_buffers_reprojected=
-Layer_with_influence_areas_created=Layer wurde durch Pufferbereich erzeugt 
-Layer_with_influence_areas_reprojected=Layer mit berechneter Pufferzone wurde angelegt
-Layer_with_unsupported_geometries_type=Geometrie-Typ wird nicht unterst\u00fctzt
-Line=Linie
-lineSideLabel_TOOLTIP_HTML_explanation=<html>Geometrien vom Typ "Linie".</html>
-Multi_layer_selection_applied_for_influence_area=Multi-Layer Selektion, der auf Pufferbereiche angewendet wird. 
-multiLayer_selection=Multi-Layer Selektion
-multiLayerSelection_checkbox_TOOLTIP_HTML_explanation=<html>Alle Features eines Layers selektieren.</html>
-MultiPoint=Multi-Punkt
-multiPointSideLabel_TOOLTIP_HTML_explanation=<html>Geometrien vom Typ "Multi-Punkt"</html>
-Ongoing_process_please_wait=Vorgang wird durchgef\u00fchrt, bitte warten ...
-Options=Optionen
-Outside=Au\u00dferhalb
-Outside_and_inside=Au\u00dferhalb und innerhalb
-Percent=Prozent
-Point=Punkt
-pointSideLabel_TOOLTIP_HTML_explanation=<html>Punkt-Geometrie.</html>
-Polygon=Polygon
-polygonSideLabel_TOOLTIP_HTML_explanation=<html>Polygon-Geometrie.</html>
-Process_canceled=Prozess wurde abgebrochen.
-Process_cancelled=Prozess wurde abgebrochen.
-Process_finished=Prozess beendet.
-Process_finished_wont_be_cancelled=Vorgang ist bereits beendet. Er wird nicht abgebrochen. 
-Removed_layer_with_influence_areas_to_TOC=Layer mit Puffer-Information wird von der Legende entfernt.
-Round=gerundet
-Runtime_exception_refreshing_the_main_frame_by_a_Swing_thread=Fehler w\u00e4hrend die Hauptkomponente durch einen Swing Thread aktualisiert wird
-seleccion=Elemente ausw\u00e4hlen ...
-select_all=Alle ausw\u00e4hlen
-select_all_info=
-select_by_buffer=Selektion durch Puffer
-select_by_buffer_info=<html>Die Geometrien des aktiven Vektor-Layers<br>der aktuellen Ansicht werden ausgew\u00e4hlt, die<br>sich mit dem Puffer, durch zuvor gew\u00e4hlte Geometrien, \u00fcberschneiden.</html>
-select_by_circle=Selektion durch Kreis
-select_by_circle_info=<html>Die Geometrien des aktiven Vektor-Layers<br>der aktuellen Ansicht, die<br>sich mit dem gew\u00e4hltenKreis \u00fcberschneiden werden ausgew\u00e4hlt.</html>
-select_by_polyline=Selektion durch Polylinie
-select_by_polyline_info=<html>Die Geometrien des aktiven Vektor-Layers<br>der aktuellen Ansicht, die<br>sich mit der gew\u00e4hlten Polylinie \u00fcberschneiden werden ausgew\u00e4hlt.</html>
-Selection_by_buffer_process=Selektion anhand eines Puffers
-Selection_process_finished_succesfully=Selektion erfolgreich durchgef\u00fchrt
-Selection_restored=Selektion wieder hergestellt
-Side=Seite
-sideLabel_TOOLTIP_HTML_explanation=<html>Methode f\u00fcr die Selektion durch Pufferbereich vergeben, <br> ist abh\u00e4ngig vom Typ des Layers.</html>
-Starting_selection_of_layer=Starten den Layer zu selektieren
-Starting_selection_process=Prozess der Selektierung starten
-Summary_of_the_process_of_selecting_by_buffer=Ergebnis Selektion durch Puffer
-There_are_no_geometries_selected=Es wurden keine Geometrien selektiert
-Tool_unavaliable_with_view_in_geographic_projection=Werkzeuge nicht in Ansicht mit geographischer Projektion verf\u00fcgar
-Tools_Select=Auswahl des Werkzeuges
-Undefined_layer=
-Unit=Einheit
-Vista=Ansicht
-Warning=Warnung
-Width=Breite
-Wont_select_geometries_on_the_layer_because_has_incompatible_projection=Geometrien k\u00f6nnen nicht ausgew\u00e4hlt werden, da die Projektion des Layers nicht kompatibel ist. 
Index: branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/text_sw.properties
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/text_sw.properties	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/text_sw.properties	(revision 38564)
@@ -1,89 +0,0 @@
-#Translations for language [sw]
-#Mon Sep 21 10:02:12 CEST 2009
-add_buffer_layers=
-add_influence_areas_layers=
-addBufferLayers_checkbox_TOOLTIP_HTML_explanation=
-Added_buffer_areas_to_TOC=
-Added_layer_with_influence_areas_to_TOC=
-addInfluenceAreasLayers_checkbox_TOOLTIP_HTML_explanation=
-Both=
-Buffer_cap=
-Buffer_information=
-Buffer_width=
-bufferWidth_TOOLTIP_HTML_explanation=
-configuration=
-Creating_layer_with_buffers=
-Creating_layer_with_influence_areas=
-Creating_temp_file=
-distanceUnitsLabel_TOOLTIP_HTML_explanation=
-Error=
-Error_fallo_geoproceso=Kosa wakati wa Kuchambua data/habari za zinazohusu dunia.
-Error_preparar_escritura_resultados=Kosa Wakati wa Kutayarisha Tabaka ya Matokeo
-extSelectionTools=
-Failed_canceling_the_current_task_of_creation_a_buffer_layer=
-failed_creating_the_temporal_layer=
-Failed_creating_the_temporal_layer=
-Failed_reloading_the_layer=
-Failed_selecting_geometries=
-Failed_selecting_geometries_by_circle_topology_exception_explanation=
-Failed_selecting_geometries_by_polyline_topology_exception_explanation=
-Failed_selecting_geometries_in_layer=
-Failed_selecting_layer=
-Failed_the_process=
-Information=
-Inside=
-Invalid_width=
-Layer_with_buffers_created=
-Layer_with_buffers_reprojected=
-Layer_with_influence_areas_created=
-Layer_with_influence_areas_reprojected=
-Layer_with_unsupported_geometries_type=
-Line=
-lineSideLabel_TOOLTIP_HTML_explanation=
-Multi_layer_selection_applied_for_influence_area=
-multiLayer_selection=
-multiLayerSelection_checkbox_TOOLTIP_HTML_explanation=
-MultiPoint=
-multiPointSideLabel_TOOLTIP_HTML_explanation=
-Ongoing_process_please_wait=
-Options=
-Outside=
-Outside_and_inside=
-Percent=
-Point=
-pointSideLabel_TOOLTIP_HTML_explanation=
-Polygon=
-polygonSideLabel_TOOLTIP_HTML_explanation=
-Process_canceled=
-Process_cancelled=
-Process_finished=
-Process_finished_wont_be_cancelled=
-Removed_layer_with_influence_areas_to_TOC=
-Round=
-Runtime_exception_refreshing_the_main_frame_by_a_Swing_thread=
-seleccion=Chaguzi
-select_all=Chagua Yote
-select_all_info=
-select_by_buffer=
-select_by_buffer_info=
-select_by_circle=
-select_by_circle_info=
-select_by_polyline=
-select_by_polyline_info=
-Selection_by_buffer_process=
-Selection_process_finished_succesfully=
-Selection_restored=
-Side=
-sideLabel_TOOLTIP_HTML_explanation=
-Starting_selection_of_layer=
-Starting_selection_process=
-Summary_of_the_process_of_selecting_by_buffer=
-There_are_no_geometries_selected=
-Tool_unavaliable_with_view_in_geographic_projection=
-Tools_Select=
-Undefined_layer=
-Unit=
-Vista=Angalia/kagua
-Warning=
-Width=
-Wont_select_geometries_on_the_layer_because_has_incompatible_projection=
Index: branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/text_el.properties
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/text_el.properties	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/text_el.properties	(revision 38564)
@@ -1,89 +0,0 @@
-#Translations for language [el]
-#Mon Sep 21 10:02:12 CEST 2009
-add_buffer_layers=
-add_influence_areas_layers=
-addBufferLayers_checkbox_TOOLTIP_HTML_explanation=
-Added_buffer_areas_to_TOC=
-Added_layer_with_influence_areas_to_TOC=
-addInfluenceAreasLayers_checkbox_TOOLTIP_HTML_explanation=
-Both=
-Buffer_cap=
-Buffer_information=
-Buffer_width=
-bufferWidth_TOOLTIP_HTML_explanation=
-configuration=
-Creating_layer_with_buffers=
-Creating_layer_with_influence_areas=
-Creating_temp_file=
-distanceUnitsLabel_TOOLTIP_HTML_explanation=
-Error=
-Error_fallo_geoproceso=\u03a3\u03c6\u03ac\u03bb\u03bc\u03b1 \u03ba\u03b1\u03c4\u03ac \u03c4\u03b7\u03bd \u03b5\u03ba\u03c4\u03ad\u03bb\u03b5\u03c3\u03b7 \u03c4\u03b7\u03c2 \u03b3\u03b5\u03c9\u03b4\u03b9\u03b5\u03c1\u03b3\u03b1\u03c3\u03af\u03b1\u03c2
-Error_preparar_escritura_resultados=\u03a3\u03c6\u03ac\u03bb\u03bc\u03b1 \u03ba\u03b1\u03c4\u03ac \u03c4\u03b7\u03bd \u03c0\u03c1\u03bf\u03b5\u03c4\u03bf\u03b9\u03bc\u03b1\u03c3\u03af\u03b1 \u03c4\u03bf\u03c5 \u03bd\u03ad\u03bf\u03c5 \u03b5\u03c0\u03b9\u03c0\u03ad\u03b4\u03bf\u03c5
-extSelectionTools=
-Failed_canceling_the_current_task_of_creation_a_buffer_layer=
-failed_creating_the_temporal_layer=
-Failed_creating_the_temporal_layer=
-Failed_reloading_the_layer=
-Failed_selecting_geometries=
-Failed_selecting_geometries_by_circle_topology_exception_explanation=
-Failed_selecting_geometries_by_polyline_topology_exception_explanation=
-Failed_selecting_geometries_in_layer=
-Failed_selecting_layer=
-Failed_the_process=
-Information=
-Inside=
-Invalid_width=
-Layer_with_buffers_created=
-Layer_with_buffers_reprojected=
-Layer_with_influence_areas_created=
-Layer_with_influence_areas_reprojected=
-Layer_with_unsupported_geometries_type=
-Line=
-lineSideLabel_TOOLTIP_HTML_explanation=
-Multi_layer_selection_applied_for_influence_area=
-multiLayer_selection=
-multiLayerSelection_checkbox_TOOLTIP_HTML_explanation=
-MultiPoint=
-multiPointSideLabel_TOOLTIP_HTML_explanation=
-Ongoing_process_please_wait=
-Options=
-Outside=
-Outside_and_inside=
-Percent=
-Point=
-pointSideLabel_TOOLTIP_HTML_explanation=
-Polygon=
-polygonSideLabel_TOOLTIP_HTML_explanation=
-Process_canceled=
-Process_cancelled=
-Process_finished=
-Process_finished_wont_be_cancelled=
-Removed_layer_with_influence_areas_to_TOC=
-Round=
-Runtime_exception_refreshing_the_main_frame_by_a_Swing_thread=
-seleccion=\u0395\u03c0\u03b9\u03bb\u03bf\u03b3\u03ae
-select_all=\u0395\u03c0\u03b9\u03bb\u03bf\u03b3\u03ae \u03cc\u03bb\u03c9\u03bd
-select_all_info=
-select_by_buffer=
-select_by_buffer_info=
-select_by_circle=
-select_by_circle_info=
-select_by_polyline=
-select_by_polyline_info=
-Selection_by_buffer_process=
-Selection_process_finished_succesfully=
-Selection_restored=
-Side=
-sideLabel_TOOLTIP_HTML_explanation=
-Starting_selection_of_layer=
-Starting_selection_process=
-Summary_of_the_process_of_selecting_by_buffer=
-There_are_no_geometries_selected=
-Tool_unavaliable_with_view_in_geographic_projection=
-Tools_Select=
-Undefined_layer=
-Unit=
-Vista=\u038c\u03c8\u03b7
-Warning=
-Width=
-Wont_select_geometries_on_the_layer_because_has_incompatible_projection=
Index: branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/text_gl.properties
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/text_gl.properties	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/text_gl.properties	(revision 38564)
@@ -1,89 +0,0 @@
-#Translations for language [gl]
-#Mon Sep 21 10:02:11 CEST 2009
-add_buffer_layers=
-add_influence_areas_layers=Agregar capas de \u00e1reas de influencia.
-addBufferLayers_checkbox_TOOLTIP_HTML_explanation=
-Added_buffer_areas_to_TOC=
-Added_layer_with_influence_areas_to_TOC=Agregada capa con \u00e1reas de influencia ao TOC.
-addInfluenceAreasLayers_checkbox_TOOLTIP_HTML_explanation=<html>Agrega as \u00e1reas de influencia de cada capa activa<br> como novas capas vectoriais.</html>
-Both=Ambos
-Buffer_cap=Cuberta do buffer
-Buffer_information=Informaci\u00f3n do buffer
-Buffer_width=Anchura do buffer
-bufferWidth_TOOLTIP_HTML_explanation=<html>Anchura do buffer.</html>
-configuration=configuraci\u00f3n
-Creating_layer_with_buffers=
-Creating_layer_with_influence_areas=Creando capa con \u00e1reas de influencia.
-Creating_temp_file=Creando arquivo temporal
-distanceUnitsLabel_TOOLTIP_HTML_explanation=<html>Unidade de distancia.</html>
-Error=Erro
-Error_fallo_geoproceso=Produc\u00eduse un erro durante a execuci\u00f3n do xeoproceso
-Error_preparar_escritura_resultados=Produc\u00eduse un erro ao preparar a capa de resultados
-extSelectionTools=Extensi\u00f3n Ferramentas de Selecci\u00f3n
-Failed_canceling_the_current_task_of_creation_a_buffer_layer=
-failed_creating_the_temporal_layer=Erro ao crear a capa temporal
-Failed_creating_the_temporal_layer=Erro ao crear a capa temporal.
-Failed_reloading_the_layer=
-Failed_selecting_geometries=Erro ao seleccionar xeometr\u00edas.
-Failed_selecting_geometries_by_circle_topology_exception_explanation=Erro ao seleccionar xeometr\u00edas na capa.\nO \u00e1rea circular de selecci\u00f3n intersecta con algunha xeometr\u00eda mal definida, deber\u00eda revisalas.
-Failed_selecting_geometries_by_polyline_topology_exception_explanation=Erro ao seleccionar xeometr\u00edas na capa.\nA polili\u00f1a intersecta con algunha xeometr\u00eda mal definida, deber\u00eda revisalas.
-Failed_selecting_geometries_in_layer=Erro ao seleccionar xeometr\u00edas na capa
-Failed_selecting_layer=Erro ao seleccionar a capa
-Failed_the_process=Erro no proceso.
-Information=Informaci\u00f3n
-Inside=Interior
-Invalid_width=Ancho non v\u00e1lido.
-Layer_with_buffers_created=
-Layer_with_buffers_reprojected=
-Layer_with_influence_areas_created=Capa con \u00e1reas de influencia creada.
-Layer_with_influence_areas_reprojected=Capa con \u00e1reas de influencia reproxectada.
-Layer_with_unsupported_geometries_type=Capa con tipo de xeometr\u00edas non soportadas.
-Line=Li\u00f1a
-lineSideLabel_TOOLTIP_HTML_explanation=<html>Xeometr\u00eda de tipo li\u00f1a.</html>
-Multi_layer_selection_applied_for_influence_area=Selecci\u00f3n multicapa aplicada para \u00e1rea de influencia.
-multiLayer_selection=Selecci\u00f3n multicapa.
-multiLayerSelection_checkbox_TOOLTIP_HTML_explanation=<html>A selecci\u00f3n de xeometr\u00edas afecta a todas as capas.</html>
-MultiPoint=Multipunto
-multiPointSideLabel_TOOLTIP_HTML_explanation=<html>Xeometr\u00edas de tipo multi punto.</html>
-Ongoing_process_please_wait=Proceso en marcha, por favor espere...
-Options=Opci\u00f3ns
-Outside=Exterior
-Outside_and_inside=Exterior e interior
-Percent=Porcentaxe
-Point=Punto
-pointSideLabel_TOOLTIP_HTML_explanation=<html>Xeometr\u00edas de tipo punto.</html>
-Polygon=Pol\u00edgono
-polygonSideLabel_TOOLTIP_HTML_explanation=<html>Xeometr\u00edas de tipo pol\u00edgono.</html>
-Process_canceled=Proceso cancelado.
-Process_cancelled=Proceso cancelado.
-Process_finished=Proceso rematado.
-Process_finished_wont_be_cancelled=O proceso rematou, non se cancelar\u00e1.
-Removed_layer_with_influence_areas_to_TOC=Eliminada capa con \u00e1reas de influencia da TOC.
-Round=Redondeado
-Runtime_exception_refreshing_the_main_frame_by_a_Swing_thread=Excepci\u00f3n en tempo de execuci\u00f3n refrescando o compo\u00f1ente principal dende un f\u00edo Swing
-seleccion=Selecci\u00f3n
-select_all=Seleccionar todo
-select_all_info=
-select_by_buffer=Seleccionar por \u00e1rea de influencia
-select_by_buffer_info=<html>Selecciona as xeometr\u00edas das capas<br>vectoriais activas na vista actual que<br>intersecten co buffer creado das<br>xeometr\u00edas seleccionadas antes.</html>
-select_by_circle=Seleccionar por c\u00edrculo
-select_by_circle_info=<html>Selecciona as xeometr\u00edas das capas<br> vectoriais activas na vista actual que<br> intersecta co c\u00edrculo seleccionado.</html>
-select_by_polyline=Seleccionar por polili\u00f1a
-select_by_polyline_info=<html>Selecciona as xeometr\u00edas das capas<br> vectoriais activas na vista actual que<br> intersectan coa polili\u00f1a seleccionada.</html>
-Selection_by_buffer_process=Proceso de selecci\u00f3n por \u00e1rea de influencia
-Selection_process_finished_succesfully=Proceso de selecci\u00f3n rematado de xeito satisfactorio.
-Selection_restored=Selecci\u00f3n restaurada.
-Side=Senso
-sideLabel_TOOLTIP_HTML_explanation=<html>Indique o sentido que seleccionar\u00e1 o buffer segundo<br> o tipo de capa.</html>
-Starting_selection_of_layer=A iniciar selecci\u00f3n de capa
-Starting_selection_process=A iniciar proceso de selecci\u00f3n.
-Summary_of_the_process_of_selecting_by_buffer=Resumo do proceso de selecci\u00f3n por buffer
-There_are_no_geometries_selected=Non hai xeometr\u00edas seleccionadas.
-Tool_unavaliable_with_view_in_geographic_projection=Ferramenta non dispo\u00f1ible en vistas con proxecci\u00f3ns xeogr\u00e1ficas.
-Tools_Select=Selecci\u00f3n de ferramentas
-Undefined_layer=
-Unit=Unidade
-Vista=Vista
-Warning=Aviso
-Width=Anchura
-Wont_select_geometries_on_the_layer_because_has_incompatible_projection=Non seleccionar\u00e1 xeometr\u00edas na capa porque ten proxecci\u00f3n incompatible.
Index: branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/text_en.properties
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/text_en.properties	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/text_en.properties	(revision 38564)
@@ -1,92 +0,0 @@
-#Translations for language [en]
-#Mon Sep 21 10:02:11 CEST 2009
-add_buffer_layers=Add buffer layers
-add_influence_areas_layers=Add buffer zone layers
-addBufferLayers_checkbox_TOOLTIP_HTML_explanation=
-Added_buffer_areas_to_TOC=
-Added_layer_with_influence_areas_to_TOC=Added layer with buffer zones to TOC.
-addInfluenceAreasLayers_checkbox_TOOLTIP_HTML_explanation=<html>Add buffer zones for each active layer<br> as new vector layers</html>
-Both=Both
-Buffer_cap=Buffer cap
-Buffer_information=Buffer information
-Buffer_width=Buffer width
-bufferWidth_TOOLTIP_HTML_explanation=<html>Buffer width</html>
-configuration=Configuration
-Creating_layer_with_buffers=
-Creating_layer_with_influence_areas=Creating layer with areas of influence...
-Creating_temp_file=Creating temporary file...
-distanceUnitsLabel_TOOLTIP_HTML_explanation=<html>Distance measurement unit</html>
-Error=Error
-Error_fallo_geoproceso=Error during geoprocess execution
-Error_preparar_escritura_resultados=Error during preparation of result layer
-extSelectionTools=Selection Tools Extension
-Failed_canceling_the_current_task_of_creation_a_buffer_layer=
-failed_creating_geometry=Failed to create geometry..
-failed_creating_the_temporal_layer=Failed to create temporary layer.
-Failed_creating_the_temporal_layer=Failed to create temporary layer.
-Failed_performing_the_operation=Failed performing the operation
-Failed_reloading_the_layer=
-Failed_selecting_geometries=Failed to select geometries.
-Failed_selecting_geometries_by_circle_topology_exception_explanation=Failed to select geometries in layer.\nThe circular selection area intersects some faulty geometries. Please revise input data.
-Failed_selecting_geometries_by_polyline_topology_exception_explanation=Failed to select geometries in layer.\nThe polygonal selection area intersects some faulty geometries. Please revise input data.
-Failed_selecting_geometries_in_layer=Failed to select geometries from layer.
-Failed_selecting_layer=Failed to select layer.
-Failed_the_process=The process failed
-Information=Information
-Inside=Inside
-Invalid_width=Invalid width.
-Layer_with_buffers_created=
-Layer_with_buffers_reprojected=
-Layer_with_influence_areas_created=Created layer with areas of influence.
-Layer_with_influence_areas_reprojected=Created layer with reprojected areas of influence.
-Layer_with_unsupported_geometries_type=Layer geometry type not supported.
-Line=Line
-lineSideLabel_TOOLTIP_HTML_explanation=<html>Geometries of type "line"</html>
-Multi_layer_selection_applied_for_influence_area=Multi-layer selection applied to buffer zones.
-multiLayer_selection=Multi-layer selection
-multiLayerSelection_checkbox_TOOLTIP_HTML_explanation=<html>Select features from all layers</html>
-MultiPoint=Multipoint
-multiPointSideLabel_TOOLTIP_HTML_explanation=<html>Geometries of type "multipoint"</html>
-Ongoing_process_please_wait=Ongoing process, please wait...
-Operation_not_supported=Operation not supported
-Options=Options
-Outside=Outside
-Outside_and_inside=Outside and inside
-Percent=Percent
-Point=Point
-pointSideLabel_TOOLTIP_HTML_explanation=<html>Geometries of type "point"</html>
-Polygon=Polygon
-polygonSideLabel_TOOLTIP_HTML_explanation=<html>Geometries of type "polygon"</html>
-Process_canceled=Process canceled
-Process_cancelled=Process cancelled.
-Process_finished=Process finished
-Process_finished_wont_be_cancelled=Process has already finished. Will not be cancelled.
-Removed_layer_with_influence_areas_to_TOC=Removed layer with buffer zones from TOC.
-Round=Rounded
-Runtime_exception_refreshing_the_main_frame_by_a_Swing_thread=Program exception (fatal error) encountered while calling Java Swing thread to refresh main user interface frame.
-seleccion=Selection
-select_all=Select all
-select_all_info=
-select_by_buffer=Select by buffer zone
-select_by_buffer_info=<html>Select those features from the view's<br> active vector layers that intersect<br> with a buffer zone created<b> around previously selected features.</html>
-select_by_circle=Select by circle
-select_by_circle_info=<html>Select those features from the view's<br> active vector layers that intersect<br> with a user-defined circle.</html>
-select_by_polyline=Select by polyline
-select_by_polyline_info=<html>Select those features from the view's<br> active vector layers that intersect<br> with a user-defined polyline.</html>
-Selection_by_buffer_process=Buffer zone selection tool
-Selection_process_finished_succesfully=Selection process finished successfully.
-Selection_restored=Selection restored.
-Side=Side
-sideLabel_TOOLTIP_HTML_explanation=<html>Choose the mode for buffer zone selection depending on layer type</html>
-Starting_selection_of_layer=Initializing layer selection...
-Starting_selection_process=Initializing selection process...
-Summary_of_the_process_of_selecting_by_buffer=Summary of "selection by buffer zone" process
-There_are_no_geometries_selected=There are no selected geometries.
-Tool_unavaliable_with_view_in_geographic_projection=This tool is not available for views using geographic (lat/long) projection systems.
-Tools_Select=Tools select
-Undefined_layer=
-Unit=Unit
-Vista=View
-Warning=Warning
-Width=Width
-Wont_select_geometries_on_the_layer_because_has_incompatible_projection=Incompatible projection. Failed to select geometries from layer.
Index: branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/about.htm
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/about.htm	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/about.htm	(revision 38564)
@@ -1,29 +0,0 @@
-<html>
-  <head>
-    <title>Herramientas Selecci&oacute;n. Proyecto Junta de Castilla y Le&oacute;n.</title>
-    <meta content="">
-<style type="text/css">
-body {
-	background-color: #7e7e7e;
-	background-image: url(images/about.jpg);
-	background-position: top center;
-	background-repeat:no-repeat;
-}
-
-html, body, h1, h2, h3, h4, div, p, ul, li, input {
-   font-family: Arial, Helvetica, sans-serif;
-}
-
-p, h1, h2, h3 {
-  text-align: center;
-}
-
-</style>
-  </head>
-  <body>
-  <br><br><br><br><br><br><br><br><br><br><br><br>
-  <p>Version: 0.1
-  <br>Build Number: #build.number#</p>
-  <p><br><br><br><a href="http://www.iver.es/">http://www.iver.es/</a></p>
-  </body>
-</html>
\ No newline at end of file
Index: branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/jcyl.html
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/jcyl.html	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/jcyl.html	(revision 38564)
@@ -1,12 +0,0 @@
-<html>
-<body>
-
-<img src="jcyl.png"><br>
-
-<h2>Junta de Castilla y Le�n</h2>
-<br>
-
-<p>EN CONSTRUCCION</p>
-
-</body>
-</html>
\ No newline at end of file
Index: branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/text_cs.properties
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/text_cs.properties	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/text_cs.properties	(revision 38564)
@@ -1,89 +0,0 @@
-#Translations for language [cs]
-#Mon Sep 21 10:02:11 CEST 2009
-add_buffer_layers=
-add_influence_areas_layers=
-addBufferLayers_checkbox_TOOLTIP_HTML_explanation=
-Added_buffer_areas_to_TOC=
-Added_layer_with_influence_areas_to_TOC=
-addInfluenceAreasLayers_checkbox_TOOLTIP_HTML_explanation=
-Both=
-Buffer_cap=
-Buffer_information=
-Buffer_width=
-bufferWidth_TOOLTIP_HTML_explanation=
-configuration=
-Creating_layer_with_buffers=
-Creating_layer_with_influence_areas=
-Creating_temp_file=
-distanceUnitsLabel_TOOLTIP_HTML_explanation=
-Error=
-Error_fallo_geoproceso=Chyba b\u011bhem vykon\u00e1v\u00e1n\u00ed funkce
-Error_preparar_escritura_resultados=Chyba b\u011bhem p\u0159\u00edpravy v\u00fdsledn\u00e9 vrstvy 
-extSelectionTools=
-Failed_canceling_the_current_task_of_creation_a_buffer_layer=
-failed_creating_the_temporal_layer=
-Failed_creating_the_temporal_layer=
-Failed_reloading_the_layer=
-Failed_selecting_geometries=
-Failed_selecting_geometries_by_circle_topology_exception_explanation=
-Failed_selecting_geometries_by_polyline_topology_exception_explanation=
-Failed_selecting_geometries_in_layer=
-Failed_selecting_layer=
-Failed_the_process=
-Information=
-Inside=
-Invalid_width=
-Layer_with_buffers_created=
-Layer_with_buffers_reprojected=
-Layer_with_influence_areas_created=
-Layer_with_influence_areas_reprojected=
-Layer_with_unsupported_geometries_type=
-Line=
-lineSideLabel_TOOLTIP_HTML_explanation=
-Multi_layer_selection_applied_for_influence_area=
-multiLayer_selection=
-multiLayerSelection_checkbox_TOOLTIP_HTML_explanation=
-MultiPoint=
-multiPointSideLabel_TOOLTIP_HTML_explanation=
-Ongoing_process_please_wait=
-Options=
-Outside=
-Outside_and_inside=
-Percent=
-Point=
-pointSideLabel_TOOLTIP_HTML_explanation=
-Polygon=
-polygonSideLabel_TOOLTIP_HTML_explanation=
-Process_canceled=
-Process_cancelled=
-Process_finished=
-Process_finished_wont_be_cancelled=
-Removed_layer_with_influence_areas_to_TOC=
-Round=
-Runtime_exception_refreshing_the_main_frame_by_a_Swing_thread=
-seleccion=V\u00fdb\u011br
-select_all=Vyber v\u0161e
-select_all_info=
-select_by_buffer=
-select_by_buffer_info=
-select_by_circle=
-select_by_circle_info=
-select_by_polyline=
-select_by_polyline_info=
-Selection_by_buffer_process=
-Selection_process_finished_succesfully=
-Selection_restored=
-Side=
-sideLabel_TOOLTIP_HTML_explanation=
-Starting_selection_of_layer=
-Starting_selection_process=
-Summary_of_the_process_of_selecting_by_buffer=
-There_are_no_geometries_selected=
-Tool_unavaliable_with_view_in_geographic_projection=
-Tools_Select=
-Undefined_layer=
-Unit=
-Vista=Pohled
-Warning=
-Width=
-Wont_select_geometries_on_the_layer_because_has_incompatible_projection=
Index: branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/text_pt_BR.properties
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/text_pt_BR.properties	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/text_pt_BR.properties	(revision 38564)
@@ -1,89 +0,0 @@
-#Translations for language [pt_BR]
-#Mon Sep 21 10:02:12 CEST 2009
-add_buffer_layers=Adicionar buffer no plano de informa\u00e7\u00e3o
-add_influence_areas_layers=Adicionar plano de informa\u00e7\u00e3o da \u00e1rea de influ\u00eancia
-addBufferLayers_checkbox_TOOLTIP_HTML_explanation=
-Added_buffer_areas_to_TOC=
-Added_layer_with_influence_areas_to_TOC=Adicionado plano de informa\u00e7\u00e3o com \u00e1reas de influ\u00eancia TOC
-addInfluenceAreasLayers_checkbox_TOOLTIP_HTML_explanation=<html>Adicione as \u00e1reas de influ\u00eancia de cada plano de informa\u00e7\u00e3o ativo<br>como novo plano de informa\u00e7\u00e3o vetorial.<html>
-Both=Ambos
-Buffer_cap=Sobrescrever \u00e1rea de influ\u00eancia
-Buffer_information=Informa\u00e7\u00f5es da \u00e1rea de influ\u00eancia
-Buffer_width=Largura da \u00e1rea de influ\u00eancia
-bufferWidth_TOOLTIP_HTML_explanation=<html>Largura da \u00e1rea de influ\u00eancia.</html>
-configuration=configura\u00e7\u00e3o
-Creating_layer_with_buffers=
-Creating_layer_with_influence_areas=Criando plano de informa\u00e7\u00e3o com \u00e1reas de influ\u00eancia.
-Creating_temp_file=Criando arquivo tempor\u00e1rio
-distanceUnitsLabel_TOOLTIP_HTML_explanation=<html> Unidade de dist\u00e2ncia. </html>
-Error=Erro
-Error_fallo_geoproceso=Falha ao executar o geoprocesso.
-Error_preparar_escritura_resultados=Erro ao gerar o arquivo de resultados.
-extSelectionTools=Extens\u00e3o Ferramentas de Sele\u00e7\u00e3o
-Failed_canceling_the_current_task_of_creation_a_buffer_layer=
-failed_creating_the_temporal_layer=Falha criando plano de informa\u00e7\u00e3o temporaria.
-Failed_creating_the_temporal_layer=Falha criando plano de informa\u00e7\u00e3o temporario.
-Failed_reloading_the_layer=
-Failed_selecting_geometries=Falha selecionando geometrias.
-Failed_selecting_geometries_by_circle_topology_exception_explanation=Falha selecionando geometrias do plano de informa\u00e7\u00e3o.\nA \u00e1rea circular de sele\u00e7\u00e3o intersecta com alguma geometria mal definida, revise novamente.
-Failed_selecting_geometries_by_polyline_topology_exception_explanation=Falha selecionando geometria do plano de informa\u00e7\u00e3o.\nA polilinha intersecta com alguma geometria mal definida, revise novamente.
-Failed_selecting_geometries_in_layer=Falha selecionando geometria no plano de informa\u00e7\u00e3o.
-Failed_selecting_layer=Falha selecionando plano de informa\u00e7\u00e3o.
-Failed_the_process=Falha no processo.
-Information=Informa\u00e7\u00e3o
-Inside=Interior
-Invalid_width=Largura inv\u00e1lida
-Layer_with_buffers_created=
-Layer_with_buffers_reprojected=
-Layer_with_influence_areas_created=plano de Informa\u00e7\u00e3o com \u00e1rea de influ\u00eancia criada.
-Layer_with_influence_areas_reprojected=Plano de Informa\u00e7\u00e3o com \u00e1rea de influ\u00eancia reprojetada.
-Layer_with_unsupported_geometries_type=Plano de Informa\u00e7\u00e3o com tipo de geometrias n\u00e3o suportadas.
-Line=Linha
-lineSideLabel_TOOLTIP_HTML_explanation=<html> Geometria de tipo de linha. </html>
-Multi_layer_selection_applied_for_influence_area=Sele\u00e7\u00e3o multi-plano de informa\u00e7\u00e3o aplicado para \u00e1rea de influ\u00eancia.
-multiLayer_selection=Sele\u00e7\u00e3o multi-plano de informa\u00e7\u00e3o
-multiLayerSelection_checkbox_TOOLTIP_HTML_explanation=<html>A sele\u00e7\u00e3o da geometria afeta todos os planos de informa\u00e7\u00e3o.</html>
-MultiPoint=Multiponto
-multiPointSideLabel_TOOLTIP_HTML_explanation=<html>Geometr\u00eda do tipo multi-ponto.</html>
-Ongoing_process_please_wait=Processo em andamento, aguarde...
-Options=Op\u00e7\u00f5es
-Outside=Exterior
-Outside_and_inside=Exterior e interior
-Percent=Porcentagem
-Point=Ponto
-pointSideLabel_TOOLTIP_HTML_explanation=<html>Geometr\u00eda do tipo pontual.</html>
-Polygon=Pol\u00edgono
-polygonSideLabel_TOOLTIP_HTML_explanation=<html>Geometrias do tipo pol\u00edgono.</html>
-Process_canceled=Processo cancelado.
-Process_cancelled=Processo cancelado.
-Process_finished=Processo finalizado.
-Process_finished_wont_be_cancelled=O processo finalizou, n\u00e3o ser\u00e1 cancelado.
-Removed_layer_with_influence_areas_to_TOC=Apagado plano de informa\u00e7\u00e3o com \u00e1rea de influ\u00eancia do TOC.
-Round=Arredondado
-Runtime_exception_refreshing_the_main_frame_by_a_Swing_thread=Exce\u00e7\u00e3o em tempo de execu\u00e7\u00e3o a partir do arrefecimento prim\u00e1rio Swing
-seleccion=Sele\u00e7\u00e3o
-select_all=Selecionar tudo
-select_all_info=
-select_by_buffer=Selecionar por \u00e1rea de influ\u00eancia
-select_by_buffer_info=<html>Selecionar as geometr\u00edas do plano de informa\u00e7\u00e3o<br> vetoriais ativas no bloco atual que<br> intersectem com a \u00e1rea de influ\u00eancia das<br> geometr\u00edas anteriores selecionadas.</html>
-select_by_circle=Selecionar por c\u00edrculo
-select_by_circle_info=<html>Selecionar as geometr\u00edas dos planos de informa\u00e7\u00e3o<br> vetores ativos no bloco atual que<br> intersectam com o circulo selecionado. </html>
-select_by_polyline=Selecioanr por polilinha
-select_by_polyline_info=<html>Selecioanr as geometr\u00edas dos planos de informa\u00e7\u00e3o<br> vetoriais ativos no bloco atual que<br> intersectam com as polil\u00ednhas selecionadas. </html>
-Selection_by_buffer_process=Processo de sele\u00e7\u00e3o por \u00e1rea de influ\u00eancia
-Selection_process_finished_succesfully=Processo de sele\u00e7\u00e3o finalizado com sucesso.
-Selection_restored=Sele\u00e7\u00e3o restaurada.
-Side=Sentido
-sideLabel_TOOLTIP_HTML_explanation=<html> Indique o sentido que selecionar\u00e1 a \u00e1rea de influ\u00eancia segundo<br> o tipo de plano de informa\u00e7\u00e3o.</html>
-Starting_selection_of_layer=Iniciando se\u00e7\u00e3o do bloco
-Starting_selection_process=Iniciando processo de sele\u00e7\u00e3o.
-Summary_of_the_process_of_selecting_by_buffer=Resumo do processo de sele\u00e7\u00e3o por \u00e1rea de influ\u00eancia.
-There_are_no_geometries_selected=N\u00e3o existem geometrias selecionadas...
-Tool_unavaliable_with_view_in_geographic_projection=Ferramenta n\u00e3o dispon\u00edvel no bloco com proje\u00e7\u00f5es geogr\u00e1ficas.
-Tools_Select=Sele\u00e7\u00e3o de ferramentas
-Undefined_layer=
-Unit=Unidade
-Vista=Bloco
-Warning=Aviso
-Width=Largura
-Wont_select_geometries_on_the_layer_because_has_incompatible_projection=N\u00e3o ser\u00e1 selecionada a geometria do plano de informa\u00e7\u00e3o porque tem proje\u00e7\u00e3o incompat\u00edvel.
Index: branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/text_fr.properties
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/text_fr.properties	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/text_fr.properties	(revision 38564)
@@ -1,89 +0,0 @@
-#Translations for language [fr]
-#Mon Sep 21 10:02:12 CEST 2009
-add_buffer_layers=Ajouter les couches zones tampon
-add_influence_areas_layers=Ajouter couches zones tampon
-addBufferLayers_checkbox_TOOLTIP_HTML_explanation=
-Added_buffer_areas_to_TOC=
-Added_layer_with_influence_areas_to_TOC=Ajouter couche zones tampon dans la TDM.
-addInfluenceAreasLayers_checkbox_TOOLTIP_HTML_explanation=<html>Ajoute les zones tampon de chaque couche active<br> comme nouvelles couches vectorielles</html>
-Both=Les deux
-Buffer_cap=Couverture du tampon
-Buffer_information=Information du tampon
-Buffer_width=Largeur du tampon
-bufferWidth_TOOLTIP_HTML_explanation=<html>Largeur du tampon</html>
-configuration=configuration
-Creating_layer_with_buffers=
-Creating_layer_with_influence_areas=Cr\u00e9ation de couche avec zones d'influence
-Creating_temp_file=Cr\u00e9ation d'un fichier temporaire
-distanceUnitsLabel_TOOLTIP_HTML_explanation=<html>Unit\u00e9s de distance</html>
-Error=Erreur
-Error_fallo_geoproceso=Erreur lors du g\u00e9otraitement.
-Error_preparar_escritura_resultados=Erreur lors de l'\u00e9criture des donn\u00e9es.
-extSelectionTools=Outils de s\u00e9lection
-Failed_canceling_the_current_task_of_creation_a_buffer_layer=
-failed_creating_the_temporal_layer=Echec lors de la cr\u00e9ation de la couche temporaire.
-Failed_creating_the_temporal_layer=Echec lors de la cr\u00e9ation de la couche temporaire.
-Failed_reloading_the_layer=
-Failed_selecting_geometries=Echec lors de la s\u00e9lection des entit\u00e9s.
-Failed_selecting_geometries_by_circle_topology_exception_explanation=Echec lors de la s\u00e9lection des entit\u00e9s.\nLa s\u00e9lection par cercle intersecte avec des entit\u00e9s d\u00e9fectueuses. Veuillez v\u00e9rifier les donn\u00e9es d'entr\u00e9e.
-Failed_selecting_geometries_by_polyline_topology_exception_explanation=Echec lors de la s\u00e9lection des entit\u00e9s.\nLa s\u00e9lection par polygone intersecte avec des entit\u00e9s d\u00e9fectueuses. Veuillez v\u00e9rifier les donn\u00e9es d'entr\u00e9e.
-Failed_selecting_geometries_in_layer=Echec lors de la s\u00e9lection des entit\u00e9s de la couche.
-Failed_selecting_layer=Echec lors de la s\u00e9lection de la couche.
-Failed_the_process=Le traitement a \u00e9chou\u00e9.
-Information=Information
-Inside=Int\u00e9rieur
-Invalid_width=Largeur non valide
-Layer_with_buffers_created=
-Layer_with_buffers_reprojected=
-Layer_with_influence_areas_created=Couche avec zones d'influence cr\u00e9\u00e9e.
-Layer_with_influence_areas_reprojected=Couche avec zones d'influence reprojet\u00e9es cr\u00e9\u00e9e.
-Layer_with_unsupported_geometries_type=Couche d'entit\u00e9s de type non support\u00e9.
-Line=Ligne
-lineSideLabel_TOOLTIP_HTML_explanation=<html>G\u00e9om\u00e9tries de type lignes.</html>
-Multi_layer_selection_applied_for_influence_area=S\u00e9lection multi-couches appliqu\u00e9e aux zones tampons.
-multiLayer_selection=S\u00e9lection multi couches.
-multiLayerSelection_checkbox_TOOLTIP_HTML_explanation=<html>La s\u00e9lection des entit\u00e9s affectera l'ensemble des couches.</html>
-MultiPoint=Multipoint
-multiPointSideLabel_TOOLTIP_HTML_explanation=<html>G\u00e9om\u00e9tries de type multi points.</html>
-Ongoing_process_please_wait=traitement en cours d'ex\u00e9cution, veuillez patienter...
-Options=Options
-Outside=Ext\u00e9rieur
-Outside_and_inside=Ext\u00e9rieur et int\u00e9rieur
-Percent=Pourcentage
-Point=Point
-pointSideLabel_TOOLTIP_HTML_explanation=<html>G\u00e9om\u00e9tries de type point.</html>
-Polygon=Polygone
-polygonSideLabel_TOOLTIP_HTML_explanation=<html>G\u00e9om\u00e9trie de type polygones.</html>
-Process_canceled=Traitement annul\u00e9
-Process_cancelled=Traitement annul\u00e9
-Process_finished=Traitement termin\u00e9
-Process_finished_wont_be_cancelled=Le traitement est termin\u00e9 et ne peut \u00eatre annul\u00e9
-Removed_layer_with_influence_areas_to_TOC=Supprimer couche zones tampon de la TDM.
-Round=Arrondi
-Runtime_exception_refreshing_the_main_frame_by_a_Swing_thread=Une exception (erreur fatale)  a \u00e9t\u00e9 rencontr\u00e9e lors de l'appel  de Java Swing pour rafra\u00eechir l'interface utilisateur.
-seleccion=S\u00e9lection
-select_all=Tout s\u00e9lectionner
-select_all_info=
-select_by_buffer=S\u00e9lection par zone tampon
-select_by_buffer_info=<html>S\u00e9lectionne les entit\u00e9s g\u00e9om\u00e9triques des couches<br>vectorielles actives de la vue qui<br> intersecte avec la zone tampon d\u00e9finie par l'utilisateur.</html>
-select_by_circle=S\u00e9lectionner par cercle
-select_by_circle_info=<html>S\u00e9lectionne les entit\u00e9s g\u00e9om\u00e9triques des couches<br>vectorielles actives de la vue qui<br> intersecte avec le cercle d\u00e9fini par l'utilisateur.</html>
-select_by_polyline=S\u00e9lection par polyligne
-select_by_polyline_info=<html>S\u00e9lectionne les entit\u00e9s g\u00e9om\u00e9triques des couches<br>vectorielles actives de la vue qui<br> intersecte avec la polyligne d\u00e9finie par l'utilisateur.</html>
-Selection_by_buffer_process=S\u00e9lection par zone tampon
-Selection_process_finished_succesfully=La s\u00e9lection s'est termin\u00e9e avec succ\u00e8s.
-Selection_restored=S\u00e9lection restaur\u00e9e.
-Side=Limites
-sideLabel_TOOLTIP_HTML_explanation=<html>Indique le mode de s\u00e9lection de zone tampon suivant le type de couche</html>
-Starting_selection_of_layer=D\u00e9marrer s\u00e9lection de couche
-Starting_selection_process=D\u00e9marrer traitement de s\u00e9lection
-Summary_of_the_process_of_selecting_by_buffer=R\u00e9capitulatif
-There_are_no_geometries_selected=Pas de g\u00e9om\u00e9tries s\u00e9lectionn\u00e9es
-Tool_unavaliable_with_view_in_geographic_projection=Outil non disponible avec une vue en projection g\u00e9ographiques.
-Tools_Select=S\u00e9lection d'outils
-Undefined_layer=
-Unit=Unit\u00e9
-Vista=Vue
-Warning=Attention
-Width=Largeur
-Wont_select_geometries_on_the_layer_because_has_incompatible_projection=Echec lors de la s\u00e9lection d'entit\u00e9s dans la couche, la projection n'est pas compatible.
Index: branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/text_nl.properties
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/text_nl.properties	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/text_nl.properties	(revision 38564)
@@ -1,89 +0,0 @@
-#Translations for language [nl]
-#Tue Aug 11 10:49:15 CEST 2009
-add_buffer_layers=
-add_influence_areas_layers=
-addBufferLayers_checkbox_TOOLTIP_HTML_explanation=
-Added_buffer_areas_to_TOC=
-Added_layer_with_influence_areas_to_TOC=
-addInfluenceAreasLayers_checkbox_TOOLTIP_HTML_explanation=
-Both=
-Buffer_cap=
-Buffer_information=
-Buffer_width=
-bufferWidth_TOOLTIP_HTML_explanation=
-configuration=
-Creating_layer_with_buffers=
-Creating_layer_with_influence_areas=
-Creating_temp_file=
-distanceUnitsLabel_TOOLTIP_HTML_explanation=
-Error=
-Error_fallo_geoproceso=
-Error_preparar_escritura_resultados=
-extSelectionTools=
-Failed_canceling_the_current_task_of_creation_a_buffer_layer=
-failed_creating_the_temporal_layer=
-Failed_creating_the_temporal_layer=
-Failed_reloading_the_layer=
-Failed_selecting_geometries=
-Failed_selecting_geometries_by_circle_topology_exception_explanation=
-Failed_selecting_geometries_by_polyline_topology_exception_explanation=
-Failed_selecting_geometries_in_layer=
-Failed_selecting_layer=
-Failed_the_process=
-Information=
-Inside=
-Invalid_width=
-Layer_with_buffers_created=
-Layer_with_buffers_reprojected=
-Layer_with_influence_areas_created=
-Layer_with_influence_areas_reprojected=
-Layer_with_unsupported_geometries_type=
-Line=
-lineSideLabel_TOOLTIP_HTML_explanation=
-Multi_layer_selection_applied_for_influence_area=
-multiLayer_selection=
-multiLayerSelection_checkbox_TOOLTIP_HTML_explanation=
-MultiPoint=
-multiPointSideLabel_TOOLTIP_HTML_explanation=
-Ongoing_process_please_wait=
-Options=
-Outside=
-Outside_and_inside=
-Percent=
-Point=
-pointSideLabel_TOOLTIP_HTML_explanation=
-Polygon=
-polygonSideLabel_TOOLTIP_HTML_explanation=
-Process_canceled=
-Process_cancelled=
-Process_finished=
-Process_finished_wont_be_cancelled=
-Removed_layer_with_influence_areas_to_TOC=
-Round=
-Runtime_exception_refreshing_the_main_frame_by_a_Swing_thread=
-seleccion=
-select_all=
-select_all_info=
-select_by_buffer=
-select_by_buffer_info=
-select_by_circle=
-select_by_circle_info=
-select_by_polyline=
-select_by_polyline_info=
-Selection_by_buffer_process=
-Selection_process_finished_succesfully=
-Selection_restored=
-Side=
-sideLabel_TOOLTIP_HTML_explanation=
-Starting_selection_of_layer=
-Starting_selection_process=
-Summary_of_the_process_of_selecting_by_buffer=
-There_are_no_geometries_selected=
-Tool_unavaliable_with_view_in_geographic_projection=
-Tools_Select=
-Undefined_layer=
-Unit=
-Vista=
-Warning=
-Width=
-Wont_select_geometries_on_the_layer_because_has_incompatible_projection=
Index: branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/iver.html
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/iver.html	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/iver.html	(revision 38564)
@@ -1,12 +0,0 @@
-<html>
-<body>
-
-<img src="iver-logo.png"><br>
-
-<h2>IVER</h2>
-<br>
-
-<p>EN CONSTRUCCION</p>
-
-</body>
-</html>
\ No newline at end of file
Index: branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/text_en_US.properties
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/text_en_US.properties	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/text_en_US.properties	(revision 38564)
@@ -1,89 +0,0 @@
-#Translations for language [en_US]
-#Mon Sep 21 10:02:11 CEST 2009
-add_buffer_layers=Add buffer layers
-add_influence_areas_layers=Add buffer zone layers
-addBufferLayers_checkbox_TOOLTIP_HTML_explanation=
-Added_buffer_areas_to_TOC=
-Added_layer_with_influence_areas_to_TOC=Added layer with buffer zones to TOC.
-addInfluenceAreasLayers_checkbox_TOOLTIP_HTML_explanation=<html>Add buffer zones for each active layer<br> as new vector layers</html>
-Both=Both
-Buffer_cap=Buffer cap
-Buffer_information=Buffer information
-Buffer_width=Buffer width
-bufferWidth_TOOLTIP_HTML_explanation=<html>Buffer width</html>
-configuration=Configuration
-Creating_layer_with_buffers=
-Creating_layer_with_influence_areas=Creating layer with areas of influence...
-Creating_temp_file=Creating temporary file...
-distanceUnitsLabel_TOOLTIP_HTML_explanation=<html>Distance measurement unit</html>
-Error=Error
-Error_fallo_geoproceso=Failed to execute geoprocessing tool.
-Error_preparar_escritura_resultados=Error generating results layer
-extSelectionTools=Selection Tools Extension
-Failed_canceling_the_current_task_of_creation_a_buffer_layer=
-failed_creating_the_temporal_layer=Failed to create temporary layer.
-Failed_creating_the_temporal_layer=Failed to create temporary layer.
-Failed_reloading_the_layer=
-Failed_selecting_geometries=Failed to select geometries.
-Failed_selecting_geometries_by_circle_topology_exception_explanation=Failed to select geometries in layer.\nThe circular selection area intersects some faulty geometries. Please revise input data.
-Failed_selecting_geometries_by_polyline_topology_exception_explanation=Failed to select geometries in layer.\nThe polygonal selection area intersects some faulty geometries. Please revise input data.
-Failed_selecting_geometries_in_layer=Failed to select geometries from layer.
-Failed_selecting_layer=Failed to select layer.
-Failed_the_process=The process failed.
-Information=Information
-Inside=Inside
-Invalid_width=Invalid width.
-Layer_with_buffers_created=
-Layer_with_buffers_reprojected=
-Layer_with_influence_areas_created=Created layer with areas of influence.
-Layer_with_influence_areas_reprojected=Created layer with reprojected areas of influence.
-Layer_with_unsupported_geometries_type=Layer geometry type not supported.
-Line=Line
-lineSideLabel_TOOLTIP_HTML_explanation=<html>Geometries of type "line"</html>
-Multi_layer_selection_applied_for_influence_area=Multi-layer selection applied to buffer zones.
-multiLayer_selection=Multi-layer selection
-multiLayerSelection_checkbox_TOOLTIP_HTML_explanation=<html>Select features from all layers</html>
-MultiPoint=Multipoint
-multiPointSideLabel_TOOLTIP_HTML_explanation=<html>Geometries of type "multipoint"</html>
-Ongoing_process_please_wait=Computation in progress. Please be patient...
-Options=Options
-Outside=Outside
-Outside_and_inside=Outside and inside
-Percent=Percent
-Point=Point
-pointSideLabel_TOOLTIP_HTML_explanation=<html>Geometries of type "point"</html>
-Polygon=Polygon
-polygonSideLabel_TOOLTIP_HTML_explanation=<html>Geometries of type "polygon"</html>
-Process_canceled=Process canceled.
-Process_cancelled=Process canceled.
-Process_finished=Process finished.
-Process_finished_wont_be_cancelled=Process has already finished. Will not be canceled.
-Removed_layer_with_influence_areas_to_TOC=Removed layer with buffer zones from TOC.
-Round=Rounded
-Runtime_exception_refreshing_the_main_frame_by_a_Swing_thread=Program exception (fatal error) encountered while calling Java Swing thread to refresh main user interface frame.
-seleccion=Selection
-select_all=Select all
-select_all_info=
-select_by_buffer=Select by buffer zone
-select_by_buffer_info=<html>Select those features from the view's<br> active vector layers that intersect<br> with a buffer zone created<b> around previously selected features.</html>
-select_by_circle=Select by circle
-select_by_circle_info=<html>Select those features from the view's<br> active vector layers that intersect<br> with a user-defined circle.</html>
-select_by_polyline=Select by polyline
-select_by_polyline_info=<html>Select those features from the view's<br> active vector layers that intersect<br> with a user-defined polyline.</html>
-Selection_by_buffer_process=Buffer zone selection tool
-Selection_process_finished_succesfully=Selection process finished successfully.
-Selection_restored=Selection restored.
-Side=Side
-sideLabel_TOOLTIP_HTML_explanation=<html>Choose the mode for buffer zone selection depending on layer type</html>
-Starting_selection_of_layer=Initializing layer selection...
-Starting_selection_process=Initializing selection process...
-Summary_of_the_process_of_selecting_by_buffer=Summary of "selection by buffer zone" process
-There_are_no_geometries_selected=There are no selected geometries.
-Tool_unavaliable_with_view_in_geographic_projection=This tool is not available for views using geographic (lat/long) projection systems.
-Tools_Select=Tool selection
-Undefined_layer=
-Unit=Unit
-Vista=View
-Warning=Warning
-Width=Width
-Wont_select_geometries_on_the_layer_because_has_incompatible_projection=Incompatible projection. Failed to select geometries from layer.
Index: branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/text_eu.properties
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/text_eu.properties	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/text_eu.properties	(revision 38564)
@@ -1,89 +0,0 @@
-#Translations for language [eu]
-#Mon Sep 21 10:02:11 CEST 2009
-add_buffer_layers=
-add_influence_areas_layers=Eragin-eremu geruzak gehitzen ditu.
-addBufferLayers_checkbox_TOOLTIP_HTML_explanation=
-Added_buffer_areas_to_TOC=
-Added_layer_with_influence_areas_to_TOC=TOCean eragin-eremu geruza gehitu da
-addInfluenceAreasLayers_checkbox_TOOLTIP_HTML_explanation=<html>Geruza aktiboen eragin-eremuak gehitzen ditu<br> bektore-geruza berri bezala.</html>
-Both=Biak
-Buffer_cap=Eragin-eremuaren txanoa
-Buffer_information=Eragin-eremuaren informazioa
-Buffer_width=Eragin-eremuaren zabalera
-bufferWidth_TOOLTIP_HTML_explanation=<html>Eragin-eremuaren zabalera</html>
-configuration=konfigurazio
-Creating_layer_with_buffers=
-Creating_layer_with_influence_areas=Eragin-eremudun geruza sortzen
-Creating_temp_file=Fitxategi tenporala sortzen
-distanceUnitsLabel_TOOLTIP_HTML_explanation=<html>Distantzia unitatea.</html>
-Error=Errorea
-Error_fallo_geoproceso=Errorea geoprozesua gauzatzean
-Error_preparar_escritura_resultados=Errore bat gertatu da emaitzen geruza prestatzean.
-extSelectionTools=Hautaketa tresnaren luzapena.
-Failed_canceling_the_current_task_of_creation_a_buffer_layer=
-failed_creating_the_temporal_layer=Hutsegitea geruza tenporala sortzean
-Failed_creating_the_temporal_layer=Hutsegitea geruza tenporala sortzean.
-Failed_reloading_the_layer=
-Failed_selecting_geometries=Hutsegitea geometriak hautatzerakoan.
-Failed_selecting_geometries_by_circle_topology_exception_explanation=Hutsegitea geruzan geometriak hautatzerakoan.\nHautaketa eremu zirkularra geometria oker batekin gurutzatzen da; berrikusi.
-Failed_selecting_geometries_by_polyline_topology_exception_explanation=Hutsegitea geruzan geometriak hautatzerakoan.\nPolilerroa geometria oker batekin gurutzatzen da; berrikusi.
-Failed_selecting_geometries_in_layer=Hutsegitea geruzan geometriak hautatzerakoan.
-Failed_selecting_layer=Hutsegitea geruza hautatzean
-Failed_the_process=Hutsegitea prozesuan.
-Information=Informazioa
-Inside=Barrua
-Invalid_width=Zabalera okerra
-Layer_with_buffers_created=
-Layer_with_buffers_reprojected=
-Layer_with_influence_areas_created=Eragin-eremuen geruza sortua.
-Layer_with_influence_areas_reprojected=Eragin-eremuen geruza birproiektatua.
-Layer_with_unsupported_geometries_type=Geruzaren geometria mota jasangaitza da.
-Line=Lerroa
-lineSideLabel_TOOLTIP_HTML_explanation=<html>Lerro motako geometriak.</html>
-Multi_layer_selection_applied_for_influence_area=Geruza anitzeko hautaketa eragin-eremuari aplikatua
-multiLayer_selection=Geruza anitzeko hautaketa
-multiLayerSelection_checkbox_TOOLTIP_HTML_explanation=<html>Geometrien hautaketak geruza guztiei eragiten die.</html>
-MultiPoint=Puntuanitza
-multiPointSideLabel_TOOLTIP_HTML_explanation=<html>Puntuanitz motako geometriak.</html>
-Ongoing_process_please_wait=Prozesua martxan, itxaron mesedez...
-Options=Aukerak
-Outside=Kanpo
-Outside_and_inside=Kanpo eta barne
-Percent=Ehunekoa
-Point=Puntua
-pointSideLabel_TOOLTIP_HTML_explanation=<html>Puntu motako geometriak.</html>
-Polygon=Poligonoa
-polygonSideLabel_TOOLTIP_HTML_explanation=<html>Poligono motako geometriak.</html>
-Process_canceled=Prozesua bertan behera utzi da.
-Process_cancelled=Prozesua bertan behera utzi da.
-Process_finished=Prozesua amaituta
-Process_finished_wont_be_cancelled=Prozesua amaitu da, ez da ezeztatuko.
-Removed_layer_with_influence_areas_to_TOC=Kenduta eragin-eremudun geruza TOCetik
-Round=Biribildua
-Runtime_exception_refreshing_the_main_frame_by_a_Swing_thread=Exekutatze denbora-muga gainditu da.
-seleccion=Hautaketa
-select_all=Hautatu dena
-select_all_info=
-select_by_buffer=Hautatu eragin-eremuaren arabera
-select_by_buffer_info=<html>Lehendik hautatuta dauden geometrien<br> eragin-eremuekin gurutzaten diren<br> bistako geruza aktibo bektorialen geometriak<br> hautatzen ditu.</html> \n 
-select_by_circle=Hautatu zirkulu bidez
-select_by_circle_info=<html>Hautatuta dagoen zirkuluarekin gurutzatzen<br>diren bistako geruza aktibo bektorialen<br>geometriak hautatzen ditu.</html>
-select_by_polyline=Hautatu polilinea bidez
-select_by_polyline_info=<html>Hautatuta dagoen polilinearekin gurutzatzen<br>diren bistako geruza aktibo bektorialen<br>geometriak hautatzen ditu.</html>
-Selection_by_buffer_process=Eragin-eremuaren araberako hautaketa prozesua
-Selection_process_finished_succesfully=Hautaketa prozesua ondo burutu da
-Selection_restored=Hautaketa berrezarria
-Side=Noranzkoa
-sideLabel_TOOLTIP_HTML_explanation=<html>Adierazi eragin-eremuaren noranzkoa<br>geruza-motaren arabera.</html>
-Starting_selection_of_layer=Geruza hautaketa hasieratzen
-Starting_selection_process=Hautaketa prozesua hasieratzen.
-Summary_of_the_process_of_selecting_by_buffer=Eragin-eremu bidez hautatzeko prozesuaren laburpena
-There_are_no_geometries_selected=Ez dago geometriarik hautatuta
-Tool_unavaliable_with_view_in_geographic_projection=Tresna hau ez dago erabilgarri proiekzio geografikodun bistetan
-Tools_Select=Tresnen hautaketa
-Undefined_layer=
-Unit=Unitatea
-Vista=Bista
-Warning=Oharra
-Width=Zabalera
-Wont_select_geometries_on_the_layer_because_has_incompatible_projection=Proiekzio bateraezina dauka eta ez da geometriarik hautatuko geruzan
Index: branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/text_pl.properties
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/text_pl.properties	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/text_pl.properties	(revision 38564)
@@ -1,89 +0,0 @@
-#Translations for language [pl]
-#Mon Sep 21 10:02:12 CEST 2009
-add_buffer_layers=
-add_influence_areas_layers=
-addBufferLayers_checkbox_TOOLTIP_HTML_explanation=
-Added_buffer_areas_to_TOC=
-Added_layer_with_influence_areas_to_TOC=
-addInfluenceAreasLayers_checkbox_TOOLTIP_HTML_explanation=
-Both=
-Buffer_cap=
-Buffer_information=
-Buffer_width=
-bufferWidth_TOOLTIP_HTML_explanation=
-configuration=
-Creating_layer_with_buffers=
-Creating_layer_with_influence_areas=
-Creating_temp_file=
-distanceUnitsLabel_TOOLTIP_HTML_explanation=
-Error=
-Error_fallo_geoproceso=
-Error_preparar_escritura_resultados=
-extSelectionTools=
-Failed_canceling_the_current_task_of_creation_a_buffer_layer=
-failed_creating_the_temporal_layer=
-Failed_creating_the_temporal_layer=
-Failed_reloading_the_layer=
-Failed_selecting_geometries=
-Failed_selecting_geometries_by_circle_topology_exception_explanation=
-Failed_selecting_geometries_by_polyline_topology_exception_explanation=
-Failed_selecting_geometries_in_layer=
-Failed_selecting_layer=
-Failed_the_process=
-Information=
-Inside=
-Invalid_width=
-Layer_with_buffers_created=
-Layer_with_buffers_reprojected=
-Layer_with_influence_areas_created=
-Layer_with_influence_areas_reprojected=
-Layer_with_unsupported_geometries_type=
-Line=
-lineSideLabel_TOOLTIP_HTML_explanation=
-Multi_layer_selection_applied_for_influence_area=
-multiLayer_selection=
-multiLayerSelection_checkbox_TOOLTIP_HTML_explanation=
-MultiPoint=
-multiPointSideLabel_TOOLTIP_HTML_explanation=
-Ongoing_process_please_wait=
-Options=
-Outside=
-Outside_and_inside=
-Percent=
-Point=
-pointSideLabel_TOOLTIP_HTML_explanation=
-Polygon=
-polygonSideLabel_TOOLTIP_HTML_explanation=
-Process_canceled=
-Process_cancelled=
-Process_finished=
-Process_finished_wont_be_cancelled=
-Removed_layer_with_influence_areas_to_TOC=
-Round=
-Runtime_exception_refreshing_the_main_frame_by_a_Swing_thread=
-seleccion=
-select_all=
-select_all_info=
-select_by_buffer=
-select_by_buffer_info=
-select_by_circle=
-select_by_circle_info=
-select_by_polyline=
-select_by_polyline_info=
-Selection_by_buffer_process=
-Selection_process_finished_succesfully=
-Selection_restored=
-Side=
-sideLabel_TOOLTIP_HTML_explanation=
-Starting_selection_of_layer=
-Starting_selection_process=
-Summary_of_the_process_of_selecting_by_buffer=
-There_are_no_geometries_selected=
-Tool_unavaliable_with_view_in_geographic_projection=
-Tools_Select=
-Undefined_layer=
-Unit=
-Vista=
-Warning=
-Width=
-Wont_select_geometries_on_the_layer_because_has_incompatible_projection=
Index: branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/text_it.properties
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/text_it.properties	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/text_it.properties	(revision 38564)
@@ -1,89 +0,0 @@
-#Translations for language [it]
-#Mon Sep 21 10:02:12 CEST 2009
-add_buffer_layers=
-add_influence_areas_layers=Aggiungi livello d'area di influenza
-addBufferLayers_checkbox_TOOLTIP_HTML_explanation=
-Added_buffer_areas_to_TOC=
-Added_layer_with_influence_areas_to_TOC=Aggiunto Livello con aree di influenza al TOC.
-addInfluenceAreasLayers_checkbox_TOOLTIP_HTML_explanation=<html>Aggiunge le aree di influenza di ogni Livello attivo<br> come nuovi Livelli vettoriali.</html>
-Both=Entrambi
-Buffer_cap=Estremit\u00e0 di buffer
-Buffer_information=Informazione di buffer
-Buffer_width=Larghezza di buffer
-bufferWidth_TOOLTIP_HTML_explanation=<html>Larghezza di buffer.</html>
-configuration=Configurazione
-Creating_layer_with_buffers=
-Creating_layer_with_influence_areas=Creazione Livello con aree di influenza.
-Creating_temp_file=Creazione file temporaneo
-distanceUnitsLabel_TOOLTIP_HTML_explanation=<html>Unit\u00e0 di lunghezza.</html>
-Error=Errore
-Error_fallo_geoproceso=Errore durante l'esecuzione del geoprocesso
-Error_preparar_escritura_resultados=Errore durante la preparazione del layer dei risultati
-extSelectionTools=Estensione Strumenti di Selezione
-Failed_canceling_the_current_task_of_creation_a_buffer_layer=
-failed_creating_the_temporal_layer=FALLITA Creazione Livello temporaneo
-Failed_creating_the_temporal_layer=FALLITA Creazione Livello temporaneo
-Failed_reloading_the_layer=
-Failed_selecting_geometries=FALLITA Selezione delle geometrie.
-Failed_selecting_geometries_by_circle_topology_exception_explanation=FALLITA Selezione delle geometrie nel Livello.\nL'area circolare di selezione interseca qualche geometria incorretta, necessario controllo.
-Failed_selecting_geometries_by_polyline_topology_exception_explanation=FALLITA Selezione delle geometrie nel Livello.\nLa polilinea di selezione interseca qualche geometria incorretta, necessario controllo.
-Failed_selecting_geometries_in_layer=FALLITA Selezione delle geometrie nel Livello.
-Failed_selecting_layer=FALLITA Selezione del Livello.
-Failed_the_process=Processo FALLITO.
-Information=Informazione
-Inside=Interno
-Invalid_width=Larghezza non valida
-Layer_with_buffers_created=
-Layer_with_buffers_reprojected=
-Layer_with_influence_areas_created=Creato Livello con aree di influenza.
-Layer_with_influence_areas_reprojected=Riproiettato Livello con aree di influenza.
-Layer_with_unsupported_geometries_type=Livello con geometrie non supportate.
-Line=Linea
-lineSideLabel_TOOLTIP_HTML_explanation=<html>Geometrie di tipologia Linea.</html>
-Multi_layer_selection_applied_for_influence_area=Selezione multilivello ottenuta con un'area di influenza
-multiLayer_selection=Selezione multilivello.
-multiLayerSelection_checkbox_TOOLTIP_HTML_explanation=<html>Selezione degli elementi di tutti i Livelli.</html>
-MultiPoint=Multipunto
-multiPointSideLabel_TOOLTIP_HTML_explanation=<html>Geometrie di tipologia multipunto.</html>
-Ongoing_process_please_wait=Processo in atto, attendere prego...
-Options=Opzioni
-Outside=Esterno
-Outside_and_inside=Esterno e interno
-Percent=Percentuale
-Point=Punto
-pointSideLabel_TOOLTIP_HTML_explanation=<html>Geometrie di tipo puntuale.</html>
-Polygon=Poligono
-polygonSideLabel_TOOLTIP_HTML_explanation=<html>Geometrie di tipo poligonale.</html>
-Process_canceled=Processo annullato.
-Process_cancelled=Processo annullato.
-Process_finished=Processo completato.
-Process_finished_wont_be_cancelled=Processo completato, non sar\u00e0 cancellato.
-Removed_layer_with_influence_areas_to_TOC=Rimosso Livello con aree di influenza del TOC.
-Round=Arrotondato
-Runtime_exception_refreshing_the_main_frame_by_a_Swing_thread=Eccezione nel tempo di esecuzione nell'aggiornamento del main frame da parte di uno Swing Thread
-seleccion=Selezione
-select_all=Seleziona tutto
-select_all_info=
-select_by_buffer=Selezione tramite area di influenza
-select_by_buffer_info=<html>Seleziona le geometrie dei Livelli<br> vettoriali attivi nella vista attuale che<br> intersecano il buffer creato con le<br> geometrie precedentemente selezionate.</html>
-select_by_circle=Seleziona tramite cerchio
-select_by_circle_info=<html>Seleziona le geometrie dei Livelli<br> vettoriali attivi nella vista attuale che<br> intersecano il cerchio selezionato.</html>
-select_by_polyline=Seleziona tramite polilinea
-select_by_polyline_info=<html>Seleziona le geometrie dei Livelli<br> vettoriali attivi nella vista attuale che<br> intersecano la polilinea selezionato.</html>
-Selection_by_buffer_process=Processo di selezione tramite area di influenza (buffer)
-Selection_process_finished_succesfully=Processo di selezione terminato correttamente.
-Selection_restored=Selezione ripristinata.
-Side=Senso
-sideLabel_TOOLTIP_HTML_explanation=<html>Indica il senso che seguir\u00e0 il buffer a seconda <br> del tipo di Livello.</html>
-Starting_selection_of_layer=Inizializzazione selezione del Livello
-Starting_selection_process=Inizializzazione processo di selezione
-Summary_of_the_process_of_selecting_by_buffer=Sommario del processo di selezione tramite buffer
-There_are_no_geometries_selected=Non ci sono geometrie selezionate.
-Tool_unavaliable_with_view_in_geographic_projection=Strumento non disponibile in viste con proiezioni geografiche.
-Tools_Select=Selezione strumenti
-Undefined_layer=
-Unit=Unit\u00e0
-Vista=Vista
-Warning=Attenzione
-Width=Larghezza
-Wont_select_geometries_on_the_layer_because_has_incompatible_projection=Non verranno selezionate geometrie nel Livello poich\u00e9 ha proiezione incompatibile.
Index: branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/config.xml
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/config.xml	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/config.xml	(revision 38564)
@@ -5,49 +5,49 @@
 	<libraries library-dir="lib"/>
 	<extensions>
 
- 		<extension class-name="org.gvsig.selectiontools.app.extension.AboutSelectionToolsExtension"
-            description="Extension Selection Tools of the Consejer�a de Medio Ambiente of the Junta de Castilla y Le�n Project."
-			active="true"
-			priority="1">
-		</extension>
+<!--  		<extension class-name="org.gvsig.selectiontools.app.extension.AboutSelectionToolsExtension" -->
+<!--             description="Extension Selection Tools of the Consejer�a de Medio Ambiente of the Junta de Castilla y Le�n Project." -->
+<!-- 			active="true" -->
+<!-- 			priority="1"> -->
+<!-- 		</extension> -->
 		
 		<extension class-name="org.gvsig.selectiontools.app.extension.SelectAllExtension"
 			description="Extension that allows select all geometries of the selected vectorial layers."
 			active="true"
 			priority="30">
-			<menu text="Vista/seleccion/select_all"
+			<menu text="Selection/SelectAll"
 				action-command="SELALL"
 				tooltip="select_all_info"
-				icon="select-all-icon"
-				position="6570"/>
+				icon="selection-select-all"
+				position="0"/>
 			<tool-bar name="Tools_Select" position="6">
-				<selectable-tool icon="select-all-icon" action-command="SELALL" tooltip="select_all_info" position="7"/>
+				<selectable-tool icon="selection-all" action-command="SELALL" tooltip="select_all_info" position="7"/>
 			</tool-bar>
 		</extension>		
 		 <extension class-name="org.gvsig.selectiontools.app.extension.SelectByCircleExtension"
 			description="Extension that allows select all geometries of the selected vectorial layers that are contained or intersect with a circle defined by the user."
 			active="true"
 			priority="30">
-			<menu text="Vista/seleccion/select_by_circle"
+			<menu text="Selection/Select_by_circle"
 				action-command="SELCIRCLE"
 				tooltip="select_by_circle_info"
-				icon="select-by-circle-icon"
-				position="6521"/>
+				icon="selection-select-by-circle"
+				position="0"/>
 			<tool-bar name="Tools_Select" position="6">
-				<selectable-tool icon="select-by-circle-icon" action-command="SELCIRCLE" tooltip="select_by_circle" position="6"/>
+				<selectable-tool icon="selection-select-by-circle" action-command="SELCIRCLE" tooltip="select_by_circle" position="6"/>
 			</tool-bar>
 		</extension>		
 		<extension class-name="org.gvsig.selectiontools.app.extension.SelectByPolylineExtension"
 			description="Extension that allows select all geometries of the selected vectorial layers that intersect with a polyline defined by the user."
 			active="false"
 			priority="30">
-			<menu text="Vista/seleccion/select_by_polyline"
+			<menu text="Selection/Select_by_polyline"
 				action-command="SELPOLYLINE"
 				tooltip="select_by_polyline_info"
-				icon="select-by-polyline-icon"
-				position="6531"/>
+				icon="selection-select-by-polyline"
+				position="0"/>
 			<tool-bar name="Tools_Select" position="6">
-				<selectable-tool icon="select-by-polyline-icon" action-command="SELPOLYLINE" tooltip="select_by_polyline" position="5"/>
+				<selectable-tool icon="selection-select-by-polyline" action-command="SELPOLYLINE" tooltip="select_by_polyline" position="5"/>
 			</tool-bar>
 		</extension>		
 
@@ -55,13 +55,13 @@
 			description="Extension that allows select all geometries of the selected vectorial layers that intersect with a buffer around their previously selected geometries."
 			active="true"
 			priority="30">
-			<menu text="Vista/seleccion/select_by_buffer"
+			<menu text="Selection/Select_by_buffer"
 				action-command="SELBUFFER"
 				tooltip="select_by_buffer_info"
-				icon="select-by-buffer-icon"
-				position="6532"/>
+				icon="selection-select-by-buffer"
+				position="0"/>
 			<tool-bar name="Tools_Select" position="6">
-				<action-tool icon="select-by-buffer-icon" action-command="SELBUFFER" tooltip="select_by_buffer" position="7"/>
+				<action-tool icon="selection-select-by-buffer" action-command="SELBUFFER" tooltip="select_by_buffer" position="7"/>
 			</tool-bar>
 		</extension>
 				
Index: branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/images/action/selection-select-all.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/images/action/selection-select-all.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/images/action/selection-select-by-circle.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/images/action/selection-select-by-circle.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/images/action/selection-select-by-buffer.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/images/action/selection-select-by-buffer.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/images/action/selection-select-by-polyline.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/images/action/selection-select-by-polyline.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/images/cursor/cursor-select-by-polyline.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/images/cursor/cursor-select-by-polyline.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/images/cursor/cursor-select-by-circle.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/images/cursor/cursor-select-by-circle.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/extDalTransformJoin/config/config.xml
===================================================================
--- branches/v2_0_0_prep/extensions/extDalTransformJoin/config/config.xml	(revision 38563)
+++ branches/v2_0_0_prep/extensions/extDalTransformJoin/config/config.xml	(revision 38564)
@@ -9,15 +9,48 @@
 		<extension class-name="org.gvsig.app.join.RemoveTableUnion"
 			description="Extensi�n encargada de quitar uniones de las tablas."
 			active="true">
-			<menu text="Tabla/quitar_uniones"/>
+			
+            <action 
+                name="table-remove-join"
+                label="_Remove_join" 
+                tooltip="_Remove_a_join_between_two_tables_or_layers" 
+                position="501200000" 
+                action-command="table-remove-join"
+                icon="table-remove-join"
+                accelerator=""
+                />
+            
+			
+			<menu
+			     name="table-remove-join" 
+			     text="Table/remove_join"
+			/>
 		</extension>
+		
+		
 		<extension class-name="org.gvsig.app.join.JoinToolExtension"
 			description="Extensi�n encargada de gestionar las operaciones sobre las tablas."
 			active="true">
-			<menu text="Tabla/join" icon="table-join" action-command="JOIN"/>
+
+            <action 
+                name="table-create-join"
+                label="_Create_join" 
+                tooltip="_Create_a_join_between_two_tables_or_layers" 
+                position="501200000" 
+                action-command="table-create-join"
+                icon="table-create-join"
+                accelerator=""
+                />
+            
+            <menu
+                name="table-create-join" 
+                text="Table/Create_join"
+                />
+                
 			<tool-bar name="Herramientas" position="12">
-				<action-tool icon="table-join" action-command="JOIN" tooltip="join" position="1"/>
+				<action-tool name="table-create-join"/>
 			</tool-bar>
+		
 		</extension>			
 	</extensions>
 	<icon src="gvsig-logo-icon" text="gvSIG"/>
Index: branches/v2_0_0_prep/extensions/extDalTransformJoin/images/action/table-create-join.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/extDalTransformJoin/images/action/table-create-join.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/extDalTransformJoin/images/action/table-remove-join.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/extDalTransformJoin/images/action/table-remove-join.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/extDalTransformJoin/src/org/gvsig/app/join/JoinToolExtension.java
===================================================================
--- branches/v2_0_0_prep/extensions/extDalTransformJoin/src/org/gvsig/app/join/JoinToolExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/extDalTransformJoin/src/org/gvsig/app/join/JoinToolExtension.java	(revision 38564)
@@ -31,6 +31,7 @@
 
 import javax.swing.JOptionPane;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.ui.mdiManager.IWindow;
 import org.gvsig.app.extension.TableOperations;
@@ -44,23 +45,29 @@
  */
 public class JoinToolExtension extends TableOperations {
 
+	public void initialize() {
+		IconThemeHelper.registerIcon("action", "table-create-join", this);
+	}
+	
 	/**
 	 * @see com.iver.mdiApp.plugins.IExtension#updateUI(java.lang.String)
 	 */
 	public void execute(String actionCommand) {
-	    try {
-	        DataTransformWizard dataTransformWizard = DataTransformLocator.getDataTransformManager().createWizard();
-            dataTransformWizard.setDataTransformGui(new JoinTransformGui());
-	        PluginServices.getMDIManager().addWindow(dataTransformWizard.getWindow());
-        } catch (Exception e) {
-            
-            IWindow iw = PluginServices.getMDIManager().getActiveWindow();
-            JOptionPane.showInternalMessageDialog(
-                iw instanceof Component ? (Component) iw : null,
-                    PluginServices.getText(this, "transform_create_wizard_exception"),
-                    PluginServices.getText(this, "feature_transform"),
-                    JOptionPane.ERROR_MESSAGE);
-        }
+		if( "table-create-join".equalsIgnoreCase(actionCommand)) {
+		    try {
+		        DataTransformWizard dataTransformWizard = DataTransformLocator.getDataTransformManager().createWizard();
+	            dataTransformWizard.setDataTransformGui(new JoinTransformGui());
+		        PluginServices.getMDIManager().addWindow(dataTransformWizard.getWindow());
+	        } catch (Exception e) {
+	            
+	            IWindow iw = PluginServices.getMDIManager().getActiveWindow();
+	            JOptionPane.showInternalMessageDialog(
+	                iw instanceof Component ? (Component) iw : null,
+	                    PluginServices.getText(this, "transform_create_wizard_exception"),
+	                    PluginServices.getText(this, "feature_transform"),
+	                    JOptionPane.ERROR_MESSAGE);
+	        }
+		}
 	}		
 	
 }
Index: branches/v2_0_0_prep/extensions/extDalTransformJoin/src/org/gvsig/app/join/RemoveTableUnion.java
===================================================================
--- branches/v2_0_0_prep/extensions/extDalTransformJoin/src/org/gvsig/app/join/RemoveTableUnion.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/extDalTransformJoin/src/org/gvsig/app/join/RemoveTableUnion.java	(revision 38564)
@@ -1,5 +1,6 @@
 package org.gvsig.app.join;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.plugins.Extension;
 import org.gvsig.andami.ui.mdiManager.IWindow;
@@ -20,44 +21,45 @@
 	 * @see org.gvsig.andami.plugins.IExtension#initialize()
 	 */
 	public void initialize() {
-		// TODO Auto-generated method stub
-
+		IconThemeHelper.registerIcon("action", "table-remove-join", this);
 	}
 
 	/**
 	 * @see org.gvsig.andami.plugins.IExtension#execute(java.lang.String)
 	 */
 	public void execute(String actionCommand) {
-		FeatureTableDocumentPanel t = (FeatureTableDocumentPanel) PluginServices.getMDIManager().getActiveWindow();
-		TableDocument pt = t.getModel();
-		FeatureStore fs = pt.getStore();
-		this.removeJoinTransfor(fs);
-
-		//		TODO
-		//		if (fs instanceof JoinFeatureStore) {
-		//			DataManager dm = DALLocator.getDataManager();
-		//			DataStoreParameters originalParams = ((JoinFeatureStoreParameters) fs
-		//					.getParameters()).getStorePrimary();
-		//			FeatureStore original = null;
-		//			try {
-		//				original = (FeatureStore) dm.createStore(originalParams);
-		//			} catch (InitializeException e) {
-		//				NotificationManager.addError(e.getMessage(), e);
-		//				return;
-		//			}
-		//
-		//			pt.setStore(original);
-		//			try {
-		//				fs.dispose();
-		//			} catch (CloseException e) {
-		//				NotificationManager.addError(e);
-		//			}
-		//			t.setModel(pt);
-		//
-		//		}
-
-		//		t.clearSelectedFields();
-		t.getModel().setModified(true);
+		if( "table-remove-join".equalsIgnoreCase(actionCommand)) {
+			FeatureTableDocumentPanel t = (FeatureTableDocumentPanel) PluginServices.getMDIManager().getActiveWindow();
+			TableDocument pt = t.getModel();
+			FeatureStore fs = pt.getStore();
+			this.removeJoinTransfor(fs);
+	
+			//		TODO
+			//		if (fs instanceof JoinFeatureStore) {
+			//			DataManager dm = DALLocator.getDataManager();
+			//			DataStoreParameters originalParams = ((JoinFeatureStoreParameters) fs
+			//					.getParameters()).getStorePrimary();
+			//			FeatureStore original = null;
+			//			try {
+			//				original = (FeatureStore) dm.createStore(originalParams);
+			//			} catch (InitializeException e) {
+			//				NotificationManager.addError(e.getMessage(), e);
+			//				return;
+			//			}
+			//
+			//			pt.setStore(original);
+			//			try {
+			//				fs.dispose();
+			//			} catch (CloseException e) {
+			//				NotificationManager.addError(e);
+			//			}
+			//			t.setModel(pt);
+			//
+			//		}
+	
+			//		t.clearSelectedFields();
+			t.getModel().setModified(true);
+		}
 	}
 
 	public void removeJoinTransfor(FeatureStore store) {
Index: branches/v2_0_0_prep/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/src/main/java/org/gvsig/annotation/app/extension/AnnotationExtension.java
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/src/main/java/org/gvsig/annotation/app/extension/AnnotationExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/src/main/java/org/gvsig/annotation/app/extension/AnnotationExtension.java	(revision 38564)
@@ -23,6 +23,7 @@
 
 import java.util.Locale;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.messages.NotificationManager;
 import org.gvsig.andami.plugins.Extension;
@@ -63,10 +64,7 @@
 		
 		ep.append("AnnotationPreferencesPage", "", new AnnotationPreferencesPage());
 		
-		PluginServices.getIconTheme().registerDefault(
-				"annotation-properties",
-				AnnotationPreferencesPage.class.getClassLoader().getResource("images/AnnotationProperties.png")
-		);
+		IconThemeHelper.registerIcon("preferences", "annotation-preferences", this);
 		
 		if (!Messages.hasLocales()) {
 		    Messages.addLocale(Locale.getDefault());
Index: branches/v2_0_0_prep/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/src/main/java/org/gvsig/annotation/app/extension/AnnotationPreferencesPage.java
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/src/main/java/org/gvsig/annotation/app/extension/AnnotationPreferencesPage.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/src/main/java/org/gvsig/annotation/app/extension/AnnotationPreferencesPage.java	(revision 38564)
@@ -49,6 +49,7 @@
 import javax.swing.JPanel;
 import javax.swing.JTextField;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.preferences.AbstractPreferencePage;
 import org.gvsig.andami.preferences.StoreException;
@@ -56,8 +57,6 @@
 import org.gvsig.annotation.AnnotationManager;
 import org.gvsig.annotation.swing.AnnotationSwingLocator;
 import org.gvsig.annotation.swing.JAnnotationPreferencesPanel;
-import org.gvsig.app.gui.panels.ColorChooserPanel;
-import org.gvsig.utils.swing.JComboBox;
 /**
  *  Default configuration page.
  *  <b><b>
@@ -67,14 +66,18 @@
  * @author Vicente Caballero Navarro
  */
 public class AnnotationPreferencesPage extends AbstractPreferencePage {
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -472617080926223575L;
 	protected String id;
-	private ImageIcon icon;
+	//private ImageIcon icon;
 	private JTextField txtDefaultText;
-	private JComboBox cmbDefaultTypeFont;
-	private JComboBox cmbDefaultStyleFont;
-	private JTextField txtDefaultRotate;
-	private JTextField txtDefaultHeight;
-	private ColorChooserPanel jccDefaultColor;
+//	private JComboBox cmbDefaultTypeFont;
+//	private JComboBox cmbDefaultStyleFont;
+//	private JTextField txtDefaultRotate;
+//	private JTextField txtDefaultHeight;
+//	private ColorChooserPanel jccDefaultColor;
 	private JAnnotationPreferencesPanel panel = null;
 	
 	private AnnotationManager annotationManager = null;
@@ -132,9 +135,7 @@
 	}
 
 	public ImageIcon getIcon() {
-		if (icon==null)
-			icon = PluginServices.getIconTheme().get("annotation-properties");
-		return icon;
+		return IconThemeHelper.getImageIcon("annotation-preferences");
 	}
 
 	public boolean isValueChanged() {
Index: branches/v2_0_0_prep/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/src/main/resources/images/AnnotationProperties.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: branches/v2_0_0_prep/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/src/main/resources/images/preferences/annotation-preferences.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/src/main/resources/images/preferences/annotation-preferences.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/extI18n/src/main/java/org/gvsig/i18n/extension/I18nExtension.java
===================================================================
--- branches/v2_0_0_prep/extensions/extI18n/src/main/java/org/gvsig/i18n/extension/I18nExtension.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/extI18n/src/main/java/org/gvsig/i18n/extension/I18nExtension.java	(revision 38564)
@@ -28,6 +28,7 @@
 
 import org.gvsig.about.AboutManager;
 import org.gvsig.about.AboutParticipant;
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.plugins.Extension;
 import org.gvsig.app.ApplicationLocator;
 import org.gvsig.app.ApplicationManager;
@@ -47,6 +48,8 @@
     }
 
     public void initialize() {
+    	IconThemeHelper.registerIcon("preferences", "i18n-preferences", this);
+    	
         // Replace the default locale Preferences page for the new one
         ToolsLocator.getExtensionPointManager()
                 .add("AplicationPreferences", "").append("LanguagePage", "",
@@ -75,10 +78,10 @@
     }
 
     public boolean isEnabled() {
-        return true;
+        return false;
     }
 
     public boolean isVisible() {
-        return true;
+        return false;
     }
 }
\ No newline at end of file
Index: branches/v2_0_0_prep/extensions/extI18n/src/main/java/org/gvsig/i18n/extension/preferences/table/RadioButtonCellEditor.java
===================================================================
--- branches/v2_0_0_prep/extensions/extI18n/src/main/java/org/gvsig/i18n/extension/preferences/table/RadioButtonCellEditor.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/extI18n/src/main/java/org/gvsig/i18n/extension/preferences/table/RadioButtonCellEditor.java	(revision 38564)
@@ -27,7 +27,9 @@
 package org.gvsig.i18n.extension.preferences.table;
 
 import java.awt.Component;
-import java.awt.event.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
 
 import javax.swing.AbstractCellEditor;
 import javax.swing.JTable;
Index: branches/v2_0_0_prep/extensions/extI18n/src/main/java/org/gvsig/i18n/extension/preferences/table/LocaleTableModel.java
===================================================================
--- branches/v2_0_0_prep/extensions/extI18n/src/main/java/org/gvsig/i18n/extension/preferences/table/LocaleTableModel.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/extI18n/src/main/java/org/gvsig/i18n/extension/preferences/table/LocaleTableModel.java	(revision 38564)
@@ -30,7 +30,9 @@
 
 import javax.swing.table.AbstractTableModel;
 
-import org.gvsig.i18n.*;
+import org.gvsig.i18n.I18nException;
+import org.gvsig.i18n.I18nManager;
+import org.gvsig.i18n.Messages;
 
 /**
  * TableModel to show the list of available Locales in gvSIG.
Index: branches/v2_0_0_prep/extensions/extI18n/src/main/java/org/gvsig/i18n/extension/preferences/table/RadioButtonCell.java
===================================================================
--- branches/v2_0_0_prep/extensions/extI18n/src/main/java/org/gvsig/i18n/extension/preferences/table/RadioButtonCell.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/extI18n/src/main/java/org/gvsig/i18n/extension/preferences/table/RadioButtonCell.java	(revision 38564)
@@ -28,7 +28,9 @@
 
 import java.awt.Component;
 
-import javax.swing.*;
+import javax.swing.JRadioButton;
+import javax.swing.JTable;
+import javax.swing.SwingConstants;
 
 /**
  * Renders a radio button on a table cell.
Index: branches/v2_0_0_prep/extensions/extI18n/src/main/java/org/gvsig/i18n/extension/preferences/I18nPreferencePage.java
===================================================================
--- branches/v2_0_0_prep/extensions/extI18n/src/main/java/org/gvsig/i18n/extension/preferences/I18nPreferencePage.java	(revision 38563)
+++ branches/v2_0_0_prep/extensions/extI18n/src/main/java/org/gvsig/i18n/extension/preferences/I18nPreferencePage.java	(revision 38564)
@@ -55,6 +55,7 @@
 import javax.swing.filechooser.FileFilter;
 import javax.swing.table.TableColumn;
 
+import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.preferences.AbstractPreferencePage;
 import org.gvsig.andami.preferences.StoreException;
 import org.gvsig.gui.beans.swing.JButton;
@@ -104,11 +105,9 @@
      */
     public I18nPreferencePage() {
 		setParentID("org.gvsig.coreplugin.preferences.general.GeneralPage");
-	icon = new ImageIcon(this.getClass().getClassLoader().getResource(
-		"images/babel.png"));
+		
+	icon = PluginServices.getIconTheme().get("i18n-preferences");
 
-	setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
-
 	add(getLocalesPanel());
 	add(Box.createRigidArea(new Dimension(0, 5)));
 	add(getActiveLocaleLabel());
Index: branches/v2_0_0_prep/extensions/extI18n/src/main/resources/images/logo_horiz_bicolor_gva.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: branches/v2_0_0_prep/extensions/extI18n/src/main/resources/images/babel.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: branches/v2_0_0_prep/extensions/extI18n/src/main/resources/images/logo_DISID-technologies.jpg
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: branches/v2_0_0_prep/extensions/extI18n/src/main/resources/images/preferences/i18n-preferences
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/extensions/extI18n/src/main/resources/images/preferences/i18n-preferences
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/impl/DefaultPluginsManager.java
===================================================================
--- branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/impl/DefaultPluginsManager.java	(revision 38563)
+++ branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/impl/DefaultPluginsManager.java	(revision 38564)
@@ -71,8 +71,7 @@
     }
 
     public File getApplicationFolder() {
-        // TODO: check if there is a better way to handle this
-        return new File(System.getProperty("user.dir"));
+    	return Launcher.getApplicationFolder();
     }
 
     public File getPluginsFolder() {
@@ -92,6 +91,6 @@
     }
 
     public File getApplicationHomeFolder() {
-        return new File(Launcher.getAppHomeDir());
+        return Launcher.getApplicationHomeFolder();
     }
 }
Index: branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/ui/splash/MultiSplashWindow.java
===================================================================
--- branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/ui/splash/MultiSplashWindow.java	(revision 38563)
+++ branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/ui/splash/MultiSplashWindow.java	(revision 38564)
@@ -122,7 +122,7 @@
         if (numLogos == 0) {
             numLogos = 1;
             img = new ImageIcon[1];
-            img[0] = PluginServices.getIconTheme().get("splash"); 
+            img[0] = PluginServices.getIconTheme().get("splash-default"); 
             timers = new long[1];
             timers[0] = 1000L;
         }
Index: branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/ui/AndamiEventQueue.java
===================================================================
--- branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/ui/AndamiEventQueue.java	(revision 38563)
+++ branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/ui/AndamiEventQueue.java	(revision 38564)
@@ -42,9 +42,15 @@
 
 import java.awt.AWTEvent;
 import java.awt.EventQueue;
+import java.awt.event.MouseEvent;
 
+import javax.swing.JOptionPane;
+
+import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.messages.Messages;
 import org.gvsig.andami.messages.NotificationManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 
@@ -54,10 +60,28 @@
  * @author Fernando Gonz�lez Cort�s
  */
 public class AndamiEventQueue extends EventQueue {
+	private static Logger logger = LoggerFactory.getLogger(AndamiEventQueue.class);
+	
 	protected void dispatchEvent(AWTEvent event){
 		try{
 			super.dispatchEvent(event);
 		} catch(RuntimeException e){
+			if( event instanceof MouseEvent ) {
+				MouseEvent me = (MouseEvent)event;
+				if( me.getButton() == 0 && me.getClickCount()==0 ) {
+					// Intentamos que los errores que se produzcan con los eventos de movimiento del raton
+					// no provoquen la aparicion de la ventana de errores ya que llega a bloquear al usuario.
+					// Intentaremos sacarlos en la barra de estado si podemos.
+					try {
+						PluginServices.getMainFrame().getStatusBar().message(e.getMessage(), JOptionPane.ERROR_MESSAGE);
+					} catch(Throwable ex) {
+						// Ignora cualquier error que se produzca intentando mostrar el mensaje de error y nos
+						// conformaremos con que este en el log.
+					}
+					logger.info("Error dispaching event",e);
+					return;
+				}
+			}
 			NotificationManager.addError(e);//Messages.getString("PluginServices.Bug en el c�digo"), e);
 		} catch (Error e){
 			NotificationManager.addError(
Index: branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/ui/mdiFrame/MainFrame.java
===================================================================
--- branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/ui/mdiFrame/MainFrame.java	(revision 38563)
+++ branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/ui/mdiFrame/MainFrame.java	(revision 38564)
@@ -97,6 +97,8 @@
 	 * enable/disable and show/hide their associated controls.
 	 */
 	public void enableControls();
+	
+	public void refreshControls();
 
 	/**
 	 * Gets the status bar, the bar located in the bottom part of the main window.
Index: branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/ui/mdiFrame/NewStatusBar.java
===================================================================
--- branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/ui/mdiFrame/NewStatusBar.java	(revision 38563)
+++ branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/ui/mdiFrame/NewStatusBar.java	(revision 38564)
@@ -26,25 +26,32 @@
 import java.awt.Dimension;
 import java.awt.FlowLayout;
 import java.awt.LayoutManager;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
 import java.util.HashMap;
 import java.util.Map;
 
 import javax.swing.BorderFactory;
 import javax.swing.ImageIcon;
 import javax.swing.JLabel;
+import javax.swing.JOptionPane;
 import javax.swing.JPanel;
+import javax.swing.JPopupMenu;
 import javax.swing.JProgressBar;
 import javax.swing.SwingConstants;
+import javax.swing.Timer;
 import javax.swing.border.BevelBorder;
 
-import org.apache.log4j.Logger;
-
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.messages.Messages;
 import org.gvsig.andami.plugins.config.generate.Label;
 import org.gvsig.gui.beans.controls.IControl;
 import org.gvsig.tools.swing.api.ToolsSwingLocator;
 import org.gvsig.tools.swing.api.task.JTasksStatus;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * <p>
@@ -69,7 +76,9 @@
 public class NewStatusBar extends JPanel {
 
     private static final long serialVersionUID = 5575549032728844632L;
-    private static Logger LOG = Logger.getLogger(NewStatusBar.class);
+    
+    private static Logger logger = LoggerFactory.getLogger(NewStatusBar.class);
+    
     private static final int INFO = 0;
     private static final int WARNING = 1;
     private static final int ERROR = 2;
@@ -78,9 +87,6 @@
     private boolean contenidoTemporal;
     private String textoAnterior;
     private int estadoAnterior;
-    private ImageIcon infoIcon;
-    private ImageIcon warningIcon;
-    private ImageIcon errorIcon;
     private int estado;
     private JProgressBar progressBar = null;
     private Map<String, JLabel> idLabel = new HashMap<String, JLabel>();
@@ -88,18 +94,22 @@
     private Map<String, Component> controls = new HashMap<String, Component>();
     private JPanel controlContainer;
     private JTasksStatus tasksStatus = null;
+	private Timer messageTimer;
 
+	
     /**
      * This is the default constructor
      */
     public NewStatusBar() {
         super();
         initialize();
-        infoIcon = PluginServices.getIconTheme().get("info-icon");
-        warningIcon = PluginServices.getIconTheme().get("warning-icon");
-        errorIcon = PluginServices.getIconTheme().get("error-icon");
     }
 
+	private ImageIcon getImageIcon(String iconName) {
+		return PluginServices.getIconTheme().get(iconName);
+	}
+	
+
     /**
      * This method initializes the status bar. It creates the required
      * containers and sets the layout.
@@ -126,14 +136,106 @@
 
         JPanel panelLeft = new JPanel();
         panelLeft.setLayout(new FlowLayout(FlowLayout.LEFT, 1, 0));
+        panelLeft.add(lblIcon);
         panelLeft.add(lblTexto);
-        panelLeft.add(lblIcon);
         panelLeft.add(getProgressBar());
 
         this.add(panelLeft, BorderLayout.CENTER);
         this.add(panelRight, BorderLayout.EAST);
+
+        buildMesagePopupMenu();
+        
+        messageTimer = new Timer(30000, new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				try {
+					clearMessage();
+				} catch( Throwable ex) {
+					logger.info("Can't clear message", ex);
+				}
+			}
+		});
     }
+    
+    public void clearMessage() {
+    	lblTexto.setText("");
+    	lblIcon.setIcon(null);
+    	estado = INFO;
+    }
 
+    
+    public void message(String msg, int messageTyoe) {
+    	messageTimer.stop();
+    	switch (messageTyoe) {
+		case JOptionPane.ERROR_MESSAGE:
+			setErrorText(msg);
+			break;
+		case JOptionPane.WARNING_MESSAGE:
+			setWarningText(msg);
+			break;
+		default:
+		case JOptionPane.INFORMATION_MESSAGE:
+			setInfoText(msg);
+			break;
+		}
+    	messageTimer.start();
+	}
+
+    private void buildMesagePopupMenu() {
+    	final JPopupMenu menu = new JPopupMenu();
+    	
+    	JMenuItem item = new JMenuItem("View details");
+    	item.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent arg0) {
+				switch (estado) {
+				default:
+				case INFO:
+					JOptionPane.showMessageDialog(lblTexto, getStatusText(), "", JOptionPane.INFORMATION_MESSAGE);
+					break;
+				case WARNING:
+					JOptionPane.showMessageDialog(lblTexto, getStatusText(), "", JOptionPane.WARNING_MESSAGE);
+					break;
+				case ERROR:
+					JOptionPane.showMessageDialog(lblTexto, getStatusText(), "", JOptionPane.ERROR_MESSAGE);
+					break;
+				}
+			}
+		});
+    	menu.add(item);
+    	item = new JMenuItem("Clear");
+    	item.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				clearMessage();
+			}
+		});
+    	menu.add(item);
+    	menu.addSeparator();
+    	item = new JMenuItem("Cancel");
+    	menu.add(item);
+    	
+    	this.lblTexto.addMouseListener( new MouseListener() {
+			public void mouseReleased(MouseEvent e) {
+				if( e.isPopupTrigger() ) {
+					if( getStatusText().length() > 0 || estado!=INFO ) {
+						menu.show(lblTexto, e.getX(), e.getY());
+					}
+				}
+			}
+			public void mousePressed(MouseEvent e) {
+				if( e.isPopupTrigger() ) {
+					if( getStatusText().length() > 0 || estado!=INFO ) {
+						menu.show(lblTexto, e.getX(), e.getY());
+					}
+				}
+			}
+			public void mouseExited(MouseEvent e) {
+			}
+			public void mouseEntered(MouseEvent e) {
+			}
+			public void mouseClicked(MouseEvent e) {
+			}
+		});
+    }
+    
     /**
      * Gets the status bar main text.
      * 
@@ -204,7 +306,7 @@
         }
 
         this.estado = INFO;
-        lblIcon.setIcon(infoIcon);
+        lblIcon.setIcon(getImageIcon("statusbar-info"));
         lblTexto.setText(texto);
     }
 
@@ -224,7 +326,7 @@
             contenidoTemporal = true;
         }
         this.estado = WARNING;
-        lblIcon.setIcon(warningIcon);
+        lblIcon.setIcon(getImageIcon("statusbar-warning"));
         lblTexto.setText(texto);
     }
 
@@ -245,7 +347,7 @@
         }
 
         this.estado = ERROR;
-        lblIcon.setIcon(errorIcon);
+        lblIcon.setIcon(getImageIcon("statusbar-error"));
         lblTexto.setText(texto);
     }
 
@@ -265,7 +367,7 @@
             estadoAnterior = INFO;
         } else {
             lblTexto.setText(texto);
-            lblIcon.setIcon(infoIcon);
+            lblIcon.setIcon(getImageIcon("statusbar-info"));
             estado = INFO;
         }
     }
@@ -286,7 +388,7 @@
             estadoAnterior = WARNING;
         } else {
             lblTexto.setText(texto);
-            lblIcon.setIcon(warningIcon);
+            lblIcon.setIcon(getImageIcon("statusbar-warning"));
             estado = WARNING;
         }
     }
@@ -307,7 +409,7 @@
             estadoAnterior = ERROR;
         } else {
             lblTexto.setText(texto);
-            lblIcon.setIcon(errorIcon);
+            lblIcon.setIcon(getImageIcon("statusbar-error"));
             estado = ERROR;
         }
     }
@@ -453,7 +555,7 @@
                 if (control != null)
                     control.setValue(msg);
             } catch (ClassCastException ex) {
-                LOG.debug("no label called " + id);
+                logger.debug("no label called " + id);
             }
         }
 
@@ -473,7 +575,7 @@
         if (control != null) {
             control.setValue(value);
         } else {
-            LOG.debug("NewStatusBar -- no control called " + id);
+            logger.debug("NewStatusBar -- no control called " + id);
         }
     }
 
@@ -530,9 +632,7 @@
             controls.put(control.getName(), control);
             controlContainer.add(control);
         } else {
-            LOG
-                .debug("NewStatusBar.addControl -- control 'id' already exists"
-                    + id);
+            logger.debug("NewStatusBar.addControl -- control 'id' already exists" + id);
         }
     }
 
@@ -549,7 +649,7 @@
             controls.remove(id);
             return component;
         } catch (ClassCastException ex) {
-            LOG.debug("NewStatusBar.removeControl -- control " + id
+            logger.debug("NewStatusBar.removeControl -- control " + id
                 + "doesn't exist");
         }
         return null;
Index: branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/ui/mdiFrame/KeyMapping.java
===================================================================
--- branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/ui/mdiFrame/KeyMapping.java	(revision 38563)
+++ branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/ui/mdiFrame/KeyMapping.java	(revision 38564)
@@ -40,10 +40,17 @@
  */
 package org.gvsig.andami.ui.mdiFrame;
 
+import java.awt.Toolkit;
+import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
 import java.util.HashMap;
+import java.util.Map;
 
+import javax.swing.KeyStroke;
+
 import org.gvsig.andami.messages.Messages;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 
@@ -51,51 +58,65 @@
  * Clase que sirve para obtener los codigos de las teclas de la manera que las
  * requieren los JMenu a partir de un caracter que representa dicha tecla
  *
- * @author Fernando Gonz�lez Cort�s
  */
 public class KeyMapping {
+	private static Logger logger = LoggerFactory.getLogger(KeyMapping.class);
+	
     /** Asocia caracteres con KeyEvents */
-    private static HashMap key = new HashMap();
+    private static Map<String,Integer> keys = new HashMap<String, Integer>();
 
     static {
-        key.put(new Character('a'), new Integer(KeyEvent.VK_A));
-        key.put(new Character('b'), new Integer(KeyEvent.VK_B));
-        key.put(new Character('c'), new Integer(KeyEvent.VK_C));
-        key.put(new Character('d'), new Integer(KeyEvent.VK_D));
-        key.put(new Character('e'), new Integer(KeyEvent.VK_E));
-        key.put(new Character('f'), new Integer(KeyEvent.VK_F));
-        key.put(new Character('g'), new Integer(KeyEvent.VK_G));
-        key.put(new Character('h'), new Integer(KeyEvent.VK_H));
-        key.put(new Character('i'), new Integer(KeyEvent.VK_I));
-        key.put(new Character('j'), new Integer(KeyEvent.VK_J));
-        key.put(new Character('k'), new Integer(KeyEvent.VK_K));
-        key.put(new Character('l'), new Integer(KeyEvent.VK_L));
-        key.put(new Character('m'), new Integer(KeyEvent.VK_M));
-        key.put(new Character('n'), new Integer(KeyEvent.VK_N));
-        key.put(new Character('o'), new Integer(KeyEvent.VK_O));
-        key.put(new Character('p'), new Integer(KeyEvent.VK_P));
-        key.put(new Character('q'), new Integer(KeyEvent.VK_Q));
-        key.put(new Character('r'), new Integer(KeyEvent.VK_R));
-        key.put(new Character('s'), new Integer(KeyEvent.VK_S));
-        key.put(new Character('t'), new Integer(KeyEvent.VK_T));
-        key.put(new Character('u'), new Integer(KeyEvent.VK_U));
-        key.put(new Character('v'), new Integer(KeyEvent.VK_V));
-        key.put(new Character('w'), new Integer(KeyEvent.VK_W));
-        key.put(new Character('x'), new Integer(KeyEvent.VK_X));
-        key.put(new Character('y'), new Integer(KeyEvent.VK_Y));
-        key.put(new Character('z'), new Integer(KeyEvent.VK_Z));
-        key.put(new Character('0'), new Integer(KeyEvent.VK_0));
-        key.put(new Character('1'), new Integer(KeyEvent.VK_1));
-        key.put(new Character('2'), new Integer(KeyEvent.VK_2));
-        key.put(new Character('3'), new Integer(KeyEvent.VK_3));
-        key.put(new Character('4'), new Integer(KeyEvent.VK_4));
-        key.put(new Character('5'), new Integer(KeyEvent.VK_5));
-        key.put(new Character('6'), new Integer(KeyEvent.VK_6));
-        key.put(new Character('7'), new Integer(KeyEvent.VK_7));
-        key.put(new Character('8'), new Integer(KeyEvent.VK_8));
-        key.put(new Character('9'), new Integer(KeyEvent.VK_9));
-        key.put(new Character('+'), new Integer(KeyEvent.VK_PLUS));
-        key.put(new Character('-'), new Integer(KeyEvent.VK_MINUS));       
+        keys.put("a", new Integer(KeyEvent.VK_A));
+        keys.put("b", new Integer(KeyEvent.VK_B));
+        keys.put("c", new Integer(KeyEvent.VK_C));
+        keys.put("d", new Integer(KeyEvent.VK_D));
+        keys.put("e", new Integer(KeyEvent.VK_E));
+        keys.put("f", new Integer(KeyEvent.VK_F));
+        keys.put("g", new Integer(KeyEvent.VK_G));
+        keys.put("h", new Integer(KeyEvent.VK_H));
+        keys.put("i", new Integer(KeyEvent.VK_I));
+        keys.put("j", new Integer(KeyEvent.VK_J));
+        keys.put("k", new Integer(KeyEvent.VK_K));
+        keys.put("l", new Integer(KeyEvent.VK_L));
+        keys.put("m", new Integer(KeyEvent.VK_M));
+        keys.put("n", new Integer(KeyEvent.VK_N));
+        keys.put("o", new Integer(KeyEvent.VK_O));
+        keys.put("p", new Integer(KeyEvent.VK_P));
+        keys.put("q", new Integer(KeyEvent.VK_Q));
+        keys.put("r", new Integer(KeyEvent.VK_R));
+        keys.put("s", new Integer(KeyEvent.VK_S));
+        keys.put("t", new Integer(KeyEvent.VK_T));
+        keys.put("u", new Integer(KeyEvent.VK_U));
+        keys.put("v", new Integer(KeyEvent.VK_V));
+        keys.put("w", new Integer(KeyEvent.VK_W));
+        keys.put("x", new Integer(KeyEvent.VK_X));
+        keys.put("y", new Integer(KeyEvent.VK_Y));
+        keys.put("z", new Integer(KeyEvent.VK_Z));
+        keys.put("0", new Integer(KeyEvent.VK_0));
+        keys.put("1", new Integer(KeyEvent.VK_1));
+        keys.put("2", new Integer(KeyEvent.VK_2));
+        keys.put("3", new Integer(KeyEvent.VK_3));
+        keys.put("4", new Integer(KeyEvent.VK_4));
+        keys.put("5", new Integer(KeyEvent.VK_5));
+        keys.put("6", new Integer(KeyEvent.VK_6));
+        keys.put("7", new Integer(KeyEvent.VK_7));
+        keys.put("8", new Integer(KeyEvent.VK_8));
+        keys.put("9", new Integer(KeyEvent.VK_9));
+        keys.put("+", new Integer(KeyEvent.VK_PLUS));
+        keys.put("-", new Integer(KeyEvent.VK_MINUS));       
+        keys.put("F1", new Integer(KeyEvent.VK_F1));       
+        keys.put("F2", new Integer(KeyEvent.VK_F2));       
+        keys.put("F3", new Integer(KeyEvent.VK_F3));       
+        keys.put("F4", new Integer(KeyEvent.VK_F4));       
+        keys.put("F5", new Integer(KeyEvent.VK_F5));       
+        keys.put("F6", new Integer(KeyEvent.VK_F6));       
+        keys.put("F7", new Integer(KeyEvent.VK_F7));       
+        keys.put("F8", new Integer(KeyEvent.VK_F8));       
+        keys.put("F9", new Integer(KeyEvent.VK_F9));       
+        keys.put("F10", new Integer(KeyEvent.VK_F10));       
+        keys.put("F11", new Integer(KeyEvent.VK_F11));       
+        keys.put("F12", new Integer(KeyEvent.VK_F12));       
+        keys.put("DELETE", new Integer(KeyEvent.VK_DELETE));       
     }
 
     /**
@@ -109,13 +130,57 @@
      * @throws RuntimeException Si el caracter no tiene una tecla asociada
      */
     public static int getKey(char a) {
-        Integer ret = (Integer) key.get(new Character(a));
-
+        Integer ret = (Integer) keys.get(String.valueOf(a));
         if (ret == null) {
             throw new RuntimeException(Messages.getString(
                     "KeyMapping.Caracter_no_valido") + a); //$NON-NLS-1$
         }
-
         return ret.intValue();
     }
+    
+    public static KeyStroke getKeyStroke(String accelerator) {
+    	if( accelerator == null ) {
+    		return null;
+    	}
+    	accelerator = accelerator.trim();
+    	if( accelerator.length() < 1 ) {
+    		return null;
+    	}
+    	String[] parts = accelerator.toLowerCase().split("[+]");
+    	int modifiers = 0;
+    	int key = 0;
+    	for( int i=0; i<parts.length ; i++) {
+    		String part = parts[i];
+    		if( "ctrl".equals(part) ) {
+    			modifiers = modifiers | InputEvent.CTRL_MASK;
+    		} else if( "shift".equals(part) ) {
+    			modifiers = modifiers | InputEvent.SHIFT_MASK;
+    		} else if( "meta".equals(part) ) {
+    			modifiers = modifiers | InputEvent.META_MASK;
+    		} else if( "alt".equals(part) ) {
+    			modifiers = modifiers | InputEvent.ALT_MASK;
+    		} else if( "".equals(part) ) { // +
+    			key = KeyEvent.VK_PLUS;
+    		} else {
+    			Integer x = (Integer) keys.get(part);
+    			if( x != null ) {
+    				key = x.intValue();
+    			} else {
+    				try {
+    					throw new IllegalArgumentException();
+    				} catch (IllegalArgumentException ex) {
+    					logger.info("getKeyStroke('"+accelerator+"') malformed accelerator.",ex);
+    				}
+    				return null;
+    			}
+    		}
+    	}
+    	if( key == 0 ) {
+    		return null;
+    	}
+    	if( modifiers == 0 ) {
+    		modifiers = Toolkit.getDefaultToolkit().getMenuShortcutKeyMask();
+    	}
+    	return KeyStroke.getKeyStroke(key,modifiers);
+    }
 }
Index: branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/ui/mdiFrame/MDIFrame.java
===================================================================
--- branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/ui/mdiFrame/MDIFrame.java	(revision 38563)
+++ branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/ui/mdiFrame/MDIFrame.java	(revision 38564)
@@ -45,7 +45,6 @@
 import java.awt.Dimension;
 import java.awt.FlowLayout;
 import java.awt.Insets;
-import java.awt.Toolkit;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.ComponentEvent;
@@ -73,20 +72,24 @@
 import javax.swing.JFrame;
 import javax.swing.JMenu;
 import javax.swing.JMenuBar;
+import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
 import javax.swing.JSeparator;
-import javax.swing.KeyStroke;
 import javax.swing.MenuElement;
 import javax.swing.SwingUtilities;
 import javax.swing.Timer;
 import javax.swing.WindowConstants;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.Launcher;
 import org.gvsig.andami.LibraryExtension;
 import org.gvsig.andami.PluginServices;
+import org.gvsig.andami.PluginsLocator;
+import org.gvsig.andami.actioninfo.ActionInfo;
+import org.gvsig.andami.actioninfo.ActionInfoManager;
+import org.gvsig.andami.actioninfo.ActionInfoStatusCache;
 import org.gvsig.andami.messages.Messages;
-import org.gvsig.andami.messages.NotificationManager;
 import org.gvsig.andami.plugins.ExtensionDecorator;
 import org.gvsig.andami.plugins.IExtension;
 import org.gvsig.andami.plugins.PluginClassLoader;
@@ -100,6 +103,8 @@
 import org.gvsig.andami.ui.mdiManager.MDIManager;
 import org.gvsig.andami.ui.mdiManager.MDIManagerFactory;
 import org.gvsig.gui.beans.controls.IControl;
+import org.gvsig.tools.swing.api.ToolsSwingLocator;
+import org.gvsig.tools.swing.icontheme.IconTheme;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -269,7 +274,9 @@
         if (!SwingUtilities.isEventDispatchThread()) {
             throw new RuntimeException("No Event Dispatch Thread");
         }
-
+        
+        Class<? extends IExtension> classExtension = (Class<? extends IExtension>) loader.loadClass(ext.getClassName());
+        
         // Para traducir
         PluginServices ps =
             PluginServices.getPluginServices(loader.getPluginName());
@@ -301,8 +308,6 @@
         btn.setVisible(false);
         String name = toolBar.getName();
 
-        MDIManagerFactory.createManager().registerAction(ext.getClassName(), selectableTool);
-        
         SelectableToolBar jtb = (SelectableToolBar) toolBarMap.get(name);
 
         if (jtb == null) {
@@ -330,7 +335,7 @@
                 btn.getActionCommand());
         }
 
-        controlClass.put(btn, loader.loadClass(ext.getClassName()));
+        controlClass.put(btn, classExtension);
 
         if (selectableTool.getName() != null) {
             btn.setName(selectableTool.getName());
@@ -370,15 +375,14 @@
         if (!SwingUtilities.isEventDispatchThread()) {
             throw new RuntimeException("No Event Dispatch Thread");
         }
-
+        Class<? extends IExtension> classExtension = (Class<? extends IExtension>) loader.loadClass(ext.getClassName());
+        
         // Para traducir los textos que vengan
         PluginServices ps =
             PluginServices.getPluginServices(loader.getPluginName());
 
         JToolBarButton btn;
-        ImageIcon image =
-            PluginServices.getIconTheme().get(actionTool.getIcon(),
-                ps.getClassLoader());
+        ImageIcon image = IconThemeHelper.getImageIcon(actionTool.getIcon());
 
         if (image != null) {
             btn = new JToolBarButton(actionTool.getText(), image);
@@ -398,8 +402,6 @@
         btn.setEnabled(false);
         btn.setVisible(false);
 
-        MDIManagerFactory.createManager().registerAction(ext.getClassName(), actionTool);
-        
         String name = toolBar.getName();
 
         SelectableToolBar jtb = (SelectableToolBar) toolBarMap.get(name);
@@ -414,7 +416,7 @@
 
         jtb.add(btn);
 
-        controlClass.put(btn, loader.loadClass(ext.getClassName()));
+        controlClass.put(btn, classExtension);
 
         if (actionTool.getName() != null) {
             btn.setName(actionTool.getName());
@@ -511,20 +513,8 @@
         if (!SwingUtilities.isEventDispatchThread()) {
             throw new RuntimeException("No Event Dispatch Thread");
         }
+		JMenu menuPadre = createMenuAncestors(menu, loader);
 
-        JMenu menuPadre = createMenuAncestors(menu, loader);
-
-        // Se registra y a�ade el menu
-        /*
-         * String[] aux = menu.getText().split("/");
-         * 
-         * if (aux.length == 2)
-         * if (aux[1].equals("----"))
-         * {
-         * menuPadre.addSeparator();
-         * return;
-         * }
-         */
         if (menu.getIs_separator()) {
             menuPadre.addSeparator();
             return;
@@ -532,13 +522,10 @@
 
         JMenuItem nuevoMenu = createJMenuItem(loader, menu);
         nuevoMenu.addMouseListener(tooltipListener);
-        nuevoMenu.addActionListener(this);
+        //nuevoMenu.addActionListener(this);
         menuPadre.add(nuevoMenu);
-        controlClass.put(nuevoMenu, loader.loadClass(ext.getClassName()));
-
-        MDIManagerFactory.createManager().registerAction(ext.getClassName(), menu);
-
-        
+        Class<? extends IExtension> classExtension = (Class<? extends IExtension>) loader.loadClass(ext.getClassName());
+        controlClass.put(nuevoMenu, classExtension);
     }
 
     /**
@@ -743,15 +730,31 @@
      *            Evento producido
      */
     public void actionPerformed(ActionEvent e) {
-        Object control = e.getSource();
-        org.gvsig.andami.plugins.IExtension ext =
-            (org.gvsig.andami.plugins.IExtension) classesExtensions
-                .get(controlClass.get(control));
-        String actionCommand = e.getActionCommand();
+        
+//        org.gvsig.andami.plugins.IExtension ext =
+//            (org.gvsig.andami.plugins.IExtension) classesExtensions
+//                .get(controlClass.get(control));
+    	String actionName = "(unknow)";
         try {
-            logger.info("{}.execute('{}')", ext.getClass().getSimpleName(), actionCommand);
-            ext.execute(actionCommand);
+            JComponent control = (JComponent) e.getSource();
+            actionName = control.getName();
+            
+        	ActionInfoManager actionManager = PluginsLocator.getActionInfoManager();
+        	ActionInfo action = actionManager.getAction(control.getName());
+        	Object args = null;
+            if( control instanceof IControl ) {
+            	args = ((IControl) control).getValue();
+            }
+            if( args == null ) {
+            	action.execute();
+            } else {
+            	action.execute(args);            	
+            }
+        	
+//            logger.info("{}.execute('{}')", ext.getClass().getSimpleName(), actionCommand);
+//            ext.execute(actionCommand);
 
+        	String actionCommand = e.getActionCommand();
             try {
                 JToolBarToggleButton toggle = (JToolBarToggleButton) control;
                 ToggleButtonModel model = (ToggleButtonModel) toggle.getModel();
@@ -760,14 +763,15 @@
             } catch (NullPointerException ex) {
             }
 
-        } catch (RuntimeException t) {
-            if (ext == null) {
-                logger.error(Messages
-                    .getString("No_extension_associated_with_this_event_")
-                    + e.getActionCommand());
-            }
-            NotificationManager.addError(Messages
-                .getString("MDIFrame.Error_no_capturado_por_el_usuario"), t);
+        } catch (Throwable ex) {
+        	logger.error("Can't perform action '"+actionName+"'.",ex);
+//            if (ext == null) {
+//                logger.error(Messages
+//                    .getString("No_extension_associated_with_this_event_")
+//                    + e.getActionCommand());
+//            }
+//            NotificationManager.addError(Messages
+//                .getString("MDIFrame.Error_no_capturado_por_el_usuario"), t);
         }
 
         enableControls();
@@ -818,13 +822,9 @@
             popupMap.put(name, popupMenu);
         }
 
-        // Se a�aden las entradas
         Menu[] menues = menu.getMenu();
-
         for (int i = 0; i < menues.length; i++) {
-            // Se registra y a�ade el menu
             JMenuItem nuevoMenu = createJMenuItem(loader, menues[i]);
-
             popupMenu.add(nuevoMenu);
         }
     }
@@ -845,53 +845,38 @@
 
         PluginServices ps =
             PluginServices.getPluginServices(loader.getPluginName());
+        
         String text = menu.getText();
-        text = text.substring(text.lastIndexOf('/') + 1);
+        int n = text.lastIndexOf('/');
+        if( n>=0  ) {
+        	text = text.substring(n + 1);
+        }
         String translatedText = ps.getText(text);
 
+        IconTheme iconTheme = ToolsSwingLocator.getIconThemeManager().getCurrent();
         if (menu.getIcon() != null) {
-            ImageIcon image =
-                PluginServices.getIconTheme().get(menu.getIcon(),
-                    ps.getClassLoader());
-            if (image != null) {
+        	if( iconTheme.exists(menu.getIcon()) ) {
+        		ImageIcon image = iconTheme.get(menu.getIcon());
                 nuevoMenu = new JMenuItem(translatedText, image);
             } else {
-                nuevoMenu =
-                    new JMenuItem(translatedText, PluginServices.getIconTheme()
-                        .get(noIcon));
-                logger.error(PluginServices
-                    .getText(this, "Unable_to_find_icon")
-                    + ": "
-                    + menu.getIcon());
+                nuevoMenu = new JMenuItem(translatedText);
+                logger.info("menu icon '"+ menu.getIcon()+ "' not exists.");
             }
         } else {
             nuevoMenu = new JMenuItem(translatedText);
         }
-        nuevoMenu.setName(text);
-        if (menu.getMnemonic() != null) {
-            if (menu.getMnemonic().length() != 1) {
-                throw new RuntimeException(
-                    "Mnemonic must be 1 character length");
-            }
+        nuevoMenu.setName(menu.getName());
+//		if (menu.getMnemonic() != null) {
+//			if (menu.getMnemonic().length() != 1) {
+//				throw new RuntimeException(
+//						"Mnemonic must be 1 character length");
+//			}
+//			nuevoMenu.setMnemonic(KeyMapping.getKey(menu.getMnemonic()
+//					.charAt(0)));
+//		}
 
-            nuevoMenu.setMnemonic(KeyMapping.getKey(menu.getMnemonic()
-                .charAt(0)));
-        }
-
         if (menu.getKey() != null) {
-            String osName = System.getProperty("os.name");
-            boolean MAC_OS_X = osName.toLowerCase().startsWith("mac os x");
-            if (MAC_OS_X) {
-                // en OS X, en vez de hardwiring la ShortcutKey, usamos el
-                // default sugerido por el OS
-                nuevoMenu.setAccelerator(KeyStroke.getKeyStroke(KeyMapping
-                    .getKey(menu.getKey().charAt(0)), Toolkit
-                    .getDefaultToolkit().getMenuShortcutKeyMask()));
-            } else {
-                nuevoMenu.setAccelerator(KeyStroke.getKeyStroke(
-                    KeyMapping.getKey(menu.getKey().charAt(0)),
-                    ActionEvent.ALT_MASK));
-            }
+            nuevoMenu.setAccelerator(KeyMapping.getKeyStroke(menu.getKey()));
         }
 
         nuevoMenu.setActionCommand(menu.getActionCommand());
@@ -907,6 +892,13 @@
         nuevoMenu.setEnabled(true);
         nuevoMenu.setVisible(true);
 
+        if( menu.getName() != null ) {
+    		ActionInfoManager actionManager = PluginsLocator.getActionInfoManager();
+    		final ActionInfo actionInfo = actionManager.getAction(menu.getName());
+    		if( actionInfo != null ) {
+    			nuevoMenu.addActionListener(actionInfo);
+    		}
+        }
         return nuevoMenu;
     }
 
@@ -1004,76 +996,96 @@
      */
     public void enableControls() {
         if (!SwingUtilities.isEventDispatchThread()) {
-            throw new RuntimeException("No Event Dispatch Thread");
+        	SwingUtilities.invokeLater(new Runnable() {
+				public void run() {
+					enableControls();
+				}
+			});
+			return;
         }
 
+        ActionInfoManager actionManager = PluginsLocator.getActionInfoManager();
+        ActionInfoStatusCache cache = actionManager.createActionStatusCache();
+        
         Iterator e = classesExtensions.values().iterator();
-        HashMap estadoExtensiones = new HashMap();
-        HashMap visibilidadExtensiones = new HashMap();
 
-        while (e.hasNext()) {
-            ExtensionDecorator ext = (ExtensionDecorator) e.next();
+//        HashMap estadoExtensiones = new HashMap();
+//        HashMap visibilidadExtensiones = new HashMap();
+//
+//        while (e.hasNext()) {
+//            ExtensionDecorator ext = (ExtensionDecorator) e.next();
+//
+//            try {
+//                if (estadoExtensiones.get(ext) == null) {
+//                    boolean b;
+//                    if (ext.getVisibility() == ExtensionDecorator.ALWAYS_VISIBLE) {
+//                        b = true;
+//                    } else
+//                        if (ext.getVisibility() == ExtensionDecorator.ALWAYS_INVISIBLE) {
+//                            b = false;
+//                        } else {
+//                            if (PluginServices.getExclusiveUIExtension() == null) {
+//                                b = ext.isVisible();
+//                            } else {
+//                                b =
+//                                    PluginServices.getExclusiveUIExtension()
+//                                        .isVisible(ext.getExtension());
+//                            }
+//                        }
+//                    Boolean visible = new Boolean(b);
+//                    Boolean enabled = new Boolean(false);
+//
+//                    if (visible.booleanValue()) {
+//                        if (PluginServices.getExclusiveUIExtension() == null) {
+//                            enabled = new Boolean(ext.isEnabled());
+//                        } else {
+//                            enabled =
+//                                new Boolean(PluginServices
+//                                    .getExclusiveUIExtension().isEnabled(
+//                                        ext.getExtension()));
+//                        }
+//
+//                    }
+//
+//                    estadoExtensiones.put(ext, enabled);
+//                    visibilidadExtensiones.put(ext, visible);
+//                }
+//            } catch (Throwable e1) {
+//                NotificationManager.addError(Messages
+//                    .getString("MDIFrame.Error_no_capturado_por_el_usuario"),
+//                    e1);
+//                estadoExtensiones.put(ext, Boolean.FALSE);
+//            }
+//        }
 
-            try {
-                if (estadoExtensiones.get(ext) == null) {
-                    boolean b;
-                    if (ext.getVisibility() == ExtensionDecorator.ALWAYS_VISIBLE) {
-                        b = true;
-                    } else
-                        if (ext.getVisibility() == ExtensionDecorator.ALWAYS_INVISIBLE) {
-                            b = false;
-                        } else {
-                            if (PluginServices.getExclusiveUIExtension() == null) {
-                                b = ext.isVisible();
-                            } else {
-                                b =
-                                    PluginServices.getExclusiveUIExtension()
-                                        .isVisible(ext.getExtension());
-                            }
-                        }
-                    Boolean visible = new Boolean(b);
-                    Boolean enabled = new Boolean(false);
-
-                    if (visible.booleanValue()) {
-                        if (PluginServices.getExclusiveUIExtension() == null) {
-                            enabled = new Boolean(ext.isEnabled());
-                        } else {
-                            enabled =
-                                new Boolean(PluginServices
-                                    .getExclusiveUIExtension().isEnabled(
-                                        ext.getExtension()));
-                        }
-
-                    }
-
-                    estadoExtensiones.put(ext, enabled);
-                    visibilidadExtensiones.put(ext, visible);
-                }
-            } catch (Throwable e1) {
-                NotificationManager.addError(Messages
-                    .getString("MDIFrame.Error_no_capturado_por_el_usuario"),
-                    e1);
-                estadoExtensiones.put(ext, Boolean.FALSE);
-            }
-        }
-
         // Enable or disable controls, according to its associated extensions
         e = controlClass.keySet().iterator();
 
         while (e.hasNext()) {
             JComponent control = (JComponent) e.next();
+            String actionlName = control.getName();
+            ActionInfo action = actionManager.getAction(actionlName);
+            try {
+//            	
+//                org.gvsig.andami.plugins.IExtension ext =
+//                    (org.gvsig.andami.plugins.IExtension) classesExtensions
+//                        .get(controlClass.get(control));
+//                boolean enabled =
+//                    ((Boolean) estadoExtensiones.get(ext)).booleanValue();
+//                boolean visible =
+//                    ((Boolean) visibilidadExtensiones.get(ext)).booleanValue();
 
-            try {
-                org.gvsig.andami.plugins.IExtension ext =
-                    (org.gvsig.andami.plugins.IExtension) classesExtensions
-                        .get(controlClass.get(control));
-                boolean enabled =
-                    ((Boolean) estadoExtensiones.get(ext)).booleanValue();
-                boolean visible =
-                    ((Boolean) visibilidadExtensiones.get(ext)).booleanValue();
+                boolean enabled = false;
+                boolean visible = cache.isVisible(action);
+                if( visible ) {
+                	enabled = cache.isEnabled(action);
+                }
+                    
                 control.setEnabled(enabled);
                 control.setVisible(visible);
             } catch (Exception ex) {
+            	logger.info("Can't enable/show control '"+actionlName +"'.",ex);
+            	this.message("Can't enable/show control '"+actionlName +"'.", JOptionPane.ERROR_MESSAGE);
                 control.setEnabled(false);
                 control.setVisible(false);
             }
@@ -1146,8 +1158,41 @@
 
         showMemory();
     }
+    
+    public void refreshControls() {
+        if (!SwingUtilities.isEventDispatchThread()) {
+        	SwingUtilities.invokeLater(new Runnable() {
+				public void run() {
+					enableControls();
+				}
+			});
+			return;
+        }
 
-    /**
+        ActionInfoManager actionManager = PluginsLocator.getActionInfoManager();
+        ActionInfoStatusCache cache = actionManager.createActionStatusCache();
+        
+        Iterator e = controlClass.keySet().iterator();
+
+        while (e.hasNext()) {
+            JComponent control = (JComponent) e.next();
+            String actionlName = control.getName();
+            ActionInfo action = actionManager.getAction(actionlName);
+            if( action!=null ) {
+	            if( control instanceof AbstractButton ) {
+	            	AbstractButton button = (AbstractButton) control;
+	            	button.setIcon(action.getIcon());
+	            }
+            }
+        }
+        enableControls();
+    }
+
+    public void message(String msg, int messageTyoe) {
+    	this.getStatusBar().message(msg, messageTyoe);
+	}
+
+	/**
      * Establece la visibilidad de un menu y todos sus descendientes en la
      * jerarquia teniendo en cuenta la visibilidad de todos los submenus.
      * 
@@ -1479,7 +1524,14 @@
         // Se registra y a�ade el menu
         JMenuItem nuevoMenu = createJMenuItem(loader, menu);
         nuevoMenu.addMouseListener(tooltipListener);
-        nuevoMenu.addActionListener(listener);
+        if( listener != null ) {
+    		ActionInfoManager actionManager = PluginsLocator.getActionInfoManager();
+    		final ActionInfo actionInfo = actionManager.getAction(menu.getName());
+    		if( actionInfo != null ) {
+    			nuevoMenu.removeActionListener(actionInfo);
+    		}
+        	nuevoMenu.addActionListener(listener);
+        }
         menuPadre.add(nuevoMenu);
 
         infoCodedMenus.put(menu, nuevoMenu);
Index: branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/ui/mdiManager/MDIManager.java
===================================================================
--- branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/ui/mdiManager/MDIManager.java	(revision 38563)
+++ branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/ui/mdiManager/MDIManager.java	(revision 38564)
@@ -41,14 +41,10 @@
 package org.gvsig.andami.ui.mdiManager;
 
 import java.beans.PropertyVetoException;
-import java.util.Iterator;
 
 import javax.swing.ImageIcon;
 import javax.swing.JPanel;
 
-import org.gvsig.andami.plugins.config.generate.ActionTool;
-import org.gvsig.andami.plugins.config.generate.Menu;
-import org.gvsig.andami.plugins.config.generate.SelectableTool;
 import org.gvsig.andami.ui.mdiFrame.MDIFrame;
 import org.gvsig.tools.swing.api.windowmanager.WindowManager;
 import org.gvsig.tools.swing.api.windowmanager.WindowManager.MODE;
@@ -86,17 +82,6 @@
  */
 public interface MDIManager {
 	
-	public interface UIActionTool {
-		public String getExtensionName();
-		public String getName();
-		public String getText();
-		public String getCommand();
-		public String getIconName();
-		public String getEnableText();
-		public String getTooptip();
-		public int getPosition();
-	}
-	
     /**
      * Initializes the MDIFrame. It must be called before starting
      * to use it. It receives the application's main frame
@@ -334,10 +319,4 @@
      * Theme.MOSAIC and Theme.EXPAND.
      */
 	public void setBackgroundImage(ImageIcon image, String typeDesktop);
-
-	public void registerAction(String extensionName, ActionTool action);
-	public void registerAction(String extensionName, SelectableTool action);
-	public void registerAction(String extensionName, Menu action);
-	
-	public Iterator<UIActionTool> getActionTools();
 }
Index: branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/authentication/LoginUI.java
===================================================================
--- branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/authentication/LoginUI.java	(revision 38563)
+++ branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/authentication/LoginUI.java	(revision 38564)
@@ -38,7 +38,7 @@
 	//Cambiar esto para que coja un icono de una ruta que se lee de un xml
 
 	static private ImageIcon gvsigIcon = PluginServices
-		.getIconTheme().get("login-gvsig");
+		.getIconTheme().get("login-image");
 
 	IAuthentication authentication;
 
Index: branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/plugins/IExtensionExecuteWithArgs.java
===================================================================
--- branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/plugins/IExtensionExecuteWithArgs.java	(revision 0)
+++ branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/plugins/IExtensionExecuteWithArgs.java	(revision 38564)
@@ -0,0 +1,6 @@
+package org.gvsig.andami.plugins;
+
+public interface IExtensionExecuteWithArgs {
+
+	public void execute(String action, Object[] args);
+}

Property changes on: branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/plugins/IExtensionExecuteWithArgs.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/plugins/IExtensionQueryByAction.java
===================================================================
--- branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/plugins/IExtensionQueryByAction.java	(revision 0)
+++ branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/plugins/IExtensionQueryByAction.java	(revision 38564)
@@ -0,0 +1,10 @@
+package org.gvsig.andami.plugins;
+
+public interface IExtensionQueryByAction {
+
+	public boolean canQueryByAction(); 
+	
+	public boolean isEnabled(String action);
+	public boolean isVisible(String action);
+	
+}

Property changes on: branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/plugins/IExtensionQueryByAction.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/plugins/config/generate/ActionToolDescriptor.java
===================================================================
--- branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/plugins/config/generate/ActionToolDescriptor.java	(revision 38563)
+++ branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/plugins/config/generate/ActionToolDescriptor.java	(revision 38564)
@@ -195,7 +195,7 @@
             }
         } );
         desc.setHandler(handler);
-        desc.setRequired(true);
+//        desc.setRequired(true);
         addFieldDescriptor(desc);
         
         //-- validation code for: _icon
@@ -321,7 +321,7 @@
         }
         desc.setValidator(fieldValidator);
         //-- _position
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_position", "position", org.exolab.castor.xml.NodeType.Attribute);
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Long.TYPE, "_position", "position", org.exolab.castor.xml.NodeType.Attribute);
         handler = (new org.exolab.castor.xml.XMLFieldHandler() {
             public java.lang.Object getValue( java.lang.Object object ) 
                 throws IllegalStateException
@@ -329,7 +329,7 @@
                 ActionTool target = (ActionTool) object;
                 if(!target.hasPosition())
                     return null;
-                return new java.lang.Integer(target.getPosition());
+                return new java.lang.Long(target.getPosition());
             }
             public void setValue( java.lang.Object object, java.lang.Object value) 
                 throws IllegalStateException, IllegalArgumentException
@@ -341,7 +341,7 @@
                         target.deletePosition();
                         return;
                     }
-                    target.setPosition( ((java.lang.Integer)value).intValue());
+                    target.setPosition( ((java.lang.Long)value).longValue());
                 }
                 catch (java.lang.Exception ex) {
                     throw new IllegalStateException(ex.toString());
@@ -357,7 +357,7 @@
         //-- validation code for: _position
         fieldValidator = new org.exolab.castor.xml.FieldValidator();
         { //-- local scope
-            IntegerValidator typeValidator= new IntegerValidator();
+        	LongValidator typeValidator= new LongValidator();
             fieldValidator.setValidator(typeValidator);
         }
         desc.setValidator(fieldValidator);
Index: branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/plugins/config/generate/ActionTool.java
===================================================================
--- branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/plugins/config/generate/ActionTool.java	(revision 38563)
+++ branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/plugins/config/generate/ActionTool.java	(revision 38564)
@@ -76,7 +76,7 @@
     /**
      * Field _position
      */
-    private int _position;
+    private long _position;
 
     /**
      * keeps track of state for field: _position
@@ -168,7 +168,7 @@
      * 
      * @return the value of field 'position'.
      */
-    public int getPosition()
+    public long getPosition()
     {
         return this._position;
     } //-- int getPosition() 
@@ -303,7 +303,7 @@
      * 
      * @param position the value of field 'position'.
      */
-    public void setPosition(int position)
+    public void setPosition(long position)
     {
         this._position = position;
         this._has_position = true;
@@ -350,4 +350,18 @@
         validator.validate(this);
     } //-- void validate() 
 
+    public String toString() {
+    	StringBuffer buffer = new StringBuffer();
+    	buffer.append("ActionTool {");
+    	buffer.append("name='").append(this._name).append("', ");
+    	buffer.append("text='").append("', text='").append("', ");
+    	buffer.append("tooltip='").append(this._tooltip).append("', ");
+    	buffer.append("actionCommand='").append(this._actionCommand).append("', ");
+    	buffer.append("position='").append(this._position).append("', ");
+    	buffer.append("icon='").append(this._icon).append("', ");
+    	buffer.append("enableText='").append(this._enableText).append("', ");
+    	buffer.append("last='").append(this._last).append("' }");
+		return buffer.toString();
+	}
+    
 }
Index: branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/plugins/config/generate/ActionDescriptor.java
===================================================================
--- branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/plugins/config/generate/ActionDescriptor.java	(revision 0)
+++ branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/plugins/config/generate/ActionDescriptor.java	(revision 38564)
@@ -0,0 +1,408 @@
+/*
+ * This class was automatically generated with 
+ * <a href="http://www.castor.org">Castor 0.9.5.3</a>, using an XML
+ * Schema.
+ * $Id: ActionDescriptor.java 29593 2009-06-29 15:54:31Z jpiera $
+ */
+
+package org.gvsig.andami.plugins.config.generate;
+
+  //---------------------------------/
+ //- Imported classes and packages -/
+//---------------------------------/
+
+import org.exolab.castor.xml.validators.LongValidator;
+import org.exolab.castor.xml.validators.StringValidator;
+
+/**
+ * Class ActionDescriptor.
+ * 
+ * @version $Revision: 29593 $ $Date: 2009-06-29 17:54:31 +0200 (lun, 29 jun 2009) $
+ */
+public class ActionDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptorImpl {
+
+
+      //--------------------------/
+     //- Class/Member Variables -/
+    //--------------------------/
+
+    /**
+     * Field nsPrefix
+     */
+    private java.lang.String nsPrefix;
+
+    /**
+     * Field nsURI
+     */
+    private java.lang.String nsURI;
+
+    /**
+     * Field xmlName
+     */
+    private java.lang.String xmlName;
+
+    /**
+     * Field identity
+     */
+    private org.exolab.castor.xml.XMLFieldDescriptor identity;
+
+
+      //----------------/
+     //- Constructors -/
+    //----------------/
+
+    public ActionDescriptor() {
+        super();
+        xmlName = "action";
+        org.exolab.castor.xml.util.XMLFieldDescriptorImpl  desc           = null;
+        org.exolab.castor.xml.XMLFieldHandler              handler        = null;
+        org.exolab.castor.xml.FieldValidator               fieldValidator = null;
+        //-- initialize attribute descriptors
+        
+        //-- _actionCommand
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_actionCommand", "action-command", org.exolab.castor.xml.NodeType.Attribute);
+        desc.setImmutable(true);
+        handler = (new org.exolab.castor.xml.XMLFieldHandler() {
+            public java.lang.Object getValue( java.lang.Object object ) 
+                throws IllegalStateException
+            {
+                Action target = (Action) object;
+                return target.getActionCommand();
+            }
+            public void setValue( java.lang.Object object, java.lang.Object value) 
+                throws IllegalStateException, IllegalArgumentException
+            {
+                try {
+                	Action target = (Action) object;
+                    target.setActionCommand( (java.lang.String) value);
+                }
+                catch (java.lang.Exception ex) {
+                    throw new IllegalStateException(ex.toString());
+                }
+            }
+            public java.lang.Object newInstance( java.lang.Object parent ) {
+                return null;
+            }
+        } );
+        desc.setHandler(handler);
+        desc.setRequired(true);
+        addFieldDescriptor(desc);
+        
+        //-- validation code for: _actionCommand
+        fieldValidator = new MyFieldValidator();
+        { //-- local scope
+            StringValidator typeValidator = new StringValidator();
+            typeValidator.setWhiteSpace("preserve");
+            fieldValidator.setValidator(typeValidator);
+        }
+        desc.setValidator(fieldValidator);
+        
+        
+        //-- _accelerator
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_accelerator", "accelerator", org.exolab.castor.xml.NodeType.Attribute);
+        desc.setImmutable(true);
+        handler = (new org.exolab.castor.xml.XMLFieldHandler() {
+            public java.lang.Object getValue( java.lang.Object object ) 
+                throws IllegalStateException
+            {
+                Action target = (Action) object;
+                return target.getAccelerator();
+            }
+            public void setValue( java.lang.Object object, java.lang.Object value) 
+                throws IllegalStateException, IllegalArgumentException
+            {
+                try {
+                	Action target = (Action) object;
+                    target.setAccelerator((java.lang.String) value);
+                }
+                catch (java.lang.Exception ex) {
+                    throw new IllegalStateException(ex.toString());
+                }
+            }
+            public java.lang.Object newInstance( java.lang.Object parent ) {
+                return null;
+            }
+        } );
+        desc.setHandler(handler);
+        addFieldDescriptor(desc);
+        
+        //-- validation code for: _accelerator
+        fieldValidator = new org.exolab.castor.xml.FieldValidator();
+        { //-- local scope
+            StringValidator typeValidator = new StringValidator();
+            typeValidator.setWhiteSpace("preserve");
+            fieldValidator.setValidator(typeValidator);
+        }
+        desc.setValidator(fieldValidator);
+        
+        
+        
+        //-- _name
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_name", "name", org.exolab.castor.xml.NodeType.Attribute);
+        desc.setImmutable(true);
+        handler = (new org.exolab.castor.xml.XMLFieldHandler() {
+            public java.lang.Object getValue( java.lang.Object object ) 
+                throws IllegalStateException
+            {
+            	Action target = (Action) object;
+                return target.getName();
+            }
+            public void setValue( java.lang.Object object, java.lang.Object value) 
+                throws IllegalStateException, IllegalArgumentException
+            {
+                try {
+                	Action target = (Action) object;
+                    target.setName( (java.lang.String) value);
+                }
+                catch (java.lang.Exception ex) {
+                    throw new IllegalStateException(ex.toString());
+                }
+            }
+            public java.lang.Object newInstance( java.lang.Object parent ) {
+                return null;
+            }
+        } );
+        desc.setHandler(handler);
+        desc.setRequired(true);
+        addFieldDescriptor(desc);
+        
+        //-- validation code for: _name
+        
+        
+        
+        fieldValidator = new MyFieldValidator();
+        { //-- local scope
+            StringValidator typeValidator = new StringValidator();
+            typeValidator.setWhiteSpace("preserve");
+            fieldValidator.setValidator(typeValidator);
+        }
+        desc.setValidator(fieldValidator);
+        //-- _icon
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_icon", "icon", org.exolab.castor.xml.NodeType.Attribute);
+        desc.setImmutable(true);
+        handler = (new org.exolab.castor.xml.XMLFieldHandler() {
+            public java.lang.Object getValue( java.lang.Object object ) 
+                throws IllegalStateException
+            {
+                Action target = (Action) object;
+                return target.getIcon();
+            }
+            public void setValue( java.lang.Object object, java.lang.Object value) 
+                throws IllegalStateException, IllegalArgumentException
+            {
+                try {
+                    Action target = (Action) object;
+                    target.setIcon( (java.lang.String) value);
+                }
+                catch (java.lang.Exception ex) {
+                    throw new IllegalStateException(ex.toString());
+                }
+            }
+            public java.lang.Object newInstance( java.lang.Object parent ) {
+                return null;
+            }
+        } );
+        desc.setHandler(handler);
+        addFieldDescriptor(desc);
+        
+        //-- validation code for: _icon
+        fieldValidator = new org.exolab.castor.xml.FieldValidator();
+        { //-- local scope
+            StringValidator typeValidator = new StringValidator();
+            typeValidator.setWhiteSpace("preserve");
+            fieldValidator.setValidator(typeValidator);
+        }
+        desc.setValidator(fieldValidator);
+        //-- _tooltip
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_tooltip", "tooltip", org.exolab.castor.xml.NodeType.Attribute);
+        desc.setImmutable(true);
+        handler = (new org.exolab.castor.xml.XMLFieldHandler() {
+            public java.lang.Object getValue( java.lang.Object object ) 
+                throws IllegalStateException
+            {
+                Action target = (Action) object;
+                return target.getTooltip();
+            }
+            public void setValue( java.lang.Object object, java.lang.Object value) 
+                throws IllegalStateException, IllegalArgumentException
+            {
+                try {
+                    Action target = (Action) object;
+                    target.setTooltip( (java.lang.String) value);
+                }
+                catch (java.lang.Exception ex) {
+                    throw new IllegalStateException(ex.toString());
+                }
+            }
+            public java.lang.Object newInstance( java.lang.Object parent ) {
+                return null;
+            }
+        } );
+        desc.setHandler(handler);
+        addFieldDescriptor(desc);
+        
+        //-- validation code for: _tooltip
+        fieldValidator = new MyFieldValidator();
+        { //-- local scope
+            StringValidator typeValidator = new StringValidator();
+            typeValidator.setWhiteSpace("preserve");
+            fieldValidator.setValidator(typeValidator);
+        }
+        desc.setValidator(fieldValidator);
+
+        //-- _label
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_label", "label", org.exolab.castor.xml.NodeType.Attribute);
+        desc.setImmutable(true);
+        handler = (new org.exolab.castor.xml.XMLFieldHandler() {
+            public java.lang.Object getValue( java.lang.Object object ) 
+                throws IllegalStateException
+            {
+                Action target = (Action) object;
+                return target.getLabel();
+            }
+            public void setValue( java.lang.Object object, java.lang.Object value) 
+                throws IllegalStateException, IllegalArgumentException
+            {
+                try {
+                    Action target = (Action) object;
+                    target.setLabel( (java.lang.String) value);
+                }
+                catch (java.lang.Exception ex) {
+                    throw new IllegalStateException(ex.toString());
+                }
+            }
+            public java.lang.Object newInstance( java.lang.Object parent ) {
+                return null;
+            }
+        } );
+        desc.setHandler(handler);
+        desc.setRequired(true);
+        addFieldDescriptor(desc);
+        
+        //-- validation code for: _label
+        fieldValidator = new MyFieldValidator();
+        fieldValidator.setMinOccurs(1);
+        { //-- local scope
+            StringValidator typeValidator = new StringValidator();
+            typeValidator.setWhiteSpace("preserve");
+            fieldValidator.setValidator(typeValidator);
+        }
+        desc.setValidator(fieldValidator);
+        
+        //-- _position
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Long.TYPE, "_position", "position", org.exolab.castor.xml.NodeType.Attribute);
+        handler = (new org.exolab.castor.xml.XMLFieldHandler() {
+            public java.lang.Object getValue( java.lang.Object object ) 
+                throws IllegalStateException
+            {
+                Action target = (Action) object;
+                if(!target.hasPosition())
+                    return null;
+                return new java.lang.Long(target.getPosition());
+            }
+            public void setValue( java.lang.Object object, java.lang.Object value) 
+                throws IllegalStateException, IllegalArgumentException
+            {
+                try {
+                    Action target = (Action) object;
+                    // if null, use delete method for optional primitives 
+                    if (value == null) {
+                        target.deletePosition();
+                        return;
+                    }
+                    target.setPosition( ((java.lang.Long)value).longValue());
+                }
+                catch (java.lang.Exception ex) {
+                    throw new IllegalStateException(ex.toString());
+                }
+            }
+            public java.lang.Object newInstance( java.lang.Object parent ) {
+                return null;
+            }
+        } );
+        desc.setHandler(handler);
+        addFieldDescriptor(desc);
+        
+        //-- validation code for: _position
+        fieldValidator = new MyFieldValidator();
+        { //-- local scope
+            LongValidator typeValidator= new LongValidator();
+            fieldValidator.setValidator(typeValidator);
+        }
+        desc.setValidator(fieldValidator);
+
+        //-- initialize element descriptors
+        
+    } //-- com.iver.andami.plugins.config.generate.ActionDescriptor()
+
+    
+
+      //-----------/
+     //- Methods -/
+    //-----------/
+
+    /**
+     * Method getAccessMode
+     */
+    public org.exolab.castor.mapping.AccessMode getAccessMode()
+    {
+        return null;
+    } //-- org.exolab.castor.mapping.AccessMode getAccessMode() 
+
+    /**
+     * Method getExtends
+     */
+    public org.exolab.castor.mapping.ClassDescriptor getExtends()
+    {
+        return null;
+    } //-- org.exolab.castor.mapping.ClassDescriptor getExtends() 
+
+    /**
+     * Method getIdentity
+     */
+    public org.exolab.castor.mapping.FieldDescriptor getIdentity()
+    {
+        return identity;
+    } //-- org.exolab.castor.mapping.FieldDescriptor getIdentity() 
+
+    /**
+     * Method getJavaClass
+     */
+    public java.lang.Class getJavaClass()
+    {
+        return org.gvsig.andami.plugins.config.generate.Action.class;
+    } //-- java.lang.Class getJavaClass() 
+
+    /**
+     * Method getNameSpacePrefix
+     */
+    public java.lang.String getNameSpacePrefix()
+    {
+        return nsPrefix;
+    } //-- java.lang.String getNameSpacePrefix() 
+
+    /**
+     * Method getNameSpaceURI
+     */
+    public java.lang.String getNameSpaceURI()
+    {
+        return nsURI;
+    } //-- java.lang.String getNameSpaceURI() 
+
+    /**
+     * Method getValidator
+     */
+    public org.exolab.castor.xml.TypeValidator getValidator()
+    {
+        return this;
+    } //-- org.exolab.castor.xml.TypeValidator getValidator() 
+
+    /**
+     * Method getXMLName
+     */
+    public java.lang.String getXMLName()
+    {
+        return xmlName;
+    } //-- java.lang.String getXMLName() 
+
+}

Property changes on: branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/plugins/config/generate/ActionDescriptor.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/plugins/config/generate/Action.java
===================================================================
--- branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/plugins/config/generate/Action.java	(revision 0)
+++ branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/plugins/config/generate/Action.java	(revision 38564)
@@ -0,0 +1,314 @@
+/*
+ * This class was automatically generated with 
+ * <a href="http://www.castor.org">Castor 0.9.5.3</a>, using an XML
+ * Schema.
+ * $Id: Menu.java 29593 2009-06-29 15:54:31Z jpiera $
+ */
+
+package org.gvsig.andami.plugins.config.generate;
+
+  //---------------------------------/
+ //- Imported classes and packages -/
+//---------------------------------/
+
+import org.exolab.castor.xml.Marshaller;
+import org.exolab.castor.xml.Unmarshaller;
+
+/**
+ * Class Action.
+ * 
+ * @version $Revision: 29593 $ $Date: 2009-06-29 17:54:31 +0200 (lun, 29 jun 2009) $
+ */
+public class Action implements java.io.Serializable {
+
+
+      //--------------------------/
+     //- Class/Member Variables -/
+    //--------------------------/
+    /**
+     * Field _name
+     */
+    private java.lang.String _name;
+    
+    /**
+     * Field _accelerator
+     */
+    private java.lang.String _accelerator;
+    
+    /**
+     * Field _actionCommand
+     */
+    private java.lang.String _actionCommand;
+
+    /**
+     * Field _icon
+     */
+    private java.lang.String _icon;
+
+    /**
+     * Field _tooltip
+     */
+    private java.lang.String _tooltip;
+
+    /**
+     * Field _label
+     */
+    private java.lang.String _label;
+
+    /**
+     * Field _position
+     */
+    private long _position;
+
+    /**
+     * keeps track of state for field: _position
+     */
+    private boolean _has_position;
+
+
+      //----------------/
+     //- Constructors -/
+    //----------------/
+
+    public Action() {
+        super();
+    } //-- com.iver.andami.plugins.config.generate.Menu()
+
+
+      //-----------/
+     //- Methods -/
+    //-----------/
+    /**
+     * Method deletePosition
+     */
+    public void deletePosition()
+    {
+        this._has_position= false;
+    } //-- void deletePosition() 
+
+    /**
+     * Returns the value of field 'actionCommand'.
+     * 
+     * @return the value of field 'actionCommand'.
+     */
+    public java.lang.String getActionCommand()
+    {
+        return this._actionCommand;
+    } //-- java.lang.String getActionCommand() 
+
+    /**
+     * Returns the value of field 'accelerator'.
+     * 
+     * @return the value of field 'accelerator'.
+     */
+    public java.lang.String getAccelerator()
+    {
+        return this._accelerator;
+    } //-- java.lang.String getAccelerator() 
+
+    /**
+     * Returns the value of field 'icon'.
+     * 
+     * @return the value of field 'icon'.
+     */
+    public java.lang.String getIcon()
+    {
+        return this._icon;
+    } //-- java.lang.String getIcon() 
+
+    /**
+     * Returns the value of field 'position'.
+     * 
+     * @return the value of field 'position'.
+     */
+    public long getPosition()
+    {
+        return this._position;
+    } //-- int getPosition() 
+
+    /**
+     * Returns the value of field 'label'.
+     * 
+     * @return the value of field 'label'.
+     */
+    public java.lang.String getLabel()
+    {
+        return this._label;
+    } //-- java.lang.String getLabel() 
+
+    /**
+     * Returns the value of field 'tooltip'.
+     * 
+     * @return the value of field 'tooltip'.
+     */
+    public java.lang.String getTooltip()
+    {
+        return this._tooltip;
+    } //-- java.lang.String getTooltip() 
+
+    /**
+     * Method hasPosition
+     */
+    public boolean hasPosition()
+    {
+        return this._has_position;
+    } //-- boolean hasPosition() 
+
+    /**
+     * Method isValid
+     */
+    public boolean isValid()
+    {
+        try {
+            validate();
+        }
+        catch (org.exolab.castor.xml.ValidationException vex) {
+            return false;
+        }
+        return true;
+    } //-- boolean isValid() 
+
+    /**
+     * Returns the value of field 'name'.
+     * 
+     * @return the value of field 'name'.
+     */
+    public java.lang.String getName()
+    {
+        return this._name;
+    } //-- java.lang.String getName() 
+
+    /**
+     * Method marshal
+     * 
+     * @param out
+     */
+    public void marshal(java.io.Writer out)
+        throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException
+    {
+        
+        Marshaller.marshal(this, out);
+    } //-- void marshal(java.io.Writer) 
+
+    /**
+     * Method marshal
+     * 
+     * @param handler
+     */
+    public void marshal(org.xml.sax.ContentHandler handler)
+        throws java.io.IOException, org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException
+    {
+        
+        Marshaller.marshal(this, handler);
+    } //-- void marshal(org.xml.sax.ContentHandler) 
+
+    /**
+     * Sets the value of field 'actionCommand'.
+     * 
+     * @param actionCommand the value of field 'actionCommand'.
+     */
+    public void setActionCommand(java.lang.String actionCommand)
+    {
+        this._actionCommand = actionCommand;
+    } //-- void setActionCommand(java.lang.String) 
+
+    /**
+     * Sets the value of field 'accelerator'.
+     * 
+     * @param accelerator the value of field 'accelerator'.
+     */
+    public void setAccelerator(java.lang.String accelerator)
+    {
+        this._accelerator = accelerator;
+    } //-- void setAccelerator(java.lang.String) 
+
+    /**
+     * Sets the value of field 'icon'.
+     * 
+     * @param icon the value of field 'icon'.
+     */
+    public void setIcon(java.lang.String icon)
+    {
+        this._icon = icon;
+    } //-- void setIcon(java.lang.String) 
+
+
+    /**
+     * Sets the value of field 'name'.
+     * 
+     * @param name the value of field 'name'.
+     */
+    public void setName(java.lang.String name)
+    {
+        this._name = name;
+    } //-- void setName(java.lang.String) 
+
+    /**
+     * Sets the value of field 'position'.
+     * 
+     * @param position the value of field 'position'.
+     */
+    public void setPosition(long position)
+    {
+    	if( position < 100000000 ) {
+    		this._position = position + 1000000000; 
+    	} else {
+    		this._position = position;
+    	}
+        this._has_position = true;
+    } //-- void setPosition(int) 
+
+    /**
+     * Sets the value of field 'label'.
+     * 
+     * @param text the value of field 'label'.
+     */
+    public void setLabel(java.lang.String label)
+    {
+        this._label = label;
+    } //-- void setLabel(java.lang.String) 
+
+    /**
+     * Sets the value of field 'tooltip'.
+     * 
+     * @param tooltip the value of field 'tooltip'.
+     */
+    public void setTooltip(java.lang.String tooltip)
+    {
+        this._tooltip = tooltip;
+    } //-- void setTooltip(java.lang.String) 
+
+    /**
+     * Method unmarshal
+     * 
+     * @param reader
+     */
+    public static java.lang.Object unmarshal(java.io.Reader reader)
+        throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException
+    {
+        return (org.gvsig.andami.plugins.config.generate.Action) Unmarshaller.unmarshal(org.gvsig.andami.plugins.config.generate.Action.class, reader);
+    } //-- java.lang.Object unmarshal(java.io.Reader) 
+
+    /**
+     * Method validate
+     */
+    public void validate()
+        throws org.exolab.castor.xml.ValidationException
+    {
+        org.exolab.castor.xml.Validator validator = new org.exolab.castor.xml.Validator();
+        validator.validate(this);
+    } //-- void validate() 
+    
+    public String toString() {
+    	StringBuffer buffer = new StringBuffer();
+    	buffer.append("Action {");
+    	buffer.append("name='").append(this._name).append("', ");
+    	buffer.append("label='").append(this._label).append("', ");
+    	buffer.append("tooltip='").append(this._tooltip).append("', ");
+    	buffer.append("actionCommand='").append(this._actionCommand).append("', ");
+    	buffer.append("position='").append(this._position).append("', ");
+    	buffer.append("icon='").append(this._icon).append("', ");
+    	buffer.append("accelerator='").append(this._accelerator).append("' }");
+    	return buffer.toString();
+	}
+}

Property changes on: branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/plugins/config/generate/Action.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/plugins/config/generate/SkinExtensionTypeDescriptor.java
===================================================================
--- branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/plugins/config/generate/SkinExtensionTypeDescriptor.java	(revision 38563)
+++ branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/plugins/config/generate/SkinExtensionTypeDescriptor.java	(revision 38564)
@@ -109,7 +109,7 @@
                 throws IllegalStateException
             {
                 SkinExtensionType target = (SkinExtensionType) object;
-                return target.getMenu();
+                return target.getAction();
             }
             public void setValue( java.lang.Object object, java.lang.Object value) 
                 throws IllegalStateException, IllegalArgumentException
@@ -136,6 +136,44 @@
         { //-- local scope
         }
         desc.setValidator(fieldValidator);
+        
+        //-- _actionList
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.gvsig.andami.plugins.config.generate.Action.class, "_actionList", "action", org.exolab.castor.xml.NodeType.Element);
+        handler = (new org.exolab.castor.xml.XMLFieldHandler() {
+            public java.lang.Object getValue( java.lang.Object object ) 
+                throws IllegalStateException
+            {
+                SkinExtensionType target = (SkinExtensionType) object;
+                return target.getMenu();
+            }
+            public void setValue( java.lang.Object object, java.lang.Object value) 
+                throws IllegalStateException, IllegalArgumentException
+            {
+                try {
+                    SkinExtensionType target = (SkinExtensionType) object;
+                    target.addAction( (org.gvsig.andami.plugins.config.generate.Action) value);
+                }
+                catch (java.lang.Exception ex) {
+                    throw new IllegalStateException(ex.toString());
+                }
+            }
+            public java.lang.Object newInstance( java.lang.Object parent ) {
+                return new org.gvsig.andami.plugins.config.generate.Action();
+            }
+        } );
+        desc.setHandler(handler);
+        desc.setMultivalued(true);
+        addFieldDescriptor(desc);
+        
+        //-- validation code for: _actionList
+        fieldValidator = new org.exolab.castor.xml.FieldValidator();
+        fieldValidator.setMinOccurs(0);
+        { //-- local scope
+        }
+        desc.setValidator(fieldValidator);
+        
+        
+        
         //-- _toolBarList
         desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.gvsig.andami.plugins.config.generate.ToolBar.class, "_toolBarList", "tool-bar", org.exolab.castor.xml.NodeType.Element);
         handler = (new org.exolab.castor.xml.XMLFieldHandler() {
Index: branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/plugins/config/generate/SkinExtensionType.java
===================================================================
--- branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/plugins/config/generate/SkinExtensionType.java	(revision 38563)
+++ branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/plugins/config/generate/SkinExtensionType.java	(revision 38564)
@@ -46,6 +46,11 @@
     private java.util.Vector _menuList;
 
     /**
+     * Field _actionList
+     */
+    private java.util.Vector _actionList;
+
+    /**
      * Field _toolBarList
      */
     private java.util.Vector _toolBarList;
@@ -68,6 +73,7 @@
     public SkinExtensionType() {
         super();
         _menuList = new Vector();
+        _actionList = new Vector();
         _toolBarList = new Vector();
         _comboButtonList = new Vector();
         _comboScaleList = new Vector();
@@ -147,7 +153,31 @@
         _menuList.insertElementAt(vMenu, index);
     } //-- void addMenu(int, com.iver.andami.plugins.config.generate.Menu) 
 
+
     /**
+     * Method addAction
+     * 
+     * @param vAction
+     */
+    public void addAction(org.gvsig.andami.plugins.config.generate.Action vAction)
+        throws java.lang.IndexOutOfBoundsException
+    {
+        _actionList.addElement(vAction);
+    } //-- void addAction(com.iver.andami.plugins.config.generate.Action) 
+
+    /**
+     * Method addAction
+     * 
+     * @param index
+     * @param vAction
+     */
+    public void addAction(int index, org.gvsig.andami.plugins.config.generate.Action vAction)
+        throws java.lang.IndexOutOfBoundsException
+    {
+        _actionList.insertElementAt(vAction, index);
+    } //-- void addAction(int, com.iver.andami.plugins.config.generate.Action) 
+
+    /**
      * Method addToolBar
      * 
      * @param vToolBar
@@ -195,6 +225,14 @@
     } //-- java.util.Enumeration enumerateMenu() 
 
     /**
+     * Method enumerateAction
+     */
+    public java.util.Enumeration enumerateAction()
+    {
+        return _actionList.elements();
+    } //-- java.util.Enumeration enumerateAction() 
+
+    /**
      * Method enumerateToolBar
      */
     public java.util.Enumeration enumerateToolBar()
@@ -314,6 +352,7 @@
         }
         return mArray;
     } //-- com.iver.andami.plugins.config.generate.Menu[] getMenu() 
+    
 
     /**
      * Method getMenuCount
@@ -324,6 +363,43 @@
     } //-- int getMenuCount() 
 
     /**
+     * Method getAction
+     * 
+     * @param index
+     */
+    public org.gvsig.andami.plugins.config.generate.Action getAction(int index)
+        throws java.lang.IndexOutOfBoundsException
+    {
+        //-- check bounds for index
+        if ((index < 0) || (index > _actionList.size())) {
+            throw new IndexOutOfBoundsException();
+        }
+        
+        return (org.gvsig.andami.plugins.config.generate.Action) _actionList.elementAt(index);
+    } //-- com.iver.andami.plugins.config.generate.Action getAction(int) 
+
+    /**
+     * Method getAction
+     */
+    public org.gvsig.andami.plugins.config.generate.Action[] getAction()
+    {
+        int size = _actionList.size();
+        org.gvsig.andami.plugins.config.generate.Action[] mArray = new org.gvsig.andami.plugins.config.generate.Action[size];
+        for (int index = 0; index < size; index++) {
+            mArray[index] = (org.gvsig.andami.plugins.config.generate.Action) _actionList.elementAt(index);
+        }
+        return mArray;
+    } //-- com.iver.andami.plugins.config.generate.Action[] getAction() 
+
+    /**
+     * Method getActionCount
+     */
+    public int getActionCount()
+    {
+        return _actionList.size();
+    } //-- int getActionCount() 
+
+    /**
      * Method getToolBar
      * 
      * @param index
@@ -422,7 +498,16 @@
         _menuList.removeAllElements();
     } //-- void removeAllMenu() 
 
+
     /**
+     * Method removeAllAction
+     */
+    public void removeAllAction()
+    {
+        _actionList.removeAllElements();
+    } //-- void removeAllAction() 
+
+    /**
      * Method removeAllToolBar
      */
     public void removeAllToolBar()
Index: branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/plugins/config/generate/MyFieldValidator.java
===================================================================
--- branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/plugins/config/generate/MyFieldValidator.java	(revision 0)
+++ branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/plugins/config/generate/MyFieldValidator.java	(revision 38564)
@@ -0,0 +1,30 @@
+package org.gvsig.andami.plugins.config.generate;
+
+import org.exolab.castor.xml.ValidationContext;
+import org.exolab.castor.xml.ValidationException;
+
+class MyFieldValidator extends org.exolab.castor.xml.FieldValidator {
+	public void validate(Object arg0, ValidationContext arg1)
+			throws ValidationException {
+		try {
+			super.validate(arg0, arg1);
+		} catch (ValidationException e) {
+			throw getException(e,arg0);
+		}
+	}
+	
+	public void validate(Object object) throws ValidationException {
+		try {
+			super.validate(object);
+   		} catch (ValidationException e) {
+			throw getException(e,object);
+		}
+	}
+	
+	private ValidationException getException(ValidationException ex, Object obj) {
+		if( obj == null ) {
+			return ex;
+		}
+		return new ValidationException( ex.getMessage() + ". " + obj.toString(), ex);
+	}
+}
\ No newline at end of file

Property changes on: branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/plugins/config/generate/MyFieldValidator.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/plugins/config/generate/SelectableToolDescriptor.java
===================================================================
--- branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/plugins/config/generate/SelectableToolDescriptor.java	(revision 38563)
+++ branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/plugins/config/generate/SelectableToolDescriptor.java	(revision 38564)
@@ -277,7 +277,7 @@
             }
         } );
         desc.setHandler(handler);
-        desc.setRequired(true);
+//        desc.setRequired(true);
         addFieldDescriptor(desc);
         
         //-- validation code for: _icon
@@ -398,7 +398,7 @@
         }
         desc.setValidator(fieldValidator);
         //-- _position
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_position", "position", org.exolab.castor.xml.NodeType.Attribute);
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Long.TYPE, "_position", "position", org.exolab.castor.xml.NodeType.Attribute);
         handler = (new org.exolab.castor.xml.XMLFieldHandler() {
             public java.lang.Object getValue( java.lang.Object object ) 
                 throws IllegalStateException
@@ -406,7 +406,7 @@
                 SelectableTool target = (SelectableTool) object;
                 if(!target.hasPosition())
                     return null;
-                return new java.lang.Integer(target.getPosition());
+                return new java.lang.Long(target.getPosition());
             }
             public void setValue( java.lang.Object object, java.lang.Object value) 
                 throws IllegalStateException, IllegalArgumentException
@@ -418,7 +418,7 @@
                         target.deletePosition();
                         return;
                     }
-                    target.setPosition( ((java.lang.Integer)value).intValue());
+                    target.setPosition( ((java.lang.Long)value).longValue());
                 }
                 catch (java.lang.Exception ex) {
                     throw new IllegalStateException(ex.toString());
@@ -434,7 +434,7 @@
         //-- validation code for: _position
         fieldValidator = new org.exolab.castor.xml.FieldValidator();
         { //-- local scope
-            IntegerValidator typeValidator= new IntegerValidator();
+            LongValidator typeValidator= new LongValidator();
             fieldValidator.setValidator(typeValidator);
         }
         desc.setValidator(fieldValidator);
Index: branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/plugins/config/generate/SelectableTool.java
===================================================================
--- branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/plugins/config/generate/SelectableTool.java	(revision 38563)
+++ branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/plugins/config/generate/SelectableTool.java	(revision 38564)
@@ -91,7 +91,7 @@
     /**
      * Field _position
      */
-    private int _position;
+    private long _position;
 
     /**
      * keeps track of state for field: _position
@@ -212,7 +212,7 @@
      * 
      * @return the value of field 'position'.
      */
-    public int getPosition()
+    public long getPosition()
     {
         return this._position;
     } //-- int getPosition() 
@@ -376,7 +376,7 @@
      * 
      * @param position the value of field 'position'.
      */
-    public void setPosition(int position)
+    public void setPosition(long position)
     {
         this._position = position;
         this._has_position = true;
Index: branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/plugins/config/generate/MenuDescriptor.java
===================================================================
--- branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/plugins/config/generate/MenuDescriptor.java	(revision 38563)
+++ branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/plugins/config/generate/MenuDescriptor.java	(revision 38564)
@@ -11,10 +11,10 @@
  //- Imported classes and packages -/
 //---------------------------------/
 
-import org.exolab.castor.mapping.AccessMode;
-import org.exolab.castor.xml.TypeValidator;
-import org.exolab.castor.xml.XMLFieldDescriptor;
-import org.exolab.castor.xml.validators.*;
+import org.exolab.castor.xml.validators.BooleanValidator;
+import org.exolab.castor.xml.validators.IntegerValidator;
+import org.exolab.castor.xml.validators.LongValidator;
+import org.exolab.castor.xml.validators.StringValidator;
 
 /**
  * Class MenuDescriptor.
@@ -90,13 +90,15 @@
         addFieldDescriptor(desc);
         
         //-- validation code for: _actionCommand
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
+        fieldValidator = new MyFieldValidator();
         { //-- local scope
             StringValidator typeValidator = new StringValidator();
             typeValidator.setWhiteSpace("preserve");
             fieldValidator.setValidator(typeValidator);
         }
         desc.setValidator(fieldValidator);
+        
+        
         //-- _key
         desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_key", "key", org.exolab.castor.xml.NodeType.Attribute);
         desc.setImmutable(true);
@@ -126,7 +128,43 @@
         addFieldDescriptor(desc);
         
         //-- validation code for: _key
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
+        
+        
+        
+        //-- _name
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_name", "name", org.exolab.castor.xml.NodeType.Attribute);
+        desc.setImmutable(true);
+        handler = (new org.exolab.castor.xml.XMLFieldHandler() {
+            public java.lang.Object getValue( java.lang.Object object ) 
+                throws IllegalStateException
+            {
+                Menu target = (Menu) object;
+                return target.getName();
+            }
+            public void setValue( java.lang.Object object, java.lang.Object value) 
+                throws IllegalStateException, IllegalArgumentException
+            {
+                try {
+                    Menu target = (Menu) object;
+                    target.setName( (java.lang.String) value);
+                }
+                catch (java.lang.Exception ex) {
+                    throw new IllegalStateException(ex.toString());
+                }
+            }
+            public java.lang.Object newInstance( java.lang.Object parent ) {
+                return null;
+            }
+        } );
+        desc.setHandler(handler);
+        //desc.setRequired(true);
+        addFieldDescriptor(desc);
+        
+        //-- validation code for: _name
+        
+        
+        
+        fieldValidator = new MyFieldValidator();
         { //-- local scope
             StringValidator typeValidator = new StringValidator();
             typeValidator.setWhiteSpace("preserve");
@@ -162,7 +200,7 @@
         addFieldDescriptor(desc);
         
         //-- validation code for: _icon
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
+        fieldValidator = new MyFieldValidator();
         { //-- local scope
             StringValidator typeValidator = new StringValidator();
             typeValidator.setWhiteSpace("preserve");
@@ -198,7 +236,7 @@
         addFieldDescriptor(desc);
         
         //-- validation code for: _tooltip
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
+        fieldValidator = new MyFieldValidator();
         { //-- local scope
             StringValidator typeValidator = new StringValidator();
             typeValidator.setWhiteSpace("preserve");
@@ -234,7 +272,7 @@
         addFieldDescriptor(desc);
         
         //-- validation code for: _enableText
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
+        fieldValidator = new MyFieldValidator();
         { //-- local scope
             StringValidator typeValidator = new StringValidator();
             typeValidator.setWhiteSpace("preserve");
@@ -270,7 +308,7 @@
         addFieldDescriptor(desc);
         
         //-- validation code for: _mnemonic
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
+        fieldValidator = new MyFieldValidator();
         { //-- local scope
             StringValidator typeValidator = new StringValidator();
             typeValidator.setWhiteSpace("preserve");
@@ -303,11 +341,11 @@
             }
         } );
         desc.setHandler(handler);
-        desc.setRequired(true);
+//        desc.setRequired(true);
         addFieldDescriptor(desc);
         
         //-- validation code for: _text
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
+        fieldValidator = new MyFieldValidator();
         fieldValidator.setMinOccurs(1);
         { //-- local scope
             StringValidator typeValidator = new StringValidator();
@@ -316,7 +354,7 @@
         }
         desc.setValidator(fieldValidator);
         //-- _position
-        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Integer.TYPE, "_position", "position", org.exolab.castor.xml.NodeType.Attribute);
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Long.TYPE, "_position", "position", org.exolab.castor.xml.NodeType.Attribute);
         handler = (new org.exolab.castor.xml.XMLFieldHandler() {
             public java.lang.Object getValue( java.lang.Object object ) 
                 throws IllegalStateException
@@ -324,7 +362,7 @@
                 Menu target = (Menu) object;
                 if(!target.hasPosition())
                     return null;
-                return new java.lang.Integer(target.getPosition());
+                return new java.lang.Long(target.getPosition());
             }
             public void setValue( java.lang.Object object, java.lang.Object value) 
                 throws IllegalStateException, IllegalArgumentException
@@ -336,7 +374,7 @@
                         target.deletePosition();
                         return;
                     }
-                    target.setPosition( ((java.lang.Integer)value).intValue());
+                    target.setPosition( ((java.lang.Long)value).longValue());
                 }
                 catch (java.lang.Exception ex) {
                     throw new IllegalStateException(ex.toString());
@@ -350,9 +388,9 @@
         addFieldDescriptor(desc);
         
         //-- validation code for: _position
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
+        fieldValidator = new MyFieldValidator();
         { //-- local scope
-            IntegerValidator typeValidator= new IntegerValidator();
+            LongValidator typeValidator= new LongValidator();
             fieldValidator.setValidator(typeValidator);
         }
         desc.setValidator(fieldValidator);
@@ -391,7 +429,7 @@
         addFieldDescriptor(desc);
         
         //-- validation code for: _is_separator
-        fieldValidator = new org.exolab.castor.xml.FieldValidator();
+        fieldValidator = new MyFieldValidator();
         { //-- local scope
             BooleanValidator typeValidator = new BooleanValidator();
             fieldValidator.setValidator(typeValidator);
Index: branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/plugins/config/generate/Menu.java
===================================================================
--- branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/plugins/config/generate/Menu.java	(revision 38563)
+++ branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/plugins/config/generate/Menu.java	(revision 38564)
@@ -32,8 +32,12 @@
       //--------------------------/
      //- Class/Member Variables -/
     //--------------------------/
-
     /**
+     * Field _name
+     */
+    private java.lang.String _name;
+    
+    /**
      * Field _actionCommand
      */
     private java.lang.String _actionCommand;
@@ -71,7 +75,7 @@
     /**
      * Field _position
      */
-    private int _position;
+    private long _position;
 
     /**
      * keeps track of state for field: _position
@@ -183,7 +187,7 @@
      * 
      * @return the value of field 'position'.
      */
-    public int getPosition()
+    public long getPosition()
     {
         return this._position;
     } //-- int getPosition() 
@@ -239,6 +243,16 @@
     } //-- boolean isValid() 
 
     /**
+     * Returns the value of field 'name'.
+     * 
+     * @return the value of field 'name'.
+     */
+    public java.lang.String getName()
+    {
+        return this._name;
+    } //-- java.lang.String getName() 
+
+    /**
      * Method marshal
      * 
      * @param out
@@ -324,13 +338,23 @@
     } //-- void setMnemonic(java.lang.String) 
 
     /**
+     * Sets the value of field 'name'.
+     * 
+     * @param name the value of field 'name'.
+     */
+    public void setName(java.lang.String name)
+    {
+        this._name = name;
+    } //-- void setName(java.lang.String) 
+
+    /**
      * Sets the value of field 'position'.
      * 
      * @param position the value of field 'position'.
      */
-    public void setPosition(int position)
+    public void setPosition(long position)
     {
-        this._position = position;
+   		this._position = position;
         this._has_position = true;
     } //-- void setPosition(int) 
 
@@ -375,4 +399,16 @@
         validator.validate(this);
     } //-- void validate() 
 
+    public String toString() {
+    	StringBuffer buffer = new StringBuffer();
+    	buffer.append("Menu {");
+    	buffer.append("name='").append(this._name).append("', ");
+    	buffer.append("text='").append(this._text).append("', ");
+    	buffer.append("tooltip='").append(this._tooltip).append("', ");
+    	buffer.append("actionCommand='").append(this._actionCommand).append("', ");
+    	buffer.append("position='").append(this._position).append("', ");
+    	buffer.append("icon='").append(this._icon).append("', ");
+    	buffer.append("enableText='").append(this._enableText).append("' }");
+    	return buffer.toString();
+	}
 }
Index: branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/plugins/Extension.java
===================================================================
--- branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/plugins/Extension.java	(revision 38563)
+++ branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/plugins/Extension.java	(revision 38564)
@@ -3,6 +3,8 @@
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.PluginsLocator;
 import org.gvsig.andami.plugins.status.IExtensionStatus;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /* gvSIG. Sistema de Informaci�n Geogr�fica de la Generalitat Valenciana
  *
@@ -86,8 +88,9 @@
  *
  * @author Jorge Piera Llodr� (piera_jor@gva.es)
  */
-public abstract class Extension implements IExtension {
+public abstract class Extension implements IExtension, IExtensionQueryByAction, IExtensionExecuteWithArgs  {
 
+	private static Logger logger = LoggerFactory.getLogger(Extension.class);
 	/*
 	 *  (non-Javadoc)
 	 * @see com.iver.andami.plugins.IExtension#terminate()
@@ -127,5 +130,23 @@
 		return PluginsLocator.getManager().getPlugin(this.getClass());
 	}
 
+	public boolean isEnabled(String action) {
+		return isEnabled();
+	}
+	
+	public boolean isVisible(String action) {
+		return isVisible();
+	}
+	
+	public boolean canQueryByAction() {
+		return false;
+	}
+
+	public void execute(String command, Object[] args) {
+		if( args!= null && args.length>0 ) {
+			logger.info("callong execute with args in a extension that not support ("+this.getClass().getSimpleName()+").");
+		}
+		execute(command);
+	}	
 }
 
Index: branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/plugins/ExtensionHelper.java
===================================================================
--- branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/plugins/ExtensionHelper.java	(revision 0)
+++ branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/plugins/ExtensionHelper.java	(revision 38564)
@@ -0,0 +1,41 @@
+package org.gvsig.andami.plugins;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ExtensionHelper {
+
+	private static Logger logger = LoggerFactory.getLogger(ExtensionHelper.class);
+	
+	public static boolean canQueryByAction(IExtension extension) {
+		if( extension instanceof IExtensionQueryByAction ) {
+			return ((IExtensionQueryByAction)extension).canQueryByAction();
+		}
+		return false;
+	}
+	
+	public static boolean isVisible(IExtension extension, String action) {
+		if( extension instanceof IExtensionQueryByAction ) {
+			return ((IExtensionQueryByAction) extension).isVisible(action);
+		}
+		return extension.isVisible();
+	}
+
+	public static boolean isEnabled(IExtension extension, String action) {
+		if( extension instanceof IExtensionQueryByAction ) {
+			return ((IExtensionQueryByAction) extension).isEnabled(action);
+		}
+		return extension.isEnabled();
+	}
+	
+	public static void execute(IExtension extension, String command, Object[] args) {
+		if( extension instanceof IExtensionExecuteWithArgs ) {
+			((IExtensionExecuteWithArgs) extension).execute(command, args);
+			return;
+		}
+		if( args!= null && args.length>0 ) {
+			logger.info("callong execute with args in a extension that not support ("+extension.getClass().getSimpleName()+").");
+		}
+		extension.execute(command);
+	}
+}

Property changes on: branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/plugins/ExtensionHelper.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/Launcher.java
===================================================================
--- branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/Launcher.java	(revision 38563)
+++ branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/Launcher.java	(revision 38564)
@@ -76,6 +76,7 @@
 import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Comparator;
+import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -108,22 +109,19 @@
 import org.apache.log4j.spi.LoggingEvent;
 import org.exolab.castor.xml.MarshalException;
 import org.exolab.castor.xml.ValidationException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
+import org.gvsig.andami.actioninfo.ActionInfo;
+import org.gvsig.andami.actioninfo.ActionInfoManager;
 import org.gvsig.andami.authentication.IAuthentication;
-import org.gvsig.andami.authentication.LoginUI;
 import org.gvsig.andami.config.generate.Andami;
 import org.gvsig.andami.config.generate.AndamiConfig;
 import org.gvsig.andami.config.generate.Plugin;
-import org.gvsig.andami.iconthemes.IIconTheme;
-import org.gvsig.andami.iconthemes.IconThemeManager;
 import org.gvsig.andami.messages.Messages;
 import org.gvsig.andami.messages.NotificationManager;
 import org.gvsig.andami.plugins.ExclusiveUIExtension;
 import org.gvsig.andami.plugins.ExtensionDecorator;
 import org.gvsig.andami.plugins.IExtension;
 import org.gvsig.andami.plugins.PluginClassLoader;
+import org.gvsig.andami.plugins.config.generate.Action;
 import org.gvsig.andami.plugins.config.generate.ActionTool;
 import org.gvsig.andami.plugins.config.generate.ComboButton;
 import org.gvsig.andami.plugins.config.generate.ComboButtonElement;
@@ -147,7 +145,6 @@
 import org.gvsig.andami.ui.ToolsWindowManager;
 import org.gvsig.andami.ui.fonts.FontUtils;
 import org.gvsig.andami.ui.mdiFrame.MDIFrame;
-import org.gvsig.andami.ui.mdiFrame.NewStatusBar;
 import org.gvsig.andami.ui.mdiManager.MDIManagerFactory;
 import org.gvsig.andami.ui.splash.MultiSplashWindow;
 import org.gvsig.andami.ui.theme.Theme;
@@ -162,10 +159,16 @@
 import org.gvsig.tools.exception.ListBaseException;
 import org.gvsig.tools.library.impl.DefaultLibrariesInitializer;
 import org.gvsig.tools.swing.api.ToolsSwingLocator;
+import org.gvsig.tools.swing.icontheme.IconTheme;
+import org.gvsig.tools.swing.icontheme.IconThemeManager;
+import org.gvsig.tools.util.FolderSet;
+import org.gvsig.tools.util.FolderSet.FolderEntry;
 import org.gvsig.utils.DateTime;
 import org.gvsig.utils.XMLEntity;
 import org.gvsig.utils.xml.XMLEncodingUtils;
 import org.gvsig.utils.xmlEntity.generate.XmlTag;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * <p>
@@ -226,8 +229,17 @@
 		}
 	}
 
+	private static Launcher launcherInstance;
+
+	public static Launcher getInstance() {
+		if( launcherInstance == null ) {
+			launcherInstance = new Launcher();
+		}
+		return launcherInstance;
+	}
+	
 	public static void main(String[] args) throws Exception {
-		Launcher launcher = new Launcher();
+		Launcher launcher = getInstance();
 		boolean install = false;
 		for (int i = 0; i < args.length; i++) {
 			if (args[i].equalsIgnoreCase("--install")) {
@@ -301,6 +313,8 @@
 			public void refresh() {
 			}
 		});
+		
+		new PluginsLibrary().initialize();
 
 		try {
 			initIconThemes();
@@ -335,13 +349,13 @@
 		configureProxy();
 
 		// 2. TODO Buscar actualizaciones de los plugins
-		splashWindow.process(20, PluginServices.getText(Launcher.class,
-				"SplashWindow.looking_for_updates"));
-		try {
-			this.downloadExtensions(andamiConfig.getPluginsDirectory());
-		} catch (Exception ex) {
-			this.addError("Can't downloads plugins", ex);
-		}
+//		splashWindow.process(20, PluginServices.getText(Launcher.class,
+//				"SplashWindow.looking_for_updates"));
+//		try {
+//			this.downloadExtensions(andamiConfig.getPluginsDirectory());
+//		} catch (Exception ex) {
+//			this.addError("Can't downloads plugins", ex);
+//		}
 
 		// 2.5. Initialize andami libraries
 		splashWindow.process(25, PluginServices.getText(Launcher.class,
@@ -496,7 +510,12 @@
 				"creating_main_window"));
 		frame.setVisible(true);
 
-		// 20. Se ejecuta el postInitialize
+		/* 
+		 * Initialize installer local repository folders 
+		 */
+		initializeLocalAddOnRepositoryFolders();
+
+		// 19. Se ejecuta el postInitialize
 		splashWindow.process(190, PluginServices.getText(Launcher.class,
 				"SplashWindow.post_initializing_extensions"));
 		SwingUtilities.invokeAndWait(new Runnable() {
@@ -509,10 +528,8 @@
 
 		// Definimos un KeyEventDispatcher global para que las extensiones
 		// puedan registrar sus "teclas r�pidas".
-		GlobalKeyEventDispatcher keyDispatcher = GlobalKeyEventDispatcher
-				.getInstance();
-		KeyboardFocusManager.getCurrentKeyboardFocusManager()
-				.addKeyEventDispatcher(keyDispatcher);
+		GlobalKeyEventDispatcher keyDispatcher = GlobalKeyEventDispatcher.getInstance();
+		KeyboardFocusManager.getCurrentKeyboardFocusManager().addKeyEventDispatcher(keyDispatcher);
 
 		SwingUtilities.invokeAndWait(new Runnable() {
 
@@ -520,6 +537,9 @@
 				frame.enableControls();
 			}
 		});
+
+		createDefaultIconTheme();
+
 		splashWindow.close();
 		if (launcherrors != null) {
 			NotificationManager.addError(launcherrors);
@@ -530,6 +550,39 @@
 
 	}
 
+	private void initializeLocalAddOnRepositoryFolders() {
+		InstallerManager installerManager = InstallerLocator.getInstallerManager();
+
+		File defaultAddonsRepository = PluginsLocator.getManager().getPluginsFolder();
+
+		installerManager.addLocalAddonRepository(defaultAddonsRepository);
+		installerManager.setDefaultLocalAddonRepository(defaultAddonsRepository);
+		
+		IconThemeManager iconManager = ToolsSwingLocator.getIconThemeManager();
+		FolderSet fset = iconManager.getRepository();
+		Iterator<FolderSet.FolderEntry> it = fset.iterator();
+		while( it.hasNext() ) {
+			FolderEntry entry = it.next();
+			installerManager.addLocalAddonRepository(entry.getFolder());
+		}
+	}
+	
+	private void createDefaultIconTheme() {
+		PluginsManager pluginsManager = PluginsLocator.getManager();
+		IconThemeManager iconManager = ToolsSwingLocator.getIconThemeManager();
+		
+		File f = new File(pluginsManager.getApplicationHomeFolder(),"icon-theme");
+		if( !f.exists() ) {
+			f.mkdir();
+		}
+		IconTheme theme = iconManager.getDefault();
+		File f2 = new File(f,theme.getID()) ;
+		if( !f2.exists() ) {
+			logger.info("Creating default icon theme in "+f.getAbsolutePath());
+			theme.export(f);
+		}
+	}
+	
 	/**
      * 
      */
@@ -697,34 +750,34 @@
 	 * Return the directory applicaction is installed.
 	 */
 	public static String getApplicationDirectory() {
-		return new File("").getAbsolutePath();
+		return getApplicationFolder().getAbsolutePath();
 	}
+	
+    public static File getApplicationFolder() {
+        // TODO: check if there is a better way to handle this
+        return new File(System.getProperty("user.dir"));
+    }
 
 	private void registerIcons() {
-		PluginServices.getIconTheme().registerDefault(
-				"login-gvsig",
-				LoginUI.class.getClassLoader().getResource(
-						"images/login_gvsig.png"));
-		PluginServices.getIconTheme().registerDefault(
-				"splash-gvsig",
-				MultiSplashWindow.class.getClassLoader().getResource(
-						"images/splash.png"));
-		PluginServices.getIconTheme().registerDefault(
-				"info-icon",
-				NewStatusBar.class.getClassLoader().getResource(
-						"images/info.gif"));
-		PluginServices.getIconTheme().registerDefault(
-				"error-icon",
-				NewStatusBar.class.getClassLoader().getResource(
-						"images/error.gif"));
-		PluginServices.getIconTheme().registerDefault(
-				"warning-icon",
-				NewStatusBar.class.getClassLoader().getResource(
-						"images/warning.gif"));
-		PluginServices.getIconTheme().registerDefault(
-				"no-icon",
-				NewStatusBar.class.getClassLoader().getResource(
-						"images/no_icon.png"));
+		IconTheme theme = PluginServices.getIconTheme();
+		ClassLoader loader = Launcher.class.getClassLoader();	
+		
+		String[][] icons = {
+				// MultiSplashWindow
+				{ "main", "splash-default" },
+				// NewStatusBar
+				{ "main", "statusbar-info" },
+				{ "main", "statusbar-warning" },
+				{ "main", "statusbar-error" }
+		};
+		for( int i=0; i<icons.length; i++) {
+			try {
+				IconThemeHelper.registerIcon(icons[i][0], icons[i][1], Launcher.class);
+			} catch(Exception e) {
+				logger.info("Can't register icon '"+icons[i][0]+"' ("+icons[i][1]+").");
+			}
+		}		
+		theme.setDefaultIcon(loader.getResource("images/main/default-icon.png" ));
 	}
 
 	/**
@@ -1242,7 +1295,175 @@
 		}
 	}
 
-	private void installPluginsMenus() {
+	private void registerActionOfExtensions(ActionInfoManager actionManager,
+			Enumeration<SkinExtensionType> extensiones, ClassLoader loader) {
+		ActionInfo actionInfo;
+		while (extensiones.hasMoreElements()) {
+			SkinExtensionType extension = extensiones.nextElement();
+			Class<? extends IExtension> classExtension;
+			try {
+				classExtension = (Class<? extends IExtension>) loader
+						.loadClass(extension.getClassName());
+
+				Enumeration<Action> actions = extension.enumerateAction();
+				while (actions.hasMoreElements()) {
+					Action action = actions.nextElement();
+					if (action.getName() == null) {
+						logger.info("invalid action name (null) in "+ extension.getClassName()+" of "+ loader.toString());
+					} else {
+						actionInfo = actionManager.createAction(
+								classExtension, action.getName(),
+								action.getLabel(), action.getActionCommand(),
+								action.getIcon(), null, action.getPosition(),
+								action.getTooltip());
+						actionManager.registerAction(actionInfo);
+						if( action.getPosition() < 100000000 ) {
+							logger.info("Invalid position in action ("+ actionInfo.toString()+ ").");
+							action.setPosition( action.getPosition() + 1000000000);
+						}
+					}
+				}
+
+				Enumeration<Menu> menus = extension.enumerateMenu();
+				while (menus.hasMoreElements()) {
+					Menu menu = menus.nextElement();
+					if (!menu.getIs_separator() ) {
+						actionInfo = actionManager.createAction(
+							classExtension, menu.getName(), menu.getText(),
+							menu.getActionCommand(), menu.getIcon(),
+							menu.getKey(), menu.getPosition(),
+							menu.getTooltip());
+						actionInfo = actionManager.registerAction(actionInfo);
+						if (actionInfo != null) {
+							menu.setActionCommand(actionInfo.getCommand());
+							menu.setTooltip(actionInfo.getTooltip());
+							menu.setIcon(actionInfo.getIconName());
+							menu.setPosition(actionInfo.getPosition());
+							menu.setKey(actionInfo.getAccelerator());
+							menu.setName(actionInfo.getName());
+						}
+					} 
+					if( menu.getPosition() < 100000000 ) {
+						logger.info("Invalid position in menu ("+ menu.getText() + ").");
+						menu.setPosition( menu.getPosition() + 1000000000);
+					}
+
+				}
+				Enumeration<ToolBar> toolBars = extension.enumerateToolBar();
+				while (toolBars.hasMoreElements()) {
+					ToolBar toolBar = toolBars.nextElement();
+
+					Enumeration<ActionTool> actionTools = toolBar
+							.enumerateActionTool();
+					while (actionTools.hasMoreElements()) {
+						ActionTool actionTool = actionTools.nextElement();
+						actionInfo = actionManager.createAction(
+								classExtension, actionTool.getName(),
+								actionTool.getText(),
+								actionTool.getActionCommand(),
+								actionTool.getIcon(),
+								null,
+								actionTool.getPosition(),
+								actionTool.getTooltip());
+						actionInfo = actionManager.registerAction(actionInfo);
+						if (actionInfo != null) {
+							actionTool.setActionCommand(actionInfo.getCommand());
+							actionTool.setTooltip(actionInfo.getTooltip());
+							actionTool.setIcon(actionInfo.getIconName());
+							actionTool.setPosition(actionInfo.getPosition());
+							actionTool.setName(actionInfo.getName());
+						}
+					}
+
+					Enumeration<SelectableTool> selectableTool = toolBar
+							.enumerateSelectableTool();
+					while (selectableTool.hasMoreElements()) {
+						SelectableTool actionTool = selectableTool
+								.nextElement();
+						actionInfo = actionManager.createAction(
+								classExtension, actionTool.getName(),
+								actionTool.getText(),
+								actionTool.getActionCommand(),
+								actionTool.getIcon(),
+								actionTool.getEnableText(),
+								actionTool.getPosition(),
+								actionTool.getTooltip());
+						actionInfo = actionManager.registerAction(actionInfo);
+						if (actionInfo != null) {
+							actionTool.setActionCommand(actionInfo.getCommand());
+							actionTool.setTooltip(actionInfo.getTooltip());
+							actionTool.setIcon(actionInfo.getIconName());
+							actionTool.setPosition(actionInfo.getPosition());
+							actionTool.setName(actionInfo.getName());
+						}
+					}
+				}
+			} catch (ClassNotFoundException e) {
+				logger.warn(
+						"Can't register actions of extension '"
+								+ extension.getClassName() + "'", e);
+			}
+		}
+	}
+	
+	@SuppressWarnings("unchecked")
+	private void registerActions() {
+		logger.info("registerActions");
+
+		ActionInfoManager actionManager = PluginsLocator.getActionInfoManager();
+		Iterator<String> it = pluginsConfig.keySet().iterator();
+
+		while (it.hasNext()) {
+			String pluginName = it.next();
+			PluginConfig pluginConfig = pluginsConfig.get(pluginName);
+			PluginServices pluginService = pluginsServices.get(pluginName);
+			PluginClassLoader loader =  pluginService.getClassLoader();
+
+			logger.info("registerActions of plugin '"+pluginName+"'.");
+
+			Extensions extensionConfig = pluginConfig.getExtensions();
+			
+			
+			Enumeration<SkinExtensionType> extensiones = extensionConfig.enumerateExtension();
+			registerActionOfExtensions(actionManager, extensiones, loader);
+
+			Enumeration<SkinExtensionType> skinSxtensiones = extensionConfig.enumerateSkinExtension();
+			registerActionOfExtensions(actionManager, skinSxtensiones, loader);
+
+			PopupMenus pluginPopupMenus = pluginConfig.getPopupMenus();
+			if (pluginPopupMenus != null) {
+				PopupMenu[] menus1 = pluginPopupMenus.getPopupMenu();
+				for (int j = 0; j < menus1.length; j++) {
+					PopupMenu popupMenu = menus1[j];
+					Enumeration<Menu> menus2 = popupMenu.enumerateMenu();
+					while (menus2.hasMoreElements()) {
+						Menu menu = menus2.nextElement();
+						if (!menu.getIs_separator() ) {
+							if( menu.getName() == null) {   
+								logger.info("Null name for popmenu '"+menu.getText()+"' in plugin "+ pluginService.getPluginName() );
+							} else {
+								ActionInfo actionInfo = actionManager.getAction(menu.getName());
+								if( actionInfo!=null ) {
+									menu.setActionCommand(actionInfo.getCommand());
+									menu.setTooltip(actionInfo.getTooltip());
+									menu.setIcon(actionInfo.getIconName());
+									menu.setPosition(actionInfo.getPosition());
+									menu.setText( actionInfo.getLabel());
+									menu.setKey(actionInfo.getAccelerator());
+								}
+							}
+						}
+					}
+				}
+			}
+			
+
+		}
+	}
+	
+
+	private TreeSet<SortableMenu> getOrderedMenus() { 
+
 		TreeSet<SortableMenu> orderedMenus = new TreeSet<SortableMenu>(
 				new MenuComparator());
 
@@ -1311,6 +1532,14 @@
 
 		}
 
+		return orderedMenus;
+	}
+
+	private void installPluginsMenus() {
+		logger.info("installPluginsMenus");
+
+		TreeSet<SortableMenu> orderedMenus = getOrderedMenus();
+
 		// Se itera por los menus ordenados
 		Iterator<SortableMenu> e = orderedMenus.iterator();
 
@@ -1319,6 +1548,8 @@
 			try {
 				SortableMenu sm = e.next();
 
+				logger.info(sm.menu.getPosition()+":"+sm.menu.getText()+":"+sm.loader.getPluginName()+":"+sm.extension.getClassName());
+				
 				frame.addMenu(sm.loader, sm.extension, sm.menu);
 
 			} catch (ClassNotFoundException ex) {
@@ -1343,11 +1574,84 @@
 		}
 	}
 
+	public class PluginMenuItem {
+		private Menu menu;
+		private PluginClassLoader loader;
+		private SkinExtensionType extension;
+
+		PluginMenuItem(PluginClassLoader loader,
+				SkinExtensionType extension, Menu menu) {
+			this.menu = menu;
+			this.loader = loader;
+			this.extension = extension;
+		}
+		
+		public PluginServices getPlugin() {
+			String pluginName = loader.getPluginName();
+			return PluginServices.getPluginServices(pluginName);
+		}
+		
+		public String getExtensionName() {
+			return this.extension.getClassName();
+		}
+		
+		public IExtension getExtension() {
+			Class<?> extensionClass;
+			try {
+				extensionClass = loader.loadClass(this.extension.getClassName());
+			} catch (ClassNotFoundException e) {
+				return null;
+			}
+			return PluginServices.getExtension(extensionClass);
+		}
+		
+		public String getText() {
+			return this.menu.getText();
+		}
+
+		public long getPosition() {
+			return this.menu.getPosition();
+		}
+		
+		public String getName() {
+			return this.menu.getName();
+		}
+		
+		public boolean isParent() {
+			return menu.getIs_separator();
+		}
+		
+		public String getPluginName() {
+			return this.loader.getPluginName();
+		}
+		
+		public ActionInfo getAction() {
+			ActionInfoManager manager = PluginsLocator.getActionInfoManager();
+			return manager.getAction(this.menu.getName());
+		}
+	}
+	
+	public List<PluginMenuItem> getPluginMenuItems() {
+		List<PluginMenuItem> menuItems = new ArrayList<Launcher.PluginMenuItem>();
+
+		TreeSet<SortableMenu> orderedMenus = getOrderedMenus();
+		Iterator<SortableMenu> e = orderedMenus.iterator();
+		while (e.hasNext()) {
+				SortableMenu sm = e.next();
+				PluginMenuItem item = new PluginMenuItem(sm.loader, sm.extension, sm.menu);
+				menuItems.add(item);
+		}
+		return menuItems;
+	}
+
+	
 	/**
 	 * Installs the menus, toolbars, actiontools, selectable toolbars and
 	 * combos. The order in which they are shown is determined here.
 	 */
 	private void installPluginsControls() {
+		logger.info("installPluginsControls (toolbars)");
+
 		Iterator<String> i = pluginsConfig.keySet().iterator();
 
 		Map<Extension, PluginServices> extensionPluginServices = new HashMap<Extension, PluginServices>();
@@ -1572,12 +1876,16 @@
 				}
 				// Install popup menus
 				PopupMenus pus = pc.getPopupMenus();
-
 				if (pus != null) {
 					PopupMenu[] menus = pus.getPopupMenu();
-
 					for (int j = 0; j < menus.length; j++) {
-						frame.addPopupMenu(ps.getClassLoader(), menus[j]);
+						String menuName = "(unknow)";
+						try  {
+							menuName = menus[j].getName();
+							frame.addPopupMenu(ps.getClassLoader(), menus[j]);
+						} catch(Throwable ex) {
+							addError("Error adding popup menu' "+ menuName +"' in plugin '"+pName+"'.");
+						}
 					}
 				}
 			} catch (Throwable e3) {
@@ -1767,6 +2075,7 @@
 				i = pluginsConfig.keySet().iterator();
 			}
 		}
+		registerActions();
 	}
 
 	private void pluginsMessages() {
@@ -1829,13 +2138,13 @@
 
 		for (int i = 0; i < pluginDirs.length; i++) {
 			if (pluginDirs[i].isDirectory()) {
+				String pluginName =  pluginDirs[i].getName();
 				File configXml = new File(pluginDirs[i].getAbsolutePath(),
 						"config.xml");
 
 				try {
 					FileInputStream is = new FileInputStream(configXml);
-					Reader xml = org.gvsig.utils.xml.XMLEncodingUtils
-							.getReader(is);
+					Reader xml = org.gvsig.utils.xml.XMLEncodingUtils.getReader(is);
 					if (xml == null) {
 						// the encoding was not correctly detected, use system
 						// default
@@ -1844,26 +2153,23 @@
 						// use a buffered reader to improve performance
 						xml = new BufferedReader(xml);
 					}
-					PluginConfig pConfig = (PluginConfig) PluginConfig
-							.unmarshal(xml);
+					PluginConfig pConfig = (PluginConfig) PluginConfig.unmarshal(xml);
 					pluginsConfig.put(pluginDirs[i].getName(), pConfig);
 				} catch (FileNotFoundException e) {
-					logger
-							.info("Plugin folder without config.xml. Skip plugin '"
-									+ pluginDirs[i].getAbsolutePath() + "'.");
+					logger.info("Plugin '"+pluginName+"' without config.xml ("
+									+ pluginDirs[i].getAbsolutePath() + ").");
 				} catch (MarshalException e) {
-					this.addError("Can't load plugin '"
-							+ pluginDirs[i].getAbsolutePath() + "'.", e);
+					this.addError("Can't load plugin '"+pluginName+"', incorrect config.xml." + e.getMessage() +" ("
+							+ pluginDirs[i].getAbsolutePath() + ").", e);
 				} catch (ValidationException e) {
-					this.addError("Can't load plugin '"
-							+ pluginDirs[i].getAbsolutePath() + "'.", e);
+					this.addError("Can't load plugin '"+pluginName+"', invalid config.xml." + e.getMessage() +" ("
+							+ pluginDirs[i].getAbsolutePath() + ").", e);
 				}
 			}
 		}
 
 		if (pluginsConfig.size() == 0) {
-			logger
-					.error("No valid plugin was found. The plugins directory currently is: "
+			logger.error("No valid plugin was found. The plugins directory currently is: "
 							+ pDir.getAbsolutePath()
 							+ "\n\tDid you specify the correct directory in the Launch Configuration parameters?\n\tExiting now...");
 			System.exit(-1);
@@ -2201,13 +2507,17 @@
 			if (e2.menu.hasPosition() && !e1.menu.hasPosition()) {
 				return Integer.MAX_VALUE;
 			}
-			if (e1.menu.getPosition() != e2.menu.getPosition()) {
+			
+			if( e1.menu.getPosition() == e2.menu.getPosition() ) {
 				// we don't return 0 unless both objects are the same, otherwise
 				// the objects get overwritten in the treemap
-				return e1.menu.getPosition() - e2.menu.getPosition();
-			} else {
 				return (e1.toString().compareTo(e2.toString()));
 			}
+    		if( e1.menu.getPosition() > e2.menu.getPosition() ) {
+				return Integer.MAX_VALUE;
+			}
+    		return Integer.MIN_VALUE;
+    		
 		}
 	}
 
@@ -2223,6 +2533,7 @@
 			menu = menu2;
 			this.loader = loader;
 		}
+		
 	}
 
 	private static class SortableTool {
@@ -2321,12 +2632,12 @@
 
 		public int compare(SortableTool e1, SortableTool e2) {
 			// compare the toolbars which contain the tools
-			int result = toolBarComp.compare(e1, e2);
+			long result = toolBarComp.compare(e1, e2);
 			if (result != 0) { // if the toolbars are different, use their order
-				return result;
+				return result>0? 1:-1;
 			}
 			// otherwise, compare the tools
-			int e1Position = -1, e2Position = -1;
+			long e1Position = -1, e2Position = -1;
 
 			if (e1.actiontool != null) {
 				if (e1.actiontool.hasPosition()) {
@@ -2359,7 +2670,7 @@
 				// we don't return 0 unless both objects are the same, otherwise
 				// the objects get overwritten in the treemap
 				if (result != 0) {
-					return result;
+					return  result>0? 1:-1;
 				}
 			}
 			return e1.toString().compareTo(e2.toString());
@@ -2552,6 +2863,10 @@
 	public static String getAppHomeDir() {
 		return appHomeDir;
 	}
+	
+    public static File getApplicationHomeFolder() {
+        return new File(getAppHomeDir());
+    }
 
 	/**
 	 * Sets Home Directory location of the application. May be set from outside
@@ -2648,11 +2963,24 @@
 	// }
 
 	public static void initIconThemes() {
-		IconThemeManager iconManager = IconThemeManager.getIconThemeManager();
-		IIconTheme icontheme = iconManager.getIconThemeFromConfig();
-		if (icontheme != null) {
-			iconManager.setCurrent(icontheme);
+		PluginsManager pluginsManager = PluginsLocator.getManager();
+		IconThemeManager iconManager = ToolsSwingLocator.getIconThemeManager();
+		
+		File f = new File(pluginsManager.getApplicationFolder(),"icon-theme");
+		if( !f.exists() ) { 
+			f.mkdir();
 		}
+		iconManager.getRepository().add(f,"_Global");
+		
+		f = new File(pluginsManager.getApplicationHomeFolder(),"icon-theme");
+		if( !f.exists() ) {
+			f.mkdir();
+		}
+		iconManager.getRepository().add(f,"_User");
+		
+		// TODO: falta por cargar de algun fichero de config el nombre del tema 
+		//		  por deecto a usar y seleccionarlo aqui como tema corriente.
+		//
 	}
 
 	/**
Index: branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/PluginServices.java
===================================================================
--- branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/PluginServices.java	(revision 38563)
+++ branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/PluginServices.java	(revision 38564)
@@ -63,12 +63,7 @@
 import javax.swing.SwingUtilities;
 import javax.swing.Timer;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import org.gvsig.andami.authentication.IAuthentication;
-import org.gvsig.andami.iconthemes.IIconTheme;
-import org.gvsig.andami.iconthemes.IconThemeManager;
 import org.gvsig.andami.messages.Messages;
 import org.gvsig.andami.messages.NotificationManager;
 import org.gvsig.andami.plugins.ExclusiveUIExtension;
@@ -86,11 +81,16 @@
 import org.gvsig.tools.persistence.PersistenceManager;
 import org.gvsig.tools.persistence.PersistentState;
 import org.gvsig.tools.persistence.exception.AddDefinitionException;
+import org.gvsig.tools.swing.icontheme.IconTheme;
+import org.gvsig.tools.swing.icontheme.IconThemeManager;
+import org.gvsig.tools.swing.icontheme.impl.DefaultIconThemeManager;
 import org.gvsig.utils.XMLEntity;
 import org.gvsig.utils.swing.threads.IMonitorableTask;
 import org.gvsig.utils.swing.threads.IProgressMonitorIF;
 import org.gvsig.utils.swing.threads.TaskMonitorTimerListener;
 import org.gvsig.utils.swing.threads.UndefinedProgressMonitor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Provides services to Plugins. Each plugin has an associated PluginServices
@@ -168,7 +168,7 @@
      * 
      * @return The plugin's name
      */
-    String getPluginName() {
+    public String getPluginName() {
         return loader.getPluginName();
     }
 
@@ -191,10 +191,12 @@
      */
     public static PluginServices getPluginServices(Object pluginClassInstance) {
         try {
-            PluginClassLoader loader =
-                (PluginClassLoader) pluginClassInstance.getClass()
-                .getClassLoader();
-
+        	PluginClassLoader loader;
+    		if( pluginClassInstance instanceof Class ) {
+    			loader = (PluginClassLoader) ((Class) pluginClassInstance).getClassLoader();
+    		} else {
+    			loader = (PluginClassLoader) pluginClassInstance.getClass().getClassLoader();
+    		}
             return Launcher.getPluginServices(loader.getPluginName());
         } catch (ClassCastException e) {
             /*
@@ -671,11 +673,11 @@
     }
 
     public static IconThemeManager getIconThemeManager() {
-        return IconThemeManager.getIconThemeManager();
+        return DefaultIconThemeManager.getIconThemeManager();
     }
 
-    public static IIconTheme getIconTheme() {
-        return IconThemeManager.getIconThemeManager().getCurrent();
+    public static IconTheme getIconTheme() {
+        return DefaultIconThemeManager.getIconThemeManager().getCurrent();
     }
 
     /**
Index: branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/PluginsLocator.java
===================================================================
--- branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/PluginsLocator.java	(revision 38563)
+++ branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/PluginsLocator.java	(revision 38564)
@@ -1,8 +1,11 @@
 package org.gvsig.andami;
 
+import org.gvsig.andami.actioninfo.ActionInfoManager;
 import org.gvsig.tools.locator.AbstractLocator;
 import org.gvsig.tools.locator.Locator;
 import org.gvsig.tools.locator.LocatorException;
+import org.gvsig.tools.swing.icontheme.IconThemeManager;
+import org.gvsig.tools.swing.icontheme.impl.DefaultIconThemeManager;
 
 
 public class PluginsLocator extends AbstractLocator {
@@ -13,8 +16,10 @@
      * PluginsManager name used by the locator to access the instance
      */
     public static final String PLUGINS_MANAGER_NAME = "PluginsManager";
+    public static final String PLUGINS_ACTIONINFO_MANAGER_NAME = "PluginsActionInfoManager";
 
     private static final String PLUGINS_MANAGER_DESCRIPTION = "PluginsManager of Andami framework";
+    private static final String PLUGINS_ACTIONINFO_MANAGER_DESCRIPTION = "PluginsActionInfoManager";
 
     /**
      * Unique instance.
@@ -51,7 +56,7 @@
     public static PluginsManager getManager() throws LocatorException {
         return (PluginsManager) getInstance().get(PLUGINS_MANAGER_NAME);
     }
-
+    
     /**
      * Registers the Class implementing the DataManager interface.
      *
@@ -74,4 +79,14 @@
                 clazz);
     }
 
+
+    public static ActionInfoManager getActionInfoManager() throws LocatorException {
+        return (ActionInfoManager) getInstance().get(PLUGINS_ACTIONINFO_MANAGER_NAME);
+    }
+
+    public static void registerActionInfoManager(Class clazz) {
+        getInstance().register(PLUGINS_ACTIONINFO_MANAGER_NAME, PLUGINS_ACTIONINFO_MANAGER_DESCRIPTION,
+                clazz);
+    }
+
 }
Index: branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/PluginsLibrary.java
===================================================================
--- branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/PluginsLibrary.java	(revision 38563)
+++ branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/PluginsLibrary.java	(revision 38564)
@@ -1,5 +1,6 @@
 package org.gvsig.andami;
 
+import org.gvsig.andami.actioninfo.impl.DefaultActionInfoManager;
 import org.gvsig.andami.impl.DefaultPluginsManager;
 import org.gvsig.andami.ui.mdiManager.WindowInfo;
 import org.gvsig.tools.library.AbstractLibrary;
@@ -17,6 +18,7 @@
 
     protected void doInitialize() throws LibraryException {
         PluginsLocator.registerDefaultManager(DefaultPluginsManager.class);
+        PluginsLocator.registerActionInfoManager(DefaultActionInfoManager.class);
     }
 
     protected void doPostInitialize() throws LibraryException {
Index: branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/actioninfo/ActionInfoManager.java
===================================================================
--- branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/actioninfo/ActionInfoManager.java	(revision 0)
+++ branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/actioninfo/ActionInfoManager.java	(revision 38564)
@@ -0,0 +1,51 @@
+package org.gvsig.andami.actioninfo;
+
+import java.util.Iterator;
+
+import org.gvsig.andami.plugins.IExtension;
+
+public interface ActionInfoManager {
+
+	/**
+	 * Create a new action and return.
+	 * 
+	 * @param extension, class that execute the action, extends IExtension
+	 * @param name, name of the action
+	 * @param text, text to use to represent the action.
+	 * @param command, command used to execute the action
+	 * @param icon, icon used to represent the action
+	 * @param accelerator, the key which invokes the action
+	 * @param position, position of the action when it is represented in the user interface
+	 * @param tip, tooltip to associate to the action
+	 * @return
+	 */
+    public ActionInfo createAction(Class<? extends IExtension> extension, String name, String text, String command, String icon, String accelerator, long position, String tip);
+    
+    /**
+     * Register the action in the actions of the system, and return the action
+     * that is registered.
+     * 
+     * If an action with the same name is in the system then actions are merged
+     * and the merged action is returned and remain in the system.
+     * 
+     * @param action
+     */
+    public ActionInfo registerAction(ActionInfo action);
+     
+    /**
+     * Retrieve an action by name
+     * 
+     * @param name
+     * @return the action associated to this name
+     */
+    public ActionInfo getAction(String name);
+    
+    /**
+     * Return an iterator over all registered actions.
+     * 
+     * @return iterator over al acctions
+     */
+    public Iterator<ActionInfo> getActions();
+    
+    public ActionInfoStatusCache createActionStatusCache();
+}

Property changes on: branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/actioninfo/ActionInfoManager.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/actioninfo/ActionInfo.java
===================================================================
--- branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/actioninfo/ActionInfo.java	(revision 0)
+++ branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/actioninfo/ActionInfo.java	(revision 38564)
@@ -0,0 +1,32 @@
+package org.gvsig.andami.actioninfo;
+
+import java.awt.event.ActionListener;
+
+import javax.swing.Action;
+import javax.swing.ImageIcon;
+import javax.swing.KeyStroke;
+
+import org.gvsig.andami.PluginServices;
+import org.gvsig.andami.plugins.IExtension;
+
+public interface ActionInfo extends Action, ActionListener{
+	public void merge(ActionInfo other);
+	public PluginServices getPlugin();
+	public IExtension getExtension();
+	public String getPluginName();
+	public String getExtensionName();
+	public String getName();
+	public String getLabel();
+	public String getCommand();
+	public ImageIcon getIcon();
+	public String getIconName();
+	public String getAccelerator();
+	public KeyStroke getKeyStroke();
+	public String getTooltip();
+	public long getPosition();
+	public boolean isVisible();
+	public boolean isEnabled();
+	public void execute();
+	public void execute(Object[] args);
+	public void execute(Object arg);
+}

Property changes on: branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/actioninfo/ActionInfo.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/actioninfo/ActionInfoStatusCache.java
===================================================================
--- branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/actioninfo/ActionInfoStatusCache.java	(revision 0)
+++ branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/actioninfo/ActionInfoStatusCache.java	(revision 38564)
@@ -0,0 +1,9 @@
+package org.gvsig.andami.actioninfo;
+
+public interface ActionInfoStatusCache {
+	public void clear();
+	
+	public boolean isEnabled(ActionInfo action);
+
+	public boolean isVisible(ActionInfo action);
+}
\ No newline at end of file

Property changes on: branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/actioninfo/ActionInfoStatusCache.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/actioninfo/impl/DefaultActionInfoStatusCache.java
===================================================================
--- branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/actioninfo/impl/DefaultActionInfoStatusCache.java	(revision 0)
+++ branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/actioninfo/impl/DefaultActionInfoStatusCache.java	(revision 38564)
@@ -0,0 +1,81 @@
+package org.gvsig.andami.actioninfo.impl;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.gvsig.andami.actioninfo.ActionInfo;
+import org.gvsig.andami.actioninfo.ActionInfoStatusCache;
+import org.gvsig.andami.plugins.ExtensionHelper;
+import org.gvsig.andami.plugins.IExtension;
+
+public class DefaultActionInfoStatusCache implements ActionInfoStatusCache {
+
+	private class Status {
+		Boolean isEnabled = null;
+		Boolean isVisible = null;
+	}
+	
+	private Map<IExtension,Status> extensions = null;
+	private Map<ActionInfo,Status> actions = null;
+	
+	public DefaultActionInfoStatusCache() {
+		this.clear();
+	}
+
+	public void clear() {
+		extensions = new HashMap<IExtension, Status>();
+		actions = new HashMap<ActionInfo, Status>();
+	}
+	
+
+	public boolean isEnabled(ActionInfo action) {
+		Status status; 
+		IExtension extension = action.getExtension();
+		if( ExtensionHelper.canQueryByAction(extension) ) {
+			status = actions.get(action);
+			if( status == null ) {
+				status = new Status();
+				actions.put(action, status);
+			}
+			if( status.isEnabled == null ) {
+				status.isEnabled = new Boolean( action.isEnabled() );
+			}
+		} else {
+			status = extensions.get(extension);
+			if( status == null ) {
+				status = new Status();
+				extensions.put(extension, status);
+			}
+			if( status.isEnabled == null ) {
+				status.isEnabled = new Boolean( extension.isEnabled() );
+			}
+		}
+		return status.isEnabled.booleanValue();
+	}
+
+	public boolean isVisible(ActionInfo action) {
+		Status status; 
+		IExtension extension = action.getExtension();
+		if( ExtensionHelper.canQueryByAction(extension) ) {
+			status = actions.get(action);
+			if( status == null ) {
+				status = new Status();
+				actions.put(action, status);
+			}
+			if( status.isVisible == null ) {
+				status.isVisible = new Boolean( action.isVisible() );
+			}
+		} else {
+			status = extensions.get(extension);
+			if( status == null ) {
+				status = new Status();
+				extensions.put(extension, status);
+			}
+			if( status.isVisible == null ) {
+				status.isVisible = new Boolean( extension.isVisible() );
+			}
+		}
+		return status.isVisible.booleanValue();
+	}
+
+}

Property changes on: branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/actioninfo/impl/DefaultActionInfoStatusCache.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/actioninfo/impl/DefaultActionInfoManager.java
===================================================================
--- branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/actioninfo/impl/DefaultActionInfoManager.java	(revision 0)
+++ branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/actioninfo/impl/DefaultActionInfoManager.java	(revision 38564)
@@ -0,0 +1,102 @@
+package org.gvsig.andami.actioninfo.impl;
+
+import java.util.ArrayList;
+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 org.gvsig.andami.actioninfo.ActionInfo;
+import org.gvsig.andami.actioninfo.ActionInfoManager;
+import org.gvsig.andami.actioninfo.ActionInfoStatusCache;
+import org.gvsig.andami.plugins.IExtension;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class DefaultActionInfoManager implements  ActionInfoManager {
+	private static Logger logger = LoggerFactory.getLogger(DefaultActionInfoManager.class);
+	
+	private Map<String, ActionInfo>actions = new HashMap<String, ActionInfo>();
+	private int anonymousCounter = 1;
+	
+    public ActionInfo createAction(Class<? extends IExtension> extension, String name, String text, String command, String icon, String enableText, long position, String tip) {
+    	name = emptyToNull(name);
+    	String actionName = name;
+    	if( actionName==null ){
+    		actionName = String.format("anonymous__%04d",this.anonymousCounter++);
+    	}
+    	ActionInfo action = new DefaultActionInfo(extension, actionName, text, command, icon, enableText, position, tip);
+    	ActionInfo previous = this.getAction(action.getName());
+    	if( previous != null ) {
+    		action.merge(previous);
+    	}
+    	if( name == null  ){
+    		logger.info("createAction: name of action is null/empty, rename to '"+actionName+"' ("+action.toString()+").");
+    	}
+    	if( action.getLabel()==null && action.getIconName()==null ) {
+    		logger.info("createAction(name='"+name+"'): text and icon of action is null");
+    	}
+    	return action;
+    }
+	
+	private String emptyToNull(String s) {
+		if( s==null ) {
+			return null;
+		}
+		return "".equals(s.trim())? null:s;
+	}
+	
+    public ActionInfo registerAction(ActionInfo action) {
+    	if( action == null ) {
+    		// Avisamos en el log de que se intenta registrar una accion null, intentado
+    		// sacar el stack para que se pueda ver quien lo esta haciendo, pero no
+    		// provocamos un error, solo retornamos null.
+			try {
+				throw new IllegalArgumentException();
+			} catch (IllegalArgumentException e) {
+				logger.info("registerAction(null).", e);
+			}
+			return null;
+    	}
+    	ActionInfo previous = this.getAction(action.getName());
+    	if( previous != null ) {
+    		previous.merge(action);
+        	return previous;
+    	} else {
+    		this.actions.put(action.getName(), action);
+        	return action;
+    	}
+    }
+    
+    public ActionInfo getAction(String name) {
+    	if( name == null || "".equals(name) ) {
+			try {
+				throw new IllegalArgumentException();
+			} catch (IllegalArgumentException e) {
+				logger.info("getAction(null/empty) return null.", e);
+				return null;
+			}
+    	}
+    	return this.actions.get(name);
+    }
+    
+    public Iterator<ActionInfo> getActions() {
+    	List<ActionInfo> actions = new ArrayList<ActionInfo>();
+    	actions.addAll(this.actions.values());
+    	Collections.sort(actions, new Comparator<ActionInfo>() {
+    		public int compare(ActionInfo arg0, ActionInfo arg1) {
+    			String s0 = String.format("%s/%012d", arg0.getPluginName(), arg0.getPosition());
+    			String s1 = String.format("%s/%012d", arg1.getPluginName(), arg1.getPosition());
+    			return s0.compareTo(s1);
+    		};
+		});
+    	return actions.iterator();
+    }
+    
+    public ActionInfoStatusCache createActionStatusCache() {
+    	return new DefaultActionInfoStatusCache();
+    }
+
+}

Property changes on: branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/actioninfo/impl/DefaultActionInfoManager.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/actioninfo/impl/DefaultActionInfo.java
===================================================================
--- branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/actioninfo/impl/DefaultActionInfo.java	(revision 0)
+++ branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/actioninfo/impl/DefaultActionInfo.java	(revision 38564)
@@ -0,0 +1,222 @@
+package org.gvsig.andami.actioninfo.impl;
+
+import java.awt.event.ActionEvent;
+import java.beans.PropertyChangeListener;
+
+import javax.swing.Action;
+import javax.swing.ImageIcon;
+import javax.swing.KeyStroke;
+
+import org.gvsig.andami.PluginServices;
+import org.gvsig.andami.PluginsLocator;
+import org.gvsig.andami.actioninfo.ActionInfo;
+import org.gvsig.andami.plugins.ExclusiveUIExtension;
+import org.gvsig.andami.plugins.ExtensionHelper;
+import org.gvsig.andami.plugins.IExtension;
+import org.gvsig.andami.ui.mdiFrame.KeyMapping;
+import org.gvsig.tools.swing.icontheme.IconTheme;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class DefaultActionInfo implements ActionInfo {
+    private static Logger logger = LoggerFactory.getLogger(DefaultActionInfo.class);
+    
+	private Class<? extends IExtension> extensionClass;
+	private IExtension extension;
+	private String name;
+	private String text;
+	private String command;
+	private String iconName;
+	private String accelerator;
+	private long position;
+	private String tip;
+	
+	DefaultActionInfo(Class<? extends IExtension> extension, String name, String text, String command, String icon, String accelerator, long position, String tip) {
+		this.extensionClass = extension;
+		this.name = name;
+		this.text = emptyToNull(text) ;
+		this.command = emptyToNull(command);
+		this.iconName = emptyToNull(icon);
+		this.accelerator = emptyToNull(accelerator);
+		this.position = position; 
+		this.tip = emptyToNull(tip);
+	}
+	
+
+	private String emptyToNull(String s) {
+		if( s==null ) {
+			return null;
+		}
+		return s.trim().length()<0 ? null:s;
+	}
+
+	public void merge(ActionInfo other) {
+		if( this.extensionClass == null ) {
+			this.extensionClass = other.getExtension().getClass() ;
+			this.extension = other.getExtension();
+		}
+		if( this.text == null  ) {
+			this.text = other.getLabel();
+		}
+		if( this.command == null  ) {
+			this.command = other.getCommand();
+		}
+		if( this.iconName == null ) {
+			this.iconName = other.getIconName();
+		}
+		if( this.accelerator == null  ) {
+			this.accelerator = other.getAccelerator();
+		}
+		if( this.position < 1 ) {
+			this.position = other.getPosition();
+		}
+		if( this.tip == null  ) {
+			this.tip = other.getTooltip();
+		}
+		
+	}
+	
+	public PluginServices getPlugin() {
+		PluginServices plugin = PluginsLocator.getManager().getPlugin(this.extensionClass);
+		return plugin;
+	}
+	
+	public String getPluginName() {
+		return this.getPlugin().getPluginDirectory().getName();
+	}
+	
+	public IExtension getExtension() {
+		if( this.extension == null ) {
+			this.extension = PluginsLocator.getManager().getExtension(this.extensionClass);
+		}
+		return this.extension;
+	}
+	
+	public String getExtensionName() {
+		return this.extensionClass.getName();
+	}
+
+	public boolean isVisible() {
+		ExclusiveUIExtension eui = PluginsLocator.getManager().getExclusiveUIExtension();
+        if (eui == null) {
+            return ExtensionHelper.isVisible(this.getExtension(), this.command);
+        }
+        return eui.isVisible(this.getExtension());
+	}
+	
+	public boolean isEnabled() {
+		ExclusiveUIExtension eui = PluginsLocator.getManager().getExclusiveUIExtension();
+        if (eui == null) {
+            return ExtensionHelper.isEnabled(this.getExtension(), this.command);
+        }
+        return eui.isEnabled(this.getExtension());
+	}
+	
+	public void execute() {
+        logger.info("{}.execute('{}')", this.getPluginName()+":"+this.getExtensionName(),  this.getCommand());
+		this.getExtension().execute(this.command);
+	}
+
+	public void execute(Object[] args) {
+        logger.info("{}.execute('{}')", this.getPluginName()+":"+this.getExtensionName(),  this.getCommand());
+        ExtensionHelper.execute(this.getExtension(), this.command, args);
+	}
+
+	public void execute(Object arg) {
+		if( arg instanceof Object[] ) {
+			execute((Object[])arg);
+			return;
+		}
+		execute( new Object[] { arg } );
+	}
+	
+	public void actionPerformed(ActionEvent arg0) {
+		this.execute();
+	}
+	
+	public String getName() {
+		return this.name;
+	}
+
+	public String getLabel() {
+		return this.text;
+	}
+
+	public String getCommand() {
+		return this.command;
+	}
+
+	public String getIconName() {
+		return this.iconName;
+	}
+
+	public ImageIcon getIcon() {
+		IconTheme iconTheme = PluginServices.getIconTheme();
+		return iconTheme.get(this.iconName);
+	}
+	
+	public String getAccelerator() {
+		return this.accelerator;
+	}
+
+	public KeyStroke getKeyStroke() {
+		if( emptyToNull(this.accelerator) == null ) {
+			return null;
+		}
+		return KeyMapping.getKeyStroke(this.accelerator);
+	}
+	
+	public long getPosition() {
+		return this.position;
+	}
+	public String getTooltip() {
+		return this.tip;
+	}
+
+	public void addPropertyChangeListener(PropertyChangeListener arg0) {
+		// not implemented
+	}
+
+	public Object getValue(String name) {
+		if( Action.ACTION_COMMAND_KEY.equalsIgnoreCase(name)) {
+			return this.command;
+		}
+		if( Action.LONG_DESCRIPTION.equalsIgnoreCase(name)) {
+			return this.tip;
+		}
+		if( Action.NAME.equalsIgnoreCase(name)) {
+			return this.name;
+		}
+		if( Action.SMALL_ICON.equalsIgnoreCase(name)) {
+			return this.iconName;
+			//return IconThemeManager.getIconThemeManager().getCurrent().get(this.iconName);
+		}
+		return null;
+	}
+
+	public void putValue(String arg0, Object arg1) {
+		
+	}
+
+	public void removePropertyChangeListener(PropertyChangeListener arg0) {
+		// not implemented
+	}
+
+	public void setEnabled(boolean arg0) {
+		// Do nothing
+	}
+	
+    public String toString() {
+    	StringBuffer buffer = new StringBuffer();
+    	buffer.append("ActionInfo {");
+    	buffer.append("name='").append(this.name).append("', ");
+    	buffer.append("label='").append(this.text).append("', ");
+    	buffer.append("tooltip='").append(this.tip).append("', ");
+    	buffer.append("actionCommand='").append(this.command).append("', ");
+    	buffer.append("position='").append(this.position).append("', ");
+    	buffer.append("icon='").append(this.iconName).append("', ");
+    	buffer.append("extension='").append(this.getExtensionName()).append("', ");
+    	buffer.append("accelerator='").append(this.accelerator).append("' }");
+    	return buffer.toString();
+	}
+}

Property changes on: branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/actioninfo/impl/DefaultActionInfo.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/actioninfo/impl/test.java
===================================================================
--- branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/actioninfo/impl/test.java	(revision 0)
+++ branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/actioninfo/impl/test.java	(revision 38564)
@@ -0,0 +1,23 @@
+package org.gvsig.andami.actioninfo.impl;
+
+import java.text.MessageFormat;
+import java.util.Formatter;
+
+public class test {
+
+	/**
+	 * @param args
+	 */
+	public static void main(String[] args) {
+
+		MessageFormat f = new MessageFormat("{0,number,##########}");
+		Long num = new Long(12);
+		Object[] testArgs = { num};
+		String s = f.format(testArgs);
+		System.out.println(s);
+		
+		s = String.format("%010d", num);
+		System.out.println(s);
+	}
+
+}

Property changes on: branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/actioninfo/impl/test.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/IconThemeHelper.java
===================================================================
--- branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/IconThemeHelper.java	(revision 0)
+++ branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/IconThemeHelper.java	(revision 38564)
@@ -0,0 +1,46 @@
+package org.gvsig.andami;
+
+import java.awt.Image;
+
+import javax.swing.ImageIcon;
+
+import org.gvsig.tools.swing.api.ToolsSwingLocator;
+import org.gvsig.tools.swing.icontheme.IconTheme;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class IconThemeHelper {
+
+	private static Logger logger = LoggerFactory.getLogger(IconThemeHelper.class);
+	
+	@SuppressWarnings("rawtypes")
+	public static void registerIcon(String group, String name, Object obj) {
+		String resourceName;
+		ClassLoader loader;
+		IconTheme iconTheme = ToolsSwingLocator.getIconThemeManager().getCurrent();
+		if( group == null || group.trim().length()==0 ) {
+			resourceName = "images/"+name+".png";
+		} else {
+			resourceName = "images/"+group+"/"+name+".png";
+		}
+		if( obj instanceof Class ) {
+			loader = ((Class) obj).getClassLoader();
+		} else {
+			loader = obj.getClass().getClassLoader();
+		}
+		PluginServices plugin = PluginServices.getPluginServices(obj);
+		try {
+			iconTheme.registerDefault(plugin.getPluginName(), group, name, null, loader.getResource(resourceName));
+		} catch( Throwable e) {
+			logger.info(e.getMessage());
+		}
+	}
+
+	public static ImageIcon getImageIcon(String iconName) {
+		return PluginServices.getIconTheme().get(iconName);
+	}
+	
+	public static Image getImage(String iconName) {
+		return PluginServices.getIconTheme().get(iconName).getImage();
+	}
+}

Property changes on: branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/IconThemeHelper.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/tools/swing/icontheme/IconTheme.java
===================================================================
--- branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/tools/swing/icontheme/IconTheme.java	(revision 0)
+++ branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/tools/swing/icontheme/IconTheme.java	(revision 38564)
@@ -0,0 +1,205 @@
+package org.gvsig.tools.swing.icontheme;
+
+import java.awt.Image;
+import java.io.File;
+import java.net.URL;
+import java.util.Iterator;
+
+import javax.swing.ImageIcon;
+
+import org.gvsig.andami.PluginServices;
+
+public interface IconTheme {
+	
+	public static final String NO_ICON_NAME = "-no-icon-";
+
+	interface Icon extends Comparable<Icon> {
+		public String getName();
+		public String getGroup() ;
+		public ImageIcon getImageIcon();
+		public Image getImage();
+		public Object getResource() ;
+		public URL getURL() ;
+		public String getLabel();
+		public String getProviderName();
+	}
+
+	/**
+	 * Load all icons from the IconTheme
+	 */
+	public void load(Object resource) throws IllegalArgumentException;
+	
+
+	public void setDefault(IconTheme def);
+
+	public IconTheme getDefault();
+
+	/**
+	 * Returns <code>true</code> if the icon theme contains a mapping for the
+	 * specified iconName.
+	 *
+	 * @param iconName The key to check if it has been registered in this
+	 * IconTheme
+	 *
+	 * @return <code>true</code> if this IconTheme contains
+	 * <code>iconName</code>, <code>false</code> otherwise.
+	 */
+	public boolean exists(String name);
+
+	/**
+	 * Gets the ImageIcon associated with the provided name, if the name
+	 * is present in the theme. If the icon not exists try to return
+	 * a icon with name "no-icon" or returns <code>null</code> if 
+	 * this not exists.
+	 *
+	 * @param name
+	 * 			The name whose associated icon is to be retrieved
+	 *
+	 * @return
+	 * 			The icon associated with the provided name
+	 */
+	public ImageIcon get(String iconName);
+	
+	/**
+	 * Return the ThemeIcon associated with the name.
+	 *  
+	 * @param name of the icon
+	 * @return the IconTheme requiered
+	 */
+	public Icon getThemeIcon(String name);
+
+	/**
+	 * Gets the theme name of the theme
+	 * @return theme name
+	 */
+	public String getName();
+
+	/**
+	 * Sets the theme name of the theme
+	 *
+	 * @param themeName
+	 */
+	public void setName(String themeName);
+
+	public String getID();
+
+	public void setID(String id);
+
+	/**
+	 * Gets the theme description.
+	 *
+	 * @return The description of this theme.
+	 */
+	public String getDescription();
+
+	/**
+	 * Sets the theme description. It should be a short description
+	 * (around 20-30 words), including the highlights of the theme,
+	 * the author and maybe its email address or a link the the theme's
+	 * homepage.
+	 *
+	 * @param description
+	 */
+	public void setDescription(String description);
+
+	/**
+	 * Return an iterator over the names of the icons in the theme.
+	 * 
+	 * @return iterator of names of icons
+	 */
+	public Iterator<String> iterator();
+
+	/**
+	 * Return an iterator over the ThemIcon in the theme.
+	 *  
+	 * @return iterator of ThemeIcon
+	 */
+	public Iterator<Icon> getThemeIcons();
+
+	
+	/**
+	 * Return the icon used as icon by default when the requested icon 
+	 * not exists.
+	 * 
+	 * @return the default icon to use.
+	 */
+	public ImageIcon getDefaultIcon();
+	
+	/**
+	 * Set the default icon to use when the requestd icon not exists.
+	 * 
+	 * @param icon
+	 */
+	public void setDefaultIcon(ImageIcon icon);
+
+	public void setDefaultIcon(URL resource);
+
+	public void setDefaultIcon(String name);
+
+	/**
+	 * Register a icon in the theme.
+	 * The parameter icon can be null if the resource is specified.
+	 * The parameter resource can be null if the icon is specified. 
+	 * 
+	 * Plugin and group can be null.
+	 *  
+	 * @param provider name of the icon
+	 * @param group name for the icon.
+	 * @param name of icon
+	 * @param icon, can be nulll if the resource is specified. 
+	 * @param resource, resource of the icon, usualy and url to the icon.
+	 * 
+	 * @throws IllegalArgumentException if name is null/empty or icon/resource are null
+	 */
+	public void registerDefault(String provider, String group, String name, ImageIcon icon, URL resource) throws IllegalArgumentException;
+
+	/**
+	 * Register a icon in the theme.
+	 * The parameter icon can be null if the resource is specified.
+	 * The parameter resource can be null if the icon is specified. 
+	 * 
+	 * Plugin and group can be null.
+	 * 
+	 * @param provider name of the icon
+	 * @param group name for the icon.
+	 * @param name of icon
+	 * @param icon, can be nulll if the resource is specified. 
+	 * @param resource, resource of the icon, usualy and url to the icon.
+	 * 
+	 * @throws IllegalArgumentException if name is null/empty or icon/resource are null
+	 */
+	public void register(String provider, String group, String name, ImageIcon icon, URL resource) throws IllegalArgumentException;
+
+	public void export(File folder);
+	
+	/**
+	 * @deprecated use {@link #getDefaultIcon()} 
+	 * @return
+	 */
+	public ImageIcon getNoIcon();
+	
+	/**
+	 * @deprecated use {@link #get(String)} instead
+	 */
+	public ImageIcon get(String iconName, ClassLoader loader);
+
+	/**
+	 * @deprecated use {@link #registerDefault(PluginServices, String, String, ImageIcon, Object)}
+	 */
+	public void registerDefault(String iconName, ImageIcon image);
+
+	/**
+	 * @deprecated use {@link #registerDefault(PluginServices, String, String, ImageIcon, Object)}
+	 */
+	public void registerDefault(String iconName, Object resource);
+
+	/**
+	 * @deprecated use {@link #register(PluginServices, String, String, ImageIcon, Object)}
+	 */
+	public void register(String iconName, ImageIcon image);
+
+	/**
+	 * @deprecated use {@link #register(PluginServices, String, String, ImageIcon, Object)}
+	 */
+	public void register(String iconName, Object resource);
+}

Property changes on: branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/tools/swing/icontheme/IconTheme.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/tools/swing/icontheme/impl/BaseIconTheme.java
===================================================================
--- branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/tools/swing/icontheme/impl/BaseIconTheme.java	(revision 0)
+++ branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/tools/swing/icontheme/impl/BaseIconTheme.java	(revision 38564)
@@ -0,0 +1,526 @@
+/*
+ * Copyright (C) 2007 IVER T.I. and Generalitat Valenciana.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
+ *
+ * For more information, contact:
+ *
+ *  Generalitat Valenciana
+ *   Conselleria d'Infraestructures i Transport
+ *   Av. Blasco Ib��ez, 50
+ *   46010 VALENCIA
+ *   SPAIN
+ *
+ *      +34 963862235
+ *   gvsig@gva.es
+ *      www.gvsig.gva.es
+ *
+ *    or
+ *
+ *   IVER T.I. S.A
+ *   Salamanca 50
+ *   46005 Valencia
+ *   Spain
+ *
+ *   +34 963163400
+ *   dac@iver.es
+ */
+
+package org.gvsig.tools.swing.icontheme.impl;
+
+
+import java.awt.Image;
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.swing.ImageIcon;
+
+import org.apache.commons.io.FileUtils;
+import org.gvsig.tools.swing.icontheme.IconTheme;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * <p>This class represents an icon theme, which is basically a mapping of
+ * symbolic icon names, and real icons (or icon paths). This is useful to
+ * change an application's icons in an easy way. An icon theme
+ * is usually read from disk on start up, but can also be created or
+ * modified on a later time.</p>
+ *
+ */
+public class BaseIconTheme implements IconTheme {
+	protected static Logger logger = LoggerFactory.getLogger(BaseIconTheme.class);
+
+	protected String id = null;
+	protected String name=null;
+	protected String description=null;
+	protected Map<String, Icon> iconList = null;
+	protected IconTheme defaultTheme = null;
+	protected String defaultIconName = null;
+
+	class DefaultIcon implements Icon {
+		private ImageIcon image;
+		private URL resource;
+		private String name;
+		private String group;
+		private String provider;
+		
+		DefaultIcon(String provider,  String group, String name, ImageIcon image,URL resource) {
+			this.image = image;
+			this.resource = resource;
+			this.group = group;
+			this.name = name;
+			this.provider = provider;
+		}
+		
+		public ImageIcon getImageIcon() {
+			if (this.image != null){
+				return this.image;
+			}
+			try {
+				this.image = new ImageIcon((URL)this.resource);
+			} catch(Exception ex) {
+				return null;
+			}
+			return this.image;
+		}
+		
+		public Image getImage() {
+			ImageIcon icon = this.getImageIcon();
+			if( icon == null ) {
+				return null;
+			}
+			return icon.getImage();
+		}
+		
+		public String getName() {
+			return name;
+		}
+		
+		public String getGroup() {
+			return group;
+		}
+		
+		public Object getResource() {
+			return resource;
+		}
+
+		public URL getURL() {
+			if( resource instanceof URL ) {
+				return (URL) this.resource;
+			}
+			return null;
+		}
+
+		public String getLabel() {
+			if( resource != null ) {
+				return resource.toString();
+			}
+			if( image != null ) {
+				return image.toString();
+			}
+			return "";
+		}
+		
+		public int compareTo(Icon other) {
+			String this_id = this.getProviderName() + "/" + this.getGroup() + "/" + this.getName();
+			String other_id = other.getProviderName() + "/" + other.getGroup() + "/" + other.getName();
+			return this_id.compareTo(other_id);
+		}
+
+		public String getProviderName() {
+			return provider;
+		}
+
+	}
+	
+	public BaseIconTheme() {
+		this(null);
+	}	
+	
+	public BaseIconTheme(IconTheme defaultIconTheme) {
+		this.setDefault(defaultIconTheme);
+		this.id = "default"; // El id no traducirlo
+		this.name = "default";
+		this.description = "Default icon theme";
+		this.iconList = new HashMap<String, Icon>();
+	}
+	
+	/**
+	 * Load the icons of the theme
+	 */
+	public void load(Object resource) {
+		// Do nothing.
+	}
+	
+	/**
+	 * Override this to load icons on demand instead of 
+	 * load on the creation of the theme.
+	 */
+	protected void deferredLoad() {
+		// Do nothing
+	}
+	
+
+	
+	private void logstack(String msg) {
+		try {
+			throw new IllegalArgumentException();
+		} catch (IllegalArgumentException e) {
+			logger.debug(msg,e);
+		}
+	}
+
+	private boolean isEmptyString(String s) {
+		if( s==null ) {
+			return true;
+		}
+		if( s.trim().length() == 0 ) {
+			return true;
+		}
+		return false;
+	}
+
+	public void setDefault(IconTheme def){
+    	if( def == this ) {
+    		defaultTheme = null;
+    	} else {
+    		defaultTheme = def;
+    	}
+    }
+
+    public IconTheme getDefault(){
+    	return defaultTheme;
+    }
+
+	public boolean exists(String iconName) {
+		if( isEmptyString(iconName) ) {
+			return false;
+		}
+		deferredLoad();
+		
+		if (iconList.containsKey(iconName)) {
+			return true;
+		}
+		if (defaultTheme !=null && defaultTheme.exists(iconName)){
+			return true;
+		}
+		return false;
+	}
+
+	public Iterator<String> iterator() {
+		Set<String> names = new HashSet<String>();
+		
+		deferredLoad();
+
+		if( defaultTheme !=null ) {
+			Iterator<String> it = defaultTheme.iterator();
+			while( it.hasNext() ) {
+				names.add(it.next());
+			}
+		}
+		Iterator<String> it = iconList.keySet().iterator();
+		while( it.hasNext() ) {
+			names.add(it.next());
+		}
+		List<String> names2 = new ArrayList<String>(names);
+		Collections.sort(names2);
+		return names2.iterator();
+	}
+	
+	public Iterator<Icon> getThemeIcons() {
+		Set<Icon> themeIcons = new HashSet<Icon>();
+		
+		deferredLoad();
+		if( defaultTheme !=null ) {
+			Iterator<Icon> it = defaultTheme.getThemeIcons();
+			while( it.hasNext() ) {
+				themeIcons.add(it.next());
+			}
+		}
+		Iterator<Icon> it = iconList.values().iterator();
+		while( it.hasNext() ) {
+			themeIcons.add(it.next());
+		}
+		List<Icon> themeIcons2 = new ArrayList<Icon>(themeIcons);
+		Collections.sort(themeIcons2);
+		return themeIcons2.iterator();
+	}
+	
+	public Icon getThemeIcon(String name) {
+		if( isEmptyString(name) ) {
+			return null;
+		}
+		deferredLoad();
+		Icon themeIcon = (Icon) iconList.get(name);
+		if( themeIcon!=null ) {
+			return themeIcon;
+		}
+		if( defaultTheme!=null && defaultTheme.exists(name)) {
+			return  defaultTheme.getThemeIcon(name);
+		}
+		return null;
+	}
+
+	public ImageIcon get(String name) {
+		ImageIcon icon = null;
+		
+		if( ! isEmptyString(name) ) {
+			deferredLoad();
+			Icon themeIcon = (Icon) iconList.get(name);
+			if( themeIcon != null ) {
+				icon = themeIcon.getImageIcon();
+				if( icon != null ) {
+					return icon;
+				}
+			}
+			if( defaultTheme!=null && defaultTheme.exists(name)) {
+				return  defaultTheme.get(name);
+			}
+		}
+		logger.info("get('"+name+"') icon not found");
+		logstack("get('"+name+"') icon not found");
+		return getNoIcon();
+	}
+
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String themeName) {
+		name = themeName;
+	}
+
+	public String getID() {
+		return this.id;
+	}
+	
+	public void setID(String id) {
+		this.id = id;
+	}
+	
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	/**
+	 * Returns the name of the icon theme
+	 */
+	public String toString() {
+		String s = null;
+		if( isEmptyString(this.getName()) ) {
+			s = this.getID();
+		}
+		if( isEmptyString(this.getDescription()) ) {
+			return s;
+		}
+		return s + " - " + this.getDescription();
+	}
+
+	public ImageIcon getDefaultIcon() {
+		ImageIcon imageIcon = null;
+		Icon icon = null;
+		
+		icon = this.getThemeIcon(defaultIconName);
+		if( icon != null ) {
+			imageIcon = icon.getImageIcon();
+			if( imageIcon != null ) {
+				return imageIcon;
+			}
+		}
+		icon = this.getThemeIcon(NO_ICON_NAME);
+		if( icon != null ) {
+			imageIcon = icon.getImageIcon();
+			if( imageIcon != null ) {
+				return imageIcon;
+			}
+		}
+		return new ImageIcon();
+	}
+
+	public void setDefaultIcon(ImageIcon icon) {
+		this.defaultIconName = null;
+		this.register(null, null, NO_ICON_NAME, icon, null);
+	}
+
+	public void setDefaultIcon(URL resource) {
+		this.defaultIconName = null;
+		this.register(null, null, NO_ICON_NAME, null, resource);
+	}
+	
+	public void setDefaultIcon(String name) {
+		this.defaultIconName = name;
+	}
+
+	public void register(String provider, String group, String name,
+			ImageIcon icon, URL resource) {
+		if( isEmptyString(name) ) {
+			throw new IllegalArgumentException("name is empty");
+		}
+		deferredLoad();
+		if( icon == null && resource == null ) {
+			Icon themeIcon = new DefaultIcon(provider, group, name, null, null);
+			iconList.put(name, themeIcon);
+			throw new IllegalArgumentException("icon and resource for '"+getIconIdentifier(provider,group, name)+"' are null");
+		}
+		Icon themeIcon = new DefaultIcon(provider, group, name, icon, resource);
+		iconList.put(name, themeIcon);
+	}
+
+	private String getIconIdentifier(String provider, String group, String name) {
+		deferredLoad();
+		String identifier = null;
+		if( !isEmptyString(provider) ) {
+			identifier = provider ;
+		}
+		if( group!= null ) {
+			identifier = identifier + "/" + group;
+		}
+		if( name == null ) {
+			identifier = identifier + "/unknow";
+		} else {
+			identifier = identifier + "/" + name;
+		}
+		return identifier; 
+	}
+
+	public void registerDefault(String provider, String group,
+			String name, ImageIcon icon, URL resource) {
+		deferredLoad();
+		if (defaultTheme!=null){
+			if( !defaultTheme.exists(name)) {
+				defaultTheme.register(provider, group, name, icon, resource);
+			}
+		} else {
+			this.register(provider, group, name, icon, resource);
+		}
+	}
+
+
+	public void export(File folder) {
+		if( !folder.exists() ) {
+			folder.mkdir();
+		}
+		folder = new File(folder, this.getID());
+		if( !folder.exists() ) {
+			folder.mkdir();
+		}
+		URL url_no_icon = this.getThemeIcon(NO_ICON_NAME).getURL();
+		
+		Iterator<Icon> themeIcons = this.getThemeIcons();
+		while (themeIcons.hasNext()) {
+			Icon themeIcon = themeIcons.next();
+			URL url_src = themeIcon.getURL();
+			if( url_src == null ) {
+				url_src = url_no_icon;
+			}
+			File target;
+			if( themeIcon.getGroup()!=null ) {
+				target = new File(folder, themeIcon.getGroup());
+				target.mkdir();
+			} else {
+				target = new File(folder.getAbsolutePath());
+			}
+			target = new File(target,themeIcon.getName()+".png");
+			try {
+				FileUtils.copyURLToFile(url_src,target);
+			} catch (IOException e) {
+				// TODO 
+			}  
+		}
+	}
+	
+	// ===================================================================
+	
+	/**
+	 * @deprecated use getDefaultIcon
+	 */
+	public ImageIcon getNoIcon() {
+		return this.getDefaultIcon();
+	}
+
+	
+	/**
+	 * @deprecated use {@link #registerDefault(PluginServices, String, String, ImageIcon, Object)}
+	 */
+	public void registerDefault(String name, ImageIcon image) {
+		logstack("registerDefault('"+name+"'), deprecated method.");
+		try {
+			registerDefault(null, null, name, image, null);
+		} catch(IllegalArgumentException e) {
+			logger.info(e.getLocalizedMessage(), e);
+		}
+	}
+
+	/**
+	 * @deprecated use {@link #registerDefault(PluginServices, String, String, ImageIcon, Object)}
+	 */
+	public void registerDefault(String name, Object resource) {
+		logstack("registerDefault('"+name+"'), deprecated method.");
+		try {
+			registerDefault(null, null, name, null, (URL)resource);
+		} catch(IllegalArgumentException e) {
+			logger.info(e.getLocalizedMessage(), e);
+		}
+	}
+
+	/**
+	 * @deprecated use {@link #registerDefault(PluginServices, String, String, ImageIcon, Object)}
+	 */
+	public void register(String name, ImageIcon image) {
+		logstack("register('"+name+"'), deprecated method.");
+		try {
+			register(null, null, name, image, null);
+		} catch(IllegalArgumentException e) {
+			logger.info(e.getLocalizedMessage(), e);
+		}
+	}
+	
+	/**
+	 * @deprecated use {@link #registerDefault(PluginServices, String, String, ImageIcon, Object)}
+	 */
+	public void register(String name, Object resource) {
+		logstack("register('"+name+"'), deprecated method.");
+		try {
+			register(null, null, name, null, (URL)resource);
+		} catch(IllegalArgumentException e) {
+			logger.info(e.getLocalizedMessage(), e);
+		}
+	}
+	
+	/**
+	 * @deprecated use get(String iconName) instead.
+	 */
+	public ImageIcon get(String iconName, ClassLoader loader) {
+		logstack("get('"+iconName+"', loader), deprecated method.");
+		return this.get(iconName);
+	}
+
+}

Property changes on: branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/tools/swing/icontheme/impl/BaseIconTheme.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/tools/swing/icontheme/impl/FolderIconTheme.java
===================================================================
--- branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/tools/swing/icontheme/impl/FolderIconTheme.java	(revision 0)
+++ branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/tools/swing/icontheme/impl/FolderIconTheme.java	(revision 38564)
@@ -0,0 +1,125 @@
+package org.gvsig.tools.swing.icontheme.impl;
+
+import java.io.File;
+import java.io.FilenameFilter;
+import java.net.MalformedURLException;
+import java.util.HashMap;
+
+import org.gvsig.installer.lib.api.InstallerLocator;
+import org.gvsig.installer.lib.api.InstallerManager;
+import org.gvsig.installer.lib.api.PackageInfo;
+import org.gvsig.tools.swing.icontheme.IconTheme;
+
+
+/**
+ * This class extends AbstractIconTheme and implements the abstract methods of this
+ * class. This methods are <code>loadIcon</code> and <code>load</code>. This methods
+ * allows load one icon or all icons in the resource.
+ */
+public class FolderIconTheme extends BaseIconTheme{
+
+	protected File resource = null; 
+	protected PackageInfo packageInfo = null;
+	
+	/**
+	 * Constructor.Constructs an Icon Theme with a default one.
+	 * @param def. The default icon theme
+	 */
+	public FolderIconTheme(IconTheme def) {
+		super(def);
+	}
+
+	public void load(Object resource) throws IllegalArgumentException {
+		if( !(resource instanceof File) ) {
+			throw new IllegalArgumentException();
+		}
+		File res = (File) resource;
+		if( !res.isDirectory() ) {
+			throw new IllegalArgumentException();
+		}
+		this.resource = res;
+		this.iconList = null;
+
+		this.loadPackageInfo();
+		this.setName(this.packageInfo.getName());
+		this.setDescription(this.packageInfo.getDescription());
+	}
+	
+	private void loadPackageInfo() {
+		File pkgfile = new File(this.resource,"package.info"); 
+		InstallerManager manager = InstallerLocator.getInstallerManager();
+		try {
+			this.packageInfo = manager.createPackageInfo(pkgfile.toURI().toURL().openStream());
+		} catch (Exception e) {
+			throw new IllegalArgumentException(e);
+		}
+		
+	}
+
+	protected void deferredLoad() {
+		if( this.iconList != null ) {
+			return;
+		}
+		iconList = new HashMap<String, IconTheme.Icon>();
+		
+		load(resource, "");
+		
+		File[] files = resource.listFiles();
+		for (int i=files.length-1; i>=0; i--) {
+			if( files[i].isDirectory() ) {
+				load(files[i],files[i].getName());
+			}
+		}
+	}
+
+	private void load(File folder, String group) {
+		File[] imagefiles = folder.listFiles(new ImageFileFilter());
+		String name;
+		for (int i=imagefiles.length-1; i>=0; i--) {
+			name = computeKey(imagefiles[i].getName());
+			try {
+				this.register(null, group, name, null, imagefiles[i].toURI().toURL());
+			} catch (MalformedURLException e) {
+				logger.info("Can't load icon", e);
+			}
+		}
+	}
+
+	
+	
+	/**
+	 * This class allows filter the images in the directory. Allows to load the images
+	 * with a apropiate extension.
+	 */
+	private class ImageFileFilter implements FilenameFilter {
+		public boolean accept(File dir, String fileName) {
+			String extension = "";
+			int pointPos = fileName.lastIndexOf(".");
+			if (pointPos>0 && pointPos < (fileName.length()-1) )
+				extension = fileName.substring(pointPos+1).toLowerCase();
+			if ( extension.equals("jpg") || extension.equals("jpeg")
+					|| extension.equals("png")
+					|| extension.equals("gif")
+
+					)
+				return true;
+			else
+				return false;
+		}
+	}
+
+	/**
+	 * Returns the key of the image without extension
+	 * @param fileName
+	 * @return string
+	 */
+	private String computeKey(String fileName) {
+		int pointPos = fileName.lastIndexOf(".");
+		if (pointPos!=-1)
+			return fileName.substring(0, pointPos);
+		else
+			return fileName;
+	}
+
+}
+

Property changes on: branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/tools/swing/icontheme/impl/FolderIconTheme.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/tools/swing/icontheme/impl/DefaultIconThemeManager.java
===================================================================
--- branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/tools/swing/icontheme/impl/DefaultIconThemeManager.java	(revision 0)
+++ branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/tools/swing/icontheme/impl/DefaultIconThemeManager.java	(revision 38564)
@@ -0,0 +1,106 @@
+package org.gvsig.tools.swing.icontheme.impl;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import org.gvsig.tools.observer.ComplexObserver;
+import org.gvsig.tools.observer.Observable;
+import org.gvsig.tools.swing.icontheme.IconTheme;
+import org.gvsig.tools.swing.icontheme.IconThemeManager;
+import org.gvsig.tools.util.FolderSet;
+import org.gvsig.tools.util.impl.DefaultFolderSet;
+
+public class DefaultIconThemeManager implements IconThemeManager , ComplexObserver{
+	private static IconThemeManager iconThemeManager = null;
+
+	private IconTheme defaultTheme = null;
+	private IconTheme currentTheme = null;
+	private Map<String, IconTheme> themes = null;
+	private FolderSet repository = null;
+
+	public static IconThemeManager getIconThemeManager(){
+		if (iconThemeManager == null){
+			iconThemeManager = new DefaultIconThemeManager();
+		}
+		return iconThemeManager;
+	}
+
+	public DefaultIconThemeManager() {
+		this.defaultTheme = new BaseIconTheme();
+		this.currentTheme = this.defaultTheme;
+		this.themes = null;
+		this.repository = new DefaultFolderSet();
+		this.repository.addObserver(this);
+	}
+	
+	public IconTheme getDefault() {
+		return this.defaultTheme;
+	}
+
+	public void setCurrent(IconTheme iconTheme) {
+		this.defaultTheme = iconTheme;
+	}
+
+	public IconTheme getCurrent() {
+		return this.currentTheme;
+	}
+
+	public IconTheme get(String themeID) {
+		return this.get(themeID);
+	}
+
+	public Iterator<IconTheme> iterator() {
+		return this.getThemes().values().iterator();
+	}
+
+	public boolean contains(IconTheme theme) {
+		return this.getThemes().containsValue(theme);
+	}
+
+	public boolean add(IconTheme theme) {
+		this.getThemes().put(theme.getID(), theme);
+		return true; 
+	}
+
+	public boolean remove(IconTheme theme) {
+		return this.getThemes().remove(theme)==null ? false: true;
+	}
+
+	public void clear() {
+		this.themes = null;
+	}
+
+	public FolderSet getRepository() {
+		return this.repository;
+	}
+
+	public void update(Observable observable, Object notification) {
+		if( observable != this.repository ) {
+			return;
+		}
+		this.themes = null;
+	}
+
+	private Map<String, IconTheme> getThemes() {
+		if( this.themes != null ) {
+			return this.themes;
+		}
+		Map<String, IconTheme> themes = new HashMap<String, IconTheme>();
+		File[] folders = this.repository.listFiles();
+		for( int i=0; i<folders.length; i++ ) {
+			if( folders[i].isDirectory() ) {
+				FolderIconTheme theme = new FolderIconTheme(this.getDefault());
+				try {
+					theme.load(folders[i]);
+					themes.put(theme.getID(), theme);
+				} catch( IllegalArgumentException ex) {
+					// Do nothing
+				}
+			}
+		}
+		this.themes = themes;
+		return themes;
+	}
+}

Property changes on: branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/tools/swing/icontheme/impl/DefaultIconThemeManager.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/tools/swing/icontheme/impl/IconThemeZip.java
===================================================================
--- branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/tools/swing/icontheme/impl/IconThemeZip.java	(revision 0)
+++ branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/tools/swing/icontheme/impl/IconThemeZip.java	(revision 38564)
@@ -0,0 +1,121 @@
+package org.gvsig.tools.swing.icontheme.impl;
+
+import java.io.File;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+
+import org.gvsig.installer.lib.api.InstallerLocator;
+import org.gvsig.installer.lib.api.InstallerManager;
+import org.gvsig.installer.lib.api.PackageInfo;
+import org.gvsig.tools.swing.icontheme.IconTheme;
+
+/**
+ * Extends BaseIconTheme to add support for themes stored in zip files.
+ * 
+ * TODO: This class is under construction.
+ */
+public class IconThemeZip extends BaseIconTheme{
+
+	protected File resource = null; 
+	protected PackageInfo packageInfo = null;
+
+	public IconThemeZip(IconTheme def) {
+		super(def);
+	}
+
+	public void load(Object resource) {
+		if( !(resource instanceof File) ) {
+			throw new IllegalArgumentException();
+		}
+		File res = (File) resource;
+		if( !res.isDirectory() ) {
+			throw new IllegalArgumentException();
+		}
+		this.resource = res;
+		this.iconList = null;
+
+		this.loadPackageInfo();
+		this.setName(this.packageInfo .getName());
+		this.setDescription(this.packageInfo.getDescription());
+	}
+
+	private void loadPackageInfo() {
+		InstallerManager manager = InstallerLocator.getInstallerManager();
+		ZipFile zipFile = null;
+		try {
+			zipFile = new ZipFile(resource);
+			InputStream pkgstream = zipFile.getInputStream( zipFile.getEntry("packages.zip") );
+			this.packageInfo = manager.createPackageInfo(pkgstream);
+		} catch (Exception e) {
+			throw new IllegalArgumentException(e);
+		}
+	}
+
+	protected void deferredLoad() {
+		if (this.iconList != null) {
+			return;
+		}
+		iconList = new HashMap<String, IconTheme.Icon>();
+
+		ZipFile zipFile = null;
+		try {
+			zipFile = new ZipFile(resource);
+		} catch (Exception e) {
+			throw new IllegalArgumentException();
+		}
+
+		Enumeration<?> entries = zipFile.entries();
+		while (entries.hasMoreElements()) {
+			ZipEntry entry = (ZipEntry) entries.nextElement();
+			if (!entry.isDirectory()) {
+				try {
+					if (isImage(entry.getName())) {
+						String name = getNameOfEntry(entry);
+						String group = getGroupOfEntry(entry);
+						URL resource = getURLOfEntry(this.resource, entry);
+						this.register(null, group, name, null, resource);
+					}
+				} catch (Exception e) {
+					logger.info("Can't register icon. Entry = " +entry.toString(), e);
+				}
+			}
+		}
+
+	}
+
+	private URL getURLOfEntry(File zip, ZipEntry entry) throws MalformedURLException, URISyntaxException {
+		String s = "jar:" + zip.toString() + "!" + entry.getName();
+		return new URI(s).toURL();
+	}
+
+	private String getGroupOfEntry(ZipEntry entry) {
+		// FIXME:
+		return "";
+	}
+
+	private String getNameOfEntry(ZipEntry entry) {
+		// FIXME: 
+		return entry.getName();
+	}
+
+	private boolean isImage(String fileName) {
+		String extension = "";
+		int pointPos = fileName.lastIndexOf(".");
+		if (pointPos>0 && pointPos < (fileName.length()-1) )
+			extension = fileName.substring(pointPos+1).toLowerCase();
+		if ( extension.equals("jpg") || extension.equals("jpeg")
+				|| extension.equals("png")
+				|| extension.equals("gif"))
+			return true;
+		else
+			return false;
+	}
+
+}

Property changes on: branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/tools/swing/icontheme/impl/IconThemeZip.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/tools/swing/icontheme/IconThemeManager.java
===================================================================
--- branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/tools/swing/icontheme/IconThemeManager.java	(revision 0)
+++ branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/tools/swing/icontheme/IconThemeManager.java	(revision 38564)
@@ -0,0 +1,46 @@
+package org.gvsig.tools.swing.icontheme;
+
+import java.util.Iterator;
+
+import org.gvsig.tools.util.FolderSet;
+
+public interface IconThemeManager {
+
+	/**
+	 * Gets the default theme
+	 * @return the default theme.
+	 */
+	public IconTheme getDefault();
+
+	/**
+	 * Sets the iconTheme like current theme
+	 * @param iconTheme
+	 */
+	public void setCurrent(IconTheme iconTheme);
+
+	/**
+	 * Gets the current theme
+	 * @return current the current theme
+	 */
+	public IconTheme getCurrent();
+
+	/**
+	 * Returns the theme that has been registered with the name that receives like
+	 * parameter
+	 * @param themeName
+	 * @return the theme that contains like name in its properties the parameter
+	 */
+	public IconTheme get(String themeID);
+
+	public boolean contains(IconTheme theme);
+
+	public Iterator<IconTheme> iterator();
+
+	public boolean add(IconTheme theme);
+
+	public boolean remove(IconTheme theme);
+
+	public void clear();
+
+	public FolderSet getRepository();
+}
\ No newline at end of file

Property changes on: branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/tools/swing/icontheme/IconThemeManager.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: branches/v2_0_0_prep/frameworks/_fwAndami/pom.xml
===================================================================
--- branches/v2_0_0_prep/frameworks/_fwAndami/pom.xml	(revision 38563)
+++ branches/v2_0_0_prep/frameworks/_fwAndami/pom.xml	(revision 38564)
@@ -1,318 +1,329 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
                       http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.gvsig.andami</artifactId>
-    <packaging>jar</packaging>
-    <version>2.0-SNAPSHOT</version>
-    <name>_fwAndami</name>
-    <description>Plugins and extensions management framework</description>
-    <parent>
-        <groupId>org.gvsig</groupId>
-        <artifactId>gvsig-base-library-pom</artifactId>
-        <version>2.0-SNAPSHOT</version>
-    </parent>
-    <properties>
-        <andami.lib.dir>${gvsig.install.dir}/lib</andami.lib.dir>
-        <build-dir>${basedir}/../build</build-dir>
-        <eclipse.project.name>_fwAndami</eclipse.project.name>
-    </properties>
-    <dependencies>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <!-- TODO: Change to runtime when everything becomes fully migrated to 
-                SLF4J -->
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.gvsig</groupId>
-            <artifactId>org.gvsig.tools.lib</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.gvsig</groupId>
-            <artifactId>org.gvsig.i18n</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.gvsig</groupId>
-            <artifactId>org.gvsig.tools.swing.api</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.gvsig</groupId>
-            <artifactId>org.gvsig.tools.swing.impl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.gvsig</groupId>
-            <artifactId>org.gvsig.tools.swing.spi</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.gvsig</groupId>
-            <artifactId>org.gvsig.tools.swing.serv.field</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.gvsig</groupId>
-            <artifactId>org.gvsig.tools.swing.serv.jform</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.gvsig</groupId>
-            <artifactId>org.gvsig.tools.swing.serv.jlist</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.gvsig</groupId>
-            <artifactId>org.gvsig.utils</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.gvsig</groupId>
-            <artifactId>org.gvsig.ui</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.gvsig</groupId>
-            <artifactId>org.gvsig.installer.lib.api</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.gvsig</groupId>
-            <artifactId>org.gvsig.installer.lib.impl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.gvsig</groupId>
-            <artifactId>org.gvsig.installer.lib.spi</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.gvsig</groupId>
-            <artifactId>org.gvsig.installer.prov.plugin</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.gvsig</groupId>
-            <artifactId>org.gvsig.installer.swing.api</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.gvsig</groupId>
-            <artifactId>org.gvsig.installer.swing.impl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>javax.help</groupId>
-            <artifactId>javahelp</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>jwizardcomponent</groupId>
-            <artifactId>jwizardcomponent</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.jgoodies</groupId>
-            <artifactId>looks</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>xerces</groupId>
-            <artifactId>xercesImpl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>castor</groupId>
-            <artifactId>castor</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>net.sf.kxml</groupId>
-            <artifactId>kxml2</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.sardak</groupId>
-            <artifactId>antform</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>ant-contrib</groupId>
-            <artifactId>ant-contrib</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>org.gvsig.andami</artifactId>
+	<packaging>jar</packaging>
+	<version>2.0-SNAPSHOT</version>
+	<name>_fwAndami</name>
+	<description>Plugins and extensions management framework</description>
+	<parent>
+		<groupId>org.gvsig</groupId>
+		<artifactId>gvsig-base-library-pom</artifactId>
+		<version>2.0-SNAPSHOT</version>
+	</parent>
+	<properties>
+		<andami.lib.dir>${gvsig.install.dir}/lib</andami.lib.dir>
+		<build-dir>${basedir}/../build</build-dir>
+		<eclipse.project.name>_fwAndami</eclipse.project.name>
+	</properties>
+	<dependencies>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-log4j12</artifactId>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+			<!-- TODO: Change to runtime when everything becomes fully migrated to 
+				SLF4J -->
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.gvsig</groupId>
+			<artifactId>org.gvsig.tools.lib</artifactId>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.gvsig</groupId>
+			<artifactId>org.gvsig.i18n</artifactId>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.gvsig</groupId>
+			<artifactId>org.gvsig.tools.swing.api</artifactId>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.gvsig</groupId>
+			<artifactId>org.gvsig.tools.swing.impl</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.gvsig</groupId>
+			<artifactId>org.gvsig.tools.swing.spi</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.gvsig</groupId>
+			<artifactId>org.gvsig.tools.swing.serv.field</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.gvsig</groupId>
+			<artifactId>org.gvsig.tools.swing.serv.jform</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.gvsig</groupId>
+			<artifactId>org.gvsig.tools.swing.serv.jlist</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.gvsig</groupId>
+			<artifactId>org.gvsig.utils</artifactId>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.gvsig</groupId>
+			<artifactId>org.gvsig.ui</artifactId>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.gvsig</groupId>
+			<artifactId>org.gvsig.installer.lib.api</artifactId>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.gvsig</groupId>
+			<artifactId>org.gvsig.installer.lib.impl</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.gvsig</groupId>
+			<artifactId>org.gvsig.installer.lib.spi</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.gvsig</groupId>
+			<artifactId>org.gvsig.installer.prov.plugin</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.gvsig</groupId>
+			<artifactId>org.gvsig.installer.swing.api</artifactId>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.gvsig</groupId>
+			<artifactId>org.gvsig.installer.swing.impl</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>javax.help</groupId>
+			<artifactId>javahelp</artifactId>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>jwizardcomponent</groupId>
+			<artifactId>jwizardcomponent</artifactId>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.jgoodies</groupId>
+			<artifactId>looks</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>xerces</groupId>
+			<artifactId>xercesImpl</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>castor</groupId>
+			<artifactId>castor</artifactId>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>net.sf.kxml</groupId>
+			<artifactId>kxml2</artifactId>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.sardak</groupId>
+			<artifactId>antform</artifactId>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>ant-contrib</groupId>
+			<artifactId>ant-contrib</artifactId>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
 			<groupId>commons-cli</groupId>
 			<artifactId>commons-cli</artifactId>
 			<version>1.2</version>
 		</dependency>
-        
-    </dependencies>
-    <build>
-        <sourceDirectory>src</sourceDirectory>
-        <testSourceDirectory>src-test</testSourceDirectory>
-        <resources>
-            <resource>
-                <directory>${basedir}/resources</directory>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <artifactId>maven-clean-plugin</artifactId>
-                <configuration>
-                    <filesets>
-                        <fileset>
-                            <directory>${andami.lib.dir}</directory>
-                            <includes>
-                                <include>**/**</include>
-                            </includes>
-                            <followSymlinks>false</followSymlinks>
-                        </fileset>
-                        <fileset>
-                            <directory>${gvsig.install.dir}/gvSIG/extensiones</directory>
-                            <includes>
-                                <include>**</include>
-                            </includes>
-                        </fileset>
-                    </filesets>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <executable>java</executable>
-                    <arguments>
-                        <argument>-classpath</argument>
-                        <!-- automatically creates the classpath using all project 
-                            dependencies, also adding the project build directory -->
-                        <classpath />
-                        <argument>org.gvsig.andami.Launcher</argument>
-                        <argument>gvSIG</argument>
-                        <argument>${gvsig.install.dir}/gvSIG/extensiones</argument>
-                    </arguments>
-                    <environmentVariables>
-                        <GDAL_DATA>${user.home}/.depman/data/gdal</GDAL_DATA>
-                        <PROJ_LIB>gvSIG/extensiones/org.gvsig.crs.extension/data</PROJ_LIB>
-                        <LD_LIBRARY_PATH>${user.home}/.depman/lib</LD_LIBRARY_PATH>
-                        <PATH>${user.home}/.depman/bin</PATH>
-                    </environmentVariables>
-                </configuration>
-            </plugin>
-            <!-- TODO: MAKE TESTS WORK AND REMOVE THIS OPTION -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <skipTests>true</skipTests>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <addClasspath>true</addClasspath>
-                            <mainClass>org.gvsig.andami.Launcher</mainClass>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-    <profiles>
-        <profile>
-            <id>install-extension</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-                <property>
-                    <name>install-extension</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins
+		<dependency>
+			<groupId>org.apache.directory.studio</groupId>
+			<artifactId>org.apache.commons.io</artifactId>
+			<version>2.4</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.jgoodies</groupId>
+			<artifactId>forms</artifactId>
+			<version>1.0.4</version>
+			<scope>runtime</scope>
+		</dependency>
+	</dependencies>
+	<build>
+		<sourceDirectory>src</sourceDirectory>
+		<testSourceDirectory>src-test</testSourceDirectory>
+		<resources>
+			<resource>
+				<directory>${basedir}/resources</directory>
+			</resource>
+		</resources>
+		<plugins>
+			<plugin>
+				<artifactId>maven-clean-plugin</artifactId>
+				<configuration>
+					<filesets>
+						<fileset>
+							<directory>${andami.lib.dir}</directory>
+							<includes>
+								<include>**/**</include>
+							</includes>
+							<followSymlinks>false</followSymlinks>
+						</fileset>
+						<fileset>
+							<directory>${gvsig.install.dir}/gvSIG/extensiones</directory>
+							<includes>
+								<include>**</include>
+							</includes>
+						</fileset>
+					</filesets>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>exec-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<goals>
+							<goal>exec</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<executable>java</executable>
+					<arguments>
+						<argument>-classpath</argument>
+						<!-- automatically creates the classpath using all project dependencies, 
+							also adding the project build directory -->
+						<classpath />
+						<argument>org.gvsig.andami.Launcher</argument>
+						<argument>gvSIG</argument>
+						<argument>${gvsig.install.dir}/gvSIG/extensiones</argument>
+					</arguments>
+					<environmentVariables>
+						<GDAL_DATA>${user.home}/.depman/data/gdal</GDAL_DATA>
+						<PROJ_LIB>gvSIG/extensiones/org.gvsig.crs.extension/data</PROJ_LIB>
+						<LD_LIBRARY_PATH>${user.home}/.depman/lib</LD_LIBRARY_PATH>
+						<PATH>${user.home}/.depman/bin</PATH>
+					</environmentVariables>
+				</configuration>
+			</plugin>
+			<!-- TODO: MAKE TESTS WORK AND REMOVE THIS OPTION -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<configuration>
+					<skipTests>true</skipTests>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<archive>
+						<manifest>
+							<addClasspath>true</addClasspath>
+							<mainClass>org.gvsig.andami.Launcher</mainClass>
+						</manifest>
+					</archive>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+	<profiles>
+		<profile>
+			<id>install-extension</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+				<property>
+					<name>install-extension</name>
+				</property>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins
 						</groupId>
-                        <artifactId>maven-dependency-plugin
+						<artifactId>maven-dependency-plugin
 						</artifactId>
-                        <executions>
-                            <execution>
-                                <id>copy-own-dependencies-for-andami
+						<executions>
+							<execution>
+								<id>copy-own-dependencies-for-andami
 								</id>
-                                <phase>install</phase>
-                                <goals>
-                                    <goal>copy-dependencies</goal>
-                                </goals>
-                                <configuration>
-                                    <outputDirectory>${andami.lib.dir}</outputDirectory>
-                                    <overWriteReleases>true</overWriteReleases>
-                                    <overWriteSnapshots>true</overWriteSnapshots>
-                                    <overWriteIfNewer>true</overWriteIfNewer>
-                                    <includeScope>runtime</includeScope>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>copy-andami</id>
-                                <phase>install</phase>
-                                <goals>
-                                    <goal>copy</goal>
-                                </goals>
-                                <configuration>
-                                    <artifactItems>
-                                        <artifactItem>
-                                            <groupId>org.gvsig</groupId>
-                                            <artifactId>org.gvsig.andami</artifactId>
-                                            <version>2.0-SNAPSHOT</version>
-                                            <type>jar</type>
-                                            <overWrite>true</overWrite>
-                                        </artifactItem>
-                                    </artifactItems>
-                                    <outputDirectory>${andami.lib.dir}</outputDirectory>
-                                    <overWriteReleases>true</overWriteReleases>
-                                    <overWriteSnapshots>false</overWriteSnapshots>
-                                    <overWriteIfNewer>true</overWriteIfNewer>
-                                    <excludeTransitive>false</excludeTransitive>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-resources-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>copy-theme</id>
-                                <phase>install</phase>
-                                <goals>
-                                    <goal>copy-resources</goal>
-                                </goals>
-                                <configuration>
-                                    <outputDirectory>${gvsig.install.dir}/theme</outputDirectory>
-                                    <resources>
-                                        <resource>
-                                            <directory>theme</directory>
-                                            <filtering>false</filtering>
-                                        </resource>
-                                    </resources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
+								<phase>install</phase>
+								<goals>
+									<goal>copy-dependencies</goal>
+								</goals>
+								<configuration>
+									<outputDirectory>${andami.lib.dir}</outputDirectory>
+									<overWriteReleases>true</overWriteReleases>
+									<overWriteSnapshots>true</overWriteSnapshots>
+									<overWriteIfNewer>true</overWriteIfNewer>
+									<includeScope>runtime</includeScope>
+								</configuration>
+							</execution>
+							<execution>
+								<id>copy-andami</id>
+								<phase>install</phase>
+								<goals>
+									<goal>copy</goal>
+								</goals>
+								<configuration>
+									<artifactItems>
+										<artifactItem>
+											<groupId>org.gvsig</groupId>
+											<artifactId>org.gvsig.andami</artifactId>
+											<version>2.0-SNAPSHOT</version>
+											<type>jar</type>
+											<overWrite>true</overWrite>
+										</artifactItem>
+									</artifactItems>
+									<outputDirectory>${andami.lib.dir}</outputDirectory>
+									<overWriteReleases>true</overWriteReleases>
+									<overWriteSnapshots>false</overWriteSnapshots>
+									<overWriteIfNewer>true</overWriteIfNewer>
+									<excludeTransitive>false</excludeTransitive>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<artifactId>maven-resources-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>copy-theme</id>
+								<phase>install</phase>
+								<goals>
+									<goal>copy-resources</goal>
+								</goals>
+								<configuration>
+									<outputDirectory>${gvsig.install.dir}/theme</outputDirectory>
+									<resources>
+										<resource>
+											<directory>theme</directory>
+											<filtering>false</filtering>
+										</resource>
+									</resources>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
 </project>
\ No newline at end of file
Index: branches/v2_0_0_prep/frameworks/_fwAndami/resources/images/main/default-icon.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/frameworks/_fwAndami/resources/images/main/default-icon.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/frameworks/_fwAndami/resources/images/main/statusbar-warning.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/frameworks/_fwAndami/resources/images/main/statusbar-warning.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/frameworks/_fwAndami/resources/images/main/splash-default.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/frameworks/_fwAndami/resources/images/main/splash-default.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/frameworks/_fwAndami/resources/images/main/statusbar-error.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/frameworks/_fwAndami/resources/images/main/statusbar-error.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/frameworks/_fwAndami/resources/images/main/statusbar-info.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/v2_0_0_prep/frameworks/_fwAndami/resources/images/main/statusbar-info.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

