Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/dev-lang/tuprolog/files
diff options
context:
space:
mode:
Diffstat (limited to 'dev-lang/tuprolog/files')
-rw-r--r--dev-lang/tuprolog/files/build-2.9.2.xml108
-rw-r--r--dev-lang/tuprolog/files/tuprolog-2.3.1_beta-javadocs.patch228
-rw-r--r--dev-lang/tuprolog/files/tuprolog-2.5.0-javadocs.patch315
-rw-r--r--dev-lang/tuprolog/files/tuprolog-2.6.0-javadocs.patch454
-rw-r--r--dev-lang/tuprolog/files/tuprolog-2.7.0-javadocs.patch437
-rw-r--r--dev-lang/tuprolog/files/tuprolog-2.9.2-no-dynamic-object-test.patch20
-rw-r--r--dev-lang/tuprolog/files/tuprolog-2.9.2-no-ikvm.patch116
7 files changed, 244 insertions, 1434 deletions
diff --git a/dev-lang/tuprolog/files/build-2.9.2.xml b/dev-lang/tuprolog/files/build-2.9.2.xml
new file mode 100644
index 000000000000..0e585bd4369c
--- /dev/null
+++ b/dev-lang/tuprolog/files/build-2.9.2.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" ?><project default="jar" name="tuprolog">
+
+ <!-- some properties -->
+ <property name="src.dir" value="src"/>
+ <property name="build.dir" value="build"/>
+ <property name="docs.dir" value="docs"/>
+ <property name="dist.dir" value="dist"/>
+ <property name="test.dir" value="test"/>
+ <property name="test.build.dir" value="test.build"/>
+ <property name="jarfile" value="${ant.project.name}.jar"/>
+ <property file="build.properties"/>
+
+ <path id="compile.classpath">
+ <fileset dir="lib" includes="*.jar"/>
+ <pathelement path="${gentoo.classpath}"/>
+ </path>
+
+ <!-- init -->
+ <target name="init">
+ <tstamp/>
+ <mkdir dir="${dist.dir}"/>
+ <mkdir dir="${build.dir}"/>
+ <mkdir dir="${docs.dir}"/>
+ <mkdir dir="${test.build.dir}"/>
+ </target>
+
+ <!-- compile everything -->
+ <target depends="init" name="compile">
+ <javac deprecation="off"
+ destdir="${build.dir}"
+ encoding="ISO-8859-1"
+ srcdir="${src.dir}"
+ target="1.7">
+ <classpath>
+ <path refid="compile.classpath"/>
+ </classpath>
+ </javac>
+ <copy todir="${build.dir}">
+ <fileset dir="${src.dir}">
+ <exclude name="**/*.java"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <!-- build the jar file -->
+ <target depends="compile" name="jar">
+ <jar basedir="${build.dir}" jarfile="${dist.dir}/${jarfile}"/>
+ <jar basedir="${build.dir}" jarfile="${dist.dir}/2p.jar">
+ <manifest>
+ <attribute name="Main-Class" value="alice.tuprologx.ide.GUILauncher"/>
+ </manifest>
+ </jar>
+ </target>
+
+ <!-- generate javadocs -->
+ <target depends="init" name="javadoc">
+ <javadoc
+ author="false"
+ destdir="${docs.dir}"
+ encoding="ISO-8859-1"
+ breakiterator="yes"
+ packagenames="alice.*"
+ sourcepath="${src.dir}"
+ use="true"
+ version="true"
+ verbose="no"
+ windowtitle="${ant.project.name} API">
+ <classpath>
+ <path refid="compile.classpath"/>
+ </classpath>
+ </javadoc>
+ </target>
+
+ <!-- clean up -->
+ <target name="clean">
+ <delete dir="${build.dir}"/>
+ <delete dir="${dist.dir}"/>
+ <delete dir="${docs.dir}"/>
+ <delete dir="${test.build.dir}"/>
+ </target>
+
+ <!-- run testsuite -->
+ <target name="test">
+ <path id="dist.classpath">
+ <fileset dir="${dist.dir}">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+ <javac classpathref="dist.classpath"
+ deprecation="off"
+ destdir="${test.build.dir}"
+ encoding="ISO-8859-1"
+ srcdir="${test.dir}/unit"
+ target="1.7"/>
+ <junit haltonfailure="on" showoutput="no" printsummary="yes">
+ <classpath>
+ <path refid="dist.classpath"/>
+ <pathelement path="${test.build.dir}"/>
+ </classpath>
+ <formatter type="xml"/>
+ <batchtest todir="${test.build.dir}">
+ <fileset dir="${test.build.dir}">
+ <include name="**/*TestCase.class"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+</project>
diff --git a/dev-lang/tuprolog/files/tuprolog-2.3.1_beta-javadocs.patch b/dev-lang/tuprolog/files/tuprolog-2.3.1_beta-javadocs.patch
deleted file mode 100644
index aa1f3dcbab2f..000000000000
--- a/dev-lang/tuprolog/files/tuprolog-2.3.1_beta-javadocs.patch
+++ /dev/null
@@ -1,228 +0,0 @@
-diff -ur 2p-deploy.orig/src/alice/tuprolog/ChoicePointStore.java 2p-deploy/src/alice/tuprolog/ChoicePointStore.java
---- 2p-deploy.orig/src/alice/tuprolog/ChoicePointStore.java 2010-01-21 21:29:24.000000000 +1300
-+++ 2p-deploy/src/alice/tuprolog/ChoicePointStore.java 2012-01-15 09:20:48.000000000 +1300
-@@ -35,7 +35,6 @@
-
- /**
- * Return the actual choice-point store
-- * @return
- */
- public ChoicePointContext getPointer() {
- return pointer;
-@@ -44,7 +43,6 @@
- /**
- * Check if a choice point exists in the store.
- * As a side effect, removes choice points which have been already used and are now empty.
-- * @return
- */
- protected boolean existChoicePoint() {
- if (pointer == null) return false;
-diff -ur 2p-deploy.orig/src/alice/tuprolog/ClauseStore.java 2p-deploy/src/alice/tuprolog/ClauseStore.java
---- 2p-deploy.orig/src/alice/tuprolog/ClauseStore.java 2010-11-04 11:55:42.000000000 +1300
-+++ 2p-deploy/src/alice/tuprolog/ClauseStore.java 2012-01-15 09:20:48.000000000 +1300
-@@ -62,8 +62,6 @@
-
- /**
- * Verify if there is a term in compatibleGoals compatible with goal.
-- * @param goal
-- * @param compGoals
- * @return true if compatible or false otherwise.
- */
- protected boolean existCompatibleClause() {
-diff -ur 2p-deploy.orig/src/alice/tuprolog/EngineManager.java 2p-deploy/src/alice/tuprolog/EngineManager.java
---- 2p-deploy.orig/src/alice/tuprolog/EngineManager.java 2010-01-21 21:29:24.000000000 +1300
-+++ 2p-deploy/src/alice/tuprolog/EngineManager.java 2012-01-15 09:20:48.000000000 +1300
-@@ -87,7 +87,7 @@
- /**
- * Solves a query
- *
-- * @param g the term representing the goal to be demonstrated
-+ * @param query the term representing the goal to be demonstrated
- * @return the result of the demonstration
- * @see SolveInfo
- **/
-diff -ur 2p-deploy.orig/src/alice/tuprolog/PrimitiveManager.java 2p-deploy/src/alice/tuprolog/PrimitiveManager.java
---- 2p-deploy.orig/src/alice/tuprolog/PrimitiveManager.java 2010-01-21 21:29:24.000000000 +1300
-+++ 2p-deploy/src/alice/tuprolog/PrimitiveManager.java 2012-01-15 09:20:48.000000000 +1300
-@@ -87,7 +87,7 @@
- * This involves identifying structs representing builtin
- * predicates and functors, and setting up related structures and links
- *
-- * @parm term the term to be identified
-+ * @param term the term to be identified
- * @return term with the identified built-in directive
- */
- public Term identifyDirective(Term term) {
-diff -ur 2p-deploy.orig/src/alice/tuprolog/lib/BasicLibrary.java 2p-deploy/src/alice/tuprolog/lib/BasicLibrary.java
---- 2p-deploy.orig/src/alice/tuprolog/lib/BasicLibrary.java 2011-01-28 16:31:44.000000000 +1300
-+++ 2p-deploy/src/alice/tuprolog/lib/BasicLibrary.java 2012-01-15 09:20:48.000000000 +1300
-@@ -109,7 +109,7 @@
- /**
- * Loads a library constructed from a theory.
- *
-- * @param theory
-+ * @param th
- * theory text
- * @param libName
- * name of the library
-diff -ur 2p-deploy.orig/src/alice/tuprolog/lib/IOLibrary.java 2p-deploy/src/alice/tuprolog/lib/IOLibrary.java
---- 2p-deploy.orig/src/alice/tuprolog/lib/IOLibrary.java 2011-01-19 16:34:24.000000000 +1300
-+++ 2p-deploy/src/alice/tuprolog/lib/IOLibrary.java 2012-01-15 09:20:48.000000000 +1300
-@@ -372,7 +372,7 @@
- /**
- * Sets an arbitrary seed for the Random object.
- *
-- * @param seed Seed to use
-+ * @param t Seed to use
- * @return true if seed Term has a valid long value, false otherwise
- */
- public boolean set_seed_1(Term t) throws PrologError {
-diff -ur 2p-deploy.orig/src/alice/tuprolog/lib/JavaLibrary.java 2p-deploy/src/alice/tuprolog/lib/JavaLibrary.java
---- 2p-deploy.orig/src/alice/tuprolog/lib/JavaLibrary.java 2010-01-21 21:29:24.000000000 +1300
-+++ 2p-deploy/src/alice/tuprolog/lib/JavaLibrary.java 2012-01-15 09:20:48.000000000 +1300
-@@ -1390,8 +1390,6 @@
-
- /**
- * Generates a fresh numeric identifier
-- *
-- * @return
- */
- protected Struct generateFreshId() {
- return new Struct("$obj_" + id++);
-diff -ur 2p-deploy.orig/src/alice/tuprologx/ide/LibraryDialogFrame.java 2p-deploy/src/alice/tuprologx/ide/LibraryDialogFrame.java
---- 2p-deploy.orig/src/alice/tuprologx/ide/LibraryDialogFrame.java 2010-01-21 21:29:22.000000000 +1300
-+++ 2p-deploy/src/alice/tuprologx/ide/LibraryDialogFrame.java 2012-01-15 09:20:48.000000000 +1300
-@@ -317,7 +317,6 @@
- displayLibraryManagerStatus();
- }
-
-- /** @see alice.tuprologx.ide.SwingFrame#onClose()*/
- public void closeLibraryDialog()
- {
- onClose();
-diff -ur 2p-deploy.orig/src/alice/tuprologx/ide/ToolBar.java 2p-deploy/src/alice/tuprologx/ide/ToolBar.java
---- 2p-deploy.orig/src/alice/tuprologx/ide/ToolBar.java 2010-01-21 21:29:22.000000000 +1300
-+++ 2p-deploy/src/alice/tuprologx/ide/ToolBar.java 2012-01-15 09:20:48.000000000 +1300
-@@ -232,8 +232,6 @@
-
- /**
- * Set the tuProlog config frame
-- *
-- * @param libraryManager a libraryManager to associate to the libraryDialog
- */
- public void setPrologConfig(PrologConfigFrame configFrame)
- {
-diff -ur 2p-deploy.orig/src/alice/tuprologx/pj/lib/PJLibrary.java 2p-deploy/src/alice/tuprologx/pj/lib/PJLibrary.java
---- 2p-deploy.orig/src/alice/tuprologx/pj/lib/PJLibrary.java 2010-01-21 21:29:48.000000000 +1300
-+++ 2p-deploy/src/alice/tuprologx/pj/lib/PJLibrary.java 2012-01-15 09:20:48.000000000 +1300
-@@ -1252,7 +1252,6 @@
-
- /**
- * Generates a fresh numeric identifier
-- * @return
- */
- protected Struct generateFreshId() {
- return new Struct("$obj_" + id++);
-diff -ur 2p-deploy.orig/src/alice/util/ReadOnlyLinkedList.java 2p-deploy/src/alice/util/ReadOnlyLinkedList.java
---- 2p-deploy.orig/src/alice/util/ReadOnlyLinkedList.java 2010-03-17 18:14:10.000000000 +1300
-+++ 2p-deploy/src/alice/util/ReadOnlyLinkedList.java 2012-01-15 09:32:03.000000000 +1300
-@@ -12,10 +12,10 @@
- import java.util.ListIterator;
-
- /**
-- * ReadOnlyLinkedList<E> encapsulate a {@link LinkedList<E>}
-+ * ReadOnlyLinkedList<E> encapsulate a {@link LinkedList}
- * and ensures that the given list is navigated only.
- *
-- * Even if ReadOnlyLinkedList<E> implements {@link List<E>} it doesn't
-+ * Even if ReadOnlyLinkedList<E> implements {@link List} it doesn't
- * support modifiers methods, and throws {@link UnsupportedOperationException}
- * if invoked.
- *
-diff -ur 2p-deploy.orig/src/alice/util/jedit/InputHandler.java 2p-deploy/src/alice/util/jedit/InputHandler.java
---- 2p-deploy.orig/src/alice/util/jedit/InputHandler.java 2010-01-21 21:29:24.000000000 +1300
-+++ 2p-deploy/src/alice/util/jedit/InputHandler.java 2012-01-15 09:20:48.000000000 +1300
-@@ -24,7 +24,7 @@
- *
- * @author Slava Pestov
- * @version $Id: InputHandler.java,v 1.14 1999/12/13 03:40:30 sp Exp $
-- * @see org.gjt.sp.jedit.textarea.DefaultInputHandler
-+ * @see alice.util.jedit.DefaultInputHandler
- */
- public abstract class InputHandler extends KeyAdapter
- {
-@@ -187,7 +187,7 @@
- /**
- * Grabs the next key typed event and invokes the specified
- * action with the key as a the action command.
-- * @param action The action
-+ * @param listener The action
- */
- public void grabNextKeyStroke(ActionListener listener)
- {
-diff -ur 2p-deploy.orig/src/alice/util/jedit/JEditTextArea.java 2p-deploy/src/alice/util/jedit/JEditTextArea.java
---- 2p-deploy.orig/src/alice/util/jedit/JEditTextArea.java 2010-01-21 21:29:24.000000000 +1300
-+++ 2p-deploy/src/alice/util/jedit/JEditTextArea.java 2012-01-15 09:20:48.000000000 +1300
-@@ -1389,7 +1389,7 @@
-
- /**
- * Sets if the selection should be rectangular.
-- * @param overwrite True if the selection should be rectangular,
-+ * @param rectSelect True if the selection should be rectangular,
- * false otherwise.
- */
- public final void setSelectionRectangular(boolean rectSelect)
-diff -ur 2p-deploy.orig/src/alice/util/jedit/KeywordMap.java 2p-deploy/src/alice/util/jedit/KeywordMap.java
---- 2p-deploy.orig/src/alice/util/jedit/KeywordMap.java 2010-01-21 21:29:22.000000000 +1300
-+++ 2p-deploy/src/alice/util/jedit/KeywordMap.java 2012-01-15 09:20:48.000000000 +1300
-@@ -75,7 +75,7 @@
- /**
- * Adds a key-value mapping.
- * @param keyword The key
-- * @Param id The value
-+ * @param id The value
- */
- public void add(String keyword, byte id)
- {
-diff -ur 2p-deploy.orig/src/alice/util/jedit/TextAreaPainter.java 2p-deploy/src/alice/util/jedit/TextAreaPainter.java
---- 2p-deploy.orig/src/alice/util/jedit/TextAreaPainter.java 2010-01-21 21:29:24.000000000 +1300
-+++ 2p-deploy/src/alice/util/jedit/TextAreaPainter.java 2012-01-15 09:20:48.000000000 +1300
-@@ -75,7 +75,7 @@
- /**
- * Returns the syntax styles used to paint colorized text. Entry <i>n</i>
- * will be used to paint tokens with id = <i>n</i>.
-- * @see org.gjt.sp.jedit.syntax.Token
-+ * @see alice.util.jedit.Token
- */
- public final SyntaxStyle[] getStyles()
- {
-@@ -86,7 +86,7 @@
- * Sets the syntax styles used to paint colorized text. Entry <i>n</i>
- * will be used to paint tokens with id = <i>n</i>.
- * @param styles The syntax styles
-- * @see org.gjt.sp.jedit.syntax.Token
-+ * @see alice.util.jedit.Token
- */
- public final void setStyles(SyntaxStyle[] styles)
- {
-@@ -356,7 +356,7 @@
-
- /**
- * Repaints the text.
-- * @param g The graphics context
-+ * @param gfx The graphics context
- */
- public void paint(Graphics gfx)
- {
-diff -ur 2p-deploy.orig/src/alice/util/jedit/TokenMarker.java 2p-deploy/src/alice/util/jedit/TokenMarker.java
---- 2p-deploy.orig/src/alice/util/jedit/TokenMarker.java 2010-01-21 21:29:22.000000000 +1300
-+++ 2p-deploy/src/alice/util/jedit/TokenMarker.java 2012-01-15 09:20:48.000000000 +1300
-@@ -24,7 +24,7 @@
- * @author Slava Pestov
- * @version $Id: TokenMarker.java,v 1.32 1999/12/13 03:40:30 sp Exp $
- *
-- * @see org.gjt.sp.jedit.syntax.Token
-+ * @see alice.util.jedit.Token
- */
- public abstract class TokenMarker
- {
diff --git a/dev-lang/tuprolog/files/tuprolog-2.5.0-javadocs.patch b/dev-lang/tuprolog/files/tuprolog-2.5.0-javadocs.patch
deleted file mode 100644
index 256710934666..000000000000
--- a/dev-lang/tuprolog/files/tuprolog-2.5.0-javadocs.patch
+++ /dev/null
@@ -1,315 +0,0 @@
-diff -ur tuprolog-2.5.0.orig/src/alice/tuprolog/ChoicePointStore.java tuprolog-2.5.0/src/alice/tuprolog/ChoicePointStore.java
---- tuprolog-2.5.0.orig/src/alice/tuprolog/ChoicePointStore.java 2012-08-03 02:38:21.000000000 +0200
-+++ tuprolog-2.5.0/src/alice/tuprolog/ChoicePointStore.java 2012-08-03 03:45:45.000000000 +0200
-@@ -36,7 +36,6 @@
-
- /**
- * Return the actual choice-point store
-- * @return
- */
- public ChoicePointContext getPointer() {
- return pointer;
-@@ -45,7 +44,6 @@
- /**
- * Check if a choice point exists in the store.
- * As a side effect, removes choice points which have been already used and are now empty.
-- * @return
- */
- protected boolean existChoicePoint() {
- if (pointer == null) return false;
-@@ -93,4 +91,4 @@
- return l;
- }
-
--}
-\ No newline at end of file
-+}
-diff -ur tuprolog-2.5.0.orig/src/alice/tuprolog/ClauseStore.java tuprolog-2.5.0/src/alice/tuprolog/ClauseStore.java
---- tuprolog-2.5.0.orig/src/alice/tuprolog/ClauseStore.java 2012-08-03 02:38:21.000000000 +0200
-+++ tuprolog-2.5.0/src/alice/tuprolog/ClauseStore.java 2012-08-03 03:45:45.000000000 +0200
-@@ -62,8 +62,6 @@
-
- /**
- * Verify if there is a term in compatibleGoals compatible with goal.
-- * @param goal
-- * @param compGoals
- * @return true if compatible or false otherwise.
- */
- protected boolean existCompatibleClause() {
-@@ -160,4 +158,4 @@
- }
-
-
--}
-\ No newline at end of file
-+}
-diff -ur tuprolog-2.5.0.orig/src/alice/tuprolog/EngineManager.java tuprolog-2.5.0/src/alice/tuprolog/EngineManager.java
---- tuprolog-2.5.0.orig/src/alice/tuprolog/EngineManager.java 2012-08-03 02:38:21.000000000 +0200
-+++ tuprolog-2.5.0/src/alice/tuprolog/EngineManager.java 2012-08-03 03:45:45.000000000 +0200
-@@ -96,7 +96,7 @@
- /**
- * Solves a query
- *
-- * @param g the term representing the goal to be demonstrated
-+ * @param query the term representing the goal to be demonstrated
- * @return the result of the demonstration
- * @see SolveInfo
- **/
-@@ -243,4 +243,4 @@
- }
-
-
--}
-\ No newline at end of file
-+}
-diff -ur tuprolog-2.5.0.orig/src/alice/tuprolog/event/SpyEvent.java tuprolog-2.5.0/src/alice/tuprolog/event/SpyEvent.java
---- tuprolog-2.5.0.orig/src/alice/tuprolog/event/SpyEvent.java 2012-08-03 02:38:21.000000000 +0200
-+++ tuprolog-2.5.0/src/alice/tuprolog/event/SpyEvent.java 2012-08-03 03:45:45.000000000 +0200
-@@ -33,10 +33,6 @@
- * event description
- */
- private String msg;
-- /**
-- * @uml.property name="env"
-- * @uml.associationEnd
-- */
- private Engine env;
-
- public SpyEvent(Object source, String msg_) {
-@@ -63,4 +59,4 @@
- return msg + ((env == null) ? "" : env.toString());
- }
-
--}
-\ No newline at end of file
-+}
-diff -ur tuprolog-2.5.0.orig/src/alice/tuprolog/lib/BasicLibrary.java tuprolog-2.5.0/src/alice/tuprolog/lib/BasicLibrary.java
---- tuprolog-2.5.0.orig/src/alice/tuprolog/lib/BasicLibrary.java 2012-08-03 02:38:21.000000000 +0200
-+++ tuprolog-2.5.0/src/alice/tuprolog/lib/BasicLibrary.java 2012-08-03 03:45:45.000000000 +0200
-@@ -114,7 +114,7 @@
- /**
- * Loads a library constructed from a theory.
- *
-- * @param theory
-+ * @param th
- * theory text
- * @param libName
- * name of the library
-@@ -1356,4 +1356,4 @@
- { "\\", "expression_bitwise_not", "functor" } };
- }
-
--}
-\ No newline at end of file
-+}
-diff -ur tuprolog-2.5.0.orig/src/alice/tuprolog/lib/IOLibrary.java tuprolog-2.5.0/src/alice/tuprolog/lib/IOLibrary.java
---- tuprolog-2.5.0.orig/src/alice/tuprolog/lib/IOLibrary.java 2012-08-03 02:38:21.000000000 +0200
-+++ tuprolog-2.5.0/src/alice/tuprolog/lib/IOLibrary.java 2012-08-03 03:45:45.000000000 +0200
-@@ -375,7 +375,7 @@
- /**
- * Sets an arbitrary seed for the Random object.
- *
-- * @param seed Seed to use
-+ * @param t Seed to use
- * @return true if seed Term has a valid long value, false otherwise
- */
- public boolean set_seed_1(Term t) throws PrologError {
-@@ -470,4 +470,4 @@
- }
- return true;
- }
--}
-\ No newline at end of file
-+}
-diff -ur tuprolog-2.5.0.orig/src/alice/tuprolog/lib/JavaLibrary.java tuprolog-2.5.0/src/alice/tuprolog/lib/JavaLibrary.java
---- tuprolog-2.5.0.orig/src/alice/tuprolog/lib/JavaLibrary.java 2012-08-03 02:38:21.000000000 +0200
-+++ tuprolog-2.5.0/src/alice/tuprolog/lib/JavaLibrary.java 2012-08-03 03:45:45.000000000 +0200
-@@ -1393,8 +1393,6 @@
-
- /**
- * Generates a fresh numeric identifier
-- *
-- * @return
- */
- protected Struct generateFreshId() {
- return new Struct("$obj_" + id++);
-diff -ur tuprolog-2.5.0.orig/src/alice/tuprolog/PrimitiveManager.java tuprolog-2.5.0/src/alice/tuprolog/PrimitiveManager.java
---- tuprolog-2.5.0.orig/src/alice/tuprolog/PrimitiveManager.java 2012-08-03 02:38:21.000000000 +0200
-+++ tuprolog-2.5.0/src/alice/tuprolog/PrimitiveManager.java 2012-08-03 03:45:45.000000000 +0200
-@@ -89,7 +89,7 @@
- * This involves identifying structs representing builtin
- * predicates and functors, and setting up related structures and links
- *
-- * @parm term the term to be identified
-+ * @param term the term to be identified
- * @return term with the identified built-in directive
- */
- public Term identifyDirective(Term term) {
-@@ -192,4 +192,4 @@
- return (functorHashMap.containsKey(name + "/" + nArgs) || predicateHashMap.containsKey(name + "/" + nArgs));
- }
- /**/
--}
-\ No newline at end of file
-+}
-diff -ur tuprolog-2.5.0.orig/src/alice/tuprologx/ide/Console.java tuprolog-2.5.0/src/alice/tuprologx/ide/Console.java
---- tuprolog-2.5.0.orig/src/alice/tuprologx/ide/Console.java 2012-08-03 02:38:20.000000000 +0200
-+++ tuprolog-2.5.0/src/alice/tuprologx/ide/Console.java 2012-08-03 03:45:45.000000000 +0200
-@@ -10,8 +10,5 @@
- public void getNextSolution();
- public void acceptSolution();
- public void stopEngine();
-- /**
-- * @uml.property name="goal"
-- */
- public String getGoal();
--}
-\ No newline at end of file
-+}
-diff -ur tuprolog-2.5.0.orig/src/alice/tuprologx/ide/LibraryDialogFrame.java tuprolog-2.5.0/src/alice/tuprologx/ide/LibraryDialogFrame.java
---- tuprolog-2.5.0.orig/src/alice/tuprologx/ide/LibraryDialogFrame.java 2012-08-03 02:38:20.000000000 +0200
-+++ tuprolog-2.5.0/src/alice/tuprologx/ide/LibraryDialogFrame.java 2012-08-03 03:45:45.000000000 +0200
-@@ -325,7 +325,6 @@
- displayLibraryManagerStatus();
- }
-
-- /** @see alice.tuprologx.ide.SwingFrame#onClose()*/
- public void closeLibraryDialog()
- {
- onClose();
-diff -ur tuprolog-2.5.0.orig/src/alice/tuprologx/ide/ToolBar.java tuprolog-2.5.0/src/alice/tuprologx/ide/ToolBar.java
---- tuprolog-2.5.0.orig/src/alice/tuprologx/ide/ToolBar.java 2012-08-03 02:38:20.000000000 +0200
-+++ tuprolog-2.5.0/src/alice/tuprologx/ide/ToolBar.java 2012-08-03 03:45:45.000000000 +0200
-@@ -242,8 +242,6 @@
-
- /**
- * Set the tuProlog config frame
-- *
-- * @param libraryManager a libraryManager to associate to the libraryDialog
- */
- public void setPrologConfig(PrologConfigFrame configFrame)
- {
-diff -ur tuprolog-2.5.0.orig/src/alice/tuprologx/pj/lib/PJLibrary.java tuprolog-2.5.0/src/alice/tuprologx/pj/lib/PJLibrary.java
---- tuprolog-2.5.0.orig/src/alice/tuprologx/pj/lib/PJLibrary.java 2012-08-03 02:38:20.000000000 +0200
-+++ tuprolog-2.5.0/src/alice/tuprologx/pj/lib/PJLibrary.java 2012-08-03 03:45:45.000000000 +0200
-@@ -1252,7 +1252,6 @@
-
- /**
- * Generates a fresh numeric identifier
-- * @return
- */
- protected Struct generateFreshId() {
- return new Struct("$obj_" + id++);
-diff -ur tuprolog-2.5.0.orig/src/alice/util/jedit/InputHandler.java tuprolog-2.5.0/src/alice/util/jedit/InputHandler.java
---- tuprolog-2.5.0.orig/src/alice/util/jedit/InputHandler.java 2012-08-03 02:38:21.000000000 +0200
-+++ tuprolog-2.5.0/src/alice/util/jedit/InputHandler.java 2012-08-03 03:45:45.000000000 +0200
-@@ -24,7 +24,7 @@
- *
- * @author Slava Pestov
- * @version $Id: InputHandler.java,v 1.14 1999/12/13 03:40:30 sp Exp $
-- * @see org.gjt.sp.jedit.textarea.DefaultInputHandler
-+ * @see alice.util.jedit.DefaultInputHandler
- */
- public abstract class InputHandler extends KeyAdapter
- {
-@@ -187,7 +187,7 @@
- /**
- * Grabs the next key typed event and invokes the specified
- * action with the key as a the action command.
-- * @param action The action
-+ * @param listener The action
- */
- public void grabNextKeyStroke(ActionListener listener)
- {
-diff -ur tuprolog-2.5.0.orig/src/alice/util/jedit/JEditTextArea.java tuprolog-2.5.0/src/alice/util/jedit/JEditTextArea.java
---- tuprolog-2.5.0.orig/src/alice/util/jedit/JEditTextArea.java 2012-08-03 02:38:21.000000000 +0200
-+++ tuprolog-2.5.0/src/alice/util/jedit/JEditTextArea.java 2012-08-03 03:48:07.000000000 +0200
-@@ -1401,7 +1401,7 @@
-
- /**
- * Sets if the selection should be rectangular.
-- * @param overwrite True if the selection should be rectangular,
-+ * @param rectSelect True if the selection should be rectangular,
- * false otherwise.
- */
- public final void setSelectionRectangular(boolean rectSelect)
-diff -ur tuprolog-2.5.0.orig/src/alice/util/jedit/KeywordMap.java tuprolog-2.5.0/src/alice/util/jedit/KeywordMap.java
---- tuprolog-2.5.0.orig/src/alice/util/jedit/KeywordMap.java 2012-08-03 02:38:21.000000000 +0200
-+++ tuprolog-2.5.0/src/alice/util/jedit/KeywordMap.java 2012-08-03 03:45:45.000000000 +0200
-@@ -75,7 +75,7 @@
- /**
- * Adds a key-value mapping.
- * @param keyword The key
-- * @Param id The value
-+ * @param id The value
- */
- public void add(String keyword, byte id)
- {
-@@ -102,9 +102,6 @@
- }
-
- // protected members
-- /**
-- * @uml.property name="mapLength"
-- */
- protected int mapLength;
-
- protected int getStringMapKey(String s)
-diff -ur tuprolog-2.5.0.orig/src/alice/util/jedit/TextAreaPainter.java tuprolog-2.5.0/src/alice/util/jedit/TextAreaPainter.java
---- tuprolog-2.5.0.orig/src/alice/util/jedit/TextAreaPainter.java 2012-08-03 02:38:21.000000000 +0200
-+++ tuprolog-2.5.0/src/alice/util/jedit/TextAreaPainter.java 2012-08-03 03:45:45.000000000 +0200
-@@ -75,7 +75,7 @@
-
- /**
- * Returns the syntax styles used to paint colorized text. Entry <i>n</i> will be used to paint tokens with id = <i>n</i>.
-- * @see org.gjt.sp.jedit.syntax.Token
-+ * @see alice.util.jedit.Token
- */
- public final SyntaxStyle[] getStyles()
- {
-@@ -85,7 +85,7 @@
- /**
- * Sets the syntax styles used to paint colorized text. Entry <i>n</i> will be used to paint tokens with id = <i>n</i>.
- * @param styles The syntax styles
-- * @see org.gjt.sp.jedit.syntax.Token
-+ * @see alice.util.jedit.Token
- */
- public final void setStyles(SyntaxStyle[] styles)
- {
-@@ -356,7 +356,7 @@
-
- /**
- * Repaints the text.
-- * @param g The graphics context
-+ * @param gfx The graphics context
- */
- public void paint(Graphics gfx)
- {
-diff -ur tuprolog-2.5.0.orig/src/alice/util/jedit/TokenMarker.java tuprolog-2.5.0/src/alice/util/jedit/TokenMarker.java
---- tuprolog-2.5.0.orig/src/alice/util/jedit/TokenMarker.java 2012-08-03 02:38:21.000000000 +0200
-+++ tuprolog-2.5.0/src/alice/util/jedit/TokenMarker.java 2012-08-03 03:45:45.000000000 +0200
-@@ -23,7 +23,7 @@
- * @author Slava Pestov
- * @version $Id: TokenMarker.java,v 1.32 1999/12/13 03:40:30 sp Exp $
- *
-- * @see org.gjt.sp.jedit.syntax.Token
-+ * @see alice.util.jedit.Token
- */
- public abstract class TokenMarker
- {
-diff -ur tuprolog-2.5.0.orig/src/alice/util/ReadOnlyLinkedList.java tuprolog-2.5.0/src/alice/util/ReadOnlyLinkedList.java
---- tuprolog-2.5.0.orig/src/alice/util/ReadOnlyLinkedList.java 2012-08-03 02:38:21.000000000 +0200
-+++ tuprolog-2.5.0/src/alice/util/ReadOnlyLinkedList.java 2012-08-03 03:45:45.000000000 +0200
-@@ -12,10 +12,10 @@
- import java.util.ListIterator;
-
- /**
-- * ReadOnlyLinkedList<E> encapsulate a {@link LinkedList<E>}
-+ * ReadOnlyLinkedList<E> encapsulate a {@link LinkedList}
- * and ensures that the given list is navigated only.
- *
-- * Even if ReadOnlyLinkedList<E> implements {@link List<E>} it doesn't
-+ * Even if ReadOnlyLinkedList<E> implements {@link List} it doesn't
- * support modifiers methods, and throws {@link UnsupportedOperationException}
- * if invoked.
- *
diff --git a/dev-lang/tuprolog/files/tuprolog-2.6.0-javadocs.patch b/dev-lang/tuprolog/files/tuprolog-2.6.0-javadocs.patch
deleted file mode 100644
index 7eba988d5ba3..000000000000
--- a/dev-lang/tuprolog/files/tuprolog-2.6.0-javadocs.patch
+++ /dev/null
@@ -1,454 +0,0 @@
-diff -ur tuprolog-2.6.0.orig/src/alice/tuprolog/ChoicePointStore.java tuprolog-2.6.0/src/alice/tuprolog/ChoicePointStore.java
---- tuprolog-2.6.0.orig/src/alice/tuprolog/ChoicePointStore.java 2013-02-14 12:01:32.000000000 +0100
-+++ tuprolog-2.6.0/src/alice/tuprolog/ChoicePointStore.java 2013-02-14 12:01:56.000000000 +0100
-@@ -36,7 +36,6 @@
-
- /**
- * Return the actual choice-point store
-- * @return
- */
- public ChoicePointContext getPointer() {
- return pointer;
-@@ -45,7 +44,6 @@
- /**
- * Check if a choice point exists in the store.
- * As a side effect, removes choice points which have been already used and are now empty.
-- * @return
- */
- protected boolean existChoicePoint() {
- if (pointer == null) return false;
-@@ -93,4 +91,4 @@
- return l;
- }
-
--}
-\ No newline at end of file
-+}
-diff -ur tuprolog-2.6.0.orig/src/alice/tuprolog/ClauseStore.java tuprolog-2.6.0/src/alice/tuprolog/ClauseStore.java
---- tuprolog-2.6.0.orig/src/alice/tuprolog/ClauseStore.java 2013-02-14 12:01:32.000000000 +0100
-+++ tuprolog-2.6.0/src/alice/tuprolog/ClauseStore.java 2013-02-14 12:01:56.000000000 +0100
-@@ -62,8 +62,6 @@
-
- /**
- * Verify if there is a term in compatibleGoals compatible with goal.
-- * @param goal
-- * @param compGoals
- * @return true if compatible or false otherwise.
- */
- protected boolean existCompatibleClause() {
-@@ -160,4 +158,4 @@
- }
-
-
--}
-\ No newline at end of file
-+}
-diff -ur tuprolog-2.6.0.orig/src/alice/tuprolog/EngineManager.java tuprolog-2.6.0/src/alice/tuprolog/EngineManager.java
---- tuprolog-2.6.0.orig/src/alice/tuprolog/EngineManager.java 2013-02-14 12:01:32.000000000 +0100
-+++ tuprolog-2.6.0/src/alice/tuprolog/EngineManager.java 2013-02-14 12:01:56.000000000 +0100
-@@ -96,7 +96,7 @@
- /**
- * Solves a query
- *
-- * @param g the term representing the goal to be demonstrated
-+ * @param query the term representing the goal to be demonstrated
- * @return the result of the demonstration
- * @see SolveInfo
- **/
-@@ -243,4 +243,4 @@
- }
-
-
--}
-\ No newline at end of file
-+}
-diff -ur tuprolog-2.6.0.orig/src/alice/tuprolog/event/SpyEvent.java tuprolog-2.6.0/src/alice/tuprolog/event/SpyEvent.java
---- tuprolog-2.6.0.orig/src/alice/tuprolog/event/SpyEvent.java 2013-02-14 12:01:32.000000000 +0100
-+++ tuprolog-2.6.0/src/alice/tuprolog/event/SpyEvent.java 2013-02-14 12:01:56.000000000 +0100
-@@ -33,10 +33,6 @@
- * event description
- */
- private String msg;
-- /**
-- * @uml.property name="env"
-- * @uml.associationEnd
-- */
- private Engine env;
-
- public SpyEvent(Object source, String msg_) {
-@@ -63,4 +59,4 @@
- return msg + ((env == null) ? "" : env.toString());
- }
-
--}
-\ No newline at end of file
-+}
-diff -ur tuprolog-2.6.0.orig/src/alice/tuprolog/lib/BasicLibrary.java tuprolog-2.6.0/src/alice/tuprolog/lib/BasicLibrary.java
---- tuprolog-2.6.0.orig/src/alice/tuprolog/lib/BasicLibrary.java 2013-02-14 12:01:32.000000000 +0100
-+++ tuprolog-2.6.0/src/alice/tuprolog/lib/BasicLibrary.java 2013-02-14 12:01:56.000000000 +0100
-@@ -116,7 +116,7 @@
- /**
- * Loads a library constructed from a theory.
- *
-- * @param theory
-+ * @param th
- * theory text
- * @param libName
- * name of the library
-@@ -1358,4 +1358,4 @@
- { "\\", "expression_bitwise_not", "functor" } };
- }
-
--}
-\ No newline at end of file
-+}
-diff -ur tuprolog-2.6.0.orig/src/alice/tuprolog/lib/IOLibrary.java tuprolog-2.6.0/src/alice/tuprolog/lib/IOLibrary.java
---- tuprolog-2.6.0.orig/src/alice/tuprolog/lib/IOLibrary.java 2013-02-14 12:01:32.000000000 +0100
-+++ tuprolog-2.6.0/src/alice/tuprolog/lib/IOLibrary.java 2013-02-14 12:01:56.000000000 +0100
-@@ -375,7 +375,7 @@
- /**
- * Sets an arbitrary seed for the Random object.
- *
-- * @param seed Seed to use
-+ * @param t Seed to use
- * @return true if seed Term has a valid long value, false otherwise
- */
- public boolean set_seed_1(Term t) throws PrologError {
-@@ -470,4 +470,4 @@
- }
- return true;
- }
--}
-\ No newline at end of file
-+}
-diff -ur tuprolog-2.6.0.orig/src/alice/tuprolog/lib/JavaLibrary.java tuprolog-2.6.0/src/alice/tuprolog/lib/JavaLibrary.java
---- tuprolog-2.6.0.orig/src/alice/tuprolog/lib/JavaLibrary.java 2013-02-14 12:01:32.000000000 +0100
-+++ tuprolog-2.6.0/src/alice/tuprolog/lib/JavaLibrary.java 2013-02-14 12:12:49.000000000 +0100
-@@ -265,7 +265,7 @@
- * @author Michele Mannino
- * Creates of a java object - not backtrackable case
- * @param className The name of the class
-- * @oaram path The list of the paths where the class may be contained
-+ * @param paths The list of the paths where the class may be contained
- * @param argl The list of the arguments used by the constructor
- * @param id The name of the prolog term
- * @throws JavaException
-@@ -1745,8 +1745,6 @@
-
- /**
- * Generates a fresh numeric identifier
-- *
-- * @return
- */
- protected Struct generateFreshId() {
- return new Struct("$obj_" + id++);
-@@ -2099,4 +2097,4 @@
- this.eventFullClass = eventClass;
- listenerInterfaceName = n;
- }
--}
-\ No newline at end of file
-+}
-diff -ur tuprolog-2.6.0.orig/src/alice/tuprolog/LibraryManager.java tuprolog-2.6.0/src/alice/tuprolog/LibraryManager.java
---- tuprolog-2.6.0.orig/src/alice/tuprolog/LibraryManager.java 2013-02-14 12:01:32.000000000 +0100
-+++ tuprolog-2.6.0/src/alice/tuprolog/LibraryManager.java 2013-02-14 12:05:56.000000000 +0100
-@@ -49,7 +49,7 @@
- * If a library with the same name is already present,
- * a warning event is notified and the request is ignored.
- *
-- * @param the name of the Java class containing the library to be loaded
-+ * @param className the name of the Java class containing the library to be loaded
- * @return the reference to the Library just loaded
- * @throws InvalidLibraryException if name is not a valid library
- */
-@@ -81,8 +81,8 @@
- * If a library with the same name is already present,
- * a warning event is notified and the request is ignored.
- *
-- * @param the name of the Java class containing the library to be loaded
-- * @param the list of the paths where the library may be contained
-+ * @param className the name of the Java class containing the library to be loaded
-+ * @param paths the list of the paths where the library may be contained
- * @return the reference to the Library just loaded
- * @throws InvalidLibraryException if name is not a valid library
- */
-@@ -305,4 +305,4 @@
-
-
-
--}
-\ No newline at end of file
-+}
-diff -ur tuprolog-2.6.0.orig/src/alice/tuprolog/PrimitiveManager.java tuprolog-2.6.0/src/alice/tuprolog/PrimitiveManager.java
---- tuprolog-2.6.0.orig/src/alice/tuprolog/PrimitiveManager.java 2013-02-14 12:01:32.000000000 +0100
-+++ tuprolog-2.6.0/src/alice/tuprolog/PrimitiveManager.java 2013-02-14 12:01:56.000000000 +0100
-@@ -89,7 +89,7 @@
- * This involves identifying structs representing builtin
- * predicates and functors, and setting up related structures and links
- *
-- * @parm term the term to be identified
-+ * @param term the term to be identified
- * @return term with the identified built-in directive
- */
- public Term identifyDirective(Term term) {
-@@ -192,4 +192,4 @@
- return (functorHashMap.containsKey(name + "/" + nArgs) || predicateHashMap.containsKey(name + "/" + nArgs));
- }
- /**/
--}
-\ No newline at end of file
-+}
-diff -ur tuprolog-2.6.0.orig/src/alice/tuprolog/Struct.java tuprolog-2.6.0/src/alice/tuprolog/Struct.java
---- tuprolog-2.6.0.orig/src/alice/tuprolog/Struct.java 2013-02-14 12:01:32.000000000 +0100
-+++ tuprolog-2.6.0/src/alice/tuprolog/Struct.java 2013-02-14 12:06:46.000000000 +0100
-@@ -201,7 +201,7 @@
- }
-
- /**
-- * @return
-+ * @return predicateIndicator
- */
- String getPredicateIndicator() {
- return predicateIndicator;
-@@ -894,4 +894,4 @@
- }
- /**/
-
--}
-\ No newline at end of file
-+}
-diff -ur tuprolog-2.6.0.orig/src/alice/tuprologx/ide/Console.java tuprolog-2.6.0/src/alice/tuprologx/ide/Console.java
---- tuprolog-2.6.0.orig/src/alice/tuprologx/ide/Console.java 2013-02-14 12:01:32.000000000 +0100
-+++ tuprolog-2.6.0/src/alice/tuprologx/ide/Console.java 2013-02-14 12:01:56.000000000 +0100
-@@ -10,8 +10,5 @@
- public void getNextSolution();
- public void acceptSolution();
- public void stopEngine();
-- /**
-- * @uml.property name="goal"
-- */
- public String getGoal();
--}
-\ No newline at end of file
-+}
-diff -ur tuprolog-2.6.0.orig/src/alice/tuprologx/ide/LibraryDialogFrame.java tuprolog-2.6.0/src/alice/tuprologx/ide/LibraryDialogFrame.java
---- tuprolog-2.6.0.orig/src/alice/tuprologx/ide/LibraryDialogFrame.java 2013-02-14 12:01:32.000000000 +0100
-+++ tuprolog-2.6.0/src/alice/tuprologx/ide/LibraryDialogFrame.java 2013-02-14 12:12:14.000000000 +0100
-@@ -370,7 +370,7 @@
- * Add a library from file chooser path.
- *
- * @param libraryClassname The name of the .class of the library to be added.
-- * @param path from file chooser.
-+ * @param file from file chooser.
- */
- public void addLibrary(String libraryClassname, File file)
- {
-@@ -498,7 +498,6 @@
- displayLibraryManagerStatus();
- }
-
-- /** @see alice.tuprologx.ide.SwingFrame#onClose()*/
- public void closeLibraryDialog()
- {
- onClose();
-diff -ur tuprolog-2.6.0.orig/src/alice/tuprologx/ide/LibraryManager.java tuprolog-2.6.0/src/alice/tuprologx/ide/LibraryManager.java
---- tuprolog-2.6.0.orig/src/alice/tuprologx/ide/LibraryManager.java 2013-02-14 12:01:32.000000000 +0100
-+++ tuprolog-2.6.0/src/alice/tuprologx/ide/LibraryManager.java 2013-02-14 12:11:42.000000000 +0100
-@@ -131,7 +131,7 @@
- * Add a library to the manager.
- *
- * @param libraryClassname The name of the .class of the library to be added.
-- * @param path The path where is contained the library.
-+ * @param file The path where is contained the library.
- * @throws ClassNotFoundException if the library class cannot be found.
- * @throws InvalidLibraryException if the library is not a valid tuProlog library.
- */
-@@ -235,7 +235,7 @@
- * Load a library from the Library Manager into the engine.
- *
- * @param library The library to be loaded into the engine.
-- * @param path The library path where is contained the library.
-+ * @param file The library path where is contained the library.
- * @throws InvalidLibraryException
- */
- public void loadLibrary(String library, File file) throws InvalidLibraryException {
-@@ -290,4 +290,4 @@
- klass.getName().replace('.', '/') + ".class");
- }
-
--} // end LibraryManager class
-\ No newline at end of file
-+} // end LibraryManager class
-diff -ur tuprolog-2.6.0.orig/src/alice/tuprologx/ide/ToolBar.java tuprolog-2.6.0/src/alice/tuprologx/ide/ToolBar.java
---- tuprolog-2.6.0.orig/src/alice/tuprologx/ide/ToolBar.java 2013-02-14 12:01:32.000000000 +0100
-+++ tuprolog-2.6.0/src/alice/tuprologx/ide/ToolBar.java 2013-02-14 12:01:56.000000000 +0100
-@@ -242,8 +242,6 @@
-
- /**
- * Set the tuProlog config frame
-- *
-- * @param libraryManager a libraryManager to associate to the libraryDialog
- */
- public void setPrologConfig(PrologConfigFrame configFrame)
- {
-diff -ur tuprolog-2.6.0.orig/src/alice/tuprologx/pj/lib/PJLibrary.java tuprolog-2.6.0/src/alice/tuprologx/pj/lib/PJLibrary.java
---- tuprolog-2.6.0.orig/src/alice/tuprologx/pj/lib/PJLibrary.java 2013-02-14 12:01:32.000000000 +0100
-+++ tuprolog-2.6.0/src/alice/tuprologx/pj/lib/PJLibrary.java 2013-02-14 12:01:56.000000000 +0100
-@@ -1252,7 +1252,6 @@
-
- /**
- * Generates a fresh numeric identifier
-- * @return
- */
- protected Struct generateFreshId() {
- return new Struct("$obj_" + id++);
-diff -ur tuprolog-2.6.0.orig/src/alice/util/DynamicURLClassLoader.java tuprolog-2.6.0/src/alice/util/DynamicURLClassLoader.java
---- tuprolog-2.6.0.orig/src/alice/util/DynamicURLClassLoader.java 2013-02-14 12:01:32.000000000 +0100
-+++ tuprolog-2.6.0/src/alice/util/DynamicURLClassLoader.java 2013-02-14 12:10:02.000000000 +0100
-@@ -35,7 +35,7 @@
-
- /**
- * Constructor that specifies the URLs array.
-- * @param URL[] urls - Used to load a directory a URL ends with "/" or "\"
-+ * @param urls - Used to load a directory a URL ends with "/" or "\"
- * otherwise it loads a class contained into a .jar
- */
-
-@@ -148,7 +148,7 @@
-
- /**
- * Remove array URLs method.
-- * @param urls - URL to be removed.
-+ * @param url - URL to be removed.
- */
-
- public void removeURL(URL url) throws IllegalArgumentException
-diff -ur tuprolog-2.6.0.orig/src/alice/util/InspectionUtils.java tuprolog-2.6.0/src/alice/util/InspectionUtils.java
---- tuprolog-2.6.0.orig/src/alice/util/InspectionUtils.java 2013-02-14 12:01:32.000000000 +0100
-+++ tuprolog-2.6.0/src/alice/util/InspectionUtils.java 2013-02-14 12:09:22.000000000 +0100
-@@ -14,9 +14,9 @@
- /**
- * @author Michele Mannino
- *
-- * @param type: class to be inspected
-- * @param methodName: name of method
-- * @param parms: array of params
-+ * @param type class to be inspected
-+ * @param methodName name of method
-+ * @param parms array of params
- */
- public static Method searchForMethod(Class<?> type, String methodName, Class<?>[] parms) {
- Method[] methods = type.getMethods();
-diff -ur tuprolog-2.6.0.orig/src/alice/util/jedit/InputHandler.java tuprolog-2.6.0/src/alice/util/jedit/InputHandler.java
---- tuprolog-2.6.0.orig/src/alice/util/jedit/InputHandler.java 2013-02-14 12:01:32.000000000 +0100
-+++ tuprolog-2.6.0/src/alice/util/jedit/InputHandler.java 2013-02-14 12:01:56.000000000 +0100
-@@ -24,7 +24,7 @@
- *
- * @author Slava Pestov
- * @version $Id: InputHandler.java,v 1.14 1999/12/13 03:40:30 sp Exp $
-- * @see org.gjt.sp.jedit.textarea.DefaultInputHandler
-+ * @see alice.util.jedit.DefaultInputHandler
- */
- public abstract class InputHandler extends KeyAdapter
- {
-@@ -187,7 +187,7 @@
- /**
- * Grabs the next key typed event and invokes the specified
- * action with the key as a the action command.
-- * @param action The action
-+ * @param listener The action
- */
- public void grabNextKeyStroke(ActionListener listener)
- {
-diff -ur tuprolog-2.6.0.orig/src/alice/util/jedit/JEditTextArea.java tuprolog-2.6.0/src/alice/util/jedit/JEditTextArea.java
---- tuprolog-2.6.0.orig/src/alice/util/jedit/JEditTextArea.java 2013-02-14 12:01:32.000000000 +0100
-+++ tuprolog-2.6.0/src/alice/util/jedit/JEditTextArea.java 2013-02-14 12:01:56.000000000 +0100
-@@ -1401,7 +1401,7 @@
-
- /**
- * Sets if the selection should be rectangular.
-- * @param overwrite True if the selection should be rectangular,
-+ * @param rectSelect True if the selection should be rectangular,
- * false otherwise.
- */
- public final void setSelectionRectangular(boolean rectSelect)
-diff -ur tuprolog-2.6.0.orig/src/alice/util/jedit/KeywordMap.java tuprolog-2.6.0/src/alice/util/jedit/KeywordMap.java
---- tuprolog-2.6.0.orig/src/alice/util/jedit/KeywordMap.java 2013-02-14 12:01:32.000000000 +0100
-+++ tuprolog-2.6.0/src/alice/util/jedit/KeywordMap.java 2013-02-14 12:01:56.000000000 +0100
-@@ -75,7 +75,7 @@
- /**
- * Adds a key-value mapping.
- * @param keyword The key
-- * @Param id The value
-+ * @param id The value
- */
- public void add(String keyword, byte id)
- {
-@@ -102,9 +102,6 @@
- }
-
- // protected members
-- /**
-- * @uml.property name="mapLength"
-- */
- protected int mapLength;
-
- protected int getStringMapKey(String s)
-diff -ur tuprolog-2.6.0.orig/src/alice/util/jedit/TextAreaPainter.java tuprolog-2.6.0/src/alice/util/jedit/TextAreaPainter.java
---- tuprolog-2.6.0.orig/src/alice/util/jedit/TextAreaPainter.java 2013-02-14 12:01:32.000000000 +0100
-+++ tuprolog-2.6.0/src/alice/util/jedit/TextAreaPainter.java 2013-02-14 12:01:56.000000000 +0100
-@@ -75,7 +75,7 @@
-
- /**
- * Returns the syntax styles used to paint colorized text. Entry <i>n</i> will be used to paint tokens with id = <i>n</i>.
-- * @see org.gjt.sp.jedit.syntax.Token
-+ * @see alice.util.jedit.Token
- */
- public final SyntaxStyle[] getStyles()
- {
-@@ -85,7 +85,7 @@
- /**
- * Sets the syntax styles used to paint colorized text. Entry <i>n</i> will be used to paint tokens with id = <i>n</i>.
- * @param styles The syntax styles
-- * @see org.gjt.sp.jedit.syntax.Token
-+ * @see alice.util.jedit.Token
- */
- public final void setStyles(SyntaxStyle[] styles)
- {
-@@ -356,7 +356,7 @@
-
- /**
- * Repaints the text.
-- * @param g The graphics context
-+ * @param gfx The graphics context
- */
- public void paint(Graphics gfx)
- {
-diff -ur tuprolog-2.6.0.orig/src/alice/util/jedit/TokenMarker.java tuprolog-2.6.0/src/alice/util/jedit/TokenMarker.java
---- tuprolog-2.6.0.orig/src/alice/util/jedit/TokenMarker.java 2013-02-14 12:01:32.000000000 +0100
-+++ tuprolog-2.6.0/src/alice/util/jedit/TokenMarker.java 2013-02-14 12:01:56.000000000 +0100
-@@ -23,7 +23,7 @@
- * @author Slava Pestov
- * @version $Id: TokenMarker.java,v 1.32 1999/12/13 03:40:30 sp Exp $
- *
-- * @see org.gjt.sp.jedit.syntax.Token
-+ * @see alice.util.jedit.Token
- */
- public abstract class TokenMarker
- {
-diff -ur tuprolog-2.6.0.orig/src/alice/util/ReadOnlyLinkedList.java tuprolog-2.6.0/src/alice/util/ReadOnlyLinkedList.java
---- tuprolog-2.6.0.orig/src/alice/util/ReadOnlyLinkedList.java 2013-02-14 12:01:32.000000000 +0100
-+++ tuprolog-2.6.0/src/alice/util/ReadOnlyLinkedList.java 2013-02-14 12:01:56.000000000 +0100
-@@ -12,10 +12,10 @@
- import java.util.ListIterator;
-
- /**
-- * ReadOnlyLinkedList<E> encapsulate a {@link LinkedList<E>}
-+ * ReadOnlyLinkedList<E> encapsulate a {@link LinkedList}
- * and ensures that the given list is navigated only.
- *
-- * Even if ReadOnlyLinkedList<E> implements {@link List<E>} it doesn't
-+ * Even if ReadOnlyLinkedList<E> implements {@link List} it doesn't
- * support modifiers methods, and throws {@link UnsupportedOperationException}
- * if invoked.
- *
diff --git a/dev-lang/tuprolog/files/tuprolog-2.7.0-javadocs.patch b/dev-lang/tuprolog/files/tuprolog-2.7.0-javadocs.patch
deleted file mode 100644
index cd67ac58daf5..000000000000
--- a/dev-lang/tuprolog/files/tuprolog-2.7.0-javadocs.patch
+++ /dev/null
@@ -1,437 +0,0 @@
-diff -ur tuprolog-2.7.0.orig/src/alice/tuprolog/ChoicePointStore.java tuprolog-2.7.0/src/alice/tuprolog/ChoicePointStore.java
---- tuprolog-2.7.0.orig/src/alice/tuprolog/ChoicePointStore.java 2013-05-16 13:50:42.000000000 +0200
-+++ tuprolog-2.7.0/src/alice/tuprolog/ChoicePointStore.java 2013-05-16 13:56:42.000000000 +0200
-@@ -36,7 +36,6 @@
-
- /**
- * Return the actual choice-point store
-- * @return
- */
- public ChoicePointContext getPointer() {
- return pointer;
-@@ -45,7 +44,6 @@
- /**
- * Check if a choice point exists in the store.
- * As a side effect, removes choice points which have been already used and are now empty.
-- * @return
- */
- protected boolean existChoicePoint() {
- if (pointer == null) return false;
-@@ -93,4 +91,4 @@
- return l;
- }
-
--}
-\ No newline at end of file
-+}
-diff -ur tuprolog-2.7.0.orig/src/alice/tuprolog/ClauseStore.java tuprolog-2.7.0/src/alice/tuprolog/ClauseStore.java
---- tuprolog-2.7.0.orig/src/alice/tuprolog/ClauseStore.java 2013-05-16 13:50:42.000000000 +0200
-+++ tuprolog-2.7.0/src/alice/tuprolog/ClauseStore.java 2013-05-16 13:56:42.000000000 +0200
-@@ -62,8 +62,6 @@
-
- /**
- * Verify if there is a term in compatibleGoals compatible with goal.
-- * @param goal
-- * @param compGoals
- * @return true if compatible or false otherwise.
- */
- protected boolean existCompatibleClause() {
-@@ -160,4 +158,4 @@
- }
-
-
--}
-\ No newline at end of file
-+}
-diff -ur tuprolog-2.7.0.orig/src/alice/tuprolog/event/SpyEvent.java tuprolog-2.7.0/src/alice/tuprolog/event/SpyEvent.java
---- tuprolog-2.7.0.orig/src/alice/tuprolog/event/SpyEvent.java 2013-05-16 13:50:42.000000000 +0200
-+++ tuprolog-2.7.0/src/alice/tuprolog/event/SpyEvent.java 2013-05-16 13:56:42.000000000 +0200
-@@ -33,10 +33,6 @@
- * event description
- */
- private String msg;
-- /**
-- * @uml.property name="env"
-- * @uml.associationEnd
-- */
- private Engine env;
-
- public SpyEvent(Object source, String msg_) {
-@@ -63,4 +59,4 @@
- return msg + ((env == null) ? "" : env.toString());
- }
-
--}
-\ No newline at end of file
-+}
-diff -ur tuprolog-2.7.0.orig/src/alice/tuprolog/lib/BasicLibrary.java tuprolog-2.7.0/src/alice/tuprolog/lib/BasicLibrary.java
---- tuprolog-2.7.0.orig/src/alice/tuprolog/lib/BasicLibrary.java 2013-05-16 13:50:42.000000000 +0200
-+++ tuprolog-2.7.0/src/alice/tuprolog/lib/BasicLibrary.java 2013-05-16 13:56:42.000000000 +0200
-@@ -116,7 +116,7 @@
- /**
- * Loads a library constructed from a theory.
- *
-- * @param theory
-+ * @param th
- * theory text
- * @param libName
- * name of the library
-@@ -1358,4 +1358,4 @@
- { "\\", "expression_bitwise_not", "functor" } };
- }
-
--}
-\ No newline at end of file
-+}
-diff -ur tuprolog-2.7.0.orig/src/alice/tuprolog/lib/IOLibrary.java tuprolog-2.7.0/src/alice/tuprolog/lib/IOLibrary.java
---- tuprolog-2.7.0.orig/src/alice/tuprolog/lib/IOLibrary.java 2013-05-16 13:50:42.000000000 +0200
-+++ tuprolog-2.7.0/src/alice/tuprolog/lib/IOLibrary.java 2013-05-16 13:56:42.000000000 +0200
-@@ -379,7 +379,7 @@
- /**
- * Sets an arbitrary seed for the Random object.
- *
-- * @param seed Seed to use
-+ * @param t Seed to use
- * @return true if seed Term has a valid long value, false otherwise
- */
- public boolean set_seed_1(Term t) throws PrologError {
-@@ -474,4 +474,4 @@
- }
- return true;
- }
--}
-\ No newline at end of file
-+}
-Only in tuprolog-2.7.0/src/alice/tuprolog/lib: IOLibrary.java.orig
-diff -ur tuprolog-2.7.0.orig/src/alice/tuprolog/lib/JavaLibrary.java tuprolog-2.7.0/src/alice/tuprolog/lib/JavaLibrary.java
---- tuprolog-2.7.0.orig/src/alice/tuprolog/lib/JavaLibrary.java 2013-05-16 13:50:42.000000000 +0200
-+++ tuprolog-2.7.0/src/alice/tuprolog/lib/JavaLibrary.java 2013-05-16 13:56:42.000000000 +0200
-@@ -265,7 +265,7 @@
- * @author Michele Mannino
- * Creates of a java object - not backtrackable case
- * @param className The name of the class
-- * @oaram path The list of the paths where the class may be contained
-+ * @param paths The list of the paths where the class may be contained
- * @param argl The list of the arguments used by the constructor
- * @param id The name of the prolog term
- * @throws JavaException
-@@ -1745,8 +1745,6 @@
-
- /**
- * Generates a fresh numeric identifier
-- *
-- * @return
- */
- protected Struct generateFreshId() {
- return new Struct("$obj_" + id++);
-@@ -2099,4 +2097,4 @@
- this.eventFullClass = eventClass;
- listenerInterfaceName = n;
- }
--}
-\ No newline at end of file
-+}
-diff -ur tuprolog-2.7.0.orig/src/alice/tuprolog/LibraryManager.java tuprolog-2.7.0/src/alice/tuprolog/LibraryManager.java
---- tuprolog-2.7.0.orig/src/alice/tuprolog/LibraryManager.java 2013-05-16 13:50:42.000000000 +0200
-+++ tuprolog-2.7.0/src/alice/tuprolog/LibraryManager.java 2013-05-16 13:56:42.000000000 +0200
-@@ -49,7 +49,7 @@
- * If a library with the same name is already present,
- * a warning event is notified and the request is ignored.
- *
-- * @param the name of the Java class containing the library to be loaded
-+ * @param className the name of the Java class containing the library to be loaded
- * @return the reference to the Library just loaded
- * @throws InvalidLibraryException if name is not a valid library
- */
-@@ -83,8 +83,8 @@
- * If a library with the same name is already present,
- * a warning event is notified and the request is ignored.
- *
-- * @param the name of the Java class containing the library to be loaded
-- * @param the list of the paths where the library may be contained
-+ * @param className the name of the Java class containing the library to be loaded
-+ * @param paths the list of the paths where the library may be contained
- * @return the reference to the Library just loaded
- * @throws InvalidLibraryException if name is not a valid library
- */
-@@ -314,4 +314,4 @@
-
-
-
--}
-\ No newline at end of file
-+}
-Only in tuprolog-2.7.0/src/alice/tuprolog: LibraryManager.java.orig
-diff -ur tuprolog-2.7.0.orig/src/alice/tuprolog/PrimitiveManager.java tuprolog-2.7.0/src/alice/tuprolog/PrimitiveManager.java
---- tuprolog-2.7.0.orig/src/alice/tuprolog/PrimitiveManager.java 2013-05-16 13:50:42.000000000 +0200
-+++ tuprolog-2.7.0/src/alice/tuprolog/PrimitiveManager.java 2013-05-16 13:56:42.000000000 +0200
-@@ -89,7 +89,7 @@
- * This involves identifying structs representing builtin
- * predicates and functors, and setting up related structures and links
- *
-- * @parm term the term to be identified
-+ * @param term the term to be identified
- * @return term with the identified built-in directive
- */
- public Term identifyDirective(Term term) {
-@@ -192,4 +192,4 @@
- return (functorHashMap.containsKey(name + "/" + nArgs) || predicateHashMap.containsKey(name + "/" + nArgs));
- }
- /**/
--}
-\ No newline at end of file
-+}
-diff -ur tuprolog-2.7.0.orig/src/alice/tuprolog/Struct.java tuprolog-2.7.0/src/alice/tuprolog/Struct.java
---- tuprolog-2.7.0.orig/src/alice/tuprolog/Struct.java 2013-05-16 13:50:42.000000000 +0200
-+++ tuprolog-2.7.0/src/alice/tuprolog/Struct.java 2013-05-16 13:56:42.000000000 +0200
-@@ -201,7 +201,7 @@
- }
-
- /**
-- * @return
-+ * @return predicateIndicator
- */
- String getPredicateIndicator() {
- return predicateIndicator;
-@@ -894,4 +894,4 @@
- }
- /**/
-
--}
-\ No newline at end of file
-+}
-diff -ur tuprolog-2.7.0.orig/src/alice/tuprologx/ide/Console.java tuprolog-2.7.0/src/alice/tuprologx/ide/Console.java
---- tuprolog-2.7.0.orig/src/alice/tuprologx/ide/Console.java 2013-05-16 13:50:41.000000000 +0200
-+++ tuprolog-2.7.0/src/alice/tuprologx/ide/Console.java 2013-05-16 13:56:42.000000000 +0200
-@@ -10,8 +10,5 @@
- public void getNextSolution();
- public void acceptSolution();
- public void stopEngine();
-- /**
-- * @uml.property name="goal"
-- */
- public String getGoal();
--}
-\ No newline at end of file
-+}
-diff -ur tuprolog-2.7.0.orig/src/alice/tuprologx/ide/LibraryDialogFrame.java tuprolog-2.7.0/src/alice/tuprologx/ide/LibraryDialogFrame.java
---- tuprolog-2.7.0.orig/src/alice/tuprologx/ide/LibraryDialogFrame.java 2013-05-16 13:50:41.000000000 +0200
-+++ tuprolog-2.7.0/src/alice/tuprologx/ide/LibraryDialogFrame.java 2013-05-16 13:56:42.000000000 +0200
-@@ -370,7 +370,7 @@
- * Add a library from file chooser path.
- *
- * @param libraryClassname The name of the .class of the library to be added.
-- * @param path from file chooser.
-+ * @param file from file chooser.
- */
- public void addLibrary(String libraryClassname, File file)
- {
-@@ -498,7 +498,6 @@
- displayLibraryManagerStatus();
- }
-
-- /** @see alice.tuprologx.ide.SwingFrame#onClose()*/
- public void closeLibraryDialog()
- {
- onClose();
-diff -ur tuprolog-2.7.0.orig/src/alice/tuprologx/ide/LibraryManager.java tuprolog-2.7.0/src/alice/tuprologx/ide/LibraryManager.java
---- tuprolog-2.7.0.orig/src/alice/tuprologx/ide/LibraryManager.java 2013-05-16 13:50:41.000000000 +0200
-+++ tuprolog-2.7.0/src/alice/tuprologx/ide/LibraryManager.java 2013-05-16 13:56:42.000000000 +0200
-@@ -131,7 +131,7 @@
- * Add a library to the manager.
- *
- * @param libraryClassname The name of the .class of the library to be added.
-- * @param path The path where is contained the library.
-+ * @param file The path where is contained the library.
- * @throws ClassNotFoundException if the library class cannot be found.
- * @throws InvalidLibraryException if the library is not a valid tuProlog library.
- */
-@@ -235,7 +235,7 @@
- * Load a library from the Library Manager into the engine.
- *
- * @param library The library to be loaded into the engine.
-- * @param path The library path where is contained the library.
-+ * @param file The library path where is contained the library.
- * @throws InvalidLibraryException
- */
- public void loadLibrary(String library, File file) throws InvalidLibraryException {
-@@ -290,4 +290,4 @@
- klass.getName().replace('.', '/') + ".class");
- }
-
--} // end LibraryManager class
-\ No newline at end of file
-+} // end LibraryManager class
-diff -ur tuprolog-2.7.0.orig/src/alice/tuprologx/ide/ToolBar.java tuprolog-2.7.0/src/alice/tuprologx/ide/ToolBar.java
---- tuprolog-2.7.0.orig/src/alice/tuprologx/ide/ToolBar.java 2013-05-16 13:50:41.000000000 +0200
-+++ tuprolog-2.7.0/src/alice/tuprologx/ide/ToolBar.java 2013-05-16 13:56:42.000000000 +0200
-@@ -242,8 +242,6 @@
-
- /**
- * Set the tuProlog config frame
-- *
-- * @param libraryManager a libraryManager to associate to the libraryDialog
- */
- public void setPrologConfig(PrologConfigFrame configFrame)
- {
-diff -ur tuprolog-2.7.0.orig/src/alice/tuprologx/pj/lib/PJLibrary.java tuprolog-2.7.0/src/alice/tuprologx/pj/lib/PJLibrary.java
---- tuprolog-2.7.0.orig/src/alice/tuprologx/pj/lib/PJLibrary.java 2013-05-16 13:50:41.000000000 +0200
-+++ tuprolog-2.7.0/src/alice/tuprologx/pj/lib/PJLibrary.java 2013-05-16 13:56:42.000000000 +0200
-@@ -1252,7 +1252,6 @@
-
- /**
- * Generates a fresh numeric identifier
-- * @return
- */
- protected Struct generateFreshId() {
- return new Struct("$obj_" + id++);
-diff -ur tuprolog-2.7.0.orig/src/alice/util/DynamicURLClassLoader.java tuprolog-2.7.0/src/alice/util/DynamicURLClassLoader.java
---- tuprolog-2.7.0.orig/src/alice/util/DynamicURLClassLoader.java 2013-05-16 13:50:43.000000000 +0200
-+++ tuprolog-2.7.0/src/alice/util/DynamicURLClassLoader.java 2013-05-16 13:56:42.000000000 +0200
-@@ -35,7 +35,7 @@
-
- /**
- * Constructor that specifies the URLs array.
-- * @param URL[] urls - Used to load a directory a URL ends with "/" or "\"
-+ * @param urls - Used to load a directory a URL ends with "/" or "\"
- * otherwise it loads a class contained into a .jar
- */
-
-@@ -148,7 +148,7 @@
-
- /**
- * Remove array URLs method.
-- * @param urls - URL to be removed.
-+ * @param url - URL to be removed.
- */
-
- public void removeURL(URL url) throws IllegalArgumentException
-diff -ur tuprolog-2.7.0.orig/src/alice/util/InspectionUtils.java tuprolog-2.7.0/src/alice/util/InspectionUtils.java
---- tuprolog-2.7.0.orig/src/alice/util/InspectionUtils.java 2013-05-16 13:50:43.000000000 +0200
-+++ tuprolog-2.7.0/src/alice/util/InspectionUtils.java 2013-05-16 13:56:42.000000000 +0200
-@@ -14,9 +14,9 @@
- /**
- * @author Michele Mannino
- *
-- * @param type: class to be inspected
-- * @param methodName: name of method
-- * @param parms: array of params
-+ * @param type class to be inspected
-+ * @param methodName name of method
-+ * @param parms array of params
- */
- public static Method searchForMethod(Class<?> type, String methodName, Class<?>[] parms) {
- Method[] methods = type.getMethods();
-diff -ur tuprolog-2.7.0.orig/src/alice/util/jedit/InputHandler.java tuprolog-2.7.0/src/alice/util/jedit/InputHandler.java
---- tuprolog-2.7.0.orig/src/alice/util/jedit/InputHandler.java 2013-05-16 13:50:42.000000000 +0200
-+++ tuprolog-2.7.0/src/alice/util/jedit/InputHandler.java 2013-05-16 13:56:42.000000000 +0200
-@@ -24,7 +24,7 @@
- *
- * @author Slava Pestov
- * @version $Id: InputHandler.java,v 1.14 1999/12/13 03:40:30 sp Exp $
-- * @see org.gjt.sp.jedit.textarea.DefaultInputHandler
-+ * @see alice.util.jedit.DefaultInputHandler
- */
- public abstract class InputHandler extends KeyAdapter
- {
-@@ -187,7 +187,7 @@
- /**
- * Grabs the next key typed event and invokes the specified
- * action with the key as a the action command.
-- * @param action The action
-+ * @param listener The action
- */
- public void grabNextKeyStroke(ActionListener listener)
- {
-diff -ur tuprolog-2.7.0.orig/src/alice/util/jedit/JEditTextArea.java tuprolog-2.7.0/src/alice/util/jedit/JEditTextArea.java
---- tuprolog-2.7.0.orig/src/alice/util/jedit/JEditTextArea.java 2013-05-16 13:50:42.000000000 +0200
-+++ tuprolog-2.7.0/src/alice/util/jedit/JEditTextArea.java 2013-05-16 13:56:42.000000000 +0200
-@@ -1401,7 +1401,7 @@
-
- /**
- * Sets if the selection should be rectangular.
-- * @param overwrite True if the selection should be rectangular,
-+ * @param rectSelect True if the selection should be rectangular,
- * false otherwise.
- */
- public final void setSelectionRectangular(boolean rectSelect)
-diff -ur tuprolog-2.7.0.orig/src/alice/util/jedit/KeywordMap.java tuprolog-2.7.0/src/alice/util/jedit/KeywordMap.java
---- tuprolog-2.7.0.orig/src/alice/util/jedit/KeywordMap.java 2013-05-16 13:50:42.000000000 +0200
-+++ tuprolog-2.7.0/src/alice/util/jedit/KeywordMap.java 2013-05-16 13:56:42.000000000 +0200
-@@ -75,7 +75,7 @@
- /**
- * Adds a key-value mapping.
- * @param keyword The key
-- * @Param id The value
-+ * @param id The value
- */
- public void add(String keyword, byte id)
- {
-@@ -102,9 +102,6 @@
- }
-
- // protected members
-- /**
-- * @uml.property name="mapLength"
-- */
- protected int mapLength;
-
- protected int getStringMapKey(String s)
-diff -ur tuprolog-2.7.0.orig/src/alice/util/jedit/TextAreaPainter.java tuprolog-2.7.0/src/alice/util/jedit/TextAreaPainter.java
---- tuprolog-2.7.0.orig/src/alice/util/jedit/TextAreaPainter.java 2013-05-16 13:50:42.000000000 +0200
-+++ tuprolog-2.7.0/src/alice/util/jedit/TextAreaPainter.java 2013-05-16 13:56:42.000000000 +0200
-@@ -75,7 +75,7 @@
-
- /**
- * Returns the syntax styles used to paint colorized text. Entry <i>n</i> will be used to paint tokens with id = <i>n</i>.
-- * @see org.gjt.sp.jedit.syntax.Token
-+ * @see alice.util.jedit.Token
- */
- public final SyntaxStyle[] getStyles()
- {
-@@ -85,7 +85,7 @@
- /**
- * Sets the syntax styles used to paint colorized text. Entry <i>n</i> will be used to paint tokens with id = <i>n</i>.
- * @param styles The syntax styles
-- * @see org.gjt.sp.jedit.syntax.Token
-+ * @see alice.util.jedit.Token
- */
- public final void setStyles(SyntaxStyle[] styles)
- {
-@@ -356,7 +356,7 @@
-
- /**
- * Repaints the text.
-- * @param g The graphics context
-+ * @param gfx The graphics context
- */
- public void paint(Graphics gfx)
- {
-diff -ur tuprolog-2.7.0.orig/src/alice/util/jedit/TokenMarker.java tuprolog-2.7.0/src/alice/util/jedit/TokenMarker.java
---- tuprolog-2.7.0.orig/src/alice/util/jedit/TokenMarker.java 2013-05-16 13:50:42.000000000 +0200
-+++ tuprolog-2.7.0/src/alice/util/jedit/TokenMarker.java 2013-05-16 13:56:42.000000000 +0200
-@@ -23,7 +23,7 @@
- * @author Slava Pestov
- * @version $Id: TokenMarker.java,v 1.32 1999/12/13 03:40:30 sp Exp $
- *
-- * @see org.gjt.sp.jedit.syntax.Token
-+ * @see alice.util.jedit.Token
- */
- public abstract class TokenMarker
- {
-diff -ur tuprolog-2.7.0.orig/src/alice/util/ReadOnlyLinkedList.java tuprolog-2.7.0/src/alice/util/ReadOnlyLinkedList.java
---- tuprolog-2.7.0.orig/src/alice/util/ReadOnlyLinkedList.java 2013-05-16 13:50:43.000000000 +0200
-+++ tuprolog-2.7.0/src/alice/util/ReadOnlyLinkedList.java 2013-05-16 13:56:42.000000000 +0200
-@@ -12,10 +12,10 @@
- import java.util.ListIterator;
-
- /**
-- * ReadOnlyLinkedList<E> encapsulate a {@link LinkedList<E>}
-+ * ReadOnlyLinkedList<E> encapsulate a {@link LinkedList}
- * and ensures that the given list is navigated only.
- *
-- * Even if ReadOnlyLinkedList<E> implements {@link List<E>} it doesn't
-+ * Even if ReadOnlyLinkedList<E> implements {@link List} it doesn't
- * support modifiers methods, and throws {@link UnsupportedOperationException}
- * if invoked.
- *
diff --git a/dev-lang/tuprolog/files/tuprolog-2.9.2-no-dynamic-object-test.patch b/dev-lang/tuprolog/files/tuprolog-2.9.2-no-dynamic-object-test.patch
new file mode 100644
index 000000000000..0416258e9e14
--- /dev/null
+++ b/dev-lang/tuprolog/files/tuprolog-2.9.2-no-dynamic-object-test.patch
@@ -0,0 +1,20 @@
+--- tuprolog-2.9.2.orig/test/unit/alice/tuprolog/JavaLibraryTestCase.java 2015-02-27 14:02:49.000000000 +0100
++++ tuprolog-2.9.2/test/unit/alice/tuprolog/JavaLibraryTestCase.java 2016-02-17 15:24:47.000000000 +0100
+@@ -39,7 +39,7 @@
+ SolveInfo goal = engine.solve(new Struct("demo", t));
+ assertFalse(goal.isSuccess());
+ }
+-
++/*
+ public void testDynamicObjectsRetrival() throws PrologException {
+ Prolog engine = new Prolog();
+ JavaLibrary lib = (JavaLibrary) engine.getLibrary("alice.tuprolog.lib.JavaLibrary");
+@@ -53,7 +53,7 @@
+ TestCounter counter = (TestCounter) lib.getRegisteredDynamicObject(id);
+ assertEquals(2, counter.getValue());
+ }
+-
++*/
+
+ public void test_java_object() throws PrologException, IOException
+ {
diff --git a/dev-lang/tuprolog/files/tuprolog-2.9.2-no-ikvm.patch b/dev-lang/tuprolog/files/tuprolog-2.9.2-no-ikvm.patch
new file mode 100644
index 000000000000..d94dc66bbac5
--- /dev/null
+++ b/dev-lang/tuprolog/files/tuprolog-2.9.2-no-ikvm.patch
@@ -0,0 +1,116 @@
+diff -urN tuprolog-2.9.0.orig/src/alice/tuprolog/LibraryManager.java tuprolog-2.9.0/src/alice/tuprolog/LibraryManager.java
+--- tuprolog-2.9.0.orig/src/alice/tuprolog/LibraryManager.java 2014-09-29 18:14:21.000000000 +0200
++++ tuprolog-2.9.0/src/alice/tuprolog/LibraryManager.java 2015-01-11 14:48:57.000000000 +0100
+@@ -9,11 +9,11 @@
+ import java.net.URL;
+ import java.net.URLClassLoader;
+ import java.util.*;
+-import cli.System.Reflection.Assembly;
++//import cli.System.Reflection.Assembly;
+
+ import alice.tuprolog.event.LibraryEvent;
+ import alice.tuprolog.event.WarningEvent;
+-import alice.util.AssemblyCustomClassLoader;
++//import alice.util.AssemblyCustomClassLoader;
+
+ /**
+ * @author Alex Benini
+@@ -179,31 +179,7 @@
+ } else
+ // .NET
+ {
+- Assembly asm = null;
+- boolean classFound = false;
+- className = "cli."
+- + className.substring(0, className.indexOf(","))
+- .trim();
+- for (int i = 0; i < paths.length; i++)
+- {
+- try
+- {
+- asm = Assembly.LoadFrom(paths[i]);
+- loader = new AssemblyCustomClassLoader(asm, urls);
+- lib = (Library) Class.forName(className, true, loader).newInstance();
+- if (lib != null)
+- {
+- classFound = true;
+- break;
+- }
+- } catch (Exception e)
+- {
+- e.printStackTrace();
+- continue;
+- }
+- }
+- if (!classFound)
+- throw new InvalidLibraryException(className, -1, -1);
++ throw new InvalidLibraryException(className, -1, -1);
+ }
+ }
+
+@@ -462,4 +438,4 @@
+ return optimizedDirectory;
+ }
+
+-}
+\ No newline at end of file
++}
+diff -urN tuprolog-2.9.0.orig/src/alice/tuprologx/ide/LibraryManager.java tuprolog-2.9.0/src/alice/tuprologx/ide/LibraryManager.java
+--- tuprolog-2.9.0.orig/src/alice/tuprologx/ide/LibraryManager.java 2014-09-29 18:14:21.000000000 +0200
++++ tuprolog-2.9.0/src/alice/tuprologx/ide/LibraryManager.java 2015-01-11 14:46:23.000000000 +0100
+@@ -18,7 +18,7 @@
+ package alice.tuprologx.ide;
+
+ import alice.tuprolog.*;
+-import alice.util.AssemblyCustomClassLoader;
++//import alice.util.AssemblyCustomClassLoader;
+
+ import java.io.File;
+ import java.net.URL;
+@@ -26,7 +26,7 @@
+ import java.util.ArrayList;
+ import java.util.Hashtable;
+ import java.util.StringTokenizer;
+-import cli.System.Reflection.Assembly;
++//import cli.System.Reflection.Assembly;
+
+ /**
+ * A dynamic manager for tuProlog libraries.
+@@ -155,10 +155,7 @@
+ // .NET
+ if(System.getProperty("java.vm.name").equals("IKVM.NET"))
+ {
+- Assembly asm = Assembly.LoadFrom(file.getPath());
+- loader = new AssemblyCustomClassLoader(asm, new URL[]{url});
+- libraryClassname = "cli." + libraryClassname.substring(0,
+- libraryClassname.indexOf(",")).trim();
++ throw new InvalidLibraryException(libraryClassname,-1,-1);
+ }
+ // JVM
+ else
+diff -urN tuprolog-2.9.0.orig/src/alice/util/AssemblyCustomClassLoader.java tuprolog-2.9.0/src/alice/util/AssemblyCustomClassLoader.java
+--- tuprolog-2.9.0.orig/src/alice/util/AssemblyCustomClassLoader.java 2014-09-29 18:14:21.000000000 +0200
++++ tuprolog-2.9.0/src/alice/util/AssemblyCustomClassLoader.java 1970-01-01 01:00:00.000000000 +0100
+@@ -1,21 +0,0 @@
+-package alice.util;
+-
+-import java.net.URL;
+-
+-public class AssemblyCustomClassLoader extends java.net.URLClassLoader
+-{
+- public AssemblyCustomClassLoader(cli.System.Reflection.Assembly asm, URL[] urls)
+- {
+- super(new java.net.URL[0], new ikvm.runtime.AssemblyClassLoader(asm));
+- // explicitly calling addURL() is safer than passing it to the super constructor,
+- // because this class loader instance may be used during the URL construction.
+- for (URL url : urls) {
+- addURL(url);
+- }
+- }
+-
+- public void addUrl(URL url)
+- {
+- addURL(url);
+- }
+-}
+\ No newline at end of file