/ - Diff - Application: gvSIG desktop - gvSIG

Revision 41025

     import java.security.Policy;
     import java.text.MessageFormat;
     import java.util.ArrayList;
     import java.util.Arrays;
     import java.util.Comparator;
     import java.util.Enumeration;
     import java.util.HashMap;
-...
     		public abstract String[] getAliases(Item item);
     		public Item get(Object key) {
     		public boolean isAlias(String key) {
     			return aliases.get(key)!=null ;
+    		}
     		public String getMainKey(String key) {
     			Item item = super.get(key);
     			if( item != null ) {
     				return key;
+    			}
     			String alias = aliases.get(key);
     			if( alias != null ) {
     				return alias;
+    			}
     			return null;
+    		}
     		public Item get(Object key) {
     			Item item = super.get(key);
     			if( item != null ) {
     				return item;
+    			}
     			String alias = aliases.get(key);
-...
     	protected static ListBaseException launcherrors = null;
     	protected static Theme theme = null;
     	private List<String> deprecatedPluginNames = null;
     	private static final class ProxyAuth extends Authenticator {
-...
     		return PluginServices.getText(Launcher.class,msg);
+    	}
     	private List<String> getDeprecatedPluginNames() {
     		if( deprecatedPluginNames == null ) {
     			String[] ss = new String[] {
     					"org.gvsig.app",
     					"org.gvsig.coreplugin",
     					"org.gvsig.editing",
     					"org.gvsig.installer.app.extension",
     					"org.gvsig.exportto.app.extension"
     			};
     			deprecatedPluginNames = Arrays.asList(ss);
+    		}
     		return deprecatedPluginNames;
+    	}
     	public void doMain(String[] args) throws Exception {
     		if (args.length < 1) {
-...
     				// Se obtienen las dependencias y sus class loaders
     				boolean ready = true;
     				Depends[] dependencies = config.getDepends();
     				PluginClassLoader[] loaders = new PluginClassLoader[dependencies.length];
     				List<PluginClassLoader> loaders = new ArrayList<PluginClassLoader>();
     				for (int j = 0; j < dependencies.length; j++) {
     					Depends dependency = dependencies[j];
     					String dependencyName = dependency.getPluginName();
     					PluginConfig dependencyPluginConfig = pluginsConfig.get(dependencyName);
     					PluginServices dependenyPluginService = pluginsServices.get(dependencyName);
     					PluginServices dependencyPluginService = pluginsServices.get(dependencyName);
     					if( getDeprecatedPluginNames().contains(dependencyName) ) {
     						logger.warn("Plugin '"+pluginName+"' use a deprecated plugin name '"+dependencyName+"' as dependency. Must use '"+pluginsConfig.getMainKey(dependencyName)+"'.");
+    					}
     					if ( dependencyPluginConfig == null) {
     						if( dependency.getOptional() ) {
     							this.logger.info("Plugin '"+pluginName+"', optional dependency '"+dependencyName+"' not found");
-...
     										+ dependencies[j].getPluginName());
+    						}
     					} else {
     						if ( dependenyPluginService!=null &&
     							installed.contains(dependenyPluginService.getPluginName())) {
     							loaders[j] = (pluginsServices.get(dependencies[j]
     									.getPluginName())).getClassLoader();
     						if ( dependencyPluginService!=null &&
     							installed.contains(dependencyPluginService.getPluginName())) {
     							loaders.add(dependencyPluginService.getClassLoader());
     						} else {
     							if( !dependency.getOptional() ) {
     								ready = false;
-...
     						+ " '" + name + "'");
+    	}
     	// public static void initIconThemes() {
     	// // load the iconTheme
     	// IconThemeManager iconManager = new IconThemeManager();
     	// PluginServices.setIconThemeManager(iconManager);
     	// IconThemeInfo selectedTheme = iconManager.readConfig();
     	// if (selectedTheme!=null) {
     	// iconManager.setDefault(selectedTheme);
     	// logger.info("Setting the icon theme: "+selectedTheme.toVerboseString());
     	// }
     	// else {
     	// // set the default dir and try to load the default theme
     	// try {
     	// iconManager.setThemesDir(new File("iconThemes"));
     	// IconThemeInfo[] list = iconManager.list();
     	//
     	// for (int i=0; i<list.length; i++) {
     	// if (list[i].getResourceName().equals("iconThemes/icons")) {
     	// iconManager.setDefault(list[i]);
     	// logger.info("Setting the default icon theme: "+list[i].toVerboseString());
     	// return;
     	// }
     	// }
     	// } catch (FileNotFoundException e) {
     	// logger.info("IconTheme basedir does not exist");
     	// }
     	// // create an empty theme
     	// IconThemeInfo info = new IconThemeInfo();
     	// info.setName("No theme loaded");
     	// info.setResource(null); // null resource means that no real theme is
     	// loaded
     	// info.setDescription("No theme loaded");
     	// info.setVersion("0");
     	// iconManager.setDefault(new IconTheme(info));
     	// logger.info("Setting an empty icon theme");
     	//
     	// }
     	// }
     	public static void initIconThemes() {
     		PluginsManager pluginsManager = PluginsLocator.getManager();
     		IconThemeManager iconManager = ToolsSwingLocator.getIconThemeManager();

     import java.io.Writer;
     import java.util.Enumeration;
     import java.util.Vector;
     import org.exolab.castor.xml.MarshalException;
     import org.exolab.castor.xml.Marshaller;
     import org.exolab.castor.xml.Unmarshaller;
     import org.exolab.castor.xml.ValidationException;
     import org.slf4j.Logger;
     import org.slf4j.LoggerFactory;
     import org.xml.sax.ContentHandler;
     /**
-...
      */
     public class PluginConfig implements java.io.Serializable {
     	private static final Logger logger = LoggerFactory.getLogger(PluginConfig.class);
           //--------------------------/
          //- Class/Member Variables -/
-...
             throws java.lang.IndexOutOfBoundsException
+        {
             _dependsList.addElement(vDepends);
         	if( "org.gvsig.app".equals(vDepends.getPluginName())  ) {
         		logger.info("Deprecated dependency 'org.gvsig.app' add optional depdency with 'org.gvsig.shp.app.mainplugin' to ensure compatibility with gvSIG 2.0.");
         		org.gvsig.andami.plugins.config.generate.Depends dep2 = new org.gvsig.andami.plugins.config.generate.Depends();
         		dep2.setOptional(true);
         		dep2.setPluginName("org.gvsig.shp.app.mainplugin");
                 _dependsList.addElement(dep2);
+        	}
         } //-- void addDepends(com.iver.andami.plugins.config.generate.Depends)
         /**

          * @throws IOException
          */
         public PluginClassLoader(URL[] jars, String baseDir, ClassLoader cl,
                 List<PluginClassLoader> pluginLoaders) throws IOException {
         	this(jars, baseDir, cl, (PluginClassLoader[]) pluginLoaders.toArray(new PluginClassLoader[pluginLoaders.size()]) );
+        }
         public PluginClassLoader(URL[] jars, String baseDir, ClassLoader cl,
             PluginClassLoader[] pluginLoaders) throws IOException {
             super(jars, cl);
             logger.debug("Creating PluginClassLoader for {}.", baseDir);
-...
             	logger.info("Error getting resource {} in {}'", new Object[] {res,this.baseDir.toString()}, e);
+            }
             if( ret == null ) {
             	logger.warn("Error getting resource {} in {}'", new Object[] {res,this.baseDir.toString()});
             	logger.info("Error getting resource {} in {}'", new Object[] {res,this.baseDir.toString()});
+            }
             return ret;
+        }

Also available in: Unified diff