[beast-mcmc] r4802 committed - Merged changes from 1.7

[beast...@googlecode.com]

Revision: 4802
Author: rambaut
Date: Thu Mar 8 09:09:33 2012
Log: Merged changes from 1.7
http://code.google.com/p/beast-mcmc/source/detail?r=4802

Modified:

/trunk/src/dr/app/beauti/components/ancestralstates/AncestralStatesComponentGenerator.java
/trunk/src/dr/app/beauti/priorsPanel/PriorsPanel.java

=======================================
---
/trunk/src/dr/app/beauti/components/ancestralstates/AncestralStatesComponentGenerator.java
Tue Mar 6 08:17:03 2012
+++
/trunk/src/dr/app/beauti/components/ancestralstates/AncestralStatesComponentGenerator.java
Thu Mar 8 09:09:33 2012
@@ -35,7 +35,7 @@
if (component.reconstructAtNodes(partition))
reconstructAtNodes = true;
if (component.reconstructAtMRCA(partition)) reconstructAtMRCA
= true;
if (component.isCountingStates(partition)) countingStates =
true;
- if (countingStates && component.dNdSRobustCounting(partition))
dNdSRobustCounting = true;
+ if (component.dNdSRobustCounting(partition))
dNdSRobustCounting = true;
}

if (!reconstructAtNodes && !reconstructAtMRCA && !countingStates
&& !dNdSRobustCounting) {
@@ -52,7 +52,7 @@
case IN_TREES_LOG:
return reconstructAtNodes || countingStates ||
dNdSRobustCounting;

- case IN_OPERATORS:
+ case AFTER_OPERATORS:
return dNdSRobustCounting;

case AFTER_TREES_LOG:
@@ -73,7 +73,7 @@
.getComponentOptions(AncestralStatesComponentOptions.class);

switch (point) {
- case IN_OPERATORS:
+ case AFTER_OPERATORS:
writeCodonPartitionedRobustCounting(writer, component);
break;
case IN_TREE_LIKELIHOOD:
=======================================
--- /trunk/src/dr/app/beauti/priorsPanel/PriorsPanel.java Mon Feb 20
13:07:25 2012
+++ /trunk/src/dr/app/beauti/priorsPanel/PriorsPanel.java Thu Mar 8
09:09:33 2012
@@ -516,15 +516,17 @@
setBackground(UIManager.getColor("Button.background"));
}

- if (value.toString().startsWith("?")) {
+ String text = (value == null) ? "" : value.toString();
+ if (text.toString().startsWith("?")) {
setForeground(undefinedColour);
- } else if (value.toString().startsWith("!")) {
+ } else if (text.toString().startsWith("!")) {
setForeground(improperColour);
} else {
setForeground(UIManager.getColor("Button.foreground"));
}

- setText((value == null) ? "" : value.toString());
+ setText(text);
+
return this;
}
}