[Jmri-commits] jmri/jmrit/symbolicprog/tabbedframe PaneProgPane.java, 1.66, 1.67

[Bob J. <jac...@us...>]

Update of /cvsroot/jmri/jmri/jmrit/symbolicprog/tabbedframe
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv24940/src/jmri/jmrit/symbolicprog/tabbedframe

Modified Files:
	PaneProgPane.java 
Log Message:
fix some missing 1.5 parameterizations

Index: PaneProgPane.java
===================================================================
RCS file: /cvsroot/jmri/jmri/jmrit/symbolicprog/tabbedframe/PaneProgPane.java,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -d -r1.66 -r1.67
*** PaneProgPane.java	29 Dec 2008 07:30:50 -0000	1.66
--- PaneProgPane.java	29 Dec 2008 08:10:00 -0000	1.67
***************
*** 411,415 ****
          for (int i =0; i<varList.size(); i++) {
  
!             int varNum = ((Integer)varList.get(i)).intValue();
              VariableValue var = _varModel.getVariable( varNum );
  
--- 411,415 ----
          for (int i =0; i<varList.size(); i++) {
  
!             int varNum = varList.get(i).intValue();
              VariableValue var = _varModel.getVariable( varNum );
  
***************
*** 525,529 ****
             (!startProcess)) {  // we want to setToRead false if the pane's process is being stopped
              for (int i = 0; i < varList.size(); i++) {
!                 int varNum = ( (Integer) varList.get(i)).intValue();
                  VariableValue var = _varModel.getVariable(varNum);
                  if (justChanges) {
--- 525,529 ----
             (!startProcess)) {  // we want to setToRead false if the pane's process is being stopped
              for (int i = 0; i < varList.size(); i++) {
!                 int varNum = varList.get(i).intValue();
                  VariableValue var = _varModel.getVariable(varNum);
                  if (justChanges) {
***************
*** 540,544 ****
              }
              for (int i = 0; i < cvList.size(); i++) {
!                 int cvNum = ( (Integer) cvList.get(i)).intValue();
                  CvValue cv = _cvModel.getCvByRow(cvNum);
                  if (justChanges) {
--- 540,544 ----
              }
              for (int i = 0; i < cvList.size(); i++) {
!                 int cvNum = cvList.get(i).intValue();
                  CvValue cv = _cvModel.getCvByRow(cvNum);
                  if (justChanges) {
***************
*** 580,584 ****
             log.debug("about to start setToWrite of varList");
             for (int i = 0; i < varList.size(); i++) {
!                int varNum = ( (Integer) varList.get(i)).intValue();
                 VariableValue var = _varModel.getVariable(varNum);
                 if (justChanges) {
--- 580,584 ----
             log.debug("about to start setToWrite of varList");
             for (int i = 0; i < varList.size(); i++) {
!                int varNum = varList.get(i).intValue();
                 VariableValue var = _varModel.getVariable(varNum);
                 if (justChanges) {
***************
*** 596,600 ****
             log.debug("about to start setToWrite of cvList");
             for (int i = 0; i < cvList.size(); i++) {
!                int cvNum = ( (Integer) cvList.get(i)).intValue();
                 CvValue cv = _cvModel.getCvByRow(cvNum);
                 if (justChanges) {
--- 596,600 ----
             log.debug("about to start setToWrite of cvList");
             for (int i = 0; i < cvList.size(); i++) {
!                int cvNum = cvList.get(i).intValue();
                 CvValue cv = _cvModel.getCvByRow(cvNum);
                 if (justChanges) {
***************
*** 674,678 ****
          // look for possible variables
          while ((varList.size() >= 0) && (varListIndex < varList.size())){
!             int varNum = ((Integer)varList.get(varListIndex)).intValue();
              int vState = _varModel.getState( varNum );
              VariableValue var = _varModel.getVariable(varNum);
--- 674,678 ----
          // look for possible variables
          while ((varList.size() >= 0) && (varListIndex < varList.size())){
!             int varNum = varList.get(varListIndex).intValue();
              int vState = _varModel.getState( varNum );
              VariableValue var = _varModel.getVariable(varNum);
***************
*** 690,694 ****
          // found no variables needing read, try CVs
          while ((cvList.size() >= 0) && (cvListIndex < cvList.size())) {
!             int cvNum = ((Integer)cvList.get(cvListIndex)).intValue();
              CvValue cv = _cvModel.getCvByRow(cvNum);
              if (log.isDebugEnabled()) log.debug("nextRead cv index "+cvNum+" state "+cv.getState());
--- 690,694 ----
          // found no variables needing read, try CVs
          while ((cvList.size() >= 0) && (cvListIndex < cvList.size())) {
!             int cvNum = cvList.get(cvListIndex).intValue();
              CvValue cv = _cvModel.getCvByRow(cvNum);
              if (log.isDebugEnabled()) log.debug("nextRead cv index "+cvNum+" state "+cv.getState());
***************
*** 712,716 ****
          // found no CVs needing read, try indexed CVs
          while ((indexedCvList.size() >= 0) && (indexedCvListIndex < indexedCvList.size())) {
!             int indxVarNum = ( (Integer) indexedCvList.get(indexedCvListIndex)).intValue();
              int indxState = _varModel.getState(indxVarNum);
              if (log.isDebugEnabled()) log.debug(
--- 712,716 ----
          // found no CVs needing read, try indexed CVs
          while ((indexedCvList.size() >= 0) && (indexedCvListIndex < indexedCvList.size())) {
!             int indxVarNum = indexedCvList.get(indexedCvListIndex).intValue();
              int indxState = _varModel.getState(indxVarNum);
              if (log.isDebugEnabled()) log.debug(
***************
*** 760,764 ****
          // look for possible CVs
          while ((cvList.size() >= 0) && (cvListIndex < cvList.size())) {
!             int cvNum = ((Integer)cvList.get(cvListIndex)).intValue();
              CvValue cv = _cvModel.getCvByRow(cvNum);
              if (log.isDebugEnabled()) log.debug("nextConfirm cv index "+cvNum+" state "+cv.getState());
--- 760,764 ----
          // look for possible CVs
          while ((cvList.size() >= 0) && (cvListIndex < cvList.size())) {
!             int cvNum = cvList.get(cvListIndex).intValue();
              CvValue cv = _cvModel.getCvByRow(cvNum);
              if (log.isDebugEnabled()) log.debug("nextConfirm cv index "+cvNum+" state "+cv.getState());
***************
*** 781,785 ****
          // found no CVs needing read, try indexed CVs
          while ((indexedCvList.size() >= 0) && (indexedCvListIndex < indexedCvList.size())) {
!             int indxVarNum = ( (Integer) indexedCvList.get(indexedCvListIndex)).intValue();
              int indxState = _varModel.getState(indxVarNum);
              if (log.isDebugEnabled()) log.debug(
--- 781,785 ----
          // found no CVs needing read, try indexed CVs
          while ((indexedCvList.size() >= 0) && (indexedCvListIndex < indexedCvList.size())) {
!             int indxVarNum = indexedCvList.get(indexedCvListIndex).intValue();
              int indxState = _varModel.getState(indxVarNum);
              if (log.isDebugEnabled()) log.debug(
***************
*** 870,874 ****
          // look for possible variables
          while ((varList.size() >= 0) && (varListIndex < varList.size())){
!             int varNum = ((Integer)varList.get(varListIndex)).intValue();
              int vState = _varModel.getState( varNum );
              VariableValue var = _varModel.getVariable(varNum);
--- 870,874 ----
          // look for possible variables
          while ((varList.size() >= 0) && (varListIndex < varList.size())){
!             int varNum = varList.get(varListIndex).intValue();
              int vState = _varModel.getState( varNum );
              VariableValue var = _varModel.getVariable(varNum);
***************
*** 887,891 ****
          // check for CVs to handle (e.g. for CV table)
          while ((cvList.size() >= 0) && (cvListIndex < cvList.size())) {
!             int cvNum = ((Integer)cvList.get(cvListIndex)).intValue();
              CvValue cv = _cvModel.getCvByRow( cvNum );
              if (log.isDebugEnabled()) log.debug("nextWrite cv index "+cvNum+" state "+cv.getState());
--- 887,891 ----
          // check for CVs to handle (e.g. for CV table)
          while ((cvList.size() >= 0) && (cvListIndex < cvList.size())) {
!             int cvNum = cvList.get(cvListIndex).intValue();
              CvValue cv = _cvModel.getCvByRow( cvNum );
              if (log.isDebugEnabled()) log.debug("nextWrite cv index "+cvNum+" state "+cv.getState());
***************
*** 908,912 ****
          // check for Indexed CVs to handle (e.g. for Indexed CV table)
          while ((indexedCvList.size() >= 0) && (indexedCvListIndex < indexedCvList.size())) {
!             int indxVarNum = ( (Integer) indexedCvList.get(indexedCvListIndex)).intValue();
              int indxState = _varModel.getState(indxVarNum);
              if (log.isDebugEnabled()) log.debug(
--- 908,912 ----
          // check for Indexed CVs to handle (e.g. for Indexed CV table)
          while ((indexedCvList.size() >= 0) && (indexedCvListIndex < indexedCvList.size())) {
!             int indxVarNum = indexedCvList.get(indexedCvListIndex).intValue();
              int indxState = _varModel.getState(indxVarNum);
              if (log.isDebugEnabled()) log.debug(
***************
*** 1660,1664 ****
              // index over variables
              for (int i=0; i<varList.size(); i++) {
!                 int varNum = ((Integer)varList.get(i)).intValue();
                  VariableValue var = _varModel.getVariable(varNum);
                  String name = var.label();
--- 1660,1664 ----
              // index over variables
              for (int i=0; i<varList.size(); i++) {
!                 int varNum = varList.get(i).intValue();
                  VariableValue var = _varModel.getVariable(varNum);
                  String name = var.label();
***************
*** 1849,1853 ****
                for (int i = 0; i < cvList.size(); i++) {
  
!                 int cvNum = ( (Integer) cvList.get(i)).intValue();
                  CvValue cv = _cvModel.getCvByRow(cvNum);
  
--- 1849,1853 ----
                for (int i = 0; i < cvList.size(); i++) {
  
!                 int cvNum = cvList.get(i).intValue();
                  CvValue cv = _cvModel.getCvByRow(cvNum);