diff --git a/.gitattributes b/.gitattributes index 5399d299021..5ba30d4f8f2 100644 --- a/.gitattributes +++ b/.gitattributes @@ -10753,6 +10753,7 @@ src/main/java/forge/control/ControlMatchUI.java -text src/main/java/forge/control/ControlWinLose.java -text src/main/java/forge/control/home/ControlConstructed.java -text src/main/java/forge/control/home/ControlQuest.java -text +src/main/java/forge/control/home/package-info.java -text svneol=native#text/plain src/main/java/forge/control/match/ControlDetail.java -text src/main/java/forge/control/match/ControlDock.java -text src/main/java/forge/control/match/ControlField.java -text diff --git a/src/main/java/forge/Card.java b/src/main/java/forge/Card.java index b5b5a25fc13..dbc80bfe07f 100644 --- a/src/main/java/forge/Card.java +++ b/src/main/java/forge/Card.java @@ -1446,7 +1446,7 @@ public class Card extends GameEntity implements Comparable { } else { this.counters.put(counterName, Integer.valueOf(n)); } - + // Run triggers final Map runParams = new TreeMap(); runParams.put("Card", this); diff --git a/src/main/java/forge/CardListUtil.java b/src/main/java/forge/CardListUtil.java index a428bd40479..4fb1e2447a1 100644 --- a/src/main/java/forge/CardListUtil.java +++ b/src/main/java/forge/CardListUtil.java @@ -562,7 +562,7 @@ public class CardListUtil { return cmc; } // sumCMC - + // Get the average converted mana cost of a card list /** *

@@ -577,7 +577,7 @@ public class CardListUtil { return sumCMC(c) / c.size(); - } + } /** * diff --git a/src/main/java/forge/GameActionUtil.java b/src/main/java/forge/GameActionUtil.java index acf2ebad1d1..d73d239f471 100644 --- a/src/main/java/forge/GameActionUtil.java +++ b/src/main/java/forge/GameActionUtil.java @@ -1334,8 +1334,8 @@ public final class GameActionUtil { } } // is a card of a certain type/color present? - if (specialConditions.contains("isPresent")) { - + if (specialConditions.contains("isPresent")) { + final String requirements = specialConditions.replaceAll("isPresent ", ""); CardList cardsinPlay = AllZoneUtil.getCardsIn(Zone.Battlefield); final String[] conditions = requirements.split(","); diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryMana.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryMana.java index a342ff1dff3..6a635611f57 100644 --- a/src/main/java/forge/card/abilityfactory/AbilityFactoryMana.java +++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryMana.java @@ -260,12 +260,12 @@ public class AbilityFactoryMana { final HashMap params = af.getMapParams(); final Card card = af.getHostCard(); - + if (!AbilityFactory.checkConditional(sa)) { AbilityFactoryMana.doDrawback(af, abMana, card); return; } - + // Spells are not undoable abMana.setUndoable(af.isAbility() && abMana.isUndoable()); diff --git a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java index c4a7e9935ba..a67aae715fb 100644 --- a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java +++ b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java @@ -2692,13 +2692,13 @@ public class CardFactoryUtil { m, source); } } - + if (sq[0].contains("LandsPlayed")) { if (players.size() > 0) { return CardFactoryUtil.doXMath(players.get(0).getNumLandsPlayed(), m, source); } } - + if (sq[0].contains("CardsDrawn")) { if (players.size() > 0) { return CardFactoryUtil.doXMath(players.get(0).getNumDrawnThisTurn(), m, source); @@ -2960,7 +2960,7 @@ public class CardFactoryUtil { if (sq[0].contains("YourDamageThisTurn")) { return CardFactoryUtil.doXMath(c.getController().getAssignedDamage(), m, c); } - + if (sq[0].contains("YourLandsPlayed")) { return CardFactoryUtil.doXMath(c.getController().getNumLandsPlayed(), m, c); } diff --git a/src/main/java/forge/control/home/package-info.java b/src/main/java/forge/control/home/package-info.java new file mode 100644 index 00000000000..c661e02554a --- /dev/null +++ b/src/main/java/forge/control/home/package-info.java @@ -0,0 +1,3 @@ +/** Controller (as in model-view-controller) for Forge. */ +package forge.control.home; + diff --git a/src/main/java/forge/gui/MultiLineLabelUI.java b/src/main/java/forge/gui/MultiLineLabelUI.java index 9fc680ad8de..5cdc8b72018 100644 --- a/src/main/java/forge/gui/MultiLineLabelUI.java +++ b/src/main/java/forge/gui/MultiLineLabelUI.java @@ -608,10 +608,10 @@ public class MultiLineLabelUI extends BasicLabelUI implements ComponentListener * Sets the label ui. * * @param labelUI - * the labelUI to set + * the new label ui */ - public static void setLabelUI(final LabelUI labelUI0) { - MultiLineLabelUI.labelUI = labelUI0; + public static void setLabelUI(final LabelUI labelUI) { + MultiLineLabelUI.labelUI = labelUI; } /** diff --git a/src/main/java/forge/gui/MultiPhaseProgressMonitorWithETA.java b/src/main/java/forge/gui/MultiPhaseProgressMonitorWithETA.java index 09f7b894026..46808a784f6 100644 --- a/src/main/java/forge/gui/MultiPhaseProgressMonitorWithETA.java +++ b/src/main/java/forge/gui/MultiPhaseProgressMonitorWithETA.java @@ -56,8 +56,7 @@ public class MultiPhaseProgressMonitorWithETA extends BaseProgressMonitor { * @see #MultiPhaseProgressMonitorWithETA(String,int,long,float,float[]) */ public MultiPhaseProgressMonitorWithETA(final String neoTitle, final int numPhases, - final long totalUnitsFirstPhase, final float minUIUpdateIntervalSec) - { + final long totalUnitsFirstPhase, final float minUIUpdateIntervalSec) { this(neoTitle, numPhases, totalUnitsFirstPhase, minUIUpdateIntervalSec, null); } @@ -88,8 +87,7 @@ public class MultiPhaseProgressMonitorWithETA extends BaseProgressMonitor { * @see BaseProgressMonitor#BaseProgressMonitor(int,long,float,float[]) */ public MultiPhaseProgressMonitorWithETA(final String neoTitle, final int numPhases, - final long totalUnitsFirstPhase, final float minUIUpdateIntervalSec, - final float[] phaseWeights) { + final long totalUnitsFirstPhase, final float minUIUpdateIntervalSec, final float[] phaseWeights) { super(numPhases, totalUnitsFirstPhase, minUIUpdateIntervalSec, phaseWeights); if (!SwingUtilities.isEventDispatchThread()) { @@ -114,65 +112,67 @@ public class MultiPhaseProgressMonitorWithETA extends BaseProgressMonitor { System.out.println("Initializing..."); SwingUtilities.invokeLater(new Runnable() { + @Override + public void run() { + + final int totalUnitsFirstPhase = 5000; + final MultiPhaseProgressMonitorWithETA monitor = new MultiPhaseProgressMonitorWithETA( + "Testing 2 phases", 2, totalUnitsFirstPhase, 1.0f, new float[] { 2, 1 }); + + final SwingWorker worker = new SwingWorker() { @Override - public void run() { + public Object doInBackground() { - final int totalUnitsFirstPhase = 5000; - final MultiPhaseProgressMonitorWithETA monitor = new MultiPhaseProgressMonitorWithETA( - "Testing 2 phases", 2, totalUnitsFirstPhase, 1.0f, new float[] { 2, 1 }); + System.out.println("Running..."); - final SwingWorker worker = new SwingWorker() { - @Override - public Object doInBackground() { + for (int i = 0; i <= totalUnitsFirstPhase; i++) { + monitor.incrementUnitsCompletedThisPhase(1); - System.out.println("Running..."); + System.out.print("\ri = " + i); - for (int i = 0; i <= totalUnitsFirstPhase; i++) { - monitor.incrementUnitsCompletedThisPhase(1); - - System.out.print("\ri = " + i); - - try { - Thread.sleep(1); - } catch (final InterruptedException ignored) { - // blank - } - } - System.out.println(); - - final int totalUnitsSecondPhase = 2000; - monitor.markCurrentPhaseAsComplete(totalUnitsSecondPhase); - - for (int i = 0; i <= totalUnitsSecondPhase; i++) { - monitor.incrementUnitsCompletedThisPhase(1); - - System.out.print("\ri = " + i); - - try { - Thread.sleep(1); - } catch (final InterruptedException ignored) { - // blank - } - } - - monitor.markCurrentPhaseAsComplete(0); - - System.out.println(); - System.out.println("Done!"); - - return null; + try { + Thread.sleep(1); + } catch (final InterruptedException ignored) { + // blank } + } + System.out.println(); - }; + final int totalUnitsSecondPhase = 2000; + monitor.markCurrentPhaseAsComplete(totalUnitsSecondPhase); - worker.execute(); + for (int i = 0; i <= totalUnitsSecondPhase; i++) { + monitor.incrementUnitsCompletedThisPhase(1); + + System.out.print("\ri = " + i); + + try { + Thread.sleep(1); + } catch (final InterruptedException ignored) { + // blank + } + } + + monitor.markCurrentPhaseAsComplete(0); + + System.out.println(); + System.out.println("Done!"); + + return null; } - }); + + }; + + worker.execute(); + } + }); } /** - * @param numUnits cannot be higher than Integer.MAX_VALUE - * + * Sets the total units this phase. + * + * @param numUnits + * cannot be higher than Integer.MAX_VALUE * @see net.slightlymagic.braids.util.progress_monitor.ProgressMonitor#setTotalUnitsThisPhase(long) */ @Override @@ -186,42 +186,44 @@ public class MultiPhaseProgressMonitorWithETA extends BaseProgressMonitor { if (numUnits > 0) { // dialog must exist before we exit this method. UtilFunctions.invokeInEventDispatchThreadAndWait(new Runnable() { - @Override - public void run() { - // (Re)create the progress bar. - if (MultiPhaseProgressMonitorWithETA.this.dialog != null) { - MultiPhaseProgressMonitorWithETA.this.dialog.dispose(); - MultiPhaseProgressMonitorWithETA.this.dialog = null; - } + @Override + public void run() { + // (Re)create the progress bar. + if (MultiPhaseProgressMonitorWithETA.this.dialog != null) { + MultiPhaseProgressMonitorWithETA.this.dialog.dispose(); + MultiPhaseProgressMonitorWithETA.this.dialog = null; + } - MultiPhaseProgressMonitorWithETA.this.dialog = new GuiProgressBarWindow(); - } - }); + MultiPhaseProgressMonitorWithETA.this.dialog = new GuiProgressBarWindow(); + } + }); } SwingUtilities.invokeLater(new Runnable() { - @Override - public void run() { - MultiPhaseProgressMonitorWithETA.this.dialog - .setTitle(MultiPhaseProgressMonitorWithETA.this.title); - MultiPhaseProgressMonitorWithETA.this.dialog - .setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE); - MultiPhaseProgressMonitorWithETA.this.dialog.setVisible(true); - MultiPhaseProgressMonitorWithETA.this.dialog.setResizable(true); - MultiPhaseProgressMonitorWithETA.this.dialog.getProgressBar().setIndeterminate(false); - MultiPhaseProgressMonitorWithETA.this.dialog.setProgressRange(0, (int) numUnits); - MultiPhaseProgressMonitorWithETA.this.dialog.reset(); + @Override + public void run() { + MultiPhaseProgressMonitorWithETA.this.dialog.setTitle(MultiPhaseProgressMonitorWithETA.this.title); + MultiPhaseProgressMonitorWithETA.this.dialog.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE); + MultiPhaseProgressMonitorWithETA.this.dialog.setVisible(true); + MultiPhaseProgressMonitorWithETA.this.dialog.setResizable(true); + MultiPhaseProgressMonitorWithETA.this.dialog.getProgressBar().setIndeterminate(false); + MultiPhaseProgressMonitorWithETA.this.dialog.setProgressRange(0, (int) numUnits); + MultiPhaseProgressMonitorWithETA.this.dialog.reset(); - final JProgressBar bar = MultiPhaseProgressMonitorWithETA.this.dialog.getProgressBar(); - bar.setString(""); - bar.setStringPainted(true); - bar.setValue(0); - } - }); + final JProgressBar bar = MultiPhaseProgressMonitorWithETA.this.dialog.getProgressBar(); + bar.setString(""); + bar.setStringPainted(true); + bar.setValue(0); + } + }); } /** + * Increment units completed this phase. + * + * @param numUnits + * the num units * @see net.slightlymagic.braids.util.progress_monitor.ProgressMonitor#incrementUnitsCompletedThisPhase(long) */ @Override @@ -229,13 +231,13 @@ public class MultiPhaseProgressMonitorWithETA extends BaseProgressMonitor { super.incrementUnitsCompletedThisPhase(numUnits); SwingUtilities.invokeLater(new Runnable() { - @Override - public void run() { - for (int i = 0; i < numUnits; i++) { - MultiPhaseProgressMonitorWithETA.this.dialog.increment(); - } - } - }); + @Override + public void run() { + for (int i = 0; i < numUnits; i++) { + MultiPhaseProgressMonitorWithETA.this.dialog.increment(); + } + } + }); if (this.shouldUpdateUI()) { @@ -300,11 +302,11 @@ public class MultiPhaseProgressMonitorWithETA extends BaseProgressMonitor { @Override public final void dispose() { SwingUtilities.invokeLater(new Runnable() { - @Override - public void run() { - MultiPhaseProgressMonitorWithETA.this.getDialog().dispose(); - } - }); + @Override + public void run() { + MultiPhaseProgressMonitorWithETA.this.getDialog().dispose(); + } + }); } /** diff --git a/src/main/java/forge/gui/game/CardPanel.java b/src/main/java/forge/gui/game/CardPanel.java index 0295eef44c7..a4613f566f8 100644 --- a/src/main/java/forge/gui/game/CardPanel.java +++ b/src/main/java/forge/gui/game/CardPanel.java @@ -122,8 +122,8 @@ public class CardPanel extends JPanel implements CardContainer { * @param connectedCard * the connectedCard to set */ - public void setConnectedCard(final CardPanel connectedCard0) { - this.connectedCard = connectedCard0; + public void setConnectedCard(final CardPanel connectedCard) { + this.connectedCard = connectedCard; } // ~ diff --git a/src/main/java/forge/view/home/HomeTopLevel.java b/src/main/java/forge/view/home/HomeTopLevel.java index 82ba7d17d85..d40d53f8e13 100644 --- a/src/main/java/forge/view/home/HomeTopLevel.java +++ b/src/main/java/forge/view/home/HomeTopLevel.java @@ -125,7 +125,7 @@ public class HomeTopLevel extends FPanel { btnEditor = new FButton(); btnEditor.setText("Deck Editor"); - + btnExit = new FButton(); btnExit.setAction(new AbstractAction() { public void actionPerformed(ActionEvent arg0) { exit(); }