japi-cvs Mailing List for JAPI (Page 53)
Status: Beta
Brought to you by:
christianhujer
You can subscribe to this list here.
2006 |
Jan
|
Feb
|
Mar
|
Apr
(115) |
May
(11) |
Jun
(5) |
Jul
(2) |
Aug
(10) |
Sep
(35) |
Oct
(14) |
Nov
(49) |
Dec
(27) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2007 |
Jan
(57) |
Feb
(1) |
Mar
|
Apr
(2) |
May
(25) |
Jun
(134) |
Jul
(76) |
Aug
(34) |
Sep
(27) |
Oct
(5) |
Nov
|
Dec
(1) |
2008 |
Jan
(3) |
Feb
|
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(63) |
Nov
(30) |
Dec
(43) |
2009 |
Jan
(10) |
Feb
(420) |
Mar
(67) |
Apr
(3) |
May
(61) |
Jun
(21) |
Jul
(19) |
Aug
|
Sep
(6) |
Oct
(16) |
Nov
(1) |
Dec
|
2010 |
Jan
(1) |
Feb
|
Mar
|
Apr
(7) |
May
(3) |
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
From: <chr...@us...> - 2006-04-24 22:28:00
|
Revision: 108 Author: christianhujer Date: 2006-04-24 15:27:52 -0700 (Mon, 24 Apr 2006) ViewCVS: http://svn.sourceforge.net/japi/?rev=108&view=rev Log Message: ----------- Added todo. Fixed bug in showConfirmDialog() (see http://www.daimonin.net/mantis/view.php?id=384 ) Modified Paths: -------------- trunk/src/app/net/sf/japi/swing/ActionFactory.java Modified: trunk/src/app/net/sf/japi/swing/ActionFactory.java =================================================================== --- trunk/src/app/net/sf/japi/swing/ActionFactory.java 2006-04-23 23:16:04 UTC (rev 107) +++ trunk/src/app/net/sf/japi/swing/ActionFactory.java 2006-04-24 22:27:52 UTC (rev 108) @@ -157,6 +157,7 @@ * @todo think about toolbar interaction * @todo think about toolbar configuration * @todo eventually rename this ActionBuilder and provide an ActionBuilderFactory. + * @todo whether a dialog is a onetime dialog should be a property and user configurable * @author <a href="mailto:ch...@ri...">Christian Hujer</a> */ public final class ActionFactory { @@ -990,7 +991,7 @@ * @return an integer indicating the option selected by the user */ public int showConfirmDialog(final Component parentComponent, final int optionType, final int messageType, final String key, final Object... args) { - return JOptionPane.showConfirmDialog(parentComponent, format(key, args), format(key + ".title", args), optionType, messageType); + return JOptionPane.showConfirmDialog(parentComponent, format(key + ".message", args), format(key + ".title", args), optionType, messageType); } /** Creates a label for a specified key. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2006-04-23 23:16:17
|
Revision: 107 Author: christianhujer Date: 2006-04-23 16:16:04 -0700 (Sun, 23 Apr 2006) ViewCVS: http://svn.sourceforge.net/japi/?rev=107&view=rev Log Message: ----------- Fixed bug in onetime dialogs. Annotated some variables as Nullable or NotNull. Modified Paths: -------------- trunk/src/app/net/sf/japi/swing/ActionFactory.java Modified: trunk/src/app/net/sf/japi/swing/ActionFactory.java =================================================================== --- trunk/src/app/net/sf/japi/swing/ActionFactory.java 2006-04-23 23:15:15 UTC (rev 106) +++ trunk/src/app/net/sf/japi/swing/ActionFactory.java 2006-04-23 23:16:04 UTC (rev 107) @@ -491,7 +491,7 @@ if (key == null) { throw new NullPointerException("null key not allowed"); } - String value = null; + String value; for (final ResourceBundle bundle : bundles) { try { value = bundle.getString(key); @@ -607,9 +607,12 @@ * @param store whether to store the initialized Actions in the ActionMap of this ActionFactory * @param barKey Action key of menu to create * @return JMenuBar created for <var>barKey</var> + * @throws NullPointerException if no menubar definition was found + * @todo make error handling consistent (see createMenu and others) */ - public JMenuBar createMenuBar(final boolean store, final String barKey) { + @NotNull public JMenuBar createMenuBar(final boolean store, final String barKey) throws NullPointerException { final JMenuBar menuBar = new JMenuBar(); + //noinspection ConstantConditions for (final String key : getString(barKey + ".menubar").split("\\s+")) { menuBar.add(createMenu(store, key)); } @@ -841,7 +844,7 @@ * @param key localization key to use for the title, the message and eventually the icon * @param args formatting arguments for the message text */ - public void showMessageDialog(final Component parentComponent, final String key, final Object... args) { + public void showMessageDialog(@Nullable final Component parentComponent, @NotNull final String key, final Object... args) { JOptionPane.showMessageDialog(parentComponent, format(key + ".message", args), format(key + ".title", args), getMessageType(key)); } @@ -849,7 +852,7 @@ * @param dialogKey dialog key * @return message type */ - public int getMessageType(final String dialogKey) { + public int getMessageType(@NotNull final String dialogKey) { final String typeText = getString(dialogKey + ".messageType"); if (typeText == null) { return JOptionPane.PLAIN_MESSAGE; @@ -893,7 +896,7 @@ * @return formatted String * @see MessageFormat#format(String,Object...) */ - public String format(final String key, final Object... args) { + public String format(@NotNull final String key, final Object... args) { return MessageFormat.format(getString(key), args); } @@ -907,7 +910,7 @@ * @return an integer indicating the option selected by the user now or eventually in a previous choice * @throws IllegalStateException if no preferences are associated */ - public int showOnetimeConfirmDialog(final Component parentComponent, final int optionType, final int messageType, final String key, final Object... args) throws IllegalStateException { + public int showOnetimeConfirmDialog(@Nullable final Component parentComponent, final int optionType, final int messageType, @NotNull final String key, final Object... args) throws IllegalStateException { @NonNls String showString = getString(key + ".show"); if (showString == null) { showString = getString(key + ".showDefault"); @@ -924,7 +927,7 @@ } } final JCheckBox dontShowAgain = new JCheckBox(getString("dialogDontShowAgain"), true); - final int result = JOptionPane.showConfirmDialog(parentComponent, new Object[] { format(key, args), dontShowAgain }, format(key + ".title", args), optionType, messageType); + final int result = JOptionPane.showConfirmDialog(parentComponent, new Object[] { format(key + ".message", args), dontShowAgain }, format(key + ".title", args), optionType, messageType); if (!dontShowAgain.isSelected()) { if (prefs.size() > 0) { prefs.get(0).put(key + ".show", "false"); @@ -944,8 +947,8 @@ * @param args formatting arguments for the message text * @throws IllegalStateException if no preferences are associated */ - public void showOnetimeMessageDialog(final Component parentComponent, final int messageType, final String key, final Object... args) throws IllegalStateException { - String showString = getString(key + ".show"); + public void showOnetimeMessageDialog(@Nullable final Component parentComponent, final int messageType, @NotNull final String key, final Object... args) throws IllegalStateException { + @NonNls String showString = getString(key + ".show"); if (showString == null) { showString = getString(key + ".showDefault"); } @@ -955,7 +958,7 @@ final boolean show = !"false".equalsIgnoreCase(showString); // undefined should be treated true if (show) { final JCheckBox dontShowAgain = new JCheckBox(getString("dialogDontShowAgain"), true); - JOptionPane.showMessageDialog(parentComponent, new Object[] { format(key, args), dontShowAgain }, format(key + ".title", args), messageType); + JOptionPane.showMessageDialog(parentComponent, new Object[] { format(key + ".message", args), dontShowAgain }, format(key + ".title", args), messageType); if (!dontShowAgain.isSelected()) { if (prefs.size() > 0) { prefs.get(0).put(key + ".show", "false"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2006-04-23 23:15:30
|
Revision: 106 Author: christianhujer Date: 2006-04-23 16:15:15 -0700 (Sun, 23 Apr 2006) ViewCVS: http://svn.sourceforge.net/japi/?rev=106&view=rev Log Message: ----------- Moving trunk to 0.10.0 Modified Paths: -------------- trunk/project.properties Modified: trunk/project.properties =================================================================== --- trunk/project.properties 2006-04-21 00:06:53 UTC (rev 105) +++ trunk/project.properties 2006-04-23 23:15:15 UTC (rev 106) @@ -1,5 +1,5 @@ project.version.major=0 -project.version.minor=9 +project.version.minor=10 project.version.patch=0 project.version=${project.version.major}.${project.version.minor}.${project.version.patch} project.focus=majorEnhancements This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2006-04-21 00:06:59
|
Revision: 105 Author: christianhujer Date: 2006-04-20 17:06:53 -0700 (Thu, 20 Apr 2006) ViewCVS: http://svn.sourceforge.net/japi/?rev=105&view=rev Log Message: ----------- Updated project properties for this branch. Modified Paths: -------------- branches/0.9/project.properties Modified: branches/0.9/project.properties =================================================================== --- branches/0.9/project.properties 2006-04-20 23:53:35 UTC (rev 104) +++ branches/0.9/project.properties 2006-04-21 00:06:53 UTC (rev 105) @@ -1,5 +1,5 @@ project.version.major=0 project.version.minor=9 -project.version.patch=0 +project.version.patch=1 project.version=${project.version.major}.${project.version.minor}.${project.version.patch} -project.focus=majorEnhancements +project.focus=minorBugfixes This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2006-04-20 23:53:49
|
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. |
From: <chr...@us...> - 2006-04-20 23:04:29
|
Revision: 103 Author: christianhujer Date: 2006-04-20 16:04:22 -0700 (Thu, 20 Apr 2006) ViewCVS: http://svn.sourceforge.net/japi/?rev=103&view=rev Log Message: ----------- Added missing imports. Modified Paths: -------------- trunk/src/doc/guide/io/src/GrepJAPI.java Modified: trunk/src/doc/guide/io/src/GrepJAPI.java =================================================================== --- trunk/src/doc/guide/io/src/GrepJAPI.java 2006-04-20 23:01:16 UTC (rev 102) +++ trunk/src/doc/guide/io/src/GrepJAPI.java 2006-04-20 23:04:22 UTC (rev 103) @@ -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. |
From: <chr...@us...> - 2006-04-20 23:01:28
|
Revision: 102 Author: christianhujer Date: 2006-04-20 16:01:16 -0700 (Thu, 20 Apr 2006) ViewCVS: http://svn.sourceforge.net/japi/?rev=102&view=rev Log Message: ----------- Cosmetic and minor improvements. Modified Paths: -------------- trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/AnswerText.java trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/MCAnswerText.java trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/MCQuestionText.java trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/Main.java trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/OpenQuestionText.java trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/Program.java trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/QuestionCollection.java trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/QuestionText.java trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/Settings.java Modified: trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/AnswerText.java =================================================================== --- trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/AnswerText.java 2006-04-20 22:52:57 UTC (rev 101) +++ trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/AnswerText.java 2006-04-20 23:01:16 UTC (rev 102) @@ -18,7 +18,6 @@ * 02111-1307, USA. */ - package net.sf.japi.progs.jeduca.jtest; import java.io.Serializable; @@ -26,8 +25,7 @@ /** An Answer. * Mutable object for answers. - * @author $Author: chris $ - * @version $Id: AnswerText.java,v 1.5 2006/01/31 23:11:54 chris Exp $ + * @author <a href="mailto:ch...@ri...">Christian Hujer</a> */ public abstract class AnswerText implements Serializable, Cloneable { @@ -113,13 +111,8 @@ } /** {@inheritDoc} */ - public AnswerText clone() { - try { - return (AnswerText) super.clone(); - } catch (CloneNotSupportedException e) { - assert false; - throw new Error(e); - } + @Override public AnswerText clone() throws CloneNotSupportedException { + return (AnswerText) super.clone(); } } // class AnswerText Modified: trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/MCAnswerText.java =================================================================== --- trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/MCAnswerText.java 2006-04-20 22:52:57 UTC (rev 101) +++ trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/MCAnswerText.java 2006-04-20 23:01:16 UTC (rev 102) @@ -18,18 +18,18 @@ * 02111-1307, USA. */ - package net.sf.japi.progs.jeduca.jtest; import java.util.List; /** Class for Multiple Choice Answers. - * @author $Author: chris $ - * @version $Id: MCAnswerText.java,v 1.3 2006/01/31 23:11:54 chris Exp $ + * @author <a href="mailto:ch...@ri...">Christian Hujer</a> */ public class MCAnswerText extends AnswerText { /** Serial Version. */ + // XXX IntelliJ IDEA + @SuppressWarnings({"AnalyzingVariableNaming"}) private static final long serialVersionUID = 1L; /** The checked state of this answertext. */ @@ -101,7 +101,7 @@ public static int countRightAnswers(final List<MCAnswerText> answers) { int right = 0; for (MCAnswerText answer : answers) { - if (answer.isCorrect()) { + if (answer.correct) { right++; } } @@ -115,11 +115,16 @@ public static int countWrongAnswers(final List<MCAnswerText> answers) { int wrong = 0; for (MCAnswerText answer : answers) { - if (!answer.isCorrect()) { + if (!answer.correct) { wrong++; } } return wrong; } + /** {@inheritDoc} */ + @Override public MCAnswerText clone() throws CloneNotSupportedException { + return (MCAnswerText) super.clone(); + } + } // class MCAnswerText Modified: trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/MCQuestionText.java =================================================================== --- trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/MCQuestionText.java 2006-04-20 22:52:57 UTC (rev 101) +++ trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/MCQuestionText.java 2006-04-20 23:01:16 UTC (rev 102) @@ -18,7 +18,6 @@ * 02111-1307, USA. */ - package net.sf.japi.progs.jeduca.jtest; import java.util.ArrayList; @@ -28,8 +27,7 @@ import java.util.List; /** Class for Multiple Choice Questions. - * @author $Author: chris $ - * @version $Id: MCQuestionText.java,v 1.4 2006/01/31 23:11:54 chris Exp $ + * @author <a href="mailto:ch...@ri...">Christian Hujer</a> */ public class MCQuestionText extends QuestionText { Modified: trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/Main.java =================================================================== --- trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/Main.java 2006-04-20 22:52:57 UTC (rev 101) +++ trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/Main.java 2006-04-20 23:01:16 UTC (rev 102) @@ -18,14 +18,12 @@ * 02111-1307, USA. */ - package net.sf.japi.progs.jeduca.jtest; import net.sf.japi.progs.jeduca.jtest.gui.ProgramFrame; /** Klasse, um das Programm zu starten. - * @author $Author: chris $ - * @version $Id: Main.java,v 1.3 2006/01/31 23:11:54 chris Exp $ + * @author <a href="mailto:ch...@ri...">Christian Hujer</a> */ public class Main { Modified: trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/OpenQuestionText.java =================================================================== --- trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/OpenQuestionText.java 2006-04-20 22:52:57 UTC (rev 101) +++ trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/OpenQuestionText.java 2006-04-20 23:01:16 UTC (rev 102) @@ -27,8 +27,7 @@ import java.util.List; /** Class for Open Questions. - * @author $Author: chris $ - * @version $Id: OpenQuestionText.java,v 1.4 2006/01/31 23:11:54 chris Exp $ + * @author <a href="mailto:ch...@ri...">Christian Hujer</a> */ public class OpenQuestionText extends QuestionText { Modified: trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/Program.java =================================================================== --- trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/Program.java 2006-04-20 22:52:57 UTC (rev 101) +++ trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/Program.java 2006-04-20 23:01:16 UTC (rev 102) @@ -36,9 +36,6 @@ */ public class Program { - /** Serial Version. */ - private static final long serialVersionUID = 1L; - /** The IOProvider. */ private IOModuleProvider<QuestionCollection> ioProvider = IOModuleProvider.getProvider(QuestionCollection.class); Modified: trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/QuestionCollection.java =================================================================== --- trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/QuestionCollection.java 2006-04-20 22:52:57 UTC (rev 101) +++ trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/QuestionCollection.java 2006-04-20 23:01:16 UTC (rev 102) @@ -34,6 +34,7 @@ public class QuestionCollection implements Serializable, Iterable<QuestionText> { /** Serial Version. */ + // XXX IntelliJ IDEA private static final long serialVersionUID = 1L; /** The Questions. Modified: trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/QuestionText.java =================================================================== --- trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/QuestionText.java 2006-04-20 22:52:57 UTC (rev 101) +++ trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/QuestionText.java 2006-04-20 23:01:16 UTC (rev 102) @@ -35,6 +35,8 @@ public abstract class QuestionText implements Serializable, Cloneable { /** Serial Version. */ + // XXX IntelliJ IDEA + @SuppressWarnings({"AnalyzingVariableNaming"}) private static final long serialVersionUID = 1L; /** The HTML state of this QuestionText. Modified: trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/Settings.java =================================================================== --- trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/Settings.java 2006-04-20 22:52:57 UTC (rev 101) +++ trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/Settings.java 2006-04-20 23:01:16 UTC (rev 102) @@ -29,8 +29,7 @@ /** Class representing the settings for JTest. * It also manages the list of recent URLs. - * @author $Author: chris $ - * @version $Id: Settings.java,v 1.5 2006/01/31 23:11:54 chris Exp $ + * @author <a href="mailto:ch...@ri...">Christian Hujer</a> */ public class Settings implements RecentURLs { @@ -64,7 +63,7 @@ maxLastOpened = prefs.getInt("maxLastOpened", 4); recentlyOpenedURLs.clear(); for (int i = 0; i < maxLastOpened; i++) { - final String file = prefs.get("recentlyOpenedURL[" + i + "]", null); + final String file = prefs.get("recentlyOpenedURL[" + i + ']', null); if (file == null) { break; } @@ -78,7 +77,7 @@ prefs.putBoolean("showQuestionSolution", showQuestionSolution); prefs.putInt("maxLastOpened", maxLastOpened); for (int i = 0, size = recentlyOpenedURLs.size(); i < size; i++) { - prefs.put("recentlyOpenedURL[" + i + "]", recentlyOpenedURLs.get(i)); + prefs.put("recentlyOpenedURL[" + i + ']', recentlyOpenedURLs.get(i)); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2006-04-20 22:53:09
|
Revision: 101 Author: christianhujer Date: 2006-04-20 15:52:57 -0700 (Thu, 20 Apr 2006) ViewCVS: http://svn.sourceforge.net/japi/?rev=101&view=rev Log Message: ----------- Fixed uncompilable subclass. Modified Paths: -------------- trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/OpenQuestionText.java Modified: trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/OpenQuestionText.java =================================================================== --- trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/OpenQuestionText.java 2006-04-18 01:01:25 UTC (rev 100) +++ trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/OpenQuestionText.java 2006-04-20 22:52:57 UTC (rev 101) @@ -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; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2006-04-18 01:01:35
|
Revision: 100 Author: christianhujer Date: 2006-04-17 18:01:25 -0700 (Mon, 17 Apr 2006) ViewCVS: http://svn.sourceforge.net/japi/?rev=100&view=rev Log Message: ----------- Updated release version. Modified Paths: -------------- trunk/src/doc/start.xhtml Modified: trunk/src/doc/start.xhtml =================================================================== --- trunk/src/doc/start.xhtml 2006-04-18 00:21:08 UTC (rev 99) +++ trunk/src/doc/start.xhtml 2006-04-18 01:01:25 UTC (rev 100) @@ -16,7 +16,7 @@ </head> <body> <p> - (Yet another (hopefully) useful) Java API. Latest release version: <strong>0.8.0</strong> + (Yet another (hopefully) useful) Java API. Latest release version: <strong>0.9.0</strong> </p> <h2>What is JAPI?</h2> <p> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2006-04-18 00:21:21
|
Revision: 99 Author: christianhujer Date: 2006-04-17 17:21:08 -0700 (Mon, 17 Apr 2006) ViewCVS: http://svn.sourceforge.net/japi/?rev=99&view=rev Log Message: ----------- Creating release tag for version 0.9.0 Added Paths: ----------- tags/0.9.0/ Copied: tags/0.9.0 (from rev 98, branches/0.9) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2006-04-18 00:20:56
|
Revision: 98 Author: christianhujer Date: 2006-04-17 17:20:47 -0700 (Mon, 17 Apr 2006) ViewCVS: http://svn.sourceforge.net/japi/?rev=98&view=rev Log Message: ----------- Creating branch for version 0.9 Added Paths: ----------- branches/0.9/ Copied: branches/0.9 (from rev 97, trunk) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2006-04-18 00:15:16
|
Revision: 97 Author: christianhujer Date: 2006-04-17 17:15:06 -0700 (Mon, 17 Apr 2006) ViewCVS: http://svn.sourceforge.net/japi/?rev=97&view=rev Log Message: ----------- Updating API link to include 0.9.0. Modified Paths: -------------- trunk/src/doc/api/start.xhtml Modified: trunk/src/doc/api/start.xhtml =================================================================== --- trunk/src/doc/api/start.xhtml 2006-04-18 00:13:21 UTC (rev 96) +++ trunk/src/doc/api/start.xhtml 2006-04-18 00:15:06 UTC (rev 97) @@ -20,6 +20,9 @@ </ul> <ul id="apiReleases"> <li> + <a href="0.9.0/">JAPI 0.9.0 API Documentation</a> + </li> + <li> <a href="0.8.0/">JAPI 0.8.0 API Documentation</a> </li> <li> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2006-04-18 00:13:32
|
Revision: 96 Author: christianhujer Date: 2006-04-17 17:13:21 -0700 (Mon, 17 Apr 2006) ViewCVS: http://svn.sourceforge.net/japi/?rev=96&view=rev Log Message: ----------- Added jakarta regexp to svn class path. Modified Paths: -------------- trunk/build.xml Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2006-04-18 00:05:42 UTC (rev 95) +++ trunk/build.xml 2006-04-18 00:13:21 UTC (rev 96) @@ -49,6 +49,7 @@ <taskdef name="svn" classpath="lib/svnant.jar" classname="org.tigris.subversion.svnant.SvnTask"> <classpath> <pathelement path="lib/svnClientAdapter.jar" /> + <pathelement path="lib/jakarta-regexp-1.3.jar" /> </classpath> </taskdef> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2006-04-18 00:05:53
|
Revision: 95 Author: christianhujer Date: 2006-04-17 17:05:42 -0700 (Mon, 17 Apr 2006) ViewCVS: http://svn.sourceforge.net/japi/?rev=95&view=rev Log Message: ----------- Added jakarta regexp. Added Paths: ----------- trunk/lib/LICENSE-jakarta-regexp-1.3.jar trunk/lib/jakarta-regexp-1.3.jar Added: trunk/lib/LICENSE-jakarta-regexp-1.3.jar =================================================================== --- trunk/lib/LICENSE-jakarta-regexp-1.3.jar (rev 0) +++ trunk/lib/LICENSE-jakarta-regexp-1.3.jar 2006-04-18 00:05:42 UTC (rev 95) @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. Property changes on: trunk/lib/LICENSE-jakarta-regexp-1.3.jar ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + LF Added: trunk/lib/jakarta-regexp-1.3.jar =================================================================== (Binary files differ) Property changes on: trunk/lib/jakarta-regexp-1.3.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2006-04-17 23:55:45
|
Revision: 94 Author: christianhujer Date: 2006-04-17 16:55:39 -0700 (Mon, 17 Apr 2006) ViewCVS: http://svn.sourceforge.net/japi/?rev=94&view=rev Log Message: ----------- Added Grep example. Added Paths: ----------- trunk/src/doc/guide/io/src/GrepJAPI.java Added: trunk/src/doc/guide/io/src/GrepJAPI.java =================================================================== --- trunk/src/doc/guide/io/src/GrepJAPI.java (rev 0) +++ trunk/src/doc/guide/io/src/GrepJAPI.java 2006-04-17 23:55:39 UTC (rev 94) @@ -0,0 +1,43 @@ +import java.util.List; +import java.util.regex.Pattern; +import java.util.regex.Matcher; +import net.sf.japi.io.args.ArgParser; +import net.sf.japi.io.args.Command; +import net.sf.japi.io.ARGV; + +/** Implementation of Grep using JAPI. + * @author <a href="mailto:ch...@it...">Christian Hujer</a> + */ +public class GrepJAPI implements Command { + + /** Main program. + * @param args command line arguments + */ + public static void main(final String... args) { + final GrepJAPI grepJAPI = new GrepJAPI(); + ArgParser.parse(grepJAPI, args); + } + + /** {@inheritDoc} */ + @SuppressWarnings({"InstanceMethodNamingConvention"}) + public void run(final List<String> args) { + final String regex = args.remove(0); + final Pattern pattern = Pattern.compile(regex); + final Matcher matcher = pattern.matcher(""); + for (final String line : new ARGV(args.toArray(new String[args.size()]))) { + if (matcher.reset(line).find()) { + System.out.println(line); + } + } + } + + @StopOption @Option({"h", "help"}) + public void help() { + System.out.println("help"); + } + + @StopOption @Option({"V", "version"}) + public void version() { + System.out.println("The version."); + } +} // class GrepJAPI Property changes on: trunk/src/doc/guide/io/src/GrepJAPI.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + LF This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2006-04-17 23:30:46
|
Revision: 93 Author: christianhujer Date: 2006-04-17 16:30:37 -0700 (Mon, 17 Apr 2006) ViewCVS: http://svn.sourceforge.net/japi/?rev=93&view=rev Log Message: ----------- Cosmetic improvements. Modified Paths: -------------- trunk/src/app/net/sf/japi/io/args/ArgParser.java Modified: trunk/src/app/net/sf/japi/io/args/ArgParser.java =================================================================== --- trunk/src/app/net/sf/japi/io/args/ArgParser.java 2006-04-17 23:29:37 UTC (rev 92) +++ trunk/src/app/net/sf/japi/io/args/ArgParser.java 2006-04-17 23:30:37 UTC (rev 93) @@ -35,7 +35,7 @@ */ public class ArgParser { - /** Parses arguments into an arguments container. + /** Parses arguments into an arguments container and invokes the Command's {@link Command#run(List<String>)} method. * @param argsContainer object to hold parsed arguments * @param args Arguments to parse */ @@ -48,7 +48,7 @@ final Option option = method.getAnnotation(Option.class); if (option != null) { for (final String optionString : option.value()) { - argumentMethods.put(optionString.length() > 1 ? "-" + optionString : optionString, method); + argumentMethods.put(optionString.length() > 1 ? '-' + optionString : optionString, method); } } } @@ -57,9 +57,10 @@ if (arg.length() > 1 && arg.charAt(0) == '-') { it.remove(); if ("--".equals(arg)) { + //noinspection BreakStatement break; } - if (arg.charAt(1) != '-') { + if (arg.charAt(1) == '-') { if (invokeMethod(argumentMethods.get(arg.substring(1)), argsContainer)) { return; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2006-04-17 23:29:52
|
Revision: 92 Author: christianhujer Date: 2006-04-17 16:29:37 -0700 (Mon, 17 Apr 2006) ViewCVS: http://svn.sourceforge.net/japi/?rev=92&view=rev Log Message: ----------- Cosmetic improvements. Modified Paths: -------------- trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/MCQuestionText.java trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/Program.java trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/QuestionCollection.java trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/QuestionText.java trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/io/KEduca.java trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/io/educa.dtd trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/io/jtestv1.dtd Modified: trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/MCQuestionText.java =================================================================== --- trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/MCQuestionText.java 2006-04-17 22:55:37 UTC (rev 91) +++ trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/MCQuestionText.java 2006-04-17 23:29:37 UTC (rev 92) @@ -34,6 +34,8 @@ public class MCQuestionText extends QuestionText { /** Serial Version. */ + // XXX... + @SuppressWarnings({"AnalyzingVariableNaming"}) private static final long serialVersionUID = 1L; /** The answers. @@ -41,10 +43,8 @@ */ private List<MCAnswerText> answers; - /** Create a Question. - */ + /** Create a Question. */ public MCQuestionText() { - super(); answers = new ArrayList<MCAnswerText>(); } @@ -133,7 +133,7 @@ * @return List with right answers */ public List<MCAnswerText> getRightAnswerTexts() { - List<MCAnswerText> right = new ArrayList<MCAnswerText>(); + final List<MCAnswerText> right = new ArrayList<MCAnswerText>(); for (MCAnswerText answer : answers) { if (answer.isCorrect()) { right.add(answer); @@ -146,7 +146,7 @@ * @return List with wrong answers */ public List<MCAnswerText> getWrongAnswerTexts() { - List<MCAnswerText> wrong = new ArrayList<MCAnswerText>(); + final List<MCAnswerText> wrong = new ArrayList<MCAnswerText>(); for (MCAnswerText answer : answers) { if (!answer.isCorrect()) { wrong.add(answer); @@ -159,17 +159,16 @@ * @return List with all answers in original order */ public List<MCAnswerText> getAnswerTexts() { - List<MCAnswerText> answers = new ArrayList<MCAnswerText>(this.answers); - return answers; + return new ArrayList<MCAnswerText>(answers); } /** Get all answers. * @return List with all answers in random order */ public List<MCAnswerText> getRandomAnswerTexts() { - List<MCAnswerText> answers = new ArrayList<MCAnswerText>(this.answers); - Collections.shuffle(answers); - return answers; + final List<MCAnswerText> randomAnswers = new ArrayList<MCAnswerText>(answers); + Collections.shuffle(randomAnswers); + return randomAnswers; } /** Get a certain set of AnswerTexts. @@ -177,28 +176,27 @@ * @return a set of not more than <var>n</var> answertexts with at least 1 right answertext */ public List<MCAnswerText> getAnswerTexts(final int n) { - List<MCAnswerText> rightAnswers = getRightAnswerTexts(); - List<MCAnswerText> wrongAnswers = getWrongAnswerTexts(); - List<MCAnswerText> answers = new ArrayList<MCAnswerText>(); + final List<MCAnswerText> rightAnswers = getRightAnswerTexts(); + final List<MCAnswerText> wrongAnswers = getWrongAnswerTexts(); + final List<MCAnswerText> answerTexts = new ArrayList<MCAnswerText>(); int rightAnswersLeft = rightAnswers.size(); - int wrongAnswersLeft = wrongAnswers.size(); if (rightAnswersLeft > 0) { - answers.add(rightAnswers.remove((int) (Math.random() * rightAnswersLeft--))); + answerTexts.add(rightAnswers.remove((int) (Math.random() * rightAnswersLeft--))); } - List<MCAnswerText> allAnswers = new ArrayList<MCAnswerText>(); + final List<MCAnswerText> allAnswers = new ArrayList<MCAnswerText>(); allAnswers.addAll(rightAnswers); allAnswers.addAll(wrongAnswers); int allAnswersLeft = allAnswers.size(); for (int i = 0; i < 4 && allAnswersLeft > 0; i++) { - answers.add(allAnswers.remove((int) (Math.random() * allAnswersLeft--))); + answerTexts.add(allAnswers.remove((int) (Math.random() * allAnswersLeft--))); } - return answers; + return answerTexts; } /** Get wether this question has been answered correctly. * @return true if this question has been answered correctly, false otherwise */ - public boolean isAnsweredCorrectly() { + @Override public boolean isAnsweredCorrectly() { boolean answeredCorrectly = true; for (MCAnswerText answer : answers) { answeredCorrectly &= answer.isCheckedCorrectly(); @@ -207,8 +205,9 @@ } /** {@inheritDoc} */ - public MCQuestionText clone() { - MCQuestionText clone = (MCQuestionText) super.clone(); + @Override public MCQuestionText clone() throws CloneNotSupportedException { + final MCQuestionText clone = (MCQuestionText) super.clone(); + //noinspection CloneCallsConstructors clone.answers = new ArrayList<MCAnswerText>(answers); for (int i = 0, size = clone.answers.size(); i < size; i++) { clone.answers.set(i, (MCAnswerText) clone.answers.get(i).clone()); Modified: trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/Program.java =================================================================== --- trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/Program.java 2006-04-17 22:55:37 UTC (rev 91) +++ trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/Program.java 2006-04-17 23:29:37 UTC (rev 92) @@ -32,8 +32,7 @@ /** The Program contains the basic references such as the current QuestionCollection and provides important main operations like loading and saving * files. * @todo Refactor to Program 1-n Document, find an alternative common name for Document to avoid conflict with XML names. - * @author $Author: chris $ - * @version $Id: Program.java,v 1.6 2006/01/31 23:11:54 chris Exp $ + * @author <a href="mailto:ch...@ri...">Christian Hujer</a> */ public class Program { Modified: trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/QuestionCollection.java =================================================================== --- trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/QuestionCollection.java 2006-04-17 22:55:37 UTC (rev 91) +++ trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/QuestionCollection.java 2006-04-17 23:29:37 UTC (rev 92) @@ -29,8 +29,7 @@ import java.util.List; /** Class for holding a Collection of Questions. - * @author $Author: chris $ - * @version $Id: QuestionCollection.java,v 1.4 2006/01/31 23:11:54 chris Exp $ + * @author <a href="mailto:ch...@ri...">Christian Hujer</a> */ public class QuestionCollection implements Serializable, Iterable<QuestionText> { Modified: trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/QuestionText.java =================================================================== --- trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/QuestionText.java 2006-04-17 22:55:37 UTC (rev 91) +++ trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/QuestionText.java 2006-04-17 23:29:37 UTC (rev 92) @@ -30,8 +30,7 @@ * <li>When going to another QuestionCollection, clone</li> * <li>When being at the GUI, clone if you must write changes to the object which are not yet to go the the QuestionCollection. Otherwise refer.</li> * </ul> - * @author $Author: chris $ - * @version $Id: QuestionText.java,v 1.5 2006/01/31 23:11:54 chris Exp $ + * @author <a href="mailto:ch...@ri...">Christian Hujer</a> */ public abstract class QuestionText implements Serializable, Cloneable { @@ -64,7 +63,7 @@ /** Create a Question. * @param text Question text */ - public QuestionText(final String text) { + protected QuestionText(final String text) { this.text = text; } @@ -132,10 +131,9 @@ /** {@inheritDoc} * Subclasses should eventually override this method if they are compositions thats components need cloning as well. */ - public QuestionText clone() { + @Override public QuestionText clone() throws CloneNotSupportedException { try { - QuestionText clone = (QuestionText) super.clone(); - return clone; + return (QuestionText) super.clone(); } catch (CloneNotSupportedException e) { assert false; throw new Error(e); Modified: trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/io/KEduca.java =================================================================== --- trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/io/KEduca.java 2006-04-17 22:55:37 UTC (rev 91) +++ trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/io/KEduca.java 2006-04-17 23:29:37 UTC (rev 92) @@ -34,7 +34,6 @@ import org.w3c.dom.Document; import org.w3c.dom.DocumentType; import org.w3c.dom.Element; -import org.w3c.dom.Node; import static org.w3c.dom.Node.ELEMENT_NODE; import org.w3c.dom.NodeList; import org.w3c.dom.ls.DOMImplementationLS; @@ -44,10 +43,10 @@ import net.sf.japi.progs.jeduca.jtest.QuestionCollection; import net.sf.japi.progs.jeduca.jtest.QuestionText; import net.sf.japi.progs.jeduca.swing.io.Exporter; +import net.sf.japi.xml.FilteredNodeList; /** Interface for reading and writing KEduca files. - * @author $Author: chris $ - * @version $Id: KEduca.java,v 1.5 2006/01/31 23:11:54 chris Exp $ + * @author <a href="mailto:ch...@ri...">Christian Hujer</a> */ public class KEduca extends AbstractJTestImport<QuestionCollection> implements Exporter<QuestionCollection> { @@ -82,12 +81,12 @@ dbf.setXIncludeAware(false); } catch (final NoSuchMethodError e) { /* ignore */ - } catch (UnsupportedOperationException e) { /* ignore */ } + } catch (final UnsupportedOperationException e) { /* ignore */ } db = dbf.newDocumentBuilder(); domImpl = db.getDOMImplementation(); xpf = XPathFactory.newInstance(); xp = xpf.newXPath(); - } catch (ParserConfigurationException e) { + } catch (final ParserConfigurationException e) { throw new Error(e); } } @@ -133,20 +132,15 @@ for (int i = 0; i < questionElsSize; i++) { final Element questionEl = (Element) questionEls.item(i); final List<MCAnswerText> answers = new ArrayList<MCAnswerText>(); - final NodeList textEls = questionEl.getChildNodes(); - final int textElsSize = textEls.getLength(); String questionText = null; - for (int j = 0; j < textElsSize; j++) { - final Node n = textEls.item(j); - if (n.getNodeType() == ELEMENT_NODE) { - final String tagName = n.getNodeName(); - if ("text".equals(tagName)) { - questionText = n.getFirstChild().getNodeValue(); - } else if ("true".equals(tagName)) { - answers.add(new MCAnswerText(n.getFirstChild().getNodeValue(), true, true)); - } else if ("false".equals(tagName)) { - answers.add(new MCAnswerText(n.getFirstChild().getNodeValue(), false, true)); - } + for (final Element n : new FilteredNodeList<Element>(questionEl, ELEMENT_NODE)) { + final String tagName = n.getNodeName(); + if ("text".equals(tagName)) { + questionText = n.getFirstChild().getNodeValue(); + } else if ("true".equals(tagName)) { + answers.add(new MCAnswerText(n.getFirstChild().getNodeValue(), true, true)); + } else if ("false".equals(tagName)) { + answers.add(new MCAnswerText(n.getFirstChild().getNodeValue(), false, true)); } } final QuestionText question = new MCQuestionText(questionText, answers); @@ -173,7 +167,7 @@ col.setAuthorName (xp.evaluate("Document/Info/author/name", doc)); col.setAuthorEMail(xp.evaluate("Document/Info/author/email", doc)); col.setAuthorWWW (xp.evaluate("Document/Info/author/www", doc)); - } catch (XPathExpressionException e) { + } catch (final XPathExpressionException e) { throw new Error(e); } } Modified: trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/io/educa.dtd =================================================================== --- trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/io/educa.dtd 2006-04-17 22:55:37 UTC (rev 91) +++ trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/io/educa.dtd 2006-04-17 23:29:37 UTC (rev 92) @@ -1,3 +1,22 @@ +<!-- JAPI - (Yet another (hopefully) useful) Java API + - + - Copyright (C) 2006 Christian Hujer + - + - This program is free software; you can redistribute it and/or + - modify it under the terms of the GNU General Public License as + - published by the Free Software Foundation; either version 2 of the + - License, or (at your option) any later version. + - + - This program is distributed in the hope that it will be useful, but + - WITHOUT ANY WARRANTY; without even the implied warranty of + - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + - General Public License for more details. + - + - You should have received a copy of the GNU General Public License + - along with this program; if not, write to the Free Software + - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + - 02111-1307, USA. + --> <!ELEMENT Document (Info, Data)> <!ELEMENT info (title, category, type, level, language, author)> @@ -15,26 +34,6 @@ <!ELEMENT question (text, (false|true)*)> <!ELEMENT text (#PCDATA)> <!ELEMENT false (#PCDATA)> -<!-- - ~ JAPI - (Yet another (hopefully) useful) Java API - ~ - ~ Copyright (C) 2006 Christian Hujer - ~ - ~ This program is free software; you can redistribute it and/or - ~ modify it under the terms of the GNU General Public License as - ~ published by the Free Software Foundation; either version 2 of the - ~ License, or (at your option) any later version. - ~ - ~ This program is distributed in the hope that it will be useful, but - ~ WITHOUT ANY WARRANTY; without even the implied warranty of - ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - ~ General Public License for more details. - ~ - ~ You should have received a copy of the GNU General Public License - ~ along with this program; if not, write to the Free Software - ~ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - ~ 02111-1307, USA. - --> <!ELEMENT true (#PCDATA)> <!ATTLIST question Modified: trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/io/jtestv1.dtd =================================================================== --- trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/io/jtestv1.dtd 2006-04-17 22:55:37 UTC (rev 91) +++ trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/io/jtestv1.dtd 2006-04-17 23:29:37 UTC (rev 92) @@ -1,3 +1,22 @@ +<!-- JAPI - (Yet another (hopefully) useful) Java API + - + - Copyright (C) 2006 Christian Hujer + - + - This program is free software; you can redistribute it and/or + - modify it under the terms of the GNU General Public License as + - published by the Free Software Foundation; either version 2 of the + - License, or (at your option) any later version. + - + - This program is distributed in the hope that it will be useful, but + - WITHOUT ANY WARRANTY; without even the implied warranty of + - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + - General Public License for more details. + - + - You should have received a copy of the GNU General Public License + - along with this program; if not, write to the Free Software + - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + - 02111-1307, USA. + --> <!ELEMENT document (info, data)> <!ELEMENT info (title, category, type, level, language, author)> <!ELEMENT title (#PCDATA)> @@ -14,26 +33,6 @@ <!ELEMENT text (#PCDATA)> <!ELEMENT false (#PCDATA)> <!ELEMENT true (#PCDATA)> -<!-- - ~ JAPI - (Yet another (hopefully) useful) Java API - ~ - ~ Copyright (C) 2006 Christian Hujer - ~ - ~ This program is free software; you can redistribute it and/or - ~ modify it under the terms of the GNU General Public License as - ~ published by the Free Software Foundation; either version 2 of the - ~ License, or (at your option) any later version. - ~ - ~ This program is distributed in the hope that it will be useful, but - ~ WITHOUT ANY WARRANTY; without even the implied warranty of - ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - ~ General Public License for more details. - ~ - ~ You should have received a copy of the GNU General Public License - ~ along with this program; if not, write to the Free Software - ~ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - ~ 02111-1307, USA. - --> <!ELEMENT regex (#PCDATA)> <!ATTLIST QuestionText type CDATA #IMPLIED This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2006-04-17 22:55:47
|
Revision: 91 Author: christianhujer Date: 2006-04-17 15:55:37 -0700 (Mon, 17 Apr 2006) ViewCVS: http://svn.sourceforge.net/japi/?rev=91&view=rev Log Message: ----------- Fixed bug: annotations were not public. Modified Paths: -------------- trunk/src/app/net/sf/japi/io/args/Mandatory.java trunk/src/app/net/sf/japi/io/args/Option.java trunk/src/app/net/sf/japi/io/args/StopOption.java Modified: trunk/src/app/net/sf/japi/io/args/Mandatory.java =================================================================== --- trunk/src/app/net/sf/japi/io/args/Mandatory.java 2006-04-17 22:45:27 UTC (rev 90) +++ trunk/src/app/net/sf/japi/io/args/Mandatory.java 2006-04-17 22:55:37 UTC (rev 91) @@ -32,5 +32,5 @@ */ @Retention(RUNTIME) @Target(METHOD) -@interface Mandatory { +public @interface Mandatory { } // @interface Mandatory Modified: trunk/src/app/net/sf/japi/io/args/Option.java =================================================================== --- trunk/src/app/net/sf/japi/io/args/Option.java 2006-04-17 22:45:27 UTC (rev 90) +++ trunk/src/app/net/sf/japi/io/args/Option.java 2006-04-17 22:55:37 UTC (rev 91) @@ -31,7 +31,7 @@ */ @Retention(RUNTIME) @Target(METHOD) -@interface Option { +public @interface Option { /** The argument names. * Usually this is two Strings, a single letter and a descriptive String. Modified: trunk/src/app/net/sf/japi/io/args/StopOption.java =================================================================== --- trunk/src/app/net/sf/japi/io/args/StopOption.java 2006-04-17 22:45:27 UTC (rev 90) +++ trunk/src/app/net/sf/japi/io/args/StopOption.java 2006-04-17 22:55:37 UTC (rev 91) @@ -34,5 +34,5 @@ */ @Retention(RUNTIME) @Target(METHOD) -@interface StopOption { +public @interface StopOption { } // @interface StopOption This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2006-04-17 22:45:37
|
Revision: 90 Author: christianhujer Date: 2006-04-17 15:45:27 -0700 (Mon, 17 Apr 2006) ViewCVS: http://svn.sourceforge.net/japi/?rev=90&view=rev Log Message: ----------- Fixed bug: interface Command was not public. Modified Paths: -------------- trunk/src/app/net/sf/japi/io/args/Command.java Modified: trunk/src/app/net/sf/japi/io/args/Command.java =================================================================== --- trunk/src/app/net/sf/japi/io/args/Command.java 2006-04-16 22:09:12 UTC (rev 89) +++ trunk/src/app/net/sf/japi/io/args/Command.java 2006-04-17 22:45:27 UTC (rev 90) @@ -26,7 +26,7 @@ /** Shell commands can implement this interface and make use of ArgParser. * @author <a href="mailto:ch...@ri...">Christian Hujer</a> */ -interface Command { +public interface Command { /** Run the command. * This method is invoked by {@link ArgParser} once it is finnished with parsing the arguments. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2006-04-16 22:09:20
|
Revision: 89 Author: christianhujer Date: 2006-04-16 15:09:12 -0700 (Sun, 16 Apr 2006) ViewCVS: http://svn.sourceforge.net/japi/?rev=89&view=rev Log Message: ----------- DTDs are now published on the website. Modified Paths: -------------- trunk/build.xml trunk/src/doc/dtd/xhtml11_xinclude10-model-1.mod Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2006-04-16 22:08:07 UTC (rev 88) +++ trunk/build.xml 2006-04-16 22:09:12 UTC (rev 89) @@ -179,6 +179,9 @@ <fileset dir="src/doc"> <include name="**/.htaccess" /> <include name="**/*.html" /> + <include name="dtd/**/*.mod" /> + <include name="dtd/**/*.dtd" /> + <include name="dtd/**/*.xml" /> <include name="**/*.css" /> <include name="**/*.png" /> <exclude name="**/.xvpics/*.png" /> Modified: trunk/src/doc/dtd/xhtml11_xinclude10-model-1.mod =================================================================== --- trunk/src/doc/dtd/xhtml11_xinclude10-model-1.mod 2006-04-16 22:08:07 UTC (rev 88) +++ trunk/src/doc/dtd/xhtml11_xinclude10-model-1.mod 2006-04-16 22:09:12 UTC (rev 89) @@ -9,7 +9,7 @@ This DTD module is identified by the PUBLIC and SYSTEM identifiers: PUBLIC "-//JAPI//ENTITIES XHTML 1.1 + XInclude 1.0 Document Model 1.0//EN" - SYSTEM "http://www.w3.org/TR/xhtml11/DTD/xhtml11_xinclude10-model-1.mod" TODO + SYSTEM "http://japi.sourceforge.net/dtd/xhtml11_xinclude10-model-1.mod" Revisions: (none) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2006-04-16 22:08:26
|
Revision: 88 Author: christianhujer Date: 2006-04-16 15:08:07 -0700 (Sun, 16 Apr 2006) ViewCVS: http://svn.sourceforge.net/japi/?rev=88&view=rev Log Message: ----------- Cosmetic improvements. Modified Paths: -------------- trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/io/JTestV1.java trunk/src/app/net/sf/japi/io/Nibbles.java trunk/src/app/net/sf/japi/sql/CachedResultSetTableModel.java trunk/src/app/net/sf/japi/sql/DatabaseTreeModel.java trunk/src/app/net/sf/japi/swing/bookmarks/BookmarkManager.java Modified: trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/io/JTestV1.java =================================================================== --- trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/io/JTestV1.java 2006-04-16 21:39:07 UTC (rev 87) +++ trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/io/JTestV1.java 2006-04-16 22:08:07 UTC (rev 88) @@ -51,7 +51,6 @@ /** Interface for reading and writing JTestV1 files. * @author $Author: chris $ - * @version $Id: JTestV1.java,v 1.5 2006/01/31 23:11:54 chris Exp $ * @todo use schema */ public class JTestV1 extends AbstractJTestImport<QuestionCollection> implements Importer<QuestionCollection>, Exporter<QuestionCollection> { @@ -316,9 +315,6 @@ */ private static class ErrorCapture implements ErrorHandler { - /** Version Information. */ - public static final String version = "$Revision: 1.5 $"; - /** Wether there were errors. */ private boolean errors; Modified: trunk/src/app/net/sf/japi/io/Nibbles.java =================================================================== --- trunk/src/app/net/sf/japi/io/Nibbles.java 2006-04-16 21:39:07 UTC (rev 87) +++ trunk/src/app/net/sf/japi/io/Nibbles.java 2006-04-16 22:08:07 UTC (rev 88) @@ -36,7 +36,6 @@ * <p /> * Everything in this class is final for performance reasons: Final methods can be sort of inlined by some compilers. * @author <a href="mailto:ch...@ri...">Christian Hujer</a> - * @version $Revision: 1.4 $ */ @SuppressWarnings({"UtilityClass", "ClassWithTooManyMethods"}) public final class Nibbles { Modified: trunk/src/app/net/sf/japi/sql/CachedResultSetTableModel.java =================================================================== --- trunk/src/app/net/sf/japi/sql/CachedResultSetTableModel.java 2006-04-16 21:39:07 UTC (rev 87) +++ trunk/src/app/net/sf/japi/sql/CachedResultSetTableModel.java 2006-04-16 22:08:07 UTC (rev 88) @@ -65,6 +65,9 @@ */ private Object[][] data; + /** The ResultSet. */ + private ResultSet resultSet; + /** Create a CachedResultSetTableModel. */ public CachedResultSetTableModel() { } @@ -92,6 +95,7 @@ /** {@inheritDoc} */ public void setResultSet(final ResultSet resultSet) { if (resultSet == null) { + this.resultSet = resultSet; rowCount = 0; columnCount = 0; columnTitles = null; @@ -102,6 +106,7 @@ columnCount = columnTitles.length; rowCount = SQLHelper.getRowCount(resultSet); data = SQLHelper.getData(resultSet); + this.resultSet = resultSet; } catch (final SQLException e) { handleException(e); rowCount = 0; @@ -114,11 +119,9 @@ fireTableStructureChanged(); } - /** {@inheritDoc} - * @todo currently this implementation always returns <code>null</code> - */ + /** {@inheritDoc} */ public ResultSet getResultSet() { - return null; // TODO + return resultSet; } /** {@inheritDoc} */ Modified: trunk/src/app/net/sf/japi/sql/DatabaseTreeModel.java =================================================================== --- trunk/src/app/net/sf/japi/sql/DatabaseTreeModel.java 2006-04-16 21:39:07 UTC (rev 87) +++ trunk/src/app/net/sf/japi/sql/DatabaseTreeModel.java 2006-04-16 22:08:07 UTC (rev 88) @@ -31,8 +31,7 @@ import javax.swing.tree.TreePath; import javax.swing.tree.TreeModel; -/** - * TODO +/** A TreeModel displaying the catalogs of a database (usually tables and views) as tree. * @author <a href="mailto:ch...@ri...">Christian Hujer</a> */ @SuppressWarnings({"ObjectEquality"}) @@ -74,7 +73,7 @@ while (rs.next()) { try { catalogs.add(new CatalogTreeNode(rs.getString(1))); - } catch (SQLException e) { + } catch (final SQLException e) { System.err.println(e); // TODO } Modified: trunk/src/app/net/sf/japi/swing/bookmarks/BookmarkManager.java =================================================================== --- trunk/src/app/net/sf/japi/swing/bookmarks/BookmarkManager.java 2006-04-16 21:39:07 UTC (rev 87) +++ trunk/src/app/net/sf/japi/swing/bookmarks/BookmarkManager.java 2006-04-16 22:08:07 UTC (rev 88) @@ -63,7 +63,7 @@ /** Class for managing and displaying Bookmarks. * Usage of this class works the following way: * <ul> - * <li>implement the interface {@link net.sf.japi.swing.bookmarks.Bookmarkable} and its methods</li> + * <li>implement the interface {@link Bookmarkable} and its methods</li> * <li>instanciate this class once for each gruop / kind of bookmarks you want to manage. Normally, one instance is enough per application</li> * <li>invoke {@link #createBookmarkMenu} to create your bookmarks menu</li> * </ul> @@ -74,14 +74,11 @@ */ public class BookmarkManager { - /** Version Information. */ - public static final String version = "$Revision: 1.2 $"; - /** The Bookmarks. */ private BookmarkFolder bookmarks = new BookmarkFolder(); /** Action Factory. */ - private static final ActionFactory actionFactory = ActionFactory.getFactory("net.sf.japi.swing.bookmarks"); + private static final ActionFactory ACTION_FACTORY = ActionFactory.getFactory("net.sf.japi.swing.bookmarks"); /** The ProgramFrame this BookmarkManager manages bookmarks for. */ private Bookmarkable bookmarkable; @@ -95,7 +92,7 @@ } catch (final Exception e) { e.printStackTrace(); // TODO: improve dialog - showMessageDialog(bookmarkable.getBookmarkBlocker(), actionFactory.getString("bookmarksCreated_message")); + showMessageDialog(bookmarkable.getBookmarkBlocker(), ACTION_FACTORY.getString("bookmarksCreated.message")); } } @@ -104,21 +101,21 @@ */ public JToolBar createBookmarkToolBar() { // Variant 1: JToolBar with JMenuBar with one entry "Lesezeichen" - final JToolBar toolBar = new JToolBar(actionFactory.getString("bookmarkToolBar_name")); + final JToolBar toolBar = new JToolBar(ACTION_FACTORY.getString("bookmarkToolBar.name")); final JMenuBar mb = new JMenuBar(); mb.add(bookmarks.createMenu()); toolBar.add(mb); return toolBar; //// Variant 2: JToolBar with JMenus and JMenuItems (broken) - //JToolBar toolBar = new JToolBar(actionFactory.getString("bookmarkToolBar_name")); + //JToolBar toolBar = new JToolBar(ACTION_FACTORY.getString("bookmarkToolBar.name")); //for (Bookmark bookmark : bookmarks) { // toolBar.add(bookmark.createMenu()); //} //return toolBar; //// Variant 3: JToolBar with JMenuBar with JMenus and JMenuItems (JMenuItems don't hover) - //JToolBar toolBar = new JToolBar(actionFactory.getString("bookmarkToolBar_name")); + //JToolBar toolBar = new JToolBar(ACTION_FACTORY.getString("bookmarkToolBar.name")); //JMenuBar mb = new JMenuBar(); //for (Bookmark bookmark : bookmarks) { // mb.add(bookmark.createMenu()); @@ -128,8 +125,8 @@ //// Variant 4: JToolBar with a button activating a PopupMenu. //// Doesn't work either, the popup menu is not correctly usable. - //JToolBar toolBar = new JToolBar(actionFactory.getString("bookmarkToolBar_name")); - //final JPopupMenu menu = new JPopupMenu(actionFactory.getString("bookmark_text")); + //JToolBar toolBar = new JToolBar(ACTION_FACTORY.getString("bookmarkToolBar.name")); + //final JPopupMenu menu = new JPopupMenu(ACTION_FACTORY.getString("bookmark.text")); //menu.add(bookmarks.createMenu()); //toolBar.add( // new javax.swing.JButton( @@ -178,11 +175,11 @@ /** Action for managing the bookmarks. * @serial include */ - private Action manageBookmarks = actionFactory.createAction(true, "manageBookmarks", this); + private Action manageBookmarks = ACTION_FACTORY.createAction(true, "manageBookmarks", this); /** Action for managing the bookmarks. */ public void manageBookmarks() { - final JFrame f = new JFrame(actionFactory.getString("manageBookmarks_shortdescription")); + final JFrame f = new JFrame(ACTION_FACTORY.getString("manageBookmarks_shortdescription")); f.getContentPane().add(createBookmarkControlPanel()); //f.getContentPane().add(new JScrollPane(new JTree(bookmarks))); f.pack(); @@ -250,9 +247,6 @@ */ private class ControlPanel extends JComponent { - /** Version Information. */ - public static final String version = "$Revision: 1.2 $"; - /** Serial Version. */ private static final long serialVersionUID = 1L; @@ -283,9 +277,6 @@ */ public static abstract class Bookmark extends AbstractAction implements MutableTreeNode { - /** Version Information. */ - public static final String version = "$Revision: 1.2 $"; - /** Title for Bookmark. * @serial include */ @@ -308,7 +299,7 @@ */ protected Bookmark(final String title) { setTitle(title); - putValue(SMALL_ICON, IconManager.getDefaultIconManager().getIcon(actionFactory.getString("bookmark.icon"))); + putValue(SMALL_ICON, IconManager.getDefaultIconManager().getIcon(ACTION_FACTORY.getString("bookmark.icon"))); } /** {@inheritDoc} @@ -438,9 +429,6 @@ */ public static class BookmarkSeparator extends Bookmark { - /** Version Information. */ - public static final String version = "$Revision: 1.2 $"; - /** Serial Version. */ private static final long serialVersionUID = 1L; @@ -476,9 +464,6 @@ */ public class BookmarkItem extends Bookmark { - /** Version Information. */ - public static final String version = "$Revision: 1.2 $"; - /** Serial Version. */ private static final long serialVersionUID = 1L; @@ -545,9 +530,6 @@ */ public class BookmarkFolder extends Bookmark implements Iterable<Bookmark> { - /** Version Information. */ - public static final String version = "$Revision: 1.2 $"; - /** Serial Version. */ private static final long serialVersionUID = 1L; @@ -565,7 +547,7 @@ * This should only be used for the basic BookmarkFolder containing all other BookmarkItems and BookmarkFolders. */ public BookmarkFolder() { - super(actionFactory.getString("bookmark_text")); + super(ACTION_FACTORY.getString("bookmark_text")); } /** Create a BookmarkFolder. @@ -711,12 +693,12 @@ /** Action for adding a bookmark. * @serial include */ - private Action addBookmark = actionFactory.createAction(true, "addBookmark", this); + private Action addBookmark = ACTION_FACTORY.createAction(true, "addBookmark", this); /** Action for creating a new bookmark folder. * @serial include */ - private Action newBookmarkFolder = actionFactory.createAction(true, "newBookmarkFolder", this); + private Action newBookmarkFolder = ACTION_FACTORY.createAction(true, "newBookmarkFolder", this); /** Add a bookmark for the currently selected Question from the currently selected QuestionCollection . */ public void addBookmark() { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2006-04-16 21:39:15
|
Revision: 87 Author: christianhujer Date: 2006-04-16 14:39:07 -0700 (Sun, 16 Apr 2006) ViewCVS: http://svn.sourceforge.net/japi/?rev=87&view=rev Log Message: ----------- Removed solved task. Modified Paths: -------------- trunk/src/doc/tasks.xhtml Modified: trunk/src/doc/tasks.xhtml =================================================================== --- trunk/src/doc/tasks.xhtml 2006-04-16 21:37:57 UTC (rev 86) +++ trunk/src/doc/tasks.xhtml 2006-04-16 21:39:07 UTC (rev 87) @@ -93,11 +93,6 @@ <dd> Add a syntax highlighting for property files. </dd> - <dt><!-- TODO -->Remove old references to ITCQIS</dt> - <dd> - Some source still contains references to ITCQIS other than Cher's mail address. - These references should be removed. - </dd> <dt><!-- TODO -->Remove unused meta stuff from XHTML sources</dt> <dd> Some XHTML sources contain unused meta stuff. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2006-04-16 21:38:14
|
Revision: 86 Author: christianhujer Date: 2006-04-16 14:37:57 -0700 (Sun, 16 Apr 2006) ViewCVS: http://svn.sourceforge.net/japi/?rev=86&view=rev Log Message: ----------- Updated my email address. Modified Paths: -------------- trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/gui/AboutGUI.java trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/io/test.jtest trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/swing/ISwingUtilities.java trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/swing/io/EndingFileFilter.java trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/swing/io/FilenameFileFilter.java trunk/progs/jeduca/src/overview.html Modified: trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/gui/AboutGUI.java =================================================================== --- trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/gui/AboutGUI.java 2006-04-16 21:32:55 UTC (rev 85) +++ trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/gui/AboutGUI.java 2006-04-16 21:37:57 UTC (rev 86) @@ -45,10 +45,10 @@ private static final String ABOUT_HTML = "<html><head><meta http-equiv='Content-Type' content='text/html'></meta><title>Über</title></head><body><h1>Über</h1><p>JTest Version 1.0</p><p>© 2004 Chrsitian Hujer. Alle Rechte vorbehalten.</p></body></html>"; /** HTML for bugs. */ - private static final String BUGS_HTML = "<html><head><meta http-equiv='Content-Type' content='text/html'></meta><title>Bugs</title></head><body><h1>Bugs</h1><p>Berichten Sie Bugs und Wünsche an: <a href='http://www.itcqis.com'>http://www.itcqis.com/</a> oder per Mail an den Autor: <a href='mailto:Chr...@it...'>Chr...@it...</a></p></body></html>"; + private static final String BUGS_HTML = "<html><head><meta http-equiv='Content-Type' content='text/html'></meta><title>Bugs</title></head><body><h1>Bugs</h1><p>Berichten Sie Bugs und Wünsche an: <a href='http://japi.sourceforge.net/'>http://japi.sourceforge.net/</a> oder per Mail an den Autor: <a href='mailto:ch...@ri...'>ch...@ri...</a></p></body></html>"; /** HTML for authors. */ - private static final String AUTHORS_HTML = "<html><head><meta http-equiv='Content-Type' content='text/html'></meta><title>Autoren</title></head><body><h1>Autoren</h1><p>JTest Version 1.0 wurde entwickelt von:</p><ul><li><a href='mailto:Chr...@it...'>Chrsitian Hujer</a></li></ul></body></html>"; + private static final String AUTHORS_HTML = "<html><head><meta http-equiv='Content-Type' content='text/html'></meta><title>Autoren</title></head><body><h1>Autoren</h1><p>JTest Version 1.0 wurde entwickelt von:</p><ul><li><a href='mailto:ch...@ri...'>Chrsitian Hujer</a></li></ul></body></html>"; /** HTML for license. */ private static final String LICENSE_HTML = "License: TODO"; // TODO Modified: trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/io/test.jtest =================================================================== --- trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/io/test.jtest 2006-04-16 21:32:55 UTC (rev 85) +++ trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/jtest/io/test.jtest 2006-04-16 21:37:57 UTC (rev 86) @@ -8,8 +8,8 @@ <language>de</language> <author> <name>Christian Hujer</name> - <email>Chr...@it...</email> - <www>http://www.itcqis.com/</www> + <email>ch...@ri...</email> + <www>http://japi.sourceforge.net/</www> </author> </info> <data> Modified: trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/swing/ISwingUtilities.java =================================================================== --- trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/swing/ISwingUtilities.java 2006-04-16 21:32:55 UTC (rev 85) +++ trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/swing/ISwingUtilities.java 2006-04-16 21:37:57 UTC (rev 86) @@ -28,7 +28,7 @@ import javax.swing.JButton; import javax.swing.JToolBar; -/** ITCQIS Swing Utilities. +/** JAPI Swing Utilities. * @todo provide methods which create toolbars that get information from preferences and resource bundles */ public class ISwingUtilities { Modified: trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/swing/io/EndingFileFilter.java =================================================================== --- trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/swing/io/EndingFileFilter.java 2006-04-16 21:32:55 UTC (rev 85) +++ trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/swing/io/EndingFileFilter.java 2006-04-16 21:37:57 UTC (rev 86) @@ -25,7 +25,7 @@ import javax.swing.filechooser.FileFilter; /** Swing FileFilter implementation that filters files with specified endings. - * @author <a href="mailto:ch...@it...">Christian Hujer</a> + * @author <a href="mailto:ch...@ri...">Christian Hujer</a> * @todo find a convenient way for i18n/l10n of this class */ public class EndingFileFilter extends FileFilter { Modified: trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/swing/io/FilenameFileFilter.java =================================================================== --- trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/swing/io/FilenameFileFilter.java 2006-04-16 21:32:55 UTC (rev 85) +++ trunk/progs/jeduca/src/net/sf/japi/progs/jeduca/swing/io/FilenameFileFilter.java 2006-04-16 21:37:57 UTC (rev 86) @@ -25,7 +25,7 @@ import javax.swing.filechooser.FileFilter; /** Swing FileFilter implementation that filters files with specified names. - * @author <a href="mailto:ch...@it...">Christian Hujer</a> + * @author <a href="mailto:ch...@ri...">Christian Hujer</a> * @todo find a convenient way for i18n/l10n of this class */ public class FilenameFileFilter extends FileFilter { Modified: trunk/progs/jeduca/src/overview.html =================================================================== --- trunk/progs/jeduca/src/overview.html 2006-04-16 21:32:55 UTC (rev 85) +++ trunk/progs/jeduca/src/overview.html 2006-04-16 21:37:57 UTC (rev 86) @@ -3,30 +3,14 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="de"> <head> <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=utf-8" /> - <title>API Documentation overview for ITCQIS JTest</title> - <meta name="Copyright" content="© 2003 ITCQIS GmbH. All rights reserved." /> - <meta name="Author" content="ITCQIS GmbH, $Author: chris $" /> - <meta scheme="CVS" name="Id" content="$Id: overview.html,v 1.1 2004/12/02 08:07:04 chris Exp $" /> - <meta scheme="CVS" name="Source" content="$Source: /home/webroot//jtest/src/java/overview.html,v $" /> - <meta scheme="CVS" name="State" content="$State: Exp $" /> - <meta scheme="CVS" name="Author" content="$Author: chris $" /> - <meta scheme="CVS" name="Revision" content="$Revision: 1.1 $" /> - <meta scheme="CVS" name="Date" content="$Date: 2004/12/02 08:07:04 $" /> - <meta scheme="CVS" name="Log" content=" - $Log: overview.html,v $ - Revision 1.1 2004/12/02 08:07:04 chris - Added. - - " /> + <title>API Documentation overview for JAPI JEduca</title> </head> <body> <p> - API Documentation overview for ITCQIS JTest. - @author $Author: chris $ - @version $Revision: 1.1 $ + API Documentation overview for JAPI JEduca. </p> <p> - ITCQIS JTest is a software for running electronic tests. + JAPI JEduca is a software for running electronic tests. Currently it supports multiple choice test and uses the same file format as KEduca. </p> </body> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2006-04-16 21:33:06
|
Revision: 85 Author: christianhujer Date: 2006-04-16 14:32:55 -0700 (Sun, 16 Apr 2006) ViewCVS: http://svn.sourceforge.net/japi/?rev=85&view=rev Log Message: ----------- Updated my email address. Modified Paths: -------------- trunk/tools/prefs/src/net/sf/japi/tools/prefsbrowser/PrefsBranchNode.java trunk/tools/prefs/src/net/sf/japi/tools/prefsbrowser/PrefsBrowser.java trunk/tools/prefs/src/net/sf/japi/tools/prefsbrowser/PrefsLeafNode.java trunk/tools/prefs/src/net/sf/japi/tools/prefsbrowser/PrefsRootNode.java trunk/tools/prefs/src/net/sf/japi/tools/prefsbrowser/PrefsTreeNode.java trunk/tools/prefs/src/net/sf/japi/tools/prefsbrowser/PrefsTreeTableModel.java Modified: trunk/tools/prefs/src/net/sf/japi/tools/prefsbrowser/PrefsBranchNode.java =================================================================== --- trunk/tools/prefs/src/net/sf/japi/tools/prefsbrowser/PrefsBranchNode.java 2006-04-16 21:28:58 UTC (rev 84) +++ trunk/tools/prefs/src/net/sf/japi/tools/prefsbrowser/PrefsBranchNode.java 2006-04-16 21:32:55 UTC (rev 85) @@ -26,7 +26,7 @@ import java.util.ArrayList; /** Node describing a branch in preferences. - * @author <a href="mailto:ch...@it...">Christian Hujer</a> + * @author <a href="mailto:ch...@ri...">Christian Hujer</a> */ public class PrefsBranchNode implements PrefsTreeNode { Modified: trunk/tools/prefs/src/net/sf/japi/tools/prefsbrowser/PrefsBrowser.java =================================================================== --- trunk/tools/prefs/src/net/sf/japi/tools/prefsbrowser/PrefsBrowser.java 2006-04-16 21:28:58 UTC (rev 84) +++ trunk/tools/prefs/src/net/sf/japi/tools/prefsbrowser/PrefsBrowser.java 2006-04-16 21:32:55 UTC (rev 85) @@ -28,7 +28,7 @@ import net.sf.japi.swing.treetable.JTreeTable; /** Main class of PrefsBrowser. - * @author <a href="mailto:ch...@it...">Christian Hujer</a> + * @author <a href="mailto:ch...@ri...">Christian Hujer</a> */ // XXX this class isn't really a Utility class, it just looks like one. @SuppressWarnings({"UtilityClassWithoutPrivateConstructor", "UtilityClassWithPublicConstructor", "UtilityClass"}) Modified: trunk/tools/prefs/src/net/sf/japi/tools/prefsbrowser/PrefsLeafNode.java =================================================================== --- trunk/tools/prefs/src/net/sf/japi/tools/prefsbrowser/PrefsLeafNode.java 2006-04-16 21:28:58 UTC (rev 84) +++ trunk/tools/prefs/src/net/sf/japi/tools/prefsbrowser/PrefsLeafNode.java 2006-04-16 21:32:55 UTC (rev 85) @@ -23,7 +23,7 @@ import java.util.prefs.Preferences; /** Node describing a leaf in preferences (key / value pair). - * @author <a href="mailto:ch...@it...">Christian Hujer</a> + * @author <a href="mailto:ch...@ri...">Christian Hujer</a> */ public class PrefsLeafNode implements PrefsTreeNode { Modified: trunk/tools/prefs/src/net/sf/japi/tools/prefsbrowser/PrefsRootNode.java =================================================================== --- trunk/tools/prefs/src/net/sf/japi/tools/prefsbrowser/PrefsRootNode.java 2006-04-16 21:28:58 UTC (rev 84) +++ trunk/tools/prefs/src/net/sf/japi/tools/prefsbrowser/PrefsRootNode.java 2006-04-16 21:32:55 UTC (rev 85) @@ -23,7 +23,7 @@ import java.util.prefs.Preferences; /** Node describing the root of preferences. - * @author <a href="mailto:ch...@it...">Christian Hujer</a> + * @author <a href="mailto:ch...@ri...">Christian Hujer</a> */ public class PrefsRootNode implements PrefsTreeNode { Modified: trunk/tools/prefs/src/net/sf/japi/tools/prefsbrowser/PrefsTreeNode.java =================================================================== --- trunk/tools/prefs/src/net/sf/japi/tools/prefsbrowser/PrefsTreeNode.java 2006-04-16 21:28:58 UTC (rev 84) +++ trunk/tools/prefs/src/net/sf/japi/tools/prefsbrowser/PrefsTreeNode.java 2006-04-16 21:32:55 UTC (rev 85) @@ -21,7 +21,7 @@ package net.sf.japi.tools.prefsbrowser; /** Superclass of PrefsTreeNode. - * @author <a href="mailto:ch...@it...">Christian Hujer</a> + * @author <a href="mailto:ch...@ri...">Christian Hujer</a> */ public interface PrefsTreeNode { Modified: trunk/tools/prefs/src/net/sf/japi/tools/prefsbrowser/PrefsTreeTableModel.java =================================================================== --- trunk/tools/prefs/src/net/sf/japi/tools/prefsbrowser/PrefsTreeTableModel.java 2006-04-16 21:28:58 UTC (rev 84) +++ trunk/tools/prefs/src/net/sf/japi/tools/prefsbrowser/PrefsTreeTableModel.java 2006-04-16 21:32:55 UTC (rev 85) @@ -25,7 +25,7 @@ import net.sf.japi.swing.ActionFactory; /** TreeTableModel for displaying preferences. - * @author <a href="mailto:ch...@it...">Christian Hujer</a> + * @author <a href="mailto:ch...@ri...">Christian Hujer</a> */ public class PrefsTreeTableModel extends AbstractTreeTableModel<PrefsRootNode, PrefsTreeNode> { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2006-04-16 21:29:21
|
Revision: 84 Author: christianhujer Date: 2006-04-16 14:28:58 -0700 (Sun, 16 Apr 2006) ViewCVS: http://svn.sourceforge.net/japi/?rev=84&view=rev Log Message: ----------- Updated my email address. Modified Paths: -------------- trunk/src/doc/dtd/xhtml11_xinclude10.dtd trunk/src/doc/guide/io/src/CatJAPI.java trunk/src/doc/guide/io/src/CatPlain.java trunk/src/doc/guide/io/src/SortJAPI.java trunk/src/doc/guide/io/src/SortPlain.java trunk/src/doc/guide/io/src/UniqJAPI.java trunk/src/doc/guide/io/src/UniqPlain.java trunk/src/doc/guide/swing/action/fromScratch/start.xhtml trunk/src/doc/start.xhtml trunk/src/doc/transform.xslt trunk/src/test/net/sf/japi/lang/SuperClassIteratorTest.java trunk/src/test/net/sf/japi/util/Arrays2Test.java Modified: trunk/src/doc/dtd/xhtml11_xinclude10.dtd =================================================================== --- trunk/src/doc/dtd/xhtml11_xinclude10.dtd 2006-04-16 21:16:40 UTC (rev 83) +++ trunk/src/doc/dtd/xhtml11_xinclude10.dtd 2006-04-16 21:28:58 UTC (rev 84) @@ -21,7 +21,7 @@ It is provided "as is" without expressed or implied warranty. - Author: Christian W. Hujer <Chr...@it...> + Author: Christian Hujer <ch...@ri...> Revision: $Id: xhtml11db.dtd,v 1.3 2004/06/02 18:10:56 chris Exp $ --> Modified: trunk/src/doc/guide/io/src/CatJAPI.java =================================================================== --- trunk/src/doc/guide/io/src/CatJAPI.java 2006-04-16 21:16:40 UTC (rev 83) +++ trunk/src/doc/guide/io/src/CatJAPI.java 2006-04-16 21:28:58 UTC (rev 84) @@ -4,7 +4,7 @@ import static net.sf.japi.io.IOHelper.copy; /** JAPI-based implementation of the UNIX comand <code>cat</code>. - * @author <a href="mailto:ch...@it...">Christian Hujer</a> + * @author <a href="mailto:ch...@ri...">Christian Hujer</a> */ public class CatJAPI { Modified: trunk/src/doc/guide/io/src/CatPlain.java =================================================================== --- trunk/src/doc/guide/io/src/CatPlain.java 2006-04-16 21:16:40 UTC (rev 83) +++ trunk/src/doc/guide/io/src/CatPlain.java 2006-04-16 21:28:58 UTC (rev 84) @@ -7,7 +7,7 @@ import static java.lang.System.out; /** Plain implementation of the UNIX comand <code>cat</code>. - * @author <a href="mailto:ch...@it...">Christian Hujer</a> + * @author <a href="mailto:ch...@ri...">Christian Hujer</a> */ public class CatPlain { Modified: trunk/src/doc/guide/io/src/SortJAPI.java =================================================================== --- trunk/src/doc/guide/io/src/SortJAPI.java 2006-04-16 21:16:40 UTC (rev 83) +++ trunk/src/doc/guide/io/src/SortJAPI.java 2006-04-16 21:28:58 UTC (rev 84) @@ -5,7 +5,7 @@ import net.sf.japi.io.ARGV; /** JAPI-based implementation of the UNIX command <code>sort</code>. - * @author <a href="mailto:ch...@it...">Christian Hujer</a> + * @author <a href="mailto:ch...@ri...">Christian Hujer</a> */ public class SortJAPI { Modified: trunk/src/doc/guide/io/src/SortPlain.java =================================================================== --- trunk/src/doc/guide/io/src/SortPlain.java 2006-04-16 21:16:40 UTC (rev 83) +++ trunk/src/doc/guide/io/src/SortPlain.java 2006-04-16 21:28:58 UTC (rev 84) @@ -9,7 +9,7 @@ import net.sf.japi.io.ARGV; /** Plain implementation of the UNIX command <code>sort</code>. - * @author <a href="mailto:ch...@it...">Christian Hujer</a> + * @author <a href="mailto:ch...@ri...">Christian Hujer</a> */ public class SortPlain { Modified: trunk/src/doc/guide/io/src/UniqJAPI.java =================================================================== --- trunk/src/doc/guide/io/src/UniqJAPI.java 2006-04-16 21:16:40 UTC (rev 83) +++ trunk/src/doc/guide/io/src/UniqJAPI.java 2006-04-16 21:28:58 UTC (rev 84) @@ -2,7 +2,7 @@ import net.sf.japi.io.ARGV; /** JAPI-based implementation of the UNIX comand <code>uniq</code>. - * @author <a href="mailto:ch...@it...">Christian Hujer</a> + * @author <a href="mailto:ch...@ri...">Christian Hujer</a> */ public class UniqJAPI { Modified: trunk/src/doc/guide/io/src/UniqPlain.java =================================================================== --- trunk/src/doc/guide/io/src/UniqPlain.java 2006-04-16 21:16:40 UTC (rev 83) +++ trunk/src/doc/guide/io/src/UniqPlain.java 2006-04-16 21:28:58 UTC (rev 84) @@ -6,7 +6,7 @@ import static java.lang.System.out; /** JAPI-based implementation of the UNIX comand <code>uniq</code>. - * @author <a href="mailto:ch...@it...">Christian Hujer</a> + * @author <a href="mailto:ch...@ri...">Christian Hujer</a> */ public class UniqPlain { Modified: trunk/src/doc/guide/swing/action/fromScratch/start.xhtml =================================================================== --- trunk/src/doc/guide/swing/action/fromScratch/start.xhtml 2006-04-16 21:16:40 UTC (rev 83) +++ trunk/src/doc/guide/swing/action/fromScratch/start.xhtml 2006-04-16 21:28:58 UTC (rev 84) @@ -62,7 +62,7 @@ /** A Text Editor application. * This is an example for developing an application with JAPI. - * @author <a href="mailto:ch...@it...">Christian Hujer</a> + * @author <a href="mailto:ch...@ri...">Christian Hujer</a> */ public class Editor { @@ -141,7 +141,7 @@ /** A Text Editor application. * This is an example for developing an application with JAPI. - * @author <a href="mailto:ch...@it...">Christian Hujer</a> + * @author <a href="mailto:ch...@ri...">Christian Hujer</a> */ public class Editor { Modified: trunk/src/doc/start.xhtml =================================================================== --- trunk/src/doc/start.xhtml 2006-04-16 21:16:40 UTC (rev 83) +++ trunk/src/doc/start.xhtml 2006-04-16 21:28:58 UTC (rev 84) @@ -49,7 +49,7 @@ <h2>Contact the developers</h2> <ul> <li> - You may visit the <a href="http://sourceforge.net/projects/japi">JAPI Project Page at SourceForge</a> or send mail to <a href="mailto:ch...@it...">ch...@it...</a>. + You may visit the <a href="http://sourceforge.net/projects/japi">JAPI Project Page at SourceForge</a> or send mail to <a href="mailto:ch...@ri...">ch...@ri...</a>. </li> <li> You may as well join <a href="irc://irc.freenode.net:6667/%23japi">IRC Channel <code>#japi</code> at <code>irc.freenode.net</code></a> and look for Cher(istheus), z0ra or Zergus. Modified: trunk/src/doc/transform.xslt =================================================================== --- trunk/src/doc/transform.xslt 2006-04-16 21:16:40 UTC (rev 83) +++ trunk/src/doc/transform.xslt 2006-04-16 21:28:58 UTC (rev 84) @@ -65,7 +65,7 @@ <a href="http://sourceforge.net/"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=149894&type=1" alt="SourceForge.net Logo" width="88" height="31" class="now" /></a> <a href="http://sourceforge.net/donate/index.php?group_id=149894"><img src="http://sourceforge.net/images/project-support.jpg" width="88" height="32" alt="Support This Project" class="now" /></a> <a href="http://validator.w3.org/check?uri=referer"><img src="http://www.w3.org/Icons/valid-xhtml11" alt="Valid XHTML 1.1" height="31" width="88" class="now" /></a> - Feedback: <a href="mailto:ch...@it...">webmaster</a> + Feedback: <a href="mailto:ch...@ri...">webmaster</a> <xsl:if test="/html:html/html:head/html:meta[@name='Date']"> <br /> <xsl:value-of select="/html:html/html:head/html:meta[@name='Date']/@content" /> Modified: trunk/src/test/net/sf/japi/lang/SuperClassIteratorTest.java =================================================================== --- trunk/src/test/net/sf/japi/lang/SuperClassIteratorTest.java 2006-04-16 21:16:40 UTC (rev 83) +++ trunk/src/test/net/sf/japi/lang/SuperClassIteratorTest.java 2006-04-16 21:28:58 UTC (rev 84) @@ -25,7 +25,7 @@ import net.sf.japi.lang.SuperClassIterator; /** Test for {@link SuperClassIterator}. - * @author <a href="mailto:ch...@it...">Christian Hujer</a> + * @author <a href="mailto:ch...@ri...">Christian Hujer</a> */ public class SuperClassIteratorTest extends TestCase { Modified: trunk/src/test/net/sf/japi/util/Arrays2Test.java =================================================================== --- trunk/src/test/net/sf/japi/util/Arrays2Test.java 2006-04-16 21:16:40 UTC (rev 83) +++ trunk/src/test/net/sf/japi/util/Arrays2Test.java 2006-04-16 21:28:58 UTC (rev 84) @@ -25,7 +25,7 @@ import net.sf.japi.util.Arrays2; /** Test for {@link Arrays2}. - * @author <a href="mailto:ch...@it...">Christian Hujer</a> + * @author <a href="mailto:ch...@ri...">Christian Hujer</a> */ public class Arrays2Test extends TestCase { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |