jalview

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
JAL-3368 retaining branch for future SwingJS reference

JAL-3437 Desktop File...Load Project fails in JalviewJS

- just needed to use the File object rather than the file name in the

call to Jalview2XML.loadJalviewAlign

JAL-3445 branch for BSML file reading development

    • -0
    • +225
    /src/jalview/io/BSMLFile.java
JAL-3453 test changes needed to allow tests to proceed unheeded by dialogs.

adding SwingJS notes for JAR file source in srcjar/

    • -0
    • +5
    /srcjar/intervalstore/README_SWINGJS.txt
    • -0
    • +6
    /srcjar/net/miginfocom/README_SWINGJS.txt
Merge branch 'Jalview-JS/JAL-3253-applet' of https://source.jalview.org/git/jalview.git into Jalview-JS/JAL-3253-applet

JAL-3459 org.json code removed

- moved to unused/

- supplied by SwingJS-site.zip

- only differences are in a few JavaScript-specific issues

- this move has NO EFFECT on the JavaScript, as SwingJS-site.zip is

unzipped last, overwriting whatever this code would have placed in

site/swingjs/j2s anyway.

    • -2411
    • +0
    /src/org/json/JSONObject.java
    • -45
    • +0
    /src/org/json/JSONPointerException.java
    • -43
    • +0
    /src/org/json/JSONPropertyIgnore.java
    • -47
    • +0
    /src/org/json/JSONPropertyName.java
  1. … 55 more files in changeset.
JAL-3210 Just about working transpilation. Some work needed for new Java 11 classes

    • -0
    • +32
    /utils/jalviewjs/template.html
    • binary
    /utils/testlibs/classgraph-4.1.6.jar
JAL-3066 Create labels for fields and hack it to work with multiple valued parameters

    • -2
    • +2
    /src/jalview/gui/OptsAndParamsPage.java
    • -2
    • +16
    /src/jalview/ws/params/simple/BooleanOption.java
    • -0
    • +16
    /src/jalview/ws/params/simple/Option.java
    • -16
    • +29
    /src/jalview/ws/slivkaws/SlivkaParamSet.java
JAL-3261 no save in setColourPropertyNoSave !

JAL-3261 tidy up get/set properties in Cache, Javadoc, tests

    • -1
    • +1
    /src/jalview/gui/ColourMenuHelper.java
JAL-3458 redraw alignment and Overview on Cancel in Feature Settings

    • -9
    • +39
    /src/jalview/gui/FeatureSettings.java
Merge remote-tracking branch 'origin/tasks/JAL-3070_wsinterfaces' into alpha/JAL-3066_Jalview_212_slivka-integration

JAL-3066 change service type naming to avoid menu entry duplication.

Merge branch 'develop' into documentation/JAL-3407_2.11.1_release

Merge branch 'Jalview-JS/JAL-3253-applet' of https://source.jalview.org/git/jalview.git into Jalview-JS/JAL-3253-applet

JAL-3070 set calcId and autocalculated flags for annotation returned by the service

JAL-3210 Two fixed tests (previously not compiling)

    • -1
    • +2
    /test/jalview/ws/SequenceFetcherTest.java
JAL-3210 Two fixed tests (previously not compiling)

    • -1
    • +2
    /test/jalview/ws/SequenceFetcherTest.java
Revert "JAL-3210 Moving j2s components around"

This reverts commit ea88f37133ba49aca6cd7bf0cc4242c0594cebf1.

    • -0
    • +523
    /site-resources/examples/PF00111_seed.stk
    • binary
    /site-resources/examples/jaxbtest.jvx
    • -0
    • +6
    /site-resources/examples/rna_ss_test.stk
  1. … 45 more files in changeset.
JAL-3210 Moving j2s components around

    • -523
    • +0
    /site-resources/examples/PF00111_seed.stk
    • binary
    /site-resources/examples/jaxbtest.jvx
    • -6
    • +0
    /site-resources/examples/rna_ss_test.stk
  1. … 45 more files in changeset.
JAL-3210 Moving j2s components around

    • -523
    • +0
    /site-resources/examples/PF00111_seed.stk
    • binary
    /site-resources/examples/jaxbtest.jvx
    • -6
    • +0
    /site-resources/examples/rna_ss_test.stk
  1. … 45 more files in changeset.
Merge branch 'Jalview-JS/JAL-3253-applet' of https://source.jalview.org/git/jalview.git into Jalview-JS/JAL-3253-applet

JAL-3444 missed commit of removal of object creation test.

Merge branch 'tasks/JAL-3070_wsinterfaces' into alpha/JAL-3066_Jalview_212_slivka-integration

JAL-3383 javadoc

JAL-3070 registerWorker start its thread automatically, so don’t also call startWorker !

JAL-3454 tidy comments

    • -4
    • +1
    /src/jalview/io/AppletFormatAdapter.java
JAL-3070 use object identity equivalence for lists of workers and Cache.log.debug messages