From: Bradley S. <ye...@us...> - 2002-10-11 23:39:13
|
Update of /cvsroot/jmol/Jmol/src/org/openscience/jmol In directory usw-pr-cvs1:/tmp/cvs-serv30613/src/org/openscience/jmol Modified Files: JmolResourceHandler.java Log Message: Split resources into those which need translation (Jmol.properties), and those that should be constant (Jmol-resources.properties). Index: JmolResourceHandler.java =================================================================== RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/JmolResourceHandler.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -r1.13 -r1.14 *** JmolResourceHandler.java 11 Oct 2002 16:15:21 -0000 1.13 --- JmolResourceHandler.java 11 Oct 2002 23:39:10 -0000 1.14 *************** *** 19,24 **** --- 19,26 ---- package org.openscience.jmol; + import java.io.IOException; import java.net.URL; import java.util.MissingResourceException; + import java.util.PropertyResourceBundle; import java.util.ResourceBundle; import java.util.StringTokenizer; *************** *** 35,43 **** private static JmolResourceHandler instance; ! private ResourceBundle resourceBundle; private JmolResourceHandler() { ! resourceBundle = ! ResourceBundle.getBundle("org.openscience.jmol.Properties.Jmol"); } --- 37,53 ---- private static JmolResourceHandler instance; ! private ResourceBundle stringsResourceBundle; ! private ResourceBundle generalResourceBundle; private JmolResourceHandler() { ! stringsResourceBundle = ! ResourceBundle.getBundle("org.openscience.jmol.Properties.Jmol"); ! try { ! generalResourceBundle = new PropertyResourceBundle(getClass() ! .getClassLoader() ! .getResourceAsStream("org/openscience/jmol/Properties/Jmol-resources.properties")); ! } catch (IOException ex) { ! throw new RuntimeException(ex.toString()); ! } } *************** *** 51,63 **** public synchronized ImageIcon getIcon(String key) { - String imageName = null; String resourceName = null; try { resourceName = getString(key); - imageName = "org/openscience/jmol/images/" + resourceName; } catch (MissingResourceException e) { } ! if (imageName != null) { URL imageUrl = this.getClass().getClassLoader().getResource(imageName); if (imageUrl != null) { --- 61,72 ---- public synchronized ImageIcon getIcon(String key) { String resourceName = null; try { resourceName = getString(key); } catch (MissingResourceException e) { } ! if (resourceName != null) { ! String imageName = "org/openscience/jmol/images/" + resourceName; URL imageUrl = this.getClass().getClassLoader().getResource(imageName); if (imageUrl != null) { *************** *** 75,81 **** String result = null; try { ! result = resourceBundle.getString(key); } catch (MissingResourceException e) { } return result; } --- 84,96 ---- String result = null; try { ! result = stringsResourceBundle.getString(key); } catch (MissingResourceException e) { } + if (result == null) { + try { + result = generalResourceBundle.getString(key); + } catch (MissingResourceException e) { + } + } return result; } *************** *** 96,109 **** String translatedText = getString(key.toString()); return (translatedText != null) ? translatedText : text; - } - - public synchronized Object getObject(String key) { - - Object result = null; - try { - result = resourceBundle.getObject(key); - } catch (MissingResourceException e) { - } - return result; } --- 111,114 ---- |