From: <nu...@us...> - 2011-05-12 08:08:28
|
Revision: 14959 http://pcgen.svn.sourceforge.net/pcgen/?rev=14959&view=rev Author: nuance Date: 2011-05-12 08:08:21 +0000 (Thu, 12 May 2011) Log Message: ----------- Whitespace tweaks for readability and some Javadoc tweaks for checkstyle problems. Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/core/GameMode.java Trunk/pcgen/code/src/java/pcgen/core/Globals.java Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java Trunk/pcgen/code/src/java/pcgen/gui/PreferencesDialog.java Modified: Trunk/pcgen/code/src/java/pcgen/core/GameMode.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/GameMode.java 2011-05-12 08:03:06 UTC (rev 14958) +++ Trunk/pcgen/code/src/java/pcgen/core/GameMode.java 2011-05-12 08:08:21 UTC (rev 14959) @@ -1813,8 +1813,7 @@ */ public void setRollMethodExpressionByName(final String aString) { - activeRollMethod = getModeContext().ref - .silentlyGetConstructedCDOMObject(RollMethod.class, aString); + activeRollMethod = getModeContext().ref.silentlyGetConstructedCDOMObject(RollMethod.class, aString); if (activeRollMethod == null) { setRollMethod(Constants.CHARACTERSTATMETHOD_USER); Modified: Trunk/pcgen/code/src/java/pcgen/core/Globals.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/Globals.java 2011-05-12 08:03:06 UTC (rev 14958) +++ Trunk/pcgen/code/src/java/pcgen/core/Globals.java 2011-05-12 08:08:21 UTC (rev 14959) @@ -1812,14 +1812,21 @@ } /** - * roll HP - * @param min - * @param max - * @param name - * @param level - * @return HP + * Roll the hitpoints for a single level. + * + * @param min the minimum number on the die + * @param max the maximum number on the die + * @param name the PC's name (used for a message to the user) + * @param level the level the hit points are being rolled for (used for a message to the user) + * @param totalLevel the level the hitpoints are being rolled for (used in maths) + * @return the hitpoints for the given level. */ - public static int rollHP(final int min, final int max, final String name, final int level, final int totalLevel) + public static int rollHP( + final int min, + final int max, + final String name, + final int level, + final int totalLevel) { int roll; @@ -1832,10 +1839,11 @@ case Constants.HP_AVERAGE: + roll = max - min; + // (n+1)/2 // average roll on a die with an odd # of sides works out exactly // average roll on a die with an even # of sides will have an extra 0.5 - roll = max - min; if (((totalLevel & 0x01) == 0) && ((roll & 0x01) != 0)) { @@ -1867,13 +1875,13 @@ break; //TODO: Can we put these back now? XXX -// case Constants.s_HP_LIVING_GREYHAWK: +// case Constants.HP_LIVING_GREYHAWK: // if (totalLevels == 1) // roll = max; // else // roll = (int)Math.floor((max + min) / 2) + 1; // break; -// case Constants.s_HP_LIVING_CITY: +// case Constants.HP_LIVING_CITY: // if (totalLevels == 1 || totalLevels == 2) // roll = max; // else Modified: Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java 2011-05-12 08:03:06 UTC (rev 14958) +++ Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java 2011-05-12 08:08:21 UTC (rev 14959) @@ -9451,9 +9451,7 @@ switch (method) { case Constants.CHARACTERSTATMETHOD_PURCHASE: - rolls[i] = - SettingsHandler.getGame() - .getPurchaseModeBaseStatScore(this); + rolls[i] = SettingsHandler.getGame().getPurchaseModeBaseStatScore(this); break; case Constants.CHARACTERSTATMETHOD_ALLSAME: rolls[i] = SettingsHandler.getGame().getAllStatsValue(); Modified: Trunk/pcgen/code/src/java/pcgen/gui/PreferencesDialog.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui/PreferencesDialog.java 2011-05-12 08:03:06 UTC (rev 14958) +++ Trunk/pcgen/code/src/java/pcgen/gui/PreferencesDialog.java 2011-05-12 08:08:21 UTC (rev 14959) @@ -1159,24 +1159,16 @@ } // Level up - hpDialogShownAtLevelUp.setSelected(SettingsHandler - .getShowHPDialogAtLevelUp()); + hpDialogShownAtLevelUp.setSelected(SettingsHandler.getShowHPDialogAtLevelUp()); //featDialogShownAtLevelUp.setSelected(SettingsHandler.getShowFeatDialogAtLevelUp()); - statDialogShownAtLevelUp.setSelected(SettingsHandler - .getShowStatDialogAtLevelUp()); - showWarningAtFirstLevelUp.setSelected(SettingsHandler - .isShowWarningAtFirstLevelUp()); - enforceSpendingBeforeLevelUp.setSelected(SettingsHandler - .getEnforceSpendingBeforeLevelUp()); + statDialogShownAtLevelUp.setSelected(SettingsHandler.getShowStatDialogAtLevelUp()); + showWarningAtFirstLevelUp.setSelected(SettingsHandler.isShowWarningAtFirstLevelUp()); + enforceSpendingBeforeLevelUp.setSelected(SettingsHandler.getEnforceSpendingBeforeLevelUp()); // Equipment - allowMetamagicInEqBuilder.setSelected(SettingsHandler - .isMetamagicAllowedInEqBuilder()); - potionMaxLevel.setSelectedIndex(SettingsHandler - .getMaxPotionSpellLevel() - - SPELLLVLMIN); - wandMaxLevel.setSelectedIndex(SettingsHandler.getMaxWandSpellLevel() - - SPELLLVLMIN); + allowMetamagicInEqBuilder.setSelected(SettingsHandler.isMetamagicAllowedInEqBuilder()); + potionMaxLevel.setSelectedIndex(SettingsHandler.getMaxPotionSpellLevel() - SPELLLVLMIN); + wandMaxLevel.setSelectedIndex(SettingsHandler.getMaxWandSpellLevel() - SPELLLVLMIN); if (SettingsHandler.wantToLoadMasterworkAndMagic()) { @@ -1187,36 +1179,31 @@ autoEquipCreate.setSelected(true); } - SettingsHandler.setWantToLoadMasterworkAndMagic(false); // Turn off temporarily so we get current setting - autoMethod1.setSelected(SettingsHandler - .getAutogen(Constants.AUTOGEN_RACIAL)); - autoMethod2.setSelected(SettingsHandler - .getAutogen(Constants.AUTOGEN_MASTERWORK)); - autoMethod3.setSelected(SettingsHandler - .getAutogen(Constants.AUTOGEN_MAGIC)); - autoMethod4.setSelected(SettingsHandler - .getAutogen(Constants.AUTOGEN_EXOTICMATERIAL)); - SettingsHandler.setWantToLoadMasterworkAndMagic(noAutoEquipCreate - .isSelected()); // Reset its state now we are done + // Turn off temporarily so we get current setting + SettingsHandler.setWantToLoadMasterworkAndMagic(false); + autoMethod1.setSelected(SettingsHandler.getAutogen(Constants.AUTOGEN_RACIAL)); + autoMethod2.setSelected(SettingsHandler.getAutogen(Constants.AUTOGEN_MASTERWORK)); + autoMethod3.setSelected(SettingsHandler.getAutogen(Constants.AUTOGEN_MAGIC)); + autoMethod4.setSelected(SettingsHandler.getAutogen(Constants.AUTOGEN_EXOTICMATERIAL)); + + // Reset its state now we are done + SettingsHandler.setWantToLoadMasterworkAndMagic(noAutoEquipCreate.isSelected()); + // Language languagePanel.applyOptionValuesToControls(); // Locations - pcgenCreateBackupCharacter.setSelected(SettingsHandler - .getCreatePcgBackup()); + pcgenCreateBackupCharacter.setSelected(SettingsHandler.getCreatePcgBackup()); // Input - printDeprecationMessages.setSelected(SettingsHandler - .outputDeprecationMessages()); - printUnconstructedDetail.setSelected(SettingsHandler - .inputUnconstructedMessages()); + printDeprecationMessages.setSelected(SettingsHandler.outputDeprecationMessages()); + printUnconstructedDetail.setSelected(SettingsHandler.inputUnconstructedMessages()); // Output paperType.setSelectedIndex(Globals.getSelectedPaper()); weaponProfPrintout.setSelected(SettingsHandler.getWeaponProfPrintout()); - saveOutputSheetWithPC.setSelected(SettingsHandler - .getSaveOutputSheetWithPC()); + saveOutputSheetWithPC.setSelected(SettingsHandler.getSaveOutputSheetWithPC()); printSpellsWithPC.setSelected(SettingsHandler.getPrintSpellsWithPC()); // Sources This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |