Changeset 7789


Ignore:
Timestamp:
Mar 2, 2020, 2:31:15 PM (22 months ago)
Author:
Nicklas Nordborg
Message:

Fixes some compilation warnings.

Location:
branches/3.16-stable
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/3.16-stable/src/core/net/sf/basedb/core/Path.java

    r7748 r7789  
    2323package net.sf.basedb.core;
    2424
    25 import java.io.UnsupportedEncodingException;
    2625import java.net.URLEncoder;
    2726import java.nio.charset.Charset;
  • branches/3.16-stable/www/common/columns/ajax.jsp

    r7773 r7789  
    2626  import="net.sf.basedb.core.AnnotationType"
    2727  import="net.sf.basedb.core.Annotation"
     28  import="net.sf.basedb.core.BasicItem"
    2829  import="net.sf.basedb.core.Item"
    2930  import="net.sf.basedb.core.Type"
     
    3233  import="net.sf.basedb.core.plugin.GuiContext"
    3334  import="net.sf.basedb.util.Values"
     35  import="net.sf.basedb.util.formatter.Formatter"
    3436  import="net.sf.basedb.util.error.ThrowableUtil"
    3537  import="net.sf.basedb.util.extensions.ExtensionsInvoker"
     
    119121    JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
    120122    jspContext.setAttribute("lazy-loading", false);
    121     ExtensionsInvoker<ListColumnAction<Object,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);
     123    ExtensionsInvoker<ListColumnAction<BasicItem, ?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);
    122124   
    123125    JSONArray jsonLazy = new JSONArray();
     
    125127    for (Integer id : items)
    126128    {
    127       Object item = itemType.getById(dc, id);
     129      BasicItem item = itemType.getById(dc, id);
    128130      JSONObject jsonItem = new JSONObject();
    129131      JSONArray jsonCols = new JSONArray();
     
    131133      jsonItem.put("data", jsonCols);
    132134     
    133       for (ListColumnAction col : columnsInvoker)
     135      for (ListColumnAction<BasicItem, ?> col : columnsInvoker)
    134136      {
    135137        if (col.getId().startsWith("/"))
    136138        {
    137           jsonCols.add(col.getFormatter().format(col.getValue(dc, item)));
     139          @SuppressWarnings("unchecked")
     140          Formatter<Object> f = (Formatter<Object>)col.getFormatter();
     141          jsonCols.add(f.format(col.getValue(dc, item)));
    138142        }
    139143      }
  • branches/3.16-stable/www/views/itemlists/view_list.jsp

    r7747 r7789  
    350350          item="SYNCFILTER"
    351351          action="syncfilter/index.jsp"
    352           dragcolumns="false"
     352          dragcolumns="<%=false%>"
    353353          >
    354354          <tbl:hidden name="list_id" value="<%=Integer.toString(itemId) %>" />
Note: See TracChangeset for help on using the changeset viewer.