/ - Diff - | gvSIG desktop 1 - gvSIG

Revision 11041

     import org.kxml2.io.KXmlParser;
     import org.xmlpull.v1.XmlPullParserException;
     import sun.security.action.GetIntegerAction;
     import com.iver.andami.Launcher;
     import com.iver.andami.Utilities;
     /**
      * <p>This class deals with icon themes, it understands the on-disk theme
-...
     public class IconThemeManager {
     	private File themesDir = null;
     	private final String themeDefinitionFile = "theme.xml";
     	private IconTheme defaultTheme = null;
     	/**
+    	 *
-...
     		this.themesDir = themesDir;
+    	}
     	/**
+    	 *
     	 * @param themesDir
     	 */
     	public IconThemeManager() {	}
     	public IconTheme get(String themeName) {
     		IconThemeInfo[] themeList = list();
     		for (int i=0; i<themeList.length; i++) {
-...
     	public IconTheme get(IconThemeInfo themeInfo) {
     		IconTheme theme = new IconTheme(themeInfo);
     		if (themeInfo.getResource().isDirectory()) {
     			File basedir = themeInfo.getResource();
     			//TODO: crear el filtro de im?genes
     			File[] imageList = basedir.listFiles(new FilenameFilter() {
     				public boolean accept(File dir, String fileName) {
     					String extension = "";
     					int pointPos = fileName.lastIndexOf(".");
     					if (pointPos>0 && pointPos < (fileName.length()-1) )
     						extension = fileName.substring(pointPos+1).toLowerCase();
     					if ( extension.equals("jpg") || extension.equals("jpeg")
     							|| extension.equals("png")
     							|| extension.equals("gif")
+    							)
     						return true;
     					else
     						return false;
     		if (themeInfo.getResource()==null) {
     			// no real theme was selected
     			return theme;
+    		}
     		if (themeInfo.getResource() instanceof File) {
     			File basedir = (File) themeInfo.getResource();
     			if (basedir.isDirectory()) {
     				//TODO: crear el filtro de im?genes
     				File[] imageList = basedir.listFiles(new ImageFileFilter());
     				String name;
     				for (int i=imageList.length-1; i>=0; i--) {
     					name = computeKey(imageList[i].getName());
     					try {
     						theme.register(name, imageList[i].toURL());
     						System.out.println("registerning "+name+": "+imageList[i].toURL());
     					} catch (MalformedURLException e) {}
+    				}
     			});
     			int pointPos;
     			String name;
     			for (int i=imageList.length-1; i>=0; i--) {
     				pointPos = imageList[i].getName().lastIndexOf(".");
     				name = imageList[i].getName().substring(0, pointPos);
     				try {
     					theme.register(name, imageList[i].toURL());
     					System.out.println("registerning "+name+": "+imageList[i].toURL());
     				} catch (MalformedURLException e) {}
+    			}
     			else {
     				return null;
+    			}
+    		}
     		else {
     		else if (themeInfo.getResource() instanceof ZipFile) {
     			ZipFile zipFile = (ZipFile) themeInfo.getResource();
     			ImageFileFilter filter = new ImageFileFilter();
     			Enumeration entries = zipFile.entries();
     			while (entries.hasMoreElements()) {
     				ZipEntry entry = (ZipEntry) entries.nextElement();
     				if (!entry.isDirectory() ) {
     					if (filter.accept(new File(zipFile.getName()), entry.getName())) {
     						theme.register(computeKey(entry.getName()), entry);
     						System.out.println("registerning "+computeKey(entry.getName())+": "+entry.getName());
+    					}
+    				}
+    			}
+    		}
     		return theme;
+    	}
     	public IconTheme getDefault() {
     		if (defaultTheme!=null)
     			return defaultTheme;
     		init();
     		return defaultTheme;
+    	}
     	public void init() {
     		IconThemeInfo info = readSelectedFromAndamiConfig();
     		defaultTheme = get(info);
+    	}
     	public void setDefault(IconThemeInfo iconTheme) {
     		/*
     		 *  TODO Currently we just change it in AndamiConfig, so that on next
     		 *  gvSIG restart the theme gets changed. However, we could implement
     		 *  here a real on-the-fly theme change.
     		 */
     		saveSelectedInAndamiConfig(iconTheme);
+    	}
     	public void setDefault(IconTheme iconTheme) {
     		setDefault(iconTheme.getInfo());
+    	}
     	/**
+    	 *
     	 * @return
-...
     			// try reading the XML file
     			if (themeDefinition.exists() && themeDefinition.isFile()) {
     				themeInfo = readXML(new FileInputStream(themeDefinition));
     				if (themeInfo.getDescription()==null)
     					themeInfo.setDescription(dir.getName());
     				if (themeInfo.getName()==null)
     					themeInfo.setName(themeInfo.getDescription());
     				themeInfo.setResource(dir);
     				return themeInfo;
+    			}
-...
     					themeInfo.setVersion(parser.nextText());
+    				}
+    			}
+    		}
+    		}
     		return themeInfo;
+    	}
-...
     				// try with the XML file
     				if (xmlEntry!=null) {
     					themeInfo = readXML(file.getInputStream(xmlEntry));
     					if (themeInfo.getDescription()==null)
     						themeInfo.setDescription(zipFile.getName());
     					if (themeInfo.getName()==null)
     						themeInfo.setName(themeInfo.getDescription());
     					themeInfo.setResource(zipFile);
     					return themeInfo;
+    				}
-...
     			themeInfo = new IconThemeInfo();
     			themeInfo.setResource(zipFile);
     			// now try with the directory
     			if (dirEntry!=null) {
     			if (dirEntry!=null) {
     				themeInfo.setName(dirEntry.getName());
     				themeInfo.setDescription(dirEntry.getName());
     				return themeInfo;
-...
     		return parts[parts.length-1];
+    	}
     	public File getThemesPath() {
     	public File getThemesDir() {
     		return themesDir;
+    	}
     	public void setThemesPath(File themesDir) {
     	public void setThemesDir(File themesDir) {
     		this.themesDir = themesDir;
+    	}
     	public IconTheme getDefault() {
     		return new IconTheme(new IconThemeInfo());
     		// TODO
     	private IconThemeInfo readSelectedFromAndamiConfig() {
     		com.iver.andami.config.generate.IconTheme selectedTheme = null;
     		if (Launcher.getAndamiConfig().getAndamiOptions()!=null && Launcher.getAndamiConfig().getAndamiOptions().getIconTheme()!=null)
     			selectedTheme = Launcher.getAndamiConfig().getAndamiOptions().getIconTheme();
     		IconThemeInfo info = new IconThemeInfo();
     		if (selectedTheme!=null) {
     			info.setName(selectedTheme.getName());
     			if (selectedTheme.getResource()!=null) {
     				try {
     					info.setResource(new ZipFile(selectedTheme.getResource()));
     				} catch (ZipException e) {
     					info.setResource(new File(selectedTheme.getResource()));
     				} catch (IOException e) {
     					info.setResource(new File(selectedTheme.getResource()));
+    				}
+    			}
     			else {
     				info.setResource(null);
+    			}
     			setThemesDir(new File(selectedTheme.getBasedir()));
     			if (selectedTheme.getVersion()!=null)
     				info.setVersion(selectedTheme.getVersion());
     			if (selectedTheme.getDescription()!=null) {
     				info.setDescription(selectedTheme.getDescription());
+    			}
     			else {
     				info.setDescription(selectedTheme.getName());
+    			}
+    		}
     		else {
     			info.setName("default");
     			info.setDescription("default");
     			info.setResource(null); // null resource means that no real theme is loaded
+    		}
     		return info;
+    	}
     	public void setDefault(IconThemeInfo iconTheme) {
     		// TODO
     	private void saveSelectedInAndamiConfig(IconThemeInfo selectedTheme) {
     		com.iver.andami.config.generate.AndamiOptions options = Launcher.getAndamiConfig().getAndamiOptions();
     		if (options==null) {
     			options = new com.iver.andami.config.generate.AndamiOptions();
+    		}
     		com.iver.andami.config.generate.IconTheme themeConfig = options.getIconTheme();
     		if (themeConfig==null) {
     			themeConfig = new com.iver.andami.config.generate.IconTheme();
+    		}
     		themeConfig.setName(selectedTheme.getName());
     		themeConfig.setDescription(selectedTheme.getDescription());
     		themeConfig.setVersion(selectedTheme.getVersion());
     		if (selectedTheme.getResource()!=null) {
     			if (selectedTheme.getResource() instanceof File) {
     				File resource = (File) selectedTheme.getResource();
     				themeConfig.setResource(resource.getName());
+    			}
     			else if (selectedTheme.getResource() instanceof ZipFile) {
     				ZipFile resource = (ZipFile) selectedTheme.getResource();
     				themeConfig.setResource(resource.getName());
+    			}
+    		}
+    	}
     public void setDefault(IconTheme iconTheme) {
     		setDefault(iconTheme.getInfo());
     	class ImageFileFilter implements FilenameFilter {
     		public boolean accept(File dir, String fileName) {
     			String extension = "";
     			int pointPos = fileName.lastIndexOf(".");
     			if (pointPos>0 && pointPos < (fileName.length()-1) )
     				extension = fileName.substring(pointPos+1).toLowerCase();
     			if ( extension.equals("jpg") || extension.equals("jpeg")
     					|| extension.equals("png")
     					|| extension.equals("gif")
+    					)
     				return true;
     			else
     				return false;
+    		}
+    	}
     	private String computeKey(String fileName) {
     		int pointPos = fileName.lastIndexOf(".");
     		if (pointPos!=-1)
     			return fileName.substring(0, pointPos);
     		else
     			return fileName;
+    	}
+    }

+     *
      */
     public class IconThemeInfo {
     	private String name;
     	private String description;
     	private String name=null;
     	private String description=null;
     	private String version="1.0";
     	private File resource;
     	private Object resource=null;
     	/**
     	 * Gets the theme name.
-...
+    	}
     	/**
     	 * Gets the file which contains physically contains this theme on disk.
     	 * It may be a zipfile or jarfile, or a directory.
     	 * Gets the Object which contains physically contains this theme on disk.
     	 * It may be a ZipFile or JarFile, or a directory.
+    	 *
     	 * @return
     	 */
     	public File getResource() {
     	public Object getResource() {
     		return resource;
+    	}
     	/**
     	 * Sets the file which contains physically contains this theme on disk.
     	 * It may be a zipfile or jarfile, or a directory.
     	 * It may be a ZipFile or JarFile, or a directory.
+    	 *
     	 * @return
     	 */
     	public void setResource(File resource) {
     	public void setResource(Object resource) {
     		this.resource = resource;
+    	}
+    }

     package com.iver.andami.iconthemes;
     import java.io.File;
     import java.io.IOException;
     import java.io.InputStream;
     import java.net.MalformedURLException;
     import java.net.URL;
     import java.util.HashMap;
     import java.util.zip.ZipEntry;
     import java.util.zip.ZipFile;
     import javax.swing.ImageIcon;
     import org.apache.log4j.Logger;
     import com.iver.andami.PluginServices;
     /**
      * <p>This class represents an icon theme, which is basically a mapping of
      * symbolic icon names, and real icons (or icon paths). This is useful to
-...
      */
     public class IconTheme {
     	private HashMap iconList = new HashMap();
     	private Logger logger = PluginServices.getLogger();
     	private Logger logger;
     	private IconThemeInfo info;
     	/**
-...
     	public ImageIcon get(String iconName) {
     		Object object = iconList.get(iconName);
     		if (object!=null) {
     			if (object instanceof String)
     				return new ImageIcon((String)object);
     			else if (object instanceof ImageIcon)
     			if (object instanceof ImageIcon)
     				return (ImageIcon) object;
     			else if (object instanceof URL) {
     				// ok, we got an imagePath, let's see if it's valid
     				ImageIcon icon =  new ImageIcon((URL)object);
     				if (icon.getImage()!=null) {
     					// the icon was successfully created from the imagePath
     					return icon;
+    				}
     				else {
     					getLogger().error("Registered icon does not map to a valid image -- key: "+iconName+" -- URL: "+object.toString());
     					return null;
+    				}
+    			}
     			else if (object instanceof ZipEntry && info.getResource() instanceof ZipFile) {
     				ZipEntry entry = (ZipEntry) object;
     				ZipFile file = (ZipFile) info.getResource();
     				try {
     					InputStream is = file.getInputStream(entry);
     					int size=(int)entry.getSize();
     					if (size==-1) return null;
     					byte[] b=new byte[size];
     					int offset=0;
     					int chunk=0;
     					while ((size - offset) > 0) {
     						chunk=is.read(b, offset, size - offset);
     						if (chunk==-1) {
     							break;
+    						}
     						offset+=chunk;
+    					}
     				} catch (IOException e) {
+    				}
+    			}
+    		}
     		return null;
+    	}
-...
     	 * <code>null</code> otherwise.
     	 */
     	public ImageIcon get(String iconName, ImageIcon fallbackImage) {
     		Object object = iconList.get(iconName);
     		if (object!=null) {
     			// key is registered
     			if (object instanceof ImageIcon)
     				return (ImageIcon) object;
     			else if (object instanceof URL) {
     				// ok, we got an imagePath, let's see if it's valid
     				ImageIcon icon =  new ImageIcon((URL)object);
     				if (icon.getImage()!=null)
     					// the icon was successfully created from the imagePath
     					return icon;
     				else {
     					// it seems the imagePath was not valid, register the fallbackImage then
     					logger.error("Registered icon does not map to a valid image -- key: "+iconName+" -- URL: "+object.toString());
     					register(iconName, fallbackImage);
     					return fallbackImage;
+    				}
+    			}
     		ImageIcon icon = get(iconName);
     		if (icon!=null) {
     			return icon;
+    		}
     		// the key was not in the list
     		register(iconName, fallbackImage);
     		return fallbackImage;
     		else {
     			register(iconName, fallbackImage);
     			return fallbackImage;
+    		}
+    	}
     	/**
-...
     	 * <code>null</code> otherwise.
     	 */
     	public ImageIcon get(String iconName, URL fallbackImage) {
     		Object object = iconList.get(iconName);
     		if (object!=null) {
     			// key is registered
     			if (object instanceof ImageIcon)
     				return (ImageIcon) object;
     			else if (object instanceof URL) {
     				return tryToGetFromURLs(iconName, (URL) object, fallbackImage);
+    			}
+    		}
     		// the key was not in the list
     		ImageIcon icon =  new ImageIcon(fallbackImage);
     		if (icon.getImage()!=null) {
     			register(iconName, fallbackImage);
     		ImageIcon icon = get(iconName);
     		if (icon!=null) {
     			return icon;
+    		}
     		else {
     			// we don't want to return an empty ImageIcon
     			logger.error("Provided icon does not map to a valid image -- key: "+iconName+" -- URL: "+fallbackImage.toString());
     			icon = new ImageIcon(fallbackImage);
     			if (icon.getImage()!=null) {
     				register(iconName, fallbackImage);
     				return icon;
+    			}
     			else {
     				// we don't want to return an empty ImageIcon
     				getLogger().error("Provided icon does not map to a valid image -- key: "+iconName+" -- URL: "+fallbackImage.toString());
+    			}
     			return null;
+    		}
+    	}
-...
     	 * <code>null</code> otherwise.
     	 */
     	public ImageIcon get(String iconName, String fallbackImage) {
     		try {
     			Object object = iconList.get(iconName);
     			if (object!=null) {
     				// key is registered
     				if (object instanceof ImageIcon)
     					return (ImageIcon) object;
     				else if (object instanceof URL) {
     		ImageIcon icon = get(iconName);
     		if (icon!=null) {
     			return icon;
+    		}
     		else {
     			icon = new ImageIcon(fallbackImage);
     			if (icon.getImage()!=null) {
     				try {
     					File fallbackFile = new File(fallbackImage);
     					return tryToGetFromURLs(iconName, (URL)object, fallbackFile.toURL());
     					register(iconName, fallbackFile.toURL());
     					return icon;
     				} catch (MalformedURLException e) {
     					e.printStackTrace();
     					return null;
+    				}
+    			}
     			// the key was not in the list
     			ImageIcon icon = new ImageIcon(fallbackImage);
     			if (icon.getImage()!=null) {
     				File fallbackFile = new File(fallbackImage);
     				register(iconName, fallbackFile.toURL());
     				return icon;
+    			}
     			else {
     				// we don't want to return an empty ImageIcon
     				logger.error("Provided icon does not map to a valid image -- key: "+iconName+" -- URL: "+fallbackImage.toString());
     				getLogger().error("Provided icon does not map to a valid image -- key: "+iconName+" -- URL: "+fallbackImage.toString());
+    			}
     			return null;
+    		}
     		catch (MalformedURLException ex) {}
     		return null;
+    	}
-...
     		iconList.put(iconName, urlImage);
+    	}
     	/**
     	 * Try to load an image from <code>imageURL</code>; if it it does not
     	 * point to a valid image, try with <code>fallbackURL</code>.
+    	 *
     	 * @param iconName
     	 * @param imageURL
     	 * @param fallbackURL
+    	 *
     	 * @return If any image was successfully loaded, return this image,
     	 * otherwise return <code>null</code>.
     	 */
     	private ImageIcon tryToGetFromURLs(String iconName, URL imageURL, URL fallbackURL) {
     		// let's see if imageURL is valid
     		ImageIcon icon =  new ImageIcon(imageURL);
     		if (icon.getImage()!=null) {
     			// the icon was successfully created from the imagePath
     			return icon;
+    		}
     		else {
     			// it seems the imagePath was not valid, try with fallbackImage then
     			logger.error("Registered icon does not map to a valid image -- key: "+iconName+" -- URL: "+imageURL.toString());
     			icon =  new ImageIcon(fallbackURL);
     			if (icon.getImage()!=null) {
     				register(iconName, fallbackURL);
     				return icon;
+    			}
     			else {
     				// we don't want to return an empty ImageIcon
     				logger.error("Provided icon does not map to a valid image -- key: "+iconName+" -- URL: "+fallbackURL.toString());
     				return null;
+    			}
+    		}
     	public void register(String iconName, ZipEntry zippedImage) {
     		iconList.put(iconName, zippedImage);
+    	}
     	/**
-...
     	public IconThemeInfo getInfo() {
     		return info;
+    	}
     	private Logger getLogger() {
     		if (logger!=null)
     			return logger;
     		else
     			return Logger.getLogger(this.getClass());
+    	}
     	protected void setLogger(Logger logger) {
     		this.logger = logger;
+    	}
+    }

Also available in: Unified diff