From 3a283a16e14533f66c94521292c2d2a385871786 Mon Sep 17 00:00:00 2001 From: mdb Date: Mon, 4 Aug 2008 12:37:23 +0000 Subject: [PATCH] Trimmed trailing whitespace. git-svn-id: https://samskivert.googlecode.com/svn/trunk@2355 6335cc39-0255-0410-8fd6-9bcaacd3b74c --- src/java/com/samskivert/Log.java | 2 +- .../io/ByteArrayOutInputStream.java | 2 +- .../samskivert/io/ExtensiblePrintStream.java | 2 +- .../samskivert/io/PersistenceException.java | 2 +- src/java/com/samskivert/io/StreamUtil.java | 2 +- .../samskivert/jdbc/ConnectionProvider.java | 4 +- .../jdbc/DuplicateKeyException.java | 2 +- src/java/com/samskivert/jdbc/JDBCUtil.java | 6 +- .../com/samskivert/jdbc/JORARepository.java | 2 +- src/java/com/samskivert/jdbc/Repository.java | 2 +- .../jdbc/RepositoryListenerUnit.java | 2 +- .../com/samskivert/jdbc/RepositoryUnit.java | 2 +- .../com/samskivert/jdbc/SimpleRepository.java | 2 +- .../com/samskivert/jdbc/WriteOnlyUnit.java | 2 +- .../com/samskivert/jdbc/depot/ByteEnum.java | 2 +- .../jdbc/depot/CacheInvalidator.java | 4 +- .../com/samskivert/jdbc/depot/CacheKey.java | 2 +- .../com/samskivert/jdbc/depot/DepotTypes.java | 2 +- src/java/com/samskivert/jdbc/depot/Log.java | 2 +- .../com/samskivert/jdbc/depot/Modifier.java | 2 +- .../com/samskivert/jdbc/depot/MultiKey.java | 4 +- .../jdbc/depot/PersistentRecord.java | 2 +- .../samskivert/jdbc/depot/SimpleCacheKey.java | 2 +- .../depot/ValidatingCacheInvalidator.java | 2 +- .../jdbc/depot/annotation/Computed.java | 6 +- .../jdbc/depot/annotation/FullTextIndex.java | 4 +- .../jdbc/depot/annotation/GenerationType.java | 2 +- .../samskivert/jdbc/depot/annotation/Id.java | 2 +- .../jdbc/depot/annotation/TableGenerator.java | 8 +- .../jdbc/depot/annotation/Transient.java | 2 +- .../depot/annotation/UniqueConstraint.java | 2 +- .../jdbc/depot/clause/FromOverride.java | 2 +- .../samskivert/jdbc/depot/clause/Join.java | 2 +- .../samskivert/jdbc/depot/clause/Limit.java | 8 +- .../samskivert/jdbc/depot/clause/OrderBy.java | 6 +- .../jdbc/depot/clause/QueryClause.java | 2 +- .../jdbc/depot/clause/UpdateClause.java | 8 +- .../samskivert/jdbc/depot/clause/Where.java | 4 +- .../jdbc/depot/expression/SQLExpression.java | 4 +- .../jdbc/depot/operator/Arithmetic.java | 2 +- .../samskivert/jdbc/depot/operator/Logic.java | 6 +- .../jdbc/depot/operator/SQLOperator.java | 6 +- .../jdbc/depot/tests/TestRecord.java | 2 +- .../jdbc/depot/tests/TestRepository.java | 2 +- .../jdbc/depot/tools/GenRecordTask.java | 2 +- src/java/com/samskivert/jdbc/jora/Cursor.java | 2 +- .../jdbc/jora/DataTransferError.java | 2 +- .../samskivert/jdbc/jora/FieldDescriptor.java | 2 +- src/java/com/samskivert/jdbc/jora/Table.java | 2 +- .../samskivert/net/AttachableURLFactory.java | 2 +- src/java/com/samskivert/net/HttpPostUtil.java | 4 +- src/java/com/samskivert/net/MACUtil.java | 2 +- src/java/com/samskivert/net/MailUtil.java | 2 +- src/java/com/samskivert/net/PathUtil.java | 2 +- src/java/com/samskivert/net/cddb/CDDB.java | 2 +- .../samskivert/net/cddb/CDDBException.java | 2 +- .../com/samskivert/net/cddb/CDDBProtocol.java | 2 +- .../com/samskivert/net/cddb/CDDBTest.java | 2 +- .../servlet/HttpErrorException.java | 2 +- .../servlet/IndiscriminateSiteIdentifier.java | 2 +- .../servlet/JDBCTableSiteIdentifier.java | 2 +- .../samskivert/servlet/MessageManager.java | 2 +- .../samskivert/servlet/RedirectException.java | 2 +- src/java/com/samskivert/servlet/Site.java | 2 +- .../samskivert/servlet/SiteIdentifier.java | 2 +- .../servlet/SiteResourceLoader.java | 2 +- .../servlet/tests/SiteResourceLoaderTest.java | 2 +- .../user/AuthenticationFailedException.java | 2 +- .../servlet/user/Authenticator.java | 2 +- .../user/InvalidPasswordException.java | 2 +- .../user/InvalidUsernameException.java | 2 +- .../servlet/user/NoSuchUserException.java | 2 +- .../com/samskivert/servlet/user/Password.java | 2 +- .../com/samskivert/servlet/user/User.java | 2 +- .../servlet/user/UserExistsException.java | 2 +- .../servlet/user/UserRepository.java | 2 +- .../com/samskivert/servlet/user/UserUtil.java | 2 +- .../com/samskivert/servlet/user/Username.java | 2 +- .../samskivert/servlet/util/CookieUtil.java | 2 +- .../servlet/util/DataValidationException.java | 2 +- .../samskivert/servlet/util/ExceptionMap.java | 2 +- .../servlet/util/FriendlyException.java | 2 +- .../com/samskivert/servlet/util/HTMLUtil.java | 4 +- .../servlet/util/ParameterUtil.java | 2 +- .../samskivert/servlet/util/RequestUtils.java | 2 +- .../servlet/util/ServiceWaiter.java | 2 +- .../samskivert/swing/AWTResultListener.java | 2 +- .../com/samskivert/swing/AbsoluteLayout.java | 2 +- .../com/samskivert/swing/CollapsibleList.java | 2 +- .../samskivert/swing/CollapsiblePanel.java | 2 +- .../com/samskivert/swing/ComboButtonBox.java | 4 +- .../com/samskivert/swing/CommandButton.java | 2 +- .../com/samskivert/swing/ControlledPanel.java | 2 +- src/java/com/samskivert/swing/Controller.java | 2 +- .../samskivert/swing/ControllerProvider.java | 2 +- src/java/com/samskivert/swing/DimenInfo.java | 2 +- src/java/com/samskivert/swing/DimmedIcon.java | 2 +- .../com/samskivert/swing/EnablingAdapter.java | 2 +- .../com/samskivert/swing/GroupLayout.java | 2 +- .../com/samskivert/swing/GroupLayoutTest.java | 2 +- .../com/samskivert/swing/HGroupLayout.java | 2 +- src/java/com/samskivert/swing/IntField.java | 4 +- .../swing/IntegerTableCellRenderer.java | 2 +- .../com/samskivert/swing/JInternalDialog.java | 2 +- src/java/com/samskivert/swing/Label.java | 12 +-- .../com/samskivert/swing/LabelSausage.java | 4 +- .../samskivert/swing/LabelStyleConstants.java | 2 +- .../com/samskivert/swing/LazyComponent.java | 2 +- .../samskivert/swing/ObjectEditorTable.java | 4 +- .../samskivert/swing/RadialLabelSausage.java | 2 +- src/java/com/samskivert/swing/RadialMenu.java | 4 +- .../com/samskivert/swing/RadialMenuItem.java | 2 +- .../com/samskivert/swing/RuntimeAdjust.java | 4 +- .../com/samskivert/swing/SafeLayeredPane.java | 2 +- src/java/com/samskivert/swing/ScaledIcon.java | 2 +- src/java/com/samskivert/swing/ScrollBox.java | 2 +- .../com/samskivert/swing/ScrollablePanel.java | 2 +- src/java/com/samskivert/swing/ShapeIcon.java | 4 +- .../com/samskivert/swing/SimpleSlider.java | 2 +- .../com/samskivert/swing/SmartPolygon.java | 2 +- src/java/com/samskivert/swing/Spacer.java | 2 +- .../com/samskivert/swing/TGraphics2D.java | 2 +- src/java/com/samskivert/swing/TableMap.java | 54 ++++++------ .../com/samskivert/swing/TableSorter.java | 84 +++++++++---------- src/java/com/samskivert/swing/Timer.java | 4 +- .../com/samskivert/swing/VGroupLayout.java | 2 +- .../swing/dnd/AutoscrollingDropTarget.java | 2 +- .../com/samskivert/swing/dnd/DnDManager.java | 14 ++-- .../com/samskivert/swing/dnd/DragSource.java | 2 +- .../com/samskivert/swing/dnd/DropTarget.java | 2 +- .../swing/event/AncestorAdapter.java | 2 +- .../samskivert/swing/event/CommandEvent.java | 2 +- .../swing/event/DocumentAdapter.java | 2 +- .../swing/event/MouseArmingAdapter.java | 2 +- .../swing/event/PopupMenuAdapter.java | 2 +- .../samskivert/swing/tests/AdjustTestApp.java | 2 +- .../com/samskivert/swing/tests/LabelDemo.java | 2 +- .../swing/tests/ProximityTrackerTest.java | 2 +- .../swing/tests/TestComboButtonBox.java | 2 +- .../com/samskivert/swing/util/ButtonUtil.java | 2 +- .../com/samskivert/swing/util/DialogUtil.java | 2 +- .../com/samskivert/swing/util/MenuUtil.java | 2 +- .../samskivert/swing/util/MouseHijacker.java | 2 +- .../swing/util/ProximityTracker.java | 2 +- .../samskivert/swing/util/RetryableTask.java | 2 +- .../com/samskivert/swing/util/SwingUtil.java | 4 +- src/java/com/samskivert/swing/util/Task.java | 2 +- .../samskivert/swing/util/TaskAdapter.java | 2 +- .../com/samskivert/swing/util/TaskMaster.java | 2 +- .../samskivert/swing/util/TaskObserver.java | 2 +- src/java/com/samskivert/test/TestUtil.java | 2 +- src/java/com/samskivert/text/MessageUtil.java | 2 +- src/java/com/samskivert/util/ArrayIntSet.java | 2 +- src/java/com/samskivert/util/ArrayUtil.java | 8 +- src/java/com/samskivert/util/AuditLogger.java | 2 +- .../com/samskivert/util/BaseArrayList.java | 2 +- .../com/samskivert/util/BasicRunQueue.java | 4 +- .../com/samskivert/util/CalendarUtil.java | 2 +- .../util/ChainedResultListener.java | 2 +- src/java/com/samskivert/util/CheapIntMap.java | 2 +- src/java/com/samskivert/util/ClassUtil.java | 8 +- .../com/samskivert/util/CollectionUtil.java | 2 +- src/java/com/samskivert/util/Collections.java | 4 +- .../samskivert/util/CompactIntListUtil.java | 2 +- .../samskivert/util/ComparableArrayList.java | 2 +- .../com/samskivert/util/ComparableTuple.java | 2 +- src/java/com/samskivert/util/Comparators.java | 2 +- .../samskivert/util/ComplainingListener.java | 2 +- src/java/com/samskivert/util/Config.java | 2 +- src/java/com/samskivert/util/ConfigUtil.java | 2 +- src/java/com/samskivert/util/Crypt.java | 8 +- .../com/samskivert/util/CurrencyUtil.java | 2 +- src/java/com/samskivert/util/DebugChords.java | 2 +- .../samskivert/util/DefaultLogProvider.java | 2 +- .../samskivert/util/ExpiringReference.java | 2 +- .../com/samskivert/util/FailureListener.java | 2 +- src/java/com/samskivert/util/FileUtil.java | 2 +- src/java/com/samskivert/util/GenUtil.java | 2 +- src/java/com/samskivert/util/HashIntMap.java | 2 +- src/java/com/samskivert/util/Histogram.java | 2 +- src/java/com/samskivert/util/IntIntMap.java | 2 +- src/java/com/samskivert/util/IntListUtil.java | 2 +- src/java/com/samskivert/util/IntMap.java | 2 +- src/java/com/samskivert/util/IntMaps.java | 2 +- .../samskivert/util/IntResultListener.java | 2 +- src/java/com/samskivert/util/IntSet.java | 4 +- src/java/com/samskivert/util/IntTuple.java | 2 +- src/java/com/samskivert/util/Interable.java | 2 +- src/java/com/samskivert/util/Interator.java | 2 +- src/java/com/samskivert/util/Interval.java | 4 +- src/java/com/samskivert/util/Invoker.java | 2 +- src/java/com/samskivert/util/JDK14Logger.java | 2 +- src/java/com/samskivert/util/KeyUtil.java | 4 +- src/java/com/samskivert/util/KeyValue.java | 2 +- src/java/com/samskivert/util/ListUtil.java | 2 +- src/java/com/samskivert/util/Log.java | 2 +- src/java/com/samskivert/util/Log4JLogger.java | 2 +- src/java/com/samskivert/util/LogProvider.java | 2 +- src/java/com/samskivert/util/Logger.java | 4 +- .../samskivert/util/LoggingLogProvider.java | 2 +- .../com/samskivert/util/LoopingThread.java | 2 +- src/java/com/samskivert/util/MapEntry.java | 2 +- .../com/samskivert/util/MethodFinder.java | 8 +- src/java/com/samskivert/util/Multex.java | 2 +- src/java/com/samskivert/util/ObjectUtil.java | 2 +- .../com/samskivert/util/ObserverList.java | 4 +- .../samskivert/util/OneLineLogFormatter.java | 2 +- src/java/com/samskivert/util/Predicate.java | 4 +- src/java/com/samskivert/util/PrefsConfig.java | 2 +- .../com/samskivert/util/ProcessLogger.java | 2 +- src/java/com/samskivert/util/Queue.java | 2 +- src/java/com/samskivert/util/QuickSort.java | 2 +- src/java/com/samskivert/util/RandomUtil.java | 2 +- src/java/com/samskivert/util/RecentList.java | 2 +- .../samskivert/util/RepeatCallTracker.java | 2 +- .../samskivert/util/RepeatRecordFilter.java | 2 +- .../com/samskivert/util/ResultHandler.java | 2 +- .../com/samskivert/util/ResultListener.java | 2 +- .../samskivert/util/ResultListenerList.java | 2 +- src/java/com/samskivert/util/RunAnywhere.java | 2 +- src/java/com/samskivert/util/RunQueue.java | 2 +- .../com/samskivert/util/SerialExecutor.java | 2 +- .../util/ServiceUnavailableException.java | 2 +- .../com/samskivert/util/ServiceWaiter.java | 2 +- .../com/samskivert/util/ShortestPath.java | 2 +- src/java/com/samskivert/util/SignalUtil.java | 2 +- .../samskivert/util/SortableArrayList.java | 2 +- src/java/com/samskivert/util/SystemInfo.java | 2 +- src/java/com/samskivert/util/TermUtil.java | 2 +- src/java/com/samskivert/util/Throttle.java | 2 +- src/java/com/samskivert/util/Tuple.java | 2 +- .../com/samskivert/util/ValueMarshaller.java | 4 +- .../util/tests/ArrayIntSetTest.java | 2 +- .../samskivert/util/tests/ArrayUtilTest.java | 2 +- .../util/tests/CheapIntMapTest.java | 2 +- .../util/tests/CollectionUtilTest.java | 2 +- .../com/samskivert/util/tests/ConfigTest.java | 2 +- .../samskivert/util/tests/ConfigUtilTest.java | 6 +- .../samskivert/util/tests/HashIntMapTest.java | 2 +- .../util/tests/IntListUtilTest.java | 2 +- .../samskivert/util/tests/LRUHashMapTest.java | 2 +- .../util/tests/ObserverListTest.java | 2 +- .../samskivert/util/tests/QuickSortTest.java | 2 +- .../util/tests/SerialExecutorTest.java | 2 +- .../samskivert/util/tests/StringUtilTest.java | 2 +- .../samskivert/util/tests/SystemInfoDemo.java | 2 +- .../com/samskivert/velocity/Application.java | 2 +- .../com/samskivert/velocity/CurrencyTool.java | 2 +- .../com/samskivert/velocity/DataTool.java | 2 +- .../com/samskivert/velocity/DummyLogic.java | 2 +- .../com/samskivert/velocity/FormTool.java | 2 +- .../com/samskivert/velocity/I18nTool.java | 2 +- .../samskivert/velocity/ImportDirective.java | 16 ++-- .../velocity/InvocationContext.java | 2 +- src/java/com/samskivert/velocity/Logic.java | 2 +- .../velocity/ServletContextLogger.java | 2 +- .../ServletContextResourceLoader.java | 4 +- .../ServletContextResourceManager.java | 2 +- .../velocity/SiteJarResourceLoader.java | 4 +- src/java/com/samskivert/velocity/SiteKey.java | 2 +- .../velocity/SiteResourceManager.java | 2 +- .../com/samskivert/velocity/StringTool.java | 2 +- .../samskivert/velocity/VelocityTestCase.java | 4 +- .../com/samskivert/velocity/VelocityUtil.java | 2 +- .../samskivert/xml/CallMethodSpecialRule.java | 2 +- .../com/samskivert/xml/CheckVersionRule.java | 2 +- src/java/com/samskivert/xml/SetFieldRule.java | 2 +- .../com/samskivert/xml/SetNextFieldRule.java | 2 +- .../samskivert/xml/SetPropertyFieldsRule.java | 4 +- src/java/com/samskivert/xml/SimpleParser.java | 2 +- .../samskivert/xml/ValidatedSetNextRule.java | 2 +- src/java/com/samskivert/xml/XMLUtil.java | 2 +- .../xml/tests/SetFieldRuleTest.java | 2 +- 273 files changed, 421 insertions(+), 421 deletions(-) diff --git a/src/java/com/samskivert/Log.java b/src/java/com/samskivert/Log.java index 7fc8597d..697ca50d 100644 --- a/src/java/com/samskivert/Log.java +++ b/src/java/com/samskivert/Log.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/io/ByteArrayOutInputStream.java b/src/java/com/samskivert/io/ByteArrayOutInputStream.java index fcb7bed5..f6c6121e 100644 --- a/src/java/com/samskivert/io/ByteArrayOutInputStream.java +++ b/src/java/com/samskivert/io/ByteArrayOutInputStream.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/io/ExtensiblePrintStream.java b/src/java/com/samskivert/io/ExtensiblePrintStream.java index 52214ccc..a16e425a 100644 --- a/src/java/com/samskivert/io/ExtensiblePrintStream.java +++ b/src/java/com/samskivert/io/ExtensiblePrintStream.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/io/PersistenceException.java b/src/java/com/samskivert/io/PersistenceException.java index 81712c02..f14f1ed9 100644 --- a/src/java/com/samskivert/io/PersistenceException.java +++ b/src/java/com/samskivert/io/PersistenceException.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/io/StreamUtil.java b/src/java/com/samskivert/io/StreamUtil.java index ced01fa6..8e5f2b61 100644 --- a/src/java/com/samskivert/io/StreamUtil.java +++ b/src/java/com/samskivert/io/StreamUtil.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/jdbc/ConnectionProvider.java b/src/java/com/samskivert/jdbc/ConnectionProvider.java index 7d5953ac..e518a01e 100644 --- a/src/java/com/samskivert/jdbc/ConnectionProvider.java +++ b/src/java/com/samskivert/jdbc/ConnectionProvider.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or @@ -80,7 +80,7 @@ public interface ConnectionProvider */ public void connectionFailed (String ident, boolean readOnly, Connection conn, SQLException error); - + /** * Returns the URL associated with this database identifier. This should be the same value that * would be used if {@link #getConnection} were called. diff --git a/src/java/com/samskivert/jdbc/DuplicateKeyException.java b/src/java/com/samskivert/jdbc/DuplicateKeyException.java index 0089defd..3d5d7228 100644 --- a/src/java/com/samskivert/jdbc/DuplicateKeyException.java +++ b/src/java/com/samskivert/jdbc/DuplicateKeyException.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/jdbc/JDBCUtil.java b/src/java/com/samskivert/jdbc/JDBCUtil.java index 30485cb1..5928d04d 100644 --- a/src/java/com/samskivert/jdbc/JDBCUtil.java +++ b/src/java/com/samskivert/jdbc/JDBCUtil.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or @@ -421,7 +421,7 @@ public class JDBCUtil rs.close(); } } - + /** * Returns the size for the specified column in the specified table. For char or date types * this is the maximum number of characters, for numeric or decimal types this is the @@ -439,7 +439,7 @@ public class JDBCUtil } /** - * Returns a string representation of the default value for the specified column in the + * Returns a string representation of the default value for the specified column in the * specified table. This may be null. */ public static String getColumnDefaultValue (Connection conn, String table, String column) diff --git a/src/java/com/samskivert/jdbc/JORARepository.java b/src/java/com/samskivert/jdbc/JORARepository.java index d97beeaf..16c77ee1 100644 --- a/src/java/com/samskivert/jdbc/JORARepository.java +++ b/src/java/com/samskivert/jdbc/JORARepository.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/jdbc/Repository.java b/src/java/com/samskivert/jdbc/Repository.java index 08b5b724..15abdab4 100644 --- a/src/java/com/samskivert/jdbc/Repository.java +++ b/src/java/com/samskivert/jdbc/Repository.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/jdbc/RepositoryListenerUnit.java b/src/java/com/samskivert/jdbc/RepositoryListenerUnit.java index fd9fe0aa..2f3d2608 100644 --- a/src/java/com/samskivert/jdbc/RepositoryListenerUnit.java +++ b/src/java/com/samskivert/jdbc/RepositoryListenerUnit.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/jdbc/RepositoryUnit.java b/src/java/com/samskivert/jdbc/RepositoryUnit.java index 6a24d508..47b16af9 100644 --- a/src/java/com/samskivert/jdbc/RepositoryUnit.java +++ b/src/java/com/samskivert/jdbc/RepositoryUnit.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/jdbc/SimpleRepository.java b/src/java/com/samskivert/jdbc/SimpleRepository.java index 549da1d3..cc129d04 100644 --- a/src/java/com/samskivert/jdbc/SimpleRepository.java +++ b/src/java/com/samskivert/jdbc/SimpleRepository.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/jdbc/WriteOnlyUnit.java b/src/java/com/samskivert/jdbc/WriteOnlyUnit.java index d4ecdd5d..e7ac79e9 100644 --- a/src/java/com/samskivert/jdbc/WriteOnlyUnit.java +++ b/src/java/com/samskivert/jdbc/WriteOnlyUnit.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2008 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/jdbc/depot/ByteEnum.java b/src/java/com/samskivert/jdbc/depot/ByteEnum.java index 477a2841..77df3231 100644 --- a/src/java/com/samskivert/jdbc/depot/ByteEnum.java +++ b/src/java/com/samskivert/jdbc/depot/ByteEnum.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/jdbc/depot/CacheInvalidator.java b/src/java/com/samskivert/jdbc/depot/CacheInvalidator.java index 034fdc3b..3f11f38a 100644 --- a/src/java/com/samskivert/jdbc/depot/CacheInvalidator.java +++ b/src/java/com/samskivert/jdbc/depot/CacheInvalidator.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or @@ -24,7 +24,7 @@ import java.io.Serializable; /** * Implementors of this interface performs perform cache invalidation for calls to - * {@link DepotRepository#updateLiteral}, {@link DepotRepository#updatePartial} and + * {@link DepotRepository#updateLiteral}, {@link DepotRepository#updatePartial} and * {@link DepotRepository#deleteAll). */ public interface CacheInvalidator diff --git a/src/java/com/samskivert/jdbc/depot/CacheKey.java b/src/java/com/samskivert/jdbc/depot/CacheKey.java index 8b828e2e..271d528c 100644 --- a/src/java/com/samskivert/jdbc/depot/CacheKey.java +++ b/src/java/com/samskivert/jdbc/depot/CacheKey.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/jdbc/depot/DepotTypes.java b/src/java/com/samskivert/jdbc/depot/DepotTypes.java index d99f69c3..ac1e18d4 100644 --- a/src/java/com/samskivert/jdbc/depot/DepotTypes.java +++ b/src/java/com/samskivert/jdbc/depot/DepotTypes.java @@ -205,7 +205,7 @@ public class DepotTypes protected Map, Integer> _classIx = new HashMap, Integer>(); /** Classes mapped to marshallers, used for table names and field lists. */ - protected Map, DepotMarshaller> _classMap = + protected Map, DepotMarshaller> _classMap = new HashMap, DepotMarshaller>(); /** When false, override the normal table abbreviations and return full table names instead. */ diff --git a/src/java/com/samskivert/jdbc/depot/Log.java b/src/java/com/samskivert/jdbc/depot/Log.java index 09fbee3a..4721b803 100644 --- a/src/java/com/samskivert/jdbc/depot/Log.java +++ b/src/java/com/samskivert/jdbc/depot/Log.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/jdbc/depot/Modifier.java b/src/java/com/samskivert/jdbc/depot/Modifier.java index 7924965a..b6aa3a1f 100644 --- a/src/java/com/samskivert/jdbc/depot/Modifier.java +++ b/src/java/com/samskivert/jdbc/depot/Modifier.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/jdbc/depot/MultiKey.java b/src/java/com/samskivert/jdbc/depot/MultiKey.java index c9f0a0dc..3e796e0d 100644 --- a/src/java/com/samskivert/jdbc/depot/MultiKey.java +++ b/src/java/com/samskivert/jdbc/depot/MultiKey.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or @@ -46,7 +46,7 @@ public class MultiKey extends WhereClause /** * Constructs a new two-column {@code MultiKey} with the given value range. */ - public MultiKey (Class pClass, String ix1, Comparable val1, String ix2, + public MultiKey (Class pClass, String ix1, Comparable val1, String ix2, Comparable... val2) { this(pClass, new String[] { ix1 }, new Comparable[] { val1 }, ix2, val2); diff --git a/src/java/com/samskivert/jdbc/depot/PersistentRecord.java b/src/java/com/samskivert/jdbc/depot/PersistentRecord.java index 5fa2f0c8..604123a0 100644 --- a/src/java/com/samskivert/jdbc/depot/PersistentRecord.java +++ b/src/java/com/samskivert/jdbc/depot/PersistentRecord.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/jdbc/depot/SimpleCacheKey.java b/src/java/com/samskivert/jdbc/depot/SimpleCacheKey.java index 823b86f8..1b40b3ea 100644 --- a/src/java/com/samskivert/jdbc/depot/SimpleCacheKey.java +++ b/src/java/com/samskivert/jdbc/depot/SimpleCacheKey.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/jdbc/depot/ValidatingCacheInvalidator.java b/src/java/com/samskivert/jdbc/depot/ValidatingCacheInvalidator.java index 0d51f56c..96094f5f 100644 --- a/src/java/com/samskivert/jdbc/depot/ValidatingCacheInvalidator.java +++ b/src/java/com/samskivert/jdbc/depot/ValidatingCacheInvalidator.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/jdbc/depot/annotation/Computed.java b/src/java/com/samskivert/jdbc/depot/annotation/Computed.java index 5c115855..879ed0a3 100644 --- a/src/java/com/samskivert/jdbc/depot/annotation/Computed.java +++ b/src/java/com/samskivert/jdbc/depot/annotation/Computed.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or @@ -50,11 +50,11 @@ public @interface Computed * querying for objects that that contain large subsets of some other persistent object's * fields -- in other words, when you use a computed entity to query only some of the columns * from a table. - * + * * The shadowed class must have been brought into the query using e.g. {@link FromOverride} * or {@link Join} clauses. The referenced fields must be simple concrete columns in a table; * they must themselves be computed or overridden or shadowing. - * + * * TODO: Do in fact let the shadowed field be computed, overriden or shadowing. */ Class shadowOf () default PersistentRecord.class; diff --git a/src/java/com/samskivert/jdbc/depot/annotation/FullTextIndex.java b/src/java/com/samskivert/jdbc/depot/annotation/FullTextIndex.java index d35bdc5a..98c5341d 100644 --- a/src/java/com/samskivert/jdbc/depot/annotation/FullTextIndex.java +++ b/src/java/com/samskivert/jdbc/depot/annotation/FullTextIndex.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2007 Michael Bayne, Pär Winzell -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or @@ -40,5 +40,5 @@ public @interface FullTextIndex /** * An array of the field names that should be indexed. */ - public String[] fields (); + public String[] fields (); } diff --git a/src/java/com/samskivert/jdbc/depot/annotation/GenerationType.java b/src/java/com/samskivert/jdbc/depot/annotation/GenerationType.java index d1cf47ec..789030eb 100644 --- a/src/java/com/samskivert/jdbc/depot/annotation/GenerationType.java +++ b/src/java/com/samskivert/jdbc/depot/annotation/GenerationType.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/jdbc/depot/annotation/Id.java b/src/java/com/samskivert/jdbc/depot/annotation/Id.java index 82ab079c..754130cd 100644 --- a/src/java/com/samskivert/jdbc/depot/annotation/Id.java +++ b/src/java/com/samskivert/jdbc/depot/annotation/Id.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/jdbc/depot/annotation/TableGenerator.java b/src/java/com/samskivert/jdbc/depot/annotation/TableGenerator.java index 78e014b1..82bfca62 100644 --- a/src/java/com/samskivert/jdbc/depot/annotation/TableGenerator.java +++ b/src/java/com/samskivert/jdbc/depot/annotation/TableGenerator.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or @@ -40,7 +40,7 @@ public @interface TableGenerator * generator for id values. */ String name (); - + /** * Name of table that stores the generated id values. Defaults to a name chosen by persistence * provider. @@ -54,13 +54,13 @@ public @interface TableGenerator /** * Name of the column that stores the last value generated Defaults to a provider-chosen name. - */ + */ String valueColumnName () default ""; /** * The primary key value in the generator table that distinguishes this set of generated values * from others that may be stored in the table Defaults to a provider-chosen value to store in * the primary key column of the generator table - */ + */ String pkColumnValue () default ""; } diff --git a/src/java/com/samskivert/jdbc/depot/annotation/Transient.java b/src/java/com/samskivert/jdbc/depot/annotation/Transient.java index 0559f86f..26a37dab 100644 --- a/src/java/com/samskivert/jdbc/depot/annotation/Transient.java +++ b/src/java/com/samskivert/jdbc/depot/annotation/Transient.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/jdbc/depot/annotation/UniqueConstraint.java b/src/java/com/samskivert/jdbc/depot/annotation/UniqueConstraint.java index 1cbb8d2f..f6d6a666 100644 --- a/src/java/com/samskivert/jdbc/depot/annotation/UniqueConstraint.java +++ b/src/java/com/samskivert/jdbc/depot/annotation/UniqueConstraint.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/jdbc/depot/clause/FromOverride.java b/src/java/com/samskivert/jdbc/depot/clause/FromOverride.java index 42630696..a447339a 100644 --- a/src/java/com/samskivert/jdbc/depot/clause/FromOverride.java +++ b/src/java/com/samskivert/jdbc/depot/clause/FromOverride.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/jdbc/depot/clause/Join.java b/src/java/com/samskivert/jdbc/depot/clause/Join.java index dbbcbf30..80edd070 100644 --- a/src/java/com/samskivert/jdbc/depot/clause/Join.java +++ b/src/java/com/samskivert/jdbc/depot/clause/Join.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/jdbc/depot/clause/Limit.java b/src/java/com/samskivert/jdbc/depot/clause/Limit.java index 3da4b3ae..6cc135f5 100644 --- a/src/java/com/samskivert/jdbc/depot/clause/Limit.java +++ b/src/java/com/samskivert/jdbc/depot/clause/Limit.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or @@ -40,7 +40,7 @@ public class Limit extends QueryClause { return _offset; } - + public int getCount () { return _count; @@ -51,12 +51,12 @@ public class Limit extends QueryClause { builder.visit(this); } - + // from SQLExpression public void addClasses (Collection> classSet) { } - + /** The first row of the result set to return. */ protected int _offset; diff --git a/src/java/com/samskivert/jdbc/depot/clause/OrderBy.java b/src/java/com/samskivert/jdbc/depot/clause/OrderBy.java index a3623219..66d92c6a 100644 --- a/src/java/com/samskivert/jdbc/depot/clause/OrderBy.java +++ b/src/java/com/samskivert/jdbc/depot/clause/OrderBy.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or @@ -69,7 +69,7 @@ public class OrderBy extends QueryClause { return _values; } - + public Order[] getOrders () { return _orders; @@ -88,7 +88,7 @@ public class OrderBy extends QueryClause expression.addClasses(classSet); } } - + /** The expressions that are generated for the clause. */ protected SQLExpression[] _values; diff --git a/src/java/com/samskivert/jdbc/depot/clause/QueryClause.java b/src/java/com/samskivert/jdbc/depot/clause/QueryClause.java index 37a653cc..89f229e3 100644 --- a/src/java/com/samskivert/jdbc/depot/clause/QueryClause.java +++ b/src/java/com/samskivert/jdbc/depot/clause/QueryClause.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/jdbc/depot/clause/UpdateClause.java b/src/java/com/samskivert/jdbc/depot/clause/UpdateClause.java index 986fa56a..ba89baae 100644 --- a/src/java/com/samskivert/jdbc/depot/clause/UpdateClause.java +++ b/src/java/com/samskivert/jdbc/depot/clause/UpdateClause.java @@ -41,7 +41,7 @@ public class UpdateClause extends QueryClause _values = null; _pojo = pojo; } - + public UpdateClause (Class pClass, WhereClause where, String[] fields, SQLExpression[] values) { @@ -51,7 +51,7 @@ public class UpdateClause extends QueryClause _values = values; _pojo = null; } - + public WhereClause getWhereClause () { return _where; @@ -105,10 +105,10 @@ public class UpdateClause extends QueryClause /** The persistent fields to update. */ protected String[] _fields; - + /** The field values, or null. */ protected SQLExpression[] _values; - + /** The object from which to fetch values, or null. */ protected Object _pojo; } diff --git a/src/java/com/samskivert/jdbc/depot/clause/Where.java b/src/java/com/samskivert/jdbc/depot/clause/Where.java index 71ff4b30..19d75889 100644 --- a/src/java/com/samskivert/jdbc/depot/clause/Where.java +++ b/src/java/com/samskivert/jdbc/depot/clause/Where.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or @@ -83,7 +83,7 @@ public class Where extends WhereClause { _condition.addClasses(classSet); } - + protected static SQLExpression toCondition (ColumnExp[] columns, Comparable[] values) { SQLExpression[] comparisons = new SQLExpression[columns.length]; diff --git a/src/java/com/samskivert/jdbc/depot/expression/SQLExpression.java b/src/java/com/samskivert/jdbc/depot/expression/SQLExpression.java index fd3dd42c..0b24ffb3 100644 --- a/src/java/com/samskivert/jdbc/depot/expression/SQLExpression.java +++ b/src/java/com/samskivert/jdbc/depot/expression/SQLExpression.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or @@ -33,7 +33,7 @@ public interface SQLExpression /** * Most uses of this class have been implemented with a visitor pattern. Create your own * {@link ExpressionVisitor} and call this method with it. - * + * * @see SQLBuilder */ public void accept (ExpressionVisitor builder) diff --git a/src/java/com/samskivert/jdbc/depot/operator/Arithmetic.java b/src/java/com/samskivert/jdbc/depot/operator/Arithmetic.java index d5a807e2..830a060a 100644 --- a/src/java/com/samskivert/jdbc/depot/operator/Arithmetic.java +++ b/src/java/com/samskivert/jdbc/depot/operator/Arithmetic.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/jdbc/depot/operator/Logic.java b/src/java/com/samskivert/jdbc/depot/operator/Logic.java index 817a4df5..651e685b 100644 --- a/src/java/com/samskivert/jdbc/depot/operator/Logic.java +++ b/src/java/com/samskivert/jdbc/depot/operator/Logic.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or @@ -86,7 +86,7 @@ public abstract class Logic { _condition = condition; } - + public SQLExpression getCondition () { return _condition; @@ -103,7 +103,7 @@ public abstract class Logic { _condition.addClasses(classSet); } - + protected SQLExpression _condition; } } diff --git a/src/java/com/samskivert/jdbc/depot/operator/SQLOperator.java b/src/java/com/samskivert/jdbc/depot/operator/SQLOperator.java index 7f4e4cef..5c4ee15c 100644 --- a/src/java/com/samskivert/jdbc/depot/operator/SQLOperator.java +++ b/src/java/com/samskivert/jdbc/depot/operator/SQLOperator.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or @@ -50,7 +50,7 @@ public interface SQLOperator extends SQLExpression { builder.visit(this); } - + // from SQLExpression public void addClasses (Collection> classSet) { @@ -100,7 +100,7 @@ public interface SQLOperator extends SQLExpression _lhs.addClasses(classSet); _rhs.addClasses(classSet); } - + /** * Returns the string representation of the operator. */ diff --git a/src/java/com/samskivert/jdbc/depot/tests/TestRecord.java b/src/java/com/samskivert/jdbc/depot/tests/TestRecord.java index 0929f136..f407a1e3 100644 --- a/src/java/com/samskivert/jdbc/depot/tests/TestRecord.java +++ b/src/java/com/samskivert/jdbc/depot/tests/TestRecord.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/jdbc/depot/tests/TestRepository.java b/src/java/com/samskivert/jdbc/depot/tests/TestRepository.java index 89b7934f..1877d482 100644 --- a/src/java/com/samskivert/jdbc/depot/tests/TestRepository.java +++ b/src/java/com/samskivert/jdbc/depot/tests/TestRepository.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/jdbc/depot/tools/GenRecordTask.java b/src/java/com/samskivert/jdbc/depot/tools/GenRecordTask.java index d0761161..401e641c 100644 --- a/src/java/com/samskivert/jdbc/depot/tools/GenRecordTask.java +++ b/src/java/com/samskivert/jdbc/depot/tools/GenRecordTask.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/jdbc/jora/Cursor.java b/src/java/com/samskivert/jdbc/jora/Cursor.java index e5b2cfe0..4fe38ba5 100644 --- a/src/java/com/samskivert/jdbc/jora/Cursor.java +++ b/src/java/com/samskivert/jdbc/jora/Cursor.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/jdbc/jora/DataTransferError.java b/src/java/com/samskivert/jdbc/jora/DataTransferError.java index 723620d4..5e466d79 100644 --- a/src/java/com/samskivert/jdbc/jora/DataTransferError.java +++ b/src/java/com/samskivert/jdbc/jora/DataTransferError.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/jdbc/jora/FieldDescriptor.java b/src/java/com/samskivert/jdbc/jora/FieldDescriptor.java index 0d2e0224..776eb244 100644 --- a/src/java/com/samskivert/jdbc/jora/FieldDescriptor.java +++ b/src/java/com/samskivert/jdbc/jora/FieldDescriptor.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/jdbc/jora/Table.java b/src/java/com/samskivert/jdbc/jora/Table.java index 4ffab29d..a33ba5a6 100644 --- a/src/java/com/samskivert/jdbc/jora/Table.java +++ b/src/java/com/samskivert/jdbc/jora/Table.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/net/AttachableURLFactory.java b/src/java/com/samskivert/net/AttachableURLFactory.java index 84a1743c..fefb234e 100644 --- a/src/java/com/samskivert/net/AttachableURLFactory.java +++ b/src/java/com/samskivert/net/AttachableURLFactory.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/net/HttpPostUtil.java b/src/java/com/samskivert/net/HttpPostUtil.java index 2dc7620c..6f6129fe 100644 --- a/src/java/com/samskivert/net/HttpPostUtil.java +++ b/src/java/com/samskivert/net/HttpPostUtil.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or @@ -78,7 +78,7 @@ public class HttpPostUtil reader.close(); waiter.postSuccess(buf.toString()); // yay - + } catch (IOException e) { waiter.postFailure(e); // boo } diff --git a/src/java/com/samskivert/net/MACUtil.java b/src/java/com/samskivert/net/MACUtil.java index e434c83d..9704b719 100644 --- a/src/java/com/samskivert/net/MACUtil.java +++ b/src/java/com/samskivert/net/MACUtil.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/net/MailUtil.java b/src/java/com/samskivert/net/MailUtil.java index c437f453..e2d6a88f 100644 --- a/src/java/com/samskivert/net/MailUtil.java +++ b/src/java/com/samskivert/net/MailUtil.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/net/PathUtil.java b/src/java/com/samskivert/net/PathUtil.java index 9fa754e9..c4ce39af 100644 --- a/src/java/com/samskivert/net/PathUtil.java +++ b/src/java/com/samskivert/net/PathUtil.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/net/cddb/CDDB.java b/src/java/com/samskivert/net/cddb/CDDB.java index a77040ec..e750749c 100644 --- a/src/java/com/samskivert/net/cddb/CDDB.java +++ b/src/java/com/samskivert/net/cddb/CDDB.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/net/cddb/CDDBException.java b/src/java/com/samskivert/net/cddb/CDDBException.java index 728ac6a7..0f3173c5 100644 --- a/src/java/com/samskivert/net/cddb/CDDBException.java +++ b/src/java/com/samskivert/net/cddb/CDDBException.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/net/cddb/CDDBProtocol.java b/src/java/com/samskivert/net/cddb/CDDBProtocol.java index 10dba8cf..b52623c9 100644 --- a/src/java/com/samskivert/net/cddb/CDDBProtocol.java +++ b/src/java/com/samskivert/net/cddb/CDDBProtocol.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/net/cddb/CDDBTest.java b/src/java/com/samskivert/net/cddb/CDDBTest.java index 61defc76..2aa9e45f 100644 --- a/src/java/com/samskivert/net/cddb/CDDBTest.java +++ b/src/java/com/samskivert/net/cddb/CDDBTest.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/servlet/HttpErrorException.java b/src/java/com/samskivert/servlet/HttpErrorException.java index dc40ea26..007240a3 100644 --- a/src/java/com/samskivert/servlet/HttpErrorException.java +++ b/src/java/com/samskivert/servlet/HttpErrorException.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/servlet/IndiscriminateSiteIdentifier.java b/src/java/com/samskivert/servlet/IndiscriminateSiteIdentifier.java index 6436d853..4bd0515d 100644 --- a/src/java/com/samskivert/servlet/IndiscriminateSiteIdentifier.java +++ b/src/java/com/samskivert/servlet/IndiscriminateSiteIdentifier.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/servlet/JDBCTableSiteIdentifier.java b/src/java/com/samskivert/servlet/JDBCTableSiteIdentifier.java index bfe70406..4f18d830 100644 --- a/src/java/com/samskivert/servlet/JDBCTableSiteIdentifier.java +++ b/src/java/com/samskivert/servlet/JDBCTableSiteIdentifier.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/servlet/MessageManager.java b/src/java/com/samskivert/servlet/MessageManager.java index 7345f06f..13c6250e 100644 --- a/src/java/com/samskivert/servlet/MessageManager.java +++ b/src/java/com/samskivert/servlet/MessageManager.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/servlet/RedirectException.java b/src/java/com/samskivert/servlet/RedirectException.java index f53c7092..b5652040 100644 --- a/src/java/com/samskivert/servlet/RedirectException.java +++ b/src/java/com/samskivert/servlet/RedirectException.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/servlet/Site.java b/src/java/com/samskivert/servlet/Site.java index a9dfe586..542a84f8 100644 --- a/src/java/com/samskivert/servlet/Site.java +++ b/src/java/com/samskivert/servlet/Site.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/servlet/SiteIdentifier.java b/src/java/com/samskivert/servlet/SiteIdentifier.java index ca0dc1c4..c09286d2 100644 --- a/src/java/com/samskivert/servlet/SiteIdentifier.java +++ b/src/java/com/samskivert/servlet/SiteIdentifier.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/servlet/SiteResourceLoader.java b/src/java/com/samskivert/servlet/SiteResourceLoader.java index 7fde4836..d0615948 100644 --- a/src/java/com/samskivert/servlet/SiteResourceLoader.java +++ b/src/java/com/samskivert/servlet/SiteResourceLoader.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/servlet/tests/SiteResourceLoaderTest.java b/src/java/com/samskivert/servlet/tests/SiteResourceLoaderTest.java index f04eb8ac..34a54273 100644 --- a/src/java/com/samskivert/servlet/tests/SiteResourceLoaderTest.java +++ b/src/java/com/samskivert/servlet/tests/SiteResourceLoaderTest.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/servlet/user/AuthenticationFailedException.java b/src/java/com/samskivert/servlet/user/AuthenticationFailedException.java index 7f0013e9..5d6b6fc2 100644 --- a/src/java/com/samskivert/servlet/user/AuthenticationFailedException.java +++ b/src/java/com/samskivert/servlet/user/AuthenticationFailedException.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/servlet/user/Authenticator.java b/src/java/com/samskivert/servlet/user/Authenticator.java index a80a227d..3cf4ecea 100644 --- a/src/java/com/samskivert/servlet/user/Authenticator.java +++ b/src/java/com/samskivert/servlet/user/Authenticator.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/servlet/user/InvalidPasswordException.java b/src/java/com/samskivert/servlet/user/InvalidPasswordException.java index 0521f80b..e6acd2e4 100644 --- a/src/java/com/samskivert/servlet/user/InvalidPasswordException.java +++ b/src/java/com/samskivert/servlet/user/InvalidPasswordException.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/servlet/user/InvalidUsernameException.java b/src/java/com/samskivert/servlet/user/InvalidUsernameException.java index de58ddf3..92885161 100644 --- a/src/java/com/samskivert/servlet/user/InvalidUsernameException.java +++ b/src/java/com/samskivert/servlet/user/InvalidUsernameException.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/servlet/user/NoSuchUserException.java b/src/java/com/samskivert/servlet/user/NoSuchUserException.java index 1eeae506..16bfc247 100644 --- a/src/java/com/samskivert/servlet/user/NoSuchUserException.java +++ b/src/java/com/samskivert/servlet/user/NoSuchUserException.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/servlet/user/Password.java b/src/java/com/samskivert/servlet/user/Password.java index 1016e2f2..f6490262 100644 --- a/src/java/com/samskivert/servlet/user/Password.java +++ b/src/java/com/samskivert/servlet/user/Password.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/servlet/user/User.java b/src/java/com/samskivert/servlet/user/User.java index 0f14f2e3..7962573f 100644 --- a/src/java/com/samskivert/servlet/user/User.java +++ b/src/java/com/samskivert/servlet/user/User.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/servlet/user/UserExistsException.java b/src/java/com/samskivert/servlet/user/UserExistsException.java index 1eb57763..06749e67 100644 --- a/src/java/com/samskivert/servlet/user/UserExistsException.java +++ b/src/java/com/samskivert/servlet/user/UserExistsException.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/servlet/user/UserRepository.java b/src/java/com/samskivert/servlet/user/UserRepository.java index e3caf400..0eeb5447 100644 --- a/src/java/com/samskivert/servlet/user/UserRepository.java +++ b/src/java/com/samskivert/servlet/user/UserRepository.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/servlet/user/UserUtil.java b/src/java/com/samskivert/servlet/user/UserUtil.java index fadee7ce..974de94d 100644 --- a/src/java/com/samskivert/servlet/user/UserUtil.java +++ b/src/java/com/samskivert/servlet/user/UserUtil.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/servlet/user/Username.java b/src/java/com/samskivert/servlet/user/Username.java index 2d56e481..9b0b1984 100644 --- a/src/java/com/samskivert/servlet/user/Username.java +++ b/src/java/com/samskivert/servlet/user/Username.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/servlet/util/CookieUtil.java b/src/java/com/samskivert/servlet/util/CookieUtil.java index b74bfbe7..353dd272 100644 --- a/src/java/com/samskivert/servlet/util/CookieUtil.java +++ b/src/java/com/samskivert/servlet/util/CookieUtil.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/servlet/util/DataValidationException.java b/src/java/com/samskivert/servlet/util/DataValidationException.java index 6e365995..afc6826f 100644 --- a/src/java/com/samskivert/servlet/util/DataValidationException.java +++ b/src/java/com/samskivert/servlet/util/DataValidationException.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/servlet/util/ExceptionMap.java b/src/java/com/samskivert/servlet/util/ExceptionMap.java index e0f5a6ad..7917b785 100644 --- a/src/java/com/samskivert/servlet/util/ExceptionMap.java +++ b/src/java/com/samskivert/servlet/util/ExceptionMap.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/servlet/util/FriendlyException.java b/src/java/com/samskivert/servlet/util/FriendlyException.java index 11d7a572..2c0a37b3 100644 --- a/src/java/com/samskivert/servlet/util/FriendlyException.java +++ b/src/java/com/samskivert/servlet/util/FriendlyException.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/servlet/util/HTMLUtil.java b/src/java/com/samskivert/servlet/util/HTMLUtil.java index c550fe33..1d026bc4 100644 --- a/src/java/com/samskivert/servlet/util/HTMLUtil.java +++ b/src/java/com/samskivert/servlet/util/HTMLUtil.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or @@ -165,7 +165,7 @@ public class HTMLUtil /** * Restrict HTML except for the specified tags. - * + * * @param allowFormatting enables <i>, <b>, <u>, * <font>, <br>, <p>, and * <hr>. diff --git a/src/java/com/samskivert/servlet/util/ParameterUtil.java b/src/java/com/samskivert/servlet/util/ParameterUtil.java index 5eaa9389..209f3f55 100644 --- a/src/java/com/samskivert/servlet/util/ParameterUtil.java +++ b/src/java/com/samskivert/servlet/util/ParameterUtil.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/servlet/util/RequestUtils.java b/src/java/com/samskivert/servlet/util/RequestUtils.java index 9b2a473c..88978756 100644 --- a/src/java/com/samskivert/servlet/util/RequestUtils.java +++ b/src/java/com/samskivert/servlet/util/RequestUtils.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/servlet/util/ServiceWaiter.java b/src/java/com/samskivert/servlet/util/ServiceWaiter.java index d83649ee..6b517b38 100644 --- a/src/java/com/samskivert/servlet/util/ServiceWaiter.java +++ b/src/java/com/samskivert/servlet/util/ServiceWaiter.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/swing/AWTResultListener.java b/src/java/com/samskivert/swing/AWTResultListener.java index 2665affe..9a610183 100644 --- a/src/java/com/samskivert/swing/AWTResultListener.java +++ b/src/java/com/samskivert/swing/AWTResultListener.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/swing/AbsoluteLayout.java b/src/java/com/samskivert/swing/AbsoluteLayout.java index 7e677e2b..7268ca05 100644 --- a/src/java/com/samskivert/swing/AbsoluteLayout.java +++ b/src/java/com/samskivert/swing/AbsoluteLayout.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/swing/CollapsibleList.java b/src/java/com/samskivert/swing/CollapsibleList.java index 8dadd8c8..d4aefd6d 100644 --- a/src/java/com/samskivert/swing/CollapsibleList.java +++ b/src/java/com/samskivert/swing/CollapsibleList.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/swing/CollapsiblePanel.java b/src/java/com/samskivert/swing/CollapsiblePanel.java index 9858c4b6..5babc270 100644 --- a/src/java/com/samskivert/swing/CollapsiblePanel.java +++ b/src/java/com/samskivert/swing/CollapsiblePanel.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/swing/ComboButtonBox.java b/src/java/com/samskivert/swing/ComboButtonBox.java index 35cfdd7e..dca9f8a9 100644 --- a/src/java/com/samskivert/swing/ComboButtonBox.java +++ b/src/java/com/samskivert/swing/ComboButtonBox.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or @@ -238,7 +238,7 @@ public class ComboButtonBox extends JPanel // add buttons for the new interval addButtons(start, count); } - + // documentation inherited from interface public void intervalRemoved (ListDataEvent e) { diff --git a/src/java/com/samskivert/swing/CommandButton.java b/src/java/com/samskivert/swing/CommandButton.java index ca7c6b05..08f53894 100644 --- a/src/java/com/samskivert/swing/CommandButton.java +++ b/src/java/com/samskivert/swing/CommandButton.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/swing/ControlledPanel.java b/src/java/com/samskivert/swing/ControlledPanel.java index d7535892..a250cecd 100644 --- a/src/java/com/samskivert/swing/ControlledPanel.java +++ b/src/java/com/samskivert/swing/ControlledPanel.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/swing/Controller.java b/src/java/com/samskivert/swing/Controller.java index 35e7f8f8..650035ec 100644 --- a/src/java/com/samskivert/swing/Controller.java +++ b/src/java/com/samskivert/swing/Controller.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/swing/ControllerProvider.java b/src/java/com/samskivert/swing/ControllerProvider.java index e68a652e..d5e586a5 100644 --- a/src/java/com/samskivert/swing/ControllerProvider.java +++ b/src/java/com/samskivert/swing/ControllerProvider.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/swing/DimenInfo.java b/src/java/com/samskivert/swing/DimenInfo.java index ef2e1690..6a08dea5 100644 --- a/src/java/com/samskivert/swing/DimenInfo.java +++ b/src/java/com/samskivert/swing/DimenInfo.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/swing/DimmedIcon.java b/src/java/com/samskivert/swing/DimmedIcon.java index 5d551bc9..554f1501 100644 --- a/src/java/com/samskivert/swing/DimmedIcon.java +++ b/src/java/com/samskivert/swing/DimmedIcon.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/swing/EnablingAdapter.java b/src/java/com/samskivert/swing/EnablingAdapter.java index aaeea3ba..08d16034 100644 --- a/src/java/com/samskivert/swing/EnablingAdapter.java +++ b/src/java/com/samskivert/swing/EnablingAdapter.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/swing/GroupLayout.java b/src/java/com/samskivert/swing/GroupLayout.java index 91fef5eb..2fe8772c 100644 --- a/src/java/com/samskivert/swing/GroupLayout.java +++ b/src/java/com/samskivert/swing/GroupLayout.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/swing/GroupLayoutTest.java b/src/java/com/samskivert/swing/GroupLayoutTest.java index 0a0e1ef0..c39388c8 100644 --- a/src/java/com/samskivert/swing/GroupLayoutTest.java +++ b/src/java/com/samskivert/swing/GroupLayoutTest.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/swing/HGroupLayout.java b/src/java/com/samskivert/swing/HGroupLayout.java index 024a985c..cea4615e 100644 --- a/src/java/com/samskivert/swing/HGroupLayout.java +++ b/src/java/com/samskivert/swing/HGroupLayout.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/swing/IntField.java b/src/java/com/samskivert/swing/IntField.java index 9dd9ae0d..a4b63e35 100644 --- a/src/java/com/samskivert/swing/IntField.java +++ b/src/java/com/samskivert/swing/IntField.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or @@ -67,7 +67,7 @@ public class IntField extends JTextField } /** - * Create an IntField with the specified initial, minimum, and + * Create an IntField with the specified initial, minimum, and * maximum values. */ public IntField (int initial, int minValue, int maxValue) diff --git a/src/java/com/samskivert/swing/IntegerTableCellRenderer.java b/src/java/com/samskivert/swing/IntegerTableCellRenderer.java index 62f70d59..08091fa4 100644 --- a/src/java/com/samskivert/swing/IntegerTableCellRenderer.java +++ b/src/java/com/samskivert/swing/IntegerTableCellRenderer.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/swing/JInternalDialog.java b/src/java/com/samskivert/swing/JInternalDialog.java index 0bf9ca0b..a4711c7b 100644 --- a/src/java/com/samskivert/swing/JInternalDialog.java +++ b/src/java/com/samskivert/swing/JInternalDialog.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/swing/Label.java b/src/java/com/samskivert/swing/Label.java index 7190b67d..e1c5de6a 100644 --- a/src/java/com/samskivert/swing/Label.java +++ b/src/java/com/samskivert/swing/Label.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or @@ -213,7 +213,7 @@ public class Label implements SwingConstants, LabelStyleConstants { return _textColor; } - + /** * Sets the color used to render the text. Setting the text color to * null will render the label in the graphics context @@ -232,7 +232,7 @@ public class Label implements SwingConstants, LabelStyleConstants { return _alternateColor; } - + /** * Instructs the label to render the text with the specified alternate * color when rendering. The text itself will be rendered in whatever @@ -257,7 +257,7 @@ public class Label implements SwingConstants, LabelStyleConstants * SwingConstants#LEFT}, {@link SwingConstants#RIGHT}, or {@link * SwingConstants#CENTER}. The default alignment is selected to be * appropriate for the locale of the text being rendered. - * + * *

This should be followed by a call to {@link #layout} before a * call is made to {@link #render} as this method invalidates the * layout information. @@ -670,7 +670,7 @@ public class Label implements SwingConstants, LabelStyleConstants // color the segment just passed endSeg += m.start(); if (lastColor != null) { - text.addAttribute(TextAttribute.FOREGROUND, lastColor, + text.addAttribute(TextAttribute.FOREGROUND, lastColor, startSeg, endSeg); } @@ -696,7 +696,7 @@ public class Label implements SwingConstants, LabelStyleConstants } // apply any final color to the tail segment if (lastColor != null) { - text.addAttribute(TextAttribute.FOREGROUND, lastColor, + text.addAttribute(TextAttribute.FOREGROUND, lastColor, startSeg, _text.length()); } } diff --git a/src/java/com/samskivert/swing/LabelSausage.java b/src/java/com/samskivert/swing/LabelSausage.java index d1f4b651..50a15160 100644 --- a/src/java/com/samskivert/swing/LabelSausage.java +++ b/src/java/com/samskivert/swing/LabelSausage.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or @@ -84,7 +84,7 @@ public abstract class LabelSausage } // compute the diameter of the circle that perfectly encompasses our - // icon + // icon int hhei = sqhei / 2; int hwid = sqwid / 2; _dia = (int) (Math.sqrt(hwid * hwid + hhei * hhei) * 2); diff --git a/src/java/com/samskivert/swing/LabelStyleConstants.java b/src/java/com/samskivert/swing/LabelStyleConstants.java index b2c0ebb4..f2298c99 100644 --- a/src/java/com/samskivert/swing/LabelStyleConstants.java +++ b/src/java/com/samskivert/swing/LabelStyleConstants.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/swing/LazyComponent.java b/src/java/com/samskivert/swing/LazyComponent.java index 6ffea003..42197360 100644 --- a/src/java/com/samskivert/swing/LazyComponent.java +++ b/src/java/com/samskivert/swing/LazyComponent.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/swing/ObjectEditorTable.java b/src/java/com/samskivert/swing/ObjectEditorTable.java index f076a194..96d8db64 100644 --- a/src/java/com/samskivert/swing/ObjectEditorTable.java +++ b/src/java/com/samskivert/swing/ObjectEditorTable.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or @@ -175,7 +175,7 @@ public class ObjectEditorTable extends JTable } else { _fields = fields; // use all the fields } - + // figure out which fields are editable for (int ii=0, nn=_fields.length; ii < nn; ii++) { if (ListUtil.contains(editableFields, _fields[ii].getName())) { diff --git a/src/java/com/samskivert/swing/RadialLabelSausage.java b/src/java/com/samskivert/swing/RadialLabelSausage.java index 879b9c11..970a5bdc 100644 --- a/src/java/com/samskivert/swing/RadialLabelSausage.java +++ b/src/java/com/samskivert/swing/RadialLabelSausage.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/swing/RadialMenu.java b/src/java/com/samskivert/swing/RadialMenu.java index 5dcc45cc..00a1a4ab 100644 --- a/src/java/com/samskivert/swing/RadialMenu.java +++ b/src/java/com/samskivert/swing/RadialMenu.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or @@ -597,7 +597,7 @@ public class RadialMenu item.openBounds.translate(-_bounds.x, -_bounds.y); item.closedBounds.translate(-_bounds.x, -_bounds.y); } - + // the origin was at the center of the encircled rectangle; we // need to translate it such that the origin of our bounds are in // screen coordinates and at the upper left rather than the center diff --git a/src/java/com/samskivert/swing/RadialMenuItem.java b/src/java/com/samskivert/swing/RadialMenuItem.java index 0173aecb..1167e417 100644 --- a/src/java/com/samskivert/swing/RadialMenuItem.java +++ b/src/java/com/samskivert/swing/RadialMenuItem.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/swing/RuntimeAdjust.java b/src/java/com/samskivert/swing/RuntimeAdjust.java index 60b1621b..c72580da 100644 --- a/src/java/com/samskivert/swing/RuntimeAdjust.java +++ b/src/java/com/samskivert/swing/RuntimeAdjust.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or @@ -146,7 +146,7 @@ public class RuntimeAdjust public int getScrollableBlockIncrement ( Rectangle visibleRect, int orientation, int direction) { return 200; - } + } public boolean getScrollableTracksViewportWidth () { return true; diff --git a/src/java/com/samskivert/swing/SafeLayeredPane.java b/src/java/com/samskivert/swing/SafeLayeredPane.java index 12effe79..d6f6d3cb 100644 --- a/src/java/com/samskivert/swing/SafeLayeredPane.java +++ b/src/java/com/samskivert/swing/SafeLayeredPane.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/swing/ScaledIcon.java b/src/java/com/samskivert/swing/ScaledIcon.java index 262fd4ee..ed4bb6d6 100644 --- a/src/java/com/samskivert/swing/ScaledIcon.java +++ b/src/java/com/samskivert/swing/ScaledIcon.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/swing/ScrollBox.java b/src/java/com/samskivert/swing/ScrollBox.java index 08a13a44..407dfd9a 100644 --- a/src/java/com/samskivert/swing/ScrollBox.java +++ b/src/java/com/samskivert/swing/ScrollBox.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/swing/ScrollablePanel.java b/src/java/com/samskivert/swing/ScrollablePanel.java index be97fbb3..08d3bb87 100644 --- a/src/java/com/samskivert/swing/ScrollablePanel.java +++ b/src/java/com/samskivert/swing/ScrollablePanel.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/swing/ShapeIcon.java b/src/java/com/samskivert/swing/ShapeIcon.java index 3c5851ec..036838c3 100644 --- a/src/java/com/samskivert/swing/ShapeIcon.java +++ b/src/java/com/samskivert/swing/ShapeIcon.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or @@ -37,7 +37,7 @@ public class ShapeIcon implements Icon { /** - * @param shape the shape to paint + * @param shape the shape to paint * @param fillColor the color to paint the shape filled, or null. * @param outlineColor the color to paint the shape outline, or null. */ diff --git a/src/java/com/samskivert/swing/SimpleSlider.java b/src/java/com/samskivert/swing/SimpleSlider.java index 7358cb44..80d10c99 100644 --- a/src/java/com/samskivert/swing/SimpleSlider.java +++ b/src/java/com/samskivert/swing/SimpleSlider.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/swing/SmartPolygon.java b/src/java/com/samskivert/swing/SmartPolygon.java index 2996060d..bed01801 100644 --- a/src/java/com/samskivert/swing/SmartPolygon.java +++ b/src/java/com/samskivert/swing/SmartPolygon.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/swing/Spacer.java b/src/java/com/samskivert/swing/Spacer.java index d4e9a8a7..919e1bb6 100644 --- a/src/java/com/samskivert/swing/Spacer.java +++ b/src/java/com/samskivert/swing/Spacer.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/swing/TGraphics2D.java b/src/java/com/samskivert/swing/TGraphics2D.java index b0b5c7a5..77ed509b 100644 --- a/src/java/com/samskivert/swing/TGraphics2D.java +++ b/src/java/com/samskivert/swing/TGraphics2D.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/swing/TableMap.java b/src/java/com/samskivert/swing/TableMap.java index a14b54b4..891e089b 100644 --- a/src/java/com/samskivert/swing/TableMap.java +++ b/src/java/com/samskivert/swing/TableMap.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or @@ -20,69 +20,69 @@ package com.samskivert.swing; -/** +/** * In a chain of data manipulators some behaviour is common. TableMap * provides most of this behavour and can be subclassed by filters - * that only need to override a handful of specific methods. TableMap + * that only need to override a handful of specific methods. TableMap * implements TableModel by routing all requests to its model, and - * TableModelListener by routing all events to its listeners. Inserting - * a TableMap which has not been subclassed into a chain of table filters + * TableModelListener by routing all events to its listeners. Inserting + * a TableMap which has not been subclassed into a chain of table filters * should have no effect. * * @version 1.4 12/17/97 * @author Philip Milne */ -import javax.swing.table.*; -import javax.swing.event.TableModelListener; -import javax.swing.event.TableModelEvent; +import javax.swing.table.*; +import javax.swing.event.TableModelListener; +import javax.swing.event.TableModelEvent; -public class TableMap extends AbstractTableModel +public class TableMap extends AbstractTableModel implements TableModelListener { - protected TableModel model; + protected TableModel model; public TableModel getModel() { return model; } public void setModel(TableModel model) { - this.model = model; - model.addTableModelListener(this); + this.model = model; + model.addTableModelListener(this); } - // By default, implement TableModel by forwarding all messages - // to the model. + // By default, implement TableModel by forwarding all messages + // to the model. public Object getValueAt(int aRow, int aColumn) { - return model.getValueAt(aRow, aColumn); + return model.getValueAt(aRow, aColumn); } - + public void setValueAt(Object aValue, int aRow, int aColumn) { - model.setValueAt(aValue, aRow, aColumn); + model.setValueAt(aValue, aRow, aColumn); } public int getRowCount() { - return (model == null) ? 0 : model.getRowCount(); + return (model == null) ? 0 : model.getRowCount(); } public int getColumnCount() { - return (model == null) ? 0 : model.getColumnCount(); + return (model == null) ? 0 : model.getColumnCount(); } - + public String getColumnName(int aColumn) { - return model.getColumnName(aColumn); + return model.getColumnName(aColumn); } public Class getColumnClass(int aColumn) { - return model.getColumnClass(aColumn); + return model.getColumnClass(aColumn); } - - public boolean isCellEditable(int row, int column) { - return model.isCellEditable(row, column); + + public boolean isCellEditable(int row, int column) { + return model.isCellEditable(row, column); } // -// Implementation of the TableModelListener interface, +// Implementation of the TableModelListener interface, // - // By default forward all events to all the listeners. + // By default forward all events to all the listeners. public void tableChanged(TableModelEvent e) { fireTableChanged(e); } diff --git a/src/java/com/samskivert/swing/TableSorter.java b/src/java/com/samskivert/swing/TableSorter.java index a333fe3b..52181caf 100644 --- a/src/java/com/samskivert/swing/TableSorter.java +++ b/src/java/com/samskivert/swing/TableSorter.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or @@ -76,9 +76,9 @@ import com.samskivert.util.Comparators; *

* This is a long overdue rewrite of a class of the same name that * first appeared in the swing table demos in 1997. - * + * * @author Philip Milne - * @author Brendon McLean + * @author Brendon McLean * @author Dan van Enckevort * @author Parwinder Sekhon * @author Michael Bayne (modifications) @@ -271,7 +271,7 @@ public class TableSorter extends AbstractTableModel { return modelToView; } - // TableModel interface methods + // TableModel interface methods public int getRowCount() { return (tableModel == null) ? 0 : tableModel.getRowCount(); @@ -302,7 +302,7 @@ public class TableSorter extends AbstractTableModel { } // Helper classes - + private class Row implements Comparable { private int modelIndex; @@ -341,53 +341,53 @@ public class TableSorter extends AbstractTableModel { private class TableModelHandler implements TableModelListener { public void tableChanged(TableModelEvent e) { - // If we're not sorting by anything, just pass the event along. + // If we're not sorting by anything, just pass the event along. if (!isSorting()) { clearSortingState(); fireTableChanged(e); return; } - - // If the table structure has changed, cancel the sorting; the - // sorting columns may have been either moved or deleted from - // the model. + + // If the table structure has changed, cancel the sorting; the + // sorting columns may have been either moved or deleted from + // the model. if (e.getFirstRow() == TableModelEvent.HEADER_ROW) { cancelSorting(); fireTableChanged(e); return; } - // We can map a cell event through to the view without widening - // when the following conditions apply: - // - // a) all the changes are on one row (e.getFirstRow() == e.getLastRow()) and, + // We can map a cell event through to the view without widening + // when the following conditions apply: + // + // a) all the changes are on one row (e.getFirstRow() == e.getLastRow()) and, // b) all the changes are in one column (column != TableModelEvent.ALL_COLUMNS) and, - // c) we are not sorting on that column (getSortingStatus(column) == NOT_SORTED) and, + // c) we are not sorting on that column (getSortingStatus(column) == NOT_SORTED) and, // d) a reverse lookup will not trigger a sort (modelToView != null) // // Note: INSERT and DELETE events fail this test as they have column == ALL_COLUMNS. - // - // The last check, for (modelToView != null) is to see if modelToView - // is already allocated. If we don't do this check; sorting can become - // a performance bottleneck for applications where cells - // change rapidly in different parts of the table. If cells - // change alternately in the sorting column and then outside of - // it this class can end up re-sorting on alternate cell updates - - // which can be a performance problem for large tables. The last - // clause avoids this problem. + // + // The last check, for (modelToView != null) is to see if modelToView + // is already allocated. If we don't do this check; sorting can become + // a performance bottleneck for applications where cells + // change rapidly in different parts of the table. If cells + // change alternately in the sorting column and then outside of + // it this class can end up re-sorting on alternate cell updates - + // which can be a performance problem for large tables. The last + // clause avoids this problem. int column = e.getColumn(); if (e.getFirstRow() == e.getLastRow() && column != TableModelEvent.ALL_COLUMNS && getSortingStatus(column) == NOT_SORTED && modelToView != null) { int viewIndex = getModelToView()[e.getFirstRow()]; - fireTableChanged(new TableModelEvent(TableSorter.this, - viewIndex, viewIndex, + fireTableChanged(new TableModelEvent(TableSorter.this, + viewIndex, viewIndex, column, e.getType())); return; } - // Something has happened to the data that may have invalidated the row order. + // Something has happened to the data that may have invalidated the row order. clearSortingState(); fireTableDataChanged(); return; @@ -405,8 +405,8 @@ public class TableSorter extends AbstractTableModel { if (!e.isControlDown()) { cancelSorting(); } - // Cycle the sorting states through {NOT_SORTED, ASCENDING, DESCENDING} or - // {NOT_SORTED, DESCENDING, ASCENDING} depending on whether shift is pressed. + // Cycle the sorting states through {NOT_SORTED, ASCENDING, DESCENDING} or + // {NOT_SORTED, DESCENDING, ASCENDING} depending on whether shift is pressed. status = status + (e.isShiftDown() ? -1 : 1); status = (status + 4) % 3 - 1; // signed mod, returning {-1, 0, 1} setSortingStatus(column, status); @@ -426,27 +426,27 @@ public class TableSorter extends AbstractTableModel { } public void paintIcon(Component c, Graphics g, int x, int y) { - Color color = c == null ? Color.GRAY : c.getBackground(); - // In a compound sort, make each succesive triangle 20% - // smaller than the previous one. + Color color = c == null ? Color.GRAY : c.getBackground(); + // In a compound sort, make each succesive triangle 20% + // smaller than the previous one. int dx = (int)(size/2*Math.pow(0.8, priority)); int dy = descending ? dx : -dx; - // Align icon (roughly) with font baseline. + // Align icon (roughly) with font baseline. y = y + 5*size/6 + (descending ? -dy : 0); int shift = descending ? 1 : -1; g.translate(x, y); - // Right diagonal. + // Right diagonal. g.setColor(color.darker()); g.drawLine(dx / 2, dy, 0, 0); g.drawLine(dx / 2, dy + shift, 0, shift); - - // Left diagonal. + + // Left diagonal. g.setColor(color.brighter()); g.drawLine(dx / 2, dy, dx, 0); g.drawLine(dx / 2, dy + shift, dx, shift); - - // Horizontal line. + + // Horizontal line. if (descending) { g.setColor(color.darker().darker()); } else { @@ -474,13 +474,13 @@ public class TableSorter extends AbstractTableModel { this.tableCellRenderer = tableCellRenderer; } - public Component getTableCellRendererComponent(JTable table, + public Component getTableCellRendererComponent(JTable table, Object value, - boolean isSelected, + boolean isSelected, boolean hasFocus, - int row, + int row, int column) { - Component c = tableCellRenderer.getTableCellRendererComponent(table, + Component c = tableCellRenderer.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column); if (c instanceof JLabel) { JLabel l = (JLabel) c; diff --git a/src/java/com/samskivert/swing/Timer.java b/src/java/com/samskivert/swing/Timer.java index 17c92e55..dadcfbef 100644 --- a/src/java/com/samskivert/swing/Timer.java +++ b/src/java/com/samskivert/swing/Timer.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or @@ -33,7 +33,7 @@ public class Timer extends javax.swing.Timer * Construct a samskivert timer. * * @param delay the delay between posts. - * @param source the source component to use for finding the + * @param source the source component to use for finding the * appropriate controller. * @param command the command to post. */ diff --git a/src/java/com/samskivert/swing/VGroupLayout.java b/src/java/com/samskivert/swing/VGroupLayout.java index 164c3bec..1712cc15 100644 --- a/src/java/com/samskivert/swing/VGroupLayout.java +++ b/src/java/com/samskivert/swing/VGroupLayout.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/swing/dnd/AutoscrollingDropTarget.java b/src/java/com/samskivert/swing/dnd/AutoscrollingDropTarget.java index 52e7fddd..a5d4ac0a 100644 --- a/src/java/com/samskivert/swing/dnd/AutoscrollingDropTarget.java +++ b/src/java/com/samskivert/swing/dnd/AutoscrollingDropTarget.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/swing/dnd/DnDManager.java b/src/java/com/samskivert/swing/dnd/DnDManager.java index 0522671f..cc95948d 100644 --- a/src/java/com/samskivert/swing/dnd/DnDManager.java +++ b/src/java/com/samskivert/swing/dnd/DnDManager.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or @@ -232,7 +232,7 @@ public class DnDManager clearComponentCursor(); } } - + protected void assertTopCursorCleared () { if (_topComp != null) { @@ -241,7 +241,7 @@ public class DnDManager _topComp = null; } } - + /** * Clear out the component-level cursor. */ @@ -252,20 +252,20 @@ public class DnDManager _lastComp = null; } } - + /** * Are we currently involved in a drag? */ protected boolean isDragging () { boolean dragging = (_source != null); - + if (!dragging) { // make sure there's no component/top cursor assertComponentCursorCleared(); assertTopCursorCleared(); } - + return dragging; } @@ -289,7 +289,7 @@ public class DnDManager } /** - * Check to see if we want to enter autoscrolling mode. + * Check to see if we want to enter autoscrolling mode. */ protected void checkAutoscroll (MouseEvent exitEvent) { diff --git a/src/java/com/samskivert/swing/dnd/DragSource.java b/src/java/com/samskivert/swing/dnd/DragSource.java index 98abc988..f4505821 100644 --- a/src/java/com/samskivert/swing/dnd/DragSource.java +++ b/src/java/com/samskivert/swing/dnd/DragSource.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/swing/dnd/DropTarget.java b/src/java/com/samskivert/swing/dnd/DropTarget.java index c787a46a..ef14bbbc 100644 --- a/src/java/com/samskivert/swing/dnd/DropTarget.java +++ b/src/java/com/samskivert/swing/dnd/DropTarget.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/swing/event/AncestorAdapter.java b/src/java/com/samskivert/swing/event/AncestorAdapter.java index ba76e265..47bc9f9a 100644 --- a/src/java/com/samskivert/swing/event/AncestorAdapter.java +++ b/src/java/com/samskivert/swing/event/AncestorAdapter.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/swing/event/CommandEvent.java b/src/java/com/samskivert/swing/event/CommandEvent.java index fec4ba69..7d34f9be 100644 --- a/src/java/com/samskivert/swing/event/CommandEvent.java +++ b/src/java/com/samskivert/swing/event/CommandEvent.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/swing/event/DocumentAdapter.java b/src/java/com/samskivert/swing/event/DocumentAdapter.java index cbd9567e..f8d2d2f6 100644 --- a/src/java/com/samskivert/swing/event/DocumentAdapter.java +++ b/src/java/com/samskivert/swing/event/DocumentAdapter.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/swing/event/MouseArmingAdapter.java b/src/java/com/samskivert/swing/event/MouseArmingAdapter.java index a38ec8af..81126e2b 100644 --- a/src/java/com/samskivert/swing/event/MouseArmingAdapter.java +++ b/src/java/com/samskivert/swing/event/MouseArmingAdapter.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/swing/event/PopupMenuAdapter.java b/src/java/com/samskivert/swing/event/PopupMenuAdapter.java index e072cf5f..ffe284f7 100644 --- a/src/java/com/samskivert/swing/event/PopupMenuAdapter.java +++ b/src/java/com/samskivert/swing/event/PopupMenuAdapter.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/swing/tests/AdjustTestApp.java b/src/java/com/samskivert/swing/tests/AdjustTestApp.java index 4989c93b..f937884a 100644 --- a/src/java/com/samskivert/swing/tests/AdjustTestApp.java +++ b/src/java/com/samskivert/swing/tests/AdjustTestApp.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/swing/tests/LabelDemo.java b/src/java/com/samskivert/swing/tests/LabelDemo.java index 2665d1c3..0ca7485e 100644 --- a/src/java/com/samskivert/swing/tests/LabelDemo.java +++ b/src/java/com/samskivert/swing/tests/LabelDemo.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/swing/tests/ProximityTrackerTest.java b/src/java/com/samskivert/swing/tests/ProximityTrackerTest.java index c3c948ba..99323ed9 100644 --- a/src/java/com/samskivert/swing/tests/ProximityTrackerTest.java +++ b/src/java/com/samskivert/swing/tests/ProximityTrackerTest.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/swing/tests/TestComboButtonBox.java b/src/java/com/samskivert/swing/tests/TestComboButtonBox.java index 5df172f4..5aa194c2 100644 --- a/src/java/com/samskivert/swing/tests/TestComboButtonBox.java +++ b/src/java/com/samskivert/swing/tests/TestComboButtonBox.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/swing/util/ButtonUtil.java b/src/java/com/samskivert/swing/util/ButtonUtil.java index 7ac9da7c..6e548e5a 100644 --- a/src/java/com/samskivert/swing/util/ButtonUtil.java +++ b/src/java/com/samskivert/swing/util/ButtonUtil.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/swing/util/DialogUtil.java b/src/java/com/samskivert/swing/util/DialogUtil.java index e21c9c9b..6574fac4 100644 --- a/src/java/com/samskivert/swing/util/DialogUtil.java +++ b/src/java/com/samskivert/swing/util/DialogUtil.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/swing/util/MenuUtil.java b/src/java/com/samskivert/swing/util/MenuUtil.java index 07a994c0..242916f0 100644 --- a/src/java/com/samskivert/swing/util/MenuUtil.java +++ b/src/java/com/samskivert/swing/util/MenuUtil.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/swing/util/MouseHijacker.java b/src/java/com/samskivert/swing/util/MouseHijacker.java index 6639cef6..5dd2f2b9 100644 --- a/src/java/com/samskivert/swing/util/MouseHijacker.java +++ b/src/java/com/samskivert/swing/util/MouseHijacker.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/swing/util/ProximityTracker.java b/src/java/com/samskivert/swing/util/ProximityTracker.java index 80b13a51..62c4f1d2 100644 --- a/src/java/com/samskivert/swing/util/ProximityTracker.java +++ b/src/java/com/samskivert/swing/util/ProximityTracker.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/swing/util/RetryableTask.java b/src/java/com/samskivert/swing/util/RetryableTask.java index eaf76aef..c7fd9f9f 100644 --- a/src/java/com/samskivert/swing/util/RetryableTask.java +++ b/src/java/com/samskivert/swing/util/RetryableTask.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/swing/util/SwingUtil.java b/src/java/com/samskivert/swing/util/SwingUtil.java index 6b10a3f5..60b22d00 100644 --- a/src/java/com/samskivert/swing/util/SwingUtil.java +++ b/src/java/com/samskivert/swing/util/SwingUtil.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or @@ -215,7 +215,7 @@ public class SwingUtil } /** - * Create a comparator that compares against the distance from + * Create a comparator that compares against the distance from * the specified point. * * Note: The comparator will continue to sort by distance from the origin diff --git a/src/java/com/samskivert/swing/util/Task.java b/src/java/com/samskivert/swing/util/Task.java index b29ff8cd..e4dc9eae 100644 --- a/src/java/com/samskivert/swing/util/Task.java +++ b/src/java/com/samskivert/swing/util/Task.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/swing/util/TaskAdapter.java b/src/java/com/samskivert/swing/util/TaskAdapter.java index b26f7860..04b957b9 100644 --- a/src/java/com/samskivert/swing/util/TaskAdapter.java +++ b/src/java/com/samskivert/swing/util/TaskAdapter.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/swing/util/TaskMaster.java b/src/java/com/samskivert/swing/util/TaskMaster.java index 9626db66..07e8f162 100644 --- a/src/java/com/samskivert/swing/util/TaskMaster.java +++ b/src/java/com/samskivert/swing/util/TaskMaster.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/swing/util/TaskObserver.java b/src/java/com/samskivert/swing/util/TaskObserver.java index 40ff32b0..148559cb 100644 --- a/src/java/com/samskivert/swing/util/TaskObserver.java +++ b/src/java/com/samskivert/swing/util/TaskObserver.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/test/TestUtil.java b/src/java/com/samskivert/test/TestUtil.java index 51ab6983..84249d28 100644 --- a/src/java/com/samskivert/test/TestUtil.java +++ b/src/java/com/samskivert/test/TestUtil.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/text/MessageUtil.java b/src/java/com/samskivert/text/MessageUtil.java index 95d2e0a7..6f814666 100644 --- a/src/java/com/samskivert/text/MessageUtil.java +++ b/src/java/com/samskivert/text/MessageUtil.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/ArrayIntSet.java b/src/java/com/samskivert/util/ArrayIntSet.java index 867ae941..f0e4787a 100644 --- a/src/java/com/samskivert/util/ArrayIntSet.java +++ b/src/java/com/samskivert/util/ArrayIntSet.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/ArrayUtil.java b/src/java/com/samskivert/util/ArrayUtil.java index 1307d0e0..e848d827 100644 --- a/src/java/com/samskivert/util/ArrayUtil.java +++ b/src/java/com/samskivert/util/ArrayUtil.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or @@ -821,7 +821,7 @@ public class ArrayUtil System.arraycopy(v2, 0, values, v1.length, v2.length); return values; } - + /** * Creates a new array that contains the contents of the first parameter * array followed by those of the second. @@ -835,7 +835,7 @@ public class ArrayUtil System.arraycopy(v2, 0, values, v1.length, v2.length); return values; } - + /** * Similar to {@link Collection#toArray}, this method copies the contents * of the first parameter to the second, creating a new array of the same @@ -851,7 +851,7 @@ public class ArrayUtil System.arraycopy(values, 0, dest, 0, values.length); return dest; } - + /** The default random object used when shuffling an array. */ protected static Random _rnd = new Random(); } diff --git a/src/java/com/samskivert/util/AuditLogger.java b/src/java/com/samskivert/util/AuditLogger.java index ce02b05d..12ae1a8c 100644 --- a/src/java/com/samskivert/util/AuditLogger.java +++ b/src/java/com/samskivert/util/AuditLogger.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/BaseArrayList.java b/src/java/com/samskivert/util/BaseArrayList.java index c6259e24..3adefd5f 100644 --- a/src/java/com/samskivert/util/BaseArrayList.java +++ b/src/java/com/samskivert/util/BaseArrayList.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/BasicRunQueue.java b/src/java/com/samskivert/util/BasicRunQueue.java index 39116db2..9736302a 100644 --- a/src/java/com/samskivert/util/BasicRunQueue.java +++ b/src/java/com/samskivert/util/BasicRunQueue.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or @@ -36,7 +36,7 @@ public class BasicRunQueue extends LoopingThread super("RunQueue"); _queue = new Queue(); } - + // documentation inherited from interface public void postRunnable (Runnable r) { diff --git a/src/java/com/samskivert/util/CalendarUtil.java b/src/java/com/samskivert/util/CalendarUtil.java index c864860d..90603981 100644 --- a/src/java/com/samskivert/util/CalendarUtil.java +++ b/src/java/com/samskivert/util/CalendarUtil.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/ChainedResultListener.java b/src/java/com/samskivert/util/ChainedResultListener.java index 8738f5f5..5b9ab14b 100644 --- a/src/java/com/samskivert/util/ChainedResultListener.java +++ b/src/java/com/samskivert/util/ChainedResultListener.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/CheapIntMap.java b/src/java/com/samskivert/util/CheapIntMap.java index 961314cc..91ef4a72 100644 --- a/src/java/com/samskivert/util/CheapIntMap.java +++ b/src/java/com/samskivert/util/CheapIntMap.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/ClassUtil.java b/src/java/com/samskivert/util/ClassUtil.java index 5fea2472..31bf7f99 100644 --- a/src/java/com/samskivert/util/ClassUtil.java +++ b/src/java/com/samskivert/util/ClassUtil.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or @@ -117,7 +117,7 @@ public class ClassUtil /** * Tells whether instances of the classes in the 'rhs' array could be used as parameters to a * reflective method invocation whose parameter list has types denoted by the 'lhs' array. - * + * * @param lhs Class array representing the types of the formal parameters of a method. * @param rhs Class array representing the types of the actual parameters of a method. A null * value or Void.TYPE is considered to match a corresponding Object or array class in lhs, but @@ -241,7 +241,7 @@ public class ClassUtil /** * Tells whether an instance of the primitive class represented by 'rhs' can be assigned to an * instance of the primitive class represented by 'lhs'. - * + * * @param lhs assignee class. * @param rhs assigned class. * @@ -294,7 +294,7 @@ public class ClassUtil /** Mapping from primitive wrapper Classes to the sets of primitive classes whose instances can * be assigned an instance of the first. */ - protected static final Map,Set>> _primitiveWideningsMap = + protected static final Map,Set>> _primitiveWideningsMap = new HashMap,Set>>(11); static { diff --git a/src/java/com/samskivert/util/CollectionUtil.java b/src/java/com/samskivert/util/CollectionUtil.java index 248b09d2..43a6d55a 100644 --- a/src/java/com/samskivert/util/CollectionUtil.java +++ b/src/java/com/samskivert/util/CollectionUtil.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/Collections.java b/src/java/com/samskivert/util/Collections.java index 2805727e..08902a00 100644 --- a/src/java/com/samskivert/util/Collections.java +++ b/src/java/com/samskivert/util/Collections.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or @@ -48,7 +48,7 @@ public class Collections * elements in their natural order. */ public static > - Iterator getSortedIterator (Iterable coll) + Iterator getSortedIterator (Iterable coll) { return getSortedIterator(coll.iterator(), new Comparator() { public int compare (T o1, T o2) { diff --git a/src/java/com/samskivert/util/CompactIntListUtil.java b/src/java/com/samskivert/util/CompactIntListUtil.java index c3196d7d..12e7cab0 100644 --- a/src/java/com/samskivert/util/CompactIntListUtil.java +++ b/src/java/com/samskivert/util/CompactIntListUtil.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/ComparableArrayList.java b/src/java/com/samskivert/util/ComparableArrayList.java index b173931b..9c2dfe2e 100644 --- a/src/java/com/samskivert/util/ComparableArrayList.java +++ b/src/java/com/samskivert/util/ComparableArrayList.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/ComparableTuple.java b/src/java/com/samskivert/util/ComparableTuple.java index a3009dab..c637e1af 100644 --- a/src/java/com/samskivert/util/ComparableTuple.java +++ b/src/java/com/samskivert/util/ComparableTuple.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/Comparators.java b/src/java/com/samskivert/util/Comparators.java index e08c275a..44ca4a47 100644 --- a/src/java/com/samskivert/util/Comparators.java +++ b/src/java/com/samskivert/util/Comparators.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/ComplainingListener.java b/src/java/com/samskivert/util/ComplainingListener.java index ee86498a..0f0fe6ab 100644 --- a/src/java/com/samskivert/util/ComplainingListener.java +++ b/src/java/com/samskivert/util/ComplainingListener.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/Config.java b/src/java/com/samskivert/util/Config.java index 253b3703..e20ebd0b 100644 --- a/src/java/com/samskivert/util/Config.java +++ b/src/java/com/samskivert/util/Config.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/ConfigUtil.java b/src/java/com/samskivert/util/ConfigUtil.java index 7be95f31..e497da31 100644 --- a/src/java/com/samskivert/util/ConfigUtil.java +++ b/src/java/com/samskivert/util/ConfigUtil.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/Crypt.java b/src/java/com/samskivert/util/Crypt.java index 5684e503..7c0fe579 100644 --- a/src/java/com/samskivert/util/Crypt.java +++ b/src/java/com/samskivert/util/Crypt.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or @@ -35,18 +35,18 @@ public class Crypt 0xDA, 0xDB, 0xDC, 0xDD, 0xDE, 0xDF, 0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7, 0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF, 0xF0, 0xF1, - 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8, 0xF9, + 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, - 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, + 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x3B, 0x3C, - 0x3D, 0x3E, 0x3F, 0x40, 0x41, 0x42, 0x43, 0x44, + 0x3D, 0x3E, 0x3F, 0x40, 0x41, 0x42, 0x43, 0x44, }; private static final boolean[] shifts2 = diff --git a/src/java/com/samskivert/util/CurrencyUtil.java b/src/java/com/samskivert/util/CurrencyUtil.java index 73a160fc..eeb806f8 100644 --- a/src/java/com/samskivert/util/CurrencyUtil.java +++ b/src/java/com/samskivert/util/CurrencyUtil.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/DebugChords.java b/src/java/com/samskivert/util/DebugChords.java index 1f228a65..1cb7d1aa 100644 --- a/src/java/com/samskivert/util/DebugChords.java +++ b/src/java/com/samskivert/util/DebugChords.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/DefaultLogProvider.java b/src/java/com/samskivert/util/DefaultLogProvider.java index 323caab0..d30b5367 100644 --- a/src/java/com/samskivert/util/DefaultLogProvider.java +++ b/src/java/com/samskivert/util/DefaultLogProvider.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/ExpiringReference.java b/src/java/com/samskivert/util/ExpiringReference.java index 79c30162..d3b7901e 100644 --- a/src/java/com/samskivert/util/ExpiringReference.java +++ b/src/java/com/samskivert/util/ExpiringReference.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/FailureListener.java b/src/java/com/samskivert/util/FailureListener.java index 94b2bfd7..b9b0a30f 100644 --- a/src/java/com/samskivert/util/FailureListener.java +++ b/src/java/com/samskivert/util/FailureListener.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/FileUtil.java b/src/java/com/samskivert/util/FileUtil.java index 98f6dfe5..038143e9 100644 --- a/src/java/com/samskivert/util/FileUtil.java +++ b/src/java/com/samskivert/util/FileUtil.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/GenUtil.java b/src/java/com/samskivert/util/GenUtil.java index d2925213..9cfd8783 100644 --- a/src/java/com/samskivert/util/GenUtil.java +++ b/src/java/com/samskivert/util/GenUtil.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/HashIntMap.java b/src/java/com/samskivert/util/HashIntMap.java index 3e7998d8..fdc36690 100644 --- a/src/java/com/samskivert/util/HashIntMap.java +++ b/src/java/com/samskivert/util/HashIntMap.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/Histogram.java b/src/java/com/samskivert/util/Histogram.java index 0c1e7f54..65ae5e07 100644 --- a/src/java/com/samskivert/util/Histogram.java +++ b/src/java/com/samskivert/util/Histogram.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/IntIntMap.java b/src/java/com/samskivert/util/IntIntMap.java index edbcfb26..d8576d53 100644 --- a/src/java/com/samskivert/util/IntIntMap.java +++ b/src/java/com/samskivert/util/IntIntMap.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/IntListUtil.java b/src/java/com/samskivert/util/IntListUtil.java index d680a9a4..d80d5dc8 100644 --- a/src/java/com/samskivert/util/IntListUtil.java +++ b/src/java/com/samskivert/util/IntListUtil.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/IntMap.java b/src/java/com/samskivert/util/IntMap.java index 4c3676db..bc1a9521 100644 --- a/src/java/com/samskivert/util/IntMap.java +++ b/src/java/com/samskivert/util/IntMap.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/IntMaps.java b/src/java/com/samskivert/util/IntMaps.java index cba838ab..0d92f207 100644 --- a/src/java/com/samskivert/util/IntMaps.java +++ b/src/java/com/samskivert/util/IntMaps.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/IntResultListener.java b/src/java/com/samskivert/util/IntResultListener.java index 46d70c56..e66c8589 100644 --- a/src/java/com/samskivert/util/IntResultListener.java +++ b/src/java/com/samskivert/util/IntResultListener.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/IntSet.java b/src/java/com/samskivert/util/IntSet.java index a7b75e70..509f4967 100644 --- a/src/java/com/samskivert/util/IntSet.java +++ b/src/java/com/samskivert/util/IntSet.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or @@ -52,7 +52,7 @@ public interface IntSet extends Set, Interable * * @return true if this set did not already contain the * specified element. - * + * * @throws UnsupportedOperationException if the add method is * not supported by this set. */ diff --git a/src/java/com/samskivert/util/IntTuple.java b/src/java/com/samskivert/util/IntTuple.java index a1d8b401..b2d36931 100644 --- a/src/java/com/samskivert/util/IntTuple.java +++ b/src/java/com/samskivert/util/IntTuple.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/Interable.java b/src/java/com/samskivert/util/Interable.java index 7b54f11d..e4c0ecc6 100644 --- a/src/java/com/samskivert/util/Interable.java +++ b/src/java/com/samskivert/util/Interable.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/Interator.java b/src/java/com/samskivert/util/Interator.java index 406b8bb1..b2c9b524 100644 --- a/src/java/com/samskivert/util/Interator.java +++ b/src/java/com/samskivert/util/Interator.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/Interval.java b/src/java/com/samskivert/util/Interval.java index fa656c8e..fa0f0ac8 100644 --- a/src/java/com/samskivert/util/Interval.java +++ b/src/java/com/samskivert/util/Interval.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or @@ -118,7 +118,7 @@ public abstract class Interval /** * Schedule the interval to execute repeatedly with the specified initial delay and repeat * delay. Supersedes any previous schedule that this Interval may have had. - * + * * @param fixedRate - if true, this interval schedules repeated expirations using * {@link Timer#scheduleAtFixedRate(TimerTask, long, long)} ensuring that the number of * expired calls will match the amount of time elapsed. If false, it uses diff --git a/src/java/com/samskivert/util/Invoker.java b/src/java/com/samskivert/util/Invoker.java index 7122c0c4..6b4ecd1d 100644 --- a/src/java/com/samskivert/util/Invoker.java +++ b/src/java/com/samskivert/util/Invoker.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/JDK14Logger.java b/src/java/com/samskivert/util/JDK14Logger.java index 3676df66..cc383fe1 100644 --- a/src/java/com/samskivert/util/JDK14Logger.java +++ b/src/java/com/samskivert/util/JDK14Logger.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2008 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/KeyUtil.java b/src/java/com/samskivert/util/KeyUtil.java index 279cac6b..527ade06 100644 --- a/src/java/com/samskivert/util/KeyUtil.java +++ b/src/java/com/samskivert/util/KeyUtil.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or @@ -105,7 +105,7 @@ public class KeyUtil public static void main (String[] args) { - String base = "888888888888888888"; + String base = "888888888888888888"; for (int ii = 0; ii < 10; ii++) { System.out.println(makeLuhnVerifiable(base + ii)); } diff --git a/src/java/com/samskivert/util/KeyValue.java b/src/java/com/samskivert/util/KeyValue.java index d19391f6..96c1f778 100644 --- a/src/java/com/samskivert/util/KeyValue.java +++ b/src/java/com/samskivert/util/KeyValue.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/ListUtil.java b/src/java/com/samskivert/util/ListUtil.java index c321b336..81f785e2 100644 --- a/src/java/com/samskivert/util/ListUtil.java +++ b/src/java/com/samskivert/util/ListUtil.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/Log.java b/src/java/com/samskivert/util/Log.java index f35469b5..71401e54 100644 --- a/src/java/com/samskivert/util/Log.java +++ b/src/java/com/samskivert/util/Log.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/Log4JLogger.java b/src/java/com/samskivert/util/Log4JLogger.java index f76e3197..5d43cfd3 100644 --- a/src/java/com/samskivert/util/Log4JLogger.java +++ b/src/java/com/samskivert/util/Log4JLogger.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2008 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/LogProvider.java b/src/java/com/samskivert/util/LogProvider.java index 28886967..106019d9 100644 --- a/src/java/com/samskivert/util/LogProvider.java +++ b/src/java/com/samskivert/util/LogProvider.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/Logger.java b/src/java/com/samskivert/util/Logger.java index 6410616c..46b47d3f 100644 --- a/src/java/com/samskivert/util/Logger.java +++ b/src/java/com/samskivert/util/Logger.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2008 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or @@ -111,7 +111,7 @@ public abstract class Logger public abstract void error (Object message, Object... args); /** - * Format messages and arguments. For use by logger implementations. + * Format messages and arguments. For use by logger implementations. */ protected String format (Object message, Object[] args) { diff --git a/src/java/com/samskivert/util/LoggingLogProvider.java b/src/java/com/samskivert/util/LoggingLogProvider.java index 0e395ba6..c969a78f 100644 --- a/src/java/com/samskivert/util/LoggingLogProvider.java +++ b/src/java/com/samskivert/util/LoggingLogProvider.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/LoopingThread.java b/src/java/com/samskivert/util/LoopingThread.java index 08369726..2ed18461 100644 --- a/src/java/com/samskivert/util/LoopingThread.java +++ b/src/java/com/samskivert/util/LoopingThread.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/MapEntry.java b/src/java/com/samskivert/util/MapEntry.java index a73c1c72..66a618f1 100644 --- a/src/java/com/samskivert/util/MapEntry.java +++ b/src/java/com/samskivert/util/MapEntry.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/MethodFinder.java b/src/java/com/samskivert/util/MethodFinder.java index c79d4420..46782ba6 100644 --- a/src/java/com/samskivert/util/MethodFinder.java +++ b/src/java/com/samskivert/util/MethodFinder.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or @@ -82,7 +82,7 @@ public class MethodFinder * *

A null value or Void.TYPE parameterTypes matches a corresponding Object or array * reference in a constructor's formal parameter list, but not a primitive formal parameter. - * + * * @param parameterTypes array representing the number and types of parameters to look for in * the constructor's signature. A null array is treated as a zero-length array. * @@ -111,7 +111,7 @@ public class MethodFinder * *

A null value or Void.TYPE in parameterTypes will match a corresponding Object or array * reference in a method's formal parameter list, but not a primitive formal parameter. - * + * * @param methodName name of the method to search for. * @param parameterTypes array representing the number and types of parameters to look for in * the method's signature. A null array is treated as a zero-length array. @@ -237,7 +237,7 @@ public class MethodFinder if (mostSpecificMembers.size() > 1) { throw new NoSuchMethodException( - "Ambiguous request for member in " + _clazz.getName() + " matching given args" ); + "Ambiguous request for member in " + _clazz.getName() + " matching given args" ); } return mostSpecificMembers.get(0); diff --git a/src/java/com/samskivert/util/Multex.java b/src/java/com/samskivert/util/Multex.java index 1380df87..39e75f32 100644 --- a/src/java/com/samskivert/util/Multex.java +++ b/src/java/com/samskivert/util/Multex.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/ObjectUtil.java b/src/java/com/samskivert/util/ObjectUtil.java index 3b7af7c9..a53417b9 100644 --- a/src/java/com/samskivert/util/ObjectUtil.java +++ b/src/java/com/samskivert/util/ObjectUtil.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/ObserverList.java b/src/java/com/samskivert/util/ObserverList.java index e14c810d..c70fde14 100644 --- a/src/java/com/samskivert/util/ObserverList.java +++ b/src/java/com/samskivert/util/ObserverList.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or @@ -273,7 +273,7 @@ public class ObserverList extends ArrayList } // clear out the snapshot so its contents can be gc'd Arrays.fill(_snap, null); - + } else if (_policy == FAST_UNSAFE_NOTIFY) { for (int ii = ocount-1; ii >= 0; ii--) { if (!checkedApply(obop, get(ii))) { diff --git a/src/java/com/samskivert/util/OneLineLogFormatter.java b/src/java/com/samskivert/util/OneLineLogFormatter.java index 451b71b3..716b8958 100644 --- a/src/java/com/samskivert/util/OneLineLogFormatter.java +++ b/src/java/com/samskivert/util/OneLineLogFormatter.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/Predicate.java b/src/java/com/samskivert/util/Predicate.java index e15ac95b..a6f694d1 100644 --- a/src/java/com/samskivert/util/Predicate.java +++ b/src/java/com/samskivert/util/Predicate.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or @@ -77,7 +77,7 @@ public abstract class Predicate */ public static class And extends Predicate { - public And (Predicate ... preds) + public And (Predicate ... preds) { _preds = preds; } diff --git a/src/java/com/samskivert/util/PrefsConfig.java b/src/java/com/samskivert/util/PrefsConfig.java index 48adce6d..cc9a57e7 100644 --- a/src/java/com/samskivert/util/PrefsConfig.java +++ b/src/java/com/samskivert/util/PrefsConfig.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/ProcessLogger.java b/src/java/com/samskivert/util/ProcessLogger.java index 1ef8c73f..80513e3c 100644 --- a/src/java/com/samskivert/util/ProcessLogger.java +++ b/src/java/com/samskivert/util/ProcessLogger.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/Queue.java b/src/java/com/samskivert/util/Queue.java index f0d27947..c1241d8b 100644 --- a/src/java/com/samskivert/util/Queue.java +++ b/src/java/com/samskivert/util/Queue.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/QuickSort.java b/src/java/com/samskivert/util/QuickSort.java index d941d366..cfde90ec 100644 --- a/src/java/com/samskivert/util/QuickSort.java +++ b/src/java/com/samskivert/util/QuickSort.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/RandomUtil.java b/src/java/com/samskivert/util/RandomUtil.java index df1fe167..7c2321c6 100644 --- a/src/java/com/samskivert/util/RandomUtil.java +++ b/src/java/com/samskivert/util/RandomUtil.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/RecentList.java b/src/java/com/samskivert/util/RecentList.java index f6b97f4b..aaa973fd 100644 --- a/src/java/com/samskivert/util/RecentList.java +++ b/src/java/com/samskivert/util/RecentList.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/RepeatCallTracker.java b/src/java/com/samskivert/util/RepeatCallTracker.java index 138ebae7..1094793a 100644 --- a/src/java/com/samskivert/util/RepeatCallTracker.java +++ b/src/java/com/samskivert/util/RepeatCallTracker.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/RepeatRecordFilter.java b/src/java/com/samskivert/util/RepeatRecordFilter.java index d8f9333c..97a1c378 100644 --- a/src/java/com/samskivert/util/RepeatRecordFilter.java +++ b/src/java/com/samskivert/util/RepeatRecordFilter.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/ResultHandler.java b/src/java/com/samskivert/util/ResultHandler.java index f12ba0f9..821108e8 100644 --- a/src/java/com/samskivert/util/ResultHandler.java +++ b/src/java/com/samskivert/util/ResultHandler.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/ResultListener.java b/src/java/com/samskivert/util/ResultListener.java index c6b8d2db..4a194a99 100644 --- a/src/java/com/samskivert/util/ResultListener.java +++ b/src/java/com/samskivert/util/ResultListener.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/ResultListenerList.java b/src/java/com/samskivert/util/ResultListenerList.java index 09f2044e..42bc4166 100644 --- a/src/java/com/samskivert/util/ResultListenerList.java +++ b/src/java/com/samskivert/util/ResultListenerList.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/RunAnywhere.java b/src/java/com/samskivert/util/RunAnywhere.java index 45bf2186..0d6068bc 100644 --- a/src/java/com/samskivert/util/RunAnywhere.java +++ b/src/java/com/samskivert/util/RunAnywhere.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/RunQueue.java b/src/java/com/samskivert/util/RunQueue.java index 5a8d952d..dfeecd6c 100644 --- a/src/java/com/samskivert/util/RunQueue.java +++ b/src/java/com/samskivert/util/RunQueue.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/SerialExecutor.java b/src/java/com/samskivert/util/SerialExecutor.java index 5fa710ea..8ff7b92b 100644 --- a/src/java/com/samskivert/util/SerialExecutor.java +++ b/src/java/com/samskivert/util/SerialExecutor.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/ServiceUnavailableException.java b/src/java/com/samskivert/util/ServiceUnavailableException.java index 2dff322b..78b4aa76 100644 --- a/src/java/com/samskivert/util/ServiceUnavailableException.java +++ b/src/java/com/samskivert/util/ServiceUnavailableException.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/ServiceWaiter.java b/src/java/com/samskivert/util/ServiceWaiter.java index efec9572..816a7273 100644 --- a/src/java/com/samskivert/util/ServiceWaiter.java +++ b/src/java/com/samskivert/util/ServiceWaiter.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/ShortestPath.java b/src/java/com/samskivert/util/ShortestPath.java index 316455b0..1ab3184f 100644 --- a/src/java/com/samskivert/util/ShortestPath.java +++ b/src/java/com/samskivert/util/ShortestPath.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/SignalUtil.java b/src/java/com/samskivert/util/SignalUtil.java index f119cc44..4be7498b 100644 --- a/src/java/com/samskivert/util/SignalUtil.java +++ b/src/java/com/samskivert/util/SignalUtil.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/SortableArrayList.java b/src/java/com/samskivert/util/SortableArrayList.java index c1e1a6b4..9cf4b0bb 100644 --- a/src/java/com/samskivert/util/SortableArrayList.java +++ b/src/java/com/samskivert/util/SortableArrayList.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/SystemInfo.java b/src/java/com/samskivert/util/SystemInfo.java index 63fbe159..d28cfe3b 100644 --- a/src/java/com/samskivert/util/SystemInfo.java +++ b/src/java/com/samskivert/util/SystemInfo.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/TermUtil.java b/src/java/com/samskivert/util/TermUtil.java index 8547d06e..184ad769 100644 --- a/src/java/com/samskivert/util/TermUtil.java +++ b/src/java/com/samskivert/util/TermUtil.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/Throttle.java b/src/java/com/samskivert/util/Throttle.java index ba4ea915..bd571287 100644 --- a/src/java/com/samskivert/util/Throttle.java +++ b/src/java/com/samskivert/util/Throttle.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/Tuple.java b/src/java/com/samskivert/util/Tuple.java index 1a56a30e..83ea8e12 100644 --- a/src/java/com/samskivert/util/Tuple.java +++ b/src/java/com/samskivert/util/Tuple.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/ValueMarshaller.java b/src/java/com/samskivert/util/ValueMarshaller.java index eb59fddc..4f5a30b9 100644 --- a/src/java/com/samskivert/util/ValueMarshaller.java +++ b/src/java/com/samskivert/util/ValueMarshaller.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or @@ -95,7 +95,7 @@ public class ValueMarshaller return Long.valueOf(source); } }); - + // and floats _parsers.put(Float.TYPE, new Parser() { public Object parse (String source) throws Exception { diff --git a/src/java/com/samskivert/util/tests/ArrayIntSetTest.java b/src/java/com/samskivert/util/tests/ArrayIntSetTest.java index d0edbaf2..b827fd37 100644 --- a/src/java/com/samskivert/util/tests/ArrayIntSetTest.java +++ b/src/java/com/samskivert/util/tests/ArrayIntSetTest.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/tests/ArrayUtilTest.java b/src/java/com/samskivert/util/tests/ArrayUtilTest.java index 61beda22..05913a06 100644 --- a/src/java/com/samskivert/util/tests/ArrayUtilTest.java +++ b/src/java/com/samskivert/util/tests/ArrayUtilTest.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/tests/CheapIntMapTest.java b/src/java/com/samskivert/util/tests/CheapIntMapTest.java index f3c5adee..7b2703d2 100644 --- a/src/java/com/samskivert/util/tests/CheapIntMapTest.java +++ b/src/java/com/samskivert/util/tests/CheapIntMapTest.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/tests/CollectionUtilTest.java b/src/java/com/samskivert/util/tests/CollectionUtilTest.java index bf26a453..4e6566fd 100644 --- a/src/java/com/samskivert/util/tests/CollectionUtilTest.java +++ b/src/java/com/samskivert/util/tests/CollectionUtilTest.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/tests/ConfigTest.java b/src/java/com/samskivert/util/tests/ConfigTest.java index 639832b6..8ced448d 100644 --- a/src/java/com/samskivert/util/tests/ConfigTest.java +++ b/src/java/com/samskivert/util/tests/ConfigTest.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/tests/ConfigUtilTest.java b/src/java/com/samskivert/util/tests/ConfigUtilTest.java index ed745bd3..6de3e02a 100644 --- a/src/java/com/samskivert/util/tests/ConfigUtilTest.java +++ b/src/java/com/samskivert/util/tests/ConfigUtilTest.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or @@ -55,9 +55,9 @@ import com.samskivert.util.ConfigUtil; * lib/test-al.jar: * _package = testAL * _overrides = test - * + * * one = testAL - one - * + * * lib/test.jar: * _package = test * diff --git a/src/java/com/samskivert/util/tests/HashIntMapTest.java b/src/java/com/samskivert/util/tests/HashIntMapTest.java index de6f3a2a..14651c33 100644 --- a/src/java/com/samskivert/util/tests/HashIntMapTest.java +++ b/src/java/com/samskivert/util/tests/HashIntMapTest.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/tests/IntListUtilTest.java b/src/java/com/samskivert/util/tests/IntListUtilTest.java index e9093406..5dbfe664 100644 --- a/src/java/com/samskivert/util/tests/IntListUtilTest.java +++ b/src/java/com/samskivert/util/tests/IntListUtilTest.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/tests/LRUHashMapTest.java b/src/java/com/samskivert/util/tests/LRUHashMapTest.java index 5a98e6ac..1e9479f5 100644 --- a/src/java/com/samskivert/util/tests/LRUHashMapTest.java +++ b/src/java/com/samskivert/util/tests/LRUHashMapTest.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/tests/ObserverListTest.java b/src/java/com/samskivert/util/tests/ObserverListTest.java index 8467860a..881652f9 100644 --- a/src/java/com/samskivert/util/tests/ObserverListTest.java +++ b/src/java/com/samskivert/util/tests/ObserverListTest.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/tests/QuickSortTest.java b/src/java/com/samskivert/util/tests/QuickSortTest.java index bb28ef7f..5451d22f 100644 --- a/src/java/com/samskivert/util/tests/QuickSortTest.java +++ b/src/java/com/samskivert/util/tests/QuickSortTest.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/tests/SerialExecutorTest.java b/src/java/com/samskivert/util/tests/SerialExecutorTest.java index b7c4328e..d96ce1ac 100644 --- a/src/java/com/samskivert/util/tests/SerialExecutorTest.java +++ b/src/java/com/samskivert/util/tests/SerialExecutorTest.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/tests/StringUtilTest.java b/src/java/com/samskivert/util/tests/StringUtilTest.java index 3e828ed7..d34e0ff8 100644 --- a/src/java/com/samskivert/util/tests/StringUtilTest.java +++ b/src/java/com/samskivert/util/tests/StringUtilTest.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/util/tests/SystemInfoDemo.java b/src/java/com/samskivert/util/tests/SystemInfoDemo.java index 9ef32f90..2192ede7 100644 --- a/src/java/com/samskivert/util/tests/SystemInfoDemo.java +++ b/src/java/com/samskivert/util/tests/SystemInfoDemo.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/velocity/Application.java b/src/java/com/samskivert/velocity/Application.java index 262fb31b..9934bcf5 100644 --- a/src/java/com/samskivert/velocity/Application.java +++ b/src/java/com/samskivert/velocity/Application.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/velocity/CurrencyTool.java b/src/java/com/samskivert/velocity/CurrencyTool.java index 9aa1074e..97a91765 100644 --- a/src/java/com/samskivert/velocity/CurrencyTool.java +++ b/src/java/com/samskivert/velocity/CurrencyTool.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/velocity/DataTool.java b/src/java/com/samskivert/velocity/DataTool.java index 19bc196d..d8a51cc8 100644 --- a/src/java/com/samskivert/velocity/DataTool.java +++ b/src/java/com/samskivert/velocity/DataTool.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/velocity/DummyLogic.java b/src/java/com/samskivert/velocity/DummyLogic.java index 70939001..d90742d7 100644 --- a/src/java/com/samskivert/velocity/DummyLogic.java +++ b/src/java/com/samskivert/velocity/DummyLogic.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/velocity/FormTool.java b/src/java/com/samskivert/velocity/FormTool.java index 74065470..58d64a3e 100644 --- a/src/java/com/samskivert/velocity/FormTool.java +++ b/src/java/com/samskivert/velocity/FormTool.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/velocity/I18nTool.java b/src/java/com/samskivert/velocity/I18nTool.java index 50562112..51796d48 100644 --- a/src/java/com/samskivert/velocity/I18nTool.java +++ b/src/java/com/samskivert/velocity/I18nTool.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/velocity/ImportDirective.java b/src/java/com/samskivert/velocity/ImportDirective.java index f6fa6c62..b41214f3 100644 --- a/src/java/com/samskivert/velocity/ImportDirective.java +++ b/src/java/com/samskivert/velocity/ImportDirective.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or @@ -52,16 +52,16 @@ public class ImportDirective extends Directive public String getName () { return "import"; - } - + } + /** * Return type of this directive. */ public int getType () { return LINE; - } - + } + /** * Loads and renders the imported template. */ @@ -126,7 +126,7 @@ public class ImportDirective extends Directive // locate the requested template Template t = null; try { - t = rsvc.getTemplate(path, encoding); + t = rsvc.getTemplate(path, encoding); } catch (ResourceNotFoundException rnfe) { rsvc.getLog().error("#import(): cannot find template '" + path + @@ -137,7 +137,7 @@ public class ImportDirective extends Directive } catch (ParseErrorException pee) { rsvc.getLog().error("#import(): syntax error in #import()-ed template '" + path + "', called from template " + context.getCurrentTemplateName() + - " at (" + getLine() + ", " + getColumn() + ")"); + " at (" + getLine() + ", " + getColumn() + ")"); throw pee; } catch (Exception e) { @@ -150,7 +150,7 @@ public class ImportDirective extends Directive context.pushCurrentTemplateName(path); ((SimpleNode)t.getData()).render(context, writer); - } catch (Throwable th) { + } catch (Throwable th) { rsvc.getLog().error("Exception rendering #import(" + path + "): " + th); // we want to pass method invocation exceptions through if (th instanceof MethodInvocationException) { diff --git a/src/java/com/samskivert/velocity/InvocationContext.java b/src/java/com/samskivert/velocity/InvocationContext.java index 9ad5a426..d86ab689 100644 --- a/src/java/com/samskivert/velocity/InvocationContext.java +++ b/src/java/com/samskivert/velocity/InvocationContext.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/velocity/Logic.java b/src/java/com/samskivert/velocity/Logic.java index b3faac2f..3bb0cbd2 100644 --- a/src/java/com/samskivert/velocity/Logic.java +++ b/src/java/com/samskivert/velocity/Logic.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/velocity/ServletContextLogger.java b/src/java/com/samskivert/velocity/ServletContextLogger.java index 5b474ec7..7607a759 100644 --- a/src/java/com/samskivert/velocity/ServletContextLogger.java +++ b/src/java/com/samskivert/velocity/ServletContextLogger.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/velocity/ServletContextResourceLoader.java b/src/java/com/samskivert/velocity/ServletContextResourceLoader.java index cbb8bdfc..38d3caca 100644 --- a/src/java/com/samskivert/velocity/ServletContextResourceLoader.java +++ b/src/java/com/samskivert/velocity/ServletContextResourceLoader.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or @@ -98,7 +98,7 @@ public class ServletContextResourceLoader extends ResourceLoader } return stream; } - + /** * Things won't ever be modified when loaded from the servlet context * because they came from the webapp .war file and if that is diff --git a/src/java/com/samskivert/velocity/ServletContextResourceManager.java b/src/java/com/samskivert/velocity/ServletContextResourceManager.java index 86c67767..c40f2a97 100644 --- a/src/java/com/samskivert/velocity/ServletContextResourceManager.java +++ b/src/java/com/samskivert/velocity/ServletContextResourceManager.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/velocity/SiteJarResourceLoader.java b/src/java/com/samskivert/velocity/SiteJarResourceLoader.java index f669892c..1e39d4be 100644 --- a/src/java/com/samskivert/velocity/SiteJarResourceLoader.java +++ b/src/java/com/samskivert/velocity/SiteJarResourceLoader.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or @@ -89,7 +89,7 @@ public class SiteJarResourceLoader extends ResourceLoader throw new ResourceNotFoundException(ioe.getMessage()); } } - + /** * Things won't ever be modified when loaded from the servlet context * because they came from the webapp .war file and if that is reloaded, diff --git a/src/java/com/samskivert/velocity/SiteKey.java b/src/java/com/samskivert/velocity/SiteKey.java index 969d6926..40bb447c 100644 --- a/src/java/com/samskivert/velocity/SiteKey.java +++ b/src/java/com/samskivert/velocity/SiteKey.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/velocity/SiteResourceManager.java b/src/java/com/samskivert/velocity/SiteResourceManager.java index df31c3c0..d40225c5 100644 --- a/src/java/com/samskivert/velocity/SiteResourceManager.java +++ b/src/java/com/samskivert/velocity/SiteResourceManager.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/velocity/StringTool.java b/src/java/com/samskivert/velocity/StringTool.java index 4893f14c..4dc8d9a5 100644 --- a/src/java/com/samskivert/velocity/StringTool.java +++ b/src/java/com/samskivert/velocity/StringTool.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/velocity/VelocityTestCase.java b/src/java/com/samskivert/velocity/VelocityTestCase.java index c5160eef..55d9a943 100644 --- a/src/java/com/samskivert/velocity/VelocityTestCase.java +++ b/src/java/com/samskivert/velocity/VelocityTestCase.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or @@ -90,7 +90,7 @@ public abstract class VelocityTestCase extends TestCase protected void testParse (String template) throws Exception { - InputStream tempin = + InputStream tempin = getClass().getClassLoader().getResourceAsStream(template); if (tempin == null) { fail("Missing template '" + template + "'."); diff --git a/src/java/com/samskivert/velocity/VelocityUtil.java b/src/java/com/samskivert/velocity/VelocityUtil.java index 49cf862a..8a7323c6 100644 --- a/src/java/com/samskivert/velocity/VelocityUtil.java +++ b/src/java/com/samskivert/velocity/VelocityUtil.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/xml/CallMethodSpecialRule.java b/src/java/com/samskivert/xml/CallMethodSpecialRule.java index 0c0a04e9..d5de875f 100644 --- a/src/java/com/samskivert/xml/CallMethodSpecialRule.java +++ b/src/java/com/samskivert/xml/CallMethodSpecialRule.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/xml/CheckVersionRule.java b/src/java/com/samskivert/xml/CheckVersionRule.java index a7b159a3..a18aa32d 100644 --- a/src/java/com/samskivert/xml/CheckVersionRule.java +++ b/src/java/com/samskivert/xml/CheckVersionRule.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/xml/SetFieldRule.java b/src/java/com/samskivert/xml/SetFieldRule.java index 333cfb44..a2d6b5ef 100644 --- a/src/java/com/samskivert/xml/SetFieldRule.java +++ b/src/java/com/samskivert/xml/SetFieldRule.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/xml/SetNextFieldRule.java b/src/java/com/samskivert/xml/SetNextFieldRule.java index 3b360af7..2c935eb5 100644 --- a/src/java/com/samskivert/xml/SetNextFieldRule.java +++ b/src/java/com/samskivert/xml/SetNextFieldRule.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/xml/SetPropertyFieldsRule.java b/src/java/com/samskivert/xml/SetPropertyFieldsRule.java index 39fcf17c..518736b1 100644 --- a/src/java/com/samskivert/xml/SetPropertyFieldsRule.java +++ b/src/java/com/samskivert/xml/SetPropertyFieldsRule.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or @@ -104,7 +104,7 @@ public class SetPropertyFieldsRule extends Rule "Skipping property '" + lname + "' for which there is no field."); } continue; - } + } // convert the value into the appropriate object type String valstr = attrs.getValue(i); diff --git a/src/java/com/samskivert/xml/SimpleParser.java b/src/java/com/samskivert/xml/SimpleParser.java index 9dc29efd..33567d08 100644 --- a/src/java/com/samskivert/xml/SimpleParser.java +++ b/src/java/com/samskivert/xml/SimpleParser.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/xml/ValidatedSetNextRule.java b/src/java/com/samskivert/xml/ValidatedSetNextRule.java index 67b966a9..a01179e8 100644 --- a/src/java/com/samskivert/xml/ValidatedSetNextRule.java +++ b/src/java/com/samskivert/xml/ValidatedSetNextRule.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/xml/XMLUtil.java b/src/java/com/samskivert/xml/XMLUtil.java index 578af798..20fbf10a 100644 --- a/src/java/com/samskivert/xml/XMLUtil.java +++ b/src/java/com/samskivert/xml/XMLUtil.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/xml/tests/SetFieldRuleTest.java b/src/java/com/samskivert/xml/tests/SetFieldRuleTest.java index d81af54e..03ada9b3 100644 --- a/src/java/com/samskivert/xml/tests/SetFieldRuleTest.java +++ b/src/java/com/samskivert/xml/tests/SetFieldRuleTest.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or