Changeset 6982

Timestamp:

Oct 19, 2015, 9:16:45 AM (7 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1957: JasperException? on Plugins & Extensions -> Overview page

Location:

branches/3.6-stable/www

Files:

• admin/extensions/details.jsp (modified) (1 diff)
• admin/extensions/scan_results.jsp (modified) (1 diff)
• admin/extensions/tree.jsp (modified) (2 diffs)
• admin/extensions/wizard.jsp (modified) (1 diff)
• plugins/net/sf/basedb/plugins/executor/external_plugin_parameters.jsp (modified) (1 diff)

branches/3.6-stable/www/admin/extensions/details.jsp

@@ -426 +426 @@
         ProcessResults results = ec.getLastScanResults();
         FileResults fileResults = results.getResults(file);
-        List<Extension> unsafe = ec.checkUnsafeScriptableUsage(file);
+        List<Extension<?>> unsafe = ec.checkUnsafeScriptableUsage(file);
         %>
         <tbody>

branches/3.6-stable/www/admin/extensions/scan_results.jsp

@@ -86 +86 @@
     {
       ExtensionsFile extFile = fileResults.getExtensionsFile();
-      List<Extension> unsafe = ec.checkUnsafeScriptableUsage(extFile);
+      List<Extension<?>> unsafe = ec.checkUnsafeScriptableUsage(extFile);
       String detailsId = Integer.toString(extFile.hashCode());
       List<String> messages = fileResults.getMessages();

branches/3.6-stable/www/admin/extensions/tree.jsp

@@ -221 +221 @@
   
     List<ExtensionPoint> eps = ef.getObjectsOfClass(ExtensionPoint.class);
-    Collections.sort(eps, Registry.EXTENSIONPOINT_COMPARATOR);
+    Collections.sort((List)eps, Registry.EXTENSIONPOINT_COMPARATOR);
     for (ExtensionPoint ep : eps)
     {
@@ -228 +228 @@
     
     List<Extension> exts = ef.getObjectsOfClass(Extension.class);
-    Collections.sort(exts, Registry.EXTENSION_COMPARATOR);
+    Collections.sort((List)exts, Registry.EXTENSION_COMPARATOR);
     String currentGroupId = null;
     JSONObject jsonGroup = null;

branches/3.6-stable/www/admin/extensions/wizard.jsp

@@ -84 +84 @@
       {
         if (xtFile.getFile() == null) continue; // We skip internal extensions/plug-ins files
-        List<Extension> unsafeExtensions = ec.checkUnsafeScriptableUsage(xtFile);
+        List<Extension<?>> unsafeExtensions = ec.checkUnsafeScriptableUsage(xtFile);
         
         About about = xtFile.getAbout();

branches/3.6-stable/www/plugins/net/sf/basedb/plugins/executor/external_plugin_parameters.jsp

@@ -50 +50 @@
   import="java.util.Iterator"
   import="java.util.List"
-  import="java.util.Map"  
-  import="org.jdom.Element"
+  import="java.util.Map"
   import="org.json.simple.JSONArray"
   import="org.json.simple.JSONObject"