[Japi-cvs] SF.net SVN: japi: [104] branches/0.9/src/doc/guide/io/src

[<chr...@us...>]

Revision: 104
Author:   christianhujer
Date:     2006-04-20 16:53:35 -0700 (Thu, 20 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/japi/?rev=104&view=rev

Log Message:
-----------
Fixed two build breakers in secondary sources by merging changesets 100:101 and 102:103 from trunk to branches/0.9.

Modified Paths:
--------------
    branches/0.9/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/OpenQuestionText.java
    branches/0.9/src/doc/guide/io/src/GrepJAPI.java
Modified: branches/0.9/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/OpenQuestionText.java
===================================================================
--- branches/0.9/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/OpenQuestionText.java	2006-04-20 23:04:22 UTC (rev 103)
+++ branches/0.9/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/OpenQuestionText.java	2006-04-20 23:53:35 UTC (rev 104)
@@ -33,6 +33,8 @@
 public class OpenQuestionText extends QuestionText {
 
     /** Serial Version. */
+    // XXX IntelliJ IDEA
+    @SuppressWarnings({"AnalyzingVariableNaming"})
     private static final long serialVersionUID = 1L;
 
     /** The regular expressions.
@@ -46,7 +48,6 @@
     /** Create an Open Question.
      */
     public OpenQuestionText() {
-        super();
         expressions = new ArrayList<String>();
     }
 
@@ -91,7 +92,7 @@
     }
 
     /** {@inheritDoc} */
-    public boolean isAnsweredCorrectly() {
+    @Override public boolean isAnsweredCorrectly() {
         for (String expression : expressions) {
             if (answer.matches(expression)) {
                 return true;
@@ -101,8 +102,10 @@
     }
 
     /** {@inheritDoc} */
-    public OpenQuestionText clone() {
-        OpenQuestionText clone = (OpenQuestionText) super.clone();
+    @Override public OpenQuestionText clone() throws CloneNotSupportedException {
+        final OpenQuestionText clone = (OpenQuestionText) super.clone();
+        // XXX IntelliJ IDEA: This is not the clone but required for deep clone of clone fields.
+        //noinspection CloneCallsConstructors
         clone.expressions = new ArrayList<String>(expressions);
         return clone;
     }

Modified: branches/0.9/src/doc/guide/io/src/GrepJAPI.java
===================================================================
--- branches/0.9/src/doc/guide/io/src/GrepJAPI.java	2006-04-20 23:04:22 UTC (rev 103)
+++ branches/0.9/src/doc/guide/io/src/GrepJAPI.java	2006-04-20 23:53:35 UTC (rev 104)
@@ -3,6 +3,8 @@
 import java.util.regex.Matcher;
 import net.sf.japi.io.args.ArgParser;
 import net.sf.japi.io.args.Command;
+import net.sf.japi.io.args.StopOption;
+import net.sf.japi.io.args.Option;
 import net.sf.japi.io.ARGV;
 
 /** Implementation of Grep using JAPI.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.