mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-03-05 20:48:51 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Replace tabs with spaces ( part of accepting another big patch); fix one failing test due to typo

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1326 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen 2010-05-02 06:49:18 +00:00
parent 1109e2aecf
commit 816d6b81e0
21 changed files with 303 additions and 325 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/src/com/google/zxing/client/android/book/SearchBookContentsResult.java
View file

@ -30,7 +30,9 @@ final class SearchBookContentsResult {
private final String snippet;
private final boolean validSnippet;
SearchBookContentsResult(String pageId, String pageNumber, String snippet,
SearchBookContentsResult(String pageId,
String pageNumber,
String snippet,
boolean validSnippet) {
this.pageId = pageId;
this.pageNumber = pageNumber;

5
core/src/com/google/zxing/oned/Code39Writer.java
View file

@ -28,7 +28,10 @@ import com.google.zxing.common.BitMatrix;
*/
public final class Code39Writer extends UPCEANWriter {
public BitMatrix encode(String contents, BarcodeFormat format, int width, int height,
public BitMatrix encode(String contents,
BarcodeFormat format,
int width,
int height,
Hashtable hints) throws WriterException {
if (format != BarcodeFormat.CODE_39) {
throw new IllegalArgumentException("Can only encode CODE_39, but got " + format);

6
core/src/com/google/zxing/oned/ITFWriter.java
View file

@ -28,7 +28,10 @@ import com.google.zxing.common.BitMatrix;
*/
public final class ITFWriter extends UPCEANWriter {
public BitMatrix encode(String contents, BarcodeFormat format, int width, int height,
public BitMatrix encode(String contents,
BarcodeFormat format,
int width,
int height,
Hashtable hints) throws WriterException {
if (format != BarcodeFormat.ITF) {
throw new IllegalArgumentException("Can only encode ITF, but got " + format);
@ -61,4 +64,5 @@ public final class ITFWriter extends UPCEANWriter {
return result;
}
}

1
core/src/com/google/zxing/pdf417/decoder/Decoder.java
View file

@ -146,4 +146,5 @@ public final class Decoder {
}
return result;
}
}

6
core/test/src/com/google/zxing/client/result/ParsedReaderResultTestCase.java
View file

@ -202,11 +202,11 @@ public final class ParsedReaderResultTestCase extends TestCase {
"DTEND:20080505\r\nEND:VEVENT", "foo\n20080504\n20080505", ParsedResultType.CALENDAR);
// Start time only
doTestResult("BEGIN:VEVENT\r\nSUMMARY:foo\r\nDTSTART:20080504T123456Z\r\nEND:VEVENT",
"foo\n20080504T123456Z", ParsedResultType.CALENDAR);
"foo\n20080504T123456Z\n20080504T123456Z", ParsedResultType.CALENDAR);
doTestResult("BEGIN:VEVENT\r\nSUMMARY:foo\r\nDTSTART:20080504T123456\r\nEND:VEVENT",
"foo\n20080504T123456", ParsedResultType.CALENDAR);
"foo\n20080504T123456\n20080504T123456", ParsedResultType.CALENDAR);
doTestResult("BEGIN:VEVENT\r\nSUMMARY:foo\r\nDTSTART:20080504\r\nEND:VEVENT",
"foo\n20080504", ParsedResultType.CALENDAR);
"foo\n20080504\n20080504", ParsedResultType.CALENDAR);
doTestResult("BEGIN:VEVENT\r\nDTEND:20080505T\r\nEND:VEVENT",
"BEGIN:VEVENT\r\nDTEND:20080505T\r\nEND:VEVENT", ParsedResultType.TEXT);
// Make sure illegal entries without newlines don't crash

3
core/test/src/com/google/zxing/qrcode/encoder/MatrixUtilTestCase.java
View file

@ -290,8 +290,7 @@ public final class MatrixUtilTestCase extends TestCase {
public void testMakeTypeInfoInfoBits() throws WriterException {
// From Appendix C in JISX0510:2004 (p 65)
BitArray bits = new BitArray();
MatrixUtil.makeTypeInfoBits(ErrorCorrectionLevel.M,
5, bits);
MatrixUtil.makeTypeInfoBits(ErrorCorrectionLevel.M, 5, bits);
assertEquals(" X......X X..XXX.", bits.toString());
}
}

5
zxing.appspot.com/generator/src/com/google/zxing/web/generator/Generator.gwt.xml
View file

@ -1,21 +1,16 @@
<module>
<!-- Inherit the core Web Toolkit stuff. -->
<inherits name='com.google.gwt.user.User'/>
<!-- Inherit the default GWT style sheet. -->
<inherits name='com.google.gwt.user.theme.standard.Standard'/>
<!-- Other module inherits -->
<inherits name='com.google.gwt.widgetideas.WidgetIdeas' />
<inherits name='com.google.gwt.libideas.LibIdeas' />
<inherits name='com.google.gwt.maps.GoogleMaps' />
<!-- Specify the app entry point class. -->
<entry-point class='com.google.zxing.web.generator.client.Generator'/>
<!-- Specify the application specific style sheet. -->
<stylesheet src='Generator.css' />
<stylesheet src='DatePickerDemo.css' />
<script src='http://maps.google.com/maps?file=api&amp;v=2&amp;key=ABQIAAAAjEOGGB_IEuss4QYUzB6Z0BRlY4xXjGBjgubjQXCS8Djm2jdpYBQn9f8dHtxpg30ararqd3GCyq_T4A' />
</module>

2
zxing.appspot.com/generator/src/com/google/zxing/web/generator/client/GeneratorException.java
View file

@ -24,8 +24,6 @@ package com.google.zxing.web.generator.client;
* @author Yohann Coppel
*/
public class GeneratorException extends Exception {
private static final long serialVersionUID = 1L;
public GeneratorException(String message) {
super(message);
}

18
zxing.appspot.com/generator/src/com/google/zxing/web/generator/public/Generator.css
View file

@ -6,12 +6,10 @@ body {
font-family: Arial, sans-serif;
font-size: 11px;
}
#header {
background-color: #dde3e9;
border-bottom: 1px solid #f2f7fc;
}
#header h1 {
font-size: 15px;
font-weight: bold;
@ -19,23 +17,19 @@ body {
padding: 12px;
border-bottom: 1px solid #c8d0d9;
}
#header span {
font-weight: normal;
color: #5e6b75;
}
#footer {
width: 100%;
text-align:center;
padding-top: 12px;
}
#footer a {
text-decoration:none;
color: #5e6b75;
}
/****************************************/
#mainpanel {
width: 800px;
@ -43,7 +37,6 @@ body {
padding: 12px;
font-size: 11px;
}
#imageresult {
background-color: #dde3e9;
height: 350px;
@ -56,7 +49,6 @@ body {
display: table;
#position: relative;
}
#innerresult {
display: table-cell;
vertical-align: middle;
@ -64,20 +56,16 @@ body {
#position: absolute;
#top: 50%;
}
#innerresult img {
#position: relative;
#top: -50%;
}
#downloadText {
font-size: 11px;
}
#urlresult {
width: 350px;
}
.firstColumn {
width: 100px;
text-align: right;
@ -87,14 +75,12 @@ body {
font-weight: bold;
font-size: 11px;
}
.secondColumn {
width: 270px;
font-size: 11px;
color: #5e6b75;
font-weight: bold;
}
/*.inputfield,*/
.gwt-TextBox,
.gwt-TextArea {
@ -106,19 +92,15 @@ body {
color: #000;
font-weight: normal;
}
/*.inputfield:focus,*/
.gwt-TextBox:focus {
background-color: #fffbcc;
}
.required {
background: #ffffff url(required-field-bg.png) repeat-y;
}
.errorMessage {
padding-left: 110px;
font-size: 11px;
color: red;
}

6
zxing.appspot.com/static/style.css
View file

@ -6,16 +6,13 @@ body {
font-family: Arial, sans-serif;
font-size: 12px;
}
td {
font-size: 14px;
}
#header {
background-color: #dde3e9;
border-bottom: 1px solid #f2f7fc;
}
#header h1 {
font-size: 15px;
font-weight: bold;
@ -23,18 +20,15 @@ td {
padding: 12px;
border-bottom: 1px solid #c8d0d9;
}
#header span {
font-weight: normal;
color: #5e6b75;
}
#footer {
width: 100%;
text-align:center;
padding-top: 12px;
}
#footer a {
text-decoration:none;
color: #5e6b75;