src/com/sun/javatest/exec/ContextManager.java

*** 291,301 ****
          }
  
          if (parentTool != null) {
              TestResultTable trt = parentTool.getActiveTestResultTable();
  
!             Map pathMap = new HashMap();
              parentTool.saveTreeState(pathMap);
  
              if (trt != null)
                  try {
                      parentTool.pauseTreeCacheWork();
--- 291,301 ----
          }
  
          if (parentTool != null) {
              TestResultTable trt = parentTool.getActiveTestResultTable();
  
!             Map<String, String> pathMap = new HashMap<>();
              parentTool.saveTreeState(pathMap);
  
              if (trt != null)
                  try {
                      parentTool.pauseTreeCacheWork();
*** 609,619 ****
       * @param renderer Custom question renderer fot this question
       */
      protected void registerCustomQuestionRenderer(Class<? extends Question> question,
                                                    QuestionRenderer renderer) {
          if (customRenderers == null) {
!             customRenderers = new HashMap();
          }
          customRenderers.put(question, renderer);
      }
  
      public ET_ControlFactory getExecToolControlFactory(ExecTool et, UIFactory uif) {
--- 609,619 ----
       * @param renderer Custom question renderer fot this question
       */
      protected void registerCustomQuestionRenderer(Class<? extends Question> question,
                                                    QuestionRenderer renderer) {
          if (customRenderers == null) {
!             customRenderers = new HashMap<>();
          }
          customRenderers.put(question, renderer);
      }
  
      public ET_ControlFactory getExecToolControlFactory(ExecTool et, UIFactory uif) {
*** 745,755 ****
      // holder for a copy of the current interview and template values
      //private Session currentConfig;
      protected InterviewParameters currentConfig = null;
      protected InterviewParameters currentTemplate = null;
      private ExecTool parentTool;
!     private Map customRenderers;
  
      private volatile boolean pendingRefresh = false;
  
      /**
       * This is the name of system property to turn template support on.
--- 745,755 ----
      // holder for a copy of the current interview and template values
      //private Session currentConfig;
      protected InterviewParameters currentConfig = null;
      protected InterviewParameters currentTemplate = null;
      private ExecTool parentTool;
!     private Map<Class<? extends Question>, QuestionRenderer> customRenderers;
  
      private volatile boolean pendingRefresh = false;
  
      /**
       * This is the name of system property to turn template support on.