Author: sletellier Date: 2011-05-03 15:05:25 +0200 (Tue, 03 May 2011) New Revision: 14 Url: http://chorem.org/repositories/revision/vradi/14 Log: Fix deprecated methods usage Modified: trunk/vradi-services/src/main/java/org/chorem/vradi/services/search/VradiQueryParser.java trunk/vradi-swing/src/main/java/org/chorem/vradi/VradiConfig.java trunk/vradi-swing/src/main/java/org/chorem/vradi/VradiMain.java trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/thesaurus/helpers/ThesaurusDataHelper.java Modified: trunk/vradi-services/src/main/java/org/chorem/vradi/services/search/VradiQueryParser.java =================================================================== --- trunk/vradi-services/src/main/java/org/chorem/vradi/services/search/VradiQueryParser.java 2011-05-03 12:56:01 UTC (rev 13) +++ trunk/vradi-services/src/main/java/org/chorem/vradi/services/search/VradiQueryParser.java 2011-05-03 13:05:25 UTC (rev 14) @@ -86,8 +86,9 @@ log.debug("expression: " + expression); } - Analyzer analyzer = new WhitespaceAnalyzer(); - QueryParser parser = new QueryParser(Version.LUCENE_29, defaultField, analyzer); + Version lucene31 = Version.LUCENE_31; + Analyzer analyzer = new WhitespaceAnalyzer(lucene31); + QueryParser parser = new QueryParser(lucene31, defaultField, analyzer); parser.setAllowLeadingWildcard(true); parser.setDefaultOperator(QueryParser.Operator.AND); Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/VradiConfig.java =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/VradiConfig.java 2011-05-03 12:56:01 UTC (rev 13) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/VradiConfig.java 2011-05-03 13:05:25 UTC (rev 14) @@ -295,12 +295,6 @@ } } - /** Can't be used un @annotation. */ - @Deprecated - public enum Step { - AfterInit, BeforeExit - } - public enum VradiSwingAction implements ApplicationConfig.ActionDef { HELP(_("vradi.action.commandline.help"), VradiAction.class.getName() + "#help", "-h", "--help"), Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/VradiMain.java =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/VradiMain.java 2011-05-03 12:56:01 UTC (rev 13) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/VradiMain.java 2011-05-03 13:05:25 UTC (rev 14) @@ -96,7 +96,7 @@ SwingUtil.checkJAXXContextEntry(context, SwingUtil.newContextEntryDef(VradiAction.class)); final ApplicationConfig config = context.getContextValue(ApplicationConfig.class); - config.doAction(VradiConfig.Step.AfterInit.ordinal()); + config.doAction(0); final LoginHandler handler = UIHelper.getHandler(context, LoginHandler.class); final LoginUI loginUI = new LoginUI(context); Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/thesaurus/helpers/ThesaurusDataHelper.java =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/thesaurus/helpers/ThesaurusDataHelper.java 2011-05-03 12:56:01 UTC (rev 13) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/thesaurus/helpers/ThesaurusDataHelper.java 2011-05-03 13:05:25 UTC (rev 14) @@ -32,7 +32,9 @@ import org.chorem.vradi.services.VradiException; import org.chorem.vradi.services.VradiService; import org.nuiton.wikitty.WikittyProxy; +import org.nuiton.wikitty.search.TreeNodeResult; +import java.util.AbstractMap; import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -176,14 +178,13 @@ public static int getNbFormsForThesaurus(Thesaurus thesaurus) { String wikittyId = thesaurus.getWikittyId(); - Map.Entry<Thesaurus, Integer> entry = - getProxy().restoreNode(Thesaurus.class, wikittyId, null); + TreeNodeResult<Thesaurus> tree = getProxy().findTreeNode(Thesaurus.class, wikittyId, 0, true, null); - if (entry == null) { + if (tree == null) { return 0; } - return entry.getValue(); + return tree.getAttCount(); } protected static List<String> getStringAsList(String s) {