[vassalengine-svn] SF.net SVN: vassalengine:[7957] VASSAL-src/trunk/src/VASSAL
Brought to you by:
rodneykinney,
uckelman
From: <uck...@us...> - 2011-10-27 19:10:10
|
Revision: 7957 http://vassalengine.svn.sourceforge.net/vassalengine/?rev=7957&view=rev Author: uckelman Date: 2011-10-27 19:10:03 +0000 (Thu, 27 Oct 2011) Log Message: ----------- Killed trailing whitespace. Modified Paths: -------------- VASSAL-src/trunk/src/VASSAL/build/AbstractBuildable.java VASSAL-src/trunk/src/VASSAL/build/GameModule.java VASSAL-src/trunk/src/VASSAL/build/GpIdChecker.java VASSAL-src/trunk/src/VASSAL/build/GpIdSupport.java VASSAL-src/trunk/src/VASSAL/build/module/GameRefresher.java VASSAL-src/trunk/src/VASSAL/build/module/ModuleExtension.java VASSAL-src/trunk/src/VASSAL/build/module/StartupGlobalKeyCommand.java VASSAL-src/trunk/src/VASSAL/build/module/metadata/AbstractMetaData.java VASSAL-src/trunk/src/VASSAL/build/module/metadata/SaveMetaData.java VASSAL-src/trunk/src/VASSAL/build/widget/CardSlot.java VASSAL-src/trunk/src/VASSAL/build/widget/PieceSlot.java VASSAL-src/trunk/src/VASSAL/command/ChangeTracker.java VASSAL-src/trunk/src/VASSAL/configure/ChooseComponentPathDialog.java VASSAL-src/trunk/src/VASSAL/configure/ColorConfigurer.java VASSAL-src/trunk/src/VASSAL/configure/ConfigureTree.java VASSAL-src/trunk/src/VASSAL/counters/Embellishment.java VASSAL-src/trunk/src/VASSAL/counters/MassPieceLoader.java VASSAL-src/trunk/src/VASSAL/counters/SendToLocation.java VASSAL-src/trunk/src/VASSAL/launch/AbstractLaunchAction.java VASSAL-src/trunk/src/VASSAL/script/AbstractInterpreter.java VASSAL-src/trunk/src/VASSAL/script/ExpressionInterpreter.java VASSAL-src/trunk/src/VASSAL/tools/BrowserSupport.java VASSAL-src/trunk/src/VASSAL/tools/ErrorDialog.java VASSAL-src/trunk/src/VASSAL/tools/bug/Bug2694Handler.java VASSAL-src/trunk/src/VASSAL/tools/imageop/Op.java VASSAL-src/trunk/src/VASSAL/tools/io/ZipArchive.java Modified: VASSAL-src/trunk/src/VASSAL/build/AbstractBuildable.java =================================================================== --- VASSAL-src/trunk/src/VASSAL/build/AbstractBuildable.java 2011-10-27 19:09:01 UTC (rev 7956) +++ VASSAL-src/trunk/src/VASSAL/build/AbstractBuildable.java 2011-10-27 19:10:03 UTC (rev 7957) @@ -40,7 +40,7 @@ */ public abstract class AbstractBuildable implements Buildable, ValidityChecker { protected List<Buildable> buildComponents = new ArrayList<Buildable>(); - + // Sub-classes can set this reference to perform validity checking protected ValidityChecker validator; Modified: VASSAL-src/trunk/src/VASSAL/build/GameModule.java =================================================================== --- VASSAL-src/trunk/src/VASSAL/build/GameModule.java 2011-10-27 19:09:01 UTC (rev 7956) +++ VASSAL-src/trunk/src/VASSAL/build/GameModule.java 2011-10-27 19:10:03 UTC (rev 7957) @@ -860,8 +860,8 @@ /* * If we are editing, check for duplicate, illegal or missing GamePiece Id's - * and update if necessary. - */ + * and update if necessary. + */ if (theModule.getDataArchive() instanceof ArchiveWriter) { theModule.checkGpIds(); } @@ -898,11 +898,11 @@ public int getNextGpId() { return nextGpId; } - + public void setNextGpId(int id) { nextGpId = id; } - + public void setGpIdSupport(GpIdSupport s) { gpidSupport = s; } @@ -920,9 +920,9 @@ for (PieceSlot pieceSlot : theModule.getAllDescendantComponentsOf(PieceSlot.class)) { checker.add(pieceSlot); } - checker.fixErrors(); + checker.fixErrors(); } - + /** * @return the object which stores data for the module */ Modified: VASSAL-src/trunk/src/VASSAL/build/GpIdChecker.java =================================================================== --- VASSAL-src/trunk/src/VASSAL/build/GpIdChecker.java 2011-10-27 19:09:01 UTC (rev 7956) +++ VASSAL-src/trunk/src/VASSAL/build/GpIdChecker.java 2011-10-27 19:10:03 UTC (rev 7957) @@ -36,39 +36,39 @@ * */ public class GpIdChecker { - + protected GpIdSupport gpIdSupport; protected int maxId; final HashMap<String, SlotElement> goodSlots = new HashMap<String, SlotElement>(); final ArrayList<SlotElement> errorSlots = new ArrayList<SlotElement>(); - + public GpIdChecker() { this(null); } - + public GpIdChecker(GpIdSupport gpIdSupport) { this.gpIdSupport = gpIdSupport; maxId = -1; } - + /** * Add a PieceSlot to our cross-reference and any PlaceMarker * traits it contains. - * + * * @param pieceSlot */ public void add(PieceSlot pieceSlot) { - testGpId(pieceSlot.getGpId(), new SlotElement(pieceSlot)); - - // PlaceMarker traits within the PieceSlot definition also contain GpId's. + testGpId(pieceSlot.getGpId(), new SlotElement(pieceSlot)); + + // PlaceMarker traits within the PieceSlot definition also contain GpId's. GamePiece gp = pieceSlot.getPiece(); - checkTrait(gp, pieceSlot); + checkTrait(gp, pieceSlot); } - + /** - * Check for PlaceMarker traits in a GamePiece and add them to + * Check for PlaceMarker traits in a GamePiece and add them to * the cross-reference - * + * * @param gp * @param slot */ @@ -76,16 +76,16 @@ if (gp == null || gp instanceof BasicPiece) { return; } - + if (gp instanceof PlaceMarker) { - final PlaceMarker pm = (PlaceMarker) gp; - testGpId (pm.getGpId(), new SlotElement(pm, slot)); + final PlaceMarker pm = (PlaceMarker) gp; + testGpId (pm.getGpId(), new SlotElement(pm, slot)); } - + checkTrait(((Decorator) gp).getInner(), slot); - + } - + /** * Validate a GamePieceId. * - non-null @@ -93,7 +93,7 @@ * - Not a duplicate of any other GpId * Keep a list of the good Slots and the slots with errors. * Also track the maximum GpId - * + * * @param id * @param element */ @@ -105,7 +105,7 @@ if (id.contains(":")) { id = id.split(":")[1]; } - + if (id == null || id.length() == 0) { // gpid not generated yet? errorSlots.add(element); } @@ -125,7 +125,7 @@ } } } - + /** * Where any errors found? * @return @@ -133,7 +133,7 @@ public boolean hasErrors() { return errorSlots.size() > 0; } - + /** * Repair any errors * - Update the next GpId in the module if necessary @@ -147,13 +147,13 @@ slotElement.updateGpId(); } } - + /** * Locate the SlotElement that matches oldPiece and return a new GamePiece - * create from that Slot. - * - * - * + * create from that Slot. + * + * + * * @param oldPiece * @return */ @@ -169,14 +169,14 @@ } return element.createPiece(oldPiece); } - - - + + + /** * Wrapper class for components that contain a GpId - They will all be either * PieceSlot components or PlaceMarker Decorator's. - * Ideally we would add an interface to these components, but this - * will break any custom code based on PlaceMarker + * Ideally we would add an interface to these components, but this + * will break any custom code based on PlaceMarker * */ class SlotElement { @@ -206,16 +206,16 @@ public String getGpId() { return id; } - + public void updateGpId() { if (marker == null) { slot.updateGpId(); } else { - marker.updateGpId(); + marker.updateGpId(); } } - + /** * Create a new GamePiece based on this Slot Element. Use oldPiece * to copy state information over to the new piece. Modified: VASSAL-src/trunk/src/VASSAL/build/GpIdSupport.java =================================================================== --- VASSAL-src/trunk/src/VASSAL/build/GpIdSupport.java 2011-10-27 19:09:01 UTC (rev 7956) +++ VASSAL-src/trunk/src/VASSAL/build/GpIdSupport.java 2011-10-27 19:10:03 UTC (rev 7957) @@ -38,7 +38,7 @@ * @return PieceSlot Id */ public String generateGpId(); - + /** * Accessors to check and update the next GpId if necessary. */ Modified: VASSAL-src/trunk/src/VASSAL/build/module/GameRefresher.java =================================================================== --- VASSAL-src/trunk/src/VASSAL/build/module/GameRefresher.java 2011-10-27 19:09:01 UTC (rev 7956) +++ VASSAL-src/trunk/src/VASSAL/build/module/GameRefresher.java 2011-10-27 19:10:03 UTC (rev 7957) @@ -84,25 +84,25 @@ * 1. Use the GpIdChecker to build a cross-reference of all available PieceSlots and * PlaceMarker's in the module. */ - gpIdChecker = new GpIdChecker(); + gpIdChecker = new GpIdChecker(); for (PieceSlot slot : theModule.getAllDescendantComponentsOf(PieceSlot.class)) { gpIdChecker.add(slot); - } + } if (gpIdChecker.hasErrors()) { // Any errors should have been resolved by the GpId check at startup, so this error indicates // a bug in GpIdChecker.fixErrors(). ErrorDialog.show("GameRefresher.no_gpids"); //$NON-NLS-1$ return; } - + /* * 2. Make a list of all pieces in the game that we have access to */ - final Command command = new Chatter.DisplayText(theModule.getChatter(), - Resources.getString("GameRefresher.counters_refreshed", + final Command command = new Chatter.DisplayText(theModule.getChatter(), + Resources.getString("GameRefresher.counters_refreshed", GlobalOptions.getInstance().getPlayerId())); command.execute(); - + final ArrayList<GamePiece> pieces = new ArrayList<GamePiece>(); for (GamePiece piece : theModule.getGameState().getAllPieces()) { @@ -129,7 +129,7 @@ } /* - * 3. Generate the commands to update the pieces + * 3. Generate the commands to update the pieces */ for (GamePiece piece : pieces) { processGamePiece(piece, command); @@ -147,7 +147,7 @@ final Map map = piece.getMap(); final Point pos = piece.getPosition(); GamePiece newPiece = gpIdChecker.createUpdatedPiece(piece); - + final Stack oldStack = piece.getParent(); final int oldPos = oldStack.indexOf(piece); Modified: VASSAL-src/trunk/src/VASSAL/build/module/ModuleExtension.java =================================================================== --- VASSAL-src/trunk/src/VASSAL/build/module/ModuleExtension.java 2011-10-27 19:09:01 UTC (rev 7956) +++ VASSAL-src/trunk/src/VASSAL/build/module/ModuleExtension.java 2011-10-27 19:10:03 UTC (rev 7957) @@ -150,7 +150,7 @@ GameModule.getGameModule().add(this); GameModule.getGameModule().getGameState().addGameComponent(this); - + if (archive instanceof ArchiveWriter) { lastSave = buildString(); @@ -165,7 +165,7 @@ for (Buildable b : getBuildables()) { checkGpIds(b, checker); } - checker.fixErrors(); + checker.fixErrors(); } } @@ -183,7 +183,7 @@ } } - + /** * Allocate new gpid's to all PieceSlots defined in a Buildable and * all of it's children @@ -208,11 +208,11 @@ } } } - + public int getNextGpId() { return nextGpId; } - + public void setNextGpId(int id) { nextGpId = id; } Modified: VASSAL-src/trunk/src/VASSAL/build/module/StartupGlobalKeyCommand.java =================================================================== --- VASSAL-src/trunk/src/VASSAL/build/module/StartupGlobalKeyCommand.java 2011-10-27 19:09:01 UTC (rev 7956) +++ VASSAL-src/trunk/src/VASSAL/build/module/StartupGlobalKeyCommand.java 2011-10-27 19:10:03 UTC (rev 7957) @@ -34,7 +34,7 @@ * in a MultiAction Button and then launched from a single instance of * StartupGlobalKeyCommand, as the sequence in which multiple instances of * StartupGlobalKeyCommand are fired is undetermined. - * + * * @author Pieter Geerkens * */ @@ -65,7 +65,7 @@ public HelpFile getHelpFile() { return HelpFile.getReferenceManualPage("Map.htm", "StartupGlobalKeyCommand"); } - + @Override public VisibilityCondition getAttributeVisibility(String key) { if (BUTTON_TEXT.equals(key) || TOOLTIP.equals(key) || @@ -80,7 +80,7 @@ } //---------------------- GameComponent implementation --------------------- - private boolean hasStarted = false; + private boolean hasStarted = false; @Override public void setup(boolean gameStarting) { Modified: VASSAL-src/trunk/src/VASSAL/build/module/metadata/AbstractMetaData.java =================================================================== --- VASSAL-src/trunk/src/VASSAL/build/module/metadata/AbstractMetaData.java 2011-10-27 19:09:01 UTC (rev 7956) +++ VASSAL-src/trunk/src/VASSAL/build/module/metadata/AbstractMetaData.java 2011-10-27 19:10:03 UTC (rev 7957) @@ -225,7 +225,7 @@ save(out); archive.addFile(getZipEntryName(), out.toInputStream()); } - + /** * Copy the Module metatdata from the current module into the specified * archive. @@ -236,7 +236,7 @@ public void copyModuleMetadata(ArchiveWriter archive) throws IOException { copyModuleMetadata(archive.getArchive()); } - + public void copyModuleMetadata(FileArchive archive) throws IOException { BufferedInputStream in = null; try { @@ -253,7 +253,7 @@ } finally { IOUtils.closeQuietly(in); - } + } } /** Modified: VASSAL-src/trunk/src/VASSAL/build/module/metadata/SaveMetaData.java =================================================================== --- VASSAL-src/trunk/src/VASSAL/build/module/metadata/SaveMetaData.java 2011-10-27 19:09:01 UTC (rev 7956) +++ VASSAL-src/trunk/src/VASSAL/build/module/metadata/SaveMetaData.java 2011-10-27 19:10:03 UTC (rev 7957) @@ -112,7 +112,7 @@ // information. copyModuleMetadata(archive); } - + /** * Add Elements specific to SaveMetaData */ Modified: VASSAL-src/trunk/src/VASSAL/build/widget/CardSlot.java =================================================================== --- VASSAL-src/trunk/src/VASSAL/build/widget/CardSlot.java 2011-10-27 19:09:01 UTC (rev 7956) +++ VASSAL-src/trunk/src/VASSAL/build/widget/CardSlot.java 2011-10-27 19:10:03 UTC (rev 7957) @@ -36,7 +36,7 @@ this(); copyFrom(piece); } - + public static String getConfigureTypeName() { return "Card"; } Modified: VASSAL-src/trunk/src/VASSAL/build/widget/PieceSlot.java =================================================================== --- VASSAL-src/trunk/src/VASSAL/build/widget/PieceSlot.java 2011-10-27 19:09:01 UTC (rev 7956) +++ VASSAL-src/trunk/src/VASSAL/build/widget/PieceSlot.java 2011-10-27 19:10:03 UTC (rev 7957) @@ -89,24 +89,24 @@ panel.addMouseListener(this); panel.addKeyListener(this); } - + public PieceSlot(PieceSlot piece) { this(); copyFrom(piece); } - + public PieceSlot(CardSlot card) { - this((PieceSlot) card); + this((PieceSlot) card); } protected void copyFrom(PieceSlot piece) { c = piece.c; name = piece.name; pieceDefinition = piece.pieceDefinition; - gpidSupport = piece.gpidSupport; + gpidSupport = piece.gpidSupport; gpId = piece.gpId; } - + public class Panel extends JPanel { private static final long serialVersionUID = 1L; protected PieceSlot pieceSlot; Modified: VASSAL-src/trunk/src/VASSAL/command/ChangeTracker.java =================================================================== --- VASSAL-src/trunk/src/VASSAL/command/ChangeTracker.java 2011-10-27 19:09:01 UTC (rev 7956) +++ VASSAL-src/trunk/src/VASSAL/command/ChangeTracker.java 2011-10-27 19:10:03 UTC (rev 7957) @@ -39,7 +39,7 @@ public Command getChangeCommand() { return new ChangePiece(piece.getId(), oldState, Decorator.getOutermost(piece).getState()); } - + public boolean isChanged() { return !oldState.equals(Decorator.getOutermost(piece).getState()); } Modified: VASSAL-src/trunk/src/VASSAL/configure/ChooseComponentPathDialog.java =================================================================== --- VASSAL-src/trunk/src/VASSAL/configure/ChooseComponentPathDialog.java 2011-10-27 19:09:01 UTC (rev 7956) +++ VASSAL-src/trunk/src/VASSAL/configure/ChooseComponentPathDialog.java 2011-10-27 19:10:03 UTC (rev 7957) @@ -51,11 +51,11 @@ Object x[] = node.getUserObjectPath(); Configurable[] userObjectPath = new Configurable[x.length]; - + for (int i = 0; i < x.length; i++) { userObjectPath[i] = (Configurable) x[i]; } - + path = ArrayUtils.copyOfRange(userObjectPath, 1, userObjectPath.length); } else { Modified: VASSAL-src/trunk/src/VASSAL/configure/ColorConfigurer.java =================================================================== --- VASSAL-src/trunk/src/VASSAL/configure/ColorConfigurer.java 2011-10-27 19:09:01 UTC (rev 7956) +++ VASSAL-src/trunk/src/VASSAL/configure/ColorConfigurer.java 2011-10-27 19:10:03 UTC (rev 7957) @@ -107,7 +107,7 @@ Integer.parseInt(st.nextToken()), Integer.parseInt(st.nextToken())); } - } + } catch (NumberFormatException e) { ErrorDialog.dataError(new BadDataReport("not an integer", s, e)); } Modified: VASSAL-src/trunk/src/VASSAL/configure/ConfigureTree.java =================================================================== --- VASSAL-src/trunk/src/VASSAL/configure/ConfigureTree.java 2011-10-27 19:09:01 UTC (rev 7956) +++ VASSAL-src/trunk/src/VASSAL/configure/ConfigureTree.java 2011-10-27 19:10:03 UTC (rev 7957) @@ -371,7 +371,7 @@ final DefaultMutableTreeNode targetNode = getTreeNode(target); final Configurable cutObj = (Configurable) cutData.getUserObject(); final Configurable convertedCutObj = convertChild(target, cutObj); - if (remove(getParent(cutData), cutObj)) { + if (remove(getParent(cutData), cutObj)) { insert(target, convertedCutObj, targetNode.getChildCount()); } copyData = getTreeNode(convertedCutObj); @@ -409,10 +409,10 @@ /** * Some components need to be converted to a new type before insertion. - * + * * Currently this is used to allow cut and paste of CardSlots and PieceSlots * between Decks and GamePiece Palette components. - * + * * @param parent * @param child * @return new Child @@ -428,7 +428,7 @@ return child; } } - + protected boolean isAllowedChildClass(Configurable parent, Class<?> childClass) { final Class<?>[] allowableClasses = parent.getAllowableConfigureComponents(); for (int i = 0; i < allowableClasses.length; i++) { @@ -437,8 +437,8 @@ } } return false; - } - + } + /** * Allocate new PieceSlot Id's to any PieceSlot sub-components * @@ -899,12 +899,12 @@ public void mouseDragged(MouseEvent evt) { } - + protected boolean isValidParent(Configurable parent, Configurable child) { if (parent != null && child != null) { final Class<?> c[] = parent.getAllowableConfigureComponents(); for (int i = 0; i < c.length; ++i) { - if (c[i].isAssignableFrom(child.getClass()) || + if (c[i].isAssignableFrom(child.getClass()) || ((c[i] == CardSlot.class) && (child.getClass() == PieceSlot.class))) { // Allow PieceSlots to be pasted to Decks return true; } Modified: VASSAL-src/trunk/src/VASSAL/counters/Embellishment.java =================================================================== --- VASSAL-src/trunk/src/VASSAL/counters/Embellishment.java 2011-10-27 19:09:01 UTC (rev 7956) +++ VASSAL-src/trunk/src/VASSAL/counters/Embellishment.java 2011-10-27 19:10:03 UTC (rev 7957) @@ -954,7 +954,7 @@ private List<Integer> isPrefix; private static final Integer NEITHER = 0; private static final Integer PREFIX = 1; - private static final Integer SUFFIX = 2; + private static final Integer SUFFIX = 2; private BooleanConfigurer followConfig; private StringConfigurer propertyConfig; Modified: VASSAL-src/trunk/src/VASSAL/counters/MassPieceLoader.java =================================================================== --- VASSAL-src/trunk/src/VASSAL/counters/MassPieceLoader.java 2011-10-27 19:09:01 UTC (rev 7956) +++ VASSAL-src/trunk/src/VASSAL/counters/MassPieceLoader.java 2011-10-27 19:10:03 UTC (rev 7957) @@ -143,7 +143,7 @@ } }); add(dirConfig.getControls()); - + basicConfig.addPropertyChangeListener(new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent e) { if (e.getNewValue() != null) { Modified: VASSAL-src/trunk/src/VASSAL/counters/SendToLocation.java =================================================================== --- VASSAL-src/trunk/src/VASSAL/counters/SendToLocation.java 2011-10-27 19:09:01 UTC (rev 7956) +++ VASSAL-src/trunk/src/VASSAL/counters/SendToLocation.java 2011-10-27 19:10:03 UTC (rev 7957) @@ -206,8 +206,8 @@ } else if ( p == null) { s += "p is null"; } else { - s += "getMap: " + getMap().getMapName() + - "; p: (" + p.x + "," + p.y + + s += "getMap: " + getMap().getMapName() + + "; p: (" + p.x + "," + p.y + "; Position: (" + getPosition().x + "," + getPosition().y + "); map: " + map.getMapName() + ";"; } @@ -287,7 +287,7 @@ catch (BadCoords e) { LogBadGridLocation(dest); reportDataError(this, Resources.getString( - "Error.not_found", "Grid Location"),map.getMapName()); + "Error.not_found", "Grid Location"),map.getMapName()); ; // ignore SendTo request. } } @@ -578,7 +578,7 @@ gridLocationInput = new StringConfigurer(null, "Grid Location: ", p.gridLocation.getFormat()); controls.add(gridLocationInput.getControls()); - + advancedInput = new BooleanConfigurer(null, "Advanced Options", false); advancedInput.addPropertyChangeListener(new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent arg0) { @@ -606,7 +606,7 @@ private void updateVisibility() { // boolean advancedVisible = advancedInput.booleanValue().booleanValue(); advancedInput.getControls().setVisible(!destInput.getValue().equals(DEST_GRIDLOCATION)); - boolean advancedVisible = advancedInput.booleanValue().booleanValue() + boolean advancedVisible = advancedInput.booleanValue().booleanValue() && advancedInput.getControls().isVisible(); xIndexInput.getControls().setVisible(advancedVisible); xOffsetInput.getControls().setVisible(advancedVisible); Modified: VASSAL-src/trunk/src/VASSAL/launch/AbstractLaunchAction.java =================================================================== --- VASSAL-src/trunk/src/VASSAL/launch/AbstractLaunchAction.java 2011-10-27 19:09:01 UTC (rev 7956) +++ VASSAL-src/trunk/src/VASSAL/launch/AbstractLaunchAction.java 2011-10-27 19:10:03 UTC (rev 7957) @@ -283,7 +283,7 @@ cancel(true); return null; } - + // slice tiles for extensions final ExtensionsManager mgr = new ExtensionsManager(lr.module); for (File ext : mgr.getActiveExtensions()) { Modified: VASSAL-src/trunk/src/VASSAL/script/AbstractInterpreter.java =================================================================== --- VASSAL-src/trunk/src/VASSAL/script/AbstractInterpreter.java 2011-10-27 19:09:01 UTC (rev 7956) +++ VASSAL-src/trunk/src/VASSAL/script/AbstractInterpreter.java 2011-10-27 19:10:03 UTC (rev 7957) @@ -62,7 +62,7 @@ } } - + protected void setVar(String name, int value) { try { set(name, value); @@ -72,7 +72,7 @@ WarningDialog.show(e, ""); } } - + protected void setVar(String name, float value) { try { set(name, value); Modified: VASSAL-src/trunk/src/VASSAL/script/ExpressionInterpreter.java =================================================================== --- VASSAL-src/trunk/src/VASSAL/script/ExpressionInterpreter.java 2011-10-27 19:09:01 UTC (rev 7956) +++ VASSAL-src/trunk/src/VASSAL/script/ExpressionInterpreter.java 2011-10-27 19:10:03 UTC (rev 7957) @@ -176,7 +176,7 @@ try { eval(in); } - catch (EvalError e) { + catch (EvalError e) { logger.error("Error trying to read init script: "+ini.toString()); WarningDialog.show(e, ""); } Modified: VASSAL-src/trunk/src/VASSAL/tools/BrowserSupport.java =================================================================== --- VASSAL-src/trunk/src/VASSAL/tools/BrowserSupport.java 2011-10-27 19:09:01 UTC (rev 7956) +++ VASSAL-src/trunk/src/VASSAL/tools/BrowserSupport.java 2011-10-27 19:10:03 UTC (rev 7957) @@ -57,7 +57,7 @@ ErrorDialog.bug(e); } } - + browserLauncher = bl; } Modified: VASSAL-src/trunk/src/VASSAL/tools/ErrorDialog.java =================================================================== --- VASSAL-src/trunk/src/VASSAL/tools/ErrorDialog.java 2011-10-27 19:09:01 UTC (rev 7956) +++ VASSAL-src/trunk/src/VASSAL/tools/ErrorDialog.java 2011-10-27 19:10:03 UTC (rev 7957) @@ -65,7 +65,7 @@ } // use a bug handler if one matches - for (BugHandler bh : bughandlers) { + for (BugHandler bh : bughandlers) { if (bh.accept(thrown)) { bh.handle(thrown); return; Modified: VASSAL-src/trunk/src/VASSAL/tools/bug/Bug2694Handler.java =================================================================== --- VASSAL-src/trunk/src/VASSAL/tools/bug/Bug2694Handler.java 2011-10-27 19:09:01 UTC (rev 7956) +++ VASSAL-src/trunk/src/VASSAL/tools/bug/Bug2694Handler.java 2011-10-27 19:10:03 UTC (rev 7957) @@ -34,8 +34,8 @@ } } } - - return false; + + return false; } public void handle(Throwable thrown) { Modified: VASSAL-src/trunk/src/VASSAL/tools/imageop/Op.java =================================================================== --- VASSAL-src/trunk/src/VASSAL/tools/imageop/Op.java 2011-10-27 19:09:01 UTC (rev 7956) +++ VASSAL-src/trunk/src/VASSAL/tools/imageop/Op.java 2011-10-27 19:10:03 UTC (rev 7957) @@ -114,7 +114,7 @@ ErrorDialog.dataError(new BadDataReport( "Image not found", ((ImageNotFoundException) c).getFile().getName(), - null + null )); return true; } Modified: VASSAL-src/trunk/src/VASSAL/tools/io/ZipArchive.java =================================================================== --- VASSAL-src/trunk/src/VASSAL/tools/io/ZipArchive.java 2011-10-27 19:09:01 UTC (rev 7956) +++ VASSAL-src/trunk/src/VASSAL/tools/io/ZipArchive.java 2011-10-27 19:10:03 UTC (rev 7957) @@ -487,7 +487,7 @@ catch (IOException e) { String err = "Unable to overwrite " + archiveFile.getAbsolutePath() + ": "; - + if (!archiveFile.exists()) { err += " file does not exist."; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |