[Arianne-commits] stendhal/src/games/stendhal/client/gui X11KeyConfig.java, 1.13, 1.14

[Hendrik <nh...@us...>]

Update of /cvsroot/arianne/stendhal/src/games/stendhal/client/gui
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv10619/src/games/stendhal/client/gui

Modified Files:
	X11KeyConfig.java 
Log Message:
sorted methods (no additional changes as the diff will be quite confusing)

Index: X11KeyConfig.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/gui/X11KeyConfig.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** X11KeyConfig.java	18 Sep 2006 06:40:15 -0000	1.13
--- X11KeyConfig.java	18 Sep 2006 06:45:28 -0000	1.14
***************
*** 32,35 ****
--- 32,76 ----
  	private static Logger logger = Logger.getLogger(X11KeyConfig.class);
  
+ 	// ------------------------------------------------------------------------
+ 	//                     public api (singleton and result)
+ 	// ------------------------------------------------------------------------
+ 
+ 	private X11KeyConfig() {
+ 		// hide constructor, this is a static class
+ 	}
+ 
+ 	/**
+ 	 * Gets X11KeyConfig (singleton pattern)
+ 	 *
+ 	 * @return X11KeyConfig
+ 	 */
+ 	public static synchronized X11KeyConfig get() {
+ 		if (instance == null) {
+ 			load();
+ 			instance = new X11KeyConfig();
+ 		}
+ 		return instance;
+ 	}
+ 
+ 	/**
+ 	 * Did the setting of DetectableAutoRepeat work?
+ 	 *
+ 	 * @return true on success; false otherwise
+ 	 */
+ 	public static boolean getResult() {
+ 		try {
+ 			return getSetDetectableAutoRepeat();
+ 		} catch (Exception e) {
+ 			logger.error(e, e);
+ 		} catch (Error e) {
+ 			logger.error(e, e);
+ 		}
+ 		return false;
+ 	}
+ 
+ 	// ------------------------------------------------------------------------
+ 	//                        loading of native library
+ 	// ------------------------------------------------------------------------
+ 	
  	// don't put this in a static init because it should only be invoked on linux
  	private static void load() {
***************
*** 68,71 ****
--- 109,116 ----
  	}
  
+ 	// ------------------------------------------------------------------------
+ 	//                      copying of a resouce from .jar
+ 	// ------------------------------------------------------------------------
+ 
  	/**
  	 * write library to home as there seems to be no way to load a
***************
*** 126,165 ****
  	}
  
- 	private X11KeyConfig() {
- 		// hide constructor, this is a static class
- 	}
  
! 	/**
! 	 * Gets X11KeyConfig (singleton pattern)
! 	 *
! 	 * @return X11KeyConfig
! 	 */
! 	public static synchronized X11KeyConfig get() {
! 		if (instance == null) {
! 			load();
! 			instance = new X11KeyConfig();
! 		}
! 		return instance;
! 	}
  
  	private static native boolean getSetDetectableAutoRepeat();
  
  	/**
- 	 * Did the setting of DetectableAutoRepeat work?
- 	 *
- 	 * @return true on success; false otherwise
- 	 */
- 	public static boolean getResult() {
- 		try {
- 			return getSetDetectableAutoRepeat();
- 		} catch (Exception e) {
- 			logger.error(e, e);
- 		} catch (Error e) {
- 			logger.error(e, e);
- 		}
- 		return false;
- 	}
- 
- 	/**
  	 * draws some stuff as prove of concept but realy invokes
  	 * XkbSetDetectableAutoRepeat. We need to do this stupid
--- 171,182 ----
  	}
  
  
! 	// ------------------------------------------------------------------------
! 	//                             native interface
! 	// ------------------------------------------------------------------------
  
  	private static native boolean getSetDetectableAutoRepeat();
  
  	/**
  	 * draws some stuff as prove of concept but realy invokes
  	 * XkbSetDetectableAutoRepeat. We need to do this stupid