Changeset 539
- Timestamp:
- 06/05/06 22:18:40
- Files:
-
- trunk/calendar3/dumprestore/src/org/bedework/dumprestore/dump/DumpGlobals.java (modified) (2 diffs)
- trunk/calendar3/dumprestore/src/org/bedework/dumprestore/dump/dumpling/DumpCalendars.java (modified) (1 diff)
- trunk/calendar3/dumprestore/src/org/bedework/dumprestore/dump/dumpling/DumpEvents.java (modified) (1 diff)
- trunk/calendar3/webcommon/src/org/bedework/webcommon/taglib/NameScopePropertyTag.java (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/calendar3/dumprestore/src/org/bedework/dumprestore/dump/DumpGlobals.java
r519 r539 66 66 67 67 /** */ 68 public int calendars; 69 70 /** */ 68 71 public int locations; 69 72 … … 107 110 System.out.println(" users: " + users); 108 111 System.out.println(" timezones: " + timezones); 112 System.out.println(" calendars: " + calendars); 109 113 System.out.println(" subscribedUsers: " + subscribedUsers); 110 114 System.out.println(" subscriptions: " + subscriptions); trunk/calendar3/dumprestore/src/org/bedework/dumprestore/dump/dumpling/DumpCalendars.java
r465 r539 89 89 } 90 90 91 globals.ca tegories++;91 globals.calendars++; 92 92 } 93 93 } trunk/calendar3/dumprestore/src/org/bedework/dumprestore/dump/dumpling/DumpEvents.java
r534 r539 64 64 } 65 65 66 long ct = 0;67 68 66 while (it.hasNext()) { 69 67 dumpEvent((BwEvent)it.next()); 70 ct++;71 68 72 if (( ct% 100) == 0) {73 info(" ... " + ct);69 if ((globals.events % 100) == 0) { 70 info(" ... " + globals.events); 74 71 } 75 72 } trunk/calendar3/webcommon/src/org/bedework/webcommon/taglib/NameScopePropertyTag.java
r533 r539 99 99 */ 100 100 protected String getString(boolean required) throws JspTagException { 101 return String.valueOf(getObject(name, scope, property, required)); 101 Object o = getObject(required); 102 if (o == null) { 103 return null; 104 } 105 return String.valueOf(o); 102 106 } 103 107 }
