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

Refactor/Code Cleanup

Browse Source
This commit is contained in:
Anthony Calosa
2019-09-02 18:08:56 +08:00
parent 83b6b9faeb
commit c38bae910a
411 changed files with 1354 additions and 3010 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuest.java
View File

@@ -221,7 +221,7 @@ public final class CEditorQuest extends CDeckEditor<Deck> {
if (n == 0) {
s = "Remove custom rating";
} else {
s = "Rate this card as " + Integer.toString(n) + " stars";
s = "Rate this card as " + n + " stars";
}
GuiUtils.addMenuItem(cmb.getMenu(), s,
KeyStroke.getKeyStroke(48 + n, 0),

8
forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuestCardShop.java
View File

@@ -83,10 +83,10 @@ public final class CEditorQuestCardShop extends ACEditorBase<InventoryItem, Deck
private DragCell probsParent = null;
// remember changed gui elements
private String CCTabLabel = new String();
private String CCAddLabel = new String();
private String CDTabLabel = new String();
private String CDRemLabel = new String();
private String CCTabLabel = "";
private String CCAddLabel = "";
private String CDTabLabel = "";
private String CDRemLabel = "";
private String prevRem4Label = null;
private String prevRem4Tooltip = null;
private Runnable prevRem4Cmd = null;

8
forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorTokenViewer.java
View File

@@ -24,10 +24,10 @@ public class CEditorTokenViewer extends ACEditorBase<PaperToken, DeckBase> {
private List<PaperToken> fullCatalogCards;
// remember changed gui elements
private String CCTabLabel = new String();
private String CCAddLabel = new String();
private String CDTabLabel = new String();
private String CDRemLabel = new String();
private String CCTabLabel = "";
private String CCAddLabel = "";
private String CDTabLabel = "";
private String CDRemLabel = "";
private String prevRem4Label = null;
private String prevRem4Tooltip = null;
private Runnable prevRem4Cmd = null;

4
forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/ContestGauntletLister.java
View File

@@ -79,8 +79,8 @@ public class ContestGauntletLister extends JPanel {
name = gd.getName();
name = name.substring(GauntletIO.PREFIX_LOCKED.length());
progress = String.valueOf(Math.round(
((double) gd.getCompleted() / (double) gd.getDecks().size()) * 100)) + " %";
progress = Math.round(
((double) gd.getCompleted() / (double) gd.getDecks().size()) * 100) + " %";
if (gd.getUserDeck() == null) {
progress = "---";

4
forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/QuickGauntletLister.java
View File

@@ -110,8 +110,8 @@ public class QuickGauntletLister extends JPanel {
row.add(new FLabel.Builder().text(String.valueOf(gd.getDecks().size()))
.fontAlign(SwingConstants.RIGHT).build(),
"w 90px!, h 20px!, gap 0 0 5px 0");
row.add(new FLabel.Builder().text(String.valueOf(Math.round(
((double) gd.getCompleted() / (double) gd.getDecks().size()) * 100)) + "%")
row.add(new FLabel.Builder().text(Math.round(
((double) gd.getCompleted() / (double) gd.getDecks().size()) * 100) + "%")
.fontAlign(SwingConstants.RIGHT).build(),
"w 90px!, h 20px!, gap 0 0 5px 0");
this.add(row, "w 98%!, h 30px!, gap 1% 0 0 0");

2
forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuQuestData.java
View File

@@ -49,7 +49,7 @@ public enum VSubmenuQuestData implements IVSubmenu<CSubmenuQuestData> {
private final FLabel lblTitleNew = new FLabel.Builder().text(localizer.getMessage("lblStartanewQuest")).opaque(true).fontSize(16).build();
String str=new String( ForgeConstants.QUEST_SAVE_DIR.replace('\\', '/'));
String str= ForgeConstants.QUEST_SAVE_DIR.replace('\\', '/');
private final FLabel lblOldQuests = new FLabel.Builder().text(localizer.getMessage("lblOldQuestData").replace("%s",str)).fontAlign(SwingConstants.CENTER).fontSize(12).build();
private final QuestFileLister lstQuests = new QuestFileLister();
private final FScrollPane scrQuests = new FScrollPane(lstQuests, false);

2
forge-gui-desktop/src/main/java/forge/screens/home/quest/ViewItem.java
View File

@@ -89,7 +89,7 @@ public class ViewItem extends FPanel {
ViewItem.this.lblIcon.setIcon(i);
ViewItem.this.lblName.setText(bazaarItem.getPurchaseName());
ViewItem.this.lblPrice.setText("Cost: " + String.valueOf(bazaarItem.getBuyingPrice(qA)) + " credits");
ViewItem.this.lblPrice.setText("Cost: " + bazaarItem.getBuyingPrice(qA) + " credits");
String desc = bazaarItem.getPurchaseDescription(qA);
ViewItem.this.tarDesc.setText(FSkin.encodeSymbols(desc, false)); //encode in case there are mana symbols in description

1
forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java
View File

@@ -101,7 +101,6 @@ import forge.util.gui.SOptionPane;
import forge.view.FView;
import forge.view.arcane.CardPanel;
import forge.view.arcane.FloatingZone;
import forge.match.input.*;
/**
* Constructs instance of match UI controller, used as a single point of

2
forge-gui-desktop/src/main/java/forge/screens/match/VAssignDamage.java
View File

@@ -174,7 +174,7 @@ public class VAssignDamage {
final JPanel pnlDefenders = new JPanel();
pnlDefenders.setOpaque(false);
int cols = attackerHasTrample ? blockers.size() + 1 : blockers.size();
final String wrap = "wrap " + Integer.toString(cols);
final String wrap = "wrap " + cols;
pnlDefenders.setLayout(new MigLayout("insets 0, gap 0, ax center, " + wrap));
final FScrollPane scrDefenders = new FScrollPane(pnlDefenders, false);

2
forge-gui-desktop/src/main/java/forge/toolbox/imaging/FImagePanel.java
View File

@@ -282,7 +282,7 @@ public class FImagePanel extends JPanel {
at.translate(this.getWidth() / 2, this.getHeight() / 2);
// 3. rotate around (0,0).
at.rotate(Math.toRadians((double) degreesOfRotation));
at.rotate(Math.toRadians(degreesOfRotation));
// 2. scale image.
if (createScaleTransform) {

2
forge-gui-desktop/src/main/java/forge/toolbox/special/PlayerDetailsPanel.java
View File

@@ -213,7 +213,7 @@ public class PlayerDetailsPanel extends JPanel {
}
public void setToolTip(final String... args) {
super.setToolTipText(String.format(tooltip, (Object[]) args));
super.setToolTipText(String.format(tooltip, args));
}
@Override

2
forge-gui-desktop/src/main/java/forge/view/arcane/CardPanel.java
View File

@@ -693,7 +693,7 @@ public class CardPanel extends SkinnedPanel implements CardContainer, IDisposabl
titleText.setText(card.getCurrentState().getName());
final int damage = card.getDamage();
damageText.setText(damage > 0 ? "\u00BB " + String.valueOf(damage) + " \u00AB" : "");
damageText.setText(damage > 0 ? "\u00BB " + damage + " \u00AB" : "");
// Card Id overlay
cardIdText.setText(card.getCurrentState().getDisplayId());

2
forge-gui-desktop/src/test/java/forge/planarconquestgenerate/PlanarConquestCommanderGeneraterGA.java
View File

@@ -109,7 +109,7 @@ public class PlanarConquestCommanderGeneraterGA extends PlanarConquestGeneraterG
@Override
protected Deck mutateObject(Deck parent1) {
PaperCard allele = parent1.getCommanders().get(0);
if(!standardMap.keySet().contains(allele.getName())){
if(!standardMap.containsKey(allele.getName())){
return null;
}
return getDeckForCard(allele);

6
forge-gui-desktop/src/test/java/forge/planarconquestgenerate/PlanarConquestGeneraterGA.java
View File

@@ -174,7 +174,7 @@ public class PlanarConquestGeneraterGA extends AbstractGeneticAlgorithm<Deck> {
@Override
protected Deck mutateObject(Deck parent1) {
PaperCard allele = parent1.getMain().get(MyRandom.getRandom().nextInt(8));
if(!standardMap.keySet().contains(allele.getName())){
if(!standardMap.containsKey(allele.getName())){
return null;
}
return getDeckForCard(allele);
@@ -184,8 +184,8 @@ public class PlanarConquestGeneraterGA extends AbstractGeneticAlgorithm<Deck> {
protected Deck createChild(Deck parent1, Deck parent2) {
PaperCard allele = parent1.getMain().get(MyRandom.getRandom().nextInt(8));
PaperCard allele2 = parent2.getMain().get(MyRandom.getRandom().nextInt(8));
if(!standardMap.keySet().contains(allele.getName())
||!standardMap.keySet().contains(allele2.getName())
if(!standardMap.containsKey(allele.getName())
||!standardMap.containsKey(allele2.getName())
||allele.getName().equals(allele2.getName())){
return null;
}