Menu
▾
▴
jcontracts-svn — Subversion commit messages. DO NOT POST!
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(35) |
Dec
(10) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(10) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <js...@us...> - 2006-11-27 16:51:39
|
Revision: 30
http://svn.sourceforge.net/jcontracts/?rev=30&view=rev
Author: jstuyts
Date: 2006-11-27 08:51:37 -0800 (Mon, 27 Nov 2006)
Log Message:
-----------
Formatted code.
Modified Paths:
--------------
trunk/source/java/net/sf/jcontracts/icontract/instruction/DeclareReturnValueHolder.java
trunk/source/java/net/sf/jcontracts/icontract/instruction/Instruction.java
trunk/source/java/net/sf/jcontracts/icontract/instruction/InstructionBase.java
Modified: trunk/source/java/net/sf/jcontracts/icontract/instruction/DeclareReturnValueHolder.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/instruction/DeclareReturnValueHolder.java 2006-11-27 16:50:57 UTC (rev 29)
+++ trunk/source/java/net/sf/jcontracts/icontract/instruction/DeclareReturnValueHolder.java 2006-11-27 16:51:37 UTC (rev 30)
@@ -2,9 +2,11 @@
import net.sf.jcontracts.codeparser.CodeMetaclass;
-public class DeclareReturnValueHolder extends InstructionBase {
+public class DeclareReturnValueHolder extends InstructionBase
+{
- public DeclareReturnValueHolder(CodeMetaclass codeElement) {
- super(codeElement);
- }
+ public DeclareReturnValueHolder(CodeMetaclass codeElement)
+ {
+ super(codeElement);
+ }
}
Modified: trunk/source/java/net/sf/jcontracts/icontract/instruction/Instruction.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/instruction/Instruction.java 2006-11-27 16:50:57 UTC (rev 29)
+++ trunk/source/java/net/sf/jcontracts/icontract/instruction/Instruction.java 2006-11-27 16:51:37 UTC (rev 30)
@@ -1,14 +1,17 @@
package net.sf.jcontracts.icontract.instruction;
+public interface Instruction
+{
-public interface Instruction {
+ public static final String COMMENT_TAG = "#*#";
- public static final String COMMENT_TAG = "#*#";
- public static final String START_SEPARATION_STRING_A = "//#*#";
- public static final String START_SEPARATION_STRING_B = "-------------------------------------------------------------------------------";
- public static final String END_SEPARATION_STRING = "//-------------------------------------------------------------------------------#*#";
+ public static final String START_SEPARATION_STRING_A = "//#*#";
- public abstract String getCode();
+ public static final String START_SEPARATION_STRING_B = "-------------------------------------------------------------------------------";
- public abstract int getInsertionLocation();
+ public static final String END_SEPARATION_STRING = "//-------------------------------------------------------------------------------#*#";
+
+ public abstract String getCode();
+
+ public abstract int getInsertionLocation();
}
Modified: trunk/source/java/net/sf/jcontracts/icontract/instruction/InstructionBase.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/instruction/InstructionBase.java 2006-11-27 16:50:57 UTC (rev 29)
+++ trunk/source/java/net/sf/jcontracts/icontract/instruction/InstructionBase.java 2006-11-27 16:51:37 UTC (rev 30)
@@ -2,24 +2,29 @@
import net.sf.jcontracts.codeparser.CodeMetaclass;
-public abstract class InstructionBase
- implements Instruction {
+public abstract class InstructionBase implements Instruction
+{
- protected CodeMetaclass parent_;
- protected int insertion_location_;
- protected String code_;
+ protected CodeMetaclass parent_;
- public InstructionBase(CodeMetaclass codeElement) {
- insertion_location_ = 0;
- code_ = "";
- parent_ = codeElement;
- }
+ protected int insertion_location_;
- public String getCode() {
- return code_;
- }
+ protected String code_;
- public int getInsertionLocation() {
- return insertion_location_;
- }
+ public InstructionBase(CodeMetaclass codeElement)
+ {
+ insertion_location_ = 0;
+ code_ = "";
+ parent_ = codeElement;
+ }
+
+ public String getCode()
+ {
+ return code_;
+ }
+
+ public int getInsertionLocation()
+ {
+ return insertion_location_;
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2006-11-27 16:51:02
|
Revision: 29
http://svn.sourceforge.net/jcontracts/?rev=29&view=rev
Author: jstuyts
Date: 2006-11-27 08:50:57 -0800 (Mon, 27 Nov 2006)
Log Message:
-----------
Formatted code.
Modified Paths:
--------------
trunk/source/java/net/sf/jcontracts/icontract/side/MethodFront.java
trunk/source/java/net/sf/jcontracts/icontract/side/Side.java
trunk/source/java/net/sf/jcontracts/icontract/side/SideBase.java
trunk/source/java/net/sf/jcontracts/icontract/side/SideFactory.java
Modified: trunk/source/java/net/sf/jcontracts/icontract/side/MethodFront.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/side/MethodFront.java 2006-11-27 16:50:03 UTC (rev 28)
+++ trunk/source/java/net/sf/jcontracts/icontract/side/MethodFront.java 2006-11-27 16:50:57 UTC (rev 29)
@@ -5,17 +5,19 @@
import net.sf.jcontracts.codeparser.CodeMetaclass;
import net.sf.jcontracts.icontract.instruction.DeclareReturnValueHolder;
-public class MethodFront extends SideBase
- implements Side {
+public class MethodFront extends SideBase implements Side
+{
- public MethodFront(CodeMetaclass codeElement) {
- super(codeElement);
- super.parent_ = codeElement;
- }
+ public MethodFront(CodeMetaclass codeElement)
+ {
+ super(codeElement);
+ super.parent_ = codeElement;
+ }
- public Vector createInstructions(boolean pre, boolean post, boolean inv) {
- Vector vec = new Vector();
- vec.addElement(new DeclareReturnValueHolder(getParent()));
- return vec;
- }
+ public Vector createInstructions(boolean pre, boolean post, boolean inv)
+ {
+ Vector vec = new Vector();
+ vec.addElement(new DeclareReturnValueHolder(getParent()));
+ return vec;
+ }
}
Modified: trunk/source/java/net/sf/jcontracts/icontract/side/Side.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/side/Side.java 2006-11-27 16:50:03 UTC (rev 28)
+++ trunk/source/java/net/sf/jcontracts/icontract/side/Side.java 2006-11-27 16:50:57 UTC (rev 29)
@@ -4,9 +4,10 @@
import net.sf.jcontracts.codeparser.CodeMetaclass;
-public interface Side {
+public interface Side
+{
- public abstract Vector createInstructions(boolean flag, boolean flag1, boolean flag2);
+ public abstract Vector createInstructions(boolean flag, boolean flag1, boolean flag2);
- public abstract CodeMetaclass getParent();
+ public abstract CodeMetaclass getParent();
}
Modified: trunk/source/java/net/sf/jcontracts/icontract/side/SideBase.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/side/SideBase.java 2006-11-27 16:50:03 UTC (rev 28)
+++ trunk/source/java/net/sf/jcontracts/icontract/side/SideBase.java 2006-11-27 16:50:57 UTC (rev 29)
@@ -2,15 +2,18 @@
import net.sf.jcontracts.codeparser.CodeMetaclass;
-public abstract class SideBase {
+public abstract class SideBase
+{
- protected CodeMetaclass parent_;
+ protected CodeMetaclass parent_;
- public SideBase(CodeMetaclass codeElement) {
- parent_ = codeElement;
- }
+ public SideBase(CodeMetaclass codeElement)
+ {
+ parent_ = codeElement;
+ }
- public CodeMetaclass getParent() {
- return parent_;
- }
+ public CodeMetaclass getParent()
+ {
+ return parent_;
+ }
}
Modified: trunk/source/java/net/sf/jcontracts/icontract/side/SideFactory.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/side/SideFactory.java 2006-11-27 16:50:03 UTC (rev 28)
+++ trunk/source/java/net/sf/jcontracts/icontract/side/SideFactory.java 2006-11-27 16:50:57 UTC (rev 29)
@@ -2,9 +2,10 @@
import net.sf.jcontracts.codeparser.CodeMetaclass;
-public interface SideFactory {
+public interface SideFactory
+{
- public abstract Side createFrontFor(CodeMetaclass codemetaclass);
+ public abstract Side createFrontFor(CodeMetaclass codemetaclass);
- public abstract Side createRearFor(CodeMetaclass codemetaclass);
+ public abstract Side createRearFor(CodeMetaclass codemetaclass);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2006-11-27 16:50:12
|
Revision: 28
http://svn.sourceforge.net/jcontracts/?rev=28&view=rev
Author: jstuyts
Date: 2006-11-27 08:50:03 -0800 (Mon, 27 Nov 2006)
Log Message:
-----------
Formatted code.
Modified Paths:
--------------
trunk/source/java/net/sf/jcontracts/icontract/util/Array.java
Modified: trunk/source/java/net/sf/jcontracts/icontract/util/Array.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/util/Array.java 2006-11-27 16:49:27 UTC (rev 27)
+++ trunk/source/java/net/sf/jcontracts/icontract/util/Array.java 2006-11-27 16:50:03 UTC (rev 28)
@@ -1,89 +1,108 @@
package net.sf.jcontracts.icontract.util;
+public class Array
+{
-public class Array {
+ private Array()
+ {
+ }
- private Array() {
- }
+ public static byte[] copy(byte orig[])
+ {
+ byte res[] = new byte[orig.length];
+ for (int i = 0; i < orig.length; i++)
+ {
+ res[i] = orig[i];
+ }
- public static byte[] copy(byte orig[]) {
- byte res[] = new byte[orig.length];
- for (int i = 0; i < orig.length; i++) {
- res[i] = orig[i];
- }
+ return res;
+ }
- return res;
- }
+ public static char[] copy(char orig[])
+ {
+ char res[] = new char[orig.length];
+ for (int i = 0; i < orig.length; i++)
+ {
+ res[i] = orig[i];
+ }
- public static char[] copy(char orig[]) {
- char res[] = new char[orig.length];
- for (int i = 0; i < orig.length; i++) {
- res[i] = orig[i];
- }
+ return res;
+ }
- return res;
- }
+ public static double[] copy(double orig[])
+ {
+ double res[] = new double[orig.length];
+ for (int i = 0; i < orig.length; i++)
+ {
+ res[i] = orig[i];
+ }
- public static double[] copy(double orig[]) {
- double res[] = new double[orig.length];
- for (int i = 0; i < orig.length; i++) {
- res[i] = orig[i];
- }
+ return res;
+ }
- return res;
- }
+ public static float[] copy(float orig[])
+ {
+ float res[] = new float[orig.length];
+ for (int i = 0; i < orig.length; i++)
+ {
+ res[i] = orig[i];
+ }
- public static float[] copy(float orig[]) {
- float res[] = new float[orig.length];
- for (int i = 0; i < orig.length; i++) {
- res[i] = orig[i];
- }
+ return res;
+ }
- return res;
- }
+ public static int[] copy(int orig[])
+ {
+ int res[] = new int[orig.length];
+ for (int i = 0; i < orig.length; i++)
+ {
+ res[i] = orig[i];
+ }
- public static int[] copy(int orig[]) {
- int res[] = new int[orig.length];
- for (int i = 0; i < orig.length; i++) {
- res[i] = orig[i];
- }
+ return res;
+ }
- return res;
- }
+ public static long[] copy(long orig[])
+ {
+ long res[] = new long[orig.length];
+ for (int i = 0; i < orig.length; i++)
+ {
+ res[i] = orig[i];
+ }
- public static long[] copy(long orig[]) {
- long res[] = new long[orig.length];
- for (int i = 0; i < orig.length; i++) {
- res[i] = orig[i];
- }
+ return res;
+ }
- return res;
- }
+ public static Object[] copy(Object orig[])
+ {
+ Object res[] = new Object[orig.length];
+ for (int i = 0; i < orig.length; i++)
+ {
+ res[i] = orig[i];
+ }
- public static Object[] copy(Object orig[]) {
- Object res[] = new Object[orig.length];
- for (int i = 0; i < orig.length; i++) {
- res[i] = orig[i];
- }
+ return res;
+ }
- return res;
- }
+ public static short[] copy(short orig[])
+ {
+ short res[] = new short[orig.length];
+ for (int i = 0; i < orig.length; i++)
+ {
+ res[i] = orig[i];
+ }
- public static short[] copy(short orig[]) {
- short res[] = new short[orig.length];
- for (int i = 0; i < orig.length; i++) {
- res[i] = orig[i];
- }
+ return res;
+ }
- return res;
- }
+ public static boolean[] copy(boolean orig[])
+ {
+ boolean res[] = new boolean[orig.length];
+ for (int i = 0; i < orig.length; i++)
+ {
+ res[i] = orig[i];
+ }
- public static boolean[] copy(boolean orig[]) {
- boolean res[] = new boolean[orig.length];
- for (int i = 0; i < orig.length; i++) {
- res[i] = orig[i];
- }
-
- return res;
- }
+ return res;
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2006-11-27 16:49:29
|
Revision: 27
http://svn.sourceforge.net/jcontracts/?rev=27&view=rev
Author: jstuyts
Date: 2006-11-27 08:49:27 -0800 (Mon, 27 Nov 2006)
Log Message:
-----------
Formatted code.
Modified Paths:
--------------
trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/xml/XMLRuleLanguage.java
trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/xml/XMLRuleLanguageSpecification.java
Modified: trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/xml/XMLRuleLanguage.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/xml/XMLRuleLanguage.java 2006-11-27 16:48:48 UTC (rev 26)
+++ trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/xml/XMLRuleLanguage.java 2006-11-27 16:49:27 UTC (rev 27)
@@ -3,13 +3,15 @@
import net.sf.jcontracts.idarwin.specification.openapi.IArchitectureSpecification;
import net.sf.jcontracts.idarwin.specification.openapi.ILanguageFactory;
-public class XMLRuleLanguage
- implements ILanguageFactory {
+public class XMLRuleLanguage implements ILanguageFactory
+{
- public IArchitectureSpecification newArchitectureSpecification() {
- return new XMLRuleLanguageSpecification();
- }
+ public IArchitectureSpecification newArchitectureSpecification()
+ {
+ return new XMLRuleLanguageSpecification();
+ }
- public XMLRuleLanguage() {
- }
+ public XMLRuleLanguage()
+ {
+ }
}
Modified: trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/xml/XMLRuleLanguageSpecification.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/xml/XMLRuleLanguageSpecification.java 2006-11-27 16:48:48 UTC (rev 26)
+++ trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/xml/XMLRuleLanguageSpecification.java 2006-11-27 16:49:27 UTC (rev 27)
@@ -5,82 +5,104 @@
import net.sf.jcontracts.idarwin.specification.impl.primitive_language.ArchitectureSpecification;
import net.sf.jcontracts.idarwin.specification.openapi.IllFormedSpecificationException;
-public class XMLRuleLanguageSpecification extends ArchitectureSpecification {
+public class XMLRuleLanguageSpecification extends ArchitectureSpecification
+{
- String RULE_START_TAG;
- String IDIOM_START_TAG;
- String GROUP_START_TAG;
- String RULE_END_TAG;
- String GROUP_END_TAG;
- String IDIOM_END_TAG;
+ String RULE_START_TAG;
- private String[] extract(String spec, String start_tag, String end_tag) {
- int currentStart = spec.indexOf(start_tag);
- String body = null;
- String name = null;
- Vector rules = new Vector();
- while (currentStart != -1 && spec.indexOf(start_tag, currentStart) != -1) {
- if (spec.indexOf(start_tag, currentStart) != -1 && spec.indexOf(end_tag, currentStart) == -1) {
- throw new RuntimeException("iDarwin: error missing tag: " + end_tag + " in\n" + spec);
- }
- int equalPos = spec.indexOf(start_tag, currentStart) + start_tag.length();
- int closingPos = spec.indexOf(">", equalPos);
- if (closingPos == -1) {
- throw new RuntimeException("iDarwin: error missing the closing '>' after the tag '" + start_tag + "' in\n" + spec);
- }
- name = spec.substring(equalPos, closingPos);
- int end = spec.indexOf(end_tag, currentStart);
- if (end != -1) {
- body = spec.substring(closingPos + 1, end);
- rules.addElement("\"" + name + "\" " + body);
- currentStart = spec.indexOf(start_tag, currentStart + 1);
- } else {
- throw new RuntimeException("iDarwin: error missing tag: " + end_tag + " in\n" + spec);
- }
- }
- String result[] = new String[rules.size()];
- for (int i = 0; i < rules.size(); i++) {
- result[i] = (String)rules.elementAt(i);
- }
+ String IDIOM_START_TAG;
- return result;
- }
+ String GROUP_START_TAG;
- private String[] extractGroups(String spec) {
- return extract(spec, GROUP_START_TAG, GROUP_END_TAG);
- }
+ String RULE_END_TAG;
- private String[] extractIdioms(String spec) {
- return extract(spec, IDIOM_START_TAG, IDIOM_END_TAG);
- }
+ String GROUP_END_TAG;
- private String[] extractRules(String spec) {
- return extract(spec, RULE_START_TAG, RULE_END_TAG);
- }
+ String IDIOM_END_TAG;
- public void parseFrom(String specification) throws IllFormedSpecificationException {
- String rs[] = null;
- String gs[] = null;
- String is[] = null;
- try {
- gs = extractGroups(specification);
- rs = extractRules(specification);
- is = extractIdioms(specification);
- parseGroupsFrom(gs);
- super.parseFrom(rs);
- parseIdiomsFrom(is);
- }
- catch (Exception e) {
- throw new IllFormedSpecificationException(e.getMessage());
- }
- }
+ private String[] extract(String spec, String start_tag, String end_tag)
+ {
+ int currentStart = spec.indexOf(start_tag);
+ String body = null;
+ String name = null;
+ Vector rules = new Vector();
+ while (currentStart != -1 && spec.indexOf(start_tag, currentStart) != -1)
+ {
+ if (spec.indexOf(start_tag, currentStart) != -1 && spec.indexOf(end_tag, currentStart) == -1)
+ {
+ throw new RuntimeException("iDarwin: error missing tag: " + end_tag + " in\n" + spec);
+ }
+ int equalPos = spec.indexOf(start_tag, currentStart) + start_tag.length();
+ int closingPos = spec.indexOf(">", equalPos);
+ if (closingPos == -1)
+ {
+ throw new RuntimeException("iDarwin: error missing the closing '>' after the tag '" + start_tag
+ + "' in\n" + spec);
+ }
+ name = spec.substring(equalPos, closingPos);
+ int end = spec.indexOf(end_tag, currentStart);
+ if (end != -1)
+ {
+ body = spec.substring(closingPos + 1, end);
+ rules.addElement("\"" + name + "\" " + body);
+ currentStart = spec.indexOf(start_tag, currentStart + 1);
+ }
+ else
+ {
+ throw new RuntimeException("iDarwin: error missing tag: " + end_tag + " in\n" + spec);
+ }
+ }
+ String result[] = new String[rules.size()];
+ for (int i = 0; i < rules.size(); i++)
+ {
+ result[i] = (String) rules.elementAt(i);
+ }
- public XMLRuleLanguageSpecification() {
- RULE_START_TAG = "<rule name=";
- IDIOM_START_TAG = "<macro name=";
- GROUP_START_TAG = "<group name=";
- RULE_END_TAG = "</rule>";
- GROUP_END_TAG = "</group>";
- IDIOM_END_TAG = "</macro>";
- }
+ return result;
+ }
+
+ private String[] extractGroups(String spec)
+ {
+ return extract(spec, GROUP_START_TAG, GROUP_END_TAG);
+ }
+
+ private String[] extractIdioms(String spec)
+ {
+ return extract(spec, IDIOM_START_TAG, IDIOM_END_TAG);
+ }
+
+ private String[] extractRules(String spec)
+ {
+ return extract(spec, RULE_START_TAG, RULE_END_TAG);
+ }
+
+ public void parseFrom(String specification) throws IllFormedSpecificationException
+ {
+ String rs[] = null;
+ String gs[] = null;
+ String is[] = null;
+ try
+ {
+ gs = extractGroups(specification);
+ rs = extractRules(specification);
+ is = extractIdioms(specification);
+ parseGroupsFrom(gs);
+ super.parseFrom(rs);
+ parseIdiomsFrom(is);
+ }
+ catch (Exception e)
+ {
+ throw new IllFormedSpecificationException(e.getMessage());
+ }
+ }
+
+ public XMLRuleLanguageSpecification()
+ {
+ RULE_START_TAG = "<rule name=";
+ IDIOM_START_TAG = "<macro name=";
+ GROUP_START_TAG = "<group name=";
+ RULE_END_TAG = "</rule>";
+ GROUP_END_TAG = "</group>";
+ IDIOM_END_TAG = "</macro>";
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2006-11-27 16:48:50
|
Revision: 26
http://svn.sourceforge.net/jcontracts/?rev=26&view=rev
Author: jstuyts
Date: 2006-11-27 08:48:48 -0800 (Mon, 27 Nov 2006)
Log Message:
-----------
Formatted code.
Modified Paths:
--------------
trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/with_rules/IArchitectureSpecification.java
trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/with_rules/IRule.java
Modified: trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/with_rules/IArchitectureSpecification.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/with_rules/IArchitectureSpecification.java 2006-11-27 16:47:30 UTC (rev 25)
+++ trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/with_rules/IArchitectureSpecification.java 2006-11-27 16:48:48 UTC (rev 26)
@@ -1,12 +1,12 @@
package net.sf.jcontracts.idarwin.specification.impl.with_rules;
+public interface IArchitectureSpecification extends
+ net.sf.jcontracts.idarwin.specification.openapi.IArchitectureSpecification
+{
-public interface IArchitectureSpecification
- extends net.sf.jcontracts.idarwin.specification.openapi.IArchitectureSpecification {
+ public abstract IRule[] getRules();
- public abstract IRule[] getRules();
+ public abstract IRule[] getUnusedRules();
- public abstract IRule[] getUnusedRules();
-
- public abstract IRule[] getUsedRules();
+ public abstract IRule[] getUsedRules();
}
Modified: trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/with_rules/IRule.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/with_rules/IRule.java 2006-11-27 16:47:30 UTC (rev 25)
+++ trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/with_rules/IRule.java 2006-11-27 16:48:48 UTC (rev 26)
@@ -2,11 +2,12 @@
import net.sf.jcontracts.idarwin.specification.openapi.IDependency;
-public interface IRule {
+public interface IRule
+{
- public abstract boolean check(IDependency idependency);
+ public abstract boolean check(IDependency idependency);
- public abstract boolean isMoreSpecificThan(IRule irule);
+ public abstract boolean isMoreSpecificThan(IRule irule);
- public abstract boolean talksAboutAnyOf(String as[]);
+ public abstract boolean talksAboutAnyOf(String as[]);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2006-11-27 16:47:34
|
Revision: 25
http://svn.sourceforge.net/jcontracts/?rev=25&view=rev
Author: jstuyts
Date: 2006-11-27 08:47:30 -0800 (Mon, 27 Nov 2006)
Log Message:
-----------
Formatted code.
Modified Paths:
--------------
trunk/source/java/net/sf/jcontracts/idarwin/specification/openapi/IArchitectureExporter.java
trunk/source/java/net/sf/jcontracts/idarwin/specification/openapi/IArchitectureSpecification.java
trunk/source/java/net/sf/jcontracts/idarwin/specification/openapi/IArchitectureSpecificationFilter.java
trunk/source/java/net/sf/jcontracts/idarwin/specification/openapi/IDependency.java
trunk/source/java/net/sf/jcontracts/idarwin/specification/openapi/ILanguageFactory.java
trunk/source/java/net/sf/jcontracts/idarwin/specification/openapi/IllFormedSpecificationException.java
trunk/source/java/net/sf/jcontracts/idarwin/specification/openapi/RunData.java
Modified: trunk/source/java/net/sf/jcontracts/idarwin/specification/openapi/IArchitectureExporter.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/idarwin/specification/openapi/IArchitectureExporter.java 2006-11-27 16:46:00 UTC (rev 24)
+++ trunk/source/java/net/sf/jcontracts/idarwin/specification/openapi/IArchitectureExporter.java 2006-11-27 16:47:30 UTC (rev 25)
@@ -2,11 +2,12 @@
import java.io.IOException;
-public interface IArchitectureExporter {
+public interface IArchitectureExporter
+{
- public abstract void close() throws IOException;
+ public abstract void close() throws IOException;
- public abstract void export(IArchitectureSpecification iarchitecturespecification) throws IOException;
+ public abstract void export(IArchitectureSpecification iarchitecturespecification) throws IOException;
- public abstract void open();
+ public abstract void open();
}
Modified: trunk/source/java/net/sf/jcontracts/idarwin/specification/openapi/IArchitectureSpecification.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/idarwin/specification/openapi/IArchitectureSpecification.java 2006-11-27 16:46:00 UTC (rev 24)
+++ trunk/source/java/net/sf/jcontracts/idarwin/specification/openapi/IArchitectureSpecification.java 2006-11-27 16:47:30 UTC (rev 25)
@@ -2,27 +2,29 @@
import java.io.IOException;
-public interface IArchitectureSpecification {
+public interface IArchitectureSpecification
+{
- public abstract boolean check(IDependency idependency, StringBuffer stringbuffer, StringBuffer stringbuffer1);
+ public abstract boolean check(IDependency idependency, StringBuffer stringbuffer, StringBuffer stringbuffer1);
- public abstract IArchitectureSpecification composeWith(IArchitectureSpecification iarchitecturespecification) throws IllFormedSpecificationException;
+ public abstract IArchitectureSpecification composeWith(IArchitectureSpecification iarchitecturespecification)
+ throws IllFormedSpecificationException;
- public abstract String getWellFormedStatement();
+ public abstract String getWellFormedStatement();
- public abstract boolean isEmpty();
+ public abstract boolean isEmpty();
- public abstract IArchitectureExporter newArchitectureExporter(String s) throws IOException;
+ public abstract IArchitectureExporter newArchitectureExporter(String s) throws IOException;
- public abstract IDependency newDependency(String s, String s1, String s2, String s3);
+ public abstract IDependency newDependency(String s, String s1, String s2, String s3);
- public abstract IArchitectureSpecificationFilter newSpecificationFilter(String as[]);
+ public abstract IArchitectureSpecificationFilter newSpecificationFilter(String as[]);
- public abstract void parseFrom(String s) throws IllFormedSpecificationException;
+ public abstract void parseFrom(String s) throws IllFormedSpecificationException;
- public abstract void prepareForCheck() throws IllFormedSpecificationException;
+ public abstract void prepareForCheck() throws IllFormedSpecificationException;
- public abstract String reportAfterAllChecks();
+ public abstract String reportAfterAllChecks();
- public abstract String toString();
+ public abstract String toString();
}
Modified: trunk/source/java/net/sf/jcontracts/idarwin/specification/openapi/IArchitectureSpecificationFilter.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/idarwin/specification/openapi/IArchitectureSpecificationFilter.java 2006-11-27 16:46:00 UTC (rev 24)
+++ trunk/source/java/net/sf/jcontracts/idarwin/specification/openapi/IArchitectureSpecificationFilter.java 2006-11-27 16:47:30 UTC (rev 25)
@@ -1,7 +1,8 @@
package net.sf.jcontracts.idarwin.specification.openapi;
+public interface IArchitectureSpecificationFilter
+{
-public interface IArchitectureSpecificationFilter {
-
- public abstract IArchitectureSpecification filter(IArchitectureSpecification iarchitecturespecification) throws IllFormedSpecificationException;
+ public abstract IArchitectureSpecification filter(IArchitectureSpecification iarchitecturespecification)
+ throws IllFormedSpecificationException;
}
Modified: trunk/source/java/net/sf/jcontracts/idarwin/specification/openapi/IDependency.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/idarwin/specification/openapi/IDependency.java 2006-11-27 16:46:00 UTC (rev 24)
+++ trunk/source/java/net/sf/jcontracts/idarwin/specification/openapi/IDependency.java 2006-11-27 16:47:30 UTC (rev 25)
@@ -1,13 +1,13 @@
package net.sf.jcontracts.idarwin.specification.openapi;
+public interface IDependency
+{
-public interface IDependency {
+ public abstract String getLocation();
- public abstract String getLocation();
+ public abstract String getSource();
- public abstract String getSource();
+ public abstract String getTarget();
- public abstract String getTarget();
-
- public abstract String getType();
+ public abstract String getType();
}
Modified: trunk/source/java/net/sf/jcontracts/idarwin/specification/openapi/ILanguageFactory.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/idarwin/specification/openapi/ILanguageFactory.java 2006-11-27 16:46:00 UTC (rev 24)
+++ trunk/source/java/net/sf/jcontracts/idarwin/specification/openapi/ILanguageFactory.java 2006-11-27 16:47:30 UTC (rev 25)
@@ -1,9 +1,9 @@
package net.sf.jcontracts.idarwin.specification.openapi;
+public interface ILanguageFactory
+{
-public interface ILanguageFactory {
+ public static final String VERSION = "0.1c";
- public static final String VERSION = "0.1c";
-
- public abstract IArchitectureSpecification newArchitectureSpecification();
+ public abstract IArchitectureSpecification newArchitectureSpecification();
}
Modified: trunk/source/java/net/sf/jcontracts/idarwin/specification/openapi/IllFormedSpecificationException.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/idarwin/specification/openapi/IllFormedSpecificationException.java 2006-11-27 16:46:00 UTC (rev 24)
+++ trunk/source/java/net/sf/jcontracts/idarwin/specification/openapi/IllFormedSpecificationException.java 2006-11-27 16:47:30 UTC (rev 25)
@@ -1,9 +1,10 @@
package net.sf.jcontracts.idarwin.specification.openapi;
+public class IllFormedSpecificationException extends Exception
+{
-public class IllFormedSpecificationException extends Exception {
-
- public IllFormedSpecificationException(String message) {
- super(message);
- }
+ public IllFormedSpecificationException(String message)
+ {
+ super(message);
+ }
}
Modified: trunk/source/java/net/sf/jcontracts/idarwin/specification/openapi/RunData.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/idarwin/specification/openapi/RunData.java 2006-11-27 16:46:00 UTC (rev 24)
+++ trunk/source/java/net/sf/jcontracts/idarwin/specification/openapi/RunData.java 2006-11-27 16:47:30 UTC (rev 25)
@@ -1,41 +1,51 @@
package net.sf.jcontracts.idarwin.specification.openapi;
+public class RunData
+{
-public class RunData {
+ private int numberOfErrors;
- private int numberOfErrors;
- private int numberOfLinks;
- private boolean directed;
- private boolean doNotShowDependecyDetails;
+ private int numberOfLinks;
- public RunData(boolean directed, boolean doNotShowDependecyDetails) {
- numberOfErrors = 0;
- numberOfLinks = 0;
- this.directed = false;
- this.doNotShowDependecyDetails = false;
- }
+ private boolean directed;
- public boolean doNotShowDependecyDetails() {
- return doNotShowDependecyDetails;
- }
+ private boolean doNotShowDependecyDetails;
- public int getNumberOfErrors() {
- return numberOfErrors;
- }
+ public RunData(boolean directed, boolean doNotShowDependecyDetails)
+ {
+ numberOfErrors = 0;
+ numberOfLinks = 0;
+ this.directed = false;
+ this.doNotShowDependecyDetails = false;
+ }
- public int getNumberOfLinks() {
- return numberOfLinks;
- }
+ public boolean doNotShowDependecyDetails()
+ {
+ return doNotShowDependecyDetails;
+ }
- public void incrementNumberOfErrors() {
- numberOfErrors++;
- }
+ public int getNumberOfErrors()
+ {
+ return numberOfErrors;
+ }
- public void incrementNumberOfLinks() {
- numberOfLinks++;
- }
+ public int getNumberOfLinks()
+ {
+ return numberOfLinks;
+ }
- public boolean isDirected() {
- return directed;
- }
+ public void incrementNumberOfErrors()
+ {
+ numberOfErrors++;
+ }
+
+ public void incrementNumberOfLinks()
+ {
+ numberOfLinks++;
+ }
+
+ public boolean isDirected()
+ {
+ return directed;
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2006-11-27 16:46:05
|
Revision: 24
http://svn.sourceforge.net/jcontracts/?rev=24&view=rev
Author: jstuyts
Date: 2006-11-27 08:46:00 -0800 (Mon, 27 Nov 2006)
Log Message:
-----------
Formatted code.
Modified Paths:
--------------
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/util/JavaEvaluator.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/util/JavaEvaluator.java 2006-11-27 16:44:57 UTC (rev 23)
+++ trunk/source/java/net/sf/jcontracts/util/JavaEvaluator.java 2006-11-27 16:46:00 UTC (rev 24)
@@ -10,191 +10,242 @@
import sun.tools.javac.Main;
-public class JavaEvaluator {
+public class JavaEvaluator
+{
- public static Object eval(String s) throws IOException {
- String uniqueS = "" + System.currentTimeMillis();
- uniqueS = uniqueS.substring(uniqueS.length() - 6, uniqueS.length());
- String className = "TE_" + uniqueS;
- String mName = "getValue";
- String filename = className + ".java";
- Object o = null;
- PrintWriter ostream = new PrintWriter(new FileOutputStream(filename));
- try {
- ostream.println("// default package");
- ostream.println("public class " + className + " {");
- ostream.println("public static Object " + mName + "() {");
- ostream.println(s);
- ostream.println("}");
- ostream.println("}");
- ostream.close();
- String fargs[] = new String[2];
- fargs[0] = "-g";
- fargs[1] = filename;
- java.io.OutputStream javacout = new ByteArrayOutputStream(1024);
- Main theCompiler = new Main(javacout, "");
- boolean boo = theCompiler.compile(fargs);
- if (!boo) {
- System.err.println("\nJavaEvaluator: error: compilation failed!\n" + javacout.toString());
- return null;
- }
- try {
- Class c = java.lang.Class.forName(className);
- Class noArgArray[] = new Class[0];
- try {
- Method theMethod = c.getMethod(mName, noArgArray);
- try {
- o = theMethod.invoke(c, noArgArray);
- }
- catch (InvocationTargetException _ex) { }
- catch (IllegalArgumentException _ex) { }
- catch (IllegalAccessException _ex) { }
+ public static Object eval(String s) throws IOException
+ {
+ String uniqueS = "" + System.currentTimeMillis();
+ uniqueS = uniqueS.substring(uniqueS.length() - 6, uniqueS.length());
+ String className = "TE_" + uniqueS;
+ String mName = "getValue";
+ String filename = className + ".java";
+ Object o = null;
+ PrintWriter ostream = new PrintWriter(new FileOutputStream(filename));
+ try
+ {
+ ostream.println("// default package");
+ ostream.println("public class " + className + " {");
+ ostream.println("public static Object " + mName + "() {");
+ ostream.println(s);
+ ostream.println("}");
+ ostream.println("}");
+ ostream.close();
+ String fargs[] = new String[2];
+ fargs[0] = "-g";
+ fargs[1] = filename;
+ java.io.OutputStream javacout = new ByteArrayOutputStream(1024);
+ Main theCompiler = new Main(javacout, "");
+ boolean boo = theCompiler.compile(fargs);
+ if (!boo)
+ {
+ System.err.println("\nJavaEvaluator: error: compilation failed!\n" + javacout.toString());
+ return null;
}
- catch (NoSuchMethodException _ex) { }
- }
- catch (ClassNotFoundException _ex) { }
- Object obj = o;
- return obj;
- }
- finally {
- (new File(filename)).delete();
- (new File(className + ".class")).delete();
- }
- }
-
- public static Object eval(String s, String arg1) throws IOException {
- String uniqueS = "" + System.currentTimeMillis();
- uniqueS = uniqueS.substring(uniqueS.length() - 6, uniqueS.length());
- String className = "TE_" + uniqueS;
- String mName = "getValue_1Arg";
- String filename = className + ".java";
- Object o = null;
- PrintWriter ostream = new PrintWriter(new FileOutputStream(filename));
- try {
- ostream.println("// default package");
- ostream.println("public class " + className + " {");
- ostream.println("public static java.lang.Object " + mName + "(java.lang.Object arg1) {");
- ostream.println(s);
- ostream.println("}");
- ostream.println("}");
- ostream.close();
- String fargs[] = new String[2];
- fargs[0] = "-g";
- fargs[1] = filename;
- java.io.OutputStream javacout = new ByteArrayOutputStream(1024);
- Main theCompiler = new Main(javacout, "");
- boolean boo = theCompiler.compile(fargs);
- if (!boo) {
- System.err.println("\nJavaEvaluator: error: compilation failed!\n" + javacout.toString());
- return null;
- }
- try {
- Class c = java.lang.Class.forName(className);
- Class argTypeArray[] = new Class[2];
- argTypeArray[0] = java.lang.Class.forName("java.lang.Object");
- argTypeArray[1] = java.lang.Class.forName("java.lang.Object");
- try {
- Method theMethod = c.getMethod(mName, argTypeArray);
- try {
- Object argValArray[] = new Object[1];
- argValArray[0] = arg1;
- o = theMethod.invoke(c, argValArray);
- }
- catch (InvocationTargetException _ex) { }
- catch (IllegalArgumentException _ex) { }
- catch (IllegalAccessException _ex) { }
+ try
+ {
+ Class c = java.lang.Class.forName(className);
+ Class noArgArray[] = new Class[0];
+ try
+ {
+ Method theMethod = c.getMethod(mName, noArgArray);
+ try
+ {
+ o = theMethod.invoke(c, noArgArray);
+ }
+ catch (InvocationTargetException _ex)
+ {
+ }
+ catch (IllegalArgumentException _ex)
+ {
+ }
+ catch (IllegalAccessException _ex)
+ {
+ }
+ }
+ catch (NoSuchMethodException _ex)
+ {
+ }
}
- catch (NoSuchMethodException _ex) { }
- }
- catch (ClassNotFoundException _ex) { }
- Object obj = o;
- return obj;
- }
- finally {
- (new File(filename)).delete();
- (new File(className + ".class")).delete();
- }
- }
+ catch (ClassNotFoundException _ex)
+ {
+ }
+ Object obj = o;
+ return obj;
+ }
+ finally
+ {
+ (new File(filename)).delete();
+ (new File(className + ".class")).delete();
+ }
+ }
- public static Object evalWithPrefix(String s, String prefix) throws Exception {
- String uniqueS = "" + System.currentTimeMillis();
- uniqueS = uniqueS.substring(uniqueS.length() - 6, uniqueS.length());
- String className = "TE_" + uniqueS;
- String mName = "getValue";
- String filename = className + ".java";
- Object o = null;
- PrintWriter ostream = new PrintWriter(new FileOutputStream(filename));
- try {
- ostream.println("// default package");
- ostream.println(prefix);
- ostream.println("public class " + className + " {");
- ostream.println("public static Object " + mName + "() {");
- ostream.println(s);
- ostream.println("}");
- ostream.println("}");
- ostream.close();
- String fargs[] = new String[2];
- fargs[0] = "-g";
- fargs[1] = filename;
- java.io.OutputStream javacout = new ByteArrayOutputStream(1024);
- boolean boo = false;
- try {
+ public static Object eval(String s, String arg1) throws IOException
+ {
+ String uniqueS = "" + System.currentTimeMillis();
+ uniqueS = uniqueS.substring(uniqueS.length() - 6, uniqueS.length());
+ String className = "TE_" + uniqueS;
+ String mName = "getValue_1Arg";
+ String filename = className + ".java";
+ Object o = null;
+ PrintWriter ostream = new PrintWriter(new FileOutputStream(filename));
+ try
+ {
+ ostream.println("// default package");
+ ostream.println("public class " + className + " {");
+ ostream.println("public static java.lang.Object " + mName + "(java.lang.Object arg1) {");
+ ostream.println(s);
+ ostream.println("}");
+ ostream.println("}");
+ ostream.close();
+ String fargs[] = new String[2];
+ fargs[0] = "-g";
+ fargs[1] = filename;
+ java.io.OutputStream javacout = new ByteArrayOutputStream(1024);
Main theCompiler = new Main(javacout, "");
- boo = theCompiler.compile(fargs);
- }
- catch (InternalError e) {
- System.err.println("\nJavaEvaluator: error: compilation failed due to VM INTERNAL ERROR!\n" + e.toString());
- return null;
- }
- if (!boo) {
- System.err.println("\nJavaEvaluator: error: compilation failed!\n" + javacout.toString());
- return null;
- }
- Class c = java.lang.Class.forName(className);
- Class noArgArray[] = new Class[0];
- Method theMethod = c.getMethod(mName, noArgArray);
- o = theMethod.invoke(c, noArgArray);
- Object obj = o;
- return obj;
- }
- finally {
- (new File(filename)).delete();
- (new File(className + ".class")).delete();
- }
- }
+ boolean boo = theCompiler.compile(fargs);
+ if (!boo)
+ {
+ System.err.println("\nJavaEvaluator: error: compilation failed!\n" + javacout.toString());
+ return null;
+ }
+ try
+ {
+ Class c = java.lang.Class.forName(className);
+ Class argTypeArray[] = new Class[2];
+ argTypeArray[0] = java.lang.Class.forName("java.lang.Object");
+ argTypeArray[1] = java.lang.Class.forName("java.lang.Object");
+ try
+ {
+ Method theMethod = c.getMethod(mName, argTypeArray);
+ try
+ {
+ Object argValArray[] = new Object[1];
+ argValArray[0] = arg1;
+ o = theMethod.invoke(c, argValArray);
+ }
+ catch (InvocationTargetException _ex)
+ {
+ }
+ catch (IllegalArgumentException _ex)
+ {
+ }
+ catch (IllegalAccessException _ex)
+ {
+ }
+ }
+ catch (NoSuchMethodException _ex)
+ {
+ }
+ }
+ catch (ClassNotFoundException _ex)
+ {
+ }
+ Object obj = o;
+ return obj;
+ }
+ finally
+ {
+ (new File(filename)).delete();
+ (new File(className + ".class")).delete();
+ }
+ }
- public static void main(String args[]) throws Exception {
- try {
- Object result = eval("return \"Hello World 1\";");
- System.out.println("Result = " + result);
- }
- catch (Exception e) {
- System.err.println("exception: " + e);
- throw e;
- }
- try {
- Object result = eval("return \"Hello World 2\";");
- System.out.println("Result = " + result);
- }
- catch (Exception e) {
- System.err.println("exception: " + e);
- throw e;
- }
- }
+ public static Object evalWithPrefix(String s, String prefix) throws Exception
+ {
+ String uniqueS = "" + System.currentTimeMillis();
+ uniqueS = uniqueS.substring(uniqueS.length() - 6, uniqueS.length());
+ String className = "TE_" + uniqueS;
+ String mName = "getValue";
+ String filename = className + ".java";
+ Object o = null;
+ PrintWriter ostream = new PrintWriter(new FileOutputStream(filename));
+ try
+ {
+ ostream.println("// default package");
+ ostream.println(prefix);
+ ostream.println("public class " + className + " {");
+ ostream.println("public static Object " + mName + "() {");
+ ostream.println(s);
+ ostream.println("}");
+ ostream.println("}");
+ ostream.close();
+ String fargs[] = new String[2];
+ fargs[0] = "-g";
+ fargs[1] = filename;
+ java.io.OutputStream javacout = new ByteArrayOutputStream(1024);
+ boolean boo = false;
+ try
+ {
+ Main theCompiler = new Main(javacout, "");
+ boo = theCompiler.compile(fargs);
+ }
+ catch (InternalError e)
+ {
+ System.err.println("\nJavaEvaluator: error: compilation failed due to VM INTERNAL ERROR!\n"
+ + e.toString());
+ return null;
+ }
+ if (!boo)
+ {
+ System.err.println("\nJavaEvaluator: error: compilation failed!\n" + javacout.toString());
+ return null;
+ }
+ Class c = java.lang.Class.forName(className);
+ Class noArgArray[] = new Class[0];
+ Method theMethod = c.getMethod(mName, noArgArray);
+ o = theMethod.invoke(c, noArgArray);
+ Object obj = o;
+ return obj;
+ }
+ finally
+ {
+ (new File(filename)).delete();
+ (new File(className + ".class")).delete();
+ }
+ }
- public static void main2(String args[]) throws Exception {
- try {
- Object result = eval("return \"Hello World\";");
- System.out.println("Result = " + result);
- result = eval("return \"Hello World from \"+(String)arg1;", "Reto");
- System.out.println("Result = " + result);
- }
- catch (Exception e) {
- System.err.println("exception: " + e);
- throw e;
- }
- }
+ public static void main(String args[]) throws Exception
+ {
+ try
+ {
+ Object result = eval("return \"Hello World 1\";");
+ System.out.println("Result = " + result);
+ }
+ catch (Exception e)
+ {
+ System.err.println("exception: " + e);
+ throw e;
+ }
+ try
+ {
+ Object result = eval("return \"Hello World 2\";");
+ System.out.println("Result = " + result);
+ }
+ catch (Exception e)
+ {
+ System.err.println("exception: " + e);
+ throw e;
+ }
+ }
- public JavaEvaluator() {
- }
+ public static void main2(String args[]) throws Exception
+ {
+ try
+ {
+ Object result = eval("return \"Hello World\";");
+ System.out.println("Result = " + result);
+ result = eval("return \"Hello World from \"+(String)arg1;", "Reto");
+ System.out.println("Result = " + result);
+ }
+ catch (Exception e)
+ {
+ System.err.println("exception: " + e);
+ throw e;
+ }
+ }
+
+ public JavaEvaluator()
+ {
+ }
}
Modified: trunk/source/java/net/sf/jcontracts/util/StringComparator.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/util/StringComparator.java 2006-11-27 16:44:57 UTC (rev 23)
+++ trunk/source/java/net/sf/jcontracts/util/StringComparator.java 2006-11-27 16:46:00 UTC (rev 24)
@@ -3,139 +3,171 @@
import java.util.Enumeration;
import java.util.Vector;
-public class StringComparator {
- public class Interval {
+public class StringComparator
+{
+ public class Interval
+ {
- private int start;
- private int end;
- private String section;
+ private int start;
- public int getStart() {
- return start;
- }
+ private int end;
- public int getEnd() {
- return end;
- }
+ private String section;
- public String getSection() {
- return section;
- }
+ public int getStart()
+ {
+ return start;
+ }
- public String toString() {
- return "Section from " + getStart() + " to " + getEnd() + " is " + getSection();
- }
+ public int getEnd()
+ {
+ return end;
+ }
+ public String getSection()
+ {
+ return section;
+ }
- private Interval(int start, int end, String section) {
- this.start = 0;
- this.end = 0;
- this.section = null;
- this.start = start;
- this.end = end;
- this.section = section;
- }
- }
+ public String toString()
+ {
+ return "Section from " + getStart() + " to " + getEnd() + " is " + getSection();
+ }
+ private Interval(int start, int end, String section)
+ {
+ this.start = 0;
+ this.end = 0;
+ this.section = null;
+ this.start = start;
+ this.end = end;
+ this.section = section;
+ }
+ }
- public Vector getEqualIntervals(String s1, String s2, int min_section_length) {
- Vector result = new Vector();
- int shorterLength = Math.min(s1.length(), s2.length());
- int p_s1 = 0;
- int p_s2 = 0;
- int start = 0;
- int end = 0;
- while (p_s1 < shorterLength) {
- while (p_s1 < shorterLength && s1.charAt(p_s1) != s2.charAt(p_s2)) {
- p_s1++;
- p_s2++;
- }
- if (p_s1 < shorterLength) {
- start = p_s1;
- for (; p_s1 < shorterLength && s1.charAt(p_s1) == s2.charAt(p_s2); p_s2++) {
- p_s1++;
+ public Vector getEqualIntervals(String s1, String s2, int min_section_length)
+ {
+ Vector result = new Vector();
+ int shorterLength = Math.min(s1.length(), s2.length());
+ int p_s1 = 0;
+ int p_s2 = 0;
+ int start = 0;
+ int end = 0;
+ while (p_s1 < shorterLength)
+ {
+ while (p_s1 < shorterLength && s1.charAt(p_s1) != s2.charAt(p_s2))
+ {
+ p_s1++;
+ p_s2++;
}
+ if (p_s1 < shorterLength)
+ {
+ start = p_s1;
+ for (; p_s1 < shorterLength && s1.charAt(p_s1) == s2.charAt(p_s2); p_s2++)
+ {
+ p_s1++;
+ }
- end = p_s1;
- if (end - start > min_section_length) {
- String section = s1.substring(start, end);
- Interval interval = new Interval(start, end - 1, section);
- result.addElement(interval);
+ end = p_s1;
+ if (end - start > min_section_length)
+ {
+ String section = s1.substring(start, end);
+ Interval interval = new Interval(start, end - 1, section);
+ result.addElement(interval);
+ }
}
- }
- }
- return result;
- }
+ }
+ return result;
+ }
- public static void main(String args[]) {
- Vector result = null;
- result = (new StringComparator()).getEqualIntervals("abcdef 1234567890 xyz", "abcdef------------xyz", 1);
- for (Enumeration e = result.elements(); e.hasMoreElements(); System.out.println("Success!")) {
- Interval i = (Interval)e.nextElement();
- System.err.println(i);
- if (i.getStart() != 0) {
- throw new RuntimeException("test failed.");
- }
- if (i.getEnd() != 5) {
- throw new RuntimeException("test failed.");
- }
- i = (Interval)e.nextElement();
- if (i.getStart() != 18) {
- throw new RuntimeException("test failed.");
- }
- if (i.getEnd() != 20) {
- throw new RuntimeException("test failed.");
- }
- }
+ public static void main(String args[])
+ {
+ Vector result = null;
+ result = (new StringComparator()).getEqualIntervals("abcdef 1234567890 xyz", "abcdef------------xyz", 1);
+ for (Enumeration e = result.elements(); e.hasMoreElements(); System.out.println("Success!"))
+ {
+ Interval i = (Interval) e.nextElement();
+ System.err.println(i);
+ if (i.getStart() != 0)
+ {
+ throw new RuntimeException("test failed.");
+ }
+ if (i.getEnd() != 5)
+ {
+ throw new RuntimeException("test failed.");
+ }
+ i = (Interval) e.nextElement();
+ if (i.getStart() != 18)
+ {
+ throw new RuntimeException("test failed.");
+ }
+ if (i.getEnd() != 20)
+ {
+ throw new RuntimeException("test failed.");
+ }
+ }
- result = (new StringComparator()).getEqualIntervals("xyz", "xyz", 1);
- for (Enumeration e = result.elements(); e.hasMoreElements(); System.out.println("Success!")) {
- Interval i = (Interval)e.nextElement();
- System.err.println(i);
- if (i.getStart() != 0) {
- throw new RuntimeException("test failed.");
- }
- if (i.getEnd() != 2) {
- throw new RuntimeException("test failed.");
- }
- }
+ result = (new StringComparator()).getEqualIntervals("xyz", "xyz", 1);
+ for (Enumeration e = result.elements(); e.hasMoreElements(); System.out.println("Success!"))
+ {
+ Interval i = (Interval) e.nextElement();
+ System.err.println(i);
+ if (i.getStart() != 0)
+ {
+ throw new RuntimeException("test failed.");
+ }
+ if (i.getEnd() != 2)
+ {
+ throw new RuntimeException("test failed.");
+ }
+ }
- result = (new StringComparator()).getEqualIntervals("----1234567890AB--", "++++123+++++++AB++", 1);
- for (Enumeration e = result.elements(); e.hasMoreElements(); System.out.println("Success!")) {
- Interval i = (Interval)e.nextElement();
- System.err.println(i);
- if (i.getStart() != 4) {
- throw new RuntimeException("test failed.");
- }
- if (i.getEnd() != 6) {
- throw new RuntimeException("test failed.");
- }
- i = (Interval)e.nextElement();
- if (i.getStart() != 14) {
- throw new RuntimeException("test failed.");
- }
- if (i.getEnd() != 15) {
- throw new RuntimeException("test failed.");
- }
- }
+ result = (new StringComparator()).getEqualIntervals("----1234567890AB--", "++++123+++++++AB++", 1);
+ for (Enumeration e = result.elements(); e.hasMoreElements(); System.out.println("Success!"))
+ {
+ Interval i = (Interval) e.nextElement();
+ System.err.println(i);
+ if (i.getStart() != 4)
+ {
+ throw new RuntimeException("test failed.");
+ }
+ if (i.getEnd() != 6)
+ {
+ throw new RuntimeException("test failed.");
+ }
+ i = (Interval) e.nextElement();
+ if (i.getStart() != 14)
+ {
+ throw new RuntimeException("test failed.");
+ }
+ if (i.getEnd() != 15)
+ {
+ throw new RuntimeException("test failed.");
+ }
+ }
- result = (new StringComparator()).getEqualIntervals("----1234567890AB--", "++++123+++++++AB++", 2);
- if (result.size() != 1) {
- throw new RuntimeException("test failed.");
- }
- for (Enumeration e = result.elements(); e.hasMoreElements(); System.out.println("Success!")) {
- Interval i = (Interval)e.nextElement();
- System.err.println(i);
- if (i.getStart() != 4) {
+ result = (new StringComparator()).getEqualIntervals("----1234567890AB--", "++++123+++++++AB++", 2);
+ if (result.size() != 1)
+ {
throw new RuntimeException("test failed.");
- }
- if (i.getEnd() != 6) {
- throw new RuntimeException("test failed.");
- }
- }
+ }
+ for (Enumeration e = result.elements(); e.hasMoreElements(); System.out.println("Success!"))
+ {
+ Interval i = (Interval) e.nextElement();
+ System.err.println(i);
+ if (i.getStart() != 4)
+ {
+ throw new RuntimeException("test failed.");
+ }
+ if (i.getEnd() != 6)
+ {
+ throw new RuntimeException("test failed.");
+ }
+ }
- }
+ }
- public StringComparator() {
- }
+ public StringComparator()
+ {
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2006-11-27 16:45:04
|
Revision: 23
http://svn.sourceforge.net/jcontracts/?rev=23&view=rev
Author: jstuyts
Date: 2006-11-27 08:44:57 -0800 (Mon, 27 Nov 2006)
Log Message:
-----------
Formatted code.
Modified Paths:
--------------
trunk/build.xml
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2006-11-24 11:11:22 UTC (rev 22)
+++ trunk/build.xml 2006-11-27 16:44:57 UTC (rev 23)
@@ -7,9 +7,7 @@
<defaultexcludes add="$jarplug.work" />
<defaultexcludes add="$jarplug.work/**" />
- <filterset id="filter.sourceforge-logo"
- begintoken="src=""
- endtoken=""">
+ <filterset id="filter.sourceforge-logo" begintoken="src="" endtoken=""">
<filter token="resources/images/sflogo.png"
value="src="http://sourceforge.net/sflogo.php?group_id=175492&amp;type=2"" />
</filterset>
@@ -28,10 +26,10 @@
optimize="false">
<include name="**/*.java" />
<classpath>
- <fileset dir="libraries">
- <include name="*.jar" />
- </fileset>
- <pathelement location="classes"/>
+ <fileset dir="libraries">
+ <include name="*.jar" />
+ </fileset>
+ <pathelement location="classes" />
</classpath>
</javac>
<copy todir="build/ant/classes">
@@ -40,7 +38,7 @@
<include name="**/*.properties" />
</fileset>
</copy>
- <echo file="build/ant/classes/net/sf/jcontracts/icontract/version.txt" >${project.version}
+ <echo file="build/ant/classes/net/sf/jcontracts/icontract/version.txt">${project.version}
</echo>
</target>
@@ -83,10 +81,8 @@
<target name="upload-site"
description="Upload the documentation to the SourceForge.net webspace.">
- <fail unless="deploy.username"
- message="'deploy.username' must be set in 'local.properties'." />
- <fail unless="deploy.password"
- message="'deploy.password' must be set in 'local.properties'." />
+ <fail unless="deploy.username" message="'deploy.username' must be set in 'local.properties'." />
+ <fail unless="deploy.password" message="'deploy.password' must be set in 'local.properties'." />
<mkdir dir="build/ant/site" />
<copy todir="build/ant/site" filtering="false">
@@ -128,4 +124,4 @@
</fileset>
</zip>
</target>
-</project>
\ No newline at end of file
+</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2006-11-24 11:11:27
|
Revision: 22
http://svn.sourceforge.net/jcontracts/?rev=22&view=rev
Author: jstuyts
Date: 2006-11-24 03:11:22 -0800 (Fri, 24 Nov 2006)
Log Message:
-----------
Organized imports.
Modified Paths:
--------------
trunk/source/java/net/sf/jcontracts/argparser/ArgLexer.java
trunk/source/java/net/sf/jcontracts/argparser/ArgParser.java
trunk/source/java/net/sf/jcontracts/argparser/Parser.java
trunk/source/java/net/sf/jcontracts/codeparser/Class.java
trunk/source/java/net/sf/jcontracts/codeparser/CodeComment.java
trunk/source/java/net/sf/jcontracts/codeparser/CodeMetaclassCache.java
trunk/source/java/net/sf/jcontracts/codeparser/DebugVisitor.java
trunk/source/java/net/sf/jcontracts/codeparser/DottyVisitor.java
trunk/source/java/net/sf/jcontracts/codeparser/Dotty_Component_CommonLevel.java
trunk/source/java/net/sf/jcontracts/codeparser/Dotty_Component_PackageLevel.java
trunk/source/java/net/sf/jcontracts/codeparser/Dotty_Component_TypeLevel.java
trunk/source/java/net/sf/jcontracts/codeparser/Interface.java
trunk/source/java/net/sf/jcontracts/codeparser/JavaLexer.java
trunk/source/java/net/sf/jcontracts/codeparser/JavaParser.java
trunk/source/java/net/sf/jcontracts/codeparser/Parser.java
trunk/source/java/net/sf/jcontracts/codeparser/Variable.java
trunk/source/java/net/sf/jcontracts/dependencyanalyzer/Graph.java
trunk/source/java/net/sf/jcontracts/icontract/AllOption.java
trunk/source/java/net/sf/jcontracts/icontract/ArgMetaclassFactory.java
trunk/source/java/net/sf/jcontracts/icontract/AssertionExpression.java
trunk/source/java/net/sf/jcontracts/icontract/Class.java
trunk/source/java/net/sf/jcontracts/icontract/CleanOption.java
trunk/source/java/net/sf/jcontracts/icontract/CompilerOption.java
trunk/source/java/net/sf/jcontracts/icontract/Constants.java
trunk/source/java/net/sf/jcontracts/icontract/Darwin.java
trunk/source/java/net/sf/jcontracts/icontract/DefaultExceptionOption.java
trunk/source/java/net/sf/jcontracts/icontract/FileTarget.java
trunk/source/java/net/sf/jcontracts/icontract/HelpOption.java
trunk/source/java/net/sf/jcontracts/icontract/IContracted.java
trunk/source/java/net/sf/jcontracts/icontract/Interface.java
trunk/source/java/net/sf/jcontracts/icontract/Internal0Option.java
trunk/source/java/net/sf/jcontracts/icontract/InvCheck.java
trunk/source/java/net/sf/jcontracts/icontract/InvCheckCallOption.java
trunk/source/java/net/sf/jcontracts/icontract/MergeOption.java
trunk/source/java/net/sf/jcontracts/icontract/MetaclassFactory.java
trunk/source/java/net/sf/jcontracts/icontract/Method.java
trunk/source/java/net/sf/jcontracts/icontract/NoInitialCompilationOption.java
trunk/source/java/net/sf/jcontracts/icontract/NoRepositoryCompilationOption.java
trunk/source/java/net/sf/jcontracts/icontract/OneOneOption.java
trunk/source/java/net/sf/jcontracts/icontract/Option.java
trunk/source/java/net/sf/jcontracts/icontract/OutputOption.java
trunk/source/java/net/sf/jcontracts/icontract/ParameterOption.java
trunk/source/java/net/sf/jcontracts/icontract/PrePostCheck.java
trunk/source/java/net/sf/jcontracts/icontract/ProcessingOption.java
trunk/source/java/net/sf/jcontracts/icontract/QuietOption.java
trunk/source/java/net/sf/jcontracts/icontract/Repository.java
trunk/source/java/net/sf/jcontracts/icontract/RepositoryOutputOption.java
trunk/source/java/net/sf/jcontracts/icontract/SourceCompilerOption.java
trunk/source/java/net/sf/jcontracts/icontract/SystemInTarget.java
trunk/source/java/net/sf/jcontracts/icontract/Target.java
trunk/source/java/net/sf/jcontracts/icontract/Tool.java
trunk/source/java/net/sf/jcontracts/icontract/UnableToDetermineTypeException.java
trunk/source/java/net/sf/jcontracts/icontract/Variable.java
trunk/source/java/net/sf/jcontracts/icontract/VerboseOption.java
trunk/source/java/net/sf/jcontracts/icontract/WrapExceptionOption.java
trunk/source/java/net/sf/jcontracts/icontract/XOption.java
trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/ArchitectureSpecification.java
trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/Idiom.java
trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/IdiomFactory.java
trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/IsolateIdiom.java
trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/LayerIdiom.java
trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PSpecLexer.java
trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PSpecParser.java
trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PatternFactory.java
trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/SetPattern.java
trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/SingleDependencyConstraint.java
trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/StrictlyLayerIdiom.java
trunk/source/java/net/sf/jcontracts/util/JavaEvaluator.java
trunk/source/java/net/sf/jcontracts/util/StringComparator.java
Modified: trunk/source/java/net/sf/jcontracts/argparser/ArgLexer.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/argparser/ArgLexer.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/argparser/ArgLexer.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,10 +1,15 @@
package net.sf.jcontracts.argparser;
-import antlr.*;
-import antlr.collections.impl.BitSet;
import java.io.InputStream;
import java.util.Hashtable;
+import antlr.CharBufferNoBacktrackingNoInteractive;
+import antlr.CharScannerNoBacktrackingNoInteractive;
+import antlr.ScannerException;
+import antlr.Token;
+import antlr.Tokenizer;
+import antlr.collections.impl.BitSet;
+
public class ArgLexer extends CharScannerNoBacktrackingNoInteractive
implements ArgTokenTypes, Tokenizer {
Modified: trunk/source/java/net/sf/jcontracts/argparser/ArgParser.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/argparser/ArgParser.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/argparser/ArgParser.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,10 +1,14 @@
package net.sf.jcontracts.argparser;
-import antlr.*;
import java.io.FileInputStream;
-import java.io.PrintStream;
import java.util.Vector;
+import antlr.LLkParserNoInteractive;
+import antlr.ParserException;
+import antlr.Token;
+import antlr.TokenBuffer;
+import antlr.Tokenizer;
+
public class ArgParser extends LLkParserNoInteractive
implements ArgTokenTypes {
Modified: trunk/source/java/net/sf/jcontracts/argparser/Parser.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/argparser/Parser.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/argparser/Parser.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,10 +1,10 @@
package net.sf.jcontracts.argparser;
-import antlr.CharScanner;
-import antlr.ParserException;
import java.io.StringBufferInputStream;
import java.util.Vector;
+import antlr.ParserException;
+
public class Parser {
private ArgParser _argparser;
Modified: trunk/source/java/net/sf/jcontracts/codeparser/Class.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/codeparser/Class.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/codeparser/Class.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,7 +1,6 @@
package net.sf.jcontracts.codeparser;
import java.util.Enumeration;
-import java.util.Vector;
public class Class extends TypeMetaclass {
Modified: trunk/source/java/net/sf/jcontracts/codeparser/CodeComment.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/codeparser/CodeComment.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/codeparser/CodeComment.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,7 +1,9 @@
package net.sf.jcontracts.codeparser;
import java.io.Serializable;
-import java.util.*;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Vector;
class CodeComment
implements Serializable {
Modified: trunk/source/java/net/sf/jcontracts/codeparser/CodeMetaclassCache.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/codeparser/CodeMetaclassCache.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/codeparser/CodeMetaclassCache.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,10 +1,18 @@
package net.sf.jcontracts.codeparser;
-import antlr.ParserException;
-import java.io.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.OutputStream;
import java.util.Enumeration;
import java.util.Vector;
+import antlr.ParserException;
+
public class CodeMetaclassCache {
private static final String base;
Modified: trunk/source/java/net/sf/jcontracts/codeparser/DebugVisitor.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/codeparser/DebugVisitor.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/codeparser/DebugVisitor.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,6 +1,5 @@
package net.sf.jcontracts.codeparser;
-import java.io.PrintStream;
public class DebugVisitor
implements ICodeMetaclassVisitor {
Modified: trunk/source/java/net/sf/jcontracts/codeparser/DottyVisitor.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/codeparser/DottyVisitor.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/codeparser/DottyVisitor.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,6 +1,8 @@
package net.sf.jcontracts.codeparser;
-import java.io.*;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.PrintWriter;
import java.util.Vector;
import net.sf.jcontracts.idarwin.specification.openapi.IArchitectureExporter;
Modified: trunk/source/java/net/sf/jcontracts/codeparser/Dotty_Component_CommonLevel.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/codeparser/Dotty_Component_CommonLevel.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/codeparser/Dotty_Component_CommonLevel.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,8 +1,9 @@
package net.sf.jcontracts.codeparser;
-import java.io.PrintStream;
import java.io.PrintWriter;
-import java.util.*;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Vector;
import net.sf.jcontracts.icontract.QuietOption;
import net.sf.jcontracts.idarwin.specification.openapi.IArchitectureSpecification;
Modified: trunk/source/java/net/sf/jcontracts/codeparser/Dotty_Component_PackageLevel.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/codeparser/Dotty_Component_PackageLevel.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/codeparser/Dotty_Component_PackageLevel.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,6 +1,5 @@
package net.sf.jcontracts.codeparser;
-import java.io.PrintStream;
import java.io.PrintWriter;
import java.util.Enumeration;
import java.util.Vector;
Modified: trunk/source/java/net/sf/jcontracts/codeparser/Dotty_Component_TypeLevel.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/codeparser/Dotty_Component_TypeLevel.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/codeparser/Dotty_Component_TypeLevel.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,6 +1,5 @@
package net.sf.jcontracts.codeparser;
-import java.io.PrintStream;
import java.io.PrintWriter;
import java.util.Enumeration;
import java.util.Vector;
Modified: trunk/source/java/net/sf/jcontracts/codeparser/Interface.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/codeparser/Interface.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/codeparser/Interface.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,6 +1,5 @@
package net.sf.jcontracts.codeparser;
-import java.util.Vector;
public class Interface extends TypeMetaclass {
Modified: trunk/source/java/net/sf/jcontracts/codeparser/JavaLexer.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/codeparser/JavaLexer.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/codeparser/JavaLexer.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,10 +1,16 @@
package net.sf.jcontracts.codeparser;
-import antlr.*;
-import antlr.collections.impl.BitSet;
import java.io.InputStream;
import java.util.Hashtable;
+import antlr.ANTLRHashString;
+import antlr.CharBufferNoBacktrackingNoInteractive;
+import antlr.CharScannerNoBacktrackingNoInteractive;
+import antlr.ScannerException;
+import antlr.Token;
+import antlr.Tokenizer;
+import antlr.collections.impl.BitSet;
+
public class JavaLexer extends CharScannerNoBacktrackingNoInteractive
implements JavaTokenTypes, Tokenizer {
Modified: trunk/source/java/net/sf/jcontracts/codeparser/JavaParser.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/codeparser/JavaParser.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/codeparser/JavaParser.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,11 +1,19 @@
package net.sf.jcontracts.codeparser;
-import antlr.*;
-import antlr.collections.impl.BitSet;
-import java.io.*;
-import java.util.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Vector;
import net.sf.jcontracts.dependencyanalyzer.Node;
+import antlr.LLkParserNoInteractive;
+import antlr.NoViableAltException;
+import antlr.ParserException;
+import antlr.Token;
+import antlr.TokenBuffer;
+import antlr.Tokenizer;
+import antlr.collections.impl.BitSet;
public class JavaParser extends LLkParserNoInteractive
implements JavaTokenTypes {
Modified: trunk/source/java/net/sf/jcontracts/codeparser/Parser.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/codeparser/Parser.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/codeparser/Parser.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,11 +1,11 @@
package net.sf.jcontracts.codeparser;
-import antlr.CharScanner;
-import antlr.ParserException;
import java.io.InputStream;
import java.util.Hashtable;
import java.util.Vector;
+import antlr.ParserException;
+
public class Parser {
private JavaParser _javaparser;
Modified: trunk/source/java/net/sf/jcontracts/codeparser/Variable.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/codeparser/Variable.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/codeparser/Variable.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,6 +1,5 @@
package net.sf.jcontracts.codeparser;
-import java.util.Vector;
public class Variable extends CodeMetaclass {
Modified: trunk/source/java/net/sf/jcontracts/dependencyanalyzer/Graph.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/dependencyanalyzer/Graph.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/dependencyanalyzer/Graph.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,7 +1,8 @@
package net.sf.jcontracts.dependencyanalyzer;
-import java.io.PrintStream;
-import java.util.*;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Vector;
public class Graph {
Modified: trunk/source/java/net/sf/jcontracts/icontract/AllOption.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/AllOption.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/icontract/AllOption.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,6 +1,6 @@
package net.sf.jcontracts.icontract;
-import java.util.Vector;
+import java.util.Vector;
public class AllOption extends ParameterOption {
Modified: trunk/source/java/net/sf/jcontracts/icontract/ArgMetaclassFactory.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/ArgMetaclassFactory.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/icontract/ArgMetaclassFactory.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,11 +1,11 @@
package net.sf.jcontracts.icontract;
-import net.sf.jcontracts.argparser.*;
+import java.util.Vector;
+
+import net.sf.jcontracts.argparser.OptionMetaclass;
+import net.sf.jcontracts.argparser.ParserMetaclassFactory;
+import net.sf.jcontracts.argparser.TargetMetaclass;
-import org.apache.log4j.Logger;
-import java.io.PrintStream;
-import java.util.Vector;
-
public class ArgMetaclassFactory
implements ParserMetaclassFactory {
Modified: trunk/source/java/net/sf/jcontracts/icontract/AssertionExpression.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/AssertionExpression.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/icontract/AssertionExpression.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,12 +1,13 @@
package net.sf.jcontracts.icontract;
-import net.sf.jcontracts.codeparser.CodeMetaclass;
-
-import org.apache.log4j.Logger;
import java.lang.reflect.Method;
import java.util.Hashtable;
import java.util.Vector;
+import net.sf.jcontracts.codeparser.CodeMetaclass;
+
+import org.apache.log4j.Logger;
+
class AssertionExpression {
private static final Logger log = Logger.getLogger(AssertionExpression.class);
private String expression_;
Modified: trunk/source/java/net/sf/jcontracts/icontract/Class.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/Class.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/icontract/Class.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,15 +1,14 @@
package net.sf.jcontracts.icontract;
-import net.sf.jcontracts.codeparser.CodeMetaclass;
-import net.sf.jcontracts.codeparser.TypeMetaclass;
-
-import org.apache.log4j.Logger;
-import java.io.PrintStream;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.Enumeration;
import java.util.Vector;
+import net.sf.jcontracts.codeparser.TypeMetaclass;
+
+import org.apache.log4j.Logger;
+
public class Class extends net.sf.jcontracts.codeparser.Class
implements InvCheck, PrePostCheck {
private static final Logger log = Logger.getLogger(Class.class);
Modified: trunk/source/java/net/sf/jcontracts/icontract/CleanOption.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/CleanOption.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/icontract/CleanOption.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,7 +1,6 @@
package net.sf.jcontracts.icontract;
-import org.apache.log4j.Logger;
-import java.util.Vector;
+import java.util.Vector;
public class CleanOption extends ParameterOption {
Modified: trunk/source/java/net/sf/jcontracts/icontract/CompilerOption.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/CompilerOption.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/icontract/CompilerOption.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,11 +1,16 @@
package net.sf.jcontracts.icontract;
-import net.sf.jcontracts.argparser.OptionMetaclass;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.Enumeration;
+import java.util.Vector;
import org.apache.log4j.Logger;
-import java.io.*;
-import java.util.Enumeration;
-import java.util.Vector;
+
import sun.tools.javac.Main;
public class CompilerOption extends ParameterOption {
Modified: trunk/source/java/net/sf/jcontracts/icontract/Constants.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/Constants.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/icontract/Constants.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,6 +1,5 @@
package net.sf.jcontracts.icontract;
-import org.apache.log4j.Logger;
interface Constants {
Modified: trunk/source/java/net/sf/jcontracts/icontract/Darwin.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/Darwin.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/icontract/Darwin.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,15 +1,19 @@
package net.sf.jcontracts.icontract;
+import java.lang.reflect.Constructor;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Vector;
+
import net.sf.jcontracts.argparser.Parser;
-import net.sf.jcontracts.codeparser.*;
+import net.sf.jcontracts.codeparser.CodeMetaclass;
+import net.sf.jcontracts.codeparser.CodeMetaclassCache;
+import net.sf.jcontracts.codeparser.DottyVisitor;
+import net.sf.jcontracts.codeparser.DottyVisitorConstants;
+import net.sf.jcontracts.codeparser.IDependencyFilter;
import net.sf.jcontracts.idarwin.specification.openapi.IArchitectureSpecification;
-import net.sf.jcontracts.idarwin.specification.openapi.IllFormedSpecificationException;
import org.apache.log4j.Logger;
-import java.io.PrintStream;
-import java.lang.reflect.*;
-import java.util.*;
-import javax.swing.JOptionPane;
public class Darwin {
private static final Logger log = Logger.getLogger(Darwin.class);
Modified: trunk/source/java/net/sf/jcontracts/icontract/DefaultExceptionOption.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/DefaultExceptionOption.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/icontract/DefaultExceptionOption.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,10 +1,7 @@
package net.sf.jcontracts.icontract;
-import net.sf.jcontracts.argparser.OptionMetaclass;
+import java.util.Vector;
-import org.apache.log4j.Logger;
-import java.util.Vector;
-
public class DefaultExceptionOption extends ParameterOption {
public static final String NAME = "d";
Modified: trunk/source/java/net/sf/jcontracts/icontract/FileTarget.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/FileTarget.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/icontract/FileTarget.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,11 +1,20 @@
package net.sf.jcontracts.icontract;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintWriter;
+import java.util.Enumeration;
+import java.util.Vector;
+
import net.sf.jcontracts.codeparser.Parser;
import org.apache.log4j.Logger;
-import java.io.*;
-import java.util.Enumeration;
-import java.util.Vector;
public class FileTarget extends Target {
private static final Logger log = Logger.getLogger(FileTarget.class);
Modified: trunk/source/java/net/sf/jcontracts/icontract/HelpOption.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/HelpOption.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/icontract/HelpOption.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,14 +1,11 @@
package net.sf.jcontracts.icontract;
-import org.apache.log4j.Logger;
-
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
-import java.io.PrintStream;
import java.io.Reader;
-import java.util.Vector;
+import java.util.Vector;
public class HelpOption extends ParameterOption {
Modified: trunk/source/java/net/sf/jcontracts/icontract/IContracted.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/IContracted.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/icontract/IContracted.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,6 +1,5 @@
package net.sf.jcontracts.icontract;
-import org.apache.log4j.Logger;
public interface IContracted {
Modified: trunk/source/java/net/sf/jcontracts/icontract/Interface.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/Interface.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/icontract/Interface.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,15 +1,14 @@
package net.sf.jcontracts.icontract;
-import net.sf.jcontracts.codeparser.CodeMetaclass;
-import net.sf.jcontracts.codeparser.TypeMetaclass;
-
-import org.apache.log4j.Logger;
-import java.io.PrintStream;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.Enumeration;
import java.util.Vector;
+import net.sf.jcontracts.codeparser.TypeMetaclass;
+
+import org.apache.log4j.Logger;
+
public class Interface extends net.sf.jcontracts.codeparser.Interface
implements PrePostCheck, InvCheck {
private static final Logger log = Logger.getLogger(Interface.class);
Modified: trunk/source/java/net/sf/jcontracts/icontract/Internal0Option.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/Internal0Option.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/icontract/Internal0Option.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,7 +1,6 @@
package net.sf.jcontracts.icontract;
-import org.apache.log4j.Logger;
-import java.util.Vector;
+import java.util.Vector;
public class Internal0Option extends ParameterOption {
Modified: trunk/source/java/net/sf/jcontracts/icontract/InvCheck.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/InvCheck.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/icontract/InvCheck.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,7 +1,6 @@
package net.sf.jcontracts.icontract;
-import org.apache.log4j.Logger;
-import java.util.Vector;
+import java.util.Vector;
interface InvCheck
extends IContracted {
Modified: trunk/source/java/net/sf/jcontracts/icontract/InvCheckCallOption.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/InvCheckCallOption.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/icontract/InvCheckCallOption.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,7 +1,6 @@
package net.sf.jcontracts.icontract;
-import org.apache.log4j.Logger;
-import java.util.Vector;
+import java.util.Vector;
public class InvCheckCallOption extends ParameterOption {
Modified: trunk/source/java/net/sf/jcontracts/icontract/MergeOption.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/MergeOption.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/icontract/MergeOption.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,11 +1,19 @@
package net.sf.jcontracts.icontract;
-import net.sf.jcontracts.argparser.OptionMetaclass;
-import net.sf.jcontracts.codeparser.*;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Vector;
+import net.sf.jcontracts.codeparser.CodeMetaclass;
+import net.sf.jcontracts.codeparser.TypeMetaclass;
+
import org.apache.log4j.Logger;
-import java.io.*;
-import java.util.*;
public class MergeOption extends ProcessingOption {
private static final Logger log = Logger.getLogger(MergeOption.class);
Modified: trunk/source/java/net/sf/jcontracts/icontract/MetaclassFactory.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/MetaclassFactory.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/icontract/MetaclassFactory.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,10 +1,9 @@
package net.sf.jcontracts.icontract;
-import net.sf.jcontracts.codeparser.*;
+import java.util.Vector;
+
+import net.sf.jcontracts.codeparser.ParserMetaclassFactory;
-import org.apache.log4j.Logger;
-import java.util.Vector;
-
public class MetaclassFactory
implements ParserMetaclassFactory {
Modified: trunk/source/java/net/sf/jcontracts/icontract/Method.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/Method.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/icontract/Method.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,15 +1,14 @@
package net.sf.jcontracts.icontract;
-import net.sf.jcontracts.codeparser.CodeMetaclass;
-import net.sf.jcontracts.codeparser.TypeMetaclass;
-
-import org.apache.log4j.Logger;
-import java.io.PrintStream;
import java.lang.reflect.InvocationTargetException;
import java.util.Enumeration;
import java.util.Hashtable;
import java.util.Vector;
+import net.sf.jcontracts.codeparser.TypeMetaclass;
+
+import org.apache.log4j.Logger;
+
public class Method extends net.sf.jcontracts.codeparser.Method
implements InvCheck, PrePostCheck {
private static final Logger log = Logger.getLogger(Method.class);
Modified: trunk/source/java/net/sf/jcontracts/icontract/NoInitialCompilationOption.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/NoInitialCompilationOption.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/icontract/NoInitialCompilationOption.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,12 +1,12 @@
package net.sf.jcontracts.icontract;
-import net.sf.jcontracts.argparser.OptionMetaclass;
-
-import org.apache.log4j.Logger;
-import java.io.*;
+import java.io.File;
+import java.io.IOException;
import java.util.Hashtable;
import java.util.Vector;
+import org.apache.log4j.Logger;
+
public class NoInitialCompilationOption extends ParameterOption {
private static final Logger log = Logger.getLogger(NoInitialCompilationOption.class);
public static final String NAME = "j";
Modified: trunk/source/java/net/sf/jcontracts/icontract/NoRepositoryCompilationOption.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/NoRepositoryCompilationOption.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/icontract/NoRepositoryCompilationOption.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,11 +1,14 @@
package net.sf.jcontracts.icontract;
-import net.sf.jcontracts.argparser.OptionMetaclass;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.Enumeration;
+import java.util.Vector;
import org.apache.log4j.Logger;
-import java.io.*;
-import java.util.Enumeration;
-import java.util.Vector;
+
import sun.tools.javac.Main;
public class NoRepositoryCompilationOption extends ParameterOption {
Modified: trunk/source/java/net/sf/jcontracts/icontract/OneOneOption.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/OneOneOption.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/icontract/OneOneOption.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,7 +1,6 @@
package net.sf.jcontracts.icontract;
-import org.apache.log4j.Logger;
-import java.util.Vector;
+import java.util.Vector;
public class OneOneOption extends ParameterOption {
Modified: trunk/source/java/net/sf/jcontracts/icontract/Option.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/Option.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/icontract/Option.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,10 +1,9 @@
package net.sf.jcontracts.icontract;
-import net.sf.jcontracts.argparser.OptionMetaclass;
+import java.util.Vector;
+
+import net.sf.jcontracts.argparser.OptionMetaclass;
-import org.apache.log4j.Logger;
-import java.util.Vector;
-
public abstract class Option extends OptionMetaclass {
public static String NAME;
Modified: trunk/source/java/net/sf/jcontracts/icontract/OutputOption.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/OutputOption.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/icontract/OutputOption.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,12 +1,12 @@
package net.sf.jcontracts.icontract;
-import net.sf.jcontracts.argparser.OptionMetaclass;
-
-import org.apache.log4j.Logger;
-import java.io.*;
+import java.io.File;
+import java.io.IOException;
import java.util.Hashtable;
import java.util.Vector;
+import org.apache.log4j.Logger;
+
public class OutputOption extends ParameterOption {
private static final Logger log = Logger.getLogger(OutputOption.class);
public static final String NAME = "o";
Modified: trunk/source/java/net/sf/jcontracts/icontract/ParameterOption.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/ParameterOption.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/icontract/ParameterOption.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,7 +1,6 @@
package net.sf.jcontracts.icontract;
-import org.apache.log4j.Logger;
-import java.util.Vector;
+import java.util.Vector;
public class ParameterOption extends Option {
Modified: trunk/source/java/net/sf/jcontracts/icontract/PrePostCheck.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/PrePostCheck.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/icontract/PrePostCheck.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,6 +1,5 @@
package net.sf.jcontracts.icontract;
-import org.apache.log4j.Logger;
interface PrePostCheck
extends IContracted {
Modified: trunk/source/java/net/sf/jcontracts/icontract/ProcessingOption.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/ProcessingOption.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/icontract/ProcessingOption.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,7 +1,6 @@
package net.sf.jcontracts.icontract;
-import org.apache.log4j.Logger;
-import java.util.Vector;
+import java.util.Vector;
public abstract class ProcessingOption extends Option {
Modified: trunk/source/java/net/sf/jcontracts/icontract/QuietOption.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/QuietOption.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/icontract/QuietOption.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,11 +1,8 @@
package net.sf.jcontracts.icontract;
-import net.sf.jcontracts.argparser.OptionMetaclass;
+import java.util.Enumeration;
+import java.util.Vector;
-import org.apache.log4j.Logger;
-import java.util.Enumeration;
-import java.util.Vector;
-
public class QuietOption extends ParameterOption {
public static final String NAME = "q";
Modified: trunk/source/java/net/sf/jcontracts/icontract/Repository.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/Repository.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/icontract/Repository.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,8 +1,9 @@
package net.sf.jcontracts.icontract;
-import org.apache.log4j.Logger;
-import java.io.*;
-import java.util.Vector;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Vector;
class Repository {
Modified: trunk/source/java/net/sf/jcontracts/icontract/RepositoryOutputOption.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/RepositoryOutputOption.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/icontract/RepositoryOutputOption.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,12 +1,12 @@
package net.sf.jcontracts.icontract;
-import net.sf.jcontracts.argparser.OptionMetaclass;
-
-import org.apache.log4j.Logger;
-import java.io.*;
+import java.io.File;
+import java.io.IOException;
import java.util.Hashtable;
import java.util.Vector;
+import org.apache.log4j.Logger;
+
public class RepositoryOutputOption extends ParameterOption {
private static final Logger log = Logger.getLogger(RepositoryOutputOption.class);
public static final String NAME = "k";
Modified: trunk/source/java/net/sf/jcontracts/icontract/SourceCompilerOption.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/SourceCompilerOption.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/icontract/SourceCompilerOption.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,11 +1,14 @@
package net.sf.jcontracts.icontract;
-import net.sf.jcontracts.argparser.OptionMetaclass;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.Enumeration;
+import java.util.Vector;
import org.apache.log4j.Logger;
-import java.io.*;
-import java.util.Enumeration;
-import java.util.Vector;
+
import sun.tools.javac.Main;
public class SourceCompilerOption extends ParameterOption {
Modified: trunk/source/java/net/sf/jcontracts/icontract/SystemInTarget.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/SystemInTarget.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/icontract/SystemInTarget.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,8 +1,7 @@
package net.sf.jcontracts.icontract;
-import org.apache.log4j.Logger;
-import java.io.InputStream;
-import java.util.Vector;
+import java.io.InputStream;
+import java.util.Vector;
public class SystemInTarget extends FileTarget {
Modified: trunk/source/java/net/sf/jcontracts/icontract/Target.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/Target.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/icontract/Target.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,10 +1,9 @@
package net.sf.jcontracts.icontract;
-import net.sf.jcontracts.argparser.TargetMetaclass;
+import java.util.Vector;
+
+import net.sf.jcontracts.argparser.TargetMetaclass;
-import org.apache.log4j.Logger;
-import java.util.Vector;
-
public abstract class Target extends TargetMetaclass {
protected Target(String name) {
Modified: trunk/source/java/net/sf/jcontracts/icontract/Tool.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/Tool.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/icontract/Tool.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,27 +1,24 @@
package net.sf.jcontracts.icontract;
-import net.sf.jcontracts.argparser.OptionMetaclass;
-import net.sf.jcontracts.argparser.Parser;
-import net.sf.jcontracts.argparser.TargetMetaclass;
-import net.sf.jcontracts.dependencyanalyzer.BooleanBlockWithNodeArg;
-import net.sf.jcontracts.dependencyanalyzer.DependencyAnalyzer;
-import net.sf.jcontracts.dependencyanalyzer.Graph;
-import net.sf.jcontracts.dependencyanalyzer.Node;
-
-import org.apache.log4j.Logger;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.FileReader;
import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.PrintStream;
import java.io.PrintWriter;
import java.util.Enumeration;
import java.util.Hashtable;
import java.util.Vector;
+import net.sf.jcontracts.argparser.Parser;
+import net.sf.jcontracts.dependencyanalyzer.BooleanBlockWithNodeArg;
+import net.sf.jcontracts.dependencyanalyzer.DependencyAnalyzer;
+import net.sf.jcontracts.dependencyanalyzer.Graph;
+import net.sf.jcontracts.dependencyanalyzer.Node;
+
+import org.apache.log4j.Logger;
+
public class Tool {
private static final Logger log = Logger.getLogger(Tool.class);
Modified: trunk/source/java/net/sf/jcontracts/icontract/UnableToDetermineTypeException.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/UnableToDetermineTypeException.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/icontract/UnableToDetermineTypeException.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,6 +1,5 @@
package net.sf.jcontracts.icontract;
-import org.apache.log4j.Logger;
public class UnableToDetermineTypeException extends Exception {
Modified: trunk/source/java/net/sf/jcontracts/icontract/Variable.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/Variable.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/icontract/Variable.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,7 +1,6 @@
package net.sf.jcontracts.icontract;
-import org.apache.log4j.Logger;
-import java.util.Vector;
+import java.util.Vector;
public class Variable extends net.sf.jcontracts.codeparser.Variable
implements PrePostCheck, InvCheck {
Modified: trunk/source/java/net/sf/jcontracts/icontract/VerboseOption.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/VerboseOption.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/icontract/VerboseOption.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,12 +1,8 @@
package net.sf.jcontracts.icontract;
-import net.sf.jcontracts.argparser.OptionMetaclass;
+import java.util.Enumeration;
+import java.util.Vector;
-import org.apache.log4j.Logger;
-import java.io.PrintStream;
-import java.util.Enumeration;
-import java.util.Vector;
-
public class VerboseOption extends ParameterOption {
public static final String NAME = "v";
Modified: trunk/source/java/net/sf/jcontracts/icontract/WrapExceptionOption.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/WrapExceptionOption.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/icontract/WrapExceptionOption.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,7 +1,6 @@
package net.sf.jcontracts.icontract;
-import org.apache.log4j.Logger;
-import java.util.Vector;
+import java.util.Vector;
public class WrapExceptionOption extends ParameterOption {
Modified: trunk/source/java/net/sf/jcontracts/icontract/XOption.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/XOption.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/icontract/XOption.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,11 +1,13 @@
package net.sf.jcontracts.icontract;
-import net.sf.jcontracts.argparser.OptionMetaclass;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Vector;
+
import net.sf.jcontracts.dependencyanalyzer.Graph;
import org.apache.log4j.Logger;
-import java.io.*;
-import java.util.Vector;
public class XOption extends ParameterOption {
private static final Logger log = Logger.getLogger(XOption.class);
Modified: trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/ArchitectureSpecification.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/ArchitectureSpecification.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/ArchitectureSpecification.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,8 +1,6 @@
package net.sf.jcontracts.idarwin.specification.impl.primitive_language;
-import antlr.ParserException;
import java.io.IOException;
-import java.io.PrintStream;
import java.io.StringBufferInputStream;
import java.util.Enumeration;
import java.util.Vector;
@@ -14,6 +12,7 @@
import net.sf.jcontracts.idarwin.specification.openapi.IDependency;
import net.sf.jcontracts.idarwin.specification.openapi.IllFormedSpecificationException;
import net.sf.jcontracts.util.JavaEvaluator;
+import antlr.ParserException;
public class ArchitectureSpecification
implements IArchitectureSpecification {
Modified: trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/Idiom.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/Idiom.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/Idiom.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,11 +1,11 @@
package net.sf.jcontracts.idarwin.specification.impl.primitive_language;
-import antlr.ParserException;
-import java.io.PrintStream;
import java.io.StringBufferInputStream;
import java.util.Enumeration;
import java.util.Vector;
+import antlr.ParserException;
+
abstract class Idiom {
protected String pattern;
Modified: trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/IdiomFactory.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/IdiomFactory.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/IdiomFactory.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,6 +1,5 @@
package net.sf.jcontracts.idarwin.specification.impl.primitive_language;
-import java.io.PrintStream;
public class IdiomFactory {
Modified: trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/IsolateIdiom.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/IsolateIdiom.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/IsolateIdiom.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,9 +1,9 @@
package net.sf.jcontracts.idarwin.specification.impl.primitive_language;
-import antlr.ParserException;
-import java.io.PrintStream;
import java.io.StringBufferInputStream;
+import antlr.ParserException;
+
class IsolateIdiom extends Idiom {
IsolateIdiom(String p) {
Modified: trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/LayerIdiom.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/LayerIdiom.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/LayerIdiom.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,9 +1,9 @@
package net.sf.jcontracts.idarwin.specification.impl.primitive_language;
-import antlr.ParserException;
-import java.io.PrintStream;
import java.io.StringBufferInputStream;
+import antlr.ParserException;
+
class LayerIdiom extends Idiom {
LayerIdiom(String p) {
Modified: trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PSpecLexer.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PSpecLexer.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PSpecLexer.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,10 +1,16 @@
package net.sf.jcontracts.idarwin.specification.impl.primitive_language;
-import antlr.*;
-import antlr.collections.impl.BitSet;
import java.io.InputStream;
import java.util.Hashtable;
+import antlr.ANTLRHashString;
+import antlr.CharBufferNoBacktrackingNoInteractive;
+import antlr.CharScannerNoBacktrackingNoInteractive;
+import antlr.ScannerException;
+import antlr.Token;
+import antlr.Tokenizer;
+import antlr.collections.impl.BitSet;
+
public class PSpecLexer extends CharScannerNoBacktrackingNoInteractive
implements PSpecTokenTypes, Tokenizer {
Modified: trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PSpecParser.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PSpecParser.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PSpecParser.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,11 +1,16 @@
package net.sf.jcontracts.idarwin.specification.impl.primitive_language;
-import antlr.*;
-import antlr.collections.impl.BitSet;
-import java.io.PrintStream;
import java.io.StringBufferInputStream;
import java.util.Vector;
+import antlr.LLkParserNoInteractive;
+import antlr.NoViableAltException;
+import antlr.ParserException;
+import antlr.Token;
+import antlr.TokenBuffer;
+import antlr.Tokenizer;
+import antlr.collections.impl.BitSet;
+
public class PSpecParser extends LLkParserNoInteractive
implements PSpecTokenTypes {
Modified: trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PatternFactory.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PatternFactory.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PatternFactory.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,9 +1,9 @@
package net.sf.jcontracts.idarwin.specification.impl.primitive_language;
-import antlr.ParserException;
-import java.io.PrintStream;
import java.io.StringBufferInputStream;
+import antlr.ParserException;
+
public class PatternFactory {
public static Pattern createFrom(String p_expression) throws PatternSyntaxException {
Modified: trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/SetPattern.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/SetPattern.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/SetPattern.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,6 +1,5 @@
package net.sf.jcontracts.idarwin.specification.impl.primitive_language;
-import java.io.PrintStream;
class SetPattern extends CompositePattern {
Modified: trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/SingleDependencyConstraint.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/SingleDependencyConstraint.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/SingleDependencyConstraint.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,7 +1,5 @@
package net.sf.jcontracts.idarwin.specification.impl.primitive_language;
-import antlr.ParserException;
-import java.io.PrintStream;
import java.io.StringBufferInputStream;
import java.util.Enumeration;
import java.util.Vector;
@@ -9,6 +7,7 @@
import net.sf.jcontracts.idarwin.specification.impl.with_rules.IRule;
import net.sf.jcontracts.idarwin.specification.openapi.IDependency;
import net.sf.jcontracts.idarwin.specification.openapi.IllFormedSpecificationException;
+import antlr.ParserException;
public class SingleDependencyConstraint extends DependencyConstraint {
Modified: trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/StrictlyLayerIdiom.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/StrictlyLayerIdiom.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/StrictlyLayerIdiom.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,9 +1,9 @@
package net.sf.jcontracts.idarwin.specification.impl.primitive_language;
-import antlr.ParserException;
-import java.io.PrintStream;
import java.io.StringBufferInputStream;
+import antlr.ParserException;
+
class StrictlyLayerIdiom extends Idiom {
StrictlyLayerIdiom(String p) {
Modified: trunk/source/java/net/sf/jcontracts/util/JavaEvaluator.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/util/JavaEvaluator.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/util/JavaEvaluator.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,8 +1,13 @@
package net.sf.jcontracts.util;
-import java.io.*;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.PrintWriter;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
+
import sun.tools.javac.Main;
public class JavaEvaluator {
Modified: trunk/source/java/net/sf/jcontracts/util/StringComparator.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/util/StringComparator.java 2006-11-24 10:13:20 UTC (rev 21)
+++ trunk/source/java/net/sf/jcontracts/util/StringComparator.java 2006-11-24 11:11:22 UTC (rev 22)
@@ -1,6 +1,5 @@
package net.sf.jcontracts.util;
-import java.io.PrintStream;
import java.util.Enumeration;
import java.util.Vector;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2006-11-24 10:13:21
|
Revision: 21
http://svn.sourceforge.net/jcontracts/?rev=21&view=rev
Author: jstuyts
Date: 2006-11-24 02:13:20 -0800 (Fri, 24 Nov 2006)
Log Message:
-----------
Updated copyright statements.
Modified Paths:
--------------
trunk/source/java/net/sf/jcontracts/icontract/Darwin.java
trunk/source/java/net/sf/jcontracts/icontract/HelpOption.java
trunk/source/java/net/sf/jcontracts/icontract/Tool.java
Modified: trunk/source/java/net/sf/jcontracts/icontract/Darwin.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/Darwin.java 2006-11-24 09:50:54 UTC (rev 20)
+++ trunk/source/java/net/sf/jcontracts/icontract/Darwin.java 2006-11-24 10:13:20 UTC (rev 21)
@@ -63,7 +63,8 @@
}
log.info("iDarwin, Version 0.1a");
- log.info("Copyright (C) 1997,98,99 Reto Kramer");
+ log.info("Copyright (C) 1997-1999 Reto Kramer");
+ log.info("Copyright (C) 2006 John Swapceinski, Johan\xA0Stuyts");
log.info("options:" + options);
log.info("all files:" + targets);
if (targets.isEmpty()) {
Modified: trunk/source/java/net/sf/jcontracts/icontract/HelpOption.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/HelpOption.java 2006-11-24 09:50:54 UTC (rev 20)
+++ trunk/source/java/net/sf/jcontracts/icontract/HelpOption.java 2006-11-24 10:13:20 UTC (rev 21)
@@ -47,7 +47,8 @@
protected void activateOnTargets(Vector targets) {
System.out.println("NAME: Java Contract Suite, Version " + VERSION);
- System.out.println("AUTHOR: Copyright (C), 1997,98,99 Reto Kramer");
+ System.out.println("AUTHOR: Copyright (C) 1997-1999 Reto Kramer");
+ System.out.println(" Copyright (C) 2006 John Swapceinski, Johan Stuyts");
System.out.println("SYNOPSIS: java net.sf.jcontracts.icontract.Tool {option} {file}");
System.out.println("DESCRIPTION: Provides Java with full support for \"Design by Contract\".");
System.out.println(" Instruments java source code files with checks to enforce:");
Modified: trunk/source/java/net/sf/jcontracts/icontract/Tool.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/Tool.java 2006-11-24 09:50:54 UTC (rev 20)
+++ trunk/source/java/net/sf/jcontracts/icontract/Tool.java 2006-11-24 10:13:20 UTC (rev 21)
@@ -72,6 +72,7 @@
log.info("Java Contract Suite, Version " + HelpOption.VERSION);
log.info("Copyright (C) 1997-2000 Reto Kramer");
+ log.info("Copyright (C) 2006 John Swapceinski, Johan Stuyts");
log.info("options:" + options);
log.info("all files:" + targets);
if (targets.isEmpty()) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2006-11-24 09:50:56
|
Revision: 20
http://svn.sourceforge.net/jcontracts/?rev=20&view=rev
Author: jstuyts
Date: 2006-11-24 01:50:54 -0800 (Fri, 24 Nov 2006)
Log Message:
-----------
Removed URLs that no longer work.
Modified Paths:
--------------
trunk/source/java/net/sf/jcontracts/icontract/Darwin.java
trunk/source/java/net/sf/jcontracts/icontract/HelpOption.java
trunk/source/java/net/sf/jcontracts/icontract/Tool.java
Modified: trunk/source/java/net/sf/jcontracts/icontract/Darwin.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/Darwin.java 2006-11-24 07:56:11 UTC (rev 19)
+++ trunk/source/java/net/sf/jcontracts/icontract/Darwin.java 2006-11-24 09:50:54 UTC (rev 20)
@@ -63,7 +63,7 @@
}
log.info("iDarwin, Version 0.1a");
- log.info("Copyright (C) 1997,98,99 Reto Kramer <in...@re...>");
+ log.info("Copyright (C) 1997,98,99 Reto Kramer");
log.info("options:" + options);
log.info("all files:" + targets);
if (targets.isEmpty()) {
Modified: trunk/source/java/net/sf/jcontracts/icontract/HelpOption.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/HelpOption.java 2006-11-24 07:56:11 UTC (rev 19)
+++ trunk/source/java/net/sf/jcontracts/icontract/HelpOption.java 2006-11-24 09:50:54 UTC (rev 20)
@@ -47,7 +47,7 @@
protected void activateOnTargets(Vector targets) {
System.out.println("NAME: Java Contract Suite, Version " + VERSION);
- System.out.println("AUTHOR: Copyright (C), 1997,98,99 Reto Kramer <in...@re...>");
+ System.out.println("AUTHOR: Copyright (C), 1997,98,99 Reto Kramer");
System.out.println("SYNOPSIS: java net.sf.jcontracts.icontract.Tool {option} {file}");
System.out.println("DESCRIPTION: Provides Java with full support for \"Design by Contract\".");
System.out.println(" Instruments java source code files with checks to enforce:");
@@ -148,10 +148,10 @@
System.out.println(" source file (removes all lines starting with \"/*|*/\").");
System.out.println(" Also creates a clean file <inputfile>.clean");
System.out.println("");
- //System.out.println(" PROBLEMS:");
- //System.out.println(" Please send problem reports and requests for new features as");
- //System.out.println(" an e-mail to <ICO...@RE...>.");
- //System.out.println(" Submitters will receive a reply with a problem tracking-number.");
+ System.out.println(" PROBLEMS:");
+ System.out.println(" Please enter problem reports and requests for new features in");
+ System.out.println(" the issue tracker, which can be found at:");
+ System.out.println(" https://sourceforge.net/tracker/?group_id=175492&atid=889550");
System.exit(0);
}
}
Modified: trunk/source/java/net/sf/jcontracts/icontract/Tool.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/Tool.java 2006-11-24 07:56:11 UTC (rev 19)
+++ trunk/source/java/net/sf/jcontracts/icontract/Tool.java 2006-11-24 09:50:54 UTC (rev 20)
@@ -71,7 +71,7 @@
}
log.info("Java Contract Suite, Version " + HelpOption.VERSION);
- log.info("Copyright (C) 1997-2000 Reto Kramer <in...@re...>");
+ log.info("Copyright (C) 1997-2000 Reto Kramer");
log.info("options:" + options);
log.info("all files:" + targets);
if (targets.isEmpty()) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2006-11-24 07:56:12
|
Revision: 19
http://svn.sourceforge.net/jcontracts/?rev=19&view=rev
Author: jstuyts
Date: 2006-11-23 23:56:11 -0800 (Thu, 23 Nov 2006)
Log Message:
-----------
Changed the way the version number is handled. The correct version will now be set during builds so no Java code has to be changed.
Modified Paths:
--------------
trunk/build.xml
trunk/source/java/net/sf/jcontracts/icontract/HelpOption.java
Added Paths:
-----------
trunk/source/java/net/sf/jcontracts/icontract/version.txt
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2006-11-24 07:36:06 UTC (rev 18)
+++ trunk/build.xml 2006-11-24 07:56:11 UTC (rev 19)
@@ -40,6 +40,8 @@
<include name="**/*.properties" />
</fileset>
</copy>
+ <echo file="build/ant/classes/net/sf/jcontracts/icontract/version.txt" >${project.version}
+</echo>
</target>
<target name="jar" description="Create the JAR file." depends="compile">
Modified: trunk/source/java/net/sf/jcontracts/icontract/HelpOption.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/HelpOption.java 2006-11-24 07:36:06 UTC (rev 18)
+++ trunk/source/java/net/sf/jcontracts/icontract/HelpOption.java 2006-11-24 07:56:11 UTC (rev 19)
@@ -1,13 +1,45 @@
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;
public class HelpOption extends ParameterOption {
- public static final String VERSION = "for JDK 1.5, Java Contract Suite v1.01.00b02-dev";
- public static final String NAME = "h";
+ public static final String VERSION;
+ private static final String VERSION_RESOURCE_NAME = "version.txt";
+ public static final String NAME = "h";
+
+ static {
+ try {
+ InputStream versionStream = HelpOption.class.getResourceAsStream(VERSION_RESOURCE_NAME);
+ try {
+ Reader versionReader = new InputStreamReader(versionStream, "US-ASCII");
+ try {
+ BufferedReader bufferedReader = new BufferedReader(versionReader);
+ try {
+ VERSION = bufferedReader.readLine();
+ } finally {
+ bufferedReader.close();
+ }
+ } finally {
+ versionReader.close();
+ }
+ } finally {
+ versionStream.close();
+ }
+ } catch (IOException e) {
+ IllegalStateException exception = new IllegalStateException("Unable to read version number");
+ exception.initCause(e);
+ throw exception;
+ }
+ }
public HelpOption(String name, Vector arguments) {
super(name, arguments);
Added: trunk/source/java/net/sf/jcontracts/icontract/version.txt
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/version.txt (rev 0)
+++ trunk/source/java/net/sf/jcontracts/icontract/version.txt 2006-11-24 07:56:11 UTC (rev 19)
@@ -0,0 +1,6 @@
+dev
+This file must be stored using the US-ASCII (or
+compatible) encoding. Only the first line is read.
+
+The file will be replaced during the build with a file
+containing the actual version number.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2006-11-24 07:36:09
|
Revision: 18
http://svn.sourceforge.net/jcontracts/?rev=18&view=rev
Author: jstuyts
Date: 2006-11-23 23:36:06 -0800 (Thu, 23 Nov 2006)
Log Message:
-----------
Changed name 'iContract' to 'Java Contract Suite'.
Modified Paths:
--------------
trunk/source/java/net/sf/jcontracts/icontract/ArgMetaclassFactory.java
trunk/source/java/net/sf/jcontracts/icontract/Class.java
trunk/source/java/net/sf/jcontracts/icontract/CompilerOption.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/Interface.java
trunk/source/java/net/sf/jcontracts/icontract/MergeOption.java
trunk/source/java/net/sf/jcontracts/icontract/Method.java
trunk/source/java/net/sf/jcontracts/icontract/NoInitialCompilationOption.java
trunk/source/java/net/sf/jcontracts/icontract/NoRepositoryCompilationOption.java
trunk/source/java/net/sf/jcontracts/icontract/OutputOption.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/Tool.java
trunk/source/java/net/sf/jcontracts/icontract/Variable.java
trunk/source/java/net/sf/jcontracts/icontract/VerboseOption.java
Modified: trunk/source/java/net/sf/jcontracts/icontract/ArgMetaclassFactory.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/ArgMetaclassFactory.java 2006-11-23 17:23:27 UTC (rev 17)
+++ trunk/source/java/net/sf/jcontracts/icontract/ArgMetaclassFactory.java 2006-11-24 07:36:06 UTC (rev 18)
@@ -66,7 +66,7 @@
if (name.compareTo("j") == 0) {
o = new NoInitialCompilationOption(name, parameters);
} else {
- throw new RuntimeException("icontract: error: unknown option -" + name);
+ throw new RuntimeException("Java Contract Suite: error: unknown option -" + name);
}
}
catch (NoClassDefFoundError _ex) {
Modified: trunk/source/java/net/sf/jcontracts/icontract/Class.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/Class.java 2006-11-23 17:23:27 UTC (rev 17)
+++ trunk/source/java/net/sf/jcontracts/icontract/Class.java 2006-11-24 07:36:06 UTC (rev 18)
@@ -14,8 +14,8 @@
implements InvCheck, PrePostCheck {
private static final Logger log = Logger.getLogger(Class.class);
public static final String REP_PREFIX = "__REP_";
- private static final String INV_GET_METHOD = "__iContract__getInvariantList";
- private static final String INV_SO_GET_METHOD = "__iContract__getInvariantSourceList";
+ private static final String INV_GET_METHOD = "__JContractS__getInvariantList";
+ private static final String INV_SO_GET_METHOD = "__JContractS__getInvariantSourceList";
private static final String INVARIANT_TAG_NAME = "invariant";
public static final String INVARIANT_CHECK_METHOD_NAME = "__check_invariant__";
public static final String INVARIANT_CHECK_AT_ENTRY = "__inv_check_at_entry__";
@@ -242,7 +242,7 @@
}
}
if (sig.length > 4) {
- throw new RuntimeException("iContract:error: more than 4 arguments (" + f + ") not supported at the moment [991]. Easy to be added though.");
+ throw new RuntimeException("Java Contract Suite:error: more than 4 arguments (" + f + ") not supported at the moment [991]. Easy to be added though.");
} else {
return m;
}
@@ -348,7 +348,7 @@
if (isStatic()) {
if (inv_conds.size() != 0) {
- log.warn(getLocationDescription() + "icontract: WARNING: the invariants (" + inv_conds + ") associated with the static class " + getSignature() + " will not be enforced (not instrumented and no repository entry) due to the static modifier!");
+ log.warn(getLocationDescription() + "Java Contract Suite: WARNING: the invariants (" + inv_conds + ") associated with the static class " + getSignature() + " will not be enforced (not instrumented and no repository entry) due to the static modifier!");
}
return "";
}
@@ -364,7 +364,7 @@
repositoryName = repositoryName + superclassName.substring(superclassName.lastIndexOf(".") + 1, superclassName.length());
}
if (repositoryForInvExists(repositoryName)) {
- body = body + " Vector super_vec = " + repositoryName + "." + "__iContract__getInvariantList" + "();\n";
+ body = body + " Vector super_vec = " + repositoryName + "." + "__JContractS__getInvariantList" + "();\n";
body = body + " for (Enumeration e = super_vec.elements(); e.hasMoreElements(); ) {\n";
body = body + " vec.addElement( e.nextElement() );\n";
body = body + " }\n";
@@ -372,7 +372,7 @@
body = body + " // Repository for superclass " + superclassName + " (" + repositoryName + ") ";
body = body + "does not exist or is not accessible.\n";
if (!superclassName.startsWith("java.")) {
- log.error(getLocationDescription() + "icontract: WARNING: the repository of " + getSignature() + " will contain it's own invariants ONLY -- this is because the superclass of " + getSignature() + " (" + superclassName + ") may" + " either not have been " + "instrumented for invariants (or the repository file " + repositoryName + ".class is missing, e.g. was not compiled) !\n");
+ log.error(getLocationDescription() + "Java Contract Suite: WARNING: the repository of " + getSignature() + " will contain it's own invariants ONLY -- this is because the superclass of " + getSignature() + " (" + superclassName + ") may" + " either not have been " + "instrumented for invariants (or the repository file " + repositoryName + ".class is missing, e.g. was not compiled) !\n");
}
}
} else {
@@ -393,7 +393,7 @@
}
String header = " /**This repository method captures the invariants of\n * class " + getSignature() + " and it's superclass " + superclassName + ".\n";
header = header + " */\n";
- header = header + " public static final Vector __iContract__getInvariantList() {";
+ header = header + " public static final Vector __JContractS__getInvariantList() {";
String code = header + "\n Vector vec = new Vector();\n" + body + " return vec;\n" + " }\n";
body = "";
if (superclassName != null) {
@@ -406,7 +406,7 @@
repositoryName = repositoryName + superclassName.substring(superclassName.lastIndexOf(".") + 1, superclassName.length());
}
if (repositoryForInvExists(repositoryName)) {
- body = body + " Vector super_vec = " + repositoryName + "." + "__iContract__getInvariantSourceList" + "();\n";
+ body = body + " Vector super_vec = " + repositoryName + "." + "__JContractS__getInvariantSourceList" + "();\n";
body = body + " for (Enumeration e = super_vec.elements(); e.hasMoreElements(); ) {\n";
body = body + " vec.addElement( e.nextElement() );\n";
body = body + " }\n";
@@ -432,7 +432,7 @@
}
header = " /**This repository method captures the source of invariants of\n * class " + getSignature() + " and it's superclass " + superclassName + ".\n";
header = header + " */\n";
- header = header + " public static final Vector __iContract__getInvariantSourceList() {";
+ header = header + " public static final Vector __JContractS__getInvariantSourceList() {";
code = code + "\n" + header + "\n Vector vec = new Vector();\n" + body + " return vec;\n" + " }\n";
return code;
}
@@ -471,7 +471,7 @@
}
}
- System.err.println(getLocationDescription() + "iContract:WARNING: could not find " + ": " + short_name);
+ System.err.println(getLocationDescription() + "Java Contract Suite:WARNING: could not find " + ": " + short_name);
return short_name;
}
@@ -518,13 +518,13 @@
}
catch (NoSuchMethodException e) {
if (!supercName.startsWith("java.")) {
- log.error(getLocationDescription() + "iContract: WARNING: " + getSignature() + " can not delegate the invariant check of the superclass (" + supercName + ") to the appropriate method (method not found, see exception detailts below) because either (i) the superclass is not instrumented, (ii) the instrumented superclass is not compiled or (iii) the sourcecode of the superclass is not accessible -- SEMANTIC ATTENTION: trying to read the superclass' invariant from its repository (" + supercName + ") -- invariant may therefore not access private superclass information!" + "[caught exception: " + e + "]");
+ log.error(getLocationDescription() + "Java Contract Suite: WARNING: " + getSignature() + " can not delegate the invariant check of the superclass (" + supercName + ") to the appropriate method (method not found, see exception detailts below) because either (i) the superclass is not instrumented, (ii) the instrumented superclass is not compiled or (iii) the sourcecode of the superclass is not accessible -- SEMANTIC ATTENTION: trying to read the superclass' invariant from its repository (" + supercName + ") -- invariant may therefore not access private superclass information!" + "[caught exception: " + e + "]");
}
}
}
catch (ClassNotFoundException e) {
if (!supercName.startsWith("java.")) {
- log.error(getLocationDescription() + "iContract: WARNING: " + getSignature() + " can not delegate the invariant check of the superclass (" + supercName + ") to the appropriate method (method's clas not found, see exception detailts below) because either (i) the superclass is not instrumented, (ii) the instrumented superclass is not compiled or (iii) the sourcecode of the superclass is not accessible -- SEMANTIC ATTENTION: trying to read the superclass' invariant from its repository (" + supercName + ") -- invariant may therefore not access private superclass information!" + "[caught exception: " + e + "]");
+ log.error(getLocationDescription() + "Java Contract Suite: WARNING: " + getSignature() + " can not delegate the invariant check of the superclass (" + supercName + ") to the appropriate method (method's clas not found, see exception detailts below) because either (i) the superclass is not instrumented, (ii) the instrumented superclass is not compiled or (iii) the sourcecode of the superclass is not accessible -- SEMANTIC ATTENTION: trying to read the superclass' invariant from its repository (" + supercName + ") -- invariant may therefore not access private superclass information!" + "[caught exception: " + e + "]");
}
}
}
@@ -554,8 +554,8 @@
java.lang.Class c = java.lang.Class.forName(repositoryName);
java.lang.Class noArgArray[] = new java.lang.Class[0];
try {
- Method theIGMethod = c.getMethod("__iContract__getInvariantList", noArgArray);
- Method theISGMethod = c.getMethod("__iContract__getInvariantSourceList", noArgArray);
+ Method theIGMethod = c.getMethod("__JContractS__getInvariantList", noArgArray);
+ Method theISGMethod = c.getMethod("__JContractS__getInvariantSourceList", noArgArray);
try {
Vector invs = (Vector)theIGMethod.invoke(c, noArgArray);
for (Enumeration e = invs.elements(); e.hasMoreElements(); inv_conds.addElement(e.nextElement())) { }
@@ -563,20 +563,20 @@
for (Enumeration e = invs_s.elements(); e.hasMoreElements(); inv_source.addElement(e.nextElement())) { }
}
catch (InvocationTargetException e) {
- log.error("iContract: WARNING: while instrumenting invariants in class " + getSignature() + " execution of\n" + repositoryName + "::" + "__iContract__getInvariantList" + "()\n" + "failed, throwing exception:\n" + e + "\nTHEREFORE INVARIANTS OF " + superclassName + " ARE IGNORED !");
+ log.error("Java Contract Suite: WARNING: while instrumenting invariants in class " + getSignature() + " execution of\n" + repositoryName + "::" + "__JContractS__getInvariantList" + "()\n" + "failed, throwing exception:\n" + e + "\nTHEREFORE INVARIANTS OF " + superclassName + " ARE IGNORED !");
}
catch (IllegalArgumentException e) {
- log.error("iContract: WARNING: while instrumenting invariants in class " + getSignature() + " execution of\n" + repositoryName + "::" + "__iContract__getInvariantList" + "()\n" + "failed, throwing exception:\n" + e + "\nTHEREFORE INVARIANTS OF " + superclassName + " ARE IGNORED !");
+ log.error("Java Contract Suite: WARNING: while instrumenting invariants in class " + getSignature() + " execution of\n" + repositoryName + "::" + "__JContractS__getInvariantList" + "()\n" + "failed, throwing exception:\n" + e + "\nTHEREFORE INVARIANTS OF " + superclassName + " ARE IGNORED !");
}
catch (IllegalAccessException e) {
- log.error("iContract: WARNING: while instrumenting invariants in class " + getSignature() + " execution of\n" + repositoryName + "::" + "__iContract__getInvariantList" + "()\n" + "failed, throwing exception:\n" + e + "\nTHEREFORE INVARIANTS OF " + superclassName + " ARE IGNORED !");
+ log.error("Java Contract Suite: WARNING: while instrumenting invariants in class " + getSignature() + " execution of\n" + repositoryName + "::" + "__JContractS__getInvariantList" + "()\n" + "failed, throwing exception:\n" + e + "\nTHEREFORE INVARIANTS OF " + superclassName + " ARE IGNORED !");
}
}
catch (NoSuchMethodException _ex) { }
}
catch (ClassNotFoundException e) {
if (!superclassName.startsWith("java.")) {
- log.error(getLocationDescription() + "icontract: WARNING: " + getSignature() + " will be instrumented with it's own invariants ONLY -- this is because the superclass of " + getSignature() + " (" + superclassName + ") may" + " either not have been " + "instrumented for invariants (or the repository file " + repositoryName + ".class is missing, e.g. was not compiled) !\n" + "[caught exception: " + e + "]");
+ log.error(getLocationDescription() + "Java Contract Suite: WARNING: " + getSignature() + " will be instrumented with it's own invariants ONLY -- this is because the superclass of " + getSignature() + " (" + superclassName + ") may" + " either not have been " + "instrumented for invariants (or the repository file " + repositoryName + ".class is missing, e.g. was not compiled) !\n" + "[caught exception: " + e + "]");
}
}
}
@@ -620,7 +620,7 @@
inst_var_decl = inst_var_decl + "// Stores bookkeeping information -- key: thread, value: call level\n";
boolean do_not_enforce_precompilation_of_source = Boolean.getBoolean("jcontracts.internal.do_not_enforce_precompilation_of_source");
if (do_not_enforce_precompilation_of_source) {
- System.err.println("iContract:SWITCH:jcontracts.internal.do_not_enforce_precompilation_of_source=true");
+ System.err.println("Java Contract Suite:SWITCH:jcontracts.internal.do_not_enforce_precompilation_of_source=true");
}
boolean icl_already_defined = false;
if (!do_not_enforce_precompilation_of_source) {
@@ -628,11 +628,11 @@
icl_already_defined = checkIfFieldExistsInSuperclassClosure(java.lang.Class.forName(getName()), "__icl_");
}
catch (ClassNotFoundException _ex) {
- throw new RuntimeException(getLocationDescription() + "iContract:ERROR: could not find " + getName() + ". Please compile the sourcefile, see -j option (net.sf.jcontracts.net.sf.jcontracts.iContract needs the compiled file to determine whether or not to create invariant bookkeeping variables (__icl_)). Exiting iContract.", _ex);
+ throw new RuntimeException(getLocationDescription() + "Java Contract Suite: ERROR: could not find " + getName() + ". Please compile the sourcefile, see -j option (Java Contract Suite needs the compiled file to determine whether or not to create invariant bookkeeping variables (__icl_)). Exiting Java Contract Suite.", _ex);
}
}
if (do_not_enforce_precompilation_of_source) {
- System.err.println("iContract:SWITCH:invariant bookkeeping may NOT work correctly because the check for the existence of the __icl_ variable in superclasses was disables. This means that there is an __icl_ varaible at each level of the inheritance rather than one and one only per inheritance chain! THIS IS ONLY SUITABLE FOR CERTAIN SPECIAL TESTCASES. REMOVE the 'java -Djcontracts.internal.do_not_enforce_precompilation_of_source' property to make net.sf.jcontracts.net.sf.jcontracts.iContract work in normal (correct) mode!");
+ System.err.println("Java Contract Suite: SWITCH:invariant bookkeeping may NOT work correctly because the check for the existence of the __icl_ variable in superclasses was disables. This means that there is an __icl_ varaible at each level of the inheritance rather than one and one only per inheritance chain! THIS IS ONLY SUITABLE FOR CERTAIN SPECIAL TESTCASES. REMOVE the 'java -Djcontracts.internal.do_not_enforce_precompilation_of_source' property to make Java Contract Suite work in normal (correct) mode!");
}
if (!icl_already_defined) {
inst_var_decl = inst_var_decl + "protected transient java.util.Hashtable __icl_ = new java.util.Hashtable(1);\n";
@@ -980,18 +980,18 @@
last_type = "<<unknown-type " + last_type + "::" + section + ">>";
log.debug("getTypeOfValue:last_type=" + last_type);
stop = true;
- throw new UnableToDetermineTypeException(getLocationDescription() + "::iContract:error: could not infere the type of (" + last_type + "::" + section + ") as the class " + last_type + " is not in the local not in any of the imported packages. Occured in " + this + "\n");
+ throw new UnableToDetermineTypeException(getLocationDescription() + "::Java Contract Suite: ERROR: could not infere the type of (" + last_type + "::" + section + ") as the class " + last_type + " is not in the local not in any of the imported packages. Occured in " + this + "\n");
}
}
catch (NoSuchMethodException _ex) {
- throw new UnableToDetermineTypeException("iContract:error: method " + last_type + "." + pure_function_name + "(" + sig + ") not found via reflection !\n");
+ throw new UnableToDetermineTypeException("Java Contract Suite: ERROR: method " + last_type + "." + pure_function_name + "(" + sig + ") not found via reflection !\n");
}
}
catch (ClassNotFoundException _ex) {
last_type = "<<unknown-type " + last_type + "::" + section + " (class " + last_type + " not found. Occured in " + this + ")>>";
log.debug("getTypeOfValue:last_type=" + last_type);
stop = true;
- throw new UnableToDetermineTypeException(getLocationDescription() + "::iContract:error: could not infere the type of (" + last_type + "::" + section + ") as the class " + last_type + " is not in the local not in any of the imported packages. Occured in " + this + "\n");
+ throw new UnableToDetermineTypeException(getLocationDescription() + "::Java Contract Suite: ERROR: could not infere the type of (" + last_type + "::" + section + ") as the class " + last_type + " is not in the local not in any of the imported packages. Occured in " + this + "\n");
}
}
}
@@ -1100,14 +1100,14 @@
}
}
catch (NoSuchMethodException _ex) {
- throw new UnableToDetermineTypeException("iContract:error: method " + last_type + "." + pure_function_name + "(" + sig + ") not found via reflection !\n");
+ throw new UnableToDetermineTypeException("Java Contract Suite: ERROR: method " + last_type + "." + pure_function_name + "(" + sig + ") not found via reflection !\n");
}
}
catch (ClassNotFoundException _ex) {
last_type = "<<unknown-type " + last_type + "::" + section + " (class " + last_type + " not found. Occured in " + this + ")>>";
log.debug("getTypeOfValue:last_type=" + last_type);
stop = true;
- throw new UnableToDetermineTypeException(getLocationDescription() + "::iContract:error: could not infere the type of (" + last_type + "::" + section + ") as the class " + last_type + " is not in the local not in any of the imported packages. Occured in " + this + "\n");
+ throw new UnableToDetermineTypeException(getLocationDescription() + "::Java Contract Suite: ERROR: could not infere the type of (" + last_type + "::" + section + ") as the class " + last_type + " is not in the local not in any of the imported packages. Occured in " + this + "\n");
}
}
current_pos = next_dot_pos + 1;
@@ -1142,27 +1142,27 @@
java.lang.Class c = java.lang.Class.forName(repositoryName);
java.lang.Class noArgArray[] = new java.lang.Class[0];
try {
- Method theIGMethod = c.getMethod("__iContract__getInvariantList", noArgArray);
- c.getMethod("__iContract__getInvariantSourceList", noArgArray);
+ Method theIGMethod = c.getMethod("__JContractS__getInvariantList", noArgArray);
+ c.getMethod("__JContractS__getInvariantSourceList", noArgArray);
try {
Vector invs = (Vector)theIGMethod.invoke(c, noArgArray);
for (Enumeration e = invs.elements(); e.hasMoreElements(); inv_conds.addElement(e.nextElement())) { }
}
catch (InvocationTargetException e) {
- log.error("iContract: WARNING: while instrumenting invariants in class " + getSignature() + " execution of\n" + repositoryName + "::" + "__iContract__getInvariantList" + "()\n" + "failed, throwing exception:\n" + e + "\nTHEREFORE INVARIANTS OF " + superclassName + " ARE IGNORED !");
+ log.error("Java Contract Suite: WARNING: while instrumenting invariants in class " + getSignature() + " execution of\n" + repositoryName + "::" + "__JContractS__getInvariantList" + "()\n" + "failed, throwing exception:\n" + e + "\nTHEREFORE INVARIANTS OF " + superclassName + " ARE IGNORED !");
}
catch (IllegalArgumentException e) {
- log.error("iContract: WARNING: while instrumenting invariants in class " + getSignature() + " execution of\n" + repositoryName + "::" + "__iContract__getInvariantList" + "()\n" + "failed, throwing exception:\n" + e + "\nTHEREFORE INVARIANTS OF " + superclassName + " ARE IGNORED !");
+ log.error("Java Contract Suite: WARNING: while instrumenting invariants in class " + getSignature() + " execution of\n" + repositoryName + "::" + "__JContractS__getInvariantList" + "()\n" + "failed, throwing exception:\n" + e + "\nTHEREFORE INVARIANTS OF " + superclassName + " ARE IGNORED !");
}
catch (IllegalAccessException e) {
- log.error("iContract: WARNING: while instrumenting invariants in class " + getSignature() + " execution of\n" + repositoryName + "::" + "__iContract__getInvariantList" + "()\n" + "failed, throwing exception:\n" + e + "\nTHEREFORE INVARIANTS OF " + superclassName + " ARE IGNORED !");
+ log.error("Java Contract Suite: WARNING: while instrumenting invariants in class " + getSignature() + " execution of\n" + repositoryName + "::" + "__JContractS__getInvariantList" + "()\n" + "failed, throwing exception:\n" + e + "\nTHEREFORE INVARIANTS OF " + superclassName + " ARE IGNORED !");
}
}
catch (NoSuchMethodException _ex) { }
}
catch (ClassNotFoundException e) {
if (!superclassName.startsWith("java.")) {
- log.error(getLocationDescription() + "icontract: WARNING: " + getSignature() + " will be instrumented with it's own invariants ONLY -- this is because the superclass of " + getSignature() + " (" + superclassName + ") may" + " either not have been " + "instrumented for invariants (or the repository file " + repositoryName + ".class is missing, e.g. was not compiled) !\n" + "[caught exception: " + e + "]");
+ log.error(getLocationDescription() + "Java Contract Suite: WARNING: " + getSignature() + " will be instrumented with it's own invariants ONLY -- this is because the superclass of " + getSignature() + " (" + superclassName + ") may" + " either not have been " + "instrumented for invariants (or the repository file " + repositoryName + ".class is missing, e.g. was not compiled) !\n" + "[caught exception: " + e + "]");
}
}
}
@@ -1256,7 +1256,7 @@
java.lang.Class c = java.lang.Class.forName(className);
java.lang.Class noArgArray[] = new java.lang.Class[0];
try {
- Method theIGMethod = c.getMethod("__iContract__getInvariantList", noArgArray);
+ Method theIGMethod = c.getMethod("__JContractS__getInvariantList", noArgArray);
try {
Vector _tmp = (Vector)theIGMethod.invoke(c, noArgArray);
res = true;
Modified: trunk/source/java/net/sf/jcontracts/icontract/CompilerOption.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/CompilerOption.java 2006-11-23 17:23:27 UTC (rev 17)
+++ trunk/source/java/net/sf/jcontracts/icontract/CompilerOption.java 2006-11-24 07:36:06 UTC (rev 18)
@@ -64,7 +64,7 @@
Main theCompiler = new Main(javacout, "");
result = theCompiler.compile(fargs);
if (!result) {
- System.err.println("\niContract: error: compilation failed " + javacout.toString());
+ System.err.println("\nJava Contract Suite: ERROR: compilation failed " + javacout.toString());
}
}
catch (NoClassDefFoundError _ex) {
@@ -103,17 +103,17 @@
outmsg.append(" <could not open out stream of compiler!>");
}
if (child.waitFor() != 0) {
- System.err.println("\niContract: error: compilation failed(error code: " + child.exitValue() + ") " + errmsg.toString() + " " + outmsg.toString());
+ System.err.println("\nJava Contract Suite: ERROR: compilation failed(error code: " + child.exitValue() + ") " + errmsg.toString() + " " + outmsg.toString());
result = false;
}
}
catch (InterruptedException _ex) {
result = false;
- System.err.println("\niContract: error: compilation failed.");
+ System.err.println("\nJava Contract Suite: ERROR: compilation failed.");
}
catch (IOException _ex) {
result = false;
- System.err.println("\niContract: error: compilation failed.");
+ System.err.println("\nJava Contract Suite: ERROR: compilation failed.");
}
}
if (!result) {
Modified: trunk/source/java/net/sf/jcontracts/icontract/FileTarget.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/FileTarget.java 2006-11-23 17:23:27 UTC (rev 17)
+++ trunk/source/java/net/sf/jcontracts/icontract/FileTarget.java 2006-11-24 07:36:06 UTC (rev 18)
@@ -82,7 +82,7 @@
String fn = getName().substring(1, getName().length());
File file = new File(fn);
if (!file.exists()) {
- throw new RuntimeException("iContract: error file " + fn + " not found!");
+ throw new RuntimeException("Java Contract Suite: error file " + fn + " not found!");
}
try {
BufferedReader f = new BufferedReader(new FileReader(fn));
@@ -157,7 +157,7 @@
}
if (cleanOption != null) {
- System.err.println("iContract: -r option enabled -- create a file " + getName() + ".clean" + " with all instrumentation code from previous run removed. Also the cleaned file will be the input to the new instrumentation run.");
+ System.err.println("Java Contract Suite: -r option enabled -- create a file " + getName() + ".clean" + " with all instrumentation code from previous run removed. Also the cleaned file will be the input to the new instrumentation run.");
is = createStreamForCodeParsing();
} else {
is = new FileInputStream(getName());
Modified: trunk/source/java/net/sf/jcontracts/icontract/HelpOption.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/HelpOption.java 2006-11-23 17:23:27 UTC (rev 17)
+++ trunk/source/java/net/sf/jcontracts/icontract/HelpOption.java 2006-11-24 07:36:06 UTC (rev 18)
@@ -6,7 +6,7 @@
public class HelpOption extends ParameterOption {
- public static final String VERSION = "for JDK 1.5, iContract v2.0";
+ public static final String VERSION = "for JDK 1.5, Java Contract Suite v1.01.00b02-dev";
public static final String NAME = "h";
public HelpOption(String name, Vector arguments) {
@@ -14,7 +14,7 @@
}
protected void activateOnTargets(Vector targets) {
- System.out.println("NAME: iContract, Version " + VERSION);
+ System.out.println("NAME: Java Contract Suite, Version " + VERSION);
System.out.println("AUTHOR: Copyright (C), 1997,98,99 Reto Kramer <in...@re...>");
System.out.println("SYNOPSIS: java net.sf.jcontracts.icontract.Tool {option} {file}");
System.out.println("DESCRIPTION: Provides Java with full support for \"Design by Contract\".");
@@ -22,14 +22,14 @@
System.out.println(" - method pre- and post-conditions");
System.out.println(" - class/interface invariants");
System.out.println(" based on comments in the code (@pre, @post, @invariant).");
- System.out.println(" net.sf.jcontracts.net.sf.jcontracts.iContract operates on classes, interfaces, and methods.");
+ System.out.println(" Java Contract Suite operates on classes, interfaces, and methods.");
System.out.println(" file: Is a list of java sourcecode files (space separated).");
System.out.println(" If a name of the form @file is in the list, each line in file");
System.out.println(" is interpreted as a filename.");
System.out.println(" If a name is a pattern (e.g. ./x/*.java), all files in x and");
System.out.println(" subdirectories thereof are searched for *.java files.");
- System.out.println(" {option}: Is a list of options, net.sf.jcontracts.net.sf.jcontracts.iContract accepts the following options:");
- System.out.println(" (if no option is given, net.sf.jcontracts.net.sf.jcontracts.iContract uses the -h option)");
+ System.out.println(" {option}: Is a list of options, Java Contract Suite accepts the following options:");
+ System.out.println(" (if no option is given, Java Contract Suite uses the -h option)");
System.out.println("");
System.out.println(" GENERAL:");
System.out.println(" -h prints version, synopsis and a brief description.");
Modified: trunk/source/java/net/sf/jcontracts/icontract/Interface.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/Interface.java 2006-11-23 17:23:27 UTC (rev 17)
+++ trunk/source/java/net/sf/jcontracts/icontract/Interface.java 2006-11-24 07:36:06 UTC (rev 18)
@@ -14,8 +14,8 @@
implements PrePostCheck, InvCheck {
private static final Logger log = Logger.getLogger(Interface.class);
public static final String REP_PREFIX = "__REP_";
- private static final String INV_GET_METHOD = "__iContract__getInvariantList";
- private static final String INV_SO_GET_METHOD = "__iContract__getInvariantSourceList";
+ private static final String INV_GET_METHOD = " __JContractS__getInvariantList";
+ private static final String INV_SO_GET_METHOD = " __JContractS__getInvariantSourceList";
private static final String INVARIANT_TAG_NAME = "invariant";
public Interface(String name, String filename, int line_number) {
@@ -185,7 +185,7 @@
}
}
if (sig.length > 4) {
- throw new RuntimeException("iContract:error: more than 4 arguments (" + f + ") not supported at the moment [991]. Easy to be added though.");
+ throw new RuntimeException("Java Contract Suite: ERROR: more than 4 arguments (" + f + ") not supported at the moment [991]. Easy to be added though.");
} else {
return m;
}
@@ -265,7 +265,7 @@
if (isStatic()) {
if (inv_conds.size() != 0) {
- log.warn(getLocationDescription() + "icontract: WARNING: the invariants (" + inv_conds + ") associated with the static interface " + getSignature() + " will not be enforced (not instrumented and no repository entry) due to the static modifier!");
+ log.warn(getLocationDescription() + "Java Contract Suite: WARNING: the invariants (" + inv_conds + ") associated with the static interface " + getSignature() + " will not be enforced (not instrumented and no repository entry) due to the static modifier!");
}
return "";
}
@@ -285,7 +285,7 @@
repositoryName = repositoryName + superclassName.substring(superclassName.lastIndexOf(".") + 1, superclassName.length());
}
if (repositoryForInvExists(repositoryName)) {
- body = body + " super_vec = " + repositoryName + "." + "__iContract__getInvariantList" + "();\n";
+ body = body + " super_vec = " + repositoryName + "." + " __JContractS__getInvariantList" + "();\n";
body = body + " for (Enumeration e = super_vec.elements(); e.hasMoreElements(); ) {\n";
body = body + " vec.addElement( e.nextElement() );\n";
body = body + " }\n";
@@ -293,7 +293,7 @@
body = body + " // Repository for super-interface " + superclassName + " (" + repositoryName + ") ";
body = body + "does not exist or is not accessible (the total set of super-interfaces of " + getSignature() + "is " + super_interfaces + ").\n";
if (!superclassName.startsWith("java.")) {
- log.error(getLocationDescription() + "icontract: WARNING: the repository of " + getSignature() + " will not contain invariants of one of its super-interfaces " + superclassName + " (total set of super-interfaces is " + super_interfaces + "). This may be because the super-interface " + superclassName + " may" + " not have been " + "instrumented for invariants (or the repository file " + repositoryName + ".class is missing, e.g. was not compiled) !\n");
+ log.error(getLocationDescription() + "Java Contract Suite: WARNING: the repository of " + getSignature() + " will not contain invariants of one of its super-interfaces " + superclassName + " (total set of super-interfaces is " + super_interfaces + "). This may be because the super-interface " + superclassName + " may" + " not have been " + "instrumented for invariants (or the repository file " + repositoryName + ".class is missing, e.g. was not compiled) !\n");
}
}
}
@@ -316,7 +316,7 @@
}
String header = " /**This repository method captures the invariants of\n * interface " + getSignature() + " and it's super-interfaces " + super_interfaces + ".\n";
header = header + " */\n";
- header = header + " public static final Vector __iContract__getInvariantList() {";
+ header = header + " public static final Vector __JContractS__getInvariantList() {";
String code = header + "\n Vector vec = new Vector();\n" + body + " return vec;\n" + " }\n";
body = "";
if (super_interfaces.size() != 0) {
@@ -332,7 +332,7 @@
repositoryName = repositoryName + superclassName.substring(superclassName.lastIndexOf(".") + 1, superclassName.length());
}
if (repositoryForInvExists(repositoryName)) {
- body = body + " super_vec = " + repositoryName + "." + "__iContract__getInvariantSourceList" + "();\n";
+ body = body + " super_vec = " + repositoryName + "." + " __JContractS__getInvariantSourceList" + "();\n";
body = body + " for (Enumeration e = super_vec.elements(); e.hasMoreElements(); ) {\n";
body = body + " vec.addElement( e.nextElement() );\n";
body = body + " }\n";
@@ -360,7 +360,7 @@
}
header = " /**This repository method captures the source of invariants of\n * interface " + getSignature() + " and it's super-interfaces " + super_interfaces + ".\n";
header = header + " */\n";
- header = header + " public static final Vector __iContract__getInvariantSourceList() {";
+ header = header + " public static final Vector __JContractS__getInvariantSourceList() {";
code = code + "\n" + header + "\n Vector vec = new Vector();\n" + body + " return vec;\n" + " }\n";
return code;
}
@@ -399,7 +399,7 @@
}
}
- System.err.println(getLocationDescription() + "iContract:WARNING: could not find " + ": " + short_name);
+ System.err.println(getLocationDescription() + "Java Contract Suite: WARNING: could not find " + ": " + short_name);
return short_name;
}
@@ -549,18 +549,18 @@
last_type = "<<unknown-type " + last_type + "::" + section + ">>";
log.debug("getTypeOfValue:last_type=" + last_type);
stop = true;
- throw new UnableToDetermineTypeException(getLocationDescription() + "::iContract:error: could not infere the type of (" + last_type + "::" + section + ") as the class " + last_type + " is not in the local not in any of the imported packages. Occured in " + this + "\n");
+ throw new UnableToDetermineTypeException(getLocationDescription() + "::Java Contract Suite: ERROR: could not infere the type of (" + last_type + "::" + section + ") as the class " + last_type + " is not in the local not in any of the imported packages. Occured in " + this + "\n");
}
}
catch (NoSuchMethodException _ex) {
- throw new UnableToDetermineTypeException("iContract:error: method " + last_type + "." + pure_function_name + "(" + sig + ") not found via reflection !\n");
+ throw new UnableToDetermineTypeException("Java Contract Suite: ERROR: method " + last_type + "." + pure_function_name + "(" + sig + ") not found via reflection !\n");
}
}
catch (ClassNotFoundException _ex) {
last_type = "<<unknown-type " + last_type + "::" + section + " (class " + last_type + " not found. Occured in " + this + ")>>";
log.debug("getTypeOfValue:last_type=" + last_type);
stop = true;
- throw new UnableToDetermineTypeException(getLocationDescription() + "::iContract:error: could not infere the type of (" + last_type + "::" + section + ") as the class " + last_type + " is not in the local not in any of the imported packages. Occured in " + this + "\n");
+ throw new UnableToDetermineTypeException(getLocationDescription() + "::Java Contract Suite: ERROR: could not infere the type of (" + last_type + "::" + section + ") as the class " + last_type + " is not in the local not in any of the imported packages. Occured in " + this + "\n");
}
}
}
@@ -669,14 +669,14 @@
}
}
catch (NoSuchMethodException _ex) {
- throw new UnableToDetermineTypeException("iContract:error: method " + last_type + "." + pure_function_name + "(" + sig + ") not found via reflection !\n");
+ throw new UnableToDetermineTypeException("Java Contract Suite: ERROR: method " + last_type + "." + pure_function_name + "(" + sig + ") not found via reflection !\n");
}
}
catch (ClassNotFoundException _ex) {
last_type = "<<unknown-type " + last_type + "::" + section + " (class " + last_type + " not found. Occured in " + this + ")>>";
log.debug("getTypeOfValue:last_type=" + last_type);
stop = true;
- throw new UnableToDetermineTypeException(getLocationDescription() + "::iContract:error: could not infere the type of (" + last_type + "::" + section + ") as the class " + last_type + " is not in the local not in any of the imported packages. Occured in " + this + "\n");
+ throw new UnableToDetermineTypeException(getLocationDescription() + "::Java Contract Suite: ERROR: could not infere the type of (" + last_type + "::" + section + ") as the class " + last_type + " is not in the local not in any of the imported packages. Occured in " + this + "\n");
}
}
current_pos = next_dot_pos + 1;
@@ -722,7 +722,7 @@
java.lang.Class c = java.lang.Class.forName(className);
java.lang.Class noArgArray[] = new java.lang.Class[0];
try {
- Method theIGMethod = c.getMethod("__iContract__getInvariantList", noArgArray);
+ Method theIGMethod = c.getMethod(" __JContractS__getInvariantList", noArgArray);
try {
Vector _tmp = (Vector)theIGMethod.invoke(c, noArgArray);
res = true;
Modified: trunk/source/java/net/sf/jcontracts/icontract/MergeOption.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/MergeOption.java 2006-11-23 17:23:27 UTC (rev 17)
+++ trunk/source/java/net/sf/jcontracts/icontract/MergeOption.java 2006-11-24 07:36:06 UTC (rev 18)
@@ -232,7 +232,7 @@
repOutputDirectory = repOutputDirectory + File.separator;
} else {
if (!outputOption.hasParameter()) {
- throw new RuntimeException("icontract:error: repository output directory option (-k) requires directory F (e.g. -kF) [note F may also be @p which will be substituted for with the path of the source file].");
+ throw new RuntimeException("Java Contract Suite: ERROR: repository output directory option (-k) requires directory F (e.g. -kF) [note F may also be @p which will be substituted for with the path of the source file].");
}
String pattern = (String)repOutputOption.getArguments().firstElement();
if (pattern.indexOf("@f") != -1 || pattern.indexOf("@e") != -1) {
@@ -271,7 +271,7 @@
String fn = entry.substring(1, entry.length());
File file = new File(fn);
if (!file.exists()) {
- throw new RuntimeException("iContract: error file " + fn + " not found !");
+ throw new RuntimeException("Java Contract Suite: error file " + fn + " not found !");
}
try {
BufferedReader f = new BufferedReader(new FileReader(fn));
@@ -295,7 +295,7 @@
output_file = new PrintWriter(System.out);
} else {
if (!outputOption.hasParameter()) {
- throw new RuntimeException("icontract:error: output option (-o) requires filename (e.g. -oFile.java).");
+ throw new RuntimeException("Java Contract Suite: ERROR: output option (-o) requires filename (e.g. -oFile.java).");
}
String fon = "";
if (cmc instanceof TypeMetaclass) {
@@ -368,7 +368,7 @@
}
} else {
- System.err.println(type.getLocationDescription() + "icontract: WARNING: contract-checks (invariant) will NOT be instrumented for (local/anonymous class) " + type.getSignature() + " [this version of the tool does not support the instrumentation of methods in local and anonymous classes]");
+ System.err.println(type.getLocationDescription() + "Java Contract Suite: WARNING: contract-checks (invariant) will NOT be instrumented for (local/anonymous class) " + type.getSignature() + " [this version of the tool does not support the instrumentation of methods in local and anonymous classes]");
}
}
PrePostCheck prepost_element = (PrePostCheck)annotations.elementAt(i);
@@ -378,7 +378,7 @@
boolean do_instr = true;
if (method.getParent() != null && ((TypeMetaclass)method.getParent()).isLocal()) {
do_instr = false;
- System.err.println(method.getLocationDescription() + "icontract: WARNING: contract-checks (pre,post) will NOT be instrumented for (method in local/anonymous class) " + method.getParent().getSignature() + "::" + method.getSignature() + " [this version of the tool does not support the instrumentation of methods in local and anonymous classes]");
+ System.err.println(method.getLocationDescription() + "Java Contract Suite: WARNING: contract-checks (pre,post) will NOT be instrumented for (method in local/anonymous class) " + method.getParent().getSignature() + "::" + method.getSignature() + " [this version of the tool does not support the instrumentation of methods in local and anonymous classes]");
}
if (do_instr) {
if (method.hasBody()) {
@@ -415,14 +415,14 @@
input_file.close();
}
if (e.getMessage() != null) {
- System.err.println("icontract:error: i/o-problem: " + e.getMessage());
+ System.err.println("Java Contract Suite: ERROR: i/o-problem: " + e.getMessage());
} else {
- System.err.println("icontract:error: i/o-problem: " + e);
+ System.err.println("Java Contract Suite: ERROR: i/o-problem: " + e);
}
throw e;
}
} else {
- System.out.println("icontract: warning: no code to generate");
+ System.out.println("Java Contract Suite: WARNING: no code to generate");
}
return fileList;
}
@@ -433,7 +433,7 @@
for (Enumeration e = controlTable.elements(); !stop && e.hasMoreElements();) {
String patternline = (String)e.nextElement();
if (patternline.indexOf(' ') == -1) {
- throw new RuntimeException("iContract:error malformed -m config file entry: \"" + patternline + "\" missing a space character that separates the <package><type><method> from the list of pre,post and inv switches (e.g. \"net.sf.jcontracts.icontract.Tool<SPACE>pre\" enables pre)");
+ throw new RuntimeException("Java Contract Suite:error malformed -m config file entry: \"" + patternline + "\" missing a space character that separates the <package><type><method> from the list of pre,post and inv switches (e.g. \"net.sf.jcontracts.icontract.Tool<SPACE>pre\" enables pre)");
}
String pattern = patternline.substring(0, patternline.indexOf(' '));
if (match(item, pattern)) {
Modified: trunk/source/java/net/sf/jcontracts/icontract/Method.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/Method.java 2006-11-23 17:23:27 UTC (rev 17)
+++ trunk/source/java/net/sf/jcontracts/icontract/Method.java 2006-11-24 07:36:06 UTC (rev 18)
@@ -18,8 +18,8 @@
private static final String POSTCONDITION_TAG_NAME_1 = "post";
private static final String POSTCONDITION_TAG_NAME_2 = "ensure";
public static final String REP_PREFIX = "__REP_";
- private static final String PRE_GET_METHOD = "__iContract__getPreList";
- private static final String POST_GET_METHOD = "__iContract__getPostList";
+ private static final String PRE_GET_METHOD = " __JContractS__getPreList";
+ private static final String POST_GET_METHOD = " __JContractS__getPostList";
private static final char EXCEPTION_CLASS_MARKER = 35;
public static final String RETURN_VALUE_HOLDER_NAME = "__return_value_holder_";
private static final String START_SEPARATION_STRING = "//#*#-------------------------------------------------------------------------------";
@@ -57,7 +57,7 @@
java.lang.Class c = java.lang.Class.forName(repositoryName);
java.lang.Class noArgArray[] = new java.lang.Class[0];
try {
- java.lang.reflect.Method thePGMethod = c.getMethod(mangleExpression("__iContract__getPostList_" + getSignature()), noArgArray);
+ java.lang.reflect.Method thePGMethod = c.getMethod(mangleExpression(" __JContractS__getPostList_" + getSignature()), noArgArray);
try {
Vector posts = (Vector)thePGMethod.invoke(c, noArgArray);
String arr[];
@@ -68,13 +68,13 @@
}
catch (InvocationTargetException e) {
- log.error("iContract: WARNING: while instrumenting postconditions in method " + getParent().getSignature() + "::" + getSignature() + " execution of\n" + mangleExpression("__iContract__getPostList_" + getSignature()) + "()\n" + "failed, throwing exception:\n" + e + " target-exception: " + e.getTargetException() + "\nTHEREFORE POSTCONDITIONS OF " + superclassName + "::" + getSignature() + " ARE IGNORED !");
+ log.error("Java Contract Suite: WARNING: while instrumenting postconditions in method " + getParent().getSignature() + "::" + getSignature() + " execution of\n" + mangleExpression(" __JContractS__getPostList_" + getSignature()) + "()\n" + "failed, throwing exception:\n" + e + " target-exception: " + e.getTargetException() + "\nTHEREFORE POSTCONDITIONS OF " + superclassName + "::" + getSignature() + " ARE IGNORED !");
}
catch (IllegalArgumentException e) {
- log.error("iContract: WARNING: while instrumenting postconditions in method " + getParent().getSignature() + "::" + getSignature() + " execution of\n" + mangleExpression("__iContract__getPostList_" + getSignature()) + "()\n" + "failed, throwing exception:\n" + e + "\nTHEREFORE POSTCONDITIONS OF " + superclassName + "::" + getSignature() + " ARE IGNORED !");
+ log.error("Java Contract Suite: WARNING: while instrumenting postconditions in method " + getParent().getSignature() + "::" + getSignature() + " execution of\n" + mangleExpression(" __JContractS__getPostList_" + getSignature()) + "()\n" + "failed, throwing exception:\n" + e + "\nTHEREFORE POSTCONDITIONS OF " + superclassName + "::" + getSignature() + " ARE IGNORED !");
}
catch (IllegalAccessException e) {
- log.error("iContract: WARNING: while instrumenting postconditions in method " + getParent().getSignature() + "::" + getSignature() + " execution of\n" + mangleExpression("__iContract__getPostList_" + getSignature()) + "()\n" + "failed, throwing exception:\n" + e + "\nTHEREFORE POSTCONDITIONS OF " + superclassName + "::" + getSignature() + " ARE IGNORED !");
+ log.error("Java Contract Suite: WARNING: while instrumenting postconditions in method " + getParent().getSignature() + "::" + getSignature() + " execution of\n" + mangleExpression(" __JContractS__getPostList_" + getSignature()) + "()\n" + "failed, throwing exception:\n" + e + "\nTHEREFORE POSTCONDITIONS OF " + superclassName + "::" + getSignature() + " ARE IGNORED !");
}
}
catch (NoSuchMethodException _ex) { }
@@ -114,7 +114,7 @@
java.lang.Class c = java.lang.Class.forName(repositoryName);
java.lang.Class noArgArray[] = new java.lang.Class[0];
try {
- java.lang.reflect.Method thePGMethod = c.getMethod(mangleExpression("__iContract__getPreList_" + getSignature()), noArgArray);
+ java.lang.reflect.Method thePGMethod = c.getMethod(mangleExpression(" __JContractS__getPreList_" + getSignature()), noArgArray);
try {
Vector pres = (Vector)thePGMethod.invoke(c, noArgArray);
String arr[];
@@ -125,13 +125,13 @@
}
catch (InvocationTargetException e) {
- log.warn("iContract: WARNING: while instrumenting preconditions in method " + getParent().getSignature() + "::" + getSignature() + " execution of\n" + mangleExpression("__iContract__getPreList_" + getSignature()) + "()\n" + "failed, throwing exception:\n" + e + " target-exception: " + e.getTargetException() + "\nTHEREFORE PRECONDITIONS OF " + superclassName + "::" + getSignature() + " ARE IGNORED !");
+ log.warn("Java Contract Suite: WARNING: while instrumenting preconditions in method " + getParent().getSignature() + "::" + getSignature() + " execution of\n" + mangleExpression(" __JContractS__getPreList_" + getSignature()) + "()\n" + "failed, throwing exception:\n" + e + " target-exception: " + e.getTargetException() + "\nTHEREFORE PRECONDITIONS OF " + superclassName + "::" + getSignature() + " ARE IGNORED !");
}
catch (IllegalArgumentException e) {
- log.warn("iContract: WARNING: while instrumenting preconditions in method " + getParent().getSignature() + "::" + getSignature() + " execution of\n" + mangleExpression("__iContract__getPreList_" + getSignature()) + "()\n" + "failed, throwing exception:\n" + e + "\nTHEREFORE PRECONDITIONS OF " + superclassName + "::" + getSignature() + " ARE IGNORED !");
+ log.warn("Java Contract Suite: WARNING: while instrumenting preconditions in method " + getParent().getSignature() + "::" + getSignature() + " execution of\n" + mangleExpression(" __JContractS__getPreList_" + getSignature()) + "()\n" + "failed, throwing exception:\n" + e + "\nTHEREFORE PRECONDITIONS OF " + superclassName + "::" + getSignature() + " ARE IGNORED !");
}
catch (IllegalAccessException e) {
- log.warn("iContract: WARNING: while instrumenting preconditions in method " + getParent().getSignature() + "::" + getSignature() + " execution of\n" + mangleExpression("__iContract__getPreList_" + getSignature()) + "()\n" + "failed, throwing exception:\n" + e + "\nTHEREFORE PRECONDITIONS OF " + superclassName + "::" + getSignature() + " ARE IGNORED !");
+ log.warn("Java Contract Suite: WARNING: while instrumenting preconditions in method " + getParent().getSignature() + "::" + getSignature() + " execution of\n" + mangleExpression(" __JContractS__getPreList_" + getSignature()) + "()\n" + "failed, throwing exception:\n" + e + "\nTHEREFORE PRECONDITIONS OF " + superclassName + "::" + getSignature() + " ARE IGNORED !");
}
}
catch (NoSuchMethodException _ex) { }
@@ -233,7 +233,7 @@
}
catch (ClassNotFoundException e) {
- log.warn(getLocationDescription() + "iContract:WARNING: while instrumenting postconditions in method " + getParent().getSignature() + "::" + getSignature() + " an attempt was made to determine if " + className + " implements interface 'java.lang.Cloneable'" + " in order to decide if the 'ExprOfType-" + className + "@pre' that appears in the " + "postcondition should use 'copy' or 'reference' semantics." + " Unfortunately " + className + " could not be found " + "(exception: " + e + "). THEREFORE REFERENCE SEMANTICS WILL HAVE TO BE USED!");
+ log.warn(getLocationDescription() + "Java Contract Suite: WARNING: while instrumenting postconditions in method " + getParent().getSignature() + "::" + getSignature() + " an attempt was made to determine if " + className + " implements interface 'java.lang.Cloneable'" + " in order to decide if the 'ExprOfType-" + className + "@pre' that appears in the " + "postcondition should use 'copy' or 'reference' semantics." + " Unfortunately " + className + " could not be found " + "(exception: " + e + "). THEREFORE REFERENCE SEMANTICS WILL HAVE TO BE USED!");
res = false;
}
}
@@ -387,14 +387,14 @@
}
}
if (sig.length > 4) {
- throw new RuntimeException("iContract:error: more than 4 arguments (" + f + ") not supported at the moment [991]. Easy to be added though.");
+ throw new RuntimeException("Java Contract Suite: ERROR: more than 4 arguments (" + f + ") not supported at the moment [991]. Easy to be added though.");
} else {
return m;
}
}
public Vector getAllNonImplementedMethods() {
- throw new RuntimeException("iContract.Method.getAllNonImplementedMethods() not expected to be called here!");
+ throw new RuntimeException("Method.getAllNonImplementedMethods() not expected to be called here!");
}
Vector getAllOldValues(String expr) {
@@ -540,8 +540,8 @@
repositoryName = repositoryName + superclassName.substring(superclassName.lastIndexOf(".") + 1, superclassName.length());
}
if (repositoryExists(repositoryName)) {
- if (repositoryEntryForPostExists(repositoryName, "__iContract__getPostList_" + getSignature())) {
- body = body + " super_vec = " + repositoryName + "." + mangleExpression("__iContract__getPostList_" + getSignature()) + "();\n";
+ if (repositoryEntryForPostExists(repositoryName, " __JContractS__getPostList_" + getSignature())) {
+ body = body + " super_vec = " + repositoryName + "." + mangleExpression(" __JContractS__getPostList_" + getSignature()) + "();\n";
body = body + " for (Enumeration e = super_vec.elements(); e.hasMoreElements(); ) {\n";
body = body + " vec.addElement( e.nextElement() );\n";
body = body + " }\n";
@@ -584,7 +584,7 @@
header = header + " and it's superclass method " + superclassName + "::" + getSignature() + ".\n";
}
header = header + " */\n";
- header = header + " public static final Vector " + mangleExpression("__iContract__getPostList_" + getSignature()) + "() {";
+ header = header + " public static final Vector " + mangleExpression(" __JContractS__getPostList_" + getSignature()) + "() {";
String code = header + "\n Vector vec = new Vector();\n" + body + " return vec;\n" + " }\n";
return code;
}
@@ -635,8 +635,8 @@
repositoryName = repositoryName + superclassName.substring(superclassName.lastIndexOf(".") +...
[truncated message content] |
|
From: <js...@us...> - 2006-11-23 17:23:36
|
Revision: 17
http://svn.sourceforge.net/jcontracts/?rev=17&view=rev
Author: jstuyts
Date: 2006-11-23 09:23:27 -0800 (Thu, 23 Nov 2006)
Log Message:
-----------
Corrected names of system properties.
Modified Paths:
--------------
trunk/source/java/net/sf/jcontracts/icontract/Class.java
trunk/source/java/net/sf/jcontracts/icontract/Method.java
trunk/source/java/net/sf/jcontracts/icontract/Tool.java
Modified: trunk/source/java/net/sf/jcontracts/icontract/Class.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/Class.java 2006-11-23 17:21:27 UTC (rev 16)
+++ trunk/source/java/net/sf/jcontracts/icontract/Class.java 2006-11-23 17:23:27 UTC (rev 17)
@@ -618,9 +618,9 @@
String inst_var_decl = "// Keeps track of calling chain to avoid recursive invariant checks.\n";
inst_var_decl = inst_var_decl + "// Avoids inv checks in public methods that are called from private ones.\n";
inst_var_decl = inst_var_decl + "// Stores bookkeeping information -- key: thread, value: call level\n";
- boolean do_not_enforce_precompilation_of_source = Boolean.getBoolean("icontract.internal.do_not_enforce_precompilation_of_source");
+ boolean do_not_enforce_precompilation_of_source = Boolean.getBoolean("jcontracts.internal.do_not_enforce_precompilation_of_source");
if (do_not_enforce_precompilation_of_source) {
- System.err.println("iContract:SWITCH:icontract.internal.do_not_enforce_precompilation_of_source=true");
+ System.err.println("iContract:SWITCH:jcontracts.internal.do_not_enforce_precompilation_of_source=true");
}
boolean icl_already_defined = false;
if (!do_not_enforce_precompilation_of_source) {
@@ -632,7 +632,7 @@
}
}
if (do_not_enforce_precompilation_of_source) {
- System.err.println("iContract:SWITCH:invariant bookkeeping may NOT work correctly because the check for the existence of the __icl_ variable in superclasses was disables. This means that there is an __icl_ varaible at each level of the inheritance rather than one and one only per inheritance chain! THIS IS ONLY SUITABLE FOR CERTAIN SPECIAL TESTCASES. REMOVE the 'java -Dicontract.internal.do_not_enforce_precompilation_of_source' property to make net.sf.jcontracts.net.sf.jcontracts.iContract work in normal (correct) mode!");
+ System.err.println("iContract:SWITCH:invariant bookkeeping may NOT work correctly because the check for the existence of the __icl_ variable in superclasses was disables. This means that there is an __icl_ varaible at each level of the inheritance rather than one and one only per inheritance chain! THIS IS ONLY SUITABLE FOR CERTAIN SPECIAL TESTCASES. REMOVE the 'java -Djcontracts.internal.do_not_enforce_precompilation_of_source' property to make net.sf.jcontracts.net.sf.jcontracts.iContract work in normal (correct) mode!");
}
if (!icl_already_defined) {
inst_var_decl = inst_var_decl + "protected transient java.util.Hashtable __icl_ = new java.util.Hashtable(1);\n";
Modified: trunk/source/java/net/sf/jcontracts/icontract/Method.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/Method.java 2006-11-23 17:21:27 UTC (rev 16)
+++ trunk/source/java/net/sf/jcontracts/icontract/Method.java 2006-11-23 17:23:27 UTC (rev 17)
@@ -855,10 +855,10 @@
log.debug("getOldVarSaveCode:type_of_val=" + type_of_val);
String tmp_val = getMangledValue(val);
log.debug("getOldVarSaveCode:tmp_val =" + tmp_val);
- boolean do_clone_for_oldvalues = Boolean.getBoolean("icontract.internal.do_clone_for_oldvalues");
+ boolean do_clone_for_oldvalues = Boolean.getBoolean("jcontracts.internal.do_clone_for_oldvalues");
if (do_clone_for_oldvalues) {
- System.err.println("iContract:SWITCH:icontract.internal.do_clone_for_oldvalues=true");
- System.err.println("Classes that implement java.lang.Cloneable, Arrays and Strings will be cloned if they appear in postcondition old-value references (e.g. @post xxx@pre). THIS IS NOT DEFAULT BEHAVIOUR PAST 0.2b6, remove -Dicontract.internal.do_clone_for_oldvalues to disable.");
+ System.err.println("iContract:SWITCH:jcontracts.internal.do_clone_for_oldvalues=true");
+ System.err.println("Classes that implement java.lang.Cloneable, Arrays and Strings will be cloned if they appear in postcondition old-value references (e.g. @post xxx@pre). THIS IS NOT DEFAULT BEHAVIOUR PAST 0.2b6, remove -Djcontracts.internal.do_clone_for_oldvalues to disable.");
if (type_of_val.equals("int") || type_of_val.equals("float") || type_of_val.equals("boolean") || type_of_val.equals("byte") || type_of_val.equals("double") || type_of_val.equals("long") || type_of_val.equals("short") || type_of_val.equals("char")) {
code = code + "// can not call methods on " + type_of_val + " (therefore no clone).\n";
code = code + type_of_val + " " + tmp_val + " = " + base_val + "; // save " + val + " (in " + (String)post_source.elementAt(i) + ")\n";
Modified: trunk/source/java/net/sf/jcontracts/icontract/Tool.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/Tool.java 2006-11-23 17:21:27 UTC (rev 16)
+++ trunk/source/java/net/sf/jcontracts/icontract/Tool.java 2006-11-23 17:23:27 UTC (rev 17)
@@ -118,7 +118,7 @@
if (!unresolved.isEmpty()) {
log.error("\n");
log.error("could not resolve the following type names:\n" + unresolved);
- boolean do_not_enforce_precompilation_of_source = Boolean.getBoolean("icontract.internal.do_not_enforce_precompilation_of_source");
+ boolean do_not_enforce_precompilation_of_source = Boolean.getBoolean("jcontracts.internal.do_not_enforce_precompilation_of_source");
if (!do_not_enforce_precompilation_of_source) {
throw new RuntimeException("could not resolve the following type names:\n" + unresolved);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2006-11-23 17:21:38
|
Revision: 16
http://svn.sourceforge.net/jcontracts/?rev=16&view=rev
Author: jstuyts
Date: 2006-11-23 09:21:27 -0800 (Thu, 23 Nov 2006)
Log Message:
-----------
Corrected path of main class.
Modified Paths:
--------------
trunk/source/java/net/sf/jcontracts/icontract/HelpOption.java
trunk/source/java/net/sf/jcontracts/icontract/MergeOption.java
Modified: trunk/source/java/net/sf/jcontracts/icontract/HelpOption.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/HelpOption.java 2006-11-23 17:14:28 UTC (rev 15)
+++ trunk/source/java/net/sf/jcontracts/icontract/HelpOption.java 2006-11-23 17:21:27 UTC (rev 16)
@@ -16,7 +16,7 @@
protected void activateOnTargets(Vector targets) {
System.out.println("NAME: iContract, Version " + VERSION);
System.out.println("AUTHOR: Copyright (C), 1997,98,99 Reto Kramer <in...@re...>");
- System.out.println("SYNOPSIS: java iContract.Tool {option} {file}");
+ System.out.println("SYNOPSIS: java net.sf.jcontracts.icontract.Tool {option} {file}");
System.out.println("DESCRIPTION: Provides Java with full support for \"Design by Contract\".");
System.out.println(" Instruments java source code files with checks to enforce:");
System.out.println(" - method pre- and post-conditions");
Modified: trunk/source/java/net/sf/jcontracts/icontract/MergeOption.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/MergeOption.java 2006-11-23 17:14:28 UTC (rev 15)
+++ trunk/source/java/net/sf/jcontracts/icontract/MergeOption.java 2006-11-23 17:21:27 UTC (rev 16)
@@ -433,7 +433,7 @@
for (Enumeration e = controlTable.elements(); !stop && e.hasMoreElements();) {
String patternline = (String)e.nextElement();
if (patternline.indexOf(' ') == -1) {
- throw new RuntimeException("iContract:error malformed -m config file entry: \"" + patternline + "\" missing a space character that separates the <package><type><method> from the list of pre,post and inv switches (e.g. \"iContract.Tool<SPACE>pre\" enables pre)");
+ throw new RuntimeException("iContract:error malformed -m config file entry: \"" + patternline + "\" missing a space character that separates the <package><type><method> from the list of pre,post and inv switches (e.g. \"net.sf.jcontracts.icontract.Tool<SPACE>pre\" enables pre)");
}
String pattern = patternline.substring(0, patternline.indexOf(' '));
if (match(item, pattern)) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2006-11-23 17:14:30
|
Revision: 15
http://svn.sourceforge.net/jcontracts/?rev=15&view=rev
Author: jstuyts
Date: 2006-11-23 09:14:28 -0800 (Thu, 23 Nov 2006)
Log Message:
-----------
Removed JAD comments from the Java sources.
Modified Paths:
--------------
trunk/source/java/net/sf/jcontracts/argparser/ArgLexer.java
trunk/source/java/net/sf/jcontracts/argparser/ArgParser.java
trunk/source/java/net/sf/jcontracts/argparser/ArgTokenTypes.java
trunk/source/java/net/sf/jcontracts/argparser/ExtendedToken.java
trunk/source/java/net/sf/jcontracts/argparser/MetaclassFactory.java
trunk/source/java/net/sf/jcontracts/argparser/Option.java
trunk/source/java/net/sf/jcontracts/argparser/OptionMetaclass.java
trunk/source/java/net/sf/jcontracts/argparser/Parser.java
trunk/source/java/net/sf/jcontracts/argparser/ParserMetaclassFactory.java
trunk/source/java/net/sf/jcontracts/argparser/Target.java
trunk/source/java/net/sf/jcontracts/argparser/TargetMetaclass.java
trunk/source/java/net/sf/jcontracts/codeparser/Class.java
trunk/source/java/net/sf/jcontracts/codeparser/CodeComment.java
trunk/source/java/net/sf/jcontracts/codeparser/CodeMetaclass.java
trunk/source/java/net/sf/jcontracts/codeparser/CodeMetaclassCache.java
trunk/source/java/net/sf/jcontracts/codeparser/DebugVisitor.java
trunk/source/java/net/sf/jcontracts/codeparser/DottyVisitor.java
trunk/source/java/net/sf/jcontracts/codeparser/DottyVisitorConstants.java
trunk/source/java/net/sf/jcontracts/codeparser/Dotty_Component_CommonLevel.java
trunk/source/java/net/sf/jcontracts/codeparser/Dotty_Component_PackageLevel.java
trunk/source/java/net/sf/jcontracts/codeparser/Dotty_Component_TypeLevel.java
trunk/source/java/net/sf/jcontracts/codeparser/ExtendedToken.java
trunk/source/java/net/sf/jcontracts/codeparser/ICodeBody.java
trunk/source/java/net/sf/jcontracts/codeparser/ICodeMetaclassVisitor.java
trunk/source/java/net/sf/jcontracts/codeparser/IDependencyFilter.java
trunk/source/java/net/sf/jcontracts/codeparser/IDotty_Component_Level.java
trunk/source/java/net/sf/jcontracts/codeparser/Interface.java
trunk/source/java/net/sf/jcontracts/codeparser/JavaLexer.java
trunk/source/java/net/sf/jcontracts/codeparser/JavaParser.java
trunk/source/java/net/sf/jcontracts/codeparser/JavaTokenTypes.java
trunk/source/java/net/sf/jcontracts/codeparser/MetaclassFactory.java
trunk/source/java/net/sf/jcontracts/codeparser/Method.java
trunk/source/java/net/sf/jcontracts/codeparser/Parser.java
trunk/source/java/net/sf/jcontracts/codeparser/ParserMetaclassFactory.java
trunk/source/java/net/sf/jcontracts/codeparser/TypeMetaclass.java
trunk/source/java/net/sf/jcontracts/codeparser/Variable.java
trunk/source/java/net/sf/jcontracts/dependencyanalyzer/BooleanBlockWithNodeArg.java
trunk/source/java/net/sf/jcontracts/dependencyanalyzer/DependencyAnalyzer.java
trunk/source/java/net/sf/jcontracts/dependencyanalyzer/Graph.java
trunk/source/java/net/sf/jcontracts/dependencyanalyzer/Node.java
trunk/source/java/net/sf/jcontracts/icontract/AllFilesUpToDateException.java
trunk/source/java/net/sf/jcontracts/icontract/AllOption.java
trunk/source/java/net/sf/jcontracts/icontract/ArgMetaclassFactory.java
trunk/source/java/net/sf/jcontracts/icontract/AssertionExpression.java
trunk/source/java/net/sf/jcontracts/icontract/Class.java
trunk/source/java/net/sf/jcontracts/icontract/CleanOption.java
trunk/source/java/net/sf/jcontracts/icontract/CompilerOption.java
trunk/source/java/net/sf/jcontracts/icontract/Constants.java
trunk/source/java/net/sf/jcontracts/icontract/Darwin.java
trunk/source/java/net/sf/jcontracts/icontract/DefaultExceptionOption.java
trunk/source/java/net/sf/jcontracts/icontract/FileTarget.java
trunk/source/java/net/sf/jcontracts/icontract/HelpOption.java
trunk/source/java/net/sf/jcontracts/icontract/IContracted.java
trunk/source/java/net/sf/jcontracts/icontract/Interface.java
trunk/source/java/net/sf/jcontracts/icontract/Internal0Option.java
trunk/source/java/net/sf/jcontracts/icontract/InvCheck.java
trunk/source/java/net/sf/jcontracts/icontract/InvCheckCallOption.java
trunk/source/java/net/sf/jcontracts/icontract/MergeOption.java
trunk/source/java/net/sf/jcontracts/icontract/MetaclassFactory.java
trunk/source/java/net/sf/jcontracts/icontract/Method.java
trunk/source/java/net/sf/jcontracts/icontract/NoInitialCompilationOption.java
trunk/source/java/net/sf/jcontracts/icontract/NoRepositoryCompilationOption.java
trunk/source/java/net/sf/jcontracts/icontract/OneOneOption.java
trunk/source/java/net/sf/jcontracts/icontract/Option.java
trunk/source/java/net/sf/jcontracts/icontract/OutputOption.java
trunk/source/java/net/sf/jcontracts/icontract/ParameterOption.java
trunk/source/java/net/sf/jcontracts/icontract/PrePostCheck.java
trunk/source/java/net/sf/jcontracts/icontract/ProcessingOption.java
trunk/source/java/net/sf/jcontracts/icontract/QuietOption.java
trunk/source/java/net/sf/jcontracts/icontract/Repository.java
trunk/source/java/net/sf/jcontracts/icontract/RepositoryOutputOption.java
trunk/source/java/net/sf/jcontracts/icontract/SourceCompilerOption.java
trunk/source/java/net/sf/jcontracts/icontract/SystemInTarget.java
trunk/source/java/net/sf/jcontracts/icontract/Target.java
trunk/source/java/net/sf/jcontracts/icontract/Tool.java
trunk/source/java/net/sf/jcontracts/icontract/UnableToDetermineTypeException.java
trunk/source/java/net/sf/jcontracts/icontract/Variable.java
trunk/source/java/net/sf/jcontracts/icontract/VerboseOption.java
trunk/source/java/net/sf/jcontracts/icontract/WrapExceptionOption.java
trunk/source/java/net/sf/jcontracts/icontract/XOption.java
trunk/source/java/net/sf/jcontracts/icontract/instruction/DeclareReturnValueHolder.java
trunk/source/java/net/sf/jcontracts/icontract/instruction/Instruction.java
trunk/source/java/net/sf/jcontracts/icontract/instruction/InstructionBase.java
trunk/source/java/net/sf/jcontracts/icontract/side/MethodFront.java
trunk/source/java/net/sf/jcontracts/icontract/side/Side.java
trunk/source/java/net/sf/jcontracts/icontract/side/SideBase.java
trunk/source/java/net/sf/jcontracts/icontract/side/SideFactory.java
trunk/source/java/net/sf/jcontracts/icontract/util/Array.java
trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/ArchitectureSpecification.java
trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/ArchitectureSpecificationFilter.java
trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/CompositePattern.java
trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/Dependency.java
trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/DependencyConstraint.java
trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/DependencyConstraintExporter.java
trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/DifferencePattern.java
trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/Group.java
trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/Idiom.java
trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/IdiomFactory.java
trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/IsolateIdiom.java
trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/LanguageFactory.java
trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/LayerIdiom.java
trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PSpecLexer.java
trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PSpecParser.java
trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PSpecTokenTypes.java
trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/Pattern.java
trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PatternFactory.java
trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PatternSyntaxException.java
trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/SetPattern.java
trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/SingleDependencyConstraint.java
trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/SingularPattern.java
trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/StrictlyLayerIdiom.java
trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/xml/XMLRuleLanguage.java
trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/xml/XMLRuleLanguageSpecification.java
trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/with_rules/IArchitectureSpecification.java
trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/with_rules/IRule.java
trunk/source/java/net/sf/jcontracts/idarwin/specification/openapi/IArchitectureExporter.java
trunk/source/java/net/sf/jcontracts/idarwin/specification/openapi/IArchitectureSpecification.java
trunk/source/java/net/sf/jcontracts/idarwin/specification/openapi/IArchitectureSpecificationFilter.java
trunk/source/java/net/sf/jcontracts/idarwin/specification/openapi/IDependency.java
trunk/source/java/net/sf/jcontracts/idarwin/specification/openapi/ILanguageFactory.java
trunk/source/java/net/sf/jcontracts/idarwin/specification/openapi/IllFormedSpecificationException.java
trunk/source/java/net/sf/jcontracts/idarwin/specification/openapi/RunData.java
trunk/source/java/net/sf/jcontracts/util/JavaEvaluator.java
trunk/source/java/net/sf/jcontracts/util/StringComparator.java
Modified: trunk/source/java/net/sf/jcontracts/argparser/ArgLexer.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/argparser/ArgLexer.java 2006-11-23 12:54:51 UTC (rev 14)
+++ trunk/source/java/net/sf/jcontracts/argparser/ArgLexer.java 2006-11-23 17:14:28 UTC (rev 15)
@@ -1,8 +1,3 @@
-// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov.
-// Jad home page: http://www.kpdus.com/jad.html
-// Decompiler options: packimports(3) braces fieldsfirst nonlb space
-// Source File Name: ArgLexer.java
-
package net.sf.jcontracts.argparser;
import antlr.*;
@@ -10,9 +5,6 @@
import java.io.InputStream;
import java.util.Hashtable;
-// Referenced classes of package net.sf.jcontracts.argParser:
-// ArgTokenTypes, ExtendedToken
-
public class ArgLexer extends CharScannerNoBacktrackingNoInteractive
implements ArgTokenTypes, Tokenizer {
Modified: trunk/source/java/net/sf/jcontracts/argparser/ArgParser.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/argparser/ArgParser.java 2006-11-23 12:54:51 UTC (rev 14)
+++ trunk/source/java/net/sf/jcontracts/argparser/ArgParser.java 2006-11-23 17:14:28 UTC (rev 15)
@@ -1,8 +1,3 @@
-// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov.
-// Jad home page: http://www.kpdus.com/jad.html
-// Decompiler options: packimports(3) braces fieldsfirst nonlb space
-// Source File Name: ArgParser.java
-
package net.sf.jcontracts.argparser;
import antlr.*;
@@ -10,10 +5,6 @@
import java.io.PrintStream;
import java.util.Vector;
-// Referenced classes of package net.sf.jcontracts.argParser:
-// ArgTokenTypes, MetaclassFactory, ArgLexer, ExtendedToken,
-// ParserMetaclassFactory, OptionMetaclass, TargetMetaclass
-
public class ArgParser extends LLkParserNoInteractive
implements ArgTokenTypes {
Modified: trunk/source/java/net/sf/jcontracts/argparser/ArgTokenTypes.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/argparser/ArgTokenTypes.java 2006-11-23 12:54:51 UTC (rev 14)
+++ trunk/source/java/net/sf/jcontracts/argparser/ArgTokenTypes.java 2006-11-23 17:14:28 UTC (rev 15)
@@ -1,8 +1,3 @@
-// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov.
-// Jad home page: http://www.kpdus.com/jad.html
-// Decompiler options: packimports(3) braces fieldsfirst nonlb space
-// Source File Name: ArgTokenTypes.java
-
package net.sf.jcontracts.argparser;
Modified: trunk/source/java/net/sf/jcontracts/argparser/ExtendedToken.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/argparser/ExtendedToken.java 2006-11-23 12:54:51 UTC (rev 14)
+++ trunk/source/java/net/sf/jcontracts/argparser/ExtendedToken.java 2006-11-23 17:14:28 UTC (rev 15)
@@ -1,8 +1,3 @@
-// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov.
-// Jad home page: http://www.kpdus.com/jad.html
-// Decompiler options: packimports(3) braces fieldsfirst nonlb space
-// Source File Name: ExtendedToken.java
-
package net.sf.jcontracts.argparser;
import antlr.CommonToken;
Modified: trunk/source/java/net/sf/jcontracts/argparser/MetaclassFactory.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/argparser/MetaclassFactory.java 2006-11-23 12:54:51 UTC (rev 14)
+++ trunk/source/java/net/sf/jcontracts/argparser/MetaclassFactory.java 2006-11-23 17:14:28 UTC (rev 15)
@@ -1,16 +1,7 @@
-// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov.
-// Jad home page: http://www.kpdus.com/jad.html
-// Decompiler options: packimports(3) braces fieldsfirst nonlb space
-// Source File Name: MetaclassFactory.java
-
package net.sf.jcontracts.argparser;
import java.util.Vector;
-// Referenced classes of package net.sf.jcontracts.argParser:
-// ParserMetaclassFactory, Option, Target, OptionMetaclass,
-// TargetMetaclass
-
public class MetaclassFactory
implements ParserMetaclassFactory {
Modified: trunk/source/java/net/sf/jcontracts/argparser/Option.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/argparser/Option.java 2006-11-23 12:54:51 UTC (rev 14)
+++ trunk/source/java/net/sf/jcontracts/argparser/Option.java 2006-11-23 17:14:28 UTC (rev 15)
@@ -1,15 +1,7 @@
-// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov.
-// Jad home page: http://www.kpdus.com/jad.html
-// Decompiler options: packimports(3) braces fieldsfirst nonlb space
-// Source File Name: Option.java
-
package net.sf.jcontracts.argparser;
import java.util.Vector;
-// Referenced classes of package net.sf.jcontracts.argParser:
-// OptionMetaclass
-
public class Option extends OptionMetaclass {
public Option(String name, Vector arguments) {
Modified: trunk/source/java/net/sf/jcontracts/argparser/OptionMetaclass.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/argparser/OptionMetaclass.java 2006-11-23 12:54:51 UTC (rev 14)
+++ trunk/source/java/net/sf/jcontracts/argparser/OptionMetaclass.java 2006-11-23 17:14:28 UTC (rev 15)
@@ -1,8 +1,3 @@
-// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov.
-// Jad home page: http://www.kpdus.com/jad.html
-// Decompiler options: packimports(3) braces fieldsfirst nonlb space
-// Source File Name: OptionMetaclass.java
-
package net.sf.jcontracts.argparser;
import java.util.Vector;
Modified: trunk/source/java/net/sf/jcontracts/argparser/Parser.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/argparser/Parser.java 2006-11-23 12:54:51 UTC (rev 14)
+++ trunk/source/java/net/sf/jcontracts/argparser/Parser.java 2006-11-23 17:14:28 UTC (rev 15)
@@ -1,8 +1,3 @@
-// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov.
-// Jad home page: http://www.kpdus.com/jad.html
-// Decompiler options: packimports(3) braces fieldsfirst nonlb space
-// Source File Name: Parser.java
-
package net.sf.jcontracts.argparser;
import antlr.CharScanner;
@@ -10,9 +5,6 @@
import java.io.StringBufferInputStream;
import java.util.Vector;
-// Referenced classes of package net.sf.jcontracts.argParser:
-// ArgLexer, ArgParser, ParserMetaclassFactory
-
public class Parser {
private ArgParser _argparser;
Modified: trunk/source/java/net/sf/jcontracts/argparser/ParserMetaclassFactory.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/argparser/ParserMetaclassFactory.java 2006-11-23 12:54:51 UTC (rev 14)
+++ trunk/source/java/net/sf/jcontracts/argparser/ParserMetaclassFactory.java 2006-11-23 17:14:28 UTC (rev 15)
@@ -1,15 +1,7 @@
-// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov.
-// Jad home page: http://www.kpdus.com/jad.html
-// Decompiler options: packimports(3) braces fieldsfirst nonlb space
-// Source File Name: ParserMetaclassFactory.java
-
package net.sf.jcontracts.argparser;
import java.util.Vector;
-// Referenced classes of package net.sf.jcontracts.argParser:
-// OptionMetaclass, TargetMetaclass
-
public interface ParserMetaclassFactory {
public abstract OptionMetaclass newOption(String s, Vector vector);
Modified: trunk/source/java/net/sf/jcontracts/argparser/Target.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/argparser/Target.java 2006-11-23 12:54:51 UTC (rev 14)
+++ trunk/source/java/net/sf/jcontracts/argparser/Target.java 2006-11-23 17:14:28 UTC (rev 15)
@@ -1,14 +1,6 @@
-// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov.
-// Jad home page: http://www.kpdus.com/jad.html
-// Decompiler options: packimports(3) braces fieldsfirst nonlb space
-// Source File Name: Target.java
-
package net.sf.jcontracts.argparser;
-// Referenced classes of package net.sf.jcontracts.argParser:
-// TargetMetaclass
-
public class Target extends TargetMetaclass {
public Target(String name) {
Modified: trunk/source/java/net/sf/jcontracts/argparser/TargetMetaclass.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/argparser/TargetMetaclass.java 2006-11-23 12:54:51 UTC (rev 14)
+++ trunk/source/java/net/sf/jcontracts/argparser/TargetMetaclass.java 2006-11-23 17:14:28 UTC (rev 15)
@@ -1,8 +1,3 @@
-// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov.
-// Jad home page: http://www.kpdus.com/jad.html
-// Decompiler options: packimports(3) braces fieldsfirst nonlb space
-// Source File Name: TargetMetaclass.java
-
package net.sf.jcontracts.argparser;
Modified: trunk/source/java/net/sf/jcontracts/codeparser/Class.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/codeparser/Class.java 2006-11-23 12:54:51 UTC (rev 14)
+++ trunk/source/java/net/sf/jcontracts/codeparser/Class.java 2006-11-23 17:14:28 UTC (rev 15)
@@ -1,16 +1,8 @@
-// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov.
-// Jad home page: http://www.kpdus.com/jad.html
-// Decompiler options: packimports(3) braces fieldsfirst nonlb space
-// Source File Name: Class.java
-
package net.sf.jcontracts.codeparser;
import java.util.Enumeration;
import java.util.Vector;
-// Referenced classes of package net.sf.jcontracts.codeParser:
-// TypeMetaclass, CodeMetaclass
-
public class Class extends TypeMetaclass {
public Class(String name, String filename, int line_number) {
Modified: trunk/source/java/net/sf/jcontracts/codeparser/CodeComment.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/codeparser/CodeComment.java 2006-11-23 12:54:51 UTC (rev 14)
+++ trunk/source/java/net/sf/jcontracts/codeparser/CodeComment.java 2006-11-23 17:14:28 UTC (rev 15)
@@ -1,8 +1,3 @@
-// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov.
-// Jad home page: http://www.kpdus.com/jad.html
-// Decompiler options: packimports(3) braces fieldsfirst nonlb space
-// Source File Name: CodeComment.java
-
package net.sf.jcontracts.codeparser;
import java.io.Serializable;
Modified: trunk/source/java/net/sf/jcontracts/codeparser/CodeMetaclass.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/codeparser/CodeMetaclass.java 2006-11-23 12:54:51 UTC (rev 14)
+++ trunk/source/java/net/sf/jcontracts/codeparser/CodeMetaclass.java 2006-11-23 17:14:28 UTC (rev 15)
@@ -1,16 +1,8 @@
-// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov.
-// Jad home page: http://www.kpdus.com/jad.html
-// Decompiler options: packimports(3) braces fieldsfirst nonlb space
-// Source File Name: CodeMetaclass.java
-
package net.sf.jcontracts.codeparser;
import java.io.Serializable;
import java.util.Vector;
-// Referenced classes of package net.sf.jcontracts.codeParser:
-// CodeComment, ICodeMetaclassVisitor
-
public abstract class CodeMetaclass
implements Serializable {
class Name
Modified: trunk/source/java/net/sf/jcontracts/codeparser/CodeMetaclassCache.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/codeparser/CodeMetaclassCache.java 2006-11-23 12:54:51 UTC (rev 14)
+++ trunk/source/java/net/sf/jcontracts/codeparser/CodeMetaclassCache.java 2006-11-23 17:14:28 UTC (rev 15)
@@ -1,8 +1,3 @@
-// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov.
-// Jad home page: http://www.kpdus.com/jad.html
-// Decompiler options: packimports(3) braces fieldsfirst nonlb space
-// Source File Name: CodeMetaclassCache.java
-
package net.sf.jcontracts.codeparser;
import antlr.ParserException;
@@ -10,9 +5,6 @@
import java.util.Enumeration;
import java.util.Vector;
-// Referenced classes of package net.sf.jcontracts.codeParser:
-// Parser, MetaclassFactory
-
public class CodeMetaclassCache {
private static final String base;
Modified: trunk/source/java/net/sf/jcontracts/codeparser/DebugVisitor.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/codeparser/DebugVisitor.java 2006-11-23 12:54:51 UTC (rev 14)
+++ trunk/source/java/net/sf/jcontracts/codeparser/DebugVisitor.java 2006-11-23 17:14:28 UTC (rev 15)
@@ -1,15 +1,7 @@
-// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov.
-// Jad home page: http://www.kpdus.com/jad.html
-// Decompiler options: packimports(3) braces fieldsfirst nonlb space
-// Source File Name: DebugVisitor.java
-
package net.sf.jcontracts.codeparser;
import java.io.PrintStream;
-// Referenced classes of package net.sf.jcontracts.codeParser:
-// ICodeMetaclassVisitor, CodeMetaclass
-
public class DebugVisitor
implements ICodeMetaclassVisitor {
Modified: trunk/source/java/net/sf/jcontracts/codeparser/DottyVisitor.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/codeparser/DottyVisitor.java 2006-11-23 12:54:51 UTC (rev 14)
+++ trunk/source/java/net/sf/jcontracts/codeparser/DottyVisitor.java 2006-11-23 17:14:28 UTC (rev 15)
@@ -1,8 +1,3 @@
-// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov.
-// Jad home page: http://www.kpdus.com/jad.html
-// Decompiler options: packimports(3) braces fieldsfirst nonlb space
-// Source File Name: DottyVisitor.java
-
package net.sf.jcontracts.codeparser;
import java.io.*;
@@ -11,10 +6,6 @@
import net.sf.jcontracts.idarwin.specification.openapi.IArchitectureExporter;
import net.sf.jcontracts.idarwin.specification.openapi.IArchitectureSpecification;
-// Referenced classes of package net.sf.jcontracts.codeParser:
-// ICodeMetaclassVisitor, Dotty_Component_TypeLevel, Dotty_Component_PackageLevel, IDependencyFilter,
-// IDotty_Component_Level, DottyVisitorConstants, CodeMetaclass
-
public class DottyVisitor
implements ICodeMetaclassVisitor {
Modified: trunk/source/java/net/sf/jcontracts/codeparser/DottyVisitorConstants.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/codeparser/DottyVisitorConstants.java 2006-11-23 12:54:51 UTC (rev 14)
+++ trunk/source/java/net/sf/jcontracts/codeparser/DottyVisitorConstants.java 2006-11-23 17:14:28 UTC (rev 15)
@@ -1,8 +1,3 @@
-// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov.
-// Jad home page: http://www.kpdus.com/jad.html
-// Decompiler options: packimports(3) braces fieldsfirst nonlb space
-// Source File Name: DottyVisitorConstants.java
-
package net.sf.jcontracts.codeparser;
Modified: trunk/source/java/net/sf/jcontracts/codeparser/Dotty_Component_CommonLevel.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/codeparser/Dotty_Component_CommonLevel.java 2006-11-23 12:54:51 UTC (rev 14)
+++ trunk/source/java/net/sf/jcontracts/codeparser/Dotty_Component_CommonLevel.java 2006-11-23 17:14:28 UTC (rev 15)
@@ -1,8 +1,3 @@
-// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov.
-// Jad home page: http://www.kpdus.com/jad.html
-// Decompiler options: packimports(3) braces fieldsfirst nonlb space
-// Source File Name: Dotty_Component_CommonLevel.java
-
package net.sf.jcontracts.codeparser;
import java.io.PrintStream;
@@ -12,9 +7,6 @@
import net.sf.jcontracts.icontract.QuietOption;
import net.sf.jcontracts.idarwin.specification.openapi.IArchitectureSpecification;
-// Referenced classes of package net.sf.jcontracts.codeParser:
-// IDependencyFilter, DottyVisitorConstants, CodeMetaclass, Class
-
public class Dotty_Component_CommonLevel {
protected Vector previouslyCheckedlinks;
Modified: trunk/source/java/net/sf/jcontracts/codeparser/Dotty_Component_PackageLevel.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/codeparser/Dotty_Component_PackageLevel.java 2006-11-23 12:54:51 UTC (rev 14)
+++ trunk/source/java/net/sf/jcontracts/codeparser/Dotty_Component_PackageLevel.java 2006-11-23 17:14:28 UTC (rev 15)
@@ -1,8 +1,3 @@
-// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov.
-// Jad home page: http://www.kpdus.com/jad.html
-// Decompiler options: packimports(3) braces fieldsfirst nonlb space
-// Source File Name: Dotty_Component_PackageLevel.java
-
package net.sf.jcontracts.codeparser;
import java.io.PrintStream;
@@ -12,11 +7,6 @@
import net.sf.jcontracts.idarwin.specification.openapi.IArchitectureSpecification;
-// Referenced classes of package net.sf.jcontracts.codeParser:
-// Dotty_Component_CommonLevel, IDotty_Component_Level, Method, CodeMetaclass,
-// TypeMetaclass, ICodeBody, Variable, DottyVisitorConstants,
-// IDependencyFilter
-
public class Dotty_Component_PackageLevel extends Dotty_Component_CommonLevel
implements IDotty_Component_Level {
Modified: trunk/source/java/net/sf/jcontracts/codeparser/Dotty_Component_TypeLevel.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/codeparser/Dotty_Component_TypeLevel.java 2006-11-23 12:54:51 UTC (rev 14)
+++ trunk/source/java/net/sf/jcontracts/codeparser/Dotty_Component_TypeLevel.java 2006-11-23 17:14:28 UTC (rev 15)
@@ -1,8 +1,3 @@
-// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov.
-// Jad home page: http://www.kpdus.com/jad.html
-// Decompiler options: packimports(3) braces fieldsfirst nonlb space
-// Source File Name: Dotty_Component_TypeLevel.java
-
package net.sf.jcontracts.codeparser;
import java.io.PrintStream;
@@ -12,11 +7,6 @@
import net.sf.jcontracts.idarwin.specification.openapi.IArchitectureSpecification;
-// Referenced classes of package net.sf.jcontracts.codeParser:
-// Dotty_Component_CommonLevel, IDotty_Component_Level, DottyVisitorConstants, Method,
-// CodeMetaclass, TypeMetaclass, ICodeBody, Variable,
-// IDependencyFilter
-
public class Dotty_Component_TypeLevel extends Dotty_Component_CommonLevel
implements IDotty_Component_Level {
Modified: trunk/source/java/net/sf/jcontracts/codeparser/ExtendedToken.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/codeparser/ExtendedToken.java 2006-11-23 12:54:51 UTC (rev 14)
+++ trunk/source/java/net/sf/jcontracts/codeparser/ExtendedToken.java 2006-11-23 17:14:28 UTC (rev 15)
@@ -1,8 +1,3 @@
-// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov.
-// Jad home page: http://www.kpdus.com/jad.html
-// Decompiler options: packimports(3) braces fieldsfirst nonlb space
-// Source File Name: ExtendedToken.java
-
package net.sf.jcontracts.codeparser;
import antlr.CommonToken;
Modified: trunk/source/java/net/sf/jcontracts/codeparser/ICodeBody.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/codeparser/ICodeBody.java 2006-11-23 12:54:51 UTC (rev 14)
+++ trunk/source/java/net/sf/jcontracts/codeparser/ICodeBody.java 2006-11-23 17:14:28 UTC (rev 15)
@@ -1,8 +1,3 @@
-// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov.
-// Jad home page: http://www.kpdus.com/jad.html
-// Decompiler options: packimports(3) braces fieldsfirst nonlb space
-// Source File Name: ICodeBody.java
-
package net.sf.jcontracts.codeparser;
import java.util.Vector;
Modified: trunk/source/java/net/sf/jcontracts/codeparser/ICodeMetaclassVisitor.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/codeparser/ICodeMetaclassVisitor.java 2006-11-23 12:54:51 UTC (rev 14)
+++ trunk/source/java/net/sf/jcontracts/codeparser/ICodeMetaclassVisitor.java 2006-11-23 17:14:28 UTC (rev 15)
@@ -1,14 +1,6 @@
-// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov.
-// Jad home page: http://www.kpdus.com/jad.html
-// Decompiler options: packimports(3) braces fieldsfirst nonlb space
-// Source File Name: ICodeMetaclassVisitor.java
-
package net.sf.jcontracts.codeparser;
-// Referenced classes of package net.sf.jcontracts.codeParser:
-// CodeMetaclass
-
public interface ICodeMetaclassVisitor {
public abstract void accept(CodeMetaclass codemetaclass);
Modified: trunk/source/java/net/sf/jcontracts/codeparser/IDependencyFilter.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/codeparser/IDependencyFilter.java 2006-11-23 12:54:51 UTC (rev 14)
+++ trunk/source/java/net/sf/jcontracts/codeparser/IDependencyFilter.java 2006-11-23 17:14:28 UTC (rev 15)
@@ -1,8 +1,3 @@
-// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov.
-// Jad home page: http://www.kpdus.com/jad.html
-// Decompiler options: packimports(3) braces fieldsfirst nonlb space
-// Source File Name: IDependencyFilter.java
-
package net.sf.jcontracts.codeparser;
import java.io.IOException;
@@ -10,9 +5,6 @@
import net.sf.jcontracts.idarwin.specification.openapi.IArchitectureSpecification;
-// Referenced classes of package net.sf.jcontracts.codeParser:
-// CodeMetaclass
-
public interface IDependencyFilter {
public abstract void addDependency(String s, String s1, int i, PrintWriter printwriter, boolean flag, String s2, IArchitectureSpecification iarchitecturespecification,
Modified: trunk/source/java/net/sf/jcontracts/codeparser/IDotty_Component_Level.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/codeparser/IDotty_Component_Level.java 2006-11-23 12:54:51 UTC (rev 14)
+++ trunk/source/java/net/sf/jcontracts/codeparser/IDotty_Component_Level.java 2006-11-23 17:14:28 UTC (rev 15)
@@ -1,8 +1,3 @@
-// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov.
-// Jad home page: http://www.kpdus.com/jad.html
-// Decompiler options: packimports(3) braces fieldsfirst nonlb space
-// Source File Name: IDotty_Component_Level.java
-
package net.sf.jcontracts.codeparser;
import java.io.PrintWriter;
@@ -10,9 +5,6 @@
import net.sf.jcontracts.idarwin.specification.openapi.IArchitectureSpecification;
-// Referenced classes of package net.sf.jcontracts.codeParser:
-// CodeMetaclass
-
public interface IDotty_Component_Level {
public abstract void acceptMethod(CodeMetaclass codemetaclass, PrintWriter printwriter, boolean flag, IArchitectureSpecification iarchitecturespecification, boolean flag1);
Modified: trunk/source/java/net/sf/jcontracts/codeparser/Interface.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/codeparser/Interface.java 2006-11-23 12:54:51 UTC (rev 14)
+++ trunk/source/java/net/sf/jcontracts/codeparser/Interface.java 2006-11-23 17:14:28 UTC (rev 15)
@@ -1,15 +1,7 @@
-// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov.
-// Jad home page: http://www.kpdus.com/jad.html
-// Decompiler options: packimports(3) braces fieldsfirst nonlb space
-// Source File Name: Interface.java
-
package net.sf.jcontracts.codeparser;
import java.util.Vector;
-// Referenced classes of package net.sf.jcontracts.codeParser:
-// TypeMetaclass, CodeMetaclass
-
public class Interface extends TypeMetaclass {
public Interface(String name, String filename, int line_number) {
Modified: trunk/source/java/net/sf/jcontracts/codeparser/JavaLexer.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/codeparser/JavaLexer.java 2006-11-23 12:54:51 UTC (rev 14)
+++ trunk/source/java/net/sf/jcontracts/codeparser/JavaLexer.java 2006-11-23 17:14:28 UTC (rev 15)
@@ -1,8 +1,3 @@
-// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov.
-// Jad home page: http://www.kpdus.com/jad.html
-// Decompiler options: packimports(3) braces fieldsfirst nonlb space
-// Source File Name: JavaLexer.java
-
package net.sf.jcontracts.codeparser;
import antlr.*;
@@ -10,9 +5,6 @@
import java.io.InputStream;
import java.util.Hashtable;
-// Referenced classes of package net.sf.jcontracts.codeParser:
-// JavaTokenTypes, ExtendedToken, CodeComment
-
public class JavaLexer extends CharScannerNoBacktrackingNoInteractive
implements JavaTokenTypes, Tokenizer {
Modified: trunk/source/java/net/sf/jcontracts/codeparser/JavaParser.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/codeparser/JavaParser.java 2006-11-23 12:54:51 UTC (rev 14)
+++ trunk/source/java/net/sf/jcontracts/codeparser/JavaParser.java 2006-11-23 17:14:28 UTC (rev 15)
@@ -1,8 +1,3 @@
-// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov.
-// Jad home page: http://www.kpdus.com/jad.html
-// Decompiler options: packimports(3) braces fieldsfirst nonlb space
-// Source File Name: JavaParser.java
-
package net.sf.jcontracts.codeparser;
import antlr.*;
@@ -12,12 +7,6 @@
import net.sf.jcontracts.dependencyanalyzer.Node;
-// Referenced classes of package net.sf.jcontracts.codeParser:
-// JavaTokenTypes, ICodeBody, CodeMetaclass, ParserMetaclassFactory,
-// TypeMetaclass, ExtendedToken, CodeComment, Method,
-// Variable, JavaLexer, MetaclassFactory, DebugVisitor,
-// Class, Interface
-
public class JavaParser extends LLkParserNoInteractive
implements JavaTokenTypes {
Modified: trunk/source/java/net/sf/jcontracts/codeparser/JavaTokenTypes.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/codeparser/JavaTokenTypes.java 2006-11-23 12:54:51 UTC (rev 14)
+++ trunk/source/java/net/sf/jcontracts/codeparser/JavaTokenTypes.java 2006-11-23 17:14:28 UTC (rev 15)
@@ -1,8 +1,3 @@
-// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov.
-// Jad home page: http://www.kpdus.com/jad.html
-// Decompiler options: packimports(3) braces fieldsfirst nonlb space
-// Source File Name: JavaTokenTypes.java
-
package net.sf.jcontracts.codeparser;
Modified: trunk/source/java/net/sf/jcontracts/codeparser/MetaclassFactory.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/codeparser/MetaclassFactory.java 2006-11-23 12:54:51 UTC (rev 14)
+++ trunk/source/java/net/sf/jcontracts/codeparser/MetaclassFactory.java 2006-11-23 17:14:28 UTC (rev 15)
@@ -1,16 +1,7 @@
-// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov.
-// Jad home page: http://www.kpdus.com/jad.html
-// Decompiler options: packimports(3) braces fieldsfirst nonlb space
-// Source File Name: MetaclassFactory.java
-
package net.sf.jcontracts.codeparser;
import java.util.Vector;
-// Referenced classes of package net.sf.jcontracts.codeParser:
-// ParserMetaclassFactory, Class, CodeMetaclass, Interface,
-// Method, Variable
-
public class MetaclassFactory
implements ParserMetaclassFactory {
Modified: trunk/source/java/net/sf/jcontracts/codeparser/Method.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/codeparser/Method.java 2006-11-23 12:54:51 UTC (rev 14)
+++ trunk/source/java/net/sf/jcontracts/codeparser/Method.java 2006-11-23 17:14:28 UTC (rev 15)
@@ -1,15 +1,7 @@
-// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov.
-// Jad home page: http://www.kpdus.com/jad.html
-// Decompiler options: packimports(3) braces fieldsfirst nonlb space
-// Source File Name: Method.java
-
package net.sf.jcontracts.codeparser;
import java.util.Vector;
-// Referenced classes of package net.sf.jcontracts.codeParser:
-// CodeMetaclass, ICodeBody, ICodeMetaclassVisitor, TypeMetaclass
-
public class Method extends CodeMetaclass
implements ICodeBody {
Modified: trunk/source/java/net/sf/jcontracts/codeparser/Parser.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/codeparser/Parser.java 2006-11-23 12:54:51 UTC (rev 14)
+++ trunk/source/java/net/sf/jcontracts/codeparser/Parser.java 2006-11-23 17:14:28 UTC (rev 15)
@@ -1,8 +1,3 @@
-// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov.
-// Jad home page: http://www.kpdus.com/jad.html
-// Decompiler options: packimports(3) braces fieldsfirst nonlb space
-// Source File Name: Parser.java
-
package net.sf.jcontracts.codeparser;
import antlr.CharScanner;
@@ -11,9 +6,6 @@
import java.util.Hashtable;
import java.util.Vector;
-// Referenced classes of package net.sf.jcontracts.codeParser:
-// JavaLexer, JavaParser, ParserMetaclassFactory
-
public class Parser {
private JavaParser _javaparser;
Modified: trunk/source/java/net/sf/jcontracts/codeparser/ParserMetaclassFactory.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/codeparser/ParserMetaclassFactory.java 2006-11-23 12:54:51 UTC (rev 14)
+++ trunk/source/java/net/sf/jcontracts/codeparser/ParserMetaclassFactory.java 2006-11-23 17:14:28 UTC (rev 15)
@@ -1,15 +1,7 @@
-// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov.
-// Jad home page: http://www.kpdus.com/jad.html
-// Decompiler options: packimports(3) braces fieldsfirst nonlb space
-// Source File Name: ParserMetaclassFactory.java
-
package net.sf.jcontracts.codeparser;
import java.util.Vector;
-// Referenced classes of package net.sf.jcontracts.codeParser:
-// Class, Interface, Method, Variable
-
public interface ParserMetaclassFactory {
public abstract String getPackage();
Modified: trunk/source/java/net/sf/jcontracts/codeparser/TypeMetaclass.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/codeparser/TypeMetaclass.java 2006-11-23 12:54:51 UTC (rev 14)
+++ trunk/source/java/net/sf/jcontracts/codeparser/TypeMetaclass.java 2006-11-23 17:14:28 UTC (rev 15)
@@ -1,15 +1,7 @@
-// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov.
-// Jad home page: http://www.kpdus.com/jad.html
-// Decompiler options: packimports(3) braces fieldsfirst nonlb space
-// Source File Name: TypeMetaclass.java
-
package net.sf.jcontracts.codeparser;
import java.util.Vector;
-// Referenced classes of package net.sf.jcontracts.codeParser:
-// CodeMetaclass, ICodeBody, ICodeMetaclassVisitor, Method
-
public abstract class TypeMetaclass extends CodeMetaclass
implements ICodeBody {
Modified: trunk/source/java/net/sf/jcontracts/codeparser/Variable.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/codeparser/Variable.java 2006-11-23 12:54:51 UTC (rev 14)
+++ trunk/source/java/net/sf/jcontracts/codeparser/Variable.java 2006-11-23 17:14:28 UTC (rev 15)
@@ -1,15 +1,7 @@
-// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov.
-// Jad home page: http://www.kpdus.com/jad.html
-// Decompiler options: packimports(3) braces fieldsfirst nonlb space
-// Source File Name: Variable.java
-
package net.sf.jcontracts.codeparser;
import java.util.Vector;
-// Referenced classes of package net.sf.jcontracts.codeParser:
-// CodeMetaclass, ICodeMetaclassVisitor
-
public class Variable extends CodeMetaclass {
private String _type;
Modified: trunk/source/java/net/sf/jcontracts/dependencyanalyzer/BooleanBlockWithNodeArg.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/dependencyanalyzer/BooleanBlockWithNodeArg.java 2006-11-23 12:54:51 UTC (rev 14)
+++ trunk/source/java/net/sf/jcontracts/dependencyanalyzer/BooleanBlockWithNodeArg.java 2006-11-23 17:14:28 UTC (rev 15)
@@ -1,14 +1,6 @@
-// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov.
-// Jad home page: http://www.kpdus.com/jad.html
-// Decompiler options: packimports(3) braces fieldsfirst nonlb space
-// Source File Name: BooleanBlockWithNodeArg.java
-
package net.sf.jcontracts.dependencyanalyzer;
-// Referenced classes of package net.sf.jcontracts.dependencyAnalyzer:
-// Node
-
public interface BooleanBlockWithNodeArg {
public abstract boolean eval(Node node);
Modified: trunk/source/java/net/sf/jcontracts/dependencyanalyzer/DependencyAnalyzer.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/dependencyanalyzer/DependencyAnalyzer.java 2006-11-23 12:54:51 UTC (rev 14)
+++ trunk/source/java/net/sf/jcontracts/dependencyanalyzer/DependencyAnalyzer.java 2006-11-23 17:14:28 UTC (rev 15)
@@ -1,16 +1,8 @@
-// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov.
-// Jad home page: http://www.kpdus.com/jad.html
-// Decompiler options: packimports(3) braces fieldsfirst nonlb space
-// Source File Name: DependencyAnalyzer.java
-
package net.sf.jcontracts.dependencyanalyzer;
import java.util.Enumeration;
import java.util.Vector;
-// Referenced classes of package net.sf.jcontracts.dependencyAnalyzer:
-// Graph, Node
-
public class DependencyAnalyzer {
private Graph dg_;
Modified: trunk/source/java/net/sf/jcontracts/dependencyanalyzer/Graph.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/dependencyanalyzer/Graph.java 2006-11-23 12:54:51 UTC (rev 14)
+++ trunk/source/java/net/sf/jcontracts/dependencyanalyzer/Graph.java 2006-11-23 17:14:28 UTC (rev 15)
@@ -1,16 +1,8 @@
-// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov.
-// Jad home page: http://www.kpdus.com/jad.html
-// Decompiler options: packimports(3) braces fieldsfirst nonlb space
-// Source File Name: Graph.java
-
package net.sf.jcontracts.dependencyanalyzer;
import java.io.PrintStream;
import java.util.*;
-// Referenced classes of package net.sf.jcontracts.dependencyAnalyzer:
-// Node, BooleanBlockWithNodeArg
-
public class Graph {
protected Vector nodes_;
Modified: trunk/source/java/net/sf/jcontracts/dependencyanalyzer/Node.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/dependencyanalyzer/Node.java 2006-11-23 12:54:51 UTC (rev 14)
+++ trunk/source/java/net/sf/jcontracts/dependencyanalyzer/Node.java 2006-11-23 17:14:28 UTC (rev 15)
@@ -1,16 +1,8 @@
-// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov.
-// Jad home page: http://www.kpdus.com/jad.html
-// Decompiler options: packimports(3) braces fieldsfirst nonlb space
-// Source File Name: Node.java
-
package net.sf.jcontracts.dependencyanalyzer;
import java.util.Enumeration;
import java.util.Vector;
-// Referenced classes of package net.sf.jcontracts.dependencyAnalyzer:
-// BooleanBlockWithNodeArg
-
public class Node {
protected String name_;
Modified: trunk/source/java/net/sf/jcontracts/icontract/AllFilesUpToDateException.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/AllFilesUpToDateException.java 2006-11-23 12:54:51 UTC (rev 14)
+++ trunk/source/java/net/sf/jcontracts/icontract/AllFilesUpToDateException.java 2006-11-23 17:14:28 UTC (rev 15)
@@ -1,8 +1,3 @@
-// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov.
-// Jad home page: http://www.kpdus.com/jad.html
-// Decompiler options: packimports(3) braces fieldsfirst nonlb space
-// Source File Name: AllFilesUpToDateException.java
-
package net.sf.jcontracts.icontract;
public class AllFilesUpToDateException extends RuntimeException {
Modified: trunk/source/java/net/sf/jcontracts/icontract/AllOption.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/AllOption.java 2006-11-23 12:54:51 UTC (rev 14)
+++ trunk/source/java/net/sf/jcontracts/icontract/AllOption.java 2006-11-23 17:14:28 UTC (rev 15)
@@ -1,15 +1,7 @@
-// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov.
-// Jad home page: http://www.kpdus.com/jad.html
-// Decompiler options: packimports(3) braces fieldsfirst nonlb space
-// Source File Name: AllOption.java
-
package net.sf.jcontracts.icontract;
import java.util.Vector;
-// Referenced classes of package net.sf.jcontracts.iContract:
-// ParameterOption
-
public class AllOption extends ParameterOption {
public static final String NAME = "a";
Modified: trunk/source/java/net/sf/jcontracts/icontract/ArgMetaclassFactory.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/ArgMetaclassFactory.java 2006-11-23 12:54:51 UTC (rev 14)
+++ trunk/source/java/net/sf/jcontracts/icontract/ArgMetaclassFactory.java 2006-11-23 17:14:28 UTC (rev 15)
@@ -1,8 +1,3 @@
-// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov.
-// Jad home page: http://www.kpdus.com/jad.html
-// Decompiler options: packimports(3) braces fieldsfirst nonlb space
-// Source File Name: ArgMetaclassFactory.java
-
package net.sf.jcontracts.icontract;
import net.sf.jcontracts.argparser.*;
@@ -11,14 +6,6 @@
import java.io.PrintStream;
import java.util.Vector;
-// Referenced classes of package net.sf.jcontracts.iContract:
-// HelpOption, VerboseOption, CompilerOption, SourceCompilerOption,
-// NoRepositoryCompilationOption, OutputOption, OneOneOption, RepositoryOutputOption,
-// DefaultExceptionOption, CleanOption, MergeOption, InvCheckCallOption,
-// WrapExceptionOption, QuietOption, AllOption, XOption,
-// Internal0Option, NoInitialCompilationOption, StopException, Log,
-// FileTarget
-
public class ArgMetaclassFactory
implements ParserMetaclassFactory {
Modified: trunk/source/java/net/sf/jcontracts/icontract/AssertionExpression.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/AssertionExpression.java 2006-11-23 12:54:51 UTC (rev 14)
+++ trunk/source/java/net/sf/jcontracts/icontract/AssertionExpression.java 2006-11-23 17:14:28 UTC (rev 15)
@@ -1,8 +1,3 @@
-// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov.
-// Jad home page: http://www.kpdus.com/jad.html
-// Decompiler options: packimports(3) braces fieldsfirst nonlb space
-// Source File Name: AssertionExpression.java
-
package net.sf.jcontracts.icontract;
import net.sf.jcontracts.codeparser.CodeMetaclass;
@@ -12,9 +7,6 @@
import java.util.Hashtable;
import java.util.Vector;
-// Referenced classes of package net.sf.jcontracts.iContract:
-// IContracted, Log, UnableToDetermineTypeException
-
class AssertionExpression {
private static final Logger log = Logger.getLogger(AssertionExpression.class);
private String expression_;
Modified: trunk/source/java/net/sf/jcontracts/icontract/Class.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/Class.java 2006-11-23 12:54:51 UTC (rev 14)
+++ trunk/source/java/net/sf/jcontracts/icontract/Class.java 2006-11-23 17:14:28 UTC (rev 15)
@@ -1,8 +1,3 @@
-// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov.
-// Jad home page: http://www.kpdus.com/jad.html
-// Decompiler options: packimports(3) braces fieldsfirst nonlb space
-// Source File Name: Class.java
-
package net.sf.jcontracts.icontract;
import net.sf.jcontracts.codeparser.CodeMetaclass;
@@ -15,10 +10,6 @@
import java.util.Enumeration;
import java.util.Vector;
-// Referenced classes of package net.sf.jcontracts.iContract:
-// InvCheck, PrePostCheck, Log, Method,
-// StopException, AssertionExpression, UnableToDetermineTypeException
-
public class Class extends net.sf.jcontracts.codeparser.Class
implements InvCheck, PrePostCheck {
private static final Logger log = Logger.getLogger(Class.class);
Modified: trunk/source/java/net/sf/jcontracts/icontract/CleanOption.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/CleanOption.java 2006-11-23 12:54:51 UTC (rev 14)
+++ trunk/source/java/net/sf/jcontracts/icontract/CleanOption.java 2006-11-23 17:14:28 UTC (rev 15)
@@ -1,16 +1,8 @@
-// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov.
-// Jad home page: http://www.kpdus.com/jad.html
-// Decompiler options: packimports(3) braces fieldsfirst nonlb space
-// Source File Name: CleanOption.java
-
package net.sf.jcontracts.icontract;
import org.apache.log4j.Logger;
import java.util.Vector;
-// Referenced classes of package net.sf.jcontracts.iContract:
-// ParameterOption
-
public class CleanOption extends ParameterOption {
public static final String NAME = "r";
Modified: trunk/source/java/net/sf/jcontracts/icontract/CompilerOption.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/CompilerOption.java 2006-11-23 12:54:51 UTC (rev 14)
+++ trunk/source/java/net/sf/jcontracts/icontract/CompilerOption.java 2006-11-23 17:14:28 UTC (rev 15)
@@ -1,8 +1,3 @@
-// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov.
-// Jad home page: http://www.kpdus.com/jad.html
-// Decompiler options: packimports(3) braces fieldsfirst nonlb space
-// Source File Name: CompilerOption.java
-
package net.sf.jcontracts.icontract;
import net.sf.jcontracts.argparser.OptionMetaclass;
@@ -13,9 +8,6 @@
import java.util.Vector;
import sun.tools.javac.Main;
-// Referenced classes of package net.sf.jcontracts.iContract:
-// ParameterOption, Log, StopException, Internal0Option
-
public class CompilerOption extends ParameterOption {
private static final Logger log = Logger.getLogger(CompilerOption.class);
Modified: trunk/source/java/net/sf/jcontracts/icontract/Constants.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/Constants.java 2006-11-23 12:54:51 UTC (rev 14)
+++ trunk/source/java/net/sf/jcontracts/icontract/Constants.java 2006-11-23 17:14:28 UTC (rev 15)
@@ -1,8 +1,3 @@
-// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov.
-// Jad home page: http://www.kpdus.com/jad.html
-// Decompiler options: packimports(3) braces fieldsfirst nonlb space
-// Source File Name: Constants.java
-
package net.sf.jcontracts.icontract;
import org.apache.log4j.Logger;
Modified: trunk/source/java/net/sf/jcontracts/icontract/Darwin.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/Darwin.java 2006-11-23 12:54:51 UTC (rev 14)
+++ trunk/source/java/net/sf/jcontracts/icontract/Darwin.java 2006-11-23 17:14:28 UTC (rev 15)
@@ -1,8 +1,3 @@
-// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov.
-// Jad home page: http://www.kpdus.com/jad.html
-// Decompiler options: packimports(3) braces fieldsfirst nonlb space
-// Source File Name: Darwin.java
-
package net.sf.jcontracts.icontract;
import net.sf.jcontracts.argparser.Parser;
@@ -16,10 +11,6 @@
import java.util.*;
import javax.swing.JOptionPane;
-// Referenced classes of package net.sf.jcontracts.iContract:
-// ArgMetaclassFactory, SystemInTarget, Target, HelpOption,
-// Option, ParameterOption, StopException, AllFilesUpToDateException
-
public class Darwin {
private static final Logger log = Logger.getLogger(Darwin.class);
Modified: trunk/source/java/net/sf/jcontracts/icontract/DefaultExceptionOption.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/DefaultExceptionOption.java 2006-11-23 12:54:51 UTC (rev 14)
+++ trunk/source/java/net/sf/jcontracts/icontract/DefaultExceptionOption.java 2006-11-23 17:14:28 UTC (rev 15)
@@ -1,8 +1,3 @@
-// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov.
-// Jad home page: http://www.kpdus.com/jad.html
-// Decompiler options: packimports(3) braces fieldsfirst nonlb space
-// Source File Name: DefaultExceptionOption.java
-
package net.sf.jcontracts.icontract;
import net.sf.jcontracts.argparser.OptionMetaclass;
@@ -10,9 +5,6 @@
import org.apache.log4j.Logger;
import java.util.Vector;
-// Referenced classes of package net.sf.jcontracts.iContract:
-// ParameterOption
-
public class DefaultExceptionOption extends ParameterOption {
public static final String NAME = "d";
Modified: trunk/source/java/net/sf/jcontracts/icontract/FileTarget.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/FileTarget.java 2006-11-23 12:54:51 UTC (rev 14)
+++ trunk/source/java/net/sf/jcontracts/icontract/FileTarget.java 2006-11-23 17:14:28 UTC (rev 15)
@@ -1,8 +1,3 @@
-// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov.
-// Jad home page: http://www.kpdus.com/jad.html
-// Decompiler options: packimports(3) braces fieldsfirst nonlb space
-// Source File Name: FileTarget.java
-
package net.sf.jcontracts.icontract;
import net.sf.jcontracts.codeparser.Parser;
@@ -12,10 +7,6 @@
import java.util.Enumeration;
import java.util.Vector;
-// Referenced classes of package net.sf.jcontracts.iContract:
-// Target, StopException, Log, Option,
-// CleanOption, MetaclassFactory, ProcessingOption
-
public class FileTarget extends Target {
private static final Logger log = Logger.getLogger(FileTarget.class);
Modified: trunk/source/java/net/sf/jcontracts/icontract/HelpOption.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/HelpOption.java 2006-11-23 12:54:51 UTC (rev 14)
+++ trunk/source/java/net/sf/jcontracts/icontract/HelpOption.java 2006-11-23 17:14:28 UTC (rev 15)
@@ -1,17 +1,9 @@
-// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov.
-// Jad home page: http://www.kpdus.com/jad.html
-// Decompiler options: packimports(3) braces fieldsfirst nonlb space
-// Source File Name: HelpOption.java
-
package net.sf.jcontracts.icontract;
import org.apache.log4j.Logger;
import java.io.PrintStream;
import java.util.Vector;
-// Referenced classes of package net.sf.jcontracts.iContract:
-// ParameterOption, StopException
-
public class HelpOption extends ParameterOption {
public static final String VERSION = "for JDK 1.5, iContract v2.0";
Modified: trunk/source/java/net/sf/jcontracts/icontract/IContracted.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/IContracted.java 2006-11-23 12:54:51 UTC (rev 14)
+++ trunk/source/java/net/sf/jcontracts/icontract/IContracted.java 2006-11-23 17:14:28 UTC (rev 15)
@@ -1,15 +1,7 @@
-// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov.
-// Jad home page: http://www.kpdus.com/jad.html
-// Decompiler options: packimports(3) braces fieldsfirst nonlb space
-// Source File Name: IContracted.java
-
package net.sf.jcontracts.icontract;
import org.apache.log4j.Logger;
-// Referenced classes of package net.sf.jcontracts.iContract:
-// UnableToDetermineTypeException
-
public interface IContracted {
public abstract String getTypeOfValue(String s) throws UnableToDetermineTypeException;
Modified: trunk/source/java/net/sf/jcontracts/icontract/Interface.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/Interface.java 2006-11-23 12:54:51 UTC (rev 14)
+++ trunk/source/java/net/sf/jcontracts/icontract/Interface.java 2006-11-23 17:14:28 UTC (rev 15)
@@ -1,8 +1,3 @@
-// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov.
-// Jad home page: http://www.kpdus.com/jad.html
-// Decompiler options: packimports(3) braces fieldsfirst nonlb space
-// Source File Name: Interface.java
-
package net.sf.jcontracts.icontract;
import net.sf.jcontracts.codeparser.CodeMetaclass;
@@ -15,10 +10,6 @@
import java.util.Enumeration;
import java.util.Vector;
-// Referenced classes of package net.sf.jcontracts.iContract:
-// PrePostCheck, InvCheck, Class, Log,
-// Method, StopException, UnableToDetermineTypeException
-
public class Interface extends net.sf.jcontracts.codeparser.Interface
implements PrePostCheck, InvCheck {
private static final Logger log = Logger.getLogger(Interface.class);
Modified: trunk/source/java/net/sf/jcontracts/icontract/Internal0Option.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/Internal0Option.java 2006-11-23 12:54:51 UTC (rev 14)
+++ trunk/source/java/net/sf/jcontracts/icontract/Internal0Option.java 2006-11-23 17:14:28 UTC (rev 15)
@@ -1,16 +1,8 @@
-// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov.
-// Jad home page: http://www.kpdus.com/jad.html
-// Decompiler options: packimports(3) braces fieldsfirst nonlb space
-// Source File Name: Internal0Option.java
-
package net.sf.jcontracts.icontract;
import org.apache.log4j.Logger;
import java.util.Vector;
-// Referenced classes of package net.sf.jcontracts.iContract:
-// ParameterOption
-
public class Internal0Option extends ParameterOption {
public static final String NAME = "Z";
Modified: trunk/source/java/net/sf/jcontracts/icontract/InvCheck.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/InvCheck.java 2006-11-23 12:54:51 UTC (rev 14)
+++ trunk/source/java/net/sf/jcontracts/icontract/InvCheck.java 2006-11-23 17:14:28 UTC (rev 15)
@@ -1,16 +1,8 @@
-// Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov.
-// Jad home page: http://www.kpdus.com/jad.html
-// Decompiler options: packimports(3) braces fieldsfirst nonlb space
-// Source File Name: InvCheck.java
-
package net.sf.jcontracts.icontract;
import org.apache.log4j.Logger;
import java.util.Vector;
-// Referenced classes of package net.sf.jcontracts.iContract:
-// IContr...
[truncated message content] |
|
From: <js...@us...> - 2006-11-23 12:54:53
|
Revision: 14
http://svn.sourceforge.net/jcontracts/?rev=14&view=rev
Author: jstuyts
Date: 2006-11-23 04:54:51 -0800 (Thu, 23 Nov 2006)
Log Message:
-----------
Moved downloads to file releases page so they don't have to be uploaded each time the site changes.
Modified Paths:
--------------
trunk/site/download.html
Removed Paths:
-------------
trunk/site/resources/downloads/
Modified: trunk/site/download.html
===================================================================
--- trunk/site/download.html 2006-11-23 12:37:47 UTC (rev 13)
+++ trunk/site/download.html 2006-11-23 12:54:51 UTC (rev 14)
@@ -30,21 +30,12 @@
<p>The current release is v1.01.00b01. It is practically the same as the JAR compiled by John Swapceinski which is
available from <a href="http://www.icontract2.org/">http://www.icontract2.org/</a>, but the classes have been
moved to another package. You can download the release from the <a
- href="https://sourceforge.net/project/showfiles.php?group_id=175492"><i>files</i> page of the project</a>.</p>
+ href="https://sourceforge.net/project/showfiles.php?group_id=175492">file releases page of the project</a>.</p>
- <p>You can download the original JAR files, the source code of the original JAR for JDK 1.2 which has been
- modified so it builds using a modern version of Java, and the JAR built from the source code here:</p>
+ <p>At the same page you can also download the original JAR files (package <i>icontract</i>), the source code of
+ the original JAR for JDK 1.2 which has been modified so it builds using a modern version of Java (package
+ <i>icontract2</i>), and the JAR built from this source code (package <i>icontract2</i>).</p>
- <ul>
- <li><a href="resources/downloads/icontract-jdk1_1_7.orig.jar">original JAR for JDK 1.1.7</a></li>
-
- <li><a href="resources/downloads/icontract-jdk1_2.orig.jar">original JAR for JDK 1.2</a></li>
-
- <li><a href="resources/downloads/icontract2-src.zip">source code</a></li>
-
- <li><a href="resources/downloads/icontract2.jar">JAR built from source code</a></li>
- </ul>
-
<hr />
<div class="sourceforge-logo"><a href="http://sourceforge.net"><img alt="SourceForge.net Logo" height="37"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2006-11-23 12:37:49
|
Revision: 13
http://svn.sourceforge.net/jcontracts/?rev=13&view=rev
Author: jstuyts
Date: 2006-11-23 04:37:47 -0800 (Thu, 23 Nov 2006)
Log Message:
-----------
Added participation page to the site.
Modified Paths:
--------------
trunk/site/documentation.html
trunk/site/download.html
trunk/site/index.html
trunk/site/license.html
trunk/site/roadmap.html
Added Paths:
-----------
trunk/site/participate.html
Modified: trunk/site/documentation.html
===================================================================
--- trunk/site/documentation.html 2006-11-23 10:39:31 UTC (rev 12)
+++ trunk/site/documentation.html 2006-11-23 12:37:47 UTC (rev 13)
@@ -18,6 +18,8 @@
<li class="menu">Documentation</li>
+ <li class="menu"><a href="participate.html">Participate</a></li>
+
<li class="menu"><a href="download.html">Download</a></li>
<li class="menu"><a href="license.html">License</a></li>
Modified: trunk/site/download.html
===================================================================
--- trunk/site/download.html 2006-11-23 10:39:31 UTC (rev 12)
+++ trunk/site/download.html 2006-11-23 12:37:47 UTC (rev 13)
@@ -18,6 +18,8 @@
<li class="menu"><a href="documentation.html">Documentation</a></li>
+ <li class="menu"><a href="participate.html">Participate</a></li>
+
<li class="menu">Download</li>
<li class="menu"><a href="license.html">License</a></li>
Modified: trunk/site/index.html
===================================================================
--- trunk/site/index.html 2006-11-23 10:39:31 UTC (rev 12)
+++ trunk/site/index.html 2006-11-23 12:37:47 UTC (rev 13)
@@ -18,6 +18,8 @@
<li class="menu"><a href="documentation.html">Documentation</a></li>
+ <li class="menu"><a href="participate.html">Participate</a></li>
+
<li class="menu"><a href="download.html">Download</a></li>
<li class="menu"><a href="license.html">License</a></li>
Modified: trunk/site/license.html
===================================================================
--- trunk/site/license.html 2006-11-23 10:39:31 UTC (rev 12)
+++ trunk/site/license.html 2006-11-23 12:37:47 UTC (rev 13)
@@ -18,6 +18,8 @@
<li class="menu"><a href="documentation.html">Documentation</a></li>
+ <li class="menu"><a href="participate.html">Participate</a></li>
+
<li class="menu"><a href="download.html">Download</a></li>
<li class="menu">License</li>
Added: trunk/site/participate.html
===================================================================
--- trunk/site/participate.html (rev 0)
+++ trunk/site/participate.html 2006-11-23 12:37:47 UTC (rev 13)
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html>
+ <head>
+ <title>Particpate - Java Contract Suite</title>
+
+ <link href="resources/stylesheets/jcontracts.css" rel="stylesheet" type="text/css" />
+
+ <link href="favicon.ico" rel="shortcut icon" type="image/x-icon" />
+ </head>
+
+ <body>
+ <ul class="menu">
+ <li class="menu"><a href="index.html">Home</a></li>
+
+ <li class="menu"><a href="roadmap.html">Roadmap</a></li>
+
+ <li class="menu"><a href="documentation.html">Documentation</a></li>
+
+ <li class="menu">Participate</li>
+
+ <li class="menu"><a href="download.html">Download</a></li>
+
+ <li class="menu"><a href="license.html">License</a></li>
+ </ul>
+
+ <h1>Participate</h1>
+
+ <p>Java Contract Suite can only become better if you help us. This can be done in many ways, some of which are
+ listed below:</p>
+
+ <ul>
+ <li>entering bug reports, feature requests, etc.;</li>
+
+ <li>fixing bugs, implementing feature request, etc.;</li>
+
+ <li>help other users.</li>
+ </ul>
+
+ <p>To help with participation we have a number of tools. Below is a description of each tool.</p>
+
+ <h1>News</h1>
+
+ <p>For each significant event related to the project a new item will be posted to the <a
+ href="https://sourceforge.net/news/?group_id=175492">news page of the project</a>.</p>
+
+ <p>If you want to be kept up-to-date automatically subscribe to one of the <i>project news releases</i> feeds at
+ <a href="https://sourceforge.net/export/rss2_project.php?group_id=175492">RSS page of the project</a>.</p>
+
+ <h1>Mailing lists</h1>
+
+ <p>The project makes use of four mailing lists. Two of them are for discussion among users and developers, and the
+ other two are for monitoring the activity of the issue tracker and the source repository.</p>
+
+ <dl>
+ <dt>users</dt>
+
+ <dd>Users of Java Contract Suite can discuss their experiences, best practices, problems, etc. here.</dd>
+
+ <dt>developers</dt>
+
+ <dd>Developers of Java Contract Suite can discuss development related issues here.</dd>
+
+ <dt>issues</dt>
+
+ <dd>For all modifications to issues a message will be posted here. Please do not post to this mailing list
+ directly.</dd>
+
+ <dt>svn</dt>
+
+ <dd>For all commits to the source repository a message will be posted here. Please do not post to this mailing
+ list directly.</dd>
+ </dl>
+
+ <p>You can subscribe to these mailing lists at the <a href="https://sourceforge.net/mail/?group_id=175492">mailing
+ lists page of the project</a>.</p>
+
+ <h1>Issue tracker</h1>
+
+ <p>If you have a feature that you would like to see implemented or improved, or you have found a bug you can
+ create an issue for it. This way the development can keep track of the tasks that have to be performed. The
+ project uses a <a href="https://sourceforge.net/tracker/?group_id=175492&atid=889550">single issue tracker</a>
+ for all types of issues.</p>
+
+ <p>If you enter an issues we request that you prefix an issue type code surrounded by square brackets to the
+ summary of the issue. For example, for a new feature you would prefix <code>[NEW]</code>. Here is the list of
+ issue types:</p>
+
+ <dl>
+ <dt>NEW</dt>
+
+ <dd>Request for a new feature.</dd>
+
+ <dt>ENH</dt>
+
+ <dd>Request for enhancement of an existing feature.</dd>
+
+ <dt>BUG</dt>
+
+ <dd>The program behaves in an undesired manner.</dd>
+ </dl>
+
+ <h1>Source repository</h1>
+
+ <p>If you want to help improve the code of Java Contract Suite you can obtain the source from the source
+ repository. Instructions on how to get the source can be found on the <a
+ href="https://sourceforge.net/svn/?group_id=175492">Subversion page of the project</a>.</p>
+
+ <p>Please use Subversion and the source repository instead of the source Zip file, because by using Subversion you
+ will be able to create patches which can easily be merged with the code by a committer.</p>
+
+ <hr />
+
+ <div class="sourceforge-logo"><a href="http://sourceforge.net"><img alt="SourceForge.net Logo" height="37"
+ src="resources/images/sflogo.png" width="125" /></a></div>
+
+ <p><a href="http://sourceforge.net/projects/jcontracts">The project page of JcontractS at SourceForge.net</a></p>
+ </body>
+</html>
\ No newline at end of file
Modified: trunk/site/roadmap.html
===================================================================
--- trunk/site/roadmap.html 2006-11-23 10:39:31 UTC (rev 12)
+++ trunk/site/roadmap.html 2006-11-23 12:37:47 UTC (rev 13)
@@ -18,6 +18,8 @@
<li class="menu"><a href="documentation.html">Documentation</a></li>
+ <li class="menu"><a href="participate.html">Participate</a></li>
+
<li class="menu"><a href="download.html">Download</a></li>
<li class="menu"><a href="license.html">License</a></li>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2006-11-23 10:39:33
|
Revision: 12
http://svn.sourceforge.net/jcontracts/?rev=12&view=rev
Author: jstuyts
Date: 2006-11-23 02:39:31 -0800 (Thu, 23 Nov 2006)
Log Message:
-----------
Added information about current release.
Modified Paths:
--------------
trunk/site/download.html
Modified: trunk/site/download.html
===================================================================
--- trunk/site/download.html 2006-11-23 10:23:46 UTC (rev 11)
+++ trunk/site/download.html 2006-11-23 10:39:31 UTC (rev 12)
@@ -25,7 +25,10 @@
<h1>Download</h1>
- <p>There are no releases yet. A release of the current code is expected around the end of November.</p>
+ <p>The current release is v1.01.00b01. It is practically the same as the JAR compiled by John Swapceinski which is
+ available from <a href="http://www.icontract2.org/">http://www.icontract2.org/</a>, but the classes have been
+ moved to another package. You can download the release from the <a
+ href="https://sourceforge.net/project/showfiles.php?group_id=175492"><i>files</i> page of the project</a>.</p>
<p>You can download the original JAR files, the source code of the original JAR for JDK 1.2 which has been
modified so it builds using a modern version of Java, and the JAR built from the source code here:</p>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2006-11-23 10:23:47
|
Revision: 11
http://svn.sourceforge.net/jcontracts/?rev=11&view=rev
Author: jstuyts
Date: 2006-11-23 02:23:46 -0800 (Thu, 23 Nov 2006)
Log Message:
-----------
Increased version number after release of v1.01.00b01.
Modified Paths:
--------------
trunk/project.properties
Modified: trunk/project.properties
===================================================================
--- trunk/project.properties 2006-11-23 10:22:07 UTC (rev 10)
+++ trunk/project.properties 2006-11-23 10:23:46 UTC (rev 11)
@@ -1,6 +1,6 @@
# Do not change the version number. The release manger is
# the only one allowed to change it.
-project.version=1.01.00b01-dev
+project.version=1.01.00b02-dev
distribution.name=jcontracts
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2006-11-23 10:22:09
|
Revision: 10
http://svn.sourceforge.net/jcontracts/?rev=10&view=rev
Author: jstuyts
Date: 2006-11-23 02:22:07 -0800 (Thu, 23 Nov 2006)
Log Message:
-----------
Added icon that is missing from tag for v1.01.00b01.
Added Paths:
-----------
trunk/JcontractS.ico
Added: trunk/JcontractS.ico
===================================================================
(Binary files differ)
Property changes on: trunk/JcontractS.ico
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2006-11-23 08:20:52
|
Revision: 9
http://svn.sourceforge.net/jcontracts/?rev=9&view=rev
Author: jstuyts
Date: 2006-11-23 00:20:51 -0800 (Thu, 23 Nov 2006)
Log Message:
-----------
Created tag for initial release: v1.01.00b01.
Added Paths:
-----------
tags/v1.01.00b01/
Copied: tags/v1.01.00b01 (from rev 8, trunk)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2006-11-23 08:07:09
|
Revision: 8
http://svn.sourceforge.net/jcontracts/?rev=8&view=rev
Author: jstuyts
Date: 2006-11-23 00:07:07 -0800 (Thu, 23 Nov 2006)
Log Message:
-----------
Added some documentation and the downloads of the originals and iContract2.
Modified Paths:
--------------
trunk/site/index.html
trunk/site/resources/stylesheets/jcontracts.css
Added Paths:
-----------
trunk/site/documentation.html
trunk/site/download.html
trunk/site/license.html
trunk/site/resources/downloads/
trunk/site/resources/downloads/icontract-jdk1_1_7.orig.jar
trunk/site/resources/downloads/icontract-jdk1_2.orig.jar
trunk/site/resources/downloads/icontract2-src.zip
trunk/site/resources/downloads/icontract2.jar
trunk/site/roadmap.html
Added: trunk/site/documentation.html
===================================================================
--- trunk/site/documentation.html (rev 0)
+++ trunk/site/documentation.html 2006-11-23 08:07:07 UTC (rev 8)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html>
+ <head>
+ <title>Documentation - Java Contract Suite</title>
+
+ <link href="resources/stylesheets/jcontracts.css" rel="stylesheet" type="text/css" />
+
+ <link href="favicon.ico" rel="shortcut icon" type="image/x-icon" />
+ </head>
+
+ <body>
+ <ul class="menu">
+ <li class="menu"><a href="index.html">Home</a></li>
+
+ <li class="menu"><a href="roadmap.html">Roadmap</a></li>
+
+ <li class="menu">Documentation</li>
+
+ <li class="menu"><a href="download.html">Download</a></li>
+
+ <li class="menu"><a href="license.html">License</a></li>
+ </ul>
+
+ <h1>Documentation</h1>
+
+ <p>The documentation for the command-line tool and the reference of the contract syntax will appear here soon.</p>
+
+ <hr />
+
+ <div class="sourceforge-logo"><a href="http://sourceforge.net"><img alt="SourceForge.net Logo" height="37"
+ src="resources/images/sflogo.png" width="125" /></a></div>
+
+ <p><a href="http://sourceforge.net/projects/jcontracts">The project page of JcontractS at SourceForge.net</a></p>
+ </body>
+</html>
\ No newline at end of file
Added: trunk/site/download.html
===================================================================
--- trunk/site/download.html (rev 0)
+++ trunk/site/download.html 2006-11-23 08:07:07 UTC (rev 8)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html>
+ <head>
+ <title>Download - Java Contract Suite</title>
+
+ <link href="resources/stylesheets/jcontracts.css" rel="stylesheet" type="text/css" />
+
+ <link href="favicon.ico" rel="shortcut icon" type="image/x-icon" />
+ </head>
+
+ <body>
+ <ul class="menu">
+ <li class="menu"><a href="index.html">Home</a></li>
+
+ <li class="menu"><a href="roadmap.html">Roadmap</a></li>
+
+ <li class="menu"><a href="documentation.html">Documentation</a></li>
+
+ <li class="menu">Download</li>
+
+ <li class="menu"><a href="license.html">License</a></li>
+ </ul>
+
+ <h1>Download</h1>
+
+ <p>There are no releases yet. A release of the current code is expected around the end of November.</p>
+
+ <p>You can download the original JAR files, the source code of the original JAR for JDK 1.2 which has been
+ modified so it builds using a modern version of Java, and the JAR built from the source code here:</p>
+
+ <ul>
+ <li><a href="resources/downloads/icontract-jdk1_1_7.orig.jar">original JAR for JDK 1.1.7</a></li>
+
+ <li><a href="resources/downloads/icontract-jdk1_2.orig.jar">original JAR for JDK 1.2</a></li>
+
+ <li><a href="resources/downloads/icontract2-src.zip">source code</a></li>
+
+ <li><a href="resources/downloads/icontract2.jar">JAR built from source code</a></li>
+ </ul>
+
+ <hr />
+
+ <div class="sourceforge-logo"><a href="http://sourceforge.net"><img alt="SourceForge.net Logo" height="37"
+ src="resources/images/sflogo.png" width="125" /></a></div>
+
+ <p><a href="http://sourceforge.net/projects/jcontracts">The project page of JcontractS at SourceForge.net</a></p>
+ </body>
+</html>
\ No newline at end of file
Modified: trunk/site/index.html
===================================================================
--- trunk/site/index.html 2006-11-21 17:35:40 UTC (rev 7)
+++ trunk/site/index.html 2006-11-23 08:07:07 UTC (rev 8)
@@ -3,7 +3,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html>
<head>
- <title>Welcome to JcontractS</title>
+ <title>Welcome to Java Contract Suite</title>
<link href="resources/stylesheets/jcontracts.css" rel="stylesheet" type="text/css" />
@@ -11,9 +11,21 @@
</head>
<body>
+ <ul class="menu">
+ <li class="menu">Home</li>
+
+ <li class="menu"><a href="roadmap.html">Roadmap</a></li>
+
+ <li class="menu"><a href="documentation.html">Documentation</a></li>
+
+ <li class="menu"><a href="download.html">Download</a></li>
+
+ <li class="menu"><a href="license.html">License</a></li>
+ </ul>
+
<h1>Introduction</h1>
- <p>JcontractS (Java contract suite) is a resurrection of the iContract tool originally developed by Reto Kramer of
+ <p>Java Contract Suite (JcontractS) is a resurrection of the iContract tool originally developed by Reto Kramer of
Reliable Systems. John Swapceinski started the resurrection by decompiling the original JAR files, and making the
sources compile with JDK 1.4 and higher. The result of his work can be found on <a
href="http://www.icontract2.org/">www.icontract2.org</a>.</p>
@@ -25,6 +37,38 @@
the source from the Subversion repository. Follow the instructions on the <a
href="https://sourceforge.net/svn/?group_id=175492">Subversion page of the project</a>.</p>
+ <h1>Goals</h1>
+
+ <p>Java Contract Suite aims to be Design by Contract implementation for Java 1.4 source code. Support for source
+ code of higher Java versions will be added in the future.</p>
+
+ <p>Even though there have been a number of Design by Contract implementations in the past, the adoption of Design
+ by Contract has been minimal. To accelerate adoption the project is available under the liberal Apache License
+ Version 2.0, and will try to provide tasks/extensions/plugins for as many development tools as possible.</p>
+
+ <h1>Why iContract?</h1>
+
+ <p>There were other, more active Design by Contract implementations than iContract when it was resurrected. Below
+ are the reasons for choosing iContract instead of another implementation.</p>
+
+ <p>With iContract the code and the contracts are kept in the same location. The invariants, preconditions and
+ postconditions are added to the Javadoc of the classes and methods. You don't have to switch between two files
+ constantly during development.</p>
+
+ <p>The syntax used by iContract is clean and terse. It is easy to read and understand for people who have never
+ used iContract before.</p>
+
+ <p>iContract supports Java 1.4. Some other implementations make use of annotations, which require Java 5 or
+ higher.</p>
+
+ <p>There is no need for JVM parameters, JVM agents, specific class loaders and/or specific frameworks. The classes
+ built with iContract can be used as is in any deployment environment.</p>
+
+ <h1>Other implementations</h1>
+
+ <p>See the <a href="http://en.wikipedia.org/wiki/Design_by_contract">Design by Contract page at Wikipedia</a> for
+ a list of Design by Contract implementations for Java (and other languages).</p>
+
<hr />
<div class="sourceforge-logo"><a href="http://sourceforge.net"><img alt="SourceForge.net Logo" height="37"
Added: trunk/site/license.html
===================================================================
--- trunk/site/license.html (rev 0)
+++ trunk/site/license.html 2006-11-23 08:07:07 UTC (rev 8)
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html>
+ <head>
+ <title>License - Java Contract Suite</title>
+
+ <link href="resources/stylesheets/jcontracts.css" rel="stylesheet" type="text/css" />
+
+ <link href="favicon.ico" rel="shortcut icon" type="image/x-icon" />
+ </head>
+
+ <body>
+ <ul class="menu">
+ <li class="menu"><a href="index.html">Home</a></li>
+
+ <li class="menu"><a href="roadmap.html">Roadmap</a></li>
+
+ <li class="menu"><a href="documentation.html">Documentation</a></li>
+
+ <li class="menu"><a href="download.html">Download</a></li>
+
+ <li class="menu">License</li>
+ </ul>
+
+ <h1>License</h1>
+
+ <p class="licensetitle">Apache License<br />Version 2.0, January 2004<br />http://www.apache.org/licenses/</p>
+
+ <p>TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION</p>
+
+ <ol>
+ <li><p>Definitions.</p><p>"License" shall mean the terms and conditions for use, reproduction, and distribution
+ as defined by Sections 1 through 9 of this document.</p><p>"Licensor" shall mean the copyright owner or entity
+ authorized by the copyright owner that is granting the License.</p><p>"Legal Entity" shall mean the union of the
+ acting entity and all other entities that control, are controlled by, or are under common control with that
+ entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent
+ (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.</p><p>"You" (or "Your")
+ shall mean an individual or Legal Entity exercising permissions granted by this License.</p><p>"Source" form
+ shall mean the preferred form for making modifications, including but not limited to software source code,
+ documentation source, and configuration files.</p><p>"Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but not limited to compiled object code, generated
+ documentation, and conversions to other media types.</p><p>"Work" shall mean the work of authorship, whether in
+ Source or Object form, made available under the License, as indicated by a copyright notice that is included in
+ or attached to the work (an example is provided in the Appendix below).</p><p>"Derivative Works" shall mean any
+ work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial
+ revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of
+ authorship. For the purposes of this License, Derivative Works shall not include works that remain separable
+ from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works
+ thereof.</p><p>"Contribution" shall mean any work of authorship, including the original version of the Work and
+ any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to
+ Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to
+ submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of
+ electronic, verbal, or written communication sent to the Licensor or its representatives, including but not
+ limited to communication on electronic mailing lists, source code control systems, and issue tracking systems
+ that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner
+ as "Not a Contribution."</p><p>"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of
+ whom a Contribution has been received by Licensor and subsequently incorporated within the Work.</p></li>
+
+ <li><p>Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby
+ grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to
+ reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work
+ and such Derivative Works in Source or Object form.</p></li>
+
+ <li><p>Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby
+ grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in
+ this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the
+ Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily
+ infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such
+ Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or
+ counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes
+ direct or contributory patent infringement, then any patent licenses granted to You under this License for that
+ Work shall terminate as of the date such litigation is filed.</p></li>
+
+ <li><p>Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any
+ medium, with or without modifications, and in Source or Object form, provided that You meet the following
+ conditions:</p><ol style="list-style-type: lower-latin;">
+ <li><p>You must give any other recipients of the Work or Derivative Works a copy of this License;
+ and</p></li>
+
+ <li><p>You must cause any modified files to carry prominent notices stating that You changed the files;
+ and</p></li>
+
+ <li><p>You must retain, in the Source form of any Derivative Works that You distribute, all copyright,
+ patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do
+ not pertain to any part of the Derivative Works; and</p></li>
+
+ <li><p>If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that
+ You distribute must include a readable copy of the attribution notices contained within such NOTICE file,
+ excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the
+ following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source
+ form or documentation, if provided along with the Derivative Works; or, within a display generated by the
+ Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file
+ are for informational purposes only and do not modify the License. You may add Your own attribution notices
+ within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work,
+ provided that such additional attribution notices cannot be construed as modifying the License.</p></li>
+ </ol><p>You may add Your own copyright statement to Your modifications and may provide additional or different
+ license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such
+ Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies
+ with the conditions stated in this License.</p></li>
+
+ <li><p>Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally
+ submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this
+ License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede
+ or modify the terms of any separate license agreement you may have executed with Licensor regarding such
+ Contributions.</p></li>
+
+ <li><p>Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or
+ product names of the Licensor, except as required for reasonable and customary use in describing the origin of
+ the Work and reproducing the content of the NOTICE file.</p></li>
+
+ <li><p>Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the
+ Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+ ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE,
+ NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for
+ determining the appropriateness of using or redistributing the Work and assume any risks associated with Your
+ exercise of permissions under this License.</p></li>
+
+ <li><p>Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence),
+ contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or
+ agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect,
+ special, incidental, or consequential damages of any character arising as a result of this License or out of the
+ use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage,
+ computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.</p></li>
+
+ <li><p>Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof,
+ You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability
+ obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You
+ agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted
+ against, such Contributor by reason of your accepting any such warranty or additional liability.</p></li>
+ </ol>
+
+ <p>END OF TERMS AND CONDITIONS</p>
+
+ <p>APPENDIX: How to apply the Apache License to your work.</p>
+
+ <p style="margin-left: 2em;">To apply the Apache License to your work, attach the following boilerplate notice,
+ with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the
+ brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend
+ that a file or class name and description of purpose be included on the same "printed page" as the copyright
+ notice for easier identification within third-party archives.</p>
+
+ <p>Copyright [yyyy] [name of copyright owner]</p>
+
+ <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at</p>
+
+ <p style="margin-left: 2em;">http://www.apache.org/licenses/LICENSE-2.0</p>
+
+ <p>Unless required by applicable law or agreed to in writing, software distributed under the License is
+ distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ License for the specific language governing permissions and limitations under the License.</p>
+
+ <hr />
+
+ <div class="sourceforge-logo"><a href="http://sourceforge.net"><img alt="SourceForge.net Logo" height="37"
+ src="resources/images/sflogo.png" width="125" /></a></div>
+
+ <p><a href="http://sourceforge.net/projects/jcontracts">The project page of JcontractS at SourceForge.net</a></p>
+ </body>
+</html>
\ No newline at end of file
Added: trunk/site/resources/downloads/icontract-jdk1_1_7.orig.jar
===================================================================
(Binary files differ)
Property changes on: trunk/site/resources/downloads/icontract-jdk1_1_7.orig.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/site/resources/downloads/icontract-jdk1_2.orig.jar
===================================================================
(Binary files differ)
Property changes on: trunk/site/resources/downloads/icontract-jdk1_2.orig.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/site/resources/downloads/icontract2-src.zip
===================================================================
(Binary files differ)
Property changes on: trunk/site/resources/downloads/icontract2-src.zip
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/site/resources/downloads/icontract2.jar
===================================================================
(Binary files differ)
Property changes on: trunk/site/resources/downloads/icontract2.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/site/resources/stylesheets/jcontracts.css
===================================================================
--- trunk/site/resources/stylesheets/jcontracts.css 2006-11-21 17:35:40 UTC (rev 7)
+++ trunk/site/resources/stylesheets/jcontracts.css 2006-11-23 08:07:07 UTC (rev 8)
@@ -36,6 +36,11 @@
width: 30em;
}
+p.licensetitle
+{
+ text-align: center;
+}
+
ul
{
width: 30em;
@@ -46,6 +51,24 @@
margin-top: 0;
}
+ul.menu
+{
+ display: inline;
+ border-top-width: 1px;
+ border-top-style: solid;
+ border-top-color: #00000;
+ border-bottom-width: 1px;
+ border-bottom-style: solid;
+ border-bottom-color: #00000;
+}
+
+li.menu
+{
+ padding-left: 1em;
+ padding-right: 1em;
+ display: inline;
+}
+
dl
{
width: 30em;
Added: trunk/site/roadmap.html
===================================================================
--- trunk/site/roadmap.html (rev 0)
+++ trunk/site/roadmap.html 2006-11-23 08:07:07 UTC (rev 8)
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html>
+ <head>
+ <title>Roadmap - Java Contract Suite</title>
+
+ <link href="resources/stylesheets/jcontracts.css" rel="stylesheet" type="text/css" />
+
+ <link href="favicon.ico" rel="shortcut icon" type="image/x-icon" />
+ </head>
+
+ <body>
+ <ul class="menu">
+ <li class="menu"><a href="index.html">Home</a></li>
+
+ <li class="menu">Roadmap</li>
+
+ <li class="menu"><a href="documentation.html">Documentation</a></li>
+
+ <li class="menu"><a href="download.html">Download</a></li>
+
+ <li class="menu"><a href="license.html">License</a></li>
+ </ul>
+
+ <h1>Roadmap</h1>
+
+ <p>The first thing that has to be done is to clean up the current code. This includes but is not limited to
+ formatting the source consistently, ensuring copyright statements, authors, product names, URLs, etc. are correct,
+ adding a license header to each source file, and changing literals to constants.</p>
+
+ <p>After cleaning up the code it would seem logical to start implementing new features but there are two major
+ issues with the current code. The first issue is that the grammar for the parser has been lost. This means that
+ fixing bugs in the parser is a lot more difficult if not impossible. The other issue is that the syntax of Java 5
+ (e.g. generics, annotations) is not supported. Because of these issues no new features will be added to the
+ current code. Bug fixes, performance improvements, etc. will be applied.</p>
+
+ <p>Once the current code has been cleaned up the development of a new implementation will be started. This
+ implementation will fully support Java versions 1.4 and higher. Although backwards compatibility with the current
+ version is desirable, it could be decided that it is better to do things differently based on user input.</p>
+
+ <p>Don't expect this new version in the near future though. It will require the implementation of a complex
+ compiler which takes a lot of time.</p>
+
+ <hr />
+
+ <div class="sourceforge-logo"><a href="http://sourceforge.net"><img alt="SourceForge.net Logo" height="37"
+ src="resources/images/sflogo.png" width="125" /></a></div>
+
+ <p><a href="http://sourceforge.net/projects/jcontracts">The project page of JcontractS at SourceForge.net</a></p>
+ </body>
+</html>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2006-11-21 17:44:26
|
Revision: 4
http://svn.sourceforge.net/jcontracts/?rev=4&view=rev
Author: jstuyts
Date: 2006-11-21 09:18:10 -0800 (Tue, 21 Nov 2006)
Log Message:
-----------
Started with the site.
Added Paths:
-----------
trunk/site/favicon.ico
trunk/site/index.html
Added: trunk/site/favicon.ico
===================================================================
(Binary files differ)
Property changes on: trunk/site/favicon.ico
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/site/index.html
===================================================================
--- trunk/site/index.html (rev 0)
+++ trunk/site/index.html 2006-11-21 17:18:10 UTC (rev 4)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html>
+ <head>
+ <title>Welcome to JcontractS</title>
+
+ <link href="resources/stylesheets/jcontracts.css" rel="stylesheet" type="text/css" />
+
+ <link href="favicon.ico" rel="shortcut icon" type="image/x-icon" />
+ </head>
+
+ <body>
+ <h1>Introduction</h1>
+
+ <p>JcontractS (Java contract suite) is a resurrection of the iContract tool originally developed by Reto Kramer of
+ Reliable Systems. John Swapceinski started the resurrection by decompiling the original JAR files, and making the
+ sources compile with JDK 1.4 and higher. The result of his work can be found on <a
+ href="http://www.icontract2.org/">www.icontract2.org</a>.</p>
+
+ <p>Johan Stuyts started the SourceForge.net project so proper further development of the project can take
+ place.</p>
+
+ <p>The project is being setup at the moment. More information will appear soon.</p>
+
+ <hr />
+
+ <div class="sourceforge-logo"><a href="http://sourceforge.net"><img alt="SourceForge.net Logo" height="37"
+ src="resources/images/sflogo.png" width="125" /></a></div>
+
+ <p><a href="http://sourceforge.net/projects/jcontracts">The project page of JcontractS at SourceForge.net</a></p>
+ </body>
+</html>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2006-11-21 17:35:47
|
Revision: 5
http://svn.sourceforge.net/jcontracts/?rev=5&view=rev
Author: jstuyts
Date: 2006-11-21 09:21:29 -0800 (Tue, 21 Nov 2006)
Log Message:
-----------
Started with the site.
Added Paths:
-----------
trunk/site/resources/
trunk/site/resources/images/
trunk/site/resources/images/sflogo.png
trunk/site/resources/stylesheets/
trunk/site/resources/stylesheets/jcontracts.css
Added: trunk/site/resources/images/sflogo.png
===================================================================
(Binary files differ)
Property changes on: trunk/site/resources/images/sflogo.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/site/resources/stylesheets/jcontracts.css
===================================================================
--- trunk/site/resources/stylesheets/jcontracts.css (rev 0)
+++ trunk/site/resources/stylesheets/jcontracts.css 2006-11-21 17:21:29 UTC (rev 5)
@@ -0,0 +1,200 @@
+html
+{
+ margin: 0;
+ padding: 0;
+}
+
+body
+{
+ margin: 0;
+ padding: 0.5em;
+ font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;
+ background-color: #FFFFFF;
+ color: #000000;
+}
+
+h1
+{
+ font-weight: bold;
+ font-size: 200%;
+}
+
+h2
+{
+ font-weight: bold;
+ font-size: 160%;
+}
+
+h3
+{
+ font-weight: bold;
+ font-size: 120%;
+}
+
+p
+{
+ width: 30em;
+}
+
+ul
+{
+ width: 30em;
+}
+
+li > p:first-child
+{
+ margin-top: 0;
+}
+
+dl
+{
+ width: 30em;
+}
+
+pre
+{
+ border-style: solid;
+ border-width: 0.05em;
+ border-color: #555555;
+ padding-left: 1em;
+ padding-right: 1em;
+ padding-top: 0.5em;
+ padding-bottom: 0.5em;
+ background-color: #FFFFFF;
+ color: #000000;
+}
+
+table
+{
+ border-style: none;
+ border-width: 0;
+}
+
+th
+{
+ padding: 0.2em;
+}
+
+td, th
+{
+ border-style: solid;
+ border-top-width: 0;
+ border-left-width: 0;
+ border-right-width: 0.05em;
+ border-bottom-width: 0.05em;
+ border-color: #000000;
+ padding: 0.2em;
+}
+
+td:first-child, th:first-child
+{
+ border-style: solid;
+ border-top-width: 0;
+ border-left-width: 0.05em;
+ border-right-width: 0.05em;
+ border-bottom-width: 0.05em;
+ border-color: #000000;
+}
+
+tr:first-child > td, tr:first-child > th
+{
+ border-style: solid;
+ border-top-width: 0.05em;
+ border-left-width: 0;
+ border-right-width: 0.05em;
+ border-bottom-width: 0.05em;
+ border-color: #000000;
+}
+
+tr:first-child > td:first-child, tr:first-child > th:first-child
+{
+ border-style: solid;
+ border-top-width: 0.05em;
+ border-left-width: 0.05em;
+ border-right-width: 0.05em;
+ border-bottom-width: 0.05em;
+ border-color: #000000;
+}
+
+div.sourceforge-logo
+{
+ float: right;
+}
+
+a:link
+{
+ color: #0000DD;
+}
+
+a:visited
+{
+ color: #880088;
+}
+
+img
+{
+ border-style: none;
+ border-width: 0;
+ vertical-align: middle;
+}
+
+/* Javadoc */
+.TableHeadingColor
+{
+ background-color: #7FB8D8;
+}
+.TableSubHeadingColor
+{
+ background-color: #BFDBEB;
+}
+.TableRowColor
+{
+ background-color: #FFFFFF;
+}
+
+.FrameTitleFont
+{
+ font-size: 100%;
+ font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;
+}
+.FrameHeadingFont
+{
+ font-size: 90%;
+ font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;
+}
+.FrameItemFont
+{
+ font-size: 90%;
+ font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;
+}
+
+.NavBarCell1
+{
+ background-color: #BFDBEB;
+}
+.NavBarCell1Rev
+{
+ background-color: #0072B2;
+}
+.NavBarFont1
+{
+ font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;
+ color: #000000;
+}
+.NavBarFont1Rev
+{
+ font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;
+ color: #FFFFFF;
+}
+
+.NavBarCell2
+{
+ font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;
+ background-color: #FFFFFF;
+}
+.NavBarCell3
+{
+ font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;
+ background-color: #FFFFFF;
+}
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
