[Jmri-commits] test/jmri/jmrit/roster FunctionLabelPaneTest.java, 1.2, 1.3 RosterEntryPaneTest.java, 1.10, 1.11 RosterEntryTest.java, 1.15, 1.16 RosterTest.java, 1.22, 1.23

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

Update of /cvsroot/jmri/test/jmri/jmrit/roster
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv5953/test/jmri/jmrit/roster

Modified Files:
	FunctionLabelPaneTest.java RosterEntryPaneTest.java 
	RosterEntryTest.java RosterTest.java 
Log Message:
remove warnings

Index: FunctionLabelPaneTest.java
===================================================================
RCS file: /cvsroot/jmri/test/jmri/jmrit/roster/FunctionLabelPaneTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FunctionLabelPaneTest.java	10 Nov 2008 16:36:38 -0000	1.2
--- FunctionLabelPaneTest.java	31 Jul 2009 22:46:23 -0000	1.3
***************
*** 35,39 ****
  
          rOld = new RosterEntry(eOld){
!                             void warnShortLong(String s){}
          };
          
--- 35,39 ----
  
          rOld = new RosterEntry(eOld){
!                             protected void warnShortLong(String s){}
          };
          
***************
*** 57,61 ****
  
          rNew = new RosterEntry(eNew){
!                             void warnShortLong(String s){}
          };
      }
--- 57,61 ----
  
          rNew = new RosterEntry(eNew){
!                             protected void warnShortLong(String s){}
          };
      }

Index: RosterEntryPaneTest.java
===================================================================
RCS file: /cvsroot/jmri/test/jmri/jmrit/roster/RosterEntryPaneTest.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** RosterEntryPaneTest.java	29 Jul 2009 06:52:07 -0000	1.10
--- RosterEntryPaneTest.java	31 Jul 2009 22:46:23 -0000	1.11
***************
*** 32,36 ****
  
          rOld = new RosterEntry(eOld){
!                             void warnShortLong(String s){}
          };
          
--- 32,36 ----
  
          rOld = new RosterEntry(eOld){
!                       protected void warnShortLong(String s){}
          };
          
***************
*** 54,58 ****
  
          rNew = new RosterEntry(eNew){
!                             void warnShortLong(String s){}
          };
      }
--- 54,58 ----
  
          rNew = new RosterEntry(eNew){
!                        protected void warnShortLong(String s){}
          };
      }
***************
*** 64,68 ****
          
          RosterEntry n = new RosterEntry(){
!                             void warnShortLong(String s){}
          };
          p.update(n);
--- 64,68 ----
          
          RosterEntry n = new RosterEntry(){
!                             protected void warnShortLong(String s){}
          };
          p.update(n);

Index: RosterTest.java
===================================================================
RCS file: /cvsroot/jmri/test/jmri/jmrit/roster/RosterTest.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** RosterTest.java	29 Jul 2009 06:52:07 -0000	1.22
--- RosterTest.java	31 Jul 2009 22:46:24 -0000	1.23
***************
*** 142,146 ****
  
          //
!         List l;
          
          l = r.getEntriesWithAttributeKey("key a");
--- 142,146 ----
  
          //
!         List<RosterEntry> l;
          
          l = r.getEntriesWithAttributeKey("key a");
***************
*** 157,161 ****
  
          //
!         List l;
          
          l = r.getEntriesWithAttributeKeyValue("key a", "value a");
--- 157,161 ----
  
          //
!         List<RosterEntry> l;
          
          l = r.getEntriesWithAttributeKeyValue("key a", "value a");

Index: RosterEntryTest.java
===================================================================
RCS file: /cvsroot/jmri/test/jmri/jmrit/roster/RosterEntryTest.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** RosterEntryTest.java	27 Jul 2009 18:07:26 -0000	1.15
--- RosterEntryTest.java	31 Jul 2009 22:46:24 -0000	1.16
***************
*** 66,70 ****
  
          RosterEntry r = new RosterEntry(e){
!                             void warnShortLong(String s){}
          };
          // check
--- 66,70 ----
  
          RosterEntry r = new RosterEntry(e){
!                             protected void warnShortLong(String s){}
          };
          // check
***************
*** 94,98 ****
  
          RosterEntry r = new RosterEntry(e){
!                             void warnShortLong(String s){}
          };
          
--- 94,98 ----
  
          RosterEntry r = new RosterEntry(e){
!                             protected void warnShortLong(String s){}
          };
          
***************
*** 149,153 ****
  
          RosterEntry r = new RosterEntry(e){
!                             void warnShortLong(String s){}
          };
          
--- 149,153 ----
  
          RosterEntry r = new RosterEntry(e){
!                             protected void warnShortLong(String s){}
          };
          
***************
*** 187,191 ****
  
          RosterEntry r = new RosterEntry(e){
!                             void warnShortLong(String s){}
          };
          
--- 187,191 ----
  
          RosterEntry r = new RosterEntry(e){
!                             protected void warnShortLong(String s){}
          };
          
***************
*** 277,281 ****
          java.util.Set<String> l = r.getAttributes();
          Assert.assertEquals("number returned", 3, l.size());
!         java.util.Iterator i = l.iterator();
          Assert.assertEquals("1st item", "key 1", i.next());
          Assert.assertEquals("2nd item", "key 2", i.next());
--- 277,281 ----
          java.util.Set<String> l = r.getAttributes();
          Assert.assertEquals("number returned", 3, l.size());
!         java.util.Iterator<String> i = l.iterator();
          Assert.assertEquals("1st item", "key 1", i.next());
          Assert.assertEquals("2nd item", "key 2", i.next());
***************
*** 318,322 ****
  
          RosterEntry r = new RosterEntry(e){
!                             void warnShortLong(String s){}
          };
  
--- 318,322 ----
  
          RosterEntry r = new RosterEntry(e){
!                             protected void warnShortLong(String s){}
          };