japi-cvs Mailing List for JAPI (Page 15)
Status: Beta
Brought to you by:
christianhujer
Menu
▾
▴
japi-cvs — svn commit digest list
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...> - 2009-02-22 16:25:10
|
Revision: 1060
http://japi.svn.sourceforge.net/japi/?rev=1060&view=rev
Author: christianhujer
Date: 2009-02-22 16:25:06 +0000 (Sun, 22 Feb 2009)
Log Message:
-----------
Fixed some IntelliJ IDEA warnings.
Modified Paths:
--------------
libs/argparser/trunk/src/doc/examples/Cat.java
libs/argparser/trunk/src/doc/examples/Head.java
libs/argparser/trunk/src/doc/examples/Recode.java
libs/argparser/trunk/src/doc/examples/Tail.java
libs/argparser/trunk/src/doc/examples/Uniq.java
Modified: libs/argparser/trunk/src/doc/examples/Cat.java
===================================================================
--- libs/argparser/trunk/src/doc/examples/Cat.java 2009-02-22 15:25:18 UTC (rev 1059)
+++ libs/argparser/trunk/src/doc/examples/Cat.java 2009-02-22 16:25:06 UTC (rev 1060)
@@ -36,7 +36,7 @@
private static final int BUF_SIZE = 4096;
/** {@inheritDoc} */
- @SuppressWarnings({ "InstanceMethodNamingConvention" })
+ @SuppressWarnings({"InstanceMethodNamingConvention", "ProhibitedExceptionDeclared"})
public int run(@NotNull final List<String> args) throws Exception {
int returnCode = 0;
if (args.size() == 0) {
@@ -66,6 +66,7 @@
*/
private void copy(@NotNull final InputStream in, @NotNull final OutputStream out) throws IOException {
final byte[] buf = new byte[BUF_SIZE];
+ //noinspection NestedAssignment
for (int bytesRead; (bytesRead = in.read(buf)) != -1;) {
out.write(buf, 0, bytesRead);
}
Modified: libs/argparser/trunk/src/doc/examples/Head.java
===================================================================
--- libs/argparser/trunk/src/doc/examples/Head.java 2009-02-22 15:25:18 UTC (rev 1059)
+++ libs/argparser/trunk/src/doc/examples/Head.java 2009-02-22 16:25:06 UTC (rev 1060)
@@ -145,6 +145,7 @@
@SuppressWarnings({"IOResourceOpenedButNotSafelyClosed"})
final BufferedReader lin = new BufferedReader(new InputStreamReader(in));
String line;
+ //noinspection NestedAssignment
for (int i = 0; i < numItems && (line = lin.readLine()) != null; i++) {
System.out.println(line);
}
Modified: libs/argparser/trunk/src/doc/examples/Recode.java
===================================================================
--- libs/argparser/trunk/src/doc/examples/Recode.java 2009-02-22 15:25:18 UTC (rev 1059)
+++ libs/argparser/trunk/src/doc/examples/Recode.java 2009-02-22 16:25:06 UTC (rev 1060)
@@ -39,7 +39,7 @@
/**
* Recode is a Java program that recodes files from one encoding to another.
- * Warning: This file changes permissions and eventually ownership.
+ * Warning: Unlike its UNIX pendants, this program changes permissions and eventually ownership of the processed files.
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
*/
public class Recode extends BasicCommand {
@@ -74,7 +74,7 @@
}
/** {@inheritDoc} */
- @SuppressWarnings({"InstanceMethodNamingConvention"})
+ @SuppressWarnings({"InstanceMethodNamingConvention", "ProhibitedExceptionDeclared"})
public int run(@NotNull final List<String> args) throws Exception {
int returnCode = 0;
if (args.size() == 0) {
@@ -132,7 +132,7 @@
@SuppressWarnings({"IOResourceOpenedButNotSafelyClosed"})
final Writer cout = new OutputStreamWriter(out, outputEncoding);
final char[] buf = new char[BUF_SIZE];
- //noinspection StatementWithEmptyBody
+ //noinspection NestedAssignment
for (int charsRead; (charsRead = cin.read(buf)) != -1;) {
cout.write(buf, 0, charsRead);
}
Modified: libs/argparser/trunk/src/doc/examples/Tail.java
===================================================================
--- libs/argparser/trunk/src/doc/examples/Tail.java 2009-02-22 15:25:18 UTC (rev 1059)
+++ libs/argparser/trunk/src/doc/examples/Tail.java 2009-02-22 16:25:06 UTC (rev 1060)
@@ -135,6 +135,7 @@
final byte[] buf = new byte[numItems];
int bytesRead;
int loop = 0;
+ //noinspection NestedAssignment
while ((bytesRead = lin.read(buf)) != -1) {
loop++;
}
@@ -153,7 +154,7 @@
@SuppressWarnings({"IOResourceOpenedButNotSafelyClosed"})
final BufferedReader lin = new BufferedReader(new InputStreamReader(in));
int num = 0;
- //noinspection StatementWithEmptyBody
+ //noinspection NestedAssignment,ValueOfIncrementOrDecrementUsed
while ((buf[num++ % numItems] = lin.readLine()) != null) {
// nothing to do, it's all in the condition.
}
Modified: libs/argparser/trunk/src/doc/examples/Uniq.java
===================================================================
--- libs/argparser/trunk/src/doc/examples/Uniq.java 2009-02-22 15:25:18 UTC (rev 1059)
+++ libs/argparser/trunk/src/doc/examples/Uniq.java 2009-02-22 16:25:06 UTC (rev 1060)
@@ -64,7 +64,7 @@
}
/** {@inheritDoc} */
- @SuppressWarnings({"InstanceMethodNamingConvention"})
+ @SuppressWarnings({"InstanceMethodNamingConvention", "ProhibitedExceptionDeclared"})
public int run(@NotNull final List<String> args) throws Exception {
int returnCode = 0;
for (final String arg : args) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2009-02-22 15:25:22
|
Revision: 1059
http://japi.svn.sourceforge.net/japi/?rev=1059&view=rev
Author: christianhujer
Date: 2009-02-22 15:25:18 +0000 (Sun, 22 Feb 2009)
Log Message:
-----------
Made constructor protected so subclasses are possible outside this package.
Modified Paths:
--------------
libs/argparser/trunk/src/prj/net/sf/japi/io/args/converter/AbstractConverter.java
Modified: libs/argparser/trunk/src/prj/net/sf/japi/io/args/converter/AbstractConverter.java
===================================================================
--- libs/argparser/trunk/src/prj/net/sf/japi/io/args/converter/AbstractConverter.java 2009-02-22 15:24:51 UTC (rev 1058)
+++ libs/argparser/trunk/src/prj/net/sf/japi/io/args/converter/AbstractConverter.java 2009-02-22 15:25:18 UTC (rev 1059)
@@ -36,7 +36,7 @@
* Create an AbstractConverter.
* @param targetClass TargetClass
*/
- AbstractConverter(@NotNull final Class<T> targetClass) {
+ protected AbstractConverter(@NotNull final Class<T> targetClass) {
this.targetClass = targetClass;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2009-02-22 15:24:53
|
Revision: 1058
http://japi.svn.sourceforge.net/japi/?rev=1058&view=rev
Author: christianhujer
Date: 2009-02-22 15:24:51 +0000 (Sun, 22 Feb 2009)
Log Message:
-----------
Fixed typo.
Modified Paths:
--------------
libs/argparser/trunk/src/prj/net/sf/japi/io/args/converter/OutputStreamConverter.java
Modified: libs/argparser/trunk/src/prj/net/sf/japi/io/args/converter/OutputStreamConverter.java
===================================================================
--- libs/argparser/trunk/src/prj/net/sf/japi/io/args/converter/OutputStreamConverter.java 2009-02-22 15:22:45 UTC (rev 1057)
+++ libs/argparser/trunk/src/prj/net/sf/japi/io/args/converter/OutputStreamConverter.java 2009-02-22 15:24:51 UTC (rev 1058)
@@ -34,7 +34,7 @@
@Deprecated public class OutputStreamConverter extends AbstractConverter<OutputStream> {
/**
- * Create an InputStreamConverter.
+ * Create an OuputStreamConverter.
*/
public OutputStreamConverter() {
super(OutputStream.class);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2009-02-22 15:22:53
|
Revision: 1057
http://japi.svn.sourceforge.net/japi/?rev=1057&view=rev
Author: christianhujer
Date: 2009-02-22 15:22:45 +0000 (Sun, 22 Feb 2009)
Log Message:
-----------
Added a missing TODO comment.
Modified Paths:
--------------
libs/argparser/trunk/src/prj/net/sf/japi/io/args/CommandWithHelp.java
Modified: libs/argparser/trunk/src/prj/net/sf/japi/io/args/CommandWithHelp.java
===================================================================
--- libs/argparser/trunk/src/prj/net/sf/japi/io/args/CommandWithHelp.java 2009-02-22 11:30:54 UTC (rev 1056)
+++ libs/argparser/trunk/src/prj/net/sf/japi/io/args/CommandWithHelp.java 2009-02-22 15:22:45 UTC (rev 1057)
@@ -174,6 +174,7 @@
/** Print version information. */
@Option(type = OptionType.TERMINAL, value = {"version"})
public void version() {
+ // TODO:2009-02-22:christianhujer:Implement this.
System.err.println("Not yet implemented.");
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2009-02-22 12:01:13
|
Revision: 1056
http://japi.svn.sourceforge.net/japi/?rev=1056&view=rev
Author: christianhujer
Date: 2009-02-22 11:30:54 +0000 (Sun, 22 Feb 2009)
Log Message:
-----------
Make keystrokes use japi-lib-argparser.
Modified Paths:
--------------
tools/keystrokes/trunk/build.xml
tools/keystrokes/trunk/keystrokes.iml
tools/keystrokes/trunk/src/prj/net/sf/japi/tools/keystrokes/KeyStrokes.java
Modified: tools/keystrokes/trunk/build.xml
===================================================================
--- tools/keystrokes/trunk/build.xml 2009-02-22 11:28:57 UTC (rev 1055)
+++ tools/keystrokes/trunk/build.xml 2009-02-22 11:30:54 UTC (rev 1056)
@@ -23,6 +23,7 @@
&commonBuild;
<target name="getlibs">
+ <get src="http://downloads.sourceforge.net/japi/japi-lib-argparser-0.3.0.jar" dest="lib/japi-lib-argparser.jar" />
<get src="http://downloads.sourceforge.net/japi/japi-lib-swing-action-0.1.0.jar" dest="lib/japi-lib-swing-action.jar" />
</target>
Modified: tools/keystrokes/trunk/keystrokes.iml
===================================================================
--- tools/keystrokes/trunk/keystrokes.iml 2009-02-22 11:28:57 UTC (rev 1055)
+++ tools/keystrokes/trunk/keystrokes.iml 2009-02-22 11:30:54 UTC (rev 1056)
@@ -28,6 +28,7 @@
</library>
</orderEntry>
<orderEntry type="module" module-name="libs-swing-action" />
+ <orderEntry type="module" module-name="libs-argparser" />
</component>
<component name="copyright">
<Base>
Modified: tools/keystrokes/trunk/src/prj/net/sf/japi/tools/keystrokes/KeyStrokes.java
===================================================================
--- tools/keystrokes/trunk/src/prj/net/sf/japi/tools/keystrokes/KeyStrokes.java 2009-02-22 11:28:57 UTC (rev 1055)
+++ tools/keystrokes/trunk/src/prj/net/sf/japi/tools/keystrokes/KeyStrokes.java 2009-02-22 11:30:54 UTC (rev 1056)
@@ -30,6 +30,7 @@
import static java.text.DateFormat.getTimeInstance;
import static java.util.Arrays.asList;
import java.util.Date;
+import java.util.List;
import javax.swing.JButton;
import javax.swing.JFrame;
import javax.swing.JPanel;
@@ -39,6 +40,8 @@
import javax.swing.KeyStroke;
import static javax.swing.WindowConstants.DISPOSE_ON_CLOSE;
import javax.swing.text.JTextComponent;
+import net.sf.japi.io.args.ArgParser;
+import net.sf.japi.io.args.BasicCommand;
import net.sf.japi.swing.action.ActionBuilder;
import net.sf.japi.swing.action.ActionBuilderFactory;
import net.sf.japi.swing.action.ActionMethod;
@@ -48,7 +51,7 @@
/** A small tool that displays the keystrokes while typing.
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
*/
-public class KeyStrokes implements InputMethodListener, KeyListener {
+public class KeyStrokes extends BasicCommand implements InputMethodListener, KeyListener {
/** Action Builder. */
private static final ActionBuilder ACTION_BUILDER = ActionBuilderFactory.getInstance().getActionBuilder("net.sf.japi.tools.keystrokes");
@@ -76,24 +79,9 @@
* @param args command line arguments
*/
public static void main(@NotNull final String... args) {
- //noinspection ResultOfObjectAllocationIgnored
- new KeyStrokes();
+ ArgParser.simpleParseAndRun(new KeyStrokes(), args);
}
- /** Create a KeyStrokes tool. */
- public KeyStrokes() {
- final JFrame frame = new JFrame(ACTION_BUILDER.getString("frame.title"));
- //noinspection ThisEscapedInObjectConstruction
- frame.addKeyListener(this);
- //noinspection ThisEscapedInObjectConstruction
- frame.addInputMethodListener(this);
- frame.enableInputMethods(true);
- frame.add(createContentPane());
- frame.pack();
- frame.setVisible(true);
- frame.setDefaultCloseOperation(DISPOSE_ON_CLOSE);
- }
-
/** Creates the content pane.
* @return The newly created content pane.
*/
@@ -187,4 +175,19 @@
System.err.println(event);
}
+ /** {@inheritDoc} */
+ public int run(@NotNull final List<String> args) throws Exception {
+ final JFrame frame = new JFrame(ACTION_BUILDER.getString("frame.title"));
+ //noinspection ThisEscapedInObjectConstruction
+ frame.addKeyListener(this);
+ //noinspection ThisEscapedInObjectConstruction
+ frame.addInputMethodListener(this);
+ frame.enableInputMethods(true);
+ frame.add(createContentPane());
+ frame.pack();
+ frame.setDefaultCloseOperation(DISPOSE_ON_CLOSE);
+ frame.setVisible(true);
+ return 0;
+ }
+
} // class KeyStrokes
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2009-02-22 11:29:04
|
Revision: 1055
http://japi.svn.sourceforge.net/japi/?rev=1055&view=rev
Author: christianhujer
Date: 2009-02-22 11:28:57 +0000 (Sun, 22 Feb 2009)
Log Message:
-----------
Fixed wrong package / main class.
Modified Paths:
--------------
tools/keystrokes/trunk/module.properties
Modified: tools/keystrokes/trunk/module.properties
===================================================================
--- tools/keystrokes/trunk/module.properties 2009-02-22 10:46:59 UTC (rev 1054)
+++ tools/keystrokes/trunk/module.properties 2009-02-22 11:28:57 UTC (rev 1055)
@@ -19,6 +19,6 @@
name=KeyStrokes
shortname=KeyStrokes
title=KeyStrokes
-package=net.sf.japi.keystrokes
-package.path=net/sf/japi/keystrokes
-main.class=net.sf.japi.keystrokes.KeyStrokes
+package=net.sf.japi.tools.keystrokes
+package.path=net/sf/japi/tools/keystrokes
+main.class=net.sf.japi.tools.keystrokes.KeyStrokes
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2009-02-22 10:47:12
|
Revision: 1054
http://japi.svn.sourceforge.net/japi/?rev=1054&view=rev
Author: christianhujer
Date: 2009-02-22 10:46:59 +0000 (Sun, 22 Feb 2009)
Log Message:
-----------
Enabled javadoc inspection.
Modified Paths:
--------------
japi.ipr
Modified: japi.ipr
===================================================================
--- japi.ipr 2009-02-22 10:17:57 UTC (rev 1053)
+++ japi.ipr 2009-02-22 10:46:59 UTC (rev 1054)
@@ -828,7 +828,7 @@
<profile version="1.0" is_locked="false">
<option name="myName" value="Project Default" />
<option name="myLocal" value="false" />
- <inspection_tool class="JavaDoc" level="WARNING" enabled="true">
+ <inspection_tool class="JavaDoc" level="ERROR" enabled="true">
<option name="TOP_LEVEL_CLASS_OPTIONS">
<value>
<option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
@@ -1396,6 +1396,7 @@
<option name="m_ignoreOverridesOfLibraryMethods" value="false" />
</inspection_tool>
<inspection_tool class="NestedAssignment" level="WARNING" enabled="true" />
+ <inspection_tool class="SSBasedInspection" level="ERROR" enabled="false" />
</profile>
</profiles>
<list size="4">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2009-02-22 10:18:03
|
Revision: 1053
http://japi.svn.sourceforge.net/japi/?rev=1053&view=rev
Author: christianhujer
Date: 2009-02-22 10:17:57 +0000 (Sun, 22 Feb 2009)
Log Message:
-----------
Fixed checkstyle issues.
Modified Paths:
--------------
tools/gdbControl/trunk/src/prj/net/sf/japi/tools/gdbcontrol/ComWithGdb.java
Modified: tools/gdbControl/trunk/src/prj/net/sf/japi/tools/gdbcontrol/ComWithGdb.java
===================================================================
--- tools/gdbControl/trunk/src/prj/net/sf/japi/tools/gdbcontrol/ComWithGdb.java 2009-02-22 10:14:43 UTC (rev 1052)
+++ tools/gdbControl/trunk/src/prj/net/sf/japi/tools/gdbcontrol/ComWithGdb.java 2009-02-22 10:17:57 UTC (rev 1053)
@@ -171,26 +171,60 @@
/** ANSI color escape sequences. */
@SuppressWarnings({"MagicNumber", "ClassNamingConvention"})
private static final class ANSI {
+
+ /** Ansi control sequence for switching to dark black. */
static final byte[] D_BLACK = { 0x1B, 0x5B, 0x30, 0x30, 0x3B, 0x33, 0x30, 0x6D };
+
+ /** Ansi control sequence for switching to dark red. */
static final byte[] D_RED = { 0x1B, 0x5B, 0x30, 0x30, 0x3B, 0x33, 0x31, 0x6D };
+
+ /** Ansi control sequence for switching to dark green. */
static final byte[] D_GREEN = { 0x1B, 0x5B, 0x30, 0x30, 0x3B, 0x33, 0x32, 0x6D };
+
+ /** Ansi control sequence for switching to dark yellow. */
static final byte[] D_YELLOW = { 0x1B, 0x5B, 0x30, 0x30, 0x3B, 0x33, 0x33, 0x6D };
+
+ /** Ansi control sequence for switching to dark blue. */
static final byte[] D_BLUE = { 0x1B, 0x5B, 0x30, 0x30, 0x3B, 0x33, 0x34, 0x6D };
+
+ /** Ansi control sequence for switching to dark magenta. */
static final byte[] D_MAGENTA = { 0x1B, 0x5B, 0x30, 0x30, 0x3B, 0x33, 0x35, 0x6D };
+
+ /** Ansi control sequence for switching to dark cyan. */
static final byte[] D_CYAN = { 0x1B, 0x5B, 0x30, 0x30, 0x3B, 0x33, 0x36, 0x6D };
+
+ /** Ansi control sequence for switching to dark white. */
static final byte[] D_WHITE = { 0x1B, 0x5B, 0x30, 0x30, 0x3B, 0x33, 0x37, 0x6D };
+
+ /** Ansi control sequence for switching to light black. */
static final byte[] L_BLACK = { 0x1B, 0x5B, 0x30, 0x31, 0x3B, 0x33, 0x30, 0x6D };
+
+ /** Ansi control sequence for switching to light red. */
static final byte[] L_RED = { 0x1B, 0x5B, 0x30, 0x31, 0x3B, 0x33, 0x31, 0x6D };
+
+ /** Ansi control sequence for switching to light green. */
static final byte[] L_GREEN = { 0x1B, 0x5B, 0x30, 0x31, 0x3B, 0x33, 0x32, 0x6D };
+
+ /** Ansi control sequence for switching to light yellow. */
static final byte[] L_YELLOW = { 0x1B, 0x5B, 0x30, 0x31, 0x3B, 0x33, 0x33, 0x6D };
+
+ /** Ansi control sequence for switching to light blue. */
static final byte[] L_BLUE = { 0x1B, 0x5B, 0x30, 0x31, 0x3B, 0x33, 0x34, 0x6D };
+
+ /** Ansi control sequence for switching to light magenta. */
static final byte[] L_MAGENTA = { 0x1B, 0x5B, 0x30, 0x31, 0x3B, 0x33, 0x35, 0x6D };
+
+ /** Ansi control sequence for switching to light cyan. */
static final byte[] L_CYAN = { 0x1B, 0x5B, 0x30, 0x31, 0x3B, 0x33, 0x36, 0x6D };
+
+ /** Ansi control sequence for switching to light white. */
static final byte[] L_WHITE = { 0x1B, 0x5B, 0x30, 0x31, 0x3B, 0x33, 0x37, 0x6D };
+ /** Ansi control sequence for switching to normal. */
static final byte[] NORMAL = { 0x1B, 0x5B, 0x30, 0x30, 0x6D };
+ /** Utility class - do not instanciate. */
private ANSI() {
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2009-02-22 10:14:46
|
Revision: 1052
http://japi.svn.sourceforge.net/japi/?rev=1052&view=rev
Author: christianhujer
Date: 2009-02-22 10:14:43 +0000 (Sun, 22 Feb 2009)
Log Message:
-----------
Made unit tests run in ant.
Modified Paths:
--------------
progs/pffhtrain/trunk/src/tst/test/net/sf/japi/pffhtrain/PffhTrainTest.java
Modified: progs/pffhtrain/trunk/src/tst/test/net/sf/japi/pffhtrain/PffhTrainTest.java
===================================================================
--- progs/pffhtrain/trunk/src/tst/test/net/sf/japi/pffhtrain/PffhTrainTest.java 2009-02-22 10:14:36 UTC (rev 1051)
+++ progs/pffhtrain/trunk/src/tst/test/net/sf/japi/pffhtrain/PffhTrainTest.java 2009-02-22 10:14:43 UTC (rev 1052)
@@ -18,10 +18,15 @@
package test.net.sf.japi.pffhtrain;
import net.sf.japi.pffhtrain.PffhTrain;
+import org.junit.Test;
/** Test for {@link PffhTrain}.
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
*/
public class PffhTrainTest {
+ /** Dummy test case. */
+ @Test
+ public void testDummy() {
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2009-02-22 10:14:39
|
Revision: 1051
http://japi.svn.sourceforge.net/japi/?rev=1051&view=rev
Author: christianhujer
Date: 2009-02-22 10:14:36 +0000 (Sun, 22 Feb 2009)
Log Message:
-----------
Made unit tests run in ant.
Modified Paths:
--------------
tools/dircount/trunk/src/tst/test/net/sf/japi/dircount/DirCountTest.java
Modified: tools/dircount/trunk/src/tst/test/net/sf/japi/dircount/DirCountTest.java
===================================================================
--- tools/dircount/trunk/src/tst/test/net/sf/japi/dircount/DirCountTest.java 2009-02-22 10:13:11 UTC (rev 1050)
+++ tools/dircount/trunk/src/tst/test/net/sf/japi/dircount/DirCountTest.java 2009-02-22 10:14:36 UTC (rev 1051)
@@ -18,6 +18,7 @@
package test.net.sf.japi.dircount;
import net.sf.japi.dircount.DirCount;
+import org.junit.Test;
/**
* Unit Test for {@link DirCount}.
@@ -25,4 +26,8 @@
*/
public class DirCountTest {
+ /** Dummy test case. */
+ @Test
+ public void testDummy() {
+ }
} // class DirCountTest
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2009-02-22 10:13:20
|
Revision: 1050
http://japi.svn.sourceforge.net/japi/?rev=1050&view=rev
Author: christianhujer
Date: 2009-02-22 10:13:11 +0000 (Sun, 22 Feb 2009)
Log Message:
-----------
Fetch required libraries.
Modified Paths:
--------------
progs/textedit/trunk/build.xml
Modified: progs/textedit/trunk/build.xml
===================================================================
--- progs/textedit/trunk/build.xml 2009-02-22 10:08:54 UTC (rev 1049)
+++ progs/textedit/trunk/build.xml 2009-02-22 10:13:11 UTC (rev 1050)
@@ -22,4 +22,10 @@
&commonBuild;
+ <target name="getlibs">
+ <get src="http://downloads.sourceforge.net/japi/japi-lib-argparser-0.3.0.jar" dest="lib/japi-lib-argparser.jar" />
+ <get src="http://downloads.sourceforge.net/japi/japi-lib-swing-action-0.1.0.jar" dest="lib/japi-lib-swing-action.jar" />
+ <get src="http://downloads.sourceforge.net/japi/japi-lib-swing-app-0.1.0.jar" dest="lib/japi-lib-swing-app.jar" />
+ </target>
+
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2009-02-22 10:08:57
|
Revision: 1049
http://japi.svn.sourceforge.net/japi/?rev=1049&view=rev
Author: christianhujer
Date: 2009-02-22 10:08:54 +0000 (Sun, 22 Feb 2009)
Log Message:
-----------
Fixed checkstyle issues.
Modified Paths:
--------------
progs/pffhtrain/trunk/src/prj/net/sf/japi/pffhtrain/PffhTrain.java
Modified: progs/pffhtrain/trunk/src/prj/net/sf/japi/pffhtrain/PffhTrain.java
===================================================================
--- progs/pffhtrain/trunk/src/prj/net/sf/japi/pffhtrain/PffhTrain.java 2009-02-22 10:08:43 UTC (rev 1048)
+++ progs/pffhtrain/trunk/src/prj/net/sf/japi/pffhtrain/PffhTrain.java 2009-02-22 10:08:54 UTC (rev 1049)
@@ -31,15 +31,17 @@
*/
public class PffhTrain extends BasicCommand {
- private static final ActionBuilder actionBuilder = ActionBuilderFactory.getInstance().getActionBuilder(PffhTrain.class);
+ /** ActionBuilder. */
+ private static final ActionBuilder ACTION_BUILDER = ActionBuilderFactory.getInstance().getActionBuilder(PffhTrain.class);
+ /** Program frame. */
private final JFrame frame;
/** Creates an instance of PffhTrain. */
public PffhTrain() {
frame = new JFrame("PffhTrain");
frame.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
- frame.setJMenuBar(actionBuilder.createMenuBar(true, "main", this));
+ frame.setJMenuBar(ACTION_BUILDER.createMenuBar(true, "main", this));
}
/** Main program.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2009-02-22 10:08:50
|
Revision: 1048
http://japi.svn.sourceforge.net/japi/?rev=1048&view=rev
Author: christianhujer
Date: 2009-02-22 10:08:43 +0000 (Sun, 22 Feb 2009)
Log Message:
-----------
Fetch required libraries.
Modified Paths:
--------------
progs/pffhtrain/trunk/build.xml
Modified: progs/pffhtrain/trunk/build.xml
===================================================================
--- progs/pffhtrain/trunk/build.xml 2009-02-22 10:06:35 UTC (rev 1047)
+++ progs/pffhtrain/trunk/build.xml 2009-02-22 10:08:43 UTC (rev 1048)
@@ -22,4 +22,9 @@
&commonBuild;
+ <target name="getlibs">
+ <get src="http://downloads.sourceforge.net/japi/japi-lib-argparser-0.3.0.jar" dest="lib/japi-lib-argparser.jar" />
+ <get src="http://downloads.sourceforge.net/japi/japi-lib-swing-action-0.1.0.jar" dest="lib/japi-lib-swing-action.jar" />
+ </target>
+
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2009-02-22 10:06:38
|
Revision: 1047
http://japi.svn.sourceforge.net/japi/?rev=1047&view=rev
Author: christianhujer
Date: 2009-02-22 10:06:35 +0000 (Sun, 22 Feb 2009)
Log Message:
-----------
Fixed checkstyle issues.
Modified Paths:
--------------
progs/jirus/trunk/src/prj/net/sf/jirus/Jirus.java
progs/jirus/trunk/src/prj/net/sf/jirus/MyReceiver.java
Modified: progs/jirus/trunk/src/prj/net/sf/jirus/Jirus.java
===================================================================
--- progs/jirus/trunk/src/prj/net/sf/jirus/Jirus.java 2009-02-22 10:06:20 UTC (rev 1046)
+++ progs/jirus/trunk/src/prj/net/sf/jirus/Jirus.java 2009-02-22 10:06:35 UTC (rev 1047)
@@ -39,9 +39,13 @@
// - Allow setups and have them changed dynamically during runtime.
public class Jirus extends BasicCommand {
+ /** Secondary channel for the split. */
public static final int SPLIT_CHANNEL = 0x02;
+
+ /** Split key note. */
public static final int SPLIT_KEY = 0x30;
+ /** Range of midi notes. */
public static final int MIDI_NOTE_RANGE = 128;
/** Main Program.
Modified: progs/jirus/trunk/src/prj/net/sf/jirus/MyReceiver.java
===================================================================
--- progs/jirus/trunk/src/prj/net/sf/jirus/MyReceiver.java 2009-02-22 10:06:20 UTC (rev 1046)
+++ progs/jirus/trunk/src/prj/net/sf/jirus/MyReceiver.java 2009-02-22 10:06:35 UTC (rev 1047)
@@ -28,18 +28,26 @@
*/
public class MyReceiver implements Receiver {
+ /** Note states (on / off). */
private final boolean[] noteState = new boolean[Jirus.MIDI_NOTE_RANGE];
+ /** Currently palying note. */
private int playingNote = 0xFF;
+ /** Receiver to which the data will be forwarded. */
private final Receiver receiver;
+ /** Creates MyReceiver.
+ * @param receiver Receiver to which the data shall be forwarded.
+ */
public MyReceiver(final Receiver receiver) {
this.receiver = receiver;
}
- public void close() {}
+ /** {@inheritDoc} */
+ public void close() { }
+ /** {@inheritDoc} */
public void send(final MidiMessage message, final long timeStamp) {
try {
final byte[] messageData = message.getMessage();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2009-02-22 10:06:22
|
Revision: 1046
http://japi.svn.sourceforge.net/japi/?rev=1046&view=rev
Author: christianhujer
Date: 2009-02-22 10:06:20 +0000 (Sun, 22 Feb 2009)
Log Message:
-----------
Fetch required libraries.
Modified Paths:
--------------
progs/jirus/trunk/build.xml
Modified: progs/jirus/trunk/build.xml
===================================================================
--- progs/jirus/trunk/build.xml 2009-02-22 10:06:18 UTC (rev 1045)
+++ progs/jirus/trunk/build.xml 2009-02-22 10:06:20 UTC (rev 1046)
@@ -22,4 +22,9 @@
&commonBuild;
+ <target name="getlibs">
+ <get src="http://downloads.sourceforge.net/japi/japi-lib-argparser-0.3.0.jar" dest="lib/japi-lib-argparser.jar" />
+ <get src="http://downloads.sourceforge.net/japi/japi-lib-midi-0.1.0.jar" dest="lib/japi-lib-midi.jar" />
+ </target>
+
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2009-02-22 10:06:21
|
Revision: 1045
http://japi.svn.sourceforge.net/japi/?rev=1045&view=rev
Author: christianhujer
Date: 2009-02-22 10:06:18 +0000 (Sun, 22 Feb 2009)
Log Message:
-----------
Fixed checkstyle issues.
Modified Paths:
--------------
progs/jtype/trunk/src/prj/net/sf/japi/jtype/Helper.java
progs/jtype/trunk/src/prj/net/sf/japi/jtype/PerformancePane.java
progs/jtype/trunk/src/prj/net/sf/japi/jtype/ReflectionField.java
Modified: progs/jtype/trunk/src/prj/net/sf/japi/jtype/Helper.java
===================================================================
--- progs/jtype/trunk/src/prj/net/sf/japi/jtype/Helper.java 2009-02-22 10:05:57 UTC (rev 1044)
+++ progs/jtype/trunk/src/prj/net/sf/japi/jtype/Helper.java 2009-02-22 10:06:18 UTC (rev 1045)
@@ -36,7 +36,7 @@
// - RE1 (alte und neue Buchstaben) passt
// - RE1 (alte und neue Buchstaben) passt, RE2 (nur alte Buchstaben) passt nicht
// - Buchstabenkombinationen
-public class Helper {
+public final class Helper {
/** Utility class - do not instanciate. */
private Helper() {
@@ -99,7 +99,7 @@
final List<String> lines = new ArrayList<String>();
@SuppressWarnings({"IOResourceOpenedButNotSafelyClosed"})
final BufferedReader in = new BufferedReader(new InputStreamReader(process.getInputStream()));
- for (String line; (line = in.readLine()) != null; ) {
+ for (String line; (line = in.readLine()) != null;) {
lines.add(line);
}
return lines;
@@ -119,13 +119,13 @@
}
/** Random number generator. */
- private static final Random random = new Random();
+ private static final Random RANDOM = new Random();
/** Returns a random String from a List of Strings.
* @param strings List from which a random String shall be returned.
* @return A random String from that List.
*/
public static String random(@NotNull final List<String> strings) {
- return strings.get(random.nextInt(strings.size()));
+ return strings.get(RANDOM.nextInt(strings.size()));
}
}
Modified: progs/jtype/trunk/src/prj/net/sf/japi/jtype/PerformancePane.java
===================================================================
--- progs/jtype/trunk/src/prj/net/sf/japi/jtype/PerformancePane.java 2009-02-22 10:05:57 UTC (rev 1044)
+++ progs/jtype/trunk/src/prj/net/sf/japi/jtype/PerformancePane.java 2009-02-22 10:06:18 UTC (rev 1045)
@@ -57,6 +57,7 @@
/** The sum of time all keystrokes took alltogether so far. */
private long timeSums;
+ /** Reflection fields. */
private final Collection<ReflectionField> reflectionFields = new ArrayList<ReflectionField>();
/** Creates a PerformancePane. */
Modified: progs/jtype/trunk/src/prj/net/sf/japi/jtype/ReflectionField.java
===================================================================
--- progs/jtype/trunk/src/prj/net/sf/japi/jtype/ReflectionField.java 2009-02-22 10:05:57 UTC (rev 1044)
+++ progs/jtype/trunk/src/prj/net/sf/japi/jtype/ReflectionField.java 2009-02-22 10:06:18 UTC (rev 1045)
@@ -23,7 +23,8 @@
import java.lang.reflect.InvocationTargetException;
import java.awt.GridBagLayout;
import java.util.Locale;
-import org.jetbrains.annotations.NotNull;import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/** A component that displays a property value along with a label.
* It uses reflection to get the object's value.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2009-02-22 10:06:09
|
Revision: 1044
http://japi.svn.sourceforge.net/japi/?rev=1044&view=rev
Author: christianhujer
Date: 2009-02-22 10:05:57 +0000 (Sun, 22 Feb 2009)
Log Message:
-----------
Fetch required libraries.
Modified Paths:
--------------
progs/jtype/trunk/build.xml
Modified: progs/jtype/trunk/build.xml
===================================================================
--- progs/jtype/trunk/build.xml 2009-02-22 10:01:32 UTC (rev 1043)
+++ progs/jtype/trunk/build.xml 2009-02-22 10:05:57 UTC (rev 1044)
@@ -22,4 +22,8 @@
&commonBuild;
+ <target name="getlibs">
+ <get src="http://downloads.sourceforge.net/japi/japi-lib-swing-action-0.1.0.jar" dest="lib/japi-lib-swing-action.jar" />
+ </target>
+
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2009-02-22 10:01:40
|
Revision: 1043
http://japi.svn.sourceforge.net/japi/?rev=1043&view=rev
Author: christianhujer
Date: 2009-02-22 10:01:32 +0000 (Sun, 22 Feb 2009)
Log Message:
-----------
Fixed checkstyle issue.
Modified Paths:
--------------
progs/midilearn/trunk/src/prj/net/sf/japi/midilearn/MidiLearn.java
Modified: progs/midilearn/trunk/src/prj/net/sf/japi/midilearn/MidiLearn.java
===================================================================
--- progs/midilearn/trunk/src/prj/net/sf/japi/midilearn/MidiLearn.java 2009-02-22 09:58:39 UTC (rev 1042)
+++ progs/midilearn/trunk/src/prj/net/sf/japi/midilearn/MidiLearn.java 2009-02-22 10:01:32 UTC (rev 1043)
@@ -50,7 +50,7 @@
/** {@inheritDoc} */
public void windowClosing(final WindowEvent e) {
- // TODO
+ // TODO:2009-02-22:christianhujer:Implement.
}
/** {@inheritDoc} */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2009-02-22 09:58:46
|
Revision: 1042
http://japi.svn.sourceforge.net/japi/?rev=1042&view=rev
Author: christianhujer
Date: 2009-02-22 09:58:39 +0000 (Sun, 22 Feb 2009)
Log Message:
-----------
Fixed checkstyle issues.
Modified Paths:
--------------
progs/jhexview/trunk/src/prj/net/sf/japi/progs/jhexview/JHexViewApplication.java
Modified: progs/jhexview/trunk/src/prj/net/sf/japi/progs/jhexview/JHexViewApplication.java
===================================================================
--- progs/jhexview/trunk/src/prj/net/sf/japi/progs/jhexview/JHexViewApplication.java 2009-02-22 09:58:35 UTC (rev 1041)
+++ progs/jhexview/trunk/src/prj/net/sf/japi/progs/jhexview/JHexViewApplication.java 2009-02-22 09:58:39 UTC (rev 1042)
@@ -43,12 +43,12 @@
/** {@inheritDoc} */
@Override
public void save(@NotNull final Document<byte[]> doc, @NotNull final String uri) {
- //To change body of implemented methods use File | Settings | File Templates.
- // TODO
+ // TODO:2009-02-22:christianhujer:Implement.
}
public Document<byte[]> createNew() {
- return null;//To change body of implemented methods use File | Settings | File Templates.
+ // TODO:2009-02-22:christianhujer:Implement.
+ return null;
}
/** {@inheritDoc} */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2009-02-22 09:58:42
|
Revision: 1041
http://japi.svn.sourceforge.net/japi/?rev=1041&view=rev
Author: christianhujer
Date: 2009-02-22 09:58:35 +0000 (Sun, 22 Feb 2009)
Log Message:
-----------
Fix checkstyle issues.
Modified Paths:
--------------
progs/jhexedit/trunk/src/prj/net/sf/japi/progs/jhexedit/JHexEditApplication.java
Modified: progs/jhexedit/trunk/src/prj/net/sf/japi/progs/jhexedit/JHexEditApplication.java
===================================================================
--- progs/jhexedit/trunk/src/prj/net/sf/japi/progs/jhexedit/JHexEditApplication.java 2009-02-22 09:58:29 UTC (rev 1040)
+++ progs/jhexedit/trunk/src/prj/net/sf/japi/progs/jhexedit/JHexEditApplication.java 2009-02-22 09:58:35 UTC (rev 1041)
@@ -44,11 +44,12 @@
@Override
public void save(@NotNull final Document<byte[]> doc, @NotNull final String uri) {
//To change body of implemented methods use File | Settings | File Templates.
- // TODO
+ // TODO:2009-02-22:christianhujer:Implement.
}
public Document<byte[]> createNew() {
- return null;//To change body of implemented methods use File | Settings | File Templates.
+ // TODO:2009-02-22:christianhujer:Implement.
+ return null;
}
/** {@inheritDoc} */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2009-02-22 09:58:35
|
Revision: 1040
http://japi.svn.sourceforge.net/japi/?rev=1040&view=rev
Author: christianhujer
Date: 2009-02-22 09:58:29 +0000 (Sun, 22 Feb 2009)
Log Message:
-----------
Fetch required libraries.
Modified Paths:
--------------
progs/jhexview/trunk/build.xml
Modified: progs/jhexview/trunk/build.xml
===================================================================
--- progs/jhexview/trunk/build.xml 2009-02-22 09:58:17 UTC (rev 1039)
+++ progs/jhexview/trunk/build.xml 2009-02-22 09:58:29 UTC (rev 1040)
@@ -22,4 +22,9 @@
&commonBuild;
+ <target name="getlibs">
+ <get src="http://downloads.sourceforge.net/japi/japi-lib-argparser-0.3.0.jar" dest="lib/japi-lib-argparser.jar" />
+ <get src="http://downloads.sourceforge.net/japi/japi-lib-swing-app-0.1.0.jar" dest="lib/japi-lib-swing-app.jar" />
+ </target>
+
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2009-02-22 09:58:20
|
Revision: 1039
http://japi.svn.sourceforge.net/japi/?rev=1039&view=rev
Author: christianhujer
Date: 2009-02-22 09:58:17 +0000 (Sun, 22 Feb 2009)
Log Message:
-----------
Fetch required libbbraries.
Modified Paths:
--------------
progs/jhexedit/trunk/build.xml
Modified: progs/jhexedit/trunk/build.xml
===================================================================
--- progs/jhexedit/trunk/build.xml 2009-02-22 09:52:10 UTC (rev 1038)
+++ progs/jhexedit/trunk/build.xml 2009-02-22 09:58:17 UTC (rev 1039)
@@ -22,4 +22,9 @@
&commonBuild;
+ <target name="getlibs">
+ <get src="http://downloads.sourceforge.net/japi/japi-lib-argparser-0.3.0.jar" dest="lib/japi-lib-argparser.jar" />
+ <get src="http://downloads.sourceforge.net/japi/japi-lib-swing-app-0.1.0.jar" dest="lib/japi-lib-swing-app.jar" />
+ </target>
+
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2009-02-22 09:52:17
|
Revision: 1038
http://japi.svn.sourceforge.net/japi/?rev=1038&view=rev
Author: christianhujer
Date: 2009-02-22 09:52:10 +0000 (Sun, 22 Feb 2009)
Log Message:
-----------
Fetch missing library for icons.
Modified Paths:
--------------
progs/jeduca/trunk/build.xml
Modified: progs/jeduca/trunk/build.xml
===================================================================
--- progs/jeduca/trunk/build.xml 2009-02-22 09:45:37 UTC (rev 1037)
+++ progs/jeduca/trunk/build.xml 2009-02-22 09:52:10 UTC (rev 1038)
@@ -31,6 +31,7 @@
<get src="http://downloads.sourceforge.net/japi/japi-lib-swing-prefs-0.1.0.jar" dest="lib/japi-lib-swing-prefs.jar" />
<get src="http://downloads.sourceforge.net/japi/japi-lib-swing-recent-0.1.0.jar" dest="lib/japi-lib-swing-recent.jar" />
<get src="http://downloads.sourceforge.net/japi/japi-lib-xml-0.1.0.jar" dest="lib/japi-lib-xml.jar" />
+ <get src="http://japi.svn.sourceforge.net/svnroot/japi/common/trunk/lib/jlfgr-1_0.jar" dest="lib/jlfgr-1_0.jar" />
</target>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2009-02-22 09:45:46
|
Revision: 1037
http://japi.svn.sourceforge.net/japi/?rev=1037&view=rev
Author: christianhujer
Date: 2009-02-22 09:45:37 +0000 (Sun, 22 Feb 2009)
Log Message:
-----------
Fixed checkstyle issues.
Modified Paths:
--------------
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/QuestionCollectionGUI.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/action.properties
Added Paths:
-----------
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/texts.properties
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/texts_de.properties
Removed Paths:
-------------
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/action_de.properties
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/QuestionCollectionGUI.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/QuestionCollectionGUI.java 2009-02-22 09:14:16 UTC (rev 1036)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/QuestionCollectionGUI.java 2009-02-22 09:45:37 UTC (rev 1037)
@@ -21,7 +21,6 @@
import static java.awt.BorderLayout.CENTER;
import java.awt.CardLayout;
import static java.awt.event.KeyEvent.VK_N;
-import java.util.ResourceBundle;
import javax.swing.Action;
import javax.swing.JComponent;
import javax.swing.JMenu;
@@ -42,10 +41,6 @@
/** Serial Version. */
private static final long serialVersionUID = 1L;
- /** The Resource bundle. */
- // TODO:2009-02-22:christianhujer:Get rid of resource bundle.
- private static final ResourceBundle RES = ResourceBundle.getBundle("net.sf.japi.progs.jeduca.jtest.gui.action");
-
/** Constant for showing the collection info. */
private static final String COLLECTION_INFO = "CollectionInfo";
@@ -312,8 +307,8 @@
* @return Navigation Menu
*/
public JMenu createNavigationMenu() {
- final JMenu menu = new JMenu(RES.getString("nav.text"));
- menu.setName(RES.getString("nav.text"));
+ final JMenu menu = new JMenu(ACTION_BUILDER.getString("nav.text"));
+ menu.setName(ACTION_BUILDER.getString("nav.text"));
for (final Action action : navigationActions) {
menu.add(new JMenuItem(action));
}
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/action.properties
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/action.properties 2009-02-22 09:14:16 UTC (rev 1036)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/action.properties 2009-02-22 09:45:37 UTC (rev 1037)
@@ -15,125 +15,53 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
+ActionBuilder.additionalBundles=net.sf.japi.progs.jeduca.jtest.gui.texts
+
###########
# Document
-doc.text=Document
-doc.mnemonic=D
-
-open.text=open...
-open.shortdescription=Open a new test
-open.longdescription=Loads a new test from a file
-open.mnemonic=O
open.accel=ctrl pressed O
open.icon=general/Open16
-open.error.text=Error while loading
-save.text=save...
-save.shortdescription=Save test
-save.longdescription=Saves the test in a new file
-save.mnemonic=S
save.accel=ctrl pressed S
save.icon=general/Save16
-save.error.text=Error while saving
-print.text=Print...
-print.shortdescription=Print current view
-print.longdescription=Prints the current view
-print.mnemonic=P
print.accel=ctrl pressed P
print.icon=general/Print16
-quit.text=quit
-quit.shortdescription=Quit program
-quit.longdescription=Quits the program
-quit.mnemonic=Q
quit.accel=ctrl pressed Q
quit.icon=kde/exit16
-quit.question=Really quit?
#######
# View
-view.text=View
-view.mnemonic=V
-
-viewShowAll.text=Show all
-viewHideAll.text=Hide all
-
-toolbars.text=Toolbars
-toolbars.mnemonic=T
-
-configureToolbars.text=Change toolbars...
-configureToolbars.mnemonic=C
-
-menuToolBar.name=Menubar
menuToolBar.accel=ctrl pressed M
programToolBar.toolbar=open save print
-programToolBar.name=Program toolbar
navigationToolBar.toolbar=start first prev next last review end
-navigationToolBar.name=Navigation toolbar
-menus.text=Menus
-configureMenus.text=Change menus...
-internalFrames.text=Windows
-configureInternalFrames.text=Change windows...
-
-
#############
# Navigation
-nav.text=Navigation
-nav.mnemonic=N
-
-start.text=Start
-start.shortdescription=Begin test
-start.longdescription=Begins the test
-start.mnemonic=S
start.accel=ctrl pressed B
start.icon=media/Play16
-first.text=First
-first.shortdescription=First question
-first.longdescription=Navigates to the first question
-first.mnemonic=F
first.accel=ctrl pressed HOME
first.icon=general/Undo16
-prev.text=Previous
-prev.shortdescription=Previous question
-prev.longdescription=Navigates to the previous question
-prev.mnemonic=P
prev.accel=ctrl pressed PAGE_UP
prev.icon=navigation/Back16
-next.text=Next
-next.shortdescription=Next question
-next.longdescription=Navigates to the next question
-next.mnemonic=N
next.accel=ctrl pressed PAGE_DOWN
next.icon=navigation/Forward16
-last.text=Last
-last.shortdescription=Last question
-last.longdescription=Navigates to the last question
-last.mnemonic=L
last.accel=ctrl pressed END
last.icon=general/Redo16
-review.text=Review
-review.shortdescription=Review questions
-review.longdescription=Shows a review of all questions
-review.mnemonic=R
review.accel=ctrl pressed INSERT
review.icon=general/History16
-end.text=End
-end.shortdescription=Test end and results
-end.longdescription=Ends the test and shows your test results
-end.mnemonic=E
end.accel=ctrl pressed ESCAPE
end.icon=general/Stop16
@@ -141,13 +69,6 @@
###########
# Settings
-settings.text=Settings
-settings.mnemonic=S
-
-config.text=Configure JEduca...
-config.shortdescription=Change JEduca preferences
-config.longdescription=Displays a dialog to change JEduca preferences
-config.mnemonic=C
#config.accel=
config.icon=general/Preferences16
@@ -155,30 +76,14 @@
#######
# Help
-help.text=Help
-help.mnemonic=H
-
-about.text=About JEduca...
-about.shortdescription=Information about JEduca
-about.longdescription=Displays a dialog with informations about JEduca
about.icon=general/About16
################
# General Stuff
-ok.text=OK
-ok.mnemonic=O
ok.accel=ENTER
-cancel.text=Cancel
-cancel.mnemonic=C
cancel.accel=ESCAPE
-delete.text=Delete
-delete.mnemonic=D
-
selectFile.icon=general/Open16
-
-about=<html><head><meta http-equiv='Content-Type' content='text/html'></meta><title>About</title></head><body><h1>About</h1><p>JEduca Version 1.0</p><p>\xA9 2004-2008 Chrsitian Hujer. All rights reserved.</p></body></html>
-application.name=JEduca
Deleted: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/action_de.properties
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/action_de.properties 2009-02-22 09:14:16 UTC (rev 1036)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/action_de.properties 2009-02-22 09:45:37 UTC (rev 1037)
@@ -1,181 +0,0 @@
-#
-# Copyright (C) 2009 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 3 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, see <http://www.gnu.org/licenses/>.
-#
-
-###########
-# Document
-
-doc.text=Dokument
-doc.mnemonic=D
-
-open.text=\xD6ffnen...
-open.shortdescription=\xD6ffnet einen Test
-open.longdescription=L\xE4dt einen neuen Test aus einer Datei
-open.mnemonic=F
-open.accel=ctrl pressed O
-#open.icon
-open.error.text=Fehler beim Laden
-
-save.text=Speichern...
-save.shortdescription=Speichert den Test
-save.longdescription=Speichert den Test in einer Datei
-save.mnemonic=S
-save.accel=ctrl pressed S
-#save.icon
-save.error.text=Fehler beim Speichern
-
-print.text=Drucken...
-print.shortdescription=Aktuelle Ansicht drucken
-print.longdescription=Druckt die aktuelle Ansicht
-print.mnemonic=D
-print.accel=ctrl pressed P
-#print.icon=
-
-quit.text=Beenden
-quit.shortdescription=Beendet das Programm
-quit.longdescription=Beendet das Programm
-quit.mnemonic=B
-quit.accel=ctrl pressed Q
-#quit.icon
-quit.question=Wirklich beenden?
-
-
-#######
-# View
-
-view.text=Ansicht
-view.mnemonic=A
-
-viewShowAll.text=Alle anzeigen
-viewHideAll.text=Alle verbergen
-
-toolbars.text=Symbolleisten
-toolbars.mnemonic=S
-
-configureToolbars.text=Symbolleisten anpassen...
-configureToolbars.mnemonic=A
-
-menuToolBar.name=Men\xFCleiste
-menuToolBar.accel=ctrl pressed M
-programToolBar.name=Programmleiste
-navigationToolBar.name=Navigationsleiste
-
-menus.text=Men\xFCs
-configureMenus.text=Men\xFCs anpassen...
-
-internalFrames.text=Fenster
-configureInternalFrames.text=Fenster anpassen...
-
-
-#############
-# Navigation
-
-nav.text=Gehe zu
-nav.mnemonic=N
-
-start.text=Start
-start.shortdescription=Test beginnen
-start.longdescription=Beginnt den Test
-start.mnemonic=S
-start.accel=ctrl pressed B
-#start.icon
-
-first.text=Erste
-first.shortdescription=Erste Frage
-first.longdescription=Springt zur ersten Frage
-first.mnemonic=E
-first.accel=ctrl pressed HOME
-#first.icon
-
-prev.text=Vorherige
-prev.shortdescription=Vorherige Frage
-prev.longdescription=Springt zur vorherigen Frage
-prev.mnemonic=V
-prev.accel=ctrl pressed PAGE_UP
-#prev.icon
-
-next.text=N\xE4chste
-next.shortdescription=N\xE4chste Frage
-next.longdescription=Springt zur n\xE4chsten Frage
-next.mnemonic=N
-next.accel=ctrl pressed PAGE_DOWN
-#next.icon
-
-last.text=Letzte
-last.shortdescription=Letzte Frage
-last.longdescription=Springt zur letzten Frage
-last.mnemonic=L
-last.accel=ctrl pressed END
-#last.icon
-
-review.text=Review
-review.shortdescription=\xDCbersicht
-review.longdescription=Springt zur Fragen\xFCbersicht
-review.mnemonic=R
-review.accel=ctrl pressed INSERT
-#review.icon
-
-end.text=Ende
-end.shortdescription=Test-Ende und Auswertung
-end.longdescription=Beendet den Test und zeigt das Testergebnis
-end.mnemonic=N
-end.accel=ctrl pressed ESCAPE
-#end.icon
-
-
-###########
-# Settings
-
-settings.text=Einstellungen
-settings.mnemonic=E
-
-config.text=JEduca konfigurieren...
-config.shortdescription=JEduca Einstellungen \xE4ndern
-config.longdescription=Zeigt einen Dialog zum \xC4ndern der JEduca Einstellungen
-config.mnemonic=K
-#config.accel
-#config.icon
-
-
-#######
-# Help
-
-help.text=Hilfe
-help.mnemonic=H
-
-about.text=\xDCber JEduca...
-about.shortdescription=Informationen \xFCber JEduca
-about.longdescription=Zeigt einen Dialog mit Informationen \xFCber JEduca
-#about.icon
-
-
-################
-# General Stuff
-
-ok.text=OK
-ok.mnemonic=O
-ok.accel=ENTER
-
-cancel.text=Abbruch
-cancel.mnemonic=A
-cancel.accel=ESCAPE
-
-delete.text=L\xF6schen
-delete.mnemonic=L
-
-#selectFile.icon=
-about=<html><head><meta http-equiv='Content-Type' content='text/html'></meta><title>\xDCber</title></head><body><h1>\xDCber</h1><p>JEduca Version 1.0</p><p>\xA9 2004-2008 Chrsitian Hujer. Alle Rechte vorbehalten.</p></body></html>
-application.name=JEduca
Added: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/texts.properties
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/texts.properties (rev 0)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/texts.properties 2009-02-22 09:45:37 UTC (rev 1037)
@@ -0,0 +1,152 @@
+#
+# Copyright (C) 2009 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 3 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, see <http://www.gnu.org/licenses/>.
+#
+
+###########
+# Document
+
+doc.text=Document
+doc.mnemonic=D
+
+open.text=open...
+open.shortdescription=Open a new test
+open.longdescription=Loads a new test from a file
+open.mnemonic=O
+open.error.text=Error while loading
+
+save.text=save...
+save.shortdescription=Save test
+save.longdescription=Saves the test in a new file
+save.mnemonic=S
+save.error.text=Error while saving
+
+print.text=Print...
+print.shortdescription=Print current view
+print.longdescription=Prints the current view
+print.mnemonic=P
+
+quit.text=quit
+quit.shortdescription=Quit program
+quit.longdescription=Quits the program
+quit.mnemonic=Q
+quit.question=Really quit?
+
+
+#######
+# View
+
+view.text=View
+view.mnemonic=V
+
+viewShowAll.text=Show all
+viewHideAll.text=Hide all
+
+toolbars.text=Toolbars
+toolbars.mnemonic=T
+
+configureToolbars.text=Change toolbars...
+configureToolbars.mnemonic=C
+
+menuToolBar.name=Menubar
+programToolBar.name=Program toolbar
+navigationToolBar.name=Navigation toolbar
+
+menus.text=Menus
+configureMenus.text=Change menus...
+
+internalFrames.text=Windows
+configureInternalFrames.text=Change windows...
+
+
+#############
+# Navigation
+
+nav.text=Navigation
+nav.mnemonic=N
+
+start.text=Start
+start.shortdescription=Begin test
+start.longdescription=Begins the test
+start.mnemonic=S
+
+first.text=First
+first.shortdescription=First question
+first.longdescription=Navigates to the first question
+first.mnemonic=F
+
+prev.text=Previous
+prev.shortdescription=Previous question
+prev.longdescription=Navigates to the previous question
+prev.mnemonic=P
+
+next.text=Next
+next.shortdescription=Next question
+next.longdescription=Navigates to the next question
+next.mnemonic=N
+
+last.text=Last
+last.shortdescription=Last question
+last.longdescription=Navigates to the last question
+last.mnemonic=L
+
+review.text=Review
+review.shortdescription=Review questions
+review.longdescription=Shows a review of all questions
+review.mnemonic=R
+
+end.text=End
+end.shortdescription=Test end and results
+end.longdescription=Ends the test and shows your test results
+end.mnemonic=E
+
+
+###########
+# Settings
+
+settings.text=Settings
+settings.mnemonic=S
+
+config.text=Configure JEduca...
+config.shortdescription=Change JEduca preferences
+config.longdescription=Displays a dialog to change JEduca preferences
+config.mnemonic=C
+
+
+#######
+# Help
+
+help.text=Help
+help.mnemonic=H
+
+about.text=About JEduca...
+about.shortdescription=Information about JEduca
+about.longdescription=Displays a dialog with informations about JEduca
+
+
+################
+# General Stuff
+
+ok.text=OK
+ok.mnemonic=O
+
+cancel.text=Cancel
+cancel.mnemonic=C
+
+delete.text=Delete
+delete.mnemonic=D
+
+about=<html><head><meta http-equiv='Content-Type' content='text/html'></meta><title>About</title></head><body><h1>About</h1><p>JEduca Version 1.0</p><p>\xA9 2004-2008 Chrsitian Hujer. All rights reserved.</p></body></html>
+application.name=JEduca
Property changes on: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/texts.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ LF
Added: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/texts_de.properties
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/texts_de.properties (rev 0)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/texts_de.properties 2009-02-22 09:45:37 UTC (rev 1037)
@@ -0,0 +1,153 @@
+#
+# Copyright (C) 2009 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 3 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, see <http://www.gnu.org/licenses/>.
+#
+
+###########
+# Document
+
+doc.text=Dokument
+doc.mnemonic=D
+
+open.text=\xD6ffnen...
+open.shortdescription=\xD6ffnet einen Test
+open.longdescription=L\xE4dt einen neuen Test aus einer Datei
+open.mnemonic=F
+open.error.text=Fehler beim Laden
+
+save.text=Speichern...
+save.shortdescription=Speichert den Test
+save.longdescription=Speichert den Test in einer Datei
+save.mnemonic=S
+save.error.text=Fehler beim Speichern
+
+print.text=Drucken...
+print.shortdescription=Aktuelle Ansicht drucken
+print.longdescription=Druckt die aktuelle Ansicht
+print.mnemonic=D
+
+quit.text=Beenden
+quit.shortdescription=Beendet das Programm
+quit.longdescription=Beendet das Programm
+quit.mnemonic=B
+quit.question=Wirklich beenden?
+
+
+#######
+# View
+
+view.text=Ansicht
+view.mnemonic=A
+
+viewShowAll.text=Alle anzeigen
+viewHideAll.text=Alle verbergen
+
+toolbars.text=Symbolleisten
+toolbars.mnemonic=S
+
+configureToolbars.text=Symbolleisten anpassen...
+configureToolbars.mnemonic=A
+
+menuToolBar.name=Men\xFCleiste
+programToolBar.name=Programmleiste
+navigationToolBar.name=Navigationsleiste
+
+menus.text=Men\xFCs
+configureMenus.text=Men\xFCs anpassen...
+
+internalFrames.text=Fenster
+configureInternalFrames.text=Fenster anpassen...
+
+
+#############
+# Navigation
+
+nav.text=Gehe zu
+nav.mnemonic=N
+
+start.text=Start
+start.shortdescription=Test beginnen
+start.longdescription=Beginnt den Test
+start.mnemonic=S
+
+first.text=Erste
+first.shortdescription=Erste Frage
+first.longdescription=Springt zur ersten Frage
+first.mnemonic=E
+
+prev.text=Vorherige
+prev.shortdescription=Vorherige Frage
+prev.longdescription=Springt zur vorherigen Frage
+prev.mnemonic=V
+
+next.text=N\xE4chste
+next.shortdescription=N\xE4chste Frage
+next.longdescription=Springt zur n\xE4chsten Frage
+next.mnemonic=N
+
+last.text=Letzte
+last.shortdescription=Letzte Frage
+last.longdescription=Springt zur letzten Frage
+last.mnemonic=L
+
+review.text=Review
+review.shortdescription=\xDCbersicht
+review.longdescription=Springt zur Fragen\xFCbersicht
+review.mnemonic=R
+
+end.text=Ende
+end.shortdescription=Test-Ende und Auswertung
+end.longdescription=Beendet den Test und zeigt das Testergebnis
+end.mnemonic=N
+
+
+###########
+# Settings
+
+settings.text=Einstellungen
+settings.mnemonic=E
+
+config.text=JEduca konfigurieren...
+config.shortdescription=JEduca Einstellungen \xE4ndern
+config.longdescription=Zeigt einen Dialog zum \xC4ndern der JEduca Einstellungen
+config.mnemonic=K
+
+
+#######
+# Help
+
+help.text=Hilfe
+help.mnemonic=H
+
+about.text=\xDCber JEduca...
+about.shortdescription=Informationen \xFCber JEduca
+about.longdescription=Zeigt einen Dialog mit Informationen \xFCber JEduca
+
+
+################
+# General Stuff
+
+ok.text=OK
+ok.mnemonic=O
+
+cancel.text=Abbruch
+cancel.mnemonic=A
+
+delete.text=L\xF6schen
+delete.mnemonic=L
+
+#selectFile.icon=
+about=<html><head><meta http-equiv='Content-Type' content='text/html'></meta><title>\xDCber</title></head><body><h1>\xDCber</h1><p>JEduca Version 1.0</p><p>\xA9 2004-2008 Chrsitian Hujer. Alle Rechte vorbehalten.</p></body></html>
+application.name=JEduca
Property changes on: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/texts_de.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: 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...> - 2009-02-22 09:14:20
|
Revision: 1036
http://japi.svn.sourceforge.net/japi/?rev=1036&view=rev
Author: christianhujer
Date: 2009-02-22 09:14:16 +0000 (Sun, 22 Feb 2009)
Log Message:
-----------
Fixed checkstyle issues.
Modified Paths:
--------------
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/AnswerText.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/MCAnswerText.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/MCQuestionText.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/Main.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/OpenQuestionText.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/Program.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/QuestionCollection.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/QuestionText.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/Settings.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/AnswerGUI.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/FirstSettingsModule.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/GUIOptionsSettingsModule.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/JTestAndDirsFileFilter.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/JTestFileFilter.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/KEducaAndDirsFileFilter.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/KEducaFileFilter.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/ListSelectionActionAdapter.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/ProgramFrame.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/QuestionCollectionGUI.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/QuestionCollectionInfoGUI.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/QuestionGUI.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/ReviewGUI.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/SettingsGUI.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/SettingsPanel.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/SolutionGUI.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/io/AbstractJTestImport.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/io/JTestSer.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/io/JTestV1.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/io/KEduca.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/io/XMLUtils.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/AbstractManager.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/HelpManager.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/InternalFrameManager.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/MenuManager.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/OpenURLPane.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/ToolBarManager.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/action.properties
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/action_de.properties
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/io/AbstractCachingImporter.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/io/CachingImporterAdapter.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/io/Exporter.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/io/IOBase.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/io/IOModuleProvider.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/io/IOUtilities.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/io/Importer.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/io/ImporterFileFilter.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/list/ActionListCellRenderer.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/text/MimeComboBox.java
progs/jeduca/trunk/src/prj/net/sf/japi/swing/LookAndFeelManager.java
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/AnswerText.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/AnswerText.java 2009-02-22 01:34:53 UTC (rev 1035)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/AnswerText.java 2009-02-22 09:14:16 UTC (rev 1036)
@@ -22,7 +22,7 @@
/** An Answer.
* Mutable object for answers.
- * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
*/
public abstract class AnswerText implements Serializable, Cloneable {
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/MCAnswerText.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/MCAnswerText.java 2009-02-22 01:34:53 UTC (rev 1035)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/MCAnswerText.java 2009-02-22 09:14:16 UTC (rev 1036)
@@ -20,13 +20,11 @@
import java.util.List;
/** Class for Multiple Choice Answers.
- * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
+ * @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. */
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/MCQuestionText.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/MCQuestionText.java 2009-02-22 01:34:53 UTC (rev 1035)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/MCQuestionText.java 2009-02-22 09:14:16 UTC (rev 1036)
@@ -24,13 +24,11 @@
import java.util.List;
/** Class for Multiple Choice Questions.
- * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
*/
public class MCQuestionText extends QuestionText {
/** Serial Version. */
- // XXX...
- @SuppressWarnings({"AnalyzingVariableNaming"})
private static final long serialVersionUID = 1L;
/** The answers.
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/Main.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/Main.java 2009-02-22 01:34:53 UTC (rev 1035)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/Main.java 2009-02-22 09:14:16 UTC (rev 1036)
@@ -20,10 +20,14 @@
import net.sf.japi.progs.jeduca.jtest.gui.ProgramFrame;
/** Klasse, um das Programm zu starten.
- * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
*/
-public class Main {
+public final class Main {
+ /** Do not instantiate. */
+ private Main() {
+ }
+
/** Main program.
* @param args command line arguments
* @throws Throwable in case of problems starting the program.
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/OpenQuestionText.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/OpenQuestionText.java 2009-02-22 01:34:53 UTC (rev 1035)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/OpenQuestionText.java 2009-02-22 09:14:16 UTC (rev 1036)
@@ -24,13 +24,11 @@
import java.util.List;
/** Class for Open Questions.
- * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
*/
public class OpenQuestionText extends QuestionText {
/** Serial Version. */
- // XXX IntelliJ IDEA
- @SuppressWarnings({"AnalyzingVariableNaming"})
private static final long serialVersionUID = 1L;
/** The regular expressions.
@@ -100,7 +98,7 @@
/** {@inheritDoc} */
@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.
+ // XXX:2009-02-22:christianhujer: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: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/Program.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/Program.java 2009-02-22 01:34:53 UTC (rev 1035)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/Program.java 2009-02-22 09:14:16 UTC (rev 1036)
@@ -28,8 +28,8 @@
/** The Program contains the basic references such as the current QuestionCollection and provides important main operations like loading and saving
* files.
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
* @todo Refactor to Program 1-n Document, find an alternative common name for Document to avoid conflict with XML names.
- * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
*/
public class Program {
@@ -67,7 +67,7 @@
*/
public void setQuestionCollection(final QuestionCollection col) {
this.col = col;
- // TODO: Event Handling
+ // TODO:2009-02-22:christianhujer:Event Handling
}
/** Get the QuestionCollection.
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/QuestionCollection.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/QuestionCollection.java 2009-02-22 01:34:53 UTC (rev 1035)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/QuestionCollection.java 2009-02-22 09:14:16 UTC (rev 1036)
@@ -26,12 +26,11 @@
import java.util.List;
/** Class for holding a Collection of Questions.
- * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
*/
public class QuestionCollection implements Serializable, Iterable<QuestionText> {
/** Serial Version. */
- // XXX IntelliJ IDEA
private static final long serialVersionUID = 1L;
/** The Questions.
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/QuestionText.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/QuestionText.java 2009-02-22 01:34:53 UTC (rev 1035)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/QuestionText.java 2009-02-22 09:14:16 UTC (rev 1036)
@@ -27,13 +27,11 @@
* <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 <a href="mailto:ch...@ri...">Christian Hujer</a>
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
*/
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: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/Settings.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/Settings.java 2009-02-22 01:34:53 UTC (rev 1035)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/Settings.java 2009-02-22 09:14:16 UTC (rev 1036)
@@ -26,7 +26,7 @@
/** Class representing the settings for JTest.
* It also manages the list of recent URLs.
- * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
*/
public class Settings implements RecentURLs {
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/AnswerGUI.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/AnswerGUI.java 2009-02-22 01:34:53 UTC (rev 1035)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/AnswerGUI.java 2009-02-22 09:14:16 UTC (rev 1036)
@@ -28,8 +28,7 @@
import net.sf.japi.progs.jeduca.jtest.MCAnswerText;
/** Class to vizualize a single MCAnswerText.
- * @author $Author: chris $
- * @version $Id: AnswerGUI.java,v 1.5 2006/01/31 23:09:18 chris Exp $
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
*/
public class AnswerGUI extends JComponent implements ChangeListener {
@@ -60,9 +59,9 @@
setLayout(new BorderLayout());
this.answer = answer;
final char mnemo = (char) ('A' + index - 1);
- final String answerText = answer.isHTML() ?
- HTML_START + "<u>" + mnemo + "</u>. " + answer.getText() + HTML_END :
- answer.getText();
+ final String answerText = answer.isHTML()
+ ? HTML_START + "<u>" + mnemo + "</u>. " + answer.getText() + HTML_END
+ : answer.getText();
if (buttons == null) {
//button = new JCheckBox((answer.isHTML() ? "<html> " : "") + answer.getText());
button = new JCheckBox(answerText);
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/FirstSettingsModule.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/FirstSettingsModule.java 2009-02-22 01:34:53 UTC (rev 1035)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/FirstSettingsModule.java 2009-02-22 09:14:16 UTC (rev 1036)
@@ -31,8 +31,7 @@
import net.sf.japi.swing.prefs.AbstractPrefs;
/** Settings module.
- * @author $Author: chris $
- * @version $Id: FirstSettingsModule.java,v 1.2 2006/01/31 23:09:18 chris Exp $
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
*/
public class FirstSettingsModule extends AbstractPrefs {
@@ -58,7 +57,7 @@
*/
public FirstSettingsModule(final Settings settings) {
setLayout(new GridBagLayout());
- final JPanel showSolutionPanel = new JPanel(new GridLayout(2,1));
+ final JPanel showSolutionPanel = new JPanel(new GridLayout(2, 1));
//setBorder(createCompoundBorder(createTitledBorder("Dummy Lösungen anzeigen"), createEtchedBorder()));
showSolutionPanel.setBorder(createTitledBorder("Dummy Lösungen anzeigen"));
final ButtonGroup solutions = new ButtonGroup();
@@ -97,7 +96,7 @@
restore();
}
- /** ??? */ // TODO {@inheritDoc} ???
+ /** ??? */ // TODO:2009-02-22:christianhujer:Provide in supertype and use {@inheritDoc} ?
public void restore() {
showSolutionsOn.setSelected(settings.isShowQuestionSolution());
showSolutionsOff.setSelected(!settings.isShowQuestionSolution());
@@ -115,17 +114,17 @@
/** {@inheritDoc} */
public void defaults() {
- //To change body of implemented methods use File | Settings | File Templates.
- // TODO
+ // TODO:2009-02-22:christianhujer:Implement.
restore();
}
public boolean isChanged() {
- return false;//To change body of implemented methods use File | Settings | File Templates.
+ // TODO:2009-02-22:christianhujer:Implement.
+ return false;
}
public void revert() {
- //To change body of implemented methods use File | Settings | File Templates.
+ // TODO:2009-02-22:christianhujer:Implement.
}
} // class FirstSettingsModule
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/GUIOptionsSettingsModule.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/GUIOptionsSettingsModule.java 2009-02-22 01:34:53 UTC (rev 1035)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/GUIOptionsSettingsModule.java 2009-02-22 09:14:16 UTC (rev 1036)
@@ -31,8 +31,7 @@
import net.sf.japi.swing.prefs.AbstractPrefs;
/** Settings module.
- * @author $Author: chris $
- * @version $Id: GUIOptionsSettingsModule.java,v 1.2 2006/01/31 23:09:18 chris Exp $
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
*/
public class GUIOptionsSettingsModule extends AbstractPrefs {
@@ -48,7 +47,7 @@
*/
public GUIOptionsSettingsModule(final Settings settings) {
setLayout(new GridBagLayout());
- final JPanel askForQuitPanel = new JPanel(new GridLayout(2,1));
+ final JPanel askForQuitPanel = new JPanel(new GridLayout(2, 1));
//setBorder(createCompoundBorder(createTitledBorder("Dummy Lösungen anzeigen"), createEtchedBorder()));
askForQuitPanel.setBorder(createTitledBorder("Dummy Beim Beenden nachfragen"));
final ButtonGroup askForQuit = new ButtonGroup();
@@ -69,7 +68,7 @@
gbc.weighty = 1.0;
add(askForQuitPanel, gbc);
setSettings(settings);
- setHelpURL(getClass().getClassLoader().getResource("help/GUIOptionsSettingsModule.html")); // TODO localize this
+ setHelpURL(getClass().getClassLoader().getResource("help/GUIOptionsSettingsModule.html")); // TODO:2009-02-22:christianhujer:localize this
setListLabelText("Dummy Auflösung2");
setLabelText("Dummy Einstellungen zum Anzeigen der Auflösungen");
}
@@ -83,9 +82,9 @@
restore();
}
- /** ??? */ // TODO {@inheritDoc} ???
+ /** ??? */ // TODO:2009-02-22:christianhujer:Provide in supertype and use {@inheritDoc} ?
public void restore() {
- // TODO
+ // TODO:2009-02-22:christianhujer:Implement.
}
/** {@inheritDoc} */
@@ -95,22 +94,23 @@
/** {@inheritDoc} */
public void apply() {
+ // TODO:2009-02-22:christianhujer:Implement.
//settings.setShowQuestionSolution(showSolutionsOn.isSelected());
}
/** {@inheritDoc} */
public void defaults() {
- //To change body of implemented methods use File | Settings | File Templates.
- // TODO
+ // TODO:2009-02-22:christianhujer:Implement.
restore();
}
public boolean isChanged() {
- return false;//To change body of implemented methods use File | Settings | File Templates.
+ // TODO:2009-02-22:christianhujer:Implement.
+ return false;
}
public void revert() {
- //To change body of implemented methods use File | Settings | File Templates.
+ // TODO:2009-02-22:christianhujer:Implement.
}
/** Returns the Settings.
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/JTestAndDirsFileFilter.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/JTestAndDirsFileFilter.java 2009-02-22 01:34:53 UTC (rev 1035)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/JTestAndDirsFileFilter.java 2009-02-22 09:14:16 UTC (rev 1036)
@@ -21,8 +21,7 @@
import javax.swing.filechooser.FileFilter;
/** FileFilter for JFileChooser that accepts only JTest files.
- * @author $Author: chris $
- * @version $Id: JTestAndDirsFileFilter.java,v 1.3 2006/01/31 23:09:18 chris Exp $
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
*/
public class JTestAndDirsFileFilter extends FileFilter {
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/JTestFileFilter.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/JTestFileFilter.java 2009-02-22 01:34:53 UTC (rev 1035)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/JTestFileFilter.java 2009-02-22 09:14:16 UTC (rev 1036)
@@ -21,8 +21,7 @@
import javax.swing.filechooser.FileFilter;
/** FileFilter for JFileChooser that accepts only JTest files.
- * @author $Author: chris $
- * @version $Id: JTestFileFilter.java,v 1.3 2006/01/31 23:09:18 chris Exp $
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
*/
public class JTestFileFilter extends FileFilter {
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/KEducaAndDirsFileFilter.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/KEducaAndDirsFileFilter.java 2009-02-22 01:34:53 UTC (rev 1035)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/KEducaAndDirsFileFilter.java 2009-02-22 09:14:16 UTC (rev 1036)
@@ -21,8 +21,7 @@
import javax.swing.filechooser.FileFilter;
/** FileFilter for JFileChooser that accepts only KEduca files.
- * @author $Author: chris $
- * @version $Id: KEducaAndDirsFileFilter.java,v 1.3 2006/01/31 23:09:18 chris Exp $
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
*/
public class KEducaAndDirsFileFilter extends FileFilter {
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/KEducaFileFilter.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/KEducaFileFilter.java 2009-02-22 01:34:53 UTC (rev 1035)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/KEducaFileFilter.java 2009-02-22 09:14:16 UTC (rev 1036)
@@ -21,8 +21,7 @@
import javax.swing.filechooser.FileFilter;
/** FileFilter for JFileChooser that accepts only KEduca files.
- * @author $Author: chris $
- * @version $Id: KEducaFileFilter.java,v 1.3 2006/01/31 23:09:18 chris Exp $
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
*/
public class KEducaFileFilter extends FileFilter {
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/ListSelectionActionAdapter.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/ListSelectionActionAdapter.java 2009-02-22 01:34:53 UTC (rev 1035)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/ListSelectionActionAdapter.java 2009-02-22 09:14:16 UTC (rev 1036)
@@ -25,8 +25,7 @@
/** Adapter which creates and fires ActionEvents on ListSelections.
* Requires that the event source is a JList and its model consists of ActionListeners, e.g. getSelectedValue() returns an ActionListener.
- * @author $Author: chris $
- * @version $Id: ListSelectionActionAdapter.java,v 1.3 2006/01/31 23:09:18 chris Exp $
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
*/
public class ListSelectionActionAdapter implements ListSelectionListener {
@@ -35,7 +34,7 @@
*/
public void valueChanged(final ListSelectionEvent e) {
if (e.getValueIsAdjusting()) {
- ((ActionListener) ((JList)e.getSource()).getSelectedValue()).actionPerformed(new ActionEvent(e.getSource(), 0, ""));
+ ((ActionListener) ((JList) e.getSource()).getSelectedValue()).actionPerformed(new ActionEvent(e.getSource(), 0, ""));
}
}
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/ProgramFrame.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/ProgramFrame.java 2009-02-22 01:34:53 UTC (rev 1035)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/ProgramFrame.java 2009-02-22 09:14:16 UTC (rev 1036)
@@ -59,8 +59,7 @@
import org.jetbrains.annotations.Nullable;
/** Programmfenster.
- * @author $Author: chris $
- * @version $Id: ProgramFrame.java,v 1.7 2006/01/31 23:09:18 chris Exp $
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
* @todo workout transience of program
* @fixme #1 Once the menubar is hidden, even the KeyStroke won't make it visible anymore. Even other KeyStrokes from JMenuItems don't work anymore then. Fix this.
* @fixme #2 F10 activates the wrong menubar.
@@ -133,7 +132,7 @@
add(questionCollectionGUI);
final JToolBar menuToolBar = new JToolBar(ACTION_BUILDER.getString("menuToolBar.name"));
menuToolBar.add(menuBar);
- //menuToolBar.putClientProperty(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(ACTION_BUILDER.getString("menuToolBar.accel"))); // FIXME #1
+ //menuToolBar.putClientProperty(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(ACTION_BUILDER.getString("menuToolBar.accel"))); // FIXME:2009-02-22:christianhujer:Doesn't work somehow.
final JToolBar bookmarkToolBar = bookmarkManager.createBookmarkToolBar();
final JToolBar programToolBar = ACTION_BUILDER.createToolBar(this, "programToolBar");
final JToolBar navigationToolBar = questionCollectionGUI.createNavigationToolBar();
@@ -141,11 +140,11 @@
add(programToolBar, NORTH);
add(bookmarkToolBar, NORTH);
add(navigationToolBar, NORTH);
- //tm.add(menuToolBar); // FIXME #1
+ //tm.add(menuToolBar); // FIXME:2009-02-22:christianhujer:Doesn't work somehow.
tm.add(programToolBar);
tm.add(bookmarkToolBar);
tm.add(navigationToolBar);
- //add(questionCollectionGUI.createNavigationToolBar(), SOUTH); // FIXME #1
+ //add(questionCollectionGUI.createNavigationToolBar(), SOUTH); // FIXME:2009-02-22:christianhujer:Doesn't work somehow.
menuBar.add(mDoc);
menuBar.add(mView);
final JMenu navigationMenu = questionCollectionGUI.createNavigationMenu();
@@ -215,12 +214,12 @@
}
/** {@inheritDoc} */
- // TODO Do not return null if loading was successful.
+ // TODO:2009-02-22:christianhujer:Do not return null if loading was successful.
@NotNull
public Document<Object> load(@NotNull final String uri) {
boolean okay;
try {
- // TODO: IOManager
+ // TODO:2009-02-22:christianhujer:IOManager
// program.eduImport(url);
program.load(uri);
questionCollectionGUI.setQuestionCollection(program.getQuestionCollection());
@@ -259,7 +258,7 @@
/** Print Action. */
@ActionMethod
public void print() {
- // TODO
+ // TODO:2009-02-22:christianhujer:Implement.
}
/** Prefs Action. */
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/QuestionCollectionGUI.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/QuestionCollectionGUI.java 2009-02-22 01:34:53 UTC (rev 1035)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/QuestionCollectionGUI.java 2009-02-22 09:14:16 UTC (rev 1036)
@@ -35,8 +35,7 @@
import net.sf.japi.swing.action.ActionBuilderFactory;
/** User Interface for a Collection of Questions.
- * @author $Author: chris $
- * @version $Id: QuestionCollectionGUI.java,v 1.7 2006/01/31 23:09:18 chris Exp $
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
*/
public class QuestionCollectionGUI extends JComponent {
@@ -44,7 +43,8 @@
private static final long serialVersionUID = 1L;
/** The Resource bundle. */
- private static final ResourceBundle res = ResourceBundle.getBundle("net.sf.japi.progs.jeduca.jtest.gui.action");
+ // TODO:2009-02-22:christianhujer:Get rid of resource bundle.
+ private static final ResourceBundle RES = ResourceBundle.getBundle("net.sf.japi.progs.jeduca.jtest.gui.action");
/** Constant for showing the collection info. */
private static final String COLLECTION_INFO = "CollectionInfo";
@@ -312,8 +312,8 @@
* @return Navigation Menu
*/
public JMenu createNavigationMenu() {
- final JMenu menu = new JMenu(res.getString("nav.text"));
- menu.setName(res.getString("nav.text"));
+ final JMenu menu = new JMenu(RES.getString("nav.text"));
+ menu.setName(RES.getString("nav.text"));
for (final Action action : navigationActions) {
menu.add(new JMenuItem(action));
}
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/QuestionCollectionInfoGUI.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/QuestionCollectionInfoGUI.java 2009-02-22 01:34:53 UTC (rev 1035)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/QuestionCollectionInfoGUI.java 2009-02-22 09:14:16 UTC (rev 1036)
@@ -23,8 +23,7 @@
import net.sf.japi.progs.jeduca.jtest.QuestionCollection;
/** Displays information about a QuestionCollection.
- * @author $Author: chris $
- * @version $Id: QuestionCollectionInfoGUI.java,v 1.4 2006/01/31 23:09:18 chris Exp $
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
*/
public class QuestionCollectionInfoGUI extends JComponent {
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/QuestionGUI.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/QuestionGUI.java 2009-02-22 01:34:53 UTC (rev 1035)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/QuestionGUI.java 2009-02-22 09:14:16 UTC (rev 1036)
@@ -48,8 +48,7 @@
import net.sf.japi.progs.jeduca.jtest.QuestionText;
/** JComponent to visualize a question and its answers.
- * @author $Author: chris $
- * @version $Id: QuestionGUI.java,v 1.5 2006/01/31 23:09:18 chris Exp $
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
*/
public class QuestionGUI extends JComponent implements ChangeListener {
@@ -126,7 +125,7 @@
*/
public void setQuestion(final QuestionText question) {
if (this.question instanceof OpenQuestionText) {
- ((OpenQuestionText)this.question).setAnswer(textField.getText());
+ ((OpenQuestionText) this.question).setAnswer(textField.getText());
}
this.question = question;
answersPanel.removeAll();
@@ -135,14 +134,14 @@
questionPanel.setEditable(false);
gbc.weighty = 0.0;
if (question instanceof MCQuestionText) {
- final List<MCAnswerText> answers = ((MCQuestionText)question).getAnswerTexts();
- final ButtonGroup gp = ((MCQuestionText)question).countRightAnswers() == 1 ? new ButtonGroup() : null;
+ final List<MCAnswerText> answers = ((MCQuestionText) question).getAnswerTexts();
+ final ButtonGroup gp = ((MCQuestionText) question).countRightAnswers() == 1 ? new ButtonGroup() : null;
int i = 1;
for (final MCAnswerText answer : answers) {
answersPanel.add(new AnswerGUI(answer, gp, i++), gbc);
}
} else if (question instanceof OpenQuestionText) {
- textField.setText(((OpenQuestionText)question).getAnswer());
+ textField.setText(((OpenQuestionText) question).getAnswer());
answersPanel.add(textField);
}
gbc.weighty = 1.0;
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/ReviewGUI.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/ReviewGUI.java 2009-02-22 01:34:53 UTC (rev 1035)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/ReviewGUI.java 2009-02-22 09:14:16 UTC (rev 1036)
@@ -33,8 +33,7 @@
import net.sf.japi.swing.VerticalFlowLayout;
/** Graphical user interface for displaying a review page for all questions.
- * @author $Author: chris $
- * @version $Id: ReviewGUI.java,v 1.4 2006/01/31 23:09:18 chris Exp $
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
*/
public class ReviewGUI extends JComponent {
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/SettingsGUI.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/SettingsGUI.java 2009-02-22 01:34:53 UTC (rev 1035)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/SettingsGUI.java 2009-02-22 09:14:16 UTC (rev 1036)
@@ -31,8 +31,7 @@
/** User Interface for loading, saving and changing the settings.
* @todo do some rework to use SettingsPanels that contain a certain field of settings and some index function to make it look similar as the settings
* of KDE / stuff look like.
- * @author $Author: chris $
- * @version $Id: SettingsGUI.java,v 1.5 2006/01/31 23:09:18 chris Exp $
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
*/
public class SettingsGUI extends JComponent {
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/SettingsPanel.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/SettingsPanel.java 2009-02-22 01:34:53 UTC (rev 1035)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/SettingsPanel.java 2009-02-22 09:14:16 UTC (rev 1036)
@@ -21,8 +21,7 @@
import javax.swing.JComponent;
/** A component that is a View and a Controller for a part of Settings storable in Preferences or special objects.
- * @author $Author: chris $
- * @version $Id: SettingsPanel.java,v 1.3 2006/01/31 23:09:18 chris Exp $
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
*/
public abstract class SettingsPanel extends JComponent {
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/SolutionGUI.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/SolutionGUI.java 2009-02-22 01:34:53 UTC (rev 1035)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/SolutionGUI.java 2009-02-22 09:14:16 UTC (rev 1036)
@@ -37,8 +37,7 @@
* <li>Multiple Choice ({@link MCQuestionText})</li>
* <li>Open Questions ({@link OpenQuestionText})</li>
* </ul>
- * @author $Author: chris $
- * @version $Id: SolutionGUI.java,v 1.5 2006/01/31 23:09:18 chris Exp $
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
*/
public class SolutionGUI extends JComponent {
@@ -151,7 +150,7 @@
* @return supplied StringBuilder for convenience
*/
private static StringBuilder appendOpenQuestion(final StringBuilder sb, final OpenQuestionText question) {
- // TODO
+ // TODO:2009-02-22:christianhujer:Implement appending.
//sb.append("<ul>");
//sb.append(question.getAnswerExplanantion());
return sb;
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/io/AbstractJTestImport.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/io/AbstractJTestImport.java 2009-02-22 01:34:53 UTC (rev 1035)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/io/AbstractJTestImport.java 2009-02-22 09:14:16 UTC (rev 1036)
@@ -27,10 +27,10 @@
* the implementation with an intelligent caching mechanism.
* Subclasses cannot rely on {@link #canLoadImpl(String)} being invoked always, since if the stored information still is uptodate, calling the method
* would be superfluous.
+ * @param <T> Type which is imported.
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
* @todo enhance map access by using string pools
* @todo tell clients to use string pools
- * @author $Author: chris $
- * @version $Id: AbstractJTestImport.java,v 1.3 2006/01/31 23:11:54 chris Exp $
*/
public abstract class AbstractJTestImport<T> implements Importer<T> {
@@ -38,8 +38,12 @@
* @author $Author: chris $
* @version $Id: AbstractJTestImport.java,v 1.3 2006/01/31 23:11:54 chris Exp $
*/
- private static class Uptodate {
+ private static final class Uptodate {
+ /** Do not instantiate out of scope. */
+ private Uptodate() {
+ }
+
/** Whether the file can be loaded. */
private boolean canLoad;
@@ -65,9 +69,9 @@
/** Check whether a file can be loaded.
* Subclasses must implement this method instead of {@link #canLoad(String)}
- * @param url URL to check whether it is loadable
+ * @param uri URL to check whether it is loadable
* @return <code>true</code> if this import module supports loading a QuestionCollection from the supplied file, otherwise <code>false</code>
*/
- protected abstract boolean canLoadImpl(final String url);
+ protected abstract boolean canLoadImpl(final String uri);
} // class AbstractJTestImport
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/io/JTestSer.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/io/JTestSer.java 2009-02-22 01:34:53 UTC (rev 1035)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/io/JTestSer.java 2009-02-22 09:14:16 UTC (rev 1036)
@@ -26,11 +26,9 @@
import java.net.URL;
import net.sf.japi.progs.jeduca.jtest.QuestionCollection;
import net.sf.japi.progs.jeduca.swing.io.Exporter;
-import net.sf.japi.progs.jeduca.swing.io.Importer;
/** Interface for reading and writing serialized JTest files.
- * @author $Author: chris $
- * @version $Id: JTestSer.java,v 1.4 2006/01/31 23:11:54 chris Exp $
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
*/
public class JTestSer extends AbstractJTestImport<QuestionCollection> implements Exporter<QuestionCollection> {
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/io/JTestV1.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/io/JTestV1.java 2009-02-22 01:34:53 UTC (rev 1035)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/io/JTestV1.java 2009-02-22 09:14:16 UTC (rev 1036)
@@ -46,7 +46,7 @@
import org.xml.sax.SAXParseException;
/** Interface for reading and writing JTestV1 files.
- * @author $Author: chris $
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
* @todo use schema
*/
public class JTestV1 extends AbstractJTestImport<QuestionCollection> implements Exporter<QuestionCollection> {
@@ -190,15 +190,15 @@
*/
private void setInfo(final QuestionCollection col, final Document doc) {
try {
- col.setTitle (xp.evaluate("document/info/title", doc));
- col.setCategory (xp.evaluate("document/info/category", doc));
- col.setType (xp.evaluate("document/info/type", doc));
- col.setLevel (xp.evaluate("document/info/level", doc));
- col.setLanguage (xp.evaluate("document/info/language", doc));
- col.setAuthorName (xp.evaluate("document/info/author/name", doc));
+ col.setTitle(xp.evaluate("document/info/title", doc));
+ col.setCategory(xp.evaluate("document/info/category", doc));
+ col.setType(xp.evaluate("document/info/type", doc));
+ col.setLevel(xp.evaluate("document/info/level", doc));
+ col.setLanguage(xp.evaluate("document/info/language", doc));
+ 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) {
+ col.setAuthorWWW(xp.evaluate("document/info/author/www", doc));
+ } catch (final XPathExpressionException e) {
throw new Error(e);
}
}
@@ -225,32 +225,30 @@
final Document doc = domImpl.createDocument(null, "Document", keduca);
//System.err.println("<!DOCTYPE " + doc.getDoctype().getName() + ">");
final Element docEl = doc.getDocumentElement();
- {
- final Element infoEl = doc.createElement("info");
- docEl.appendChild(infoEl);
- infoEl.appendChild(create(doc, "title", col.getTitle()));
- infoEl.appendChild(create(doc, "category", col.getCategory()));
- infoEl.appendChild(create(doc, "type", col.getType()));
- infoEl.appendChild(create(doc, "level", col.getLevel()));
- infoEl.appendChild(create(doc, "language", col.getLanguage()));
- {
- final Element authorEl = doc.createElement("author");
- infoEl.appendChild(authorEl);
- infoEl.appendChild(create(doc, "name", col.getAuthorName()));
- infoEl.appendChild(create(doc, "email", col.getAuthorEMail()));
- infoEl.appendChild(create(doc, "www", col.getAuthorWWW()));
+
+ final Element infoEl = doc.createElement("info");
+ docEl.appendChild(infoEl);
+ infoEl.appendChild(create(doc, "title", col.getTitle()));
+ infoEl.appendChild(create(doc, "category", col.getCategory()));
+ infoEl.appendChild(create(doc, "type", col.getType()));
+ infoEl.appendChild(create(doc, "level", col.getLevel()));
+ infoEl.appendChild(create(doc, "language", col.getLanguage()));
+
+ final Element authorEl = doc.createElement("author");
+ infoEl.appendChild(authorEl);
+ infoEl.appendChild(create(doc, "name", col.getAuthorName()));
+ infoEl.appendChild(create(doc, "email", col.getAuthorEMail()));
+ infoEl.appendChild(create(doc, "www", col.getAuthorWWW()));
+
+ final Element dataEl = doc.createElement("data");
+ docEl.appendChild(dataEl);
+ for (int i = 0; i < col.getSize(); i++) {
+ final QuestionText qt = col.getQuestion(i);
+ if (qt instanceof MCQuestionText) { // skip answers other than Multiple Choice
+ dataEl.appendChild(createQuestionEl(doc, (MCQuestionText) qt));
}
}
- {
- final Element dataEl = doc.createElement("data");
- docEl.appendChild(dataEl);
- for (int i = 0; i < col.getSize(); i++) {
- final QuestionText qt = col.getQuestion(i);
- if (qt instanceof MCQuestionText) { // skip answers other than Multiple Choice
- dataEl.appendChild(createQuestionEl(doc, (MCQuestionText) qt));
- }
- }
- }
+
return doc;
}
@@ -295,6 +293,7 @@
}
/** {@inheritDoc} */
+ @Override
protected boolean canLoadImpl(final String uri) {
try {
final ErrorCapture capture = new ErrorCapture();
@@ -315,7 +314,7 @@
private boolean errors;
/** Create a new ErrorCapture. */
- ErrorCapture() {}
+ ErrorCapture() { }
/** {@inheritDoc} */
public void warning(final SAXParseException exception) throws SAXException {
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/io/KEduca.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/io/KEduca.java 2009-02-22 01:34:53 UTC (rev 1035)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/io/KEduca.java 2009-02-22 09:14:16 UTC (rev 1036)
@@ -43,7 +43,7 @@
import org.xml.sax.SAXException;
/** Interface for reading and writing KEduca files.
- * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
*/
public class KEduca extends AbstractJTestImport<QuestionCollection> implements Exporter<QuestionCollection> {
@@ -156,14 +156,14 @@
*/
private void setInfo(final QuestionCollection col, final Document doc) {
try {
- col.setTitle (xp.evaluate("Document/Info/title", doc));
- col.setCategory (xp.evaluate("Document/Info/category", doc));
- col.setType (xp.evaluate("Document/Info/type", doc));
- col.setLevel (xp.evaluate("Document/Info/level", doc));
- col.setLanguage (xp.evaluate("Document/Info/language", doc));
- col.setAuthorName (xp.evaluate("Document/Info/author/name", doc));
+ col.setTitle(xp.evaluate("Document/Info/title", doc));
+ col.setCategory(xp.evaluate("Document/Info/category", doc));
+ col.setType(xp.evaluate("Document/Info/type", doc));
+ col.setLevel(xp.evaluate("Document/Info/level", doc));
+ col.setLanguage(xp.evaluate("Document/Info/language", doc));
+ 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));
+ col.setAuthorWWW(xp.evaluate("Document/Info/author/www", doc));
} catch (final XPathExpressionException e) {
throw new Error(e);
}
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/io/XMLUtils.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/io/XMLUtils.java 2009-02-22 01:34:53 UTC (rev 1035)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/io/XMLUtils.java 2009-02-22 09:14:16 UTC (rev 1036)
@@ -20,14 +20,15 @@
import org.xml.sax.ext.DefaultHandler2;
/** Class for XML Utilities like EntityResolvers, ErrorHandlers and stuff like that.
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
*/
-public class XMLUtils {
+public final class XMLUtils {
/** Singleton instance. */
private static final XMLUtils INSTANCE = new XMLUtils();
/** Singleton constructor. */
- private XMLUtils() {}
+ private XMLUtils() { }
/** Get an instance of XMLUtils.
* @return instance of XMLUtils
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/AbstractManager.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/AbstractManager.java 2009-02-22 01:34:53 UTC (rev 1035)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/AbstractManager.java 2009-02-22 09:14:16 UTC (rev 1036)
@@ -62,6 +62,9 @@
* </ul>
* You may add and remove components to a Manager as you want.
* All menus you created will automatically be uptodate.
+ * @param <T> Type which is managed.
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
+ * @see Component#setVisible(boolean)
* @todo support icons for the managed components, e.g. use a client property ({@link JComponent#putClientProperty(Object,Object)} / {@link
* JComponent#getClientProperty(Object)}) (partly done)
* @todo support accelerators for the managed components (partly done)
@@ -70,17 +73,14 @@
* @todo provide access to SubAction, e.g. via an {@link ActionMap}
* @todo change actions to Map with T as key and SubAction as value.
* @todo support creation of single JCheckBoxes and JCheckBoxMenuitems.
- * @author $Author: chris $
- * @version $Id: AbstractManager.java,v 1.4 2006/01/31 23:09:18 chris Exp $
- * @see Component#setVisible(boolean)
*/
public abstract class AbstractManager<T extends JComponent> {
/** The actions of the components this Manager manages. */
- protected List<SubAction<?>> actions = new ArrayList<SubAction<?>>();
+ private List<SubAction<?>> actions = new ArrayList<SubAction<?>>();
/** The Menus created. */
- protected Collection<JMenu> cMenus = new ArrayList<JMenu>();
+ private Collection<JMenu> cMenus = new ArrayList<JMenu>();
/** Action Builder. */
private static final ActionBuilder ACTION_BUILDER = ActionBuilderFactory.getInstance().getActionBuilder("net.sf.japi.progs.jeduca.swing");
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/HelpManager.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/HelpManager.java 2009-02-22 01:34:53 UTC (rev 1035)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/HelpManager.java 2009-02-22 09:14:16 UTC (rev 1036)
@@ -31,14 +31,13 @@
import static javax.swing.WindowConstants.DO_NOTHING_ON_CLOSE;
/** Class for displaying help to the user.
- * @author $Author: chris $
- * @version $Id: HelpManager.java,v 1.1 2005/10/20 07:21:57 chris Exp $
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
* @todo initial page
*/
public class HelpManager extends WindowAdapter {
/** The HelpManager instances. */
- private static final Map<String,HelpManager> managers = new WeakHashMap<String,HelpManager>();
+ private static final Map<String, HelpManager> MANAGERS = new WeakHashMap<String, HelpManager>();
/** Get a HelpManager.
* If no HelpManager already exists, a new one will be created and remembered.
@@ -46,10 +45,10 @@
* @return HelpManager for <var>key</var>.
*/
public static HelpManager getHelp(final String key) {
- HelpManager help = managers.get(key);
+ HelpManager help = MANAGERS.get(key);
if (help == null) {
help = new HelpManager();
- managers.put(key, help);
+ MANAGERS.put(key, help);
}
return help;
}
@@ -65,7 +64,7 @@
dialog = new JFrame();
dialog.addWindowListener(this);
dialog.setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
- // TODO: dialog title
+ // TODO:2009-02-22:christianhujer:Dialog title.
helpView = new JEditorPane("text/html", "");
helpView.setEditable(false);
dialog.add(new JScrollPane(helpView));
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/InternalFrameManager.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/InternalFrameManager.java 2009-02-22 01:34:53 UTC (rev 1035)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/InternalFrameManager.java 2009-02-22 09:14:16 UTC (rev 1036)
@@ -23,8 +23,7 @@
/** Class for managing internal Frames.
* It provides a list of internal frames which can be hidden and shown along with a factory for creating a menu to show and hide these internal frames.
- * @author $Author: chris $
- * @version $Id: InternalFrameManager.java,v 1.3 2006/01/31 23:09:18 chris Exp $
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
*/
public class InternalFrameManager extends AbstractManager<JInternalFrame> {
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/MenuManager.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/MenuManager.java 2009-02-22 01:34:53 UTC (rev 1035)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/MenuManager.java 2009-02-22 09:14:16 UTC (rev 1036)
@@ -24,8 +24,7 @@
/** Class for managing menus.
* It provides a list of menus which can be hidden and shown along with a factory for creating a menu to show and hide these menus.
- * @author $Author: chris $
- * @version $Id: MenuManager.java,v 1.3 2006/01/31 23:09:18 chris Exp $
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
*/
public class MenuManager extends AbstractManager<JMenu> {
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/OpenURLPane.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/OpenURLPane.java 2009-02-22 01:34:53 UTC (rev 1035)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/OpenURLPane.java 2009-02-22 09:14:16 UTC (rev 1036)
@@ -46,10 +46,9 @@
/** Class for displaying a Dialog which requests that the user enters a URL or opens a File selection box.
* It works quite like {@link JFileChooser}, even a bit simpler.
* Just invoke one of the static methods {@link #showOpenURLDialog(Component)} or {@link #showOpenURLDialog(Component,JFileChooser)}.
- * @author $Author: chris $
- * @version $Id: OpenURLPane.java,v 1.4 2006/01/31 23:09:18 chris Exp $
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
*/
-public class OpenURLPane extends JComponent {
+public final class OpenURLPane extends JComponent {
/** Serial Version. */
private static final long serialVersionUID = 1L;
@@ -70,7 +69,7 @@
gbc.gridx = 0;
gbc.gridy = 1;
gbc.gridwidth = 7;
- gbc.fill=HORIZONTAL;
+ gbc.fill = HORIZONTAL;
gbc.weightx = 1.0;
gbc.anchor = CENTER;
add(input, gbc);
@@ -78,20 +77,20 @@
gbc.gridx = 7;
gbc.gridy = 1;
gbc.gridwidth = 1;
- gbc.fill=NONE;
+ gbc.fill = NONE;
gbc.weightx = 0.0;
add(new JButton(selectFile), gbc);
gbc.gridx = 0;
gbc.gridy = 2;
gbc.gridwidth = 8;
- gbc.fill=HORIZONTAL;
+ gbc.fill = HORIZONTAL;
add(new JSeparator(), gbc);
gbc.gridx = 0;
gbc.gridy = 3;
gbc.gridwidth = 2;
- gbc.fill=NONE;
+ gbc.fill = NONE;
gbc.weightx = 1.0;
add(new JLabel(), gbc);
@@ -166,10 +165,10 @@
pane.fileChooser = fileChooser;
final Window w = getWindowForComponent(parent);
if (w instanceof Dialog) {
- pane.dialog = new JDialog((Dialog)w, ActionBuilderFactory.getInstance().getActionBuilder("net.sf.japi.progs.jeduca.swing").getString("openURL"), true);
+ pane.dialog = new JDialog((Dialog) w, ActionBuilderFactory.getInstance().getActionBuilder("net.sf.japi.progs.jeduca.swing").getString("openURL"), true);
} else {
assert w instanceof Frame;
- pane.dialog = new JDialog((Frame)w, ActionBuilderFactory.getInstance().getActionBuilder("net.sf.japi.progs.jeduca.swing").getString("openURL"), true);
+ pane.dialog = new JDialog((Frame) w, ActionBuilderFactory.getInstance().getActionBuilder("net.sf.japi.progs.jeduca.swing").getString("openURL"), true);
}
pane.dialog.add(pane);
pane.dialog.pack();
@@ -233,6 +232,7 @@
public void selectFile() {
final int res = fileChooser.showOpenDialog(this);
if (res == JFileChooser.CANCEL_OPTION) {
+ // Nothing to do in case of cancel.
} else if (res == JFileChooser.APPROVE_OPTION) {
try {
input.setText(fileChooser.getSelectedFile().toURI().toURL().toString());
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/ToolBarManager.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/ToolBarManager.java 2009-02-22 01:34:53 UTC (rev 1035)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/ToolBarManager.java 2009-02-22 09:14:16 UTC (rev 1036)
@@ -34,8 +34,7 @@
* {@link BorderLayout} in being a layout manager for containers with toolbars.
* <p />
* Note: all added toolbars automatically get a popup menu for managing the toolbars.
- * @author $Author: chris $
- * @version $Id: ToolBarManager.java,v 1.4 2006/01/31 23:09:18 chris Exp $
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
* @see JToolBar
* @see ToolBarLayout
* @todo implement {@link #configureToolbars()}
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/action.properties
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/action.properties 2009-02-22 01:34:53 UTC (rev 1035)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/action.properties 2009-02-22 09:14:16 UTC (rev 1036)
@@ -39,8 +39,9 @@
selectFile.icon=general/Open16
openURL=Open URL
-laf.test=Look and Feels
+laf.text=Look and Feels
+
toolbarPopup.text=Toolbar Menu
toolbarPopupPos.text=Position
toolbarPopupTextpos.text=Text position
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/action_de.properties
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/action_de.properties 2009-02-22 01:34:53 UTC (rev 1035)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/action_de.properties 2009-02-22 09:14:16 UTC (rev 1036)
@@ -24,6 +24,7 @@
toolbars.mnemonic=S
configureToolbars.text=Symbolleisten anpassen...
configureToolbars.mnemonic=A
+
ok.text=OK
ok.mnemonic=O
ok.accel=ENTER
@@ -35,7 +36,7 @@
delete.text=L\xF6schen
delete.mnemonic=L
-#selectFile.icon=
+selectFile.icon=general/Open16
openURL=URL \xF6ffnen
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/io/AbstractCachingImporter.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/io/AbstractCachingImporter.java 2009-02-22 01:34:53 UTC (rev 1035)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/io/AbstractCachingImporter.java 2009-02-22 09:14:16 UTC (rev 1036)
@@ -26,6 +26,8 @@
* decorates the implementation with that intelligent caching mechanism.
* Subclasses cannot rely on {@link #canLoadImpl(String)} being invoked always, since if the stored information still is uptodate, calling the method
* would be superfluous.
+ * @param <T> Type which is imported.
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
* @todo enhance map access by using string pools
* @todo tell clients to use string pools
*/
@@ -35,13 +37,17 @@
* @author $Author: chris $
* @version $Id: AbstractCachingImporter.java,v 1.1 2004/12/28 23:51:22 chris Exp $
*/
- private static class Uptodate {
+ private static final class Uptodate {
+ /** Do not instantiate outside scope. */
+ private Uptodate() {
+ }
+
/** Whether the file can be loaded. */
- boolean canLoad;
+ private boolean canLoad;
/** Timestamp of file. */
- long lastModified;
+ private long lastModified;
} // class Uptodate
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/io/CachingImporterAdapter.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/io/CachingImporterAdapter.java 2009-02-22 01:34:53 UTC (rev 1035)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/io/CachingImporterAdapter.java 2009-02-22 09:14:16 UTC (rev 1036)
@@ -21,8 +21,8 @@
import org.xml.sax.SAXException;
/** Adapter class to have a caching implementation of {@link Importer} where the Importer-implementation cannot extend {@link AbstractCachingImporter}.
- * @author $Author: chris $
- * @version $Id: CachingImporterAdapter.java,v 1.1 2004/12/28 23:51:22 chris Exp $
+ * @param <T> Type which is imported.
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
*/
public class CachingImporterAdapter<T> extends AbstractCachingImporter<T> {
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/io/Exporter.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/io/Exporter.java 2009-02-22 01:34:53 UTC (rev 1035)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/io/Exporter.java 2009-02-22 09:14:16 UTC (rev 1036)
@@ -21,8 +21,8 @@
import java.io.IOException;
/** Interface for classes that are able to export docum...
[truncated message content] |
