aboutsummaryrefslogtreecommitdiffstats
path: root/src/net/java/sip/communicator/plugin/thunderbird
diff options
context:
space:
mode:
authorLyubomir Marinov <lyubomir.marinov@jitsi.org>2013-05-23 18:50:35 +0300
committerLyubomir Marinov <lyubomir.marinov@jitsi.org>2013-05-23 18:50:35 +0300
commitb211c26d6c8f51a75d3b64b6092284c3847a3a8a (patch)
treea51b7d816a27f8db492cf9c44f998e2da8176635 /src/net/java/sip/communicator/plugin/thunderbird
parent24e81b82808681c6b5741b14048ef58c4e665e37 (diff)
downloadjitsi-b211c26d6c8f51a75d3b64b6092284c3847a3a8a.zip
jitsi-b211c26d6c8f51a75d3b64b6092284c3847a3a8a.tar.gz
jitsi-b211c26d6c8f51a75d3b64b6092284c3847a3a8a.tar.bz2
Fixes warnings, removes trailing whitespace, adds @Override annotations.
Diffstat (limited to 'src/net/java/sip/communicator/plugin/thunderbird')
-rw-r--r--src/net/java/sip/communicator/plugin/thunderbird/ThunderbirdActivator.java4
-rw-r--r--src/net/java/sip/communicator/plugin/thunderbird/ThunderbirdConfigForm.java8
-rw-r--r--src/net/java/sip/communicator/plugin/thunderbird/ThunderbirdContactQuery.java24
-rw-r--r--src/net/java/sip/communicator/plugin/thunderbird/ThunderbirdContactSourceService.java20
4 files changed, 28 insertions, 28 deletions
diff --git a/src/net/java/sip/communicator/plugin/thunderbird/ThunderbirdActivator.java b/src/net/java/sip/communicator/plugin/thunderbird/ThunderbirdActivator.java
index a28a66d..d6a9c58 100644
--- a/src/net/java/sip/communicator/plugin/thunderbird/ThunderbirdActivator.java
+++ b/src/net/java/sip/communicator/plugin/thunderbird/ThunderbirdActivator.java
@@ -18,7 +18,7 @@ import org.osgi.framework.*;
/**
* Bundle-Activator for the Thunderbird address book contact source plug-in.
- *
+ *
* @author Ingo Bauersachs
*/
public class ThunderbirdActivator
@@ -77,7 +77,7 @@ public class ThunderbirdActivator
/**
* Stops an address book service and deletes the corresponding configuration
* data.
- *
+ *
* @param service the address book instance to remove.
*/
static void remove(ThunderbirdContactSourceService service)
diff --git a/src/net/java/sip/communicator/plugin/thunderbird/ThunderbirdConfigForm.java b/src/net/java/sip/communicator/plugin/thunderbird/ThunderbirdConfigForm.java
index 512b8ba..00ae93e 100644
--- a/src/net/java/sip/communicator/plugin/thunderbird/ThunderbirdConfigForm.java
+++ b/src/net/java/sip/communicator/plugin/thunderbird/ThunderbirdConfigForm.java
@@ -168,7 +168,7 @@ public class ThunderbirdConfigForm
if (txtFilename.getText() != null)
{
String bprop = PNAME_BASE_THUNDERBIRD_CONFIG + ".1";
-
+
ConfigurationService config
= ThunderbirdActivator.getConfigService();
config.setProperty(bprop, "1");
@@ -305,7 +305,7 @@ public class ThunderbirdConfigForm
/*
* (non-Javadoc)
- *
+ *
* @see javax.swing.event.DocumentListener#insertUpdate(javax.swing.event.
* DocumentEvent)
*/
@@ -316,7 +316,7 @@ public class ThunderbirdConfigForm
/*
* (non-Javadoc)
- *
+ *
* @see javax.swing.event.DocumentListener#removeUpdate(javax.swing.event.
* DocumentEvent)
*/
@@ -327,7 +327,7 @@ public class ThunderbirdConfigForm
/*
* (non-Javadoc)
- *
+ *
* @see javax.swing.event.DocumentListener#changedUpdate(javax.swing.event.
* DocumentEvent)
*/
diff --git a/src/net/java/sip/communicator/plugin/thunderbird/ThunderbirdContactQuery.java b/src/net/java/sip/communicator/plugin/thunderbird/ThunderbirdContactQuery.java
index c03225d..1bbce76 100644
--- a/src/net/java/sip/communicator/plugin/thunderbird/ThunderbirdContactQuery.java
+++ b/src/net/java/sip/communicator/plugin/thunderbird/ThunderbirdContactQuery.java
@@ -21,7 +21,7 @@ import net.java.sip.communicator.util.*;
/**
* Queries a Thunderbird address book for contacts matching the given pattern.
- *
+ *
* @author Ingo Bauersachs
*/
public class ThunderbirdContactQuery
@@ -33,7 +33,7 @@ public class ThunderbirdContactQuery
/**
* Creates a new instance of this class.
- *
+ *
* @param owner The contact source that created this query.
* @param query The pattern to match against the contacts database.
*/
@@ -61,7 +61,7 @@ public class ThunderbirdContactQuery
new InputStreamReader(new FileInputStream(filename));
MorkDocument md = new MorkDocument(sr);
sr.close();
-
+
// We now have rows in their tables and additional rows at
// transaction level. Put the to a better format:
// DB -> Tables -> Rows
@@ -76,7 +76,7 @@ public class ThunderbirdContactQuery
table = new HashMap<String, Row>();
db.put(tableId, table);
}
-
+
for (Row r : t.getRows())
{
String scope = r.getScopeName();
@@ -84,11 +84,11 @@ public class ThunderbirdContactQuery
{
scope = t.getScopeName();
}
-
+
table.put(r.getRowId() + "/" + scope, r);
}
}
-
+
// The additional rows at the root-level update/replace the ones
// in the tables. There's usually neither a table nor a scope
// defined, so lets just use the default.
@@ -100,7 +100,7 @@ public class ThunderbirdContactQuery
{
scope = defaultScope;
}
-
+
String tableId = "1/" + scope;
Map<String, Row> table = db.get(tableId);
if (table == null)
@@ -108,13 +108,13 @@ public class ThunderbirdContactQuery
table = new HashMap<String, Row>();
db.put(tableId, table);
}
-
+
String rowId = r.getRowId() + "/" + scope;
if (rowId.startsWith("-"))
{
rowId = rowId.substring(1);
}
-
+
table.put(rowId, r);
}
@@ -152,7 +152,7 @@ public class ThunderbirdContactQuery
/**
* Processes a database row by matching it against the query and adding it
* to the result set if it matched.
- *
+ *
* @param r The database row representing a contact.
*/
private void readEntry(Row r)
@@ -218,7 +218,7 @@ public class ThunderbirdContactQuery
/**
* Adds a "Phone" {@link ContactDetail} to a query contact.
- *
+ *
* @param details The {@link List} of {@link ContactDetail}s to which the
* details is added.
* @param r The source database row of the contact.
@@ -248,7 +248,7 @@ public class ThunderbirdContactQuery
/**
* Gets a set of non-empty properties from the source database row.
- *
+ *
* @param r The source database row to process.
* @param properties The property-names to extract.
* @return A set of non-empty properties from the source database row.
diff --git a/src/net/java/sip/communicator/plugin/thunderbird/ThunderbirdContactSourceService.java b/src/net/java/sip/communicator/plugin/thunderbird/ThunderbirdContactSourceService.java
index f9c6abd..27e4fe0 100644
--- a/src/net/java/sip/communicator/plugin/thunderbird/ThunderbirdContactSourceService.java
+++ b/src/net/java/sip/communicator/plugin/thunderbird/ThunderbirdContactSourceService.java
@@ -16,7 +16,7 @@ import net.java.sip.communicator.service.contactsource.*;
/**
* Query creator for an instance of a Thunderbird address book.
- *
+ *
* @author Ingo Bauersachs
*/
public class ThunderbirdContactSourceService
@@ -89,7 +89,7 @@ public class ThunderbirdContactSourceService
/**
* Creates a new instance of this class.
- *
+ *
* @param baseConfigProperty The base property name of the config for this
* instance
*/
@@ -115,7 +115,7 @@ public class ThunderbirdContactSourceService
/*
* (non-Javadoc)
- *
+ *
* @see net.java.sip.communicator.service.contactsource
* .ContactSourceService#getType()
*/
@@ -126,7 +126,7 @@ public class ThunderbirdContactSourceService
/*
* (non-Javadoc)
- *
+ *
* @see net.java.sip.communicator.service.contactsource
* .ContactSourceService#getDisplayName()
*/
@@ -137,7 +137,7 @@ public class ThunderbirdContactSourceService
/*
* (non-Javadoc)
- *
+ *
* @see net.java.sip.communicator.service.contactsource
* .ContactSourceService#queryContactSource(java.lang.String)
*/
@@ -164,7 +164,7 @@ public class ThunderbirdContactSourceService
/*
* (non-Javadoc)
- *
+ *
* @see
* net.java.sip.communicator.service.contactsource.ContactSourceService#
* queryContactSource(java.lang.String, int)
@@ -178,7 +178,7 @@ public class ThunderbirdContactSourceService
/*
* (non-Javadoc)
- *
+ *
* @see
* net.java.sip.communicator.service.contactsource.ExtendedContactSourceService
* #queryContactSource(java.util.regex.Pattern)
@@ -190,7 +190,7 @@ public class ThunderbirdContactSourceService
/*
* (non-Javadoc)
- *
+ *
* @see
* net.java.sip.communicator.service.contactsource.ContactSourceService#
* getIndex()
@@ -202,7 +202,7 @@ public class ThunderbirdContactSourceService
/*
* (non-Javadoc)
- *
+ *
* @see
* net.java.sip.communicator.service.contactsource.ExtendedContactSourceService
* #getPhoneNumberPrefix()
@@ -226,7 +226,7 @@ public class ThunderbirdContactSourceService
/**
* Gets the filename to the address book database processed by this
* ContactSource.
- *
+ *
* @return The filename to the address book database.
*/
String getFilename()