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 38607)
+++ branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/ui/mdiFrame/MainFrame.java	(revision 38608)
@@ -224,4 +224,7 @@
 	 */
 	public void removeStatusBarLabels(Class clase);
 
+	public void messageDialog(String message, String title, int messageType);
+	
+	public void messageDialog(String message, String messageArgs[], String title, int messageType);
 }
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 38607)
+++ branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/ui/mdiFrame/MDIFrame.java	(revision 38608)
@@ -1524,7 +1524,7 @@
         // Se registra y a�ade el menu
         JMenuItem nuevoMenu = createJMenuItem(loader, menu);
         nuevoMenu.addMouseListener(tooltipListener);
-        if( listener != null ) {
+        if( listener != null && menu.getName() != null && menu.getName().trim().length()>0 ) {
     		ActionInfoManager actionManager = PluginsLocator.getActionInfoManager();
     		final ActionInfo actionInfo = actionManager.getAction(menu.getName());
     		if( actionInfo != null ) {
@@ -1723,4 +1723,34 @@
         }
         return getMenu(menu, menuBar);
     }
+
+	public void messageDialog(String message, String title, int messageType) {
+		messageDialog(message, null, title, messageType);
+	}
+	
+	public void messageDialog(String message, String messageArgs[], String title, int messageType) {
+		String msg = message;
+		String theTitle = title;
+		
+        if (message == null) {
+        	logger.info("message if null, message dialog not show.");
+            return;
+        }
+        if( theTitle == null ) {
+        	theTitle = "";
+        }
+        if (msg.startsWith("_")) {
+	        msg = org.gvsig.i18n.Messages.getText(message, messageArgs);
+	        if (msg == null) {
+	        	msg = "_"+message.replace("_", " ");
+	        }
+        }		
+        if (theTitle.startsWith("_")) {
+        	theTitle = org.gvsig.i18n.Messages.getText(theTitle);
+	        if (theTitle == null) {
+	        	theTitle = "_"+title.replace("_", " ");
+	        }
+        }		
+		JOptionPane.showMessageDialog(this, msg,theTitle, messageType);
+	}
 }
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 38607)
+++ branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/ui/mdiManager/MDIManager.java	(revision 38608)
@@ -40,6 +40,7 @@
  */
 package org.gvsig.andami.ui.mdiManager;
 
+import java.awt.GridBagConstraints;
 import java.beans.PropertyVetoException;
 
 import javax.swing.ImageIcon;
@@ -172,6 +173,17 @@
      */
     public IWindow addCentredWindow(IWindow p) throws SingletonDialogAlreadyShownException;
 
+    public static final int ALIGN_FIRST_LINE_START = GridBagConstraints.FIRST_LINE_START;
+    public static final int ALIGN_PAGE_START = GridBagConstraints.PAGE_START;
+    public static final int ALIGN_FIRST_LINE_END = GridBagConstraints.FIRST_LINE_END;
+    public static final int ALIGN_FIRST_LINE_END_CASCADE = GridBagConstraints.FIRST_LINE_END + GridBagConstraints.BELOW_BASELINE;
+    public static final int ALIGN_LINE_START = GridBagConstraints.LINE_START;
+    public static final int ALIGN_LINE_END = GridBagConstraints.LINE_END;
+    public static final int ALIGN_LAST_LINE_START = GridBagConstraints.LAST_LINE_START;
+    public static final int ALIGN_PAGE_END = GridBagConstraints.PAGE_END;
+    public static final int ALIGN_LAST_LINE_END = GridBagConstraints.LAST_LINE_END;
+    public static final int ALIGN_CENTER = GridBagConstraints.CENTER;
+    
     public IWindow addWindow(IWindow p, int align) throws SingletonDialogAlreadyShownException;
 
     /**
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 38607)
+++ branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/IconThemeHelper.java	(revision 38608)
@@ -1,6 +1,7 @@
 package org.gvsig.andami;
 
 import java.awt.Image;
+import java.net.URL;
 
 import javax.swing.ImageIcon;
 
@@ -16,6 +17,7 @@
 	@SuppressWarnings("rawtypes")
 	public static void registerIcon(String group, String name, Object obj) {
 		String resourceName;
+		String provider;
 		ClassLoader loader;
 		IconTheme iconTheme = ToolsSwingLocator.getIconThemeManager().getCurrent();
 		if( group == null || group.trim().length()==0 ) {
@@ -25,14 +27,20 @@
 		}
 		if( obj instanceof Class ) {
 			loader = ((Class) obj).getClassLoader();
+			provider = ((Class) obj).getName();
 		} else {
 			loader = obj.getClass().getClassLoader();
+			provider = obj.getClass().getName();
 		}
 		PluginServices plugin = PluginServices.getPluginServices(obj);
+		if( plugin != null ) {
+			provider = plugin.getPluginName(); 
+		}
 		try {
-			iconTheme.registerDefault(plugin.getPluginName(), group, name, null, loader.getResource(resourceName));
+			URL resource = loader.getResource(resourceName);
+			iconTheme.registerDefault(provider, group, name, null, resource);
 		} catch( Throwable e) {
-			logger.info(e.getMessage());
+			logger.info("Can't register icon '"+name+"'.",e);
 		}
 	}
 
Index: branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/project/documents/gui/ProjectWindow.java
===================================================================
--- branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/project/documents/gui/ProjectWindow.java	(revision 38607)
+++ branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/project/documents/gui/ProjectWindow.java	(revision 38608)
@@ -57,6 +57,7 @@
 import org.gvsig.andami.help.Help;
 import org.gvsig.andami.messages.NotificationManager;
 import org.gvsig.andami.ui.mdiManager.IWindow;
+import org.gvsig.andami.ui.mdiManager.MDIManager;
 import org.gvsig.andami.ui.mdiManager.SingletonWindow;
 import org.gvsig.andami.ui.mdiManager.WindowInfo;
 import org.gvsig.app.extension.ProjectExtension;
@@ -332,7 +333,7 @@
                 return;
             }
             PluginServices.getMDIManager().addWindow(window,
-                GridBagConstraints.FIRST_LINE_END);
+                MDIManager.ALIGN_FIRST_LINE_END_CASCADE);
             project.setModified(true);
         }
     }
@@ -424,10 +425,10 @@
             if (lastremoved > lstDocs.getModel().getSize()) {
                 lastremoved = lstDocs.getModel().getSize();
             }
-            if (lastremoved > 0) {
+            if (lastremoved >= 0) {
                 lstDocs.setSelectedIndex(lastremoved);
             }
-            refreshList();
+            // refreshList();
             project.setModified(true);
         }
     }
Index: branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/project/documents/view/gui/AbstractViewPanel.java
===================================================================
--- branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/project/documents/view/gui/AbstractViewPanel.java	(revision 38607)
+++ branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/project/documents/view/gui/AbstractViewPanel.java	(revision 38608)
@@ -48,6 +48,8 @@
 import org.gvsig.app.project.documents.view.toc.gui.TOC;
 import org.gvsig.fmap.mapcontrol.MapControl;
 import org.gvsig.utils.exceptionHandling.ExceptionListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * 
@@ -59,6 +61,8 @@
 public abstract class AbstractViewPanel extends JPanel implements IView,
     IWindowTransform, PropertyChangeListener {
 
+	private static final Logger logger = LoggerFactory.getLogger(AbstractViewPanel.class);
+	
     private static final long serialVersionUID = -259620280790490262L;
 
     private static final int DEFAULT_HEIGHT = 450;
@@ -105,8 +109,7 @@
 
         protected void paintChildren(Graphics g) {
             if (lastDivider != lastDividerLocation) {
-                System.out.println("paintChildren = "
-                    + this.lastDividerLocation);
+            	logger.debug("paintChildren = "+ this.lastDividerLocation);
                 lastDivider = lastDividerLocation;
             }
             super.paintChildren(g);
Index: branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/project/documents/view/legend/gui/SingleSymbol.java
===================================================================
--- branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/project/documents/view/legend/gui/SingleSymbol.java	(revision 38607)
+++ branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/project/documents/view/legend/gui/SingleSymbol.java	(revision 38608)
@@ -58,6 +58,7 @@
 import javax.swing.JTextField;
 import javax.swing.border.TitledBorder;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.messages.NotificationManager;
 import org.gvsig.app.gui.styling.SymbolLevelsWindow;
@@ -158,8 +159,7 @@
 	}
 
 	public ImageIcon getIcon() {
-		return new ImageIcon(this.getClass().getClassLoader().
-				getResource("images/single-symbol.png"));
+		return IconThemeHelper.getImageIcon("legend-overview-single-symbol");
 	}
 
 	public Class getLegendClass() {
Index: branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/project/documents/view/legend/gui/ThemeManagerWindow.java
===================================================================
--- branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/project/documents/view/legend/gui/ThemeManagerWindow.java	(revision 38607)
+++ branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/project/documents/view/legend/gui/ThemeManagerWindow.java	(revision 38608)
@@ -50,17 +50,24 @@
 import java.util.ArrayList;
 import java.util.Hashtable;
 
+import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JTabbedPane;
 import javax.swing.event.ChangeListener;
 
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.messages.NotificationManager;
+import org.gvsig.andami.ui.mdiFrame.MDIFrame;
 import org.gvsig.andami.ui.mdiManager.IWindow;
+import org.gvsig.andami.ui.mdiManager.MDIManagerFactory;
 import org.gvsig.andami.ui.mdiManager.WindowInfo;
+import org.gvsig.app.ApplicationLocator;
+import org.gvsig.app.ApplicationManager;
 import org.gvsig.fmap.mapcontext.layers.FLayer;
 import org.gvsig.fmap.mapcontext.layers.FLyrDefault;
 import org.gvsig.gui.beans.swing.JButton;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 /**
@@ -69,6 +76,8 @@
  * @version 01-feb-2007
  */
 public final class ThemeManagerWindow extends JPanel implements IWindow, ActionListener {
+	private static final Logger logger = LoggerFactory.getLogger(ThemeManagerWindow.class);
+			
 	private static final long serialVersionUID = 4650656815369149211L;
 	private static int selectedTabIndex = 0;
 	private static ArrayList<Class<? extends AbstractThemeManagerPage>> pages =
@@ -96,23 +105,30 @@
 	}
 
 	private  void initialize() {
+		StringBuffer msgerr = new StringBuffer(); 
 		for (int i = 0; i < pages.size(); i++) {
 			Class<? extends AbstractThemeManagerPage> pageClass = pages.get(i);
 			AbstractThemeManagerPage tab = null;
 			try {
 				tab = pageClass.newInstance();
-			} catch (InstantiationException e) {
-				NotificationManager.addError("Trying to instantiate an interface" +
-						" or abstract class + "+pageClass.getName(), e);
-			} catch (IllegalAccessException e) {
-				NotificationManager.addError("IllegalAccessException: does " +
-						pageClass.getName()	+ " class have an anonymous" +
-						" constructor?", e);
+			} catch (Exception e) {
+				msgerr.append(translate("_Cant_add_property_page_related_to_{0}", pageClass.getName()))
+					.append("\n");
+				logger.info("Can't instance propety page from class "+pageClass.getName(),e);
+				continue;
 			}
 			if (tab!=null){
 			    if (s.get(tab.getClass()).contains(layer.getClass())){
-			        tab.setModel(layer);
-			        tabs.addTab(tab.getName(), tab);
+			    	String tabName = null;
+			    	try {
+			    		tab.setModel(layer);
+			    		tabName = tab.getName();
+			    	} catch( Throwable ex) {
+						msgerr.append(translate("_Cant_initialice_property_page_{0}", tabName))
+							.append("\n");
+			    		logger.info("Can't set model of property page '"+tabName+"' from class '"+pageClass.getName()+"'.");
+			    	}
+			        tabs.addTab(tabName, tab);
 			    }
 			}
 		}
@@ -138,8 +154,27 @@
 		});
 		add(getPanelButtons(), java.awt.BorderLayout.SOUTH);
 		setSize(new Dimension(780, 540));
+		if( msgerr.length()>0 ) {
+			PluginServices.getMainFrame().messageDialog(msgerr.toString(), "_Warning", JOptionPane.WARNING_MESSAGE);
+		}
 	}
 
+	private String translate(String msg, String arg1) {
+		String[] args = null;
+		String translation = null;
+        if (msg == null) {
+            return "";
+        }
+        if( arg1 != null ) {
+        	args = new String[] { arg1 };
+        }
+        translation = org.gvsig.i18n.Messages.getText(msg, args);
+        if (translation == null) {
+        	return "_"+msg.replace("_", " ");
+        }
+        return translation;
+	}
+	
 	private JPanel getPanelButtons() {
 		if (panelButtons == null) {
 			panelButtons = new JPanel(new FlowLayout(FlowLayout.RIGHT, 5,5));
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 38607)
+++ branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/develtools/ActionsInfoDevelTool.java	(revision 38608)
@@ -80,12 +80,12 @@
 			if( action.getPosition()<100000000 ) {
 				buffer.append("    <td title=\"Incorrect position\">")
 					.append(error_open)
-					.append(action.getPosition())
+					.append(MenusDevelTool.formatPosition(action.getPosition()))
 					.append(error_close)
 					.append("</td>\n");
 			} else {
 				buffer.append("    <td>")
-					.append(action.getPosition())
+					.append(MenusDevelTool.formatPosition(action.getPosition()))
 					.append("</td>\n");
 			}
 			if( action.getLabel()==null ) {
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 38607)
+++ branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/extension/develtools/MenusDevelTool.java	(revision 38608)
@@ -69,7 +69,7 @@
 			buffer.append("  <tr valign=\"top\">\n");
 			buffer
 				.append("    <td>")
-				.append(String.format("%012d", menu.getPosition()))
+				.append(formatPosition( menu.getPosition()))
 				.append("</td>\n");			
 			buffer
 				.append("    <td>")
@@ -116,4 +116,16 @@
 
 		return buffer.toString();
 	}
+	
+	static String formatPosition(long position) {
+		String pos = String.format("%012d",position);
+		if( pos.length() != 12) {
+			return pos;
+		}
+		String posf = pos.substring(0, 5) + "-" +
+			pos.substring(5,8) + "-" +
+			pos.substring(8,11) + "-" +
+			pos.substring(11);
+		return posf;
+	}
 }
Index: branches/v2_0_0_prep/libraries/org.gvsig.symbology/org.gvsig.symbology.swing/org.gvsig.symbology.swing.impl/src/main/java/org/gvsig/symbology/swing/impl/IconThemeHelper.java
===================================================================
--- branches/v2_0_0_prep/libraries/org.gvsig.symbology/org.gvsig.symbology.swing/org.gvsig.symbology.swing.impl/src/main/java/org/gvsig/symbology/swing/impl/IconThemeHelper.java	(revision 0)
+++ branches/v2_0_0_prep/libraries/org.gvsig.symbology/org.gvsig.symbology.swing/org.gvsig.symbology.swing.impl/src/main/java/org/gvsig/symbology/swing/impl/IconThemeHelper.java	(revision 38608)
@@ -0,0 +1,51 @@
+package org.gvsig.symbology.swing.impl;
+
+import java.awt.Image;
+
+import javax.swing.ImageIcon;
+
+import org.gvsig.tools.swing.api.ToolsSwingLocator;
+import org.gvsig.tools.swing.icontheme.IconTheme;
+import org.gvsig.tools.swing.icontheme.IconThemeManager;
+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;
+		String provider; 
+		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();
+			provider = ((Class) obj).getName(); 
+		} else {
+			loader = obj.getClass().getClassLoader();
+			provider = obj.getClass().getName();
+		}
+		try {
+			iconTheme.registerDefault(provider, group, name, null, loader.getResource(resourceName));
+		} catch( Throwable e) {
+			logger.info(e.getMessage());
+		}
+	}
+
+	public static ImageIcon getImageIcon(String iconName) {
+		IconThemeManager manager = ToolsSwingLocator.getIconThemeManager();
+		return manager.getCurrent().get(iconName);
+	}
+	
+	public static Image getImage(String iconName) {
+		IconThemeManager manager = ToolsSwingLocator.getIconThemeManager();
+		return manager.getCurrent().get(iconName).getImage();
+	}
+}

Property changes on: branches/v2_0_0_prep/libraries/org.gvsig.symbology/org.gvsig.symbology.swing/org.gvsig.symbology.swing.impl/src/main/java/org/gvsig/symbology/swing/impl/IconThemeHelper.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: branches/v2_0_0_prep/libraries/org.gvsig.symbology/org.gvsig.symbology.swing/org.gvsig.symbology.swing.impl/src/main/java/org/gvsig/symbology/swing/impl/SymbologySwingDefaultImplLibrary.java
===================================================================
--- branches/v2_0_0_prep/libraries/org.gvsig.symbology/org.gvsig.symbology.swing/org.gvsig.symbology.swing.impl/src/main/java/org/gvsig/symbology/swing/impl/SymbologySwingDefaultImplLibrary.java	(revision 38607)
+++ branches/v2_0_0_prep/libraries/org.gvsig.symbology/org.gvsig.symbology.swing/org.gvsig.symbology.swing.impl/src/main/java/org/gvsig/symbology/swing/impl/SymbologySwingDefaultImplLibrary.java	(revision 38608)
@@ -21,6 +21,7 @@
  */
 package org.gvsig.symbology.swing.impl;
 
+
 import org.gvsig.symbology.swing.SymbologySwingLibrary;
 import org.gvsig.symbology.swing.SymbologySwingLocator;
 import org.gvsig.tools.library.AbstractLibrary;
@@ -43,6 +44,22 @@
     protected void doInitialize() throws LibraryException {
         SymbologySwingLocator
             .registerSwingManager(DefaultSymbologySwingManager.class);
+        
+        // LineProperties
+        IconThemeHelper.registerIcon("line-properties", "line-properties-join-bevel", this);
+        IconThemeHelper.registerIcon("line-properties", "line-properties-join-bevel-selected", this);
+        IconThemeHelper.registerIcon("line-properties", "line-properties-join-miter", this);
+        IconThemeHelper.registerIcon("line-properties", "line-properties-join-miter-selected", this);
+        IconThemeHelper.registerIcon("line-properties", "line-properties-join-round", this);
+        IconThemeHelper.registerIcon("line-properties", "line-properties-join-round-selected", this);
+        IconThemeHelper.registerIcon("line-properties", "line-properties-cap-butt", this);
+        IconThemeHelper.registerIcon("line-properties", "line-properties-cap-butt-selected", this);
+        IconThemeHelper.registerIcon("line-properties", "line-properties-cap-round", this);
+        IconThemeHelper.registerIcon("line-properties", "line-properties-cap-round-selected", this);
+        IconThemeHelper.registerIcon("line-properties", "line-properties-cap-square", this);
+        IconThemeHelper.registerIcon("line-properties", "line-properties-cap-square-selected", this);
+        // SymbolLayerManager
+        IconThemeHelper.registerIcon("symbol-editor", "symbol-editor-unlocked", this);
     }
 
     @Override
Index: branches/v2_0_0_prep/libraries/org.gvsig.symbology/org.gvsig.symbology.swing/org.gvsig.symbology.swing.impl/pom.xml
===================================================================
--- branches/v2_0_0_prep/libraries/org.gvsig.symbology/org.gvsig.symbology.swing/org.gvsig.symbology.swing.impl/pom.xml	(revision 38607)
+++ branches/v2_0_0_prep/libraries/org.gvsig.symbology/org.gvsig.symbology.swing/org.gvsig.symbology.swing.impl/pom.xml	(revision 38608)
@@ -13,15 +13,20 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.gvsig</groupId>
+			<artifactId>org.gvsig.tools.swing.api</artifactId>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.gvsig</groupId>
 			<artifactId>org.gvsig.symbology.lib.api</artifactId>
 			<version>2.0.0-SNAPSHOT</version>
-            <scope>compile</scope>
+			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.gvsig</groupId>
 			<artifactId>org.gvsig.symbology.swing.api</artifactId>
 			<version>2.0.0-SNAPSHOT</version>
-            <scope>compile</scope>
+			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.gvsig</groupId>
@@ -39,7 +44,7 @@
 		<dependency>
 			<groupId>org.gvsig</groupId>
 			<artifactId>org.gvsig.ui</artifactId>
-            <scope>compile</scope>
+			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.gvsig</groupId>
@@ -53,14 +58,14 @@
 			<classifier>impl</classifier>
 			<scope>test</scope>
 		</dependency>
-        <dependency>
-            <groupId>org.gvsig</groupId>
-            <artifactId>org.gvsig.projection</artifactId>
-            <scope>test</scope>
-        </dependency>
 		<dependency>
 			<groupId>org.gvsig</groupId>
 			<artifactId>org.gvsig.projection</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.gvsig</groupId>
+			<artifactId>org.gvsig.projection</artifactId>
 			<classifier>cresques-impl</classifier>
 			<scope>test</scope>
 		</dependency>
@@ -70,16 +75,16 @@
 			<classifier>se</classifier>
 			<scope>test</scope>
 		</dependency>
-        <dependency>
-            <groupId>org.gvsig</groupId>
-            <artifactId>org.gvsig.fmap.mapcontext</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.gvsig</groupId>
-            <artifactId>org.gvsig.fmap.mapcontext</artifactId>
-            <classifier>impl</classifier>
-            <scope>test</scope>
-        </dependency>
+		<dependency>
+			<groupId>org.gvsig</groupId>
+			<artifactId>org.gvsig.fmap.mapcontext</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.gvsig</groupId>
+			<artifactId>org.gvsig.fmap.mapcontext</artifactId>
+			<classifier>impl</classifier>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file
Index: branches/v2_0_0_prep/libraries/org.gvsig.symbology/org.gvsig.symbology.swing/org.gvsig.symbology.swing.api/src/main/java/org/gvsig/app/gui/styling/SymbolLayerManager.java
===================================================================
--- branches/v2_0_0_prep/libraries/org.gvsig.symbology/org.gvsig.symbology.swing/org.gvsig.symbology.swing.api/src/main/java/org/gvsig/app/gui/styling/SymbolLayerManager.java	(revision 38607)
+++ branches/v2_0_0_prep/libraries/org.gvsig.symbology/org.gvsig.symbology.swing/org.gvsig.symbology.swing.api/src/main/java/org/gvsig/app/gui/styling/SymbolLayerManager.java	(revision 38608)
@@ -125,6 +125,7 @@
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.app.project.documents.view.legend.gui.ISymbolSelector;
 import org.gvsig.fmap.geom.Geometry;
@@ -414,11 +415,9 @@
 //             				"images/unlocked.png";
 //             else
 //             	source = "images/unlocked.png";
-             String source = "images/unlocked.png";
 
-             ImageIcon icon = new ImageIcon(getClass().
-             		getClassLoader().getResource(source));
-             JButton btnLock = new JButton(icon);
+             
+             JButton btnLock = new JButton(IconThemeHelper.getImageIcon("symbol-editor-unlocked"));
              btnLock.setSize(btnDimension);
              btnLock.setPreferredSize(btnDimension);
              btnLock.setActionCommand("LOCK");
Index: branches/v2_0_0_prep/libraries/org.gvsig.symbology/org.gvsig.symbology.swing/org.gvsig.symbology.swing.api/src/main/java/org/gvsig/app/gui/styling/LineProperties.java
===================================================================
--- branches/v2_0_0_prep/libraries/org.gvsig.symbology/org.gvsig.symbology.swing/org.gvsig.symbology.swing.api/src/main/java/org/gvsig/app/gui/styling/LineProperties.java	(revision 38607)
+++ branches/v2_0_0_prep/libraries/org.gvsig.symbology/org.gvsig.symbology.swing/org.gvsig.symbology.swing.api/src/main/java/org/gvsig/app/gui/styling/LineProperties.java	(revision 38608)
@@ -10,13 +10,12 @@
 import javax.swing.BorderFactory;
 import javax.swing.BoxLayout;
 import javax.swing.ButtonGroup;
-import javax.swing.ImageIcon;
 import javax.swing.JButton;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JRadioButton;
 
-import org.gvsig.andami.PluginServices;
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.gui.beans.DefaultBean;
 import org.gvsig.gui.beans.swing.JBlank;
 import org.gvsig.i18n.Messages;
@@ -55,20 +54,11 @@
 
 		pnlJoin.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEmptyBorder(), Messages.getText("join_style")+":"));
 
-		//////////
-		PluginServices.getIconTheme().registerDefault(
-				"join-bevel",
-				this.getClass().getClassLoader().getResource("images/join_bevel.png"));
-		PluginServices.getIconTheme().registerDefault(
-				"join-bevel-selected",
-				this.getClass().getClassLoader().getResource("images/join_bevel-selected.png"));
-		ImageIcon img= PluginServices.getIconTheme().get("join-bevel");
-
 		JPanel d = new JPanel();
 		JPanel toCenter;
 		d.setLayout(new BoxLayout(d, BoxLayout.Y_AXIS));
-		joinBevel = new JRadioButton(img);
-		joinBevel.setSelectedIcon(PluginServices.getIconTheme().get("join-bevel-selected"));
+		joinBevel = new JRadioButton(IconThemeHelper.getImageIcon("line-properties-join-bevel"));
+		joinBevel.setSelectedIcon(IconThemeHelper.getImageIcon("line-properties-join-bevel-selected"));
 		FlowLayout flowCenteredLayout = new FlowLayout(FlowLayout.CENTER, 0, 0);
 		toCenter = new JPanel(flowCenteredLayout);
 		toCenter.add(joinBevel);
@@ -80,19 +70,11 @@
 
 		pnlJoin.add(d);
 
-		PluginServices.getIconTheme().registerDefault(
-				"join-miter",
-				this.getClass().getClassLoader().getResource("images/join_miter.png"));
-		PluginServices.getIconTheme().registerDefault(
-				"join-miter-selected",
-				this.getClass().getClassLoader().getResource("images/join_miter-selected.png"));
 
-		img= PluginServices.getIconTheme().get("join-miter");
-
 		d = new JPanel();
 		d.setLayout(new BoxLayout(d, BoxLayout.Y_AXIS));
-		joinMiter = new JRadioButton(img);
-		joinMiter.setSelectedIcon(PluginServices.getIconTheme().get("join-miter-selected"));
+		joinMiter = new JRadioButton(IconThemeHelper.getImageIcon("line-properties-join-miter"));
+		joinMiter.setSelectedIcon(IconThemeHelper.getImageIcon("line-properties-join-miter-selected"));
 		toCenter = new JPanel(flowCenteredLayout);
 		toCenter.add(joinMiter);
 		d.add(toCenter);
@@ -102,18 +84,12 @@
 		d.add(toCenter);
 		pnlJoin.add(d);
 
-		PluginServices.getIconTheme().registerDefault(
-				"join-round",
-				this.getClass().getClassLoader().getResource("images/join_round.png"));
-		PluginServices.getIconTheme().registerDefault(
-				"join-round-selected",
-				this.getClass().getClassLoader().getResource("images/join_round-selected.png"));
-		img= PluginServices.getIconTheme().get("join-round");
 
+
 		d = new JPanel();
 		d.setLayout(new BoxLayout(d, BoxLayout.Y_AXIS));
-		joinRound = new JRadioButton(img);
-		joinRound.setSelectedIcon(PluginServices.getIconTheme().get("join-round-selected"));
+		joinRound = new JRadioButton(IconThemeHelper.getImageIcon("line-properties-join-round"));
+		joinRound.setSelectedIcon(IconThemeHelper.getImageIcon("line-properties-join-round-selected"));
 		toCenter = new JPanel(flowCenteredLayout);
 		toCenter.add(joinRound);
 		d.add(toCenter);
@@ -134,18 +110,10 @@
 		JPanel pnlCap = new JPanel(new FlowLayout(FlowLayout.LEFT, 30, 0));
 		pnlCap.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEmptyBorder(), Messages.getText("end_style")+":"));
 
-		PluginServices.getIconTheme().registerDefault(
-				"cap-butt",
-				this.getClass().getClassLoader().getResource("images/cap_butt.png"));
-		PluginServices.getIconTheme().registerDefault(
-				"cap-butt-selected",
-				this.getClass().getClassLoader().getResource("images/cap_butt-selected.png"));
-		img= PluginServices.getIconTheme().get("cap-butt");
-
 		JPanel c = new JPanel();
 		c.setLayout(new BoxLayout(c, BoxLayout.Y_AXIS));
-		capBut = new JRadioButton(img);
-		capBut.setSelectedIcon(PluginServices.getIconTheme().get("cap-butt-selected"));
+		capBut = new JRadioButton(IconThemeHelper.getImageIcon("line-properties-cap-butt"));
+		capBut.setSelectedIcon(IconThemeHelper.getImageIcon("line-properties-cap-butt-selected"));
 		toCenter = new JPanel(flowCenteredLayout);
 		toCenter.add(capBut);
 		c.add(toCenter);
@@ -154,19 +122,10 @@
 		c.add(toCenter);
 		pnlCap.add(c);
 
-		PluginServices.getIconTheme().registerDefault(
-				"cap-round",
-				this.getClass().getClassLoader().getResource("images/cap_round.png"));
-		PluginServices.getIconTheme().registerDefault(
-				"cap-round-selected",
-				this.getClass().getClassLoader().getResource("images/cap_round-selected.png"));
-		img= PluginServices.getIconTheme().get("cap-round");
-
-
 		JPanel a = new JPanel();
 		a.setLayout(new BoxLayout(a, BoxLayout.Y_AXIS));
-		capRound = new JRadioButton(img);
-		capRound.setSelectedIcon(PluginServices.getIconTheme().get("cap-round-selected"));
+		capRound = new JRadioButton(IconThemeHelper.getImageIcon("line-properties-cap-round"));
+		capRound.setSelectedIcon(IconThemeHelper.getImageIcon("line-properties-cap-round-selected"));
 		toCenter = new JPanel(flowCenteredLayout);
 		toCenter.add(capRound);
 		a.add(toCenter);
@@ -175,18 +134,11 @@
 		a.add(toCenter);
 		pnlCap.add(a);
 
-		PluginServices.getIconTheme().registerDefault(
-				"cap-square",
-				this.getClass().getClassLoader().getResource("images/cap_square.png"));
-		PluginServices.getIconTheme().registerDefault(
-				"cap-square-selected",
-				this.getClass().getClassLoader().getResource("images/cap_square-selected.png"));
-		img= PluginServices.getIconTheme().get("cap-square");
 
 		JPanel b = new JPanel();
 		b.setLayout(new BoxLayout(b, BoxLayout.Y_AXIS));
-		capSquare = new JRadioButton(img);
-		capSquare.setSelectedIcon(PluginServices.getIconTheme().get("cap-square-selected"));
+		capSquare = new JRadioButton(IconThemeHelper.getImageIcon("line-properties-cap-square"));
+		capSquare.setSelectedIcon(IconThemeHelper.getImageIcon("line-properties-cap-square-selected"));
 		toCenter = new JPanel(flowCenteredLayout);
 		toCenter.add(capSquare);
 
Index: branches/v2_0_0_prep/libraries/org.gvsig.exportto/org.gvsig.exportto.swing/org.gvsig.exportto.swing.impl/src/main/java/org/gvsig/exportto/swing/impl/DefaultJExporttoServicePanel.java
===================================================================
--- branches/v2_0_0_prep/libraries/org.gvsig.exportto/org.gvsig.exportto.swing/org.gvsig.exportto.swing.impl/src/main/java/org/gvsig/exportto/swing/impl/DefaultJExporttoServicePanel.java	(revision 38607)
+++ branches/v2_0_0_prep/libraries/org.gvsig.exportto/org.gvsig.exportto.swing/org.gvsig.exportto.swing.impl/src/main/java/org/gvsig/exportto/swing/impl/DefaultJExporttoServicePanel.java	(revision 38608)
@@ -33,6 +33,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.exportto.ExporttoService;
 import org.gvsig.exportto.ExporttoServiceException;
 import org.gvsig.exportto.ExporttoServiceFinishAction;
@@ -113,11 +114,7 @@
         this.providerTypes = providerTypes;
         this.status = JOptionPane.UNDEFINED_CONDITION;
 
-        URL iconURL =
-            getClass().getClassLoader().getResource(
-                "org/gvsig/exportto/swing/impl/images/exporttoicon.png");
-        ImageIcon icon = new ImageIcon(iconURL);
-        wizardPanelWithLogo = new WizardPanelWithLogo(icon);
+        wizardPanelWithLogo = new WizardPanelWithLogo(IconThemeHelper.getImageIcon("wizard-export-to"));
 
         // Initialize the wizards
         exporterSelectionWizard =
Index: branches/v2_0_0_prep/libraries/org.gvsig.exportto/org.gvsig.exportto.swing/org.gvsig.exportto.swing.impl/src/main/java/org/gvsig/exportto/swing/impl/ExporttoSwingDefaultImplLibrary.java
===================================================================
--- branches/v2_0_0_prep/libraries/org.gvsig.exportto/org.gvsig.exportto.swing/org.gvsig.exportto.swing.impl/src/main/java/org/gvsig/exportto/swing/impl/ExporttoSwingDefaultImplLibrary.java	(revision 38607)
+++ branches/v2_0_0_prep/libraries/org.gvsig.exportto/org.gvsig.exportto.swing/org.gvsig.exportto.swing.impl/src/main/java/org/gvsig/exportto/swing/impl/ExporttoSwingDefaultImplLibrary.java	(revision 38608)
@@ -23,6 +23,7 @@
 
 import java.util.Locale;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.exportto.swing.ExporttoSwingLibrary;
 import org.gvsig.exportto.swing.ExporttoSwingLocator;
 import org.gvsig.exportto.swing.spi.ExporttoSwingProviderLocator;
@@ -56,6 +57,7 @@
         Messages.addResourceFamily("org.gvsig.exportto.swing.impl.i18n.text",
             ExporttoSwingDefaultImplLibrary.class.getClassLoader(),
             ExporttoSwingDefaultImplLibrary.class.getClass().getName());
+        IconThemeHelper.registerIcon("export-to", "wizard-export-to", this);
     }
 
     @Override
Index: branches/v2_0_0_prep/libraries/libFMap_dal/src/org/gvsig/fmap/dal/feature/spi/memory/MemoryFeatureSet.java
===================================================================
--- branches/v2_0_0_prep/libraries/libFMap_dal/src/org/gvsig/fmap/dal/feature/spi/memory/MemoryFeatureSet.java	(revision 38607)
+++ branches/v2_0_0_prep/libraries/libFMap_dal/src/org/gvsig/fmap/dal/feature/spi/memory/MemoryFeatureSet.java	(revision 38608)
@@ -50,7 +50,7 @@
 
 	protected List data;
 
-	public MemoryFeatureSet(AbstractMemoryStoreProvider store,
+	public MemoryFeatureSet(AbstractFeatureStoreProvider store,
 			FeatureQuery query, FeatureType featureType, List data) {
 		super(store, query,
 		/*
Index: branches/v2_0_0_prep/libraries/libInternationalization/src/org/gvsig/i18n/Messages.java
===================================================================
--- branches/v2_0_0_prep/libraries/libInternationalization/src/org/gvsig/i18n/Messages.java	(revision 38607)
+++ branches/v2_0_0_prep/libraries/libInternationalization/src/org/gvsig/i18n/Messages.java	(revision 38608)
@@ -144,7 +144,7 @@
 
 	public static String getText(String key,  String[] arguments, String callerName) {
 		String translation = getText(key, callerName);
-		if (translation!=null) {
+		if (translation!=null && arguments!=null ) {
 			try {
 				translation = MessageFormat.format(translation, arguments);
 			}
@@ -192,11 +192,10 @@
 
 	public static String getText(String key, String[] arguments, boolean log) {
 		String translation = getText(key, _CLASSNAME, log);
-		if (translation!=null) {
+		if (translation!=null && arguments!=null ) {
 			try {
 				translation = MessageFormat.format(translation, arguments);
-			}
-			catch (IllegalFormatException ex) {
+			} catch (IllegalFormatException ex) {
 				if (log) {
 					logger.error(_CLASSNAME+" -- Error formating key: "+key+" -- "+translation);
 				}
Index: branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/mdiManager/WindowStackSupport.java
===================================================================
--- branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/mdiManager/WindowStackSupport.java	(revision 38607)
+++ branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/mdiManager/WindowStackSupport.java	(revision 38608)
@@ -95,7 +95,7 @@
 		Menu m = new Menu();
 		m.setActionCommand(""+id);
 		m.setTooltip(PluginServices.getText(this, "activa_la_ventana"));
-		m.setText("Ventana/"+vi.getTitle());
+		m.setText("Window/"+vi.getTitle());
 		/* get the first free mnemonic (if any) and assign */
 		for ( int i=0; i < 10; i++) {
 			if ( key_free[i]) {
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 38607)
+++ branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/mdiManager/NewSkin.java	(revision 38608)
@@ -147,6 +147,8 @@
     private Cursor lastCursor = null;
 	private ImageIcon image;
 	private String typeDesktop;
+
+	private int alignCounter = 1;
 	
 	//Anyade barras de scroll
 	private void addScrolledDesktopPanel( JFrame parent, MyDesktopPane desktopPane) {
@@ -410,59 +412,67 @@
         int visibleWidth = contentPane.getWidth() - contentPane.getX(); // The last substraction is for if there is any menu,... at left
         int visibleHeight = contentPane.getHeight() - newStatusBar.getHeight() - contentPane.getY() - Math.abs(jDesktopPane.getY() - contentPane.getY()); // The last substraction is for if there is any menu,... at top
 
-//        -------------------------------------------------
-//        |FIRST_LINE_START   PAGE_START     FIRST_LINE_END|
-//        |                                                |
-//        |                                                |
-//        |LINE_START           CENTER             LINE_END|
-//        |                                                |
-//        |                                                |
-//        |LAST_LINE_START     PAGE_END       LAST_LINE_END|
-//        -------------------------------------------------
-        
+//        ---------------------------------------------------------------
+//        |FIRST_LINE_START(23)   PAGE_START(19)     FIRST_LINE_END(24) |
+//        |                                                             |
+//        |                                                             |
+//        |LINE_START(21)           CENTER(10)              LINE_END(22)|
+//        |                                                             |
+//        |                                                             |
+//        |LAST_LINE_START(25)     PAGE_END(20)       LAST_LINE_END(26) |
+//        ---------------------------------------------------------------
+    	
         switch (mode) {
-        case GridBagConstraints.FIRST_LINE_START:
+        case ALIGN_FIRST_LINE_START:
             newReferencePoint.x = DefaultXMargin;
             newReferencePoint.y = DefaultYMargin;
             break;
         
-        case GridBagConstraints.PAGE_START:
+        case ALIGN_PAGE_START:
             newReferencePoint.x = visibleWidth / 2;
             newReferencePoint.y = DefaultYMargin;
             break;
         
-        case GridBagConstraints.FIRST_LINE_END:
+        case ALIGN_FIRST_LINE_END:
             newReferencePoint.x = visibleWidth - window.getWidth() - DefaultXMargin;
             newReferencePoint.y = DefaultYMargin;
             break;
         
-        case GridBagConstraints.LINE_START:
+        case ALIGN_FIRST_LINE_END_CASCADE:
+            newReferencePoint.x = visibleWidth - window.getWidth() - (int)(DefaultXMargin + (DefaultXMargin*1.5*this.alignCounter));
+            newReferencePoint.y = DefaultYMargin + (int)(DefaultYMargin*1.5*this.alignCounter);
+            if( ++this.alignCounter >5 ) {
+            	this.alignCounter = 0;
+            }
+            break;
+        
+        case ALIGN_LINE_START:
             newReferencePoint.x = DefaultXMargin;
             newReferencePoint.y = visibleHeight / 2;
             break;
         
-        case GridBagConstraints.LINE_END:
+        case ALIGN_LINE_END:
             newReferencePoint.x = visibleWidth - window.getWidth() - DefaultXMargin;
             newReferencePoint.y = visibleHeight / 2;
             break;
         
-        case GridBagConstraints.LAST_LINE_START:
+        case ALIGN_LAST_LINE_START:
             newReferencePoint.x = DefaultXMargin;
             newReferencePoint.y = visibleHeight - window.getHeight() - DefaultYMargin;
             break;
         
-        case GridBagConstraints.PAGE_END:
+        case ALIGN_PAGE_END:
             newReferencePoint.x = visibleWidth / 2;
             newReferencePoint.y = visibleHeight - window.getHeight() - DefaultYMargin;
             break;
         
-        case GridBagConstraints.LAST_LINE_END:
+        case ALIGN_LAST_LINE_END:
             newReferencePoint.x = visibleWidth - window.getWidth() - DefaultXMargin;
             newReferencePoint.y = visibleHeight - window.getHeight() - DefaultYMargin;
             break;
         
         default:
-        case GridBagConstraints.CENTER:
+        case ALIGN_CENTER:
             newReferencePoint.x = visibleWidth / 2;
             newReferencePoint.y = visibleHeight / 2;
             break;
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 38607)
+++ branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/preferences/network/FirewallPage.java	(revision 38608)
@@ -159,7 +159,6 @@
 
 	public FirewallPage() {
 		super();
-		//icon = new ImageIcon(this.getClass().getClassLoader().getResource("images/shield.png"));
 		icon=PluginServices.getIconTheme().get("edit-setup-firewall");
 		setParentID(NetworkPage.id);
 //		 checkbox
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 38607)
+++ branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/preferences/network/NetworkPage.java	(revision 38608)
@@ -132,7 +132,6 @@
 	public NetworkPage() {
 		super();
 		id = this.getClass().getName();
-		// icon = new ImageIcon(this.getClass().getClassLoader().getResource("images/network.png"));
 		icon=PluginServices.getIconTheme().get("edit-setup-network");
 		lblNetworkStatus = new JLabel();
 		lblNetworkStatus.setFont(lblNetworkStatus.getFont().deriveFont(Font.BOLD));
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 38607)
+++ branches/v2_0_0_prep/libraries/libCorePlugin/src/org/gvsig/coreplugin/preferences/general/SkinPreferences.java	(revision 38608)
@@ -22,10 +22,13 @@
 import org.gvsig.andami.ui.mdiManager.MDIManagerFactory;
 import org.gvsig.utils.XMLEntity;
 import org.gvsig.utils.swing.JComboBox;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 public class SkinPreferences extends AbstractPreferencePage {
 
+	private static final Logger logger = LoggerFactory.getLogger(SkinPreferences.class);
 	private String id;
 	private ImageIcon icon;
 	private Vector listSkinsPlugins;
@@ -108,9 +111,6 @@
 	}
 
 	public void initializeValues() {
-		// TODO Auto-generated method stub
-		// System.out.println("inicialize values");
-
 		listSkinsPlugins = new Vector();
 
 		HashMap pluginsConfig = Launcher.getPluginConfig();
@@ -123,9 +123,9 @@
 			if (pc.getExtensions().getSkinExtension() != null) {
 				SkinExtension[] se = pc.getExtensions().getSkinExtension();
 				for (int j=0;j<se.length;j++){
-
-					listSkinsPlugins.add(se[j].getClassName());
-					System.out.println("plugin de skin + name");
+					String extensionName = se[j].getClassName();
+					listSkinsPlugins.add(extensionName );
+					logger.info("Skin plugin '"+name + "', extension '"+ extensionName +".");
 				}
 			}
 		}
Index: branches/v2_0_0_prep/libraries/org.gvsig.annotation/org.gvsig.annotation.swing/org.gvsig.annotation.swing.impl/src/main/java/org/gvsig/annotation/swing/impl/AnnotationSwingDefaultImplLibrary.java
===================================================================
--- branches/v2_0_0_prep/libraries/org.gvsig.annotation/org.gvsig.annotation.swing/org.gvsig.annotation.swing.impl/src/main/java/org/gvsig/annotation/swing/impl/AnnotationSwingDefaultImplLibrary.java	(revision 38607)
+++ branches/v2_0_0_prep/libraries/org.gvsig.annotation/org.gvsig.annotation.swing/org.gvsig.annotation.swing.impl/src/main/java/org/gvsig/annotation/swing/impl/AnnotationSwingDefaultImplLibrary.java	(revision 38608)
@@ -25,9 +25,12 @@
 
 import org.gvsig.annotation.swing.AnnotationSwingLibrary;
 import org.gvsig.annotation.swing.AnnotationSwingLocator;
+import org.gvsig.gui.beans.wizard.WizardPanelWithLogo;
 import org.gvsig.i18n.Messages;
 import org.gvsig.tools.library.AbstractLibrary;
 import org.gvsig.tools.library.LibraryException;
+import org.gvsig.tools.swing.api.ToolsSwingLocator;
+import org.gvsig.tools.swing.icontheme.IconThemeManager;
 
 /**
  * Library for default swing implementation initialization and configuration.
@@ -46,6 +49,17 @@
     protected void doInitialize() throws LibraryException {
         AnnotationSwingLocator
             .registerSwingManager(DefaultAnnotationSwingManager.class);
+
+        IconThemeManager themeManager = ToolsSwingLocator.getIconThemeManager();
+        
+        themeManager.getDefault().registerDefault(
+        		this.getClass().getName(), 
+        		"annotation", 
+        		"wizard-annotation", 
+        		null, 
+        		this.getClass().getClassLoader().getResource("org/gvsig/annotation/swing/impl/images/wizard-icon.png")
+        );
+
     }
 
     @Override
Index: branches/v2_0_0_prep/libraries/org.gvsig.annotation/org.gvsig.annotation.swing/org.gvsig.annotation.swing.impl/src/main/java/org/gvsig/annotation/swing/impl/DefaultJAnnotationCreationServicePanel.java
===================================================================
--- branches/v2_0_0_prep/libraries/org.gvsig.annotation/org.gvsig.annotation.swing/org.gvsig.annotation.swing.impl/src/main/java/org/gvsig/annotation/swing/impl/DefaultJAnnotationCreationServicePanel.java	(revision 38607)
+++ branches/v2_0_0_prep/libraries/org.gvsig.annotation/org.gvsig.annotation.swing/org.gvsig.annotation.swing.impl/src/main/java/org/gvsig/annotation/swing/impl/DefaultJAnnotationCreationServicePanel.java	(revision 38608)
@@ -45,6 +45,8 @@
 import org.gvsig.gui.beans.wizard.WizardPanelWithLogo;
 import org.gvsig.i18n.Messages;
 import org.gvsig.tools.service.ServiceException;
+import org.gvsig.tools.swing.api.ToolsSwingLocator;
+import org.gvsig.tools.swing.icontheme.IconThemeManager;
 import org.gvsig.tools.task.TaskStatus;
 
 /**
@@ -77,9 +79,8 @@
 
 		super();
 
-        URL iconURL = getClass().getClassLoader().getResource("org/gvsig/annotation/swing/impl/images/wizard-icon.png");
-        ImageIcon icon = new ImageIcon(iconURL);
-		wizardPanelWithLogo = new WizardPanelWithLogo(icon);
+        IconThemeManager themeManager = ToolsSwingLocator.getIconThemeManager();
+		wizardPanelWithLogo = new WizardPanelWithLogo(themeManager.getCurrent().get("wizard-annotation"));
 
 		this.annotationCreationService = annotationCreationService;
 		this.annotationSwingManager = annotationSwingManager;
Index: branches/v2_0_0_prep/extensions/extGeoDB/images/geodb/geodb-connection-add.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/geodb/geodb-connection-add.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/extGeoDB/src/org/gvsig/geodb/vectorialdb/wizard/WizardDB.java
===================================================================
--- branches/v2_0_0_prep/extensions/extGeoDB/src/org/gvsig/geodb/vectorialdb/wizard/WizardDB.java	(revision 38607)
+++ branches/v2_0_0_prep/extensions/extGeoDB/src/org/gvsig/geodb/vectorialdb/wizard/WizardDB.java	(revision 38608)
@@ -52,6 +52,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.PluginsLocator;
 import org.gvsig.andami.PluginsManager;
@@ -542,9 +543,7 @@
 					"add_connection"));
 			dbButton.setBounds(new java.awt.Rectangle(465, 20, 26, 21));
 
-			// FIXME use standard icon theme
-			String _file = createResourceUrl("images/jdbc.png").getFile();
-			dbButton.setIcon(new ImageIcon(_file));
+			dbButton.setIcon(IconThemeHelper.getImageIcon("geodb-connection-add"));
 		}
 
 		return dbButton;
Index: branches/v2_0_0_prep/extensions/extGeoDB/src/org/gvsig/geodb/ExtDB_Spatial.java
===================================================================
--- branches/v2_0_0_prep/extensions/extGeoDB/src/org/gvsig/geodb/ExtDB_Spatial.java	(revision 38607)
+++ branches/v2_0_0_prep/extensions/extGeoDB/src/org/gvsig/geodb/ExtDB_Spatial.java	(revision 38608)
@@ -44,6 +44,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;
@@ -62,7 +63,7 @@
 public class ExtDB_Spatial extends Extension {
 
 	public void initialize() {
-	    //do nothing
+	    IconThemeHelper.registerIcon("geodb", "geodb-connection-add", this);
     }
 
     public void execute(String actionCommand) {
Index: branches/v2_0_0_prep/extensions/org.gvsig.installer/org.gvsig.installer.swing/org.gvsig.installer.swing.impl/src/main/java/org/gvsig/installer/swing/impl/execution/DefaultInstallPackageWizard.java
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.installer/org.gvsig.installer.swing/org.gvsig.installer.swing.impl/src/main/java/org/gvsig/installer/swing/impl/execution/DefaultInstallPackageWizard.java	(revision 38607)
+++ branches/v2_0_0_prep/extensions/org.gvsig.installer/org.gvsig.installer.swing/org.gvsig.installer.swing.impl/src/main/java/org/gvsig/installer/swing/impl/execution/DefaultInstallPackageWizard.java	(revision 38608)
@@ -83,11 +83,6 @@
 		installerExecutionService = InstallerLocator.getInstallerManager()
 				.getInstallPackageService();
 
-		// URL iconURL =
-		// getClass().getClassLoader().getResource(
-		// "images/installpackageicon.png");
-		// ImageIcon icon = new ImageIcon(iconURL);
-		// wizardPanelWithLogo = new WizardPanelWithLogo(icon);
 		wizardPanelWithLogo = new WizardPanelWithLogo();
 
 		List<URL> downloadURLs = SwingInstallerLocator
Index: branches/v2_0_0_prep/extensions/extEditing/config/config.xml
===================================================================
--- branches/v2_0_0_prep/extensions/extEditing/config/config.xml	(revision 38607)
+++ branches/v2_0_0_prep/extensions/extEditing/config/config.xml	(revision 38608)
@@ -309,7 +309,7 @@
                 name="layer-insert-line"
                 label="_Insert_line" 
                 tooltip="_Insert_line" 
-                position="60100500" 
+                position="601000500" 
                 action-command="layer-insert-line"
                 icon="layer-insert-line"
                 accelerator=""
Index: branches/v2_0_0_prep/extensions/extEditing/images/preferences/preferences-snapper.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-snapper.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/TestJWizard.java
===================================================================
--- branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/TestJWizard.java	(revision 38607)
+++ branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/TestJWizard.java	(revision 38608)
@@ -1,105 +0,0 @@
-package org.gvsig.editing;
-
-import javax.swing.ImageIcon;
-import javax.swing.JFrame;
-import javax.swing.SwingUtilities;
-import javax.swing.UIManager;
-
-import jwizardcomponent.Utilities;
-import jwizardcomponent.frame.SimpleLogoJWizardFrame;
-
-import org.gvsig.editing.gui.cad.MyFinishAction;
-import org.gvsig.editing.gui.cad.panels.ChooseGeometryType;
-import org.gvsig.editing.gui.cad.panels.JPanelFieldDefinition;
-
-
-/**
- * <p>Title: JWizardComponent</p>
- * <p>Description: Swing-Based Wizard Framework for Wizards</p>
- * <p>Copyright (C) 2003 William Ready
- *
- * <br>This library is free software; you can redistribute it and/or
- * <br>modify it under the terms of the GNU Lesser General Public
- * <br>License as published by the Free Software Foundation; either
- * <br>version 2.1 of the License, or (at your option) any later version.
- *
- * <br>This library is distributed in the hope that it will be useful,
- * <br>but WITHOUT ANY WARRANTY; without even the implied warranty of
- * <br>MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * <br>See the GNU Lesser General Public License for more details.
- *
- * <br>To receive a copy of the GNU Lesser General Public License
- * <br>write to:  The Free Software Foundation, Inc.,
- * <br>59 Temple Place, Suite 330
- * <br>Boston, MA 02111-1307 USA</p>
- * @author William Ready
- * @version 1.0
- */
-
-public class TestJWizard {
-
-  static ImageIcon LOGO;
-
-
-  public static void main(String [] args) {
-    try {
-
-    	LOGO = new javax.swing.ImageIcon("images/package_graphics.png");
-			// new ImageIcon(DefaultJWizardComponents.class.getResource("images/logo.jpeg"));
-
-      SimpleLogoJWizardFrame wizardFrame = new SimpleLogoJWizardFrame(
-          LOGO);
-      wizardFrame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-
-      UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-      SwingUtilities.updateComponentTreeUI(wizardFrame);
-
-      wizardFrame.setTitle("Nuevo tema");
-
-      MyFinishAction myFinish = new MyFinishAction(wizardFrame.getWizardComponents(), null, "SHP");
-
-	  wizardFrame.getWizardComponents().setFinishAction(myFinish);
-
-
-      /* wizardFrame.getWizardComponents().addWizardPanel(
-          new SimpleLabelWizardPanel(wizardFrame.getWizardComponents(),
-          new JLabel("Dynamic Test"))); */
-      /* LayerFactory.setDriversPath("d:/Eclipse/workspace/_fwAndami/gvSIG/extensiones/com.iver.cit.gvsig/drivers");
-
-      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());
-      }
-
-
-
-      wizardFrame.getWizardComponents().addWizardPanel(
-    		  new ChooseWriteDriver(wizardFrame.getWizardComponents(),
-              "Dynamic Test", (String[]) spatialDrivers.toArray(new String[0])));
-      */
-		ChooseGeometryType panelChoose = new ChooseGeometryType(wizardFrame.getWizardComponents());
-		JPanelFieldDefinition panelFields = new JPanelFieldDefinition(wizardFrame.getWizardComponents());
-		wizardFrame.getWizardComponents().addWizardPanel(panelChoose);
-
-		wizardFrame.getWizardComponents().addWizardPanel(panelFields);
-
-      /* wizardFrame.getWizardComponents().addWizardPanel(
-          new SimpleLabelWizardPanel(wizardFrame.getWizardComponents(),
-          new JLabel("Done!"))); */
-      wizardFrame.setSize(540, 350);
-      Utilities.centerComponentOnScreen(wizardFrame);
-      wizardFrame.show();
-
-  	  // System.out.println("Salgo con " + panelChoose.getLayerName());
-
-    } catch (Exception e) {
-      e.printStackTrace();
-    }
-  }
-
-}
\ No newline at end of file
Index: branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/gui/preferences/SnapConfigPage.java
===================================================================
--- branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/gui/preferences/SnapConfigPage.java	(revision 38607)
+++ branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/gui/preferences/SnapConfigPage.java	(revision 38608)
@@ -8,6 +8,7 @@
 import javax.swing.ImageIcon;
 import javax.swing.JPanel;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.messages.NotificationManager;
 import org.gvsig.andami.preferences.AbstractPreferencePage;
@@ -34,7 +35,6 @@
  */
 public class SnapConfigPage extends AbstractPreferencePage {
     private static Preferences prefs = Preferences.userRoot().node("snappers");
-    private ImageIcon icon;
     private SnapConfig snapConfig;   
 	private static boolean applySnappers=true;
     @SuppressWarnings("unchecked")
@@ -44,7 +44,6 @@
     public SnapConfigPage() {
         super();
         this.setLayout(new BorderLayout());
-        icon = new ImageIcon(this.getClass().getClassLoader().getResource("images/Snapper.png"));
         IWindow window=PluginServices.getMDIManager().getActiveWindow();
         if (window instanceof DefaultViewPanel){
         	mc=((DefaultViewPanel)window).getMapControl();
@@ -160,7 +159,7 @@
      * @return DOCUMENT ME!
      */
     public ImageIcon getIcon() {
-        return icon;
+        return IconThemeHelper.getImageIcon("preferences-snapper");
     }
 
     /**
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 38607)
+++ branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/CADExtension.java	(revision 38608)
@@ -225,6 +225,7 @@
     	
     	
     	IconThemeHelper.registerIcon("preferences", "preferences-layer-modify-flatness", this);
+    	IconThemeHelper.registerIcon("preferences", "preferences-snapper", 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/ShowGraphicsLayerTable.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/ShowGraphicsLayerTable.java	(revision 38607)
+++ 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/ShowGraphicsLayerTable.java	(revision 38608)
@@ -24,6 +24,7 @@
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.PluginServices;
 import org.gvsig.andami.plugins.Extension;
 import org.gvsig.app.ApplicationLocator;
@@ -147,10 +148,7 @@
 	}
 
 	private void registerIcons() {
-		PluginServices.getIconTheme().registerDefault(
-				"layer-show-attribute-table",
-				this.getClass().getClassLoader()
-						.getResource("images/ResultConsulta.png"));
+		IconThemeHelper.registerIcon("action", "layer-show-attributes-table", this);
 	}
 
 	public void propertyChange(PropertyChangeEvent evt) {
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 38607)
+++ 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 38608)
@@ -259,7 +259,7 @@
                 name="table-rename-column"
                 label="_Rename_column" 
                 tooltip="_Rename_column" 
-                position="5006500000" 
+                position="500650000" 
                 action-command="table-add-column"
                 icon="table-add-column"
                 accelerator=""
@@ -452,7 +452,7 @@
                 name="table-statistics"
                 label="_Statistics" 
                 tooltip="_Statistics" 
-                position="5080000000" 
+                position="508000000" 
                 action-command="table-statistics"
                 icon="table-statistics"
                 accelerator=""
Index: branches/v2_0_0_prep/extensions/org.gvsig.exportto.app/org.gvsig.exportto.app.extension/src/main/resources/config.xml
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.exportto.app/org.gvsig.exportto.app.extension/src/main/resources/config.xml	(revision 38607)
+++ branches/v2_0_0_prep/extensions/org.gvsig.exportto.app/org.gvsig.exportto.app.extension/src/main/resources/config.xml	(revision 38608)
@@ -11,16 +11,16 @@
 			description=""
 			active="true"
 			priority="1">
-			<menu text="Capa/export_to"
-				position="11"
+			<menu text="Layer/export_to"
+				position="600500000"
 				action-command="Exportto"/>				
 		</extension>		
 		<extension class-name="org.gvsig.exportto.app.extension.ExporttoTableExtension"
             description=""
             active="true"
             priority="1">
-            <menu text="Tabla/export_to"
-                position="50"
+            <menu text="Table/export_to"
+                position="600850000"
                 action-command="Exportto"/>             
         </extension>        
         <extension class-name="org.gvsig.exportto.app.extension.ExporttoPreferencesExtension"
Index: branches/v2_0_0_prep/extensions/org.gvsig.symbology.app/org.gvsig.symbology.app.symbolinstaller/src/main/java/org/gvsig/symbology/app/symbolinstaller/creation/DefaultMakeSymbolPackageWizard.java
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.symbology.app/org.gvsig.symbology.app.symbolinstaller/src/main/java/org/gvsig/symbology/app/symbolinstaller/creation/DefaultMakeSymbolPackageWizard.java	(revision 38607)
+++ branches/v2_0_0_prep/extensions/org.gvsig.symbology.app/org.gvsig.symbology.app.symbolinstaller/src/main/java/org/gvsig/symbology/app/symbolinstaller/creation/DefaultMakeSymbolPackageWizard.java	(revision 38608)
@@ -24,11 +24,10 @@
 
 import java.awt.BorderLayout;
 import java.io.File;
-import java.net.URL;
 
-import javax.swing.ImageIcon;
 import javax.swing.JPanel;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.gui.beans.wizard.WizardPanel;
 import org.gvsig.gui.beans.wizard.WizardPanelActionListener;
 import org.gvsig.gui.beans.wizard.WizardPanelWithLogo;
@@ -62,11 +61,7 @@
     private WizardListenerAdapter wizardListenerAdapter = null;
 
     public DefaultMakeSymbolPackageWizard() throws LocatorException {
-        URL iconURL =
-            getClass().getClassLoader().getResource(
-                "images/makepluginpackageicon.png");
-        ImageIcon icon = new ImageIcon(iconURL);
-        wizardPanelWithLogo = new WizardPanelWithLogo(icon);
+        wizardPanelWithLogo = new WizardPanelWithLogo(IconThemeHelper.getImageIcon("wizard-make-symbol-package"));
 
         setCancelButtonEnabled(true);
         setFinishButtonEnabled(false);
Index: branches/v2_0_0_prep/extensions/org.gvsig.symbology.app/org.gvsig.symbology.app.symbolinstaller/src/main/java/org/gvsig/symbology/app/symbolinstaller/execution/SymbolInstallerExtension.java
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.symbology.app/org.gvsig.symbology.app.symbolinstaller/src/main/java/org/gvsig/symbology/app/symbolinstaller/execution/SymbolInstallerExtension.java	(revision 38607)
+++ branches/v2_0_0_prep/extensions/org.gvsig.symbology.app/org.gvsig.symbology.app.symbolinstaller/src/main/java/org/gvsig/symbology/app/symbolinstaller/execution/SymbolInstallerExtension.java	(revision 38608)
@@ -24,6 +24,7 @@
 
 import java.util.Locale;
 
+import org.gvsig.andami.IconThemeHelper;
 import org.gvsig.andami.plugins.Extension;
 import org.gvsig.andami.ui.ToolsWindowManager;
 import org.gvsig.i18n.Messages;
@@ -39,6 +40,8 @@
         Messages.addResourceFamily("org.gvsig.symbology.app.symbolinstaller.text",
             SymbolInstallerExtension.class.getClassLoader(),
             SymbolInstallerExtension.class.getClass().getName());
+        
+        IconThemeHelper.registerIcon("symbol-installer", "wizard-make-symbol-package", this);
     }
 
     @Override
Index: branches/v2_0_0_prep/extensions/org.gvsig.newlayer.app/org.gvsig.newlayer.app.extension/src/main/resources/config.xml
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.newlayer.app/org.gvsig.newlayer.app.extension/src/main/resources/config.xml	(revision 38607)
+++ branches/v2_0_0_prep/extensions/org.gvsig.newlayer.app/org.gvsig.newlayer.app.extension/src/main/resources/config.xml	(revision 38608)
@@ -8,8 +8,8 @@
 			description=""
 			active="true"
 			priority="1">
-			<menu text="Vista/new_layer"
-				position="30090"
+			<menu text="View/new_layer"
+				position="650200000"
 				action-command="NewLayer"/>				
 		</extension>		
 		<!-- <extension class-name="org.gvsig.newlayer.app.extension.ExporttoTableExtension"
Index: branches/v2_0_0_prep/extensions/org.gvsig.geometrymeasurement.app/org.gvsig.geometrymeasurement.app.extension/src/main/resources/config.xml
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.geometrymeasurement.app/org.gvsig.geometrymeasurement.app.extension/src/main/resources/config.xml	(revision 38607)
+++ branches/v2_0_0_prep/extensions/org.gvsig.geometrymeasurement.app/org.gvsig.geometrymeasurement.app.extension/src/main/resources/config.xml	(revision 38608)
@@ -8,12 +8,13 @@
 		<extension class-name="org.gvsig.geometrymeasurement.app.extension.AreaMeasurementExtension"
 			description="Extension that measures the area of all the polygonos they selected."
             active="true">
-            <menu text="Tabla/area" tooltip="area"
+            <menu text="Table/Add/area" tooltip="area"
                 action-command="AREA"
+                position="500800100"
                 icon="add-area" />
             <tool-bar name="area">
                 <action-tool icon="add-area"
-                    action-command="AREA" tooltip="area"
+                    action-command="AREA" tooltip="area" position="500800100"
                     enable-text="deber�a de estar activada" last="true"/>
             </tool-bar>
 		</extension>	
@@ -21,12 +22,13 @@
 		<extension class-name="org.gvsig.geometrymeasurement.app.extension.PerimeterMeasurementExtension"
            description="Extension that measures the perimeter of all the lines they selected."
             active="true">
-            <menu text="Tabla/perimeter" tooltip="perimeter"
+            <menu text="Table/Add/perimeter" tooltip="perimeter"
                 action-command="PERIMETER"
+                position="500800200"
                 icon="add-perimeter" />
             <tool-bar name="perimeter">
                 <action-tool icon="add-perimeter"
-                    action-command="PERIMETER" tooltip="perimeter"
+                    action-command="PERIMETER" tooltip="perimeter" position="500800200"
                     enable-text="deber�a de estar activada" last="true"/>
             </tool-bar>
         </extension>
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 38607)
+++ branches/v2_0_0_prep/extensions/org.gvsig.hyperlink.app/org.gvsig.hyperlink.app.extension/src/main/resources/config.xml	(revision 38608)
@@ -8,9 +8,9 @@
 			description=""
 			active="true"
 			priority="20">
-			<menu text="Capa/Advanced_Hyperlink" action-command="HYPERLINK" icon="view-hyperlink" position="5040"/>
+			<menu text="View/Hyperlink" action-command="HYPERLINK" icon="view-hyperlink" position="650750000"/>
 			<tool-bar name="View_Tools_Query" position="5">
-				<selectable-tool icon="view-query-link" action-command="HYPERLINK"  tooltip="Advanced_Hyperlink" position="7"/>
+				<selectable-tool icon="view-query-link" action-command="HYPERLINK"  tooltip="Hyperlink" position="650750000"/>
 			</tool-bar>
 		</extension>		
 	</extensions>
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 38607)
+++ 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 38608)
@@ -64,13 +64,8 @@
  */
 public class CircleSelectionListener implements CircleListener {
 
-    /**
-     * 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();
 
+
     /**
      * The cursor used to work with this tool listener.
      * 
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 38607)
+++ branches/v2_0_0_prep/extensions/org.gvsig.selectiontools.app/org.gvsig.selectiontools.app.extension/src/main/resources/config.xml	(revision 38608)
@@ -19,7 +19,7 @@
 				action-command="SELALL"
 				tooltip="select_all_info"
 				icon="selection-select-all"
-				position="0"/>
+				position="300400000"/>
 			<tool-bar name="Tools_Select" position="6">
 				<selectable-tool icon="selection-all" action-command="SELALL" tooltip="select_all_info" position="7"/>
 			</tool-bar>
@@ -32,7 +32,7 @@
 				action-command="SELCIRCLE"
 				tooltip="select_by_circle_info"
 				icon="selection-select-by-circle"
-				position="0"/>
+				position="301000000"/>
 			<tool-bar name="Tools_Select" position="6">
 				<selectable-tool icon="selection-select-by-circle" action-command="SELCIRCLE" tooltip="select_by_circle" position="6"/>
 			</tool-bar>
@@ -45,7 +45,7 @@
 				action-command="SELPOLYLINE"
 				tooltip="select_by_polyline_info"
 				icon="selection-select-by-polyline"
-				position="0"/>
+				position="301300000"/>
 			<tool-bar name="Tools_Select" position="6">
 				<selectable-tool icon="selection-select-by-polyline" action-command="SELPOLYLINE" tooltip="select_by_polyline" position="5"/>
 			</tool-bar>
@@ -59,7 +59,7 @@
 				action-command="SELBUFFER"
 				tooltip="select_by_buffer_info"
 				icon="selection-select-by-buffer"
-				position="0"/>
+				position="300900000"/>
 			<tool-bar name="Tools_Select" position="6">
 				<action-tool icon="selection-select-by-buffer" action-command="SELBUFFER" tooltip="select_by_buffer" position="7"/>
 			</tool-bar>
Index: branches/v2_0_0_prep/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/src/main/resources/config.xml
===================================================================
--- branches/v2_0_0_prep/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/src/main/resources/config.xml	(revision 38607)
+++ branches/v2_0_0_prep/extensions/org.gvsig.annotation.app/org.gvsig.annotation.app.extension/src/main/resources/config.xml	(revision 38608)
@@ -10,8 +10,8 @@
 			description=""
 			active="true"
 			priority="1">
-			<menu text="Capa/export_to_annotation"
-				position="35020"
+			<menu text="Layer/export_to_annotation"
+				position="600550000"
 				action-command="Annotation"/>
 		</extension>	
 		<extension class-name="org.gvsig.annotation.app.extension.AnnotationAboutExtension"
