Author: sletellier Date: 2011-05-17 15:52:51 +0200 (Tue, 17 May 2011) New Revision: 24 Url: http://chorem.org/repositories/revision/vradi/24 Log: - Fix cartography - Remove full screen menu Modified: trunk/vradi-services/src/main/java/org/chorem/vradi/services/managers/ThesaurusManager.java trunk/vradi-swing/src/main/java/org/chorem/vradi/VradiConfigHelper.java trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/VradiMainUI.jaxx trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/content/AdminThesaurusHandler.java Modified: trunk/vradi-services/src/main/java/org/chorem/vradi/services/managers/ThesaurusManager.java =================================================================== --- trunk/vradi-services/src/main/java/org/chorem/vradi/services/managers/ThesaurusManager.java 2011-05-17 13:52:07 UTC (rev 23) +++ trunk/vradi-services/src/main/java/org/chorem/vradi/services/managers/ThesaurusManager.java 2011-05-17 13:52:51 UTC (rev 24) @@ -212,7 +212,7 @@ // return entry.getValue(); // FIXME sletellier 20110427: verify that return same result - TreeNodeResult<Thesaurus> tree = wikittyProxy.findTreeNode(Thesaurus.class, thesaurusId, 0, true, null); + TreeNodeResult<Thesaurus> tree = wikittyProxy.findTreeNode(Thesaurus.class, thesaurusId, 1, true, null); return tree.getAttCount(); } Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/VradiConfigHelper.java =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/VradiConfigHelper.java 2011-05-17 13:52:07 UTC (rev 23) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/VradiConfigHelper.java 2011-05-17 13:52:51 UTC (rev 24) @@ -108,17 +108,17 @@ return result != null && result; } - public static Locale getLocale(ApplicationConfig config) { - Locale result = config.getOption(Locale.class, VradiConfig.VradiSwingOption.LOCALE.key); - return result; - } - public static void setFullscreen(ApplicationConfig config, boolean fullscreen) { boolean oldValue = isFullScreen(config); config.setOption(VradiConfig.VradiSwingOption.FULL_SCREEN.key, fullscreen + ""); config.saveForUser(); } + public static Locale getLocale(ApplicationConfig config) { + Locale result = config.getOption(Locale.class, VradiConfig.VradiSwingOption.LOCALE.key); + return result; + } + public static void setLocale(ApplicationConfig config, Locale newLocale) { config.setOption(VradiConfig.VradiSwingOption.LOCALE.key, newLocale.toString()); config.saveForUser(); Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/VradiMainUI.jaxx =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/VradiMainUI.jaxx 2011-05-17 13:52:07 UTC (rev 23) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/VradiMainUI.jaxx 2011-05-17 13:52:51 UTC (rev 24) @@ -76,12 +76,14 @@ onActionPerformed="getHandler().changeLanguage(this, Locale.UK)"/--> </JMenu> - <JSeparator/> + + <!-- sletellier 20110510 : Dont work anymore... --> + <!--JSeparator/> <JMenuItem id='menuFileFullscreen' onActionPerformed="getHandler().changeScreen(this, true)"/> <JMenuItem id='menuFileNormalscreen' onActionPerformed="getHandler().changeScreen(this, false)"/> - <JSeparator/> + <JSeparator/--> <JMenuItem id='menuFileExit' onActionPerformed="getHandler().close(mainFrame)"/> </JMenu> Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/content/AdminThesaurusHandler.java =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/content/AdminThesaurusHandler.java 2011-05-17 13:52:07 UTC (rev 23) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/content/AdminThesaurusHandler.java 2011-05-17 13:52:51 UTC (rev 24) @@ -77,6 +77,7 @@ /** @author sletellier <letellier@codelutin.com> */ public class AdminThesaurusHandler { + /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(AdminThesaurusHandler.class);