Author: echatellier Date: 2012-01-04 16:45:00 +0100 (Wed, 04 Jan 2012) New Revision: 144 Url: http://chorem.org/repositories/revision/vradi/144 Log: Fix compilation Modified: 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 trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/AdminHandler.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/AttachmentListAction.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 2012-01-04 15:16:56 UTC (rev 143) +++ trunk/vradi-services/src/main/java/org/chorem/vradi/services/VradiDataServiceImpl.java 2012-01-04 15:45:00 UTC (rev 144) @@ -525,9 +525,11 @@ fields.put(key, extension.getFieldType(key)); } + // FIXME echatellier 20120104 tag value map WikittyExtension fieldOrderedExtension = new WikittyExtension(extension.getName(), extension.getVersion(), + new HashMap<String, String>(), extension.getRequires(), fields); fieldOrderedExtension.setTagValues(extension.getTagValues()); 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 2012-01-04 15:16:56 UTC (rev 143) +++ trunk/vradi-services/src/main/java/org/chorem/vradi/services/managers/FormTypeManager.java 2012-01-04 15:45:00 UTC (rev 144) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 Codelutin + * Copyright (C) 2009 - 2012 Codelutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -23,6 +23,7 @@ */ package org.chorem.vradi.services.managers; +import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.vradi.VradiConstants.FormTypeTemplateEnum; @@ -155,8 +156,9 @@ newVersion = WikittyUtil.DEFAULT_VERSION; } - WikittyExtension extension = new WikittyExtension(name, newVersion, - requires, new LinkedHashMap<String, FieldType>(fields)); + // FIXME echatellier 20120104 requires array + WikittyExtension extension = new WikittyExtension(name, newVersion, new HashMap<String, String>(), + requires.toArray(new String[]{}), new LinkedHashMap<String, FieldType>(fields)); if (tagValues != null) { for (Map.Entry<String, String> entry : tagValues.entrySet()) { @@ -415,8 +417,9 @@ WikittyExtension formType; try { + // FIXME echatellier 20120104 tag value map formType = new WikittyExtension(formTypeName, - WikittyUtil.DEFAULT_VERSION, + WikittyUtil.DEFAULT_VERSION, new HashMap<String, String>(), Form.EXT_FORM, new LinkedHashMap<String, FieldType>()); wikittyProxy.storeExtension(formType); Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/AdminHandler.java =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/AdminHandler.java 2012-01-04 15:16:56 UTC (rev 143) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/AdminHandler.java 2012-01-04 15:45:00 UTC (rev 144) @@ -1148,8 +1148,10 @@ WikittyExtension uiExtension = context.getBean(); String extensionName = uiExtension.getName(); - WikittyExtension newFormType = new WikittyExtension(extensionName, - uiExtension.getVersion(), uiExtension.getRequires(), null); + + // FIXME echatellier 20120104 tag values empty + WikittyExtension newFormType = new WikittyExtension(extensionName, + uiExtension.getVersion(), uiExtension.getTagValues(), uiExtension.getRequires(), null); // Keep all field names List<String> fieldsNames = new ArrayList<String>(); Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/AttachmentListAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/AttachmentListAction.java 2012-01-04 15:16:56 UTC (rev 143) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/AttachmentListAction.java 2012-01-04 15:45:00 UTC (rev 144) @@ -42,7 +42,7 @@ public String execute() throws Exception { String result = SUCCESS; if (targetId == null) { - attachments = new PagedResult<Attachment>( + attachments = new PagedResult<Attachment>("", 0, 0, "", null, Collections.EMPTY_LIST); } else { WikittyProxy proxy = getProxy();