From: Jeremias M. <jm...@us...> - 2008-09-10 12:53:11
|
Update of /cvsroot/barcode4j/barcode4j/src/java/org/krysalis/barcode4j/impl/code128 In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv26642/src/java/org/krysalis/barcode4j/impl/code128 Modified Files: Code128Bean.java Log Message: Issue #2082330: Fixed bad error message in Code128Bean. Index: Code128Bean.java =================================================================== RCS file: /cvsroot/barcode4j/barcode4j/src/java/org/krysalis/barcode4j/impl/code128/Code128Bean.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Code128Bean.java 13 May 2008 13:00:45 -0000 1.7 --- Code128Bean.java 10 Sep 2008 12:53:19 -0000 1.8 *************** *** 1,11 **** /* * Copyright 2002-2005 Jeremias Maerki. ! * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at ! * * http://www.apache.org/licenses/LICENSE-2.0 ! * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, --- 1,11 ---- /* * Copyright 2002-2005 Jeremias Maerki. ! * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at ! * * http://www.apache.org/licenses/LICENSE-2.0 ! * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, *************** *** 26,30 **** /** * This class is an implementation of the Code 128 barcode. ! * * @author Jeremias Maerki * @version $Id$ --- 26,30 ---- /** * This class is an implementation of the Code 128 barcode. ! * * @author Jeremias Maerki * @version $Id$ *************** *** 41,45 **** setVerticalQuietZone(0); //1D barcodes don't have vertical quiet zones } ! /** * @see org.krysalis.barcode4j.impl.AbstractBarcodeBean#hasFontDescender() --- 41,45 ---- setVerticalQuietZone(0); //1D barcodes don't have vertical quiet zones } ! /** * @see org.krysalis.barcode4j.impl.AbstractBarcodeBean#hasFontDescender() *************** *** 48,52 **** return true; } ! /** * @see org.krysalis.barcode4j.impl.AbstractBarcodeBean#getBarWidth(int) --- 48,52 ---- return true; } ! /** * @see org.krysalis.barcode4j.impl.AbstractBarcodeBean#getBarWidth(int) *************** *** 56,60 **** return width * moduleWidth; } else { ! throw new IllegalArgumentException("Only widths 1 and 2 allowed"); } } --- 56,60 ---- return width * moduleWidth; } else { ! throw new IllegalArgumentException("Only widths 1, 2, 3 and 4 allowed"); } } *************** *** 68,73 **** final double width = ((msgLen * 11) + 13) * getModuleWidth(); final double qz = (hasQuietZone() ? quietZone : 0); ! return new BarcodeDimension(width, getHeight(), ! width + (2 * qz), getHeight(), quietZone, 0.0); } --- 68,73 ---- final double width = ((msgLen * 11) + 13) * getModuleWidth(); final double qz = (hasQuietZone() ? quietZone : 0); ! return new BarcodeDimension(width, getHeight(), ! width + (2 * qz), getHeight(), quietZone, 0.0); } *************** *** 81,88 **** } ! ClassicBarcodeLogicHandler handler = new DefaultCanvasLogicHandler(this, new Canvas(canvas)); //handler = new LoggingLogicHandlerProxy(handler); ! Code128LogicImpl impl = new Code128LogicImpl(); impl.generateBarcodeLogic(handler, msg); --- 81,88 ---- } ! ClassicBarcodeLogicHandler handler = new DefaultCanvasLogicHandler(this, new Canvas(canvas)); //handler = new LoggingLogicHandlerProxy(handler); ! Code128LogicImpl impl = new Code128LogicImpl(); impl.generateBarcodeLogic(handler, msg); |