/ - Diff - Application: gvSIG desktop - gvSIG

Revision 41314

     import java.util.HashSet;
     import java.util.IllegalFormatException;
     import java.util.Iterator;
     import java.util.List;
     import java.util.Locale;
     import java.util.Properties;
     import java.util.Set;
-...
+     *
      */
     public class Messages {
         private static class FamilyDescriptor {
             String family = null;
             ClassLoader loader = null;
             String callerName = null;
             public FamilyDescriptor(String family, ClassLoader loader, String callerName ) {
                 this.family  = family;
                 this.loader = loader;
                 this.callerName = callerName;
+            }
+        }
         private static Logger logger = LoggerFactory.getLogger("Messages");
         private static String _CLASSNAME = "org.gvsig.i18n.Messages";
         private static Locale currentLocale;
         /* Each entry will contain a hashmap with translations. Each hasmap
          * contains the translations for one language, indexed by the
-...
     	private static Set resourceFamilies = new HashSet();
     	private static Set classLoaders = new HashSet();
             private static List familyDescriptors = new ArrayList();
     	/*
     	 * The language considered the origin of translations, which will
     	 * (possibly) be stored in a property file without language suffix
-...
     			logger.warn("There is not preferred languages list. Maybe the Messages class was not initialized");
+    		}
                     familyDescriptors.add( new FamilyDescriptor(family,loader,callerName));
     		resourceFamilies.add(family);
     		classLoaders.add(loader);
-...
     			addResourceFamily(lang, translations, family, loader, callerName);
+    		}
+    	}
     	private static void addResourceFamily(Locale lang, Properties translations,
     			String family, ClassLoader loader, String callerName) {
                     //logger.debug("addResourceFamily "+lang.toString()+", "+family+", "+loader.toString());
     		Properties properties = new Properties();
     		String langCode = lang.toString();
     		String resource = family.replace('.', '/') + "_" + langCode + ".properties";
                     URL resourceURL = loader.getResource(resource);
     		InputStream is = loader.getResourceAsStream(resource);
     		if( is==null && langCode.contains("_") ) {
     			try {
     				langCode = langCode.split("_")[0];
     				resource = family.replace('.', '/') + "_" + langCode + ".properties";
                                     resourceURL = loader.getResource(resource);
     				is = loader.getResourceAsStream(resource);
     				if( is==null ) {
     					resource = family.replace('.', '/') +  ".properties";
                                             resourceURL = loader.getResource(resource);
     					is = loader.getResourceAsStream(resource);
+    				}
     			} catch(Exception ex) {
-...
+    			}
+    		}
                     if( resourceURL!=null && logger.isDebugEnabled() ) {
                         logger.debug("Load resources from '"+resourceURL.toString()+"' with classloader {"+loader.toString()+"}.");
+                    }
     		Enumeration keys = properties.keys();
     		while (keys.hasMoreElements()) {
     			String currentKey = (String) keys.nextElement();
     			if (!translations.containsKey(currentKey)) {
     				translations
     						.put(currentKey, properties.getProperty(currentKey));
     				translations.put(currentKey, properties.getProperty(currentKey));
+    			}
+    		}
-...
     	 * The ArrayList represents an ordered list of preferred locales
     	 */
     	public static void setPreferredLocales(ArrayList preferredLocalesList) {
                     logger.info("setPreferredLocales "+preferredLocalesList.toString());
     		// delete all existing locales
     		Iterator oldLocales = preferredLocales.iterator();
     		while (oldLocales.hasNext()) {
-...
+    		}
+    	}
             public static Locale getCurrentLocale() {
                 return currentLocale;
+            }
             public static void setCurrentLocale(Locale locale) {
                 logger.info("setCurrentLocale "+locale.toString());
                 resourceFamilies = new HashSet();
                 classLoaders = new HashSet();
                 localeResources = new ArrayList();
                 preferredLocales = new ArrayList();
                 addLocale(locale);
                 String localeStr = locale.getLanguage();
                 if ( localeStr.equals("es") || localeStr.equals("ca")
                         || localeStr.equals("gl") || localeStr.equals("eu")
                         || localeStr.equals("va") ) {
                     // prefer Spanish for languages spoken in Spain
                     addLocale(new Locale("es"));
                     addLocale(new Locale("en"));
                 } else {
                     // prefer English for the rest
                     addLocale(new Locale("en"));
                     addLocale(new Locale("es"));
+                }
                 for( int curlocale=0; curlocale<preferredLocales.size(); curlocale++) {
                     for( int curfamily=0; curfamily<familyDescriptors.size(); curfamily++) {
                          FamilyDescriptor family = (FamilyDescriptor) familyDescriptors.get(curfamily);
                          addResourceFamily(
                                  (Locale) preferredLocales.get(curlocale),
                                  (Properties) localeResources.get(curlocale),
                                  family.family,
                                  family.loader,
                                  family.callerName);
+                    }
+                }
                 currentLocale = locale;
                 Locale.setDefault(locale);
+            }
     	/**
     	 * Adds a Locale at the end of the ordered list of preferred locales.
     	 * Note that calling this method does not load any translation, it just
-...
     	 */
     	public static void addLocale(Locale lang) {
     		if (!preferredLocales.contains(lang)) { // avoid duplicates
     				preferredLocales.add(lang); // add the lang to the ordered list of preferred locales
     				Properties dict = new Properties();
     				localeResources.add(dict); // add a hashmap which will contain the translation for this language
                         logger.info("addLocale "+lang.toString());
                         preferredLocales.add(lang); // add the lang to the ordered list of preferred locales
                         Properties dict = new Properties();
                         localeResources.add(dict); // add a hashmap which will contain the translation for this language
+    		}
+    	}

+     *
      * 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
      * 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.
      * MA 02110-1301, USA.
+     *
      * For any additional information, do not hesitate to contact us
      * at info AT gvsig.com, or visit our website www.gvsig.com.
-...
     package org.gvsig.andami.impl;
     import java.io.File;
     import java.lang.reflect.InvocationTargetException;
     import java.util.ArrayList;
     import java.util.Collections;
     import java.util.Enumeration;
     import java.util.Iterator;
     import java.util.List;
     import java.util.Locale;
     import java.util.logging.Level;
     import javax.swing.JComponent;
     import javax.swing.SwingUtilities;
-...
     import org.gvsig.installer.lib.api.PackageInfo;
     import org.gvsig.tools.ToolsLocator;
     import org.gvsig.tools.packageutils.PackageManager;
     import org.gvsig.andami.ui.mdiFrame.MDIFrame;
     import org.slf4j.Logger;
     import org.slf4j.LoggerFactory;
     public class DefaultPluginsManager implements PluginsManager{
     public class DefaultPluginsManager implements PluginsManager {
         private class Task implements Comparable, Runnable {
-...
                         } catch (InterruptedException ex) {
                             // Do nothing
                         } catch (Exception ex) {
                            logger.warn("Errors in execution of "+type+" task '"+name+"'.",ex);
                             logger.warn("Errors in execution of " + type + " task '" + name + "'.", ex);
+                        }
                         return;
+                    }
+                }
                 logger.info("Running "+type+" task '"+name+"' (priority "+priority+").");
                 logger.info("Running " + type + " task '" + name + "' (priority " + priority + ").");
                 try {
                     task.run();
                 } catch(Exception ex) {
                     logger.warn("Errors in execution of "+type+" task '"+name+"'.",ex);
                     logger.info("Terminated " + type + " task '" + name + "'.");
                 } catch (Exception ex) {
                     logger.warn("Errors in execution of " + type + " task '" + name + "'.", ex);
+                }
+            }
+        }
         private static Logger logger =
             LoggerFactory.getLogger(DefaultPluginsManager.class);
     	private List<File> pluginsFolders = null;
     	private List<Task> onStartupTasks = new ArrayList<Task>();
             private List<Task> onShutdownTasks = new ArrayList<Task>();
     	public ExclusiveUIExtension getExclusiveUIExtension() {
     		return PluginServices.getExclusiveUIExtension();
+    	}
         private static Logger logger
                 = LoggerFactory.getLogger(DefaultPluginsManager.class);
     	public IExtension getExtension(Class<? extends IExtension> extension) {
     		return PluginServices.getExtension(extension);
+    	}
         private List<File> pluginsFolders = null;
         private List<Task> startupTasks = new ArrayList<Task>();
         private List<Task> shutdownTasks = new ArrayList<Task>();
     	@SuppressWarnings("unchecked")
     	public Iterator<IExtension> getExtensions() {
     		return PluginServices.getExtensions();
+    	}
         public ExclusiveUIExtension getExclusiveUIExtension() {
             return PluginServices.getExclusiveUIExtension();
+        }
     	/**
     	 * Return the associated pluginServices to the extension class passed as parameter.
+    	 *
     	 */
     	public PluginServices getPlugin(Class<? extends IExtension> extension) {
                 String pluginName = ((PluginClassLoader)extension.getClassLoader()).getPluginName();
                 return  this.getPlugin(pluginName);
+    	}
         public IExtension getExtension(Class<? extends IExtension> extension) {
             return PluginServices.getExtension(extension);
+        }
     	public PluginServices getPlugin(Object obj) {
                 if( obj instanceof IExtension ) {
                     Class<? extends IExtension> klass = (Class<? extends IExtension>) obj.getClass();
                     return this.getPlugin(klass);
+                }
                 PluginClassLoader loader = (PluginClassLoader) obj.getClass().getClassLoader();
                 String pluginName = loader.getPluginName();
                 return this.getPlugin(pluginName);
+    	}
         @SuppressWarnings("unchecked")
         public Iterator<IExtension> getExtensions() {
             return PluginServices.getExtensions();
+        }
             public PluginServices getPlugin(String pluginName) {
     		return Launcher.getPluginServices(pluginName);
+    	}
         /**
          * Return the associated pluginServices to the extension class passed as
          * parameter.
+         *
          */
         public PluginServices getPlugin(Class<? extends IExtension> extension) {
             String pluginName = ((PluginClassLoader) extension.getClassLoader()).getPluginName();
             return this.getPlugin(pluginName);
+        }
     	public PackageInfo getPackageInfo(Class<? extends IExtension> extension) {
     	    PackageManager pkgmgr = ToolsLocator.getPackageManager();
         public PluginServices getPlugin(Object obj) {
             if ( obj instanceof IExtension ) {
                 Class<? extends IExtension> klass = (Class<? extends IExtension>) obj.getClass();
                 return this.getPlugin(klass);
+            }
             PluginClassLoader loader = (PluginClassLoader) obj.getClass().getClassLoader();
             String pluginName = loader.getPluginName();
             return this.getPlugin(pluginName);
+        }
         public PluginServices getPlugin(String pluginName) {
             return Launcher.getPluginServices(pluginName);
+        }
         public PackageInfo getPackageInfo(Class<? extends IExtension> extension) {
             PackageManager pkgmgr = ToolsLocator.getPackageManager();
             File pinfo_file = new File(this.getPlugin(extension).getPluginDirectory(), "package.info");
             PackageInfo packageInfo = null;
             try {
                 packageInfo = pkgmgr.createPackageInfo(pinfo_file);
             } catch (Exception e) {
     			logger.info("Error while reading package info file from "
     					+ pinfo_file.toString(), e);
                 logger.info("Error while reading package info file from "
                         + pinfo_file.toString(), e);
+            }
             return packageInfo;
+    	}
     	public PackageInfo getPackageInfo(String pluginName) {
     		PackageManager pkgmgr = ToolsLocator.getPackageManager();
     		File pinfo_file = new File(this.getPlugin(pluginName)
     				.getPluginDirectory(), "package.info");
+        }
     		PackageInfo packageInfo = null;
     		try {
     			packageInfo = pkgmgr.createPackageInfo(pinfo_file);
     		} catch (Exception e) {
     			logger.info("Error while reading package info file from "
     					+ pinfo_file.toString(), e);
+    		}
     		return packageInfo;
+    	}
     	public PackageInfo getPackageInfo() {
     		PackageManager pkgmgr = ToolsLocator.getPackageManager();
     		File pinfo_file = new File(
     			    this.getApplicationFolder(), "package.info");
     		PackageInfo packageInfo = null;
     		try {
     			packageInfo = pkgmgr.createPackageInfo(pinfo_file);
     		} catch (Exception e) {
     			logger.info("Error while reading package info file from "
     					+ pinfo_file.toString(), e);
+    		}
     		return packageInfo;
+    	}
     	@SuppressWarnings("unchecked")
     	public List<PluginServices> getPlugins() {
     		List<PluginServices> pluginServices = new ArrayList<PluginServices>();
     		AndamiConfig config = Launcher.getAndamiConfig();
     		Enumeration<Plugin> plugins = config.enumeratePlugin();
     		while( plugins.hasMoreElements()) {
     			Plugin plugin =   plugins.nextElement();
     			pluginServices.add(PluginServices.getPluginServices(plugin.getName()));
+    		}
     		return pluginServices;
+    	}
         public PackageInfo getPackageInfo(String pluginName) {
             PackageManager pkgmgr = ToolsLocator.getPackageManager();
             File pinfo_file = new File(this.getPlugin(pluginName)
                     .getPluginDirectory(), "package.info");
     	public void setExclusiveUIExtension(ExclusiveUIExtension extension) {
     		PluginServices.setExclusiveUIExtension(extension);
+    	}
             PackageInfo packageInfo = null;
             try {
                 packageInfo = pkgmgr.createPackageInfo(pinfo_file);
             } catch (Exception e) {
                 logger.info("Error while reading package info file from "
                         + pinfo_file.toString(), e);
+            }
             return packageInfo;
+        }
     	public String getText(Object obj, String msg) {
     	    return PluginServices.getText(obj, msg);
+    	}
     	public String translate(String msg) {
     	    return org.gvsig.i18n.Messages.translate(msg);
+    	}
         public PackageInfo getPackageInfo() {
             PackageManager pkgmgr = ToolsLocator.getPackageManager();
             File pinfo_file = new File(
                     this.getApplicationFolder(), "package.info");
             PackageInfo packageInfo = null;
             try {
                 packageInfo = pkgmgr.createPackageInfo(pinfo_file);
             } catch (Exception e) {
                 logger.info("Error while reading package info file from "
                         + pinfo_file.toString(), e);
+            }
             return packageInfo;
+        }
         @SuppressWarnings("unchecked")
         public List<PluginServices> getPlugins() {
             List<PluginServices> pluginServices = new ArrayList<PluginServices>();
             AndamiConfig config = Launcher.getAndamiConfig();
             Enumeration<Plugin> plugins = config.enumeratePlugin();
             while ( plugins.hasMoreElements() ) {
                 Plugin plugin = plugins.nextElement();
                 pluginServices.add(PluginServices.getPluginServices(plugin.getName()));
+            }
             return pluginServices;
+        }
         public void setExclusiveUIExtension(ExclusiveUIExtension extension) {
             PluginServices.setExclusiveUIExtension(extension);
+        }
         public String getText(Object obj, String msg) {
             return PluginServices.getText(obj, msg);
+        }
         public String translate(String msg) {
             return org.gvsig.i18n.Messages.translate(msg);
+        }
         public File getApplicationFolder() {
         	return Launcher.getApplicationFolder();
             return Launcher.getApplicationFolder();
+        }
     	/**
     	 * @deprecated use {@link #getPluginsFolders()}
     	 */
         /**
          * @deprecated use {@link #getPluginsFolders()}
          */
         public File getPluginsDirectory() {
             return getPluginsFolder();
+        }
     	/**
     	 * @deprecated use {@link #getPluginsFolders()}
     	 */
         /**
          * @deprecated use {@link #getPluginsFolders()}
          */
         public File getPluginsFolder() {
         	List<File> l = this.getPluginsFolders();
         	if( l==null || l.size()<1 ) {
         		return null;
+        	}
         	return l.get(0);
             List<File> l = this.getPluginsFolders();
             if ( l == null || l.size() < 1 ) {
                 return null;
+            }
             return l.get(0);
+        }
         public List<File> getPluginsFolders() {
         	if( this.pluginsFolders!=null ) {
         		return this.pluginsFolders;
+        	}
         	String folder = "gvSIG/extensiones";
         	if( !(Launcher.getAndamiConfig() == null || Launcher.getAndamiConfig().getPluginsDirectory()==null) ) {
         		folder = Launcher.getAndamiConfig().getPluginsDirectory();
+        	}
             if ( this.pluginsFolders != null ) {
                 return this.pluginsFolders;
+            }
             String folder = "gvSIG/extensiones";
             if ( !(Launcher.getAndamiConfig() == null || Launcher.getAndamiConfig().getPluginsDirectory() == null) ) {
                 folder = Launcher.getAndamiConfig().getPluginsDirectory();
+            }
             this.pluginsFolders = new ArrayList<File>();
             this.pluginsFolders.add(new File(getApplicationFolder(), folder));
             return this.pluginsFolders;
-...
+        }
         public void addStartupTask(String name, Runnable task, boolean in_event_thread, int priority) {
             this.onStartupTasks.add( new Task("startup", name, task, in_event_thread, priority));
             this.startupTasks.add(new Task("startup", name, task, in_event_thread, priority));
+        }
         public void addShutdownTask(String name, Runnable task, boolean in_event_thread, int priority) {
             this.onShutdownTasks.add( new Task("shutdown",name, task, in_event_thread, priority));
             this.shutdownTasks.add(new Task("shutdown", name, task, in_event_thread, priority));
+        }
         public void executeStartupTasks() {
-...
                 public void run() {
                     try {
                         Thread.sleep(1000);
                     } catch (Exception exc) {
                     } catch (Exception exc) {
                         // Ignore error
+                    }
                     Collections.sort(onStartupTasks);
                     for( int i=onStartupTasks.size()-1; i>=0; i--) {
                         Task task = onStartupTasks.get(i);
                     Collections.sort(startupTasks);
                     for ( int i = startupTasks.size() - 1; i >= 0; i-- ) {
                         Task task = startupTasks.get(i);
                         task.run();
+                    }
+                }
             });
             th.start();
+        }
         public void executeShutdownTasks() {
             logger.info("Executing shutdown tasks.");
             Collections.sort(onShutdownTasks);
             for( int i=onShutdownTasks.size()-1; i>=0; i--) {
                 Task task = onShutdownTasks.get(i);
             Collections.sort(shutdownTasks);
             for ( int i = shutdownTasks.size() - 1; i >= 0; i-- ) {
                 Task task = shutdownTasks.get(i);
                 task.run();
+            }
+        }
         public File getApplicationI18nFolder() {
             return new File(this.getApplicationFolder(),"i18n");
             return new File(this.getApplicationFolder(), "i18n");
+        }
         public Locale getCurrentLocale() {
             return org.gvsig.i18n.Messages.getCurrentLocale();
+        }
         public void setCurrentLocale(final Locale locale) {
             org.gvsig.i18n.Messages.setCurrentLocale(locale);
             AndamiConfig config = Launcher.getAndamiConfig();
             config.setLocaleLanguage(locale.getLanguage());
             config.setLocaleCountry(locale.getCountry());
             config.setLocaleVariant(locale.getVariant());
             if( !SwingUtilities.isEventDispatchThread() ) {
                 try {
                     SwingUtilities.invokeAndWait(new Runnable() {
                         public void run() {
                             try {
                                 JComponent.setDefaultLocale(locale);
                             } catch (Exception ex) {
                                 // Do nothing
+                            }
                             MDIFrame.getInstance().setLocale(locale);
+                        }
                     });
                 } catch (Exception ex) {
                     // Ignore
+                }
+            }
+        }
+    }

     import java.util.Map;
     import javax.swing.ImageIcon;
     import javax.swing.UIManager;
     import org.apache.commons.io.IOUtils;
     import org.apache.commons.lang.text.StrSubstitutor;
     import org.apache.commons.lang3.StringUtils;
     import org.gvsig.andami.Launcher;
     import org.gvsig.andami.PluginServices;
-...
         private static final String PRIORITY = "priority";
         private static final String VALUE = "value";
         private static final String BACKGROUND_IMAGE = "BackgroundImage";
         private static final String BACKGROUND_COLOR = "BackgroundColor";
         private static final String WALLPAPER_TYPE = "WallpaperType";
         private static final String VERSION = "version";
-...
         private ArrayList<String> fontpositionsY = new ArrayList<String>();
         private String name = null;
         private String backgroundimage;
         private String backgroundimage = null;
         private Color backgroundColor = null;
         private String wallpaperType = CENTERED;
         private int priority = 0;
-...
         private StrSubstitutor strSubstitutor = null;
         public Theme() {
+        }
         public Theme(Map vars) {
             this();
             this.strSubstitutor = new StrSubstitutor(vars);
+        }
-...
             FileInputStream fis = null;
             try {
                 String encoding = XMLUtils.getEncoding(file, "UTF-8");
                 fis = new FileInputStream(file);
                 KXmlParser parser = new KXmlParser();
                 parser.setInput(fis, encoding);
-...
                                         if ( parser.getName().compareTo(BACKGROUND_IMAGE) == 0 ) {
                                             backgroundimage = fixPath(file, parser.getAttributeValue("", PATH));
                                             tag = parser.next();
                                         } else if ( parser.getName().compareTo(BACKGROUND_COLOR) == 0 ) {
                                             backgroundColor = parseColor(parser.getAttributeValue("", "color"));
                                             tag = parser.next();
                                         } else if ( parser.getName().compareTo(ICON) == 0 ) {
                                             icon = fixPath(file, parser.getAttributeValue("", PATH));
                                             tag = parser.next();
-...
                                 String s = parser.getAttributeValue("", VALUE);
                                 try {
                                     this.priority = Integer.parseInt(s);
                                 } catch(Exception ex) {
                                 } catch (Exception ex) {
                                     this.priority = 0;
+                                }
                                 tag = parser.next();
-...
+            }
+        }
         public Color getBackgroundColor() {
             if ( this.backgroundColor == null ) {
                 this.backgroundColor = (Color) UIManager.get("Desktop.background");
+            }
             return this.backgroundColor;
+        }
         /**
          * Return the time of the splash images.
+         *
-...
             for ( int i = 0; i < colors.length; i++ ) {
                 try {
                     String s = fontColors.get(i);
                     String[] rgb = s.split(",");
                     colors[i] = new Color(Integer.valueOf(rgb[0]), Integer.valueOf(rgb[1]), Integer.valueOf(rgb[2]));
                     colors[i] = parseColor(s);
                 } catch (Exception e) {
                     NotificationManager.addInfo(PluginServices.getText(this, "incorrect_color"), e);
+                }
-...
             return colors;
+        }
         private Color parseColor(String s) {
             if ( StringUtils.isEmpty(s) ) {
                 return null;
+            }
             String[] rgb = s.split(",");
             Color color = new Color(Integer.valueOf(rgb[0]), Integer.valueOf(rgb[1]), Integer.valueOf(rgb[2]));
             return color;
+        }
         private String expand(String value) {
             if ( this.strSubstitutor == null ) {
                 return value;
+            }
             return strSubstitutor.replace(value);
+        }
         public int getPriority() {
             return this.priority;
+        }

+     *
      * 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
      * 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.
      * MA 02110-1301, USA.
+     *
      * For any additional information, do not hesitate to contact us
      * at info AT gvsig.com, or visit our website www.gvsig.com.
-...
     import javax.swing.Action;
     import javax.swing.Icon;
     import org.gvsig.andami.ui.mdiFrame.TranslatableButtonHelper.TranslatableButton;
     public class JToolBarToggleButton extends javax.swing.JToggleButton implements EnableTextSupport{
     	/**
+    	 *
     	 */
     	public JToolBarToggleButton() {
     		super();
     		// TODO Auto-generated constructor stub
+    	}
     	/**
     	 * @param text
     	 */
     	public JToolBarToggleButton(String text) {
     		super(text);
     		// TODO Auto-generated constructor stub
+    	}
     	/**
     	 * @param text
     	 * @param selected
     	 */
     	public JToolBarToggleButton(String text, boolean selected) {
     		super(text, selected);
     		// TODO Auto-generated constructor stub
+    	}
     	/**
     	 * @param text
     	 * @param icon
     	 */
     	public JToolBarToggleButton(String text, Icon icon) {
     		super(text, icon);
     		// TODO Auto-generated constructor stub
+    	}
     	/**
     	 * @param text
     	 * @param icon
     	 * @param selected
     	 */
     	public JToolBarToggleButton(String text, Icon icon, boolean selected) {
     		super(text, icon, selected);
     		// TODO Auto-generated constructor stub
+    	}
     	/**
     	 * @param a
     	 */
     	public JToolBarToggleButton(Action a) {
     		super(a);
     		// TODO Auto-generated constructor stub
+    	}
     	/**
     	 * @param icon
     	 */
     	public JToolBarToggleButton(Icon icon) {
     		super(icon);
     		// TODO Auto-generated constructor stub
+    	}
     	/**
     	 * @param icon
     	 * @param selected
     	 */
     	public JToolBarToggleButton(Icon icon, boolean selected) {
     		super(icon, selected);
     		// TODO Auto-generated constructor stub
+    	}
     	private String enableText;
     	private String toolTip;
     	/**
     	 * @return Returns the enableText.
     	 */
     	public String getEnableText() {
     		return enableText;
+    	}
     	/**
     	 * @param enableText The enableText to set.
     	 */
     	public void setEnableText(String enableText) {
     		this.enableText = enableText;
+    	}
     	/**
     	 * @see java.awt.Component#setVisible(boolean)
     	 */
     	public void setEnabled(boolean aFlag) {
     		super.setEnabled(aFlag);
     		if (aFlag){
     			setToolTipText(toolTip);
     		}else{
     			setToolTipText(enableText);
+    		}
+    	}
     	/**
     	 * @see javax.swing.JComponent#setToolTipText(java.lang.String)
     	 */
     	public void setToolTip(String text) {
     		toolTip = text;
+    	}
     public class JToolBarToggleButton extends javax.swing.JToggleButton implements EnableTextSupport, TranslatableButton {
         private TranslatableButtonHelper i18nHelper = new TranslatableButtonHelper();
         private String enableText;
         private String toolTip;
         public JToolBarToggleButton() {
             super();
+        }
         public JToolBarToggleButton(String text) {
             super(text);
+        }
         public JToolBarToggleButton(String text, boolean selected) {
             super(text, selected);
+        }
         public JToolBarToggleButton(String text, Icon icon) {
             super(text, icon);
+        }
         public JToolBarToggleButton(String text, Icon icon, boolean selected) {
             super(text, icon, selected);
+        }
         public JToolBarToggleButton(Action a) {
             super(a);
+        }
         public JToolBarToggleButton(Icon icon) {
             super(icon);
+        }
         public JToolBarToggleButton(Icon icon, boolean selected) {
             super(icon, selected);
+        }
         /**
          * @return Returns the enableText.
          */
         public String getEnableText() {
             return enableText;
+        }
         /**
          * @param enableText The enableText to set.
          */
         public void setEnableText(String enableText) {
             this.enableText = enableText;
+        }
         public void setEnabled(boolean aFlag) {
             super.setEnabled(aFlag);
             if ( aFlag ) {
                 setToolTipText(toolTip);
             } else {
                 setToolTipText(enableText);
+            }
+        }
         public void setToolTip(String text) {
             toolTip = text;
+        }
         public void setToolTipKey(String key) {
             this.i18nHelper.setTooltip(key);
+        }
         public void setTextKey(String key) {
             this.i18nHelper.setText(key);
+        }
         public void translate() {
             if ( this.i18nHelper.needTranslation() ) {
                 this.i18nHelper.translate();
                 this.setText(this.i18nHelper.getText());
                 this.setToolTip(this.i18nHelper.getTooltip());
+            }
+        }
+    }

+     *
      * 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
      * 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.
      * MA 02110-1301, USA.
+     *
      * For any additional information, do not hesitate to contact us
      * at info AT gvsig.com, or visit our website www.gvsig.com.
-...
     import java.util.HashMap;
     import java.util.Iterator;
     import java.util.List;
     import java.util.Locale;
     import java.util.Map;
     import java.util.Map.Entry;
     import java.util.NoSuchElementException;
     import java.util.StringTokenizer;
     import java.util.Vector;
-...
     import javax.swing.AbstractButton;
     import javax.swing.ButtonGroup;
     import javax.swing.ImageIcon;
     import javax.swing.JButton;
     import javax.swing.JComponent;
     import javax.swing.JFileChooser;
     import javax.swing.JFrame;
-...
     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.plugins.config.generate.SelectableTool;
     import org.gvsig.andami.plugins.config.generate.SkinExtensionType;
     import org.gvsig.andami.plugins.config.generate.ToolBar;
     import org.gvsig.andami.ui.mdiFrame.TranslatableButtonHelper.TranslatableButton;
     import org.gvsig.andami.ui.mdiManager.MDIManager;
     import org.gvsig.andami.ui.mdiManager.MDIManagerFactory;
     import org.gvsig.gui.beans.controls.IControl;
-...
     /**
      * Main application window.
+     *
+     *
      * Use Launcher.getMDIFrame to get the instance of this class.
+     *
      * @version $Revision: 39484 $
      */
     @SuppressWarnings("unchecked")
     public class MDIFrame extends JFrame implements ComponentListener,
         ContainerListener, ActionListener, MainFrame {
             ContainerListener, ActionListener, MainFrame {
         private static final long serialVersionUID = -2472484309160847654L;
         private static Logger logger = LoggerFactory.getLogger(MDIFrame.class);
         private static MDIFrame instance = null;
         private MDIManager mdiManager = MDIManagerFactory.createManager();
         /** Elementos de la aplicaci�n */
         /**
          * Elementos de la aplicaci�n
          */
         private JMenuBar menuBar = new JMenuBar();
         /** Panel which contains the toolbars */
         /**
          * Panel which contains the toolbars
          */
         private JPanel toolBars = new JPanel();
         /** Status bar */
         /**
          * Status bar
          */
         private NewStatusBar bEstado = null;
         /** Asocia los nombres con las barras de herramientas */
         /**
          * Asocia los nombres con las barras de herramientas
          */
         private HashMap toolBarMap = new HashMap();
         /** Almacena los grupos de selectableTools */
         /**
          * Almacena los grupos de selectableTools
          */
         private HashMap buttonGroupMap = new HashMap();
         /**
          * Stores the initially selected tools.
-...
         // this should be the same value defined at plugin-config.xsd
         private String defaultGroup = "unico";
         /** Asocia los nombres con los popupMenus */
         /**
          * Asocia los nombres con los popupMenus
          */
         private HashMap popupMap = new HashMap();
         /** Asocia controles con la clase de la extension asociada */
         private HashMap controlClass = new HashMap();
         /**
          * Asocia controles con la clase de la extension asociada
          */
         private List<JComponent> controls = new ArrayList<JComponent>();
         /**
          * Asocia la informaci�n sobre las etiquetas que van en la status bar con
-...
         private HashMap classLabels = new HashMap();
         // private HashMap classControls = new HashMap();
         /** ProgressListeners (ver interfaz com.iver.mdiApp.ui.ProgressListener) */
         /**
          * ProgressListeners (ver interfaz com.iver.mdiApp.ui.ProgressListener)
          */
         private ArrayList progressListeners = new ArrayList();
         /** Timer para invocar los enventos de la interfaz anterior */
     	private Timer progressTimer = null;
         /**
          * Timer para invocar los enventos de la interfaz anterior
          */
         private Timer progressTimer = null;
         /** Tabla hash que asocia las clases con las extensiones */
         private Map classesExtensions = new HashMap<Class<? extends IExtension>, ExtensionDecorator>();
         /** �ltima clase que activ� etiquetas */
         /**
          * Tabla hash que asocia las clases con las extensiones
          */
         // private Map classesExtensions = new HashMap<Class<? extends IExtension>, ExtensionDecorator>();
         /**
          * �ltima clase que activ� etiquetas
          */
         private Class lastLabelClass;
         /** Instancia que pone los tooltip en la barra de estado */
         /**
          * Instancia que pone los tooltip en la barra de estado
          */
         private TooltipListener tooltipListener = new TooltipListener();
     	private HashMap infoCodedMenus = new HashMap();
         private HashMap infoCodedMenus = new HashMap();
         private String titlePrefix;
         private static final String noIcon = "no-icon";
         private MDIFrame() {
+        }
         public static MDIFrame getInstance() {
             if ( instance == null ) {
                 instance = new MDIFrame();
+            }
             return instance;
+        }
         /**
          * Makes some initialization tasks.
+         *
+         *
          * @throws RuntimeException
          *             DOCUMENT ME!
          */
         public void init() {
         	JPopupMenu.setDefaultLightWeightPopupEnabled(false);
             if (!SwingUtilities.isEventDispatchThread()) {
             JPopupMenu.setDefaultLightWeightPopupEnabled(false);
             if ( !SwingUtilities.isEventDispatchThread() ) {
                 throw new RuntimeException("Not Event Dispatch Thread");
+            }
             // Se a�aden los listeners del JFrame
             // Se a?aden los listeners del JFrame
             this.addWindowListener(new WindowAdapter() {
                 @Override
-...
             this.getContentPane().setLayout(new BorderLayout());
             /*
              * Se configura y se a�ade el JPanel de las barras de
              * Se configura y se a?ade el JPanel de las barras de
              * herramientas
              */
             FlowLayout layout = new FlowLayout(FlowLayout.LEFT);
-...
             toolBars.setLayout(layout);
             getContentPane().add(toolBars, BorderLayout.PAGE_START);
             // Se a�ade la barra de estado a la aplicaci�n
             // Add the status bar of the application
             bEstado = new NewStatusBar();
             bEstado.message(Messages.getString("StatusBar.Aplicacion_iniciada"), JOptionPane.INFORMATION_MESSAGE);
             getContentPane().add(bEstado, BorderLayout.SOUTH);
-...
              * afterwards
              */
             setSize(
                 MainFrame.MAIN_FRAME_SIZE_DEFAULT[0],
                 MainFrame.MAIN_FRAME_SIZE_DEFAULT[1]);
                     MainFrame.MAIN_FRAME_SIZE_DEFAULT[0],
                     MainFrame.MAIN_FRAME_SIZE_DEFAULT[1]);
             setLocation(
                 MainFrame.MAIN_FRAME_POS_DEFAULT[0],
                 MainFrame.MAIN_FRAME_POS_DEFAULT[1]);
                     MainFrame.MAIN_FRAME_POS_DEFAULT[0],
                     MainFrame.MAIN_FRAME_POS_DEFAULT[1]);
             setExtendedState(
                 MainFrame.MAIN_FRAME_EXT_STATE_DEFAULT);
                     MainFrame.MAIN_FRAME_EXT_STATE_DEFAULT);
             mdiManager.init(this);
             /*
              * pack() would resize the main frame
+             *
              */
             // pack();
+        }
         /*
          * (non-javadoc)
+         *
          * @see java.awt.Frame.setTitle(String title)
          */
         @Override
         public void setTitle(final String title) {
             if (!SwingUtilities.isEventDispatchThread()) {
             if ( !SwingUtilities.isEventDispatchThread() ) {
                 SwingUtilities.invokeLater(new Runnable() {
                     public void run() {
                     	setTitle(title);
                         setTitle(title);
+                    }
                 });
                 return;
-...
             super.setTitle(titlePrefix + " : " + title);
+        }
         /**
          * A�ade un modo de operaci�n a la caja de herramientas
+         *
          * @param ext
          *            Texto del boton, si es null no aparece texto
          * @param ext
          *            Icono del boton, si es null no aparece icono
          * @param ext
          *            Extensi�n asociada al control
          * @param selectableTool
          *            Enable text del control
+         *
          * @throws ClassNotFoundException
          * @throws RuntimeException
          *             DOCUMENT ME!
          */
         public void addTool(PluginClassLoader loader, SkinExtensionType ext,
             ToolBar toolBar, SelectableTool selectableTool)
             throws ClassNotFoundException {
             if (!SwingUtilities.isEventDispatchThread()) {
                 throw new RuntimeException("No Event Dispatch Thread");
         public void addTool(final PluginClassLoader loader, final SkinExtensionType ext,
                 final ToolBar toolBar, final SelectableTool selectableTool)
                 throws ClassNotFoundException {
             if ( !SwingUtilities.isEventDispatchThread() ) {
                 try {
                     SwingUtilities.invokeAndWait(new Runnable() {
                         public void run() {
                             try {
                                 addTool(loader, ext, toolBar, selectableTool);
                             } catch (ClassNotFoundException ex) {
                                 logger.warn("??? Eehh????", ex);
+                            }
+                        }
                     });
                 } catch (Exception ex) {
                     // Do nothing
+                }
                 return;
+            }
             Class<? extends IExtension> classExtension = (Class<? extends IExtension>) loader.loadClass(ext.getClassName());
             // Para traducir
             PluginServices ps =
                 PluginServices.getPluginServices(loader.getPluginName());
             I18nManager i18nManager = ToolsLocator.getI18nManager();
             JToolBarToggleButton btn;
             ImageIcon image =
                 PluginServices.getIconTheme().get(selectableTool.getIcon());
             ImageIcon image
                     = PluginServices.getIconTheme().get(selectableTool.getIcon());
             if (image != null) {
             if ( image != null ) {
                 btn = new JToolBarToggleButton(selectableTool.getText(), image);
             } else {
                 logger.error(PluginServices.getText(this, "Unable_to_find_icon")
                     + ": " + selectableTool.getIcon());
                 btn =
                     new JToolBarToggleButton(selectableTool.getText(),
                         PluginServices.getIconTheme().get(noIcon));
                 logger.warn("Unable to find icon '" + selectableTool.getIcon() + "'.");
                 btn
                         = new JToolBarToggleButton(selectableTool.getText(),
                                 PluginServices.getIconTheme().get(noIcon));
+            }
             org.gvsig.andami.ui.mdiFrame.ToggleButtonModel buttonModel =
                 new org.gvsig.andami.ui.mdiFrame.ToggleButtonModel();
             org.gvsig.andami.ui.mdiFrame.ToggleButtonModel buttonModel
                     = new org.gvsig.andami.ui.mdiFrame.ToggleButtonModel();
             btn.setModel(buttonModel);
             btn.setMargin(new Insets(0, 0, 0, 0));
             btn.addMouseListener(tooltipListener);
-...
             SelectableToolBar jtb = (SelectableToolBar) toolBarMap.get(name);
             if (jtb == null) {
             if ( jtb == null ) {
                 jtb = new SelectableToolBar(name);
                 jtb.setRollover(true);
                 jtb.setAndamiVisibility(toolBar.getIsVisible());
-...
+            }
             ButtonGroup group;
             if (buttonGroupMap.containsKey(selectableTool.getGroup())) {
             if ( buttonGroupMap.containsKey(selectableTool.getGroup()) ) {
                 group = (ButtonGroup) buttonGroupMap.get(selectableTool.getGroup());
             } else {
                 group = new ButtonGroup();
-...
             jtb.addButton(group, btn);
             buttonModel.setGroupName(selectableTool.getGroup());
             if (selectableTool.getIsDefault()) {
             if ( selectableTool.getIsDefault() ) {
                 btn.setSelected(true);
                 initialSelectedTools.put(selectableTool.getGroup(),
                     btn.getActionCommand());
                         btn.getActionCommand());
+            }
             controlClass.put(btn, classExtension);
             addControl(btn);
             if (selectableTool.getName() != null) {
             if ( selectableTool.getName() != null ) {
                 btn.setName(selectableTool.getName());
+            }
             if (selectableTool.getTooltip() != null) {
                 btn.setToolTip(ps.getText(selectableTool.getTooltip()));
             if ( selectableTool.getTooltip() != null ) {
                 btn.setToolTip(i18nManager.getTranslation(selectableTool.getTooltip()));
                 btn.setToolTipKey(selectableTool.getTooltip());
+            }
             if (selectableTool.getEnableText() != null) {
                 btn.setEnableText(ps.getText(selectableTool.getEnableText()));
             if ( selectableTool.getEnableText() != null ) {
                 btn.setEnableText(i18nManager.getTranslation(selectableTool.getEnableText()));
+            }
             if (selectableTool.getLast() == true) {
             if ( selectableTool.getLast() == true ) {
                 jtb.addSeparator();
+            }
+        }
         /**
          * A�ade un bot�n a la barra de herramientas
+         *
          * Add a button to the toolbar.
+         *
          * @param ext
          *            Texto del boton, si es null no aparece texto
          * Texto del boton, si es null no aparece texto
          * @param ext
          *            Extensi�n asociada al control
          * Extension asociada al control
          * @param toolBar
          *            Icono del boton, si es null no aparece texto
          * Icono del boton, si es null no aparece texto
          * @param actionTool
          *            Tooltip de la barra de herramientas
+         *
          * Tooltip de la barra de herramientas
+         *
          * @throws ClassNotFoundException
          * @throws RuntimeException
          *             DOCUMENT ME!
          */
         public void addTool(PluginClassLoader loader, SkinExtensionType ext,
             ToolBar toolBar, ActionTool actionTool) throws ClassNotFoundException {
             if (!SwingUtilities.isEventDispatchThread()) {
                 throw new RuntimeException("No Event Dispatch Thread");
         public void addTool(final PluginClassLoader loader, final SkinExtensionType ext,
                 final ToolBar toolBar, final ActionTool actionTool) throws ClassNotFoundException {
             if ( !SwingUtilities.isEventDispatchThread() ) {
                 try {
                     SwingUtilities.invokeAndWait(new Runnable() {
                         public void run() {
                             try {
                                 addTool(loader, ext, toolBar, actionTool);
                             } catch (ClassNotFoundException ex) {
                                 logger.warn("??? Eehh????", ex);
+                            }
+                        }
                     });
                 } catch (Exception ex) {
                     // Do nothing
+                }
                 return;
+            }
             Class<? extends IExtension> classExtension = (Class<? extends IExtension>) loader.loadClass(ext.getClassName());
             // Para traducir los textos que vengan
             PluginServices ps =
                 PluginServices.getPluginServices(loader.getPluginName());
             I18nManager i18nManager = ToolsLocator.getI18nManager();
             JToolBarButton btn;
             ImageIcon image = IconThemeHelper.getImageIcon(actionTool.getIcon());
             if (image != null) {
             if ( image != null ) {
                 btn = new JToolBarButton(actionTool.getText(), image);
             } else {
                 logger.error(PluginServices.getText(this, "Unable_to_find_icon")
                     + ": " + actionTool.getIcon());
                 btn =
                     new JToolBarButton(actionTool.getText(), PluginServices
                         .getIconTheme().get(noIcon));
                 logger.warn("Unable to find icon '" + actionTool.getIcon() + "'.");
                 btn
                         = new JToolBarButton(actionTool.getText(), PluginServices
                                 .getIconTheme().get(noIcon));
+            }
             btn.setMargin(new Insets(0, 0, 0, 0));
-...
             SelectableToolBar jtb = (SelectableToolBar) toolBarMap.get(name);
             if (jtb == null) {
             if ( jtb == null ) {
                 jtb = new SelectableToolBar(name);
                 jtb.setRollover(true);
                 jtb.setAndamiVisibility(toolBar.getIsVisible());
-...
             jtb.add(btn);
             controlClass.put(btn, classExtension);
             addControl(btn);
             if (actionTool.getName() != null) {
             if ( actionTool.getName() != null ) {
                 btn.setName(actionTool.getName());
+            }
             if (actionTool.getTooltip() != null) {
                 btn.setToolTip(ps.getText(actionTool.getTooltip()));
             if ( actionTool.getTooltip() != null ) {
                 btn.setToolTip(i18nManager.getTranslation(actionTool.getTooltip()));
                 btn.setToolTipKey(actionTool.getTooltip());
+            }
             if (actionTool.getEnableText() != null) {
                 btn.setEnableText(ps.getText(actionTool.getEnableText()));
             if ( actionTool.getEnableText() != null ) {
                 btn.setEnableText(i18nManager.getTranslation(actionTool.getEnableText()));
+            }
             if (actionTool.getLast() == true) {
             if ( actionTool.getLast() == true ) {
                 jtb.addSeparator();
+            }
+        }
     	public void addTool(final ActionInfo action, final String toolBarName) {
     		I18nManager i18nManager = ToolsLocator.getI18nManager();
         public void addTool(final ActionInfo action, final String toolBarName) {
             I18nManager i18nManager = ToolsLocator.getI18nManager();
     		if (!SwingUtilities.isEventDispatchThread()) {
     			SwingUtilities.invokeLater(new Runnable() {
     				public void run() {
     					addTool(action, toolBarName);
+    				}
     			});
     			return;
+    		}
     		JToolBarButton btn = new JToolBarButton(action.getIcon());
     		btn.setMargin(new Insets(0, 0, 0, 0));
     		btn.addMouseListener(tooltipListener);
     		btn.addActionListener(this);
     		btn.setFocusable(false);
     		btn.setActionCommand(action.getCommand());
     		btn.setEnabled(false);
     		btn.setVisible(false);
     		btn.setName(action.getName());
     		if (action.getTooltip() != null) {
     			btn.setToolTip(i18nManager.getTranslation(action.getTooltip()));
+    		}
             if ( !SwingUtilities.isEventDispatchThread() ) {
                 SwingUtilities.invokeLater(new Runnable() {
                     public void run() {
                         addTool(action, toolBarName);
+                    }
                 });
                 return;
+            }
             JToolBarButton btn = new JToolBarButton(action.getIcon());
             btn.setMargin(new Insets(0, 0, 0, 0));
             btn.addMouseListener(tooltipListener);
             btn.addActionListener(this);
             btn.setFocusable(false);
             btn.setActionCommand(action.getCommand());
             btn.setEnabled(false);
             btn.setVisible(false);
             btn.setName(action.getName());
             if ( action.getTooltip() != null ) {
                 btn.setToolTip(i18nManager.getTranslation(action.getTooltip()));
                 btn.setToolTipKey(action.getTooltip());
+            }
     		SelectableToolBar jtb = (SelectableToolBar) toolBarMap.get(toolBarName);
     		if (jtb == null) {
     			jtb = new SelectableToolBar(toolBarName);
     			jtb.setRollover(true);
     			jtb.setAndamiVisibility(true);
     			toolBarMap.put(toolBarName, jtb);
     			toolBars.add(jtb);
+    		}
     		jtb.add(btn);
             SelectableToolBar jtb = (SelectableToolBar) toolBarMap.get(toolBarName);
             if ( jtb == null ) {
                 jtb = new SelectableToolBar(toolBarName);
                 jtb.setRollover(true);
                 jtb.setAndamiVisibility(true);
                 toolBarMap.put(toolBarName, jtb);
                 toolBars.add(jtb);
+            }
             jtb.add(btn);
     		controlClass.put(btn, action.getExtension().getClass());
+    	}
             addControl(btn);
+        }
         /**
          * Creates the needed menu structure to add the menu to the bar.
          * Returns the father which must hold the menu which was

... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff