Author: tchemit Date: 2011-08-18 08:30:43 +0200 (Thu, 18 Aug 2011) New Revision: 130 Url: http://chorem.org/repositories/revision/vradi/130 Log: fix savage api change :( Modified: trunk/vradi-services-web/src/test/java/org/chorem/vradi/services/VradiHessianStorageTest.java trunk/vradi-services/src/main/java/org/chorem/vradi/services/VradiDataServiceImpl.java trunk/vradi-services/src/main/java/org/chorem/vradi/services/managers/FormTypeManager.java Modified: trunk/vradi-services/src/main/java/org/chorem/vradi/services/VradiDataServiceImpl.java =================================================================== --- trunk/vradi-services/src/main/java/org/chorem/vradi/services/VradiDataServiceImpl.java 2011-08-16 23:14:01 UTC (rev 129) +++ trunk/vradi-services/src/main/java/org/chorem/vradi/services/VradiDataServiceImpl.java 2011-08-18 06:30:43 UTC (rev 130) @@ -65,6 +65,7 @@ import java.io.File; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collection; import java.util.Date; import java.util.HashMap; @@ -381,7 +382,7 @@ public WikittyExtension updateFormType(String name, Map<String, FieldType> fields, String requires, Map<String, String> tagValues) throws VradiException { - return formTypeManager.updateFormType(name, fields, requires, tagValues); + return formTypeManager.updateFormType(name, fields, Arrays.asList(requires), tagValues); } /** Modified: trunk/vradi-services/src/main/java/org/chorem/vradi/services/managers/FormTypeManager.java =================================================================== --- trunk/vradi-services/src/main/java/org/chorem/vradi/services/managers/FormTypeManager.java 2011-08-16 23:14:01 UTC (rev 129) +++ trunk/vradi-services/src/main/java/org/chorem/vradi/services/managers/FormTypeManager.java 2011-08-18 06:30:43 UTC (rev 130) @@ -133,9 +133,12 @@ * @param requires the new requires of the form type * @param tagValues the new tag values of the form type * @return the form type up to date + * @throws VradiException */ - public WikittyExtension updateFormType(String name, Map<String, FieldType> fields, - String requires, Map<String, String> tagValues) throws VradiException { + public WikittyExtension updateFormType(String name, + Map<String, FieldType> fields, + List<String> requires, + Map<String, String> tagValues) throws VradiException { if (log.isDebugEnabled()) { log.debug("updateFormType(" + name + ", fields, requires, tagValues)"); Modified: trunk/vradi-services-web/src/test/java/org/chorem/vradi/services/VradiHessianStorageTest.java =================================================================== --- trunk/vradi-services-web/src/test/java/org/chorem/vradi/services/VradiHessianStorageTest.java 2011-08-16 23:14:01 UTC (rev 129) +++ trunk/vradi-services-web/src/test/java/org/chorem/vradi/services/VradiHessianStorageTest.java 2011-08-18 06:30:43 UTC (rev 130) @@ -157,7 +157,7 @@ session.setNum(7); wikittyProxy.getWikitty(session).addExtension( - new WikittyExtension("ouaf", "2.0", null, + new WikittyExtension("ouaf", "2.0", (String)null, WikittyUtil.buildFieldMapExtension( "Numeric a", "Numeric b",