jalview

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
minor changes

    • binary
    /swingjs/ver/3.2.9-j11/SwingJS-site.zip
    • binary
    /swingjs/ver/3.2.9/SwingJS-site.zip
    • -3
    • +3
    /test/jalview/gui/JvSwingUtilsTest.java
JAL-3446 SwingJS update

-fixes desktop frame not taking focus when clicked, so not processing

menu shortcuts

    • binary
    /swingjs/ver/3.2.9/SwingJS-site.zip
JAL-3664 shortcuts in Desktop not working from AlignFrame

- missing test for JInternalFrame in JComponent.processKeyBindings

    • binary
    /swingjs/ver/3.2.9/SwingJS-site.zip
JAL-3446 fixing a bad merge, sorry

JAL-3446 separated out potential exceptions for simplified key mask operation

JAL-3446 removing mouse button test debug

SwingJS upgrade fixes AlignmentPanel keyPressed not called

- ContentPane was getting the message, not JInternalFrame

    • binary
    /swingjs/ver/3.2.9-j11/SwingJS-site.zip
    • binary
    /swingjs/ver/3.2.9/SwingJS-site.zip
JAL-3446 from applet -- reload; also fixes some repaint issues

    • -23
    • +56
    /src/jalview/gui/AlignFrame.java
    • -37
    • +56
    /src/jalview/gui/AnnotationPanel.java
    • -4
    • +15
    /src/jalview/gui/PaintRefresher.java
    • -2
    • +16
    /src/jalview/io/VamsasAppDatastore.java
    • -11
    • +18
    /src/jalview/project/Jalview2XML.java
    • -0
    • +6
    /src/jalview/util/jarInputStreamProvider.java
JAL-3624 code tidy

    • -0
    • +14
    /test/jalview/util/PlatformTest.java
    • -31
    • +11
    /test/jalview/ws/sifts/SiftsClientTest.java
JAL-3624 unneeded import removed

    • -3
    • +2
    /src/jalview/ws/sifts/SiftsSettings.java
JAL-3446 separated out potential exceptions for simplified key mask operation

JAL-3446 misplaced } removed drop and window listeners from JS

JAL-3446 no need for SHIFT_DOWN or ALT_DOWN masks

First try at merging didn't go so well.

Merge branch 'Jalview-JS/develop.JAL-3446.ctrlDown' into Jalview-JS/develop

Conflicts:

src/jalview/bin/JalviewJS2.java

src/jalview/gui/Desktop.java

src/jalview/util/Platform.java

    • -30
    • +28
    /src/jalview/jbgui/GAlignFrame.java
JAL-3446, JAL-3647 after first successful test run; removing debug messages

    • -17
    • +23
    /src/jalview/gui/AlignmentPanel.java
Bamboo #36 checking component sizes

    • -7
    • +13
    /test/jalview/gui/SeqCanvasTest.java
Bamboo text #35 - simpler logic; avoids impossible repaint, validation?

    • -40
    • +13
    /src/jalview/gui/AlignmentPanel.java
Bamboo test #3 The problem is not threading. It is feedback from ViewportRanges to AlignmentPanel from trying to set the ranges to invalid values.

    • -0
    • +13
    /src/jalview/gui/AlignmentPanel.java
Bamboo test - setting method priorities

Bamboo test 2 -- threads and stacktrace

So close! Bamboo test

JAL-3446 JAL-3645 tooltip testing not intended to be checked in.

JAL-3645 errant "g" in JavaDoc

JAL-3446 from applet, JAL-3584 tooltip fixes <br> and allows different html style coding for Java and JavaScript Conflicts: src/jalview/gui/JvSwingUtils.java

    • -18
    • +31
    /src/jalview/gui/JvSwingUtils.java
JAL-3446 from applet, JAL-3584 tooltip fixes <br> and allows different html style coding for Java and JavaScript

    • -21
    • +18
    /src/jalview/gui/JvSwingUtils.java
JAL-3446 SwingJS upgrade for html labels and tooltips preferred size fix

- adds display:inline-block to label spans

- better testing for isHTML in labels

    • binary
    /swingjs/ver/3.2.9/SwingJS-site.zip
JAL-3446 more tweaks to tests failing on build server

    • -1
    • +0
    /test/jalview/gui/AlignViewportTest.java
Merge branch 'Jalview-JS/develop' of https://source.jalview.org/git/jalview.git into Jalview-JS/develop

JAL-3446 tests - Popup/HTML changes in Applet

- <br> indicates no additional line breaks.

- removal of unrealistic tests ("false" tests of jws2Discoverer HTML

messages)

- accepts either <br> or <br/> (as does JLabel)

    • -15
    • +24
    /src/jalview/gui/JvSwingUtils.java
    • -9
    • +28
    /test/jalview/gui/JvSwingUtilsTest.java
    • -7
    • +11
    /test/jalview/gui/PopupMenuTest.java