From: Freek D. <mac...@us...> - 2010-01-31 22:23:05
|
Update of /cvsroot/rails/18xx/rails/common In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv382/rails/common Modified Files: GuiDef.java GuiHints.java ServerToClient.java Log Message: Fix indentation: Java files contain 4 spaces, not tabs Index: ServerToClient.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/common/ServerToClient.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ServerToClient.java 14 Jan 2010 20:41:20 -0000 1.1 --- ServerToClient.java 31 Jan 2010 22:22:27 -0000 1.2 *************** *** 22,32 **** private GuiHints guiHints = null; ! public GuiHints getUiHints() { ! return guiHints; ! } ! public void setUiHints(GuiHints guiHints) { ! this.guiHints = guiHints; ! } --- 22,32 ---- private GuiHints guiHints = null; ! public GuiHints getUiHints() { ! return guiHints; ! } ! public void setUiHints(GuiHints guiHints) { ! this.guiHints = guiHints; ! } Index: GuiHints.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/common/GuiHints.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** GuiHints.java 14 Jan 2010 20:41:20 -0000 1.1 --- GuiHints.java 31 Jan 2010 22:22:27 -0000 1.2 *************** *** 19,83 **** public static final long serialVersionUID = 1L; ! /** What round type is currently active in the engine? */ ! private Class<? extends RoundI> currentRoundType = null; ! /** Which windows should be visible? */ ! private List<VisibilityHint> visibilityHints; ! /** Which window type is active and should be on top? */ ! private GuiDef.Panel activePanel; ! public Class<? extends RoundI> getCurrentRoundType() { ! return currentRoundType; ! } ! public void setCurrentRoundType(Class<? extends RoundI> currentRoundType) { ! this.currentRoundType = currentRoundType; ! } ! public List<VisibilityHint> getVisibilityHints() { ! return visibilityHints; ! } ! public void setVisibilityHint(GuiDef.Panel type, boolean visibility) { ! if (visibilityHints == null) { ! visibilityHints = new ArrayList<VisibilityHint>(4); ! } ! visibilityHints.add (new VisibilityHint(type, visibility)); ! } ! public void clearVisibilityHints () { ! if (visibilityHints == null) { ! visibilityHints = new ArrayList<VisibilityHint>(4); ! } else { ! visibilityHints.clear(); ! } ! } ! public GuiDef.Panel getActivePanel() { ! return activePanel; ! } ! public void setActivePanel(GuiDef.Panel activePanel) { ! this.activePanel = activePanel; ! } ! public class VisibilityHint { ! GuiDef.Panel type; ! boolean visibility; ! VisibilityHint (GuiDef.Panel type, boolean visibility) { ! this.type = type; ! this.visibility = visibility; ! } ! public GuiDef.Panel getType() { ! return type; ! } ! public boolean getVisibility() { ! return visibility; ! } ! } } --- 19,83 ---- public static final long serialVersionUID = 1L; ! /** What round type is currently active in the engine? */ ! private Class<? extends RoundI> currentRoundType = null; ! /** Which windows should be visible? */ ! private List<VisibilityHint> visibilityHints; ! /** Which window type is active and should be on top? */ ! private GuiDef.Panel activePanel; ! public Class<? extends RoundI> getCurrentRoundType() { ! return currentRoundType; ! } ! public void setCurrentRoundType(Class<? extends RoundI> currentRoundType) { ! this.currentRoundType = currentRoundType; ! } ! public List<VisibilityHint> getVisibilityHints() { ! return visibilityHints; ! } ! public void setVisibilityHint(GuiDef.Panel type, boolean visibility) { ! if (visibilityHints == null) { ! visibilityHints = new ArrayList<VisibilityHint>(4); ! } ! visibilityHints.add (new VisibilityHint(type, visibility)); ! } ! public void clearVisibilityHints () { ! if (visibilityHints == null) { ! visibilityHints = new ArrayList<VisibilityHint>(4); ! } else { ! visibilityHints.clear(); ! } ! } ! public GuiDef.Panel getActivePanel() { ! return activePanel; ! } ! public void setActivePanel(GuiDef.Panel activePanel) { ! this.activePanel = activePanel; ! } ! public class VisibilityHint { ! GuiDef.Panel type; ! boolean visibility; ! VisibilityHint (GuiDef.Panel type, boolean visibility) { ! this.type = type; ! this.visibility = visibility; ! } ! public GuiDef.Panel getType() { ! return type; ! } ! public boolean getVisibility() { ! return visibility; ! } ! } } Index: GuiDef.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/common/GuiDef.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** GuiDef.java 14 Jan 2010 20:40:26 -0000 1.1 --- GuiDef.java 31 Jan 2010 22:22:27 -0000 1.2 *************** *** 46,53 **** public enum Panel { ! START_ROUND, ! STATUS, ! MAP, ! STOCK_MARKET } } --- 46,53 ---- public enum Panel { ! START_ROUND, ! STATUS, ! MAP, ! STOCK_MARKET } } |