[Bedework-commit] calendarapi r1437 - in trunk: .
calFacade/src/org/bedework/calfacade/env
calFacade/src/org/bedework/calfacade/util
calsvc/src/org/bedework/calsvc calsvc/src/org/bedework/calsvc/client
calsvc/src/org/bedework/calsvc/scheduling
logging/src/org/bedework/logging mail/src/org/bedework/mail
svnadmin at bedework.org
svnadmin at bedework.org
Mon Feb 14 10:21:27 EST 2011
Author: douglm
Date: 2011-02-14 10:21:24 -0500 (Mon, 14 Feb 2011)
New Revision: 1437
Modified:
trunk/build.xml
trunk/calFacade/src/org/bedework/calfacade/env/CalOptionsFactory.java
trunk/calFacade/src/org/bedework/calfacade/util/AbstractDirImpl.java
trunk/calsvc/src/org/bedework/calsvc/Admin.java
trunk/calsvc/src/org/bedework/calsvc/CalSuites.java
trunk/calsvc/src/org/bedework/calsvc/CalSvc.java
trunk/calsvc/src/org/bedework/calsvc/CalSvcDb.java
trunk/calsvc/src/org/bedework/calsvc/Calendars.java
trunk/calsvc/src/org/bedework/calsvc/EventPropertiesImpl.java
trunk/calsvc/src/org/bedework/calsvc/Events.java
trunk/calsvc/src/org/bedework/calsvc/Filters.java
trunk/calsvc/src/org/bedework/calsvc/Indexing.java
trunk/calsvc/src/org/bedework/calsvc/Preferences.java
trunk/calsvc/src/org/bedework/calsvc/ResourcesImpl.java
trunk/calsvc/src/org/bedework/calsvc/Synch.java
trunk/calsvc/src/org/bedework/calsvc/Syspars.java
trunk/calsvc/src/org/bedework/calsvc/Users.java
trunk/calsvc/src/org/bedework/calsvc/Views.java
trunk/calsvc/src/org/bedework/calsvc/client/ClientState.java
trunk/calsvc/src/org/bedework/calsvc/scheduling/AttendeeSchedulingHandler.java
trunk/calsvc/src/org/bedework/calsvc/scheduling/FreeAndBusyHandler.java
trunk/calsvc/src/org/bedework/calsvc/scheduling/IScheduleHandler.java
trunk/calsvc/src/org/bedework/calsvc/scheduling/ImplicitSchedulingHandler.java
trunk/calsvc/src/org/bedework/calsvc/scheduling/OrganizerSchedulingHandler.java
trunk/calsvc/src/org/bedework/calsvc/scheduling/OutBoxHandler.java
trunk/calsvc/src/org/bedework/calsvc/scheduling/OutboundSchedulingHandler.java
trunk/calsvc/src/org/bedework/calsvc/scheduling/Scheduling.java
trunk/calsvc/src/org/bedework/calsvc/scheduling/SchedulingBase.java
trunk/logging/src/org/bedework/logging/BwlogFactory.java
trunk/mail/src/org/bedework/mail/DummyMailer.java
trunk/mail/src/org/bedework/mail/TestMailer.java
Log:
Further changes to the build. Attempt to catch changed libraries and force a rebuild.
Also use outofdate to suppress running of apt when sources have not changed.
Minor but widespread change to remove debug parameter from a number of classes. For those debugging now depends on log4j level.
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2011-02-14 15:21:14 UTC (rev 1436)
+++ trunk/build.xml 2011-02-14 15:21:24 UTC (rev 1437)
@@ -124,36 +124,52 @@
<build-jar module-base="${org.bedework.annotations.base}"
jar-file="${annotations.jar}" />
- <delete dir="${org.bedework.aptgen.base}" />
- <mkdir dir="${org.bedework.aptgen.base}" />
-
- <property name="dest.dir" location="${dist.home}/apt-classes" />
- <delete dir="${dest.dir}" />
- <mkdir dir="${dest.dir}" />
-
- <!-- Don't set factorypath or factorypathref. It supresses seach of
- class path for factories -->
- <apt factory="org.bedework.calfacade.annotations.process.FacadeAPF"
- srcdir="${org.bedework.calfacade.base}/src"
- destdir="${dest.dir}"
- debug="true"
- preprocessdir="${org.bedework.aptgen.base}" >
- <classpath refid="compile.classpath"/>
- <include name="**/*.java"/>
- <exclude name="**/mail/**/*.java"/>
- <exclude name="**/svc/**/*.java"/>
- <exclude name="**/synch/**/*.java"/>
- <exclude name="**/timezonesImpl/**/*.java"/>
- <exclude name="**/util/**/*.java"/>
- <option name="resourcePath" value="${org.bedework.annotations.base}/resources" />
- <!--
- <compilerarg value="-XListAnnotationTypes"/>
- <compilerarg value="-XListDeclarations"/>
- <compilerarg value="-XPrintAptRounds"/>
- <compilerarg value="-XPrintFactoryInfo"/>
- -->
- <option name="debug" value="false" />
- </apt>
+ <outofdate>
+ <sourcefiles>
+ <fileset dir="${org.bedework.calfacade.base}/src">
+ <include name="**/*.java"/>
+ </fileset>
+ </sourcefiles>
+ <targetfiles>
+ <fileset dir="${org.bedework.aptgen.base}">
+ <include name="**/*.java"/>
+ </fileset>
+ </targetfiles>
+ <sequential>
+ <noisyMsg message="**** apt rebuilding - sources changed" />
+
+ <delete dir="${org.bedework.aptgen.base}" />
+ <mkdir dir="${org.bedework.aptgen.base}" />
+
+ <property name="dest.dir" location="${dist.home}/apt-classes" />
+ <delete dir="${dest.dir}" />
+ <mkdir dir="${dest.dir}" />
+
+ <!-- Don't set factorypath or factorypathref. It supresses seach of
+ class path for factories -->
+ <apt factory="org.bedework.calfacade.annotations.process.FacadeAPF"
+ srcdir="${org.bedework.calfacade.base}/src"
+ destdir="${dest.dir}"
+ debug="true"
+ preprocessdir="${org.bedework.aptgen.base}" >
+ <classpath refid="compile.classpath"/>
+ <include name="**/*.java"/>
+ <exclude name="**/mail/**/*.java"/>
+ <exclude name="**/svc/**/*.java"/>
+ <exclude name="**/synch/**/*.java"/>
+ <exclude name="**/timezonesImpl/**/*.java"/>
+ <exclude name="**/util/**/*.java"/>
+ <option name="resourcePath" value="${org.bedework.annotations.base}/resources" />
+ <!--
+ <compilerarg value="-XListAnnotationTypes"/>
+ <compilerarg value="-XListDeclarations"/>
+ <compilerarg value="-XPrintAptRounds"/>
+ <compilerarg value="-XPrintFactoryInfo"/>
+ -->
+ <option name="debug" value="false" />
+ </apt>
+ </sequential>
+ </outofdate>
</target>
<!-- ===================== build.source Target ===============================
Modified: trunk/calFacade/src/org/bedework/calfacade/env/CalOptionsFactory.java
===================================================================
--- trunk/calFacade/src/org/bedework/calfacade/env/CalOptionsFactory.java 2011-02-14 15:21:14 UTC (rev 1436)
+++ trunk/calFacade/src/org/bedework/calfacade/env/CalOptionsFactory.java 2011-02-14 15:21:24 UTC (rev 1437)
@@ -53,32 +53,29 @@
/** Obtain and initialise an options object.
*
- * @param debug
* @return OptionsI
* @throws OptionsException
*/
- public static OptionsI getOptions(final boolean debug) throws OptionsException {
+ public static OptionsI getOptions() throws OptionsException {
if (opts != null) {
return opts;
}
- opts = getOptions(globalPrefix, appPrefix, optionsFile, outerTag, debug);
+ opts = getOptions(globalPrefix, appPrefix, optionsFile, outerTag);
return opts;
}
/** Obtain and initialise a local options object using the given stream.
*
* @param is
- * @param debug
* @return OptionsI
* @throws OptionsException
*/
- public static OptionsI getOptions(final InputStream is,
- final boolean debug) throws OptionsException {
+ public static OptionsI getOptions(final InputStream is) throws OptionsException {
if (opts == null) {
- getOptions(debug);
+ getOptions();
}
- return fromStream(globalPrefix, appPrefix, outerTag, is, debug);
+ return fromStream(globalPrefix, appPrefix, outerTag, is);
}
}
Modified: trunk/calFacade/src/org/bedework/calfacade/util/AbstractDirImpl.java
===================================================================
--- trunk/calFacade/src/org/bedework/calfacade/util/AbstractDirImpl.java 2011-02-14 15:21:14 UTC (rev 1436)
+++ trunk/calFacade/src/org/bedework/calfacade/util/AbstractDirImpl.java 2011-02-14 15:21:24 UTC (rev 1437)
@@ -870,7 +870,7 @@
}
try {
- props = (DirConfigProperties)CalOptionsFactory.getOptions(false).getGlobalProperty(getConfigName());
+ props = (DirConfigProperties)CalOptionsFactory.getOptions().getGlobalProperty(getConfigName());
String prDomains = props.getDomains();
@@ -905,7 +905,7 @@
}
try {
- sysRoots = (SystemRoots)CalOptionsFactory.getOptions(false).getGlobalProperty("systemRoots");
+ sysRoots = (SystemRoots)CalOptionsFactory.getOptions().getGlobalProperty("systemRoots");
} catch (Throwable t) {
throw new CalFacadeException(t);
}
@@ -919,7 +919,7 @@
}
try {
- caPrefixes = (CalAddrPrefixes)CalOptionsFactory.getOptions(false).getGlobalProperty("caladdrPrefixes");
+ caPrefixes = (CalAddrPrefixes)CalOptionsFactory.getOptions().getGlobalProperty("caladdrPrefixes");
} catch (Throwable t) {
return null;
}
@@ -974,7 +974,7 @@
CardDavInfo cdi = new CardDavInfo();
try {
- OptionsI opts = CalOptionsFactory.getOptions(false);
+ OptionsI opts = CalOptionsFactory.getOptions();
if (auth) {
cdi.host = (String)opts.getGlobalProperty("personalCardDAVHost");
cdi.port = Integer.valueOf((String)opts.getGlobalProperty("personalCardDAVPort"));
Modified: trunk/calsvc/src/org/bedework/calsvc/Admin.java
===================================================================
--- trunk/calsvc/src/org/bedework/calsvc/Admin.java 2011-02-14 15:21:14 UTC (rev 1436)
+++ trunk/calsvc/src/org/bedework/calsvc/Admin.java 2011-02-14 15:21:24 UTC (rev 1437)
@@ -46,11 +46,11 @@
*
* @param svci
* @param user
- * @param debug
* @throws CalFacadeException
*/
- Admin(final CalSvc svci, final BwUser user, final boolean debug) throws CalFacadeException {
- super(svci, user, debug);
+ Admin(final CalSvc svci,
+ final BwUser user) throws CalFacadeException {
+ super(svci, user);
//publicCalendarRootPath = "/" + getSyspars().getPublicCalendarRoot();
//userCalendarRootPath = "/" + getSyspars().getUserCalendarRoot();
Modified: trunk/calsvc/src/org/bedework/calsvc/CalSuites.java
===================================================================
--- trunk/calsvc/src/org/bedework/calsvc/CalSuites.java 2011-02-14 15:21:14 UTC (rev 1436)
+++ trunk/calsvc/src/org/bedework/calsvc/CalSuites.java 2011-02-14 15:21:24 UTC (rev 1437)
@@ -52,16 +52,16 @@
*
* @param svci
* @param user
- * @param debug
*/
- CalSuites(CalSvc svci, BwUser user, boolean debug) {
- super(svci, user, debug);
+ CalSuites(final CalSvc svci,
+ final BwUser user) {
+ super(svci, user);
}
/* (non-Javadoc)
* @see org.bedework.calsvci.CalSuitesI#add(org.bedework.calfacade.svc.BwCalSuite)
*/
- public BwCalSuiteWrapper add(BwCalSuite val) throws CalFacadeException {
+ public BwCalSuiteWrapper add(final BwCalSuite val) throws CalFacadeException {
BwCalSuite cs = fetch(getSess(), val.getName());
if (cs != null) {
@@ -77,7 +77,7 @@
return wrap(val, false);
}
- public void set(BwCalSuiteWrapper val) throws CalFacadeException {
+ public void set(final BwCalSuiteWrapper val) throws CalFacadeException {
currentCalSuite = val;
}
@@ -91,7 +91,7 @@
return currentCalSuite;
}
- private void checkCollections(BwCalSuite cs) throws CalFacadeException {
+ private void checkCollections(final BwCalSuite cs) throws CalFacadeException {
if ((cs.getSubmissionsRoot() == null) &&
(cs.getSubmissionsRootPath() != null)) {
cs.setSubmissionsRoot(
@@ -108,7 +108,7 @@
/* (non-Javadoc)
* @see org.bedework.calsvci.CalSuitesI#get(java.lang.String)
*/
- public BwCalSuiteWrapper get(String name) throws CalFacadeException {
+ public BwCalSuiteWrapper get(final String name) throws CalFacadeException {
BwCalSuite cs = fetch(getSess(), name);
if (cs == null) {
@@ -123,9 +123,9 @@
/* (non-Javadoc)
* @see org.bedework.calsvci.CalSuitesI#get(org.bedework.calfacade.svc.BwAdminGroup)
*/
- public BwCalSuiteWrapper get(BwAdminGroup group)
+ public BwCalSuiteWrapper get(final BwAdminGroup group)
throws CalFacadeException {
- HibSession sess = (HibSession)getSess();
+ HibSession sess = getSess();
sess.namedQuery("getCalSuiteByGroup");
sess.setEntity("group", group);
@@ -175,8 +175,8 @@
return retCss;
}
- private BwCalSuiteWrapper wrap(BwCalSuite cs,
- boolean alwaysReturn) throws CalFacadeException {
+ private BwCalSuiteWrapper wrap(final BwCalSuite cs,
+ final boolean alwaysReturn) throws CalFacadeException {
CurrentAccess ca = checkAccess(cs, PrivilegeDefs.privAny, alwaysReturn);
if ((ca == null) || !ca.getAccessAllowed()) {
@@ -209,7 +209,7 @@
/* (non-Javadoc)
* @see org.bedework.calsvci.CalSuitesI#update(org.bedework.calfacade.svc.wrappers.BwCalSuiteWrapper)
*/
- public void update(BwCalSuiteWrapper val) throws CalFacadeException {
+ public void update(final BwCalSuiteWrapper val) throws CalFacadeException {
HibSession sess = getSess();
sess.update(val.fetchEntity());
@@ -218,7 +218,7 @@
/* (non-Javadoc)
* @see org.bedework.calsvci.CalSuitesI#delete(org.bedework.calfacade.svc.wrappers.BwCalSuiteWrapper)
*/
- public void delete(BwCalSuiteWrapper val) throws CalFacadeException {
+ public void delete(final BwCalSuiteWrapper val) throws CalFacadeException {
HibSession sess = getSess();
sess.delete(val.fetchEntity());
@@ -232,8 +232,8 @@
* @return BwCalSuite object or null
* @throws CalFacadeException
*/
- public static BwCalSuite fetch(Object session,
- String name) throws CalFacadeException {
+ public static BwCalSuite fetch(final Object session,
+ final String name) throws CalFacadeException {
HibSession sess = (HibSession)session;
sess.namedQuery("getCalSuite");
Modified: trunk/calsvc/src/org/bedework/calsvc/CalSvc.java
===================================================================
--- trunk/calsvc/src/org/bedework/calsvc/CalSvc.java 2011-02-14 15:21:14 UTC (rev 1436)
+++ trunk/calsvc/src/org/bedework/calsvc/CalSvc.java 2011-02-14 15:21:24 UTC (rev 1437)
@@ -328,7 +328,7 @@
fixUsers();
try {
- OptionsI opts = CalOptionsFactory.getOptions(debug);
+ OptionsI opts = CalOptionsFactory.getOptions();
systemName = (String)opts.getGlobalProperty("systemName");
open();
@@ -345,7 +345,7 @@
BwSystem sys = getSysparsHandler().get();
if (tzserverUri == null) {
- tzserverUri = CalOptionsFactory.getOptions(false).getGlobalStringProperty("timezonesUri");
+ tzserverUri = CalOptionsFactory.getOptions().getGlobalStringProperty("timezonesUri");
if (tzserverUri == null) {
throw new CalFacadeException("No timezones server URI defined");
@@ -595,7 +595,7 @@
@Override
public SysparsI getSysparsHandler() throws CalFacadeException {
if (sysparsHandler == null) {
- sysparsHandler = new Syspars(this, null, systemName, debug);
+ sysparsHandler = new Syspars(this, null, systemName);
handlers.add((CalSvcDb)sysparsHandler);
}
@@ -629,7 +629,7 @@
@Override
public PreferencesI getPrefsHandler() throws CalFacadeException {
if (prefsHandler == null) {
- prefsHandler = new Preferences(this, getUser(), debug);
+ prefsHandler = new Preferences(this, getUser());
handlers.add((CalSvcDb)prefsHandler);
}
@@ -643,7 +643,7 @@
}
if (adminHandler == null) {
- adminHandler = new Admin(this, getUser(), debug);
+ adminHandler = new Admin(this, getUser());
handlers.add((CalSvcDb)adminHandler);
}
@@ -653,7 +653,7 @@
@Override
public EventsI getEventsHandler() throws CalFacadeException {
if (eventsHandler == null) {
- eventsHandler = new Events(this, getUser(), debug);
+ eventsHandler = new Events(this, getUser());
handlers.add((CalSvcDb)eventsHandler);
}
@@ -663,7 +663,7 @@
@Override
public FiltersI getFiltersHandler() throws CalFacadeException {
if (filtersHandler == null) {
- filtersHandler = new Filters(this, getUser(), debug);
+ filtersHandler = new Filters(this, getUser());
handlers.add((CalSvcDb)filtersHandler);
}
@@ -673,7 +673,7 @@
@Override
public CalendarsI getCalendarsHandler() throws CalFacadeException {
if (calendarsHandler == null) {
- calendarsHandler = new Calendars(this, getUser(), debug);
+ calendarsHandler = new Calendars(this, getUser());
handlers.add((CalSvcDb)calendarsHandler);
}
@@ -686,7 +686,7 @@
@Override
public CalSuitesI getCalSuitesHandler() throws CalFacadeException {
if (calSuitesHandler == null) {
- calSuitesHandler = new CalSuites(this, getUser(), debug);
+ calSuitesHandler = new CalSuites(this, getUser());
handlers.add((CalSvcDb)calSuitesHandler);
}
@@ -699,7 +699,7 @@
@Override
public IndexingI getIndexingHandler() throws CalFacadeException {
if (indexingHandler == null) {
- indexingHandler = new Indexing(this, getUser(), debug);
+ indexingHandler = new Indexing(this, getUser());
handlers.add((CalSvcDb)indexingHandler);
}
@@ -709,7 +709,7 @@
@Override
public ResourcesI getResourcesHandler() throws CalFacadeException {
if (resourcesHandler == null) {
- resourcesHandler = new ResourcesImpl(this, getUser(), debug);
+ resourcesHandler = new ResourcesImpl(this, getUser());
handlers.add((CalSvcDb)resourcesHandler);
}
@@ -722,7 +722,7 @@
@Override
public SynchI getSynchHandler() throws CalFacadeException {
if (synchHandler == null) {
- synchHandler = new Synch(this, getUser(), null, debug);
+ synchHandler = new Synch(this, getUser(), null);
handlers.add((CalSvcDb)synchHandler);
}
@@ -735,7 +735,7 @@
@Override
public SchedulingI getScheduler() throws CalFacadeException {
if (sched == null) {
- sched = new Scheduling(this, getUser(), debug);
+ sched = new Scheduling(this, getUser());
handlers.add((CalSvcDb)sched);
}
@@ -748,7 +748,7 @@
@Override
public UsersI getUsersHandler() throws CalFacadeException {
if (usersHandler == null) {
- usersHandler = new Users(this, null, debug);
+ usersHandler = new Users(this, null);
handlers.add((CalSvcDb)usersHandler);
/* Cannot call getUser() until initialised */
@@ -764,7 +764,7 @@
@Override
public ViewsI getViewsHandler() throws CalFacadeException {
if (viewsHandler == null) {
- viewsHandler = new Views(this, getUser(), debug);
+ viewsHandler = new Views(this, getUser());
handlers.add((CalSvcDb)viewsHandler);
}
@@ -828,9 +828,7 @@
public EventProperties<BwCategory> getCategoriesHandler()
throws CalFacadeException {
if (categoriesHandler == null) {
- categoriesHandler = new EventPropertiesImpl<BwCategory>(this,
- getUser(),
- debug);
+ categoriesHandler = new EventPropertiesImpl<BwCategory>(this, getUser());
categoriesHandler.init("word", "word",
BwCategory.class.getName(),
"getCategoryRefs", "removeCategoryPrefForAll",
@@ -848,9 +846,7 @@
public EventProperties<BwLocation> getLocationsHandler()
throws CalFacadeException {
if (locationsHandler == null) {
- locationsHandler = new EventPropertiesImpl<BwLocation>(this,
- getUser(),
- debug);
+ locationsHandler = new EventPropertiesImpl<BwLocation>(this, getUser());
locationsHandler.init("uid", "address",
BwLocation.class.getName(),
"getLocationRefs", "removeLocationPrefForAll",
@@ -868,7 +864,7 @@
public EventProperties<BwContact> getContactsHandler()
throws CalFacadeException {
if (contactsHandler == null) {
- contactsHandler = new EventPropertiesImpl<BwContact>(this, getUser(), debug);
+ contactsHandler = new EventPropertiesImpl<BwContact>(this, getUser());
contactsHandler.init("uid", "name",
BwContact.class.getName(),
"getContactRefs", "removeContactPrefForAll",
@@ -919,7 +915,7 @@
@Override
public ClientStateI getClientState() throws CalFacadeException {
if (clientState == null) {
- clientState = new ClientState(this, getUser(), debug);
+ clientState = new ClientState(this, getUser());
handlers.add(clientState);
}
@@ -1313,7 +1309,7 @@
}
try {
- OptionsI opts = CalOptionsFactory.getOptions(debug);
+ OptionsI opts = CalOptionsFactory.getOptions();
String pwEncryptClass = "org.rpi.cmt.security.PwEncryptionDefault";
//String pwEncryptClass = getSysparsHandler().get().getPwEncryptClass();
Modified: trunk/calsvc/src/org/bedework/calsvc/CalSvcDb.java
===================================================================
--- trunk/calsvc/src/org/bedework/calsvc/CalSvcDb.java 2011-02-14 15:21:14 UTC (rev 1436)
+++ trunk/calsvc/src/org/bedework/calsvc/CalSvcDb.java 2011-02-14 15:21:24 UTC (rev 1437)
@@ -75,19 +75,7 @@
/**
* @param svci
* @param principal
- * @param debug
*/
- public CalSvcDb(final CalSvc svci, final BwPrincipal principal,
- final boolean debug) {
- setSvc(svci);
- this.principal = principal;
- this.debug = debug;
- }
-
- /**
- * @param svci
- * @param principal
- */
public CalSvcDb(final CalSvc svci, final BwPrincipal principal) {
setSvc(svci);
this.principal = principal;
Modified: trunk/calsvc/src/org/bedework/calsvc/Calendars.java
===================================================================
--- trunk/calsvc/src/org/bedework/calsvc/Calendars.java 2011-02-14 15:21:14 UTC (rev 1436)
+++ trunk/calsvc/src/org/bedework/calsvc/Calendars.java 2011-02-14 15:21:24 UTC (rev 1437)
@@ -81,12 +81,11 @@
*
* @param svci
* @param principal
- * @param debug
* @throws CalFacadeException
*/
- Calendars(final CalSvc svci, final BwPrincipal principal,
- final boolean debug) throws CalFacadeException {
- super(svci, principal, debug);
+ Calendars(final CalSvc svci,
+ final BwPrincipal principal) throws CalFacadeException {
+ super(svci, principal);
publicCalendarRootPath = "/" + getSyspars().getPublicCalendarRoot();
//userCalendarRootPath = "/" + getSyspars().getUserCalendarRoot();
Modified: trunk/calsvc/src/org/bedework/calsvc/EventPropertiesImpl.java
===================================================================
--- trunk/calsvc/src/org/bedework/calsvc/EventPropertiesImpl.java 2011-02-14 15:21:14 UTC (rev 1436)
+++ trunk/calsvc/src/org/bedework/calsvc/EventPropertiesImpl.java 2011-02-14 15:21:24 UTC (rev 1437)
@@ -70,10 +70,10 @@
*
* @param svci
* @param user
- * @param debug
*/
- public EventPropertiesImpl(final CalSvc svci, final BwUser user, final boolean debug) {
- super(svci, user, debug);
+ public EventPropertiesImpl(final CalSvc svci,
+ final BwUser user) {
+ super(svci, user);
}
/* (non-Javadoc)
Modified: trunk/calsvc/src/org/bedework/calsvc/Events.java
===================================================================
--- trunk/calsvc/src/org/bedework/calsvc/Events.java 2011-02-14 15:21:14 UTC (rev 1436)
+++ trunk/calsvc/src/org/bedework/calsvc/Events.java 2011-02-14 15:21:24 UTC (rev 1437)
@@ -83,8 +83,9 @@
* @author Mike Douglass douglm - rpi.edu
*/
class Events extends CalSvcDb implements EventsI {
- Events(final CalSvc svci, final BwUser user, final boolean debug) {
- super(svci, user, debug);
+ Events(final CalSvc svci,
+ final BwUser user) {
+ super(svci, user);
}
/* (non-Javadoc)
Modified: trunk/calsvc/src/org/bedework/calsvc/Filters.java
===================================================================
--- trunk/calsvc/src/org/bedework/calsvc/Filters.java 2011-02-14 15:21:14 UTC (rev 1436)
+++ trunk/calsvc/src/org/bedework/calsvc/Filters.java 2011-02-14 15:21:24 UTC (rev 1437)
@@ -49,10 +49,10 @@
*
* @param svci
* @param user
- * @param debug
*/
- Filters(final CalSvc svci, final BwUser user, final boolean debug) {
- super(svci, user, debug);
+ Filters(final CalSvc svci,
+ final BwUser user) {
+ super(svci, user);
}
/* (non-Javadoc)
Modified: trunk/calsvc/src/org/bedework/calsvc/Indexing.java
===================================================================
--- trunk/calsvc/src/org/bedework/calsvc/Indexing.java 2011-02-14 15:21:14 UTC (rev 1436)
+++ trunk/calsvc/src/org/bedework/calsvc/Indexing.java 2011-02-14 15:21:24 UTC (rev 1437)
@@ -70,9 +70,9 @@
private boolean indexing = true;
- Indexing(final CalSvc svci, final BwUser user,
- final boolean debug) throws CalFacadeException {
- super(svci, user, debug);
+ Indexing(final CalSvc svci,
+ final BwUser user) throws CalFacadeException {
+ super(svci, user);
indexing = getSvc().getSysparsHandler().get().getIndexing();
}
Modified: trunk/calsvc/src/org/bedework/calsvc/Preferences.java
===================================================================
--- trunk/calsvc/src/org/bedework/calsvc/Preferences.java 2011-02-14 15:21:14 UTC (rev 1436)
+++ trunk/calsvc/src/org/bedework/calsvc/Preferences.java 2011-02-14 15:21:24 UTC (rev 1437)
@@ -58,11 +58,10 @@
/**
* @param svci
* @param principal
- * @param debug
*/
- Preferences(final CalSvc svci, final BwPrincipal principal,
- final boolean debug) {
- super(svci, principal, debug);
+ Preferences(final CalSvc svci,
+ final BwPrincipal principal) {
+ super(svci, principal);
}
/** Call at svci open
Modified: trunk/calsvc/src/org/bedework/calsvc/ResourcesImpl.java
===================================================================
--- trunk/calsvc/src/org/bedework/calsvc/ResourcesImpl.java 2011-02-14 15:21:14 UTC (rev 1436)
+++ trunk/calsvc/src/org/bedework/calsvc/ResourcesImpl.java 2011-02-14 15:21:24 UTC (rev 1437)
@@ -47,11 +47,10 @@
*
* @param svci
* @param principal
- * @param debug
*/
- ResourcesImpl(final CalSvc svci, final BwPrincipal principal,
- final boolean debug) {
- super(svci, principal, debug);
+ ResourcesImpl(final CalSvc svci,
+ final BwPrincipal principal) {
+ super(svci, principal);
}
/* (non-Javadoc)
Modified: trunk/calsvc/src/org/bedework/calsvc/Synch.java
===================================================================
--- trunk/calsvc/src/org/bedework/calsvc/Synch.java 2011-02-14 15:21:14 UTC (rev 1436)
+++ trunk/calsvc/src/org/bedework/calsvc/Synch.java 2011-02-14 15:21:24 UTC (rev 1437)
@@ -45,8 +45,10 @@
*/
protected String synchId;
- Synch(CalSvc svci, BwUser user, String synchId, boolean debug) {
- super(svci, user, debug);
+ Synch(final CalSvc svci,
+ final BwUser user,
+ final String synchId) {
+ super(svci, user);
this.synchId = synchId;
}
@@ -73,7 +75,7 @@
/* (non-Javadoc)
* @see org.bedework.calsvci.SynchI#addInfo(org.bedework.calfacade.syncml.BwSynchInfo)
*/
- public void addInfo(BwSynchInfo val) throws CalFacadeException {
+ public void addInfo(final BwSynchInfo val) throws CalFacadeException {
HibSession sess = getSess();
if (debug) {
@@ -87,7 +89,7 @@
/* (non-Javadoc)
* @see org.bedework.calsvci.SynchI#updateInfo(org.bedework.calfacade.syncml.BwSynchInfo)
*/
- public void updateInfo(BwSynchInfo val) throws CalFacadeException {
+ public void updateInfo(final BwSynchInfo val) throws CalFacadeException {
HibSession sess = getSess();
sess.saveOrUpdate(val);
@@ -96,7 +98,7 @@
/* (non-Javadoc)
* @see org.bedework.calsvci.SynchI#getState(org.bedework.calfacade.BwEvent)
*/
- public BwSynchState getState(BwEvent ev) throws CalFacadeException {
+ public BwSynchState getState(final BwEvent ev) throws CalFacadeException {
HibSession sess = getSess();
sess.namedQuery("getSynchState");
@@ -127,7 +129,7 @@
/* (non-Javadoc)
* @see org.bedework.calsvci.SynchI#addState(org.bedework.calfacade.syncml.BwSynchState)
*/
- public void addState(BwSynchState val) throws CalFacadeException {
+ public void addState(final BwSynchState val) throws CalFacadeException {
HibSession sess = getSess();
sess.save(val);
@@ -136,7 +138,7 @@
/* (non-Javadoc)
* @see org.bedework.calsvci.SynchI#updateState(org.bedework.calfacade.syncml.BwSynchState)
*/
- public void updateState(BwSynchState val) throws CalFacadeException {
+ public void updateState(final BwSynchState val) throws CalFacadeException {
HibSession sess = getSess();
sess.saveOrUpdate(val);
@@ -156,7 +158,7 @@
/* (non-Javadoc)
* @see org.bedework.calsvci.SynchI#getData(org.bedework.calfacade.syncml.BwSynchState)
*/
- public void getData(BwSynchState val) throws CalFacadeException {
+ public void getData(final BwSynchState val) throws CalFacadeException {
HibSession sess = getSess();
sess.namedQuery("getSynchData");
@@ -171,7 +173,7 @@
/* (non-Javadoc)
* @see org.bedework.calsvci.SynchI#setData(org.bedework.calfacade.syncml.BwSynchState)
*/
- public void setData(BwSynchState val) throws CalFacadeException {
+ public void setData(final BwSynchState val) throws CalFacadeException {
HibSession sess = getSess();
sess.saveOrUpdate(val);
@@ -208,7 +210,7 @@
* Private methods
* ==================================================================== */
- private int setSynchStateUser(BwEvent ev, int state)
+ private int setSynchStateUser(final BwEvent ev, final int state)
throws CalFacadeException {
HibSession sess = getSess();
Modified: trunk/calsvc/src/org/bedework/calsvc/Syspars.java
===================================================================
--- trunk/calsvc/src/org/bedework/calsvc/Syspars.java 2011-02-14 15:21:14 UTC (rev 1436)
+++ trunk/calsvc/src/org/bedework/calsvc/Syspars.java 2011-02-14 15:21:24 UTC (rev 1437)
@@ -53,9 +53,9 @@
private Collection<String> rootUsers;
- Syspars(CalSvc svci, BwUser user, String systemName,
- boolean debug) {
- super(svci, user, debug);
+ Syspars(final CalSvc svci, final BwUser user,
+ final String systemName) {
+ super(svci, user);
this.systemName = systemName;
}
@@ -87,7 +87,7 @@
/* (non-Javadoc)
* @see org.bedework.calsvci.SysparsI#get(java.lang.String)
*/
- public BwSystem get(String name) throws CalFacadeException {
+ public BwSystem get(final String name) throws CalFacadeException {
HibSession sess = getSess();
sess.namedQuery("getSystemPars");
@@ -115,7 +115,7 @@
/* (non-Javadoc)
* @see org.bedework.calsvci.SysparsI#update(org.bedework.calfacade.BwSystem)
*/
- public void update(BwSystem val) throws CalFacadeException {
+ public void update(final BwSystem val) throws CalFacadeException {
if (!isSuper()) {
throw new CalFacadeAccessException();
}
@@ -179,7 +179,7 @@
/* (non-Javadoc)
* @see org.bedework.calsvci.SysparsI#addLocale(java.util.Locale)
*/
- public void addLocale(Locale loc) throws CalFacadeException {
+ public void addLocale(final Locale loc) throws CalFacadeException {
Collection<Locale> locs = getSupportedLocales();
if (locs.contains(loc)) {
@@ -218,7 +218,7 @@
/* (non-Javadoc)
* @see org.bedework.calsvci.SysparsI#removeLocale(java.util.Locale)
*/
- public void removeLocale(Locale loc) throws CalFacadeException {
+ public void removeLocale(final Locale loc) throws CalFacadeException {
Collection<Locale> locs = getSupportedLocales();
if (!locs.contains(loc)) {
@@ -295,7 +295,7 @@
/* (non-Javadoc)
* @see org.bedework.calsvci.SysparsI#addRootUser(java.lang.String)
*/
- public void addRootUser(String val) throws CalFacadeException {
+ public void addRootUser(final String val) throws CalFacadeException {
Collection<String> rus = getRootUsers();
if (rus.contains(val)) {
@@ -320,7 +320,7 @@
/* (non-Javadoc)
* @see org.bedework.calsvci.SysparsI#removeRootUser(java.lang.String)
*/
- public void removeRootUser(String val) throws CalFacadeException {
+ public void removeRootUser(final String val) throws CalFacadeException {
Collection<String> rus = getRootUsers();
if (!rus.contains(val)) {
@@ -351,7 +351,7 @@
/* (non-Javadoc)
* @see org.bedework.calsvci.SysparsI#isRootUser(org.bedework.calfacade.BwUser)
*/
- public boolean isRootUser(BwUser val) throws CalFacadeException {
+ public boolean isRootUser(final BwUser val) throws CalFacadeException {
if ((val == null) || val.getUnauthenticated()) {
return false;
}
Modified: trunk/calsvc/src/org/bedework/calsvc/Users.java
===================================================================
--- trunk/calsvc/src/org/bedework/calsvc/Users.java 2011-02-14 15:21:14 UTC (rev 1436)
+++ trunk/calsvc/src/org/bedework/calsvc/Users.java 2011-02-14 15:21:24 UTC (rev 1437)
@@ -58,8 +58,9 @@
private BwUser publicUser;
- Users(final CalSvc svci, final BwUser user, final boolean debug) throws CalFacadeException {
- super(svci, user, debug);
+ Users(final CalSvc svci,
+ final BwUser user) throws CalFacadeException {
+ super(svci, user);
userCalendarRootPath = "/" + getSvc().getSysparsHandler().get().getUserCalendarRoot();
}
Modified: trunk/calsvc/src/org/bedework/calsvc/Views.java
===================================================================
--- trunk/calsvc/src/org/bedework/calsvc/Views.java 2011-02-14 15:21:14 UTC (rev 1436)
+++ trunk/calsvc/src/org/bedework/calsvc/Views.java 2011-02-14 15:21:24 UTC (rev 1437)
@@ -39,15 +39,16 @@
* @author Mike Douglass douglm - rpi.edu
*/
class Views extends CalSvcDb implements ViewsI {
- Views(CalSvc svci, BwUser user, boolean debug) {
- super(svci, user, debug);
+ Views(final CalSvc svci,
+ final BwUser user) {
+ super(svci, user);
}
/* (non-Javadoc)
* @see org.bedework.calsvci.ViewsI#add(org.bedework.calfacade.svc.BwView, boolean)
*/
- public boolean add(BwView val,
- boolean makeDefault) throws CalFacadeException {
+ public boolean add(final BwView val,
+ final boolean makeDefault) throws CalFacadeException {
if (val == null) {
return false;
}
@@ -71,7 +72,7 @@
/* (non-Javadoc)
* @see org.bedework.calsvci.ViewsI#remove(org.bedework.calfacade.svc.BwView)
*/
- public boolean remove(BwView val) throws CalFacadeException{
+ public boolean remove(final BwView val) throws CalFacadeException{
if (val == null) {
return false;
}
@@ -125,8 +126,8 @@
/* (non-Javadoc)
* @see org.bedework.calsvci.ViewsI#addCollection(java.lang.String, java.lang.String)
*/
- public boolean addCollection(String name,
- String path) throws CalFacadeException {
+ public boolean addCollection(final String name,
+ final String path) throws CalFacadeException {
BwPreferences prefs = getSvc().getPrefsHandler().get();
checkOwnerOrSuper(prefs);
@@ -146,8 +147,8 @@
/* (non-Javadoc)
* @see org.bedework.calsvci.ViewsI#removeCollection(java.lang.String, java.lang.String)
*/
- public boolean removeCollection(String name,
- String path) throws CalFacadeException {
+ public boolean removeCollection(final String name,
+ final String path) throws CalFacadeException {
BwPreferences prefs = getSvc().getPrefsHandler().get(getPrincipal());
checkOwnerOrSuper(prefs);
@@ -178,7 +179,7 @@
/* (non-Javadoc)
* @see org.bedework.calsvci.ViewsI#getAll(org.bedework.calfacade.BwUser)
*/
- public Collection<BwView> getAll(BwUser user) throws CalFacadeException {
+ public Collection<BwView> getAll(final BwUser user) throws CalFacadeException {
Collection<BwView> c = getSvc().getPrefsHandler().get(user).getViews();
if (c == null) {
c = new TreeSet<BwView>();
Modified: trunk/calsvc/src/org/bedework/calsvc/client/ClientState.java
===================================================================
--- trunk/calsvc/src/org/bedework/calsvc/client/ClientState.java 2011-02-14 15:21:14 UTC (rev 1436)
+++ trunk/calsvc/src/org/bedework/calsvc/client/ClientState.java 2011-02-14 15:21:24 UTC (rev 1437)
@@ -67,10 +67,10 @@
/**
* @param svci
* @param user
- * @param debug
*/
- public ClientState(final CalSvc svci, final BwUser user, final boolean debug) {
- super(svci, user, debug);
+ public ClientState(final CalSvc svci,
+ final BwUser user) {
+ super(svci, user);
}
/* (non-Javadoc)
Modified: trunk/calsvc/src/org/bedework/calsvc/scheduling/AttendeeSchedulingHandler.java
===================================================================
--- trunk/calsvc/src/org/bedework/calsvc/scheduling/AttendeeSchedulingHandler.java 2011-02-14 15:21:14 UTC (rev 1436)
+++ trunk/calsvc/src/org/bedework/calsvc/scheduling/AttendeeSchedulingHandler.java 2011-02-14 15:21:24 UTC (rev 1437)
@@ -59,8 +59,9 @@
*
*/
public abstract class AttendeeSchedulingHandler extends OrganizerSchedulingHandler {
- AttendeeSchedulingHandler(final CalSvc svci, final BwUser user, final boolean debug) {
- super(svci, user, debug);
+ AttendeeSchedulingHandler(final CalSvc svci,
+ final BwUser user) {
+ super(svci, user);
}
/* (non-Javadoc)
Modified: trunk/calsvc/src/org/bedework/calsvc/scheduling/FreeAndBusyHandler.java
===================================================================
--- trunk/calsvc/src/org/bedework/calsvc/scheduling/FreeAndBusyHandler.java 2011-02-14 15:21:14 UTC (rev 1436)
+++ trunk/calsvc/src/org/bedework/calsvc/scheduling/FreeAndBusyHandler.java 2011-02-14 15:21:24 UTC (rev 1437)
@@ -89,8 +89,8 @@
{fbtb, fbtbt, fbtbu, fbtbt} // typeto == typeBusyTentative
};
- FreeAndBusyHandler(final CalSvc svci, final BwUser user, final boolean debug) {
- super(svci, user, debug);
+ FreeAndBusyHandler(final CalSvc svci, final BwUser user) {
+ super(svci, user);
}
/* (non-Javadoc)
Modified: trunk/calsvc/src/org/bedework/calsvc/scheduling/IScheduleHandler.java
===================================================================
--- trunk/calsvc/src/org/bedework/calsvc/scheduling/IScheduleHandler.java 2011-02-14 15:21:14 UTC (rev 1436)
+++ trunk/calsvc/src/org/bedework/calsvc/scheduling/IScheduleHandler.java 2011-02-14 15:21:24 UTC (rev 1437)
@@ -97,8 +97,9 @@
private CalDavClient calDav;
- IScheduleHandler(final CalSvc svci, final BwUser user, final boolean debug) {
- super(svci, user, debug);
+ IScheduleHandler(final CalSvc svci,
+ final BwUser user) {
+ super(svci, user);
}
/* External realtime requests */
Modified: trunk/calsvc/src/org/bedework/calsvc/scheduling/ImplicitSchedulingHandler.java
===================================================================
--- trunk/calsvc/src/org/bedework/calsvc/scheduling/ImplicitSchedulingHandler.java 2011-02-14 15:21:14 UTC (rev 1436)
+++ trunk/calsvc/src/org/bedework/calsvc/scheduling/ImplicitSchedulingHandler.java 2011-02-14 15:21:24 UTC (rev 1437)
@@ -64,8 +64,9 @@
*
*/
public abstract class ImplicitSchedulingHandler extends AttendeeSchedulingHandler {
- ImplicitSchedulingHandler(final CalSvc svci, final BwUser user, final boolean debug) {
- super(svci, user, debug);
+ ImplicitSchedulingHandler(final CalSvc svci,
+ final BwUser user) {
+ super(svci, user);
}
public void implicitSchedule(final EventInfo ei,
Modified: trunk/calsvc/src/org/bedework/calsvc/scheduling/OrganizerSchedulingHandler.java
===================================================================
--- trunk/calsvc/src/org/bedework/calsvc/scheduling/OrganizerSchedulingHandler.java 2011-02-14 15:21:14 UTC (rev 1436)
+++ trunk/calsvc/src/org/bedework/calsvc/scheduling/OrganizerSchedulingHandler.java 2011-02-14 15:21:24 UTC (rev 1437)
@@ -55,8 +55,9 @@
public abstract class OrganizerSchedulingHandler extends OutboundSchedulingHandler {
//private static String acceptPartstat = IcalDefs.partstats[IcalDefs.partstatAccepted];
- OrganizerSchedulingHandler(final CalSvc svci, final BwUser user, final boolean debug) {
- super(svci, user, debug);
+ OrganizerSchedulingHandler(final CalSvc svci,
+ final BwUser user) {
+ super(svci, user);
}
public ScheduleResult schedule(final EventInfo ei,
Modified: trunk/calsvc/src/org/bedework/calsvc/scheduling/OutBoxHandler.java
===================================================================
--- trunk/calsvc/src/org/bedework/calsvc/scheduling/OutBoxHandler.java 2011-02-14 15:21:14 UTC (rev 1436)
+++ trunk/calsvc/src/org/bedework/calsvc/scheduling/OutBoxHandler.java 2011-02-14 15:21:24 UTC (rev 1437)
@@ -49,8 +49,8 @@
*
*/
public abstract class OutBoxHandler extends SchedulingBase {
- OutBoxHandler(final CalSvc svci, final BwUser user, final boolean debug) {
- super(svci, user, debug);
+ OutBoxHandler(final CalSvc svci, final BwUser user) {
+ super(svci, user);
}
protected String addToOutBox(final EventInfo ei, final BwCalendar outBox,
Modified: trunk/calsvc/src/org/bedework/calsvc/scheduling/OutboundSchedulingHandler.java
===================================================================
--- trunk/calsvc/src/org/bedework/calsvc/scheduling/OutboundSchedulingHandler.java 2011-02-14 15:21:14 UTC (rev 1436)
+++ trunk/calsvc/src/org/bedework/calsvc/scheduling/OutboundSchedulingHandler.java 2011-02-14 15:21:24 UTC (rev 1437)
@@ -65,8 +65,8 @@
*/
public abstract class OutboundSchedulingHandler extends IScheduleHandler {
OutboundSchedulingHandler(final CalSvc svci,
- final BwUser user, final boolean debug) {
- super(svci, user, debug);
+ final BwUser user) {
+ super(svci, user);
}
/* Send the meeting request. If recipient is non-null send only to that recipient
Modified: trunk/calsvc/src/org/bedework/calsvc/scheduling/Scheduling.java
===================================================================
--- trunk/calsvc/src/org/bedework/calsvc/scheduling/Scheduling.java 2011-02-14 15:21:14 UTC (rev 1436)
+++ trunk/calsvc/src/org/bedework/calsvc/scheduling/Scheduling.java 2011-02-14 15:21:24 UTC (rev 1437)
@@ -53,10 +53,10 @@
*
* @param svci
* @param user
- * @param debug
*/
- public Scheduling(final CalSvc svci, final BwUser user, final boolean debug) {
- super(svci, user, debug);
+ public Scheduling(final CalSvc svci,
+ final BwUser user) {
+ super(svci, user);
}
/* (non-Javadoc)
Modified: trunk/calsvc/src/org/bedework/calsvc/scheduling/SchedulingBase.java
===================================================================
--- trunk/calsvc/src/org/bedework/calsvc/scheduling/SchedulingBase.java 2011-02-14 15:21:14 UTC (rev 1436)
+++ trunk/calsvc/src/org/bedework/calsvc/scheduling/SchedulingBase.java 2011-02-14 15:21:24 UTC (rev 1437)
@@ -67,8 +67,9 @@
*
*/
public abstract class SchedulingBase extends CalSvcDb implements SchedulingIntf {
- SchedulingBase(final CalSvc svci, final BwUser user, final boolean debug) {
- super(svci, user, debug);
+ SchedulingBase(final CalSvc svci,
+ final BwUser user) {
+ super(svci, user);
}
/** Add an entry to the queue
Modified: trunk/logging/src/org/bedework/logging/BwlogFactory.java
===================================================================
--- trunk/logging/src/org/bedework/logging/BwlogFactory.java 2011-02-14 15:21:14 UTC (rev 1436)
+++ trunk/logging/src/org/bedework/logging/BwlogFactory.java 2011-02-14 15:21:24 UTC (rev 1437)
@@ -48,7 +48,7 @@
try {
String loggerClassName =
- CalOptionsFactory.getOptions(false).getGlobalStringProperty("loggerClass");
+ CalOptionsFactory.getOptions().getGlobalStringProperty("loggerClass");
logger = (BwLog)CalFacadeUtil.getObject(loggerClassName, BwLog.class);
} catch (Throwable t) {
Modified: trunk/mail/src/org/bedework/mail/DummyMailer.java
===================================================================
--- trunk/mail/src/org/bedework/mail/DummyMailer.java 2011-02-14 15:21:14 UTC (rev 1436)
+++ trunk/mail/src/org/bedework/mail/DummyMailer.java 2011-02-14 15:21:24 UTC (rev 1437)
@@ -62,12 +62,12 @@
import net.fortuna.ical4j.model.Calendar;
+import org.apache.log4j.Logger;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
-import org.apache.log4j.Logger;
-
/** A dummy mailer which just writes to the log.
*
* @author Mike Douglass douglm at rpi.edu
@@ -79,7 +79,7 @@
private transient Logger log;
- public void init(boolean debug) throws CalFacadeException {
+ public void init(final boolean debug) throws CalFacadeException {
//this.debug = debug;
getConfig();
@@ -88,10 +88,10 @@
/* (non-Javadoc)
* @see org.bedework.calfacade.mail.MailerIntf#mailEntity(net.fortuna.ical4j.model.Calendar, java.lang.String, java.util.Collection, java.lang.String)
*/
- public boolean mailEntity(Calendar cal,
- String originator,
- Collection<String>recipients,
- String subject) throws CalFacadeException {
+ public boolean mailEntity(final Calendar cal,
+ final String originator,
+ final Collection<String>recipients,
+ final String subject) throws CalFacadeException {
if (getConfig().getDisabled()) {
return false;
}
@@ -102,11 +102,11 @@
return true;
}
- public void addList(BwCalendar cal) throws CalFacadeException {
+ public void addList(final BwCalendar cal) throws CalFacadeException {
debugMsg("addList called with " + cal.getName());
}
- public void deleteList(BwCalendar cal) throws CalFacadeException {
+ public void deleteList(final BwCalendar cal) throws CalFacadeException {
debugMsg("deleteList called with " + cal.getName());
}
@@ -115,44 +115,44 @@
return new ArrayList<String>();
}
- public boolean checkList(BwCalendar cal) throws CalFacadeException {
+ public boolean checkList(final BwCalendar cal) throws CalFacadeException {
debugMsg("checkList called with " + cal.getName());
return true;
}
- public void postList(BwCalendar cal, Message val) throws CalFacadeException {
+ public void postList(final BwCalendar cal, final Message val) throws CalFacadeException {
debugMsg("postList called with " + cal.getName() + " and message:");
debugMsg(val.toString());
}
- public void addUser(BwCalendar cal, BwUser user) throws CalFacadeException {
+ public void addUser(final BwCalendar cal, final BwUser user) throws CalFacadeException {
debugMsg("addUser called with " + cal.getName() + " and user " +
user.getAccount());
}
- public void removeUser(BwCalendar cal, BwUser user) throws CalFacadeException {
+ public void removeUser(final BwCalendar cal, final BwUser user) throws CalFacadeException {
debugMsg("removeUser called with " + cal.getName() + " and user " +
user.getAccount());
}
- public boolean checkUser(BwCalendar cal, BwUser user) throws CalFacadeException {
+ public boolean checkUser(final BwCalendar cal, final BwUser user) throws CalFacadeException {
debugMsg("checkUser called with " + cal.getName() + " and user " +
user.getAccount());
return true;
}
- public void updateUser(BwCalendar cal, BwUser user, String newEmail)
+ public void updateUser(final BwCalendar cal, final BwUser user, final String newEmail)
throws CalFacadeException {
debugMsg("updateUser called with " + cal.getName() + " and user " +
user.getAccount() + " and new email " + newEmail);
}
- public Collection<BwUser> listUsers(BwCalendar cal) throws CalFacadeException {
+ public Collection<BwUser> listUsers(final BwCalendar cal) throws CalFacadeException {
debugMsg("listUsers called with " + cal.getName());
return new ArrayList<BwUser>();
}
- public void post(Message val) throws CalFacadeException {
+ public void post(final Message val) throws CalFacadeException {
debugMsg("Mailer called with:");
debugMsg(val.toString());
}
@@ -160,7 +160,7 @@
private MailConfigProperties getConfig() throws CalFacadeException {
if (config == null) {
try {
- config = (MailConfigProperties)CalOptionsFactory.getOptions(false).
+ config = (MailConfigProperties)CalOptionsFactory.getOptions().
getGlobalProperty("module.dummymail");
} catch (Throwable t) {
throw new CalFacadeException(t);
@@ -177,7 +177,7 @@
return log;
}
- private void debugMsg(String msg) {
+ private void debugMsg(final String msg) {
getLog().debug(msg);
}
}
Modified: trunk/mail/src/org/bedework/mail/TestMailer.java
===================================================================
--- trunk/mail/src/org/bedework/mail/TestMailer.java 2011-02-14 15:21:14 UTC (rev 1436)
+++ trunk/mail/src/org/bedework/mail/TestMailer.java 2011-02-14 15:21:24 UTC (rev 1437)
@@ -63,6 +63,8 @@
import net.fortuna.ical4j.data.CalendarOutputter;
import net.fortuna.ical4j.model.Calendar;
+import org.apache.log4j.Logger;
+
import java.io.StringWriter;
import java.io.Writer;
import java.util.ArrayList;
@@ -77,8 +79,6 @@
import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeMessage;
-import org.apache.log4j.Logger;
-
/** A mailer which provides some minimal functionality for testing.
* We do not consider many issues such as spam prevention, efficiency in
* mailing to large lists, etc.
@@ -94,7 +94,7 @@
private transient Logger log;
- public void init(boolean debug) throws CalFacadeException {
+ public void init(final boolean debug) throws CalFacadeException {
this.debug = debug;
Properties props = new Properties();
@@ -124,9 +124,9 @@
/* (non-Javadoc)
* @see org.bedework.calfacade.mail.MailerIntf#mailEntity(net.fortuna.ical4j.model.Calendar, java.lang.String, java.util.Collection, java.lang.String)
*/
- public boolean mailEntity(Calendar cal,
+ public boolean mailEntity(final Calendar cal,
String originator,
- Collection<String>recipients,
+ final Collection<String>recipients,
String subject) throws CalFacadeException {
if (debug) {
debugMsg("mailEntity called with " + cal);
@@ -188,11 +188,11 @@
}
}
- public void addList(BwCalendar cal) throws CalFacadeException {
+ public void addList(final BwCalendar cal) throws CalFacadeException {
debugMsg("addList called with " + cal.getName());
}
- public void deleteList(BwCalendar cal) throws CalFacadeException {
+ public void deleteList(final BwCalendar cal) throws CalFacadeException {
debugMsg("deleteList called with " + cal.getName());
}
@@ -201,44 +201,44 @@
return new ArrayList<String>();
}
- public boolean checkList(BwCalendar cal) throws CalFacadeException {
+ public boolean checkList(final BwCalendar cal) throws CalFacadeException {
debugMsg("checkList called with " + cal.getName());
return true;
}
- public void postList(BwCalendar cal, Message val) throws CalFacadeException {
+ public void postList(final BwCalendar cal, final Message val) throws CalFacadeException {
debugMsg("postList called with " + cal.getName() + " and message:");
debugMsg(val.toString());
}
- public void addUser(BwCalendar cal, BwUser user) throws CalFacadeException {
+ public void addUser(final BwCalendar cal, final BwUser user) throws CalFacadeException {
debugMsg("addUser called with " + cal.getName() + " and user " +
user.getAccount());
}
- public void removeUser(BwCalendar cal, BwUser user) throws CalFacadeException {
+ public void removeUser(final BwCalendar cal, final BwUser user) throws CalFacadeException {
debugMsg("removeUser called with " + cal.getName() + " and user " +
user.getAccount());
}
- public boolean checkUser(BwCalendar cal, BwUser user) throws CalFacadeException {
+ public boolean checkUser(final BwCalendar cal, final BwUser user) throws CalFacadeException {
debugMsg("checkUser called with " + cal.getName() + " and user " +
user.getAccount());
return true;
}
- public void updateUser(BwCalendar cal, BwUser user, String newEmail)
+ public void updateUser(final BwCalendar cal, final BwUser user, final String newEmail)
throws CalFacadeException {
debugMsg("updateUser called with " + cal.getName() + " and user " +
user.getAccount() + " and new email " + newEmail);
}
- public Collection<BwUser> listUsers(BwCalendar cal) throws CalFacadeException {
+ public Collection<BwUser> listUsers(final BwCalendar cal) throws CalFacadeException {
debugMsg("listUsers called with " + cal.getName());
return new ArrayList<BwUser>();
}
- public void post(Message val) throws CalFacadeException {
+ public void post(final Message val) throws CalFacadeException {
debugMsg("Mailer called with:");
debugMsg(val.toString());
@@ -286,7 +286,7 @@
private MailConfigProperties getConfig() throws CalFacadeException {
if (config == null) {
try {
- config = (MailConfigProperties)CalOptionsFactory.getOptions(false).getGlobalProperty("module.testmail");
+ config = (MailConfigProperties)CalOptionsFactory.getOptions().getGlobalProperty("module.testmail");
} catch (Throwable t) {
throw new CalFacadeException(t);
}
@@ -302,7 +302,7 @@
return log;
}
- private void debugMsg(String msg) {
+ private void debugMsg(final String msg) {
getLog().debug(msg);
}
}
More information about the Bedework-commit
mailing list