projects
/
zxing.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2af1a4a
)
Standardize getDisplayResult() implementation in parsed results, and fix up web site...
author
srowen
<srowen@59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Fri, 27 Jun 2008 18:55:00 +0000
(18:55 +0000)
committer
srowen
<srowen@59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Fri, 27 Jun 2008 18:55:00 +0000
(18:55 +0000)
git-svn-id: http://zxing.googlecode.com/svn/trunk@490
59b500cc
-1b3d-0410-9834-
0bbf25fbcc57
core/src/com/google/zxing/client/result/CalendarParsedResult.java
patch
|
blob
|
history
core/src/com/google/zxing/client/result/EmailAddressParsedResult.java
patch
|
blob
|
history
core/src/com/google/zxing/client/result/SMSParsedResult.java
patch
|
blob
|
history
core/src/com/google/zxing/client/result/TelParsedResult.java
patch
|
blob
|
history
core/src/com/google/zxing/client/result/URIParsedResult.java
patch
|
blob
|
history
zxingorg/web/index.jspx
patch
|
blob
|
history
diff --git
a/core/src/com/google/zxing/client/result/CalendarParsedResult.java
b/core/src/com/google/zxing/client/result/CalendarParsedResult.java
index
687e36b
..
5dbcb7b
100644
(file)
--- a/
core/src/com/google/zxing/client/result/CalendarParsedResult.java
+++ b/
core/src/com/google/zxing/client/result/CalendarParsedResult.java
@@
-78,7
+78,8
@@
public final class CalendarParsedResult extends ParsedResult {
}
public String getDisplayResult() {
}
public String getDisplayResult() {
- StringBuffer result = new StringBuffer(summary);
+ StringBuffer result = new StringBuffer();
+ maybeAppend(summary, result);
maybeAppend(start, result);
maybeAppend(end, result);
maybeAppend(location, result);
maybeAppend(start, result);
maybeAppend(end, result);
maybeAppend(location, result);
diff --git
a/core/src/com/google/zxing/client/result/EmailAddressParsedResult.java
b/core/src/com/google/zxing/client/result/EmailAddressParsedResult.java
index
a0542da
..
a49059d
100644
(file)
--- a/
core/src/com/google/zxing/client/result/EmailAddressParsedResult.java
+++ b/
core/src/com/google/zxing/client/result/EmailAddressParsedResult.java
@@
-51,7
+51,11
@@
public final class EmailAddressParsedResult extends ParsedResult {
}
public String getDisplayResult() {
}
public String getDisplayResult() {
- return emailAddress;
+ StringBuffer result = new StringBuffer();
+ maybeAppend(emailAddress, result);
+ maybeAppend(subject, result);
+ maybeAppend(body, result);
+ return result.toString();
}
}
\ No newline at end of file
}
}
\ No newline at end of file
diff --git
a/core/src/com/google/zxing/client/result/SMSParsedResult.java
b/core/src/com/google/zxing/client/result/SMSParsedResult.java
index
23b8d7e
..
77fdd0f
100644
(file)
--- a/
core/src/com/google/zxing/client/result/SMSParsedResult.java
+++ b/
core/src/com/google/zxing/client/result/SMSParsedResult.java
@@
-63,7
+63,13
@@
public final class SMSParsedResult extends ParsedResult {
}
public String getDisplayResult() {
}
public String getDisplayResult() {
- return number;
+ StringBuffer result = new StringBuffer();
+ maybeAppend(number, result);
+ maybeAppend(via, result);
+ maybeAppend(subject, result);
+ maybeAppend(body, result);
+ maybeAppend(title, result);
+ return result.toString();
}
}
\ No newline at end of file
}
}
\ No newline at end of file
diff --git
a/core/src/com/google/zxing/client/result/TelParsedResult.java
b/core/src/com/google/zxing/client/result/TelParsedResult.java
index
bddb85a
..
20cdd51
100644
(file)
--- a/
core/src/com/google/zxing/client/result/TelParsedResult.java
+++ b/
core/src/com/google/zxing/client/result/TelParsedResult.java
@@
-45,7
+45,10
@@
public final class TelParsedResult extends ParsedResult {
}
public String getDisplayResult() {
}
public String getDisplayResult() {
- return number;
+ StringBuffer result = new StringBuffer();
+ maybeAppend(number, result);
+ maybeAppend(title, result);
+ return result.toString();
}
}
\ No newline at end of file
}
}
\ No newline at end of file
diff --git
a/core/src/com/google/zxing/client/result/URIParsedResult.java
b/core/src/com/google/zxing/client/result/URIParsedResult.java
index
93bd637
..
1e63140
100644
(file)
--- a/
core/src/com/google/zxing/client/result/URIParsedResult.java
+++ b/
core/src/com/google/zxing/client/result/URIParsedResult.java
@@
-39,11
+39,10
@@
public final class URIParsedResult extends ParsedResult {
}
public String getDisplayResult() {
}
public String getDisplayResult() {
- if (title == null) {
- return uri;
- } else {
- return title + '\n' + uri;
- }
+ StringBuffer result = new StringBuffer();
+ maybeAppend(uri, result);
+ maybeAppend(title, result);
+ return result.toString();
}
}
diff --git
a/zxingorg/web/index.jspx
b/zxingorg/web/index.jspx
index
1e51b88
..
51e65c6
100644
(file)
--- a/
zxingorg/web/index.jspx
+++ b/
zxingorg/web/index.jspx
@@
-32,13
+32,6
@@
<a href="BarcodeReader.jad">Download</a>
the ZXing Barcode Reader.
</p>
<a href="BarcodeReader.jad">Download</a>
the ZXing Barcode Reader.
</p>
- <p>
- <strong>Having problems with the regular version?</strong>
- </p>
- <p>
- <a href="BarcodeReaderBasic.jad">Download</a>
- the ZXing Barcode Reader Basic version.
- </p>
<p>
<strong>An Android client is available for the curious:</strong>
</p>
<p>
<strong>An Android client is available for the curious:</strong>
</p>