X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fext%2Frbvi%2Fchimera%2FJalviewChimeraBinding.java;h=a39f355c85e1c6ec5b4b4a4ce962808a2e6594ee;hb=5a98fbf31c418758a11bbf8f54d5def7e509bb31;hp=fcf89af178ba17cda6c841da4e8d6868b135664b;hpb=5cdee2262acaf572fe92b3410044ee93e666b818;p=jalview.git diff --git a/src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java b/src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java index fcf89af..a39f355 100644 --- a/src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java +++ b/src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java @@ -20,7 +20,6 @@ */ package jalview.ext.rbvi.chimera; -import static org.junit.Assert.assertTrue; import jalview.api.AlignmentViewPanel; import jalview.api.FeatureRenderer; import jalview.api.SequenceRenderer; @@ -37,16 +36,12 @@ import jalview.structure.StructureListener; import jalview.structure.StructureMapping; import jalview.structure.StructureSelectionManager; import jalview.structures.models.SequenceStructureBindingModel; +import jalview.util.MessageManager; import java.awt.Color; -import java.awt.Container; import java.awt.event.ComponentEvent; -import java.awt.event.ComponentListener; import java.io.File; -import java.net.URL; -import java.security.AccessControlException; import java.util.ArrayList; -import java.util.Collection; import java.util.Enumeration; import java.util.HashMap; import java.util.Hashtable; @@ -54,19 +49,10 @@ import java.util.List; import java.util.Map; import java.util.Vector; -import org.jmol.adapter.smarter.SmarterJmolAdapter; -import org.jmol.api.JmolAppConsoleInterface; -import org.jmol.api.JmolSelectionListener; -import org.jmol.api.JmolStatusListener; -import org.jmol.api.JmolViewer; -import org.jmol.constant.EnumCallback; -import org.jmol.popup.JmolPopup; - import ext.edu.ucsf.rbvi.strucviz2.ChimeraManager; import ext.edu.ucsf.rbvi.strucviz2.ChimeraModel; import ext.edu.ucsf.rbvi.strucviz2.StructureManager; import ext.edu.ucsf.rbvi.strucviz2.StructureManager.ModelType; -import sun.rmi.runtime.Log; public abstract class JalviewChimeraBinding extends SequenceStructureBindingModel implements StructureListener, @@ -491,8 +477,7 @@ public abstract class JalviewChimeraBinding extends // Jmol callback has completed. if (mapping == null || mapping.length < 1) { - throw new Error( - "Implementation error - Chimera seems to be still working on getting its data - report at http://issues.jalview.org/browse/JAL-1016"); + throw new Error(MessageManager.getString("error.implementation_error_chimera_getting_data")); } int lastPos = -1; for (int s = 0; s < sequence[pdbfnum].length; s++) @@ -1365,9 +1350,7 @@ public abstract class JalviewChimeraBinding extends { if (pe < 0 || pe >= pdbentry.length) { - throw new Error( - "Implementation error - no corresponding pdbentry (for index " - + pe + ") to add sequences mappings to"); + throw new Error(MessageManager.formatMessage("error.implementation_error_no_pdbentry_from_index", new String[]{Integer.valueOf(pe).toString()})); } final String nullChain = "TheNullChain"; Vector s = new Vector();