git://git.nikiroo.be
/
jvcard.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add more warnings source to 1.6) and fix warnings
[jvcard.git]
/
src
/
be
/
nikiroo
/
jvcard
/
launcher
/
CardResult.java
diff --git
a/src/be/nikiroo/jvcard/launcher/CardResult.java
b/src/be/nikiroo/jvcard/launcher/CardResult.java
index 68a5ae747512bd986b0970f1675fb2e98b95638a..4a0afd6fa6ed5dc860fb5c7b59c3cd84bd89494e 100644
(file)
--- a/
src/be/nikiroo/jvcard/launcher/CardResult.java
+++ b/
src/be/nikiroo/jvcard/launcher/CardResult.java
@@
-9,7
+9,7
@@
import be.nikiroo.jvcard.Card;
* about it.
*
* @author niki
* about it.
*
* @author niki
- *
+ *
*/
public class CardResult {
/**
*/
public class CardResult {
/**
@@
-17,7
+17,7
@@
public class CardResult {
* synchronisation is not able to process fully automatically.
*
* @author niki
* synchronisation is not able to process fully automatically.
*
* @author niki
- *
+ *
*/
public interface MergeCallback {
/**
*/
public interface MergeCallback {
/**
@@
-59,6
+59,7
@@
public class CardResult {
*/
public CardResult(Card card, boolean remote, boolean synced, boolean changed) {
this.card = card;
*/
public CardResult(Card card, boolean remote, boolean synced, boolean changed) {
this.card = card;
+ this.remote = remote;
this.synced = synced;
this.changed = changed;
}
this.synced = synced;
this.changed = changed;
}