/[classpath]/cp-tools/src/gnu/localegen/JavaGenerator.java
ViewVC logotype

Diff of /cp-tools/src/gnu/localegen/JavaGenerator.java

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.7 by mkoch, Sat Nov 13 23:05:58 2004 UTC revision 1.8 by mkoch, Sat Nov 13 23:10:23 2004 UTC
# Line 249  public class JavaGenerator Line 249  public class JavaGenerator
249      private String name;      private String name;
250      private Hashtable data;      private Hashtable data;
251      private String[] order;      private String[] order;
252      private int addNull;      private int prependNull;
253        private int appendNull;
254    
255      public OrderedListContent(String name, Hashtable data, String[] order, int addNull)      public OrderedListContent(String name, Hashtable data, String[] order, int prependNull, int appendNull)
256      {      {
257        this.name = name;        this.name = name;
258        this.data = data;        this.data = data;
259        this.order = order;        this.order = order;
260        this.addNull = addNull;        this.prependNull = prependNull;
261          this.appendNull = appendNull;
262      }      }
263    
264      public boolean isPackage()      public boolean isPackage()
# Line 278  public class JavaGenerator Line 280  public class JavaGenerator
280      {      {
281        o.println("  private static final Object[] " + name + " = {");        o.println("  private static final Object[] " + name + " = {");
282    
283        for (int i = 0; i < addNull; i++)        for (int i = 0; i < prependNull; i++)
284          o.println("    null,");          o.println("    null,");
285    
286        for (int i = 0; i < order.length; i++)        for (int i = 0; i < order.length; i++)
# Line 290  public class JavaGenerator Line 292  public class JavaGenerator
292              o.println();              o.println();
293          }          }
294    
295          for (int i = 0; i < appendNull; i++)
296            o.println("    null,");
297    
298        o.println("  };");        o.println("  };");
299      }      }
300    }    }
# Line 433  public class JavaGenerator Line 438  public class JavaGenerator
438    }    }
439    
440    public void addOrderedListContent(Hashtable tree, String ref, String name, String[] order,    public void addOrderedListContent(Hashtable tree, String ref, String name, String[] order,
441                                      int addNull)                                      int prependNull, int appendNull)
442    {    {
443      ListDataElement data_elt = (ListDataElement)tree.get(ref);      ListDataElement data_elt = (ListDataElement)tree.get(ref);
444    
445      if (data_elt == null)      if (data_elt == null)
446        return;        return;
447    
448      localeContents.add(new OrderedListContent(name, data_elt.listData, order, addNull));      localeContents.add(new OrderedListContent(name, data_elt.listData, order, prependNull, appendNull));
449    }    }
450    
451    private void computeCalendar(Hashtable flattree)    private void computeCalendar(Hashtable flattree)
# Line 460  public class JavaGenerator Line 465  public class JavaGenerator
465                    
466          addOrderedListContent(calendarLeaf,          addOrderedListContent(calendarLeaf,
467                                "calendar.months.monthContext.monthWidth.abbreviated", "shortMonths",                                "calendar.months.monthContext.monthWidth.abbreviated", "shortMonths",
468                                gnu.ldml.Constants.monthsOrder[i], 0);                                gnu.ldml.Constants.monthsOrder[i], 0, 1);
469          addOrderedListContent(calendarLeaf, "calendar.months.monthContext.monthWidth.wide", "months",          addOrderedListContent(calendarLeaf, "calendar.months.monthContext.monthWidth.wide", "months",
470                                gnu.ldml.Constants.monthsOrder[i], 0);                                gnu.ldml.Constants.monthsOrder[i], 0, 1);
471                    
472          addOrderedListContent(calendarLeaf, "calendar.days.dayContext.dayWidth.abbreviated", "shortWeekdays",          addOrderedListContent(calendarLeaf, "calendar.days.dayContext.dayWidth.abbreviated", "shortWeekdays",
473                                gnu.ldml.Constants.daysOrder, 1);                                gnu.ldml.Constants.daysOrder, 1, 0);
474          addOrderedListContent(calendarLeaf, "calendar.days.dayContext.dayWidth.wide", "weekdays",          addOrderedListContent(calendarLeaf, "calendar.days.dayContext.dayWidth.wide", "weekdays",
475                                gnu.ldml.Constants.daysOrder, 1);                                gnu.ldml.Constants.daysOrder, 1, 0);
476    
477          /* ERAS */          /* ERAS */
478          ListDataElement eraElement = (ListDataElement)calendarLeaf.get("calendar.eras.eraAbbr");          ListDataElement eraElement = (ListDataElement)calendarLeaf.get("calendar.eras.eraAbbr");
# Line 820  public class JavaGenerator Line 825  public class JavaGenerator
825      File javaFile = new File(javaDir, "LocaleInformation_" + analyzer.getParser().getName() + ".java");      File javaFile = new File(javaDir, "LocaleInformation_" + analyzer.getParser().getName() + ".java");
826    
827      computeContents();      computeContents();
828        
829      if (localeContents.size() == 0)      if (localeContents.size() == 0)
830        return;        return;
831    

Legend:
Removed from v.1.7  
changed lines
  Added in v.1.8

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26