src/demo/share/java2d/J2DBench/src/j2dbench/Result.java

*** 1,7 ****
  /*
!  * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
--- 1,7 ----
  /*
!  * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
*** 68,98 ****
  
      public static void init() {
          resultoptroot = new Group(TestEnvironment.globaloptroot,
                                    "results", "Result Options");
  
!         String workStrings[] = {
              "units",
              "kilounits",
              "megaunits",
              "autounits",
              "ops",
              "kiloops",
              "megaops",
              "autoops",
          };
!         String workDescriptions[] = {
              "Test Units",
              "Thousands of Test Units",
              "Millions of Test Units",
              "Auto-scaled Test Units",
              "Operations",
              "Thousands of Operations",
              "Millions of Operations",
              "Auto-scaled Operations",
          };
!         Integer workObjects[] = {
              new Integer(WORK_UNITS),
              new Integer(WORK_THOUSANDS),
              new Integer(WORK_MILLIONS),
              new Integer(WORK_AUTO),
              new Integer(WORK_OPS | WORK_UNITS),
--- 68,98 ----
  
      public static void init() {
          resultoptroot = new Group(TestEnvironment.globaloptroot,
                                    "results", "Result Options");
  
!         String[] workStrings = {
              "units",
              "kilounits",
              "megaunits",
              "autounits",
              "ops",
              "kiloops",
              "megaops",
              "autoops",
          };
!         String[] workDescriptions = {
              "Test Units",
              "Thousands of Test Units",
              "Millions of Test Units",
              "Auto-scaled Test Units",
              "Operations",
              "Thousands of Operations",
              "Millions of Operations",
              "Auto-scaled Operations",
          };
!         Integer[] workObjects = {
              new Integer(WORK_UNITS),
              new Integer(WORK_THOUSANDS),
              new Integer(WORK_MILLIONS),
              new Integer(WORK_AUTO),
              new Integer(WORK_OPS | WORK_UNITS),
*** 103,127 ****
          workOpt = new Option.ObjectChoice(resultoptroot,
                                            "workunits", "Work Units",
                                            workStrings, workObjects,
                                            workStrings, workDescriptions,
                                            0);
!         String timeStrings[] = {
              "sec",
              "msec",
              "usec",
              "nsec",
              "autosec",
          };
!         String timeDescriptions[] = {
              "Seconds",
              "Milliseconds",
              "Microseconds",
              "Nanoseconds",
              "Auto-scaled seconds",
          };
!         Integer timeObjects[] = {
              new Integer(TIME_SECONDS),
              new Integer(TIME_MILLIS),
              new Integer(TIME_MICROS),
              new Integer(TIME_NANOS),
              new Integer(TIME_AUTO),
--- 103,127 ----
          workOpt = new Option.ObjectChoice(resultoptroot,
                                            "workunits", "Work Units",
                                            workStrings, workObjects,
                                            workStrings, workDescriptions,
                                            0);
!         String[] timeStrings = {
              "sec",
              "msec",
              "usec",
              "nsec",
              "autosec",
          };
!         String[] timeDescriptions = {
              "Seconds",
              "Milliseconds",
              "Microseconds",
              "Nanoseconds",
              "Auto-scaled seconds",
          };
!         Integer[] timeObjects = {
              new Integer(TIME_SECONDS),
              new Integer(TIME_MILLIS),
              new Integer(TIME_MICROS),
              new Integer(TIME_NANOS),
              new Integer(TIME_AUTO),
*** 129,147 ****
          timeOpt = new Option.ObjectChoice(resultoptroot,
                                            "timeunits", "Time Units",
                                            timeStrings, timeObjects,
                                            timeStrings, timeDescriptions,
                                            0);
!         String rateStrings[] = {
              "unitspersec",
              "secsperunit",
          };
!         String rateDescriptions[] = {
              "Work units per Time",
              "Time units per Work",
          };
!         Boolean rateObjects[] = {
              Boolean.FALSE,
              Boolean.TRUE,
          };
          rateOpt = new Option.ObjectChoice(resultoptroot,
                                            "ratio", "Rate Ratio",
--- 129,147 ----
          timeOpt = new Option.ObjectChoice(resultoptroot,
                                            "timeunits", "Time Units",
                                            timeStrings, timeObjects,
                                            timeStrings, timeDescriptions,
                                            0);
!         String[] rateStrings = {
              "unitspersec",
              "secsperunit",
          };
!         String[] rateDescriptions = {
              "Work units per Time",
              "Time units per Work",
          };
!         Boolean[] rateObjects = {
              Boolean.FALSE,
              Boolean.TRUE,
          };
          rateOpt = new Option.ObjectChoice(resultoptroot,
                                            "ratio", "Rate Ratio",