Changeset 6986


Ignore:
Timestamp:
Oct 19, 2015, 9:36:34 AM (6 years ago)
Author:
Nicklas Nordborg
Message:

Merge patch release 3.6.1 to the trunk.

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/www/admin/extensions/details.jsp

    r6605 r6986  
    426426        ProcessResults results = ec.getLastScanResults();
    427427        FileResults fileResults = results.getResults(file);
    428         List<Extension> unsafe = ec.checkUnsafeScriptableUsage(file);
     428        List<Extension<?>> unsafe = ec.checkUnsafeScriptableUsage(file);
    429429        %>
    430430        <tbody>
  • trunk/www/admin/extensions/scan_results.jsp

    r6409 r6986  
    8686    {
    8787      ExtensionsFile extFile = fileResults.getExtensionsFile();
    88       List<Extension> unsafe = ec.checkUnsafeScriptableUsage(extFile);
     88      List<Extension<?>> unsafe = ec.checkUnsafeScriptableUsage(extFile);
    8989      String detailsId = Integer.toString(extFile.hashCode());
    9090      List<String> messages = fileResults.getMessages();
  • trunk/www/admin/extensions/tree.jsp

    r6684 r6986  
    221221 
    222222    List<ExtensionPoint> eps = ef.getObjectsOfClass(ExtensionPoint.class);
    223     Collections.sort(eps, Registry.EXTENSIONPOINT_COMPARATOR);
     223    Collections.sort((List)eps, Registry.EXTENSIONPOINT_COMPARATOR);
    224224    for (ExtensionPoint ep : eps)
    225225    {
     
    228228   
    229229    List<Extension> exts = ef.getObjectsOfClass(Extension.class);
    230     Collections.sort(exts, Registry.EXTENSION_COMPARATOR);
     230    Collections.sort((List)exts, Registry.EXTENSION_COMPARATOR);
    231231    String currentGroupId = null;
    232232    JSONObject jsonGroup = null;
  • trunk/www/admin/extensions/wizard.jsp

    r6409 r6986  
    8484      {
    8585        if (xtFile.getFile() == null) continue; // We skip internal extensions/plug-ins files
    86         List<Extension> unsafeExtensions = ec.checkUnsafeScriptableUsage(xtFile);
     86        List<Extension<?>> unsafeExtensions = ec.checkUnsafeScriptableUsage(xtFile);
    8787       
    8888        About about = xtFile.getAbout();
  • trunk/www/plugins/net/sf/basedb/plugins/executor/external_plugin_parameters.jsp

    r6621 r6986  
    5050  import="java.util.Iterator"
    5151  import="java.util.List"
    52   import="java.util.Map" 
    53   import="org.jdom.Element"
     52  import="java.util.Map"
    5453  import="org.json.simple.JSONArray"
    5554  import="org.json.simple.JSONObject"
Note: See TracChangeset for help on using the changeset viewer.