From: Jim Procter Date: Mon, 3 Feb 2014 16:49:32 +0000 (+0000) Subject: Merge branch 'JAL-957_jbake' into r281_JAL-957 X-Git-Tag: Jalview_2_9~204^2~4^2~3 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=dd1aed40cf00d837d1643918c380546a1dd2d39a;p=jalview.git Merge branch 'JAL-957_jbake' into r281_JAL-957 Conflicts: build.xml examples/linkedapplets_ng.html --- dd1aed40cf00d837d1643918c380546a1dd2d39a diff --cc build.xml index 12e16a8,990cbe6..d11047e --- a/build.xml +++ b/build.xml @@@ -59,284 -59,233 +59,231 @@@ --> - - - - - - - - - - --> + + + + + + + + + + --> - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - + - - - - - - - - - - - - - + + + + + + + + + + + + + + - - + + - - - - - - -
+ + + + + + +
---Jalview Build Details---
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - Jalview - The Barton Group - - Jalview Multiple Alignment Editor - Jalview - - - - - - - - - - - - - - - - - - - - - - - - Jalview - The Barton Group - - Jalview Multiple Alignment Editor - Jalview - - - - - + + - - - + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - Jalview - The Barton Group - - Jalview Multiple Alignment Editor - Jalview - - - - - - - + - + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - + + + + + + + - - - - - - - - - - - - java -classpath ${run.classpath} jalview.bin.Jalview + + + + + + + + + + + + java -classpath ${run.classpath} jalview.bin.Jalview - + - + + + + + Jalview + The Barton Group + + Jalview Multiple Alignment Editor + Jalview + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + Build External Client Code process aborted by user. Jalview source is unchanged. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - ++ ++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + diff --cc examples/linkedapplets_ng.html index 4c67efc,1c3fd41..6aa5479 --- a/examples/linkedapplets_ng.html +++ b/examples/linkedapplets_ng.html @@@ -1,108 -1,88 +1,88 @@@ - + + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8) + * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle + * + * 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. + * + * 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 . +--> - - Linked Jalview Applets Demo + Linked JalviewLites - - - + + - - - - + + + - + - - +// close layer when click-out +document.onclick = mclose; +// --> + + @@@ -165,19 -143,56 +145,56 @@@
-
+
- JalviewLite Linked Applets Demo
 -

The two applets below use JalviewLite's javascript API to exchange events about the currently selected region and mouse position in the alignment. + + + + +

+
+
+ Examples aren't working ?
Try the unsigned applet demos +
+
+

Quick Links to jars for example:
jalviewApplet.jar and JmolApplet.jar +

+
+
+ + + + + +

JalviewLite Linked Applets Demo

+

The two applets below use JalviewLite's javascript API to exchange events about the currently selected region and mouse position in the alignment.