Menu
▾
▴
[Jcontracts-svn] SF.net SVN: jcontracts: [22] trunk/source/java/net/sf/jcontracts
|
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.
|
