[Rubyeclipse-commit] org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/preferences MembersOrderPreferenceCache.java,1.1,1.2

[Christopher W. <caw...@us...>]

Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/preferences
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7114/src/org/rubypeople/rdt/internal/ui/preferences

Modified Files:
	MembersOrderPreferenceCache.java 
Log Message:
fix ticket #112 and #113

Index: MembersOrderPreferenceCache.java
===================================================================
RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/preferences/MembersOrderPreferenceCache.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MembersOrderPreferenceCache.java	10 Feb 2006 19:52:26 -0000	1.1
--- MembersOrderPreferenceCache.java	20 Apr 2006 21:51:44 -0000	1.2
***************
*** 28,37 ****
      public static final int METHOD_INDEX= 2;
      public static final int FIELDS_INDEX= 3;
!     public static final int INIT_INDEX= 4;
!     public static final int STATIC_FIELDS_INDEX= 5;
!     public static final int STATIC_INIT_INDEX= 6;
!     public static final int STATIC_METHODS_INDEX= 7;
!     public static final int ENUM_CONSTANTS_INDEX= 8;
!     public static final int N_CATEGORIES= ENUM_CONSTANTS_INDEX + 1;
      
      private static final int PUBLIC_INDEX= 0;
--- 28,34 ----
      public static final int METHOD_INDEX= 2;
      public static final int FIELDS_INDEX= 3;
!     public static final int STATIC_FIELDS_INDEX= 4;
!     public static final int STATIC_METHODS_INDEX= 5;
!     public static final int N_CATEGORIES= STATIC_METHODS_INDEX + 1;
      
      private static final int PUBLIC_INDEX= 0;
***************
*** 106,110 ****
          StringTokenizer tokenizer= new StringTokenizer(str, ","); //$NON-NLS-1$
          int i= 0;
-         offsets[ENUM_CONSTANTS_INDEX]= i++; // enum constants always on top
          
          while (tokenizer.hasMoreTokens()) {
--- 103,106 ----
***************
*** 116,125 ****
              } else if ("F".equals(token)) { //$NON-NLS-1$
                  offsets[FIELDS_INDEX]= i++;
-             } else if ("I".equals(token)) { //$NON-NLS-1$
-                 offsets[INIT_INDEX]= i++;
              } else if ("SF".equals(token)) { //$NON-NLS-1$
                  offsets[STATIC_FIELDS_INDEX]= i++;
-             } else if ("SI".equals(token)) { //$NON-NLS-1$
-                 offsets[STATIC_INIT_INDEX]= i++;
              } else if ("SM".equals(token)) { //$NON-NLS-1$
                  offsets[STATIC_METHODS_INDEX]= i++;
--- 112,117 ----