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

checkstyle

Browse Source
This commit is contained in:
jendave
2011-10-28 23:04:23 +00:00
parent ddc4de70e7
commit 4e155bd68c
3 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/config/forge_checks.xml
View File

@@ -198,7 +198,7 @@
<!-- See http://checkstyle.sf.net/config_design.html --> <!-- See http://checkstyle.sf.net/config_design.html -->
<!-- <module name="DesignForExtension"/> --> <!-- <module name="DesignForExtension"/> -->
<module name="FinalClass"/> <module name="FinalClass"/>
<module name="HideUtilityClassConstructor"/> <!-- <module name="HideUtilityClassConstructor"/> -->
<module name="InterfaceIsType"/> <module name="InterfaceIsType"/>
<module name="VisibilityModifier"/> <module name="VisibilityModifier"/>

9
src/main/java/arcane/ui/util/Animation.java
View File

@@ -226,8 +226,7 @@ public abstract class Animation {
*/ */
public static void moveCardToPlay(final int startX, final int startY, final int startWidth, final int endX, public static void moveCardToPlay(final int startX, final int startY, final int startWidth, final int endX,
final int endY, final int endWidth, final CardPanel animationPanel, final CardPanel placeholder, final int endY, final int endWidth, final CardPanel animationPanel, final CardPanel placeholder,
final JLayeredPane layeredPane, final int speed) final JLayeredPane layeredPane, final int speed) {
{
UI.invokeLater(new Runnable() { UI.invokeLater(new Runnable() {
public void run() { public void run() {
final int startHeight = Math.round(startWidth * CardPanel.ASPECT_RATIO); final int startHeight = Math.round(startWidth * CardPanel.ASPECT_RATIO);
@@ -484,12 +483,10 @@ public abstract class Animation {
long delayedTime; long delayedTime;
synchronized (enlargeLock) { synchronized (enlargeLock) {
if (enlargedCardPanel == overPanel) if (enlargedCardPanel == overPanel) {
{
return; // Already showing this card enlarged. return; // Already showing this card enlarged.
} }
if (delay > 0 && delayedCardPanel == overPanel) if (delay > 0 && delayedCardPanel == overPanel) {
{
return; // Already delayed this card. return; // Already delayed this card.
} }
delayedCardPanel = overPanel; delayedCardPanel = overPanel;

12
src/main/java/arcane/ui/util/ManaSymbols.java
View File

@@ -19,7 +19,7 @@ import com.esotericsoftware.minlog.Log;
*/ */
public class ManaSymbols { public class ManaSymbols {
/** Constant <code>manaImages</code>. */ /** Constant <code>manaImages</code>. */
private static final Map<String, Image> manaImages = new HashMap<String, Image>(); private static final Map<String, Image> MANA_IMAGES = new HashMap<String, Image>();
/** Constant <code>replaceSymbolsPattern</code>. */ /** Constant <code>replaceSymbolsPattern</code>. */
private static Pattern replaceSymbolsPattern = Pattern.compile("\\{([^}/]*)/?([^}]*)\\}"); private static Pattern replaceSymbolsPattern = Pattern.compile("\\{([^}/]*)/?([^}]*)\\}");
@@ -35,7 +35,7 @@ public class ManaSymbols {
"defend", "summonsick", "phasing", "counters1", "counters2", "counters3", "countersMulti", "foil01", "defend", "summonsick", "phasing", "counters1", "counters2", "counters3", "countersMulti", "foil01",
"foil02", "foil03", "foil04", "foil05", "foil06", "foil07", "foil08", "foil09", "foil10" }; "foil02", "foil03", "foil04", "foil05", "foil06", "foil07", "foil08", "foil09", "foil10" };
for (String symbol : symbols) { for (String symbol : symbols) {
manaImages.put(symbol, UI.getImageIcon("res/images/symbols-13/" + symbol + ".png").getImage()); MANA_IMAGES.put(symbol, UI.getImageIcon("res/images/symbols-13/" + symbol + ".png").getImage());
} }
} }
@@ -61,7 +61,7 @@ public class ManaSymbols {
StringTokenizer tok = new StringTokenizer(manaCost, " "); StringTokenizer tok = new StringTokenizer(manaCost, " ");
while (tok.hasMoreTokens()) { while (tok.hasMoreTokens()) {
String symbol = tok.nextToken(); String symbol = tok.nextToken();
Image image = manaImages.get(symbol); Image image = MANA_IMAGES.get(symbol);
if (image == null) { if (image == null) {
Log.info("Symbol not recognized \"" + symbol + "\" in mana cost: " + manaCost); Log.info("Symbol not recognized \"" + symbol + "\" in mana cost: " + manaCost);
continue; continue;
@@ -90,7 +90,7 @@ public class ManaSymbols {
StringTokenizer tok = new StringTokenizer(s, " "); StringTokenizer tok = new StringTokenizer(s, " ");
while (tok.hasMoreTokens()) { while (tok.hasMoreTokens()) {
String symbol = tok.nextToken(); String symbol = tok.nextToken();
Image image = manaImages.get(symbol); Image image = MANA_IMAGES.get(symbol);
if (image == null) { if (image == null) {
Log.info("Symbol not recognized \"" + symbol + "\" in string: " + s); Log.info("Symbol not recognized \"" + symbol + "\" in string: " + s);
continue; continue;
@@ -115,7 +115,7 @@ public class ManaSymbols {
* a int. * a int.
*/ */
public static void drawAttack(final Graphics g, final int x, final int y) { public static void drawAttack(final Graphics g, final int x, final int y) {
Image image = manaImages.get("attack"); Image image = MANA_IMAGES.get("attack");
g.drawImage(image, x, y, null); g.drawImage(image, x, y, null);
} }
@@ -134,7 +134,7 @@ public class ManaSymbols {
* a int. * a int.
*/ */
public static void drawSymbol(final String imageName, final Graphics g, final int x, final int y) { public static void drawSymbol(final String imageName, final Graphics g, final int x, final int y) {
Image image = manaImages.get(imageName); Image image = MANA_IMAGES.get(imageName);
g.drawImage(image, x, y, null); g.drawImage(image, x, y, null);
} }