Precommit fails check style for CounterpathPhone class in main, attached a patch to solve this.
George
From 2d32f33c7653d44d1549d6382d978b476d1227bb Mon Sep 17 00:00:00 2001 From: George Niculae <[email protected]> Date: Fri, 22 Oct 2010 23:13:39 +0300 Subject: [PATCH] fix style for CounterpathPhone class --- .../phone/counterpath/CounterpathPhone.java | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/sipXconfig/plugins/counterpath/src/org/sipfoundry/sipxconfig/phone/counterpath/CounterpathPhone.java b/sipXconfig/plugins/counterpath/src/org/sipfoundry/sipxconfig/phone/counterpath/CounterpathPhone.java index a022115..6a5fa9e 100644 --- a/sipXconfig/plugins/counterpath/src/org/sipfoundry/sipxconfig/phone/counterpath/CounterpathPhone.java +++ b/sipXconfig/plugins/counterpath/src/org/sipfoundry/sipxconfig/phone/counterpath/CounterpathPhone.java @@ -9,8 +9,6 @@ */ package org.sipfoundry.sipxconfig.phone.counterpath; -import static java.lang.String.format; - import java.io.BufferedWriter; import java.io.File; import java.io.FileOutputStream; @@ -18,6 +16,8 @@ import java.io.IOException; import java.io.OutputStreamWriter; import java.util.Collection; +import static java.lang.String.format; + import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.lang.ArrayUtils; import org.sipfoundry.sipxconfig.admin.commserver.LocationsManager; @@ -47,10 +47,11 @@ public class CounterpathPhone extends Phone { private static final String REG_PASSWORD = "registration/password"; private static final String REG_DOMAIN = "registration/domain"; private static final String SUBSCRIPTION_AOR = "presence/workgroup/workgroup_subscription_aor"; - private static final String RESOURCE_LISTS_PATH = "system/resources/system:contact_list_storage:resource_lists_path"; - private static final String RESOURCE_LISTS_FILENAME = "system/resources/system:contact_list_storage:contacts_server_filename"; - private static final String RESOURCE_LISTS_USER_NAME = "system/resources/system:contact_list_storage:resource_lists_user_name"; - private static final String RESOURCE_LISTS_PASSWORD = "system/resources/system:contact_list_storage:resource_lists_password"; + private static final String CONTACT_LIST_STORAGE = "system/resources/system:contact_list_storage:"; + private static final String RESOURCE_LISTS_PATH = CONTACT_LIST_STORAGE + "resource_lists_path"; + private static final String RESOURCE_LISTS_FILENAME = CONTACT_LIST_STORAGE + "contacts_server_filename"; + private static final String RESOURCE_LISTS_USER_NAME = CONTACT_LIST_STORAGE + "resource_lists_user_name"; + private static final String RESOURCE_LISTS_PASSWORD = CONTACT_LIST_STORAGE + "resource_lists_password"; private static final String VOICEMAIL_URL = "voicemail/voicemail_url"; private static final String WEBDAV_REALM = ":WebDAV:"; private static final String AUTH_FILE_NAME = "webdav.users.passwd"; @@ -251,9 +252,7 @@ public class CounterpathPhone extends Phone { return m_imAccount.getImPassword(); } - @SettingEntry(paths = { - REG_DOMAIN, "xmpp-config/domain" - }) + @SettingEntry(paths = { REG_DOMAIN, "xmpp-config/domain" }) public String getDomain() { DeviceDefaults defaults = m_line.getPhoneContext().getPhoneDefaults(); return defaults.getDomainName(); -- 1.6.0.6
_______________________________________________ sipx-dev mailing list [email protected] List Archive: http://list.sipfoundry.org/archive/sipx-dev/
