external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 18:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor tweak in InputSelectTargets and some string refactoring

Browse Source
This commit is contained in:
kevlahnota
2017-09-05 20:53:54 +00:00
parent 5c18270826
commit 00cbfa45d7
17 changed files with 174 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-gui-mobile/src/forge/screens/match/views/VAssignDamage.java
View File

@@ -39,6 +39,7 @@ import forge.toolbox.FLabel;
import forge.toolbox.FOptionPane;
import forge.toolbox.FScrollPane;
import forge.util.Callback;
import forge.util.TextUtil;
import forge.util.Utils;
import forge.util.WaitCallback;
@@ -419,7 +420,8 @@ public class VAssignDamage extends FDialog {
dt.label.setText(sb.toString());
}
lblTotalDamage.setText(String.format("Available damage points: %d (of %d)", damageLeft, totalDamageToAssign));
lblTotalDamage.setText(TextUtil.concatNoSpace("Available damage points: ",
String.valueOf(damageLeft), " (of ", String.valueOf(totalDamageToAssign), ")"));
setButtonEnabled(1, damageLeft == 0);
lblAssignRemaining.setVisible(allHaveLethal && damageLeft > 0);
}

5
forge-gui-mobile/src/forge/screens/match/winlose/ViewWinLose.java
View File

@@ -2,6 +2,7 @@ package forge.screens.match.winlose;
import java.util.List;
import forge.util.TextUtil;
import org.apache.commons.lang3.StringUtils;
import com.badlogic.gdx.Input.Keys;
@@ -127,9 +128,9 @@ public class ViewWinLose extends FOverlay implements IWinLoseView<FButton> {
if (winner == null) {
return "It's a draw!";
} else if (winningTeam != -1) {
return String.format("Team %d won!", Integer.valueOf(winningTeam));
return TextUtil.concatNoSpace("Team ", String.valueOf(winningTeam), " won!");
} else {
return String.format("%s won!", winner);
return TextUtil.concatNoSpace(winner, " won!");
}
}