[Jmol-commits] CVS: Jmol/src/org/openscience/jmol/app GuiMap.java,1.3,1.4 Jmol.java,1.57,1.58

[Michael T H. <mic...@us...>]

Update of /cvsroot/jmol/Jmol/src/org/openscience/jmol/app
In directory sc8-pr-cvs1:/tmp/cvs-serv28639/src/org/openscience/jmol/app

Modified Files:
	GuiMap.java Jmol.java 
Log Message:
more work on menu definitions


Index: GuiMap.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/app/GuiMap.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- GuiMap.java	2 Jun 2003 13:35:11 -0000	1.3
+++ GuiMap.java	18 Jan 2004 16:33:00 -0000	1.4
@@ -77,7 +77,7 @@
     String key;
     KeyJMenu(String key) {
       super(JmolResourceHandler.
-            getInstance().getString(key+Jmol.labelSuffix));
+            getInstance().getString(key+"Label"));
       this.key = key;
       map.put(key, this);
     }
@@ -90,7 +90,7 @@
     String key;
     KeyJMenuItem(String key) {
       super(JmolResourceHandler.
-            getInstance().getString(key+Jmol.labelSuffix));
+            getInstance().getString(key+"Label"));
       this.key = key;
       map.put(key, this);
     }
@@ -104,7 +104,7 @@
     String key;
     KeyJCheckBoxMenuItem(String key, boolean isChecked) {
       super(JmolResourceHandler.
-            getInstance().getString(key+Jmol.labelSuffix), isChecked);
+            getInstance().getString(key+"Label"), isChecked);
       this.key = key;
       map.put(key, this);
     }
@@ -118,7 +118,7 @@
     String key;
     KeyJRadioButtonMenuItem(String key) {
       super(JmolResourceHandler.
-            getInstance().getString(key+Jmol.labelSuffix));
+            getInstance().getString(key+"Label"));
       this.key = key;
       map.put(key, this);
     }
@@ -132,7 +132,7 @@
     String key;
     KeyJCheckBox(String key, boolean isChecked) {
       super(JmolResourceHandler.
-            getInstance().getString(key+Jmol.labelSuffix), isChecked);
+            getInstance().getString(key+"Label"), isChecked);
       this.key = key;
       map.put(key, this);
     }

Index: Jmol.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/app/Jmol.java,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- Jmol.java	18 Jan 2004 15:37:46 -0000	1.57
+++ Jmol.java	18 Jan 2004 16:33:00 -0000	1.58
@@ -493,7 +493,7 @@
       mi = guimap.newJRadioButtonMenuItem("Jmol."+cmd);
     } else {
       String checked = JmolResourceHandler.getInstance().getString("Jmol."
-                         + cmd + checkSuffix);
+                         + cmd + "Check");
       if (checked != null) {
         boolean c = false;
         if (checked.equals("true")) {
@@ -505,14 +505,14 @@
       }
     }
     String mnem = JmolResourceHandler.getInstance().getString("Jmol." + cmd
-                    + mnemonicSuffix);
+                    + "Mnemonic");
     if (mnem != null) {
       char mn = mnem.charAt(0);
       mi.setMnemonic(mn);
     }
 
     ImageIcon f = JmolResourceHandler.getInstance().getIcon("Jmol." + cmd
-                    + imageSuffix);
+                    + "Image");
     if (f != null) {
       mi.setHorizontalTextPosition(JButton.RIGHT);
       mi.setIcon(f);
@@ -594,7 +594,7 @@
   protected AbstractButton createToolbarButton(String key) {
 
     ImageIcon ii = JmolResourceHandler.getInstance().getIcon("Jmol." + key
-                     + imageSuffix);
+                     + "Image");
     AbstractButton b = new JButton(ii);
     String isToggleString =
       JmolResourceHandler.getInstance().getString("Jmol." + key + "Toggle");
@@ -629,7 +629,7 @@
     }
 
     String tip = JmolResourceHandler.getInstance().getString("Jmol." + key
-                   + tipSuffix);
+                   + "Tip");
     if (tip != null) {
       b.setToolTipText(tip);
     }
@@ -697,7 +697,7 @@
                 menuBar.add(m);
             }
             String mnem = JmolResourceHandler.getInstance().getString("Jmol."
-                + menuKeys[i] + mnemonicSuffix);
+                + menuKeys[i] + "Mnemonic");
             if (mnem != null) {
                 char mn = mnem.charAt(0);
                 m.setMnemonic(mn);
@@ -714,7 +714,7 @@
           menuBar.add(m);
       }
       String mnem = JmolResourceHandler.getInstance().getString("Jmol."
-          + menuKey + mnemonicSuffix);
+          + menuKey + "Mnemonic");
       if (mnem != null) {
           char mn = mnem.charAt(0);
           m.setMnemonic(mn);
@@ -731,7 +731,7 @@
     String[] itemKeys;
     if (isPopup) {
       itemKeys = tokenize(JmolResourceHandler.getInstance().getString("Jmol."
-          + key + popupSuffix));
+          + key + "Popup"));
     } else {
       itemKeys = tokenize(JmolResourceHandler.getInstance().getString("Jmol."
           + key));
@@ -745,7 +745,7 @@
 
       // Check to see if it is a radio group:
       String radiogroup = JmolResourceHandler.getInstance().getString("Jmol."
-                            + itemKeys[i] + radioSuffix);
+                            + itemKeys[i] + "Radio");
       if (radiogroup != null) {
 
         // Get the list of items in the radio group:
@@ -753,7 +753,7 @@
 
         // See what is the selected member of the radio group:
         String si = JmolResourceHandler.getInstance().getString("Jmol."
-                      + itemKeys[i] + selectedSuffix);
+                      + itemKeys[i] + "Selected");
 
         // Create the button group:
         ButtonGroup bg = new ButtonGroup();
@@ -773,7 +773,7 @@
       } else {
         // Check to see if it is a popup menu:
         String popup = JmolResourceHandler.getInstance().
-          getString("Jmol." + itemKeys[i] + popupSuffix);
+          getString("Jmol." + itemKeys[i] + "Popup");
         if (popup != null) {
           if (popup.equals("prop")) {
             apm =
@@ -827,54 +827,6 @@
   private JToolBar toolbar;
 
 
-  /**
-   * Suffix applied to the key used in resource file
-   * lookups for an image.
-   */
-  private static final String imageSuffix = "Image";
-
-  /**
-   * Suffix applied to the key used in resource file
-   * lookups for a label.
-   */
-  public static final String labelSuffix = "Label";
-
-  /**
-   * Suffix applied to the key used in resource file
-   * lookups for a checkbox menu item.
-   */
-  private static final String checkSuffix = "Check";
-
-  /**
-   * Suffix applied to the key used in resource file
-   * lookups for a radio group.
-   */
-  private static final String radioSuffix = "Radio";
-
-  /**
-   * Suffix applied to the key used in resource file
-   * lookups for a selected member of a radio group.
-   */
-  private static final String selectedSuffix = "Selected";
-
-  /**
-   * Suffix applied to the key used in resource file
-   * lookups for a popup menu.
-   */
-  private static final String popupSuffix = "Popup";
-
-  /**
-   * Suffix applied to the key used in resource file
-   * lookups for tooltip text.
-   */
-  private static final String tipSuffix = "Tooltip";
-
-  /**
-   * Suffix applied to the key used in resource file
-   * lookups for Mnemonics.
-   */
-  private static final String mnemonicSuffix = "Mnemonic";
-
   private static final String newwinAction = "newwin";
   private static final String openAction = "open";
   private static final String openurlAction = "openurl";