diff -u -r1.13 -r1.14
--- IDDecoder.java	8 Feb 2006 01:00:29 -0000	1.13
+++ IDDecoder.java	14 Feb 2006 21:14:39 -0000	1.14
@@ -25,37 +25,15 @@

     /** Same as getIDExpanded() except sets id. */
     public ExpandedIdentifier getExpandedIdentifier(long id);
     

-    /** @return value of the field from the name */
-    @Deprecated
-    public int getValue(String field);
-    
-    /** @return value of the field from the index */
-    @Deprecated

+    /*/\/\/\ Access to field data /\/\/\ */
+    public int getValue(String field);   

     public int getValue(int index);
     

-    /** @return true if setID() has been called, false if not */    
-    //public boolean isValid();
-    
-    /* /\/\/\ ID description /\/\/\ */
-    
-    /** @return number of fields in the descriptor*/
-    @Deprecated
-    public int getFieldCount();
-    
-    /** @return name of the field from the index */
-    @Deprecated
-    public String getFieldName(int index);
-    
-    /** @return index of the field from the name */
-    @Deprecated
-    public int getFieldIndex(String name);
-    
-    /** Load the IDDecoder with an IDDescriptor. */
-    @Deprecated
-    public void setIDDescription(IDDescriptor id);
-    
-    /** @return currently loaded IDDescriptor */
-    @Deprecated

+    /* /\/\/\ ID description /\/\/\ */       
+    public int getFieldCount();         
+    public String getFieldName(int index);        
+    public int getFieldIndex(String name);          
+    public void setIDDescription(IDDescriptor id);    

     public IDDescriptor getIDDescription();
     
     /** @return layer number */

@@ -98,6 +76,9 @@

     /** Get the system ID, i.e. the "system" field. */
     public int getSystemID();
     

+    /** @Deprecated use getSystemID() instead */
+    public int getSystemNumber();
+    

     /** Get the Subdetector associated with this IDDecoder, or null if not applicable. */
     public Subdetector getSubdetector();