*/
package jalview.bin;
+import jalview.api.AlignCalcWorkerI;
+import jalview.api.AlignViewportI;
+import jalview.api.JalviewApp;
+import jalview.api.StructureSelectionManagerProvider;
+import jalview.datamodel.ColumnSelection;
+import jalview.datamodel.HiddenColumns;
+import jalview.datamodel.PDBEntry;
+import jalview.datamodel.SequenceGroup;
+import jalview.datamodel.SequenceI;
import jalview.ext.so.SequenceOntology;
import jalview.gui.AlignFrame;
+import jalview.gui.AlignmentPanel;
+import jalview.gui.CalculationChooser;
import jalview.gui.Desktop;
import jalview.gui.PromptUserConfig;
+import jalview.gui.StructureViewer;
import jalview.io.AppletFormatAdapter;
import jalview.io.BioJsHTMLOutput;
import jalview.io.DataSourceType;
import jalview.io.IdentifyFile;
import jalview.io.NewickFile;
import jalview.io.gff.SequenceOntologyFactory;
+import jalview.javascript.JSFunctionExec;
+import jalview.javascript.MouseOverStructureListener;
+import jalview.renderer.seqfeatures.FeatureRenderer;
import jalview.schemes.ColourSchemeI;
import jalview.schemes.ColourSchemeProperty;
+import jalview.structure.SelectionSource;
+import jalview.structure.VamsasSource;
import jalview.util.MessageManager;
import jalview.util.Platform;
import jalview.ws.jws2.Jws2Discoverer;
+import netscape.javascript.JSObject;
+import java.applet.AppletContext;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileOutputStream;
import java.security.Permissions;
import java.security.Policy;
import java.util.HashMap;
+import java.util.Hashtable;
import java.util.Map;
import java.util.Vector;
import java.util.logging.ConsoleHandler;
* @author $author$
* @version $Revision$
*/
-public class Jalview
+public class Jalview implements JalviewJSApi
{
static
{
public static AlignFrame currentAlignFrame;
+ public boolean isJavaAppletTag;
+
+ public String appletResourcePath;
+
+ JalviewAppLoader appLoader;
+
+ protected JSFunctionExec jsFunctionExec;
+
+ private boolean noCalculation, noMenuBar, noStatus;
+
+ private boolean noAnnotation;
+
+ public boolean getStartCalculations()
+ {
+ return !noCalculation;
+ }
+
+ public boolean getAllowMenuBar()
+ {
+ return !noMenuBar;
+ }
+
+ public boolean getShowStatus()
+ {
+ return !noStatus;
+ }
+
+ public boolean getShowAnnotation()
+ {
+ return !noAnnotation;
+ }
+
+
static
{
if (!Platform.isJS())
*/
public static void main(String[] args)
{
-// setLogging(); // BH - for event debugging in JavaScript
- instance = new Jalview();
- instance.doMain(args);
-}
-
- private static void logClass(String name)
- {
- // BH - for event debugging in JavaScript
- ConsoleHandler consoleHandler = new ConsoleHandler();
- consoleHandler.setLevel(Level.ALL);
- Logger logger = Logger.getLogger(name);
- logger.setLevel(Level.ALL);
- logger.addHandler(consoleHandler);
- }
-
- @SuppressWarnings("unused")
- private static void setLogging()
- {
-
- /**
- * @j2sIgnore
- *
- */
+ if (false)
{
- System.out.println("not in js");
+ Platform.startJavaLogging();
}
- // BH - for event debugging in JavaScript (Java mode only)
- if (!Platform.isJS())
- /**
- * Java only
- *
- * @j2sIgnore
- */
- {
- Logger.getLogger("").setLevel(Level.ALL);
- logClass("java.awt.EventDispatchThread");
- logClass("java.awt.EventQueue");
- logClass("java.awt.Component");
- logClass("java.awt.focus.Component");
- logClass("java.awt.focus.DefaultKeyboardFocusManager");
- }
-
- }
-
-
-
+ instance = new Jalview();
+ instance.doMain(args);
+}
/**
* @param args
{
Jalview.currentAlignFrame = currentAlignFrame;
}
+
+ /**
+ * Get the SwingJS applet ID and combine that with the frameType
+ *
+ * @param frameType
+ * "alignment", "desktop", etc., or null
+ * @return
+ */
+ public static String getAppID(String frameType)
+ {
+ String id = Cache.getProperty("Info.j2sAppletID");
+ if (id == null)
+ {
+ id = "jalview";
+ }
+ return id + (frameType == null ? "" : "-" + frameType);
+ }
+
+ /**
+ * Handle all JalviewLite applet parameters
+ *
+ * @param aparser
+ * @param af
+ */
+ private void loadAppletParams(ArgsParser aparser, AlignFrame af)
+ {
+ JalviewApp app = new JalviewApp()
+ {
+
+ // TODO BH 2019
+ //
+ // These are methods that are in JalviewLite that various classes call
+ // but are not in JalviewLiteJsApi. Or, even if they are, other classes
+ // call
+ // them to JalviewLite directly. Some may not be necessary, but they have
+ // to
+ // be at least mentioned here, or the classes calling them should
+ // reference
+ // JalviewLite itself.
+
+ private boolean alignPDBStructures; // From JalviewLite; not implemented
+
+ private Hashtable<String, Hashtable<String, String[]>> jsmessages;
+
+ private Hashtable<String, int[]> jshashes;
+
+ @Override
+ public String getParameter(String name)
+ {
+ return aparser.getAppletValue(name, null);
+ }
+
+ @Override
+ public boolean getDefaultParameter(String name, boolean def)
+ {
+ String stn;
+ return ((stn = getParameter(name)) == null ? def
+ : "true".equalsIgnoreCase(stn));
+ }
+
+ /**
+ * Get the applet-like document base even though this is an application.
+ */
+ @Override
+ public URL getDocumentBase()
+ {
+ return Platform.getDocumentBase();
+ }
+
+ /**
+ * Get the applet-like code base even though this is an application.
+ */
+ @Override
+ public URL getCodeBase()
+ {
+ return Platform.getCodeBase();
+ }
+
+ @Override
+ public AlignViewportI getViewport()
+ {
+ return af.getViewport();
+ }
+
+ /**
+ * features
+ *
+ */
+ @Override
+ public boolean parseFeaturesFile(String filename,
+ DataSourceType protocol)
+ {
+ return af.parseFeaturesFile(filename, protocol);
+ }
+
+ /**
+ * scorefile
+ *
+ */
+ @Override
+ public boolean loadScoreFile(String sScoreFile) throws IOException
+ {
+ af.loadJalviewDataFile(sScoreFile, null, null, null);
+ return true;
+ }
+
+ /**
+ * annotations, jpredfile, jnetfile
+ *
+ */
+ @Override
+ public void updateForAnnotations()
+ {
+ af.updateForAnnotations();
+ }
+
+ @Override
+ public void loadTree(NewickFile fin, String treeFile)
+ throws IOException
+ {
+ // n/a -- already done by standard Jalview command line processing
+ }
+
+ @Override
+ public void setAlignPdbStructures(boolean defaultParameter)
+ {
+ alignPDBStructures = true;
+ }
+
+ @Override
+ public void newStructureView(PDBEntry pdb, SequenceI[] seqs,
+ String[] chains, DataSourceType protocol)
+ {
+ StructureViewer.launchStructureViewer(af.alignPanel, pdb, seqs);
+ }
+
+ @Override
+ public void setFeatureGroupState(String[] groups, boolean state)
+ {
+ af.setFeatureGroupState(groups, state);
+ }
+
+ @Override
+ public void alignedStructureView(PDBEntry[] pdb, SequenceI[][] seqs,
+ String[][] chains, String[] protocols)
+ {
+ System.err.println(
+ "Jalview applet interface alignedStructureView not implemented");
+ }
+
+ @Override
+ public void newFeatureSettings()
+ {
+ System.err.println(
+ "Jalview applet interface newFeatureSettings not implemented");
+ }
+
+ private Vector<Runnable> jsExecQueue;
+
+ @Override
+ public Vector<Runnable> getJsExecQueue(JSFunctionExec exec)
+ {
+ jsFunctionExec = exec;
+ return (jsExecQueue == null ? (jsExecQueue = new Vector<>())
+ : jsExecQueue);
+ }
+
+ @Override
+ public AppletContext getAppletContext()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public boolean isJsfallbackEnabled()
+ {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ @Override
+ public JSObject getJSObject()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public StructureSelectionManagerProvider getStructureSelectionManagerProvider()
+ {
+ // TODO Q: what exactly is this? BH
+ return null;
+ }
+
+ @Override
+ public void updateColoursFromMouseOver(Object source,
+ MouseOverStructureListener mouseOverStructureListener)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public Object[] getSelectionForListener(SequenceGroup seqsel,
+ ColumnSelection colsel, HiddenColumns hidden,
+ SelectionSource source, Object alignFrame)
+ {
+ return appLoader.getSelectionForListener(getCurrentAlignFrame(),
+ seqsel, colsel, hidden, source, alignFrame);
+ }
+
+ @Override
+ public String arrayToSeparatorList(String[] array)
+ {
+ return appLoader.arrayToSeparatorList(array);
+ }
+
+ @Override
+ public Hashtable<String, int[]> getJSHashes()
+ {
+ return (jshashes == null ? (jshashes = new Hashtable<>())
+ : jshashes);
+ }
+
+ @Override
+ public Hashtable<String, Hashtable<String, String[]>> getJSMessages()
+ {
+ return (jsmessages == null ? (jsmessages = new Hashtable<>())
+ : jsmessages);
+ }
+
+ @Override
+ public Object getFrameForSource(VamsasSource source)
+ {
+ if (source != null)
+ {
+ AlignFrame af;
+ if (source instanceof jalview.gui.AlignViewport
+ && source == (af = getCurrentAlignFrame()).getViewport())
+ {
+ // should be valid if it just generated an event!
+ return af;
+ }
+ // TODO: ensure that if '_af' is specified along with a handler
+ // function, then only events from that alignFrame are sent to that
+ // function
+ }
+ return null;
+ }
+
+ @Override
+ public FeatureRenderer getNewFeatureRenderer(AlignViewportI vp)
+ {
+ return new jalview.gui.FeatureRenderer((AlignmentPanel) vp);
+ }
+
+ };
+
+ appLoader = new JalviewAppLoader(true);
+ appLoader.load(app);
+ }
+
+ /**
+ *
+ * @see jalview.bin.JalviewLiteJsApi#getSelectedSequences()
+ */
+ @Override
+ public String getSelectedSequences()
+ {
+ return getSelectedSequencesFrom(getCurrentAlignFrame());
+ }
+
+ /**
+ *
+ * @see jalview.bin.JalviewLiteJsApi#getSelectedSequences(java.lang.String)
+ */
+ @Override
+ public String getSelectedSequences(String sep)
+ {
+ return getSelectedSequencesFrom(getCurrentAlignFrame(), sep);
+ }
+
+ /**
+ *
+ * @see jalview.bin.JalviewLiteJsApi#getSelectedSequencesFrom(jalview.appletgui
+ * .AlignFrame)
+ */
+ @Override
+ public String getSelectedSequencesFrom(AlignFrame alf)
+ {
+ if (alf == null)
+ {
+ alf = getCurrentAlignFrame();
+ }
+ return getSelectedSequencesFrom(alf, null);
+ }
+
+ /**
+ *
+ * @see jalview.bin.JalviewLiteJsApi#getSelectedSequencesFrom(jalview.appletgui
+ * .AlignFrame, java.lang.String)
+ */
+ @Override
+ public String getSelectedSequencesFrom(AlignFrame alf, String sep)
+ {
+ if (alf == null)
+ {
+ alf = getCurrentAlignFrame();
+ }
+ return appLoader.getSelectedSequencesFrom(alf, sep);
+ }
+
+ /**
+ *
+ * @see jalview.bin.JalviewLiteJsApi#getSelectedSequencesFrom(jalview.appletgui
+ * .AlignFrame, java.lang.String)
+ */
+ @Override
+ public void highlight(String sequenceId, String position,
+ String alignedPosition)
+ {
+ highlightIn(null, sequenceId, position,
+ alignedPosition);
+ }
+
+ @Override
+ public void highlightIn(AlignFrame alf, String sequenceId,
+ String position, String alignedPosition)
+ {
+ if (alf == null)
+ {
+ alf = getCurrentAlignFrame();
+ }
+ appLoader.highlightIn(alf, sequenceId, position, alignedPosition);
+ }
+
+ @Override
+ public void select(String sequenceIds, String columns)
+ {
+ selectIn(getCurrentAlignFrame(), sequenceIds, columns, null);
+ }
+
+ @Override
+ public void select(String sequenceIds, String columns, String sep)
+ {
+ selectIn(null, sequenceIds, columns, sep);
+ }
+
+ @Override
+ public void selectIn(AlignFrame alf, String sequenceIds, String columns)
+ {
+ selectIn(alf, sequenceIds, columns, null);
+ }
+
+ @Override
+ public void selectIn(AlignFrame alf, String sequenceIds, String columns,
+ String sep)
+ {
+ if (alf == null)
+ {
+ alf = getCurrentAlignFrame();
+ }
+ appLoader.selectIn(alf, sequenceIds, columns, sep);
+ }
+
+ @Override
+ public String getSelectedSequencesAsAlignment(String format,
+ String suffix)
+ {
+ return getSelectedSequencesAsAlignmentFrom(null,
+ format, suffix);
+ }
+
+ @Override
+ public String getSelectedSequencesAsAlignmentFrom(AlignFrame alf,
+ String format, String sep)
+ {
+ if (alf == null)
+ {
+ alf = getCurrentAlignFrame();
+ }
+ return appLoader.getSelectedSequencesAsAlignmentFrom(alf, format, sep);
+ }
+
+ @Override
+ public String getAlignmentOrder()
+ {
+ return getAlignmentFrom(getCurrentAlignFrame(), null);
+ }
+
+ @Override
+ public String getAlignmentOrderFrom(AlignFrame alf)
+ {
+ return getAlignmentFrom(alf, null);
+ }
+
+ @Override
+ public String getAlignmentOrderFrom(AlignFrame alf, String sep)
+ {
+ if (alf == null)
+ {
+ alf = getCurrentAlignFrame();
+ }
+ return appLoader.getAlignmentOrderFrom(alf, sep);
+ }
+
+ @Override
+ public String orderBy(String order, String undoName)
+ {
+ return orderBy(order, undoName, null);
+ }
+
+ @Override
+ public String orderBy(String order, String undoName, String sep)
+ {
+ return orderAlignmentBy(getCurrentAlignFrame(), order, undoName, sep);
+ }
+
+ @Override
+ public String orderAlignmentBy(AlignFrame alf, String order,
+ String undoName, String sep)
+ {
+ if (alf == null)
+ {
+ alf = getCurrentAlignFrame();
+ }
+ return appLoader.orderAlignmentBy(alf, order, undoName, sep);
+ }
+
+ @Override
+ public String getAlignment(String format)
+ {
+ return getAlignmentFrom(null, format, null);
+ }
+
+ @Override
+ public String getAlignmentFrom(AlignFrame alf, String format)
+ {
+ return getAlignmentFrom(alf, format, null);
+ }
+
+ @Override
+ public String getAlignment(String format, String suffix)
+ {
+ return getAlignmentFrom(getCurrentAlignFrame(), format, suffix);
+ }
+
+ @Override
+ public String getAlignmentFrom(AlignFrame alf, String format,
+ String suffix)
+ {
+ return appLoader.getAlignmentFrom(alf, format, suffix);
+ }
+
+ @Override
+ public void loadAnnotation(String annotation)
+ {
+ loadAnnotationFrom(getCurrentAlignFrame(), annotation);
+ }
+
+ @Override
+ public void loadAnnotationFrom(AlignFrame alf, String annotation)
+ {
+ if (alf == null)
+ {
+ alf = getCurrentAlignFrame();
+ }
+ appLoader.loadAnnotationFrom(alf, annotation);
+ }
+
+ @Override
+ public void loadFeatures(String features, boolean autoenabledisplay)
+ {
+ loadFeaturesFrom(currentAlignFrame, features, autoenabledisplay);
+ }
+
+ @Override
+ public boolean loadFeaturesFrom(AlignFrame alf, String features,
+ boolean autoenabledisplay)
+ {
+ if (alf == null)
+ {
+ alf = getCurrentAlignFrame();
+ }
+ return appLoader.loadFeaturesFrom(alf, features, autoenabledisplay);
+ }
+
+ @Override
+ public String getFeatures(String format)
+ {
+ return getFeaturesFrom(null, format);
+ }
+
+ @Override
+ public String getFeaturesFrom(AlignFrame alf, String format)
+ {
+ if (alf == null)
+ {
+ alf = getCurrentAlignFrame();
+ }
+ return appLoader.getFeaturesFrom(alf, format);
+ }
+
+ @Override
+ public String getAnnotation()
+ {
+ return getAnnotationFrom(null);
+ }
+
+ @Override
+ public String getAnnotationFrom(AlignFrame alf)
+ {
+ if (alf == null)
+ {
+ alf = getCurrentAlignFrame();
+ }
+ return appLoader.getAnnotationFrom(alf);
+ }
+
+// @Override
+// public AlignFrame newView()
+// {
+// return newViewFrom(null, null);
+// }
+//
+// @Override
+// public AlignFrame newView(String name)
+// {
+// return newViewFrom(null, name);
+// }
+//
+// @Override
+// public AlignFrame newViewFrom(AlignFrame alf)
+// {
+// return newViewFrom(alf, null);
+// }
+//
+// @Override
+// public AlignFrame newViewFrom(AlignFrame alf, String name)
+// {
+// if (alf == null)
+// {
+// alf = getCurrentAlignFrame();
+// }
+// return appLoader.newViewFrom(alf, name);
+// }
+
+ @Override
+ public AlignFrame loadAlignment(String text, String title)
+ {
+ return appLoader.loadAlignment(text, AlignFrame.DEFAULT_WIDTH,
+ AlignFrame.DEFAULT_HEIGHT, title);
+ }
+
+ @Override
+ public boolean addPdbFile(AlignFrame alFrame, String sequenceId,
+ String pdbEntryString, String pdbFile)
+ {
+ if (alFrame == null)
+ {
+ alFrame = getCurrentAlignFrame();
+ }
+ return appLoader.addPdbFile(alFrame, sequenceId, pdbEntryString,
+ pdbFile);
+ }
+
+ @Override
+ public void scrollViewToIn(AlignFrame alf, String topRow,
+ String leftHandColumn)
+ {
+ if (alf == null)
+ {
+ alf = getCurrentAlignFrame();
+ }
+ appLoader.scrollViewToIn(alf, topRow, leftHandColumn);
+ }
+
+ @Override
+ public void scrollViewToRowIn(AlignFrame alf, String topRow)
+ {
+ if (alf == null)
+ {
+ alf = getCurrentAlignFrame();
+ }
+ appLoader.scrollViewToRowIn(alf, topRow);
+ }
+
+ @Override
+ public void scrollViewToColumnIn(AlignFrame alf, String leftHandColumn)
+ {
+ if (alf == null)
+ {
+ alf = getCurrentAlignFrame();
+ }
+ appLoader.scrollViewToColumnIn(alf, leftHandColumn);
+ }
+
+ @Override
+ public String getFeatureGroups()
+ {
+ return getFeatureGroupsOn(null);
+ }
+
+ @Override
+ public String getFeatureGroupsOn(AlignFrame alf)
+ {
+ if (alf == null)
+ {
+ alf = getCurrentAlignFrame();
+ }
+ return appLoader.getFeatureGroupsOn(alf);
+ }
+
+ @Override
+ public String getFeatureGroupsOfState(boolean visible)
+ {
+ return getFeatureGroupsOfStateOn(null, visible);
+ }
+
+ @Override
+ public String getFeatureGroupsOfStateOn(AlignFrame alf, boolean visible)
+ {
+ if (alf == null)
+ {
+ alf = getCurrentAlignFrame();
+ }
+ return appLoader.getFeatureGroupsOfStateOn(alf, visible);
+ }
+
+ @Override
+ public void setFeatureGroupState(String groups, boolean state)
+ { // JalviewLite API
+ setFeatureGroupStateOn(null, groups, state);
+ }
+
+ @Override
+ public void setFeatureGroupStateOn(AlignFrame alf, String groups,
+ boolean state)
+ {
+ if (alf == null)
+ {
+ alf = getCurrentAlignFrame();
+ }
+ appLoader.setFeatureGroupStateOn(alf, groups, state);
+ }
+
+ @Override
+ public String getSeparator()
+ {
+ return appLoader.getSeparator();
+ }
+
+ @Override
+ public void setSeparator(String separator)
+ {
+ appLoader.setSeparator(separator);
+ }
+
+ @Override
+ public String getJsMessage(String messageclass, String viewId)
+ {
+ // see http://www.jalview.org/examples/jalviewLiteJs.html
+ return null;
+ }
+
+ /**
+ * Open a new Tree panel on the desktop statically. Params are standard (not
+ * set by Groovy). No dialog is opened.
+ *
+ * @param af
+ * @param treeType
+ * @param modelName
+ * @return null, or the string "label.you_need_at_least_n_sequences" if number
+ * of sequences selected is inappropriate
+ */
+ @Override
+ public Object openTreePanel(AlignFrame af, String treeType,
+ String modelName)
+ { // JalviewJS api
+ if (af == null)
+ {
+ af = getCurrentAlignFrame();
+ }
+ return CalculationChooser.openTreePanel(af, treeType, modelName, null);
+ }
+
+ /**
+ * public static method for JalviewJS API to open a PCAPanel without
+ * necessarily using a dialog.
+ *
+ * @param af
+ * @param modelName
+ * @return the PCAPanel, or the string "label.you_need_at_least_n_sequences"
+ * if number of sequences selected is inappropriate
+ */
+ @Override
+ public Object openPcaPanel(AlignFrame af, String modelName)
+ {
+ if (af == null)
+ {
+ af = getCurrentAlignFrame();
+ }
+ return CalculationChooser.openPcaPanel(af, modelName, null);
+ }
+
+ @Override
+ public String getSelectedSequencesAsAlignment(String format,
+ boolean suffix)
+ {
+ return getSelectedSequencesAsAlignmentFrom(null,
+ format, suffix);
+ }
+
+ @Override
+ public String getSelectedSequencesAsAlignmentFrom(AlignFrame alf,
+ String format, boolean suffix)
+ {
+ if (alf == null)
+ {
+ alf = getCurrentAlignFrame();
+ }
+ return appLoader.getSelectedSequencesAsAlignmentFrom(alf, format,
+ "" + suffix);
+ }
+
+ @Override
+ public String arrayToSeparatorList(String[] array)
+ {
+ return appLoader.arrayToSeparatorList(array);
+ }
+
+ @Override
+ public String[] separatorListToArray(String list)
+ {
+ return appLoader.separatorListToArray(list);
+ }
+
+ //// probably not needed in JalviewJS -- From when Jmol and Jalview did not
+ //// have a direct connection?
+
+ @Override
+ public void setMouseoverListener(String listener)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void setMouseoverListener(AlignFrame af, String listener)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void setSelectionListener(String listener)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void setSelectionListener(AlignFrame af, String listener)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void setStructureListener(String listener, String modelSet)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void removeJavascriptListener(AlignFrame af, String listener)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void mouseOverStructure(String pdbResNum, String chain,
+ String pdbfile)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void showOverview()
+ {
+ currentAlignFrame.overviewMenuItem_actionPerformed(null);
+ }
+
+ public void notifyWorker(AlignCalcWorkerI worker, String status)
+ {
+ // System.out.println("Jalview worker " + worker.getClass().getSimpleName()
+ // + " " + status);
+ }
+
+ @Override
+ public Object parseArguments(String[] args)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+
+
+
}
git://source.jalview.org / jalview.git / blobdiff