fixed problem with maven build

haslab · Jan 18, 2018 · 2fd2a87 · 2fd2a87
1 parent d123062
commit 2fd2a87
Show file tree

Hide file tree

Showing 251 changed files with 11 additions and 1 deletion.
diff --git a/.gitmodules b/.gitmodules
diff --git a/AA_README.TXT b/AA_README.TXT
diff --git a/LICENSES/Alloy.txt b/LICENSES/Alloy.txt
diff --git a/LICENSES/JavaCup.txt b/LICENSES/JavaCup.txt
diff --git a/LICENSES/Kodkod.txt b/LICENSES/Kodkod.txt
diff --git a/LICENSES/MiniSat.txt b/LICENSES/MiniSat.txt
diff --git a/LICENSES/SAT4J.txt b/LICENSES/SAT4J.txt
diff --git a/LICENSES/ZChaff.txt b/LICENSES/ZChaff.txt
diff --git a/README.md b/README.md
diff --git a/electrum/pom.xml b/electrum/pom.xml
@@ -61,5 +61,10 @@
       <artifactId>AppleJavaExtensions</artifactId>
       <version>1.4</version>
     </dependency>
+    <dependency>
+    	<groupId>commons-cli</groupId>
+    	<artifactId>commons-cli</artifactId>
+    	<version>1.4</version>
+    </dependency>
   </dependencies>
 </project>
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4/A4Reporter.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4/A4Reporter.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4/ByteBuffer.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4/ByteBuffer.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4/Computer.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4/Computer.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4/ConstList.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4/ConstList.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4/ConstMap.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4/ConstMap.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4/ConstSet.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4/ConstSet.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4/DirectedGraph.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4/DirectedGraph.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4/Env.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4/Env.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4/Err.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4/Err.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4/ErrorAPI.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4/ErrorAPI.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4/ErrorFatal.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4/ErrorFatal.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4/ErrorSyntax.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4/ErrorSyntax.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4/ErrorType.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4/ErrorType.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4/ErrorWarning.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4/ErrorWarning.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4/JoinableList.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4/JoinableList.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4/Listener.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4/Listener.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4/Listeners.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4/Listeners.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4/MacUtil.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4/MacUtil.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4/MailBug.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4/MailBug.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4/OurAntiAlias.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4/OurAntiAlias.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4/OurBorder.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4/OurBorder.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4/OurCheckbox.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4/OurCheckbox.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4/OurCombobox.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4/OurCombobox.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4/OurConsole.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4/OurConsole.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4/OurDialog.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4/OurDialog.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4/OurHighlighter.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4/OurHighlighter.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4/OurPDFWriter.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4/OurPDFWriter.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4/OurPNGWriter.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4/OurPNGWriter.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4/OurSyntaxDocument.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4/OurSyntaxDocument.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4/OurSyntaxUndoableDocument.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4/OurSyntaxUndoableDocument.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4/OurSyntaxWidget.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4/OurSyntaxWidget.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4/OurTabbedSyntaxWidget.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4/OurTabbedSyntaxWidget.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4/OurTree.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4/OurTree.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4/OurUtil.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4/OurUtil.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4/Pair.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4/Pair.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4/Pos.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4/Pos.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4/Runner.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4/Runner.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4/SafeList.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4/SafeList.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4/Subprocess.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4/Subprocess.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4/UniqueNameGenerator.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4/UniqueNameGenerator.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4/Util.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4/Util.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4/Version.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4/Version.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4/WorkerEngine.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4/WorkerEngine.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4/XMLNode.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4/XMLNode.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4/package.html b/electrum/src/main/java/edu/mit/csail/sdg/alloy4/package.html
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/ast/Attr.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/ast/Attr.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/ast/Browsable.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/ast/Browsable.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/ast/Command.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/ast/Command.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/ast/CommandScope.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/ast/CommandScope.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/ast/Decl.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/ast/Decl.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/ast/Expr.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/ast/Expr.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/ast/ExprBad.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/ast/ExprBad.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/ast/ExprBadCall.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/ast/ExprBadCall.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/ast/ExprBadJoin.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/ast/ExprBadJoin.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/ast/ExprBinary.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/ast/ExprBinary.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/ast/ExprCall.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/ast/ExprCall.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/ast/ExprChoice.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/ast/ExprChoice.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/ast/ExprConstant.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/ast/ExprConstant.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/ast/ExprCustom.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/ast/ExprCustom.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/ast/ExprHasName.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/ast/ExprHasName.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/ast/ExprITE.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/ast/ExprITE.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/ast/ExprLet.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/ast/ExprLet.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/ast/ExprList.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/ast/ExprList.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/ast/ExprQt.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/ast/ExprQt.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/ast/ExprUnary.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/ast/ExprUnary.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/ast/ExprVar.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/ast/ExprVar.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/ast/Func.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/ast/Func.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/ast/Module.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/ast/Module.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/ast/Sig.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/ast/Sig.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/ast/Type.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/ast/Type.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/ast/VisitQuery.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/ast/VisitQuery.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/ast/VisitReturn.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/ast/VisitReturn.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/ast/package.html b/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/ast/package.html
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/parser/Alloy.cup b/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/parser/Alloy.cup
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/parser/Alloy.lex b/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/parser/Alloy.lex
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/parser/CompFilter.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/parser/CompFilter.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/parser/CompLexer.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/parser/CompLexer.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/parser/CompModule.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/parser/CompModule.java
@@ -61,6 +61,7 @@
 import edu.mit.csail.sdg.alloy4compiler.ast.Sig.Field;
 import edu.mit.csail.sdg.alloy4compiler.ast.Sig.PrimSig;
 import edu.mit.csail.sdg.alloy4compiler.ast.Sig.SubsetSig;
+import edu.mit.csail.sdg.alloy4compiler.ast.Module;
 
 /** Mutable; this class represents an Alloy module; equals() uses object identity. 
  * 

diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/parser/CompParser.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/parser/CompParser.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/parser/CompSym.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/parser/CompSym.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/parser/CompUtil.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/parser/CompUtil.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/parser/Macro.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/parser/Macro.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/parser/generate-lexer.sh b/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/parser/generate-lexer.sh
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/parser/generate-parser.sh b/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/parser/generate-parser.sh
diff --git a/.../src/main/java/edu/mit/csail/sdg/alloy4compiler/parser/generate-parsing-trace-from-log.sh b/.../src/main/java/edu/mit/csail/sdg/alloy4compiler/parser/generate-parsing-trace-from-log.sh
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/parser/package.html b/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/parser/package.html
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/sim/SimAtom.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/sim/SimAtom.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/sim/SimCallback.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/sim/SimCallback.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/sim/SimInstance.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/sim/SimInstance.java
@@ -41,6 +41,7 @@
 import edu.mit.csail.sdg.alloy4compiler.ast.Sig.Field;
 import edu.mit.csail.sdg.alloy4compiler.ast.Sig.PrimSig;
 import edu.mit.csail.sdg.alloy4compiler.ast.Sig.SubsetSig;
+import edu.mit.csail.sdg.alloy4compiler.ast.Module;
 
 /** Mutable; represents an instance. 
  * */

diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/sim/SimTuple.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/sim/SimTuple.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/sim/SimTupleset.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/sim/SimTupleset.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/sim/package.html b/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/sim/package.html
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/translator/A4Options.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/translator/A4Options.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/translator/A4Solution.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/translator/A4Solution.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/translator/A4SolutionReader.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/translator/A4SolutionReader.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/translator/A4SolutionWriter.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/translator/A4SolutionWriter.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/translator/A4Tuple.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/translator/A4Tuple.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/translator/A4TupleSet.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/translator/A4TupleSet.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/translator/BookExamples.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/translator/BookExamples.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/translator/BoundsComputer.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/translator/BoundsComputer.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/translator/ConvToConjunction.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/translator/ConvToConjunction.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/translator/GatherTemporalAtoms.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/translator/GatherTemporalAtoms.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/translator/ScopeComputer.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/translator/ScopeComputer.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/translator/Simplifier.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/translator/Simplifier.java
diff --git a/...rum/src/main/java/edu/mit/csail/sdg/alloy4compiler/translator/TranslateAlloyToKodkod.java b/...rum/src/main/java/edu/mit/csail/sdg/alloy4compiler/translator/TranslateAlloyToKodkod.java
diff --git a/...trum/src/main/java/edu/mit/csail/sdg/alloy4compiler/translator/TranslateKodkodToJava.java b/...trum/src/main/java/edu/mit/csail/sdg/alloy4compiler/translator/TranslateKodkodToJava.java
diff --git a/...rum/src/main/java/edu/mit/csail/sdg/alloy4compiler/translator/TranslateTAlloyToAlloy.java b/...rum/src/main/java/edu/mit/csail/sdg/alloy4compiler/translator/TranslateTAlloyToAlloy.java
diff --git a/...trum/src/main/java/edu/mit/csail/sdg/alloy4compiler/translator/TranslateTAlloyToInit.java b/...trum/src/main/java/edu/mit/csail/sdg/alloy4compiler/translator/TranslateTAlloyToInit.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/translator/WriteCNF.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/translator/WriteCNF.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/translator/instance.txt b/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/translator/instance.txt
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/translator/package.html b/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/translator/package.html
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4graph/Artist.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4graph/Artist.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4graph/AvailableSpace.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4graph/AvailableSpace.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4graph/Curve.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4graph/Curve.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4graph/DotColor.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4graph/DotColor.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4graph/DotDirection.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4graph/DotDirection.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4graph/DotPalette.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4graph/DotPalette.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4graph/DotShape.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4graph/DotShape.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4graph/DotStyle.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4graph/DotStyle.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4graph/Graph.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4graph/Graph.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4graph/GraphEdge.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4graph/GraphEdge.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4graph/GraphNode.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4graph/GraphNode.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4graph/GraphViewer.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4graph/GraphViewer.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4graph/package.html b/electrum/src/main/java/edu/mit/csail/sdg/alloy4graph/package.html
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4viz/AlloyAtom.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4viz/AlloyAtom.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4viz/AlloyElement.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4viz/AlloyElement.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4viz/AlloyInstance.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4viz/AlloyInstance.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4viz/AlloyModel.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4viz/AlloyModel.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4viz/AlloyNodeElement.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4viz/AlloyNodeElement.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4viz/AlloyProjection.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4viz/AlloyProjection.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4viz/AlloyRelation.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4viz/AlloyRelation.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4viz/AlloySet.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4viz/AlloySet.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4viz/AlloyTuple.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4viz/AlloyTuple.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4viz/AlloyType.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4viz/AlloyType.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4viz/MagicColor.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4viz/MagicColor.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4viz/MagicLayout.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4viz/MagicLayout.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4viz/MagicUtil.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4viz/MagicUtil.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4viz/StaticGraphMaker.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4viz/StaticGraphMaker.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4viz/StaticInstanceReader.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4viz/StaticInstanceReader.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4viz/StaticProjector.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4viz/StaticProjector.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4viz/StaticThemeReaderWriter.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4viz/StaticThemeReaderWriter.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4viz/VizCustomizationPanel.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4viz/VizCustomizationPanel.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4viz/VizGUI.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4viz/VizGUI.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4viz/VizGraphPanel.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4viz/VizGraphPanel.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4viz/VizState.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4viz/VizState.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4viz/VizTree.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4viz/VizTree.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4viz/package.html b/electrum/src/main/java/edu/mit/csail/sdg/alloy4viz/package.html
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4whole/DemoFileSystem.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4whole/DemoFileSystem.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4whole/ExampleUsingTheAPI.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4whole/ExampleUsingTheAPI.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4whole/ExampleUsingTheCompiler.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4whole/ExampleUsingTheCompiler.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4whole/Helper.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4whole/Helper.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4whole/InternalTest.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4whole/InternalTest.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4whole/SimpleCLI.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4whole/SimpleCLI.java
@@ -23,6 +23,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.swing.text.DefaultHighlighter.DefaultHighlightPainter;
+
 import edu.mit.csail.sdg.alloy4.A4Reporter;
 import edu.mit.csail.sdg.alloy4.ErrorWarning;
 import edu.mit.csail.sdg.alloy4.Pair;
@@ -45,6 +47,7 @@
 import edu.mit.csail.sdg.alloy4compiler.translator.TranslateAlloyToKodkod;
 import edu.mit.csail.sdg.alloy4viz.StaticInstanceReader;
 
+
 /** This class is used by the Alloy developers to drive the regression test suite.
  * For a more detailed guide on how to use Alloy API, please see "ExampleUsingTheCompiler.java"
  */
@@ -141,7 +144,7 @@ private static void validate(A4Solution sol) throws Exception {
     }
 
     public static void main(String[] args) throws Exception {
-        final boolean sat4j = "yes".equals(System.getProperty("sat4j"));
+    	final boolean sat4j = "yes".equals(System.getProperty("sat4j"));
         final boolean minisat = "yes".equals(System.getProperty("minisat"));
         SatSolver solver = A4Options.SatSolver.make("mem", "mem", "/zweb/sat/mem");
         final SimpleReporter rep = new SimpleReporter();

diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4whole/SimpleGUI.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4whole/SimpleGUI.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4whole/SimpleReporter.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4whole/SimpleReporter.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4whole/SwingLogPanel.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4whole/SwingLogPanel.java
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4whole/package.html b/electrum/src/main/java/edu/mit/csail/sdg/alloy4whole/package.html
diff --git a/electrum/src/main/java/java_cup/runtime/DefaultSymbolFactory.java b/electrum/src/main/java/java_cup/runtime/DefaultSymbolFactory.java
diff --git a/electrum/src/main/java/java_cup/runtime/Scanner.java b/electrum/src/main/java/java_cup/runtime/Scanner.java
diff --git a/electrum/src/main/java/java_cup/runtime/Symbol.java b/electrum/src/main/java/java_cup/runtime/Symbol.java
diff --git a/electrum/src/main/java/java_cup/runtime/SymbolFactory.java b/electrum/src/main/java/java_cup/runtime/SymbolFactory.java
diff --git a/electrum/src/main/java/java_cup/runtime/lr_parser.java b/electrum/src/main/java/java_cup/runtime/lr_parser.java
diff --git a/electrum/src/main/java/java_cup/runtime/virtual_parse_stack.java b/electrum/src/main/java/java_cup/runtime/virtual_parse_stack.java
diff --git a/electrum/src/main/resources/icons/ColorIcons/black.gif b/electrum/src/main/resources/icons/ColorIcons/black.gif
diff --git a/electrum/src/main/resources/icons/ColorIcons/blue.gif b/electrum/src/main/resources/icons/ColorIcons/blue.gif
diff --git a/electrum/src/main/resources/icons/ColorIcons/cadetblue.gif b/electrum/src/main/resources/icons/ColorIcons/cadetblue.gif
diff --git a/electrum/src/main/resources/icons/ColorIcons/chartreuse2.gif b/electrum/src/main/resources/icons/ColorIcons/chartreuse2.gif
diff --git a/electrum/src/main/resources/icons/ColorIcons/cornflowerblue.gif b/electrum/src/main/resources/icons/ColorIcons/cornflowerblue.gif
diff --git a/electrum/src/main/resources/icons/ColorIcons/cyan.gif b/electrum/src/main/resources/icons/ColorIcons/cyan.gif
diff --git a/electrum/src/main/resources/icons/ColorIcons/darkolivegreen2.gif b/electrum/src/main/resources/icons/ColorIcons/darkolivegreen2.gif
diff --git a/electrum/src/main/resources/icons/ColorIcons/gold.gif b/electrum/src/main/resources/icons/ColorIcons/gold.gif
diff --git a/electrum/src/main/resources/icons/ColorIcons/green2.gif b/electrum/src/main/resources/icons/ColorIcons/green2.gif
diff --git a/electrum/src/main/resources/icons/ColorIcons/lightgoldenrod.gif b/electrum/src/main/resources/icons/ColorIcons/lightgoldenrod.gif
diff --git a/electrum/src/main/resources/icons/ColorIcons/lightgray.gif b/electrum/src/main/resources/icons/ColorIcons/lightgray.gif
diff --git a/electrum/src/main/resources/icons/ColorIcons/limegreen.gif b/electrum/src/main/resources/icons/ColorIcons/limegreen.gif
diff --git a/electrum/src/main/resources/icons/ColorIcons/magenta.gif b/electrum/src/main/resources/icons/ColorIcons/magenta.gif
diff --git a/electrum/src/main/resources/icons/ColorIcons/magic.gif b/electrum/src/main/resources/icons/ColorIcons/magic.gif
diff --git a/electrum/src/main/resources/icons/ColorIcons/palevioletred.gif b/electrum/src/main/resources/icons/ColorIcons/palevioletred.gif
diff --git a/electrum/src/main/resources/icons/ColorIcons/red.gif b/electrum/src/main/resources/icons/ColorIcons/red.gif
diff --git a/electrum/src/main/resources/icons/ColorIcons/salmon.gif b/electrum/src/main/resources/icons/ColorIcons/salmon.gif
diff --git a/electrum/src/main/resources/icons/ColorIcons/white.gif b/electrum/src/main/resources/icons/ColorIcons/white.gif
diff --git a/electrum/src/main/resources/icons/ColorIcons/yellow.gif b/electrum/src/main/resources/icons/ColorIcons/yellow.gif
diff --git a/electrum/src/main/resources/icons/ShapeIcons/Mcircle.gif b/electrum/src/main/resources/icons/ShapeIcons/Mcircle.gif
diff --git a/electrum/src/main/resources/icons/ShapeIcons/Mdiamond.gif b/electrum/src/main/resources/icons/ShapeIcons/Mdiamond.gif
diff --git a/electrum/src/main/resources/icons/ShapeIcons/Msquare.gif b/electrum/src/main/resources/icons/ShapeIcons/Msquare.gif
diff --git a/electrum/src/main/resources/icons/ShapeIcons/box.gif b/electrum/src/main/resources/icons/ShapeIcons/box.gif
diff --git a/electrum/src/main/resources/icons/ShapeIcons/circle.gif b/electrum/src/main/resources/icons/ShapeIcons/circle.gif
diff --git a/electrum/src/main/resources/icons/ShapeIcons/diamond.gif b/electrum/src/main/resources/icons/ShapeIcons/diamond.gif
diff --git a/electrum/src/main/resources/icons/ShapeIcons/doublecircle.gif b/electrum/src/main/resources/icons/ShapeIcons/doublecircle.gif
diff --git a/electrum/src/main/resources/icons/ShapeIcons/doubleoctagon.gif b/electrum/src/main/resources/icons/ShapeIcons/doubleoctagon.gif
diff --git a/electrum/src/main/resources/icons/ShapeIcons/egg.gif b/electrum/src/main/resources/icons/ShapeIcons/egg.gif
diff --git a/electrum/src/main/resources/icons/ShapeIcons/ellipse.gif b/electrum/src/main/resources/icons/ShapeIcons/ellipse.gif
diff --git a/electrum/src/main/resources/icons/ShapeIcons/hexagon.gif b/electrum/src/main/resources/icons/ShapeIcons/hexagon.gif
diff --git a/electrum/src/main/resources/icons/ShapeIcons/house.gif b/electrum/src/main/resources/icons/ShapeIcons/house.gif
diff --git a/electrum/src/main/resources/icons/ShapeIcons/invhouse.gif b/electrum/src/main/resources/icons/ShapeIcons/invhouse.gif
diff --git a/electrum/src/main/resources/icons/ShapeIcons/invtrapezium.gif b/electrum/src/main/resources/icons/ShapeIcons/invtrapezium.gif
diff --git a/electrum/src/main/resources/icons/ShapeIcons/invtriangle.gif b/electrum/src/main/resources/icons/ShapeIcons/invtriangle.gif
diff --git a/electrum/src/main/resources/icons/ShapeIcons/octagon.gif b/electrum/src/main/resources/icons/ShapeIcons/octagon.gif
diff --git a/electrum/src/main/resources/icons/ShapeIcons/parallelogram.gif b/electrum/src/main/resources/icons/ShapeIcons/parallelogram.gif
diff --git a/electrum/src/main/resources/icons/ShapeIcons/trapezium.gif b/electrum/src/main/resources/icons/ShapeIcons/trapezium.gif
diff --git a/electrum/src/main/resources/icons/ShapeIcons/triangle.gif b/electrum/src/main/resources/icons/ShapeIcons/triangle.gif
diff --git a/electrum/src/main/resources/icons/ShapeIcons/tripleoctagon.gif b/electrum/src/main/resources/icons/ShapeIcons/tripleoctagon.gif
diff --git a/electrum/src/main/resources/icons/StyleIcons/bold.gif b/electrum/src/main/resources/icons/StyleIcons/bold.gif
diff --git a/electrum/src/main/resources/icons/StyleIcons/dashed.gif b/electrum/src/main/resources/icons/StyleIcons/dashed.gif
diff --git a/electrum/src/main/resources/icons/StyleIcons/dotted.gif b/electrum/src/main/resources/icons/StyleIcons/dotted.gif
diff --git a/electrum/src/main/resources/icons/StyleIcons/solid.gif b/electrum/src/main/resources/icons/StyleIcons/solid.gif
diff --git a/electrum/src/main/resources/images/24_execute.gif b/electrum/src/main/resources/images/24_execute.gif
diff --git a/electrum/src/main/resources/images/24_execute_abort2.gif b/electrum/src/main/resources/images/24_execute_abort2.gif
diff --git a/electrum/src/main/resources/images/24_graph.gif b/electrum/src/main/resources/images/24_graph.gif
diff --git a/electrum/src/main/resources/images/24_history.gif b/electrum/src/main/resources/images/24_history.gif
diff --git a/electrum/src/main/resources/images/24_new.gif b/electrum/src/main/resources/images/24_new.gif
diff --git a/electrum/src/main/resources/images/24_open.gif b/electrum/src/main/resources/images/24_open.gif
diff --git a/electrum/src/main/resources/images/24_plaintext.gif b/electrum/src/main/resources/images/24_plaintext.gif
diff --git a/electrum/src/main/resources/images/24_reload.gif b/electrum/src/main/resources/images/24_reload.gif
diff --git a/electrum/src/main/resources/images/24_save.gif b/electrum/src/main/resources/images/24_save.gif
diff --git a/electrum/src/main/resources/images/24_settings.gif b/electrum/src/main/resources/images/24_settings.gif
diff --git a/electrum/src/main/resources/images/24_settings_apply.gif b/electrum/src/main/resources/images/24_settings_apply.gif
diff --git a/electrum/src/main/resources/images/24_settings_apply2.gif b/electrum/src/main/resources/images/24_settings_apply2.gif
diff --git a/electrum/src/main/resources/images/24_settings_apply3.gif b/electrum/src/main/resources/images/24_settings_apply3.gif
diff --git a/electrum/src/main/resources/images/24_settings_close.gif b/electrum/src/main/resources/images/24_settings_close.gif
diff --git a/electrum/src/main/resources/images/24_settings_close2.gif b/electrum/src/main/resources/images/24_settings_close2.gif
diff --git a/electrum/src/main/resources/images/24_settings_close3.gif b/electrum/src/main/resources/images/24_settings_close3.gif
diff --git a/electrum/src/main/resources/images/24_settings_close4.gif b/electrum/src/main/resources/images/24_settings_close4.gif
diff --git a/electrum/src/main/resources/images/24_settings_close5.gif b/electrum/src/main/resources/images/24_settings_close5.gif
diff --git a/electrum/src/main/resources/images/24_texttree.gif b/electrum/src/main/resources/images/24_texttree.gif
diff --git a/electrum/src/main/resources/images/cb0.gif b/electrum/src/main/resources/images/cb0.gif
diff --git a/electrum/src/main/resources/images/cb1.gif b/electrum/src/main/resources/images/cb1.gif
diff --git a/electrum/src/main/resources/images/logo.gif b/electrum/src/main/resources/images/logo.gif
diff --git a/electrum/src/main/resources/images/menu0.gif b/electrum/src/main/resources/images/menu0.gif
diff --git a/electrum/src/main/resources/images/menu1.gif b/electrum/src/main/resources/images/menu1.gif
diff --git a/electrum/src/main/resources/images/tcb01.gif b/electrum/src/main/resources/images/tcb01.gif
diff --git a/electrum/src/main/resources/images/tcb02.gif b/electrum/src/main/resources/images/tcb02.gif
diff --git a/electrum/src/main/resources/images/tcb03.gif b/electrum/src/main/resources/images/tcb03.gif
diff --git a/electrum/src/main/resources/images/tcb04.gif b/electrum/src/main/resources/images/tcb04.gif
diff --git a/electrum/src/main/resources/models/Temporal_Examples/ex1.ele b/electrum/src/main/resources/models/Temporal_Examples/ex1.ele
diff --git a/electrum/src/main/resources/models/Temporal_Examples/firewire.ele b/electrum/src/main/resources/models/Temporal_Examples/firewire.ele
diff --git a/electrum/src/main/resources/models/Temporal_Examples/hotel.ele b/electrum/src/main/resources/models/Temporal_Examples/hotel.ele
diff --git a/electrum/src/main/resources/models/Temporal_Examples/lift_spl.ele b/electrum/src/main/resources/models/Temporal_Examples/lift_spl.ele
diff --git a/electrum/src/main/resources/models/Temporal_Examples/ring.ele b/electrum/src/main/resources/models/Temporal_Examples/ring.ele
diff --git a/electrum/src/main/resources/models/Temporal_Examples/span_tree.ele b/electrum/src/main/resources/models/Temporal_Examples/span_tree.ele
diff --git a/pom.xml b/pom.xml