From: <aki...@us...> - 2006-12-14 22:00:37
|
Revision: 1066 http://svn.sourceforge.net/gridarta/?rev=1066&view=rev Author: akirschbaum Date: 2006-12-14 14:00:37 -0800 (Thu, 14 Dec 2006) Log Message: ----------- Unify declaration order and comments. Modified Paths: -------------- trunk/crossfire/src/cfeditor/CMainControl.java trunk/daimonin/src/daieditor/CMainControl.java Modified: trunk/crossfire/src/cfeditor/CMainControl.java =================================================================== --- trunk/crossfire/src/cfeditor/CMainControl.java 2006-12-14 21:49:25 UTC (rev 1065) +++ trunk/crossfire/src/cfeditor/CMainControl.java 2006-12-14 22:00:37 UTC (rev 1066) @@ -106,6 +106,9 @@ /** The Animation Objects. */ private AnimationObjects animationObjects; + /** The Face Objects. */ + private FaceObjects faceObjects; + // icons for the map and arch pictures. private static ImageIcon mapSelIcon; @@ -174,8 +177,6 @@ /** Pickmaps cannot be edited while lockedPickmaps is true. */ private boolean lockAllPickmaps = false; - private FaceObjects faceObjects; - /** Constructs the main controller and its model and view. */ public CMainControl() { instance = this; @@ -193,6 +194,14 @@ } /** + * Get the Face Objects. + * @return faceObjects + */ + public FaceObjects getFaceObjects() { + return faceObjects; + } + + /** * Initialises this main controller. * @param doShow <code>true</code> for showing, <code>false</code> for not showing. */ @@ -285,14 +294,6 @@ } /** - * Get the Face Objects. - * @return faceObjects - */ - public FaceObjects getFaceObjects() { - return faceObjects; - } - - /** * Set the mapiew to show tiles of the given type. * (If no tileEdit is set, everything is displayed) * @param v tileedit bitmask of types to show Modified: trunk/daimonin/src/daieditor/CMainControl.java =================================================================== --- trunk/daimonin/src/daieditor/CMainControl.java 2006-12-14 21:49:25 UTC (rev 1065) +++ trunk/daimonin/src/daieditor/CMainControl.java 2006-12-14 22:00:37 UTC (rev 1066) @@ -382,7 +382,9 @@ return faceObjects; } - /** Initialises this main controller. */ + /** + * Initialises this main controller. + */ void init() { // Get the current directory currentDir = new File(System.getProperty("user.dir")); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |