Changeset 6965
- Timestamp:
- Oct 2, 2015, 9:26:28 AM (7 years ago)
- Location:
- trunk/src
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/clients/web/net/sf/basedb/clients/web/AnnotationUtil.java
r6947 r6965 179 179 // Load annotation type information 180 180 Type valueType = at.getValueType(); 181 Formatter formatter =FormatterFactory.getTypeFormatter(dc.getSessionControl(), valueType);181 Formatter<Object> formatter = (Formatter<Object>)FormatterFactory.getTypeFormatter(dc.getSessionControl(), valueType); 182 182 183 183 jsonAt.put("id", at.getId()); … … 297 297 298 298 @SuppressWarnings("unchecked") 299 static void createJSON(JSONObject json, DbControl dc, Annotation a, Formatter formatter, boolean formatAll)299 static void createJSON(JSONObject json, DbControl dc, Annotation a, Formatter<Object> formatter, boolean formatAll) 300 300 { 301 301 json.put("id", a.getId()); … … 311 311 312 312 // Populate the values array 313 List values = a.getValues(null);313 List<?> values = a.getValues(null); 314 314 if (values != null) 315 315 { -
trunk/src/core/net/sf/basedb/core/ItemContext.java
r6936 r6965 57 57 import java.util.Arrays; 58 58 import java.util.Collection; 59 import java.util.Collections;60 59 import java.util.Iterator; 61 60 import java.util.Map; -
trunk/src/plugins/core/net/sf/basedb/plugins/executor/IOSupport.java
r6898 r6965 22 22 package net.sf.basedb.plugins.executor; 23 23 24 import net.sf.basedb.core.BaseException;25 24 import net.sf.basedb.core.ProgressReporter; 26 25 import net.sf.basedb.core.SessionControl; -
trunk/src/test/TestItemList.java
r6891 r6965 23 23 24 24 import java.util.ArrayList; 25 import java.util.Collections;26 25 import java.util.Date; 27 26 import java.util.List;
Note: See TracChangeset
for help on using the changeset viewer.