Changeset 7606


Ignore:
Timestamp:
Feb 27, 2019, 9:09:14 AM (5 years ago)
Author:
Nicklas Nordborg
Message:

References #2151: Pre-compile all JSP pages before releases

Switched to JSON.simple 1.1.1-1 from ​http://dev.thep.lu.se/basehacks/wiki/JSON.simple

There is now only a single "unchecked" compilation warning remaining.

Location:
trunk
Files:
1 added
1 deleted
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/.classpath

    r7528 r7606  
    1717  <classpathentry kind="lib" path="lib/dist/tar.jar"/>
    1818  <classpathentry kind="lib" path="lib/dist/commons-io-1.4.jar"/>
    19   <classpathentry kind="lib" path="lib/dist/json-simple-1.1.1.jar"/>
    2019  <classpathentry kind="lib" path="lib/svn/svnant-1.4dev.jar"/>
    2120  <classpathentry kind="lib" path="lib/dist/jdom-2.0.6.jar"/>
    … …  
    3534  <classpathentry kind="lib" path="lib/dist/commons-collections4-4.2.jar"/>
    3635  <classpathentry kind="lib" path="lib/dist/bcprov-jdk15on-160.jar"/>
     36  <classpathentry kind="lib" path="lib/dist/json-simple-1.1.1-1.jar"/>
    3737  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
    3838  <classpathentry kind="output" path="xbin"/>

  • trunk/src/clients/web/net/sf/basedb/clients/web/AnnotationUtil.java

    r7334 r7606  
    6868    See: common/annotations/batch_inherit.jsp (and .js)
    6969  */
    70   @SuppressWarnings("unchecked")
    7170  public static JSONObject loadJsonForBatchInherit(DbControl dc, AnnotationType at)
    7271  {
    … …  
    160159 
    161160 
    162   @SuppressWarnings("unchecked")
    163161  public static JSONObject createJsonForAnnotationTypeAndAnnotation(DbControl dc, AnnotationType at,
    164162    Annotation a, Annotation inherited, boolean isProtocolParameter, Set<AnnotationTypeCategory> allCategories)
    … …  
    313311  }
    314312
    315   @SuppressWarnings("unchecked")
    316313  static void createJSON(JSONObject json, DbControl dc, Annotation a, Formatter<Object> formatter, boolean formatAll)
    317314  {

  • trunk/src/clients/web/net/sf/basedb/clients/web/taglib/table/ColumnDef.java

    r7604 r7606  
    584584    @since 3.3
    585585  */
    586   @SuppressWarnings("unchecked")
    587586  public JSONObject asJsonObject()
    588587  {

  • trunk/src/clients/web/net/sf/basedb/clients/web/taglib/table/Table.java

    r7217 r7606  
    453453    return page;
    454454  }
    455   @SuppressWarnings({ "unchecked", "rawtypes" })
     455  @SuppressWarnings("rawtypes")
    456456  void addColumnDef(ColumnDef cd, ListColumnAction extensionColumn)
    457457  {

  • trunk/src/core/net/sf/basedb/util/json/JsonUtil.java

    r7501 r7606  
    6060      or empty an empty array is returned
    6161  */
    62   @SuppressWarnings("unchecked")
    6362  public static <T> JSONArray toArray(Iterator<T> it, JsonConverter<? super T> converter)
    6463  {

  • trunk/src/core/net/sf/basedb/util/json/NameableConverter.java

    r6497 r7606  
    4646    @return The JSON object
    4747  */
    48   @SuppressWarnings("unchecked")
    4948  @Override
    5049  public Object convert(T object)

  • trunk/www/common/plugin/index.jsp

    r7605 r7606  
    426426                Integer[] itemId = Values.getInt(sValues);
    427427                oValues = new Object[itemId.length];
    428                 Item iType = Item.fromItemClass((Class)pType.getParameterClass());
     428                Item iType = Item.fromClass((Class)pType.getParameterClass());
    429429                dc = sc.newDbControl();
    430430                for (int i = 0; i < itemId.length; ++i)
Note: See TracChangeset for help on using the changeset viewer.