X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FAppletJmol.java;h=4b014d1868ff644863e1ce70116d8099b9ad6514;hb=ab43013b7e357b84b4abade0dba949668dfb2a0e;hp=562ff72728268fd1c0ebab66c91f75d35fdf177b;hpb=b57a02c25e335d033c97f8a6bacd6b54f62bd2b6;p=jalview.git
diff --git a/src/jalview/appletgui/AppletJmol.java b/src/jalview/appletgui/AppletJmol.java
index 562ff72..4b014d1 100644
--- a/src/jalview/appletgui/AppletJmol.java
+++ b/src/jalview/appletgui/AppletJmol.java
@@ -1,19 +1,22 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
- * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1)
+ * Copyright (C) 2014 The Jalview Authors
*
* This file is part of Jalview.
*
* Jalview is free software: you can redistribute it and/or
* modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *
* Jalview 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 GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along with Jalview. If not, see .
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.appletgui;
@@ -26,57 +29,65 @@ import jalview.datamodel.*;
import jalview.structure.*;
import jalview.io.*;
-import org.jmol.api.*;
-
-import org.jmol.popup.*;
-import org.jmol.viewer.JmolConstants;
-
import jalview.schemes.*;
+import jalview.util.MessageManager;
public class AppletJmol extends EmbmenuFrame implements
// StructureListener,
- KeyListener, ActionListener, ItemListener, SequenceStructureBinding
+ KeyListener, ActionListener, ItemListener
{
- Menu fileMenu = new Menu("File");
+ Menu fileMenu = new Menu(MessageManager.getString("action.file"));
- Menu viewMenu = new Menu("View");
+ Menu viewMenu = new Menu(MessageManager.getString("action.view"));
- Menu coloursMenu = new Menu("Colours");
+ Menu coloursMenu = new Menu(MessageManager.getString("action.colour"));
- Menu chainMenu = new Menu("Show Chain");
+ Menu chainMenu = new Menu(MessageManager.getString("action.show_chain"));
- Menu helpMenu = new Menu("Help");
+ Menu helpMenu = new Menu(MessageManager.getString("action.help"));
- MenuItem mappingMenuItem = new MenuItem("View Mapping");
+ MenuItem mappingMenuItem = new MenuItem(
+ MessageManager.getString("label.view_mapping"));
- CheckboxMenuItem seqColour = new CheckboxMenuItem("By Sequence", true);
+ CheckboxMenuItem seqColour = new CheckboxMenuItem(
+ MessageManager.getString("action.by_sequence"), true);
- CheckboxMenuItem jmolColour = new CheckboxMenuItem("Using Jmol", false);
+ CheckboxMenuItem jmolColour = new CheckboxMenuItem(
+ MessageManager.getString("action.using_jmol"), false);
- MenuItem chain = new MenuItem("By Chain");
+ MenuItem chain = new MenuItem(MessageManager.getString("action.by_chain"));
- MenuItem charge = new MenuItem("Charge & Cysteine");
+ MenuItem charge = new MenuItem(
+ MessageManager.getString("label.charge_cysteine"));
- MenuItem zappo = new MenuItem("Zappo");
+ MenuItem zappo = new MenuItem(MessageManager.getString("label.zappo"));
- MenuItem taylor = new MenuItem("Taylor");
+ MenuItem taylor = new MenuItem(MessageManager.getString("label.taylor"));
- MenuItem hydro = new MenuItem("Hydrophobicity");
+ MenuItem hydro = new MenuItem(
+ MessageManager.getString("label.hydrophobicity"));
- MenuItem helix = new MenuItem("Helix Propensity");
+ MenuItem helix = new MenuItem(
+ MessageManager.getString("label.helix_propensity"));
- MenuItem strand = new MenuItem("Strand Propensity");
+ MenuItem strand = new MenuItem(
+ MessageManager.getString("label.strand_propensity"));
- MenuItem turn = new MenuItem("Turn Propensity");
+ MenuItem turn = new MenuItem(
+ MessageManager.getString("label.turn_propensity"));
- MenuItem buried = new MenuItem("Buried Index");
+ MenuItem buried = new MenuItem(
+ MessageManager.getString("label.buried_index"));
- MenuItem purinepyrimidine = new MenuItem("Purine/Pyrimidine");
+ MenuItem purinepyrimidine = new MenuItem(
+ MessageManager.getString("label.purine_pyrimidine"));
- MenuItem user = new MenuItem("User Defined Colours");
+ MenuItem user = new MenuItem(
+ MessageManager.getString("label.user_defined_colours"));
- MenuItem jmolHelp = new MenuItem("Jmol Help");
+ MenuItem jmolHelp = new MenuItem(
+ MessageManager.getString("label.jmol_help"));
Panel scriptWindow;
@@ -128,7 +139,7 @@ public class AppletJmol extends EmbmenuFrame implements
String[][] boundchains, boolean align, AlignmentPanel ap,
String protocol)
{
- throw new Error("Not yet implemented.");
+ throw new Error(MessageManager.getString("error.not_yet_implemented"));
}
public AppletJmol(PDBEntry pdbentry, SequenceI[] seq, String[] chains,
@@ -304,8 +315,7 @@ public class AppletJmol extends EmbmenuFrame implements
}
if (freader == null)
{
- throw new Exception(
- "Invalid datasource. Could not obtain Reader.");
+ throw new Exception(MessageManager.getString("exception.invalid_datasource_couldnt_obtain_reader"));
}
jmb.viewer.openReader(pdbentry.getFile(), pdbentry.getId(),
freader);
@@ -333,7 +343,7 @@ public class AppletJmol extends EmbmenuFrame implements
{
chainMenu.removeAll();
- MenuItem menuItem = new MenuItem("All");
+ MenuItem menuItem = new MenuItem(MessageManager.getString("label.all"));
menuItem.addActionListener(this);
chainMenu.add(menuItem);
@@ -401,8 +411,9 @@ public class AppletJmol extends EmbmenuFrame implements
.println("Out of memory when trying to create dialog box with sequence-structure mapping.");
return;
}
- jalview.bin.JalviewLite.addFrame(frame, "PDB - Sequence Mapping",
- 550, 600);
+ jalview.bin.JalviewLite.addFrame(frame,
+ MessageManager.getString("label.pdb_sequence_mapping"), 550,
+ 600);
}
else if (evt.getSource() == charge)
{
@@ -620,7 +631,8 @@ public class AppletJmol extends EmbmenuFrame implements
g.fillRect(0, 0, currentSize.width, currentSize.height);
g.setColor(Color.white);
g.setFont(new Font("Verdana", Font.BOLD, 14));
- g.drawString("Retrieving PDB data....", 20, currentSize.height / 2);
+ g.drawString(MessageManager.getString("label.retrieving_pdb_data"),
+ 20, currentSize.height / 2);
}
else
{