[jetrix-cvs] SF.net SVN: jetrix:[833] jetrix/trunk/src
Brought to you by:
smanux
Menu
▾
▴
[jetrix-cvs] SF.net SVN: jetrix:[833] jetrix/trunk/src
|
From: <sm...@us...> - 2010-03-08 09:04:52
|
Revision: 833
http://jetrix.svn.sourceforge.net/jetrix/?rev=833&view=rev
Author: smanux
Date: 2010-03-08 09:04:45 +0000 (Mon, 08 Mar 2010)
Log Message:
-----------
Simplified the Block and Special enums
Modified Paths:
--------------
jetrix/trunk/src/java/net/jetrix/commands/ModeCommand.java
jetrix/trunk/src/java/net/jetrix/config/Block.java
jetrix/trunk/src/java/net/jetrix/config/Settings.java
jetrix/trunk/src/java/net/jetrix/config/Special.java
jetrix/trunk/src/java/net/jetrix/filter/DownstackPuzzleGenerator.java
jetrix/trunk/src/java/net/jetrix/protocols/TetrinetProtocol.java
jetrix/trunk/src/test/net/jetrix/filter/DownstackPuzzleGeneratorTest.java
Modified: jetrix/trunk/src/java/net/jetrix/commands/ModeCommand.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/commands/ModeCommand.java 2010-03-07 00:23:41 UTC (rev 832)
+++ jetrix/trunk/src/java/net/jetrix/commands/ModeCommand.java 2010-03-08 09:04:45 UTC (rev 833)
@@ -64,7 +64,7 @@
{
for (Block block : Block.values())
{
- settings.setOccurancy(block, mode[block.getValue()]);
+ settings.setOccurancy(block, mode[block.ordinal()]);
}
settings.setLinesPerSpecial(mode[7]);
Modified: jetrix/trunk/src/java/net/jetrix/config/Block.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/config/Block.java 2010-03-07 00:23:41 UTC (rev 832)
+++ jetrix/trunk/src/java/net/jetrix/config/Block.java 2010-03-08 09:04:45 UTC (rev 833)
@@ -33,35 +33,21 @@
*/
public enum Block
{
- LINE(0, "line"),
- SQUARE(1, "square"),
- LEFTL(2, "leftl"),
- RIGHTL(3, "rightl"),
- LEFTZ(4, "leftz"),
- RIGHTZ(5, "rightz"),
- HALFCROSS(6, "halfcross");
+ LINE,
+ SQUARE,
+ LEFTL,
+ RIGHTL,
+ LEFTZ,
+ RIGHTZ,
+ HALFCROSS;
- private int value;
- private String code;
-
- Block(int value, String code)
- {
- this.value = value;
- this.code = code;
- }
-
- public int getValue()
- {
- return value;
- }
-
public String getCode()
{
- return code;
+ return name().toLowerCase();
}
public String getName(Locale locale)
{
- return Language.getText("command.config.blocks." + code, locale);
+ return Language.getText("command.config.blocks." + getCode(), locale);
}
}
Modified: jetrix/trunk/src/java/net/jetrix/config/Settings.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/config/Settings.java 2010-03-07 00:23:41 UTC (rev 832)
+++ jetrix/trunk/src/java/net/jetrix/config/Settings.java 2010-03-08 09:04:45 UTC (rev 833)
@@ -211,12 +211,12 @@
public int getOccurancy(Block piece)
{
- return isDefaultBlockOccurancy() ? defaultSettings.getOccurancy(piece) : blockOccurancy[piece.getValue()];
+ return isDefaultBlockOccurancy() ? defaultSettings.getOccurancy(piece) : blockOccurancy[piece.ordinal()];
}
public int getOccurancy(Special special)
{
- return isDefaultSpecialOccurancy() ? defaultSettings.getOccurancy(special) : specialOccurancy[special.getValue()];
+ return isDefaultSpecialOccurancy() ? defaultSettings.getOccurancy(special) : specialOccurancy[special.ordinal()];
}
public void setStartingLevel(int startingLevel)
@@ -341,7 +341,7 @@
Arrays.fill(blockOccurancy, 0);
}
- blockOccurancy[block.getValue()] = occurancy;
+ blockOccurancy[block.ordinal()] = occurancy;
}
/**
@@ -360,7 +360,7 @@
Arrays.fill(specialOccurancy, 0);
}
- specialOccurancy[special.getValue()] = occurancy;
+ specialOccurancy[special.ordinal()] = occurancy;
}
/**
Modified: jetrix/trunk/src/java/net/jetrix/config/Special.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/config/Special.java 2010-03-07 00:23:41 UTC (rev 832)
+++ jetrix/trunk/src/java/net/jetrix/config/Special.java 2010-03-08 09:04:45 UTC (rev 833)
@@ -33,32 +33,23 @@
*/
public enum Special
{
- ADDLINE(0, 'a', "addline"),
- CLEARLINE(1, 'c', "clearline"),
- NUKEFIELD(2, 'n', "nukefield"),
- RANDOMCLEAR(3, 'r', "randomclear"),
- SWITCHFIELD(4, 's', "switchfield"),
- CLEARSPECIAL(5, 'b', "clearspecial"),
- GRAVITY(6, 'g', "gravity"),
- QUAKEFIELD(7, 'q', "quakefield"),
- BLOCKBOMB(8, 'o', "blockbomb");
+ ADDLINE('a'),
+ CLEARLINE('c'),
+ NUKEFIELD('n'),
+ RANDOMCLEAR('r'),
+ SWITCHFIELD('s'),
+ CLEARSPECIAL('b'),
+ GRAVITY('g'),
+ QUAKEFIELD('q'),
+ BLOCKBOMB('o');
- private int value;
private final char letter;
- private String code;
- Special(int value, char letter, String code)
+ Special(char letter)
{
- this.value = value;
this.letter = letter;
- this.code = code;
}
- public int getValue()
- {
- return value;
- }
-
public char getLetter()
{
return letter;
@@ -66,12 +57,12 @@
public String getCode()
{
- return code;
+ return name().toLowerCase();
}
public String getName(Locale locale)
{
- return Language.getText("command.config.specials." + code, locale);
+ return Language.getText("command.config.specials." + getCode(), locale);
}
/**
@@ -89,7 +80,7 @@
return special;
}
}
-
+
return null;
}
}
Modified: jetrix/trunk/src/java/net/jetrix/filter/DownstackPuzzleGenerator.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/filter/DownstackPuzzleGenerator.java 2010-03-07 00:23:41 UTC (rev 832)
+++ jetrix/trunk/src/java/net/jetrix/filter/DownstackPuzzleGenerator.java 2010-03-08 09:04:45 UTC (rev 833)
@@ -159,7 +159,7 @@
for (Special special : Special.values())
{
- settings.setOccurancy(special, Integer.parseInt(occurancy[special.getValue()]));
+ settings.setOccurancy(special, Integer.parseInt(occurancy[special.ordinal()]));
}
}
else if (line.startsWith("BLOCK"))
Modified: jetrix/trunk/src/java/net/jetrix/protocols/TetrinetProtocol.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/protocols/TetrinetProtocol.java 2010-03-07 00:23:41 UTC (rev 832)
+++ jetrix/trunk/src/java/net/jetrix/protocols/TetrinetProtocol.java 2010-03-08 09:04:45 UTC (rev 833)
@@ -535,7 +535,7 @@
{
for (int j = 0; j < s.getOccurancy(block); j++)
{
- message.append(Integer.toString(block.getValue() + 1));
+ message.append(Integer.toString(block.ordinal() + 1));
}
}
@@ -546,7 +546,7 @@
{
for (int j = 0; j < s.getOccurancy(special); j++)
{
- message.append(Integer.toString(special.getValue() + 1));
+ message.append(Integer.toString(special.ordinal() + 1));
}
}
Modified: jetrix/trunk/src/test/net/jetrix/filter/DownstackPuzzleGeneratorTest.java
===================================================================
--- jetrix/trunk/src/test/net/jetrix/filter/DownstackPuzzleGeneratorTest.java 2010-03-07 00:23:41 UTC (rev 832)
+++ jetrix/trunk/src/test/net/jetrix/filter/DownstackPuzzleGeneratorTest.java 2010-03-08 09:04:45 UTC (rev 833)
@@ -54,7 +54,7 @@
int[] specials = { 32, 18, 1, 11, 3, 14, 1, 6, 14 };
for (Special special : Special.values())
{
- assertEquals(special.getCode() + " occurancy", specials[special.getValue()], settings.getOccurancy(special));
+ assertEquals(special.getCode() + " occurancy", specials[special.ordinal()], settings.getOccurancy(special));
}
assertEquals("sudden death message", "Time! It's SUDDEN DEATH MODE!", settings.getSuddenDeathMessage());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
