From: <js...@us...> - 2006-11-23 17:14:30
|
Revision: 15 http://svn.sourceforge.net/jcontracts/?rev=15&view=rev Author: jstuyts Date: 2006-11-23 09:14:28 -0800 (Thu, 23 Nov 2006) Log Message: ----------- Removed JAD comments from the Java sources. Modified Paths: -------------- trunk/source/java/net/sf/jcontracts/argparser/ArgLexer.java trunk/source/java/net/sf/jcontracts/argparser/ArgParser.java trunk/source/java/net/sf/jcontracts/argparser/ArgTokenTypes.java trunk/source/java/net/sf/jcontracts/argparser/ExtendedToken.java trunk/source/java/net/sf/jcontracts/argparser/MetaclassFactory.java trunk/source/java/net/sf/jcontracts/argparser/Option.java trunk/source/java/net/sf/jcontracts/argparser/OptionMetaclass.java trunk/source/java/net/sf/jcontracts/argparser/Parser.java trunk/source/java/net/sf/jcontracts/argparser/ParserMetaclassFactory.java trunk/source/java/net/sf/jcontracts/argparser/Target.java trunk/source/java/net/sf/jcontracts/argparser/TargetMetaclass.java trunk/source/java/net/sf/jcontracts/codeparser/Class.java trunk/source/java/net/sf/jcontracts/codeparser/CodeComment.java trunk/source/java/net/sf/jcontracts/codeparser/CodeMetaclass.java trunk/source/java/net/sf/jcontracts/codeparser/CodeMetaclassCache.java trunk/source/java/net/sf/jcontracts/codeparser/DebugVisitor.java trunk/source/java/net/sf/jcontracts/codeparser/DottyVisitor.java trunk/source/java/net/sf/jcontracts/codeparser/DottyVisitorConstants.java trunk/source/java/net/sf/jcontracts/codeparser/Dotty_Component_CommonLevel.java trunk/source/java/net/sf/jcontracts/codeparser/Dotty_Component_PackageLevel.java trunk/source/java/net/sf/jcontracts/codeparser/Dotty_Component_TypeLevel.java trunk/source/java/net/sf/jcontracts/codeparser/ExtendedToken.java trunk/source/java/net/sf/jcontracts/codeparser/ICodeBody.java trunk/source/java/net/sf/jcontracts/codeparser/ICodeMetaclassVisitor.java trunk/source/java/net/sf/jcontracts/codeparser/IDependencyFilter.java trunk/source/java/net/sf/jcontracts/codeparser/IDotty_Component_Level.java trunk/source/java/net/sf/jcontracts/codeparser/Interface.java trunk/source/java/net/sf/jcontracts/codeparser/JavaLexer.java trunk/source/java/net/sf/jcontracts/codeparser/JavaParser.java trunk/source/java/net/sf/jcontracts/codeparser/JavaTokenTypes.java trunk/source/java/net/sf/jcontracts/codeparser/MetaclassFactory.java trunk/source/java/net/sf/jcontracts/codeparser/Method.java trunk/source/java/net/sf/jcontracts/codeparser/Parser.java trunk/source/java/net/sf/jcontracts/codeparser/ParserMetaclassFactory.java trunk/source/java/net/sf/jcontracts/codeparser/TypeMetaclass.java trunk/source/java/net/sf/jcontracts/codeparser/Variable.java trunk/source/java/net/sf/jcontracts/dependencyanalyzer/BooleanBlockWithNodeArg.java trunk/source/java/net/sf/jcontracts/dependencyanalyzer/DependencyAnalyzer.java trunk/source/java/net/sf/jcontracts/dependencyanalyzer/Graph.java trunk/source/java/net/sf/jcontracts/dependencyanalyzer/Node.java trunk/source/java/net/sf/jcontracts/icontract/AllFilesUpToDateException.java trunk/source/java/net/sf/jcontracts/icontract/AllOption.java trunk/source/java/net/sf/jcontracts/icontract/ArgMetaclassFactory.java trunk/source/java/net/sf/jcontracts/icontract/AssertionExpression.java trunk/source/java/net/sf/jcontracts/icontract/Class.java trunk/source/java/net/sf/jcontracts/icontract/CleanOption.java trunk/source/java/net/sf/jcontracts/icontract/CompilerOption.java trunk/source/java/net/sf/jcontracts/icontract/Constants.java trunk/source/java/net/sf/jcontracts/icontract/Darwin.java trunk/source/java/net/sf/jcontracts/icontract/DefaultExceptionOption.java trunk/source/java/net/sf/jcontracts/icontract/FileTarget.java trunk/source/java/net/sf/jcontracts/icontract/HelpOption.java trunk/source/java/net/sf/jcontracts/icontract/IContracted.java trunk/source/java/net/sf/jcontracts/icontract/Interface.java trunk/source/java/net/sf/jcontracts/icontract/Internal0Option.java trunk/source/java/net/sf/jcontracts/icontract/InvCheck.java trunk/source/java/net/sf/jcontracts/icontract/InvCheckCallOption.java trunk/source/java/net/sf/jcontracts/icontract/MergeOption.java trunk/source/java/net/sf/jcontracts/icontract/MetaclassFactory.java trunk/source/java/net/sf/jcontracts/icontract/Method.java trunk/source/java/net/sf/jcontracts/icontract/NoInitialCompilationOption.java trunk/source/java/net/sf/jcontracts/icontract/NoRepositoryCompilationOption.java trunk/source/java/net/sf/jcontracts/icontract/OneOneOption.java trunk/source/java/net/sf/jcontracts/icontract/Option.java trunk/source/java/net/sf/jcontracts/icontract/OutputOption.java trunk/source/java/net/sf/jcontracts/icontract/ParameterOption.java trunk/source/java/net/sf/jcontracts/icontract/PrePostCheck.java trunk/source/java/net/sf/jcontracts/icontract/ProcessingOption.java trunk/source/java/net/sf/jcontracts/icontract/QuietOption.java trunk/source/java/net/sf/jcontracts/icontract/Repository.java trunk/source/java/net/sf/jcontracts/icontract/RepositoryOutputOption.java trunk/source/java/net/sf/jcontracts/icontract/SourceCompilerOption.java trunk/source/java/net/sf/jcontracts/icontract/SystemInTarget.java trunk/source/java/net/sf/jcontracts/icontract/Target.java trunk/source/java/net/sf/jcontracts/icontract/Tool.java trunk/source/java/net/sf/jcontracts/icontract/UnableToDetermineTypeException.java trunk/source/java/net/sf/jcontracts/icontract/Variable.java trunk/source/java/net/sf/jcontracts/icontract/VerboseOption.java trunk/source/java/net/sf/jcontracts/icontract/WrapExceptionOption.java trunk/source/java/net/sf/jcontracts/icontract/XOption.java trunk/source/java/net/sf/jcontracts/icontract/instruction/DeclareReturnValueHolder.java trunk/source/java/net/sf/jcontracts/icontract/instruction/Instruction.java trunk/source/java/net/sf/jcontracts/icontract/instruction/InstructionBase.java trunk/source/java/net/sf/jcontracts/icontract/side/MethodFront.java trunk/source/java/net/sf/jcontracts/icontract/side/Side.java trunk/source/java/net/sf/jcontracts/icontract/side/SideBase.java trunk/source/java/net/sf/jcontracts/icontract/side/SideFactory.java trunk/source/java/net/sf/jcontracts/icontract/util/Array.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/ArchitectureSpecification.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/ArchitectureSpecificationFilter.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/CompositePattern.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/Dependency.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/DependencyConstraint.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/DependencyConstraintExporter.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/DifferencePattern.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/Group.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/Idiom.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/IdiomFactory.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/IsolateIdiom.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/LanguageFactory.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/LayerIdiom.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PSpecLexer.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PSpecParser.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PSpecTokenTypes.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/Pattern.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PatternFactory.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PatternSyntaxException.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/SetPattern.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/SingleDependencyConstraint.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/SingularPattern.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/StrictlyLayerIdiom.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/xml/XMLRuleLanguage.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/xml/XMLRuleLanguageSpecification.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/with_rules/IArchitectureSpecification.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/with_rules/IRule.java trunk/source/java/net/sf/jcontracts/idarwin/specification/openapi/IArchitectureExporter.java trunk/source/java/net/sf/jcontracts/idarwin/specification/openapi/IArchitectureSpecification.java trunk/source/java/net/sf/jcontracts/idarwin/specification/openapi/IArchitectureSpecificationFilter.java trunk/source/java/net/sf/jcontracts/idarwin/specification/openapi/IDependency.java trunk/source/java/net/sf/jcontracts/idarwin/specification/openapi/ILanguageFactory.java trunk/source/java/net/sf/jcontracts/idarwin/specification/openapi/IllFormedSpecificationException.java trunk/source/java/net/sf/jcontracts/idarwin/specification/openapi/RunData.java trunk/source/java/net/sf/jcontracts/util/JavaEvaluator.java trunk/source/java/net/sf/jcontracts/util/StringComparator.java Modified: trunk/source/java/net/sf/jcontracts/argparser/ArgLexer.java =================================================================== --- trunk/source/java/net/sf/jcontracts/argparser/ArgLexer.java 2006-11-23 12:54:51 UTC (rev 14) +++ trunk/source/java/net/sf/jcontracts/argparser/ArgLexer.java 2006-11-23 17:14:28 UTC (rev 15) @@ -1,8 +1,3 @@ -// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://www.kpdus.com/jad.html -// Decompiler options: packimports(3) braces fieldsfirst nonlb space -// Source File Name: ArgLexer.java - package net.sf.jcontracts.argparser; import antlr.*; @@ -10,9 +5,6 @@ import java.io.InputStream; import java.util.Hashtable; -// Referenced classes of package net.sf.jcontracts.argParser: -// ArgTokenTypes, ExtendedToken - public class ArgLexer extends CharScannerNoBacktrackingNoInteractive implements ArgTokenTypes, Tokenizer { Modified: trunk/source/java/net/sf/jcontracts/argparser/ArgParser.java =================================================================== --- trunk/source/java/net/sf/jcontracts/argparser/ArgParser.java 2006-11-23 12:54:51 UTC (rev 14) +++ trunk/source/java/net/sf/jcontracts/argparser/ArgParser.java 2006-11-23 17:14:28 UTC (rev 15) @@ -1,8 +1,3 @@ -// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://www.kpdus.com/jad.html -// Decompiler options: packimports(3) braces fieldsfirst nonlb space -// Source File Name: ArgParser.java - package net.sf.jcontracts.argparser; import antlr.*; @@ -10,10 +5,6 @@ import java.io.PrintStream; import java.util.Vector; -// Referenced classes of package net.sf.jcontracts.argParser: -// ArgTokenTypes, MetaclassFactory, ArgLexer, ExtendedToken, -// ParserMetaclassFactory, OptionMetaclass, TargetMetaclass - public class ArgParser extends LLkParserNoInteractive implements ArgTokenTypes { Modified: trunk/source/java/net/sf/jcontracts/argparser/ArgTokenTypes.java =================================================================== --- trunk/source/java/net/sf/jcontracts/argparser/ArgTokenTypes.java 2006-11-23 12:54:51 UTC (rev 14) +++ trunk/source/java/net/sf/jcontracts/argparser/ArgTokenTypes.java 2006-11-23 17:14:28 UTC (rev 15) @@ -1,8 +1,3 @@ -// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://www.kpdus.com/jad.html -// Decompiler options: packimports(3) braces fieldsfirst nonlb space -// Source File Name: ArgTokenTypes.java - package net.sf.jcontracts.argparser; Modified: trunk/source/java/net/sf/jcontracts/argparser/ExtendedToken.java =================================================================== --- trunk/source/java/net/sf/jcontracts/argparser/ExtendedToken.java 2006-11-23 12:54:51 UTC (rev 14) +++ trunk/source/java/net/sf/jcontracts/argparser/ExtendedToken.java 2006-11-23 17:14:28 UTC (rev 15) @@ -1,8 +1,3 @@ -// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://www.kpdus.com/jad.html -// Decompiler options: packimports(3) braces fieldsfirst nonlb space -// Source File Name: ExtendedToken.java - package net.sf.jcontracts.argparser; import antlr.CommonToken; Modified: trunk/source/java/net/sf/jcontracts/argparser/MetaclassFactory.java =================================================================== --- trunk/source/java/net/sf/jcontracts/argparser/MetaclassFactory.java 2006-11-23 12:54:51 UTC (rev 14) +++ trunk/source/java/net/sf/jcontracts/argparser/MetaclassFactory.java 2006-11-23 17:14:28 UTC (rev 15) @@ -1,16 +1,7 @@ -// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://www.kpdus.com/jad.html -// Decompiler options: packimports(3) braces fieldsfirst nonlb space -// Source File Name: MetaclassFactory.java - package net.sf.jcontracts.argparser; import java.util.Vector; -// Referenced classes of package net.sf.jcontracts.argParser: -// ParserMetaclassFactory, Option, Target, OptionMetaclass, -// TargetMetaclass - public class MetaclassFactory implements ParserMetaclassFactory { Modified: trunk/source/java/net/sf/jcontracts/argparser/Option.java =================================================================== --- trunk/source/java/net/sf/jcontracts/argparser/Option.java 2006-11-23 12:54:51 UTC (rev 14) +++ trunk/source/java/net/sf/jcontracts/argparser/Option.java 2006-11-23 17:14:28 UTC (rev 15) @@ -1,15 +1,7 @@ -// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://www.kpdus.com/jad.html -// Decompiler options: packimports(3) braces fieldsfirst nonlb space -// Source File Name: Option.java - package net.sf.jcontracts.argparser; import java.util.Vector; -// Referenced classes of package net.sf.jcontracts.argParser: -// OptionMetaclass - public class Option extends OptionMetaclass { public Option(String name, Vector arguments) { Modified: trunk/source/java/net/sf/jcontracts/argparser/OptionMetaclass.java =================================================================== --- trunk/source/java/net/sf/jcontracts/argparser/OptionMetaclass.java 2006-11-23 12:54:51 UTC (rev 14) +++ trunk/source/java/net/sf/jcontracts/argparser/OptionMetaclass.java 2006-11-23 17:14:28 UTC (rev 15) @@ -1,8 +1,3 @@ -// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://www.kpdus.com/jad.html -// Decompiler options: packimports(3) braces fieldsfirst nonlb space -// Source File Name: OptionMetaclass.java - package net.sf.jcontracts.argparser; import java.util.Vector; Modified: trunk/source/java/net/sf/jcontracts/argparser/Parser.java =================================================================== --- trunk/source/java/net/sf/jcontracts/argparser/Parser.java 2006-11-23 12:54:51 UTC (rev 14) +++ trunk/source/java/net/sf/jcontracts/argparser/Parser.java 2006-11-23 17:14:28 UTC (rev 15) @@ -1,8 +1,3 @@ -// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://www.kpdus.com/jad.html -// Decompiler options: packimports(3) braces fieldsfirst nonlb space -// Source File Name: Parser.java - package net.sf.jcontracts.argparser; import antlr.CharScanner; @@ -10,9 +5,6 @@ import java.io.StringBufferInputStream; import java.util.Vector; -// Referenced classes of package net.sf.jcontracts.argParser: -// ArgLexer, ArgParser, ParserMetaclassFactory - public class Parser { private ArgParser _argparser; Modified: trunk/source/java/net/sf/jcontracts/argparser/ParserMetaclassFactory.java =================================================================== --- trunk/source/java/net/sf/jcontracts/argparser/ParserMetaclassFactory.java 2006-11-23 12:54:51 UTC (rev 14) +++ trunk/source/java/net/sf/jcontracts/argparser/ParserMetaclassFactory.java 2006-11-23 17:14:28 UTC (rev 15) @@ -1,15 +1,7 @@ -// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://www.kpdus.com/jad.html -// Decompiler options: packimports(3) braces fieldsfirst nonlb space -// Source File Name: ParserMetaclassFactory.java - package net.sf.jcontracts.argparser; import java.util.Vector; -// Referenced classes of package net.sf.jcontracts.argParser: -// OptionMetaclass, TargetMetaclass - public interface ParserMetaclassFactory { public abstract OptionMetaclass newOption(String s, Vector vector); Modified: trunk/source/java/net/sf/jcontracts/argparser/Target.java =================================================================== --- trunk/source/java/net/sf/jcontracts/argparser/Target.java 2006-11-23 12:54:51 UTC (rev 14) +++ trunk/source/java/net/sf/jcontracts/argparser/Target.java 2006-11-23 17:14:28 UTC (rev 15) @@ -1,14 +1,6 @@ -// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://www.kpdus.com/jad.html -// Decompiler options: packimports(3) braces fieldsfirst nonlb space -// Source File Name: Target.java - package net.sf.jcontracts.argparser; -// Referenced classes of package net.sf.jcontracts.argParser: -// TargetMetaclass - public class Target extends TargetMetaclass { public Target(String name) { Modified: trunk/source/java/net/sf/jcontracts/argparser/TargetMetaclass.java =================================================================== --- trunk/source/java/net/sf/jcontracts/argparser/TargetMetaclass.java 2006-11-23 12:54:51 UTC (rev 14) +++ trunk/source/java/net/sf/jcontracts/argparser/TargetMetaclass.java 2006-11-23 17:14:28 UTC (rev 15) @@ -1,8 +1,3 @@ -// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://www.kpdus.com/jad.html -// Decompiler options: packimports(3) braces fieldsfirst nonlb space -// Source File Name: TargetMetaclass.java - package net.sf.jcontracts.argparser; Modified: trunk/source/java/net/sf/jcontracts/codeparser/Class.java =================================================================== --- trunk/source/java/net/sf/jcontracts/codeparser/Class.java 2006-11-23 12:54:51 UTC (rev 14) +++ trunk/source/java/net/sf/jcontracts/codeparser/Class.java 2006-11-23 17:14:28 UTC (rev 15) @@ -1,16 +1,8 @@ -// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://www.kpdus.com/jad.html -// Decompiler options: packimports(3) braces fieldsfirst nonlb space -// Source File Name: Class.java - package net.sf.jcontracts.codeparser; import java.util.Enumeration; import java.util.Vector; -// Referenced classes of package net.sf.jcontracts.codeParser: -// TypeMetaclass, CodeMetaclass - public class Class extends TypeMetaclass { public Class(String name, String filename, int line_number) { Modified: trunk/source/java/net/sf/jcontracts/codeparser/CodeComment.java =================================================================== --- trunk/source/java/net/sf/jcontracts/codeparser/CodeComment.java 2006-11-23 12:54:51 UTC (rev 14) +++ trunk/source/java/net/sf/jcontracts/codeparser/CodeComment.java 2006-11-23 17:14:28 UTC (rev 15) @@ -1,8 +1,3 @@ -// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://www.kpdus.com/jad.html -// Decompiler options: packimports(3) braces fieldsfirst nonlb space -// Source File Name: CodeComment.java - package net.sf.jcontracts.codeparser; import java.io.Serializable; Modified: trunk/source/java/net/sf/jcontracts/codeparser/CodeMetaclass.java =================================================================== --- trunk/source/java/net/sf/jcontracts/codeparser/CodeMetaclass.java 2006-11-23 12:54:51 UTC (rev 14) +++ trunk/source/java/net/sf/jcontracts/codeparser/CodeMetaclass.java 2006-11-23 17:14:28 UTC (rev 15) @@ -1,16 +1,8 @@ -// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://www.kpdus.com/jad.html -// Decompiler options: packimports(3) braces fieldsfirst nonlb space -// Source File Name: CodeMetaclass.java - package net.sf.jcontracts.codeparser; import java.io.Serializable; import java.util.Vector; -// Referenced classes of package net.sf.jcontracts.codeParser: -// CodeComment, ICodeMetaclassVisitor - public abstract class CodeMetaclass implements Serializable { class Name Modified: trunk/source/java/net/sf/jcontracts/codeparser/CodeMetaclassCache.java =================================================================== --- trunk/source/java/net/sf/jcontracts/codeparser/CodeMetaclassCache.java 2006-11-23 12:54:51 UTC (rev 14) +++ trunk/source/java/net/sf/jcontracts/codeparser/CodeMetaclassCache.java 2006-11-23 17:14:28 UTC (rev 15) @@ -1,8 +1,3 @@ -// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://www.kpdus.com/jad.html -// Decompiler options: packimports(3) braces fieldsfirst nonlb space -// Source File Name: CodeMetaclassCache.java - package net.sf.jcontracts.codeparser; import antlr.ParserException; @@ -10,9 +5,6 @@ import java.util.Enumeration; import java.util.Vector; -// Referenced classes of package net.sf.jcontracts.codeParser: -// Parser, MetaclassFactory - public class CodeMetaclassCache { private static final String base; Modified: trunk/source/java/net/sf/jcontracts/codeparser/DebugVisitor.java =================================================================== --- trunk/source/java/net/sf/jcontracts/codeparser/DebugVisitor.java 2006-11-23 12:54:51 UTC (rev 14) +++ trunk/source/java/net/sf/jcontracts/codeparser/DebugVisitor.java 2006-11-23 17:14:28 UTC (rev 15) @@ -1,15 +1,7 @@ -// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://www.kpdus.com/jad.html -// Decompiler options: packimports(3) braces fieldsfirst nonlb space -// Source File Name: DebugVisitor.java - package net.sf.jcontracts.codeparser; import java.io.PrintStream; -// Referenced classes of package net.sf.jcontracts.codeParser: -// ICodeMetaclassVisitor, CodeMetaclass - public class DebugVisitor implements ICodeMetaclassVisitor { Modified: trunk/source/java/net/sf/jcontracts/codeparser/DottyVisitor.java =================================================================== --- trunk/source/java/net/sf/jcontracts/codeparser/DottyVisitor.java 2006-11-23 12:54:51 UTC (rev 14) +++ trunk/source/java/net/sf/jcontracts/codeparser/DottyVisitor.java 2006-11-23 17:14:28 UTC (rev 15) @@ -1,8 +1,3 @@ -// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://www.kpdus.com/jad.html -// Decompiler options: packimports(3) braces fieldsfirst nonlb space -// Source File Name: DottyVisitor.java - package net.sf.jcontracts.codeparser; import java.io.*; @@ -11,10 +6,6 @@ import net.sf.jcontracts.idarwin.specification.openapi.IArchitectureExporter; import net.sf.jcontracts.idarwin.specification.openapi.IArchitectureSpecification; -// Referenced classes of package net.sf.jcontracts.codeParser: -// ICodeMetaclassVisitor, Dotty_Component_TypeLevel, Dotty_Component_PackageLevel, IDependencyFilter, -// IDotty_Component_Level, DottyVisitorConstants, CodeMetaclass - public class DottyVisitor implements ICodeMetaclassVisitor { Modified: trunk/source/java/net/sf/jcontracts/codeparser/DottyVisitorConstants.java =================================================================== --- trunk/source/java/net/sf/jcontracts/codeparser/DottyVisitorConstants.java 2006-11-23 12:54:51 UTC (rev 14) +++ trunk/source/java/net/sf/jcontracts/codeparser/DottyVisitorConstants.java 2006-11-23 17:14:28 UTC (rev 15) @@ -1,8 +1,3 @@ -// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://www.kpdus.com/jad.html -// Decompiler options: packimports(3) braces fieldsfirst nonlb space -// Source File Name: DottyVisitorConstants.java - package net.sf.jcontracts.codeparser; Modified: trunk/source/java/net/sf/jcontracts/codeparser/Dotty_Component_CommonLevel.java =================================================================== --- trunk/source/java/net/sf/jcontracts/codeparser/Dotty_Component_CommonLevel.java 2006-11-23 12:54:51 UTC (rev 14) +++ trunk/source/java/net/sf/jcontracts/codeparser/Dotty_Component_CommonLevel.java 2006-11-23 17:14:28 UTC (rev 15) @@ -1,8 +1,3 @@ -// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://www.kpdus.com/jad.html -// Decompiler options: packimports(3) braces fieldsfirst nonlb space -// Source File Name: Dotty_Component_CommonLevel.java - package net.sf.jcontracts.codeparser; import java.io.PrintStream; @@ -12,9 +7,6 @@ import net.sf.jcontracts.icontract.QuietOption; import net.sf.jcontracts.idarwin.specification.openapi.IArchitectureSpecification; -// Referenced classes of package net.sf.jcontracts.codeParser: -// IDependencyFilter, DottyVisitorConstants, CodeMetaclass, Class - public class Dotty_Component_CommonLevel { protected Vector previouslyCheckedlinks; Modified: trunk/source/java/net/sf/jcontracts/codeparser/Dotty_Component_PackageLevel.java =================================================================== --- trunk/source/java/net/sf/jcontracts/codeparser/Dotty_Component_PackageLevel.java 2006-11-23 12:54:51 UTC (rev 14) +++ trunk/source/java/net/sf/jcontracts/codeparser/Dotty_Component_PackageLevel.java 2006-11-23 17:14:28 UTC (rev 15) @@ -1,8 +1,3 @@ -// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://www.kpdus.com/jad.html -// Decompiler options: packimports(3) braces fieldsfirst nonlb space -// Source File Name: Dotty_Component_PackageLevel.java - package net.sf.jcontracts.codeparser; import java.io.PrintStream; @@ -12,11 +7,6 @@ import net.sf.jcontracts.idarwin.specification.openapi.IArchitectureSpecification; -// Referenced classes of package net.sf.jcontracts.codeParser: -// Dotty_Component_CommonLevel, IDotty_Component_Level, Method, CodeMetaclass, -// TypeMetaclass, ICodeBody, Variable, DottyVisitorConstants, -// IDependencyFilter - public class Dotty_Component_PackageLevel extends Dotty_Component_CommonLevel implements IDotty_Component_Level { Modified: trunk/source/java/net/sf/jcontracts/codeparser/Dotty_Component_TypeLevel.java =================================================================== --- trunk/source/java/net/sf/jcontracts/codeparser/Dotty_Component_TypeLevel.java 2006-11-23 12:54:51 UTC (rev 14) +++ trunk/source/java/net/sf/jcontracts/codeparser/Dotty_Component_TypeLevel.java 2006-11-23 17:14:28 UTC (rev 15) @@ -1,8 +1,3 @@ -// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://www.kpdus.com/jad.html -// Decompiler options: packimports(3) braces fieldsfirst nonlb space -// Source File Name: Dotty_Component_TypeLevel.java - package net.sf.jcontracts.codeparser; import java.io.PrintStream; @@ -12,11 +7,6 @@ import net.sf.jcontracts.idarwin.specification.openapi.IArchitectureSpecification; -// Referenced classes of package net.sf.jcontracts.codeParser: -// Dotty_Component_CommonLevel, IDotty_Component_Level, DottyVisitorConstants, Method, -// CodeMetaclass, TypeMetaclass, ICodeBody, Variable, -// IDependencyFilter - public class Dotty_Component_TypeLevel extends Dotty_Component_CommonLevel implements IDotty_Component_Level { Modified: trunk/source/java/net/sf/jcontracts/codeparser/ExtendedToken.java =================================================================== --- trunk/source/java/net/sf/jcontracts/codeparser/ExtendedToken.java 2006-11-23 12:54:51 UTC (rev 14) +++ trunk/source/java/net/sf/jcontracts/codeparser/ExtendedToken.java 2006-11-23 17:14:28 UTC (rev 15) @@ -1,8 +1,3 @@ -// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://www.kpdus.com/jad.html -// Decompiler options: packimports(3) braces fieldsfirst nonlb space -// Source File Name: ExtendedToken.java - package net.sf.jcontracts.codeparser; import antlr.CommonToken; Modified: trunk/source/java/net/sf/jcontracts/codeparser/ICodeBody.java =================================================================== --- trunk/source/java/net/sf/jcontracts/codeparser/ICodeBody.java 2006-11-23 12:54:51 UTC (rev 14) +++ trunk/source/java/net/sf/jcontracts/codeparser/ICodeBody.java 2006-11-23 17:14:28 UTC (rev 15) @@ -1,8 +1,3 @@ -// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://www.kpdus.com/jad.html -// Decompiler options: packimports(3) braces fieldsfirst nonlb space -// Source File Name: ICodeBody.java - package net.sf.jcontracts.codeparser; import java.util.Vector; Modified: trunk/source/java/net/sf/jcontracts/codeparser/ICodeMetaclassVisitor.java =================================================================== --- trunk/source/java/net/sf/jcontracts/codeparser/ICodeMetaclassVisitor.java 2006-11-23 12:54:51 UTC (rev 14) +++ trunk/source/java/net/sf/jcontracts/codeparser/ICodeMetaclassVisitor.java 2006-11-23 17:14:28 UTC (rev 15) @@ -1,14 +1,6 @@ -// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://www.kpdus.com/jad.html -// Decompiler options: packimports(3) braces fieldsfirst nonlb space -// Source File Name: ICodeMetaclassVisitor.java - package net.sf.jcontracts.codeparser; -// Referenced classes of package net.sf.jcontracts.codeParser: -// CodeMetaclass - public interface ICodeMetaclassVisitor { public abstract void accept(CodeMetaclass codemetaclass); Modified: trunk/source/java/net/sf/jcontracts/codeparser/IDependencyFilter.java =================================================================== --- trunk/source/java/net/sf/jcontracts/codeparser/IDependencyFilter.java 2006-11-23 12:54:51 UTC (rev 14) +++ trunk/source/java/net/sf/jcontracts/codeparser/IDependencyFilter.java 2006-11-23 17:14:28 UTC (rev 15) @@ -1,8 +1,3 @@ -// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://www.kpdus.com/jad.html -// Decompiler options: packimports(3) braces fieldsfirst nonlb space -// Source File Name: IDependencyFilter.java - package net.sf.jcontracts.codeparser; import java.io.IOException; @@ -10,9 +5,6 @@ import net.sf.jcontracts.idarwin.specification.openapi.IArchitectureSpecification; -// Referenced classes of package net.sf.jcontracts.codeParser: -// CodeMetaclass - public interface IDependencyFilter { public abstract void addDependency(String s, String s1, int i, PrintWriter printwriter, boolean flag, String s2, IArchitectureSpecification iarchitecturespecification, Modified: trunk/source/java/net/sf/jcontracts/codeparser/IDotty_Component_Level.java =================================================================== --- trunk/source/java/net/sf/jcontracts/codeparser/IDotty_Component_Level.java 2006-11-23 12:54:51 UTC (rev 14) +++ trunk/source/java/net/sf/jcontracts/codeparser/IDotty_Component_Level.java 2006-11-23 17:14:28 UTC (rev 15) @@ -1,8 +1,3 @@ -// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://www.kpdus.com/jad.html -// Decompiler options: packimports(3) braces fieldsfirst nonlb space -// Source File Name: IDotty_Component_Level.java - package net.sf.jcontracts.codeparser; import java.io.PrintWriter; @@ -10,9 +5,6 @@ import net.sf.jcontracts.idarwin.specification.openapi.IArchitectureSpecification; -// Referenced classes of package net.sf.jcontracts.codeParser: -// CodeMetaclass - public interface IDotty_Component_Level { public abstract void acceptMethod(CodeMetaclass codemetaclass, PrintWriter printwriter, boolean flag, IArchitectureSpecification iarchitecturespecification, boolean flag1); Modified: trunk/source/java/net/sf/jcontracts/codeparser/Interface.java =================================================================== --- trunk/source/java/net/sf/jcontracts/codeparser/Interface.java 2006-11-23 12:54:51 UTC (rev 14) +++ trunk/source/java/net/sf/jcontracts/codeparser/Interface.java 2006-11-23 17:14:28 UTC (rev 15) @@ -1,15 +1,7 @@ -// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://www.kpdus.com/jad.html -// Decompiler options: packimports(3) braces fieldsfirst nonlb space -// Source File Name: Interface.java - package net.sf.jcontracts.codeparser; import java.util.Vector; -// Referenced classes of package net.sf.jcontracts.codeParser: -// TypeMetaclass, CodeMetaclass - public class Interface extends TypeMetaclass { public Interface(String name, String filename, int line_number) { Modified: trunk/source/java/net/sf/jcontracts/codeparser/JavaLexer.java =================================================================== --- trunk/source/java/net/sf/jcontracts/codeparser/JavaLexer.java 2006-11-23 12:54:51 UTC (rev 14) +++ trunk/source/java/net/sf/jcontracts/codeparser/JavaLexer.java 2006-11-23 17:14:28 UTC (rev 15) @@ -1,8 +1,3 @@ -// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://www.kpdus.com/jad.html -// Decompiler options: packimports(3) braces fieldsfirst nonlb space -// Source File Name: JavaLexer.java - package net.sf.jcontracts.codeparser; import antlr.*; @@ -10,9 +5,6 @@ import java.io.InputStream; import java.util.Hashtable; -// Referenced classes of package net.sf.jcontracts.codeParser: -// JavaTokenTypes, ExtendedToken, CodeComment - public class JavaLexer extends CharScannerNoBacktrackingNoInteractive implements JavaTokenTypes, Tokenizer { Modified: trunk/source/java/net/sf/jcontracts/codeparser/JavaParser.java =================================================================== --- trunk/source/java/net/sf/jcontracts/codeparser/JavaParser.java 2006-11-23 12:54:51 UTC (rev 14) +++ trunk/source/java/net/sf/jcontracts/codeparser/JavaParser.java 2006-11-23 17:14:28 UTC (rev 15) @@ -1,8 +1,3 @@ -// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://www.kpdus.com/jad.html -// Decompiler options: packimports(3) braces fieldsfirst nonlb space -// Source File Name: JavaParser.java - package net.sf.jcontracts.codeparser; import antlr.*; @@ -12,12 +7,6 @@ import net.sf.jcontracts.dependencyanalyzer.Node; -// Referenced classes of package net.sf.jcontracts.codeParser: -// JavaTokenTypes, ICodeBody, CodeMetaclass, ParserMetaclassFactory, -// TypeMetaclass, ExtendedToken, CodeComment, Method, -// Variable, JavaLexer, MetaclassFactory, DebugVisitor, -// Class, Interface - public class JavaParser extends LLkParserNoInteractive implements JavaTokenTypes { Modified: trunk/source/java/net/sf/jcontracts/codeparser/JavaTokenTypes.java =================================================================== --- trunk/source/java/net/sf/jcontracts/codeparser/JavaTokenTypes.java 2006-11-23 12:54:51 UTC (rev 14) +++ trunk/source/java/net/sf/jcontracts/codeparser/JavaTokenTypes.java 2006-11-23 17:14:28 UTC (rev 15) @@ -1,8 +1,3 @@ -// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://www.kpdus.com/jad.html -// Decompiler options: packimports(3) braces fieldsfirst nonlb space -// Source File Name: JavaTokenTypes.java - package net.sf.jcontracts.codeparser; Modified: trunk/source/java/net/sf/jcontracts/codeparser/MetaclassFactory.java =================================================================== --- trunk/source/java/net/sf/jcontracts/codeparser/MetaclassFactory.java 2006-11-23 12:54:51 UTC (rev 14) +++ trunk/source/java/net/sf/jcontracts/codeparser/MetaclassFactory.java 2006-11-23 17:14:28 UTC (rev 15) @@ -1,16 +1,7 @@ -// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://www.kpdus.com/jad.html -// Decompiler options: packimports(3) braces fieldsfirst nonlb space -// Source File Name: MetaclassFactory.java - package net.sf.jcontracts.codeparser; import java.util.Vector; -// Referenced classes of package net.sf.jcontracts.codeParser: -// ParserMetaclassFactory, Class, CodeMetaclass, Interface, -// Method, Variable - public class MetaclassFactory implements ParserMetaclassFactory { Modified: trunk/source/java/net/sf/jcontracts/codeparser/Method.java =================================================================== --- trunk/source/java/net/sf/jcontracts/codeparser/Method.java 2006-11-23 12:54:51 UTC (rev 14) +++ trunk/source/java/net/sf/jcontracts/codeparser/Method.java 2006-11-23 17:14:28 UTC (rev 15) @@ -1,15 +1,7 @@ -// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://www.kpdus.com/jad.html -// Decompiler options: packimports(3) braces fieldsfirst nonlb space -// Source File Name: Method.java - package net.sf.jcontracts.codeparser; import java.util.Vector; -// Referenced classes of package net.sf.jcontracts.codeParser: -// CodeMetaclass, ICodeBody, ICodeMetaclassVisitor, TypeMetaclass - public class Method extends CodeMetaclass implements ICodeBody { Modified: trunk/source/java/net/sf/jcontracts/codeparser/Parser.java =================================================================== --- trunk/source/java/net/sf/jcontracts/codeparser/Parser.java 2006-11-23 12:54:51 UTC (rev 14) +++ trunk/source/java/net/sf/jcontracts/codeparser/Parser.java 2006-11-23 17:14:28 UTC (rev 15) @@ -1,8 +1,3 @@ -// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://www.kpdus.com/jad.html -// Decompiler options: packimports(3) braces fieldsfirst nonlb space -// Source File Name: Parser.java - package net.sf.jcontracts.codeparser; import antlr.CharScanner; @@ -11,9 +6,6 @@ import java.util.Hashtable; import java.util.Vector; -// Referenced classes of package net.sf.jcontracts.codeParser: -// JavaLexer, JavaParser, ParserMetaclassFactory - public class Parser { private JavaParser _javaparser; Modified: trunk/source/java/net/sf/jcontracts/codeparser/ParserMetaclassFactory.java =================================================================== --- trunk/source/java/net/sf/jcontracts/codeparser/ParserMetaclassFactory.java 2006-11-23 12:54:51 UTC (rev 14) +++ trunk/source/java/net/sf/jcontracts/codeparser/ParserMetaclassFactory.java 2006-11-23 17:14:28 UTC (rev 15) @@ -1,15 +1,7 @@ -// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://www.kpdus.com/jad.html -// Decompiler options: packimports(3) braces fieldsfirst nonlb space -// Source File Name: ParserMetaclassFactory.java - package net.sf.jcontracts.codeparser; import java.util.Vector; -// Referenced classes of package net.sf.jcontracts.codeParser: -// Class, Interface, Method, Variable - public interface ParserMetaclassFactory { public abstract String getPackage(); Modified: trunk/source/java/net/sf/jcontracts/codeparser/TypeMetaclass.java =================================================================== --- trunk/source/java/net/sf/jcontracts/codeparser/TypeMetaclass.java 2006-11-23 12:54:51 UTC (rev 14) +++ trunk/source/java/net/sf/jcontracts/codeparser/TypeMetaclass.java 2006-11-23 17:14:28 UTC (rev 15) @@ -1,15 +1,7 @@ -// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://www.kpdus.com/jad.html -// Decompiler options: packimports(3) braces fieldsfirst nonlb space -// Source File Name: TypeMetaclass.java - package net.sf.jcontracts.codeparser; import java.util.Vector; -// Referenced classes of package net.sf.jcontracts.codeParser: -// CodeMetaclass, ICodeBody, ICodeMetaclassVisitor, Method - public abstract class TypeMetaclass extends CodeMetaclass implements ICodeBody { Modified: trunk/source/java/net/sf/jcontracts/codeparser/Variable.java =================================================================== --- trunk/source/java/net/sf/jcontracts/codeparser/Variable.java 2006-11-23 12:54:51 UTC (rev 14) +++ trunk/source/java/net/sf/jcontracts/codeparser/Variable.java 2006-11-23 17:14:28 UTC (rev 15) @@ -1,15 +1,7 @@ -// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://www.kpdus.com/jad.html -// Decompiler options: packimports(3) braces fieldsfirst nonlb space -// Source File Name: Variable.java - package net.sf.jcontracts.codeparser; import java.util.Vector; -// Referenced classes of package net.sf.jcontracts.codeParser: -// CodeMetaclass, ICodeMetaclassVisitor - public class Variable extends CodeMetaclass { private String _type; Modified: trunk/source/java/net/sf/jcontracts/dependencyanalyzer/BooleanBlockWithNodeArg.java =================================================================== --- trunk/source/java/net/sf/jcontracts/dependencyanalyzer/BooleanBlockWithNodeArg.java 2006-11-23 12:54:51 UTC (rev 14) +++ trunk/source/java/net/sf/jcontracts/dependencyanalyzer/BooleanBlockWithNodeArg.java 2006-11-23 17:14:28 UTC (rev 15) @@ -1,14 +1,6 @@ -// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://www.kpdus.com/jad.html -// Decompiler options: packimports(3) braces fieldsfirst nonlb space -// Source File Name: BooleanBlockWithNodeArg.java - package net.sf.jcontracts.dependencyanalyzer; -// Referenced classes of package net.sf.jcontracts.dependencyAnalyzer: -// Node - public interface BooleanBlockWithNodeArg { public abstract boolean eval(Node node); Modified: trunk/source/java/net/sf/jcontracts/dependencyanalyzer/DependencyAnalyzer.java =================================================================== --- trunk/source/java/net/sf/jcontracts/dependencyanalyzer/DependencyAnalyzer.java 2006-11-23 12:54:51 UTC (rev 14) +++ trunk/source/java/net/sf/jcontracts/dependencyanalyzer/DependencyAnalyzer.java 2006-11-23 17:14:28 UTC (rev 15) @@ -1,16 +1,8 @@ -// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://www.kpdus.com/jad.html -// Decompiler options: packimports(3) braces fieldsfirst nonlb space -// Source File Name: DependencyAnalyzer.java - package net.sf.jcontracts.dependencyanalyzer; import java.util.Enumeration; import java.util.Vector; -// Referenced classes of package net.sf.jcontracts.dependencyAnalyzer: -// Graph, Node - public class DependencyAnalyzer { private Graph dg_; Modified: trunk/source/java/net/sf/jcontracts/dependencyanalyzer/Graph.java =================================================================== --- trunk/source/java/net/sf/jcontracts/dependencyanalyzer/Graph.java 2006-11-23 12:54:51 UTC (rev 14) +++ trunk/source/java/net/sf/jcontracts/dependencyanalyzer/Graph.java 2006-11-23 17:14:28 UTC (rev 15) @@ -1,16 +1,8 @@ -// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://www.kpdus.com/jad.html -// Decompiler options: packimports(3) braces fieldsfirst nonlb space -// Source File Name: Graph.java - package net.sf.jcontracts.dependencyanalyzer; import java.io.PrintStream; import java.util.*; -// Referenced classes of package net.sf.jcontracts.dependencyAnalyzer: -// Node, BooleanBlockWithNodeArg - public class Graph { protected Vector nodes_; Modified: trunk/source/java/net/sf/jcontracts/dependencyanalyzer/Node.java =================================================================== --- trunk/source/java/net/sf/jcontracts/dependencyanalyzer/Node.java 2006-11-23 12:54:51 UTC (rev 14) +++ trunk/source/java/net/sf/jcontracts/dependencyanalyzer/Node.java 2006-11-23 17:14:28 UTC (rev 15) @@ -1,16 +1,8 @@ -// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://www.kpdus.com/jad.html -// Decompiler options: packimports(3) braces fieldsfirst nonlb space -// Source File Name: Node.java - package net.sf.jcontracts.dependencyanalyzer; import java.util.Enumeration; import java.util.Vector; -// Referenced classes of package net.sf.jcontracts.dependencyAnalyzer: -// BooleanBlockWithNodeArg - public class Node { protected String name_; Modified: trunk/source/java/net/sf/jcontracts/icontract/AllFilesUpToDateException.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/AllFilesUpToDateException.java 2006-11-23 12:54:51 UTC (rev 14) +++ trunk/source/java/net/sf/jcontracts/icontract/AllFilesUpToDateException.java 2006-11-23 17:14:28 UTC (rev 15) @@ -1,8 +1,3 @@ -// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://www.kpdus.com/jad.html -// Decompiler options: packimports(3) braces fieldsfirst nonlb space -// Source File Name: AllFilesUpToDateException.java - package net.sf.jcontracts.icontract; public class AllFilesUpToDateException extends RuntimeException { Modified: trunk/source/java/net/sf/jcontracts/icontract/AllOption.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/AllOption.java 2006-11-23 12:54:51 UTC (rev 14) +++ trunk/source/java/net/sf/jcontracts/icontract/AllOption.java 2006-11-23 17:14:28 UTC (rev 15) @@ -1,15 +1,7 @@ -// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://www.kpdus.com/jad.html -// Decompiler options: packimports(3) braces fieldsfirst nonlb space -// Source File Name: AllOption.java - package net.sf.jcontracts.icontract; import java.util.Vector; -// Referenced classes of package net.sf.jcontracts.iContract: -// ParameterOption - public class AllOption extends ParameterOption { public static final String NAME = "a"; Modified: trunk/source/java/net/sf/jcontracts/icontract/ArgMetaclassFactory.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/ArgMetaclassFactory.java 2006-11-23 12:54:51 UTC (rev 14) +++ trunk/source/java/net/sf/jcontracts/icontract/ArgMetaclassFactory.java 2006-11-23 17:14:28 UTC (rev 15) @@ -1,8 +1,3 @@ -// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://www.kpdus.com/jad.html -// Decompiler options: packimports(3) braces fieldsfirst nonlb space -// Source File Name: ArgMetaclassFactory.java - package net.sf.jcontracts.icontract; import net.sf.jcontracts.argparser.*; @@ -11,14 +6,6 @@ import java.io.PrintStream; import java.util.Vector; -// Referenced classes of package net.sf.jcontracts.iContract: -// HelpOption, VerboseOption, CompilerOption, SourceCompilerOption, -// NoRepositoryCompilationOption, OutputOption, OneOneOption, RepositoryOutputOption, -// DefaultExceptionOption, CleanOption, MergeOption, InvCheckCallOption, -// WrapExceptionOption, QuietOption, AllOption, XOption, -// Internal0Option, NoInitialCompilationOption, StopException, Log, -// FileTarget - public class ArgMetaclassFactory implements ParserMetaclassFactory { Modified: trunk/source/java/net/sf/jcontracts/icontract/AssertionExpression.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/AssertionExpression.java 2006-11-23 12:54:51 UTC (rev 14) +++ trunk/source/java/net/sf/jcontracts/icontract/AssertionExpression.java 2006-11-23 17:14:28 UTC (rev 15) @@ -1,8 +1,3 @@ -// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://www.kpdus.com/jad.html -// Decompiler options: packimports(3) braces fieldsfirst nonlb space -// Source File Name: AssertionExpression.java - package net.sf.jcontracts.icontract; import net.sf.jcontracts.codeparser.CodeMetaclass; @@ -12,9 +7,6 @@ import java.util.Hashtable; import java.util.Vector; -// Referenced classes of package net.sf.jcontracts.iContract: -// IContracted, Log, UnableToDetermineTypeException - class AssertionExpression { private static final Logger log = Logger.getLogger(AssertionExpression.class); private String expression_; Modified: trunk/source/java/net/sf/jcontracts/icontract/Class.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/Class.java 2006-11-23 12:54:51 UTC (rev 14) +++ trunk/source/java/net/sf/jcontracts/icontract/Class.java 2006-11-23 17:14:28 UTC (rev 15) @@ -1,8 +1,3 @@ -// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://www.kpdus.com/jad.html -// Decompiler options: packimports(3) braces fieldsfirst nonlb space -// Source File Name: Class.java - package net.sf.jcontracts.icontract; import net.sf.jcontracts.codeparser.CodeMetaclass; @@ -15,10 +10,6 @@ import java.util.Enumeration; import java.util.Vector; -// Referenced classes of package net.sf.jcontracts.iContract: -// InvCheck, PrePostCheck, Log, Method, -// StopException, AssertionExpression, UnableToDetermineTypeException - public class Class extends net.sf.jcontracts.codeparser.Class implements InvCheck, PrePostCheck { private static final Logger log = Logger.getLogger(Class.class); Modified: trunk/source/java/net/sf/jcontracts/icontract/CleanOption.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/CleanOption.java 2006-11-23 12:54:51 UTC (rev 14) +++ trunk/source/java/net/sf/jcontracts/icontract/CleanOption.java 2006-11-23 17:14:28 UTC (rev 15) @@ -1,16 +1,8 @@ -// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://www.kpdus.com/jad.html -// Decompiler options: packimports(3) braces fieldsfirst nonlb space -// Source File Name: CleanOption.java - package net.sf.jcontracts.icontract; import org.apache.log4j.Logger; import java.util.Vector; -// Referenced classes of package net.sf.jcontracts.iContract: -// ParameterOption - public class CleanOption extends ParameterOption { public static final String NAME = "r"; Modified: trunk/source/java/net/sf/jcontracts/icontract/CompilerOption.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/CompilerOption.java 2006-11-23 12:54:51 UTC (rev 14) +++ trunk/source/java/net/sf/jcontracts/icontract/CompilerOption.java 2006-11-23 17:14:28 UTC (rev 15) @@ -1,8 +1,3 @@ -// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://www.kpdus.com/jad.html -// Decompiler options: packimports(3) braces fieldsfirst nonlb space -// Source File Name: CompilerOption.java - package net.sf.jcontracts.icontract; import net.sf.jcontracts.argparser.OptionMetaclass; @@ -13,9 +8,6 @@ import java.util.Vector; import sun.tools.javac.Main; -// Referenced classes of package net.sf.jcontracts.iContract: -// ParameterOption, Log, StopException, Internal0Option - public class CompilerOption extends ParameterOption { private static final Logger log = Logger.getLogger(CompilerOption.class); Modified: trunk/source/java/net/sf/jcontracts/icontract/Constants.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/Constants.java 2006-11-23 12:54:51 UTC (rev 14) +++ trunk/source/java/net/sf/jcontracts/icontract/Constants.java 2006-11-23 17:14:28 UTC (rev 15) @@ -1,8 +1,3 @@ -// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://www.kpdus.com/jad.html -// Decompiler options: packimports(3) braces fieldsfirst nonlb space -// Source File Name: Constants.java - package net.sf.jcontracts.icontract; import org.apache.log4j.Logger; Modified: trunk/source/java/net/sf/jcontracts/icontract/Darwin.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/Darwin.java 2006-11-23 12:54:51 UTC (rev 14) +++ trunk/source/java/net/sf/jcontracts/icontract/Darwin.java 2006-11-23 17:14:28 UTC (rev 15) @@ -1,8 +1,3 @@ -// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://www.kpdus.com/jad.html -// Decompiler options: packimports(3) braces fieldsfirst nonlb space -// Source File Name: Darwin.java - package net.sf.jcontracts.icontract; import net.sf.jcontracts.argparser.Parser; @@ -16,10 +11,6 @@ import java.util.*; import javax.swing.JOptionPane; -// Referenced classes of package net.sf.jcontracts.iContract: -// ArgMetaclassFactory, SystemInTarget, Target, HelpOption, -// Option, ParameterOption, StopException, AllFilesUpToDateException - public class Darwin { private static final Logger log = Logger.getLogger(Darwin.class); Modified: trunk/source/java/net/sf/jcontracts/icontract/DefaultExceptionOption.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/DefaultExceptionOption.java 2006-11-23 12:54:51 UTC (rev 14) +++ trunk/source/java/net/sf/jcontracts/icontract/DefaultExceptionOption.java 2006-11-23 17:14:28 UTC (rev 15) @@ -1,8 +1,3 @@ -// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://www.kpdus.com/jad.html -// Decompiler options: packimports(3) braces fieldsfirst nonlb space -// Source File Name: DefaultExceptionOption.java - package net.sf.jcontracts.icontract; import net.sf.jcontracts.argparser.OptionMetaclass; @@ -10,9 +5,6 @@ import org.apache.log4j.Logger; import java.util.Vector; -// Referenced classes of package net.sf.jcontracts.iContract: -// ParameterOption - public class DefaultExceptionOption extends ParameterOption { public static final String NAME = "d"; Modified: trunk/source/java/net/sf/jcontracts/icontract/FileTarget.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/FileTarget.java 2006-11-23 12:54:51 UTC (rev 14) +++ trunk/source/java/net/sf/jcontracts/icontract/FileTarget.java 2006-11-23 17:14:28 UTC (rev 15) @@ -1,8 +1,3 @@ -// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://www.kpdus.com/jad.html -// Decompiler options: packimports(3) braces fieldsfirst nonlb space -// Source File Name: FileTarget.java - package net.sf.jcontracts.icontract; import net.sf.jcontracts.codeparser.Parser; @@ -12,10 +7,6 @@ import java.util.Enumeration; import java.util.Vector; -// Referenced classes of package net.sf.jcontracts.iContract: -// Target, StopException, Log, Option, -// CleanOption, MetaclassFactory, ProcessingOption - public class FileTarget extends Target { private static final Logger log = Logger.getLogger(FileTarget.class); Modified: trunk/source/java/net/sf/jcontracts/icontract/HelpOption.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/HelpOption.java 2006-11-23 12:54:51 UTC (rev 14) +++ trunk/source/java/net/sf/jcontracts/icontract/HelpOption.java 2006-11-23 17:14:28 UTC (rev 15) @@ -1,17 +1,9 @@ -// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://www.kpdus.com/jad.html -// Decompiler options: packimports(3) braces fieldsfirst nonlb space -// Source File Name: HelpOption.java - package net.sf.jcontracts.icontract; import org.apache.log4j.Logger; import java.io.PrintStream; import java.util.Vector; -// Referenced classes of package net.sf.jcontracts.iContract: -// ParameterOption, StopException - public class HelpOption extends ParameterOption { public static final String VERSION = "for JDK 1.5, iContract v2.0"; Modified: trunk/source/java/net/sf/jcontracts/icontract/IContracted.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/IContracted.java 2006-11-23 12:54:51 UTC (rev 14) +++ trunk/source/java/net/sf/jcontracts/icontract/IContracted.java 2006-11-23 17:14:28 UTC (rev 15) @@ -1,15 +1,7 @@ -// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://www.kpdus.com/jad.html -// Decompiler options: packimports(3) braces fieldsfirst nonlb space -// Source File Name: IContracted.java - package net.sf.jcontracts.icontract; import org.apache.log4j.Logger; -// Referenced classes of package net.sf.jcontracts.iContract: -// UnableToDetermineTypeException - public interface IContracted { public abstract String getTypeOfValue(String s) throws UnableToDetermineTypeException; Modified: trunk/source/java/net/sf/jcontracts/icontract/Interface.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/Interface.java 2006-11-23 12:54:51 UTC (rev 14) +++ trunk/source/java/net/sf/jcontracts/icontract/Interface.java 2006-11-23 17:14:28 UTC (rev 15) @@ -1,8 +1,3 @@ -// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://www.kpdus.com/jad.html -// Decompiler options: packimports(3) braces fieldsfirst nonlb space -// Source File Name: Interface.java - package net.sf.jcontracts.icontract; import net.sf.jcontracts.codeparser.CodeMetaclass; @@ -15,10 +10,6 @@ import java.util.Enumeration; import java.util.Vector; -// Referenced classes of package net.sf.jcontracts.iContract: -// PrePostCheck, InvCheck, Class, Log, -// Method, StopException, UnableToDetermineTypeException - public class Interface extends net.sf.jcontracts.codeparser.Interface implements PrePostCheck, InvCheck { private static final Logger log = Logger.getLogger(Interface.class); Modified: trunk/source/java/net/sf/jcontracts/icontract/Internal0Option.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/Internal0Option.java 2006-11-23 12:54:51 UTC (rev 14) +++ trunk/source/java/net/sf/jcontracts/icontract/Internal0Option.java 2006-11-23 17:14:28 UTC (rev 15) @@ -1,16 +1,8 @@ -// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://www.kpdus.com/jad.html -// Decompiler options: packimports(3) braces fieldsfirst nonlb space -// Source File Name: Internal0Option.java - package net.sf.jcontracts.icontract; import org.apache.log4j.Logger; import java.util.Vector; -// Referenced classes of package net.sf.jcontracts.iContract: -// ParameterOption - public class Internal0Option extends ParameterOption { public static final String NAME = "Z"; Modified: trunk/source/java/net/sf/jcontracts/icontract/InvCheck.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/InvCheck.java 2006-11-23 12:54:51 UTC (rev 14) +++ trunk/source/java/net/sf/jcontracts/icontract/InvCheck.java 2006-11-23 17:14:28 UTC (rev 15) @@ -1,16 +1,8 @@ -// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov. -// Jad home page: http://www.kpdus.com/jad.html -// Decompiler options: packimports(3) braces fieldsfirst nonlb space -// Source File Name: InvCheck.java - package net.sf.jcontracts.icontract; import org.apache.log4j.Logger; import java.util.Vector; -// Referenced classes of package net.sf.jcontracts.iContract: -// IContr... [truncated message content] |
From: <js...@us...> - 2006-11-24 11:11:27
|
Revision: 22 http://svn.sourceforge.net/jcontracts/?rev=22&view=rev Author: jstuyts Date: 2006-11-24 03:11:22 -0800 (Fri, 24 Nov 2006) Log Message: ----------- Organized imports. Modified Paths: -------------- trunk/source/java/net/sf/jcontracts/argparser/ArgLexer.java trunk/source/java/net/sf/jcontracts/argparser/ArgParser.java trunk/source/java/net/sf/jcontracts/argparser/Parser.java trunk/source/java/net/sf/jcontracts/codeparser/Class.java trunk/source/java/net/sf/jcontracts/codeparser/CodeComment.java trunk/source/java/net/sf/jcontracts/codeparser/CodeMetaclassCache.java trunk/source/java/net/sf/jcontracts/codeparser/DebugVisitor.java trunk/source/java/net/sf/jcontracts/codeparser/DottyVisitor.java trunk/source/java/net/sf/jcontracts/codeparser/Dotty_Component_CommonLevel.java trunk/source/java/net/sf/jcontracts/codeparser/Dotty_Component_PackageLevel.java trunk/source/java/net/sf/jcontracts/codeparser/Dotty_Component_TypeLevel.java trunk/source/java/net/sf/jcontracts/codeparser/Interface.java trunk/source/java/net/sf/jcontracts/codeparser/JavaLexer.java trunk/source/java/net/sf/jcontracts/codeparser/JavaParser.java trunk/source/java/net/sf/jcontracts/codeparser/Parser.java trunk/source/java/net/sf/jcontracts/codeparser/Variable.java trunk/source/java/net/sf/jcontracts/dependencyanalyzer/Graph.java trunk/source/java/net/sf/jcontracts/icontract/AllOption.java trunk/source/java/net/sf/jcontracts/icontract/ArgMetaclassFactory.java trunk/source/java/net/sf/jcontracts/icontract/AssertionExpression.java trunk/source/java/net/sf/jcontracts/icontract/Class.java trunk/source/java/net/sf/jcontracts/icontract/CleanOption.java trunk/source/java/net/sf/jcontracts/icontract/CompilerOption.java trunk/source/java/net/sf/jcontracts/icontract/Constants.java trunk/source/java/net/sf/jcontracts/icontract/Darwin.java trunk/source/java/net/sf/jcontracts/icontract/DefaultExceptionOption.java trunk/source/java/net/sf/jcontracts/icontract/FileTarget.java trunk/source/java/net/sf/jcontracts/icontract/HelpOption.java trunk/source/java/net/sf/jcontracts/icontract/IContracted.java trunk/source/java/net/sf/jcontracts/icontract/Interface.java trunk/source/java/net/sf/jcontracts/icontract/Internal0Option.java trunk/source/java/net/sf/jcontracts/icontract/InvCheck.java trunk/source/java/net/sf/jcontracts/icontract/InvCheckCallOption.java trunk/source/java/net/sf/jcontracts/icontract/MergeOption.java trunk/source/java/net/sf/jcontracts/icontract/MetaclassFactory.java trunk/source/java/net/sf/jcontracts/icontract/Method.java trunk/source/java/net/sf/jcontracts/icontract/NoInitialCompilationOption.java trunk/source/java/net/sf/jcontracts/icontract/NoRepositoryCompilationOption.java trunk/source/java/net/sf/jcontracts/icontract/OneOneOption.java trunk/source/java/net/sf/jcontracts/icontract/Option.java trunk/source/java/net/sf/jcontracts/icontract/OutputOption.java trunk/source/java/net/sf/jcontracts/icontract/ParameterOption.java trunk/source/java/net/sf/jcontracts/icontract/PrePostCheck.java trunk/source/java/net/sf/jcontracts/icontract/ProcessingOption.java trunk/source/java/net/sf/jcontracts/icontract/QuietOption.java trunk/source/java/net/sf/jcontracts/icontract/Repository.java trunk/source/java/net/sf/jcontracts/icontract/RepositoryOutputOption.java trunk/source/java/net/sf/jcontracts/icontract/SourceCompilerOption.java trunk/source/java/net/sf/jcontracts/icontract/SystemInTarget.java trunk/source/java/net/sf/jcontracts/icontract/Target.java trunk/source/java/net/sf/jcontracts/icontract/Tool.java trunk/source/java/net/sf/jcontracts/icontract/UnableToDetermineTypeException.java trunk/source/java/net/sf/jcontracts/icontract/Variable.java trunk/source/java/net/sf/jcontracts/icontract/VerboseOption.java trunk/source/java/net/sf/jcontracts/icontract/WrapExceptionOption.java trunk/source/java/net/sf/jcontracts/icontract/XOption.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/ArchitectureSpecification.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/Idiom.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/IdiomFactory.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/IsolateIdiom.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/LayerIdiom.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PSpecLexer.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PSpecParser.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PatternFactory.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/SetPattern.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/SingleDependencyConstraint.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/StrictlyLayerIdiom.java trunk/source/java/net/sf/jcontracts/util/JavaEvaluator.java trunk/source/java/net/sf/jcontracts/util/StringComparator.java Modified: trunk/source/java/net/sf/jcontracts/argparser/ArgLexer.java =================================================================== --- trunk/source/java/net/sf/jcontracts/argparser/ArgLexer.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/argparser/ArgLexer.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,10 +1,15 @@ package net.sf.jcontracts.argparser; -import antlr.*; -import antlr.collections.impl.BitSet; import java.io.InputStream; import java.util.Hashtable; +import antlr.CharBufferNoBacktrackingNoInteractive; +import antlr.CharScannerNoBacktrackingNoInteractive; +import antlr.ScannerException; +import antlr.Token; +import antlr.Tokenizer; +import antlr.collections.impl.BitSet; + public class ArgLexer extends CharScannerNoBacktrackingNoInteractive implements ArgTokenTypes, Tokenizer { Modified: trunk/source/java/net/sf/jcontracts/argparser/ArgParser.java =================================================================== --- trunk/source/java/net/sf/jcontracts/argparser/ArgParser.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/argparser/ArgParser.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,10 +1,14 @@ package net.sf.jcontracts.argparser; -import antlr.*; import java.io.FileInputStream; -import java.io.PrintStream; import java.util.Vector; +import antlr.LLkParserNoInteractive; +import antlr.ParserException; +import antlr.Token; +import antlr.TokenBuffer; +import antlr.Tokenizer; + public class ArgParser extends LLkParserNoInteractive implements ArgTokenTypes { Modified: trunk/source/java/net/sf/jcontracts/argparser/Parser.java =================================================================== --- trunk/source/java/net/sf/jcontracts/argparser/Parser.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/argparser/Parser.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,10 +1,10 @@ package net.sf.jcontracts.argparser; -import antlr.CharScanner; -import antlr.ParserException; import java.io.StringBufferInputStream; import java.util.Vector; +import antlr.ParserException; + public class Parser { private ArgParser _argparser; Modified: trunk/source/java/net/sf/jcontracts/codeparser/Class.java =================================================================== --- trunk/source/java/net/sf/jcontracts/codeparser/Class.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/codeparser/Class.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,7 +1,6 @@ package net.sf.jcontracts.codeparser; import java.util.Enumeration; -import java.util.Vector; public class Class extends TypeMetaclass { Modified: trunk/source/java/net/sf/jcontracts/codeparser/CodeComment.java =================================================================== --- trunk/source/java/net/sf/jcontracts/codeparser/CodeComment.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/codeparser/CodeComment.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,7 +1,9 @@ package net.sf.jcontracts.codeparser; import java.io.Serializable; -import java.util.*; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Vector; class CodeComment implements Serializable { Modified: trunk/source/java/net/sf/jcontracts/codeparser/CodeMetaclassCache.java =================================================================== --- trunk/source/java/net/sf/jcontracts/codeparser/CodeMetaclassCache.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/codeparser/CodeMetaclassCache.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,10 +1,18 @@ package net.sf.jcontracts.codeparser; -import antlr.ParserException; -import java.io.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.OutputStream; import java.util.Enumeration; import java.util.Vector; +import antlr.ParserException; + public class CodeMetaclassCache { private static final String base; Modified: trunk/source/java/net/sf/jcontracts/codeparser/DebugVisitor.java =================================================================== --- trunk/source/java/net/sf/jcontracts/codeparser/DebugVisitor.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/codeparser/DebugVisitor.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,6 +1,5 @@ package net.sf.jcontracts.codeparser; -import java.io.PrintStream; public class DebugVisitor implements ICodeMetaclassVisitor { Modified: trunk/source/java/net/sf/jcontracts/codeparser/DottyVisitor.java =================================================================== --- trunk/source/java/net/sf/jcontracts/codeparser/DottyVisitor.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/codeparser/DottyVisitor.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,6 +1,8 @@ package net.sf.jcontracts.codeparser; -import java.io.*; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.PrintWriter; import java.util.Vector; import net.sf.jcontracts.idarwin.specification.openapi.IArchitectureExporter; Modified: trunk/source/java/net/sf/jcontracts/codeparser/Dotty_Component_CommonLevel.java =================================================================== --- trunk/source/java/net/sf/jcontracts/codeparser/Dotty_Component_CommonLevel.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/codeparser/Dotty_Component_CommonLevel.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,8 +1,9 @@ package net.sf.jcontracts.codeparser; -import java.io.PrintStream; import java.io.PrintWriter; -import java.util.*; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Vector; import net.sf.jcontracts.icontract.QuietOption; import net.sf.jcontracts.idarwin.specification.openapi.IArchitectureSpecification; Modified: trunk/source/java/net/sf/jcontracts/codeparser/Dotty_Component_PackageLevel.java =================================================================== --- trunk/source/java/net/sf/jcontracts/codeparser/Dotty_Component_PackageLevel.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/codeparser/Dotty_Component_PackageLevel.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,6 +1,5 @@ package net.sf.jcontracts.codeparser; -import java.io.PrintStream; import java.io.PrintWriter; import java.util.Enumeration; import java.util.Vector; Modified: trunk/source/java/net/sf/jcontracts/codeparser/Dotty_Component_TypeLevel.java =================================================================== --- trunk/source/java/net/sf/jcontracts/codeparser/Dotty_Component_TypeLevel.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/codeparser/Dotty_Component_TypeLevel.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,6 +1,5 @@ package net.sf.jcontracts.codeparser; -import java.io.PrintStream; import java.io.PrintWriter; import java.util.Enumeration; import java.util.Vector; Modified: trunk/source/java/net/sf/jcontracts/codeparser/Interface.java =================================================================== --- trunk/source/java/net/sf/jcontracts/codeparser/Interface.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/codeparser/Interface.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,6 +1,5 @@ package net.sf.jcontracts.codeparser; -import java.util.Vector; public class Interface extends TypeMetaclass { Modified: trunk/source/java/net/sf/jcontracts/codeparser/JavaLexer.java =================================================================== --- trunk/source/java/net/sf/jcontracts/codeparser/JavaLexer.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/codeparser/JavaLexer.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,10 +1,16 @@ package net.sf.jcontracts.codeparser; -import antlr.*; -import antlr.collections.impl.BitSet; import java.io.InputStream; import java.util.Hashtable; +import antlr.ANTLRHashString; +import antlr.CharBufferNoBacktrackingNoInteractive; +import antlr.CharScannerNoBacktrackingNoInteractive; +import antlr.ScannerException; +import antlr.Token; +import antlr.Tokenizer; +import antlr.collections.impl.BitSet; + public class JavaLexer extends CharScannerNoBacktrackingNoInteractive implements JavaTokenTypes, Tokenizer { Modified: trunk/source/java/net/sf/jcontracts/codeparser/JavaParser.java =================================================================== --- trunk/source/java/net/sf/jcontracts/codeparser/JavaParser.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/codeparser/JavaParser.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,11 +1,19 @@ package net.sf.jcontracts.codeparser; -import antlr.*; -import antlr.collections.impl.BitSet; -import java.io.*; -import java.util.*; +import java.io.File; +import java.io.FileInputStream; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Vector; import net.sf.jcontracts.dependencyanalyzer.Node; +import antlr.LLkParserNoInteractive; +import antlr.NoViableAltException; +import antlr.ParserException; +import antlr.Token; +import antlr.TokenBuffer; +import antlr.Tokenizer; +import antlr.collections.impl.BitSet; public class JavaParser extends LLkParserNoInteractive implements JavaTokenTypes { Modified: trunk/source/java/net/sf/jcontracts/codeparser/Parser.java =================================================================== --- trunk/source/java/net/sf/jcontracts/codeparser/Parser.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/codeparser/Parser.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,11 +1,11 @@ package net.sf.jcontracts.codeparser; -import antlr.CharScanner; -import antlr.ParserException; import java.io.InputStream; import java.util.Hashtable; import java.util.Vector; +import antlr.ParserException; + public class Parser { private JavaParser _javaparser; Modified: trunk/source/java/net/sf/jcontracts/codeparser/Variable.java =================================================================== --- trunk/source/java/net/sf/jcontracts/codeparser/Variable.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/codeparser/Variable.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,6 +1,5 @@ package net.sf.jcontracts.codeparser; -import java.util.Vector; public class Variable extends CodeMetaclass { Modified: trunk/source/java/net/sf/jcontracts/dependencyanalyzer/Graph.java =================================================================== --- trunk/source/java/net/sf/jcontracts/dependencyanalyzer/Graph.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/dependencyanalyzer/Graph.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,7 +1,8 @@ package net.sf.jcontracts.dependencyanalyzer; -import java.io.PrintStream; -import java.util.*; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Vector; public class Graph { Modified: trunk/source/java/net/sf/jcontracts/icontract/AllOption.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/AllOption.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/icontract/AllOption.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,6 +1,6 @@ package net.sf.jcontracts.icontract; -import java.util.Vector; +import java.util.Vector; public class AllOption extends ParameterOption { Modified: trunk/source/java/net/sf/jcontracts/icontract/ArgMetaclassFactory.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/ArgMetaclassFactory.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/icontract/ArgMetaclassFactory.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,11 +1,11 @@ package net.sf.jcontracts.icontract; -import net.sf.jcontracts.argparser.*; +import java.util.Vector; + +import net.sf.jcontracts.argparser.OptionMetaclass; +import net.sf.jcontracts.argparser.ParserMetaclassFactory; +import net.sf.jcontracts.argparser.TargetMetaclass; -import org.apache.log4j.Logger; -import java.io.PrintStream; -import java.util.Vector; - public class ArgMetaclassFactory implements ParserMetaclassFactory { Modified: trunk/source/java/net/sf/jcontracts/icontract/AssertionExpression.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/AssertionExpression.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/icontract/AssertionExpression.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,12 +1,13 @@ package net.sf.jcontracts.icontract; -import net.sf.jcontracts.codeparser.CodeMetaclass; - -import org.apache.log4j.Logger; import java.lang.reflect.Method; import java.util.Hashtable; import java.util.Vector; +import net.sf.jcontracts.codeparser.CodeMetaclass; + +import org.apache.log4j.Logger; + class AssertionExpression { private static final Logger log = Logger.getLogger(AssertionExpression.class); private String expression_; Modified: trunk/source/java/net/sf/jcontracts/icontract/Class.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/Class.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/icontract/Class.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,15 +1,14 @@ package net.sf.jcontracts.icontract; -import net.sf.jcontracts.codeparser.CodeMetaclass; -import net.sf.jcontracts.codeparser.TypeMetaclass; - -import org.apache.log4j.Logger; -import java.io.PrintStream; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.Enumeration; import java.util.Vector; +import net.sf.jcontracts.codeparser.TypeMetaclass; + +import org.apache.log4j.Logger; + public class Class extends net.sf.jcontracts.codeparser.Class implements InvCheck, PrePostCheck { private static final Logger log = Logger.getLogger(Class.class); Modified: trunk/source/java/net/sf/jcontracts/icontract/CleanOption.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/CleanOption.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/icontract/CleanOption.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,7 +1,6 @@ package net.sf.jcontracts.icontract; -import org.apache.log4j.Logger; -import java.util.Vector; +import java.util.Vector; public class CleanOption extends ParameterOption { Modified: trunk/source/java/net/sf/jcontracts/icontract/CompilerOption.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/CompilerOption.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/icontract/CompilerOption.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,11 +1,16 @@ package net.sf.jcontracts.icontract; -import net.sf.jcontracts.argparser.OptionMetaclass; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.io.InputStreamReader; +import java.util.Enumeration; +import java.util.Vector; import org.apache.log4j.Logger; -import java.io.*; -import java.util.Enumeration; -import java.util.Vector; + import sun.tools.javac.Main; public class CompilerOption extends ParameterOption { Modified: trunk/source/java/net/sf/jcontracts/icontract/Constants.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/Constants.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/icontract/Constants.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,6 +1,5 @@ package net.sf.jcontracts.icontract; -import org.apache.log4j.Logger; interface Constants { Modified: trunk/source/java/net/sf/jcontracts/icontract/Darwin.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/Darwin.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/icontract/Darwin.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,15 +1,19 @@ package net.sf.jcontracts.icontract; +import java.lang.reflect.Constructor; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Vector; + import net.sf.jcontracts.argparser.Parser; -import net.sf.jcontracts.codeparser.*; +import net.sf.jcontracts.codeparser.CodeMetaclass; +import net.sf.jcontracts.codeparser.CodeMetaclassCache; +import net.sf.jcontracts.codeparser.DottyVisitor; +import net.sf.jcontracts.codeparser.DottyVisitorConstants; +import net.sf.jcontracts.codeparser.IDependencyFilter; import net.sf.jcontracts.idarwin.specification.openapi.IArchitectureSpecification; -import net.sf.jcontracts.idarwin.specification.openapi.IllFormedSpecificationException; import org.apache.log4j.Logger; -import java.io.PrintStream; -import java.lang.reflect.*; -import java.util.*; -import javax.swing.JOptionPane; public class Darwin { private static final Logger log = Logger.getLogger(Darwin.class); Modified: trunk/source/java/net/sf/jcontracts/icontract/DefaultExceptionOption.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/DefaultExceptionOption.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/icontract/DefaultExceptionOption.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,10 +1,7 @@ package net.sf.jcontracts.icontract; -import net.sf.jcontracts.argparser.OptionMetaclass; +import java.util.Vector; -import org.apache.log4j.Logger; -import java.util.Vector; - public class DefaultExceptionOption extends ParameterOption { public static final String NAME = "d"; Modified: trunk/source/java/net/sf/jcontracts/icontract/FileTarget.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/FileTarget.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/icontract/FileTarget.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,11 +1,20 @@ package net.sf.jcontracts.icontract; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.FilenameFilter; +import java.io.IOException; +import java.io.InputStream; +import java.io.PrintWriter; +import java.util.Enumeration; +import java.util.Vector; + import net.sf.jcontracts.codeparser.Parser; import org.apache.log4j.Logger; -import java.io.*; -import java.util.Enumeration; -import java.util.Vector; public class FileTarget extends Target { private static final Logger log = Logger.getLogger(FileTarget.class); Modified: trunk/source/java/net/sf/jcontracts/icontract/HelpOption.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/HelpOption.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/icontract/HelpOption.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,14 +1,11 @@ package net.sf.jcontracts.icontract; -import org.apache.log4j.Logger; - import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import java.io.PrintStream; import java.io.Reader; -import java.util.Vector; +import java.util.Vector; public class HelpOption extends ParameterOption { Modified: trunk/source/java/net/sf/jcontracts/icontract/IContracted.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/IContracted.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/icontract/IContracted.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,6 +1,5 @@ package net.sf.jcontracts.icontract; -import org.apache.log4j.Logger; public interface IContracted { Modified: trunk/source/java/net/sf/jcontracts/icontract/Interface.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/Interface.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/icontract/Interface.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,15 +1,14 @@ package net.sf.jcontracts.icontract; -import net.sf.jcontracts.codeparser.CodeMetaclass; -import net.sf.jcontracts.codeparser.TypeMetaclass; - -import org.apache.log4j.Logger; -import java.io.PrintStream; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.Enumeration; import java.util.Vector; +import net.sf.jcontracts.codeparser.TypeMetaclass; + +import org.apache.log4j.Logger; + public class Interface extends net.sf.jcontracts.codeparser.Interface implements PrePostCheck, InvCheck { private static final Logger log = Logger.getLogger(Interface.class); Modified: trunk/source/java/net/sf/jcontracts/icontract/Internal0Option.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/Internal0Option.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/icontract/Internal0Option.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,7 +1,6 @@ package net.sf.jcontracts.icontract; -import org.apache.log4j.Logger; -import java.util.Vector; +import java.util.Vector; public class Internal0Option extends ParameterOption { Modified: trunk/source/java/net/sf/jcontracts/icontract/InvCheck.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/InvCheck.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/icontract/InvCheck.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,7 +1,6 @@ package net.sf.jcontracts.icontract; -import org.apache.log4j.Logger; -import java.util.Vector; +import java.util.Vector; interface InvCheck extends IContracted { Modified: trunk/source/java/net/sf/jcontracts/icontract/InvCheckCallOption.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/InvCheckCallOption.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/icontract/InvCheckCallOption.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,7 +1,6 @@ package net.sf.jcontracts.icontract; -import org.apache.log4j.Logger; -import java.util.Vector; +import java.util.Vector; public class InvCheckCallOption extends ParameterOption { Modified: trunk/source/java/net/sf/jcontracts/icontract/MergeOption.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/MergeOption.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/icontract/MergeOption.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,11 +1,19 @@ package net.sf.jcontracts.icontract; -import net.sf.jcontracts.argparser.OptionMetaclass; -import net.sf.jcontracts.codeparser.*; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileOutputStream; +import java.io.FileReader; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Vector; +import net.sf.jcontracts.codeparser.CodeMetaclass; +import net.sf.jcontracts.codeparser.TypeMetaclass; + import org.apache.log4j.Logger; -import java.io.*; -import java.util.*; public class MergeOption extends ProcessingOption { private static final Logger log = Logger.getLogger(MergeOption.class); Modified: trunk/source/java/net/sf/jcontracts/icontract/MetaclassFactory.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/MetaclassFactory.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/icontract/MetaclassFactory.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,10 +1,9 @@ package net.sf.jcontracts.icontract; -import net.sf.jcontracts.codeparser.*; +import java.util.Vector; + +import net.sf.jcontracts.codeparser.ParserMetaclassFactory; -import org.apache.log4j.Logger; -import java.util.Vector; - public class MetaclassFactory implements ParserMetaclassFactory { Modified: trunk/source/java/net/sf/jcontracts/icontract/Method.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/Method.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/icontract/Method.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,15 +1,14 @@ package net.sf.jcontracts.icontract; -import net.sf.jcontracts.codeparser.CodeMetaclass; -import net.sf.jcontracts.codeparser.TypeMetaclass; - -import org.apache.log4j.Logger; -import java.io.PrintStream; import java.lang.reflect.InvocationTargetException; import java.util.Enumeration; import java.util.Hashtable; import java.util.Vector; +import net.sf.jcontracts.codeparser.TypeMetaclass; + +import org.apache.log4j.Logger; + public class Method extends net.sf.jcontracts.codeparser.Method implements InvCheck, PrePostCheck { private static final Logger log = Logger.getLogger(Method.class); Modified: trunk/source/java/net/sf/jcontracts/icontract/NoInitialCompilationOption.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/NoInitialCompilationOption.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/icontract/NoInitialCompilationOption.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,12 +1,12 @@ package net.sf.jcontracts.icontract; -import net.sf.jcontracts.argparser.OptionMetaclass; - -import org.apache.log4j.Logger; -import java.io.*; +import java.io.File; +import java.io.IOException; import java.util.Hashtable; import java.util.Vector; +import org.apache.log4j.Logger; + public class NoInitialCompilationOption extends ParameterOption { private static final Logger log = Logger.getLogger(NoInitialCompilationOption.class); public static final String NAME = "j"; Modified: trunk/source/java/net/sf/jcontracts/icontract/NoRepositoryCompilationOption.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/NoRepositoryCompilationOption.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/icontract/NoRepositoryCompilationOption.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,11 +1,14 @@ package net.sf.jcontracts.icontract; -import net.sf.jcontracts.argparser.OptionMetaclass; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.IOException; +import java.io.InputStreamReader; +import java.util.Enumeration; +import java.util.Vector; import org.apache.log4j.Logger; -import java.io.*; -import java.util.Enumeration; -import java.util.Vector; + import sun.tools.javac.Main; public class NoRepositoryCompilationOption extends ParameterOption { Modified: trunk/source/java/net/sf/jcontracts/icontract/OneOneOption.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/OneOneOption.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/icontract/OneOneOption.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,7 +1,6 @@ package net.sf.jcontracts.icontract; -import org.apache.log4j.Logger; -import java.util.Vector; +import java.util.Vector; public class OneOneOption extends ParameterOption { Modified: trunk/source/java/net/sf/jcontracts/icontract/Option.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/Option.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/icontract/Option.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,10 +1,9 @@ package net.sf.jcontracts.icontract; -import net.sf.jcontracts.argparser.OptionMetaclass; +import java.util.Vector; + +import net.sf.jcontracts.argparser.OptionMetaclass; -import org.apache.log4j.Logger; -import java.util.Vector; - public abstract class Option extends OptionMetaclass { public static String NAME; Modified: trunk/source/java/net/sf/jcontracts/icontract/OutputOption.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/OutputOption.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/icontract/OutputOption.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,12 +1,12 @@ package net.sf.jcontracts.icontract; -import net.sf.jcontracts.argparser.OptionMetaclass; - -import org.apache.log4j.Logger; -import java.io.*; +import java.io.File; +import java.io.IOException; import java.util.Hashtable; import java.util.Vector; +import org.apache.log4j.Logger; + public class OutputOption extends ParameterOption { private static final Logger log = Logger.getLogger(OutputOption.class); public static final String NAME = "o"; Modified: trunk/source/java/net/sf/jcontracts/icontract/ParameterOption.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/ParameterOption.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/icontract/ParameterOption.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,7 +1,6 @@ package net.sf.jcontracts.icontract; -import org.apache.log4j.Logger; -import java.util.Vector; +import java.util.Vector; public class ParameterOption extends Option { Modified: trunk/source/java/net/sf/jcontracts/icontract/PrePostCheck.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/PrePostCheck.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/icontract/PrePostCheck.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,6 +1,5 @@ package net.sf.jcontracts.icontract; -import org.apache.log4j.Logger; interface PrePostCheck extends IContracted { Modified: trunk/source/java/net/sf/jcontracts/icontract/ProcessingOption.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/ProcessingOption.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/icontract/ProcessingOption.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,7 +1,6 @@ package net.sf.jcontracts.icontract; -import org.apache.log4j.Logger; -import java.util.Vector; +import java.util.Vector; public abstract class ProcessingOption extends Option { Modified: trunk/source/java/net/sf/jcontracts/icontract/QuietOption.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/QuietOption.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/icontract/QuietOption.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,11 +1,8 @@ package net.sf.jcontracts.icontract; -import net.sf.jcontracts.argparser.OptionMetaclass; +import java.util.Enumeration; +import java.util.Vector; -import org.apache.log4j.Logger; -import java.util.Enumeration; -import java.util.Vector; - public class QuietOption extends ParameterOption { public static final String NAME = "q"; Modified: trunk/source/java/net/sf/jcontracts/icontract/Repository.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/Repository.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/icontract/Repository.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,8 +1,9 @@ package net.sf.jcontracts.icontract; -import org.apache.log4j.Logger; -import java.io.*; -import java.util.Vector; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.Vector; class Repository { Modified: trunk/source/java/net/sf/jcontracts/icontract/RepositoryOutputOption.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/RepositoryOutputOption.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/icontract/RepositoryOutputOption.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,12 +1,12 @@ package net.sf.jcontracts.icontract; -import net.sf.jcontracts.argparser.OptionMetaclass; - -import org.apache.log4j.Logger; -import java.io.*; +import java.io.File; +import java.io.IOException; import java.util.Hashtable; import java.util.Vector; +import org.apache.log4j.Logger; + public class RepositoryOutputOption extends ParameterOption { private static final Logger log = Logger.getLogger(RepositoryOutputOption.class); public static final String NAME = "k"; Modified: trunk/source/java/net/sf/jcontracts/icontract/SourceCompilerOption.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/SourceCompilerOption.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/icontract/SourceCompilerOption.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,11 +1,14 @@ package net.sf.jcontracts.icontract; -import net.sf.jcontracts.argparser.OptionMetaclass; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.IOException; +import java.io.InputStreamReader; +import java.util.Enumeration; +import java.util.Vector; import org.apache.log4j.Logger; -import java.io.*; -import java.util.Enumeration; -import java.util.Vector; + import sun.tools.javac.Main; public class SourceCompilerOption extends ParameterOption { Modified: trunk/source/java/net/sf/jcontracts/icontract/SystemInTarget.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/SystemInTarget.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/icontract/SystemInTarget.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,8 +1,7 @@ package net.sf.jcontracts.icontract; -import org.apache.log4j.Logger; -import java.io.InputStream; -import java.util.Vector; +import java.io.InputStream; +import java.util.Vector; public class SystemInTarget extends FileTarget { Modified: trunk/source/java/net/sf/jcontracts/icontract/Target.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/Target.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/icontract/Target.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,10 +1,9 @@ package net.sf.jcontracts.icontract; -import net.sf.jcontracts.argparser.TargetMetaclass; +import java.util.Vector; + +import net.sf.jcontracts.argparser.TargetMetaclass; -import org.apache.log4j.Logger; -import java.util.Vector; - public abstract class Target extends TargetMetaclass { protected Target(String name) { Modified: trunk/source/java/net/sf/jcontracts/icontract/Tool.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/Tool.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/icontract/Tool.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,27 +1,24 @@ package net.sf.jcontracts.icontract; -import net.sf.jcontracts.argparser.OptionMetaclass; -import net.sf.jcontracts.argparser.Parser; -import net.sf.jcontracts.argparser.TargetMetaclass; -import net.sf.jcontracts.dependencyanalyzer.BooleanBlockWithNodeArg; -import net.sf.jcontracts.dependencyanalyzer.DependencyAnalyzer; -import net.sf.jcontracts.dependencyanalyzer.Graph; -import net.sf.jcontracts.dependencyanalyzer.Node; - -import org.apache.log4j.Logger; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.FileReader; import java.io.IOException; -import java.io.InputStreamReader; -import java.io.PrintStream; import java.io.PrintWriter; import java.util.Enumeration; import java.util.Hashtable; import java.util.Vector; +import net.sf.jcontracts.argparser.Parser; +import net.sf.jcontracts.dependencyanalyzer.BooleanBlockWithNodeArg; +import net.sf.jcontracts.dependencyanalyzer.DependencyAnalyzer; +import net.sf.jcontracts.dependencyanalyzer.Graph; +import net.sf.jcontracts.dependencyanalyzer.Node; + +import org.apache.log4j.Logger; + public class Tool { private static final Logger log = Logger.getLogger(Tool.class); Modified: trunk/source/java/net/sf/jcontracts/icontract/UnableToDetermineTypeException.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/UnableToDetermineTypeException.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/icontract/UnableToDetermineTypeException.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,6 +1,5 @@ package net.sf.jcontracts.icontract; -import org.apache.log4j.Logger; public class UnableToDetermineTypeException extends Exception { Modified: trunk/source/java/net/sf/jcontracts/icontract/Variable.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/Variable.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/icontract/Variable.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,7 +1,6 @@ package net.sf.jcontracts.icontract; -import org.apache.log4j.Logger; -import java.util.Vector; +import java.util.Vector; public class Variable extends net.sf.jcontracts.codeparser.Variable implements PrePostCheck, InvCheck { Modified: trunk/source/java/net/sf/jcontracts/icontract/VerboseOption.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/VerboseOption.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/icontract/VerboseOption.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,12 +1,8 @@ package net.sf.jcontracts.icontract; -import net.sf.jcontracts.argparser.OptionMetaclass; +import java.util.Enumeration; +import java.util.Vector; -import org.apache.log4j.Logger; -import java.io.PrintStream; -import java.util.Enumeration; -import java.util.Vector; - public class VerboseOption extends ParameterOption { public static final String NAME = "v"; Modified: trunk/source/java/net/sf/jcontracts/icontract/WrapExceptionOption.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/WrapExceptionOption.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/icontract/WrapExceptionOption.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,7 +1,6 @@ package net.sf.jcontracts.icontract; -import org.apache.log4j.Logger; -import java.util.Vector; +import java.util.Vector; public class WrapExceptionOption extends ParameterOption { Modified: trunk/source/java/net/sf/jcontracts/icontract/XOption.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/XOption.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/icontract/XOption.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,11 +1,13 @@ package net.sf.jcontracts.icontract; -import net.sf.jcontracts.argparser.OptionMetaclass; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.Vector; + import net.sf.jcontracts.dependencyanalyzer.Graph; import org.apache.log4j.Logger; -import java.io.*; -import java.util.Vector; public class XOption extends ParameterOption { private static final Logger log = Logger.getLogger(XOption.class); Modified: trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/ArchitectureSpecification.java =================================================================== --- trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/ArchitectureSpecification.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/ArchitectureSpecification.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,8 +1,6 @@ package net.sf.jcontracts.idarwin.specification.impl.primitive_language; -import antlr.ParserException; import java.io.IOException; -import java.io.PrintStream; import java.io.StringBufferInputStream; import java.util.Enumeration; import java.util.Vector; @@ -14,6 +12,7 @@ import net.sf.jcontracts.idarwin.specification.openapi.IDependency; import net.sf.jcontracts.idarwin.specification.openapi.IllFormedSpecificationException; import net.sf.jcontracts.util.JavaEvaluator; +import antlr.ParserException; public class ArchitectureSpecification implements IArchitectureSpecification { Modified: trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/Idiom.java =================================================================== --- trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/Idiom.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/Idiom.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,11 +1,11 @@ package net.sf.jcontracts.idarwin.specification.impl.primitive_language; -import antlr.ParserException; -import java.io.PrintStream; import java.io.StringBufferInputStream; import java.util.Enumeration; import java.util.Vector; +import antlr.ParserException; + abstract class Idiom { protected String pattern; Modified: trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/IdiomFactory.java =================================================================== --- trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/IdiomFactory.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/IdiomFactory.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,6 +1,5 @@ package net.sf.jcontracts.idarwin.specification.impl.primitive_language; -import java.io.PrintStream; public class IdiomFactory { Modified: trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/IsolateIdiom.java =================================================================== --- trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/IsolateIdiom.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/IsolateIdiom.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,9 +1,9 @@ package net.sf.jcontracts.idarwin.specification.impl.primitive_language; -import antlr.ParserException; -import java.io.PrintStream; import java.io.StringBufferInputStream; +import antlr.ParserException; + class IsolateIdiom extends Idiom { IsolateIdiom(String p) { Modified: trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/LayerIdiom.java =================================================================== --- trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/LayerIdiom.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/LayerIdiom.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,9 +1,9 @@ package net.sf.jcontracts.idarwin.specification.impl.primitive_language; -import antlr.ParserException; -import java.io.PrintStream; import java.io.StringBufferInputStream; +import antlr.ParserException; + class LayerIdiom extends Idiom { LayerIdiom(String p) { Modified: trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PSpecLexer.java =================================================================== --- trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PSpecLexer.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PSpecLexer.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,10 +1,16 @@ package net.sf.jcontracts.idarwin.specification.impl.primitive_language; -import antlr.*; -import antlr.collections.impl.BitSet; import java.io.InputStream; import java.util.Hashtable; +import antlr.ANTLRHashString; +import antlr.CharBufferNoBacktrackingNoInteractive; +import antlr.CharScannerNoBacktrackingNoInteractive; +import antlr.ScannerException; +import antlr.Token; +import antlr.Tokenizer; +import antlr.collections.impl.BitSet; + public class PSpecLexer extends CharScannerNoBacktrackingNoInteractive implements PSpecTokenTypes, Tokenizer { Modified: trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PSpecParser.java =================================================================== --- trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PSpecParser.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PSpecParser.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,11 +1,16 @@ package net.sf.jcontracts.idarwin.specification.impl.primitive_language; -import antlr.*; -import antlr.collections.impl.BitSet; -import java.io.PrintStream; import java.io.StringBufferInputStream; import java.util.Vector; +import antlr.LLkParserNoInteractive; +import antlr.NoViableAltException; +import antlr.ParserException; +import antlr.Token; +import antlr.TokenBuffer; +import antlr.Tokenizer; +import antlr.collections.impl.BitSet; + public class PSpecParser extends LLkParserNoInteractive implements PSpecTokenTypes { Modified: trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PatternFactory.java =================================================================== --- trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PatternFactory.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PatternFactory.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,9 +1,9 @@ package net.sf.jcontracts.idarwin.specification.impl.primitive_language; -import antlr.ParserException; -import java.io.PrintStream; import java.io.StringBufferInputStream; +import antlr.ParserException; + public class PatternFactory { public static Pattern createFrom(String p_expression) throws PatternSyntaxException { Modified: trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/SetPattern.java =================================================================== --- trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/SetPattern.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/SetPattern.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,6 +1,5 @@ package net.sf.jcontracts.idarwin.specification.impl.primitive_language; -import java.io.PrintStream; class SetPattern extends CompositePattern { Modified: trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/SingleDependencyConstraint.java =================================================================== --- trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/SingleDependencyConstraint.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/SingleDependencyConstraint.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,7 +1,5 @@ package net.sf.jcontracts.idarwin.specification.impl.primitive_language; -import antlr.ParserException; -import java.io.PrintStream; import java.io.StringBufferInputStream; import java.util.Enumeration; import java.util.Vector; @@ -9,6 +7,7 @@ import net.sf.jcontracts.idarwin.specification.impl.with_rules.IRule; import net.sf.jcontracts.idarwin.specification.openapi.IDependency; import net.sf.jcontracts.idarwin.specification.openapi.IllFormedSpecificationException; +import antlr.ParserException; public class SingleDependencyConstraint extends DependencyConstraint { Modified: trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/StrictlyLayerIdiom.java =================================================================== --- trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/StrictlyLayerIdiom.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/StrictlyLayerIdiom.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,9 +1,9 @@ package net.sf.jcontracts.idarwin.specification.impl.primitive_language; -import antlr.ParserException; -import java.io.PrintStream; import java.io.StringBufferInputStream; +import antlr.ParserException; + class StrictlyLayerIdiom extends Idiom { StrictlyLayerIdiom(String p) { Modified: trunk/source/java/net/sf/jcontracts/util/JavaEvaluator.java =================================================================== --- trunk/source/java/net/sf/jcontracts/util/JavaEvaluator.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/util/JavaEvaluator.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,8 +1,13 @@ package net.sf.jcontracts.util; -import java.io.*; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.PrintWriter; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; + import sun.tools.javac.Main; public class JavaEvaluator { Modified: trunk/source/java/net/sf/jcontracts/util/StringComparator.java =================================================================== --- trunk/source/java/net/sf/jcontracts/util/StringComparator.java 2006-11-24 10:13:20 UTC (rev 21) +++ trunk/source/java/net/sf/jcontracts/util/StringComparator.java 2006-11-24 11:11:22 UTC (rev 22) @@ -1,6 +1,5 @@ package net.sf.jcontracts.util; -import java.io.PrintStream; import java.util.Enumeration; import java.util.Vector; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <js...@us...> - 2006-12-04 18:10:11
|
Revision: 37 http://svn.sourceforge.net/jcontracts/?rev=37&view=rev Author: jstuyts Date: 2006-12-04 10:10:07 -0800 (Mon, 04 Dec 2006) Log Message: ----------- Removed unnecessary code. Modified Paths: -------------- trunk/source/java/net/sf/jcontracts/antlr/ANTLRHashString.java trunk/source/java/net/sf/jcontracts/antlr/ANTLRLexer.java trunk/source/java/net/sf/jcontracts/antlr/ANTLRParser.java trunk/source/java/net/sf/jcontracts/antlr/ANTLRTokdefLexer.java trunk/source/java/net/sf/jcontracts/antlr/CodeGenerator.java trunk/source/java/net/sf/jcontracts/antlr/DiagnosticCodeGenerator.java trunk/source/java/net/sf/jcontracts/antlr/TokdefTokenManager.java trunk/source/java/net/sf/jcontracts/antlr/actions/ActionLexer.java trunk/source/java/net/sf/jcontracts/antlr/collections/BitSetTest.java trunk/source/java/net/sf/jcontracts/antlr/collections/LLStackTest.java trunk/source/java/net/sf/jcontracts/antlr/collections/LListTest.java trunk/source/java/net/sf/jcontracts/antlr/preprocessor/PreprocessorLexer.java trunk/source/java/net/sf/jcontracts/antlr/preprocessor/Tool.java trunk/source/java/net/sf/jcontracts/argparser/ArgLexer.java trunk/source/java/net/sf/jcontracts/codeparser/DottyVisitor.java trunk/source/java/net/sf/jcontracts/codeparser/Dotty_Component_CommonLevel.java trunk/source/java/net/sf/jcontracts/codeparser/Dotty_Component_TypeLevel.java trunk/source/java/net/sf/jcontracts/codeparser/JavaLexer.java trunk/source/java/net/sf/jcontracts/codeparser/JavaParser.java trunk/source/java/net/sf/jcontracts/codeparser/Method.java trunk/source/java/net/sf/jcontracts/codeparser/Parser.java trunk/source/java/net/sf/jcontracts/dependencyanalyzer/Node.java trunk/source/java/net/sf/jcontracts/icontract/AssertionExpression.java trunk/source/java/net/sf/jcontracts/icontract/Class.java trunk/source/java/net/sf/jcontracts/icontract/Darwin.java trunk/source/java/net/sf/jcontracts/icontract/Interface.java trunk/source/java/net/sf/jcontracts/icontract/MergeOption.java trunk/source/java/net/sf/jcontracts/icontract/Method.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/Group.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PSpecLexer.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/SetPattern.java Modified: trunk/source/java/net/sf/jcontracts/antlr/ANTLRHashString.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/ANTLRHashString.java 2006-12-04 17:08:12 UTC (rev 36) +++ trunk/source/java/net/sf/jcontracts/antlr/ANTLRHashString.java 2006-12-04 18:10:07 UTC (rev 37) @@ -118,6 +118,4 @@ private int len; private CharScanner lexer; - - private static final int prime = 151; } Modified: trunk/source/java/net/sf/jcontracts/antlr/ANTLRLexer.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/ANTLRLexer.java 2006-12-04 17:08:12 UTC (rev 36) +++ trunk/source/java/net/sf/jcontracts/antlr/ANTLRLexer.java 2006-12-04 18:10:07 UTC (rev 37) @@ -1750,87 +1750,70 @@ case 13: // '\r' case 32: // ' ' mWS(true); - Token _tmp = super._returnToken; break; case 47: // '/' mCOMMENT(true); - Token _tmp1 = super._returnToken; break; case 63: // '?' mQUESTION(true); - Token _tmp2 = super._returnToken; break; case 35: // '#' mTREE_BEGIN(true); - Token _tmp3 = super._returnToken; break; case 40: // '(' mLPAREN(true); - Token _tmp4 = super._returnToken; break; case 41: // ')' mRPAREN(true); - Token _tmp5 = super._returnToken; break; case 58: // ':' mCOLON(true); - Token _tmp6 = super._returnToken; break; case 42: // '*' mSTAR(true); - Token _tmp7 = super._returnToken; break; case 43: // '+' mPLUS(true); - Token _tmp8 = super._returnToken; break; case 59: // ';' mSEMI(true); - Token _tmp9 = super._returnToken; break; case 94: // '^' mCARET(true); - Token _tmp10 = super._returnToken; break; case 33: // '!' mBANG(true); - Token _tmp11 = super._returnToken; break; case 124: // '|' mOR(true); - Token _tmp12 = super._returnToken; break; case 126: // '~' mNOT_OP(true); - Token _tmp13 = super._returnToken; break; case 125: // '}' mRCURLY(true); - Token _tmp14 = super._returnToken; break; case 39: // '\'' mCHAR_LITERAL(true); - Token _tmp15 = super._returnToken; break; case 34: // '"' mSTRING_LITERAL(true); - Token _tmp16 = super._returnToken; break; case 48: // '0' @@ -1844,17 +1827,14 @@ case 56: // '8' case 57: // '9' mINT(true); - Token _tmp17 = super._returnToken; break; case 91: // '[' mARG_ACTION(true); - Token _tmp18 = super._returnToken; break; case 123: // '{' mACTION(true); - Token _tmp19 = super._returnToken; break; case 65: // 'A' @@ -1884,7 +1864,6 @@ case 89: // 'Y' case 90: // 'Z' mTOKEN_REF(true); - Token _tmp20 = super._returnToken; break; case 97: // 'a' @@ -1914,37 +1893,31 @@ case 121: // 'y' case 122: // 'z' mRULE_REF(true); - Token _tmp21 = super._returnToken; break; case 45: // '-' mTREE_SPECIFIER(true); - Token _tmp22 = super._returnToken; break; default: if (super.la_1 == '=' && super.la_2 == '>') { mIMPLIES(true); - Token _tmp23 = super._returnToken; break; } if (super.la_1 == '.' && super.la_2 == '.') { mRANGE(true); - Token _tmp24 = super._returnToken; break; } if (super.la_1 == '=') { mASSIGN(true); - Token _tmp25 = super._returnToken; break; } if (super.la_1 == '.') { mWILDCARD(true); - Token _tmp26 = super._returnToken; break; } if (LA(1) != '\uFFFF') Modified: trunk/source/java/net/sf/jcontracts/antlr/ANTLRParser.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/ANTLRParser.java 2006-12-04 17:08:12 UTC (rev 36) +++ trunk/source/java/net/sf/jcontracts/antlr/ANTLRParser.java 2006-12-04 18:10:07 UTC (rev 37) @@ -1673,8 +1673,6 @@ public static final String version = "2.20b7"; - private static final boolean DEBUG_PARSER = false; - ANTLRGrammarParseBehavior behavior; Tool tool; Modified: trunk/source/java/net/sf/jcontracts/antlr/ANTLRTokdefLexer.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/ANTLRTokdefLexer.java 2006-12-04 17:08:12 UTC (rev 36) +++ trunk/source/java/net/sf/jcontracts/antlr/ANTLRTokdefLexer.java 2006-12-04 18:10:07 UTC (rev 37) @@ -798,27 +798,22 @@ case 13: // '\r' case 32: // ' ' mWS(true); - Token _tmp = super._returnToken; break; case 40: // '(' mLPAREN(true); - Token _tmp1 = super._returnToken; break; case 41: // ')' mRPAREN(true); - Token _tmp2 = super._returnToken; break; case 61: // '=' mASSIGN(true); - Token _tmp3 = super._returnToken; break; case 34: // '"' mSTRING(true); - Token _tmp4 = super._returnToken; break; case 65: // 'A' @@ -874,7 +869,6 @@ case 121: // 'y' case 122: // 'z' mID(true); - Token _tmp5 = super._returnToken; break; case 48: // '0' @@ -888,20 +882,17 @@ case 56: // '8' case 57: // '9' mINT(true); - Token _tmp6 = super._returnToken; break; default: if (super.la_1 == '/' && super.la_2 == '/') { mSL_COMMENT(true); - Token _tmp7 = super._returnToken; break; } if (super.la_1 == '/' && super.la_2 == '*') { mML_COMMENT(true); - Token _tmp8 = super._returnToken; break; } if (LA(1) != '\uFFFF') Modified: trunk/source/java/net/sf/jcontracts/antlr/CodeGenerator.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/CodeGenerator.java 2006-12-04 17:08:12 UTC (rev 36) +++ trunk/source/java/net/sf/jcontracts/antlr/CodeGenerator.java 2006-12-04 18:10:07 UTC (rev 37) @@ -301,7 +301,6 @@ { ActionLexer lexer = new ActionLexer(actionStr, currentRule, this, tInfo); lexer.setLineOffset(line); - lexer.setTool(tool); try { lexer.mACTION(true); @@ -414,6 +413,4 @@ protected int bitsetTestThreshold; - private static boolean OLD_ACTION_TRANSLATOR = true; - } Modified: trunk/source/java/net/sf/jcontracts/antlr/DiagnosticCodeGenerator.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/DiagnosticCodeGenerator.java 2006-12-04 17:08:12 UTC (rev 36) +++ trunk/source/java/net/sf/jcontracts/antlr/DiagnosticCodeGenerator.java 2006-12-04 18:10:07 UTC (rev 37) @@ -449,7 +449,6 @@ for (int i = 0; i < blk.alternatives.size(); i++) { Alternative alt = blk.getAlternativeAt(i); - AlternativeElement _tmp = alt.head; println(""); if (i != 0) { Modified: trunk/source/java/net/sf/jcontracts/antlr/TokdefTokenManager.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/TokdefTokenManager.java 2006-12-04 17:08:12 UTC (rev 36) +++ trunk/source/java/net/sf/jcontracts/antlr/TokdefTokenManager.java 2006-12-04 18:10:07 UTC (rev 37) @@ -80,8 +80,6 @@ } } - private int dummy; - private String filename; private boolean noDefine; Modified: trunk/source/java/net/sf/jcontracts/antlr/actions/ActionLexer.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/actions/ActionLexer.java 2006-12-04 17:08:12 UTC (rev 36) +++ trunk/source/java/net/sf/jcontracts/antlr/actions/ActionLexer.java 2006-12-04 18:10:07 UTC (rev 37) @@ -492,7 +492,6 @@ match('#'); super.text.setLength(_saveIndex); mTREE(true); - Token _tmp = super._returnToken; } else if(super.la_1 == '#' && _tokenSet_2.member(super.la_2)) { @@ -519,7 +518,6 @@ match('#'); super.text.setLength(_saveIndex); mAST_CONSTRUCTOR(true); - Token _tmp1 = super._returnToken; } else if(super.la_1 == '#' && super.la_2 == '#') { @@ -1840,7 +1838,6 @@ int _begin = super.text.length(); int _ttype = 15; mID(true); - Token _tmp = super._returnToken; if(_tokenSet_3.member(super.la_1) && _tokenSet_14.member(super.la_2)) { int _saveIndex = super.text.length(); @@ -2272,7 +2269,6 @@ if(super.la_1 == '=' && _tokenSet_5.member(super.la_2)) { match('='); - char _tmp = super.la_1; matchNot('='); if(transInfo != null && transInfo.refRuleRoot != null) { @@ -2346,7 +2342,6 @@ try { mACTION(true); - Token _tmp = super._returnToken; _ttype = super._returnToken.getType(); if(_ttype != -1) { @@ -2372,15 +2367,9 @@ setLine(lineOffset); } - public void setTool(Tool tool) - { - this.tool = tool; - } - protected RuleBlock currentRule; protected CodeGenerator generator; protected int lineOffset; - private Tool tool; ActionTransInfo transInfo; private static final long _tokenSet_0_data_[] = { 0xffff7f63fffffbf8L, 0x7fffffffffffffffL, 0L, 0L Modified: trunk/source/java/net/sf/jcontracts/antlr/collections/BitSetTest.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/collections/BitSetTest.java 2006-12-04 17:08:12 UTC (rev 36) +++ trunk/source/java/net/sf/jcontracts/antlr/collections/BitSetTest.java 2006-12-04 18:10:07 UTC (rev 37) @@ -5,8 +5,6 @@ package net.sf.jcontracts.antlr.collections; -import java.io.PrintStream; - import net.sf.jcontracts.antlr.collections.impl.BitSet; public class BitSetTest Modified: trunk/source/java/net/sf/jcontracts/antlr/collections/LLStackTest.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/collections/LLStackTest.java 2006-12-04 17:08:12 UTC (rev 36) +++ trunk/source/java/net/sf/jcontracts/antlr/collections/LLStackTest.java 2006-12-04 18:10:07 UTC (rev 37) @@ -5,7 +5,6 @@ package net.sf.jcontracts.antlr.collections; -import java.io.PrintStream; import java.util.Enumeration; import net.sf.jcontracts.antlr.collections.impl.LList; Modified: trunk/source/java/net/sf/jcontracts/antlr/collections/LListTest.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/collections/LListTest.java 2006-12-04 17:08:12 UTC (rev 36) +++ trunk/source/java/net/sf/jcontracts/antlr/collections/LListTest.java 2006-12-04 18:10:07 UTC (rev 37) @@ -5,7 +5,6 @@ package net.sf.jcontracts.antlr.collections; -import java.io.PrintStream; import java.util.Enumeration; import java.util.NoSuchElementException; Modified: trunk/source/java/net/sf/jcontracts/antlr/preprocessor/PreprocessorLexer.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/preprocessor/PreprocessorLexer.java 2006-12-04 17:08:12 UTC (rev 36) +++ trunk/source/java/net/sf/jcontracts/antlr/preprocessor/PreprocessorLexer.java 2006-12-04 18:10:07 UTC (rev 37) @@ -1727,47 +1727,38 @@ { case 58: // ':' mRULE_BLOCK(true); - Token _tmp = super._returnToken; break; case 40: // '(' mSUBRULE_BLOCK(true); - Token _tmp1 = super._returnToken; break; case 47: // '/' mCOMMENT(true); - Token _tmp2 = super._returnToken; break; case 123: // '{' mACTION(true); - Token _tmp3 = super._returnToken; break; case 34: // '"' mSTRING_LITERAL(true); - Token _tmp4 = super._returnToken; break; case 39: // '\'' mCHAR_LITERAL(true); - Token _tmp5 = super._returnToken; break; case 33: // '!' mBANG(true); - Token _tmp6 = super._returnToken; break; case 59: // ';' mSEMI(true); - Token _tmp7 = super._returnToken; break; case 125: // '}' mRCURLY(true); - Token _tmp8 = super._returnToken; break; case 65: // 'A' @@ -1824,7 +1815,6 @@ case 121: // 'y' case 122: // 'z' mID_OR_KEYWORD(true); - Token _tmp9 = super._returnToken; break; case 9: // '\t' @@ -1832,17 +1822,14 @@ case 13: // '\r' case 32: // ' ' mWS(true); - Token _tmp10 = super._returnToken; break; case 61: // '=' mASSIGN_RHS(true); - Token _tmp11 = super._returnToken; break; case 91: // '[' mARG_ACTION(true); - Token _tmp12 = super._returnToken; break; default: Modified: trunk/source/java/net/sf/jcontracts/antlr/preprocessor/Tool.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/preprocessor/Tool.java 2006-12-04 17:08:12 UTC (rev 36) +++ trunk/source/java/net/sf/jcontracts/antlr/preprocessor/Tool.java 2006-12-04 18:10:07 UTC (rev 37) @@ -7,7 +7,6 @@ import java.io.FileNotFoundException; import java.io.IOException; -import java.io.PrintStream; import java.util.Enumeration; import net.sf.jcontracts.antlr.collections.impl.Vector; Modified: trunk/source/java/net/sf/jcontracts/argparser/ArgLexer.java =================================================================== --- trunk/source/java/net/sf/jcontracts/argparser/ArgLexer.java 2006-12-04 17:08:12 UTC (rev 36) +++ trunk/source/java/net/sf/jcontracts/argparser/ArgLexer.java 2006-12-04 18:10:07 UTC (rev 37) @@ -612,17 +612,14 @@ { case 44: // ',' mCOMMA(true); - Token _tmp = super._returnToken; break; case 34: // '"' mDOUBLEQUOTE(true); - Token _tmp1 = super._returnToken; break; case 39: // '\'' mQUOTE(true); - Token _tmp2 = super._returnToken; break; case 9: // '\t' @@ -630,32 +627,27 @@ case 13: // '\r' case 32: // ' ' mWS(true); - Token _tmp3 = super._returnToken; break; default: if (super.la_1 == '/' && super.la_2 == '/' && LA(3) >= '\003' && LA(3) <= '\377') { mSL_COMMENT(true); - Token _tmp4 = super._returnToken; break; } if (super.la_1 == '-' && _tokenSet_0.member(super.la_2)) { mOPTION_WITH_ARG(true); - Token _tmp5 = super._returnToken; break; } if (super.la_1 == '-') { mDASH(true); - Token _tmp6 = super._returnToken; break; } if (_tokenSet_1.member(super.la_1)) { mIDENT(true); - Token _tmp7 = super._returnToken; break; } if (LA(1) != '\uFFFF') Modified: trunk/source/java/net/sf/jcontracts/codeparser/DottyVisitor.java =================================================================== --- trunk/source/java/net/sf/jcontracts/codeparser/DottyVisitor.java 2006-12-04 17:08:12 UTC (rev 36) +++ trunk/source/java/net/sf/jcontracts/codeparser/DottyVisitor.java 2006-12-04 18:10:07 UTC (rev 37) @@ -33,8 +33,6 @@ private IDependencyFilter filter; - private Vector unusedConstraints; - public DottyVisitor(IArchitectureSpecification spec, String filename, String title, boolean layoutLR, boolean directed, int componentVisitorDetailLevel, boolean showPackages, Vector quietList, boolean check, boolean do_not_show_dependecy_details, IDependencyFilter filter) throws IOException @@ -45,7 +43,6 @@ cluster_index = 1; specification = null; this.filter = null; - unusedConstraints = new Vector(); specification = spec; if (componentVisitorDetailLevel == 2) { Modified: trunk/source/java/net/sf/jcontracts/codeparser/Dotty_Component_CommonLevel.java =================================================================== --- trunk/source/java/net/sf/jcontracts/codeparser/Dotty_Component_CommonLevel.java 2006-12-04 17:08:12 UTC (rev 36) +++ trunk/source/java/net/sf/jcontracts/codeparser/Dotty_Component_CommonLevel.java 2006-12-04 18:10:07 UTC (rev 37) @@ -5,7 +5,6 @@ import java.util.Hashtable; import java.util.Vector; -import net.sf.jcontracts.icontract.QuietOption; import net.sf.jcontracts.idarwin.specification.openapi.IArchitectureSpecification; public class Dotty_Component_CommonLevel @@ -145,7 +144,6 @@ } } } - QuietOption _tmp = QuietOption.theQuietOption; return result; } Modified: trunk/source/java/net/sf/jcontracts/codeparser/Dotty_Component_TypeLevel.java =================================================================== --- trunk/source/java/net/sf/jcontracts/codeparser/Dotty_Component_TypeLevel.java 2006-12-04 17:08:12 UTC (rev 36) +++ trunk/source/java/net/sf/jcontracts/codeparser/Dotty_Component_TypeLevel.java 2006-12-04 18:10:07 UTC (rev 37) @@ -9,18 +9,14 @@ public class Dotty_Component_TypeLevel extends Dotty_Component_CommonLevel implements IDotty_Component_Level { - private Vector previouslinks; - public Dotty_Component_TypeLevel(IDependencyFilter filter, boolean performChecks) { - previouslinks = new Vector(); super.performChecks = performChecks; super.filter = filter; } public Dotty_Component_TypeLevel(boolean performChecks) { - previouslinks = new Vector(); super.performChecks = performChecks; } Modified: trunk/source/java/net/sf/jcontracts/codeparser/JavaLexer.java =================================================================== --- trunk/source/java/net/sf/jcontracts/codeparser/JavaLexer.java 2006-12-04 17:08:12 UTC (rev 36) +++ trunk/source/java/net/sf/jcontracts/codeparser/JavaLexer.java 2006-12-04 18:10:07 UTC (rev 37) @@ -21,8 +21,6 @@ private int _suspectedTokenStartPosition; - private String _filename; - private int _last_newline_position; private static final long _tokenSet_0_data_[] = @@ -87,7 +85,6 @@ _data = null; _position = 0; _suspectedTokenStartPosition = 0; - _filename = "?"; _last_newline_position = 0; super.literals = new Hashtable(); super.literals.put(new ANTLRHashString("synchronized", this), new Integer(32)); @@ -165,11 +162,6 @@ return _suspectedTokenStartPosition - _last_newline_position; } - private String getFilename() - { - return _filename; - } - int getPosition() { return _position; @@ -2897,57 +2889,46 @@ { case 63: // '?' mQUESTION(true); - Token _tmp = super._returnToken; break; case 40: // '(' mLPAREN(true); - Token _tmp1 = super._returnToken; break; case 41: // ')' mRPAREN(true); - Token _tmp2 = super._returnToken; break; case 91: // '[' mLBRACK(true); - Token _tmp3 = super._returnToken; break; case 93: // ']' mRBRACK(true); - Token _tmp4 = super._returnToken; break; case 123: // '{' mLCURLY(true); - Token _tmp5 = super._returnToken; break; case 125: // '}' mRCURLY(true); - Token _tmp6 = super._returnToken; break; case 58: // ':' mCOLON(true); - Token _tmp7 = super._returnToken; break; case 44: // ',' mCOMMA(true); - Token _tmp8 = super._returnToken; break; case 126: // '~' mBNOT(true); - Token _tmp9 = super._returnToken; break; case 59: // ';' mSEMI(true); - Token _tmp10 = super._returnToken; break; case 9: // '\t' @@ -2956,22 +2937,18 @@ case 13: // '\r' case 32: // ' ' mWS(true); - Token _tmp11 = super._returnToken; break; case 35: // '#' mPREPROC_LINE(true); - Token _tmp12 = super._returnToken; break; case 39: // '\'' mCHAR_LITERAL(true); - Token _tmp13 = super._returnToken; break; case 34: // '"' mSTRING_LITERAL(true); - Token _tmp14 = super._returnToken; break; case 36: // '$' @@ -3029,249 +3006,208 @@ case 121: // 'y' case 122: // 'z' mIDENT(true); - Token _tmp15 = super._returnToken; break; default: if (super.la_1 == '>' && super.la_2 == '>' && LA(3) == '>' && LA(4) == '=') { mBSR_ASSIGN(true); - Token _tmp16 = super._returnToken; break; } if (super.la_1 == '/' && super.la_2 == '*' && LA(3) == '*' && LA(4) == '/') { mTRIV_COMMENT(true); - Token _tmp17 = super._returnToken; break; } if (super.la_1 == '/' && super.la_2 == '*' && LA(3) == '*' && LA(4) >= '\003' && LA(4) <= '\377') { mCODE_COMMENT(true); - Token _tmp18 = super._returnToken; break; } if (super.la_1 == '>' && super.la_2 == '>' && LA(3) == '=') { mSR_ASSIGN(true); - Token _tmp19 = super._returnToken; break; } if (super.la_1 == '>' && super.la_2 == '>' && LA(3) == '>') { mBSR(true); - Token _tmp20 = super._returnToken; break; } if (super.la_1 == '<' && super.la_2 == '<' && LA(3) == '=') { mSL_ASSIGN(true); - Token _tmp21 = super._returnToken; break; } if (super.la_1 == '/' && super.la_2 == '*' && _tokenSet_0.member(LA(3))) { mML_COMMENT(true); - Token _tmp22 = super._returnToken; break; } if (super.la_1 == '=' && super.la_2 == '=') { mEQUAL(true); - Token _tmp23 = super._returnToken; break; } if (super.la_1 == '!' && super.la_2 == '=') { mNOT_EQUAL(true); - Token _tmp24 = super._returnToken; break; } if (super.la_1 == '/' && super.la_2 == '=') { mDIV_ASSIGN(true); - Token _tmp25 = super._returnToken; break; } if (super.la_1 == '+' && super.la_2 == '=') { mPLUS_ASSIGN(true); - Token _tmp26 = super._returnToken; break; } if (super.la_1 == '+' && super.la_2 == '+') { mINC(true); - Token _tmp27 = super._returnToken; break; } if (super.la_1 == '-' && super.la_2 == '=') { mMINUS_ASSIGN(true); - Token _tmp28 = super._returnToken; break; } if (super.la_1 == '-' && super.la_2 == '-') { mDEC(true); - Token _tmp29 = super._returnToken; break; } if (super.la_1 == '*' && super.la_2 == '=') { mSTAR_ASSIGN(true); - Token _tmp30 = super._returnToken; break; } if (super.la_1 == '%' && super.la_2 == '=') { mMOD_ASSIGN(true); - Token _tmp31 = super._returnToken; break; } if (super.la_1 == '>' && super.la_2 == '>') { mSR(true); - Token _tmp32 = super._returnToken; break; } if (super.la_1 == '>' && super.la_2 == '=') { mGE(true); - Token _tmp33 = super._returnToken; break; } if (super.la_1 == '<' && super.la_2 == '<') { mSL(true); - Token _tmp34 = super._returnToken; break; } if (super.la_1 == '<' && super.la_2 == '=') { mLE(true); - Token _tmp35 = super._returnToken; break; } if (super.la_1 == '^' && super.la_2 == '=') { mBXOR_ASSIGN(true); - Token _tmp36 = super._returnToken; break; } if (super.la_1 == '|' && super.la_2 == '=') { mBOR_ASSIGN(true); - Token _tmp37 = super._returnToken; break; } if (super.la_1 == '|' && super.la_2 == '|') { mLOR(true); - Token _tmp38 = super._returnToken; break; } if (super.la_1 == '&' && super.la_2 == '=') { mBAND_ASSIGN(true); - Token _tmp39 = super._returnToken; break; } if (super.la_1 == '&' && super.la_2 == '&') { mLAND(true); - Token _tmp40 = super._returnToken; break; } if (super.la_1 == '/' && super.la_2 == '/') { mSL_COMMENT(true); - Token _tmp41 = super._returnToken; break; } if (super.la_1 == '.') { mDOT(true); - Token _tmp42 = super._returnToken; break; } if (super.la_1 == '=') { mASSIGN(true); - Token _tmp43 = super._returnToken; break; } if (super.la_1 == '!') { mLNOT(true); - Token _tmp44 = super._returnToken; break; } if (super.la_1 == '/') { mDIV(true); - Token _tmp45 = super._returnToken; break; } if (super.la_1 == '+') { mPLUS(true); - Token _tmp46 = super._returnToken; break; } if (super.la_1 == '-') { mMINUS(true); - Token _tmp47 = super._returnToken; break; } if (super.la_1 == '*') { mSTAR(true); - Token _tmp48 = super._returnToken; break; } if (super.la_1 == '%') { mMOD(true); - Token _tmp49 = super._returnToken; break; } if (super.la_1 == '>') { mGT(true); - Token _tmp50 = super._returnToken; break; } if (super.la_1 == '<') { mLT(true); - Token _tmp51 = super._returnToken; break; } if (super.la_1 == '^') { mBXOR(true); - Token _tmp52 = super._returnToken; break; } if (super.la_1 == '|') { mBOR(true); - Token _tmp53 = super._returnToken; break; } if (super.la_1 == '&') { mBAND(true); - Token _tmp54 = super._returnToken; break; } if (_tokenSet_1.member(super.la_1)) { mNUM_INT(true); - Token _tmp55 = super._returnToken; break; } if (LA(1) != '\uFFFF') @@ -3307,10 +3243,4 @@ { _data = o; } - - void setFilename(String filename) - { - _filename = filename; - } - } Modified: trunk/source/java/net/sf/jcontracts/codeparser/JavaParser.java =================================================================== --- trunk/source/java/net/sf/jcontracts/codeparser/JavaParser.java 2006-12-04 17:08:12 UTC (rev 36) +++ trunk/source/java/net/sf/jcontracts/codeparser/JavaParser.java 2006-12-04 18:10:07 UTC (rev 37) @@ -30,8 +30,6 @@ private static String otherConst = "other"; - private boolean displayMissingTypeWarning; - private boolean captureAllDependencies; private Vector _annotations; @@ -485,7 +483,6 @@ protected JavaParser(TokenBuffer tokenBuf, int k) { super(tokenBuf, k); - displayMissingTypeWarning = true; captureAllDependencies = true; _annotations = new Vector(); importList_ = new Vector(); @@ -508,7 +505,6 @@ protected JavaParser(Tokenizer lexer, int k) { super(lexer, k); - displayMissingTypeWarning = true; captureAllDependencies = true; _annotations = new Vector(); importList_ = new Vector(); @@ -1531,11 +1527,6 @@ captureAllDependencies = false; } - void disableDisplayMissingTypeWarning() - { - displayMissingTypeWarning = false; - } - public void enableCaptureAllDependencies() { captureAllDependencies = true; @@ -1546,11 +1537,6 @@ captureAllDep = true; } - void enableDisplayMissingTypeWarning() - { - displayMissingTypeWarning = true; - } - private void enterMethod(Method m) { currentMethod = m; @@ -2768,7 +2754,6 @@ filename = "<System.in>"; } JavaLexer lexer = new JavaLexer(is); - lexer.setFilename(filename); lexer.setTokenObjectClass("net.sf.jcontracts.codeParser.ExtendedToken"); JavaParser parser = new JavaParser(lexer); MetaclassFactory metaclassFactory = new MetaclassFactory(filename); Modified: trunk/source/java/net/sf/jcontracts/codeparser/Method.java =================================================================== --- trunk/source/java/net/sf/jcontracts/codeparser/Method.java 2006-12-04 17:08:12 UTC (rev 36) +++ trunk/source/java/net/sf/jcontracts/codeparser/Method.java 2006-12-04 18:10:07 UTC (rev 37) @@ -21,8 +21,6 @@ private int _endOfConstructorSuperCall; - private int _numberOfReturnStatements; - protected Vector newedTypes; protected Vector castedTypes; @@ -40,7 +38,6 @@ _body_indentation = 0; _endOfLastStatement = 0; _endOfConstructorSuperCall = 0; - _numberOfReturnStatements = 0; newedTypes = new Vector(); castedTypes = new Vector(); localVarTypes = new Vector(); Modified: trunk/source/java/net/sf/jcontracts/codeparser/Parser.java =================================================================== --- trunk/source/java/net/sf/jcontracts/codeparser/Parser.java 2006-12-04 17:08:12 UTC (rev 36) +++ trunk/source/java/net/sf/jcontracts/codeparser/Parser.java 2006-12-04 18:10:07 UTC (rev 37) @@ -17,7 +17,6 @@ public Parser(InputStream is, String filename) { _lexer = new JavaLexer(is); - _lexer.setFilename(filename); _lexer.setTokenObjectClass("net.sf.jcontracts.codeParser.ExtendedToken"); _javaparser = new JavaParser(_lexer); _javaparser.setFilename(filename); @@ -45,7 +44,6 @@ public Vector getAnnotations() throws ParserException { - _javaparser.enableDisplayMissingTypeWarning(); _javaparser.compilationUnit(); return _javaparser.getAnnotations(); } Modified: trunk/source/java/net/sf/jcontracts/dependencyanalyzer/Node.java =================================================================== --- trunk/source/java/net/sf/jcontracts/dependencyanalyzer/Node.java 2006-12-04 17:08:12 UTC (rev 36) +++ trunk/source/java/net/sf/jcontracts/dependencyanalyzer/Node.java 2006-12-04 18:10:07 UTC (rev 37) @@ -134,11 +134,6 @@ return !found; } - private boolean isVisited() - { - return visited4marked_; - } - public void mark(BooleanBlockWithNodeArg block) { if (!visited4marked_ && !marked_) Modified: trunk/source/java/net/sf/jcontracts/icontract/AssertionExpression.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/AssertionExpression.java 2006-12-04 17:08:12 UTC (rev 36) +++ trunk/source/java/net/sf/jcontracts/icontract/AssertionExpression.java 2006-12-04 18:10:07 UTC (rev 37) @@ -373,7 +373,7 @@ { String code = ""; String elementType = getElementType(); - String _tmp = "__" + getMangledValue(getElementVar()) + "_counter"; + getMangledValue(getElementVar()); String elementVar = getElementVar(); String resultVar = "__result_" + getMangledValue(getElementVar()); String quantificationDomain = getQuantificationDomain(); @@ -707,7 +707,7 @@ { String code = ""; String elementType = getElementType(); - String _tmp = "__" + getMangledValue(getElementVar()) + "_counter"; + getMangledValue(getElementVar()); String elementVar = getElementVar(); String resultVar = "__result_" + getMangledValue(getElementVar()); String quantificationDomain = getQuantificationDomain(); Modified: trunk/source/java/net/sf/jcontracts/icontract/Class.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/Class.java 2006-12-04 17:08:12 UTC (rev 36) +++ trunk/source/java/net/sf/jcontracts/icontract/Class.java 2006-12-04 18:10:07 UTC (rev 37) @@ -15,12 +15,6 @@ public static final String REP_PREFIX = "__REP_"; - private static final String INV_GET_METHOD = "__JContractS__getInvariantList"; - - private static final String INV_SO_GET_METHOD = "__JContractS__getInvariantSourceList"; - - private static final String INVARIANT_TAG_NAME = "invariant"; - public static final String INVARIANT_CHECK_METHOD_NAME = "__check_invariant__"; public static final String INVARIANT_CHECK_AT_ENTRY = "__inv_check_at_entry__"; @@ -31,10 +25,6 @@ public static final char EXCEPTION_CLASS_MARKER = 35; - private static final String START_SEPARATION_STRING = "//#*#-------------------------------------------------------------------------------"; - - private static final String END_SEPARATION_STRING = "//-------------------------------------------------------------------------------#*#"; - public static boolean generateSuperCheckCallFlag = false; public static boolean doWrapExceptionOptionFlag = false; @@ -1804,7 +1794,7 @@ Method theIGMethod = c.getMethod("__JContractS__getInvariantList", noArgArray); try { - Vector _tmp = (Vector) theIGMethod.invoke(c, noArgArray); + theIGMethod.invoke(c, noArgArray); res = true; } catch (InvocationTargetException _ex) Modified: trunk/source/java/net/sf/jcontracts/icontract/Darwin.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/Darwin.java 2006-12-04 17:08:12 UTC (rev 36) +++ trunk/source/java/net/sf/jcontracts/icontract/Darwin.java 2006-12-04 18:10:07 UTC (rev 37) @@ -19,10 +19,6 @@ { private static final Logger log = Logger.getLogger(Darwin.class); - private static final String LANGUAGE_START_TAG = "<idarwin language="; - - private static final String LANGUAGE_END_TAG = "</idarwin>"; - public static boolean process(String args[], Vector specset, boolean layoutLR, boolean directed, String outputfilename, boolean check, int componentDetailLevel, boolean showPackages, Vector quietList, Vector allFiles, Vector changedFiles, String srcbase, boolean do_not_show_dependecy_details, Modified: trunk/source/java/net/sf/jcontracts/icontract/Interface.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/Interface.java 2006-12-04 17:08:12 UTC (rev 36) +++ trunk/source/java/net/sf/jcontracts/icontract/Interface.java 2006-12-04 18:10:07 UTC (rev 37) @@ -15,12 +15,6 @@ public static final String REP_PREFIX = "__REP_"; - private static final String INV_GET_METHOD = " __JContractS__getInvariantList"; - - private static final String INV_SO_GET_METHOD = " __JContractS__getInvariantSourceList"; - - private static final String INVARIANT_TAG_NAME = "invariant"; - public Interface(String name, String filename, int line_number) { super(name, filename, line_number); @@ -1001,7 +995,7 @@ Method theIGMethod = c.getMethod(" __JContractS__getInvariantList", noArgArray); try { - Vector _tmp = (Vector) theIGMethod.invoke(c, noArgArray); + theIGMethod.invoke(c, noArgArray); res = true; } catch (InvocationTargetException _ex) Modified: trunk/source/java/net/sf/jcontracts/icontract/MergeOption.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/MergeOption.java 2006-12-04 17:08:12 UTC (rev 36) +++ trunk/source/java/net/sf/jcontracts/icontract/MergeOption.java 2006-12-04 18:10:07 UTC (rev 37) @@ -286,10 +286,6 @@ DefaultExceptionOption defaultExceptionOption = null; for (int i = 0; i < options.size(); i++) { - if ("c".compareTo(((Option) options.elementAt(i)).getName()) == 0) - { - CompilerOption _tmp = (CompilerOption) options.elementAt(i); - } if ("n".compareTo(((Option) options.elementAt(i)).getName()) == 0) { noRepositoryCompilationOption = (NoRepositoryCompilationOption) options.elementAt(i); @@ -314,7 +310,6 @@ } if ("i".compareTo(((Option) options.elementAt(i)).getName()) == 0) { - InvCheckCallOption _tmp1 = (InvCheckCallOption) options.elementAt(i); Class.generateSuperCheckCallFlag = true; } if ("w".compareTo(((Option) options.elementAt(i)).getName()) == 0) Modified: trunk/source/java/net/sf/jcontracts/icontract/Method.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/Method.java 2006-12-04 17:08:12 UTC (rev 36) +++ trunk/source/java/net/sf/jcontracts/icontract/Method.java 2006-12-04 18:10:07 UTC (rev 37) @@ -13,34 +13,14 @@ { private static final Logger log = Logger.getLogger(Method.class); - private static final String PRECONDITION_TAG_NAME_1 = "pre"; - - private static final String PRECONDITION_TAG_NAME_2 = "require"; - - private static final String POSTCONDITION_TAG_NAME_1 = "post"; - - private static final String POSTCONDITION_TAG_NAME_2 = "ensure"; - public static final String REP_PREFIX = "__REP_"; - private static final String PRE_GET_METHOD = " __JContractS__getPreList"; - - private static final String POST_GET_METHOD = " __JContractS__getPostList"; - - private static final char EXCEPTION_CLASS_MARKER = 35; - public static final String RETURN_VALUE_HOLDER_NAME = "__return_value_holder_"; - private static final String START_SEPARATION_STRING = "//#*#-------------------------------------------------------------------------------"; - - private static final String END_SEPARATION_STRING = "//-------------------------------------------------------------------------------#*#"; - public static boolean doWrapExceptionOptionFlag = false; public static String defaultExceptionClassName = "RuntimeException"; - private static final String impli = "implies"; - public Method(String name, Vector parameterList, String filename, int line_number) { super(name, parameterList, filename, line_number); @@ -2485,7 +2465,7 @@ java.lang.reflect.Method theIGMethod = c.getMethod(mangleExpression(methodName), noArgArray); try { - Vector _tmp = (Vector) theIGMethod.invoke(c, noArgArray); + theIGMethod.invoke(c, noArgArray); res = true; } catch (InvocationTargetException _ex) @@ -2528,7 +2508,7 @@ java.lang.reflect.Method theIGMethod = c.getMethod(mangleExpression(methodName), noArgArray); try { - Vector _tmp = (Vector) theIGMethod.invoke(c, noArgArray); + theIGMethod.invoke(c, noArgArray); res = true; } catch (InvocationTargetException _ex) Modified: trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/Group.java =================================================================== --- trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/Group.java 2006-12-04 17:08:12 UTC (rev 36) +++ trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/Group.java 2006-12-04 18:10:07 UTC (rev 37) @@ -15,23 +15,6 @@ this.label = label; } - private String basicRemoveIfsubstitutedIn(String r) - { - StringBuffer buf = new StringBuffer(); - String tag = "[" + label + "]"; - String inset = ""; - int lastpos = 0; - for (int pos = -1; (pos = r.indexOf(tag, lastpos)) != -1;) - { - buf.append(r.substring(lastpos, pos)); - buf.append(inset); - lastpos = pos + tag.length(); - } - - buf.append(r.substring(lastpos, r.length())); - return buf.toString(); - } - private String basicSubstituteIn(String r) { StringBuffer buf = new StringBuffer(); Modified: trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PSpecLexer.java =================================================================== --- trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PSpecLexer.java 2006-12-04 17:08:12 UTC (rev 36) +++ trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PSpecLexer.java 2006-12-04 18:10:07 UTC (rev 37) @@ -19,8 +19,6 @@ private int _position; - private int _suspectedTokenStartPosition; - private static final long _tokenSet_0_data_[] = { -1032L, -1L, -1L, -1L, 0L, 0L, 0L, 0L @@ -33,7 +31,6 @@ super(cb); _data = null; _position = 0; - _suspectedTokenStartPosition = 0; super.literals = new Hashtable(); super.literals.put(new ANTLRHashString("mustnot", this), new Integer(6)); super.literals.put(new ANTLRHashString("may", this), new Integer(5)); @@ -700,22 +697,18 @@ { case 92: // '\\' mBACKSLASH(true); - Token _tmp = super._returnToken; break; case 123: // '{' mCBOPEN(true); - Token _tmp1 = super._returnToken; break; case 125: // '}' mCBCLOSE(true); - Token _tmp2 = super._returnToken; break; case 44: // ',' mCOMMA(true); - Token _tmp3 = super._returnToken; break; case 9: // '\t' @@ -723,17 +716,14 @@ case 13: // '\r' case 32: // ' ' mWS(true); - Token _tmp4 = super._returnToken; break; case 47: // '/' mSL_COMMENT(true); - Token _tmp5 = super._returnToken; break; case 34: // '"' mCOMMENT(true); - Token _tmp6 = super._returnToken; break; case 36: // '$' @@ -806,7 +796,6 @@ case 121: // 'y' case 122: // 'z' mIDENT(true); - Token _tmp7 = super._returnToken; break; default: @@ -836,7 +825,6 @@ { super.resetText(); setData(null); - _suspectedTokenStartPosition = getPosition(); } protected void setData(Object o) Modified: trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/SetPattern.java =================================================================== --- trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/SetPattern.java 2006-12-04 17:08:12 UTC (rev 36) +++ trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/SetPattern.java 2006-12-04 18:10:07 UTC (rev 37) @@ -63,28 +63,6 @@ return matchAny(s); } - private boolean matchAll(Pattern p) - { - boolean result = true; - for (int i = 0; result && i < patterns.length; i++) - { - result = p.match(patterns[i]); - } - - return result; - } - - private boolean matchAll(String s) - { - boolean result = true; - for (int i = 0; result && i < patterns.length; i++) - { - result = patterns[i].match(s); - } - - return result; - } - private boolean matchAny(Pattern p) { for (int i = 0; i < patterns.length; i++) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <js...@us...> - 2006-12-04 19:07:12
|
Revision: 38 http://svn.sourceforge.net/jcontracts/?rev=38&view=rev Author: jstuyts Date: 2006-12-04 11:07:09 -0800 (Mon, 04 Dec 2006) Log Message: ----------- Added serial version UID to serializable classes. Modified Paths: -------------- trunk/source/java/net/sf/jcontracts/antlr/ANTLRException.java trunk/source/java/net/sf/jcontracts/antlr/FileCopyException.java trunk/source/java/net/sf/jcontracts/antlr/MismatchedTokenException.java trunk/source/java/net/sf/jcontracts/antlr/NoViableAltException.java trunk/source/java/net/sf/jcontracts/antlr/ParserException.java trunk/source/java/net/sf/jcontracts/antlr/ScannerException.java trunk/source/java/net/sf/jcontracts/antlr/SemanticException.java trunk/source/java/net/sf/jcontracts/codeparser/Class.java trunk/source/java/net/sf/jcontracts/codeparser/CodeComment.java trunk/source/java/net/sf/jcontracts/codeparser/CodeMetaclass.java trunk/source/java/net/sf/jcontracts/codeparser/Interface.java trunk/source/java/net/sf/jcontracts/codeparser/Method.java trunk/source/java/net/sf/jcontracts/codeparser/Variable.java trunk/source/java/net/sf/jcontracts/icontract/AllFilesUpToDateException.java trunk/source/java/net/sf/jcontracts/icontract/Class.java trunk/source/java/net/sf/jcontracts/icontract/Interface.java trunk/source/java/net/sf/jcontracts/icontract/Method.java trunk/source/java/net/sf/jcontracts/icontract/UnableToDetermineTypeException.java trunk/source/java/net/sf/jcontracts/icontract/Variable.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PatternSyntaxException.java trunk/source/java/net/sf/jcontracts/idarwin/specification/openapi/IllFormedSpecificationException.java Modified: trunk/source/java/net/sf/jcontracts/antlr/ANTLRException.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/ANTLRException.java 2006-12-04 18:10:07 UTC (rev 37) +++ trunk/source/java/net/sf/jcontracts/antlr/ANTLRException.java 2006-12-04 19:07:09 UTC (rev 38) @@ -2,6 +2,7 @@ public class ANTLRException extends Exception { + private static final long serialVersionUID = 1L; public ANTLRException(String s) { Modified: trunk/source/java/net/sf/jcontracts/antlr/FileCopyException.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/FileCopyException.java 2006-12-04 18:10:07 UTC (rev 37) +++ trunk/source/java/net/sf/jcontracts/antlr/FileCopyException.java 2006-12-04 19:07:09 UTC (rev 38) @@ -4,6 +4,7 @@ class FileCopyException extends IOException { + private static final long serialVersionUID = 1L; public FileCopyException(String msg) { Modified: trunk/source/java/net/sf/jcontracts/antlr/MismatchedTokenException.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/MismatchedTokenException.java 2006-12-04 18:10:07 UTC (rev 37) +++ trunk/source/java/net/sf/jcontracts/antlr/MismatchedTokenException.java 2006-12-04 19:07:09 UTC (rev 38) @@ -4,6 +4,7 @@ public class MismatchedTokenException extends ParserException { + private static final long serialVersionUID = 1L; public MismatchedTokenException() { Modified: trunk/source/java/net/sf/jcontracts/antlr/NoViableAltException.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/NoViableAltException.java 2006-12-04 18:10:07 UTC (rev 37) +++ trunk/source/java/net/sf/jcontracts/antlr/NoViableAltException.java 2006-12-04 19:07:09 UTC (rev 38) @@ -2,6 +2,7 @@ public class NoViableAltException extends ParserException { + private static final long serialVersionUID = 1L; public NoViableAltException() { Modified: trunk/source/java/net/sf/jcontracts/antlr/ParserException.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/ParserException.java 2006-12-04 18:10:07 UTC (rev 37) +++ trunk/source/java/net/sf/jcontracts/antlr/ParserException.java 2006-12-04 19:07:09 UTC (rev 38) @@ -2,6 +2,7 @@ public class ParserException extends ANTLRException { + private static final long serialVersionUID = 1L; public ParserException() { Modified: trunk/source/java/net/sf/jcontracts/antlr/ScannerException.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/ScannerException.java 2006-12-04 18:10:07 UTC (rev 37) +++ trunk/source/java/net/sf/jcontracts/antlr/ScannerException.java 2006-12-04 19:07:09 UTC (rev 38) @@ -2,6 +2,7 @@ public class ScannerException extends ANTLRException { + private static final long serialVersionUID = 1L; public ScannerException() { Modified: trunk/source/java/net/sf/jcontracts/antlr/SemanticException.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/SemanticException.java 2006-12-04 18:10:07 UTC (rev 37) +++ trunk/source/java/net/sf/jcontracts/antlr/SemanticException.java 2006-12-04 19:07:09 UTC (rev 38) @@ -2,6 +2,7 @@ public class SemanticException extends ParserException { + private static final long serialVersionUID = 1L; public SemanticException(String s) { Modified: trunk/source/java/net/sf/jcontracts/codeparser/Class.java =================================================================== --- trunk/source/java/net/sf/jcontracts/codeparser/Class.java 2006-12-04 18:10:07 UTC (rev 37) +++ trunk/source/java/net/sf/jcontracts/codeparser/Class.java 2006-12-04 19:07:09 UTC (rev 38) @@ -4,6 +4,7 @@ public class Class extends TypeMetaclass { + private static final long serialVersionUID = 1L; public Class(String name, String filename, int line_number) { Modified: trunk/source/java/net/sf/jcontracts/codeparser/CodeComment.java =================================================================== --- trunk/source/java/net/sf/jcontracts/codeparser/CodeComment.java 2006-12-04 18:10:07 UTC (rev 37) +++ trunk/source/java/net/sf/jcontracts/codeparser/CodeComment.java 2006-12-04 19:07:09 UTC (rev 38) @@ -7,6 +7,7 @@ class CodeComment implements Serializable { + private static final long serialVersionUID = 1L; private String _title; Modified: trunk/source/java/net/sf/jcontracts/codeparser/CodeMetaclass.java =================================================================== --- trunk/source/java/net/sf/jcontracts/codeparser/CodeMetaclass.java 2006-12-04 18:10:07 UTC (rev 37) +++ trunk/source/java/net/sf/jcontracts/codeparser/CodeMetaclass.java 2006-12-04 19:07:09 UTC (rev 38) @@ -7,6 +7,7 @@ { class Name implements Serializable { + private static final long serialVersionUID = 1L; private String n_; Modified: trunk/source/java/net/sf/jcontracts/codeparser/Interface.java =================================================================== --- trunk/source/java/net/sf/jcontracts/codeparser/Interface.java 2006-12-04 18:10:07 UTC (rev 37) +++ trunk/source/java/net/sf/jcontracts/codeparser/Interface.java 2006-12-04 19:07:09 UTC (rev 38) @@ -2,6 +2,7 @@ public class Interface extends TypeMetaclass { + private static final long serialVersionUID = 1L; public Interface(String name, String filename, int line_number) { Modified: trunk/source/java/net/sf/jcontracts/codeparser/Method.java =================================================================== --- trunk/source/java/net/sf/jcontracts/codeparser/Method.java 2006-12-04 18:10:07 UTC (rev 37) +++ trunk/source/java/net/sf/jcontracts/codeparser/Method.java 2006-12-04 19:07:09 UTC (rev 38) @@ -4,6 +4,7 @@ public class Method extends CodeMetaclass implements ICodeBody { + private static final long serialVersionUID = 1L; private Vector _parameterList; Modified: trunk/source/java/net/sf/jcontracts/codeparser/Variable.java =================================================================== --- trunk/source/java/net/sf/jcontracts/codeparser/Variable.java 2006-12-04 18:10:07 UTC (rev 37) +++ trunk/source/java/net/sf/jcontracts/codeparser/Variable.java 2006-12-04 19:07:09 UTC (rev 38) @@ -2,6 +2,7 @@ public class Variable extends CodeMetaclass { + private static final long serialVersionUID = 1L; private String _type; Modified: trunk/source/java/net/sf/jcontracts/icontract/AllFilesUpToDateException.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/AllFilesUpToDateException.java 2006-12-04 18:10:07 UTC (rev 37) +++ trunk/source/java/net/sf/jcontracts/icontract/AllFilesUpToDateException.java 2006-12-04 19:07:09 UTC (rev 38) @@ -2,6 +2,7 @@ public class AllFilesUpToDateException extends RuntimeException { + private static final long serialVersionUID = 1L; public AllFilesUpToDateException() { Modified: trunk/source/java/net/sf/jcontracts/icontract/Class.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/Class.java 2006-12-04 18:10:07 UTC (rev 37) +++ trunk/source/java/net/sf/jcontracts/icontract/Class.java 2006-12-04 19:07:09 UTC (rev 38) @@ -11,6 +11,8 @@ public class Class extends net.sf.jcontracts.codeparser.Class implements InvCheck, PrePostCheck { + private static final long serialVersionUID = 1L; + private static final Logger log = Logger.getLogger(Class.class); public static final String REP_PREFIX = "__REP_"; Modified: trunk/source/java/net/sf/jcontracts/icontract/Interface.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/Interface.java 2006-12-04 18:10:07 UTC (rev 37) +++ trunk/source/java/net/sf/jcontracts/icontract/Interface.java 2006-12-04 19:07:09 UTC (rev 38) @@ -11,6 +11,8 @@ public class Interface extends net.sf.jcontracts.codeparser.Interface implements PrePostCheck, InvCheck { + private static final long serialVersionUID = 1L; + private static final Logger log = Logger.getLogger(Interface.class); public static final String REP_PREFIX = "__REP_"; Modified: trunk/source/java/net/sf/jcontracts/icontract/Method.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/Method.java 2006-12-04 18:10:07 UTC (rev 37) +++ trunk/source/java/net/sf/jcontracts/icontract/Method.java 2006-12-04 19:07:09 UTC (rev 38) @@ -11,8 +11,10 @@ public class Method extends net.sf.jcontracts.codeparser.Method implements InvCheck, PrePostCheck { - private static final Logger log = Logger.getLogger(Method.class); + private static final long serialVersionUID = 1L; +private static final Logger log = Logger.getLogger(Method.class); + public static final String REP_PREFIX = "__REP_"; public static final String RETURN_VALUE_HOLDER_NAME = "__return_value_holder_"; Modified: trunk/source/java/net/sf/jcontracts/icontract/UnableToDetermineTypeException.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/UnableToDetermineTypeException.java 2006-12-04 18:10:07 UTC (rev 37) +++ trunk/source/java/net/sf/jcontracts/icontract/UnableToDetermineTypeException.java 2006-12-04 19:07:09 UTC (rev 38) @@ -2,6 +2,7 @@ public class UnableToDetermineTypeException extends Exception { + private static final long serialVersionUID = 1L; public UnableToDetermineTypeException() { Modified: trunk/source/java/net/sf/jcontracts/icontract/Variable.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/Variable.java 2006-12-04 18:10:07 UTC (rev 37) +++ trunk/source/java/net/sf/jcontracts/icontract/Variable.java 2006-12-04 19:07:09 UTC (rev 38) @@ -4,6 +4,7 @@ public class Variable extends net.sf.jcontracts.codeparser.Variable implements PrePostCheck, InvCheck { + private static final long serialVersionUID = 1L; public Variable(String name, String filename, int line_number) { Modified: trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PatternSyntaxException.java =================================================================== --- trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PatternSyntaxException.java 2006-12-04 18:10:07 UTC (rev 37) +++ trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PatternSyntaxException.java 2006-12-04 19:07:09 UTC (rev 38) @@ -2,6 +2,7 @@ public class PatternSyntaxException extends Exception { + private static final long serialVersionUID = 1L; public PatternSyntaxException() { Modified: trunk/source/java/net/sf/jcontracts/idarwin/specification/openapi/IllFormedSpecificationException.java =================================================================== --- trunk/source/java/net/sf/jcontracts/idarwin/specification/openapi/IllFormedSpecificationException.java 2006-12-04 18:10:07 UTC (rev 37) +++ trunk/source/java/net/sf/jcontracts/idarwin/specification/openapi/IllFormedSpecificationException.java 2006-12-04 19:07:09 UTC (rev 38) @@ -2,6 +2,7 @@ public class IllFormedSpecificationException extends Exception { + private static final long serialVersionUID = 1L; public IllFormedSpecificationException(String message) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <js...@us...> - 2006-12-04 19:21:21
|
Revision: 39 http://svn.sourceforge.net/jcontracts/?rev=39&view=rev Author: jstuyts Date: 2006-12-04 11:21:15 -0800 (Mon, 04 Dec 2006) Log Message: ----------- Removed duplicate code. Modified Paths: -------------- trunk/source/java/net/sf/jcontracts/codeparser/CodeMetaclass.java trunk/source/java/net/sf/jcontracts/icontract/Class.java trunk/source/java/net/sf/jcontracts/icontract/Method.java Modified: trunk/source/java/net/sf/jcontracts/codeparser/CodeMetaclass.java =================================================================== --- trunk/source/java/net/sf/jcontracts/codeparser/CodeMetaclass.java 2006-12-04 19:07:09 UTC (rev 38) +++ trunk/source/java/net/sf/jcontracts/codeparser/CodeMetaclass.java 2006-12-04 19:21:15 UTC (rev 39) @@ -140,7 +140,7 @@ return getModifiers().contains("static"); } - String protectString(String str, char key) + protected String protectString(String str, char key) { if (str.length() == 0) { Modified: trunk/source/java/net/sf/jcontracts/icontract/Class.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/Class.java 2006-12-04 19:07:09 UTC (rev 38) +++ trunk/source/java/net/sf/jcontracts/icontract/Class.java 2006-12-04 19:21:15 UTC (rev 39) @@ -1729,34 +1729,6 @@ return protectString(protectString(str, '\\'), '"'); } - String protectString(String str, char key) - { - if (str.length() == 0) - { - return str; - } - if (str.indexOf(key) == -1) - { - return str; - } - StringBuffer buf = new StringBuffer(); - int last; - int j; - for (last = 0; (j = str.indexOf(key, last)) != -1; last = j + 1) - { - for (int i = last; i < str.indexOf(key, last); i++) - { - buf.append(str.charAt(i)); - } - - buf.append("\\"); - buf.append(key); - } - - buf.append(str.substring(last, str.length())); - return buf.toString(); - } - public String removedExceptionClassNames(String comment) { if (comment.indexOf('#') == -1) Modified: trunk/source/java/net/sf/jcontracts/icontract/Method.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/Method.java 2006-12-04 19:07:09 UTC (rev 38) +++ trunk/source/java/net/sf/jcontracts/icontract/Method.java 2006-12-04 19:21:15 UTC (rev 39) @@ -2400,34 +2400,6 @@ return protectString(protectString(str, '\\'), '"'); } - String protectString(String str, char key) - { - if (str.length() == 0) - { - return str; - } - if (str.indexOf(key) == -1) - { - return str; - } - StringBuffer buf = new StringBuffer(); - int last; - int j; - for (last = 0; (j = str.indexOf(key, last)) != -1; last = j + 1) - { - for (int i = last; i < str.indexOf(key, last); i++) - { - buf.append(str.charAt(i)); - } - - buf.append("\\"); - buf.append(key); - } - - buf.append(str.substring(last, str.length())); - return buf.toString(); - } - public String removedExceptionClassNames(String comment) { if (comment.indexOf('#') == -1) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <js...@us...> - 2006-12-04 19:46:58
|
Revision: 40 http://svn.sourceforge.net/jcontracts/?rev=40&view=rev Author: jstuyts Date: 2006-12-04 11:46:56 -0800 (Mon, 04 Dec 2006) Log Message: ----------- Replaced input streams with readers. Modified Paths: -------------- trunk/source/java/net/sf/jcontracts/codeparser/CodeMetaclassCache.java trunk/source/java/net/sf/jcontracts/codeparser/JavaLexer.java trunk/source/java/net/sf/jcontracts/codeparser/JavaParser.java trunk/source/java/net/sf/jcontracts/codeparser/Parser.java trunk/source/java/net/sf/jcontracts/icontract/FileTarget.java trunk/source/java/net/sf/jcontracts/icontract/SystemInTarget.java trunk/source/java/net/sf/jcontracts/icontract/Tool.java Modified: trunk/source/java/net/sf/jcontracts/codeparser/CodeMetaclassCache.java =================================================================== --- trunk/source/java/net/sf/jcontracts/codeparser/CodeMetaclassCache.java 2006-12-04 19:21:15 UTC (rev 39) +++ trunk/source/java/net/sf/jcontracts/codeparser/CodeMetaclassCache.java 2006-12-04 19:46:56 UTC (rev 40) @@ -3,6 +3,7 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; +import java.io.FileReader; import java.io.IOException; import java.io.InputStream; import java.io.ObjectInputStream; @@ -53,7 +54,7 @@ for (Enumeration e = recache.elements(); e.hasMoreElements();) { String fn = (String) e.nextElement(); - FileInputStream is = new FileInputStream(srcbase + fn); + FileReader is = new FileReader(srcbase + fn); System.err.println("Upating cache entry for: " + fn.replace(File.separatorChar, '.')); Parser parser = new Parser(is, fn); parser.enableCaptureAllDependencies(); Modified: trunk/source/java/net/sf/jcontracts/codeparser/JavaLexer.java =================================================================== --- trunk/source/java/net/sf/jcontracts/codeparser/JavaLexer.java 2006-12-04 19:21:15 UTC (rev 39) +++ trunk/source/java/net/sf/jcontracts/codeparser/JavaLexer.java 2006-12-04 19:46:56 UTC (rev 40) @@ -1,6 +1,6 @@ package net.sf.jcontracts.codeparser; -import java.io.InputStream; +import java.io.Reader; import java.util.Hashtable; import net.sf.jcontracts.antlr.ANTLRHashString; @@ -141,7 +141,7 @@ super.caseSensitiveLiterals = true; } - public JavaLexer(InputStream in) + public JavaLexer(Reader in) { this(new CharBufferNoBacktrackingNoInteractive(in)); } Modified: trunk/source/java/net/sf/jcontracts/codeparser/JavaParser.java =================================================================== --- trunk/source/java/net/sf/jcontracts/codeparser/JavaParser.java 2006-12-04 19:21:15 UTC (rev 39) +++ trunk/source/java/net/sf/jcontracts/codeparser/JavaParser.java 2006-12-04 19:46:56 UTC (rev 40) @@ -1,7 +1,9 @@ package net.sf.jcontracts.codeparser; import java.io.File; -import java.io.FileInputStream; +import java.io.FileReader; +import java.io.InputStreamReader; +import java.io.Reader; import java.util.Enumeration; import java.util.Hashtable; import java.util.Vector; @@ -2741,16 +2743,16 @@ { try { - java.io.InputStream is; + Reader is; String filename; if (args.length != 0) { - is = new FileInputStream(args[0]); + is = new FileReader(args[0]); filename = args[0]; } else { - is = System.in; + is = new InputStreamReader(System.in); filename = "<System.in>"; } JavaLexer lexer = new JavaLexer(is); Modified: trunk/source/java/net/sf/jcontracts/codeparser/Parser.java =================================================================== --- trunk/source/java/net/sf/jcontracts/codeparser/Parser.java 2006-12-04 19:21:15 UTC (rev 39) +++ trunk/source/java/net/sf/jcontracts/codeparser/Parser.java 2006-12-04 19:46:56 UTC (rev 40) @@ -1,6 +1,6 @@ package net.sf.jcontracts.codeparser; -import java.io.InputStream; +import java.io.Reader; import java.util.Hashtable; import java.util.Vector; @@ -14,7 +14,7 @@ private JavaLexer _lexer; - public Parser(InputStream is, String filename) + public Parser(Reader is, String filename) { _lexer = new JavaLexer(is); _lexer.setTokenObjectClass("net.sf.jcontracts.codeParser.ExtendedToken"); Modified: trunk/source/java/net/sf/jcontracts/icontract/FileTarget.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/FileTarget.java 2006-12-04 19:21:15 UTC (rev 39) +++ trunk/source/java/net/sf/jcontracts/icontract/FileTarget.java 2006-12-04 19:46:56 UTC (rev 40) @@ -2,13 +2,12 @@ import java.io.BufferedReader; import java.io.File; -import java.io.FileInputStream; import java.io.FileReader; import java.io.FileWriter; import java.io.FilenameFilter; import java.io.IOException; -import java.io.InputStream; import java.io.PrintWriter; +import java.io.Reader; import java.util.Enumeration; import java.util.Vector; @@ -25,7 +24,7 @@ super(name); } - private void copyWithoutLinesStartingWith(FileInputStream is, PrintWriter os, String header) throws IOException + private void copyWithoutLinesStartingWith(FileReader is, PrintWriter os, String header) throws IOException { char buf[] = new char[300]; for (int ch = is.read(); ch != -1;) @@ -58,13 +57,13 @@ } - protected InputStream createStreamForCodeParsing() throws IOException + protected Reader createStreamForCodeParsing() throws IOException { - FileInputStream is = null; + FileReader is = null; PrintWriter os = null; try { - is = new FileInputStream(getName()); + is = new FileReader(getName()); os = new PrintWriter(new FileWriter(getName() + ".clean")); copyWithoutLinesStartingWith(is, os, "/*|*/"); } @@ -79,7 +78,7 @@ os.close(); } } - return new FileInputStream(getName() + ".clean"); + return new FileReader(getName() + ".clean"); } Vector enumerateFilesIn(String dir, FilenameFilter filter) @@ -209,7 +208,7 @@ Vector process(Vector options) throws Exception { Vector fileList = new Vector(); - InputStream is = null; + Reader is = null; CleanOption cleanOption = null; for (int i = 0; i < options.size(); i++) { @@ -230,7 +229,7 @@ } else { - is = new FileInputStream(getName()); + is = new FileReader(getName()); } Parser parser = new Parser(is, getName()); MetaclassFactory metaclassFactory = new MetaclassFactory(getName()); Modified: trunk/source/java/net/sf/jcontracts/icontract/SystemInTarget.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/SystemInTarget.java 2006-12-04 19:21:15 UTC (rev 39) +++ trunk/source/java/net/sf/jcontracts/icontract/SystemInTarget.java 2006-12-04 19:46:56 UTC (rev 40) @@ -1,6 +1,7 @@ package net.sf.jcontracts.icontract; -import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.Reader; import java.util.Vector; public class SystemInTarget extends FileTarget @@ -11,9 +12,9 @@ super("<system.in>"); } - protected InputStream createStreamForCodeParsing() + protected Reader createStreamForCodeParsing() { - return System.in; + return new InputStreamReader(System.in); } Vector expand() Modified: trunk/source/java/net/sf/jcontracts/icontract/Tool.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/Tool.java 2006-12-04 19:21:15 UTC (rev 39) +++ trunk/source/java/net/sf/jcontracts/icontract/Tool.java 2006-12-04 19:46:56 UTC (rev 40) @@ -1,12 +1,12 @@ package net.sf.jcontracts.icontract; import java.io.File; -import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.FileReader; import java.io.IOException; import java.io.PrintWriter; +import java.io.Reader; import java.util.Enumeration; import java.util.Hashtable; import java.util.Vector; @@ -105,10 +105,10 @@ for (int i = 0; i < targets.size(); i++) { String fn = ((Target) targets.elementAt(i)).getName(); - FileInputStream is = null; + Reader is = null; try { - is = new FileInputStream(fn); + is = new FileReader(fn); } catch (FileNotFoundException _ex) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <js...@us...> - 2006-12-04 20:08:26
|
Revision: 41 http://svn.sourceforge.net/jcontracts/?rev=41&view=rev Author: jstuyts Date: 2006-12-04 12:08:21 -0800 (Mon, 04 Dec 2006) Log Message: ----------- Replaced input streams with readers. Modified Paths: -------------- trunk/source/java/net/sf/jcontracts/antlr/ANTLRLexer.java trunk/source/java/net/sf/jcontracts/antlr/ANTLRTokdefLexer.java trunk/source/java/net/sf/jcontracts/antlr/CharBufferNoBacktrackingNoInteractive.java trunk/source/java/net/sf/jcontracts/antlr/TokdefTokenManager.java trunk/source/java/net/sf/jcontracts/antlr/Tool.java trunk/source/java/net/sf/jcontracts/antlr/actions/ActionLexer.java trunk/source/java/net/sf/jcontracts/antlr/preprocessor/Hierarchy.java trunk/source/java/net/sf/jcontracts/antlr/preprocessor/PreprocessorLexer.java trunk/source/java/net/sf/jcontracts/argparser/ArgLexer.java trunk/source/java/net/sf/jcontracts/argparser/ArgParser.java trunk/source/java/net/sf/jcontracts/argparser/Parser.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/ArchitectureSpecification.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/Idiom.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/IsolateIdiom.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/LayerIdiom.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PSpecLexer.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PSpecParser.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PatternFactory.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/SingleDependencyConstraint.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/StrictlyLayerIdiom.java Modified: trunk/source/java/net/sf/jcontracts/antlr/ANTLRLexer.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/ANTLRLexer.java 2006-12-04 19:46:56 UTC (rev 40) +++ trunk/source/java/net/sf/jcontracts/antlr/ANTLRLexer.java 2006-12-04 20:08:21 UTC (rev 41) @@ -1,6 +1,6 @@ package net.sf.jcontracts.antlr; -import java.io.InputStream; +import java.io.Reader; import java.util.Hashtable; import net.sf.jcontracts.antlr.collections.impl.BitSet; @@ -31,7 +31,7 @@ super.caseSensitiveLiterals = true; } - public ANTLRLexer(InputStream in) + public ANTLRLexer(Reader in) { this(new CharBufferNoBacktrackingNoInteractive(in)); } Modified: trunk/source/java/net/sf/jcontracts/antlr/ANTLRTokdefLexer.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/ANTLRTokdefLexer.java 2006-12-04 19:46:56 UTC (rev 40) +++ trunk/source/java/net/sf/jcontracts/antlr/ANTLRTokdefLexer.java 2006-12-04 20:08:21 UTC (rev 41) @@ -1,6 +1,6 @@ package net.sf.jcontracts.antlr; -import java.io.InputStream; +import java.io.Reader; import java.util.Hashtable; import net.sf.jcontracts.antlr.collections.impl.BitSet; @@ -16,7 +16,7 @@ super.caseSensitiveLiterals = true; } - public ANTLRTokdefLexer(InputStream in) + public ANTLRTokdefLexer(Reader in) { this(new CharBufferNoBacktrackingNoInteractive(in)); } Modified: trunk/source/java/net/sf/jcontracts/antlr/CharBufferNoBacktrackingNoInteractive.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/CharBufferNoBacktrackingNoInteractive.java 2006-12-04 19:46:56 UTC (rev 40) +++ trunk/source/java/net/sf/jcontracts/antlr/CharBufferNoBacktrackingNoInteractive.java 2006-12-04 20:08:21 UTC (rev 41) @@ -1,14 +1,14 @@ package net.sf.jcontracts.antlr; import java.io.IOException; -import java.io.InputStream; +import java.io.Reader; public class CharBufferNoBacktrackingNoInteractive { - public CharBufferNoBacktrackingNoInteractive(InputStream input_) + public CharBufferNoBacktrackingNoInteractive(Reader input_) { - readAheadBuffer = new byte[1024]; + readAheadBuffer = new char[1024]; input = input_; queue = new CharQueue(1024); } @@ -34,7 +34,7 @@ { for (int i = 0; i < nbrRead; i++) { - queue.append((char) (readAheadBuffer[i] & 0xff)); + queue.append(readAheadBuffer[i]); } } @@ -50,11 +50,11 @@ return queue.elementAt(i - 1); } - transient InputStream input; + transient Reader input; CharQueue queue; static final int maxReadAhead = 1024; - byte readAheadBuffer[]; + char readAheadBuffer[]; } Modified: trunk/source/java/net/sf/jcontracts/antlr/TokdefTokenManager.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/TokdefTokenManager.java 2006-12-04 19:46:56 UTC (rev 40) +++ trunk/source/java/net/sf/jcontracts/antlr/TokdefTokenManager.java 2006-12-04 20:08:21 UTC (rev 41) @@ -1,6 +1,6 @@ package net.sf.jcontracts.antlr; -import java.io.FileInputStream; +import java.io.FileReader; import java.io.IOException; class TokdefTokenManager extends SimpleTokenManager @@ -14,7 +14,7 @@ filename = filename_; try { - FileInputStream fileIn = new FileInputStream(filename); + FileReader fileIn = new FileReader(filename); ANTLRTokdefLexer tokdefLexer = new ANTLRTokdefLexer(fileIn); ANTLRTokdefParser tokdefParser = new ANTLRTokdefParser(tokdefLexer); tokdefParser.file(this); Modified: trunk/source/java/net/sf/jcontracts/antlr/Tool.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/Tool.java 2006-12-04 19:46:56 UTC (rev 40) +++ trunk/source/java/net/sf/jcontracts/antlr/Tool.java 2006-12-04 20:08:21 UTC (rev 41) @@ -1,11 +1,13 @@ package net.sf.jcontracts.antlr; -import java.io.DataInputStream; +import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; +import java.io.FileReader; import java.io.IOException; -import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.Reader; import net.sf.jcontracts.antlr.collections.impl.Vector; @@ -16,7 +18,7 @@ { hasError = false; genDiagnostics = false; - f = System.in; + f = new InputStreamReader(System.in); in = null; errorHandler = new DefaultToolErrorHandler(); } @@ -41,7 +43,6 @@ { if (destination_file.isFile()) { - new DataInputStream(System.in); if (!destination_file.canWrite()) { throw new FileCopyException("FileCopy: destination file is unwriteable: " + dest_name); @@ -116,9 +117,9 @@ { if (grammarFile != null) { - f = new FileInputStream(grammarFile); + f = new FileReader(grammarFile); } - in = new DataInputStream(f); + in = new BufferedReader(f); } catch (IOException _ex) { @@ -437,9 +438,9 @@ String grammarFile; - transient InputStream f; + transient Reader f; - transient DataInputStream in; + transient Reader in; protected static String literalsPrefix = "LITERAL_"; Modified: trunk/source/java/net/sf/jcontracts/antlr/actions/ActionLexer.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/actions/ActionLexer.java 2006-12-04 19:46:56 UTC (rev 40) +++ trunk/source/java/net/sf/jcontracts/antlr/actions/ActionLexer.java 2006-12-04 20:08:21 UTC (rev 41) @@ -19,14 +19,14 @@ super.caseSensitiveLiterals = true; } - public ActionLexer(InputStream in) + public ActionLexer(Reader in) { this(new CharBufferNoBacktrackingNoInteractive(in)); } public ActionLexer(String s, RuleBlock currentRule, CodeGenerator generator, ActionTransInfo transInfo) { - this(((InputStream) (new StringBufferInputStream(s)))); + this(new StringReader(s)); this.currentRule = currentRule; this.generator = generator; this.transInfo = transInfo; Modified: trunk/source/java/net/sf/jcontracts/antlr/preprocessor/Hierarchy.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/preprocessor/Hierarchy.java 2006-12-04 19:46:56 UTC (rev 40) +++ trunk/source/java/net/sf/jcontracts/antlr/preprocessor/Hierarchy.java 2006-12-04 20:08:21 UTC (rev 41) @@ -5,8 +5,8 @@ package net.sf.jcontracts.antlr.preprocessor; -import java.io.FileInputStream; import java.io.FileNotFoundException; +import java.io.FileReader; import java.util.Enumeration; import java.util.Hashtable; @@ -94,7 +94,7 @@ public void readGrammarFile(String file) throws FileNotFoundException { - FileInputStream grStream = new FileInputStream(file); + FileReader grStream = new FileReader(file); addGrammarFile(new GrammarFile(file)); PreprocessorLexer ppLexer = new PreprocessorLexer(grStream); Preprocessor pp = new Preprocessor(ppLexer); Modified: trunk/source/java/net/sf/jcontracts/antlr/preprocessor/PreprocessorLexer.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/preprocessor/PreprocessorLexer.java 2006-12-04 19:46:56 UTC (rev 40) +++ trunk/source/java/net/sf/jcontracts/antlr/preprocessor/PreprocessorLexer.java 2006-12-04 20:08:21 UTC (rev 41) @@ -5,7 +5,7 @@ package net.sf.jcontracts.antlr.preprocessor; -import java.io.InputStream; +import java.io.Reader; import java.util.Hashtable; import net.sf.jcontracts.antlr.*; @@ -31,7 +31,7 @@ super.caseSensitiveLiterals = true; } - public PreprocessorLexer(InputStream in) + public PreprocessorLexer(Reader in) { this(new CharBufferNoBacktrackingNoInteractive(in)); } Modified: trunk/source/java/net/sf/jcontracts/argparser/ArgLexer.java =================================================================== --- trunk/source/java/net/sf/jcontracts/argparser/ArgLexer.java 2006-12-04 19:46:56 UTC (rev 40) +++ trunk/source/java/net/sf/jcontracts/argparser/ArgLexer.java 2006-12-04 20:08:21 UTC (rev 41) @@ -1,6 +1,6 @@ package net.sf.jcontracts.argparser; -import java.io.InputStream; +import java.io.Reader; import java.util.Hashtable; import net.sf.jcontracts.antlr.CharBufferNoBacktrackingNoInteractive; @@ -72,7 +72,7 @@ super.caseSensitiveLiterals = true; } - public ArgLexer(InputStream in) + public ArgLexer(Reader in) { this(new CharBufferNoBacktrackingNoInteractive(in)); } Modified: trunk/source/java/net/sf/jcontracts/argparser/ArgParser.java =================================================================== --- trunk/source/java/net/sf/jcontracts/argparser/ArgParser.java 2006-12-04 19:46:56 UTC (rev 40) +++ trunk/source/java/net/sf/jcontracts/argparser/ArgParser.java 2006-12-04 20:08:21 UTC (rev 41) @@ -1,6 +1,8 @@ package net.sf.jcontracts.argparser; -import java.io.FileInputStream; +import java.io.FileReader; +import java.io.InputStreamReader; +import java.io.Reader; import java.util.Vector; import net.sf.jcontracts.antlr.LLkParserNoInteractive; @@ -98,14 +100,14 @@ { try { - java.io.InputStream is; + Reader is; if (args.length != 0) { - is = new FileInputStream(args[0]); + is = new FileReader(args[0]); } else { - is = System.in; + is = new InputStreamReader(System.in); } ArgLexer lexer = new ArgLexer(is); lexer.setTokenObjectClass("net.sf.jcontracts.argParser.ExtendedToken"); Modified: trunk/source/java/net/sf/jcontracts/argparser/Parser.java =================================================================== --- trunk/source/java/net/sf/jcontracts/argparser/Parser.java 2006-12-04 19:46:56 UTC (rev 40) +++ trunk/source/java/net/sf/jcontracts/argparser/Parser.java 2006-12-04 20:08:21 UTC (rev 41) @@ -1,6 +1,6 @@ package net.sf.jcontracts.argparser; -import java.io.StringBufferInputStream; +import java.io.StringReader; import java.util.Vector; import net.sf.jcontracts.antlr.ParserException; @@ -15,7 +15,7 @@ public Parser(String s) { - StringBufferInputStream is = new StringBufferInputStream(s); + StringReader is = new StringReader(s); _lexer = new ArgLexer(is); _lexer.setTokenObjectClass("net.sf.jcontracts.argParser.ExtendedToken"); _argparser = new ArgParser(_lexer); Modified: trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/ArchitectureSpecification.java =================================================================== --- trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/ArchitectureSpecification.java 2006-12-04 19:46:56 UTC (rev 40) +++ trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/ArchitectureSpecification.java 2006-12-04 20:08:21 UTC (rev 41) @@ -1,7 +1,7 @@ package net.sf.jcontracts.idarwin.specification.impl.primitive_language; import java.io.IOException; -import java.io.StringBufferInputStream; +import java.io.StringReader; import java.util.Enumeration; import java.util.Vector; @@ -351,7 +351,7 @@ { for (int i = 0; i < specLines.length; i++) { - StringBufferInputStream is = new StringBufferInputStream(specLines[i]); + StringReader is = new StringReader(specLines[i]); PSpecLexer speclexer = new PSpecLexer(is); PSpecParser specparser = new PSpecParser(speclexer); try @@ -393,7 +393,7 @@ { for (int i = 0; i < gs.length; i++) { - StringBufferInputStream is = new StringBufferInputStream(gs[i]); + StringReader is = new StringReader(gs[i]); PSpecLexer speclexer = new PSpecLexer(is); PSpecParser specparser = new PSpecParser(speclexer); try @@ -415,7 +415,7 @@ { for (int i = 0; i < ids.length; i++) { - StringBufferInputStream is = new StringBufferInputStream(ids[i]); + StringReader is = new StringReader(ids[i]); PSpecLexer speclexer = new PSpecLexer(is); PSpecParser specparser = new PSpecParser(speclexer); try Modified: trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/Idiom.java =================================================================== --- trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/Idiom.java 2006-12-04 19:46:56 UTC (rev 40) +++ trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/Idiom.java 2006-12-04 20:08:21 UTC (rev 41) @@ -1,6 +1,6 @@ package net.sf.jcontracts.idarwin.specification.impl.primitive_language; -import java.io.StringBufferInputStream; +import java.io.StringReader; import java.util.Enumeration; import java.util.Vector; @@ -62,7 +62,7 @@ System.err.println("could resolve up to: " + c); throw new RuntimeException("Could not reolve all group names.\n\nSee Console for details!"); } - StringBufferInputStream is = new StringBufferInputStream(c); + StringReader is = new StringReader(c); PSpecLexer speclexer = new PSpecLexer(is); PSpecParser specparser = new PSpecParser(speclexer); Idiom idiom = null; Modified: trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/IsolateIdiom.java =================================================================== --- trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/IsolateIdiom.java 2006-12-04 19:46:56 UTC (rev 40) +++ trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/IsolateIdiom.java 2006-12-04 20:08:21 UTC (rev 41) @@ -1,6 +1,6 @@ package net.sf.jcontracts.idarwin.specification.impl.primitive_language; -import java.io.StringBufferInputStream; +import java.io.StringReader; import net.sf.jcontracts.antlr.ParserException; @@ -17,7 +17,7 @@ { Idiom newIdiom = substitute(spec.getGroups()); String patternString = newIdiom.toStringWithoutType(); - StringBufferInputStream is = new StringBufferInputStream(patternString); + StringReader is = new StringReader(patternString); PSpecLexer speclexer = new PSpecLexer(is); PSpecParser specparser = new PSpecParser(speclexer); Pattern p = null; Modified: trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/LayerIdiom.java =================================================================== --- trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/LayerIdiom.java 2006-12-04 19:46:56 UTC (rev 40) +++ trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/LayerIdiom.java 2006-12-04 20:08:21 UTC (rev 41) @@ -1,6 +1,6 @@ package net.sf.jcontracts.idarwin.specification.impl.primitive_language; -import java.io.StringBufferInputStream; +import java.io.StringReader; import net.sf.jcontracts.antlr.ParserException; @@ -17,7 +17,7 @@ { Idiom newIdiom = substitute(spec.getGroups()); String patternString = newIdiom.toStringWithoutType(); - StringBufferInputStream is = new StringBufferInputStream(patternString); + StringReader is = new StringReader(patternString); PSpecLexer speclexer = new PSpecLexer(is); PSpecParser specparser = new PSpecParser(speclexer); Pattern p = null; Modified: trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PSpecLexer.java =================================================================== --- trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PSpecLexer.java 2006-12-04 19:46:56 UTC (rev 40) +++ trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PSpecLexer.java 2006-12-04 20:08:21 UTC (rev 41) @@ -1,6 +1,6 @@ package net.sf.jcontracts.idarwin.specification.impl.primitive_language; -import java.io.InputStream; +import java.io.Reader; import java.util.Hashtable; import net.sf.jcontracts.antlr.ANTLRHashString; @@ -37,7 +37,7 @@ super.caseSensitiveLiterals = true; } - public PSpecLexer(InputStream in) + public PSpecLexer(Reader in) { this(new CharBufferNoBacktrackingNoInteractive(in)); } Modified: trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PSpecParser.java =================================================================== --- trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PSpecParser.java 2006-12-04 19:46:56 UTC (rev 40) +++ trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PSpecParser.java 2006-12-04 20:08:21 UTC (rev 41) @@ -1,6 +1,6 @@ package net.sf.jcontracts.idarwin.specification.impl.primitive_language; -import java.io.StringBufferInputStream; +import java.io.StringReader; import java.util.Vector; import net.sf.jcontracts.antlr.LLkParserNoInteractive; @@ -142,7 +142,7 @@ try { String s = "\"label 12 #\"a.*\\x.y.* may * b.*"; - StringBufferInputStream is = new StringBufferInputStream(s); + StringReader is = new StringReader(s); PSpecLexer lexer = new PSpecLexer(is); PSpecParser parser = new PSpecParser(lexer); SingleDependencyConstraint r = parser.rule(); Modified: trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PatternFactory.java =================================================================== --- trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PatternFactory.java 2006-12-04 19:46:56 UTC (rev 40) +++ trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PatternFactory.java 2006-12-04 20:08:21 UTC (rev 41) @@ -1,6 +1,6 @@ package net.sf.jcontracts.idarwin.specification.impl.primitive_language; -import java.io.StringBufferInputStream; +import java.io.StringReader; import net.sf.jcontracts.antlr.ParserException; @@ -11,7 +11,7 @@ public static Pattern createFrom(String p_expression) throws PatternSyntaxException { Pattern result = null; - StringBufferInputStream is = new StringBufferInputStream(p_expression); + StringReader is = new StringReader(p_expression); PSpecLexer speclexer = new PSpecLexer(is); PSpecParser specparser = new PSpecParser(speclexer); try Modified: trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/SingleDependencyConstraint.java =================================================================== --- trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/SingleDependencyConstraint.java 2006-12-04 19:46:56 UTC (rev 40) +++ trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/SingleDependencyConstraint.java 2006-12-04 20:08:21 UTC (rev 41) @@ -1,6 +1,6 @@ package net.sf.jcontracts.idarwin.specification.impl.primitive_language; -import java.io.StringBufferInputStream; +import java.io.StringReader; import java.util.Enumeration; import java.util.Vector; @@ -435,7 +435,7 @@ System.err.println("could resolve up to: " + c); throw new IllFormedSpecificationException("Could not reolve all group names.\n\nSee Console for details!"); } - StringBufferInputStream is = new StringBufferInputStream(c); + StringReader is = new StringReader(c); PSpecLexer speclexer = new PSpecLexer(is); PSpecParser specparser = new PSpecParser(speclexer); SingleDependencyConstraint r = null; Modified: trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/StrictlyLayerIdiom.java =================================================================== --- trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/StrictlyLayerIdiom.java 2006-12-04 19:46:56 UTC (rev 40) +++ trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/StrictlyLayerIdiom.java 2006-12-04 20:08:21 UTC (rev 41) @@ -1,6 +1,6 @@ package net.sf.jcontracts.idarwin.specification.impl.primitive_language; -import java.io.StringBufferInputStream; +import java.io.StringReader; import net.sf.jcontracts.antlr.ParserException; @@ -17,7 +17,7 @@ { Idiom newIdiom = substitute(spec.getGroups()); String patternString = newIdiom.toStringWithoutType(); - StringBufferInputStream is = new StringBufferInputStream(patternString); + StringReader is = new StringReader(patternString); PSpecLexer speclexer = new PSpecLexer(is); PSpecParser specparser = new PSpecParser(speclexer); Pattern p = null; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <js...@us...> - 2006-12-27 06:16:02
|
Revision: 43 http://svn.sourceforge.net/jcontracts/?rev=43&view=rev Author: jstuyts Date: 2006-12-26 22:16:00 -0800 (Tue, 26 Dec 2006) Log Message: ----------- Added license header to Java files. Modified Paths: -------------- trunk/source/java/net/sf/jcontracts/antlr/ANTLRException.java trunk/source/java/net/sf/jcontracts/antlr/ANTLRGrammarParseBehavior.java trunk/source/java/net/sf/jcontracts/antlr/ANTLRHashString.java trunk/source/java/net/sf/jcontracts/antlr/ANTLRLexer.java trunk/source/java/net/sf/jcontracts/antlr/ANTLRParser.java trunk/source/java/net/sf/jcontracts/antlr/ANTLRStringBuffer.java trunk/source/java/net/sf/jcontracts/antlr/ANTLRTokdefLexer.java trunk/source/java/net/sf/jcontracts/antlr/ANTLRTokdefParser.java trunk/source/java/net/sf/jcontracts/antlr/ANTLRTokdefParserTokenTypes.java trunk/source/java/net/sf/jcontracts/antlr/ANTLRTokenTypes.java trunk/source/java/net/sf/jcontracts/antlr/ASTFactory.java trunk/source/java/net/sf/jcontracts/antlr/ASTIterator.java trunk/source/java/net/sf/jcontracts/antlr/ASTNULLType.java trunk/source/java/net/sf/jcontracts/antlr/ASTPair.java trunk/source/java/net/sf/jcontracts/antlr/ASTVisitor.java trunk/source/java/net/sf/jcontracts/antlr/AbstractParser.java trunk/source/java/net/sf/jcontracts/antlr/ActionElement.java trunk/source/java/net/sf/jcontracts/antlr/ActionTransInfo.java trunk/source/java/net/sf/jcontracts/antlr/Alternative.java trunk/source/java/net/sf/jcontracts/antlr/AlternativeBlock.java trunk/source/java/net/sf/jcontracts/antlr/AlternativeElement.java trunk/source/java/net/sf/jcontracts/antlr/BaseAST.java trunk/source/java/net/sf/jcontracts/antlr/BlockContext.java trunk/source/java/net/sf/jcontracts/antlr/BlockEndElement.java trunk/source/java/net/sf/jcontracts/antlr/BlockWithImpliedExitPath.java trunk/source/java/net/sf/jcontracts/antlr/CharBufferBacktrackingInteractive.java trunk/source/java/net/sf/jcontracts/antlr/CharBufferBacktrackingNoInteractive.java trunk/source/java/net/sf/jcontracts/antlr/CharBufferNoBacktrackingInteractive.java trunk/source/java/net/sf/jcontracts/antlr/CharBufferNoBacktrackingNoInteractive.java trunk/source/java/net/sf/jcontracts/antlr/CharFormatter.java trunk/source/java/net/sf/jcontracts/antlr/CharLiteralElement.java trunk/source/java/net/sf/jcontracts/antlr/CharQueue.java trunk/source/java/net/sf/jcontracts/antlr/CharRangeElement.java trunk/source/java/net/sf/jcontracts/antlr/CharScanner.java trunk/source/java/net/sf/jcontracts/antlr/CharScannerBacktrackingInteractive.java trunk/source/java/net/sf/jcontracts/antlr/CharScannerBacktrackingInteractiveNoCaseSensitive.java trunk/source/java/net/sf/jcontracts/antlr/CharScannerBacktrackingNoInteractive.java trunk/source/java/net/sf/jcontracts/antlr/CharScannerBacktrackingNoInteractiveNoCaseSensitive.java trunk/source/java/net/sf/jcontracts/antlr/CharScannerNoBacktrackingInteractive.java trunk/source/java/net/sf/jcontracts/antlr/CharScannerNoBacktrackingInteractiveNoCaseSensitive.java trunk/source/java/net/sf/jcontracts/antlr/CharScannerNoBacktrackingNoInteractive.java trunk/source/java/net/sf/jcontracts/antlr/CharScannerNoBacktrackingNoInteractiveNoCaseSensitive.java trunk/source/java/net/sf/jcontracts/antlr/CodeGenerator.java trunk/source/java/net/sf/jcontracts/antlr/CommonAST.java trunk/source/java/net/sf/jcontracts/antlr/CommonToken.java trunk/source/java/net/sf/jcontracts/antlr/DefaultToolErrorHandler.java trunk/source/java/net/sf/jcontracts/antlr/DefineGrammarSymbols.java trunk/source/java/net/sf/jcontracts/antlr/DiagnosticCodeGenerator.java trunk/source/java/net/sf/jcontracts/antlr/DumpASTVisitor.java trunk/source/java/net/sf/jcontracts/antlr/ExceptionHandler.java trunk/source/java/net/sf/jcontracts/antlr/ExceptionSpec.java trunk/source/java/net/sf/jcontracts/antlr/FileCopyException.java trunk/source/java/net/sf/jcontracts/antlr/Grammar.java trunk/source/java/net/sf/jcontracts/antlr/GrammarAnalyzer.java trunk/source/java/net/sf/jcontracts/antlr/GrammarAtom.java trunk/source/java/net/sf/jcontracts/antlr/GrammarElement.java trunk/source/java/net/sf/jcontracts/antlr/GrammarSymbol.java trunk/source/java/net/sf/jcontracts/antlr/JavaBlockFinishingInfo.java trunk/source/java/net/sf/jcontracts/antlr/JavaCharFormatter.java trunk/source/java/net/sf/jcontracts/antlr/JavaCodeGenerator.java trunk/source/java/net/sf/jcontracts/antlr/LLkAnalyzer.java trunk/source/java/net/sf/jcontracts/antlr/LLkGrammarAnalyzer.java trunk/source/java/net/sf/jcontracts/antlr/LLkParser.java trunk/source/java/net/sf/jcontracts/antlr/LLkParserNoInteractive.java trunk/source/java/net/sf/jcontracts/antlr/LexerGrammar.java trunk/source/java/net/sf/jcontracts/antlr/Lookahead.java trunk/source/java/net/sf/jcontracts/antlr/MakeGrammar.java trunk/source/java/net/sf/jcontracts/antlr/MismatchedTokenException.java trunk/source/java/net/sf/jcontracts/antlr/NoViableAltException.java trunk/source/java/net/sf/jcontracts/antlr/OneOrMoreBlock.java trunk/source/java/net/sf/jcontracts/antlr/OptionalBlock.java trunk/source/java/net/sf/jcontracts/antlr/Parser.java trunk/source/java/net/sf/jcontracts/antlr/ParserException.java trunk/source/java/net/sf/jcontracts/antlr/ParserGrammar.java trunk/source/java/net/sf/jcontracts/antlr/RuleBlock.java trunk/source/java/net/sf/jcontracts/antlr/RuleEndElement.java trunk/source/java/net/sf/jcontracts/antlr/RuleRefElement.java trunk/source/java/net/sf/jcontracts/antlr/RuleSymbol.java trunk/source/java/net/sf/jcontracts/antlr/ScannerException.java trunk/source/java/net/sf/jcontracts/antlr/SemanticException.java trunk/source/java/net/sf/jcontracts/antlr/SimpleTokenManager.java trunk/source/java/net/sf/jcontracts/antlr/StringLiteralElement.java trunk/source/java/net/sf/jcontracts/antlr/StringLiteralSymbol.java trunk/source/java/net/sf/jcontracts/antlr/SynPredBlock.java trunk/source/java/net/sf/jcontracts/antlr/TokdefTokenManager.java trunk/source/java/net/sf/jcontracts/antlr/Token.java trunk/source/java/net/sf/jcontracts/antlr/TokenBuffer.java trunk/source/java/net/sf/jcontracts/antlr/TokenManager.java trunk/source/java/net/sf/jcontracts/antlr/TokenQueue.java trunk/source/java/net/sf/jcontracts/antlr/TokenRangeElement.java trunk/source/java/net/sf/jcontracts/antlr/TokenRefElement.java trunk/source/java/net/sf/jcontracts/antlr/TokenSymbol.java trunk/source/java/net/sf/jcontracts/antlr/Tokenizer.java trunk/source/java/net/sf/jcontracts/antlr/Tool.java trunk/source/java/net/sf/jcontracts/antlr/ToolErrorHandler.java trunk/source/java/net/sf/jcontracts/antlr/TreeBlockContext.java trunk/source/java/net/sf/jcontracts/antlr/TreeElement.java trunk/source/java/net/sf/jcontracts/antlr/TreeParser.java trunk/source/java/net/sf/jcontracts/antlr/TreeSpecifierNode.java trunk/source/java/net/sf/jcontracts/antlr/TreeWalkerGrammar.java trunk/source/java/net/sf/jcontracts/antlr/WildcardElement.java trunk/source/java/net/sf/jcontracts/antlr/ZeroOrMoreBlock.java trunk/source/java/net/sf/jcontracts/antlr/actions/ActionLexer.java trunk/source/java/net/sf/jcontracts/antlr/actions/ActionLexerTokenTypes.java trunk/source/java/net/sf/jcontracts/antlr/collections/AST.java trunk/source/java/net/sf/jcontracts/antlr/collections/ASTEnumeration.java trunk/source/java/net/sf/jcontracts/antlr/collections/BitSetTest.java trunk/source/java/net/sf/jcontracts/antlr/collections/Enumerator.java trunk/source/java/net/sf/jcontracts/antlr/collections/LLStackTest.java trunk/source/java/net/sf/jcontracts/antlr/collections/LListTest.java trunk/source/java/net/sf/jcontracts/antlr/collections/List.java trunk/source/java/net/sf/jcontracts/antlr/collections/Stack.java trunk/source/java/net/sf/jcontracts/antlr/collections/impl/ASTArray.java trunk/source/java/net/sf/jcontracts/antlr/collections/impl/ASTEnumerator.java trunk/source/java/net/sf/jcontracts/antlr/collections/impl/BitSet.java trunk/source/java/net/sf/jcontracts/antlr/collections/impl/IndexedVector.java trunk/source/java/net/sf/jcontracts/antlr/collections/impl/LLCell.java trunk/source/java/net/sf/jcontracts/antlr/collections/impl/LLEnumeration.java trunk/source/java/net/sf/jcontracts/antlr/collections/impl/LList.java trunk/source/java/net/sf/jcontracts/antlr/collections/impl/Vector.java trunk/source/java/net/sf/jcontracts/antlr/collections/impl/VectorEnumeration.java trunk/source/java/net/sf/jcontracts/antlr/collections/impl/VectorEnumerator.java trunk/source/java/net/sf/jcontracts/antlr/preprocessor/Grammar.java trunk/source/java/net/sf/jcontracts/antlr/preprocessor/GrammarFile.java trunk/source/java/net/sf/jcontracts/antlr/preprocessor/Hierarchy.java trunk/source/java/net/sf/jcontracts/antlr/preprocessor/Option.java trunk/source/java/net/sf/jcontracts/antlr/preprocessor/Preprocessor.java trunk/source/java/net/sf/jcontracts/antlr/preprocessor/PreprocessorLexer.java trunk/source/java/net/sf/jcontracts/antlr/preprocessor/PreprocessorTokenTypes.java trunk/source/java/net/sf/jcontracts/antlr/preprocessor/Rule.java trunk/source/java/net/sf/jcontracts/antlr/preprocessor/Tool.java trunk/source/java/net/sf/jcontracts/argparser/ArgLexer.java trunk/source/java/net/sf/jcontracts/argparser/ArgParser.java trunk/source/java/net/sf/jcontracts/argparser/ArgTokenTypes.java trunk/source/java/net/sf/jcontracts/argparser/ExtendedToken.java trunk/source/java/net/sf/jcontracts/argparser/MetaclassFactory.java trunk/source/java/net/sf/jcontracts/argparser/Option.java trunk/source/java/net/sf/jcontracts/argparser/OptionMetaclass.java trunk/source/java/net/sf/jcontracts/argparser/Parser.java trunk/source/java/net/sf/jcontracts/argparser/ParserMetaclassFactory.java trunk/source/java/net/sf/jcontracts/argparser/Target.java trunk/source/java/net/sf/jcontracts/argparser/TargetMetaclass.java trunk/source/java/net/sf/jcontracts/codeparser/Class.java trunk/source/java/net/sf/jcontracts/codeparser/CodeComment.java trunk/source/java/net/sf/jcontracts/codeparser/CodeMetaclass.java trunk/source/java/net/sf/jcontracts/codeparser/CodeMetaclassCache.java trunk/source/java/net/sf/jcontracts/codeparser/DebugVisitor.java trunk/source/java/net/sf/jcontracts/codeparser/DottyVisitor.java trunk/source/java/net/sf/jcontracts/codeparser/DottyVisitorConstants.java trunk/source/java/net/sf/jcontracts/codeparser/Dotty_Component_CommonLevel.java trunk/source/java/net/sf/jcontracts/codeparser/Dotty_Component_PackageLevel.java trunk/source/java/net/sf/jcontracts/codeparser/Dotty_Component_TypeLevel.java trunk/source/java/net/sf/jcontracts/codeparser/ExtendedToken.java trunk/source/java/net/sf/jcontracts/codeparser/ICodeBody.java trunk/source/java/net/sf/jcontracts/codeparser/ICodeMetaclassVisitor.java trunk/source/java/net/sf/jcontracts/codeparser/IDependencyFilter.java trunk/source/java/net/sf/jcontracts/codeparser/IDotty_Component_Level.java trunk/source/java/net/sf/jcontracts/codeparser/Interface.java trunk/source/java/net/sf/jcontracts/codeparser/JavaLexer.java trunk/source/java/net/sf/jcontracts/codeparser/JavaParser.java trunk/source/java/net/sf/jcontracts/codeparser/JavaTokenTypes.java trunk/source/java/net/sf/jcontracts/codeparser/MetaclassFactory.java trunk/source/java/net/sf/jcontracts/codeparser/Method.java trunk/source/java/net/sf/jcontracts/codeparser/Parser.java trunk/source/java/net/sf/jcontracts/codeparser/ParserMetaclassFactory.java trunk/source/java/net/sf/jcontracts/codeparser/TypeMetaclass.java trunk/source/java/net/sf/jcontracts/codeparser/Variable.java trunk/source/java/net/sf/jcontracts/dependencyanalyzer/BooleanBlockWithNodeArg.java trunk/source/java/net/sf/jcontracts/dependencyanalyzer/DependencyAnalyzer.java trunk/source/java/net/sf/jcontracts/dependencyanalyzer/Graph.java trunk/source/java/net/sf/jcontracts/dependencyanalyzer/Node.java trunk/source/java/net/sf/jcontracts/icontract/AllFilesUpToDateException.java trunk/source/java/net/sf/jcontracts/icontract/AllOption.java trunk/source/java/net/sf/jcontracts/icontract/ArgMetaclassFactory.java trunk/source/java/net/sf/jcontracts/icontract/AssertionExpression.java trunk/source/java/net/sf/jcontracts/icontract/Class.java trunk/source/java/net/sf/jcontracts/icontract/CleanOption.java trunk/source/java/net/sf/jcontracts/icontract/CompilerOption.java trunk/source/java/net/sf/jcontracts/icontract/Constants.java trunk/source/java/net/sf/jcontracts/icontract/Darwin.java trunk/source/java/net/sf/jcontracts/icontract/DefaultExceptionOption.java trunk/source/java/net/sf/jcontracts/icontract/FileTarget.java trunk/source/java/net/sf/jcontracts/icontract/HelpOption.java trunk/source/java/net/sf/jcontracts/icontract/IContracted.java trunk/source/java/net/sf/jcontracts/icontract/Interface.java trunk/source/java/net/sf/jcontracts/icontract/Internal0Option.java trunk/source/java/net/sf/jcontracts/icontract/InvCheck.java trunk/source/java/net/sf/jcontracts/icontract/InvCheckCallOption.java trunk/source/java/net/sf/jcontracts/icontract/MergeOption.java trunk/source/java/net/sf/jcontracts/icontract/MetaclassFactory.java trunk/source/java/net/sf/jcontracts/icontract/Method.java trunk/source/java/net/sf/jcontracts/icontract/NoInitialCompilationOption.java trunk/source/java/net/sf/jcontracts/icontract/NoRepositoryCompilationOption.java trunk/source/java/net/sf/jcontracts/icontract/OneOneOption.java trunk/source/java/net/sf/jcontracts/icontract/Option.java trunk/source/java/net/sf/jcontracts/icontract/OutputOption.java trunk/source/java/net/sf/jcontracts/icontract/ParameterOption.java trunk/source/java/net/sf/jcontracts/icontract/PrePostCheck.java trunk/source/java/net/sf/jcontracts/icontract/ProcessingOption.java trunk/source/java/net/sf/jcontracts/icontract/QuietOption.java trunk/source/java/net/sf/jcontracts/icontract/Repository.java trunk/source/java/net/sf/jcontracts/icontract/RepositoryOutputOption.java trunk/source/java/net/sf/jcontracts/icontract/SourceCompilerOption.java trunk/source/java/net/sf/jcontracts/icontract/SystemInTarget.java trunk/source/java/net/sf/jcontracts/icontract/Target.java trunk/source/java/net/sf/jcontracts/icontract/Tool.java trunk/source/java/net/sf/jcontracts/icontract/UnableToDetermineTypeException.java trunk/source/java/net/sf/jcontracts/icontract/Variable.java trunk/source/java/net/sf/jcontracts/icontract/VerboseOption.java trunk/source/java/net/sf/jcontracts/icontract/WrapExceptionOption.java trunk/source/java/net/sf/jcontracts/icontract/XOption.java trunk/source/java/net/sf/jcontracts/icontract/instruction/DeclareReturnValueHolder.java trunk/source/java/net/sf/jcontracts/icontract/instruction/Instruction.java trunk/source/java/net/sf/jcontracts/icontract/instruction/InstructionBase.java trunk/source/java/net/sf/jcontracts/icontract/side/MethodFront.java trunk/source/java/net/sf/jcontracts/icontract/side/Side.java trunk/source/java/net/sf/jcontracts/icontract/side/SideBase.java trunk/source/java/net/sf/jcontracts/icontract/side/SideFactory.java trunk/source/java/net/sf/jcontracts/icontract/util/Array.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/ArchitectureSpecification.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/ArchitectureSpecificationFilter.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/CompositePattern.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/Dependency.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/DependencyConstraint.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/DependencyConstraintExporter.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/DifferencePattern.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/Group.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/Idiom.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/IdiomFactory.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/IsolateIdiom.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/LanguageFactory.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/LayerIdiom.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PSpecLexer.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PSpecParser.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PSpecTokenTypes.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/Pattern.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PatternFactory.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PatternSyntaxException.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/SetPattern.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/SingleDependencyConstraint.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/SingularPattern.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/StrictlyLayerIdiom.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/xml/XMLRuleLanguage.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/xml/XMLRuleLanguageSpecification.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/with_rules/IArchitectureSpecification.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/with_rules/IRule.java trunk/source/java/net/sf/jcontracts/idarwin/specification/openapi/IArchitectureExporter.java trunk/source/java/net/sf/jcontracts/idarwin/specification/openapi/IArchitectureSpecification.java trunk/source/java/net/sf/jcontracts/idarwin/specification/openapi/IArchitectureSpecificationFilter.java trunk/source/java/net/sf/jcontracts/idarwin/specification/openapi/IDependency.java trunk/source/java/net/sf/jcontracts/idarwin/specification/openapi/ILanguageFactory.java trunk/source/java/net/sf/jcontracts/idarwin/specification/openapi/IllFormedSpecificationException.java trunk/source/java/net/sf/jcontracts/idarwin/specification/openapi/RunData.java trunk/source/java/net/sf/jcontracts/util/JavaEvaluator.java trunk/source/java/net/sf/jcontracts/util/StringComparator.java Modified: trunk/source/java/net/sf/jcontracts/antlr/ANTLRException.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/ANTLRException.java 2006-12-05 07:25:30 UTC (rev 42) +++ trunk/source/java/net/sf/jcontracts/antlr/ANTLRException.java 2006-12-27 06:16:00 UTC (rev 43) @@ -1,3 +1,19 @@ +/* + * Copyright 1997-2000 Reto Kramer + * Copyright 2006 John Swapceinski, Johan Stuyts + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package net.sf.jcontracts.antlr; public class ANTLRException extends Exception Modified: trunk/source/java/net/sf/jcontracts/antlr/ANTLRGrammarParseBehavior.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/ANTLRGrammarParseBehavior.java 2006-12-05 07:25:30 UTC (rev 42) +++ trunk/source/java/net/sf/jcontracts/antlr/ANTLRGrammarParseBehavior.java 2006-12-27 06:16:00 UTC (rev 43) @@ -1,3 +1,19 @@ +/* + * Copyright 1997-2000 Reto Kramer + * Copyright 2006 John Swapceinski, Johan Stuyts + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package net.sf.jcontracts.antlr; import net.sf.jcontracts.antlr.collections.impl.BitSet; Modified: trunk/source/java/net/sf/jcontracts/antlr/ANTLRHashString.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/ANTLRHashString.java 2006-12-05 07:25:30 UTC (rev 42) +++ trunk/source/java/net/sf/jcontracts/antlr/ANTLRHashString.java 2006-12-27 06:16:00 UTC (rev 43) @@ -1,3 +1,19 @@ +/* + * Copyright 1997-2000 Reto Kramer + * Copyright 2006 John Swapceinski, Johan Stuyts + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package net.sf.jcontracts.antlr; public class ANTLRHashString Modified: trunk/source/java/net/sf/jcontracts/antlr/ANTLRLexer.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/ANTLRLexer.java 2006-12-05 07:25:30 UTC (rev 42) +++ trunk/source/java/net/sf/jcontracts/antlr/ANTLRLexer.java 2006-12-27 06:16:00 UTC (rev 43) @@ -1,3 +1,19 @@ +/* + * Copyright 1997-2000 Reto Kramer + * Copyright 2006 John Swapceinski, Johan Stuyts + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package net.sf.jcontracts.antlr; import java.io.Reader; Modified: trunk/source/java/net/sf/jcontracts/antlr/ANTLRParser.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/ANTLRParser.java 2006-12-05 07:25:30 UTC (rev 42) +++ trunk/source/java/net/sf/jcontracts/antlr/ANTLRParser.java 2006-12-27 06:16:00 UTC (rev 43) @@ -1,3 +1,19 @@ +/* + * Copyright 1997-2000 Reto Kramer + * Copyright 2006 John Swapceinski, Johan Stuyts + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package net.sf.jcontracts.antlr; import net.sf.jcontracts.antlr.collections.impl.BitSet; Modified: trunk/source/java/net/sf/jcontracts/antlr/ANTLRStringBuffer.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/ANTLRStringBuffer.java 2006-12-05 07:25:30 UTC (rev 42) +++ trunk/source/java/net/sf/jcontracts/antlr/ANTLRStringBuffer.java 2006-12-27 06:16:00 UTC (rev 43) @@ -1,3 +1,19 @@ +/* + * Copyright 1997-2000 Reto Kramer + * Copyright 2006 John Swapceinski, Johan Stuyts + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package net.sf.jcontracts.antlr; public class ANTLRStringBuffer Modified: trunk/source/java/net/sf/jcontracts/antlr/ANTLRTokdefLexer.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/ANTLRTokdefLexer.java 2006-12-05 07:25:30 UTC (rev 42) +++ trunk/source/java/net/sf/jcontracts/antlr/ANTLRTokdefLexer.java 2006-12-27 06:16:00 UTC (rev 43) @@ -1,3 +1,19 @@ +/* + * Copyright 1997-2000 Reto Kramer + * Copyright 2006 John Swapceinski, Johan Stuyts + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package net.sf.jcontracts.antlr; import java.io.Reader; Modified: trunk/source/java/net/sf/jcontracts/antlr/ANTLRTokdefParser.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/ANTLRTokdefParser.java 2006-12-05 07:25:30 UTC (rev 42) +++ trunk/source/java/net/sf/jcontracts/antlr/ANTLRTokdefParser.java 2006-12-27 06:16:00 UTC (rev 43) @@ -1,3 +1,19 @@ +/* + * Copyright 1997-2000 Reto Kramer + * Copyright 2006 John Swapceinski, Johan Stuyts + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package net.sf.jcontracts.antlr; import net.sf.jcontracts.antlr.collections.impl.BitSet; Modified: trunk/source/java/net/sf/jcontracts/antlr/ANTLRTokdefParserTokenTypes.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/ANTLRTokdefParserTokenTypes.java 2006-12-05 07:25:30 UTC (rev 42) +++ trunk/source/java/net/sf/jcontracts/antlr/ANTLRTokdefParserTokenTypes.java 2006-12-27 06:16:00 UTC (rev 43) @@ -1,3 +1,19 @@ +/* + * Copyright 1997-2000 Reto Kramer + * Copyright 2006 John Swapceinski, Johan Stuyts + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package net.sf.jcontracts.antlr; public interface ANTLRTokdefParserTokenTypes Modified: trunk/source/java/net/sf/jcontracts/antlr/ANTLRTokenTypes.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/ANTLRTokenTypes.java 2006-12-05 07:25:30 UTC (rev 42) +++ trunk/source/java/net/sf/jcontracts/antlr/ANTLRTokenTypes.java 2006-12-27 06:16:00 UTC (rev 43) @@ -1,3 +1,19 @@ +/* + * Copyright 1997-2000 Reto Kramer + * Copyright 2006 John Swapceinski, Johan Stuyts + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package net.sf.jcontracts.antlr; public interface ANTLRTokenTypes Modified: trunk/source/java/net/sf/jcontracts/antlr/ASTFactory.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/ASTFactory.java 2006-12-05 07:25:30 UTC (rev 42) +++ trunk/source/java/net/sf/jcontracts/antlr/ASTFactory.java 2006-12-27 06:16:00 UTC (rev 43) @@ -1,3 +1,19 @@ +/* + * Copyright 1997-2000 Reto Kramer + * Copyright 2006 John Swapceinski, Johan Stuyts + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package net.sf.jcontracts.antlr; import net.sf.jcontracts.antlr.collections.AST; Modified: trunk/source/java/net/sf/jcontracts/antlr/ASTIterator.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/ASTIterator.java 2006-12-05 07:25:30 UTC (rev 42) +++ trunk/source/java/net/sf/jcontracts/antlr/ASTIterator.java 2006-12-27 06:16:00 UTC (rev 43) @@ -1,3 +1,19 @@ +/* + * Copyright 1997-2000 Reto Kramer + * Copyright 2006 John Swapceinski, Johan Stuyts + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package net.sf.jcontracts.antlr; import net.sf.jcontracts.antlr.collections.AST; Modified: trunk/source/java/net/sf/jcontracts/antlr/ASTNULLType.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/ASTNULLType.java 2006-12-05 07:25:30 UTC (rev 42) +++ trunk/source/java/net/sf/jcontracts/antlr/ASTNULLType.java 2006-12-27 06:16:00 UTC (rev 43) @@ -1,3 +1,19 @@ +/* + * Copyright 1997-2000 Reto Kramer + * Copyright 2006 John Swapceinski, Johan Stuyts + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package net.sf.jcontracts.antlr; import net.sf.jcontracts.antlr.collections.AST; Modified: trunk/source/java/net/sf/jcontracts/antlr/ASTPair.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/ASTPair.java 2006-12-05 07:25:30 UTC (rev 42) +++ trunk/source/java/net/sf/jcontracts/antlr/ASTPair.java 2006-12-27 06:16:00 UTC (rev 43) @@ -1,3 +1,19 @@ +/* + * Copyright 1997-2000 Reto Kramer + * Copyright 2006 John Swapceinski, Johan Stuyts + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package net.sf.jcontracts.antlr; import net.sf.jcontracts.antlr.collections.AST; Modified: trunk/source/java/net/sf/jcontracts/antlr/ASTVisitor.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/ASTVisitor.java 2006-12-05 07:25:30 UTC (rev 42) +++ trunk/source/java/net/sf/jcontracts/antlr/ASTVisitor.java 2006-12-27 06:16:00 UTC (rev 43) @@ -1,3 +1,19 @@ +/* + * Copyright 1997-2000 Reto Kramer + * Copyright 2006 John Swapceinski, Johan Stuyts + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package net.sf.jcontracts.antlr; import net.sf.jcontracts.antlr.collections.AST; Modified: trunk/source/java/net/sf/jcontracts/antlr/AbstractParser.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/AbstractParser.java 2006-12-05 07:25:30 UTC (rev 42) +++ trunk/source/java/net/sf/jcontracts/antlr/AbstractParser.java 2006-12-27 06:16:00 UTC (rev 43) @@ -1,3 +1,19 @@ +/* + * Copyright 1997-2000 Reto Kramer + * Copyright 2006 John Swapceinski, Johan Stuyts + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package net.sf.jcontracts.antlr; import net.sf.jcontracts.antlr.collections.AST; Modified: trunk/source/java/net/sf/jcontracts/antlr/ActionElement.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/ActionElement.java 2006-12-05 07:25:30 UTC (rev 42) +++ trunk/source/java/net/sf/jcontracts/antlr/ActionElement.java 2006-12-27 06:16:00 UTC (rev 43) @@ -1,3 +1,19 @@ +/* + * Copyright 1997-2000 Reto Kramer + * Copyright 2006 John Swapceinski, Johan Stuyts + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package net.sf.jcontracts.antlr; class ActionElement extends AlternativeElement Modified: trunk/source/java/net/sf/jcontracts/antlr/ActionTransInfo.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/ActionTransInfo.java 2006-12-05 07:25:30 UTC (rev 42) +++ trunk/source/java/net/sf/jcontracts/antlr/ActionTransInfo.java 2006-12-27 06:16:00 UTC (rev 43) @@ -1,3 +1,19 @@ +/* + * Copyright 1997-2000 Reto Kramer + * Copyright 2006 John Swapceinski, Johan Stuyts + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package net.sf.jcontracts.antlr; public class ActionTransInfo Modified: trunk/source/java/net/sf/jcontracts/antlr/Alternative.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/Alternative.java 2006-12-05 07:25:30 UTC (rev 42) +++ trunk/source/java/net/sf/jcontracts/antlr/Alternative.java 2006-12-27 06:16:00 UTC (rev 43) @@ -1,3 +1,19 @@ +/* + * Copyright 1997-2000 Reto Kramer + * Copyright 2006 John Swapceinski, Johan Stuyts + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package net.sf.jcontracts.antlr; class Alternative Modified: trunk/source/java/net/sf/jcontracts/antlr/AlternativeBlock.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/AlternativeBlock.java 2006-12-05 07:25:30 UTC (rev 42) +++ trunk/source/java/net/sf/jcontracts/antlr/AlternativeBlock.java 2006-12-27 06:16:00 UTC (rev 43) @@ -1,3 +1,19 @@ +/* + * Copyright 1997-2000 Reto Kramer + * Copyright 2006 John Swapceinski, Johan Stuyts + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package net.sf.jcontracts.antlr; import net.sf.jcontracts.antlr.collections.impl.Vector; Modified: trunk/source/java/net/sf/jcontracts/antlr/AlternativeElement.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/AlternativeElement.java 2006-12-05 07:25:30 UTC (rev 42) +++ trunk/source/java/net/sf/jcontracts/antlr/AlternativeElement.java 2006-12-27 06:16:00 UTC (rev 43) @@ -1,3 +1,19 @@ +/* + * Copyright 1997-2000 Reto Kramer + * Copyright 2006 John Swapceinski, Johan Stuyts + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package net.sf.jcontracts.antlr; abstract class AlternativeElement extends GrammarElement Modified: trunk/source/java/net/sf/jcontracts/antlr/BaseAST.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/BaseAST.java 2006-12-05 07:25:30 UTC (rev 42) +++ trunk/source/java/net/sf/jcontracts/antlr/BaseAST.java 2006-12-27 06:16:00 UTC (rev 43) @@ -1,3 +1,19 @@ +/* + * Copyright 1997-2000 Reto Kramer + * Copyright 2006 John Swapceinski, Johan Stuyts + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package net.sf.jcontracts.antlr; import net.sf.jcontracts.antlr.collections.AST; Modified: trunk/source/java/net/sf/jcontracts/antlr/BlockContext.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/BlockContext.java 2006-12-05 07:25:30 UTC (rev 42) +++ trunk/source/java/net/sf/jcontracts/antlr/BlockContext.java 2006-12-27 06:16:00 UTC (rev 43) @@ -1,3 +1,19 @@ +/* + * Copyright 1997-2000 Reto Kramer + * Copyright 2006 John Swapceinski, Johan Stuyts + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package net.sf.jcontracts.antlr; class BlockContext Modified: trunk/source/java/net/sf/jcontracts/antlr/BlockEndElement.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/BlockEndElement.java 2006-12-05 07:25:30 UTC (rev 42) +++ trunk/source/java/net/sf/jcontracts/antlr/BlockEndElement.java 2006-12-27 06:16:00 UTC (rev 43) @@ -1,3 +1,19 @@ +/* + * Copyright 1997-2000 Reto Kramer + * Copyright 2006 John Swapceinski, Johan Stuyts + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package net.sf.jcontracts.antlr; class BlockEndElement extends AlternativeElement Modified: trunk/source/java/net/sf/jcontracts/antlr/BlockWithImpliedExitPath.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/BlockWithImpliedExitPath.java 2006-12-05 07:25:30 UTC (rev 42) +++ trunk/source/java/net/sf/jcontracts/antlr/BlockWithImpliedExitPath.java 2006-12-27 06:16:00 UTC (rev 43) @@ -1,3 +1,19 @@ +/* + * Copyright 1997-2000 Reto Kramer + * Copyright 2006 John Swapceinski, Johan Stuyts + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package net.sf.jcontracts.antlr; abstract class BlockWithImpliedExitPath extends AlternativeBlock Modified: trunk/source/java/net/sf/jcontracts/antlr/CharBufferBacktrackingInteractive.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/CharBufferBacktrackingInteractive.java 2006-12-05 07:25:30 UTC (rev 42) +++ trunk/source/java/net/sf/jcontracts/antlr/CharBufferBacktrackingInteractive.java 2006-12-27 06:16:00 UTC (rev 43) @@ -1,3 +1,19 @@ +/* + * Copyright 1997-2000 Reto Kramer + * Copyright 2006 John Swapceinski, Johan Stuyts + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package net.sf.jcontracts.antlr; import java.io.IOException; Modified: trunk/source/java/net/sf/jcontracts/antlr/CharBufferBacktrackingNoInteractive.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/CharBufferBacktrackingNoInteractive.java 2006-12-05 07:25:30 UTC (rev 42) +++ trunk/source/java/net/sf/jcontracts/antlr/CharBufferBacktrackingNoInteractive.java 2006-12-27 06:16:00 UTC (rev 43) @@ -1,3 +1,19 @@ +/* + * Copyright 1997-2000 Reto Kramer + * Copyright 2006 John Swapceinski, Johan Stuyts + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package net.sf.jcontracts.antlr; import java.io.IOException; Modified: trunk/source/java/net/sf/jcontracts/antlr/CharBufferNoBacktrackingInteractive.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/CharBufferNoBacktrackingInteractive.java 2006-12-05 07:25:30 UTC (rev 42) +++ trunk/source/java/net/sf/jcontracts/antlr/CharBufferNoBacktrackingInteractive.java 2006-12-27 06:16:00 UTC (rev 43) @@ -1,3 +1,19 @@ +/* + * Copyright 1997-2000 Reto Kramer + * Copyright 2006 John Swapceinski, Johan Stuyts + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package net.sf.jcontracts.antlr; import java.io.IOException; Modified: trunk/source/java/net/sf/jcontracts/antlr/CharBufferNoBacktrackingNoInteractive.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/CharBufferNoBacktrackingNoInteractive.java 2006-12-05 07:25:30 UTC (rev 42) +++ trunk/source/java/net/sf/jcontracts/antlr/CharBufferNoBacktrackingNoInteractive.java 2006-12-27 06:16:00 UTC (rev 43) @@ -1,3 +1,19 @@ +/* + * Copyright 1997-2000 Reto Kramer + * Copyright 2006 John Swapceinski, Johan Stuyts + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package net.sf.jcontracts.antlr; import java.io.IOException; Modified: trunk/source/java/net/sf/jcontracts/antlr/CharFormatter.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/CharFormatter.java 2006-12-05 07:25:30 UTC (rev 42) +++ trunk/source/java/net/sf/jcontracts/antlr/CharFormatter.java 2006-12-27 06:16:00 UTC (rev 43) @@ -1,3 +1,19 @@ +/* + * Copyright 1997-2000 Reto Kramer + * Copyright 2006 John Swapceinski, Johan Stuyts + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package net.sf.jcontracts.antlr; public interface CharFormatter Modified: trunk/source/java/net/sf/jcontracts/antlr/CharLiteralElement.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/CharLiteralElement.java 2006-12-05 07:25:30 UTC (rev 42) +++ trunk/source/java/net/sf/jcontracts/antlr/CharLiteralElement.java 2006-12-27 06:16:00 UTC (rev 43) @@ -1,3 +1,19 @@ +/* + * Copyright 1997-2000 Reto Kramer + * Copyright 2006 John Swapceinski, Johan Stuyts + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package net.sf.jcontracts.antlr; class CharLiteralElement extends GrammarAtom Modified: trunk/source/java/net/sf/jcontracts/antlr/CharQueue.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/CharQueue.java 2006-12-05 07:25:30 UTC (rev 42) +++ trunk/source/java/net/sf/jcontracts/antlr/CharQueue.java 2006-12-27 06:16:00 UTC (rev 43) @@ -1,3 +1,19 @@ +/* + * Copyright 1997-2000 Reto Kramer + * Copyright 2006 John Swapceinski, Johan Stuyts + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package net.sf.jcontracts.antlr; class CharQueue Modified: trunk/source/java/net/sf/jcontracts/antlr/CharRangeElement.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/CharRangeElement.java 2006-12-05 07:25:30 UTC (rev 42) +++ trunk/source/java/net/sf/jcontracts/antlr/CharRangeElement.java 2006-12-27 06:16:00 UTC (rev 43) @@ -1,3 +1,19 @@ +/* + * Copyright 1997-2000 Reto Kramer + * Copyright 2006 John Swapceinski, Johan Stuyts + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package net.sf.jcontracts.antlr; class CharRangeElement extends AlternativeElement Modified: trunk/source/java/net/sf/jcontracts/antlr/CharScanner.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/CharScanner.java 2006-12-05 07:25:30 UTC (rev 42) +++ trunk/source/java/net/sf/jcontracts/antlr/CharScanner.java 2006-12-27 06:16:00 UTC (rev 43) @@ -1,3 +1,19 @@ +/* + * Copyright 1997-2000 Reto Kramer + * Copyright 2006 John Swapceinski, Johan Stuyts + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package net.sf.jcontracts.antlr; import java.util.Hashtable; Modified: trunk/source/java/net/sf/jcontracts/antlr/CharScannerBacktrackingInteractive.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/CharScannerBacktrackingInteractive.java 2006-12-05 07:25:30 UTC (rev 42) +++ trunk/source/java/net/sf/jcontracts/antlr/CharScannerBacktrackingInteractive.java 2006-12-27 06:16:00 UTC (rev 43) @@ -1,3 +1,19 @@ +/* + * Copyright 1997-2000 Reto Kramer + * Copyright 2006 John Swapceinski, Johan Stuyts + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package net.sf.jcontracts.antlr; import java.io.IOException; Modified: trunk/source/java/net/sf/jcontracts/antlr/CharScannerBacktrackingInteractiveNoCaseSensitive.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/CharScannerBacktrackingInteractiveNoCaseSensitive.java 2006-12-05 07:25:30 UTC (rev 42) +++ trunk/source/java/net/sf/jcontracts/antlr/CharScannerBacktrackingInteractiveNoCaseSensitive.java 2006-12-27 06:16:00 UTC (rev 43) @@ -1,3 +1,19 @@ +/* + * Copyright 1997-2000 Reto Kramer + * Copyright 2006 John Swapceinski, Johan Stuyts + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package net.sf.jcontracts.antlr; import java.io.IOException; Modified: trunk/source/java/net/sf/jcontracts/antlr/CharScannerBacktrackingNoInteractive.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/CharScannerBacktrackingNoInteractive.java 2006-12-05 07:25:30 UTC (rev 42) +++ trunk/source/java/net/sf/jcontracts/antlr/CharScannerBacktrackingNoInteractive.java 2006-12-27 06:16:00 UTC (rev 43) @@ -1,3 +1,19 @@ +/* + * Copyright 1997-2000 Reto Kramer + * Copyright 2006 John Swapceinski, Johan Stuyts + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package net.sf.jcontracts.antlr; import java.io.IOException; Modified: trunk/source/java/net/sf/jcontracts/antlr/CharScannerBacktrackingNoInteractiveNoCaseSensitive.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/CharScannerBacktracki... [truncated message content] |
From: <js...@us...> - 2006-12-27 20:44:38
|
Revision: 45 http://svn.sourceforge.net/jcontracts/?rev=45&view=rev Author: jstuyts Date: 2006-12-27 12:44:35 -0800 (Wed, 27 Dec 2006) Log Message: ----------- Fixed package names. Modified Paths: -------------- trunk/source/java/net/sf/jcontracts/argparser/ArgParser.java trunk/source/java/net/sf/jcontracts/argparser/Parser.java trunk/source/java/net/sf/jcontracts/codeparser/JavaParser.java trunk/source/java/net/sf/jcontracts/codeparser/Parser.java Modified: trunk/source/java/net/sf/jcontracts/argparser/ArgParser.java =================================================================== --- trunk/source/java/net/sf/jcontracts/argparser/ArgParser.java 2006-12-27 06:19:30 UTC (rev 44) +++ trunk/source/java/net/sf/jcontracts/argparser/ArgParser.java 2006-12-27 20:44:35 UTC (rev 45) @@ -126,7 +126,7 @@ is = new InputStreamReader(System.in); } ArgLexer lexer = new ArgLexer(is); - lexer.setTokenObjectClass("net.sf.jcontracts.argParser.ExtendedToken"); + lexer.setTokenObjectClass("net.sf.jcontracts.argparser.ExtendedToken"); ArgParser parser = new ArgParser(lexer); parser.cmdline(); System.out.println("OPTIONS:"); Modified: trunk/source/java/net/sf/jcontracts/argparser/Parser.java =================================================================== --- trunk/source/java/net/sf/jcontracts/argparser/Parser.java 2006-12-27 06:19:30 UTC (rev 44) +++ trunk/source/java/net/sf/jcontracts/argparser/Parser.java 2006-12-27 20:44:35 UTC (rev 45) @@ -33,7 +33,7 @@ { StringReader is = new StringReader(s); _lexer = new ArgLexer(is); - _lexer.setTokenObjectClass("net.sf.jcontracts.argParser.ExtendedToken"); + _lexer.setTokenObjectClass("net.sf.jcontracts.argparser.ExtendedToken"); _argparser = new ArgParser(_lexer); } Modified: trunk/source/java/net/sf/jcontracts/codeparser/JavaParser.java =================================================================== --- trunk/source/java/net/sf/jcontracts/codeparser/JavaParser.java 2006-12-27 06:19:30 UTC (rev 44) +++ trunk/source/java/net/sf/jcontracts/codeparser/JavaParser.java 2006-12-27 20:44:35 UTC (rev 45) @@ -2772,7 +2772,7 @@ filename = "<System.in>"; } JavaLexer lexer = new JavaLexer(is); - lexer.setTokenObjectClass("net.sf.jcontracts.codeParser.ExtendedToken"); + lexer.setTokenObjectClass("net.sf.jcontracts.codeparser.ExtendedToken"); JavaParser parser = new JavaParser(lexer); MetaclassFactory metaclassFactory = new MetaclassFactory(filename); parser.setMetaclassFactory(metaclassFactory); Modified: trunk/source/java/net/sf/jcontracts/codeparser/Parser.java =================================================================== --- trunk/source/java/net/sf/jcontracts/codeparser/Parser.java 2006-12-27 06:19:30 UTC (rev 44) +++ trunk/source/java/net/sf/jcontracts/codeparser/Parser.java 2006-12-27 20:44:35 UTC (rev 45) @@ -33,7 +33,7 @@ public Parser(Reader is, String filename) { _lexer = new JavaLexer(is); - _lexer.setTokenObjectClass("net.sf.jcontracts.codeParser.ExtendedToken"); + _lexer.setTokenObjectClass("net.sf.jcontracts.codeparser.ExtendedToken"); _javaparser = new JavaParser(_lexer); _javaparser.setFilename(filename); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <js...@us...> - 2008-05-09 17:08:18
|
Revision: 48 http://jcontracts.svn.sourceforge.net/jcontracts/?rev=48&view=rev Author: jstuyts Date: 2008-05-09 10:08:10 -0700 (Fri, 09 May 2008) Log Message: ----------- Removed obsolote options. Removed unused classes. Some small code cleanups. Modified Paths: -------------- trunk/source/java/net/sf/jcontracts/argparser/ArgParser.java trunk/source/java/net/sf/jcontracts/icontract/ArgMetaclassFactory.java trunk/source/java/net/sf/jcontracts/icontract/Class.java trunk/source/java/net/sf/jcontracts/icontract/FileTarget.java trunk/source/java/net/sf/jcontracts/icontract/HelpOption.java trunk/source/java/net/sf/jcontracts/icontract/MergeOption.java trunk/source/java/net/sf/jcontracts/icontract/Method.java trunk/source/java/net/sf/jcontracts/icontract/Option.java trunk/source/java/net/sf/jcontracts/icontract/Repository.java trunk/source/java/net/sf/jcontracts/icontract/Tool.java Removed Paths: ------------- trunk/source/java/net/sf/jcontracts/icontract/CleanOption.java trunk/source/java/net/sf/jcontracts/icontract/CompilerOption.java trunk/source/java/net/sf/jcontracts/icontract/Darwin.java trunk/source/java/net/sf/jcontracts/icontract/Internal0Option.java trunk/source/java/net/sf/jcontracts/icontract/InvCheckCallOption.java trunk/source/java/net/sf/jcontracts/icontract/NoInitialCompilationOption.java trunk/source/java/net/sf/jcontracts/icontract/NoRepositoryCompilationOption.java trunk/source/java/net/sf/jcontracts/icontract/OneOneOption.java trunk/source/java/net/sf/jcontracts/icontract/QuietOption.java trunk/source/java/net/sf/jcontracts/icontract/SourceCompilerOption.java trunk/source/java/net/sf/jcontracts/icontract/VerboseOption.java trunk/source/java/net/sf/jcontracts/icontract/WrapExceptionOption.java trunk/source/java/net/sf/jcontracts/icontract/XOption.java trunk/source/java/net/sf/jcontracts/icontract/util/ trunk/source/java/net/sf/jcontracts/util/ Modified: trunk/source/java/net/sf/jcontracts/argparser/ArgParser.java =================================================================== --- trunk/source/java/net/sf/jcontracts/argparser/ArgParser.java 2008-05-09 17:07:10 UTC (rev 47) +++ trunk/source/java/net/sf/jcontracts/argparser/ArgParser.java 2008-05-09 17:08:10 UTC (rev 48) @@ -185,7 +185,8 @@ Token j = null; j = LT(1); match(6); - TargetMetaclass t = getMetaclassFactory().newTarget(j.getText()); + String tokenText = j.getText(); + TargetMetaclass t = getMetaclassFactory().newTarget(tokenText); return t; } Modified: trunk/source/java/net/sf/jcontracts/icontract/ArgMetaclassFactory.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/ArgMetaclassFactory.java 2008-05-09 17:07:10 UTC (rev 47) +++ trunk/source/java/net/sf/jcontracts/icontract/ArgMetaclassFactory.java 2008-05-09 17:08:10 UTC (rev 48) @@ -34,30 +34,10 @@ { o = new HelpOption(name, parameters); } - else if (name.compareTo("v") == 0) - { - o = new VerboseOption(name, parameters); - } - else if (name.compareTo("c") == 0) - { - o = new CompilerOption(name, parameters); - } - else if (name.compareTo("b") == 0) - { - o = new SourceCompilerOption(name, parameters); - } - else if (name.compareTo("n") == 0) - { - o = new NoRepositoryCompilationOption(name, parameters); - } else if (name.compareTo("o") == 0) { o = new OutputOption(name, parameters); } - else if (name.compareTo("y") == 0) - { - o = new OneOneOption(name, parameters); - } else if (name.compareTo("k") == 0) { o = new RepositoryOutputOption(name, parameters); @@ -66,42 +46,14 @@ { o = new DefaultExceptionOption(name, parameters); } - else if (name.compareTo("r") == 0) - { - o = new CleanOption(name, parameters); - } else if (name.compareTo("m") == 0) { o = new MergeOption(name, parameters); } - else if (name.compareTo("i") == 0) - { - o = new InvCheckCallOption(name, parameters); - } - else if (name.compareTo("w") == 0) - { - o = new WrapExceptionOption(name, parameters); - } - else if (name.compareTo("q") == 0) - { - o = new QuietOption(name, parameters); - } else if (name.compareTo("a") == 0) { o = new AllOption(name, parameters); } - else if (name.compareTo("x") == 0) - { - o = new XOption(name, parameters); - } - else if (name.compareTo("Z") == 0) - { - o = new Internal0Option(name, parameters); - } - else if (name.compareTo("j") == 0) - { - o = new NoInitialCompilationOption(name, parameters); - } else { throw new RuntimeException("Java Contract Suite: error: unknown option -" + name); Modified: trunk/source/java/net/sf/jcontracts/icontract/Class.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/Class.java 2008-05-09 17:07:10 UTC (rev 47) +++ trunk/source/java/net/sf/jcontracts/icontract/Class.java 2008-05-09 17:08:10 UTC (rev 48) @@ -43,10 +43,6 @@ public static final char EXCEPTION_CLASS_MARKER = 35; - public static boolean generateSuperCheckCallFlag = false; - - public static boolean doWrapExceptionOptionFlag = false; - public static String defaultExceptionClassName = "RuntimeException"; public Class(String name, String filename, int line_number) @@ -335,10 +331,7 @@ throw new RuntimeException("Java Contract Suite:error: more than 4 arguments (" + f + ") not supported at the moment [991]. Easy to be added though."); } - else - { - return m; - } + return m; } public Vector getAllNonImplementedMethods() @@ -693,7 +686,7 @@ super_interfaces = new Vector(); } boolean inv_check_method_exists = false; - if (generateSuperCheckCallFlag && supercName != null) + if (supercName != null) { String invCheckMethodName = supercName.replace('.', '_'); invCheckMethodName = "__check_invariant____" + invCheckMethodName; @@ -743,15 +736,8 @@ } } } - if (generateSuperCheckCallFlag) + if (supercName != null && !inv_check_method_exists) { - if (supercName != null && !inv_check_method_exists) - { - super_interfaces.insertElementAt(supercName, 0); - } - } - else if (supercName != null) - { super_interfaces.insertElementAt(supercName, 0); } if (getParent() != null) @@ -844,10 +830,10 @@ Vector closure_source = new Vector(); for (int i = 0; i < inv_conds.size(); i++) { - if (!closure_conds.contains((String) inv_conds.elementAt(i))) + if (!closure_conds.contains(inv_conds.elementAt(i))) { - closure_conds.addElement((String) inv_conds.elementAt(i)); - closure_source.addElement((String) inv_source.elementAt(i)); + closure_conds.addElement(inv_conds.elementAt(i)); + closure_source.addElement(inv_source.elementAt(i)); } else { @@ -894,35 +880,20 @@ String inst_var_decl = "// Keeps track of calling chain to avoid recursive invariant checks.\n"; inst_var_decl = inst_var_decl + "// Avoids inv checks in public methods that are called from private ones.\n"; inst_var_decl = inst_var_decl + "// Stores bookkeeping information -- key: thread, value: call level\n"; - boolean do_not_enforce_precompilation_of_source = Boolean - .getBoolean("jcontracts.internal.do_not_enforce_precompilation_of_source"); - if (do_not_enforce_precompilation_of_source) - { - System.err - .println("Java Contract Suite:SWITCH:jcontracts.internal.do_not_enforce_precompilation_of_source=true"); - } boolean icl_already_defined = false; - if (!do_not_enforce_precompilation_of_source) + try { - try - { - icl_already_defined = checkIfFieldExistsInSuperclassClosure(java.lang.Class.forName(getName()), - "__icl_"); - } - catch (ClassNotFoundException _ex) - { - throw new RuntimeException( - getLocationDescription() - + "Java Contract Suite: ERROR: could not find " - + getName() - + ". Please compile the sourcefile, see -j option (Java Contract Suite needs the compiled file to determine whether or not to create invariant bookkeeping variables (__icl_)). Exiting Java Contract Suite.", - _ex); - } + icl_already_defined = checkIfFieldExistsInSuperclassClosure(java.lang.Class.forName(getName()), + "__icl_"); } - if (do_not_enforce_precompilation_of_source) + catch (ClassNotFoundException _ex) { - System.err - .println("Java Contract Suite: SWITCH:invariant bookkeeping may NOT work correctly because the check for the existence of the __icl_ variable in superclasses was disables. This means that there is an __icl_ varaible at each level of the inheritance rather than one and one only per inheritance chain! THIS IS ONLY SUITABLE FOR CERTAIN SPECIAL TESTCASES. REMOVE the 'java -Djcontracts.internal.do_not_enforce_precompilation_of_source' property to make Java Contract Suite work in normal (correct) mode!"); + throw new RuntimeException( + getLocationDescription() + + "Java Contract Suite: ERROR: could not find " + + getName() + + ". Please compile the sourcefile (Java Contract Suite needs the compiled file to determine whether or not to create invariant bookkeeping variables (__icl_)). Exiting Java Contract Suite.", + _ex); } if (!icl_already_defined) { @@ -1011,7 +982,7 @@ header = header + " {"; } String code = "\n"; - if (generateSuperCheckCallFlag && supercName != null) + if (supercName != null) { if (inv_check_method_exists) { @@ -1117,14 +1088,7 @@ code = "try {" + code; code = code + "}\n"; - if (!doWrapExceptionOptionFlag) - { - code = code + "catch ( " + "RuntimeException" + " ex ) {\n"; - } - else - { - code = code + "catch ( Exception ex ) {\n"; - } + code = code + "catch ( Exception ex ) {\n"; code = code + " String msg = \"\";\n"; code = code + " if (ex.getClass()==" @@ -1199,10 +1163,7 @@ { return Void.TYPE; } - else - { - return null; - } + return null; } public String getTypeOfValue(String value) throws UnableToDetermineTypeException @@ -1699,9 +1660,9 @@ Vector closure_conds = new Vector(); for (int i = 0; i < inv_conds.size(); i++) { - if (!closure_conds.contains((String) inv_conds.elementAt(i))) + if (!closure_conds.contains(inv_conds.elementAt(i))) { - closure_conds.addElement((String) inv_conds.elementAt(i)); + closure_conds.addElement(inv_conds.elementAt(i)); } } Deleted: trunk/source/java/net/sf/jcontracts/icontract/CleanOption.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/CleanOption.java 2008-05-09 17:07:10 UTC (rev 47) +++ trunk/source/java/net/sf/jcontracts/icontract/CleanOption.java 2008-05-09 17:08:10 UTC (rev 48) @@ -1,30 +0,0 @@ -/* - * Copyright 1997-2000 Reto Kramer - * Copyright 2006 John Swapceinski, Johan Stuyts - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package net.sf.jcontracts.icontract; - -import java.util.Vector; - -public class CleanOption extends ParameterOption -{ - - public static final String NAME = "r"; - - public CleanOption(String name, Vector arguments) - { - super(name, arguments); - } -} Deleted: trunk/source/java/net/sf/jcontracts/icontract/CompilerOption.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/CompilerOption.java 2008-05-09 17:07:10 UTC (rev 47) +++ trunk/source/java/net/sf/jcontracts/icontract/CompilerOption.java 2008-05-09 17:08:10 UTC (rev 48) @@ -1,239 +0,0 @@ -/* - * Copyright 1997-2000 Reto Kramer - * Copyright 2006 John Swapceinski, Johan Stuyts - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package net.sf.jcontracts.icontract; - -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.FileReader; -import java.io.FileWriter; -import java.io.IOException; -import java.io.InputStreamReader; -import java.util.Enumeration; -import java.util.Vector; - -import org.apache.log4j.Logger; - -import sun.tools.javac.Main; - -public class CompilerOption extends ParameterOption -{ - private static final Logger log = Logger.getLogger(CompilerOption.class); - - public static final String NAME = "c"; - - public CompilerOption(String name, Vector arguments) - { - super(name, arguments); - } - - boolean doCompile(Vector fileList, boolean useFilenameOnly) - { - boolean result = true; - if (shallCompile() && fileList.size() > 0) - { - String comp = getCompiler(); - boolean useCallToCompiler = comp.startsWith(":"); - if (useCallToCompiler) - { - Vector options = new Vector(); - if (comp.indexOf(" ") != -1) - { - int lastsp = 1; - for (int sp = 0; (sp = comp.indexOf(" ", lastsp)) != -1;) - { - options.addElement(comp.substring(lastsp, sp).trim()); - lastsp = sp + 1; - } - - options.addElement(comp.substring(lastsp, comp.length()).trim()); - } - else if (comp.length() > 1) - { - options.addElement(comp.substring(1, comp.length()).trim()); - } - String fargs[] = new String[options.size() + fileList.size()]; - int pos = 0; - String cmdstr = ""; - for (Enumeration oenum = options.elements(); oenum.hasMoreElements();) - { - String o = (String) oenum.nextElement(); - fargs[pos] = o; - pos++; - cmdstr = cmdstr + o + " "; - } - - for (Enumeration fenum = fileList.elements(); fenum.hasMoreElements();) - { - String fn = (String) fenum.nextElement(); - if (useFilenameOnly) - { - File f = new File(fn); - fn = f.getName(); - } - fargs[pos] = fn; - pos++; - cmdstr = cmdstr + fn + " "; - } - - log.info("javac (sun.tools.javac.Main) " + cmdstr); - java.io.OutputStream javacout = new ByteArrayOutputStream(1024); - try - { - java.lang.Class.forName("sun.tools.javac.Main"); - Main theCompiler = new Main(javacout, ""); - result = theCompiler.compile(fargs); - if (!result) - { - System.err.println("\nJava Contract Suite: ERROR: compilation failed " + javacout.toString()); - } - } - catch (NoClassDefFoundError _ex) - { - throw new RuntimeException( - "Attempt to perform in-process call to sun.tools.javac.Main failed because the class could not be found! In Java-2, make sure that the JDK's tools.jar (contain sun.tools.javac.*) is on your classpath!", - _ex); - } - catch (ClassNotFoundException _ex) - { - throw new RuntimeException( - "Attempt to perform in-process call to sun.tools.javac.Main failed because the class could not be found! In Java-2, make sure that the JDK's tools.jar (contain sun.tools.javac.*) is on your classpath!", - _ex); - } - } - else - { - String files = ""; - for (Enumeration fenum = fileList.elements(); fenum.hasMoreElements();) - { - String fn = (String) fenum.nextElement(); - if (useFilenameOnly) - { - File f = new File(fn); - fn = f.getName(); - } - files = files + fn + " "; - } - - String cmd = getCompiler() + " -source 1.4 " + files; - log.info(cmd); - try - { - Process child = Runtime.getRuntime().exec(cmd); - InputStreamReader err = new InputStreamReader(child.getErrorStream()); - StringBuffer errmsg = new StringBuffer(); - if (err != null) - { - for (char buffer[] = new char[1]; err.read(buffer, 0, 1) != -1; errmsg.append(buffer[0])) - { - } - } - else - { - errmsg.append(" <could not open err stream to compiler!>"); - } - InputStreamReader out = new InputStreamReader(child.getInputStream()); - StringBuffer outmsg = new StringBuffer(); - if (out != null) - { - for (char buffer[] = new char[1]; out.read(buffer, 0, 1) != -1; outmsg.append(buffer[0])) - { - } - } - else - { - outmsg.append(" <could not open out stream of compiler!>"); - } - if (child.waitFor() != 0) - { - System.err.println("\nJava Contract Suite: ERROR: compilation failed(error code: " - + child.exitValue() + ") " + errmsg.toString() + " " + outmsg.toString()); - result = false; - } - } - catch (InterruptedException _ex) - { - result = false; - System.err.println("\nJava Contract Suite: ERROR: compilation failed."); - } - catch (IOException _ex) - { - result = false; - System.err.println("\nJava Contract Suite: ERROR: compilation failed."); - } - } - if (!result) - { - log.info("failed"); - } - } - if (!Internal0Option.isActive() && !result) - { - log - .info("deleting instrumented files .java to ensure regeneration and recompilation at the next tool invocation."); - for (Enumeration fenum = fileList.elements(); fenum.hasMoreElements();) - { - String fn = (String) fenum.nextElement(); - File f = new File(fn); - File fcopy = new File(fn + "_TO_DEBUG"); - try - { - FileReader frSource = new FileReader(f); - FileWriter fwTarget = new FileWriter(fcopy); - char buffer[] = new char[2048]; - int len = 0; - try - { - while ((len = frSource.read(buffer, 0, 2048)) != -1) - { - fwTarget.write(buffer, 0, len); - } - } - finally - { - fwTarget.close(); - frSource.close(); - } - log.info("file with errors copied for debugging: " + fn + "_TO_DEBUG"); - } - catch (IOException e) - { - throw new RuntimeException("Problems copying file " + fn + " to the " + fn + "_TO_DEBUG", e); - } - boolean success = f.delete(); - if (!success) - { - throw new RuntimeException( - "the deletion of the instrumented file (" - + fn - + ") failed although the tool just generated it a split second ago itself - were the permissions changed?"); - } - } - - } - return result; - } - - String getCompiler() - { - return (String) getArguments().firstElement(); - } - - boolean shallCompile() - { - return getArguments().size() > 0; - } -} Deleted: trunk/source/java/net/sf/jcontracts/icontract/Darwin.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/Darwin.java 2008-05-09 17:07:10 UTC (rev 47) +++ trunk/source/java/net/sf/jcontracts/icontract/Darwin.java 2008-05-09 17:08:10 UTC (rev 48) @@ -1,255 +0,0 @@ -/* - * Copyright 1997-2000 Reto Kramer - * Copyright 2006 John Swapceinski, Johan Stuyts - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package net.sf.jcontracts.icontract; - -import java.lang.reflect.Constructor; -import java.util.Enumeration; -import java.util.Hashtable; -import java.util.Vector; - -import net.sf.jcontracts.argparser.Parser; -import net.sf.jcontracts.codeparser.CodeMetaclass; -import net.sf.jcontracts.codeparser.CodeMetaclassCache; -import net.sf.jcontracts.codeparser.DottyVisitor; -import net.sf.jcontracts.codeparser.DottyVisitorConstants; -import net.sf.jcontracts.codeparser.IDependencyFilter; -import net.sf.jcontracts.idarwin.specification.openapi.IArchitectureSpecification; - -import org.apache.log4j.Logger; - -public class Darwin -{ - private static final Logger log = Logger.getLogger(Darwin.class); - - public static boolean process(String args[], Vector specset, boolean layoutLR, boolean directed, - String outputfilename, boolean check, int componentDetailLevel, boolean showPackages, Vector quietList, - Vector allFiles, Vector changedFiles, String srcbase, boolean do_not_show_dependecy_details, - IDependencyFilter filter) throws Exception - { - String recent_file = null; - try - { - Vector options; - Vector targets; - if (args.length != 0) - { - String s = ""; - for (int i = 0; i < args.length; i++) - { - if (args[i].startsWith("-") && args[i].indexOf(" ") != -1) - { - s = s + args[i].substring(0, 2) + "\"" + args[i].substring(2, args[i].length()) + "\" "; - } - else - { - s = s + args[i] + " "; - } - } - - Parser argParser = new Parser(s); - argParser.setMetaclassFactory(new ArgMetaclassFactory()); - argParser.doParse(); - options = argParser.getOptions(); - targets = argParser.getTargets(); - if (targets.isEmpty()) - { - System.err.println("iDarwin: list of source files empty, reading from standard input."); - targets.addElement(new SystemInTarget()); - } - else - { - Vector newTargets = new Vector(); - for (int i = 0; i < targets.size(); i++) - { - Target ft = (Target) targets.elementAt(i); - for (Enumeration e = ft.expand().elements(); e.hasMoreElements(); newTargets.addElement(e - .nextElement())) - { - } - } - - targets = newTargets; - } - } - else - { - options = new Vector(); - options.addElement(new HelpOption("h", new Vector())); - targets = new Vector(); - targets.addElement(new SystemInTarget()); - } - for (int i = 0; i < options.size(); i++) - { - if (!((Option) options.elementAt(i)).doesProcessing()) - { - ((ParameterOption) options.elementAt(i)).activateOnTargets(targets); - } - } - - log.info("iDarwin, Version 0.1a"); - log.info("Copyright (C) 1997-1999 Reto Kramer"); - log.info("Copyright (C) 2006 John Swapceinski, Johan\xA0Stuyts"); - log.info("options:" + options); - log.info("all files:" + targets); - if (targets.isEmpty()) - { - throw new RuntimeException( - "iDarwin: error list of source files is empty or no matches for pattern(s), no files to process!"); - } - log.info("parsing input files to determine dependencies."); - IArchitectureSpecification totalArchSpec = null; - if (check) - { - boolean atleastone = false; - for (Enumeration e = specset.elements(); e.hasMoreElements();) - { - String spec = (String) e.nextElement(); - if (!atleastone && spec.length() > 0) - { - atleastone = true; - } - int currentStart = spec.indexOf("<idarwin language="); - String languageFactory = null; - String body = null; - while (currentStart != -1 && spec.indexOf("<idarwin language=", currentStart) != -1) - { - if (spec.indexOf("<idarwin language=", currentStart) != -1 - && spec.indexOf("</idarwin>", currentStart) == -1) - { - throw new RuntimeException("iDarwin: error missing tag: </idarwin> in\n" + spec); - } - int equalPos = spec.indexOf("<idarwin language=", currentStart) + "<idarwin language=".length(); - int closingPos = spec.indexOf(">", equalPos); - if (closingPos == -1) - { - throw new RuntimeException( - "iDarwin: error missing the closing '>' after the tag '<idarwin language=' in\n" - + spec); - } - languageFactory = spec.substring(equalPos, closingPos); - int end = spec.indexOf("</idarwin>", currentStart); - if (end != -1) - { - body = spec.substring(closingPos + 1, end); - currentStart = spec.indexOf("<idarwin language=", currentStart + 1); - } - else - { - throw new RuntimeException("iDarwin: error missing tag: </idarwin> in\n" + spec); - } - String mName = "newArchitectureSpecification"; - java.lang.Class cl = java.lang.Class.forName(languageFactory); - java.lang.Class noArgArray[] = new java.lang.Class[0]; - Constructor theDefaultConstructor = cl.getConstructor(noArgArray); - Object noinitargs[] = new Object[0]; - Object o = theDefaultConstructor.newInstance(noinitargs); - java.lang.reflect.Method theMethod = cl.getMethod(mName, noArgArray); - IArchitectureSpecification archspec = (IArchitectureSpecification) theMethod.invoke(o, - noArgArray); - if (archspec == null) - { - throw new RuntimeException( - "iDarwin: error the architecture specification is null - error in the implementation of the language factory (newArchitectureSpecification() must not return null)"); - } - archspec.parseFrom(body); - if (totalArchSpec == null) - { - totalArchSpec = archspec; - } - else - { - totalArchSpec = totalArchSpec.composeWith(archspec); - } - } - } - - } - if (check) - { - totalArchSpec.prepareForCheck(); - } - DottyVisitor dv = new DottyVisitor(totalArchSpec, outputfilename, "Title goes here ...", layoutLR, - directed, componentDetailLevel, showPackages, quietList, check, do_not_show_dependecy_details, - filter); - try - { - new Vector(); - Hashtable anntable = new Hashtable(); - Vector annotations = (new CodeMetaclassCache()).getAnnotations(allFiles, changedFiles, srcbase); - for (int j = 0; j < annotations.size(); j++) - { - CodeMetaclass cm = (CodeMetaclass) annotations.elementAt(j); - String thisPackage = DottyVisitorConstants.extractPackage(cm.getName()); - if (!anntable.containsKey(thisPackage)) - { - anntable.put(thisPackage, new Vector()); - } - ((Vector) anntable.get(thisPackage)).addElement(cm); - } - - Vector ann; - for (Enumeration e = anntable.keys(); e.hasMoreElements(); ann.size()) - { - String packagename = (String) e.nextElement(); - ann = (Vector) anntable.get(packagename); - dv.startSubGraph(); - CodeMetaclass cm; - for (Enumeration annenum = ann.elements(); annenum.hasMoreElements(); cm.accept(dv)) - { - cm = (CodeMetaclass) annenum.nextElement(); - } - - dv.endSubGraph(packagename); - } - - if (check) - { - dv.export("architecture-evolution-spec.dotty"); - String finalReport = totalArchSpec.reportAfterAllChecks(); - System.err.println(); - System.err.println(finalReport); - System.err.println(); - System.err.println("\n" + dv.getNumberOfLinks() + " dependencies checked."); - if (dv.getNumberOfErrors() > 0) - { - System.err.println(dv.getNumberOfErrors() + " errors found!"); - } - else - { - System.err.println("No error found!"); - } - System.err.println(); - } - boolean flag = dv.getError(); - return flag; - } - finally - { - dv.close(); - log.info("done (file written: " + outputfilename + ")"); - } - } - catch (Exception e) - { - throw new RuntimeException("iDarwin: file being processed when the problem occured:\n" + recent_file, e); - } - } - - public Darwin() - { - } -} Modified: trunk/source/java/net/sf/jcontracts/icontract/FileTarget.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/FileTarget.java 2008-05-09 17:07:10 UTC (rev 47) +++ trunk/source/java/net/sf/jcontracts/icontract/FileTarget.java 2008-05-09 17:08:10 UTC (rev 48) @@ -18,11 +18,9 @@ import java.io.BufferedReader; import java.io.File; +import java.io.FileFilter; import java.io.FileReader; -import java.io.FileWriter; -import java.io.FilenameFilter; import java.io.IOException; -import java.io.PrintWriter; import java.io.Reader; import java.util.Enumeration; import java.util.Vector; @@ -40,83 +38,25 @@ super(name); } - private void copyWithoutLinesStartingWith(FileReader is, PrintWriter os, String header) throws IOException + Vector enumerateFilesIn(File dir, FileFilter filter) { - char buf[] = new char[300]; - for (int ch = is.read(); ch != -1;) - { - int pos = 0; - while (ch != -1 && (char) ch != '\n') - { - buf[pos] = (char) ch; - pos++; - ch = is.read(); - if ((char) ch == '\r') - { - ch = is.read(); - } - } - if ((char) ch == '\n') - { - ch = is.read(); - if ((char) ch == '\r') - { - ch = is.read(); - } - String strb = new String(buf, 0, pos); - if (!strb.trim().startsWith(header)) - { - os.println(strb); - } - } - } - - } - - protected Reader createStreamForCodeParsing() throws IOException - { - FileReader is = null; - PrintWriter os = null; - try - { - is = new FileReader(getName()); - os = new PrintWriter(new FileWriter(getName() + ".clean")); - copyWithoutLinesStartingWith(is, os, "/*|*/"); - } - finally - { - if (is != null) - { - is.close(); - } - if (os != null) - { - os.close(); - } - } - return new FileReader(getName() + ".clean"); - } - - Vector enumerateFilesIn(String dir, FilenameFilter filter) - { Vector fs = new Vector(); - File localroot = new File(dir); - String filenames[] = localroot.list(filter); - if (filenames != null) + File[] files = dir.listFiles(filter); + if (files != null) { - for (int i = 0; i < filenames.length; i++) + for (int i = 0; i < files.length; i++) { - File f = new File(dir + File.separator + filenames[i]); + File f = files[i]; if (f.isDirectory()) { - for (Enumeration e = enumerateFilesIn(dir + File.separator + filenames[i], filter).elements(); e + for (Enumeration e = enumerateFilesIn(f, filter).elements(); e .hasMoreElements(); fs.addElement(e.nextElement())) { } } else { - fs.addElement(dir + File.separator + filenames[i]); + fs.addElement(f.getPath()); } } @@ -137,11 +77,26 @@ } try { - BufferedReader f = new BufferedReader(new FileReader(fn)); - for (String line = null; (line = f.readLine()) != null;) + FileReader fileReader = new FileReader(fn); + try { - v.addElement(new FileTarget(line)); + BufferedReader f = new BufferedReader(fileReader); + try + { + for (String line = null; (line = f.readLine()) != null;) + { + v.addElement(new FileTarget(line)); + } + } + finally + { + f.close(); + } } + finally + { + fileReader.close(); + } } catch (IOException _ex) @@ -154,26 +109,21 @@ int pos = getName().indexOf("*"); final String pattern = getName().substring(pos, getName().length()); File dir = new File(getName()); - String tmp_parent = ""; + File parent; if (dir.getParent() == null) { - tmp_parent = "."; + parent = new File("."); } else { - dir = new File(dir.getParent()); - tmp_parent = dir.getName(); + parent = dir.getParentFile(); } - String parent = tmp_parent; - Vector filenames = enumerateFilesIn(parent, new FilenameFilter() + Vector filenames = enumerateFilesIn(parent, new FileFilter() { - - public boolean accept(File dir, String name) + public boolean accept(File file) { - File f = new File(dir + File.separator + name); - return match(name, pattern) || f.isDirectory(); + return match(file.getName(), pattern) || file.isDirectory(); } - }); for (Enumeration e = filenames.elements(); e.hasMoreElements(); v.addElement(new FileTarget((String) e .nextElement()))) @@ -224,44 +174,36 @@ Vector process(Vector options) throws Exception { Vector fileList = new Vector(); - Reader is = null; - CleanOption cleanOption = null; - for (int i = 0; i < options.size(); i++) + Reader is = new FileReader(getName()); + try { - if ("r".compareTo(((Option) options.elementAt(i)).getName()) == 0) + BufferedReader bufferedIs = new BufferedReader(is); + try { - cleanOption = (CleanOption) options.elementAt(i); - } - } - - if (cleanOption != null) - { - System.err - .println("Java Contract Suite: -r option enabled -- create a file " - + getName() - + ".clean" - + " with all instrumentation code from previous run removed. Also the cleaned file will be the input to the new instrumentation run."); - is = createStreamForCodeParsing(); - } - else - { - is = new FileReader(getName()); - } - Parser parser = new Parser(is, getName()); - MetaclassFactory metaclassFactory = new MetaclassFactory(getName()); - parser.setMetaclassFactory(metaclassFactory); - Vector intermediate = parser.getAnnotations(); - is.close(); - for (int i = 0; i < options.size(); i++) - { - if (((Option) options.elementAt(i)).doesProcessing()) - { - Vector files = ((ProcessingOption) options.elementAt(i)).process(intermediate, options, getName()); - for (Enumeration e = files.elements(); e.hasMoreElements(); fileList.addElement(e.nextElement())) + Parser parser = new Parser(bufferedIs, getName()); + MetaclassFactory metaclassFactory = new MetaclassFactory(getName()); + parser.setMetaclassFactory(metaclassFactory); + Vector intermediate = parser.getAnnotations(); + for (int i = 0; i < options.size(); i++) { + if (((Option) options.elementAt(i)).doesProcessing()) + { + Vector files = ((ProcessingOption) options.elementAt(i)).process(intermediate, options, getName()); + for (Enumeration e = files.elements(); e.hasMoreElements(); fileList.addElement(e.nextElement())) + { + } + } } } + finally + { + bufferedIs.close(); + } } + finally + { + is.close(); + } return fileList; } Modified: trunk/source/java/net/sf/jcontracts/icontract/HelpOption.java =================================================================== --- trunk/source/java/net/sf/jcontracts/icontract/HelpOption.java 2008-05-09 17:07:10 UTC (rev 47) +++ trunk/source/java/net/sf/jcontracts/icontract/HelpOption.java 2008-05-09 17:08:10 UTC (rev 48) @@ -30,6 +30,14 @@ private static final String VERSION_RESOURCE_NAME = "version.txt"; + private static final String LABEL_SPACES = " "; + + private static final int INDENT_SIZE = LABEL_SPACES.length() + 1; + + private static final int MAX_TOTAL_WIDTH = 79; + + private static final int MAX_PARAGRAPH_WIDTH = MAX_TOTAL_WIDTH - INDENT_SIZE; + public static final String NAME = "h"; static @@ -77,113 +85,139 @@ protected void activateOnTargets(Vector targets) { - System.out.println("NAME: Java Contract Suite, Version " + VERSION); - System.out.println("AUTHOR: Copyright (C) 1997-1999 Reto Kramer"); - System.out.println(" Copyright (C) 2006 John Swapceinski, Johan Stuyts"); - System.out.println("SYNOPSIS: java net.sf.jcontracts.icontract.Tool {option} {file}"); - System.out.println("DESCRIPTION: Provides Java with full support for \"Design by Contract\"."); - System.out.println(" Instruments java source code files with checks to enforce:"); - System.out.println(" - method pre- and post-conditions"); - System.out.println(" - class/interface invariants"); - System.out.println(" based on comments in the code (@pre, @post, @invariant)."); - System.out.println(" Java Contract Suite operates on classes, interfaces, and methods."); - System.out.println(" file: Is a list of java sourcecode files (space separated)."); - System.out.println(" If a name of the form @file is in the list, each line in file"); - System.out.println(" is interpreted as a filename."); - System.out.println(" If a name is a pattern (e.g. ./x/*.java), all files in x and"); - System.out.println(" subdirectories thereof are searched for *.java files."); - System.out.println(" {option}: Is a list of options, Java Contract Suite accepts the following options:"); - System.out.println(" (if no option is given, Java Contract Suite uses the -h option)"); - System.out.println(""); - System.out.println(" GENERAL:"); - System.out.println(" -h prints version, synopsis and a brief description."); - System.out.println(" -vA,B,C control how much information is displayed."); - System.out.println(" if -v is not present, errors and warnings are displayed."); - System.out.println(" -v (no args) displays errors, warnings and progress information."); - System.out.println(" A,B,C may be error*, warning*, note*, info*, progress* and debug*"); - System.out.println(" -a regenerates all files, even if the timestamps say that"); - System.out.println(" the instrumented version is up to date."); - System.out.println(""); - System.out.println(" OUTPUT:"); - System.out.println(" -oF Store the instrumented code output into file F."); - System.out.println(" F may include @p, @f and @e which will be substituted with path"); - System.out.println(" filename and file extension of the file being processed."); - System.out.println(" NOTE: add that location to the classpath for -c compiler"); - System.out.println(" e.g. ... -c'java -classpath @p' ..."); - System.out.println(""); - System.out.println(" -jF Copy the original sourcefiles into file F before compilation."); - System.out.println(" F may include @p, @f and @e which will be substituted with path"); - System.out.println(" filename and file extension of the file being processed."); - System.out.println(" [useful if working with sourcefiles of extensions other than .java]"); - System.out.println(" NOTE: add that location to the classpath for -b compiler"); - System.out.println(" e.g. ... -b'java -classpath @p' ..."); - System.out.println(""); - System.out.println(" -kF Rewrite the repository filename using F (F=specific dir)."); - System.out.println(" F may include @p (neither @f nor @e) which will be substituted"); - System.out.println(" with the path of the file being processed."); - System.out.println(" [useful if the repository shall be stored at a specific place]"); - System.out.println(" NOTE: add that location to the classpath for -n compiler"); - System.out.println(" e.g. ... -n'java -classpath @p' ..."); - System.out.println(""); - System.out.println(" COMPILERS:"); - System.out.println(" Note: C denotes the compiler command(e.g. javac). if the colon (:) is."); - System.out.println(" used the sun.tools.javac.Main compiler is called in the same VM."); - System.out.println(" For small files this results in speedups and lower mem consumtion"); - System.out.println(" -bC use compiler C to compile the sourcefiles BEFORE instrumentation."); - System.out.println(" If the -jC option is missing (default), 'javac' is invoked."); - System.out.println(" If -j (no C) is used, initial sourcefiles will not be compiled."); - System.out.println(" [NOTE: the -j output option allow redirection of file-location]"); - System.out.println(""); - System.out.println(" -cC use compiler C to compile the sourcefiles AFTER instrumentation."); - System.out.println(" If the -cC option is missing (default), 'javac' is invoked."); - System.out.println(" If -c (no C) is used, instrumented sourcefiles will not be compiled."); - System.out.println(" [NOTE: the -o output option allow redirection of file-location]"); - System.out.println(""); - System.out.println(" -y ensures that the -o/-c options work with JDK 1.1 by passing"); - System.out.println(" the filename (excl. dir prefix) to the -c compiler only."); - System.out.println(""); - System.out.println(" -nC use compiler C to automatically compile the repository files."); - System.out.println(" [useful if working with a non JDK compiler.]"); - System.out.println(" If the -nC option is missing (default), 'javac' is invoked."); - System.out.println(" If -n (no C) is used, repositories will not be compiled."); - System.out.println(" [NOTE: the -k output option allow redirection of file-location]"); - System.out.println(""); - System.out.println(" CONTROL:"); - System.out.println(" -mOPT{,OPT} Instruments the source code depending on the list of flags OPT:"); - System.out.println(" OPT can be either \"@<file>\", \"pre\", \"post\" or \"inv\""); - System.out.println(" -mpre instruments only the method pre-conditions (@pre <bool expr>)"); - System.out.println(" -mpost instruments only the method post-conditions (@post <bool expr>)"); - System.out.println(" -minv instruments only the class invariants (@invariant <bool expr>)"); - System.out.println(" -m@file reads each line in file <package.type.method> <pre,post,inv>"); - System.out.println(" to allow fine control over what is instrumented."); - System.out.println(" NOTE: -mpre,post,inv override @file entries!"); - System.out.println(""); - System.out.println(" -qA,B,C disables warnings related to contract propagation from"); - System.out.println(" classes A,B and C."); - System.out.println(" A,B and C may be qualified (e.g. package.class)"); - System.out.println(" NOTE: Only the first warning related to a type will be displayed!"); - System.out.println(" The special name :all: (-q:all:,A,B) disables warning suppresion"); - System.out.println(""); - System.out.println(" -i (experimental) in subclasses instrument a call to the superclass'"); - System.out.println(" invariant check method to allow private fields to be part of the"); - System.out.println(" superclass invariant expression"); - System.out.println(""); - System.out.println(" -w generate code that ensures that pre/post/inv-checks do not throw"); - System.out.println(" checked exceptions - they will be 'converted' to RuntimeException."); - System.out.println(" This option is not compatible with the -d option."); - System.out.println(" -dE Use exception class E as the default exception throw for contract"); - System.out.println(" volation. E may be qualified (e.g. package.class)."); - System.out.println(" This option is not compatible with the -w option."); - System.out.println(""); - System.out.println(" MISC:"); - System.out.println(" -r Before instrumenting, remove all instrumentation code in the"); - System.out.println(" source file (removes all lines starting with \"/*|*/\")."); - System.out.println(" Also creates a clean file <inputfile>.clean"); - System.out.println(""); - System.out.println(" PROBLEMS:"); - System.out.println(" Please enter problem reports and requests for new features in"); - System.out.println(" the issue tracker, which can be found at:"); - System.out.println(" https://sourceforge.net/tracker/?group_id=175492&atid=889550"); + printParagraph("NAME:", "Java Contract Suite, Version " + VERSION); + System.out.println(); + + printParagraph("AUTHOR:", "Copyright (C) 1997-1999 Reto Kramer"); + printParagraph("Copyright (C) 2006 John Swapceinski, Johan Stuyts"); + System.out.println(); + + printParagraph("SYNOPSIS:", "java net.sf.jcontracts.icontract.Tool {options} {files}"); + System.out.println(); + + printParagraph("DESCRIPTION:", "Provides Java with full support for \"Design by Contract\". " + + "Instruments java source code files with checks to enforce:"); + printParagraph("- method pre- and post-conditions"); + printParagraph("- class/interface invariants"); + printParagraph("based on comments in the code (@pre, @post, @invariant). " + + "Java Contract Suite operates on classes, interfaces, and methods."); + System.out.println(); + + printParagraph("CLASSPATH:", "The following items need to be on the class path " + + "so Java Contract Suite can generate instrumented and repository sources " + + "for your project:"); + printParagraph("- JAR files of Java Contract Suite and Log4j"); + printParagraph("- JAR files containing instrumented classes of \"Design by Contract\" enabled dependencies"); + printParagraph("- JAR files containing repository classes of \"Design by Contract\" enabled dependencies"); + printParagraph("- JAR files of regular dependencies"); + printParagraph("- uninstrumented classes of project"); + System.out.println(); + + printLabel("PARAMETERS:"); + + printParagraph("files", "Is a list of java sourcecode files (space separated)."); + System.out.println(); + printParagraph("If a name of the form @file is in the list, each line in file " + + "is interpreted as a filename."); + System.out.println(); + printParagraph("If a name is a pattern (e.g. ./x/*.java), all files in x and " + + "subdirectories thereof are searched for *.java files."); + System.out.println(); + + printParagraph("options", "Is a list of options, Java Contract Suite accepts the following " + + "options: (if no parameters are given, Java Contract Suite uses the -h " + + "option)"); + System.out.println(); + + printLabel("GENERAL:"); + + printParagraph("-h", "prints version, synopsis and a brief description."); + System.out.println(); + + printParagraph("-a", "regenerates all files, even if the timestamps say that " + + "the instrumented version is up to date."); + System.out.println(); + + printLabel("OUTPUT:"); + + printParagraph("-oF", "Store the instrumented code output into file F. " + + "F may include @p, @f and @e which will be substituted with path, " + + "filename and file extension of the file being processed."); + System.out.println(); + + printParagraph("-kD", "Rewrite the repository filename using D (D=specific dir). " + + "D may include @p (neither @f nor @e) which will be substituted " + + "with the path of the file being processed."); + printParagraph("[useful if the repository shall be stored at a specific place]"); + System.out.println(); + + printLabel("CONTROL:"); + + printParagraph("-mOPT,{OPT}", "Instruments the source code depending on the list of flags OPT. " + + "OPT can be either \"@<file>\", \"pre\", \"post\" or \"inv\"."); + printParagraph("-mpre", "Instruments only the method pre-conditions (@pre <bool expr>)."); + printParagraph("-mpost", "Instruments only the method post-conditions (@post <bool expr>)."); + printParagraph("-minv", "Instruments only the class invariants (@invariant <bool expr>)."); + printParagraph("-m@file", "Reads each line in file <package.type.method> <pre,post,inv> " + + "to allow fine control over what is instrumented."); + printParagraph("NOTE:", "-mpre,post,inv override @file entries!"); + System.out.println(); + + printParagraph("-dE", "Use exception class E as the default exception thrown for contract " + + "volations. E may be qualified (e.g. package.class)."); + System.out.println(); + + printParagraph("PROBLEMS:", "Please enter problem reports and requests for new features in " + + "the issue tracker, which can be found at:"); + printParagraph("https://sourceforge.net/tracker/?group_id=175492&atid=889550"); + System.exit(0); } + + private void printParagraph(String text) + { + printParagraph("", text); + } + + private void printParagraph(String label, String text) + { + printLabelWithoutNewLine(label); + System.out.print(' '); + printParagraphText(text); + } + + private void printLabel(String label) + { + printLabelWithoutNewLine(label); + System.out.println(); + } + + private void printLabelWithoutNewLine(String label) + { + System.out.print(LABEL_SPACES.substring(label.length())); + System.out.print(label); + } + + private void printParagraphText(String text) + { + if (text.length() <= MAX_PARAGRAPH_WIDTH) + { + System.out.println(text); + } + else + { + int lastIndexOfSpaceWithinParagraphWidth = text.lastIndexOf(' ', MAX_PARAGRAPH_WIDTH); + if (lastIndexOfSpaceWithinParagraphWidth == -1) + { + System.out.println(text); + } + else + { + System.out.println(text.substring(0, lastIndexOfSpaceWithinParagraphWidth)); + System.out.print(LABEL_SPACES); + System.out.print(' '); + printParagraphText(text.substring(lastIndexOfSpaceW... [truncated message content] |