git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b71733c
)
JAL-3127 Sequence ID Colour and nominal spanish translation
author
Jim Procter
<jprocter@issues.jalview.org>
Tue, 20 Nov 2018 06:40:21 +0000
(06:40 +0000)
committer
Jim Procter
<jprocter@issues.jalview.org>
Tue, 20 Nov 2018 06:40:21 +0000
(06:40 +0000)
resources/lang/Messages.properties
patch
|
blob
|
history
resources/lang/Messages_es.properties
patch
|
blob
|
history
src/jalview/schemes/JalviewColourScheme.java
patch
|
blob
|
history
test/jalview/schemes/JalviewColourSchemeTest.java
patch
|
blob
|
history
diff --git
a/resources/lang/Messages.properties
b/resources/lang/Messages.properties
index
ae5b0e7
..
4e31b62
100644
(file)
--- a/
resources/lang/Messages.properties
+++ b/
resources/lang/Messages.properties
@@
-203,6
+203,7
@@
label.colourScheme_purine/pyrimidine = Purine/Pyrimidine
label.colourScheme_nucleotide = Nucleotide
label.colourScheme_t-coffee_scores = T-Coffee Scores
label.colourScheme_rna_helices = By RNA Helices
label.colourScheme_nucleotide = Nucleotide
label.colourScheme_t-coffee_scores = T-Coffee Scores
label.colourScheme_rna_helices = By RNA Helices
+label.colourScheme_sequence_id = Sequence ID Colour
label.blc = BLC
label.fasta = Fasta
label.msf = MSF
label.blc = BLC
label.fasta = Fasta
label.msf = MSF
diff --git
a/resources/lang/Messages_es.properties
b/resources/lang/Messages_es.properties
index
555977d
..
9d337a7
100644
(file)
--- a/
resources/lang/Messages_es.properties
+++ b/
resources/lang/Messages_es.properties
@@
-199,6
+199,7
@@
label.colourScheme_purine/pyrimidine = Purina/Pirimidina
label.colourScheme_nucleotide = Nucleótido
label.colourScheme_t-coffee_scores = Puntuación del T-Coffee
label.colourScheme_rna_helices = Por hélices de RNA
label.colourScheme_nucleotide = Nucleótido
label.colourScheme_t-coffee_scores = Puntuación del T-Coffee
label.colourScheme_rna_helices = Por hélices de RNA
+label.colourScheme_sequence_id = Color de ID de secuencia
label.blc = BLC
label.fasta = Fasta
label.msf = MSF
label.blc = BLC
label.fasta = Fasta
label.msf = MSF
diff --git
a/src/jalview/schemes/JalviewColourScheme.java
b/src/jalview/schemes/JalviewColourScheme.java
index
4422d72
..
456397e
100644
(file)
--- a/
src/jalview/schemes/JalviewColourScheme.java
+++ b/
src/jalview/schemes/JalviewColourScheme.java
@@
-43,7
+43,7
@@
public enum JalviewColourScheme
PurinePyrimidine("Purine/Pyrimidine", PurinePyrimidineColourScheme.class),
RNAHelices("RNA Helices", RNAHelicesColour.class),
TCoffee("T-Coffee Scores", TCoffeeColourScheme.class),
PurinePyrimidine("Purine/Pyrimidine", PurinePyrimidineColourScheme.class),
RNAHelices("RNA Helices", RNAHelicesColour.class),
TCoffee("T-Coffee Scores", TCoffeeColourScheme.class),
- IdColour("Sequence IDs", IdColourScheme.class);
+ IdColour("Sequence ID", IdColourScheme.class);
// RNAInteraction("RNA Interaction type", RNAInteractionColourScheme.class)
private String name;
// RNAInteraction("RNA Interaction type", RNAInteractionColourScheme.class)
private String name;
diff --git
a/test/jalview/schemes/JalviewColourSchemeTest.java
b/test/jalview/schemes/JalviewColourSchemeTest.java
index
d9403d2
..
e8a70e4
100644
(file)
--- a/
test/jalview/schemes/JalviewColourSchemeTest.java
+++ b/
test/jalview/schemes/JalviewColourSchemeTest.java
@@
-24,6
+24,8
@@
public class JalviewColourSchemeTest
assertTrue(JalviewColourScheme.PurinePyrimidine.getSchemeClass() == PurinePyrimidineColourScheme.class);
assertTrue(JalviewColourScheme.TCoffee.getSchemeClass() == TCoffeeColourScheme.class);
assertTrue(JalviewColourScheme.RNAHelices.getSchemeClass() == RNAHelicesColour.class);
assertTrue(JalviewColourScheme.PurinePyrimidine.getSchemeClass() == PurinePyrimidineColourScheme.class);
assertTrue(JalviewColourScheme.TCoffee.getSchemeClass() == TCoffeeColourScheme.class);
assertTrue(JalviewColourScheme.RNAHelices.getSchemeClass() == RNAHelicesColour.class);
+ assertTrue(JalviewColourScheme.IdColour
+ .getSchemeClass() == IdColourScheme.class);
}
@Test(groups = "Functional")
}
@Test(groups = "Functional")
@@
-44,5
+46,6
@@
public class JalviewColourSchemeTest
"Purine/Pyrimidine");
assertEquals(JalviewColourScheme.TCoffee.toString(), "T-Coffee Scores");
assertEquals(JalviewColourScheme.RNAHelices.toString(), "RNA Helices");
"Purine/Pyrimidine");
assertEquals(JalviewColourScheme.TCoffee.toString(), "T-Coffee Scores");
assertEquals(JalviewColourScheme.RNAHelices.toString(), "RNA Helices");
+ assertEquals(JalviewColourScheme.IdColour.toString(), "Sequence ID");
}
}
}
}