Changeset 7789

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:

• src/core/net/sf/basedb/core/Path.java (modified) (1 diff)
• www/common/columns/ajax.jsp (modified) (5 diffs)
• www/views/itemlists/view_list.jsp (modified) (1 diff)

branches/3.16-stable/src/core/net/sf/basedb/core/Path.java

@@ -23 +23 @@
 package net.sf.basedb.core;
 
-import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.nio.charset.Charset;

branches/3.16-stable/www/common/columns/ajax.jsp

@@ -26 +26 @@
   import="net.sf.basedb.core.AnnotationType"
   import="net.sf.basedb.core.Annotation"
+  import="net.sf.basedb.core.BasicItem"
   import="net.sf.basedb.core.Item"
   import="net.sf.basedb.core.Type"
@@ -32 +33 @@
   import="net.sf.basedb.core.plugin.GuiContext"
   import="net.sf.basedb.util.Values"
+  import="net.sf.basedb.util.formatter.Formatter"
   import="net.sf.basedb.util.error.ThrowableUtil"
   import="net.sf.basedb.util.extensions.ExtensionsInvoker"
@@ -119 +121 @@
     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, null);
     jspContext.setAttribute("lazy-loading", false);
-    ExtensionsInvoker<ListColumnAction<Object,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);
+    ExtensionsInvoker<ListColumnAction<BasicItem, ?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);
     
     JSONArray jsonLazy = new JSONArray();
@@ -125 +127 @@
     for (Integer id : items)
     {
-      Object item = itemType.getById(dc, id);
+      BasicItem item = itemType.getById(dc, id);
       JSONObject jsonItem = new JSONObject();
       JSONArray jsonCols = new JSONArray();
@@ -131 +133 @@
       jsonItem.put("data", jsonCols);
       
-      for (ListColumnAction col : columnsInvoker)
+      for (ListColumnAction<BasicItem, ?> col : columnsInvoker)
       {
         if (col.getId().startsWith("/"))
         {
-          jsonCols.add(col.getFormatter().format(col.getValue(dc, item)));
+          @SuppressWarnings("unchecked")
+          Formatter<Object> f = (Formatter<Object>)col.getFormatter();
+          jsonCols.add(f.format(col.getValue(dc, item)));
         }
       }

branches/3.16-stable/www/views/itemlists/view_list.jsp

@@ -350 +350 @@
           item="SYNCFILTER"
           action="syncfilter/index.jsp"
-          dragcolumns="false"
+          dragcolumns="<%=false%>"
           >
           <tbl:hidden name="list_id" value="<%=Integer.toString(itemId) %>" />