From 3ee451bce342d4bb61ad6235ba57bdf817bfdd1a Mon Sep 17 00:00:00 2001 From: adam Date: Sun, 23 Jul 2006 02:47:53 -0400 Subject: [PATCH] copyright notices/updates darcs-hash:20060723064753-5007d-e1917a77b2f86898c05160d112fe2ab0a7af12b2.gz --- COPYING | 29 ----------- LICENSE | 53 +++++++++++--------- TODO | 16 ++---- src/edu/berkeley/sbp/Ambiguous.java | 2 + src/edu/berkeley/sbp/Atom.java | 2 + src/edu/berkeley/sbp/Element.java | 2 + src/edu/berkeley/sbp/Forest.java | 2 + src/edu/berkeley/sbp/GSS.java | 2 + src/edu/berkeley/sbp/Input.java | 2 + src/edu/berkeley/sbp/ParseFailed.java | 2 + src/edu/berkeley/sbp/Parser.java | 2 + src/edu/berkeley/sbp/Sequence.java | 2 + src/edu/berkeley/sbp/SequenceOrElement.java | 2 + src/edu/berkeley/sbp/Tree.java | 2 + src/edu/berkeley/sbp/Union.java | 2 + src/edu/berkeley/sbp/Walk.java | 2 + src/edu/berkeley/sbp/bind/Bindable.java | 2 + src/edu/berkeley/sbp/bind/Binding.java | 2 + src/edu/berkeley/sbp/bind/BindingFunctor.java | 2 + src/edu/berkeley/sbp/bind/RawBindingFunctor.java | 2 + src/edu/berkeley/sbp/bind/TreeFunctor.java | 2 + src/edu/berkeley/sbp/bind/bind.java | 2 + src/edu/berkeley/sbp/chr/CharAtom.java | 2 + src/edu/berkeley/sbp/chr/CharInput.java | 2 + src/edu/berkeley/sbp/chr/CharParser.java | 2 + src/edu/berkeley/sbp/chr/CharTopology.java | 2 + .../sbp/meta/AnnotationGrammarBindings.java | 2 + .../sbp/meta/ArrayBuildingTreeFunctor.java | 2 + src/edu/berkeley/sbp/meta/Grammar.java | 2 + src/edu/berkeley/sbp/meta/MetaGrammar.java | 2 + src/edu/berkeley/sbp/meta/MetaGrammarBindings.java | 2 + src/edu/berkeley/sbp/meta/Production.java | 2 + src/edu/berkeley/sbp/meta/Repeat.java | 2 + src/edu/berkeley/sbp/misc/Cartesian.java | 2 + src/edu/berkeley/sbp/misc/Demo.java | 2 + src/edu/berkeley/sbp/misc/Demo2.java | 2 + src/edu/berkeley/sbp/misc/Java15.java | 2 + src/edu/berkeley/sbp/misc/ParserServlet.java | 2 + src/edu/berkeley/sbp/misc/ReflectiveWalker.java | 2 + src/edu/berkeley/sbp/misc/RegressionTests.java | 2 + src/edu/berkeley/sbp/misc/StringWalker.java | 2 + src/edu/berkeley/sbp/misc/TreeWalker.java | 2 + src/edu/berkeley/sbp/tib/Tib.java | 4 +- src/edu/berkeley/sbp/tib/TibDoc.java | 4 +- src/edu/berkeley/sbp/util/ANSI.java | 2 + src/edu/berkeley/sbp/util/ArrayIterator.java | 2 + src/edu/berkeley/sbp/util/ArrayUtil.java | 2 + src/edu/berkeley/sbp/util/ConcatenateIterator.java | 2 + .../berkeley/sbp/util/ConcatenatedIterator.java | 2 + src/edu/berkeley/sbp/util/DiscreteTopology.java | 2 + src/edu/berkeley/sbp/util/EmptyIterator.java | 2 + src/edu/berkeley/sbp/util/FastSet.java | 2 + src/edu/berkeley/sbp/util/Functor.java | 2 + src/edu/berkeley/sbp/util/GraphViz.java | 2 + src/edu/berkeley/sbp/util/HashMapBag.java | 2 + src/edu/berkeley/sbp/util/IntPairMap.java | 2 + src/edu/berkeley/sbp/util/IntegerMappable.java | 2 + src/edu/berkeley/sbp/util/IntegerTopology.java | 2 + src/edu/berkeley/sbp/util/Invokable.java | 2 + src/edu/berkeley/sbp/util/MapBag.java | 2 + src/edu/berkeley/sbp/util/PrintableTree.java | 2 + src/edu/berkeley/sbp/util/Reflection.java | 2 + src/edu/berkeley/sbp/util/SingletonIterator.java | 2 + src/edu/berkeley/sbp/util/StringUtil.java | 2 + src/edu/berkeley/sbp/util/ToHTML.java | 2 + src/edu/berkeley/sbp/util/ToJava.java | 2 + src/edu/berkeley/sbp/util/TopologicalBag.java | 2 + src/edu/berkeley/sbp/util/Topology.java | 2 + src/edu/berkeley/sbp/util/TreeBuilder.java | 2 + src/edu/berkeley/sbp/util/Visitable.java | 2 + src/edu/berkeley/sbp/util/VisitableMap.java | 2 + 71 files changed, 168 insertions(+), 70 deletions(-) delete mode 100644 COPYING diff --git a/COPYING b/COPYING deleted file mode 100644 index 994c4d6..0000000 --- a/COPYING +++ /dev/null @@ -1,29 +0,0 @@ -Copyright (c) 2006, Adam Megacz -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - * Neither the name of the University of California, Berkeley nor the - names of its contributors may be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR AND CONTRIBUTORS -BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR -BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/LICENSE b/LICENSE index acf93e9..994c4d6 100644 --- a/LICENSE +++ b/LICENSE @@ -1,24 +1,29 @@ -* Copyright (c) 2005, Regents of the University of California -* All rights reserved. -* Redistribution and use in source and binary forms, with or without -* modification, are permitted provided that the following conditions are met: -* -* * Redistributions of source code must retain the above copyright -* notice, this list of conditions and the following disclaimer. -* * Redistributions in binary form must reproduce the above copyright -* notice, this list of conditions and the following disclaimer in the -* documentation and/or other materials provided with the distribution. -* * Neither the name of the University of California, Berkeley nor the -* names of its contributors may be used to endorse or promote products -* derived from this software without specific prior written permission. -* -* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS" AND ANY -* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -* DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY -* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +Copyright (c) 2006, Adam Megacz +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + * Neither the name of the University of California, Berkeley nor the + names of its contributors may be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR AND CONTRIBUTORS +BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE +OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/TODO b/TODO index 2432db1..321a8dc 100644 --- a/TODO +++ b/TODO @@ -6,21 +6,15 @@ Immediately - Annotation Tutorial - - MUST HAVE BETTER ERROR MESSAGES - - when ambiguity encountered, show text region (where-to-where) - - use for developing java15.g - - - java15.g - - - topology no longer needed as an arg to parser - - expose parser's protected method? - - - copyright notices - ______________________________________________________________________________ v1.1 + - MUST HAVE BETTER ERROR MESSAGES + - use for developing java15.g + - java15.g + - topology no longer needed as an arg to parser? + - broader regression testing (for stuff like error messages, etc) - More topology untangling [later] diff --git a/src/edu/berkeley/sbp/Ambiguous.java b/src/edu/berkeley/sbp/Ambiguous.java index 37a857c..8618b9e 100644 --- a/src/edu/berkeley/sbp/Ambiguous.java +++ b/src/edu/berkeley/sbp/Ambiguous.java @@ -1,3 +1,5 @@ +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license + package edu.berkeley.sbp; import edu.berkeley.sbp.*; import edu.berkeley.sbp.util.*; diff --git a/src/edu/berkeley/sbp/Atom.java b/src/edu/berkeley/sbp/Atom.java index e8345f0..e02b79f 100644 --- a/src/edu/berkeley/sbp/Atom.java +++ b/src/edu/berkeley/sbp/Atom.java @@ -1,3 +1,5 @@ +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license + package edu.berkeley.sbp; import java.io.*; import java.util.*; diff --git a/src/edu/berkeley/sbp/Element.java b/src/edu/berkeley/sbp/Element.java index f7a8978..3622aea 100644 --- a/src/edu/berkeley/sbp/Element.java +++ b/src/edu/berkeley/sbp/Element.java @@ -1,3 +1,5 @@ +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license + package edu.berkeley.sbp; import edu.berkeley.sbp.util.*; import edu.berkeley.sbp.*; diff --git a/src/edu/berkeley/sbp/Forest.java b/src/edu/berkeley/sbp/Forest.java index 43ffb10..bdaedca 100644 --- a/src/edu/berkeley/sbp/Forest.java +++ b/src/edu/berkeley/sbp/Forest.java @@ -1,3 +1,5 @@ +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license + package edu.berkeley.sbp; import edu.berkeley.sbp.*; import edu.berkeley.sbp.Sequence.Position; diff --git a/src/edu/berkeley/sbp/GSS.java b/src/edu/berkeley/sbp/GSS.java index d4cf42f..217889b 100644 --- a/src/edu/berkeley/sbp/GSS.java +++ b/src/edu/berkeley/sbp/GSS.java @@ -1,3 +1,5 @@ +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license + package edu.berkeley.sbp; import edu.berkeley.sbp.*; import edu.berkeley.sbp.util.*; diff --git a/src/edu/berkeley/sbp/Input.java b/src/edu/berkeley/sbp/Input.java index d19b208..c16947d 100644 --- a/src/edu/berkeley/sbp/Input.java +++ b/src/edu/berkeley/sbp/Input.java @@ -1,3 +1,5 @@ +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license + package edu.berkeley.sbp; import java.io.*; import java.util.*; diff --git a/src/edu/berkeley/sbp/ParseFailed.java b/src/edu/berkeley/sbp/ParseFailed.java index 316caaf..27f87e8 100644 --- a/src/edu/berkeley/sbp/ParseFailed.java +++ b/src/edu/berkeley/sbp/ParseFailed.java @@ -1,3 +1,5 @@ +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license + package edu.berkeley.sbp; import edu.berkeley.sbp.*; import edu.berkeley.sbp.Sequence.Position; diff --git a/src/edu/berkeley/sbp/Parser.java b/src/edu/berkeley/sbp/Parser.java index f216a38..9db0bf9 100644 --- a/src/edu/berkeley/sbp/Parser.java +++ b/src/edu/berkeley/sbp/Parser.java @@ -1,3 +1,5 @@ +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license + package edu.berkeley.sbp; import edu.berkeley.sbp.*; import edu.berkeley.sbp.util.*; diff --git a/src/edu/berkeley/sbp/Sequence.java b/src/edu/berkeley/sbp/Sequence.java index 84a2dc6..9535357 100644 --- a/src/edu/berkeley/sbp/Sequence.java +++ b/src/edu/berkeley/sbp/Sequence.java @@ -1,3 +1,5 @@ +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license + package edu.berkeley.sbp; import edu.berkeley.sbp.util.*; import edu.berkeley.sbp.*; diff --git a/src/edu/berkeley/sbp/SequenceOrElement.java b/src/edu/berkeley/sbp/SequenceOrElement.java index c67173f..d5266e9 100644 --- a/src/edu/berkeley/sbp/SequenceOrElement.java +++ b/src/edu/berkeley/sbp/SequenceOrElement.java @@ -1,3 +1,5 @@ +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license + package edu.berkeley.sbp; import edu.berkeley.sbp.util.*; import edu.berkeley.sbp.*; diff --git a/src/edu/berkeley/sbp/Tree.java b/src/edu/berkeley/sbp/Tree.java index f87c5dc..558d234 100644 --- a/src/edu/berkeley/sbp/Tree.java +++ b/src/edu/berkeley/sbp/Tree.java @@ -1,3 +1,5 @@ +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license + package edu.berkeley.sbp; import edu.berkeley.sbp.*; import edu.berkeley.sbp.util.*; diff --git a/src/edu/berkeley/sbp/Union.java b/src/edu/berkeley/sbp/Union.java index f1f65b1..51002ab 100644 --- a/src/edu/berkeley/sbp/Union.java +++ b/src/edu/berkeley/sbp/Union.java @@ -1,3 +1,5 @@ +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license + package edu.berkeley.sbp; import edu.berkeley.sbp.util.*; import edu.berkeley.sbp.*; diff --git a/src/edu/berkeley/sbp/Walk.java b/src/edu/berkeley/sbp/Walk.java index 3d23469..092d1ff 100644 --- a/src/edu/berkeley/sbp/Walk.java +++ b/src/edu/berkeley/sbp/Walk.java @@ -1,3 +1,5 @@ +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license + package edu.berkeley.sbp; import edu.berkeley.sbp.*; import edu.berkeley.sbp.util.*; diff --git a/src/edu/berkeley/sbp/bind/Bindable.java b/src/edu/berkeley/sbp/bind/Bindable.java index 8f5cc86..e3ee82f 100644 --- a/src/edu/berkeley/sbp/bind/Bindable.java +++ b/src/edu/berkeley/sbp/bind/Bindable.java @@ -1,3 +1,5 @@ +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license + package edu.berkeley.sbp.bind; import edu.berkeley.sbp.util.*; diff --git a/src/edu/berkeley/sbp/bind/Binding.java b/src/edu/berkeley/sbp/bind/Binding.java index dc82abb..bbff124 100644 --- a/src/edu/berkeley/sbp/bind/Binding.java +++ b/src/edu/berkeley/sbp/bind/Binding.java @@ -1,3 +1,5 @@ +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license + package edu.berkeley.sbp.bind; import edu.berkeley.sbp.util.*; diff --git a/src/edu/berkeley/sbp/bind/BindingFunctor.java b/src/edu/berkeley/sbp/bind/BindingFunctor.java index a7d1ecc..0880e57 100644 --- a/src/edu/berkeley/sbp/bind/BindingFunctor.java +++ b/src/edu/berkeley/sbp/bind/BindingFunctor.java @@ -1,3 +1,5 @@ +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license + package edu.berkeley.sbp.bind; import edu.berkeley.sbp.*; import edu.berkeley.sbp.util.*; diff --git a/src/edu/berkeley/sbp/bind/RawBindingFunctor.java b/src/edu/berkeley/sbp/bind/RawBindingFunctor.java index 52817d1..2a7cdbe 100644 --- a/src/edu/berkeley/sbp/bind/RawBindingFunctor.java +++ b/src/edu/berkeley/sbp/bind/RawBindingFunctor.java @@ -1,3 +1,5 @@ +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license + package edu.berkeley.sbp.bind; import edu.berkeley.sbp.*; import edu.berkeley.sbp.util.*; diff --git a/src/edu/berkeley/sbp/bind/TreeFunctor.java b/src/edu/berkeley/sbp/bind/TreeFunctor.java index 671901a..57a61a9 100644 --- a/src/edu/berkeley/sbp/bind/TreeFunctor.java +++ b/src/edu/berkeley/sbp/bind/TreeFunctor.java @@ -1,3 +1,5 @@ +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license + package edu.berkeley.sbp.bind; import edu.berkeley.sbp.*; import edu.berkeley.sbp.util.*; diff --git a/src/edu/berkeley/sbp/bind/bind.java b/src/edu/berkeley/sbp/bind/bind.java index b4234ea..1aed596 100644 --- a/src/edu/berkeley/sbp/bind/bind.java +++ b/src/edu/berkeley/sbp/bind/bind.java @@ -1,3 +1,5 @@ +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license + package edu.berkeley.sbp.bind; import edu.berkeley.sbp.util.*; diff --git a/src/edu/berkeley/sbp/chr/CharAtom.java b/src/edu/berkeley/sbp/chr/CharAtom.java index 1d76aa7..f05c345 100644 --- a/src/edu/berkeley/sbp/chr/CharAtom.java +++ b/src/edu/berkeley/sbp/chr/CharAtom.java @@ -1,3 +1,5 @@ +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license + package edu.berkeley.sbp.chr; import java.io.*; import java.util.*; diff --git a/src/edu/berkeley/sbp/chr/CharInput.java b/src/edu/berkeley/sbp/chr/CharInput.java index 1a08f22..6dd9d7b 100644 --- a/src/edu/berkeley/sbp/chr/CharInput.java +++ b/src/edu/berkeley/sbp/chr/CharInput.java @@ -1,3 +1,5 @@ +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license + package edu.berkeley.sbp.chr; import java.io.*; import java.util.*; diff --git a/src/edu/berkeley/sbp/chr/CharParser.java b/src/edu/berkeley/sbp/chr/CharParser.java index c901388..b5e6dfc 100644 --- a/src/edu/berkeley/sbp/chr/CharParser.java +++ b/src/edu/berkeley/sbp/chr/CharParser.java @@ -1,3 +1,5 @@ +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license + package edu.berkeley.sbp.chr; import java.io.*; import java.util.*; diff --git a/src/edu/berkeley/sbp/chr/CharTopology.java b/src/edu/berkeley/sbp/chr/CharTopology.java index cd482de..cfb69f3 100644 --- a/src/edu/berkeley/sbp/chr/CharTopology.java +++ b/src/edu/berkeley/sbp/chr/CharTopology.java @@ -1,3 +1,5 @@ +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license + package edu.berkeley.sbp.chr; import edu.berkeley.sbp.*; import edu.berkeley.sbp.misc.*; diff --git a/src/edu/berkeley/sbp/meta/AnnotationGrammarBindings.java b/src/edu/berkeley/sbp/meta/AnnotationGrammarBindings.java index a65509f..e38f3e4 100644 --- a/src/edu/berkeley/sbp/meta/AnnotationGrammarBindings.java +++ b/src/edu/berkeley/sbp/meta/AnnotationGrammarBindings.java @@ -1,3 +1,5 @@ +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license + package edu.berkeley.sbp.meta; import edu.berkeley.sbp.util.*; import edu.berkeley.sbp.*; diff --git a/src/edu/berkeley/sbp/meta/ArrayBuildingTreeFunctor.java b/src/edu/berkeley/sbp/meta/ArrayBuildingTreeFunctor.java index 4975d9c..0003274 100644 --- a/src/edu/berkeley/sbp/meta/ArrayBuildingTreeFunctor.java +++ b/src/edu/berkeley/sbp/meta/ArrayBuildingTreeFunctor.java @@ -1,3 +1,5 @@ +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license + package edu.berkeley.sbp.meta; import edu.berkeley.sbp.util.*; diff --git a/src/edu/berkeley/sbp/meta/Grammar.java b/src/edu/berkeley/sbp/meta/Grammar.java index 7b4d315..857c176 100644 --- a/src/edu/berkeley/sbp/meta/Grammar.java +++ b/src/edu/berkeley/sbp/meta/Grammar.java @@ -1,3 +1,5 @@ +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license + package edu.berkeley.sbp.meta; import edu.berkeley.sbp.util.*; import edu.berkeley.sbp.*; diff --git a/src/edu/berkeley/sbp/meta/MetaGrammar.java b/src/edu/berkeley/sbp/meta/MetaGrammar.java index ede6484..41bbe11 100644 --- a/src/edu/berkeley/sbp/meta/MetaGrammar.java +++ b/src/edu/berkeley/sbp/meta/MetaGrammar.java @@ -1,3 +1,5 @@ +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license + package edu.berkeley.sbp.meta; import edu.berkeley.sbp.util.*; import edu.berkeley.sbp.*; diff --git a/src/edu/berkeley/sbp/meta/MetaGrammarBindings.java b/src/edu/berkeley/sbp/meta/MetaGrammarBindings.java index 00d4aa4..40f3e39 100644 --- a/src/edu/berkeley/sbp/meta/MetaGrammarBindings.java +++ b/src/edu/berkeley/sbp/meta/MetaGrammarBindings.java @@ -1,3 +1,5 @@ +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license + package edu.berkeley.sbp.meta; import edu.berkeley.sbp.util.*; import edu.berkeley.sbp.*; diff --git a/src/edu/berkeley/sbp/meta/Production.java b/src/edu/berkeley/sbp/meta/Production.java index bcd2407..4cbbef2 100644 --- a/src/edu/berkeley/sbp/meta/Production.java +++ b/src/edu/berkeley/sbp/meta/Production.java @@ -1,3 +1,5 @@ +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license + package edu.berkeley.sbp.meta; import edu.berkeley.sbp.util.*; import edu.berkeley.sbp.*; diff --git a/src/edu/berkeley/sbp/meta/Repeat.java b/src/edu/berkeley/sbp/meta/Repeat.java index 0ea201d..b3f1841 100644 --- a/src/edu/berkeley/sbp/meta/Repeat.java +++ b/src/edu/berkeley/sbp/meta/Repeat.java @@ -1,3 +1,5 @@ +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license + package edu.berkeley.sbp.meta; import edu.berkeley.sbp.util.*; import edu.berkeley.sbp.*; diff --git a/src/edu/berkeley/sbp/misc/Cartesian.java b/src/edu/berkeley/sbp/misc/Cartesian.java index 5665019..50ddbab 100644 --- a/src/edu/berkeley/sbp/misc/Cartesian.java +++ b/src/edu/berkeley/sbp/misc/Cartesian.java @@ -1,3 +1,5 @@ +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license + package edu.berkeley.sbp.misc; import java.io.*; import java.util.*; diff --git a/src/edu/berkeley/sbp/misc/Demo.java b/src/edu/berkeley/sbp/misc/Demo.java index a9601b9..8315472 100644 --- a/src/edu/berkeley/sbp/misc/Demo.java +++ b/src/edu/berkeley/sbp/misc/Demo.java @@ -1,3 +1,5 @@ +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license + package edu.berkeley.sbp.misc; import edu.berkeley.sbp.*; diff --git a/src/edu/berkeley/sbp/misc/Demo2.java b/src/edu/berkeley/sbp/misc/Demo2.java index 8d55c1e..60bd6ee 100644 --- a/src/edu/berkeley/sbp/misc/Demo2.java +++ b/src/edu/berkeley/sbp/misc/Demo2.java @@ -1,3 +1,5 @@ +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license + package edu.berkeley.sbp.misc; import edu.berkeley.sbp.*; diff --git a/src/edu/berkeley/sbp/misc/Java15.java b/src/edu/berkeley/sbp/misc/Java15.java index 085f26e..0e08879 100644 --- a/src/edu/berkeley/sbp/misc/Java15.java +++ b/src/edu/berkeley/sbp/misc/Java15.java @@ -1,3 +1,5 @@ +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license + // Copyright 2006 the Contributors, as shown in the revision logs. // Licensed under the Apache Public Source License 2.0 ("the License"). // You may not use this file except in compliance with the License. diff --git a/src/edu/berkeley/sbp/misc/ParserServlet.java b/src/edu/berkeley/sbp/misc/ParserServlet.java index 54ab9ce..39097bf 100644 --- a/src/edu/berkeley/sbp/misc/ParserServlet.java +++ b/src/edu/berkeley/sbp/misc/ParserServlet.java @@ -1,3 +1,5 @@ +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license + package edu.berkeley.sbp.misc; import edu.berkeley.sbp.util.*; import edu.berkeley.sbp.*; diff --git a/src/edu/berkeley/sbp/misc/ReflectiveWalker.java b/src/edu/berkeley/sbp/misc/ReflectiveWalker.java index ad057a7..60f8e9b 100644 --- a/src/edu/berkeley/sbp/misc/ReflectiveWalker.java +++ b/src/edu/berkeley/sbp/misc/ReflectiveWalker.java @@ -1,3 +1,5 @@ +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license + package edu.berkeley.sbp.misc; import edu.berkeley.sbp.*; import edu.berkeley.sbp.util.*; diff --git a/src/edu/berkeley/sbp/misc/RegressionTests.java b/src/edu/berkeley/sbp/misc/RegressionTests.java index bffc0da..33c015d 100644 --- a/src/edu/berkeley/sbp/misc/RegressionTests.java +++ b/src/edu/berkeley/sbp/misc/RegressionTests.java @@ -1,3 +1,5 @@ +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license + package edu.berkeley.sbp.misc; import java.io.*; import java.util.*; diff --git a/src/edu/berkeley/sbp/misc/StringWalker.java b/src/edu/berkeley/sbp/misc/StringWalker.java index db85259..ab54a39 100644 --- a/src/edu/berkeley/sbp/misc/StringWalker.java +++ b/src/edu/berkeley/sbp/misc/StringWalker.java @@ -1,3 +1,5 @@ +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license + package edu.berkeley.sbp.misc; import edu.berkeley.sbp.*; import edu.berkeley.sbp.util.*; diff --git a/src/edu/berkeley/sbp/misc/TreeWalker.java b/src/edu/berkeley/sbp/misc/TreeWalker.java index b735673..aeec51a 100644 --- a/src/edu/berkeley/sbp/misc/TreeWalker.java +++ b/src/edu/berkeley/sbp/misc/TreeWalker.java @@ -1,3 +1,5 @@ +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license + package edu.berkeley.sbp.misc; import java.io.*; import java.util.*; diff --git a/src/edu/berkeley/sbp/tib/Tib.java b/src/edu/berkeley/sbp/tib/Tib.java index 0237e64..2398c5c 100644 --- a/src/edu/berkeley/sbp/tib/Tib.java +++ b/src/edu/berkeley/sbp/tib/Tib.java @@ -1,6 +1,4 @@ -// Copyright 2005 the Contributors, as shown in the revision logs. -// Licensed under the Apache Public Source License 2.0 ("the License"). -// You may not use this file except in compliance with the License. +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license package edu.berkeley.sbp.tib; import edu.berkeley.sbp.*; diff --git a/src/edu/berkeley/sbp/tib/TibDoc.java b/src/edu/berkeley/sbp/tib/TibDoc.java index c67e541..273c639 100644 --- a/src/edu/berkeley/sbp/tib/TibDoc.java +++ b/src/edu/berkeley/sbp/tib/TibDoc.java @@ -1,6 +1,4 @@ -// Copyright 2005 the Contributors, as shown in the revision logs. -// Licensed under the Apache Public Source License 2.0 ("the License"). -// You may not use this file except in compliance with the License. +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license package edu.berkeley.sbp.tib; import edu.berkeley.sbp.*; diff --git a/src/edu/berkeley/sbp/util/ANSI.java b/src/edu/berkeley/sbp/util/ANSI.java index d0109df..ecd9b43 100644 --- a/src/edu/berkeley/sbp/util/ANSI.java +++ b/src/edu/berkeley/sbp/util/ANSI.java @@ -1,3 +1,5 @@ +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license + package edu.berkeley.sbp.util; public class ANSI { //public static String black(Object o) { return "\033[30m"+o+"\033[0m"; } diff --git a/src/edu/berkeley/sbp/util/ArrayIterator.java b/src/edu/berkeley/sbp/util/ArrayIterator.java index df541e5..be62cfc 100644 --- a/src/edu/berkeley/sbp/util/ArrayIterator.java +++ b/src/edu/berkeley/sbp/util/ArrayIterator.java @@ -1,3 +1,5 @@ +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license + package edu.berkeley.sbp.util; import java.util.*; diff --git a/src/edu/berkeley/sbp/util/ArrayUtil.java b/src/edu/berkeley/sbp/util/ArrayUtil.java index d52de30..8c1ebf3 100644 --- a/src/edu/berkeley/sbp/util/ArrayUtil.java +++ b/src/edu/berkeley/sbp/util/ArrayUtil.java @@ -1,3 +1,5 @@ +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license + package edu.berkeley.sbp.util; import java.lang.reflect.*; import java.util.*; diff --git a/src/edu/berkeley/sbp/util/ConcatenateIterator.java b/src/edu/berkeley/sbp/util/ConcatenateIterator.java index d936189..ceb9eda 100644 --- a/src/edu/berkeley/sbp/util/ConcatenateIterator.java +++ b/src/edu/berkeley/sbp/util/ConcatenateIterator.java @@ -1,3 +1,5 @@ +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license + package edu.berkeley.sbp.util; import java.util.*; diff --git a/src/edu/berkeley/sbp/util/ConcatenatedIterator.java b/src/edu/berkeley/sbp/util/ConcatenatedIterator.java index 7f5f749..06a08a6 100644 --- a/src/edu/berkeley/sbp/util/ConcatenatedIterator.java +++ b/src/edu/berkeley/sbp/util/ConcatenatedIterator.java @@ -1,3 +1,5 @@ +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license + package edu.berkeley.sbp.util; import java.util.*; diff --git a/src/edu/berkeley/sbp/util/DiscreteTopology.java b/src/edu/berkeley/sbp/util/DiscreteTopology.java index 0fb75eb..04af0b6 100644 --- a/src/edu/berkeley/sbp/util/DiscreteTopology.java +++ b/src/edu/berkeley/sbp/util/DiscreteTopology.java @@ -1,3 +1,5 @@ +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license + package edu.berkeley.sbp.util; import java.io.*; import java.util.*; diff --git a/src/edu/berkeley/sbp/util/EmptyIterator.java b/src/edu/berkeley/sbp/util/EmptyIterator.java index 3c6d197..2c099f3 100644 --- a/src/edu/berkeley/sbp/util/EmptyIterator.java +++ b/src/edu/berkeley/sbp/util/EmptyIterator.java @@ -1,3 +1,5 @@ +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license + package edu.berkeley.sbp.util; import java.util.*; diff --git a/src/edu/berkeley/sbp/util/FastSet.java b/src/edu/berkeley/sbp/util/FastSet.java index e7ae063..26c5f33 100644 --- a/src/edu/berkeley/sbp/util/FastSet.java +++ b/src/edu/berkeley/sbp/util/FastSet.java @@ -1,3 +1,5 @@ +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license + package edu.berkeley.sbp.util; import java.util.*; diff --git a/src/edu/berkeley/sbp/util/Functor.java b/src/edu/berkeley/sbp/util/Functor.java index 5f2e89e..c945c4b 100644 --- a/src/edu/berkeley/sbp/util/Functor.java +++ b/src/edu/berkeley/sbp/util/Functor.java @@ -1,3 +1,5 @@ +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license + package edu.berkeley.sbp.util; public interface Functor { diff --git a/src/edu/berkeley/sbp/util/GraphViz.java b/src/edu/berkeley/sbp/util/GraphViz.java index b6db224..07213e5 100644 --- a/src/edu/berkeley/sbp/util/GraphViz.java +++ b/src/edu/berkeley/sbp/util/GraphViz.java @@ -1,3 +1,5 @@ +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license + package edu.berkeley.sbp.util; import edu.berkeley.sbp.util.*; import edu.berkeley.sbp.*; diff --git a/src/edu/berkeley/sbp/util/HashMapBag.java b/src/edu/berkeley/sbp/util/HashMapBag.java index 73e2cce..1611ac2 100644 --- a/src/edu/berkeley/sbp/util/HashMapBag.java +++ b/src/edu/berkeley/sbp/util/HashMapBag.java @@ -1,3 +1,5 @@ +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license + package edu.berkeley.sbp.util; import java.util.*; diff --git a/src/edu/berkeley/sbp/util/IntPairMap.java b/src/edu/berkeley/sbp/util/IntPairMap.java index a45c6c3..706e54b 100644 --- a/src/edu/berkeley/sbp/util/IntPairMap.java +++ b/src/edu/berkeley/sbp/util/IntPairMap.java @@ -1,3 +1,5 @@ +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license + package edu.berkeley.sbp.util; import java.util.*; diff --git a/src/edu/berkeley/sbp/util/IntegerMappable.java b/src/edu/berkeley/sbp/util/IntegerMappable.java index 34a96e7..a43a329 100644 --- a/src/edu/berkeley/sbp/util/IntegerMappable.java +++ b/src/edu/berkeley/sbp/util/IntegerMappable.java @@ -1,3 +1,5 @@ +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license + package edu.berkeley.sbp.util; public interface IntegerMappable { diff --git a/src/edu/berkeley/sbp/util/IntegerTopology.java b/src/edu/berkeley/sbp/util/IntegerTopology.java index 73de988..a84768e 100644 --- a/src/edu/berkeley/sbp/util/IntegerTopology.java +++ b/src/edu/berkeley/sbp/util/IntegerTopology.java @@ -1,3 +1,5 @@ +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license + package edu.berkeley.sbp.util; import java.io.*; import java.util.*; diff --git a/src/edu/berkeley/sbp/util/Invokable.java b/src/edu/berkeley/sbp/util/Invokable.java index 7864410..43415e8 100644 --- a/src/edu/berkeley/sbp/util/Invokable.java +++ b/src/edu/berkeley/sbp/util/Invokable.java @@ -1,3 +1,5 @@ +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license + package edu.berkeley.sbp.util; import edu.berkeley.sbp.util.*; import edu.berkeley.sbp.*; diff --git a/src/edu/berkeley/sbp/util/MapBag.java b/src/edu/berkeley/sbp/util/MapBag.java index f93a2e8..f5e5a68 100644 --- a/src/edu/berkeley/sbp/util/MapBag.java +++ b/src/edu/berkeley/sbp/util/MapBag.java @@ -1,3 +1,5 @@ +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license + package edu.berkeley.sbp.util; import java.util.*; diff --git a/src/edu/berkeley/sbp/util/PrintableTree.java b/src/edu/berkeley/sbp/util/PrintableTree.java index 7577137..bbc1ab9 100644 --- a/src/edu/berkeley/sbp/util/PrintableTree.java +++ b/src/edu/berkeley/sbp/util/PrintableTree.java @@ -1,3 +1,5 @@ +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license + package edu.berkeley.sbp.util; import edu.berkeley.sbp.*; import edu.berkeley.sbp.util.*; diff --git a/src/edu/berkeley/sbp/util/Reflection.java b/src/edu/berkeley/sbp/util/Reflection.java index cb45e8f..1bd7ffc 100644 --- a/src/edu/berkeley/sbp/util/Reflection.java +++ b/src/edu/berkeley/sbp/util/Reflection.java @@ -1,3 +1,5 @@ +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license + package edu.berkeley.sbp.util; import java.io.*; import java.lang.reflect.*; diff --git a/src/edu/berkeley/sbp/util/SingletonIterator.java b/src/edu/berkeley/sbp/util/SingletonIterator.java index 108b56c..2eca5e0 100644 --- a/src/edu/berkeley/sbp/util/SingletonIterator.java +++ b/src/edu/berkeley/sbp/util/SingletonIterator.java @@ -1,3 +1,5 @@ +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license + package edu.berkeley.sbp.util; import java.util.*; diff --git a/src/edu/berkeley/sbp/util/StringUtil.java b/src/edu/berkeley/sbp/util/StringUtil.java index 7d8009d..71f4bc0 100644 --- a/src/edu/berkeley/sbp/util/StringUtil.java +++ b/src/edu/berkeley/sbp/util/StringUtil.java @@ -1,3 +1,5 @@ +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license + package edu.berkeley.sbp.util; /** miscellaneous string utilities */ diff --git a/src/edu/berkeley/sbp/util/ToHTML.java b/src/edu/berkeley/sbp/util/ToHTML.java index 3d52562..1c1d89f 100644 --- a/src/edu/berkeley/sbp/util/ToHTML.java +++ b/src/edu/berkeley/sbp/util/ToHTML.java @@ -1,3 +1,5 @@ +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license + package edu.berkeley.sbp.util; import java.io.*; import java.util.*; diff --git a/src/edu/berkeley/sbp/util/ToJava.java b/src/edu/berkeley/sbp/util/ToJava.java index 4c94755..25544f8 100644 --- a/src/edu/berkeley/sbp/util/ToJava.java +++ b/src/edu/berkeley/sbp/util/ToJava.java @@ -1,3 +1,5 @@ +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license + package edu.berkeley.sbp.util; import edu.berkeley.sbp.*; import edu.berkeley.sbp.util.*; diff --git a/src/edu/berkeley/sbp/util/TopologicalBag.java b/src/edu/berkeley/sbp/util/TopologicalBag.java index 2595602..f7ce6e7 100644 --- a/src/edu/berkeley/sbp/util/TopologicalBag.java +++ b/src/edu/berkeley/sbp/util/TopologicalBag.java @@ -1,3 +1,5 @@ +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license + package edu.berkeley.sbp.util; import edu.berkeley.sbp.util.*; import edu.berkeley.sbp.*; diff --git a/src/edu/berkeley/sbp/util/Topology.java b/src/edu/berkeley/sbp/util/Topology.java index 8de0f72..70441ff 100644 --- a/src/edu/berkeley/sbp/util/Topology.java +++ b/src/edu/berkeley/sbp/util/Topology.java @@ -1,3 +1,5 @@ +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license + package edu.berkeley.sbp.util; import edu.berkeley.sbp.util.*; import edu.berkeley.sbp.*; diff --git a/src/edu/berkeley/sbp/util/TreeBuilder.java b/src/edu/berkeley/sbp/util/TreeBuilder.java index 7284018..7a29311 100644 --- a/src/edu/berkeley/sbp/util/TreeBuilder.java +++ b/src/edu/berkeley/sbp/util/TreeBuilder.java @@ -1,3 +1,5 @@ +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license + package edu.berkeley.sbp.util; import edu.berkeley.sbp.*; import java.util.*; diff --git a/src/edu/berkeley/sbp/util/Visitable.java b/src/edu/berkeley/sbp/util/Visitable.java index f49e3d9..017cab7 100644 --- a/src/edu/berkeley/sbp/util/Visitable.java +++ b/src/edu/berkeley/sbp/util/Visitable.java @@ -1,3 +1,5 @@ +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license + package edu.berkeley.sbp.util; import java.util.*; diff --git a/src/edu/berkeley/sbp/util/VisitableMap.java b/src/edu/berkeley/sbp/util/VisitableMap.java index df6a1a1..8ede7f4 100644 --- a/src/edu/berkeley/sbp/util/VisitableMap.java +++ b/src/edu/berkeley/sbp/util/VisitableMap.java @@ -1,3 +1,5 @@ +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license + package edu.berkeley.sbp.util; import java.util.*; -- 1.7.10.4