Thread: [Japi-cvs] SF.net SVN: japi:[703] tools
Status: Beta
Brought to you by:
christianhujer
|
From: <chr...@us...> - 2008-11-30 15:25:32
|
Revision: 703
http://japi.svn.sourceforge.net/japi/?rev=703&view=rev
Author: christianhujer
Date: 2008-11-30 15:25:28 +0000 (Sun, 30 Nov 2008)
Log Message:
-----------
Added TodoScanner tool.
Added Paths:
-----------
tools/todoScanner/
tools/todoScanner/branches/
tools/todoScanner/tags/
tools/todoScanner/trunk/
tools/todoScanner/trunk/build.xml
tools/todoScanner/trunk/lib/
tools/todoScanner/trunk/module.properties
tools/todoScanner/trunk/src/
tools/todoScanner/trunk/src/doc/
tools/todoScanner/trunk/src/prj/
tools/todoScanner/trunk/src/prj/net/
tools/todoScanner/trunk/src/prj/net/sf/
tools/todoScanner/trunk/src/prj/net/sf/japi/
tools/todoScanner/trunk/src/prj/net/sf/japi/tools/
tools/todoScanner/trunk/src/prj/net/sf/japi/tools/todoScanner/
tools/todoScanner/trunk/src/prj/net/sf/japi/tools/todoScanner/TodoScanner.java
tools/todoScanner/trunk/src/tst/
tools/todoScanner/trunk/todoScanner.iml
Property changes on: tools/todoScanner/trunk
___________________________________________________________________
Added: svn:externals
+ common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
Added: tools/todoScanner/trunk/build.xml
===================================================================
--- tools/todoScanner/trunk/build.xml (rev 0)
+++ tools/todoScanner/trunk/build.xml 2008-11-30 15:25:28 UTC (rev 703)
@@ -0,0 +1,239 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ TodoScanner is a program for finding TODO comments.
+ ~ Copyright (C) 2008 Christian Hujer
+ ~
+ ~ This program is free software; you can redistribute it and/or modify
+ ~ it under the terms of the GNU General Public License as published by
+ ~ the Free Software Foundation; either version 2 of the License, or
+ ~ (at your option) any later version.
+ ~
+ ~ This program is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ ~ GNU General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU General Public License along
+ ~ with this program; if not, write to the Free Software Foundation, Inc.,
+ ~ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ -->
+
+<project name="Replacer" default="buildapp">
+
+ <property file="module.properties" />
+
+ <!-- Sets module.version to something very reasonable, depending on whether we're in trunk, tags, branches or somewhere else. -->
+ <basename property="dir.version" file="${user.dir}" />
+ <dirname property="parent" file="${user.dir}" />
+ <basename property="parentRegion" file="${parent}" />
+ <exec outputproperty="svnversion" executable="svnversion">
+ <env key="LC_ALL" value="C" />
+ </exec>
+ <condition property="module.version" value="trunk-${svnversion}">
+ <equals arg1="trunk" arg2="${dir.version}" />
+ </condition>
+ <condition property="module.version" value="branch-${dir.version}-${svnversion}">
+ <equals arg1="branches" arg2="${parentRegion}" />
+ </condition>
+ <condition property="module.version" value="${dir.version}">
+ <equals arg1="tags" arg2="${parentRegion}" />
+ </condition>
+ <property name="module.version" value="${parentRegion}-${dir.version}-${svnversion}" />
+
+ <property name="main.class" value="net.sf.japi.tools.replacer.Replacer" />
+
+ <taskdef name="pack200" classpath="common/antlib/Pack200Task.jar" classname="com.sun.tools.apache.ant.pack200.Pack200Task" />
+
+ <target
+ name = "clean"
+ description = "Cleans Sandbox"
+ >
+ <delete dir="classes" />
+ <delete dir="docs" />
+ </target>
+
+ <target
+ name = "compile"
+ description = "Compiles production classes"
+ >
+ <mkdir dir="classes/production/${module.shortname}" />
+ <javac
+ srcdir="src/prj"
+ destdir="classes/production/${module.shortname}"
+ encoding="utf-8"
+ source="1.5"
+ target="1.5"
+ >
+ <classpath>
+ <fileset dir="lib" includes="*.jar" excludes="LICENSE-*.jar" />
+ <fileset dir="common/lib" includes="*.jar" excludes="LICENSE-*.jar" />
+ </classpath>
+ </javac>
+ <copy
+ todir="classes/production/${module.shortname}"
+ >
+ <fileset dir="src/prj" includes="**/*.properties" excludes="test/**/*.properties" />
+ <fileset dir="src/prj" includes="META-INF/services/**" />
+ </copy>
+ <copy
+ todir="classes/production/${module.shortname}"
+ >
+ <fileset dir="lib" includes="LICENSE-*" />
+ <fileset dir="." includes="COPYING" />
+ </copy>
+ </target>
+
+ <target
+ name = "dist"
+ description = "Packs distribution archives."
+ depends = "clean, compile"
+ >
+ <delete dir="dist" />
+ <mkdir dir="dist" />
+ <property name="distName" value="dist/${module.name}-${module.version}" />
+ <parallel>
+ <tar tarfile="${distName}.src.tar">
+ <tarfileset dir="." prefix="${module.name}-${module.version}">
+ <include name="src/**" />
+ <include name="build.xml" />
+ </tarfileset>
+ </tar>
+ <zip destfile="${distName}.src.zip">
+ <zipfileset dir="." prefix="${module.name}-${module.version}">
+ <include name="src/**" />
+ <include name="build.xml" />
+ </zipfileset>
+ </zip>
+ <jar destfile="${distName}.src.jar">
+ <zipfileset dir="." prefix="${module.name}-${module.version}">
+ <include name="src/**" />
+ <include name="build.xml" />
+ </zipfileset>
+ </jar>
+ <jar destfile="${distName}.jar">
+ <zipfileset dir="classes/production/${module.shortname}"/>
+ <manifest>
+ <attribute name="Main-Class" value="${main.class}" />
+ <attribute name="Class-Path" value="lib/annotations.jar lib/japi-lib-lang-0.1.jar lib/japi-lib-swing-about-0.1.jar lib/japi-lib-swing-action-0.1.jar" />
+ <attribute name="Implementation-Title" value="${module.name}" />
+ <attribute name="Implementation-Vendor" value="Christian Hujer + the JAPI Developers" />
+ <attribute name="Implementation-Version" value="${module.version}" />
+ <attribute name="Implementation-URL" value="http://sourceforge.net/projects/japi/" />
+ </manifest>
+ </jar>
+ <tar tarfile="${distName}.doc.tar">
+ <tarfileset dir="." prefix="${module.name}-${module.version}">
+ <include name="docs/**" />
+ <include name="build.xml" />
+ </tarfileset>
+ </tar>
+ <zip destfile="${distName}.doc.zip">
+ <zipfileset dir="." prefix="${module.name}-${module.version}">
+ <include name="docs/**" />
+ <include name="build.xml" />
+ </zipfileset>
+ </zip>
+ <jar destfile="${distName}.doc.jar">
+ <zipfileset dir="." prefix="${module.name}-${module.version}">
+ <include name="docs/**" />
+ </zipfileset>
+ </jar>
+ </parallel>
+ <parallel>
+ <gzip src="${distName}.src.tar" destfile="${distName}.src.tar.gz" />
+ <bzip2 src="${distName}.src.tar" destfile="${distName}.src.tar.bz2" />
+ <gzip src="${distName}.doc.tar" destfile="${distName}.doc.tar.gz" />
+ <bzip2 src="${distName}.doc.tar" destfile="${distName}.doc.tar.bz2" />
+ <pack200
+ src="${distName}.jar"
+ destfile="${distName}.pack.gz"
+ gzipoutput="true"
+ stripdebug="true"
+ effort="9"
+ keepfileorder="false"
+ modificationtime="latest"
+ deflatehint="false"
+ />
+ </parallel>
+ <delete file="${distName}.src.tar" />
+ <delete file="${distName}.doc.tar" />
+ </target>
+
+ <target
+ name = "doc"
+ description = "Creates public javadoc documentation."
+ >
+ <mkdir dir="docs/api" />
+ <!--copy todir="docs/api" file="src/doc/api/public/copyright.html" />
+ <copy todir="docs/api" file="src/doc/api/public/.htaccess" /-->
+ <javadoc
+ destdir = "docs/api"
+ access = "protected"
+ author = "yes"
+ version = "yes"
+ locale = "en_US"
+ use = "yes"
+ splitindex = "yes"
+ windowtitle = "JAPI Library ${module.title} ${module.version} API documentation"
+ doctitle = "JAPI<br />Yet another Java API<br />Library ${module.title} ${module.version} API documentation"
+ header = "JAPI Library ${module.title} ${module.version}<br />API Documentation"
+ footer = "JAPI<br />Yet another Java API<br />Library ${module.title} ${module.version} API documentation"
+ bottom = "<div style=" text-align:center;">© 2005-2006 Christian Hujer. All rights reserved. See <a href="{@docRoot}/copyright.html">copyright</a></div>"
+ serialwarn = "yes"
+ charset = "utf-8"
+ docencoding = "utf-8"
+ encoding = "utf-8"
+ source = "1.5"
+ linksource = "yes"
+ link = "${user.javadoc.link}"
+ >
+ <!--
+ overview = "src/overview.html"
+ -->
+ <classpath>
+ <fileset dir="lib" includes="annotations.jar" />
+ </classpath>
+ <sourcepath>
+ <pathelement path="${user.javadoc.javasrc}" />
+ <pathelement path="src/prj" />
+ </sourcepath>
+ <packageset
+ dir="src/prj"
+ defaultexcludes="yes"
+ >
+ <include name="net/**" />
+ </packageset>
+ <taglet name="net.sf.japi.taglets.FixmeTaglet" path="${commonPath}/antlib/japi-lib-taglets-trunk.jar" />
+ <taglet name="net.sf.japi.taglets.HistoryTaglet" path="${commonPath}/antlib/japi-lib-taglets-trunk.jar" />
+ <taglet name="net.sf.japi.taglets.InvariantTaglet" path="${commonPath}/antlib/japi-lib-taglets-trunk.jar" />
+ <taglet name="net.sf.japi.taglets.NoteTaglet" path="${commonPath}/antlib/japi-lib-taglets-trunk.jar" />
+ <taglet name="net.sf.japi.taglets.PostconditionTaglet" path="${commonPath}/antlib/japi-lib-taglets-trunk.jar" />
+ <taglet name="net.sf.japi.taglets.PreconditionTaglet" path="${commonPath}/antlib/japi-lib-taglets-trunk.jar" />
+ <taglet name="net.sf.japi.taglets.ReturnValueTaglet" path="${commonPath}/antlib/japi-lib-taglets-trunk.jar" />
+ <taglet name="net.sf.japi.taglets.TodoTaglet" path="${commonPath}/antlib/japi-lib-taglets-trunk.jar" />
+ <taglet name="net.sf.japi.taglets.WarningTaglet" path="${commonPath}/antlib/japi-lib-taglets-trunk.jar" />
+ <taglet name="net.sf.japi.taglets.XxxTaglet" path="${commonPath}/antlib/japi-lib-taglets-trunk.jar" />
+ </javadoc>
+ </target>
+
+ <target
+ name = "buildapp"
+ description = "Creates executable jar"
+ depends = "compile"
+ >
+ <property name="appName" value="${module.name}-${module.version}-app" />
+ <jar destfile="${appName}.jar">
+ <zipfileset dir="classes/production/${module.shortname}"/>
+ <zipgroupfileset dir="lib" includes="*.jar" excludes="LICENSE-*.jar" />
+ <manifest>
+ <attribute name="Main-Class" value="${main.class}" />
+ <!--attribute name="Class-Path" value="lib/annotations.jar lib/japi-lib-lang-0.1.jar lib/japi-lib-swing-about-0.1.jar lib/japi-lib-swing-action-0.1.jar" /-->
+ <attribute name="Implementation-Title" value="${module.name}" />
+ <attribute name="Implementation-Vendor" value="Christian Hujer + the JAPI Developers" />
+ <attribute name="Implementation-Version" value="${module.version}" />
+ <attribute name="Implementation-URL" value="http://sourceforge.net/projects/japi/" />
+ </manifest>
+ </jar>
+ </target>
+
+</project>
Property changes on: tools/todoScanner/trunk/build.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:eol-style
+ LF
Added: tools/todoScanner/trunk/module.properties
===================================================================
--- tools/todoScanner/trunk/module.properties (rev 0)
+++ tools/todoScanner/trunk/module.properties 2008-11-30 15:25:28 UTC (rev 703)
@@ -0,0 +1,23 @@
+#
+# Replacer is a command for performing regular expression substitutions.
+# Copyright (C) 2008 Christian Hujer.
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library 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
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+#
+
+update.focus=none
+module.name=TodoScanner
+module.shortname=TodoScanner
+module.title=TodoScanner
Property changes on: tools/todoScanner/trunk/module.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ LF
Added: tools/todoScanner/trunk/src/prj/net/sf/japi/tools/todoScanner/TodoScanner.java
===================================================================
--- tools/todoScanner/trunk/src/prj/net/sf/japi/tools/todoScanner/TodoScanner.java (rev 0)
+++ tools/todoScanner/trunk/src/prj/net/sf/japi/tools/todoScanner/TodoScanner.java 2008-11-30 15:25:28 UTC (rev 703)
@@ -0,0 +1,78 @@
+package net.sf.japi.tools.todoScanner;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.nio.charset.Charset;
+import java.util.List;
+import net.sf.japi.io.args.ArgParser;
+import net.sf.japi.io.args.BasicCommand;
+import org.jetbrains.annotations.NotNull;
+
+/** Scanner for comments of specific formats like to do comments.
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
+ */
+public class TodoScanner extends BasicCommand {
+
+ /** The file encoding that is used for reading and writing files as weil es parsing substitutions from {@link System#in}. */
+ private Charset encoding = Charset.defaultCharset();
+
+ /** Main program.
+ * @param args Command line arguments (try --help).
+ */
+ public static void main(@NotNull final String... args) {
+ ArgParser.simpleParseAndRun(new TodoScanner(), args);
+ }
+
+ /** {@inheritDoc} */
+ @SuppressWarnings({"InstanceMethodNamingConvention"})
+ public int run(@NotNull final List<String> args) throws Exception {
+ if (args.size() == 0) {
+ scanForTodos(System.in);
+ } else {
+ for (final String filename : args) {
+ scanForTodos(new File(filename));
+ }
+ }
+ return 0;
+ }
+
+ /** Scans for todos in the specified file.
+ * @param file File to scan for todos.
+ * @throws IOException In case of I/O problems.
+ */
+ public void scanForTodos(@NotNull final File file) throws IOException {
+ final InputStream in = new FileInputStream(file);
+ try {
+ scanForTodos(in);
+ } finally {
+ in.close();
+ }
+ }
+
+ /** Scans for todos in the specified stream.
+ * @param in Stream to scan for todos.
+ * @throws IOException In case of I/O problems.
+ */
+ public void scanForTodos(@NotNull final InputStream in) throws IOException {
+ scanForTodos(new InputStreamReader(in, encoding));
+ }
+
+ /** Scans for todos in the specified stream.
+ * @param cin Stream to scan for todos.
+ * @throws IOException In case of I/O problems.
+ */
+ public void scanForTodos(@NotNull final Reader cin) throws IOException {
+ final BufferedReader in = cin instanceof BufferedReader ? (BufferedReader) cin : new BufferedReader(cin);
+ int lineNumber = 0;
+ for (String line; (line = in.readLine()) != null; lineNumber++) {
+ if (line.matches("TODO")) {
+ System.out.println(lineNumber + ": " + line);
+ }
+ }
+ }
+}
Property changes on: tools/todoScanner/trunk/src/prj/net/sf/japi/tools/todoScanner/TodoScanner.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ LF
Added: tools/todoScanner/trunk/todoScanner.iml
===================================================================
--- tools/todoScanner/trunk/todoScanner.iml (rev 0)
+++ tools/todoScanner/trunk/todoScanner.iml 2008-11-30 15:25:28 UTC (rev 703)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module relativePaths="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/doc" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/prj" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/tst" isTestSource="true" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="libs-argparser" />
+ <orderEntry type="library" name="annotations" level="project" />
+ <orderEntry type="library" name="junit" level="project" />
+ <orderEntryProperties />
+ </component>
+</module>
+
Property changes on: tools/todoScanner/trunk/todoScanner.iml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
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...> - 2008-11-30 15:27:15
|
Revision: 704
http://japi.svn.sourceforge.net/japi/?rev=704&view=rev
Author: christianhujer
Date: 2008-11-30 15:27:12 +0000 (Sun, 30 Nov 2008)
Log Message:
-----------
Added Tool MidiDeviceLister.
Added Paths:
-----------
tools/midiDeviceLister/
tools/midiDeviceLister/branches/
tools/midiDeviceLister/tags/
tools/midiDeviceLister/trunk/
tools/midiDeviceLister/trunk/midiDeviceLister.iml
tools/midiDeviceLister/trunk/src/
tools/midiDeviceLister/trunk/src/doc/
tools/midiDeviceLister/trunk/src/prj/
tools/midiDeviceLister/trunk/src/prj/net/
tools/midiDeviceLister/trunk/src/prj/net/sf/
tools/midiDeviceLister/trunk/src/prj/net/sf/japi/
tools/midiDeviceLister/trunk/src/prj/net/sf/japi/tools/
tools/midiDeviceLister/trunk/src/prj/net/sf/japi/tools/midiDeviceLister/
tools/midiDeviceLister/trunk/src/prj/net/sf/japi/tools/midiDeviceLister/MidiDeviceLister.java
tools/midiDeviceLister/trunk/src/tst/
Added: tools/midiDeviceLister/trunk/midiDeviceLister.iml
===================================================================
--- tools/midiDeviceLister/trunk/midiDeviceLister.iml (rev 0)
+++ tools/midiDeviceLister/trunk/midiDeviceLister.iml 2008-11-30 15:27:12 UTC (rev 704)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module relativePaths="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/doc" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/prj" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/tst" isTestSource="true" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="libs-argparser" />
+ <orderEntry type="library" name="annotations" level="project" />
+ <orderEntry type="library" name="junit" level="project" />
+ <orderEntryProperties />
+ </component>
+</module>
+
Property changes on: tools/midiDeviceLister/trunk/midiDeviceLister.iml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:eol-style
+ LF
Added: tools/midiDeviceLister/trunk/src/prj/net/sf/japi/tools/midiDeviceLister/MidiDeviceLister.java
===================================================================
--- tools/midiDeviceLister/trunk/src/prj/net/sf/japi/tools/midiDeviceLister/MidiDeviceLister.java (rev 0)
+++ tools/midiDeviceLister/trunk/src/prj/net/sf/japi/tools/midiDeviceLister/MidiDeviceLister.java 2008-11-30 15:27:12 UTC (rev 704)
@@ -0,0 +1,56 @@
+package net.sf.japi.tools.midiDeviceLister;
+
+import java.util.List;
+import javax.sound.midi.MidiDevice;
+import javax.sound.midi.MidiSystem;
+import javax.sound.midi.Sequencer;
+import javax.sound.midi.Synthesizer;
+import net.sf.japi.io.args.ArgParser;
+import net.sf.japi.io.args.BasicCommand;
+import org.jetbrains.annotations.NotNull;
+
+/** A small command line program that lists Midi Devices.
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
+ */
+public class MidiDeviceLister extends BasicCommand {
+
+ /** Main program.
+ * @param args Command line arguments (ignored).
+ */
+ public static void main(final String... args){
+ ArgParser.simpleParseAndRun(new MidiDeviceLister(), args);
+ }
+
+ /** {@inheritDoc} */
+ @SuppressWarnings({"InstanceMethodNamingConvention"})
+ public int run(@NotNull final List<String> args) throws Exception {
+ for (final MidiDevice.Info deviceInfo : MidiSystem.getMidiDeviceInfo()) {
+ System.out.println("Name: " + deviceInfo.getName());
+ System.out.println("Version: " + deviceInfo.getVendor());
+ System.out.println("Vendor: " + deviceInfo.getVersion());
+ System.out.println("Description: " + deviceInfo.getDescription());
+ final MidiDevice device = MidiSystem.getMidiDevice(deviceInfo);
+ System.out.println("Maximum transmitters: " + getMaxInfo(device.getMaxTransmitters()));
+ System.out.println("Maximum receivers: " + getMaxInfo(device.getMaxReceivers()));
+ System.out.println("Sequencer: " + (device instanceof Sequencer));
+ System.out.println("Synthesizer: " + (device instanceof Synthesizer));
+ System.out.println();
+ }
+ return 0;
+ }
+
+ /** Returns a String representing a transmitter or receiver maximum count information.
+ * @param count Count to represent as String.
+ * @return String representing that count.
+ */
+ private static String getMaxInfo(final int count) {
+ switch (count) {
+ case -1:
+ return "-1 (Unlimited)";
+ case 0:
+ return "0 (Unsupported)";
+ default:
+ return Integer.toString(count);
+ }
+ }
+}
Property changes on: tools/midiDeviceLister/trunk/src/prj/net/sf/japi/tools/midiDeviceLister/MidiDeviceLister.java
___________________________________________________________________
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...> - 2008-11-30 15:54:53
|
Revision: 705
http://japi.svn.sourceforge.net/japi/?rev=705&view=rev
Author: christianhujer
Date: 2008-11-30 15:54:49 +0000 (Sun, 30 Nov 2008)
Log Message:
-----------
Added tool GdbControl.
Added Paths:
-----------
tools/gdbControl/
tools/gdbControl/branches/
tools/gdbControl/tags/
tools/gdbControl/trunk/
tools/gdbControl/trunk/build.xml
tools/gdbControl/trunk/gdbControl.iml
tools/gdbControl/trunk/lib/
tools/gdbControl/trunk/lib/annotations.jar
tools/gdbControl/trunk/lib/japi-lib-argparser-trunk.jar
tools/gdbControl/trunk/module.properties
tools/gdbControl/trunk/src/
tools/gdbControl/trunk/src/doc/
tools/gdbControl/trunk/src/prj/
tools/gdbControl/trunk/src/prj/net/
tools/gdbControl/trunk/src/prj/net/sf/
tools/gdbControl/trunk/src/prj/net/sf/japi/
tools/gdbControl/trunk/src/prj/net/sf/japi/tools/
tools/gdbControl/trunk/src/prj/net/sf/japi/tools/gdbcontrol/
tools/gdbControl/trunk/src/prj/net/sf/japi/tools/gdbcontrol/ComWithGdb.java
tools/gdbControl/trunk/src/tst/
Property changes on: tools/gdbControl/trunk
___________________________________________________________________
Added: svn:externals
+ common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
Added: tools/gdbControl/trunk/build.xml
===================================================================
--- tools/gdbControl/trunk/build.xml (rev 0)
+++ tools/gdbControl/trunk/build.xml 2008-11-30 15:54:49 UTC (rev 705)
@@ -0,0 +1,238 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Replacer is a program for performing an in-place search and replace
+ ~ based on regular expressions.
+ ~ Copyright (C) 2007 Christian Hujer
+ ~
+ ~ This program is free software; you can redistribute it and/or modify
+ ~ it under the terms of the GNU General Public License as published by
+ ~ the Free Software Foundation; either version 2 of the License, or
+ ~ (at your option) any later version.
+ ~
+ ~ This program is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ ~ GNU General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU General Public License along
+ ~ with this program; if not, write to the Free Software Foundation, Inc.,
+ ~ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ -->
+
+<project name="GdbControl" default="buildapp">
+
+ <property file="module.properties" />
+
+ <!-- Sets module.version to something very reasonable, depending on whether we're in trunk, tags, branches or somewhere else. -->
+ <basename property="dir.version" file="${user.dir}" />
+ <dirname property="parent" file="${user.dir}" />
+ <basename property="parentRegion" file="${parent}" />
+ <exec outputproperty="svnversion" executable="svnversion">
+ <env key="LC_ALL" value="C" />
+ </exec>
+ <condition property="module.version" value="trunk-${svnversion}">
+ <equals arg1="trunk" arg2="${dir.version}" />
+ </condition>
+ <condition property="module.version" value="branch-${dir.version}-${svnversion}">
+ <equals arg1="branches" arg2="${parentRegion}" />
+ </condition>
+ <condition property="module.version" value="${dir.version}">
+ <equals arg1="tags" arg2="${parentRegion}" />
+ </condition>
+ <property name="module.version" value="${parentRegion}-${dir.version}-${svnversion}" />
+
+ <taskdef name="pack200" classpath="common/antlib/Pack200Task.jar" classname="com.sun.tools.apache.ant.pack200.Pack200Task" />
+
+ <target
+ name = "clean"
+ description = "Cleans Sandbox"
+ >
+ <delete dir="classes" />
+ <delete dir="docs" />
+ </target>
+
+ <target
+ name = "compile"
+ description = "Compiles production classes"
+ >
+ <mkdir dir="classes/production/${module.shortname}" />
+ <javac
+ srcdir="src/prj"
+ destdir="classes/production/${module.shortname}"
+ encoding="utf-8"
+ source="1.5"
+ target="1.5"
+ >
+ <classpath>
+ <fileset dir="lib" includes="*.jar" excludes="LICENSE-*.jar" />
+ <fileset dir="common/lib" includes="*.jar" excludes="LICENSE-*.jar" />
+ </classpath>
+ </javac>
+ <copy
+ todir="classes/production/${module.shortname}"
+ >
+ <fileset dir="src/prj" includes="**/*.properties" excludes="test/**/*.properties" />
+ <fileset dir="src/prj" includes="META-INF/services/**" />
+ </copy>
+ <copy
+ todir="classes/production/${module.shortname}"
+ >
+ <fileset dir="lib" includes="LICENSE-*" />
+ <fileset dir="." includes="COPYING" />
+ </copy>
+ </target>
+
+ <target
+ name = "dist"
+ description = "Packs distribution archives."
+ depends = "clean, compile"
+ >
+ <delete dir="dist" />
+ <mkdir dir="dist" />
+ <property name="distName" value="dist/${module.name}-${module.version}" />
+ <parallel>
+ <tar tarfile="${distName}.src.tar">
+ <tarfileset dir="." prefix="${module.name}-${module.version}">
+ <include name="src/**" />
+ <include name="build.xml" />
+ </tarfileset>
+ </tar>
+ <zip destfile="${distName}.src.zip">
+ <zipfileset dir="." prefix="${module.name}-${module.version}">
+ <include name="src/**" />
+ <include name="build.xml" />
+ </zipfileset>
+ </zip>
+ <jar destfile="${distName}.src.jar">
+ <zipfileset dir="." prefix="${module.name}-${module.version}">
+ <include name="src/**" />
+ <include name="build.xml" />
+ </zipfileset>
+ </jar>
+ <jar destfile="${distName}.jar">
+ <zipfileset dir="classes/production/${module.shortname}"/>
+ <manifest>
+ <attribute name="Main-Class" value="${main.class}" />
+ <attribute name="Class-Path" value="lib/annotations.jar lib/japi-lib-lang-0.1.jar lib/japi-lib-swing-about-0.1.jar lib/japi-lib-swing-action-0.1.jar" />
+ <attribute name="Implementation-Title" value="${module.name}" />
+ <attribute name="Implementation-Vendor" value="Christian Hujer + the JAPI Developers" />
+ <attribute name="Implementation-Version" value="${module.version}" />
+ <attribute name="Implementation-URL" value="http://sourceforge.net/projects/japi/" />
+ </manifest>
+ </jar>
+ <tar tarfile="${distName}.doc.tar">
+ <tarfileset dir="." prefix="${module.name}-${module.version}">
+ <include name="docs/**" />
+ <include name="build.xml" />
+ </tarfileset>
+ </tar>
+ <zip destfile="${distName}.doc.zip">
+ <zipfileset dir="." prefix="${module.name}-${module.version}">
+ <include name="docs/**" />
+ <include name="build.xml" />
+ </zipfileset>
+ </zip>
+ <jar destfile="${distName}.doc.jar">
+ <zipfileset dir="." prefix="${module.name}-${module.version}">
+ <include name="docs/**" />
+ </zipfileset>
+ </jar>
+ </parallel>
+ <parallel>
+ <gzip src="${distName}.src.tar" destfile="${distName}.src.tar.gz" />
+ <bzip2 src="${distName}.src.tar" destfile="${distName}.src.tar.bz2" />
+ <gzip src="${distName}.doc.tar" destfile="${distName}.doc.tar.gz" />
+ <bzip2 src="${distName}.doc.tar" destfile="${distName}.doc.tar.bz2" />
+ <pack200
+ src="${distName}.jar"
+ destfile="${distName}.pack.gz"
+ gzipoutput="true"
+ stripdebug="true"
+ effort="9"
+ keepfileorder="false"
+ modificationtime="latest"
+ deflatehint="false"
+ />
+ </parallel>
+ <delete file="${distName}.src.tar" />
+ <delete file="${distName}.doc.tar" />
+ </target>
+
+ <target
+ name = "doc"
+ description = "Creates public javadoc documentation."
+ >
+ <mkdir dir="docs/api" />
+ <!--copy todir="docs/api" file="src/doc/api/public/copyright.html" />
+ <copy todir="docs/api" file="src/doc/api/public/.htaccess" /-->
+ <javadoc
+ destdir = "docs/api"
+ access = "protected"
+ author = "yes"
+ version = "yes"
+ locale = "en_US"
+ use = "yes"
+ splitindex = "yes"
+ windowtitle = "JAPI Library ${module.title} ${module.version} API documentation"
+ doctitle = "JAPI<br />Yet another Java API<br />Library ${module.title} ${module.version} API documentation"
+ header = "JAPI Library ${module.title} ${module.version}<br />API Documentation"
+ footer = "JAPI<br />Yet another Java API<br />Library ${module.title} ${module.version} API documentation"
+ bottom = "<div style=" text-align:center;">© 2005-2006 Christian Hujer. All rights reserved. See <a href="{@docRoot}/copyright.html">copyright</a></div>"
+ serialwarn = "yes"
+ charset = "utf-8"
+ docencoding = "utf-8"
+ encoding = "utf-8"
+ source = "1.5"
+ linksource = "yes"
+ link = "${user.javadoc.link}"
+ >
+ <!--
+ overview = "src/overview.html"
+ -->
+ <classpath>
+ <fileset dir="lib" includes="annotations.jar" />
+ </classpath>
+ <sourcepath>
+ <pathelement path="${user.javadoc.javasrc}" />
+ <pathelement path="src/prj" />
+ </sourcepath>
+ <packageset
+ dir="src/prj"
+ defaultexcludes="yes"
+ >
+ <include name="net/**" />
+ </packageset>
+ <taglet name="net.sf.japi.taglets.FixmeTaglet" path="${commonPath}/antlib/japi-lib-taglets-trunk.jar" />
+ <taglet name="net.sf.japi.taglets.HistoryTaglet" path="${commonPath}/antlib/japi-lib-taglets-trunk.jar" />
+ <taglet name="net.sf.japi.taglets.InvariantTaglet" path="${commonPath}/antlib/japi-lib-taglets-trunk.jar" />
+ <taglet name="net.sf.japi.taglets.NoteTaglet" path="${commonPath}/antlib/japi-lib-taglets-trunk.jar" />
+ <taglet name="net.sf.japi.taglets.PostconditionTaglet" path="${commonPath}/antlib/japi-lib-taglets-trunk.jar" />
+ <taglet name="net.sf.japi.taglets.PreconditionTaglet" path="${commonPath}/antlib/japi-lib-taglets-trunk.jar" />
+ <taglet name="net.sf.japi.taglets.ReturnValueTaglet" path="${commonPath}/antlib/japi-lib-taglets-trunk.jar" />
+ <taglet name="net.sf.japi.taglets.TodoTaglet" path="${commonPath}/antlib/japi-lib-taglets-trunk.jar" />
+ <taglet name="net.sf.japi.taglets.WarningTaglet" path="${commonPath}/antlib/japi-lib-taglets-trunk.jar" />
+ <taglet name="net.sf.japi.taglets.XxxTaglet" path="${commonPath}/antlib/japi-lib-taglets-trunk.jar" />
+ </javadoc>
+ </target>
+
+ <target
+ name = "buildapp"
+ description = "Creates executable jar"
+ depends = "compile"
+ >
+ <property name="appName" value="${module.name}-${module.version}-app" />
+ <jar destfile="${appName}.jar">
+ <zipfileset dir="classes/production/${module.shortname}"/>
+ <zipgroupfileset dir="lib" includes="*.jar" excludes="LICENSE-*.jar" />
+ <manifest>
+ <attribute name="Main-Class" value="${main.class}" />
+ <!--attribute name="Class-Path" value="lib/annotations.jar lib/japi-lib-lang-0.1.jar lib/japi-lib-swing-about-0.1.jar lib/japi-lib-swing-action-0.1.jar" /-->
+ <attribute name="Implementation-Title" value="${module.name}" />
+ <attribute name="Implementation-Vendor" value="Christian Hujer + the JAPI Developers" />
+ <attribute name="Implementation-Version" value="${module.version}" />
+ <attribute name="Implementation-URL" value="http://sourceforge.net/projects/japi/" />
+ </manifest>
+ </jar>
+ </target>
+
+</project>
Property changes on: tools/gdbControl/trunk/build.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:eol-style
+ LF
Added: tools/gdbControl/trunk/gdbControl.iml
===================================================================
--- tools/gdbControl/trunk/gdbControl.iml (rev 0)
+++ tools/gdbControl/trunk/gdbControl.iml 2008-11-30 15:54:49 UTC (rev 705)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module relativePaths="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/doc" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/prj" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/tst" isTestSource="true" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="library" name="annotations" level="project" />
+ <orderEntry type="library" name="junit" level="project" />
+ <orderEntryProperties />
+ </component>
+</module>
+
Property changes on: tools/gdbControl/trunk/gdbControl.iml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:eol-style
+ LF
Added: tools/gdbControl/trunk/lib/annotations.jar
===================================================================
(Binary files differ)
Property changes on: tools/gdbControl/trunk/lib/annotations.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: tools/gdbControl/trunk/lib/japi-lib-argparser-trunk.jar
===================================================================
(Binary files differ)
Property changes on: tools/gdbControl/trunk/lib/japi-lib-argparser-trunk.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: tools/gdbControl/trunk/module.properties
===================================================================
--- tools/gdbControl/trunk/module.properties (rev 0)
+++ tools/gdbControl/trunk/module.properties 2008-11-30 15:54:49 UTC (rev 705)
@@ -0,0 +1,24 @@
+#
+# GdbControl is a program / library / frontend from Java to gdb.
+# Copyright (C) 2008 Christian Hujer.
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library 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
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+#
+
+update.focus=none
+module.name=GdbCobtrol
+module.shortname=GdbCobtrol
+module.title=GdbCobtrol
+main.class=net.sf.japi.tools.gdbcontrol.ComWithGdb
Property changes on: tools/gdbControl/trunk/module.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ LF
Added: tools/gdbControl/trunk/src/prj/net/sf/japi/tools/gdbcontrol/ComWithGdb.java
===================================================================
--- tools/gdbControl/trunk/src/prj/net/sf/japi/tools/gdbcontrol/ComWithGdb.java (rev 0)
+++ tools/gdbControl/trunk/src/prj/net/sf/japi/tools/gdbcontrol/ComWithGdb.java 2008-11-30 15:54:49 UTC (rev 705)
@@ -0,0 +1,180 @@
+package net.sf.japi.tools.gdbcontrol;
+
+import java.io.ByteArrayOutputStream;
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import org.jetbrains.annotations.NotNull;
+
+/** A Java wrapper for communication with gdb.
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
+ * <!-- Copyright 2008 Christian Hujer. -->
+ */
+public final class ComWithGdb {
+
+ /** The prompt String. */
+ private final CharSequence prompt = "(gdb) ";
+
+ /** The process of gdb. */
+ private Process gdbProcess;
+
+ /** InputStream to read data from gdb's stdout. */
+ private InputStream gdbIn;
+
+ /** OutputStream to write data to gdb's stdin. */
+ private OutputStream gdbOut;
+
+ /** OutputStream to read data from gdb's stderr. */
+ private InputStream gdbErr;
+
+ /** Own InputStream to read data from usually stdin. */
+ private InputStream stdIn;
+
+ /** Own OutputStream to write data to usually stdout. */
+ private OutputStream stdOut;
+
+ /** Own OutputStream to write data to usually stderr. */
+ private OutputStream stdErr;
+
+ /** The encoding to use. */
+ private String encoding = "US-ASCII";
+
+ /** Collector for read operations. */
+ private final ByteArrayOutputStream collector = new ByteArrayOutputStream();
+
+ /** Creates a ComWithGdb.
+ * @param name Name of the program to debug.
+ * @throws IOException in case of I/O problems.
+ */
+ public ComWithGdb(final String name) throws IOException {
+ gdbProcess = Runtime.getRuntime().exec("gdb " + name);
+ gdbIn = gdbProcess.getInputStream();
+ gdbOut = gdbProcess.getOutputStream();
+ gdbErr = gdbProcess.getErrorStream();
+ stdIn = System.in;
+ stdOut = System.out;
+ stdErr = System.err;
+ readUntilPrompt();
+ }
+
+ /** Starts a debug session.
+ * @throws IOException in case of I/O problems.
+ */
+ public void start() throws IOException {
+ execute("start");
+ }
+
+ /** Reads from gdb until gdb sends a prompt.
+ * @return The text until and including the prompt.
+ * @throws IOException in case of I/O problems.
+ */
+ public String readUntilPrompt() throws IOException {
+ return readUntil(prompt);
+ }
+
+ /** Reads until a specific String is found.
+ * @warning This implementation will only work correctly if the text does not contain duplicate characters.
+ * It works fine for Strings like "(gdb) ".
+ * It will not work reliably for Strings like "A_AB" because this will not find "A_AB" in "A_A_AB".
+ * @param text The text to search, usually a prompt.
+ * @return The data that was read until the text was found, including that text itself.
+ * @throws IOException in case of I/O problems.
+ */
+ public synchronized String readUntil(@NotNull final CharSequence text) throws IOException {
+ try {
+ int match = 0;
+ for (int c; (c = gdbIn.read()) != -1;) {
+ stdOut.write(c);
+ collector.write(c);
+ if ((c == text.charAt(match)) || (c == text.charAt(match = 0))) {
+ match++;
+ if (match == text.length()) {
+ return collector.toString(encoding);
+ }
+ }
+ }
+ throw new EOFException("Unexpected end of data from gdb.");
+ } finally {
+ stdOut.flush();
+ }
+ }
+
+ /** Sends a Command to gdb and waits for the next prompt.
+ * @param command Command to send.
+ * @return What gdb responded to that command (including the prompt).
+ * @throws IOException in case of I/O problems.
+ */
+ public String execute(@NotNull final String command) throws IOException {
+ send(command);
+ return readUntilPrompt();
+ }
+
+ /** Sends a Command to gdb.
+ * @param command Command to send.
+ * @throws IOException in case of I/O problems.
+ */
+ public void send(@NotNull final String command) throws IOException {
+ final byte[] data = command.getBytes(encoding);
+ stdOut.write(ANSI.l_blue);
+ gdbOut.write(data);
+ stdOut.write(data);
+ gdbOut.write('\n');
+ stdOut.write('\n');
+ gdbOut.flush();
+ stdOut.write(ANSI.normal);
+ stdOut.flush();
+ }
+
+ /** Quits the gdb.
+ * @return exit value of the gdb process.
+ * @throws IOException in case of I/O problems.
+ * @throws InterruptedException in case the calling thread was interrupted while waiting for gdb's termination.
+ */
+ public int quit() throws IOException, InterruptedException {
+ send("quit");
+ gdbProcess.waitFor();
+ final int retVal = gdbProcess.exitValue();
+ gdbProcess.destroy();
+ gdbProcess = null;
+ return retVal;
+ }
+
+ /** Main program.
+ * @param args Command line arguments - name of the executable to debug.
+ * @throws IOException in case of I/O problems.
+ * @throws InterruptedException in case the calling thread was interrupted while waiting for gdb's termination.
+ */
+ public static void main(final String... args) throws IOException, InterruptedException {
+ final ComWithGdb gdb = new ComWithGdb(args[0]);
+ gdb.execute("start");
+ gdb.quit();
+ }
+
+ /** ANSI color escape sequences. */
+ @SuppressWarnings({"MagicNumber", "ClassNamingConvention"})
+ static class ANSI {
+ static byte[] d_black = { 0x1B, 0x5B, 0x30, 0x30, 0x3B, 0x33, 0x30, 0x6D };
+ static byte[] d_red = { 0x1B, 0x5B, 0x30, 0x30, 0x3B, 0x33, 0x31, 0x6D };
+ static byte[] d_green = { 0x1B, 0x5B, 0x30, 0x30, 0x3B, 0x33, 0x32, 0x6D };
+ static byte[] d_yellow = { 0x1B, 0x5B, 0x30, 0x30, 0x3B, 0x33, 0x33, 0x6D };
+ static byte[] d_blue = { 0x1B, 0x5B, 0x30, 0x30, 0x3B, 0x33, 0x34, 0x6D };
+ static byte[] d_magenta = { 0x1B, 0x5B, 0x30, 0x30, 0x3B, 0x33, 0x35, 0x6D };
+ static byte[] d_cyan = { 0x1B, 0x5B, 0x30, 0x30, 0x3B, 0x33, 0x36, 0x6D };
+ static byte[] d_white = { 0x1B, 0x5B, 0x30, 0x30, 0x3B, 0x33, 0x37, 0x6D };
+
+ static byte[] l_black = { 0x1B, 0x5B, 0x30, 0x31, 0x3B, 0x33, 0x30, 0x6D };
+ static byte[] l_red = { 0x1B, 0x5B, 0x30, 0x31, 0x3B, 0x33, 0x31, 0x6D };
+ static byte[] l_green = { 0x1B, 0x5B, 0x30, 0x31, 0x3B, 0x33, 0x32, 0x6D };
+ static byte[] l_yellow = { 0x1B, 0x5B, 0x30, 0x31, 0x3B, 0x33, 0x33, 0x6D };
+ static byte[] l_blue = { 0x1B, 0x5B, 0x30, 0x31, 0x3B, 0x33, 0x34, 0x6D };
+ static byte[] l_magenta = { 0x1B, 0x5B, 0x30, 0x31, 0x3B, 0x33, 0x35, 0x6D };
+ static byte[] l_cyan = { 0x1B, 0x5B, 0x30, 0x31, 0x3B, 0x33, 0x36, 0x6D };
+ static byte[] l_white = { 0x1B, 0x5B, 0x30, 0x31, 0x3B, 0x33, 0x37, 0x6D };
+
+ static byte[] normal = { 0x1B, 0x5B, 0x30, 0x30, 0x6D };
+
+ private ANSI() {
+ }
+ }
+}
Property changes on: tools/gdbControl/trunk/src/prj/net/sf/japi/tools/gdbcontrol/ComWithGdb.java
___________________________________________________________________
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...> - 2008-11-30 16:11:04
|
Revision: 708
http://japi.svn.sourceforge.net/japi/?rev=708&view=rev
Author: christianhujer
Date: 2008-11-30 16:10:59 +0000 (Sun, 30 Nov 2008)
Log Message:
-----------
Added tool archStat.
Added Paths:
-----------
tools/archStat/
tools/archStat/branches/
tools/archStat/tags/
tools/archStat/trunk/
tools/archStat/trunk/archStat.iml
tools/archStat/trunk/build.xml
tools/archStat/trunk/lib/
tools/archStat/trunk/lib/annotations.jar
tools/archStat/trunk/lib/japi-lib-argparser-trunk.jar
tools/archStat/trunk/src/
tools/archStat/trunk/src/doc/
tools/archStat/trunk/src/prj/
tools/archStat/trunk/src/prj/net/
tools/archStat/trunk/src/prj/net/sf/
tools/archStat/trunk/src/prj/net/sf/japi/
tools/archStat/trunk/src/prj/net/sf/japi/archstat/
tools/archStat/trunk/src/prj/net/sf/japi/archstat/ArchStat.java
tools/archStat/trunk/src/prj/net/sf/japi/archstat/ArchStat.properties
tools/archStat/trunk/src/prj/net/sf/japi/archstat/ArchStat_de.properties
tools/archStat/trunk/src/prj/net/sf/japi/archstat/Checker.xml
tools/archStat/trunk/src/prj/net/sf/japi/archstat/FileStat.java
tools/archStat/trunk/src/prj/net/sf/japi/archstat/LineCheck.java
tools/archStat/trunk/src/prj/net/sf/japi/archstat/LogEntry.java
tools/archStat/trunk/src/prj/net/sf/japi/archstat/LogSystem.java
tools/archStat/trunk/src/prj/net/sf/japi/archstat/Logger.java
tools/archStat/trunk/src/prj/net/sf/japi/archstat/MessageType.java
tools/archStat/trunk/src/prj/net/sf/japi/archstat/StreamLogger.java
tools/archStat/trunk/src/tst/
Property changes on: tools/archStat/trunk
___________________________________________________________________
Added: svn:externals
+ common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
Added: tools/archStat/trunk/archStat.iml
===================================================================
--- tools/archStat/trunk/archStat.iml (rev 0)
+++ tools/archStat/trunk/archStat.iml 2008-11-30 16:10:59 UTC (rev 708)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module relativePaths="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/doc" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/prj" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/tst" isTestSource="true" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="library" name="annotations" level="project" />
+ <orderEntry type="library" name="junit" level="project" />
+ <orderEntry type="module" module-name="libs-argparser" />
+ <orderEntryProperties />
+ </component>
+</module>
+
Property changes on: tools/archStat/trunk/archStat.iml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:eol-style
+ LF
Added: tools/archStat/trunk/build.xml
===================================================================
--- tools/archStat/trunk/build.xml (rev 0)
+++ tools/archStat/trunk/build.xml 2008-11-30 16:10:59 UTC (rev 708)
@@ -0,0 +1,228 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Replacer is a program for performing an in-place search and replace
+ ~ based on regular expressions.
+ ~ Copyright (C) 2007 Christian Hujer
+ ~
+ ~ This program is free software; you can redistribute it and/or modify
+ ~ it under the terms of the GNU General Public License as published by
+ ~ the Free Software Foundation; either version 2 of the License, or
+ ~ (at your option) any later version.
+ ~
+ ~ This program is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ ~ GNU General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU General Public License along
+ ~ with this program; if not, write to the Free Software Foundation, Inc.,
+ ~ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ -->
+
+<project name="ArchStat" default="compile">
+
+ <property name="module.version" value="0.1" />
+ <property name="module.name" value="ArchStat" />
+ <property name="module.shortname" value="ArchStat" />
+ <property name="module.title" value="ArchStat" />
+ <property name="main.class" value="net.sf.japi.archstat.ArchStat" />
+
+ <taskdef name="pack200" classpath="common/antlib/Pack200Task.jar" classname="com.sun.tools.apache.ant.pack200.Pack200Task" />
+
+ <target
+ name = "clean"
+ description = "Cleans Sandbox"
+ >
+ <delete dir="classes" />
+ <delete dir="docs" />
+ </target>
+
+ <target
+ name = "compile"
+ description = "Compiles production classes"
+ >
+ <mkdir dir="classes/production/${module.shortname}" />
+ <mkdir dir="classes/test/${module.shortname}" />
+ <javac
+ srcdir="src/prj"
+ destdir="classes/production/${module.shortname}"
+ encoding="utf-8"
+ source="1.5"
+ target="1.5"
+ >
+ <classpath>
+ <fileset dir="lib" includes="*.jar" excludes="LICENSE-*.jar" />
+ <fileset dir="common/lib" includes="*.jar" excludes="LICENSE-*.jar" />
+ </classpath>
+ <exclude name="test/**/*.java" />
+ </javac>
+ <copy
+ todir="classes/production/${module.shortname}"
+ >
+ <fileset dir="src/prj" includes="**/*.properties" excludes="test/**/*.properties" />
+ <fileset dir="src/prj" includes="**/*.xml" excludes="test/**/*.xml" />
+ <fileset dir="src/prj" includes="META-INF/services/**" />
+ </copy>
+ <copy
+ todir="classes/production/${module.shortname}"
+ >
+ <fileset dir="lib" includes="LICENSE-*" />
+ <fileset dir="." includes="COPYING" />
+ </copy>
+ </target>
+
+ <target
+ name = "dist"
+ description = "Packs distribution archives."
+ depends = "clean, compile"
+ >
+ <!--depends = "clean, compile, doc"
+ -->
+ <delete dir="dist" />
+ <mkdir dir="dist" />
+ <property name="distName" value="dist/${module.name}-${module.version}" />
+ <parallel>
+ <tar tarfile="${distName}.src.tar">
+ <tarfileset dir="." prefix="${module.name}-${module.version}">
+ <include name="src/**" />
+ <include name="build.xml" />
+ </tarfileset>
+ </tar>
+ <zip destfile="${distName}.src.zip">
+ <zipfileset dir="." prefix="${module.name}-${module.version}">
+ <include name="src/**" />
+ <include name="build.xml" />
+ </zipfileset>
+ </zip>
+ <jar destfile="${distName}.src.jar">
+ <zipfileset dir="." prefix="${module.name}-${module.version}">
+ <include name="src/**" />
+ <include name="build.xml" />
+ </zipfileset>
+ </jar>
+ <jar destfile="${distName}.jar">
+ <zipfileset dir="classes/production/${module.shortname}"/>
+ <manifest>
+ <attribute name="Main-Class" value="${main.class}" />
+ <attribute name="Class-Path" value="lib/annotations.jar lib/japi-lib-lang-0.1.jar lib/japi-lib-swing-about-0.1.jar lib/japi-lib-swing-action-0.1.jar" />
+ <attribute name="Implementation-Title" value="${module.name}" />
+ <attribute name="Implementation-Vendor" value="Christian Hujer + the JAPI Developers" />
+ <attribute name="Implementation-Version" value="${module.version}" />
+ <attribute name="Implementation-URL" value="http://sourceforge.net/projects/japi/" />
+ </manifest>
+ </jar>
+ <tar tarfile="${distName}.doc.tar">
+ <tarfileset dir="." prefix="${module.name}-${module.version}">
+ <include name="docs/**" />
+ <include name="build.xml" />
+ </tarfileset>
+ </tar>
+ <zip destfile="${distName}.doc.zip">
+ <zipfileset dir="." prefix="${module.name}-${module.version}">
+ <include name="docs/**" />
+ <include name="build.xml" />
+ </zipfileset>
+ </zip>
+ <jar destfile="${distName}.doc.jar">
+ <zipfileset dir="." prefix="${module.name}-${module.version}">
+ <include name="docs/**" />
+ </zipfileset>
+ </jar>
+ </parallel>
+ <parallel>
+ <gzip src="${distName}.src.tar" destfile="${distName}.src.tar.gz" />
+ <bzip2 src="${distName}.src.tar" destfile="${distName}.src.tar.bz2" />
+ <gzip src="${distName}.doc.tar" destfile="${distName}.doc.tar.gz" />
+ <bzip2 src="${distName}.doc.tar" destfile="${distName}.doc.tar.bz2" />
+ <pack200
+ src="${distName}.jar"
+ destfile="${distName}.pack.gz"
+ gzipoutput="true"
+ stripdebug="true"
+ effort="9"
+ keepfileorder="false"
+ modificationtime="latest"
+ deflatehint="false"
+ />
+ </parallel>
+ <delete file="${distName}.src.tar" />
+ <delete file="${distName}.doc.tar" />
+ </target>
+
+ <target
+ name = "doc"
+ description = "Creates public javadoc documentation."
+ >
+ <mkdir dir="docs/api" />
+ <!--copy todir="docs/api" file="src/doc/api/public/copyright.html" />
+ <copy todir="docs/api" file="src/doc/api/public/.htaccess" /-->
+ <javadoc
+ destdir = "docs/api"
+ access = "protected"
+ author = "yes"
+ version = "yes"
+ locale = "en_US"
+ use = "yes"
+ splitindex = "yes"
+ windowtitle = "JAPI Library ${module.title} ${module.version} API documentation"
+ doctitle = "JAPI<br />Yet another Java API<br />Library ${module.title} ${module.version} API documentation"
+ header = "JAPI Library ${module.title} ${module.version}<br />API Documentation"
+ footer = "JAPI<br />Yet another Java API<br />Library ${module.title} ${module.version} API documentation"
+ bottom = "<div style=" text-align:center;">© 2005-2006 Christian Hujer. All rights reserved. See <a href="{@docRoot}/copyright.html">copyright</a></div>"
+ serialwarn = "yes"
+ charset = "utf-8"
+ docencoding = "utf-8"
+ encoding = "utf-8"
+ source = "1.5"
+ linksource = "yes"
+ link = "${user.javadoc.link}"
+ >
+ <!--
+ overview = "src/overview.html"
+ -->
+ <classpath>
+ <fileset dir="lib" includes="annotations.jar" />
+ </classpath>
+ <sourcepath>
+ <pathelement path="${user.javadoc.javasrc}" />
+ <pathelement path="src/prj" />
+ </sourcepath>
+ <packageset
+ dir="src/prj"
+ defaultexcludes="yes"
+ >
+ <include name="net/**" />
+ </packageset>
+ <tag enabled="true" name="retval" description="Return Values:" scope="methods" />
+ <tag enabled="true" name="pre" description="Preconditions:" scope="methods,constructors" />
+ <tag enabled="true" name="post" description="Postconditions:" scope="methods" />
+ <tag enabled="true" name="invariant" description="Invariant:" scope="methods,fields" />
+ <tag enabled="true" name="note" description="Notes:" />
+ <tag enabled="true" name="warning" description="Warnings:" />
+ <!--tag enabled="true" name="todo" description="Todo:" /-->
+ <taglet name="com.sun.tools.doclets.ToDoTaglet" path="" />
+ <tag enabled="true" name="fixme" description="Fixme:" />
+ <tag enabled="true" name="xxx" description="XXX:" />
+ </javadoc>
+ </target>
+
+ <target
+ name = "buildapp"
+ description = "Creates executable jar"
+ >
+ <property name="appName" value="${module.name}-${module.version}-app" />
+ <jar destfile="${appName}.jar">
+ <zipfileset dir="classes/production/${module.shortname}"/>
+ <zipgroupfileset dir="lib" includes="*.jar" excludes="LICENSE-*.jar" />
+ <manifest>
+ <attribute name="Main-Class" value="${main.class}" />
+ <!--attribute name="Class-Path" value="lib/annotations.jar lib/japi-lib-lang-0.1.jar lib/japi-lib-swing-about-0.1.jar lib/japi-lib-swing-action-0.1.jar" /-->
+ <attribute name="Implementation-Title" value="${module.name}" />
+ <attribute name="Implementation-Vendor" value="Christian Hujer + the JAPI Developers" />
+ <attribute name="Implementation-Version" value="${module.version}" />
+ <attribute name="Implementation-URL" value="http://sourceforge.net/projects/japi/" />
+ </manifest>
+ </jar>
+ </target>
+
+</project>
Property changes on: tools/archStat/trunk/build.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:eol-style
+ LF
Added: tools/archStat/trunk/lib/annotations.jar
===================================================================
(Binary files differ)
Property changes on: tools/archStat/trunk/lib/annotations.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: tools/archStat/trunk/lib/japi-lib-argparser-trunk.jar
===================================================================
(Binary files differ)
Property changes on: tools/archStat/trunk/lib/japi-lib-argparser-trunk.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: tools/archStat/trunk/src/prj/net/sf/japi/archstat/ArchStat.java
===================================================================
--- tools/archStat/trunk/src/prj/net/sf/japi/archstat/ArchStat.java (rev 0)
+++ tools/archStat/trunk/src/prj/net/sf/japi/archstat/ArchStat.java 2008-11-30 16:10:59 UTC (rev 708)
@@ -0,0 +1,208 @@
+package net.sf.japi.archstat;
+
+// Recursive code statistics.
+// © Copyright 2008 Christian Hujer. All rights reserved.
+// License: GPL (Gnu General Public License) v2 or newer
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+import org.jetbrains.annotations.NotNull;
+import org.xml.sax.SAXException;
+import net.sf.japi.io.args.BasicCommand;
+import net.sf.japi.io.args.ArgParser;
+import net.sf.japi.io.args.Option;
+
+/** A Command for performing recursive source code file statistics.
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
+ */
+public class ArchStat extends BasicCommand {
+
+ /** Default buffer size. */
+ private static final int BUF_SIZE = 8192;
+
+ /** Main program.
+ * @param args Command line arguments (try --help).
+ */
+ public static void main(final String... args) {
+ ArgParser.simpleParseAndRun(new ArchStat(), args);
+ }
+
+ /** The DocumentBuilder for parsing XML documents. */
+ @NotNull private DocumentBuilder db;
+
+ /** Whether or not to output memory statistics. */
+ private boolean memoryStatistics;
+
+ /** {@inheritDoc} */
+ @SuppressWarnings({"InstanceMethodNamingConvention"})
+ public int run(@NotNull final List<String> args) throws Exception {
+ if (args.size() == 0) {
+ System.err.println("Error: No arguments given.");
+ return 1;
+ }
+ if (memoryStatistics) {
+ System.err.println("Memory free (start): " + Runtime.getRuntime().freeMemory());
+ }
+ final DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+ db = dbf.newDocumentBuilder();
+ readDefaultCheckers();
+ final FileStat fileStat = new FileStat(checkers);
+ for (final String arg : args) {
+ fileStat.addChild(arg);
+ }
+ fileStat.printStatistic(System.out, depth);
+ if (memoryStatistics) {
+ System.err.println("Memory free (end, before GC): " + Runtime.getRuntime().freeMemory());
+ System.gc();
+ System.err.println("Memory free (end, after GC): " + Runtime.getRuntime().freeMemory());
+ }
+ return fileStat.warnings > 0 ? 1 : 0;
+ }
+
+ /** The default depth. */
+ private static final int DEFAULT_DEPTH = Integer.MAX_VALUE;
+
+ /** The depth up to which statistics are printed.
+ */
+ private int depth = DEFAULT_DEPTH;
+
+ /** Sets whether or not to output memory statistics.
+ * @param memoryStatistics Whether or not to output memory statistics.
+ */
+ @Option({"memory"})
+ public void setMemoryStatistics(@NotNull final Boolean memoryStatistics) {
+ this.memoryStatistics = memoryStatistics;
+ }
+
+ /** Sets the depth up to which statistics are printed.
+ * @param depth Depth up to which statistics are printed.
+ */
+ @Option({"d", "depth"})
+ public void setDepth(@NotNull final Integer depth) {
+ this.depth = depth;
+ }
+
+ /** Returns the depth up to which statistics are printed.
+ * @return The depth up to which statistics are printed.
+ */
+ public int getDepth() {
+ return depth;
+ }
+
+ /** The checks that should be performed. */
+ private final List<LineCheck> checkers = new ArrayList<LineCheck>();
+
+ /** Reads a file.
+ * @param file File to read.
+ * @return Contents of that file as String.
+ * @throws IOException In case of I/O problems.
+ */
+ public static CharSequence readFile(final File file) throws IOException {
+ assert file.isFile();
+ final BufferedReader in = new BufferedReader(new FileReader(file));
+ final StringBuilder sb = new StringBuilder((int) file.length());
+ final char[] buf = new char[BUF_SIZE];
+ try {
+ for (int charsRead; (charsRead = in.read(buf)) != -1; ) {
+ sb.append(buf, 0, charsRead);
+ }
+ } finally {
+ in.close();
+ }
+ return sb.toString();
+ }
+
+ /** The Pattern for splitting lines. */
+ // TODO: This is somehow bogus. Replace this by something else.
+ private static final Pattern lineSplitPattern = Pattern.compile("(?<=\\r\\n|\\r|\\n)");
+
+ /** The Pattern for counting lines. */
+ private static final Pattern lineCountPattern = Pattern.compile("$", Pattern.MULTILINE);
+
+ /** Returns the number of lines in the specified string.
+ * @param string String of which to count lines.
+ * @return The number of lines in <var>string</var>
+ */
+ static int countLines(final CharSequence string) {
+ return count(lineCountPattern, string) - 1;
+ }
+
+ /** Returns a split array of lines for the specified string.
+ * @param string String to split.
+ * @return Array with lines.
+ */
+ static String[] getLines(final CharSequence string) {
+ return lineSplitPattern.split(string);
+ }
+
+ private static final Pattern commentPattern = Pattern.compile("/(/.*?$|\\*.*?\\*/(\\s*?\\n)?)", Pattern.MULTILINE | Pattern.DOTALL);
+ static CharSequence removeCComments(final CharSequence string) {
+ return commentPattern.matcher(string).replaceAll("");
+ }
+
+ private static final Pattern sourceLinePattern = Pattern.compile("^.*\\S.*\\S.*\\S.*$", Pattern.MULTILINE);
+ static int countSourceLines(final CharSequence string) {
+ return count(sourceLinePattern, string);
+ }
+
+ private static int count(final Pattern pattern, final CharSequence string) {
+ int count = 0;
+ final Matcher m = pattern.matcher(string);
+ while (m.find()) {
+ count++;
+ }
+ return count;
+ }
+
+ private void readDefaultCheckers() throws SAXException, IOException {
+ final Enumeration<URL> checkers = ArchStat.class.getClassLoader().getResources("net/sf/japi/archstat/Checker.xml");
+ while (checkers.hasMoreElements()) {
+ final URL url = checkers.nextElement();
+ readCheckers(url);
+ }
+ }
+ private void readCheckers(final Document doc) {
+ final NodeList nl = doc.getElementsByTagName("pattern");
+ for (int i = 0; i < nl.getLength(); i++) {
+ final LineCheck check = new LineCheck((Element) nl.item(i));
+ if (checkers.contains(check)) {
+ // TODO improve
+ throw new RuntimeException("Duplicate Checker " + check.getName());
+ }
+ checkers.add(new LineCheck((Element) nl.item(i)));
+ }
+ }
+
+ /** Reads additional configuration from the specified file.
+ * @param file File from which to read the config.
+ * @throws IOException in case of I/O problems.
+ * @throws SAXException in case of XML parsing errors.
+ */
+ @Option({"c", "config"})
+ public void readCheckers(@NotNull final File file) throws SAXException, IOException {
+ readCheckers(db.parse(file));
+ }
+
+ /** Reads additional configuration from the specified resource.
+ * @param url Resource to read.
+ * @throws IOException in case of I/O problems.
+ * @throws SAXException in case of XML parsing errors.
+ */
+ private void readCheckers(final URL url) throws SAXException, IOException {
+ readCheckers(db.parse(url.openStream()));
+ }
+
+}
Property changes on: tools/archStat/trunk/src/prj/net/sf/japi/archstat/ArchStat.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ LF
Added: tools/archStat/trunk/src/prj/net/sf/japi/archstat/ArchStat.properties
===================================================================
--- tools/archStat/trunk/src/prj/net/sf/japi/archstat/ArchStat.properties (rev 0)
+++ tools/archStat/trunk/src/prj/net/sf/japi/archstat/ArchStat.properties 2008-11-30 16:10:59 UTC (rev 708)
@@ -0,0 +1,2 @@
+readCheckers=Specify an additional configuration file. Can be specified more than once.
+setDepth=Set the maximum output depth. Default: No limit.
Property changes on: tools/archStat/trunk/src/prj/net/sf/japi/archstat/ArchStat.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ LF
Added: tools/archStat/trunk/src/prj/net/sf/japi/archstat/ArchStat_de.properties
===================================================================
--- tools/archStat/trunk/src/prj/net/sf/japi/archstat/ArchStat_de.properties (rev 0)
+++ tools/archStat/trunk/src/prj/net/sf/japi/archstat/ArchStat_de.properties 2008-11-30 16:10:59 UTC (rev 708)
@@ -0,0 +1,2 @@
+readCheckers=Eine zus\xE4tzliche Konfiguration lesen. Kann mehrmals angegeben werden.
+setDepth=Maximale Ausgabetiefe festlegen. Voreinstellung: unbegrenzt.
Property changes on: tools/archStat/trunk/src/prj/net/sf/japi/archstat/ArchStat_de.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ LF
Added: tools/archStat/trunk/src/prj/net/sf/japi/archstat/Checker.xml
===================================================================
--- tools/archStat/trunk/src/prj/net/sf/japi/archstat/Checker.xml (rev 0)
+++ tools/archStat/trunk/src/prj/net/sf/japi/archstat/Checker.xml 2008-11-30 16:10:59 UTC (rev 708)
@@ -0,0 +1,72 @@
+<config>
+ <filetypes>
+ <filetype id="CSource" match="^.+\.(c)$" description="C Source Code" />
+ <filetype id="CHeader" match="^.+\.(h)$" description="C Header"/>
+ <filetype id="C" groups="CSource CHeader" description="C Language (Source and Header)"/>
+ <filetype id="AsmSource" match="^.+\.(s|src|asm|i|inc)$" description="Assembly Source Code"/>
+ <filetype id="AsmHeader" match="^.+\.(i|inc)$" description="Assembly Header"/>
+ <filetype id="Asm" groups="AsmSource AsmHeader" description="Assembly Language (Source and Header)"/>
+ <filetype id="Java" match="^.+\.(java)$" description="Java Source"/>
+ <filetype id="Jpp" match="^.+\.(jpp)$" description="Jpp Source"/>
+ <filetype id="Curly" groups="C Asm Java Jpp" description="Java and Jpp Source"/>
+ <filetype id="Makefile" match="^(Makefile|.+\.mak)$" description="Makefile" />
+ </filetypes>
+ <patterns>
+ <pattern
+ match="line"
+ type="WARNING"
+ name="bogusLintSuppression"
+ regex="/[/*] lint"
+ message="Bogus lint suppression."
+ />
+ <pattern
+ match="line"
+ type="WARNING"
+ name="trailingWhitespace"
+ regex="[\p{javaWhitespace}&&[^\p{Zl}]]+?(\r\n|\r|\n)$"
+ message="Trailing whitespace."
+ />
+ <pattern
+ match="line"
+ type="WARNING"
+ name="unixLine"
+ regex="[^\r]\n$"
+ message="Unix line."
+ />
+ <pattern
+ match="line"
+ type="WARNING"
+ name="oldIntegerType"
+ regex="\b[US](08|16|32)_(EXACT|FAST)\b"
+ message="Old integer type."
+ />
+ <pattern
+ match="line"
+ type="WARNING"
+ name="oldBooleanType"
+ regex="\bBOOL(_FAST)?\b"
+ message="Old boolean type."
+ />
+ <pattern
+ match="line"
+ type="WARNING"
+ name="tab"
+ regex="\t"
+ message="Tab character."
+ />
+ <pattern
+ match="line"
+ type="WARNING"
+ name="commentStart"
+ regex="/\*\*\s*?[\r\n]"
+ message="Documentation comment text doesn't start in first line of documentation comment."
+ />
+ <pattern
+ match="line"
+ type="WARNING"
+ name="oldStyleComment"
+ regex="(\*{3,}|/{3,})"
+ message="Old style comment."
+ />
+ </patterns>
+</config>
Property changes on: tools/archStat/trunk/src/prj/net/sf/japi/archstat/Checker.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:eol-style
+ LF
Added: tools/archStat/trunk/src/prj/net/sf/japi/archstat/FileStat.java
===================================================================
--- tools/archStat/trunk/src/prj/net/sf/japi/archstat/FileStat.java (rev 0)
+++ tools/archStat/trunk/src/prj/net/sf/japi/archstat/FileStat.java 2008-11-30 16:10:59 UTC (rev 708)
@@ -0,0 +1,173 @@
+package net.sf.japi.archstat;
+
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.ArrayList;
+import java.util.TreeSet;
+import java.io.File;
+import java.io.IOException;
+import org.jetbrains.annotations.NotNull;
+
+/** Per-File statistics.
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
+ */
+public class FileStat {
+
+ /** The checks that should be performed. */
+ private final List<LineCheck> checkers;
+
+ /** The warnings that occurred in that individual check. */
+ private final Map<LineCheck, Integer> checkWarnings = new HashMap<LineCheck, Integer>();
+
+ /** The children of this statistic. */
+ private final Map<File, FileStat> children = new HashMap<File, FileStat>();
+
+ /** The list of errors that occurred. */
+ private final List<Throwable> errors = new ArrayList<Throwable>();
+
+ /** The title of this statistic. */
+ private final String title;
+
+ /** The file (regular file or directory) of this statistic. */
+ private final File file;
+
+ private int linesRaw;
+
+ private int linesNoComment;
+
+ private int sourceLines;
+
+ private int commentLines;
+
+ private CharSequence fileText;
+
+ int warnings;
+
+ @SuppressWarnings({"AssignmentToCollectionOrArrayFieldFromParameter"})
+ FileStat(final List<LineCheck> checkers) {
+ this.checkers = checkers;
+ title = "<SUM>";
+ file = null;
+ }
+
+ @SuppressWarnings({"AssignmentToCollectionOrArrayFieldFromParameter"})
+ FileStat(final List<LineCheck> checkers, @NotNull final File file) {
+ this.checkers = checkers;
+ this.file = file;
+ title = file.toString();
+ if (file.isFile()) {
+ CharSequence fileText;
+ try {
+ fileText = ArchStat.readFile(file);
+ ...
[truncated message content] |
|
From: <chr...@us...> - 2008-11-30 16:19:17
|
Revision: 709
http://japi.svn.sourceforge.net/japi/?rev=709&view=rev
Author: christianhujer
Date: 2008-11-30 16:19:15 +0000 (Sun, 30 Nov 2008)
Log Message:
-----------
Added tool mail.
Added Paths:
-----------
tools/mail/
tools/mail/branches/
tools/mail/tags/
tools/mail/trunk/
tools/mail/trunk/build.xml
tools/mail/trunk/lib/
tools/mail/trunk/lib/annotations.jar
tools/mail/trunk/lib/japi-lib-argparser-trunk.jar
tools/mail/trunk/mail.iml
tools/mail/trunk/src/
tools/mail/trunk/src/doc/
tools/mail/trunk/src/prj/
tools/mail/trunk/src/prj/net/
tools/mail/trunk/src/prj/net/sf/
tools/mail/trunk/src/prj/net/sf/japi/
tools/mail/trunk/src/prj/net/sf/japi/tools/
tools/mail/trunk/src/prj/net/sf/japi/tools/mail/
tools/mail/trunk/src/prj/net/sf/japi/tools/mail/Mail.java
tools/mail/trunk/src/prj/net/sf/japi/tools/mail/Mail.properties
tools/mail/trunk/src/prj/net/sf/japi/tools/mail/PingPongSession.java
tools/mail/trunk/src/tst/
Added: tools/mail/trunk/build.xml
===================================================================
--- tools/mail/trunk/build.xml (rev 0)
+++ tools/mail/trunk/build.xml 2008-11-30 16:19:15 UTC (rev 709)
@@ -0,0 +1,228 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Replacer is a program for performing an in-place search and replace
+ ~ based on regular expressions.
+ ~ Copyright (C) 2007 Christian Hujer
+ ~
+ ~ This program is free software; you can redistribute it and/or modify
+ ~ it under the terms of the GNU General Public License as published by
+ ~ the Free Software Foundation; either version 2 of the License, or
+ ~ (at your option) any later version.
+ ~
+ ~ This program is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ ~ GNU General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU General Public License along
+ ~ with this program; if not, write to the Free Software Foundation, Inc.,
+ ~ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ -->
+
+<project name="ArchStat" default="compile">
+
+ <property name="module.version" value="0.1" />
+ <property name="module.name" value="JapiMail" />
+ <property name="module.shortname" value="JapiMail" />
+ <property name="module.title" value="JapiMail" />
+ <property name="main.class" value="net.sf.japi.tools.mail.Mail" />
+
+ <taskdef name="pack200" classpath="common/antlib/Pack200Task.jar" classname="com.sun.tools.apache.ant.pack200.Pack200Task" />
+
+ <target
+ name = "clean"
+ description = "Cleans Sandbox"
+ >
+ <delete dir="classes" />
+ <delete dir="docs" />
+ </target>
+
+ <target
+ name = "compile"
+ description = "Compiles production classes"
+ >
+ <mkdir dir="classes/production/${module.shortname}" />
+ <mkdir dir="classes/test/${module.shortname}" />
+ <javac
+ srcdir="src/prj"
+ destdir="classes/production/${module.shortname}"
+ encoding="utf-8"
+ source="1.5"
+ target="1.5"
+ >
+ <classpath>
+ <fileset dir="lib" includes="*.jar" excludes="LICENSE-*.jar" />
+ <fileset dir="common/lib" includes="*.jar" excludes="LICENSE-*.jar" />
+ </classpath>
+ <exclude name="test/**/*.java" />
+ </javac>
+ <copy
+ todir="classes/production/${module.shortname}"
+ >
+ <fileset dir="src/prj" includes="**/*.properties" excludes="test/**/*.properties" />
+ <fileset dir="src/prj" includes="**/*.xml" excludes="test/**/*.xml" />
+ <fileset dir="src/prj" includes="META-INF/services/**" />
+ </copy>
+ <copy
+ todir="classes/production/${module.shortname}"
+ >
+ <fileset dir="lib" includes="LICENSE-*" />
+ <fileset dir="." includes="COPYING" />
+ </copy>
+ </target>
+
+ <target
+ name = "dist"
+ description = "Packs distribution archives."
+ depends = "clean, compile"
+ >
+ <!--depends = "clean, compile, doc"
+ -->
+ <delete dir="dist" />
+ <mkdir dir="dist" />
+ <property name="distName" value="dist/${module.name}-${module.version}" />
+ <parallel>
+ <tar tarfile="${distName}.src.tar">
+ <tarfileset dir="." prefix="${module.name}-${module.version}">
+ <include name="src/**" />
+ <include name="build.xml" />
+ </tarfileset>
+ </tar>
+ <zip destfile="${distName}.src.zip">
+ <zipfileset dir="." prefix="${module.name}-${module.version}">
+ <include name="src/**" />
+ <include name="build.xml" />
+ </zipfileset>
+ </zip>
+ <jar destfile="${distName}.src.jar">
+ <zipfileset dir="." prefix="${module.name}-${module.version}">
+ <include name="src/**" />
+ <include name="build.xml" />
+ </zipfileset>
+ </jar>
+ <jar destfile="${distName}.jar">
+ <zipfileset dir="classes/production/${module.shortname}"/>
+ <manifest>
+ <attribute name="Main-Class" value="${main.class}" />
+ <attribute name="Class-Path" value="lib/annotations.jar lib/japi-lib-lang-0.1.jar lib/japi-lib-swing-about-0.1.jar lib/japi-lib-swing-action-0.1.jar" />
+ <attribute name="Implementation-Title" value="${module.name}" />
+ <attribute name="Implementation-Vendor" value="Christian Hujer + the JAPI Developers" />
+ <attribute name="Implementation-Version" value="${module.version}" />
+ <attribute name="Implementation-URL" value="http://sourceforge.net/projects/japi/" />
+ </manifest>
+ </jar>
+ <tar tarfile="${distName}.doc.tar">
+ <tarfileset dir="." prefix="${module.name}-${module.version}">
+ <include name="docs/**" />
+ <include name="build.xml" />
+ </tarfileset>
+ </tar>
+ <zip destfile="${distName}.doc.zip">
+ <zipfileset dir="." prefix="${module.name}-${module.version}">
+ <include name="docs/**" />
+ <include name="build.xml" />
+ </zipfileset>
+ </zip>
+ <jar destfile="${distName}.doc.jar">
+ <zipfileset dir="." prefix="${module.name}-${module.version}">
+ <include name="docs/**" />
+ </zipfileset>
+ </jar>
+ </parallel>
+ <parallel>
+ <gzip src="${distName}.src.tar" destfile="${distName}.src.tar.gz" />
+ <bzip2 src="${distName}.src.tar" destfile="${distName}.src.tar.bz2" />
+ <gzip src="${distName}.doc.tar" destfile="${distName}.doc.tar.gz" />
+ <bzip2 src="${distName}.doc.tar" destfile="${distName}.doc.tar.bz2" />
+ <pack200
+ src="${distName}.jar"
+ destfile="${distName}.pack.gz"
+ gzipoutput="true"
+ stripdebug="true"
+ effort="9"
+ keepfileorder="false"
+ modificationtime="latest"
+ deflatehint="false"
+ />
+ </parallel>
+ <delete file="${distName}.src.tar" />
+ <delete file="${distName}.doc.tar" />
+ </target>
+
+ <target
+ name = "doc"
+ description = "Creates public javadoc documentation."
+ >
+ <mkdir dir="docs/api" />
+ <!--copy todir="docs/api" file="src/doc/api/public/copyright.html" />
+ <copy todir="docs/api" file="src/doc/api/public/.htaccess" /-->
+ <javadoc
+ destdir = "docs/api"
+ access = "protected"
+ author = "yes"
+ version = "yes"
+ locale = "en_US"
+ use = "yes"
+ splitindex = "yes"
+ windowtitle = "JAPI Library ${module.title} ${module.version} API documentation"
+ doctitle = "JAPI<br />Yet another Java API<br />Library ${module.title} ${module.version} API documentation"
+ header = "JAPI Library ${module.title} ${module.version}<br />API Documentation"
+ footer = "JAPI<br />Yet another Java API<br />Library ${module.title} ${module.version} API documentation"
+ bottom = "<div style=" text-align:center;">© 2005-2006 Christian Hujer. All rights reserved. See <a href="{@docRoot}/copyright.html">copyright</a></div>"
+ serialwarn = "yes"
+ charset = "utf-8"
+ docencoding = "utf-8"
+ encoding = "utf-8"
+ source = "1.5"
+ linksource = "yes"
+ link = "${user.javadoc.link}"
+ >
+ <!--
+ overview = "src/overview.html"
+ -->
+ <classpath>
+ <fileset dir="lib" includes="annotations.jar" />
+ </classpath>
+ <sourcepath>
+ <pathelement path="${user.javadoc.javasrc}" />
+ <pathelement path="src/prj" />
+ </sourcepath>
+ <packageset
+ dir="src/prj"
+ defaultexcludes="yes"
+ >
+ <include name="net/**" />
+ </packageset>
+ <tag enabled="true" name="retval" description="Return Values:" scope="methods" />
+ <tag enabled="true" name="pre" description="Preconditions:" scope="methods,constructors" />
+ <tag enabled="true" name="post" description="Postconditions:" scope="methods" />
+ <tag enabled="true" name="invariant" description="Invariant:" scope="methods,fields" />
+ <tag enabled="true" name="note" description="Notes:" />
+ <tag enabled="true" name="warning" description="Warnings:" />
+ <!--tag enabled="true" name="todo" description="Todo:" /-->
+ <taglet name="com.sun.tools.doclets.ToDoTaglet" path="" />
+ <tag enabled="true" name="fixme" description="Fixme:" />
+ <tag enabled="true" name="xxx" description="XXX:" />
+ </javadoc>
+ </target>
+
+ <target
+ name = "buildapp"
+ description = "Creates executable jar"
+ >
+ <property name="appName" value="${module.name}-${module.version}-app" />
+ <jar destfile="${appName}.jar">
+ <zipfileset dir="classes/production/${module.shortname}"/>
+ <zipgroupfileset dir="lib" includes="*.jar" excludes="LICENSE-*.jar" />
+ <manifest>
+ <attribute name="Main-Class" value="${main.class}" />
+ <!--attribute name="Class-Path" value="lib/annotations.jar lib/japi-lib-lang-0.1.jar lib/japi-lib-swing-about-0.1.jar lib/japi-lib-swing-action-0.1.jar" /-->
+ <attribute name="Implementation-Title" value="${module.name}" />
+ <attribute name="Implementation-Vendor" value="Christian Hujer + the JAPI Developers" />
+ <attribute name="Implementation-Version" value="${module.version}" />
+ <attribute name="Implementation-URL" value="http://sourceforge.net/projects/japi/" />
+ </manifest>
+ </jar>
+ </target>
+
+</project>
Property changes on: tools/mail/trunk/build.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:eol-style
+ LF
Added: tools/mail/trunk/lib/annotations.jar
===================================================================
(Binary files differ)
Property changes on: tools/mail/trunk/lib/annotations.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: tools/mail/trunk/lib/japi-lib-argparser-trunk.jar
===================================================================
(Binary files differ)
Property changes on: tools/mail/trunk/lib/japi-lib-argparser-trunk.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: tools/mail/trunk/mail.iml
===================================================================
--- tools/mail/trunk/mail.iml (rev 0)
+++ tools/mail/trunk/mail.iml 2008-11-30 16:19:15 UTC (rev 709)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module relativePaths="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/doc" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/prj" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/tst" isTestSource="true" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="libs-argparser" />
+ <orderEntry type="library" name="annotations" level="project" />
+ <orderEntryProperties />
+ </component>
+</module>
+
Property changes on: tools/mail/trunk/mail.iml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:eol-style
+ LF
Added: tools/mail/trunk/src/prj/net/sf/japi/tools/mail/Mail.java
===================================================================
--- tools/mail/trunk/src/prj/net/sf/japi/tools/mail/Mail.java (rev 0)
+++ tools/mail/trunk/src/prj/net/sf/japi/tools/mail/Mail.java 2008-11-30 16:19:15 UTC (rev 709)
@@ -0,0 +1,146 @@
+package net.sf.japi.tools.mail;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.Socket;
+import java.util.Arrays;
+import java.util.List;
+import net.sf.japi.io.args.ArgParser;
+import net.sf.japi.io.args.BasicCommand;
+import net.sf.japi.io.args.Option;
+import net.sf.japi.io.args.OptionType;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/** A very simple and primitive mail command.
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
+ */
+public class Mail extends BasicCommand {
+
+ /** The default welcome name. */
+ private static final String DEFAULT_HELO_NAME = "JapiMail";
+
+ /** The default port. */
+ private static final int DEFAULT_PORT = 25;
+
+ /** The sender. */
+ private String from;
+
+ /** The welcome name. */
+ private String heloName = DEFAULT_HELO_NAME;
+
+ /** The smtp server to communicate with. */
+ private String server;
+
+ /** The port. */
+ private int port = DEFAULT_PORT;
+
+ /** Whether or not to print debug messages. */
+ private boolean debug;
+
+ /** Whether or not to use simple smtp instead of enhanced smtp. */
+ private boolean simple;
+
+ /** The msg to send.
+ * Maybe <code>null</code> which means the message will be read from stdin.
+ */
+ @Nullable private String msg;
+
+ /** Main program.
+ * @param args Command line arguments (try --help)
+ */
+ public static void main(final String... args) {
+ ArgParser.simpleParseAndRun(new Mail(), args);
+ }
+
+ /** {@inheritDoc} */
+ @SuppressWarnings({"InstanceMethodNamingConvention"})
+ public int run(@NotNull final List<String> args) throws IOException {
+ final PingPongSession session = new PingPongSession(new Socket(server, port));
+ session.setDebug(debug);
+ try {
+ session.waitFor("220");
+ session.sendAndWait((simple ? "HELO" : "EHLO") + " " + heloName, "250");
+ session.sendAndWait("MAIL from: " + from, "250");
+ for (final String arg : args) {
+ session.sendAndWait("RCPT to: " + arg, "250");
+ }
+ session.sendAndWait("DATA", "354");
+ if (msg == null) {
+ final BufferedReader in = new BufferedReader(new InputStreamReader(System.in));
+ for (String line; (line = in.readLine()) != null && !".".equals(line);) {
+ session.send(line);
+ }
+ } else {
+ session.send(msg);
+ }
+ session.sendAndWait(".", "250");
+ session.sendAndWait("QUIT", "221");
+ } finally {
+ session.close();
+ }
+ return 0;
+ }
+
+
+ /** Sets the server.
+ * @param server Server.
+ */
+ @Option(type = OptionType.REQUIRED, value = {"s", "server"})
+ public void setServer(@NotNull final String server) {
+ this.server = server;
+ }
+
+ /** Sets the port.
+ * @param port Port.
+ */
+ @Option({"p", "port"})
+ public void setPort(@Nullable final Integer port) {
+ this.port = port != null ? port : DEFAULT_PORT;
+ }
+
+ /** Sets the sender.
+ * @param from The sender.
+ */
+ @Option(type = OptionType.REQUIRED, value = {"f", "from"})
+ public void setFrom(@NotNull final String from) {
+ this.from = from;
+ }
+
+ /** Turns on debugging. */
+ @Option({"d", "debug"})
+ public void setDebug() {
+ debug = true;
+ }
+
+ /** Turns off enhanced smtp. */
+ @Option({"simple"})
+ public void setSimple() {
+ simple = true;
+ }
+
+ /** Sets the message to send.
+ * @param msg Message to send (without trailing "." line).
+ */
+ public void setMsg(@Nullable final String msg) {
+ this.msg = msg;
+ }
+
+ /** Send mail.
+ * @param server Server address.
+ * @param port Server port.
+ * @param from Sender address.
+ * @param msg Message to send (without trailing "." line).
+ * @param rcpts Recipient addresses.
+ * @throws IOException in case of I/O problems.
+ */
+ public static void sendMail(@NotNull final String server, final int port, @NotNull final String from, @NotNull final String msg, @NotNull final String... rcpts) throws IOException {
+ final Mail mail = new Mail();
+ mail.setServer(server);
+ mail.setPort(port);
+ mail.setFrom(from);
+ mail.setMsg(msg);
+ mail.run(Arrays.asList(rcpts));
+ }
+}
Property changes on: tools/mail/trunk/src/prj/net/sf/japi/tools/mail/Mail.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ LF
Added: tools/mail/trunk/src/prj/net/sf/japi/tools/mail/Mail.properties
===================================================================
--- tools/mail/trunk/src/prj/net/sf/japi/tools/mail/Mail.properties (rev 0)
+++ tools/mail/trunk/src/prj/net/sf/japi/tools/mail/Mail.properties 2008-11-30 16:19:15 UTC (rev 709)
@@ -0,0 +1,9 @@
+setFrom=Sender address, e.g. you...@yo....
+setServer=SMTP server, e.g. mail.yourcompany.com.
+setPort=SMTP server port, defaults to 25.
+setDebug=Enables debug log (prints each line send and received).
+setSimple=Switches from enhanced smtp to simple smtp (only changes EHLO to HELO, nothing else yet).
+helpHeader=JapiMail [OPTION...] [RECEIVER...]\nSends email.\nVery primitive. Does not support anything more than sending plain mail. No encoding, no attachment, no nothing.
+helpFooter=Example: JapiMail -f ern...@yo... -s mail.yourcompany.com ti...@yo... sa...@yo... <mail.txt\n\
+ Do not forget to specify a subject. The first line of your mail should be:\n\
+ Subject: The subject
Property changes on: tools/mail/trunk/src/prj/net/sf/japi/tools/mail/Mail.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ LF
Added: tools/mail/trunk/src/prj/net/sf/japi/tools/mail/PingPongSession.java
===================================================================
--- tools/mail/trunk/src/prj/net/sf/japi/tools/mail/PingPongSession.java (rev 0)
+++ tools/mail/trunk/src/prj/net/sf/japi/tools/mail/PingPongSession.java 2008-11-30 16:19:15 UTC (rev 709)
@@ -0,0 +1,166 @@
+package net.sf.japi.tools.mail;
+
+import java.io.BufferedReader;
+import java.io.Closeable;
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.io.Reader;
+import java.io.Writer;
+import java.net.Socket;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/** A PingPongSession is a session for simple ping pong protocols like SMTP.
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
+ */
+public class PingPongSession implements Closeable {
+
+ /** The Socket to communicate with. */
+ private final Socket socket;
+
+ /** The Reader to read from. */
+ private final BufferedReader sin;
+
+ /** The Writer to write to. */
+ private final PrintWriter sout;
+
+ /** Whether or not to print debug messages. */
+ private boolean debug;
+
+ /** The debug stream. */
+ private PrintStream err = System.err;
+
+ /** Establishes a PingPong session.
+ * @param socket Socket for which to establish a PingPong session.
+ * @throws IOException in case of I/O problems when connecting the streams of the socket.
+ */
+ public PingPongSession(@NotNull final Socket socket) throws IOException {
+ this(socket.getInputStream(), socket.getOutputStream(), socket);
+ }
+
+ /** Establishes a PingPong session.
+ * @param in InputStream to communicate with.
+ * @param out OutputStream to communicate with.
+ * @throws IOException in case of I/O problems when connecting the streams of the socket.
+ */
+ public PingPongSession(@NotNull final InputStream in, @NotNull final OutputStream out) throws IOException {
+ this(in, out, null);
+ }
+
+ /** Establishes a PingPong session.
+ * @param in InputStream to communicate with.
+ * @param out OutputStream to communicate with.
+ */
+ public PingPongSession(@NotNull final Reader in, @NotNull final Writer out) {
+ this(in, out, null);
+ }
+
+ /** Establishes a PingPong session.
+ * @param in InputStream to communicate with.
+ * @param out OutputStream to communicate with.
+ * @param socket Socket to communicate with.
+ * @throws IOException in case of I/O problems when connecting the streams of the socket.
+ */
+ public PingPongSession(@NotNull final InputStream in, @NotNull final OutputStream out, @Nullable final Socket socket) throws IOException {
+ this(new InputStreamReader(in, "ASCII"), new OutputStreamWriter(out, "ASCII"), socket);
+ }
+
+ /** Establishes a PingPong session.
+ * @param in Reader to communicate with.
+ * @param out Writer to communicate with.
+ * @param socket Socket to communicate with.
+ */
+ public PingPongSession(@NotNull final Reader in, @NotNull final Writer out, @Nullable final Socket socket) {
+ sin = in instanceof BufferedReader ? (BufferedReader) in : new BufferedReader(in);
+ sout = new PrintWriter(out, true);
+ this.socket = socket;
+ }
+
+ /** Sets whether or not to print debug messages.
+ * @param debug <code>true</code> if debug messages are desired, otherwise <code>false</code>.
+ */
+ public void setDebug(final boolean debug) {
+ this.debug = debug;
+ }
+
+ /** Returns whether or not debug messages are printed.
+ * @return <code>true</code> if debug messages are printed, otherwise <code>false</code>.
+ */
+ public boolean isDebug() {
+ return debug;
+ }
+
+ /** Sets the Stream to which debug messages are printed.
+ * @param err Stream to which debug messages are printed.
+ */
+ public void setErr(@NotNull final PrintStream err) {
+ this.err = err;
+ }
+
+ /** Returns the Stream to which debug messages are printed.
+ * @return Stream to which debug messages are printed.
+ */
+ public PrintStream getErr() {
+ return err;
+ }
+
+ /** Sends a line of text to the SMTP server, expecting an answer with a specific SMTP return code.
+ * @param line Line to send.
+ * @param returnCode Return code to wait for after sending the line.
+ * @throws IOException in case of I/O problems or the expected return code was not received.
+ */
+ public void sendAndWait(@NotNull final String line, @NotNull final String returnCode) throws IOException {
+ send(line);
+ waitFor(returnCode);
+ }
+
+ /** Waits for a specific SMTP return code.
+ * @param returnCode Return code to wait for.
+ * @throws IOException in case the expected return code was not received.
+ */
+ public void waitFor(@NotNull final String returnCode) throws IOException {
+ String line;
+ do {
+ line = sin.readLine();
+ if (debug && line != null) {
+ err.println("< " + line);
+ }
+ } while ((line != null) && (line.startsWith(returnCode + "-")));
+ if (line == null) {
+ if (debug) {
+ err.println("< <EOF>");
+ }
+ throw new EOFException();
+ }
+ if (!line.startsWith(returnCode + " ")) {
+ throw new IOException("Unexpected response from SMTP server.\nExpected: " + returnCode + "\nReceived: " + line);
+ }
+ }
+
+ /** Sends a line of text to the SMTP server.
+ * @param line Line to send.
+ * @throws IOException in case of I/O problems.
+ */
+ public void send(@NotNull final String line) throws IOException {
+ sout.println(line);
+ if (debug) {
+ err.println("> " + line);
+ }
+ }
+
+ /** {@inheritDoc} */
+ public void close() throws IOException {
+ if (socket != null) {
+ socket.close();
+ } else {
+ sout.close();
+ sin.close();
+ }
+ }
+}
Property changes on: tools/mail/trunk/src/prj/net/sf/japi/tools/mail/PingPongSession.java
___________________________________________________________________
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...> - 2008-11-30 17:23:36
|
Revision: 716
http://japi.svn.sourceforge.net/japi/?rev=716&view=rev
Author: christianhujer
Date: 2008-11-30 17:23:31 +0000 (Sun, 30 Nov 2008)
Log Message:
-----------
Added JGrep tool.
Added Paths:
-----------
tools/jgrep/
tools/jgrep/branches/
tools/jgrep/tags/
tools/jgrep/trunk/
tools/jgrep/trunk/COPYING
tools/jgrep/trunk/build.xml
tools/jgrep/trunk/jgrep.iml
tools/jgrep/trunk/lib/
tools/jgrep/trunk/lib/annotations.jar
tools/jgrep/trunk/lib/japi-lib-argparser-trunk.jar
tools/jgrep/trunk/src/
tools/jgrep/trunk/src/doc/
tools/jgrep/trunk/src/prj/
tools/jgrep/trunk/src/prj/net/
tools/jgrep/trunk/src/prj/net/sf/
tools/jgrep/trunk/src/prj/net/sf/japi/
tools/jgrep/trunk/src/prj/net/sf/japi/tools/
tools/jgrep/trunk/src/prj/net/sf/japi/tools/jgrep/
tools/jgrep/trunk/src/prj/net/sf/japi/tools/jgrep/JGrep.java
tools/jgrep/trunk/src/prj/net/sf/japi/tools/jgrep/JGrep.properties
tools/jgrep/trunk/src/tst/
Added: tools/jgrep/trunk/COPYING
===================================================================
--- tools/jgrep/trunk/COPYING (rev 0)
+++ tools/jgrep/trunk/COPYING 2008-11-30 17:23:31 UTC (rev 716)
@@ -0,0 +1,339 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
Property changes on: tools/jgrep/trunk/COPYING
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ LF
Added: tools/jgrep/trunk/build.xml
===================================================================
--- tools/jgrep/trunk/build.xml (rev 0)
+++ tools/jgrep/trunk/build.xml 2008-11-30 17:23:31 UTC (rev 716)
@@ -0,0 +1,227 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Replacer is a program for performing an in-place search and replace
+ ~ based on regular expressions.
+ ~ Copyright (C) 2007 Christian Hujer
+ ~
+ ~ This program is free software; you can redistribute it and/or modify
+ ~ it under the terms of the GNU General Public License as published by
+ ~ the Free Software Foundation; either version 2 of the License, or
+ ~ (at your option) any later version.
+ ~
+ ~ This program is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ ~ GNU General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU General Public License along
+ ~ with this program; if not, write to the Free Software Foundation, Inc.,
+ ~ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ -->
+
+<project name="Replacer" default="compile">
+
+ <property name="module.version" value="0.1" />
+ <property name="module.name" value="Replacer" />
+ <property name="module.shortname" value="Replacer" />
+ <property name="module.title" value="Replacer" />
+ <property name="main.class" value="net.sf.japi.tools.replacer.Replacer" />
+
+ <taskdef name="pack200" classpath="common/antlib/Pack200Task.jar" classname="com.sun.tools.apache.ant.pack200.Pack200Task" />
+
+ <target
+ name = "clean"
+ description = "Cleans Sandbox"
+ >
+ <delete dir="classes" />
+ <delete dir="docs" />
+ </target>
+
+ <target
+ name = "compile"
+ description = "Compiles production classes"
+ >
+ <mkdir dir="classes/production/${module.shortname}" />
+ <mkdir dir="classes/test/${module.shortname}" />
+ <javac
+ srcdir="src/prj"
+ destdir="classes/production/${module.shortname}"
+ encoding="utf-8"
+ source="1.5"
+ target="1.5"
+ >
+ <classpath>
+ <fileset dir="lib" includes="*.jar" excludes="LICENSE-*.jar" />
+ <fileset dir="common/lib" includes="*.jar" excludes="LICENSE-*.jar" />
+ </classpath>
+ <exclude name="test/**/*.java" />
+ </javac>
+ <copy
+ todir="classes/production/${module.shortname}"
+ >
+ <fileset dir="src/prj" includes="**/*.properties" excludes="test/**/*.properties" />
+ <fileset dir="src/prj" includes="META-INF/services/**" />
+ </copy>
+ <copy
+ todir="classes/production/${module.shortname}"
+ >
+ <fileset dir="lib" includes="LICENSE-*" />
+ <fileset dir="." includes="COPYING" />
+ </copy>
+ </target>
+
+ <target
+ name = "dist"
+ description = "Packs distribution archives."
+ depends = "clean, compile"
+ >
+ <!--depends = "clean, compile, doc"
+ -->
+ <delete dir="dist" />
+ <mkdir dir="dist" />
+ <property name="distName" value="dist/${module.name}-${module.version}" />
+ <parallel>
+ <tar tarfile="${distName}.src.tar">
+ <tarfileset dir="." prefix="${module.name}-${module.version}">
+ <include name="src/**" />
+ <include name="build.xml" />
+ </tarfileset>
+ </tar>
+ <zip destfile="${distName}.src.zip">
+ <zipfileset dir="." prefix="${module.name}-${module.version}">
+ <include name="src/**" />
+ <include name="build.xml" />
+ </zipfileset>
+ </zip>
+ <jar destfile="${distName}.src.jar">
+ <zipfileset dir="." prefix="${module.name}-${module.version}">
+ <include name="src/**" />
+ <include name="build.xml" />
+ </zipfileset>
+ </jar>
+ <jar destfile="${distName}.jar">
+ <zipfileset dir="classes/production/${module.shortname}"/>
+ <manifest>
+ <attribute name="Main-Class" value="${main.class}" />
+ <attribute name="Class-Path" value="lib/annotations.jar lib/japi-lib-lang-0.1.jar lib/japi-lib-swing-about-0.1.jar lib/japi-lib-swing-action-0.1.jar" />
+ <attribute name="Implementation-Title" value="${module.name}" />
+ <attribute name="Implementation-Vendor" value="Christian Hujer + the JAPI Developers" />
+ <attribute name="Implementation-Version" value="${module.version}" />
+ <attribute name="Implementation-URL" value="http://sourceforge.net/projects/japi/" />
+ </manifest>
+ </jar>
+ <tar tarfile="${distName}.doc.tar">
+ <tarfileset dir="." prefix="${module.name}-${module.version}">
+ <include name="docs/**" />
+ <include name="build.xml" />
+ </tarfileset>
+ </tar>
+ <zip destfile="${distName}.doc.zip">
+ <zipfileset dir="." prefix="${module.name}-${module.version}">
+ <include name="docs/**" />
+ <include name="build.xml" />
+ </zipfileset>
+ </zip>
+ <jar destfile="${distName}.doc.jar">
+ <zipfileset dir="." prefix="${module.name}-${module.version}">
+ <include name="docs/**" />
+ </zipfileset>
+ </jar>
+ </parallel>
+ <parallel>
+ <gzip src="${distName}.src.tar" destfile="${distName}.src.tar.gz" />
+ <bzip2 src="${distName}.src.tar" destfile="${distName}.src.tar.bz2" />
+ <gzip src="${distName}.doc.tar" destfile="${distName}.doc.tar.gz" />
+ <bzip2 src="${distName}.doc.tar" destfile="${distName}.doc.tar.bz2" />
+ <pack200
+ src="${distName}.jar"
+ destfile="${distName}.pack.gz"
+ gzipoutput="true"
+ stripdebug="true"
+ effort="9"
+ keepfileorder="false"
+ modificationtime="latest"
+ deflatehint="false"
+ />
+ </parallel>
+ <delete file="${distName}.src.tar" />
+ <delete file="${distName}.doc.tar" />
+ </target>
+
+ <target
+ name = "doc"
+ description = "Creates public javadoc documentation."
+ >
+ <mkdir dir="docs/api" />
+ <!--copy todir="docs/api" file="src/doc/api/public/copyright.html" />
+ <copy todir="docs/api" file="src/doc/api/public/.htaccess" /-->
+ <javadoc
+ destdir = "docs/api"
+ access = "protected"
+ author = "yes"
+ version = "yes"
+ locale = "en_US"
+ use = "yes"
+ splitindex = "yes"
+ windowtitle = "JAPI Library ${module.title} ${module.version} API documentation"
+ doctitle = "JAPI<br />Yet another Java API<br />Library ${module.title} ${module.version} API documentation"
+ header = "JAPI Library ${module.title} ${module.version}<br />API Documentation"
+ footer = "JAPI<br />Yet another Java API<br />Library ${module.title} ${module.version} API documentation"
+ bottom = "<div style=" text-align:center;">© 2005-2006 Christian Hujer. All rights reserved. See <a href="{@docRoot}/copyright.html">copyright</a></div>"
+ serialwarn = "yes"
+ charset = "utf-8"
+ docencoding = "utf-8"
+ encoding = "utf-8"
+ source = "1.5"
+ linksource = "yes"
+ link = "${user.javadoc.link}"
+ >
+ <!--
+ overview = "src/overview.html"
+ -->
+ <classpath>
+ <fileset dir="lib" includes="annotations.jar" />
+ </classpath>
+ <sourcepath>
+ <pathelement path="${user.javadoc.javasrc}" />
+ <pathelement path="src/prj" />
+ </sourcepath>
+ <packageset
+ dir="src/prj"
+ defaultexcludes="yes"
+ >
+ <include name="net/**" />
+ </packageset>
+ <tag enabled="true" name="retval" description="Return Values:" scope="methods" />
+ <tag enabled="true" name="pre" description="Preconditions:" scope="methods,constructors" />
+ <tag enabled="true" name="post" description="Postconditions:" scope="methods" />
+ <tag enabled="true" name="invariant" description="Invariant:" scope="methods,fields" />
+ <tag enabled="true" name="note" description="Notes:" />
+ <tag enabled="true" name="warning" description="Warnings:" />
+ <!--tag enabled="true" name="todo" description="Todo:" /-->
+ <taglet name="com.sun.tools.doclets.ToDoTaglet" path="" />
+ <tag enabled="true" name="fixme" description="Fixme:" />
+ <tag enabled="true" name="xxx" description="XXX:" />
+ </javadoc>
+ </target>
+
+ <target
+ name = "buildapp"
+ description = "Creates executable jar"
+ >
+ <property name="appName" value="${module.name}-${module.version}-app" />
+ <jar destfile="${appName}.jar">
+ <zipfileset dir="classes/production/${module.shortname}"/>
+ <zipgroupfileset dir="lib" includes="*.jar" excludes="LICENSE-*.jar" />
+ <manifest>
+ <attribute name="Main-Class" value="${main.class}" />
+ <!--attribute name="Class-Path" value="lib/annotations.jar lib/japi-lib-lang-0.1.jar lib/japi-lib-swing-about-0.1.jar lib/japi-lib-swing-action-0.1.jar" /-->
+ <attribute name="Implementation-Title" value="${module.name}" />
+ <attribute name="Implementation-Vendor" value="Christian Hujer + the...
[truncated message content] |
|
From: <chr...@us...> - 2008-11-30 17:27:56
|
Revision: 717
http://japi.svn.sourceforge.net/japi/?rev=717&view=rev
Author: christianhujer
Date: 2008-11-30 17:27:47 +0000 (Sun, 30 Nov 2008)
Log Message:
-----------
Added ScriptInterpreter.
Added Paths:
-----------
tools/scriptInterpreter/
tools/scriptInterpreter/branches/
tools/scriptInterpreter/tags/
tools/scriptInterpreter/trunk/
tools/scriptInterpreter/trunk/ScriptInterpreter-0.1-app.jar
tools/scriptInterpreter/trunk/action.js
tools/scriptInterpreter/trunk/build.xml
tools/scriptInterpreter/trunk/lib/
tools/scriptInterpreter/trunk/lib/LICENSE-annotations.jar
tools/scriptInterpreter/trunk/lib/LICENSE-jlfgr-1_0.jar
tools/scriptInterpreter/trunk/lib/LICENSE-junit.jar
tools/scriptInterpreter/trunk/lib/annotations.jar
tools/scriptInterpreter/trunk/lib/japi-lib-argparser-trunk.jar
tools/scriptInterpreter/trunk/lib/jlfgr-1_0.jar
tools/scriptInterpreter/trunk/lib/junit.jar
tools/scriptInterpreter/trunk/scriptInterpreter.iml
tools/scriptInterpreter/trunk/src/
tools/scriptInterpreter/trunk/src/doc/
tools/scriptInterpreter/trunk/src/prj/
tools/scriptInterpreter/trunk/src/prj/net/
tools/scriptInterpreter/trunk/src/prj/net/sf/
tools/scriptInterpreter/trunk/src/prj/net/sf/japi/
tools/scriptInterpreter/trunk/src/prj/net/sf/japi/tools/
tools/scriptInterpreter/trunk/src/prj/net/sf/japi/tools/si/
tools/scriptInterpreter/trunk/src/prj/net/sf/japi/tools/si/ScriptInterpreter.java
tools/scriptInterpreter/trunk/src/prj/net/sf/japi/tools/si/ScriptInterpreter.properties
tools/scriptInterpreter/trunk/src/tst/
tools/scriptInterpreter/trunk/test.js
Added: tools/scriptInterpreter/trunk/ScriptInterpreter-0.1-app.jar
===================================================================
(Binary files differ)
Property changes on: tools/scriptInterpreter/trunk/ScriptInterpreter-0.1-app.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: tools/scriptInterpreter/trunk/action.js
===================================================================
--- tools/scriptInterpreter/trunk/action.js (rev 0)
+++ tools/scriptInterpreter/trunk/action.js 2008-11-30 17:27:47 UTC (rev 717)
@@ -0,0 +1,15 @@
+function aa(e) {
+ print("Test.\n");
+}
+function wl1(e) {
+ if (e.ID == java.awt.event.WindowEvent.WINDOW_CLOSING) {
+ e.source.dispose();
+ }
+}
+frame = new javax.swing.JFrame("Test");
+button = new javax.swing.JButton("Click");
+button.addActionListener(aa);
+frame.add(button);
+frame.addWindowListener(wl1);
+frame.pack();
+frame.setVisible(true);
Property changes on: tools/scriptInterpreter/trunk/action.js
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ LF
Added: tools/scriptInterpreter/trunk/build.xml
===================================================================
--- tools/scriptInterpreter/trunk/build.xml (rev 0)
+++ tools/scriptInterpreter/trunk/build.xml 2008-11-30 17:27:47 UTC (rev 717)
@@ -0,0 +1,226 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ ScriptInterpreter is a program for interpreting scripts using Java.
+ ~ Copyright (C) 2007 Christian Hujer
+ ~
+ ~ This program is free software; you can redistribute it and/or modify
+ ~ it under the terms of the GNU General Public License as published by
+ ~ the Free Software Foundation; either version 2 of the License, or
+ ~ (at your option) any later version.
+ ~
+ ~ This program is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ ~ GNU General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU General Public License along
+ ~ with this program; if not, write to the Free Software Foundation, Inc.,
+ ~ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ -->
+
+<project name="ScriptInterpreter" default="compile">
+
+ <property name="module.version" value="0.1" />
+ <property name="module.name" value="ScriptInterpreter" />
+ <property name="module.shortname" value="ScriptInterpreter" />
+ <property name="module.title" value="ScriptInterpreter" />
+ <property name="main.class" value="net.sf.japi.tools.si.ScriptInterpreter" />
+
+ <taskdef name="pack200" classpath="common/antlib/Pack200Task.jar" classname="com.sun.tools.apache.ant.pack200.Pack200Task" />
+
+ <target
+ name = "clean"
+ description = "Cleans Sandbox"
+ >
+ <delete dir="classes" />
+ <delete dir="docs" />
+ </target>
+
+ <target
+ name = "compile"
+ description = "Compiles production classes"
+ >
+ <mkdir dir="classes/production/${module.shortname}" />
+ <mkdir dir="classes/test/${module.shortname}" />
+ <javac
+ srcdir="src/prj"
+ destdir="classes/production/${module.shortname}"
+ encoding="utf-8"
+ source="1.5"
+ target="1.5"
+ >
+ <classpath>
+ <fileset dir="lib" includes="*.jar" excludes="LICENSE-*.jar" />
+ <fileset dir="common/lib" includes="*.jar" excludes="LICENSE-*.jar" />
+ </classpath>
+ <exclude name="test/**/*.java" />
+ </javac>
+ <copy
+ todir="classes/production/${module.shortname}"
+ >
+ <fileset dir="src/prj" includes="**/*.properties" excludes="test/**/*.properties" />
+ <fileset dir="src/prj" includes="META-INF/services/**" />
+ </copy>
+ <copy
+ todir="classes/production/${module.shortname}"
+ >
+ <fileset dir="lib" includes="LICENSE-*" />
+ <fileset dir="." includes="COPYING" />
+ </copy>
+ </target>
+
+ <target
+ name = "dist"
+ description = "Packs distribution archives."
+ depends = "clean, compile"
+ >
+ <!--depends = "clean, compile, doc"
+ -->
+ <delete dir="dist" />
+ <mkdir dir="dist" />
+ <property name="distName" value="dist/${module.name}-${module.version}" />
+ <parallel>
+ <tar tarfile="${distName}.src.tar">
+ <tarfileset dir="." prefix="${module.name}-${module.version}">
+ <include name="src/**" />
+ <include name="build.xml" />
+ </tarfileset>
+ </tar>
+ <zip destfile="${distName}.src.zip">
+ <zipfileset dir="." prefix="${module.name}-${module.version}">
+ <include name="src/**" />
+ <include name="build.xml" />
+ </zipfileset>
+ </zip>
+ <jar destfile="${distName}.src.jar">
+ <zipfileset dir="." prefix="${module.name}-${module.version}">
+ <include name="src/**" />
+ <include name="build.xml" />
+ </zipfileset>
+ </jar>
+ <jar destfile="${distName}.jar">
+ <zipfileset dir="classes/production/${module.shortname}"/>
+ <manifest>
+ <attribute name="Main-Class" value="${main.class}" />
+ <attribute name="Class-Path" value="lib/annotations.jar lib/japi-lib-lang-0.1.jar lib/japi-lib-swing-about-0.1.jar lib/japi-lib-swing-action-0.1.jar" />
+ <attribute name="Implementation-Title" value="${module.name}" />
+ <attribute name="Implementation-Vendor" value="Christian Hujer + the JAPI Developers" />
+ <attribute name="Implementation-Version" value="${module.version}" />
+ <attribute name="Implementation-URL" value="http://sourceforge.net/projects/japi/" />
+ </manifest>
+ </jar>
+ <tar tarfile="${distName}.doc.tar">
+ <tarfileset dir="." prefix="${module.name}-${module.version}">
+ <include name="docs/**" />
+ <include name="build.xml" />
+ </tarfileset>
+ </tar>
+ <zip destfile="${distName}.doc.zip">
+ <zipfileset dir="." prefix="${module.name}-${module.version}">
+ <include name="docs/**" />
+ <include name="build.xml" />
+ </zipfileset>
+ </zip>
+ <jar destfile="${distName}.doc.jar">
+ <zipfileset dir="." prefix="${module.name}-${module.version}">
+ <include name="docs/**" />
+ </zipfileset>
+ </jar>
+ </parallel>
+ <parallel>
+ <gzip src="${distName}.src.tar" destfile="${distName}.src.tar.gz" />
+ <bzip2 src="${distName}.src.tar" destfile="${distName}.src.tar.bz2" />
+ <gzip src="${distName}.doc.tar" destfile="${distName}.doc.tar.gz" />
+ <bzip2 src="${distName}.doc.tar" destfile="${distName}.doc.tar.bz2" />
+ <pack200
+ src="${distName}.jar"
+ destfile="${distName}.pack.gz"
+ gzipoutput="true"
+ stripdebug="true"
+ effort="9"
+ keepfileorder="false"
+ modificationtime="latest"
+ deflatehint="false"
+ />
+ </parallel>
+ <delete file="${distName}.src.tar" />
+ <delete file="${distName}.doc.tar" />
+ </target>
+
+ <target
+ name = "doc"
+ description = "Creates public javadoc documentation."
+ >
+ <mkdir dir="docs/api" />
+ <!--copy todir="docs/api" file="src/doc/api/public/copyright.html" />
+ <copy todir="docs/api" file="src/doc/api/public/.htaccess" /-->
+ <javadoc
+ destdir = "docs/api"
+ access = "protected"
+ author = "yes"
+ version = "yes"
+ locale = "en_US"
+ use = "yes"
+ splitindex = "yes"
+ windowtitle = "JAPI Library ${module.title} ${module.version} API documentation"
+ doctitle = "JAPI<br />Yet another Java API<br />Library ${module.title} ${module.version} API documentation"
+ header = "JAPI Library ${module.title} ${module.version}<br />API Documentation"
+ footer = "JAPI<br />Yet another Java API<br />Library ${module.title} ${module.version} API documentation"
+ bottom = "<div style=" text-align:center;">© 2005-2006 Christian Hujer. All rights reserved. See <a href="{@docRoot}/copyright.html">copyright</a></div>"
+ serialwarn = "yes"
+ charset = "utf-8"
+ docencoding = "utf-8"
+ encoding = "utf-8"
+ source = "1.5"
+ linksource = "yes"
+ link = "${user.javadoc.link}"
+ >
+ <!--
+ overview = "src/overview.html"
+ -->
+ <classpath>
+ <fileset dir="lib" includes="annotations.jar" />
+ </classpath>
+ <sourcepath>
+ <pathelement path="${user.javadoc.javasrc}" />
+ <pathelement path="src/prj" />
+ </sourcepath>
+ <packageset
+ dir="src/prj"
+ defaultexcludes="yes"
+ >
+ <include name="net/**" />
+ </packageset>
+ <tag enabled="true" name="retval" description="Return Values:" scope="methods" />
+ <tag enabled="true" name="pre" description="Preconditions:" scope="methods,constructors" />
+ <tag enabled="true" name="post" description="Postconditions:" scope="methods" />
+ <tag enabled="true" name="invariant" description="Invariant:" scope="methods,fields" />
+ <tag enabled="true" name="note" description="Notes:" />
+ <tag enabled="true" name="warning" description="Warnings:" />
+ <!--tag enabled="true" name="todo" description="Todo:" /-->
+ <taglet name="com.sun.tools.doclets.ToDoTaglet" path="" />
+ <tag enabled="true" name="fixme" description="Fixme:" />
+ <tag enabled="true" name="xxx" description="XXX:" />
+ </javadoc>
+ </target>
+
+ <target
+ name = "buildapp"
+ description = "Creates executable jar"
+ >
+ <property name="appName" value="${module.name}-${module.version}-app" />
+ <jar destfile="${appName}.jar">
+ <zipfileset dir="classes/production/${module.shortname}"/>
+ <zipgroupfileset dir="lib" includes="*.jar" excludes="LICENSE-*.jar" />
+ <manifest>
+ <attribute name="Main-Class" value="${main.class}" />
+ <!--attribute name="Class-Path" value="lib/annotations.jar lib/japi-lib-lang-0.1.jar lib/japi-lib-swing-about-0.1.jar lib/japi-lib-swing-action-0.1.jar" /-->
+ <attribute name="Implementation-Title" value="${module.name}" />
+ <attribute name="Implementation-Vendor" value="Christian Hujer + the JAPI Developers" />
+ <attribute name="Implementation-Version" value="${module.version}" />
+ <attribute name="Implementation-URL" value="http://sourceforge.net/projects/japi/" />
+ </manifest>
+ </jar>
+ </target>
+
+</project>
Property changes on: tools/scriptInterpreter/trunk/build.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:eol-style
+ LF
Added: tools/scriptInterpreter/trunk/lib/LICENSE-annotations.jar
===================================================================
--- tools/scriptInterpreter/trunk/lib/LICENSE-annotations.jar (rev 0)
+++ tools/scriptInterpreter/trunk/lib/LICENSE-annotations.jar 2008-11-30 17:27:47 UTC (rev 717)
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
Property changes on: tools/scriptInterpreter/trunk/lib/LICENSE-annotations.jar
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ LF
Added: tools/scriptInterpreter/trunk/lib/LICENSE-jlfgr-1_0.jar
===================================================================
--- tools/scriptInterpreter/trunk/lib/LICENSE-jlfgr-1_0.jar (rev 0)
+++ tools/scriptInterpreter/trunk/lib/LICENSE-jlfgr-1_0.jar 2008-11-30 17:27:47 UTC (rev 717)
@@ -0,0 +1,10 @@
+Copyright 2000 by Sun Microsystems, Inc. All Rights Reserved.
+
+Sun grants you ("Licensee") a non-exclusive, royalty free, license to use, and redistribute this software graphics artwork, as individual graphics or as a collection, as part of software code or programs that you develop, provided that i) this copyright notice and license accompany the software graphics artwork; and ii) you do not utilize the software graphics artwork in a manner which is disparaging to Sun. Unless enforcement is prohibited by applicable law, you may not modify the graphics, and must use them true to color and unmodified in every way.
+
+This software graphics artwork is provided "AS IS," without a warranty of any kind. ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN AND ITS LICENSORS SHALL NOT BE LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE GRAPHICS ARTWORK.
+
+IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE SOFTWARE GRAPHICS ARTWORK, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+If any of the above provisions are held to be in violation of applicable law, void, or unenforceable in any jurisdiction, then such provisions are waived to the extent necessary for this Disclaimer to be otherwise enforceable in such jurisdiction.
+
Property changes on: tools/scriptInterpreter/trunk/lib/LICENSE-jlfgr-1_0.jar
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ LF
Added: tools/scriptInterpreter/trunk/lib/LICENSE-junit.jar
===================================================================
--- tools/scriptInterpreter/trunk/lib/LICENSE-junit.jar (rev 0)
+++ tools/scriptInterpreter/trunk/lib/LICENSE-junit.jar 2008-11-30 17:27:47 UTC (rev 717)
@@ -0,0 +1,213 @@
+Common Public License Version 1.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC
+LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
+CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+ a) in the case of the initial Contributor, the initial code and
+documentation distributed under this Agreement, and
+
+ b) in the case of each subsequent Contributor:
+
+ i) changes to the Program, and
+
+ ii) additions to the Program;
+
+ where such changes and/or additions to the Program originate from and are
+distributed by that particular Contributor. A Contribution 'originates' from a
+Contributor if it was added to the Program by such Contributor itself or anyone
+acting on such Contributor's behalf. Contributions do not include additions to
+the Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii) are not
+derivative works of the Program.
+
+"Contributor" means any person or entity that distributes the Program.
+
+"Licensed Patents " mean patent claims licensable by a Contributor which are
+necessarily infringed by the use or sale of its Contribution alone or when
+combined with the Program.
+
+"Program" means the Contributions distributed in accordance with this Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement,
+including all Contributors.
+
+2. GRANT OF RIGHTS
+
+ a) Subject to the terms of this Agreement, each Contributor hereby grants
+Recipient a non-exclusive, worldwide, royalty-free copyright license to
+repr...
[truncated message content] |
|
From: <chr...@us...> - 2008-11-30 17:30:41
|
Revision: 718
http://japi.svn.sourceforge.net/japi/?rev=718&view=rev
Author: christianhujer
Date: 2008-11-30 17:30:37 +0000 (Sun, 30 Nov 2008)
Log Message:
-----------
Added MidiMonitor.
Added Paths:
-----------
tools/midiMonitor/
tools/midiMonitor/branches/
tools/midiMonitor/tags/
tools/midiMonitor/trunk/
tools/midiMonitor/trunk/midiMonitor.iml
tools/midiMonitor/trunk/src/
tools/midiMonitor/trunk/src/doc/
tools/midiMonitor/trunk/src/prj/
tools/midiMonitor/trunk/src/prj/net/
tools/midiMonitor/trunk/src/prj/net/sf/
tools/midiMonitor/trunk/src/prj/net/sf/japi/
tools/midiMonitor/trunk/src/prj/net/sf/japi/tools/
tools/midiMonitor/trunk/src/prj/net/sf/japi/tools/midiMonitor/
tools/midiMonitor/trunk/src/prj/net/sf/japi/tools/midiMonitor/MidiMonitor.java
tools/midiMonitor/trunk/src/tst/
Added: tools/midiMonitor/trunk/midiMonitor.iml
===================================================================
--- tools/midiMonitor/trunk/midiMonitor.iml (rev 0)
+++ tools/midiMonitor/trunk/midiMonitor.iml 2008-11-30 17:30:37 UTC (rev 718)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module relativePaths="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/doc" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/prj" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/tst" isTestSource="true" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="libs-argparser" />
+ <orderEntry type="library" name="annotations" level="project" />
+ <orderEntry type="library" name="junit" level="project" />
+ <orderEntry type="module" module-name="midi" />
+ <orderEntryProperties />
+ </component>
+</module>
+
Property changes on: tools/midiMonitor/trunk/midiMonitor.iml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:eol-style
+ LF
Added: tools/midiMonitor/trunk/src/prj/net/sf/japi/tools/midiMonitor/MidiMonitor.java
===================================================================
--- tools/midiMonitor/trunk/src/prj/net/sf/japi/tools/midiMonitor/MidiMonitor.java (rev 0)
+++ tools/midiMonitor/trunk/src/prj/net/sf/japi/tools/midiMonitor/MidiMonitor.java 2008-11-30 17:30:37 UTC (rev 718)
@@ -0,0 +1,65 @@
+package net.sf.japi.tools.midiMonitor;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import javax.sound.midi.MidiDevice;
+import javax.sound.midi.MidiSystem;
+import javax.sound.midi.MidiUnavailableException;
+import javax.sound.midi.Transmitter;
+import net.sf.japi.io.args.ArgParser;
+import net.sf.japi.io.args.CommandWithHelp;
+import net.sf.japi.io.args.Option;
+import net.sf.japi.io.args.OptionType;
+import net.sf.japi.midi.MonitorReceiver;
+import org.jetbrains.annotations.NotNull;
+
+/** MidiMonitor is a command line program for monitoring MIDI transmitters.
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
+ */
+public class MidiMonitor extends CommandWithHelp {
+
+ /** The transmitters that shall be monitored. */
+ private final Map<String, Transmitter> transmitters = new HashMap<String,Transmitter>();
+
+ /** Main program.
+ * @param args Command line arguments (try --help).
+ */
+ public static void main(final String... args) {
+ ArgParser.simpleParseAndRun(new MidiMonitor(), args);
+ }
+
+ /** Adds a transmitter to the list of transmitters to monitor.
+ * @param transmitterName Name of the transmitterName to add.
+ * @throws MidiUnavailableException If MIDI is unavailable.
+ */
+ @Option(type = OptionType.REQUIRED, value = {"t", "transmitter"})
+ public void addTransmitter(@NotNull final String transmitterName) throws MidiUnavailableException {
+ for (final MidiDevice.Info deviceInfo : MidiSystem.getMidiDeviceInfo()) {
+ if (transmitterName.equals(deviceInfo.getName())) {
+ final MidiDevice device = MidiSystem.getMidiDevice(deviceInfo);
+ if (device.getMaxTransmitters() != 0) {
+ device.open();
+ transmitters.put(transmitterName, device.getTransmitter());
+ return;
+ }
+ }
+ }
+ }
+
+ /** {@inheritDoc} */
+ @SuppressWarnings({"InstanceMethodNamingConvention"})
+ public int run(@NotNull final List<String> args) throws Exception {
+ for (final Map.Entry<String,Transmitter> entry : transmitters.entrySet()) {
+ entry.getValue().setReceiver(new MonitorReceiver(entry.getKey()));
+ }
+ try {
+ synchronized (this) {
+ wait();
+ }
+ } catch (final InterruptedException e) {
+ /* ignore. */
+ }
+ return 0;
+ }
+}
Property changes on: tools/midiMonitor/trunk/src/prj/net/sf/japi/tools/midiMonitor/MidiMonitor.java
___________________________________________________________________
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...> - 2008-11-30 17:33:22
|
Revision: 719
http://japi.svn.sourceforge.net/japi/?rev=719&view=rev
Author: christianhujer
Date: 2008-11-30 17:33:16 +0000 (Sun, 30 Nov 2008)
Log Message:
-----------
Added ScriptEngineLister.
Added Paths:
-----------
tools/scriptEngineLister/
tools/scriptEngineLister/branches/
tools/scriptEngineLister/tags/
tools/scriptEngineLister/trunkbak/
tools/scriptEngineLister/trunkbak/scriptEngineLister.iml
tools/scriptEngineLister/trunkbak/src/
tools/scriptEngineLister/trunkbak/src/doc/
tools/scriptEngineLister/trunkbak/src/prj/
tools/scriptEngineLister/trunkbak/src/prj/net/
tools/scriptEngineLister/trunkbak/src/prj/net/sf/
tools/scriptEngineLister/trunkbak/src/prj/net/sf/japi/
tools/scriptEngineLister/trunkbak/src/prj/net/sf/japi/tools/
tools/scriptEngineLister/trunkbak/src/prj/net/sf/japi/tools/sel/
tools/scriptEngineLister/trunkbak/src/prj/net/sf/japi/tools/sel/ScriptEngineLister.java
tools/scriptEngineLister/trunkbak/src/tst/
Added: tools/scriptEngineLister/trunkbak/scriptEngineLister.iml
===================================================================
--- tools/scriptEngineLister/trunkbak/scriptEngineLister.iml (rev 0)
+++ tools/scriptEngineLister/trunkbak/scriptEngineLister.iml 2008-11-30 17:33:16 UTC (rev 719)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module relativePaths="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/doc" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/prj" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/tst" isTestSource="true" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="library" name="annotations" level="project" />
+ <orderEntry type="library" name="junit" level="project" />
+ <orderEntry type="module" module-name="libs-argparser" />
+ <orderEntryProperties />
+ </component>
+</module>
+
Property changes on: tools/scriptEngineLister/trunkbak/scriptEngineLister.iml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:eol-style
+ LF
Added: tools/scriptEngineLister/trunkbak/src/prj/net/sf/japi/tools/sel/ScriptEngineLister.java
===================================================================
--- tools/scriptEngineLister/trunkbak/src/prj/net/sf/japi/tools/sel/ScriptEngineLister.java (rev 0)
+++ tools/scriptEngineLister/trunkbak/src/prj/net/sf/japi/tools/sel/ScriptEngineLister.java 2008-11-30 17:33:16 UTC (rev 719)
@@ -0,0 +1,71 @@
+package net.sf.japi.tools.sel;
+
+import java.util.List;
+import javax.script.Bindings;
+import javax.script.ScriptContext;
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineFactory;
+import javax.script.ScriptEngineManager;
+import net.sf.japi.io.args.ArgParser;
+import net.sf.japi.io.args.BasicCommand;
+import org.jetbrains.annotations.NotNull;
+
+/** Program for listing available script engines.
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
+ */
+public class ScriptEngineLister extends BasicCommand {
+
+ /** Main program.
+ * @param args Command line arguments (try --help).
+ */
+ public static void main(final String... args) {
+ ArgParser.simpleParseAndRun(new ScriptEngineLister(), args);
+ }
+
+ /** {@inheritDoc} */
+ @SuppressWarnings({"InstanceMethodNamingConvention"})
+ public int run(@NotNull final List<String> args) throws Exception {
+ final ScriptEngineManager sem = new ScriptEngineManager();
+ for (final ScriptEngineFactory factory : sem.getEngineFactories()) {
+ System.out.println("Name: " + factory.getEngineName());
+ System.out.println("Version: " + factory.getEngineVersion());
+ System.out.println("Extensions: " + factory.getExtensions());
+ System.out.println("Language Name: " + factory.getLanguageName());
+ System.out.println("Language Version: " + factory.getLanguageVersion());
+ System.out.println("Mime Types: " + factory.getMimeTypes());
+ System.out.println("Names: " + factory.getNames());
+ printBindings(factory);
+ System.out.println();
+ }
+ return 0;//To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ private void printBindings(final ScriptEngineFactory factory) {
+ final ScriptEngine se = factory.getScriptEngine();
+ printBindings(se, ScriptContext.GLOBAL_SCOPE);
+ printBindings(se, ScriptContext.ENGINE_SCOPE);
+ }
+
+ private void printBindings(final ScriptEngine engine, final int scope) {
+ System.out.print("Scope: ");
+ switch (scope) {
+ case ScriptContext.GLOBAL_SCOPE:
+ System.out.print("GLOBAL_SCOPE");
+ break;
+ case ScriptContext.ENGINE_SCOPE:
+ System.out.print("ENGINE_SCOPE");
+ break;
+ default:
+ System.out.print(scope);
+ }
+ System.out.println();
+ final Bindings bindings = engine.getBindings(scope);
+ if (bindings == null) {
+ System.out.println("null");
+ } else {
+ for (final Object entry : bindings.entrySet()) {
+ System.out.println(entry);
+ }
+ }
+ }
+}
Property changes on: tools/scriptEngineLister/trunkbak/src/prj/net/sf/japi/tools/sel/ScriptEngineLister.java
___________________________________________________________________
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...> - 2008-12-24 10:55:01
|
Revision: 731
http://japi.svn.sourceforge.net/japi/?rev=731&view=rev
Author: christianhujer
Date: 2008-12-24 10:54:54 +0000 (Wed, 24 Dec 2008)
Log Message:
-----------
Update license file.
Modified Paths:
--------------
libs/argparser/trunk/COPYING
libs/io/trunk/COPYING
libs/lang/trunk/COPYING
libs/net/trunk/COPYING
libs/taglets/trunk/COPYING
Added Paths:
-----------
games/jmines/trunk/COPYING
libs/logging/trunk/COPYING
libs/midi/trunk/COPYING
libs/registry/trunk/COPYING
libs/swing-action/trunk/COPYING
libs/swing-app/trunk/COPYING
libs/swing-bookmarks/trunk/COPYING
libs/swing-extlib/trunk/COPYING
libs/swing-font/trunk/COPYING
libs/swing-keyprefs/trunk/COPYING
libs/swing-list/trunk/COPYING
libs/swing-misc/trunk/COPYING
libs/swing-prefs/trunk/COPYING
libs/swing-proxyprefs/trunk/COPYING
libs/swing-recent/trunk/COPYING
libs/swing-tod/trunk/COPYING
libs/swing-treetable/trunk/COPYING
libs/util/trunk/COPYING
libs/xml/trunk/COPYING
progs/batcher/trunk/COPYING
progs/cardlearn/trunk/COPYING
progs/jeduca/trunk/COPYING
progs/jhexedit/trunk/COPYING
progs/jhexview/trunk/COPYING
progs/jirus/trunk/COPYING
progs/jtype/trunk/COPYING
progs/midilearn/trunk/COPYING
progs/textedit/trunk/COPYING
tools/archStat/trunk/COPYING
tools/cstyle/trunk/COPYING
tools/findLongestPath/trunk/COPYING
tools/fontbrowser/trunk/COPYING
tools/gdbControl/trunk/COPYING
tools/jwget/trunk/COPYING
tools/keystrokes/trunk/COPYING
tools/mail/trunk/COPYING
tools/midiDeviceLister/trunk/COPYING
tools/midiMonitor/trunk/COPYING
tools/prefsbrowser/trunk/COPYING
tools/scriptInterpreter/trunk/COPYING
tools/todoScanner/trunk/COPYING
Added: games/jmines/trunk/COPYING
===================================================================
--- games/jmines/trunk/COPYING (rev 0)
+++ games/jmines/trunk/COPYING 2008-12-24 10:54:54 UTC (rev 731)
@@ -0,0 +1,339 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
Property changes on: games/jmines/trunk/COPYING
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ LF
Modified: libs/argparser/trunk/COPYING
===================================================================
--- libs/argparser/trunk/COPYING 2008-11-30 18:12:40 UTC (rev 730)
+++ libs/argparser/trunk/COPYING 2008-12-24 10:54:54 UTC (rev 731)
@@ -1,221 +1,397 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 2.1, February 1999
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
+[This is the first released version of the Lesser GPL. It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
-your programs, too.
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
+ This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it. You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+ When we speak of free software, we are referring to freedom of use,
+not price. Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
+distributors to deny you these rights or to ask you to surrender these
+rights. These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
+ For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you. You must make sure that they, too, receive or can get the source
+code. If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it. And you must show them these terms so they know their rights.
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
+ We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
+ To protect each distributor, we want to make it very clear that
+there is no warranty for the free library. Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+ Finally, software patents pose a constant threat to the existence of
+any free program. We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder. Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
+ Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License. This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License. We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+ When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library. The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom. The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+ We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License. It also provides other free software developers Less
+of an advantage over competing non-free programs. These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries. However, the Lesser license provides advantages in certain
+special circumstances.
+
+ For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard. To achieve this, non-free programs must be
+allowed to use the library. A more frequent case is that a free
+library does the same job as widely used non-free libraries. In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+ In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software. For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+ Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
+modification follow. Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library". The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+ GNU LESSER GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
+ 0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed und...
[truncated message content] |
|
From: <chr...@us...> - 2008-12-24 11:08:16
|
Revision: 732
http://japi.svn.sourceforge.net/japi/?rev=732&view=rev
Author: christianhujer
Date: 2008-12-24 11:08:12 +0000 (Wed, 24 Dec 2008)
Log Message:
-----------
Updated svn:externals property to be in sync on all trunks.
Property Changed:
----------------
games/jmines/trunk/
historic/trunk/
imajar/trunk/
libs/logging/trunk/
libs/midi/trunk/
progs/batcher/trunk/
progs/cardlearn/trunk/
progs/jeduca/trunk/
progs/jhexedit/trunk/
progs/jhexview/trunk/
progs/jirus/trunk/
progs/jtype/trunk/
progs/midilearn/trunk/
progs/textedit/trunk/
site/trunk/
tools/jgrep/trunk/
tools/mail/trunk/
tools/midiDeviceLister/trunk/
tools/midiMonitor/trunk/
tools/scriptInterpreter/trunk/
tools/string2bytes/trunk/
Property changes on: games/jmines/trunk
___________________________________________________________________
Added: svn:externals
+ common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
Property changes on: historic/trunk
___________________________________________________________________
Added: svn:externals
+ common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
Property changes on: imajar/trunk
___________________________________________________________________
Added: svn:externals
+ common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
Property changes on: libs/logging/trunk
___________________________________________________________________
Added: svn:ignore
+ classes
Property changes on: libs/midi/trunk
___________________________________________________________________
Added: svn:ignore
+ classes
dest
developer.properties
dist
docs
Property changes on: progs/batcher/trunk
___________________________________________________________________
Added: svn:externals
+ common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
Property changes on: progs/cardlearn/trunk
___________________________________________________________________
Added: svn:externals
+ common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
Property changes on: progs/jeduca/trunk
___________________________________________________________________
Added: svn:externals
+ common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
Property changes on: progs/jhexedit/trunk
___________________________________________________________________
Added: svn:externals
+ common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
Property changes on: progs/jhexview/trunk
___________________________________________________________________
Added: svn:externals
+ common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
Property changes on: progs/jirus/trunk
___________________________________________________________________
Added: svn:externals
+ common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
Property changes on: progs/jtype/trunk
___________________________________________________________________
Added: svn:externals
+ common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
Property changes on: progs/midilearn/trunk
___________________________________________________________________
Added: svn:externals
+ common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
Property changes on: progs/textedit/trunk
___________________________________________________________________
Added: svn:externals
+ common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
Property changes on: site/trunk
___________________________________________________________________
Added: svn:externals
+ common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
Property changes on: tools/jgrep/trunk
___________________________________________________________________
Added: svn:externals
+ common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
Property changes on: tools/mail/trunk
___________________________________________________________________
Added: svn:externals
+ common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
Property changes on: tools/midiDeviceLister/trunk
___________________________________________________________________
Added: svn:externals
+ common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
Property changes on: tools/midiMonitor/trunk
___________________________________________________________________
Added: svn:externals
+ common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
Property changes on: tools/scriptInterpreter/trunk
___________________________________________________________________
Added: svn:externals
+ common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
Property changes on: tools/string2bytes/trunk
___________________________________________________________________
Added: svn:externals
+ common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-12-24 23:08:33
|
Revision: 733
http://japi.svn.sourceforge.net/japi/?rev=733&view=rev
Author: christianhujer
Date: 2008-12-24 23:08:28 +0000 (Wed, 24 Dec 2008)
Log Message:
-----------
Updated / synchronized svn:ignore property of all trunks.
Property Changed:
----------------
common/trunk/
games/jmines/trunk/
historic/trunk/
imajar/trunk/
libs/finance/trunk/
libs/logging/trunk/
libs/registry/trunk/
libs/swing-about/trunk/
libs/swing-action/trunk/
libs/swing-app/trunk/
libs/swing-bookmarks/trunk/
libs/swing-extlib/trunk/
libs/swing-font/trunk/
libs/swing-keyprefs/trunk/
libs/swing-misc/trunk/
libs/swing-prefs/trunk/
libs/swing-proxyprefs/trunk/
libs/swing-recent/trunk/
libs/swing-tod/trunk/
libs/swing-treetable/trunk/
libs/util/trunk/
libs/xml/trunk/
progs/batcher/trunk/
progs/cardlearn/trunk/
progs/jeduca/trunk/
progs/jhexedit/trunk/
progs/jhexview/trunk/
progs/jirus/trunk/
progs/jtype/trunk/
progs/midilearn/trunk/
progs/textedit/trunk/
site/trunk/
tools/archStat/trunk/
tools/cstyle/trunk/
tools/dircount/trunk/
tools/findLongestPath/trunk/
tools/fontbrowser/trunk/
tools/gdbControl/trunk/
tools/jgrep/trunk/
tools/jwget/trunk/
tools/keystrokes/trunk/
tools/mail/trunk/
tools/midiDeviceLister/trunk/
tools/midiMonitor/trunk/
tools/prefsbrowser/trunk/
tools/replacer/trunk/
tools/scriptInterpreter/trunk/
tools/string2bytes/trunk/
tools/todoScanner/trunk/
Property changes on: common/trunk
___________________________________________________________________
Added: svn:ignore
+ classes
dest
developer.properties
dist
docs
Property changes on: games/jmines/trunk
___________________________________________________________________
Added: svn:ignore
+ classes
dest
developer.properties
dist
docs
Property changes on: historic/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
make
+ classes
dest
developer.properties
dist
docs
Property changes on: imajar/trunk
___________________________________________________________________
Added: svn:ignore
+ classes
dest
developer.properties
dist
docs
Property changes on: libs/finance/trunk
___________________________________________________________________
Added: svn:ignore
+ classes
dest
developer.properties
dist
docs
Property changes on: libs/logging/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
+ classes
dest
developer.properties
dist
docs
Property changes on: libs/registry/trunk
___________________________________________________________________
Added: svn:ignore
+ classes
dest
developer.properties
dist
docs
Property changes on: libs/swing-about/trunk
___________________________________________________________________
Added: svn:ignore
+ classes
dest
developer.properties
dist
docs
Property changes on: libs/swing-action/trunk
___________________________________________________________________
Modified: svn:ignore
- dest
dist
classes
+ classes
dest
developer.properties
dist
docs
Property changes on: libs/swing-app/trunk
___________________________________________________________________
Added: svn:ignore
+ classes
dest
developer.properties
dist
docs
Property changes on: libs/swing-bookmarks/trunk
___________________________________________________________________
Added: svn:ignore
+ classes
dest
developer.properties
dist
docs
Property changes on: libs/swing-extlib/trunk
___________________________________________________________________
Modified: svn:ignore
- dest
dist
classes
+ classes
dest
developer.properties
dist
docs
Property changes on: libs/swing-font/trunk
___________________________________________________________________
Added: svn:ignore
+ classes
dest
developer.properties
dist
docs
Property changes on: libs/swing-keyprefs/trunk
___________________________________________________________________
Added: svn:ignore
+ classes
dest
developer.properties
dist
docs
Property changes on: libs/swing-misc/trunk
___________________________________________________________________
Modified: svn:ignore
- dest
dist
classes
+ classes
dest
developer.properties
dist
docs
Property changes on: libs/swing-prefs/trunk
___________________________________________________________________
Modified: svn:ignore
- dest
dist
classes
+ classes
dest
developer.properties
dist
docs
Property changes on: libs/swing-proxyprefs/trunk
___________________________________________________________________
Added: svn:ignore
+ classes
dest
developer.properties
dist
docs
Property changes on: libs/swing-recent/trunk
___________________________________________________________________
Added: svn:ignore
+ classes
dest
developer.properties
dist
docs
Property changes on: libs/swing-tod/trunk
___________________________________________________________________
Modified: svn:ignore
- dest
dist
classes
+ classes
dest
developer.properties
dist
docs
Property changes on: libs/swing-treetable/trunk
___________________________________________________________________
Added: svn:ignore
+ classes
dest
developer.properties
dist
docs
Property changes on: libs/util/trunk
___________________________________________________________________
Modified: svn:ignore
- dest
dist
classes
+ classes
dest
developer.properties
dist
docs
Property changes on: libs/xml/trunk
___________________________________________________________________
Modified: svn:ignore
- dest
dist
classes
+ classes
dest
developer.properties
dist
docs
Property changes on: progs/batcher/trunk
___________________________________________________________________
Added: svn:ignore
+ classes
dest
developer.properties
dist
docs
Property changes on: progs/cardlearn/trunk
___________________________________________________________________
Added: svn:ignore
+ classes
dest
developer.properties
dist
docs
Property changes on: progs/jeduca/trunk
___________________________________________________________________
Added: svn:ignore
+ classes
dest
developer.properties
dist
docs
Property changes on: progs/jhexedit/trunk
___________________________________________________________________
Added: svn:ignore
+ classes
dest
developer.properties
dist
docs
Property changes on: progs/jhexview/trunk
___________________________________________________________________
Added: svn:ignore
+ classes
dest
developer.properties
dist
docs
Property changes on: progs/jirus/trunk
___________________________________________________________________
Added: svn:ignore
+ classes
dest
developer.properties
dist
docs
Property changes on: progs/jtype/trunk
___________________________________________________________________
Added: svn:ignore
+ classes
dest
developer.properties
dist
docs
Property changes on: progs/midilearn/trunk
___________________________________________________________________
Added: svn:ignore
+ classes
dest
developer.properties
dist
docs
Property changes on: progs/textedit/trunk
___________________________________________________________________
Added: svn:ignore
+ classes
dest
developer.properties
dist
docs
Property changes on: site/trunk
___________________________________________________________________
Added: svn:ignore
+ classes
dest
developer.properties
dist
docs
Property changes on: tools/archStat/trunk
___________________________________________________________________
Added: svn:ignore
+ classes
dest
developer.properties
dist
docs
Property changes on: tools/cstyle/trunk
___________________________________________________________________
Added: svn:ignore
+ classes
dest
developer.properties
dist
docs
Property changes on: tools/dircount/trunk
___________________________________________________________________
Added: svn:ignore
+ classes
dest
developer.properties
dist
docs
Property changes on: tools/findLongestPath/trunk
___________________________________________________________________
Added: svn:ignore
+ classes
dest
developer.properties
dist
docs
Property changes on: tools/fontbrowser/trunk
___________________________________________________________________
Added: svn:ignore
+ classes
dest
developer.properties
dist
docs
Property changes on: tools/gdbControl/trunk
___________________________________________________________________
Added: svn:ignore
+ classes
dest
developer.properties
dist
docs
Property changes on: tools/jgrep/trunk
___________________________________________________________________
Added: svn:ignore
+ classes
dest
developer.properties
dist
docs
Property changes on: tools/jwget/trunk
___________________________________________________________________
Added: svn:ignore
+ classes
dest
developer.properties
dist
docs
Property changes on: tools/keystrokes/trunk
___________________________________________________________________
Added: svn:ignore
+ classes
dest
developer.properties
dist
docs
Property changes on: tools/mail/trunk
___________________________________________________________________
Added: svn:ignore
+ classes
dest
developer.properties
dist
docs
Property changes on: tools/midiDeviceLister/trunk
___________________________________________________________________
Added: svn:ignore
+ classes
dest
developer.properties
dist
docs
Property changes on: tools/midiMonitor/trunk
___________________________________________________________________
Added: svn:ignore
+ classes
dest
developer.properties
dist
docs
Property changes on: tools/prefsbrowser/trunk
___________________________________________________________________
Added: svn:ignore
+ classes
dest
developer.properties
dist
docs
Property changes on: tools/replacer/trunk
___________________________________________________________________
Added: svn:ignore
+ classes
dest
developer.properties
dist
docs
Property changes on: tools/scriptInterpreter/trunk
___________________________________________________________________
Added: svn:ignore
+ classes
dest
developer.properties
dist
docs
Property changes on: tools/string2bytes/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
+ classes
dest
developer.properties
dist
docs
Property changes on: tools/todoScanner/trunk
___________________________________________________________________
Added: svn:ignore
+ classes
dest
developer.properties
dist
docs
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-12-27 01:15:50
|
Revision: 741
http://japi.svn.sourceforge.net/japi/?rev=741&view=rev
Author: christianhujer
Date: 2008-12-27 01:15:43 +0000 (Sat, 27 Dec 2008)
Log Message:
-----------
Update project so it is loadable without warnings in IntelliJ IDEA again.
Modified Paths:
--------------
common/trunk/common.iml
games/jmines/trunk/jmines.iml
historic/trunk/historic.iml
japi.ipr
libs/argparser/trunk/libs-argparser.iml
libs/finance/trunk/libs-finance.iml
libs/io/trunk/libs-io.iml
libs/lang/trunk/libs-lang.iml
libs/logging/trunk/libs-logging.iml
libs/midi/trunk/midi.iml
libs/net/trunk/libs-net.iml
libs/registry/trunk/libs-registry.iml
libs/swing-about/trunk/libs-swing-about.iml
libs/swing-action/trunk/libs-swing-action.iml
libs/swing-app/trunk/libs-swing-app.iml
libs/swing-bookmarks/trunk/libs-swing-bookmarks.iml
libs/swing-extlib/trunk/libs-swing-extlib.iml
libs/swing-font/trunk/libs-swing-font.iml
libs/swing-keyprefs/trunk/libs-swing-keyprefs.iml
libs/swing-list/trunk/libs-swing-list.iml
libs/swing-misc/trunk/libs-swing-misc.iml
libs/swing-prefs/trunk/libs-swing-prefs.iml
libs/swing-proxyprefs/trunk/libs-swing-proxyprefs.iml
libs/swing-recent/trunk/libs-swing-recent.iml
libs/swing-tod/trunk/libs-swing-tod.iml
libs/swing-treetable/trunk/libs-swing-treetable.iml
libs/taglets/trunk/libs-taglets.iml
libs/util/trunk/libs-util.iml
libs/xml/trunk/libs-xml.iml
progs/batcher/trunk/Batcher.iml
progs/cardlearn/trunk/cardlearn.iml
progs/jeduca/trunk/JEduca.iml
progs/jhexedit/trunk/jhexedit.iml
progs/jhexview/trunk/jhexview.iml
progs/jirus/trunk/jirus.iml
progs/jtype/trunk/jtype.iml
progs/midilearn/trunk/midilearn.iml
progs/textedit/trunk/textedit.iml
site/trunk/site.iml
tools/archStat/trunk/archStat.iml
tools/cstyle/trunk/cstyle.iml
tools/dircount/trunk/dircount.iml
tools/findLongestPath/trunk/findLongestPath.iml
tools/fontbrowser/trunk/fontbrowser.iml
tools/gdbControl/trunk/gdbControl.iml
tools/jgrep/trunk/jgrep.iml
tools/jwget/trunk/jwget.iml
tools/keystrokes/trunk/keystrokes.iml
tools/mail/trunk/mail.iml
tools/midiDeviceLister/trunk/midiDeviceLister.iml
tools/midiMonitor/trunk/midiMonitor.iml
tools/prefsbrowser/trunk/prefsbrowser.iml
tools/replacer/trunk/replacer.iml
tools/scriptEngineLister/trunk/scriptEngineLister.iml
tools/scriptInterpreter/trunk/scriptInterpreter.iml
tools/string2bytes/trunk/string2bytes.iml
tools/todoScanner/trunk/todoScanner.iml
Added Paths:
-----------
tools/scriptEngineLister/trunk/
Removed Paths:
-------------
tools/scriptEngineLister/trunkbak/
Modified: common/trunk/common.iml
===================================================================
--- common/trunk/common.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ common/trunk/common.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -6,7 +6,6 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="annotations" level="project" />
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: games/jmines/trunk/jmines.iml
===================================================================
--- games/jmines/trunk/jmines.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ games/jmines/trunk/jmines.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -10,7 +10,6 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="libs-swing-action" />
- <orderEntryProperties />
</component>
</module>
Modified: historic/trunk/historic.iml
===================================================================
--- historic/trunk/historic.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ historic/trunk/historic.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -24,7 +24,6 @@
<orderEntry type="module" module-name="libs-swing-prefs" />
<orderEntry type="library" name="junit" level="project" />
<orderEntry type="module" module-name="libs-xml" />
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: japi.ipr
===================================================================
--- japi.ipr 2008-12-26 18:26:50 UTC (rev 740)
+++ japi.ipr 2008-12-27 01:15:43 UTC (rev 741)
@@ -63,6 +63,15 @@
<option name="HTML_ELEMENTS_TO_INSERT_NEW_LINE_BEFORE" value="" />
<option name="HTML_DO_NOT_INDENT_CHILDREN_OF" value="" />
<option name="ENUM_CONSTANTS_WRAP" value="2" />
+ <ADDITIONAL_INDENT_OPTIONS fileType="java">
+ <option name="INDENT_SIZE" value="4" />
+ <option name="CONTINUATION_INDENT_SIZE" value="8" />
+ <option name="TAB_SIZE" value="8" />
+ <option name="USE_TAB_CHARACTER" value="false" />
+ <option name="SMART_TABS" value="false" />
+ <option name="LABEL_INDENT_SIZE" value="0" />
+ <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+ </ADDITIONAL_INDENT_OPTIONS>
<ADDITIONAL_INDENT_OPTIONS fileType="js">
<option name="INDENT_SIZE" value="4" />
<option name="CONTINUATION_INDENT_SIZE" value="8" />
@@ -72,6 +81,24 @@
<option name="LABEL_INDENT_SIZE" value="0" />
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
</ADDITIONAL_INDENT_OPTIONS>
+ <ADDITIONAL_INDENT_OPTIONS fileType="jsp">
+ <option name="INDENT_SIZE" value="4" />
+ <option name="CONTINUATION_INDENT_SIZE" value="8" />
+ <option name="TAB_SIZE" value="4" />
+ <option name="USE_TAB_CHARACTER" value="false" />
+ <option name="SMART_TABS" value="false" />
+ <option name="LABEL_INDENT_SIZE" value="0" />
+ <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+ </ADDITIONAL_INDENT_OPTIONS>
+ <ADDITIONAL_INDENT_OPTIONS fileType="xml">
+ <option name="INDENT_SIZE" value="4" />
+ <option name="CONTINUATION_INDENT_SIZE" value="8" />
+ <option name="TAB_SIZE" value="4" />
+ <option name="USE_TAB_CHARACTER" value="false" />
+ <option name="SMART_TABS" value="false" />
+ <option name="LABEL_INDENT_SIZE" value="0" />
+ <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+ </ADDITIONAL_INDENT_OPTIONS>
</value>
</option>
<option name="USE_PER_PROJECT_SETTINGS" value="true" />
@@ -118,6 +145,7 @@
<option name="ADDITIONAL_OPTIONS_STRING" value="" />
<option name="MAXIMUM_HEAP_SIZE" value="128" />
</component>
+ <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
<component name="EntryPointsManager">
<entry_points version="2.0" />
</component>
@@ -204,9 +232,7 @@
<inspection_tool class="ClassNameDiffersFromFileName" level="WARNING" enabled="true" />
<inspection_tool class="ClassInTopLevelPackage" level="WARNING" enabled="true" />
<inspection_tool class="MissingDeprecatedAnnotation" level="WARNING" enabled="true" />
- <inspection_tool class="MissingOverrideAnnotation" level="WARNING" enabled="true">
- <option name="useJdk6Rules" value="false" />
- </inspection_tool>
+ <inspection_tool class="MissingOverrideAnnotation" level="WARNING" enabled="true" />
<inspection_tool class="CloneableImplementsClone" level="WARNING" enabled="true">
<option name="m_ignoreCloneableDueToInheritance" value="true" />
</inspection_tool>
@@ -232,6 +258,7 @@
</inspection_tool>
<inspection_tool class="TypeMayBeWeakened" level="WARNING" enabled="true">
<option name="useRighthandTypeAsWeakestTypeInAssignments" value="true" />
+ <option name="useParameterizedTypeForCollectionMethods" value="true" />
</inspection_tool>
<inspection_tool class="FinalMethodInFinalClass" level="WARNING" enabled="true" />
<inspection_tool class="MultipleTopLevelClassesInFile" level="WARNING" enabled="true" />
@@ -627,6 +654,9 @@
</item>
</group>
</component>
+ <component name="ProjectDetails">
+ <option name="projectName" value="japi" />
+ </component>
<component name="ProjectFileVersion" converted="true" />
<component name="ProjectModuleManager">
<modules>
@@ -641,7 +671,7 @@
<module fileurl="file://$PROJECT_DIR$/tools/fontbrowser/trunk/fontbrowser.iml" filepath="$PROJECT_DIR$/tools/fontbrowser/trunk/fontbrowser.iml" group="tools" />
<module fileurl="file://$PROJECT_DIR$/tools/gdbControl/trunk/gdbControl.iml" filepath="$PROJECT_DIR$/tools/gdbControl/trunk/gdbControl.iml" group="tools" />
<module fileurl="file://$PROJECT_DIR$/historic/trunk/historic.iml" filepath="$PROJECT_DIR$/historic/trunk/historic.iml" />
- <module fileurl="file://$PROJECT_DIR$/tools/jgrep/jgrep/jgrep.iml" filepath="$PROJECT_DIR$/tools/jgrep/jgrep/jgrep.iml" group="tools" />
+ <module fileurl="file://$PROJECT_DIR$/tools/jgrep/trunk/jgrep.iml" filepath="$PROJECT_DIR$/tools/jgrep/trunk/jgrep.iml" group="tools" />
<module fileurl="file://$PROJECT_DIR$/progs/jhexedit/trunk/jhexedit.iml" filepath="$PROJECT_DIR$/progs/jhexedit/trunk/jhexedit.iml" group="progs" />
<module fileurl="file://$PROJECT_DIR$/progs/jhexview/trunk/jhexview.iml" filepath="$PROJECT_DIR$/progs/jhexview/trunk/jhexview.iml" group="progs" />
<module fileurl="file://$PROJECT_DIR$/progs/jirus/trunk/jirus.iml" filepath="$PROJECT_DIR$/progs/jirus/trunk/jirus.iml" group="progs" />
@@ -688,11 +718,11 @@
<module fileurl="file://$PROJECT_DIR$/tools/todoScanner/trunk/todoScanner.iml" filepath="$PROJECT_DIR$/tools/todoScanner/trunk/todoScanner.iml" group="tools" />
</modules>
</component>
- <component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="true" project-jdk-name="latest" project-jdk-type="JavaSDK">
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_5" assert-keyword="true" jdk-15="true" project-jdk-name="latest" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/classes" />
</component>
<component name="ProjectRunConfigurationManager">
- <configuration default="false" name="JEduca" type="Application" factoryName="Application" enabled="false" merge="false">
+ <configuration default="false" name="JEduca" type="Application" factoryName="Application" enabled="false" merge="false" runner="emma">
<option name="MAIN_CLASS_NAME" value="net.sf.japi.progs.jeduca.jtest.Main" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="" />
@@ -725,6 +755,9 @@
<option name="GENERATE_IIOP_STUBS" value="false" />
<option name="ADDITIONAL_OPTIONS_STRING" value="" />
</component>
+ <component name="SvnBranchConfigurationManager">
+ <option name="myVersion" value="124" />
+ </component>
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="svn" />
</component>
Modified: libs/argparser/trunk/libs-argparser.iml
===================================================================
--- libs/argparser/trunk/libs-argparser.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ libs/argparser/trunk/libs-argparser.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -27,7 +27,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: libs/finance/trunk/libs-finance.iml
===================================================================
--- libs/finance/trunk/libs-finance.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ libs/finance/trunk/libs-finance.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -27,7 +27,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: libs/io/trunk/libs-io.iml
===================================================================
--- libs/io/trunk/libs-io.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ libs/io/trunk/libs-io.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -27,7 +27,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: libs/lang/trunk/libs-lang.iml
===================================================================
--- libs/lang/trunk/libs-lang.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ libs/lang/trunk/libs-lang.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -27,7 +27,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: libs/logging/trunk/libs-logging.iml
===================================================================
--- libs/logging/trunk/libs-logging.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ libs/logging/trunk/libs-logging.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -27,7 +27,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: libs/midi/trunk/midi.iml
===================================================================
--- libs/midi/trunk/midi.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ libs/midi/trunk/midi.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -12,7 +12,6 @@
<orderEntry type="library" name="annotations" level="project" />
<orderEntry type="library" name="junit" level="project" />
<orderEntry type="module" module-name="libs-swing-action" />
- <orderEntryProperties />
</component>
</module>
Modified: libs/net/trunk/libs-net.iml
===================================================================
--- libs/net/trunk/libs-net.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ libs/net/trunk/libs-net.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -28,7 +28,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: libs/registry/trunk/libs-registry.iml
===================================================================
--- libs/registry/trunk/libs-registry.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ libs/registry/trunk/libs-registry.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -27,7 +27,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: libs/swing-about/trunk/libs-swing-about.iml
===================================================================
--- libs/swing-about/trunk/libs-swing-about.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ libs/swing-about/trunk/libs-swing-about.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -28,7 +28,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: libs/swing-action/trunk/libs-swing-action.iml
===================================================================
--- libs/swing-action/trunk/libs-swing-action.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ libs/swing-action/trunk/libs-swing-action.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -28,7 +28,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: libs/swing-app/trunk/libs-swing-app.iml
===================================================================
--- libs/swing-app/trunk/libs-swing-app.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ libs/swing-app/trunk/libs-swing-app.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -32,7 +32,6 @@
<orderEntry type="module" module-name="libs-swing-about" />
<orderEntry type="module" module-name="libs-swing-extlib" />
<orderEntry type="module" module-name="libs-argparser" />
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: libs/swing-bookmarks/trunk/libs-swing-bookmarks.iml
===================================================================
--- libs/swing-bookmarks/trunk/libs-swing-bookmarks.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ libs/swing-bookmarks/trunk/libs-swing-bookmarks.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -30,7 +30,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: libs/swing-extlib/trunk/libs-swing-extlib.iml
===================================================================
--- libs/swing-extlib/trunk/libs-swing-extlib.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ libs/swing-extlib/trunk/libs-swing-extlib.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -27,7 +27,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: libs/swing-font/trunk/libs-swing-font.iml
===================================================================
--- libs/swing-font/trunk/libs-swing-font.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ libs/swing-font/trunk/libs-swing-font.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -28,7 +28,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: libs/swing-keyprefs/trunk/libs-swing-keyprefs.iml
===================================================================
--- libs/swing-keyprefs/trunk/libs-swing-keyprefs.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ libs/swing-keyprefs/trunk/libs-swing-keyprefs.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -30,7 +30,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: libs/swing-list/trunk/libs-swing-list.iml
===================================================================
--- libs/swing-list/trunk/libs-swing-list.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ libs/swing-list/trunk/libs-swing-list.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -28,7 +28,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: libs/swing-misc/trunk/libs-swing-misc.iml
===================================================================
--- libs/swing-misc/trunk/libs-swing-misc.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ libs/swing-misc/trunk/libs-swing-misc.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -28,7 +28,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: libs/swing-prefs/trunk/libs-swing-prefs.iml
===================================================================
--- libs/swing-prefs/trunk/libs-swing-prefs.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ libs/swing-prefs/trunk/libs-swing-prefs.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -29,7 +29,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: libs/swing-proxyprefs/trunk/libs-swing-proxyprefs.iml
===================================================================
--- libs/swing-proxyprefs/trunk/libs-swing-proxyprefs.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ libs/swing-proxyprefs/trunk/libs-swing-proxyprefs.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -29,7 +29,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: libs/swing-recent/trunk/libs-swing-recent.iml
===================================================================
--- libs/swing-recent/trunk/libs-swing-recent.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ libs/swing-recent/trunk/libs-swing-recent.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -29,7 +29,6 @@
</orderEntry>
<orderEntry type="module" module-name="libs-swing-action" />
<orderEntry type="module" module-name="libs-swing-app" />
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: libs/swing-tod/trunk/libs-swing-tod.iml
===================================================================
--- libs/swing-tod/trunk/libs-swing-tod.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ libs/swing-tod/trunk/libs-swing-tod.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -28,7 +28,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: libs/swing-treetable/trunk/libs-swing-treetable.iml
===================================================================
--- libs/swing-treetable/trunk/libs-swing-treetable.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ libs/swing-treetable/trunk/libs-swing-treetable.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -27,7 +27,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: libs/taglets/trunk/libs-taglets.iml
===================================================================
--- libs/taglets/trunk/libs-taglets.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ libs/taglets/trunk/libs-taglets.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -28,7 +28,6 @@
</library>
</orderEntry>
<orderEntry type="library" name="tools" level="application" />
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: libs/util/trunk/libs-util.iml
===================================================================
--- libs/util/trunk/libs-util.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ libs/util/trunk/libs-util.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -27,7 +27,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: libs/xml/trunk/libs-xml.iml
===================================================================
--- libs/xml/trunk/libs-xml.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ libs/xml/trunk/libs-xml.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -27,7 +27,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: progs/batcher/trunk/Batcher.iml
===================================================================
--- progs/batcher/trunk/Batcher.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ progs/batcher/trunk/Batcher.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -12,7 +12,6 @@
<orderEntry type="library" name="junit" level="project" />
<orderEntry type="module" module-name="libs-swing-about" />
<orderEntry type="module" module-name="libs-swing-action" />
- <orderEntryProperties />
</component>
</module>
Modified: progs/cardlearn/trunk/cardlearn.iml
===================================================================
--- progs/cardlearn/trunk/cardlearn.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ progs/cardlearn/trunk/cardlearn.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -11,7 +11,6 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="annotations" level="project" />
<orderEntry type="library" name="junit" level="project" />
- <orderEntryProperties />
</component>
</module>
Modified: progs/jeduca/trunk/JEduca.iml
===================================================================
--- progs/jeduca/trunk/JEduca.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ progs/jeduca/trunk/JEduca.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -20,7 +20,6 @@
<orderEntry type="module" module-name="libs-swing-about" />
<orderEntry type="module" module-name="libs-swing-prefs" />
<orderEntry type="module" module-name="libs-swing-recent" />
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: progs/jhexedit/trunk/jhexedit.iml
===================================================================
--- progs/jhexedit/trunk/jhexedit.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ progs/jhexedit/trunk/jhexedit.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -13,7 +13,6 @@
<orderEntry type="library" name="annotations" level="project" />
<orderEntry type="library" name="junit" level="project" />
<orderEntry type="module" module-name="libs-swing-app" />
- <orderEntryProperties />
</component>
</module>
Modified: progs/jhexview/trunk/jhexview.iml
===================================================================
--- progs/jhexview/trunk/jhexview.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ progs/jhexview/trunk/jhexview.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -13,7 +13,6 @@
<orderEntry type="library" name="junit" level="project" />
<orderEntry type="module" module-name="libs-argparser" />
<orderEntry type="module" module-name="libs-swing-app" />
- <orderEntryProperties />
</component>
</module>
Modified: progs/jirus/trunk/jirus.iml
===================================================================
--- progs/jirus/trunk/jirus.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ progs/jirus/trunk/jirus.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -14,7 +14,6 @@
<orderEntry type="library" name="junit" level="project" />
<orderEntry type="library" name="jlfgr-1_0" level="project" />
<orderEntry type="module" module-name="midi" />
- <orderEntryProperties />
</component>
</module>
Modified: progs/jtype/trunk/jtype.iml
===================================================================
--- progs/jtype/trunk/jtype.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ progs/jtype/trunk/jtype.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -12,7 +12,6 @@
<orderEntry type="library" name="annotations" level="project" />
<orderEntry type="library" name="junit" level="project" />
<orderEntry type="module" module-name="libs-swing-action" />
- <orderEntryProperties />
</component>
</module>
Modified: progs/midilearn/trunk/midilearn.iml
===================================================================
--- progs/midilearn/trunk/midilearn.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ progs/midilearn/trunk/midilearn.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -11,7 +11,6 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="annotations" level="project" />
<orderEntry type="library" name="junit" level="project" />
- <orderEntryProperties />
</component>
</module>
Modified: progs/textedit/trunk/textedit.iml
===================================================================
--- progs/textedit/trunk/textedit.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ progs/textedit/trunk/textedit.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -13,7 +13,6 @@
<orderEntry type="library" name="junit" level="project" />
<orderEntry type="module" module-name="libs-argparser" />
<orderEntry type="module" module-name="libs-swing-app" />
- <orderEntryProperties />
</component>
</module>
Modified: site/trunk/site.iml
===================================================================
--- site/trunk/site.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ site/trunk/site.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -8,7 +8,6 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="annotations" level="project" />
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: tools/archStat/trunk/archStat.iml
===================================================================
--- tools/archStat/trunk/archStat.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ tools/archStat/trunk/archStat.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -12,7 +12,6 @@
<orderEntry type="library" name="annotations" level="project" />
<orderEntry type="library" name="junit" level="project" />
<orderEntry type="module" module-name="libs-argparser" />
- <orderEntryProperties />
</component>
</module>
Modified: tools/cstyle/trunk/cstyle.iml
===================================================================
--- tools/cstyle/trunk/cstyle.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ tools/cstyle/trunk/cstyle.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -28,7 +28,6 @@
</library>
</orderEntry>
<orderEntry type="module" module-name="libs-argparser" />
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: tools/dircount/trunk/dircount.iml
===================================================================
--- tools/dircount/trunk/dircount.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ tools/dircount/trunk/dircount.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -12,7 +12,6 @@
<orderEntry type="module" module-name="libs-argparser" />
<orderEntry type="library" name="annotations" level="project" />
<orderEntry type="library" name="junit" level="project" />
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: tools/findLongestPath/trunk/findLongestPath.iml
===================================================================
--- tools/findLongestPath/trunk/findLongestPath.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ tools/findLongestPath/trunk/findLongestPath.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -28,7 +28,6 @@
</library>
</orderEntry>
<orderEntry type="module" module-name="libs-argparser" />
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: tools/fontbrowser/trunk/fontbrowser.iml
===================================================================
--- tools/fontbrowser/trunk/fontbrowser.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ tools/fontbrowser/trunk/fontbrowser.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -28,7 +28,6 @@
</library>
</orderEntry>
<orderEntry type="module" module-name="libs-swing-action" />
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: tools/gdbControl/trunk/gdbControl.iml...
[truncated message content] |
|
From: <chr...@us...> - 2008-12-27 02:40:43
|
Revision: 742
http://japi.svn.sourceforge.net/japi/?rev=742&view=rev
Author: christianhujer
Date: 2008-12-27 02:40:38 +0000 (Sat, 27 Dec 2008)
Log Message:
-----------
Improved IntelliJ IDEA project settings / configuration.
That includes preparations for exporting the project to Eclipse.
Modified Paths:
--------------
japi.ipr
libs/argparser/trunk/libs-argparser.iml
libs/midi/trunk/midi.iml
libs/net/trunk/libs-net.iml
libs/registry/trunk/libs-registry.iml
libs/swing-app/trunk/libs-swing-app.iml
libs/swing-bookmarks/trunk/libs-swing-bookmarks.iml
libs/swing-extlib/trunk/libs-swing-extlib.iml
libs/swing-font/trunk/libs-swing-font.iml
libs/swing-keyprefs/trunk/libs-swing-keyprefs.iml
libs/swing-list/trunk/libs-swing-list.iml
libs/swing-misc/trunk/libs-swing-misc.iml
libs/swing-prefs/trunk/libs-swing-prefs.iml
libs/swing-proxyprefs/trunk/libs-swing-proxyprefs.iml
libs/swing-recent/trunk/libs-swing-recent.iml
libs/swing-tod/trunk/libs-swing-tod.iml
libs/swing-treetable/trunk/libs-swing-treetable.iml
libs/taglets/trunk/libs-taglets.iml
libs/util/trunk/libs-util.iml
progs/batcher/trunk/Batcher.iml
progs/cardlearn/trunk/cardlearn.iml
progs/jeduca/trunk/JEduca.iml
progs/jhexedit/trunk/jhexedit.iml
progs/jhexview/trunk/jhexview.iml
progs/jirus/trunk/jirus.iml
progs/jtype/trunk/jtype.iml
progs/midilearn/trunk/midilearn.iml
progs/textedit/trunk/textedit.iml
tools/archStat/trunk/archStat.iml
tools/cstyle/trunk/cstyle.iml
tools/dircount/trunk/dircount.iml
tools/findLongestPath/trunk/findLongestPath.iml
tools/gdbControl/trunk/gdbControl.iml
tools/jgrep/trunk/jgrep.iml
tools/mail/trunk/mail.iml
tools/midiDeviceLister/trunk/midiDeviceLister.iml
tools/midiMonitor/trunk/midiMonitor.iml
tools/replacer/trunk/replacer.iml
tools/scriptEngineLister/trunk/scriptEngineLister.iml
tools/scriptInterpreter/trunk/scriptInterpreter.iml
tools/string2bytes/trunk/string2bytes.iml
tools/todoScanner/trunk/todoScanner.iml
Added Paths:
-----------
progs/batcher/trunk/src/doc/
progs/batcher/trunk/src/prj/
progs/batcher/trunk/src/prj/net/
progs/batcher/trunk/src/tst/
Removed Paths:
-------------
libs/taglets/trunk/taglets.iml
progs/batcher/trunk/src/net/
Modified: japi.ipr
===================================================================
--- japi.ipr 2008-12-27 01:15:43 UTC (rev 741)
+++ japi.ipr 2008-12-27 02:40:38 UTC (rev 742)
@@ -63,6 +63,24 @@
<option name="HTML_ELEMENTS_TO_INSERT_NEW_LINE_BEFORE" value="" />
<option name="HTML_DO_NOT_INDENT_CHILDREN_OF" value="" />
<option name="ENUM_CONSTANTS_WRAP" value="2" />
+ <ADDITIONAL_INDENT_OPTIONS fileType="groovy">
+ <option name="INDENT_SIZE" value="2" />
+ <option name="CONTINUATION_INDENT_SIZE" value="8" />
+ <option name="TAB_SIZE" value="4" />
+ <option name="USE_TAB_CHARACTER" value="false" />
+ <option name="SMART_TABS" value="false" />
+ <option name="LABEL_INDENT_SIZE" value="0" />
+ <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+ </ADDITIONAL_INDENT_OPTIONS>
+ <ADDITIONAL_INDENT_OPTIONS fileType="gsp">
+ <option name="INDENT_SIZE" value="2" />
+ <option name="CONTINUATION_INDENT_SIZE" value="8" />
+ <option name="TAB_SIZE" value="4" />
+ <option name="USE_TAB_CHARACTER" value="false" />
+ <option name="SMART_TABS" value="false" />
+ <option name="LABEL_INDENT_SIZE" value="0" />
+ <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+ </ADDITIONAL_INDENT_OPTIONS>
<ADDITIONAL_INDENT_OPTIONS fileType="java">
<option name="INDENT_SIZE" value="4" />
<option name="CONTINUATION_INDENT_SIZE" value="8" />
Modified: libs/argparser/trunk/libs-argparser.iml
===================================================================
--- libs/argparser/trunk/libs-argparser.iml 2008-12-27 01:15:43 UTC (rev 741)
+++ libs/argparser/trunk/libs-argparser.iml 2008-12-27 02:40:38 UTC (rev 742)
@@ -12,7 +12,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
+ <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -21,7 +21,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
+ <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Modified: libs/midi/trunk/midi.iml
===================================================================
--- libs/midi/trunk/midi.iml 2008-12-27 01:15:43 UTC (rev 741)
+++ libs/midi/trunk/midi.iml 2008-12-27 02:40:38 UTC (rev 742)
@@ -9,8 +9,24 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="annotations" level="project" />
- <orderEntry type="library" name="junit" level="project" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntry type="module" module-name="libs-swing-action" />
</component>
</module>
Modified: libs/net/trunk/libs-net.iml
===================================================================
--- libs/net/trunk/libs-net.iml 2008-12-27 01:15:43 UTC (rev 741)
+++ libs/net/trunk/libs-net.iml 2008-12-27 02:40:38 UTC (rev 742)
@@ -9,11 +9,10 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="libs-io" />
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
+ <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -22,12 +21,13 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
+ <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module" module-name="libs-io" />
</component>
<component name="copyright">
<Base>
Modified: libs/registry/trunk/libs-registry.iml
===================================================================
--- libs/registry/trunk/libs-registry.iml 2008-12-27 01:15:43 UTC (rev 741)
+++ libs/registry/trunk/libs-registry.iml 2008-12-27 02:40:38 UTC (rev 742)
@@ -12,7 +12,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
+ <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -21,7 +21,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
+ <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Modified: libs/swing-app/trunk/libs-swing-app.iml
===================================================================
--- libs/swing-app/trunk/libs-swing-app.iml 2008-12-27 01:15:43 UTC (rev 741)
+++ libs/swing-app/trunk/libs-swing-app.iml 2008-12-27 02:40:38 UTC (rev 742)
@@ -12,7 +12,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
+ <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -21,7 +21,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
+ <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Modified: libs/swing-bookmarks/trunk/libs-swing-bookmarks.iml
===================================================================
--- libs/swing-bookmarks/trunk/libs-swing-bookmarks.iml 2008-12-27 01:15:43 UTC (rev 741)
+++ libs/swing-bookmarks/trunk/libs-swing-bookmarks.iml 2008-12-27 02:40:38 UTC (rev 742)
@@ -9,13 +9,10 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="libs-swing-action" />
- <orderEntry type="module" module-name="libs-util" />
- <orderEntry type="module" module-name="libs-swing-app" />
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
+ <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -24,12 +21,15 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
+ <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module" module-name="libs-swing-action" />
+ <orderEntry type="module" module-name="libs-util" />
+ <orderEntry type="module" module-name="libs-swing-app" />
</component>
<component name="copyright">
<Base>
Modified: libs/swing-extlib/trunk/libs-swing-extlib.iml
===================================================================
--- libs/swing-extlib/trunk/libs-swing-extlib.iml 2008-12-27 01:15:43 UTC (rev 741)
+++ libs/swing-extlib/trunk/libs-swing-extlib.iml 2008-12-27 02:40:38 UTC (rev 742)
@@ -12,7 +12,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
+ <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -21,7 +21,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
+ <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Modified: libs/swing-font/trunk/libs-swing-font.iml
===================================================================
--- libs/swing-font/trunk/libs-swing-font.iml 2008-12-27 01:15:43 UTC (rev 741)
+++ libs/swing-font/trunk/libs-swing-font.iml 2008-12-27 02:40:38 UTC (rev 742)
@@ -9,11 +9,10 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="libs-swing-action" />
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
+ <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -22,12 +21,13 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
+ <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module" module-name="libs-swing-action" />
</component>
<component name="copyright">
<Base>
Modified: libs/swing-keyprefs/trunk/libs-swing-keyprefs.iml
===================================================================
--- libs/swing-keyprefs/trunk/libs-swing-keyprefs.iml 2008-12-27 01:15:43 UTC (rev 741)
+++ libs/swing-keyprefs/trunk/libs-swing-keyprefs.iml 2008-12-27 02:40:38 UTC (rev 742)
@@ -9,13 +9,10 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="libs-swing-action" />
- <orderEntry type="module" module-name="libs-swing-prefs" />
- <orderEntry type="module" module-name="libs-swing-treetable" />
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
+ <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -24,12 +21,15 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
+ <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module" module-name="libs-swing-action" />
+ <orderEntry type="module" module-name="libs-swing-prefs" />
+ <orderEntry type="module" module-name="libs-swing-treetable" />
</component>
<component name="copyright">
<Base>
Modified: libs/swing-list/trunk/libs-swing-list.iml
===================================================================
--- libs/swing-list/trunk/libs-swing-list.iml 2008-12-27 01:15:43 UTC (rev 741)
+++ libs/swing-list/trunk/libs-swing-list.iml 2008-12-27 02:40:38 UTC (rev 742)
@@ -9,7 +9,6 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="libs-swing-action" />
<orderEntry type="module-library">
<library>
<CLASSES>
@@ -28,6 +27,7 @@
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module" module-name="libs-swing-action" />
</component>
<component name="copyright">
<Base>
Modified: libs/swing-misc/trunk/libs-swing-misc.iml
===================================================================
--- libs/swing-misc/trunk/libs-swing-misc.iml 2008-12-27 01:15:43 UTC (rev 741)
+++ libs/swing-misc/trunk/libs-swing-misc.iml 2008-12-27 02:40:38 UTC (rev 742)
@@ -9,7 +9,6 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="libs-swing-action" />
<orderEntry type="module-library">
<library>
<CLASSES>
@@ -28,6 +27,7 @@
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module" module-name="libs-swing-action" />
</component>
<component name="copyright">
<Base>
Modified: libs/swing-prefs/trunk/libs-swing-prefs.iml
===================================================================
--- libs/swing-prefs/trunk/libs-swing-prefs.iml 2008-12-27 01:15:43 UTC (rev 741)
+++ libs/swing-prefs/trunk/libs-swing-prefs.iml 2008-12-27 02:40:38 UTC (rev 742)
@@ -9,8 +9,6 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="libs-swing-action" />
- <orderEntry type="module" module-name="libs-swing-extlib" />
<orderEntry type="module-library">
<library>
<CLASSES>
@@ -29,6 +27,8 @@
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module" module-name="libs-swing-action" />
+ <orderEntry type="module" module-name="libs-swing-extlib" />
</component>
<component name="copyright">
<Base>
Modified: libs/swing-proxyprefs/trunk/libs-swing-proxyprefs.iml
===================================================================
--- libs/swing-proxyprefs/trunk/libs-swing-proxyprefs.iml 2008-12-27 01:15:43 UTC (rev 741)
+++ libs/swing-proxyprefs/trunk/libs-swing-proxyprefs.iml 2008-12-27 02:40:38 UTC (rev 742)
@@ -9,12 +9,10 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="libs-swing-action" />
- <orderEntry type="module" module-name="libs-swing-prefs" />
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
+ <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -23,12 +21,14 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
+ <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module" module-name="libs-swing-action" />
+ <orderEntry type="module" module-name="libs-swing-prefs" />
</component>
<component name="copyright">
<Base>
Modified: libs/swing-recent/trunk/libs-swing-recent.iml
===================================================================
--- libs/swing-recent/trunk/libs-swing-recent.iml 2008-12-27 01:15:43 UTC (rev 741)
+++ libs/swing-recent/trunk/libs-swing-recent.iml 2008-12-27 02:40:38 UTC (rev 742)
@@ -12,7 +12,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
+ <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -21,7 +21,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
+ <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Modified: libs/swing-tod/trunk/libs-swing-tod.iml
===================================================================
--- libs/swing-tod/trunk/libs-swing-tod.iml 2008-12-27 01:15:43 UTC (rev 741)
+++ libs/swing-tod/trunk/libs-swing-tod.iml 2008-12-27 02:40:38 UTC (rev 742)
@@ -9,11 +9,10 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="libs-swing-action" />
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
+ <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -22,12 +21,13 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
+ <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module" module-name="libs-swing-action" />
</component>
<component name="copyright">
<Base>
Modified: libs/swing-treetable/trunk/libs-swing-treetable.iml
===================================================================
--- libs/swing-treetable/trunk/libs-swing-treetable.iml 2008-12-27 01:15:43 UTC (rev 741)
+++ libs/swing-treetable/trunk/libs-swing-treetable.iml 2008-12-27 02:40:38 UTC (rev 742)
@@ -12,7 +12,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
+ <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -21,7 +21,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
+ <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Modified: libs/taglets/trunk/libs-taglets.iml
===================================================================
--- libs/taglets/trunk/libs-taglets.iml 2008-12-27 01:15:43 UTC (rev 741)
+++ libs/taglets/trunk/libs-taglets.iml 2008-12-27 02:40:38 UTC (rev 742)
@@ -27,7 +27,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="library" name="tools" level="application" />
</component>
<component name="copyright">
<Base>
Deleted: libs/taglets/trunk/taglets.iml
===================================================================
--- libs/taglets/trunk/taglets.iml 2008-12-27 01:15:43 UTC (rev 741)
+++ libs/taglets/trunk/taglets.iml 2008-12-27 02:40:38 UTC (rev 742)
@@ -1,196 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4" relativePaths="true" type="JAVA_MODULE">
- <component name="ModuleRootManager" />
- <component name="NewModuleRootManager" inherit-compiler-output="true">
- <exclude-output />
- <content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../Documents/Downloads/jdk1.6.0/lib/tools.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntryProperties />
- </component>
- <component name="copyright">
- <Base>
- <setting name="state" value="2" />
- </Base>
- <LanguageOptions name="$TEMPLATE$">
- <option name="templateOptions">
- <value>
- <option name="block" value="true" />
- <option name="separateBefore" value="false" />
- <option name="separateAfter" value="false" />
- <option name="prefixLines" value="true" />
- <option name="lenBefore" value="80" />
- <option name="lenAfter" value="80" />
- <option name="box" value="false" />
- <option name="filler" value=" " />
- </value>
- </option>
- <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
- <option name="keyword" value="Copyright" />
- <option name="fileTypeOverride" value="4" />
- <option name="relativeBefore" value="true" />
- <option name="addBlankAfter" value="true" />
- <option name="fileLocation" value="1" />
- <option name="useAlternate" value="false" />
- </LanguageOptions>
- <LanguageOptions name="CSS">
- <option name="templateOptions">
- <value>
- <option name="block" value="true" />
- <option name="separateBefore" value="false" />
- <option name="separateAfter" value="false" />
- <option name="prefixLines" value="true" />
- <option name="lenBefore" value="80" />
- <option name="lenAfter" value="80" />
- <option name="box" value="false" />
- <option name="filler" value=" " />
- </value>
- </option>
- <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
- <option name="keyword" value="Copyright" />
- <option name="fileTypeOverride" value="2" />
- <option name="relativeBefore" value="true" />
- <option name="addBlankAfter" value="true" />
- <option name="fileLocation" value="1" />
- <option name="useAlternate" value="false" />
- </LanguageOptions>
- <LanguageOptions name="HTML">
- <option name="templateOptions">
- <value>
- <option name="block" value="true" />
- <option name="separateBefore" value="false" />
- <option name="separateAfter" value="false" />
- <option name="prefixLines" value="true" />
- <option name="lenBefore" value="80" />
- <option name="lenAfter" value="80" />
- <option name="box" value="false" />
- <option name="filler" value=" " />
- </value>
- </option>
- <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
- <option name="keyword" value="Copyright" />
- <option name="fileTypeOverride" value="2" />
- <option name="relativeBefore" value="true" />
- <option name="addBlankAfter" value="true" />
- <option name="fileLocation" value="1" />
- <option name="useAlternate" value="false" />
- </LanguageOptions>
- <LanguageOptions name="JAVA">
- <option name="templateOptions">
- <value>
- <option name="block" value="true" />
- <option name="separateBefore" value="false" />
- <option name="separateAfter" value="false" />
- <option name="prefixLines" value="true" />
- <option name="lenBefore" value="80" />
- <option name="lenAfter" value="80" />
- <option name="box" value="false" />
- <option name="filler" value=" " />
- </value>
- </option>
- <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
- <option name="keyword" value="Copyright" />
- <option name="fileTypeOverride" value="2" />
- <option name="relativeBefore" value="true" />
- <option name="addBlankAfter" value="true" />
- <option name="fileLocation" value="1" />
- <option name="useAlternate" value="false" />
- </LanguageOptions>
- <LanguageOptions name="JSP">
- <option name="templateOptions">
- <value>
- <option name="block" value="true" />
- <option name="separateBefore" value="false" />
- <option name="separateAfter" value="false" />
- <option name="prefixLines" value="true" />
- <option name="lenBefore" value="80" />
- <option name="lenAfter" value="80" />
- <option name="box" value="false" />
- <option name="filler" value=" " />
- </value>
- </option>
- <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
- <option name="keyword" value="Copyright" />
- <option name="fileTypeOverride" value="2" />
- <option name="relativeBefore" value="true" />
- <option name="addBlankAfter" value="true" />
- <option name="fileLocation" value="1" />
- <option name="useAlternate" value="false" />
- </LanguageOptions>
- <LanguageOptions name="JavaScript">
- <option name="templateOptions">
- <value>
- <option name="block" value="true" />
- <option name="separateBefore" value="false" />
- <option name="separateAfter" value="false" />
- <option name="prefixLines" value="true" />
- <option name="lenBefore" value="80" />
- <option name="lenAfter" value="80" />
- <option name="box" value="false" />
- <option name="filler" value=" " />
- </value>
- </option>
- <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
- <option name="keyword" value="Copyright" />
- <option name="fileTypeOverride" value="2" />
- <option name="relativeBefore" value="true" />
- <option name="addBlankAfter" value="true" />
- <option name="fileLocation" value="1" />
- <option name="useAlternate" value="false" />
- </LanguageOptions>
- <LanguageOptions name="Properties">
- <option name="templateOptions">
- <value>
- <option name="block" value="true" />
- <option name="separateBefore" value="false" />
- <option name="separateAfter" value="false" />
- <option name="prefixLines" value="true" />
- <option name="lenBefore" value="80" />
- <option name="lenAfter" value="80" />
- <option name="box" value="false" />
- <option name="filler" value=" " />
- </value>
- </option>
- <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
- <option name="keyword" value="Copyright" />
- <option name="fileTypeOverride" value="2" />
- <option name="relativeBefore" value="true" />
- <option name="addBlankAfter" value="true" />
- <option name="fileLocation" value="1" />
- <option name="useAlternate" value="false" />
- </LanguageOptions>
- <LanguageOptions name="XML">
- <option name="templateOptions">
- <value>
- <option name="block" value="true" />
- <option name="separateBefore" value="false" />
- <option name="separateAfter" value="false" />
- <option name="prefixLines" value="true" />
- <option name="lenBefore" value="80" />
- <option name="lenAfter" value="80" />
- <option name="box" value="false" />
- <option name="filler" value=" " />
- </value>
- </option>
- <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
- <option name="keyword" value="Copyright" />
- <option name="fileTypeOverride" value="2" />
- <option name="relativeBefore" value="true" />
- <option name="addBlankAfter" value="true" />
- <option name="fileLocation" value="1" />
- <option name="useAlternate" value="false" />
- </LanguageOptions>
- </component>
-</module>
-
Modified: libs/util/trunk/libs-util.iml
===================================================================
--- libs/util/trunk/libs-util.iml 2008-12-27 01:15:4...
[truncated message content] |
|
From: <chr...@us...> - 2008-12-27 02:56:13
|
Revision: 743
http://japi.svn.sourceforge.net/japi/?rev=743&view=rev
Author: christianhujer
Date: 2008-12-27 02:56:08 +0000 (Sat, 27 Dec 2008)
Log Message:
-----------
Updated ignore properties to ignore bin directory of eclipse workspace.
Property Changed:
----------------
common/trunk/
games/jmines/trunk/
historic/trunk/
imajar/trunk/
libs/argparser/trunk/
libs/finance/trunk/
libs/io/trunk/
libs/lang/trunk/
libs/logging/trunk/
libs/midi/trunk/
libs/net/trunk/
libs/registry/trunk/
libs/swing-about/trunk/
libs/swing-action/trunk/
libs/swing-app/trunk/
libs/swing-bookmarks/trunk/
libs/swing-extlib/trunk/
libs/swing-font/trunk/
libs/swing-keyprefs/trunk/
libs/swing-list/trunk/
libs/swing-misc/trunk/
libs/swing-prefs/trunk/
libs/swing-proxyprefs/trunk/
libs/swing-recent/trunk/
libs/swing-tod/trunk/
libs/swing-treetable/trunk/
libs/taglets/trunk/
libs/util/trunk/
libs/xml/trunk/
progs/batcher/trunk/
progs/cardlearn/trunk/
progs/jeduca/trunk/
progs/jhexedit/trunk/
progs/jhexview/trunk/
progs/jirus/trunk/
progs/jtype/trunk/
progs/midilearn/trunk/
progs/textedit/trunk/
site/trunk/
tools/archStat/trunk/
tools/cstyle/trunk/
tools/dircount/trunk/
tools/findLongestPath/trunk/
tools/fontbrowser/trunk/
tools/gdbControl/trunk/
tools/jgrep/trunk/
tools/jwget/trunk/
tools/keystrokes/trunk/
tools/mail/trunk/
tools/midiDeviceLister/trunk/
tools/midiMonitor/trunk/
tools/prefsbrowser/trunk/
tools/replacer/trunk/
tools/scriptEngineLister/trunk/
tools/scriptInterpreter/trunk/
tools/string2bytes/trunk/
tools/todoScanner/trunk/
Property changes on: common/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: games/jmines/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: historic/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: imajar/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: libs/argparser/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: libs/finance/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: libs/io/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: libs/lang/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: libs/logging/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: libs/midi/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: libs/net/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: libs/registry/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: libs/swing-about/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: libs/swing-action/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: libs/swing-app/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: libs/swing-bookmarks/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: libs/swing-extlib/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: libs/swing-font/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: libs/swing-keyprefs/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: libs/swing-list/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: libs/swing-misc/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: libs/swing-prefs/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: libs/swing-proxyprefs/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: libs/swing-recent/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: libs/swing-tod/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: libs/swing-treetable/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: libs/taglets/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: libs/util/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: libs/xml/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: progs/batcher/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: progs/cardlearn/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: progs/jeduca/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: progs/jhexedit/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: progs/jhexview/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: progs/jirus/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: progs/jtype/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: progs/midilearn/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: progs/textedit/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: site/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: tools/archStat/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: tools/cstyle/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: tools/dircount/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: tools/findLongestPath/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: tools/fontbrowser/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: tools/gdbControl/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: tools/jgrep/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: tools/jwget/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: tools/keystrokes/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: tools/mail/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: tools/midiDeviceLister/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: tools/midiMonitor/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: tools/prefsbrowser/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: tools/replacer/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: tools/scriptEngineLister/trunk
___________________________________________________________________
Added: svn:ignore
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: tools/scriptInterpreter/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: tools/string2bytes/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: tools/todoScanner/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-12-27 22:06:31
|
Revision: 747
http://japi.svn.sourceforge.net/japi/?rev=747&view=rev
Author: christianhujer
Date: 2008-12-27 21:40:37 +0000 (Sat, 27 Dec 2008)
Log Message:
-----------
Code improvements regarding @Nullable / @NotNull, if vs. ?:.
Modified Paths:
--------------
historic/trunk/src/app/net/sf/japi/finance/SimpleCapitalCalculator.java
historic/trunk/src/app/net/sf/japi/io/ARGVEnumeration.java
historic/trunk/src/app/net/sf/japi/sql/CachedResultSetTableModel.java
historic/trunk/src/app/net/sf/japi/sql/DatabaseTreeModel.java
historic/trunk/src/app/net/sf/japi/sql/ScrollResultSetTableModel.java
historic/trunk/src/app/net/sf/japi/swing/JPropertyEditor.java
historic/trunk/src/doc/guide/swing/action/fromScratch/src/net/sf/japi/examples/editor/Editor.java
historic/trunk/src/test/net/sf/japi/util/PairTest.java
historic/trunk/src/test/net/sf/japi/util/TableTest.java
libs/argparser/trunk/src/prj/net/sf/japi/io/args/ArgParser.java
libs/argparser/trunk/src/prj/net/sf/japi/io/args/CommandWithHelp.java
libs/argparser/trunk/src/prj/net/sf/japi/io/args/converter/OututStreamConverter.java
libs/lang/trunk/src/prj/net/sf/japi/lang/PropertyComparator.java
libs/midi/trunk/src/prj/net/sf/japi/midi/gui/SpinnerChannelModel.java
libs/swing-action/trunk/src/tst/test/net/sf/japi/swing/ReflectionActionTest.java
libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/Application.java
libs/swing-bookmarks/trunk/src/prj/net/sf/japi/swing/bookmarks/BookmarkManager.java
libs/swing-extlib/trunk/src/prj/net/sf/japi/swing/ToolBarLayout.java
libs/swing-font/trunk/src/prj/net/sf/japi/swing/font/FontChooser.java
libs/swing-misc/trunk/src/prj/net/sf/japi/swing/misc/ConsoleProgress.java
libs/swing-misc/trunk/src/prj/net/sf/japi/swing/misc/JSAXErrorHandler.java
libs/taglets/trunk/src/prj/net/sf/japi/taglets/BlockListTaglet.java
libs/util/trunk/src/prj/net/sf/japi/util/Collections2.java
libs/util/trunk/src/prj/net/sf/japi/util/filter/file/EndingFileFilter.java
libs/xml/trunk/src/tst/test/net/sf/japi/xml/NodeListIterator2Test.java
libs/xml/trunk/src/tst/test/net/sf/japi/xml/NodeListIteratorTest.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/swing/AbstractManager.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/OpenURLPane.java
progs/jtype/trunk/src/prj/net/sf/japi/jtype/ReflectionField.java
tools/archStat/trunk/src/prj/net/sf/japi/archstat/FileStat.java
tools/cstyle/trunk/src/prj/net/sf/japi/cstyle/LineEndingParser.java
tools/gdbControl/trunk/src/prj/net/sf/japi/tools/gdbcontrol/ComWithGdb.java
tools/string2bytes/trunk/src/tst/test/net/sf/japi/string2bytes/CodecStepTest.java
Modified: historic/trunk/src/app/net/sf/japi/finance/SimpleCapitalCalculator.java
===================================================================
--- historic/trunk/src/app/net/sf/japi/finance/SimpleCapitalCalculator.java 2008-12-27 03:27:49 UTC (rev 746)
+++ historic/trunk/src/app/net/sf/japi/finance/SimpleCapitalCalculator.java 2008-12-27 21:40:37 UTC (rev 747)
@@ -45,11 +45,7 @@
if ( numberOfPeriods < 0 ) throw new IllegalArgumentException("Number of periods has to be at least 0!");
if ( numberOfPeriods == 0 )
return initialCapital;
- if( numberOfPeriods == 1 ) {
- currentCapital = initialCapital * (1 + interestRate/100);
- } else {
- currentCapital = initialCapital * Math.pow(( 1 + interestRate/100 ), numberOfPeriods);
- }
+ currentCapital = numberOfPeriods == 1 ? initialCapital * (1 + interestRate / 100) : initialCapital * Math.pow((1 + interestRate / 100), numberOfPeriods);
return currentCapital;
}
@@ -93,7 +89,7 @@
public String toString() {
return "initial capital: " + this.initialCapital +
"\ninterest rate: " + this.interestRate +
- "\ncurrent capital: " + this.currentCapital;
+ "\ncurrent capital: " + this.currentCapital;
}
/** Clones the current SimpleCapitalCalculator.
@@ -106,5 +102,5 @@
throw new InternalError();
}
}
-
+
} // class SimpleCapitalCalculator
Modified: historic/trunk/src/app/net/sf/japi/io/ARGVEnumeration.java
===================================================================
--- historic/trunk/src/app/net/sf/japi/io/ARGVEnumeration.java 2008-12-27 03:27:49 UTC (rev 746)
+++ historic/trunk/src/app/net/sf/japi/io/ARGVEnumeration.java 2008-12-27 21:40:37 UTC (rev 747)
@@ -30,6 +30,7 @@
import java.util.List;
import java.util.NoSuchElementException;
import net.sf.japi.util.ThrowableHandler;
+import org.jetbrains.annotations.Nullable;
/** Implementation of {@link Enumeration} for ARGV.
* Used by {@link ARGVInputStream} and {@link ARGVReader}.
@@ -50,7 +51,7 @@
private InputStream currentStream;
/** Next InputStream. */
- private InputStream nextStream;
+ @Nullable private InputStream nextStream;
/** Current filename. */
private String currentFilename;
Modified: historic/trunk/src/app/net/sf/japi/sql/CachedResultSetTableModel.java
===================================================================
--- historic/trunk/src/app/net/sf/japi/sql/CachedResultSetTableModel.java 2008-12-27 03:27:49 UTC (rev 746)
+++ historic/trunk/src/app/net/sf/japi/sql/CachedResultSetTableModel.java 2008-12-27 21:40:37 UTC (rev 747)
@@ -58,15 +58,15 @@
/** The column titles.
* @serial include
*/
- private String[] columnTitles;
+ @Nullable private String[] columnTitles;
/** The Data.
* @serial include
*/
- private Object[][] data;
+ @Nullable private Object[][] data;
/** The ResultSet. */
- private ResultSet resultSet;
+ @Nullable private ResultSet resultSet;
/** Create a CachedResultSetTableModel. */
public CachedResultSetTableModel() {
@@ -75,7 +75,7 @@
/** Create a CachedResultSetTableModel.
* @param rs Initial ResultSet
*/
- public CachedResultSetTableModel(final ResultSet rs) {
+ public CachedResultSetTableModel(@Nullable final ResultSet rs) {
setResultSet(rs);
}
@@ -93,7 +93,7 @@
}
/** {@inheritDoc} */
- public void setResultSet(final ResultSet resultSet) {
+ public void setResultSet(@Nullable final ResultSet resultSet) {
if (resultSet == null) {
this.resultSet = resultSet;
rowCount = 0;
@@ -120,7 +120,7 @@
}
/** {@inheritDoc} */
- public ResultSet getResultSet() {
+ @Nullable public ResultSet getResultSet() {
return resultSet;
}
Modified: historic/trunk/src/app/net/sf/japi/sql/DatabaseTreeModel.java
===================================================================
--- historic/trunk/src/app/net/sf/japi/sql/DatabaseTreeModel.java 2008-12-27 03:27:49 UTC (rev 746)
+++ historic/trunk/src/app/net/sf/japi/sql/DatabaseTreeModel.java 2008-12-27 21:40:37 UTC (rev 747)
@@ -30,6 +30,7 @@
import javax.swing.event.TreeModelListener;
import javax.swing.tree.TreeModel;
import javax.swing.tree.TreePath;
+import org.jetbrains.annotations.Nullable;
/** A TreeModel displaying the catalogs of a database (usually tables and views) as tree.
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
@@ -67,7 +68,7 @@
public void refresh() throws SQLException {
catalogs.clear();
if (databaseMetaData != null) {
- ResultSet rs = null;
+ @Nullable ResultSet rs = null;
try {
rs = databaseMetaData.getCatalogs();
while (rs.next()) {
@@ -118,20 +119,12 @@
/** {@inheritDoc} */
public int getChildCount(final Object parent) {
- if (parent == this) {
- return catalogs.size();
- } else {
- return ((CatalogTreeNode) parent).getTableCount();
- }
+ return parent == this ? catalogs.size() : ((CatalogTreeNode) parent).getTableCount();
}
/** {@inheritDoc} */
public int getIndexOfChild(final Object parent, final Object child) {
- if (parent == this) {
- return catalogs.indexOf(child);
- } else {
- return ((CatalogTreeNode) parent).getTableIndex((CatalogTreeNode.TableTreeNode) child);
- }
+ return parent == this ? catalogs.indexOf(child) : ((CatalogTreeNode) parent).getTableIndex((CatalogTreeNode.TableTreeNode) child);
}
/** {@inheritDoc} */
@@ -181,7 +174,7 @@
*/
CatalogTreeNode(final String catalog) throws SQLException {
this.catalog = catalog;
- ResultSet rs = null;
+ @Nullable ResultSet rs = null;
try {
rs = databaseMetaData.getTables(catalog, null, null, null);
while (rs.next()) {
Modified: historic/trunk/src/app/net/sf/japi/sql/ScrollResultSetTableModel.java
===================================================================
--- historic/trunk/src/app/net/sf/japi/sql/ScrollResultSetTableModel.java 2008-12-27 03:27:49 UTC (rev 746)
+++ historic/trunk/src/app/net/sf/japi/sql/ScrollResultSetTableModel.java 2008-12-27 21:40:37 UTC (rev 747)
@@ -74,7 +74,7 @@
/** The column titles.
* @serial include
*/
- private String[] columnTitles;
+ @Nullable private String[] columnTitles;
/** Create a ResultSetTableModel. */
public ScrollResultSetTableModel() {
@@ -161,11 +161,7 @@
return 0;
}
try {
- if (resultSet.last()) {
- return resultSet.getRow();
- } else {
- return 0;
- }
+ return resultSet.last() ? resultSet.getRow() : 0;
} catch (final SQLException e) {
handleException(e);
return 0;
Modified: historic/trunk/src/app/net/sf/japi/swing/JPropertyEditor.java
===================================================================
--- historic/trunk/src/app/net/sf/japi/swing/JPropertyEditor.java 2008-12-27 03:27:49 UTC (rev 746)
+++ historic/trunk/src/app/net/sf/japi/swing/JPropertyEditor.java 2008-12-27 21:40:37 UTC (rev 747)
@@ -71,12 +71,7 @@
propertyEditor = PropertyEditorManager.findEditor(propertyType);
}
if (propertyEditor != null) {
- final Component editor;
- if (propertyEditor.supportsCustomEditor()) {
- editor = propertyEditor.getCustomEditor();
- } else {
- editor = createEditor(propertyType);
- }
+ final Component editor = propertyEditor.supportsCustomEditor() ? propertyEditor.getCustomEditor() : createEditor(propertyType);
if (editor != null) {
//noinspection ObjectAllocationInLoop
add(new JLabel(propertyName), labelGbc);
Modified: historic/trunk/src/doc/guide/swing/action/fromScratch/src/net/sf/japi/examples/editor/Editor.java
===================================================================
--- historic/trunk/src/doc/guide/swing/action/fromScratch/src/net/sf/japi/examples/editor/Editor.java 2008-12-27 03:27:49 UTC (rev 746)
+++ historic/trunk/src/doc/guide/swing/action/fromScratch/src/net/sf/japi/examples/editor/Editor.java 2008-12-27 21:40:37 UTC (rev 747)
@@ -48,7 +48,7 @@
/** Currently opened file.
* Maybe <code>null</code> in case the current document was not already saved.
*/
- private File file;
+ @Nullable private File file;
/** Create the Editor. */
public Editor() {
Modified: historic/trunk/src/test/net/sf/japi/util/PairTest.java
===================================================================
--- historic/trunk/src/test/net/sf/japi/util/PairTest.java 2008-12-27 03:27:49 UTC (rev 746)
+++ historic/trunk/src/test/net/sf/japi/util/PairTest.java 2008-12-27 21:40:37 UTC (rev 747)
@@ -23,6 +23,7 @@
import junit.framework.TestCase;
import net.sf.japi.util.Pair;
+import org.jetbrains.annotations.Nullable;
/** Test class for {@link Pair}.
* @author <a href="mailto:ch...@it...">Christian Hujer</a>
@@ -30,9 +31,9 @@
public class PairTest extends TestCase {
/** Object Under Test: A Table. */
- private Pair<Object,Object> oUT;
- private String first;
- private String second;
+ @Nullable private Pair<Object,Object> oUT;
+ @Nullable private String first;
+ @Nullable private String second;
/** {@inheritDoc} */
@Override protected void setUp() throws Exception {
Modified: historic/trunk/src/test/net/sf/japi/util/TableTest.java
===================================================================
--- historic/trunk/src/test/net/sf/japi/util/TableTest.java 2008-12-27 03:27:49 UTC (rev 746)
+++ historic/trunk/src/test/net/sf/japi/util/TableTest.java 2008-12-27 21:40:37 UTC (rev 747)
@@ -24,6 +24,7 @@
import junit.framework.TestCase;
import net.sf.japi.util.Pair;
import net.sf.japi.util.Table;
+import org.jetbrains.annotations.Nullable;
/** Test class for Table.
* @author <a href="mailto:ch...@it...">Christian Hujer</a>
@@ -31,7 +32,7 @@
public class TableTest extends TestCase {
/** Object Under Test: A Table. */
- private Table<Object,Object> oUT;
+ @Nullable private Table<Object,Object> oUT;
/** {@inheritDoc} */
@Override public void setUp() throws Exception {
Modified: libs/argparser/trunk/src/prj/net/sf/japi/io/args/ArgParser.java
===================================================================
--- libs/argparser/trunk/src/prj/net/sf/japi/io/args/ArgParser.java 2008-12-27 03:27:49 UTC (rev 746)
+++ libs/argparser/trunk/src/prj/net/sf/japi/io/args/ArgParser.java 2008-12-27 21:40:37 UTC (rev 747)
@@ -111,7 +111,7 @@
final List<String> argList = new ArrayList<String>(args);
for (final ListIterator<String> iterator = argList.listIterator(); iterator.hasNext();) {
final String arg = iterator.next();
- if (arg.equals("--")) {
+ if ("--".equals(arg)) {
break;
}
if (arg.startsWith("@")) {
@@ -186,7 +186,7 @@
// But it's safer to check this.
throw new NullPointerException("null is not allowed for an option name.");
}
- if (optionName.equals("")) {
+ if ("".equals(optionName)) {
throw new IllegalArgumentException("The empty String is not allowed as option name.");
}
if (optionName.startsWith("-")) {
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 2008-12-27 03:27:49 UTC (rev 746)
+++ libs/argparser/trunk/src/prj/net/sf/japi/io/args/CommandWithHelp.java 2008-12-27 21:40:37 UTC (rev 747)
@@ -70,7 +70,7 @@
final String delim = shortNames.size() > 0 && longNames.size() > 0 ? ", " : " ";
String description;
try {
- final String optionKey = option.key().equals("") ? optionMethod.getName() : option.key();
+ final String optionKey = "".equals(option.key()) ? optionMethod.getName() : option.key();
description = getString(optionKey);
} catch (final MissingResourceException ignore) {
description = "";
Modified: libs/argparser/trunk/src/prj/net/sf/japi/io/args/converter/OututStreamConverter.java
===================================================================
--- libs/argparser/trunk/src/prj/net/sf/japi/io/args/converter/OututStreamConverter.java 2008-12-27 03:27:49 UTC (rev 746)
+++ libs/argparser/trunk/src/prj/net/sf/japi/io/args/converter/OututStreamConverter.java 2008-12-27 21:40:37 UTC (rev 747)
@@ -43,11 +43,7 @@
/** {@inheritDoc} */
@NotNull public OutputStream convert(@NotNull final Locale locale, @NotNull final String arg) throws FileNotFoundException {
- if ("-".equals(arg) && !new File("-").exists()) {
- return System.out;
- } else {
- return new FileOutputStream(arg);
- }
+ return "-".equals(arg) && !new File("-").exists() ? System.out : new FileOutputStream(arg);
}
} // class InputStreamConverter
Modified: libs/lang/trunk/src/prj/net/sf/japi/lang/PropertyComparator.java
===================================================================
--- libs/lang/trunk/src/prj/net/sf/japi/lang/PropertyComparator.java 2008-12-27 03:27:49 UTC (rev 746)
+++ libs/lang/trunk/src/prj/net/sf/japi/lang/PropertyComparator.java 2008-12-27 21:40:37 UTC (rev 747)
@@ -66,11 +66,7 @@
final Method o2Getter = getter != null ? getter : getPropertyGetter(o2.getClass(), propertyName);
final Object o1Value = o1Getter.invoke(o1);
final Object o2Value = o2Getter.invoke(o2);
- if (delegate == null) {
- return ((Comparable) o1Value).compareTo((Comparable) o2Value);
- } else {
- return delegate.compare((T) o1Value, (T) o2Value);
- }
+ return delegate == null ? ((Comparable) o1Value).compareTo((Comparable) o2Value) : delegate.compare((T) o1Value, (T) o2Value);
} catch (final IllegalAccessException e) {
throw new IllegalAccessError(e.getMessage());
} catch (final InvocationTargetException e) {
Modified: libs/midi/trunk/src/prj/net/sf/japi/midi/gui/SpinnerChannelModel.java
===================================================================
--- libs/midi/trunk/src/prj/net/sf/japi/midi/gui/SpinnerChannelModel.java 2008-12-27 03:27:49 UTC (rev 746)
+++ libs/midi/trunk/src/prj/net/sf/japi/midi/gui/SpinnerChannelModel.java 2008-12-27 21:40:37 UTC (rev 747)
@@ -1,6 +1,6 @@
package net.sf.japi.midi.gui;
-import javax.swing.AbstractSpinnerModel;
+import javax.swing.AbstractSpinnerModel;import org.jetbrains.annotations.Nullable;
/** A SpinnerModel for MIDI Channels.
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
@@ -31,12 +31,12 @@
}
/** {@inheritDoc} */
- public Object getNextValue() {
+ @Nullable public Object getNextValue() {
return value < 0xF ? value + 1 : null;
}
/** {@inheritDoc} */
- public Object getPreviousValue() {
+ @Nullable public Object getPreviousValue() {
return value > 0x0 ? value - 1 : null;
}
}
Modified: libs/swing-action/trunk/src/tst/test/net/sf/japi/swing/ReflectionActionTest.java
===================================================================
--- libs/swing-action/trunk/src/tst/test/net/sf/japi/swing/ReflectionActionTest.java 2008-12-27 03:27:49 UTC (rev 746)
+++ libs/swing-action/trunk/src/tst/test/net/sf/japi/swing/ReflectionActionTest.java 2008-12-27 21:40:37 UTC (rev 747)
@@ -25,6 +25,7 @@
import net.sf.japi.swing.ActionBuilderFactory;
import net.sf.japi.swing.ActionMethod;
import net.sf.japi.swing.ReflectionAction;
+import org.jetbrains.annotations.Nullable;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -41,7 +42,7 @@
private static final ActionBuilder ACTION_BUILDER = ActionBuilderFactory.getInstance().getActionBuilder("test.net.sf.japi.swing");
/** The testling: A ReflectionAction. */
- private ReflectionAction testling;
+ @Nullable private ReflectionAction testling;
/** The Action Mock. */
private ActionMock actionMock;
Modified: libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/Application.java
===================================================================
--- libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/Application.java 2008-12-27 03:27:49 UTC (rev 746)
+++ libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/Application.java 2008-12-27 21:40:37 UTC (rev 747)
@@ -408,11 +408,7 @@
*/
private void setActiveDocumentImpl(@Nullable final DocumentFrame<D> docFrame) {
currentDocumentFrame = docFrame;
- if (docFrame != null) {
- currentDocument = docFrame.getDocument();
- } else {
- currentDocument = null;
- }
+ currentDocument = docFrame != null ? docFrame.getDocument() : null;
updateActionStates();
}
Modified: libs/swing-bookmarks/trunk/src/prj/net/sf/japi/swing/bookmarks/BookmarkManager.java
===================================================================
--- libs/swing-bookmarks/trunk/src/prj/net/sf/japi/swing/bookmarks/BookmarkManager.java 2008-12-27 03:27:49 UTC (rev 746)
+++ libs/swing-bookmarks/trunk/src/prj/net/sf/japi/swing/bookmarks/BookmarkManager.java 2008-12-27 21:40:37 UTC (rev 747)
@@ -53,6 +53,7 @@
import net.sf.japi.swing.IconManager;
import net.sf.japi.util.EmptyEnumeration;
import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.w3c.dom.DOMImplementation;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -294,7 +295,7 @@
/** The folder (parent) of this bookmark.
* @serial include
*/
- private BookmarkFolder folder;
+ @Nullable private BookmarkFolder folder;
///** Create a Bookmark without title.
// * Should only be used by {@link BookmarkFolder#BookmarkFolder()}.
@@ -321,14 +322,14 @@
/** Get the folder (parent) of this bookmark.
* @return folder (parent) of this bookmark
*/
- public BookmarkFolder getFolder() {
+ @Nullable public BookmarkFolder getFolder() {
return folder;
}
/** Set the folder (parent) of this bookmark.
* @param folder parent folder of this bookmark
*/
- public void setFolder(final BookmarkFolder folder) {
+ public void setFolder(@Nullable final BookmarkFolder folder) {
if (this.folder != null) {
this.folder.remove(this);
}
Modified: libs/swing-extlib/trunk/src/prj/net/sf/japi/swing/ToolBarLayout.java
===================================================================
--- libs/swing-extlib/trunk/src/prj/net/sf/japi/swing/ToolBarLayout.java 2008-12-27 03:27:49 UTC (rev 746)
+++ libs/swing-extlib/trunk/src/prj/net/sf/japi/swing/ToolBarLayout.java 2008-12-27 21:40:37 UTC (rev 747)
@@ -30,6 +30,7 @@
import java.util.ArrayList;
import java.util.List;
import javax.swing.JToolBar;
+import org.jetbrains.annotations.Nullable;
/** A LayoutManager that manages a layout of a {@link Container} similar to {@link BorderLayout} but with an important difference, it is possible to
* add as many components to a side layout region as you want. The desired purpose is to serve as LayoutManager for containers that shall contain
@@ -109,7 +110,7 @@
/** Component in the center region.
* @serial include
*/
- private Component center;
+ @Nullable private Component center;
/** Create a ToolBarLayout with zero gaps. */
public ToolBarLayout() {
Modified: libs/swing-font/trunk/src/prj/net/sf/japi/swing/font/FontChooser.java
===================================================================
--- libs/swing-font/trunk/src/prj/net/sf/japi/swing/font/FontChooser.java 2008-12-27 03:27:49 UTC (rev 746)
+++ libs/swing-font/trunk/src/prj/net/sf/japi/swing/font/FontChooser.java 2008-12-27 21:40:37 UTC (rev 747)
@@ -211,11 +211,7 @@
@Nullable public static Font showChooseFontDialog(@Nullable final Component parent, @Nullable final Font font) {
final FontChooser chooser = new FontChooser();
chooser.setSelectedFont(font);
- if (showConfirmDialog(parent, chooser, ACTION_BUILDER.getString("chooser.title"), OK_CANCEL_OPTION, PLAIN_MESSAGE) == OK_OPTION) {
- return chooser.selectedFont;
- } else {
- return null;
- }
+ return showConfirmDialog(parent, chooser, ACTION_BUILDER.getString("chooser.title"), OK_CANCEL_OPTION, PLAIN_MESSAGE) == OK_OPTION ? chooser.selectedFont : null;
}
} // class FontChooser
Modified: libs/swing-misc/trunk/src/prj/net/sf/japi/swing/misc/ConsoleProgress.java
===================================================================
--- libs/swing-misc/trunk/src/prj/net/sf/japi/swing/misc/ConsoleProgress.java 2008-12-27 03:27:49 UTC (rev 746)
+++ libs/swing-misc/trunk/src/prj/net/sf/japi/swing/misc/ConsoleProgress.java 2008-12-27 21:40:37 UTC (rev 747)
@@ -16,10 +16,10 @@
private final Appendable out;
/** The flushable for out. */
- private final Flushable flushOut;
+ @Nullable private final Flushable flushOut;
/** The closeable for out. */
- private final Closeable closeOut;
+ @Nullable private final Closeable closeOut;
/** Current maximum. */
private int max;
Modified: libs/swing-misc/trunk/src/prj/net/sf/japi/swing/misc/JSAXErrorHandler.java
===================================================================
--- libs/swing-misc/trunk/src/prj/net/sf/japi/swing/misc/JSAXErrorHandler.java 2008-12-27 03:27:49 UTC (rev 746)
+++ libs/swing-misc/trunk/src/prj/net/sf/japi/swing/misc/JSAXErrorHandler.java 2008-12-27 21:40:37 UTC (rev 747)
@@ -27,6 +27,7 @@
import javax.swing.JTextArea;
import net.sf.japi.swing.ActionBuilder;
import net.sf.japi.swing.ActionBuilderFactory;
+import org.jetbrains.annotations.Nullable;
import org.xml.sax.ErrorHandler;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
@@ -48,7 +49,7 @@
/** The Dialog.
* @serial include
*/
- private JDialog dialog;
+ @Nullable private JDialog dialog;
/** Parent component.
* @serial include
Modified: libs/taglets/trunk/src/prj/net/sf/japi/taglets/BlockListTaglet.java
===================================================================
--- libs/taglets/trunk/src/prj/net/sf/japi/taglets/BlockListTaglet.java 2008-12-27 03:27:49 UTC (rev 746)
+++ libs/taglets/trunk/src/prj/net/sf/japi/taglets/BlockListTaglet.java 2008-12-27 21:40:37 UTC (rev 747)
@@ -21,7 +21,7 @@
import com.sun.javadoc.Tag;
import com.sun.tools.doclets.Taglet;
-import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.NotNull;import org.jetbrains.annotations.Nullable;
/**
* Base class for Taglets that are simple blocks transforming into lists.
@@ -114,7 +114,7 @@
}
/** {@inheritDoc} */
- public String toString(final Tag[] tags) {
+ @Nullable public String toString(final Tag[] tags) {
if (tags == null || tags.length == 0) {
return null;
}
Modified: libs/util/trunk/src/prj/net/sf/japi/util/Collections2.java
===================================================================
--- libs/util/trunk/src/prj/net/sf/japi/util/Collections2.java 2008-12-27 03:27:49 UTC (rev 746)
+++ libs/util/trunk/src/prj/net/sf/japi/util/Collections2.java 2008-12-27 21:40:37 UTC (rev 747)
@@ -64,7 +64,7 @@
* @return collection containing only those elements accepted by the filter or <code>null</code> if the Collection could not be created.
*/
@Nullable public static <T, C extends Collection<T>> C filter(@NotNull final C c, @NotNull final Filter<? super T> filter) {
- C filtered = null;
+ @Nullable C filtered = null;
try {
filtered = (C) c.getClass().newInstance();
} catch (final Exception e) { /* ignore, check is done on null. */ }
Modified: libs/util/trunk/src/prj/net/sf/japi/util/filter/file/EndingFileFilter.java
===================================================================
--- libs/util/trunk/src/prj/net/sf/japi/util/filter/file/EndingFileFilter.java 2008-12-27 03:27:49 UTC (rev 746)
+++ libs/util/trunk/src/prj/net/sf/japi/util/filter/file/EndingFileFilter.java 2008-12-27 21:40:37 UTC (rev 747)
@@ -86,6 +86,7 @@
ret |= fileName.endsWith(ending);
}
}
+ ret = acceptDirectories ? pathname.isDirectory() : !pathname.isDirectory();
if (acceptDirectories) {
ret |= pathname.isDirectory();
} else {
Modified: libs/xml/trunk/src/tst/test/net/sf/japi/xml/NodeListIterator2Test.java
===================================================================
--- libs/xml/trunk/src/tst/test/net/sf/japi/xml/NodeListIterator2Test.java 2008-12-27 03:27:49 UTC (rev 746)
+++ libs/xml/trunk/src/tst/test/net/sf/japi/xml/NodeListIterator2Test.java 2008-12-27 21:40:37 UTC (rev 747)
@@ -25,6 +25,7 @@
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import net.sf.japi.xml.NodeListIterator;
+import org.jetbrains.annotations.Nullable;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -39,7 +40,7 @@
public class NodeListIterator2Test {
/** Object Under Test: A NodeListIterator. */
- private NodeListIterator<Node> testling;
+ @Nullable private NodeListIterator<Node> testling;
/** Mock NodeList. */
private NodeList mockNodeList;
Modified: libs/xml/trunk/src/tst/test/net/sf/japi/xml/NodeListIteratorTest.java
===================================================================
--- libs/xml/trunk/src/tst/test/net/sf/japi/xml/NodeListIteratorTest.java 2008-12-27 03:27:49 UTC (rev 746)
+++ libs/xml/trunk/src/tst/test/net/sf/japi/xml/NodeListIteratorTest.java 2008-12-27 21:40:37 UTC (rev 747)
@@ -7,6 +7,7 @@
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
import net.sf.japi.xml.NodeListIterator;
+import org.jetbrains.annotations.Nullable;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
@@ -25,7 +26,7 @@
public class NodeListIteratorTest {
/** The DocumentBuilder for creating DOM trees for testing. */
- private static DocumentBuilder db;
+ @Nullable private static DocumentBuilder db;
/** Creates the DocumentBuilder that is used for creating DOM trees for testing.
* @throws ParserConfigurationException (unexpected)
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/ProgramFrame.java
===================================================================
--- progs/jeduca/t...
[truncated message content] |
|
From: <chr...@us...> - 2008-12-28 15:27:08
|
Revision: 748
http://japi.svn.sourceforge.net/japi/?rev=748&view=rev
Author: christianhujer
Date: 2008-12-28 15:27:01 +0000 (Sun, 28 Dec 2008)
Log Message:
-----------
Fixed code style issues:
- Problems regarding null / @Nullable / @NotNull
- Obsolete @used tags
- Missing exceptions in javadoc
- Missing parameter descriptions in javadoc
Modified Paths:
--------------
historic/trunk/src/app/net/sf/japi/cpp/CPreProcessor.java
historic/trunk/src/app/net/sf/japi/lang/Properties.java
historic/trunk/src/app/net/sf/japi/sql/CachedResultSetTableModel.java
historic/trunk/src/app/net/sf/japi/sql/DatabaseTreeModel.java
historic/trunk/src/app/net/sf/japi/sql/ScrollResultSetTableModel.java
historic/trunk/src/app/net/sf/japi/swing/JPropertyEditor.java
historic/trunk/src/app/net/sf/japi/util/PrintStreamThrowableHandler.java
historic/trunk/src/app/net/sf/japi/util/Service.java
historic/trunk/src/doc/guide/io/src/CatJAPI.java
historic/trunk/src/doc/guide/swing/action/fromScratch/src/net/sf/japi/examples/editor/Editor.java
historic/trunk/src/test/net/sf/japi/util/PairTest.java
historic/trunk/src/test/net/sf/japi/util/TableTest.java
libs/argparser/trunk/src/doc/examples/Recode.java
libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/MissingArgumentExceptionTest.java
libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/RequiredOptionsMissingExceptionTest.java
libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/TerminalExceptionTest.java
libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/UnknownOptionExceptionTest.java
libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/converter/NoConverterFoundExceptionTest.java
libs/logging/trunk/src/prj/net/sf/japi/log/SimpleLogger.java
libs/midi/trunk/src/prj/net/sf/japi/midi/MidiUtils.java
libs/swing-action/trunk/src/tst/test/net/sf/japi/swing/ReflectionActionTest.java
libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/script/Application.java
libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/script/TryApplication.java
libs/swing-bookmarks/trunk/src/prj/net/sf/japi/swing/bookmarks/BookmarkDropTargetAdapter.java
libs/swing-bookmarks/trunk/src/prj/net/sf/japi/swing/bookmarks/BookmarkManager.java
libs/swing-keyprefs/trunk/src/prj/net/sf/japi/swing/prefs/keys/AbstractSimpleNode.java
libs/swing-keyprefs/trunk/src/prj/net/sf/japi/swing/prefs/keys/ActionKeyDisplay.java
libs/swing-misc/trunk/src/prj/net/sf/japi/swing/misc/CollectionsListModel.java
libs/swing-misc/trunk/src/prj/net/sf/japi/swing/misc/JSAXErrorHandler.java
libs/swing-treetable/trunk/src/prj/net/sf/japi/swing/treetable/AbstractTreeTableModel.java
libs/util/trunk/src/tst/test/net/sf/japi/util/EnumerationIteratorTest.java
libs/xml/trunk/src/tst/test/net/sf/japi/xml/NodeListIterator2Test.java
libs/xml/trunk/src/tst/test/net/sf/japi/xml/NodeListIteratorTest.java
progs/cardlearn/trunk/src/prj/net/sf/japi/cardlearn/CardDatabaseConfigEditor.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/OpenURLPane.java
progs/jirus/trunk/src/prj/net/sf/jirus/MyReceiver.java
tools/gdbControl/trunk/src/prj/net/sf/japi/tools/gdbcontrol/ComWithGdb.java
tools/replacer/trunk/src/prj/net/sf/japi/tools/replacer/Replacer.java
tools/string2bytes/trunk/src/tst/test/net/sf/japi/string2bytes/CodecStepTest.java
Modified: historic/trunk/src/app/net/sf/japi/cpp/CPreProcessor.java
===================================================================
--- historic/trunk/src/app/net/sf/japi/cpp/CPreProcessor.java 2008-12-27 21:40:37 UTC (rev 747)
+++ historic/trunk/src/app/net/sf/japi/cpp/CPreProcessor.java 2008-12-28 15:27:01 UTC (rev 748)
@@ -102,9 +102,8 @@
private static String readFile(final String filename) throws IOException {
final StringBuilder chain = new StringBuilder();
final char[] buffer = new char[4096];
- Reader in = null;
+ final Reader in = new FileReader(filename);
try {
- in = new FileReader(filename);
for (int bytesRead; (bytesRead = in.read(buffer)) != -1;) {
chain.append(buffer, 0, bytesRead);
}
@@ -199,6 +198,7 @@
/** Main program.
* @param args command line arguments
+ * @throws IOException in case of I/O problems.
*/
public static void main(final String... args) throws IOException {
new CPreProcessor().process(System.in, System.out);
Modified: historic/trunk/src/app/net/sf/japi/lang/Properties.java
===================================================================
--- historic/trunk/src/app/net/sf/japi/lang/Properties.java 2008-12-27 21:40:37 UTC (rev 747)
+++ historic/trunk/src/app/net/sf/japi/lang/Properties.java 2008-12-28 15:27:01 UTC (rev 748)
@@ -30,8 +30,9 @@
public class Properties {
/** Get a property of an object.
- * @param object
- * @param propertyName
+ * @param object Object of which to get a property as String.
+ * @param propertyName Name of the property to get.
+ * @return Value of <var>propertyName</var> of <var>object</var> as String.
* @see #setPropertyFromString(Object, String, String)
*/
public static String getPropertyAsString(final Object object, final String propertyName) {
Modified: historic/trunk/src/app/net/sf/japi/sql/CachedResultSetTableModel.java
===================================================================
--- historic/trunk/src/app/net/sf/japi/sql/CachedResultSetTableModel.java 2008-12-27 21:40:37 UTC (rev 747)
+++ historic/trunk/src/app/net/sf/japi/sql/CachedResultSetTableModel.java 2008-12-28 15:27:01 UTC (rev 748)
@@ -87,7 +87,7 @@
for (int i = listeners.length - 2; i >= 0; i -= 2) {
//noinspection ObjectEquality
if (listeners[i] == ThrowableHandler.class) {
- ((ThrowableHandler<? super SQLException>)listeners[i+1]).handleThrowable(exception);
+ ((ThrowableHandler<? super SQLException>) listeners[i + 1]).handleThrowable(exception);
}
}
}
@@ -103,7 +103,7 @@
} else {
try {
columnTitles = SQLHelper.getColumnLabels(resultSet);
- columnCount = columnTitles.length;
+ columnCount = columnTitles != null ? columnTitles.length : 0;
rowCount = SQLHelper.getRowCount(resultSet);
data = SQLHelper.getData(resultSet);
this.resultSet = resultSet;
@@ -163,8 +163,8 @@
}
/** {@inheritDoc} */
- @Override public String getColumnName(final int column) {
- return columnTitles[column];
+ @Override @Nullable public String getColumnName(final int column) {
+ return columnTitles != null ? columnTitles[column] : null;
}
} // class CachedResultSetTableModel
Modified: historic/trunk/src/app/net/sf/japi/sql/DatabaseTreeModel.java
===================================================================
--- historic/trunk/src/app/net/sf/japi/sql/DatabaseTreeModel.java 2008-12-27 21:40:37 UTC (rev 747)
+++ historic/trunk/src/app/net/sf/japi/sql/DatabaseTreeModel.java 2008-12-28 15:27:01 UTC (rev 748)
@@ -30,7 +30,6 @@
import javax.swing.event.TreeModelListener;
import javax.swing.tree.TreeModel;
import javax.swing.tree.TreePath;
-import org.jetbrains.annotations.Nullable;
/** A TreeModel displaying the catalogs of a database (usually tables and views) as tree.
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
@@ -68,9 +67,8 @@
public void refresh() throws SQLException {
catalogs.clear();
if (databaseMetaData != null) {
- @Nullable ResultSet rs = null;
+ final ResultSet rs = databaseMetaData.getCatalogs();
try {
- rs = databaseMetaData.getCatalogs();
while (rs.next()) {
try {
catalogs.add(new CatalogTreeNode(rs.getString(1)));
@@ -80,7 +78,7 @@
}
}
} finally {
- try { rs.close(); } catch (final Exception e) { /* ignore **/ } finally { rs = null; }
+ rs.close();
}
}
fireTreeStructureChanged();
@@ -170,18 +168,18 @@
private List<TableTreeNode> tables = new ArrayList<TableTreeNode>();
/** Create a CatalogTreeNode.
+ * @param catalog Catalog for which to create a CatalogTreeNode.
* @throws SQLException in case of database problems
*/
CatalogTreeNode(final String catalog) throws SQLException {
this.catalog = catalog;
- @Nullable ResultSet rs = null;
+ final ResultSet rs = databaseMetaData.getTables(catalog, null, null, null);
try {
- rs = databaseMetaData.getTables(catalog, null, null, null);
while (rs.next()) {
tables.add(new TableTreeNode(rs.getString("TABLE_NAME")));
}
} finally {
- try { rs.close(); } catch (final Exception e) { /* ignore **/ } finally { rs = null; }
+ rs.close();
}
}
@@ -219,7 +217,9 @@
/** The name of this table. */
private String table;
- /** Create a TableTreeNode. */
+ /** Create a TableTreeNode.
+ * @param table Table name for which to create a TableTreeNode.
+ */
TableTreeNode(final String table) {
this.table = table;
}
Modified: historic/trunk/src/app/net/sf/japi/sql/ScrollResultSetTableModel.java
===================================================================
--- historic/trunk/src/app/net/sf/japi/sql/ScrollResultSetTableModel.java 2008-12-27 21:40:37 UTC (rev 747)
+++ historic/trunk/src/app/net/sf/japi/sql/ScrollResultSetTableModel.java 2008-12-28 15:27:01 UTC (rev 748)
@@ -157,6 +157,7 @@
/** {@inheritDoc} */
public int getRowCount() {
+ final ResultSet resultSet = this.resultSet;
if (resultSet == null) {
return 0;
}
@@ -325,7 +326,7 @@
((RowSet) resultSet).addRowSetListener(this);
}
columnTitles = SQLHelper.getColumnLabels(resultSet);
- columnCount = columnTitles.length;
+ columnCount = columnTitles != null ? columnTitles.length : 0;
rowCount = SQLHelper.getRowCount(resultSet);
} catch (final SQLException e) {
handleException(e);
Modified: historic/trunk/src/app/net/sf/japi/swing/JPropertyEditor.java
===================================================================
--- historic/trunk/src/app/net/sf/japi/swing/JPropertyEditor.java 2008-12-27 21:40:37 UTC (rev 747)
+++ historic/trunk/src/app/net/sf/japi/swing/JPropertyEditor.java 2008-12-28 15:27:01 UTC (rev 748)
@@ -83,6 +83,7 @@
/** Create an editor for a property.
* @param propertyType property type
+ * @return Editor component for the specified property type or <code>null</code> if no editor is available.
*/
@SuppressWarnings({"ReturnOfNull"})
private static Component createEditor(final Class<?> propertyType) {
Modified: historic/trunk/src/app/net/sf/japi/util/PrintStreamThrowableHandler.java
===================================================================
--- historic/trunk/src/app/net/sf/japi/util/PrintStreamThrowableHandler.java 2008-12-27 21:40:37 UTC (rev 747)
+++ historic/trunk/src/app/net/sf/japi/util/PrintStreamThrowableHandler.java 2008-12-28 15:27:01 UTC (rev 748)
@@ -34,7 +34,10 @@
private final PrintStream stream;
- /** Private Singleton Constructor. */
+ /** Creates a PrintStreamThrowableHandler for the specified PrintStream.
+ * @param stream Stream for which to create a PrintStreamThrowableHandler.
+ * @see #STDERR for a default global PrintStreamThrowableHandler that wraps {@link System#in}.
+ */
public PrintStreamThrowableHandler(final PrintStream stream) {
this.stream = stream;
}
Modified: historic/trunk/src/app/net/sf/japi/util/Service.java
===================================================================
--- historic/trunk/src/app/net/sf/japi/util/Service.java 2008-12-27 21:40:37 UTC (rev 747)
+++ historic/trunk/src/app/net/sf/japi/util/Service.java 2008-12-28 15:27:01 UTC (rev 748)
@@ -89,6 +89,7 @@
* @param service Service class to look up
* @param loader Class loader to use
* @return implementations found (lazy iterable)
+ * @throws MustangUnavailableException In case Mustang is not available and thus it's not possible to use Mustang services.
*/
@NotNull private static <T> Iterable<T> loadMustang(@NotNull final Class<T> service, @Nullable final ClassLoader loader) throws MustangUnavailableException {
try {
Modified: historic/trunk/src/doc/guide/io/src/CatJAPI.java
===================================================================
--- historic/trunk/src/doc/guide/io/src/CatJAPI.java 2008-12-27 21:40:37 UTC (rev 747)
+++ historic/trunk/src/doc/guide/io/src/CatJAPI.java 2008-12-28 15:27:01 UTC (rev 748)
@@ -10,6 +10,7 @@
/** Main program.
* @param args command line arguments: names of files to concatenate
+ * @throws IOException in case of I/O problems.
*/
public static void main(final String... args) throws IOException {
copy(new ARGVInputStream(args), out);
Modified: historic/trunk/src/doc/guide/swing/action/fromScratch/src/net/sf/japi/examples/editor/Editor.java
===================================================================
--- historic/trunk/src/doc/guide/swing/action/fromScratch/src/net/sf/japi/examples/editor/Editor.java 2008-12-27 21:40:37 UTC (rev 747)
+++ historic/trunk/src/doc/guide/swing/action/fromScratch/src/net/sf/japi/examples/editor/Editor.java 2008-12-28 15:27:01 UTC (rev 748)
@@ -73,16 +73,15 @@
return null;
}
- /** Action method.
- * @used
- */
+ /** Action method. */
@ActionMethod public void fileNew() {
textPane.setText("");
file = null;
}
/** Action method.
- * @used
+ * @throws FileNotFoundException In case the file to open could not be opened or found.
+ * @throws IOException In case of I/O problems when trying to open or read the file.
*/
@ActionMethod public void fileOpen() throws FileNotFoundException, IOException {
if (fileChooser.showOpenDialog(frame) == APPROVE_OPTION) {
@@ -102,9 +101,7 @@
}
}
- /** Action method.
- * @used
- */
+ /** Action method. */
@ActionMethod public void fileQuit() {
if (ACTION_BUILDER.showQuestionDialog(frame, "reallyQuit")) {
frame.dispose();
@@ -112,7 +109,7 @@
}
/** Action method.
- * @used
+ * @throws IOException In case of I/O problems when saving.
*/
@ActionMethod public void fileSave() throws IOException {
if (file == null) {
@@ -128,7 +125,7 @@
}
/** Action method.
- * @used
+ * @throws IOException In case of I/O problems when saving.
*/
@ActionMethod public void fileSaveAs() throws IOException {
if (fileChooser.showSaveDialog(frame) == APPROVE_OPTION) {
Modified: historic/trunk/src/test/net/sf/japi/util/PairTest.java
===================================================================
--- historic/trunk/src/test/net/sf/japi/util/PairTest.java 2008-12-27 21:40:37 UTC (rev 747)
+++ historic/trunk/src/test/net/sf/japi/util/PairTest.java 2008-12-28 15:27:01 UTC (rev 748)
@@ -23,7 +23,6 @@
import junit.framework.TestCase;
import net.sf.japi.util.Pair;
-import org.jetbrains.annotations.Nullable;
/** Test class for {@link Pair}.
* @author <a href="mailto:ch...@it...">Christian Hujer</a>
@@ -31,9 +30,9 @@
public class PairTest extends TestCase {
/** Object Under Test: A Table. */
- @Nullable private Pair<Object,Object> oUT;
- @Nullable private String first;
- @Nullable private String second;
+ private Pair<Object,Object> oUT;
+ private String first;
+ private String second;
/** {@inheritDoc} */
@Override protected void setUp() throws Exception {
@@ -44,6 +43,7 @@
}
/** {@inheritDoc} */
+ @SuppressWarnings({"AssignmentToNull"})
@Override protected void tearDown() throws Exception {
super.tearDown();
oUT = null;
@@ -51,23 +51,31 @@
second = null;
}
- /** Test case for {@link Pair#getFirst()}. */
+ /** Test case for {@link Pair#getFirst()}.
+ * @throws Exception (unexpected).
+ */
public void testGetFirst() throws Exception {
assertSame("First must be retreivable via getFirst()", first, oUT.getFirst());
}
- /** Test case for {@link Pair#getSecond()}. */
+ /** Test case for {@link Pair#getSecond()}.
+ * @throws Exception (unexpected).
+ */
public void testGetSecond() throws Exception {
assertSame("First must be retreivable via getSecond()", second, oUT.getSecond());
}
- /** Test case for {@link Pair#Pair(Object,Object)}. */
+ /** Test case for {@link Pair#Pair(Object,Object)}.
+ * @throws Exception (unexpected).
+ */
public void testPair() throws Exception {
assertTrue("Dummy assertion.", true);
// This test is already implicitly performed by #setUp().
}
- /** Test case for {@link Pair#equals(Object)}. */
+ /** Test case for {@link Pair#equals(Object)}.
+ * @throws Exception (unexpected).
+ */
public void testEquals() throws Exception {
assertFalse("A pair must not be equal to random objects.", oUT.equals(new Object()));
assertTrue("A pair must be equal to itself", oUT.equals(oUT));
Modified: historic/trunk/src/test/net/sf/japi/util/TableTest.java
===================================================================
--- historic/trunk/src/test/net/sf/japi/util/TableTest.java 2008-12-27 21:40:37 UTC (rev 747)
+++ historic/trunk/src/test/net/sf/japi/util/TableTest.java 2008-12-28 15:27:01 UTC (rev 748)
@@ -24,7 +24,6 @@
import junit.framework.TestCase;
import net.sf.japi.util.Pair;
import net.sf.japi.util.Table;
-import org.jetbrains.annotations.Nullable;
/** Test class for Table.
* @author <a href="mailto:ch...@it...">Christian Hujer</a>
@@ -32,7 +31,7 @@
public class TableTest extends TestCase {
/** Object Under Test: A Table. */
- @Nullable private Table<Object,Object> oUT;
+ private Table<Object,Object> oUT;
/** {@inheritDoc} */
@Override public void setUp() throws Exception {
@@ -41,6 +40,7 @@
}
/** {@inheritDoc} */
+ @SuppressWarnings({"AssignmentToNull"})
@Override protected void tearDown() throws Exception {
super.tearDown();
oUT = null;
@@ -51,7 +51,9 @@
assertEquals("Newly created table must be empty.", 0, oUT.size());
}
- /** Test case for clearing a table. */
+ /** Test case for clearing a table.
+ * @throws Exception (unexpected).
+ */
public void testClear() throws Exception {
oUT.putPair(new Object(), new Object());
assertSize("Added 1 Element", 1);
Modified: libs/argparser/trunk/src/doc/examples/Recode.java
===================================================================
--- libs/argparser/trunk/src/doc/examples/Recode.java 2008-12-27 21:40:37 UTC (rev 747)
+++ libs/argparser/trunk/src/doc/examples/Recode.java 2008-12-28 15:27:01 UTC (rev 748)
@@ -115,7 +115,9 @@
try {
copy(tmpFile, file);
} finally {
- tmpFile.delete();
+ if (!tmpFile.delete()) {
+ System.err.println("Couldn't delete temporary file " + tmpFile);
+ }
}
}
Modified: libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/MissingArgumentExceptionTest.java
===================================================================
--- libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/MissingArgumentExceptionTest.java 2008-12-27 21:40:37 UTC (rev 747)
+++ libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/MissingArgumentExceptionTest.java 2008-12-28 15:27:01 UTC (rev 748)
@@ -34,6 +34,7 @@
* Tests that {@link MissingArgumentException#MissingArgumentException(String)} works.
* @throws Exception (unexpected)
*/
+ @SuppressWarnings({"ThrowableInstanceNeverThrown"})
@Test
public void testMissingArgumentException() throws Exception {
final MissingArgumentException exception = new MissingArgumentException("foo");
Modified: libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/RequiredOptionsMissingExceptionTest.java
===================================================================
--- libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/RequiredOptionsMissingExceptionTest.java 2008-12-27 21:40:37 UTC (rev 747)
+++ libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/RequiredOptionsMissingExceptionTest.java 2008-12-28 15:27:01 UTC (rev 748)
@@ -35,6 +35,7 @@
* Tests that {@link RequiredOptionsMissingException#RequiredOptionsMissingException(String[])} works.
* @throws Exception (unexpected)
*/
+ @SuppressWarnings({"ThrowableInstanceNeverThrown"})
@Test
public void testRequiredOptionsMissingException() throws Exception {
final String[] options = { "foo", "bar" };
@@ -55,6 +56,7 @@
* Tests that {@link RequiredOptionsMissingException#RequiredOptionsMissingException(String[])} throws an IllegalArgumentException in case no missing options were given.
* @throws IllegalArgumentException (expected).
*/
+ @SuppressWarnings({"ThrowableInstanceNeverThrown"})
@Test(expected = IllegalArgumentException.class)
public void testNoMissingOptions() throws Exception {
new RequiredOptionsMissingException();
Modified: libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/TerminalExceptionTest.java
===================================================================
--- libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/TerminalExceptionTest.java 2008-12-27 21:40:37 UTC (rev 747)
+++ libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/TerminalExceptionTest.java 2008-12-28 15:27:01 UTC (rev 748)
@@ -34,6 +34,7 @@
* Tests that {@link TerminalException#TerminalException()} works.
* @throws Exception (unexpected)
*/
+ @SuppressWarnings({"ThrowableInstanceNeverThrown"})
@Test
public void testTerminalException() throws Exception {
final TerminalException exception = new TerminalException();
@@ -44,6 +45,7 @@
* Tests that {@link TerminalException#getReturnCode()} works.
* @throws Exception (unexpected)
*/
+ @SuppressWarnings({"ThrowableInstanceNeverThrown"})
@Test
public void testGetReturnCode() throws Exception {
final TerminalException exception = new TerminalException(1);
Modified: libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/UnknownOptionExceptionTest.java
===================================================================
--- libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/UnknownOptionExceptionTest.java 2008-12-27 21:40:37 UTC (rev 747)
+++ libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/UnknownOptionExceptionTest.java 2008-12-28 15:27:01 UTC (rev 748)
@@ -35,6 +35,7 @@
* Tests that {@link UnknownOptionException#UnknownOptionException(String[])} works.
* @throws Exception (unexpected)
*/
+ @SuppressWarnings({"ThrowableInstanceNeverThrown"})
@Test
public void testUnknownOptionException() throws Exception {
final String[] options = { "foo", "bar" };
Modified: libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/converter/NoConverterFoundExceptionTest.java
===================================================================
--- libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/converter/NoConverterFoundExceptionTest.java 2008-12-27 21:40:37 UTC (rev 747)
+++ libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/converter/NoConverterFoundExceptionTest.java 2008-12-28 15:27:01 UTC (rev 748)
@@ -33,6 +33,7 @@
* Tests that the target type is stored correctly.
* @throws Exception (unexpected)
*/
+ @SuppressWarnings({"ThrowableInstanceNeverThrown"})
@Test
public void testGetTargetType() throws Exception {
final NoConverterFoundException exception = new NoConverterFoundException(Object.class);
Modified: libs/logging/trunk/src/prj/net/sf/japi/log/SimpleLogger.java
===================================================================
--- libs/logging/trunk/src/prj/net/sf/japi/log/SimpleLogger.java 2008-12-27 21:40:37 UTC (rev 747)
+++ libs/logging/trunk/src/prj/net/sf/japi/log/SimpleLogger.java 2008-12-28 15:27:01 UTC (rev 748)
@@ -34,24 +34,44 @@
private SimpleLogger() {
}
- /** @see Logger#log(Enum, String) */
- public static void log(final Level level, final String message) {
- DEFAULT_LOGGER.log(level, message);
+ /** Creates a log entry.
+ * @param level Level for the log entry
+ * @param key Key for retrieving the message from the bundle
+ * @see Logger#log(Enum, String)
+ */
+ public static void log(final Level level, final String key) {
+ DEFAULT_LOGGER.log(level, key);
}
- /** @see Logger#log(Enum, String, Object...) */
- public static void log(final Level level, final String message, final Object... params) {
- DEFAULT_LOGGER.log(level, message, params);
+ /** Creates a log entry.
+ * @param level Level for the log entry
+ * @param key Key for retrieving the message from the bundle
+ * @param params Values to use during message formatting
+ * @see Logger#log(Enum, String, Object...)
+ */
+ public static void log(final Level level, final String key, final Object... params) {
+ DEFAULT_LOGGER.log(level, key, params);
}
- /** @see Logger#log(Enum, Throwable, String) */
- public static void log(final Level level, final Throwable t, final String message) {
- DEFAULT_LOGGER.log(level, t, message);
+ /** Creates a log entry.
+ * @param level Level for the log entry
+ * @param key Key for retrieving the message from the bundle
+ * @param t Throwable to log
+ * @see Logger#log(Enum, Throwable, String)
+ */
+ public static void log(final Level level, final Throwable t, final String key) {
+ DEFAULT_LOGGER.log(level, t, key);
}
- /** @see Logger#log(Enum, Throwable, String, Object...) */
- public static void log(final Level level, final Throwable t, final String message, final Object... params) {
- DEFAULT_LOGGER.log(level, t, message, params);
+ /** Creates a log entry.
+ * @param level Level for the log entry
+ * @param key Key for retrieving the message from the bundle
+ * @param t Throwable to log
+ * @param params Values to use during message formatting
+ * @see Logger#log(Enum, Throwable, String, Object...)
+ */
+ public static void log(final Level level, final Throwable t, final String key, final Object... params) {
+ DEFAULT_LOGGER.log(level, t, key, params);
}
} // class SimpleLogger
Modified: libs/midi/trunk/src/prj/net/sf/japi/midi/MidiUtils.java
===================================================================
--- libs/midi/trunk/src/prj/net/sf/japi/midi/MidiUtils.java 2008-12-27 21:40:37 UTC (rev 747)
+++ libs/midi/trunk/src/prj/net/sf/japi/midi/MidiUtils.java 2008-12-28 15:27:01 UTC (rev 748)
@@ -29,7 +29,7 @@
return getReceivingDevices(MidiSystem.getMidiDeviceInfo());
}
- /** Returns all {@iink MidiDevice}s which provide {@link Transmitter}s.
+ /** Returns all {@link MidiDevice}s which provide {@link Transmitter}s.
* @return All {@link MidiDevice}s which provide {@link Transmitter}s.
* @throws MidiUnavailableException if one of the requested devices is unavailable due to resource restrictions.
*/
@@ -124,6 +124,7 @@
/** Returns a device by its name.
* @param name Name of the device to return.
* @return The first device found that matches <var>name</var> or <code>null</code> if the requested device was not found.
+ * @throws MidiUnavailableException In case Midi is not available.
*/
public static MidiDevice getDeviceByName(@NotNull final String name) throws MidiUnavailableException {
for (final MidiDevice.Info deviceInfo : MidiSystem.getMidiDeviceInfo()) {
Modified: libs/swing-action/trunk/src/tst/test/net/sf/japi/swing/ReflectionActionTest.java
===================================================================
--- libs/swing-action/trunk/src/tst/test/net/sf/japi/swing/ReflectionActionTest.java 2008-12-27 21:40:37 UTC (rev 747)
+++ libs/swing-action/trunk/src/tst/test/net/sf/japi/swing/ReflectionActionTest.java 2008-12-28 15:27:01 UTC (rev 748)
@@ -25,7 +25,6 @@
import net.sf.japi.swing.ActionBuilderFactory;
import net.sf.japi.swing.ActionMethod;
import net.sf.japi.swing.ReflectionAction;
-import org.jetbrains.annotations.Nullable;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -42,7 +41,7 @@
private static final ActionBuilder ACTION_BUILDER = ActionBuilderFactory.getInstance().getActionBuilder("test.net.sf.japi.swing");
/** The testling: A ReflectionAction. */
- @Nullable private ReflectionAction testling;
+ private ReflectionAction testling;
/** The Action Mock. */
private ActionMock actionMock;
@@ -55,6 +54,7 @@
}
/** Remove the testling. */
+ @SuppressWarnings({"AssignmentToNull"})
@After
public void tearDown() {
testling = null;
Modified: libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/script/Application.java
===================================================================
--- libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/script/Application.java 2008-12-27 21:40:37 UTC (rev 747)
+++ libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/script/Application.java 2008-12-28 15:27:01 UTC (rev 748)
@@ -1,6 +1,7 @@
package net.sf.japi.swing.app.script;
import java...
[truncated message content] |
|
From: <chr...@us...> - 2008-12-28 16:16:47
|
Revision: 749
http://japi.svn.sourceforge.net/japi/?rev=749&view=rev
Author: christianhujer
Date: 2008-12-28 16:16:40 +0000 (Sun, 28 Dec 2008)
Log Message:
-----------
Fixed some serialization issues.
Modified Paths:
--------------
historic/trunk/src/app/net/sf/japi/swing/WindowsLookAndFeel.java
historic/trunk/src/app/net/sf/japi/util/Service.java
libs/argparser/trunk/src/prj/net/sf/japi/io/args/ArgumentFileNotFoundException.java
libs/argparser/trunk/src/prj/net/sf/japi/io/args/MissingArgumentException.java
libs/argparser/trunk/src/prj/net/sf/japi/io/args/RequiredOptionsMissingException.java
libs/argparser/trunk/src/prj/net/sf/japi/io/args/TerminalException.java
libs/argparser/trunk/src/prj/net/sf/japi/io/args/UnknownOptionException.java
libs/argparser/trunk/src/prj/net/sf/japi/io/args/converter/NoConverterFoundException.java
libs/swing-action/trunk/src/prj/net/sf/japi/swing/DisposeAction.java
libs/swing-action/trunk/src/prj/net/sf/japi/swing/NamedActionMap.java
libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/Document.java
libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/DocumentEvent.java
libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/DocumentFrame.java
libs/swing-bookmarks/trunk/src/prj/net/sf/japi/swing/bookmarks/BookmarkManager.java
libs/swing-keyprefs/trunk/src/prj/net/sf/japi/swing/prefs/keys/ActionKeyDisplay.java
libs/swing-list/trunk/src/prj/net/sf/japi/swing/list/ArrayListModel.java
libs/swing-misc/trunk/src/prj/net/sf/japi/swing/misc/CollectionsListModel.java
libs/swing-prefs/trunk/src/prj/net/sf/japi/swing/prefs/PreferencesGroup.java
libs/swing-treetable/trunk/src/prj/net/sf/japi/swing/treetable/JTreeTable.java
libs/swing-treetable/trunk/src/prj/net/sf/japi/swing/treetable/TreeTableModelTableModelAdapter.java
progs/cardlearn/trunk/src/prj/net/sf/japi/cardlearn/Card.java
progs/cardlearn/trunk/src/prj/net/sf/japi/cardlearn/CardDatabaseConfig.java
tools/cstyle/trunk/src/prj/net/sf/japi/cstyle/ParseEvent.java
tools/string2bytes/trunk/src/prj/net/sf/japi/string2bytes/CodecStepsListModel.java
Modified: historic/trunk/src/app/net/sf/japi/swing/WindowsLookAndFeel.java
===================================================================
--- historic/trunk/src/app/net/sf/japi/swing/WindowsLookAndFeel.java 2008-12-28 15:27:01 UTC (rev 748)
+++ historic/trunk/src/app/net/sf/japi/swing/WindowsLookAndFeel.java 2008-12-28 16:16:40 UTC (rev 749)
@@ -27,6 +27,9 @@
@SuppressWarnings({"ClassNameSameAsAncestorName"})
public class WindowsLookAndFeel extends com.sun.java.swing.plaf.windows.WindowsLookAndFeel {
+ /** Serial version. */
+ private static final long serialVersionUID = 1L;
+
/** {@inheritDoc} */
@Override public void initialize() {
final String osVersion = System.getProperty("os.version");
Modified: historic/trunk/src/app/net/sf/japi/util/Service.java
===================================================================
--- historic/trunk/src/app/net/sf/japi/util/Service.java 2008-12-28 15:27:01 UTC (rev 748)
+++ historic/trunk/src/app/net/sf/japi/util/Service.java 2008-12-28 16:16:40 UTC (rev 749)
@@ -107,6 +107,9 @@
/** Exception thrown when Mustang is unavailable. */
private static class MustangUnavailableException extends Exception {
+
+ /** Serial version. */
+ private static final long serialVersionUID = 1L;
}
} // class Registry
Modified: libs/argparser/trunk/src/prj/net/sf/japi/io/args/ArgumentFileNotFoundException.java
===================================================================
--- libs/argparser/trunk/src/prj/net/sf/japi/io/args/ArgumentFileNotFoundException.java 2008-12-28 15:27:01 UTC (rev 748)
+++ libs/argparser/trunk/src/prj/net/sf/japi/io/args/ArgumentFileNotFoundException.java 2008-12-28 16:16:40 UTC (rev 749)
@@ -28,6 +28,9 @@
*/
public class ArgumentFileNotFoundException extends FileNotFoundException {
+ /** Serial version. */
+ private static final long serialVersionUID = 1L;
+
/** Create an ArgumentFileNotFoundException.
* @param cause The FileNotFoundException that caused this ArgumentFileNotFoundException.
*/
Modified: libs/argparser/trunk/src/prj/net/sf/japi/io/args/MissingArgumentException.java
===================================================================
--- libs/argparser/trunk/src/prj/net/sf/japi/io/args/MissingArgumentException.java 2008-12-28 15:27:01 UTC (rev 748)
+++ libs/argparser/trunk/src/prj/net/sf/japi/io/args/MissingArgumentException.java 2008-12-28 16:16:40 UTC (rev 749)
@@ -27,6 +27,9 @@
*/
public class MissingArgumentException extends Exception {
+ /** Serial version. */
+ private static final long serialVersionUID = 1L;
+
/** The option that was missing its argument.
* @serial include
*/
Modified: libs/argparser/trunk/src/prj/net/sf/japi/io/args/RequiredOptionsMissingException.java
===================================================================
--- libs/argparser/trunk/src/prj/net/sf/japi/io/args/RequiredOptionsMissingException.java 2008-12-28 15:27:01 UTC (rev 748)
+++ libs/argparser/trunk/src/prj/net/sf/japi/io/args/RequiredOptionsMissingException.java 2008-12-28 16:16:40 UTC (rev 749)
@@ -26,6 +26,9 @@
*/
public class RequiredOptionsMissingException extends Exception {
+ /** Serial version. */
+ private static final long serialVersionUID = 1L;
+
/** The list of options that were missing.
* @serial include
*/
Modified: libs/argparser/trunk/src/prj/net/sf/japi/io/args/TerminalException.java
===================================================================
--- libs/argparser/trunk/src/prj/net/sf/japi/io/args/TerminalException.java 2008-12-28 15:27:01 UTC (rev 748)
+++ libs/argparser/trunk/src/prj/net/sf/japi/io/args/TerminalException.java 2008-12-28 16:16:40 UTC (rev 749)
@@ -24,6 +24,9 @@
*/
public class TerminalException extends Exception {
+ /** Serial version. */
+ private static final long serialVersionUID = 1L;
+
/** The return code (eventually reported to the operating system in {@link System#exit(int)}).
* @serial include
*/
Modified: libs/argparser/trunk/src/prj/net/sf/japi/io/args/UnknownOptionException.java
===================================================================
--- libs/argparser/trunk/src/prj/net/sf/japi/io/args/UnknownOptionException.java 2008-12-28 15:27:01 UTC (rev 748)
+++ libs/argparser/trunk/src/prj/net/sf/japi/io/args/UnknownOptionException.java 2008-12-28 16:16:40 UTC (rev 749)
@@ -26,6 +26,9 @@
*/
public class UnknownOptionException extends Exception {
+ /** Serial version. */
+ private static final long serialVersionUID = 1L;
+
/** The list of options that were unknown.
* @serial include
*/
Modified: libs/argparser/trunk/src/prj/net/sf/japi/io/args/converter/NoConverterFoundException.java
===================================================================
--- libs/argparser/trunk/src/prj/net/sf/japi/io/args/converter/NoConverterFoundException.java 2008-12-28 15:27:01 UTC (rev 748)
+++ libs/argparser/trunk/src/prj/net/sf/japi/io/args/converter/NoConverterFoundException.java 2008-12-28 16:16:40 UTC (rev 749)
@@ -25,6 +25,9 @@
*/
public class NoConverterFoundException extends Exception {
+ /** Serial version. */
+ private static final long serialVersionUID = 1L;
+
/**
* The type for that no Converter was found.
* @serial include
Modified: libs/swing-action/trunk/src/prj/net/sf/japi/swing/DisposeAction.java
===================================================================
--- libs/swing-action/trunk/src/prj/net/sf/japi/swing/DisposeAction.java 2008-12-28 15:27:01 UTC (rev 748)
+++ libs/swing-action/trunk/src/prj/net/sf/japi/swing/DisposeAction.java 2008-12-28 16:16:40 UTC (rev 749)
@@ -42,6 +42,9 @@
*/
public final class DisposeAction extends AbstractAction {
+ /** Serial version. */
+ private static final long serialVersionUID = 1L;
+
/** The window to be disposed.
* @serial include
*/
Modified: libs/swing-action/trunk/src/prj/net/sf/japi/swing/NamedActionMap.java
===================================================================
--- libs/swing-action/trunk/src/prj/net/sf/japi/swing/NamedActionMap.java 2008-12-28 15:27:01 UTC (rev 748)
+++ libs/swing-action/trunk/src/prj/net/sf/japi/swing/NamedActionMap.java 2008-12-28 16:16:40 UTC (rev 749)
@@ -26,6 +26,9 @@
*/
public class NamedActionMap extends ActionMap {
+ /** Serial version. */
+ private static final long serialVersionUID = 1L;
+
/** The name.
* @serial include
*/
Modified: libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/Document.java
===================================================================
--- libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/Document.java 2008-12-28 15:27:01 UTC (rev 748)
+++ libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/Document.java 2008-12-28 16:16:40 UTC (rev 749)
@@ -1,6 +1,7 @@
package net.sf.japi.swing.app;
import java.awt.Component;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import javax.swing.event.EventListenerList;
@@ -14,8 +15,11 @@
* @param <D> The document type that is managed by the application.
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
*/
-public abstract class Document<D> {
+public abstract class Document<D> implements Serializable {
+ /** Serial version. */
+ private static final long serialVersionUID = 1L;
+
/** The frames of this document. */
private final List<DocumentFrame<D>> frames = new ArrayList<DocumentFrame<D>>();
Modified: libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/DocumentEvent.java
===================================================================
--- libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/DocumentEvent.java 2008-12-28 15:27:01 UTC (rev 748)
+++ libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/DocumentEvent.java 2008-12-28 16:16:40 UTC (rev 749)
@@ -9,6 +9,9 @@
*/
public class DocumentEvent<D> extends EventObject {
+ /** Serial version. */
+ private static final long serialVersionUID = 1L;
+
/** The type of this event. */
@NotNull private final DocumentEventType type;
Modified: libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/DocumentFrame.java
===================================================================
--- libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/DocumentFrame.java 2008-12-28 15:27:01 UTC (rev 748)
+++ libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/DocumentFrame.java 2008-12-28 16:16:40 UTC (rev 749)
@@ -20,6 +20,9 @@
/** The Action for activating this frame. */
private final Action windowAction = new AbstractAction() {
+ /** Serial version. */
+ private static final long serialVersionUID = 1L;
+
public void actionPerformed(final ActionEvent e) {
try {
setSelected(true);
Modified: libs/swing-bookmarks/trunk/src/prj/net/sf/japi/swing/bookmarks/BookmarkManager.java
===================================================================
--- libs/swing-bookmarks/trunk/src/prj/net/sf/japi/swing/bookmarks/BookmarkManager.java 2008-12-28 15:27:01 UTC (rev 748)
+++ libs/swing-bookmarks/trunk/src/prj/net/sf/japi/swing/bookmarks/BookmarkManager.java 2008-12-28 16:16:40 UTC (rev 749)
@@ -24,6 +24,7 @@
import java.awt.event.ActionEvent;
import java.io.File;
import java.io.IOException;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Enumeration;
@@ -74,8 +75,11 @@
* @todo fix bookmark drag and drop indices
* @todo think about serialization of Actions
*/
-public class BookmarkManager {
+public class BookmarkManager implements Serializable {
+ /** Serial version. */
+ private static final long serialVersionUID = 1L;
+
/** The Bookmarks. */
private BookmarkFolder bookmarks = new BookmarkFolder();
Modified: libs/swing-keyprefs/trunk/src/prj/net/sf/japi/swing/prefs/keys/ActionKeyDisplay.java
===================================================================
--- libs/swing-keyprefs/trunk/src/prj/net/sf/japi/swing/prefs/keys/ActionKeyDisplay.java 2008-12-28 15:27:01 UTC (rev 748)
+++ libs/swing-keyprefs/trunk/src/prj/net/sf/japi/swing/prefs/keys/ActionKeyDisplay.java 2008-12-28 16:16:40 UTC (rev 749)
@@ -121,6 +121,9 @@
*/
class ActionKeyAction extends AbstractAction {
+ /** Serial version. */
+ private static final long serialVersionUID = 1L;
+
/** The Action to be displayed. */
private Action action;
Modified: libs/swing-list/trunk/src/prj/net/sf/japi/swing/list/ArrayListModel.java
===================================================================
--- libs/swing-list/trunk/src/prj/net/sf/japi/swing/list/ArrayListModel.java 2008-12-28 15:27:01 UTC (rev 748)
+++ libs/swing-list/trunk/src/prj/net/sf/japi/swing/list/ArrayListModel.java 2008-12-28 16:16:40 UTC (rev 749)
@@ -31,6 +31,9 @@
*/
public class ArrayListModel<E> extends AbstractMutableListModel<E> {
+ /** Serial version. */
+ private static final long serialVersionUID = 1L;
+
/** The ArrayList that backs this ArrayListModel.
* @serial include
*/
Modified: libs/swing-misc/trunk/src/prj/net/sf/japi/swing/misc/CollectionsListModel.java
===================================================================
--- libs/swing-misc/trunk/src/prj/net/sf/japi/swing/misc/CollectionsListModel.java 2008-12-28 15:27:01 UTC (rev 748)
+++ libs/swing-misc/trunk/src/prj/net/sf/japi/swing/misc/CollectionsListModel.java 2008-12-28 16:16:40 UTC (rev 749)
@@ -32,6 +32,9 @@
*/
public class CollectionsListModel<E> extends AbstractListModel implements List<E> {
+ /** Serial version. */
+ private static final long serialVersionUID = 1L;
+
/** The list to delegate to.
* @serial include
*/
Modified: libs/swing-prefs/trunk/src/prj/net/sf/japi/swing/prefs/PreferencesGroup.java
===================================================================
--- libs/swing-prefs/trunk/src/prj/net/sf/japi/swing/prefs/PreferencesGroup.java 2008-12-28 15:27:01 UTC (rev 748)
+++ libs/swing-prefs/trunk/src/prj/net/sf/japi/swing/prefs/PreferencesGroup.java 2008-12-28 16:16:40 UTC (rev 749)
@@ -29,6 +29,9 @@
*/
public class PreferencesGroup extends AbstractListModel implements Iterable<Prefs> {
+ /** Serial version. */
+ private static final long serialVersionUID = 1L;
+
/** The preferences modules.
* @serial include
*/
Modified: libs/swing-treetable/trunk/src/prj/net/sf/japi/swing/treetable/JTreeTable.java
===================================================================
--- libs/swing-treetable/trunk/src/prj/net/sf/japi/swing/treetable/JTreeTable.java 2008-12-28 15:27:01 UTC (rev 748)
+++ libs/swing-treetable/trunk/src/prj/net/sf/japi/swing/treetable/JTreeTable.java 2008-12-28 16:16:40 UTC (rev 749)
@@ -55,6 +55,9 @@
// Force the JTable and JTree to share their row selection models.
tree.setSelectionModel(new DefaultTreeSelectionModel() {
+
+ /** Serial version. */
+ private static final long serialVersionUID = 1L;
{
setSelectionModel(listSelectionModel);
}
@@ -136,6 +139,9 @@
/** Editor for TreeTableCells. */
public class TreeTableCellEditor extends AbstractCellEditor implements TableCellEditor {
+ /** Serial Version. */
+ private static final long serialVersionUID = 1L;
+
/** {@inheritDoc} */
public Component getTableCellEditorComponent(final JTable table, final Object value, final boolean isSelected, final int row, final int column) {
return tree;
Modified: libs/swing-treetable/trunk/src/prj/net/sf/japi/swing/treetable/TreeTableModelTableModelAdapter.java
===================================================================
--- libs/swing-treetable/trunk/src/prj/net/sf/japi/swing/treetable/TreeTableModelTableModelAdapter.java 2008-12-28 15:27:01 UTC (rev 748)
+++ libs/swing-treetable/trunk/src/prj/net/sf/japi/swing/treetable/TreeTableModelTableModelAdapter.java 2008-12-28 16:16:40 UTC (rev 749)
@@ -30,6 +30,9 @@
*/
public class TreeTableModelTableModelAdapter extends AbstractTableModel {
+ /** Serial version. */
+ private static final long serialVersionUID = 1L;
+
/** The underlying JTree. */
private JTree tree;
Modified: progs/cardlearn/trunk/src/prj/net/sf/japi/cardlearn/Card.java
===================================================================
--- progs/cardlearn/trunk/src/prj/net/sf/japi/cardlearn/Card.java 2008-12-28 15:27:01 UTC (rev 748)
+++ progs/cardlearn/trunk/src/prj/net/sf/japi/cardlearn/Card.java 2008-12-28 16:16:40 UTC (rev 749)
@@ -8,6 +8,9 @@
*/
public class Card implements Serializable {
+ /** Serial version. */
+ private static final long serialVersionUID = 1L;
+
private final String[] fieldContents = new String[6];
public void setField(final int fieldIndex, final String fieldContent) {
Modified: progs/cardlearn/trunk/src/prj/net/sf/japi/cardlearn/CardDatabaseConfig.java
===================================================================
--- progs/cardlearn/trunk/src/prj/net/sf/japi/cardlearn/CardDatabaseConfig.java 2008-12-28 15:27:01 UTC (rev 748)
+++ progs/cardlearn/trunk/src/prj/net/sf/japi/cardlearn/CardDatabaseConfig.java 2008-12-28 16:16:40 UTC (rev 749)
@@ -7,6 +7,9 @@
*/
public class CardDatabaseConfig implements Serializable {
+ /** Serial version. */
+ private static final long serialVersionUID = 1L;
+
private String[] fieldNames = new String[6];
/** Creates a CardDatabaseConfig.
Modified: tools/cstyle/trunk/src/prj/net/sf/japi/cstyle/ParseEvent.java
===================================================================
--- tools/cstyle/trunk/src/prj/net/sf/japi/cstyle/ParseEvent.java 2008-12-28 15:27:01 UTC (rev 748)
+++ tools/cstyle/trunk/src/prj/net/sf/japi/cstyle/ParseEvent.java 2008-12-28 16:16:40 UTC (rev 749)
@@ -9,6 +9,9 @@
*/
public class ParseEvent extends EventObject {
+ /** Serial version. */
+ private static final long serialVersionUID = 1L;
+
/**
* Constructs a ParseEvent.
* @param source The Parser on which the Event initially occurred.
Modified: tools/string2bytes/trunk/src/prj/net/sf/japi/string2bytes/CodecStepsListModel.java
===================================================================
--- tools/string2bytes/trunk/src/prj/net/sf/japi/string2bytes/CodecStepsListModel.java 2008-12-28 15:27:01 UTC (rev 748)
+++ tools/string2bytes/trunk/src/prj/net/sf/japi/string2bytes/CodecStepsListModel.java 2008-12-28 16:16:40 UTC (rev 749)
@@ -30,6 +30,9 @@
*/
public class CodecStepsListModel extends DefaultListModel {
+ /** Serial version. */
+ private static final long serialVersionUID = 1L;
+
/** {@inheritDoc} */
@Override public void insertElementAt(@NotNull final Object object, final int i) {
if (!(object instanceof StringCodec)) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-12-28 19:32:01
|
Revision: 750
http://japi.svn.sourceforge.net/japi/?rev=750&view=rev
Author: christianhujer
Date: 2008-12-28 19:31:55 +0000 (Sun, 28 Dec 2008)
Log Message:
-----------
Fixed several I/O issues.
Modified Paths:
--------------
historic/trunk/src/app/net/sf/japi/cpp/CPreProcessor.java
historic/trunk/src/doc/guide/io/src/CatJAPI.java
historic/trunk/src/doc/guide/io/src/SortPlain.java
historic/trunk/src/doc/guide/io/src/UniqPlain.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
libs/argparser/trunk/src/prj/net/sf/japi/io/args/ArgParser.java
libs/argparser/trunk/src/prj/net/sf/japi/io/args/TokenReader.java
libs/argparser/trunk/src/prj/net/sf/japi/io/args/converter/OututStreamConverter.java
libs/io/trunk/src/prj/net/sf/japi/io/BRLineIterator.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/io/JTestSer.java
progs/jtype/trunk/src/prj/net/sf/japi/jtype/Helper.java
progs/textedit/trunk/src/prj/net/sf/japi/progs/textedit/TextEditApplication.java
tools/archStat/trunk/src/prj/net/sf/japi/archstat/ArchStat.java
tools/cstyle/trunk/src/prj/net/sf/japi/cstyle/CStyle.java
tools/jgrep/trunk/src/prj/net/sf/japi/tools/jgrep/JGrep.java
tools/mail/trunk/src/prj/net/sf/japi/tools/mail/Mail.java
tools/mail/trunk/src/prj/net/sf/japi/tools/mail/PingPongSession.java
tools/replacer/trunk/src/prj/net/sf/japi/tools/replacer/Replacer.java
tools/scriptInterpreter/trunk/src/prj/net/sf/japi/tools/si/ScriptInterpreter.java
tools/todoScanner/trunk/src/prj/net/sf/japi/tools/todoScanner/TodoScanner.java
Modified: historic/trunk/src/app/net/sf/japi/cpp/CPreProcessor.java
===================================================================
--- historic/trunk/src/app/net/sf/japi/cpp/CPreProcessor.java 2008-12-28 16:16:40 UTC (rev 749)
+++ historic/trunk/src/app/net/sf/japi/cpp/CPreProcessor.java 2008-12-28 19:31:55 UTC (rev 750)
@@ -126,7 +126,9 @@
private StringBuilder currentDirectiveArgs = new StringBuilder();
private Processor(final Reader inStream, final Writer outStream) throws IOException {
+ //noinspection IOResourceOpenedButNotSafelyClosed
in = inStream instanceof BufferedReader ? (BufferedReader) inStream : new BufferedReader(inStream);
+ //noinspection IOResourceOpenedButNotSafelyClosed
out = outStream instanceof PrintWriter ? (PrintWriter) outStream : new PrintWriter(outStream);
run();
out.flush();
@@ -205,6 +207,7 @@
}
public void process(final InputStream in, final OutputStream out) throws IOException {
+ //noinspection IOResourceOpenedButNotSafelyClosed
process(new InputStreamReader(in), new OutputStreamWriter(out));
}
Modified: historic/trunk/src/doc/guide/io/src/CatJAPI.java
===================================================================
--- historic/trunk/src/doc/guide/io/src/CatJAPI.java 2008-12-28 16:16:40 UTC (rev 749)
+++ historic/trunk/src/doc/guide/io/src/CatJAPI.java 2008-12-28 19:31:55 UTC (rev 750)
@@ -13,6 +13,7 @@
* @throws IOException in case of I/O problems.
*/
public static void main(final String... args) throws IOException {
+ //noinspection IOResourceOpenedButNotSafelyClosed
copy(new ARGVInputStream(args), out);
}
Modified: historic/trunk/src/doc/guide/io/src/SortPlain.java
===================================================================
--- historic/trunk/src/doc/guide/io/src/SortPlain.java 2008-12-28 16:16:40 UTC (rev 749)
+++ historic/trunk/src/doc/guide/io/src/SortPlain.java 2008-12-28 19:31:55 UTC (rev 750)
@@ -18,25 +18,29 @@
public static void main(final String... args) {
final List<String> lineList = new ArrayList<String>();
if (args.length == 0) {
- BufferedReader in = null;
try {
- in = new BufferedReader(new InputStreamReader(System.in));
- for (String line; (line = in.readLine()) != null; lineList.add(line));
+ final BufferedReader in = new BufferedReader(new InputStreamReader(System.in));
+ try {
+ for (String line; (line = in.readLine()) != null; lineList.add(line));
+ } catch (final IOException e) {
+ System.err.println(e);
+ } finally {
+ in.close();
+ }
} catch (final IOException e) {
System.err.println(e);
- } finally {
- try { in.close(); } catch (final Exception ignore) { /* ignore */ }
}
} else {
for (final String arg : args) {
- BufferedReader in = null;
try {
- in = new BufferedReader(new FileReader(arg));
- for (String line; (line = in.readLine()) != null; lineList.add(line));
+ final BufferedReader in = new BufferedReader(new FileReader(arg));
+ try {
+ for (String line; (line = in.readLine()) != null; lineList.add(line));
+ } finally {
+ in.close();
+ }
} catch (final IOException e) {
System.err.println(e);
- } finally {
- try { in.close(); } catch (final Exception ignore) { /* ignore */ }
}
}
}
Modified: historic/trunk/src/doc/guide/io/src/UniqPlain.java
===================================================================
--- historic/trunk/src/doc/guide/io/src/UniqPlain.java 2008-12-28 16:16:40 UTC (rev 749)
+++ historic/trunk/src/doc/guide/io/src/UniqPlain.java 2008-12-28 19:31:55 UTC (rev 750)
@@ -16,35 +16,37 @@
public static void main(final String... args) {
String prevLine = null;
if (args.length == 0) {
- BufferedReader in = null;
try {
- in = new BufferedReader(new InputStreamReader(System.in));
- for (String line; (line = in.readLine()) != null;) {
- if (!line.equals(prevLine)) {
- out.println(line);
+ final BufferedReader in = new BufferedReader(new InputStreamReader(System.in));
+ try {
+ for (String line; (line = in.readLine()) != null;) {
+ if (!line.equals(prevLine)) {
+ out.println(line);
+ }
+ prevLine = line;
}
- prevLine = line;
+ } finally {
+ in.close();
}
} catch (final IOException e) {
err.println(e);
- } finally {
- try { in.close(); } catch (final Exception ignore) { /* ignore */ }
}
} else {
for (final String arg : args) {
- BufferedReader in = null;
try {
- in = new BufferedReader(new FileReader(arg));
- for (String line; (line = in.readLine()) != null;) {
- if (!line.equals(prevLine)) {
- out.println(line);
+ BufferedReader in = new BufferedReader(new FileReader(arg));
+ try {
+ for (String line; (line = in.readLine()) != null;) {
+ if (!line.equals(prevLine)) {
+ out.println(line);
+ }
+ prevLine = line;
}
- prevLine = line;
+ } finally {
+ in.close();
}
} catch (final IOException e) {
err.println(e);
- } finally {
- try { in.close(); } catch (final Exception ignore) { /* ignore */ }
}
}
}
Modified: libs/argparser/trunk/src/doc/examples/Head.java
===================================================================
--- libs/argparser/trunk/src/doc/examples/Head.java 2008-12-28 16:16:40 UTC (rev 749)
+++ libs/argparser/trunk/src/doc/examples/Head.java 2008-12-28 19:31:55 UTC (rev 750)
@@ -131,6 +131,7 @@
* @throws IOException in case of I/O errors.
*/
private void copyBytes(@NotNull final InputStream in) throws IOException {
+ @SuppressWarnings({"IOResourceOpenedButNotSafelyClosed"})
final InputStream lin = in instanceof BufferedInputStream ? in : new BufferedInputStream(in);
final byte[] buf = new byte[numItems];
final int bytesRead = lin.read(buf, 0, numItems);
@@ -142,6 +143,7 @@
* @throws IOException in case of I/O errors.
*/
private void copyLines(@NotNull final InputStream in) throws IOException {
+ @SuppressWarnings({"IOResourceOpenedButNotSafelyClosed"})
final BufferedReader lin = new BufferedReader(new InputStreamReader(in));
String line;
for (int i = 0; i < numItems && (line = lin.readLine()) != null; i++) {
Modified: libs/argparser/trunk/src/doc/examples/Recode.java
===================================================================
--- libs/argparser/trunk/src/doc/examples/Recode.java 2008-12-28 16:16:40 UTC (rev 749)
+++ libs/argparser/trunk/src/doc/examples/Recode.java 2008-12-28 19:31:55 UTC (rev 750)
@@ -128,7 +128,9 @@
* @throws IOException In case of I/O problems.
*/
public void recode(final InputStream in, final OutputStream out) throws IOException {
+ @SuppressWarnings({"IOResourceOpenedButNotSafelyClosed"})
final Reader cin = new InputStreamReader(in, inputEncoding);
+ @SuppressWarnings({"IOResourceOpenedButNotSafelyClosed"})
final Writer cout = new OutputStreamWriter(out, outputEncoding);
final char[] buf = new char[BUF_SIZE];
//noinspection StatementWithEmptyBody
Modified: libs/argparser/trunk/src/doc/examples/Tail.java
===================================================================
--- libs/argparser/trunk/src/doc/examples/Tail.java 2008-12-28 16:16:40 UTC (rev 749)
+++ libs/argparser/trunk/src/doc/examples/Tail.java 2008-12-28 19:31:55 UTC (rev 750)
@@ -131,6 +131,7 @@
* @throws IOException in case of I/O errors.
*/
private void copyBytes(@NotNull final InputStream in) throws IOException {
+ @SuppressWarnings({"IOResourceOpenedButNotSafelyClosed"})
final InputStream lin = in instanceof BufferedInputStream ? in : new BufferedInputStream(in);
final byte[] buf = new byte[numItems];
int bytesRead;
@@ -150,6 +151,7 @@
*/
private void copyLines(@NotNull final InputStream in) throws IOException {
final String[] buf = new String[numItems];
+ @SuppressWarnings({"IOResourceOpenedButNotSafelyClosed"})
final BufferedReader lin = new BufferedReader(new InputStreamReader(in));
int num = 0;
//noinspection StatementWithEmptyBody
Modified: libs/argparser/trunk/src/doc/examples/Uniq.java
===================================================================
--- libs/argparser/trunk/src/doc/examples/Uniq.java 2008-12-28 16:16:40 UTC (rev 749)
+++ libs/argparser/trunk/src/doc/examples/Uniq.java 2008-12-28 19:31:55 UTC (rev 750)
@@ -89,6 +89,7 @@
* @throws IOException In case of I/O problems.
*/
private void uniq(@NotNull final InputStream in) throws IOException {
+ //noinspection IOResourceOpenedButNotSafelyClosed
uniq(new InputStreamReader(in));
}
@@ -97,6 +98,7 @@
* @throws IOException In case of I/O problems.
*/
private void uniq(@NotNull final Reader in) throws IOException {
+ //noinspection IOResourceOpenedButNotSafelyClosed
final BufferedReader bin = in instanceof BufferedReader ? (BufferedReader) in : new BufferedReader(in);
String previousLine = bin.readLine();
if (previousLine != null) {
Modified: libs/argparser/trunk/src/prj/net/sf/japi/io/args/ArgParser.java
===================================================================
--- libs/argparser/trunk/src/prj/net/sf/japi/io/args/ArgParser.java 2008-12-28 16:16:40 UTC (rev 749)
+++ libs/argparser/trunk/src/prj/net/sf/japi/io/args/ArgParser.java 2008-12-28 19:31:55 UTC (rev 750)
@@ -135,6 +135,7 @@
@NotNull public static List<String> readFromFile(@NotNull final File file) throws ArgumentFileNotFoundException {
final TokenReader in;
try {
+ //noinspection IOResourceOpenedButNotSafelyClosed
in = new TokenReader(new FileInputStream(file));
} catch (final FileNotFoundException e) {
throw new ArgumentFileNotFoundException(e);
Modified: libs/argparser/trunk/src/prj/net/sf/japi/io/args/TokenReader.java
===================================================================
--- libs/argparser/trunk/src/prj/net/sf/japi/io/args/TokenReader.java 2008-12-28 16:16:40 UTC (rev 749)
+++ libs/argparser/trunk/src/prj/net/sf/japi/io/args/TokenReader.java 2008-12-28 19:31:55 UTC (rev 750)
@@ -52,6 +52,7 @@
* @param in InputStream to read from.
*/
public TokenReader(@NotNull final InputStream in) {
+ //noinspection IOResourceOpenedButNotSafelyClosed
this.in = new InputStreamReader(in);
next = readNextToken();
}
Modified: libs/argparser/trunk/src/prj/net/sf/japi/io/args/converter/OututStreamConverter.java
===================================================================
--- libs/argparser/trunk/src/prj/net/sf/japi/io/args/converter/OututStreamConverter.java 2008-12-28 16:16:40 UTC (rev 749)
+++ libs/argparser/trunk/src/prj/net/sf/japi/io/args/converter/OututStreamConverter.java 2008-12-28 19:31:55 UTC (rev 750)
@@ -42,6 +42,7 @@
}
/** {@inheritDoc} */
+ @SuppressWarnings({"IOResourceOpenedButNotSafelyClosed"})
@NotNull public OutputStream convert(@NotNull final Locale locale, @NotNull final String arg) throws FileNotFoundException {
return "-".equals(arg) && !new File("-").exists() ? System.out : new FileOutputStream(arg);
}
Modified: libs/io/trunk/src/prj/net/sf/japi/io/BRLineIterator.java
===================================================================
--- libs/io/trunk/src/prj/net/sf/japi/io/BRLineIterator.java 2008-12-28 16:16:40 UTC (rev 749)
+++ libs/io/trunk/src/prj/net/sf/japi/io/BRLineIterator.java 2008-12-28 19:31:55 UTC (rev 750)
@@ -24,6 +24,7 @@
* @param in BufferedReader from which to return lines.
*/
public BRLineIterator(@NotNull final Reader in) {
+ //noinspection IOResourceOpenedButNotSafelyClosed
this.in = in instanceof BufferedReader ? (BufferedReader) in : new BufferedReader(in);
nextLine = readLine();
}
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 2008-12-28 16:16:40 UTC (rev 749)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/io/JTestSer.java 2008-12-28 19:31:55 UTC (rev 750)
@@ -26,7 +26,6 @@
import java.io.InputStream;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
-import java.io.OutputStream;
import java.net.URL;
import net.sf.japi.progs.jeduca.jtest.QuestionCollection;
import net.sf.japi.progs.jeduca.swing.io.Exporter;
@@ -78,9 +77,10 @@
*/
private QuestionCollection load(final InputStream in) throws IOException {
try {
+ //noinspection IOResourceOpenedButNotSafelyClosed
return (QuestionCollection) (new ObjectInputStream(in).readObject());
- } catch (ClassNotFoundException e) {
- throw new IOException("This isn't a serialized JTest file");
+ } catch (final ClassNotFoundException e) {
+ throw new IOException("This isn't a serialized JTest file", e);
}
}
@@ -90,12 +90,11 @@
* @throws IOException in case of I/O-problems
*/
public void save(final QuestionCollection col, final File f) throws IOException {
- final OutputStream fout = new FileOutputStream(f);
+ final ObjectOutputStream out = new ObjectOutputStream(new FileOutputStream(f));
try {
- final ObjectOutputStream out = new ObjectOutputStream(fout);
out.writeObject(col);
} finally {
- fout.close();
+ out.close();
}
}
Modified: progs/jtype/trunk/src/prj/net/sf/japi/jtype/Helper.java
===================================================================
--- progs/jtype/trunk/src/prj/net/sf/japi/jtype/Helper.java 2008-12-28 16:16:40 UTC (rev 749)
+++ progs/jtype/trunk/src/prj/net/sf/japi/jtype/Helper.java 2008-12-28 19:31:55 UTC (rev 750)
@@ -80,6 +80,7 @@
try {
final Process process = runtime.exec(command);
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; ) {
lines.add(line);
Modified: progs/textedit/trunk/src/prj/net/sf/japi/progs/textedit/TextEditApplication.java
===================================================================
--- progs/textedit/trunk/src/prj/net/sf/japi/progs/textedit/TextEditApplication.java 2008-12-28 16:16:40 UTC (rev 749)
+++ progs/textedit/trunk/src/prj/net/sf/japi/progs/textedit/TextEditApplication.java 2008-12-28 19:31:55 UTC (rev 750)
@@ -37,10 +37,13 @@
@Override
public void save(@NotNull final Document<PlainDocument> doc, @NotNull final String uri) throws Exception {
final Writer out = new BufferedWriter(new OutputStreamWriter(openUriForwriting(uri)));
- final PlainDocument data = doc.getData();
- out.write(data.getText(0, data.getLength()));
- out.flush();
- out.close();
+ try {
+ final PlainDocument data = doc.getData();
+ out.write(data.getText(0, data.getLength()));
+ out.flush();
+ } finally {
+ out.close();
+ }
}
/** {@inheritDoc} */
Modified: tools/archStat/trunk/src/prj/net/sf/japi/archstat/ArchStat.java
===================================================================
--- tools/archStat/trunk/src/prj/net/sf/japi/archstat/ArchStat.java 2008-12-28 16:16:40 UTC (rev 749)
+++ tools/archStat/trunk/src/prj/net/sf/japi/archstat/ArchStat.java 2008-12-28 19:31:55 UTC (rev 750)
@@ -112,10 +112,10 @@
*/
public static CharSequence readFile(final File file) throws IOException {
assert file.isFile();
+ final StringBuilder sb = new StringBuilder((int) file.length());
final BufferedReader in = new BufferedReader(new FileReader(file));
- final StringBuilder sb = new StringBuilder((int) file.length());
- final char[] buf = new char[BUF_SIZE];
try {
+ final char[] buf = new char[BUF_SIZE];
for (int charsRead; (charsRead = in.read(buf)) != -1; ) {
sb.append(buf, 0, charsRead);
}
Modified: tools/cstyle/trunk/src/prj/net/sf/japi/cstyle/CStyle.java
===================================================================
--- tools/cstyle/trunk/src/prj/net/sf/japi/cstyle/CStyle.java 2008-12-28 16:16:40 UTC (rev 749)
+++ tools/cstyle/trunk/src/prj/net/sf/japi/cstyle/CStyle.java 2008-12-28 19:31:55 UTC (rev 750)
@@ -108,6 +108,7 @@
* @throws IOException In case of I/O problems.
*/
public void check(@NotNull final InputStream stream) throws IOException {
+ @SuppressWarnings({"IOResourceOpenedButNotSafelyClosed"})
final Reader in = new BufferedReader(new InputStreamReader(stream, encoding));
check(in);
}
Modified: tools/jgrep/trunk/src/prj/net/sf/japi/tools/jgrep/JGrep.java
===================================================================
--- tools/jgrep/trunk/src/prj/net/sf/japi/tools/jgrep/JGrep.java 2008-12-28 16:16:40 UTC (rev 749)
+++ tools/jgrep/trunk/src/prj/net/sf/japi/tools/jgrep/JGrep.java 2008-12-28 19:31:55 UTC (rev 750)
@@ -201,6 +201,7 @@
* @throws IOException in case of I/O problems.
*/
public void grep(@NotNull final InputStream in, @Nullable final String currentFile) throws IOException {
+ //noinspection IOResourceOpenedButNotSafelyClosed
grep(new InputStreamReader(in, encoding), currentFile);
}
@@ -210,6 +211,7 @@
* @throws IOException in case of I/O problems.
*/
public void grep(@NotNull final Reader reader, @Nullable final String currentFile) throws IOException {
+ @SuppressWarnings({"IOResourceOpenedButNotSafelyClosed"})
final BufferedReader in = reader instanceof BufferedReader ? (BufferedReader) reader : new BufferedReader(reader);
int lineNumber = 0;
for (String line; (line = in.readLine()) != null; ) {
Modified: tools/mail/trunk/src/prj/net/sf/japi/tools/mail/Mail.java
===================================================================
--- tools/mail/trunk/src/prj/net/sf/japi/tools/mail/Mail.java 2008-12-28 16:16:40 UTC (rev 749)
+++ tools/mail/trunk/src/prj/net/sf/japi/tools/mail/Mail.java 2008-12-28 19:31:55 UTC (rev 750)
@@ -68,6 +68,7 @@
}
session.sendAndWait("DATA", "354");
if (msg == null) {
+ @SuppressWarnings({"IOResourceOpenedButNotSafelyClosed"})
final BufferedReader in = new BufferedReader(new InputStreamReader(System.in));
for (String line; (line = in.readLine()) != null && !".".equals(line);) {
session.send(line);
Modified: tools/mail/trunk/src/prj/net/sf/japi/tools/mail/PingPongSession.java
===================================================================
--- tools/mail/trunk/src/prj/net/sf/japi/tools/mail/PingPongSession.java 2008-12-28 16:16:40 UTC (rev 749)
+++ tools/mail/trunk/src/prj/net/sf/japi/tools/mail/PingPongSession.java 2008-12-28 19:31:55 UTC (rev 750)
@@ -68,6 +68,7 @@
* @throws IOException in case of I/O problems when connecting the streams of the socket.
*/
public PingPongSession(@NotNull final InputStream in, @NotNull final OutputStream out, @Nullable final Socket socket) throws IOException {
+ //noinspection IOResourceOpenedButNotSafelyClosed
this(new InputStreamReader(in, "ASCII"), new OutputStreamWriter(out, "ASCII"), socket);
}
@@ -77,7 +78,9 @@
* @param socket Socket to communicate with.
*/
public PingPongSession(@NotNull final Reader in, @NotNull final Writer out, @Nullable final Socket socket) {
+ //noinspection IOResourceOpenedButNotSafelyClosed
sin = in instanceof BufferedReader ? (BufferedReader) in : new BufferedReader(in);
+ //noinspection IOResourceOpenedButNotSafelyClosed
sout = new PrintWriter(out, true);
this.socket = socket;
}
Modified: tools/replacer/trunk/src/prj/net/sf/japi/tools/replacer/Replacer.java
===================================================================
--- tools/replacer/trunk/src/prj/net/sf/japi/tools/replacer/Replacer.java 2008-12-28 16:16:40 UTC (rev 749)
+++ tools/replacer/trunk/src/prj/net/sf/japi/tools/replacer/Replacer.java 2008-12-28 19:31:55 UTC (rev 750)
@@ -194,6 +194,7 @@
*/
@NotNull public CharSequence read(@NotNull final InputStream stream) throws IOException {
final StringBuilder sb = new StringBuilder();
+ @SuppressWarnings({"IOResourceOpenedButNotSafelyClosed"})
final Reader in = new InputStreamReader(stream instanceof BufferedInputStream ? stream : new BufferedInputStream(stream), encoding);
final char[] buf = new char[BUF_SIZE];
//noinspection NestedAssignment
Modified: tools/scriptInterpreter/trunk/src/prj/net/sf/japi/tools/si/ScriptInterpreter.java
===================================================================
--- tools/scriptInterpreter/trunk/src/prj/net/sf/japi/tools/si/ScriptInterpreter.java 2008-12-28 16:16:40 UTC (rev 749)
+++ tools/scriptInterpreter/trunk/src/prj/net/sf/japi/tools/si/ScriptInterpreter.java 2008-12-28 19:31:55 UTC (rev 750)
@@ -1,6 +1,7 @@
package net.sf.japi.tools.si;
import java.io.InputStreamReader;
+import java.io.IOException;
import java.util.List;
import java.util.TreeSet;
import java.util.Collection;
@@ -8,6 +9,7 @@
import javax.script.ScriptEngine;
import javax.script.ScriptEngineFactory;
import javax.script.ScriptEngineManager;
+import javax.script.ScriptException;
import net.sf.japi.io.args.ArgParser;
import net.sf.japi.io.args.BasicCommand;
import net.sf.japi.io.args.Option;
@@ -40,11 +42,16 @@
/** {@inheritDoc} */
@SuppressWarnings({"InstanceMethodNamingConvention"})
- public int run(@NotNull final List<String> args) throws Exception {
+ public int run(@NotNull final List<String> args) throws IOException, ScriptException {
final ScriptEngineManager sem = new ScriptEngineManager();
final ScriptEngine se = sem.getEngineByMimeType(mimeType);
se.getBindings(ScriptContext.ENGINE_SCOPE).put("cmd", this);
- se.eval(new InputStreamReader(System.in));
+ final InputStreamReader in = new InputStreamReader(System.in);
+ try {
+ se.eval(in);
+ } finally {
+ in.close();
+ }
return 0;
}
Modified: tools/todoScanner/trunk/src/prj/net/sf/japi/tools/todoScanner/TodoScanner.java
===================================================================
--- tools/todoScanner/trunk/src/prj/net/sf/japi/tools/todoScanner/TodoScanner.java 2008-12-28 16:16:40 UTC (rev 749)
+++ tools/todoScanner/trunk/src/prj/net/sf/japi/tools/todoScanner/TodoScanner.java 2008-12-28 19:31:55 UTC (rev 750)
@@ -59,6 +59,7 @@
* @throws IOException In case of I/O problems.
*/
public void scanForTodos(@NotNull final InputStream in) throws IOException {
+ //noinspection IOResourceOpenedButNotSafelyClosed
scanForTodos(new InputStreamReader(in, encoding));
}
@@ -67,6 +68,7 @@
* @throws IOException In case of I/O problems.
*/
public void scanForTodos(@NotNull final Reader cin) throws IOException {
+ @SuppressWarnings({"IOResourceOpenedButNotSafelyClosed"})
final BufferedReader in = cin instanceof BufferedReader ? (BufferedReader) cin : new BufferedReader(cin);
int lineNumber = 0;
for (String line; (line = in.readLine()) != null; lineNumber++) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-12-29 04:02:42
|
Revision: 756
http://japi.svn.sourceforge.net/japi/?rev=756&view=rev
Author: christianhujer
Date: 2008-12-29 04:02:35 +0000 (Mon, 29 Dec 2008)
Log Message:
-----------
Made all fields final that can be final.
Modified Paths:
--------------
historic/trunk/src/app/net/sf/japi/cpp/CPreProcessor.java
historic/trunk/src/app/net/sf/japi/sql/DatabaseTreeModel.java
historic/trunk/src/app/net/sf/japi/util/Table.java
historic/trunk/src/doc/guide/swing/action/basic/src/ex/Application.java
libs/argparser/trunk/src/prj/net/sf/japi/io/args/TokenReader.java
libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/RBMockCommand.java
libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/converter/AbstractConverterTest.java
libs/logging/trunk/src/prj/net/sf/japi/log/LoggerFactory.java
libs/midi/trunk/src/prj/net/sf/japi/midi/DeviceComparator.java
libs/swing-action/trunk/src/prj/net/sf/japi/swing/DefaultActionBuilder.java
libs/swing-action/trunk/src/prj/net/sf/japi/swing/DisposeAction.java
libs/swing-action/trunk/src/prj/net/sf/japi/swing/DummyActionBuilder.java
libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/AppLaunchCommand.java
libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/Application.java
libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/ApplicationQuitter.java
libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/Document.java
libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/DocumentEvent.java
libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/DocumentFrame.java
libs/swing-bookmarks/trunk/src/prj/net/sf/japi/swing/bookmarks/BookmarkManager.java
libs/swing-bookmarks/trunk/src/prj/net/sf/japi/swing/bookmarks/BookmarkTransferable.java
libs/swing-bookmarks/trunk/src/prj/net/sf/japi/swing/bookmarks/BookmarkTreeCellRenderer.java
libs/swing-extlib/trunk/src/prj/net/sf/japi/swing/ToolBarLayout.java
libs/swing-misc/trunk/src/prj/net/sf/japi/swing/misc/JSAXErrorHandler.java
libs/swing-prefs/trunk/src/prj/net/sf/japi/swing/prefs/PreferencesPane.java
libs/swing-prefs/trunk/src/tst/test/net/sf/japi/swing/prefs/MockPrefs.java
libs/swing-recent/trunk/src/prj/net/sf/japi/swing/recent/PrefsRecentURLs.java
libs/swing-tod/trunk/src/prj/net/sf/japi/swing/tod/TipOfTheDayManager.java
libs/swing-treetable/trunk/src/prj/net/sf/japi/swing/treetable/JTreeTable.java
libs/swing-treetable/trunk/src/prj/net/sf/japi/swing/treetable/TreeTableModelTableModelAdapter.java
libs/swing-treetable/trunk/src/prj/net/sf/japi/swing/treetable/TreeTableModelTreeModelAdapter.java
libs/util/trunk/src/prj/net/sf/japi/util/IteratorIterable.java
libs/util/trunk/src/prj/net/sf/japi/util/filter/NotFilter.java
progs/cardlearn/trunk/src/prj/net/sf/japi/cardlearn/CardDatabaseConfig.java
progs/cardlearn/trunk/src/prj/net/sf/japi/cardlearn/CardDatabaseConfigEditor.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/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/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/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/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/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/io/AbstractCachingImporter.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/io/IOModuleProvider.java
progs/jhexedit/trunk/src/prj/net/sf/japi/progs/jhexedit/HexEditPane.java
progs/jhexview/trunk/src/prj/net/sf/japi/progs/jhexview/HexViewPane.java
progs/jirus/trunk/src/prj/net/sf/jirus/MyReceiver.java
progs/jtype/trunk/src/prj/net/sf/japi/jtype/Helper.java
progs/jtype/trunk/src/prj/net/sf/japi/jtype/PerformancePane.java
tools/gdbControl/trunk/src/prj/net/sf/japi/tools/gdbcontrol/ComWithGdb.java
tools/keystrokes/trunk/src/prj/net/sf/japi/tools/keystrokes/KeyStrokes.java
tools/mail/trunk/src/prj/net/sf/japi/tools/mail/Mail.java
tools/prefsbrowser/trunk/src/prj/net/sf/japi/tools/prefsbrowser/PrefsBranchNode.java
tools/prefsbrowser/trunk/src/prj/net/sf/japi/tools/prefsbrowser/PrefsRootNode.java
tools/string2bytes/trunk/src/prj/net/sf/japi/string2bytes/CodecSelectionPanel.java
tools/todoScanner/trunk/src/prj/net/sf/japi/tools/todoScanner/TodoScanner.java
Modified: historic/trunk/src/app/net/sf/japi/cpp/CPreProcessor.java
===================================================================
--- historic/trunk/src/app/net/sf/japi/cpp/CPreProcessor.java 2008-12-28 23:30:05 UTC (rev 755)
+++ historic/trunk/src/app/net/sf/japi/cpp/CPreProcessor.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -66,7 +66,7 @@
private final Map<String, String> defines = new HashMap<String, String>();
/** Setting whether to strip comments. */
- private boolean stripComments = true;
+ private final boolean stripComments = true;
public CPreProcessor() {
}
@@ -122,8 +122,8 @@
private final Reader in;
private final Writer out;
private int c;
- private StringBuilder currentDirective = new StringBuilder();
- private StringBuilder currentDirectiveArgs = new StringBuilder();
+ private final StringBuilder currentDirective = new StringBuilder();
+ private final StringBuilder currentDirectiveArgs = new StringBuilder();
private Processor(final Reader inStream, final Writer outStream) throws IOException {
//noinspection IOResourceOpenedButNotSafelyClosed
Modified: historic/trunk/src/app/net/sf/japi/sql/DatabaseTreeModel.java
===================================================================
--- historic/trunk/src/app/net/sf/japi/sql/DatabaseTreeModel.java 2008-12-28 23:30:05 UTC (rev 755)
+++ historic/trunk/src/app/net/sf/japi/sql/DatabaseTreeModel.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -38,10 +38,10 @@
public class DatabaseTreeModel implements TreeModel {
/** The event listeners. */
- private EventListenerList listenerList = new EventListenerList();
+ private final EventListenerList listenerList = new EventListenerList();
/** The Database nodes in the tree. */
- private List<CatalogTreeNode> catalogs = new ArrayList<CatalogTreeNode>();
+ private final List<CatalogTreeNode> catalogs = new ArrayList<CatalogTreeNode>();
/** The Database Metadata of the database this treemodel reflects. */
private DatabaseMetaData databaseMetaData;
@@ -165,7 +165,7 @@
private String catalog;
/** The tables of this catalog. */
- private List<TableTreeNode> tables = new ArrayList<TableTreeNode>();
+ private final List<TableTreeNode> tables = new ArrayList<TableTreeNode>();
/** Create a CatalogTreeNode.
* @param catalog Catalog for which to create a CatalogTreeNode.
Modified: historic/trunk/src/app/net/sf/japi/util/Table.java
===================================================================
--- historic/trunk/src/app/net/sf/japi/util/Table.java 2008-12-28 23:30:05 UTC (rev 755)
+++ historic/trunk/src/app/net/sf/japi/util/Table.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -35,7 +35,7 @@
public class Table<T1,T2> {
/** The pairs of the table. */
- private Set<Pair<T1,T2>> pairs = new HashSet<Pair<T1,T2>>();
+ private final Set<Pair<T1,T2>> pairs = new HashSet<Pair<T1,T2>>();
/** Create a table. */
public Table() {
Modified: historic/trunk/src/doc/guide/swing/action/basic/src/ex/Application.java
===================================================================
--- historic/trunk/src/doc/guide/swing/action/basic/src/ex/Application.java 2008-12-28 23:30:05 UTC (rev 755)
+++ historic/trunk/src/doc/guide/swing/action/basic/src/ex/Application.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -12,7 +12,7 @@
public class Application extends WindowAdapter {
/** The application frame. */
- private JFrame frame;
+ private final JFrame frame;
/** Main program.
* @param args command line arguments (currently ignored)
@@ -22,7 +22,7 @@
new Application();
}
- private ActionBuilder actionBuilder = ActionBuilderFactory.getInstance().getActionBuilder("ex");
+ private final ActionBuilder actionBuilder = ActionBuilderFactory.getInstance().getActionBuilder("ex");
public Application() {
frame = new JFrame(actionBuilder.getString("appWindow.title"));
Modified: libs/argparser/trunk/src/prj/net/sf/japi/io/args/TokenReader.java
===================================================================
--- libs/argparser/trunk/src/prj/net/sf/japi/io/args/TokenReader.java 2008-12-28 23:30:05 UTC (rev 755)
+++ libs/argparser/trunk/src/prj/net/sf/japi/io/args/TokenReader.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -43,7 +43,7 @@
public class TokenReader implements Closeable, Iterable<String>, Iterator<String> {
/** Reader to read from. */
- @NotNull private Reader in;
+ @NotNull private final Reader in;
/** The next token. */
@Nullable private String next;
Modified: libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/RBMockCommand.java
===================================================================
--- libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/RBMockCommand.java 2008-12-28 23:30:05 UTC (rev 755)
+++ libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/RBMockCommand.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -31,7 +31,7 @@
public class RBMockCommand extends BasicCommand {
/** My own ResourceBundle. */
- private ResourceBundle myBundle = ResourceBundle.getBundle("test.net.sf.japi.io.args.RBMockCommandMyBundle");
+ private final ResourceBundle myBundle = ResourceBundle.getBundle("test.net.sf.japi.io.args.RBMockCommandMyBundle");
/** Whether to return its own ResourceBundle. */
private boolean returnOwnBundle;
Modified: libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/converter/AbstractConverterTest.java
===================================================================
--- libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/converter/AbstractConverterTest.java 2008-12-28 23:30:05 UTC (rev 755)
+++ libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/converter/AbstractConverterTest.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -35,10 +35,10 @@
public abstract class AbstractConverterTest<V, T extends Converter<V>> {
/** The target class. */
- private Class<V> targetClass;
+ private final Class<V> targetClass;
/** The converter testling. */
- private T converter;
+ private final T converter;
/**
* Create an AbstractConverterTest.
Modified: libs/logging/trunk/src/prj/net/sf/japi/log/LoggerFactory.java
===================================================================
--- libs/logging/trunk/src/prj/net/sf/japi/log/LoggerFactory.java 2008-12-28 23:30:05 UTC (rev 755)
+++ libs/logging/trunk/src/prj/net/sf/japi/log/LoggerFactory.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -41,7 +41,7 @@
* Key: logger name, as with {@link java.util.logging.LogManager#getLogger(String)}.
* Value: Logger associated with the Key
*/
- @NotNull private Map<String, Logger> loggers = new HashMap<String, Logger>();
+ @NotNull private final Map<String, Logger> loggers = new HashMap<String, Logger>();
/**
* Private Singleton Constructor.
Modified: libs/midi/trunk/src/prj/net/sf/japi/midi/DeviceComparator.java
===================================================================
--- libs/midi/trunk/src/prj/net/sf/japi/midi/DeviceComparator.java 2008-12-28 23:30:05 UTC (rev 755)
+++ libs/midi/trunk/src/prj/net/sf/japi/midi/DeviceComparator.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -13,7 +13,7 @@
private static final long serialVersionUID = 1L;
/** The convenient default instance. */
- private static Comparator<? super MidiDevice> instance = new DeviceComparator();
+ private static final Comparator<? super MidiDevice> instance = new DeviceComparator();
/** {@inheritDoc} */
public int compare(final MidiDevice o1, final MidiDevice o2) {
Modified: libs/swing-action/trunk/src/prj/net/sf/japi/swing/DefaultActionBuilder.java
===================================================================
--- libs/swing-action/trunk/src/prj/net/sf/japi/swing/DefaultActionBuilder.java 2008-12-28 23:30:05 UTC (rev 755)
+++ libs/swing-action/trunk/src/prj/net/sf/japi/swing/DefaultActionBuilder.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -81,7 +81,7 @@
@NotNull private final ActionMap actionMap = new NamedActionMap();
/** The action providers that were registered and will be queried when an action should be created / retrieved. */
- private List<ActionProvider> actionProviders = new ArrayList<ActionProvider>();
+ private final List<ActionProvider> actionProviders = new ArrayList<ActionProvider>();
/** Add a ResourceBundle to the list of used bundles.
* @param baseName the base name of the resource bundle, a fully qualified class name
Modified: libs/swing-action/trunk/src/prj/net/sf/japi/swing/DisposeAction.java
===================================================================
--- libs/swing-action/trunk/src/prj/net/sf/japi/swing/DisposeAction.java 2008-12-28 23:30:05 UTC (rev 755)
+++ libs/swing-action/trunk/src/prj/net/sf/japi/swing/DisposeAction.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -48,7 +48,7 @@
/** The window to be disposed.
* @serial include
*/
- private Window window;
+ private final Window window;
/** Install the DisposeAction to a JDialog for the ESCAPE key.
* For most users of this method, the return value is irrelevant and can be ignored.
Modified: libs/swing-action/trunk/src/prj/net/sf/japi/swing/DummyActionBuilder.java
===================================================================
--- libs/swing-action/trunk/src/prj/net/sf/japi/swing/DummyActionBuilder.java 2008-12-28 23:30:05 UTC (rev 755)
+++ libs/swing-action/trunk/src/prj/net/sf/japi/swing/DummyActionBuilder.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -45,7 +45,7 @@
/** The ActionMap.
* The DummyActionBuilder at least needs an ActionMap to fulfil the contract of ActionBuilder regarding nullability.
*/
- private ActionMap actionMap = new ActionMap();
+ private final ActionMap actionMap = new ActionMap();
/** {@inheritDoc} */
public void addBundle(@NotNull final String baseName) {
Modified: libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/AppLaunchCommand.java
===================================================================
--- libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/AppLaunchCommand.java 2008-12-28 23:30:05 UTC (rev 755)
+++ libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/AppLaunchCommand.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -15,7 +15,7 @@
@Nullable private final Class<? extends Application<?>> appClass;
/** The Application. */
- @Nullable private Application<?> application;
+ @Nullable private final Application<?> application;
/** Creates an AppLaunchCommand.
* @param appClass Application Class to launch.
Modified: libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/Application.java
===================================================================
--- libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/Application.java 2008-12-28 23:30:05 UTC (rev 755)
+++ libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/Application.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -40,22 +40,22 @@
public abstract class Application<D> implements CanLoad<D>, InternalFrameListener, DocumentListener<D> {
/** The application frame. */
- @NotNull private JFrame appFrame;
+ @NotNull private final JFrame appFrame;
/** The ActionBuilder. */
@NotNull private final ActionBuilder actionBuilder;
/** Whether or not to ask the user before quitting. */
- private boolean askForQuit = true;
+ private final boolean askForQuit = true;
/** The About Dialog. */
private AboutDialog aboutDialog = null; // lazy
/** The file chooser for loading and saving. */
- private JFileChooser fileChooser;
+ private final JFileChooser fileChooser;
/** The MDI handler. */
- private JDesktopPane desktop;
+ private final JDesktopPane desktop;
/** The current document frame. */
@Nullable private DocumentFrame<D> currentDocumentFrame = null;
Modified: libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/ApplicationQuitter.java
===================================================================
--- libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/ApplicationQuitter.java 2008-12-28 23:30:05 UTC (rev 755)
+++ libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/ApplicationQuitter.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -11,7 +11,7 @@
class ApplicationQuitter<D> extends WindowAdapter {
/** Application to quit. */
- @NotNull private Application<D> application;
+ @NotNull private final Application<D> application;
/** Creates an ApplicationQuitter.
* @param application Application to quit when its window is closing.
Modified: libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/Document.java
===================================================================
--- libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/Document.java 2008-12-28 23:30:05 UTC (rev 755)
+++ libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/Document.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -27,7 +27,7 @@
private final EventListenerList listenerList = new EventListenerList();
/** The data of this Document. */
- @NotNull private D data;
+ @NotNull private final D data;
/** The URI of this document. */
@Nullable private String uri;
Modified: libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/DocumentEvent.java
===================================================================
--- libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/DocumentEvent.java 2008-12-28 23:30:05 UTC (rev 755)
+++ libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/DocumentEvent.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -16,7 +16,7 @@
@NotNull private final DocumentEventType type;
/** The source of this event. */
- private Document<D> source;
+ private final Document<D> source;
/** Constructs a DocumentEvent.
* @param source The Document on which the Event initially occurred.
Modified: libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/DocumentFrame.java
===================================================================
--- libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/DocumentFrame.java 2008-12-28 23:30:05 UTC (rev 755)
+++ libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/DocumentFrame.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -15,7 +15,7 @@
class DocumentFrame<D> extends JInternalFrame {
/** The document of this DocumentFrame. */
- @NotNull private Document<D> document;
+ @NotNull private final Document<D> document;
/** The Action for activating this frame. */
private final Action windowAction = new AbstractAction() {
Modified: libs/swing-bookmarks/trunk/src/prj/net/sf/japi/swing/bookmarks/BookmarkManager.java
===================================================================
--- libs/swing-bookmarks/trunk/src/prj/net/sf/japi/swing/bookmarks/BookmarkManager.java 2008-12-28 23:30:05 UTC (rev 755)
+++ libs/swing-bookmarks/trunk/src/prj/net/sf/japi/swing/bookmarks/BookmarkManager.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -87,7 +87,7 @@
private static final ActionBuilder ACTION_BUILDER = ActionBuilderFactory.getInstance().getActionBuilder("net.sf.japi.swing.bookmarks");
/** The ProgramFrame this BookmarkManager manages bookmarks for. */
- private Bookmarkable bookmarkable;
+ private final Bookmarkable bookmarkable;
/** Create a new BookmarkManager.
* @param bookmarkable The bookmarkable to use for this BookmarkManager.
@@ -190,7 +190,7 @@
/** Action for managing the bookmarks.
* @serial include
*/
- private Action manageBookmarks = ACTION_BUILDER.createAction(true, "manageBookmarks", this);
+ private final Action manageBookmarks = ACTION_BUILDER.createAction(true, "manageBookmarks", this);
/** Action for managing the bookmarks. */
public void manageBookmarks() {
@@ -549,12 +549,12 @@
/** The bookmarks in this folder.
* @serial include
*/
- private List<Bookmark> bookmarks = new ArrayList<Bookmark>();
+ private final List<Bookmark> bookmarks = new ArrayList<Bookmark>();
/** The Menus created for this folder.
* @serial include
*/
- private List<JMenu> menus = new ArrayList<JMenu>();
+ private final List<JMenu> menus = new ArrayList<JMenu>();
/** Create a BookmarkFolder without a title.
* This should only be used for the basic BookmarkFolder containing all other BookmarkItems and BookmarkFolders.
@@ -706,12 +706,12 @@
/** Action for adding a bookmark.
* @serial include
*/
- private Action addBookmark = ACTION_BUILDER.createAction(true, "addBookmark", this);
+ private final Action addBookmark = ACTION_BUILDER.createAction(true, "addBookmark", this);
/** Action for creating a new bookmark folder.
* @serial include
*/
- private Action newBookmarkFolder = ACTION_BUILDER.createAction(true, "newBookmarkFolder", this);
+ private final Action newBookmarkFolder = ACTION_BUILDER.createAction(true, "newBookmarkFolder", this);
/** Add a bookmark for the currently selected Question from the currently selected QuestionCollection . */
public void addBookmark() {
Modified: libs/swing-bookmarks/trunk/src/prj/net/sf/japi/swing/bookmarks/BookmarkTransferable.java
===================================================================
--- libs/swing-bookmarks/trunk/src/prj/net/sf/japi/swing/bookmarks/BookmarkTransferable.java 2008-12-28 23:30:05 UTC (rev 755)
+++ libs/swing-bookmarks/trunk/src/prj/net/sf/japi/swing/bookmarks/BookmarkTransferable.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -42,7 +42,7 @@
}
/** Supported DataFlavors. */
- private static DataFlavor[] flavors = {BOOKMARK_DATA_FLAVOR};
+ private static final DataFlavor[] flavors = {BOOKMARK_DATA_FLAVOR};
/** Bookmark to be transferred. */
private final BookmarkManager.Bookmark bookmark;
@@ -61,7 +61,7 @@
/** {@inheritDoc} */
public DataFlavor[] getTransferDataFlavors() {
- return flavors;
+ return flavors.clone();
}
/** {@inheritDoc} */
Modified: libs/swing-bookmarks/trunk/src/prj/net/sf/japi/swing/bookmarks/BookmarkTreeCellRenderer.java
===================================================================
--- libs/swing-bookmarks/trunk/src/prj/net/sf/japi/swing/bookmarks/BookmarkTreeCellRenderer.java 2008-12-28 23:30:05 UTC (rev 755)
+++ libs/swing-bookmarks/trunk/src/prj/net/sf/japi/swing/bookmarks/BookmarkTreeCellRenderer.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -36,7 +36,7 @@
/** JSeparator.
* @serial include
*/
- private JSeparator sep = new JSeparator();
+ private final JSeparator sep = new JSeparator();
/** {@inheritDoc} */
@Override public Component getTreeCellRendererComponent(final JTree tree, final Object value, final boolean sel, final boolean expanded, final boolean leaf, final int row, final boolean hasFocus) {
Modified: libs/swing-extlib/trunk/src/prj/net/sf/japi/swing/ToolBarLayout.java
===================================================================
--- libs/swing-extlib/trunk/src/prj/net/sf/japi/swing/ToolBarLayout.java 2008-12-28 23:30:05 UTC (rev 755)
+++ libs/swing-extlib/trunk/src/prj/net/sf/japi/swing/ToolBarLayout.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -90,22 +90,22 @@
/** Components in the north region.
* @serial include
*/
- private List<Component> north = new ArrayList<Component>();
+ private final List<Component> north = new ArrayList<Component>();
/** Components in the south region.
* @serial include
*/
- private List<Component> south = new ArrayList<Component>();
+ private final List<Component> south = new ArrayList<Component>();
/** Components in the east region.
* @serial include
*/
- private List<Component> east = new ArrayList<Component>();
+ private final List<Component> east = new ArrayList<Component>();
/** Components in the west region.
* @serial include
*/
- private List<Component> west = new ArrayList<Component>();
+ private final List<Component> west = new ArrayList<Component>();
/** Component in the center region.
* @serial include
Modified: libs/swing-misc/trunk/src/prj/net/sf/japi/swing/misc/JSAXErrorHandler.java
===================================================================
--- libs/swing-misc/trunk/src/prj/net/sf/japi/swing/misc/JSAXErrorHandler.java 2008-12-28 23:30:05 UTC (rev 755)
+++ libs/swing-misc/trunk/src/prj/net/sf/japi/swing/misc/JSAXErrorHandler.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -43,7 +43,7 @@
/** The JTextArea which displays the errors.
* @serial include
*/
- private JTextArea errorPane = new JTextArea();
+ private final JTextArea errorPane = new JTextArea();
/** The Dialog.
* @serial include
@@ -58,7 +58,7 @@
/** Button for closing.
* @serial include
*/
- private JButton closeButton;
+ private final JButton closeButton;
/** Create a JSAXErrorHandler.
* @param parent Parent component to display on.
Modified: libs/swing-prefs/trunk/src/prj/net/sf/japi/swing/prefs/PreferencesPane.java
===================================================================
--- libs/swing-prefs/trunk/src/prj/net/sf/japi/swing/prefs/PreferencesPane.java 2008-12-28 23:30:05 UTC (rev 755)
+++ libs/swing-prefs/trunk/src/prj/net/sf/japi/swing/prefs/PreferencesPane.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -274,7 +274,7 @@
/** The border.
* For some reason it gets lost when set in the initializer, so we store it and set it each time the renderer is used.
*/
- private Border border = createEmptyBorder(10, 10, 10, 10);
+ private final Border border = createEmptyBorder(10, 10, 10, 10);
/** Create a PrefsListCellRenderer. */
PrefsListCellRenderer() {
Modified: libs/swing-prefs/trunk/src/tst/test/net/sf/japi/swing/prefs/MockPrefs.java
===================================================================
--- libs/swing-prefs/trunk/src/tst/test/net/sf/japi/swing/prefs/MockPrefs.java 2008-12-28 23:30:05 UTC (rev 755)
+++ libs/swing-prefs/trunk/src/tst/test/net/sf/japi/swing/prefs/MockPrefs.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -36,7 +36,7 @@
private final Map<String, int[]> invocationCounter = new HashMap<String, int[]>();
/** The Textfield for changes. */
- private JTextField textfield = new JTextField();
+ private final JTextField textfield = new JTextField();
/** The text for changes. */
private String text = "";
Modified: libs/swing-recent/trunk/src/prj/net/sf/japi/swing/recent/PrefsRecentURLs.java
===================================================================
--- libs/swing-recent/trunk/src/prj/net/sf/japi/swing/recent/PrefsRecentURLs.java 2008-12-28 23:30:05 UTC (rev 755)
+++ libs/swing-recent/trunk/src/prj/net/sf/japi/swing/recent/PrefsRecentURLs.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -38,13 +38,13 @@
private int maxLastOpened;
/** List with recently opened files. */
- private List<String> recentlyOpenedURLs = new ArrayList<String>();
+ private final List<String> recentlyOpenedURLs = new ArrayList<String>();
/** List with listeners. */
- private EventListenerList listeners = new EventListenerList();
+ private final EventListenerList listeners = new EventListenerList();
/** The Preferences to manage the recent URLs in. */
- private Preferences prefs;
+ private final Preferences prefs;
/** The PrefsRecentURls. */
private static final Map<Class<?>,PrefsRecentURLs> instances = new WeakHashMap<Class<?>,PrefsRecentURLs>();
Modified: libs/swing-tod/trunk/src/prj/net/sf/japi/swing/tod/TipOfTheDayManager.java
===================================================================
--- libs/swing-tod/trunk/src/prj/net/sf/japi/swing/tod/TipOfTheDayManager.java 2008-12-28 23:30:05 UTC (rev 755)
+++ libs/swing-tod/trunk/src/prj/net/sf/japi/swing/tod/TipOfTheDayManager.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -114,16 +114,16 @@
@Nullable private JDialog dialog;
/** JCheckBox for showing at startup. */
- @NotNull private JCheckBox showAtStartup = new JCheckBox(ACTION_BUILDER.createAction(false, "todShowAtStartup", null));
+ @NotNull private final JCheckBox showAtStartup = new JCheckBox(ACTION_BUILDER.createAction(false, "todShowAtStartup", null));
/** The JLabel showing th...
[truncated message content] |
|
From: <chr...@us...> - 2008-12-29 04:44:06
|
Revision: 763
http://japi.svn.sourceforge.net/japi/?rev=763&view=rev
Author: christianhujer
Date: 2008-12-29 04:44:02 +0000 (Mon, 29 Dec 2008)
Log Message:
-----------
Removed unnecessary parenthesis.
Modified Paths:
--------------
historic/trunk/src/app/net/sf/japi/finance/SimpleCapitalCalculator.java
libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/Application.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/util/StringToTextComparatorAdapter.java
tools/gdbControl/trunk/src/prj/net/sf/japi/tools/gdbcontrol/ComWithGdb.java
tools/keystrokes/trunk/src/prj/net/sf/japi/tools/keystrokes/KeyStrokes.java
tools/mail/trunk/src/prj/net/sf/japi/tools/mail/PingPongSession.java
tools/replacer/trunk/src/prj/net/sf/japi/tools/replacer/LineIterator.java
Modified: historic/trunk/src/app/net/sf/japi/finance/SimpleCapitalCalculator.java
===================================================================
--- historic/trunk/src/app/net/sf/japi/finance/SimpleCapitalCalculator.java 2008-12-29 04:42:24 UTC (rev 762)
+++ historic/trunk/src/app/net/sf/japi/finance/SimpleCapitalCalculator.java 2008-12-29 04:44:02 UTC (rev 763)
@@ -48,7 +48,7 @@
if ( numberOfPeriods == 0 ) {
return initialCapital;
}
- currentCapital = numberOfPeriods == 1 ? initialCapital * (1 + interestRate / 100) : initialCapital * Math.pow((1 + interestRate / 100), numberOfPeriods);
+ currentCapital = numberOfPeriods == 1 ? initialCapital * (1 + interestRate / 100) : initialCapital * Math.pow(1 + interestRate / 100, numberOfPeriods);
return currentCapital;
}
Modified: libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/Application.java
===================================================================
--- libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/Application.java 2008-12-29 04:42:24 UTC (rev 762)
+++ libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/Application.java 2008-12-29 04:44:02 UTC (rev 763)
@@ -396,7 +396,7 @@
}
public void internalFrameActivated(final InternalFrameEvent e) {
- setActiveDocumentImpl(((DocumentFrame<D>) e.getInternalFrame()));
+ setActiveDocumentImpl((DocumentFrame<D>) e.getInternalFrame());
}
public void internalFrameDeactivated(final InternalFrameEvent e) {
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 2008-12-29 04:42:24 UTC (rev 762)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/io/JTestSer.java 2008-12-29 04:44:02 UTC (rev 763)
@@ -78,7 +78,7 @@
private QuestionCollection load(final InputStream in) throws IOException {
try {
//noinspection IOResourceOpenedButNotSafelyClosed
- return (QuestionCollection) (new ObjectInputStream(in).readObject());
+ return (QuestionCollection) new ObjectInputStream(in).readObject();
} catch (final ClassNotFoundException e) {
throw new IOException("This isn't a serialized JTest file", e);
}
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/util/StringToTextComparatorAdapter.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/util/StringToTextComparatorAdapter.java 2008-12-29 04:42:24 UTC (rev 762)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/util/StringToTextComparatorAdapter.java 2008-12-29 04:44:02 UTC (rev 763)
@@ -69,7 +69,7 @@
/** {@inheritDoc} */
@Override public boolean equals(final Object obj) {
- if ((obj == null) || !(obj instanceof StringToTextComparatorAdapter)) {
+ if (obj == null || !(obj instanceof StringToTextComparatorAdapter)) {
return false;
}
final StringToTextComparatorAdapter a = (StringToTextComparatorAdapter) obj;
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 2008-12-29 04:42:24 UTC (rev 762)
+++ tools/gdbControl/trunk/src/prj/net/sf/japi/tools/gdbcontrol/ComWithGdb.java 2008-12-29 04:44:02 UTC (rev 763)
@@ -87,7 +87,7 @@
for (int c; (c = gdbIn.read()) != -1;) {
stdOut.write(c);
collector.write(c);
- if ((c == text.charAt(match)) || (c == text.charAt(match = 0))) {
+ if (c == text.charAt(match) || c == text.charAt(match = 0)) {
match++;
if (match == text.length()) {
return collector.toString(encoding);
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 2008-12-29 04:42:24 UTC (rev 762)
+++ tools/keystrokes/trunk/src/prj/net/sf/japi/tools/keystrokes/KeyStrokes.java 2008-12-29 04:44:02 UTC (rev 763)
@@ -166,7 +166,7 @@
history.append(format.format(new Date(event.getWhen())));
history.append(": ");
history.append(keyStrokeText);
- history.append("(" + ((int) event.getKeyChar()) + " " + event.getKeyCode() + " " + event.getKeyLocation() + ")");
+ history.append("(" + (int) event.getKeyChar() + " " + event.getKeyCode() + " " + event.getKeyLocation() + ")");
history.append("\n");
history.setEditable(false);
}
Modified: tools/mail/trunk/src/prj/net/sf/japi/tools/mail/PingPongSession.java
===================================================================
--- tools/mail/trunk/src/prj/net/sf/japi/tools/mail/PingPongSession.java 2008-12-29 04:42:24 UTC (rev 762)
+++ tools/mail/trunk/src/prj/net/sf/japi/tools/mail/PingPongSession.java 2008-12-29 04:44:02 UTC (rev 763)
@@ -134,7 +134,7 @@
if (debug && line != null) {
err.println("< " + line);
}
- } while ((line != null) && (line.startsWith(returnCode + "-")));
+ } while (line != null && line.startsWith(returnCode + "-"));
if (line == null) {
if (debug) {
err.println("< <EOF>");
Modified: tools/replacer/trunk/src/prj/net/sf/japi/tools/replacer/LineIterator.java
===================================================================
--- tools/replacer/trunk/src/prj/net/sf/japi/tools/replacer/LineIterator.java 2008-12-29 04:42:24 UTC (rev 762)
+++ tools/replacer/trunk/src/prj/net/sf/japi/tools/replacer/LineIterator.java 2008-12-29 04:44:02 UTC (rev 763)
@@ -100,7 +100,7 @@
c == LINE_FEED ||
// CARRIAGE_RETURN only already terminates a line if it is standalone.
// If it is immediately followed by a LINE_FEED, that line feed will terminate the line in the next invocation.
- (c == CARRIAGE_RETURN && (end == text.length() || text.charAt(end) != LINE_FEED)) ||
+ c == CARRIAGE_RETURN && (end == text.length() || text.charAt(end) != LINE_FEED) ||
c == NEXT_LINE ||
c == LINE_SEPARATOR ||
c == PARAGRAPH_SEPARATOR;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2009-02-01 17:38:41
|
Revision: 786
http://japi.svn.sourceforge.net/japi/?rev=786&view=rev
Author: christianhujer
Date: 2009-02-01 17:38:36 +0000 (Sun, 01 Feb 2009)
Log Message:
-----------
Updated module settings namespacing.
Modified Paths:
--------------
libs/argparser/trunk/module.properties
libs/io/trunk/module.properties
libs/lang/trunk/module.properties
libs/logging/trunk/module.properties
libs/midi/trunk/module.properties
libs/net/trunk/module.properties
libs/registry/trunk/module.properties
libs/swing-about/trunk/module.properties
libs/swing-action/trunk/module.properties
libs/swing-app/trunk/module.properties
libs/swing-bookmarks/trunk/module.properties
libs/swing-extlib/trunk/module.properties
libs/swing-font/trunk/module.properties
libs/swing-keyprefs/trunk/module.properties
libs/swing-list/trunk/module.properties
libs/swing-misc/trunk/module.properties
libs/swing-prefs/trunk/module.properties
libs/swing-proxyprefs/trunk/module.properties
libs/swing-recent/trunk/module.properties
libs/swing-tod/trunk/module.properties
libs/swing-treetable/trunk/module.properties
libs/taglets/trunk/module.properties
libs/util/trunk/module.properties
libs/xml/trunk/module.properties
tools/archStat/trunk/build.xml
tools/cstyle/trunk/build.xml
tools/dircount/trunk/build.xml
tools/findLongestPath/trunk/build.xml
tools/fontbrowser/trunk/build.xml
tools/gdbControl/trunk/build.xml
tools/gdbControl/trunk/module.properties
tools/jgrep/trunk/build.xml
tools/jwget/trunk/build.xml
tools/keystrokes/trunk/build.xml
tools/mail/trunk/build.xml
tools/prefsbrowser/trunk/build.xml
tools/replacer/trunk/build.xml
tools/replacer/trunk/module.properties
tools/scriptInterpreter/trunk/build.xml
tools/string2bytes/trunk/build.xml
tools/todoScanner/trunk/build.xml
tools/todoScanner/trunk/module.properties
Modified: libs/argparser/trunk/module.properties
===================================================================
--- libs/argparser/trunk/module.properties 2009-02-01 16:28:43 UTC (rev 785)
+++ libs/argparser/trunk/module.properties 2009-02-01 17:38:36 UTC (rev 786)
@@ -18,8 +18,8 @@
#
update.focus=none
-module.name=japi-lib-argparser
-module.shortname=argparser
-module.title=ArgParser
-module.package=net.sf.japi.io.args
-module.package.path=net/sf/japi/io/args/
+name=japi-lib-argparser
+shortname=argparser
+title=ArgParser
+package=net.sf.japi.io.args
+package.path=net/sf/japi/io/args/
Modified: libs/io/trunk/module.properties
===================================================================
--- libs/io/trunk/module.properties 2009-02-01 16:28:43 UTC (rev 785)
+++ libs/io/trunk/module.properties 2009-02-01 17:38:36 UTC (rev 786)
@@ -18,6 +18,6 @@
#
update.focus=none
-module.name=japi-lib-io
-module.shortname=io
-module.title=IO
+name=japi-lib-io
+shortname=io
+title=IO
Modified: libs/lang/trunk/module.properties
===================================================================
--- libs/lang/trunk/module.properties 2009-02-01 16:28:43 UTC (rev 785)
+++ libs/lang/trunk/module.properties 2009-02-01 17:38:36 UTC (rev 786)
@@ -18,6 +18,6 @@
#
update.focus=none
-module.name=japi-lib-lang
-module.shortname=lang
-module.title=Lang
+name=japi-lib-lang
+shortname=lang
+title=Lang
Modified: libs/logging/trunk/module.properties
===================================================================
--- libs/logging/trunk/module.properties 2009-02-01 16:28:43 UTC (rev 785)
+++ libs/logging/trunk/module.properties 2009-02-01 17:38:36 UTC (rev 786)
@@ -18,6 +18,6 @@
#
update.focus=none
-module.name=japi-lib-logging
-module.shortname=logging
-module.title=Logging
+name=japi-lib-logging
+shortname=logging
+title=Logging
Modified: libs/midi/trunk/module.properties
===================================================================
--- libs/midi/trunk/module.properties 2009-02-01 16:28:43 UTC (rev 785)
+++ libs/midi/trunk/module.properties 2009-02-01 17:38:36 UTC (rev 786)
@@ -18,8 +18,8 @@
#
update.focus=none
-module.name=japi-lib-midi
-module.shortname=midi
-module.title=Midi
-module.package=net.sf.japi.midi
-module.package.path=net/sf/japi/midi/
+name=japi-lib-midi
+shortname=midi
+title=Midi
+package=net.sf.japi.midi
+package.path=net/sf/japi/midi/
Modified: libs/net/trunk/module.properties
===================================================================
--- libs/net/trunk/module.properties 2009-02-01 16:28:43 UTC (rev 785)
+++ libs/net/trunk/module.properties 2009-02-01 17:38:36 UTC (rev 786)
@@ -18,6 +18,6 @@
#
update.focus=none
-module.name=japi-lib-net
-module.shortname=net
-module.title=Net
+name=japi-lib-net
+shortname=net
+title=Net
Modified: libs/registry/trunk/module.properties
===================================================================
--- libs/registry/trunk/module.properties 2009-02-01 16:28:43 UTC (rev 785)
+++ libs/registry/trunk/module.properties 2009-02-01 17:38:36 UTC (rev 786)
@@ -18,6 +18,6 @@
#
update.focus=none
-module.name=japi-lib-registry
-module.shortname=registry
-module.title=Registry
+name=japi-lib-registry
+shortname=registry
+title=Registry
Modified: libs/swing-about/trunk/module.properties
===================================================================
--- libs/swing-about/trunk/module.properties 2009-02-01 16:28:43 UTC (rev 785)
+++ libs/swing-about/trunk/module.properties 2009-02-01 17:38:36 UTC (rev 786)
@@ -18,6 +18,6 @@
#
update.focus=none
-module.name=japi-lib-swing-about
-module.shortname=swing-about
-module.title=SwingAbout
+name=japi-lib-swing-about
+shortname=swing-about
+title=SwingAbout
Modified: libs/swing-action/trunk/module.properties
===================================================================
--- libs/swing-action/trunk/module.properties 2009-02-01 16:28:43 UTC (rev 785)
+++ libs/swing-action/trunk/module.properties 2009-02-01 17:38:36 UTC (rev 786)
@@ -18,6 +18,6 @@
#
update.focus=none
-module.name=japi-lib-swing-action
-module.shortname=swing-action
-module.title=SwingAction
+name=japi-lib-swing-action
+shortname=swing-action
+title=SwingAction
Modified: libs/swing-app/trunk/module.properties
===================================================================
--- libs/swing-app/trunk/module.properties 2009-02-01 16:28:43 UTC (rev 785)
+++ libs/swing-app/trunk/module.properties 2009-02-01 17:38:36 UTC (rev 786)
@@ -18,6 +18,6 @@
#
update.focus=none
-module.name=japi-lib-swing-app
-module.shortname=swing-app
-module.title=SwingApp
+name=japi-lib-swing-app
+shortname=swing-app
+title=SwingApp
Modified: libs/swing-bookmarks/trunk/module.properties
===================================================================
--- libs/swing-bookmarks/trunk/module.properties 2009-02-01 16:28:43 UTC (rev 785)
+++ libs/swing-bookmarks/trunk/module.properties 2009-02-01 17:38:36 UTC (rev 786)
@@ -18,6 +18,6 @@
#
update.focus=none
-module.name=japi-lib-swing-bookmarks
-module.shortname=swing-bookmarks
-module.title=SwingBookmarks
+name=japi-lib-swing-bookmarks
+shortname=swing-bookmarks
+title=SwingBookmarks
Modified: libs/swing-extlib/trunk/module.properties
===================================================================
--- libs/swing-extlib/trunk/module.properties 2009-02-01 16:28:43 UTC (rev 785)
+++ libs/swing-extlib/trunk/module.properties 2009-02-01 17:38:36 UTC (rev 786)
@@ -18,6 +18,6 @@
#
update.focus=none
-module.name=japi-lib-swing-extlib
-module.shortname=swing-extlib
-module.title=SwingExtlib
+name=japi-lib-swing-extlib
+shortname=swing-extlib
+title=SwingExtlib
Modified: libs/swing-font/trunk/module.properties
===================================================================
--- libs/swing-font/trunk/module.properties 2009-02-01 16:28:43 UTC (rev 785)
+++ libs/swing-font/trunk/module.properties 2009-02-01 17:38:36 UTC (rev 786)
@@ -18,6 +18,6 @@
#
update.focus=none
-module.name=japi-lib-swing-font
-module.shortname=swing-font
-module.title=SwingFont
+name=japi-lib-swing-font
+shortname=swing-font
+title=SwingFont
Modified: libs/swing-keyprefs/trunk/module.properties
===================================================================
--- libs/swing-keyprefs/trunk/module.properties 2009-02-01 16:28:43 UTC (rev 785)
+++ libs/swing-keyprefs/trunk/module.properties 2009-02-01 17:38:36 UTC (rev 786)
@@ -18,6 +18,6 @@
#
update.focus=none
-module.name=japi-lib-swing-keyprefs
-module.shortname=swing-keyprefs
-module.title=SwingKeyprefs
+name=japi-lib-swing-keyprefs
+shortname=swing-keyprefs
+title=SwingKeyprefs
Modified: libs/swing-list/trunk/module.properties
===================================================================
--- libs/swing-list/trunk/module.properties 2009-02-01 16:28:43 UTC (rev 785)
+++ libs/swing-list/trunk/module.properties 2009-02-01 17:38:36 UTC (rev 786)
@@ -18,6 +18,6 @@
#
update.focus=none
-module.name=japi-lib-swing-list
-module.shortname=swing-list
-module.title=SwingList
+name=japi-lib-swing-list
+shortname=swing-list
+title=SwingList
Modified: libs/swing-misc/trunk/module.properties
===================================================================
--- libs/swing-misc/trunk/module.properties 2009-02-01 16:28:43 UTC (rev 785)
+++ libs/swing-misc/trunk/module.properties 2009-02-01 17:38:36 UTC (rev 786)
@@ -18,6 +18,6 @@
#
update.focus=none
-module.name=japi-lib-swing-misc
-module.shortname=swing-misc
-module.title=SwingMisc
+name=japi-lib-swing-misc
+shortname=swing-misc
+title=SwingMisc
Modified: libs/swing-prefs/trunk/module.properties
===================================================================
--- libs/swing-prefs/trunk/module.properties 2009-02-01 16:28:43 UTC (rev 785)
+++ libs/swing-prefs/trunk/module.properties 2009-02-01 17:38:36 UTC (rev 786)
@@ -18,6 +18,6 @@
#
update.focus=none
-module.name=japi-lib-swing-prefs
-module.shortname=swing-prefs
-module.title=SwingPrefs
+name=japi-lib-swing-prefs
+shortname=swing-prefs
+title=SwingPrefs
Modified: libs/swing-proxyprefs/trunk/module.properties
===================================================================
--- libs/swing-proxyprefs/trunk/module.properties 2009-02-01 16:28:43 UTC (rev 785)
+++ libs/swing-proxyprefs/trunk/module.properties 2009-02-01 17:38:36 UTC (rev 786)
@@ -18,6 +18,6 @@
#
update.focus=none
-module.name=japi-lib-swing-proxyprefs
-module.shortname=swing-proxyprefs
-module.title=SwingProxyprefs
+name=japi-lib-swing-proxyprefs
+shortname=swing-proxyprefs
+title=SwingProxyprefs
Modified: libs/swing-recent/trunk/module.properties
===================================================================
--- libs/swing-recent/trunk/module.properties 2009-02-01 16:28:43 UTC (rev 785)
+++ libs/swing-recent/trunk/module.properties 2009-02-01 17:38:36 UTC (rev 786)
@@ -18,6 +18,6 @@
#
update.focus=none
-module.name=japi-lib-swing-recent
-module.shortname=swing-recent
-module.title=SwingRecent
+name=japi-lib-swing-recent
+shortname=swing-recent
+title=SwingRecent
Modified: libs/swing-tod/trunk/module.properties
===================================================================
--- libs/swing-tod/trunk/module.properties 2009-02-01 16:28:43 UTC (rev 785)
+++ libs/swing-tod/trunk/module.properties 2009-02-01 17:38:36 UTC (rev 786)
@@ -18,6 +18,6 @@
#
update.focus=none
-module.name=japi-lib-swing-tod
-module.shortname=swing-tod
-module.title=SwingTod
+name=japi-lib-swing-tod
+shortname=swing-tod
+title=SwingTod
Modified: libs/swing-treetable/trunk/module.properties
===================================================================
--- libs/swing-treetable/trunk/module.properties 2009-02-01 16:28:43 UTC (rev 785)
+++ libs/swing-treetable/trunk/module.properties 2009-02-01 17:38:36 UTC (rev 786)
@@ -18,6 +18,6 @@
#
update.focus=none
-module.name=japi-lib-swing-treetable
-module.shortname=swing-treetable
-module.title=SwingTreetable
+name=japi-lib-swing-treetable
+shortname=swing-treetable
+title=SwingTreetable
Modified: libs/taglets/trunk/module.properties
===================================================================
--- libs/taglets/trunk/module.properties 2009-02-01 16:28:43 UTC (rev 785)
+++ libs/taglets/trunk/module.properties 2009-02-01 17:38:36 UTC (rev 786)
@@ -18,6 +18,6 @@
#
update.focus=none
-module.name=japi-lib-taglets
-module.shortname=taglets
-module.title=Taglets
+name=japi-lib-taglets
+shortname=taglets
+title=Taglets
Modified: libs/util/trunk/module.properties
===================================================================
--- libs/util/trunk/module.properties 2009-02-01 16:28:43 UTC (rev 785)
+++ libs/util/trunk/module.properties 2009-02-01 17:38:36 UTC (rev 786)
@@ -18,6 +18,6 @@
#
update.focus=none
-module.name=japi-lib-util
-module.shortname=util
-module.title=Util
+name=japi-lib-util
+shortname=util
+title=Util
Modified: libs/xml/trunk/module.properties
===================================================================
--- libs/xml/trunk/module.properties 2009-02-01 16:28:43 UTC (rev 785)
+++ libs/xml/trunk/module.properties 2009-02-01 17:38:36 UTC (rev 786)
@@ -18,6 +18,6 @@
#
update.focus=none
-module.name=japi-lib-xml
-module.shortname=xml
-module.title=Xml
+name=japi-lib-xml
+shortname=xml
+title=Xml
Modified: tools/archStat/trunk/build.xml
===================================================================
--- tools/archStat/trunk/build.xml 2009-02-01 16:28:43 UTC (rev 785)
+++ tools/archStat/trunk/build.xml 2009-02-01 17:38:36 UTC (rev 786)
@@ -25,7 +25,7 @@
<property name="module.name" value="ArchStat" />
<property name="module.shortname" value="ArchStat" />
<property name="module.title" value="ArchStat" />
- <property name="main.class" value="net.sf.japi.archstat.ArchStat" />
+ <property name="module.main.class" value="net.sf.japi.archstat.ArchStat" />
<taskdef name="pack200" classpath="common/antlib/Pack200Task.jar" classname="com.sun.tools.apache.ant.pack200.Pack200Task" />
@@ -103,7 +103,7 @@
<jar destfile="${distName}.jar">
<zipfileset dir="classes/production/${module.shortname}"/>
<manifest>
- <attribute name="Main-Class" value="${main.class}" />
+ <attribute name="Main-Class" value="${module.main.class}" />
<attribute name="Class-Path" value="lib/annotations.jar lib/japi-lib-lang-0.1.jar lib/japi-lib-swing-about-0.1.jar lib/japi-lib-swing-action-0.1.jar" />
<attribute name="Implementation-Title" value="${module.name}" />
<attribute name="Implementation-Vendor" value="Christian Hujer + the JAPI Developers" />
@@ -215,7 +215,7 @@
<zipfileset dir="classes/production/${module.shortname}"/>
<zipgroupfileset dir="lib" includes="*.jar" excludes="LICENSE-*.jar" />
<manifest>
- <attribute name="Main-Class" value="${main.class}" />
+ <attribute name="Main-Class" value="${module.main.class}" />
<!--attribute name="Class-Path" value="lib/annotations.jar lib/japi-lib-lang-0.1.jar lib/japi-lib-swing-about-0.1.jar lib/japi-lib-swing-action-0.1.jar" /-->
<attribute name="Implementation-Title" value="${module.name}" />
<attribute name="Implementation-Vendor" value="Christian Hujer + the JAPI Developers" />
Modified: tools/cstyle/trunk/build.xml
===================================================================
--- tools/cstyle/trunk/build.xml 2009-02-01 16:28:43 UTC (rev 785)
+++ tools/cstyle/trunk/build.xml 2009-02-01 17:38:36 UTC (rev 786)
@@ -24,7 +24,7 @@
<property name="module.name" value="cstyle" />
<property name="module.shortname" value="cstyle" />
<property name="module.title" value="CStyle" />
- <property name="main.class" value="net.sf.japi.cstyle.CStyle" />
+ <property name="module.main.class" value="net.sf.japi.cstyle.CStyle" />
<taskdef name="pack200" classpath="common/antlib/Pack200Task.jar" classname="com.sun.tools.apache.ant.pack200.Pack200Task" />
@@ -101,7 +101,7 @@
<jar destfile="${distName}.jar">
<zipfileset dir="classes/production/${module.shortname}"/>
<manifest>
- <attribute name="Main-Class" value="${main.class}" />
+ <attribute name="Main-Class" value="${module.main.class}" />
<attribute name="Class-Path" value="lib/annotations.jar lib/japi-lib-lang-0.1.jar lib/japi-lib-swing-about-0.1.jar lib/japi-lib-swing-action-0.1.jar" />
<attribute name="Implementation-Title" value="${module.name}" />
<attribute name="Implementation-Vendor" value="Christian Hujer + the JAPI Developers" />
@@ -213,7 +213,7 @@
<zipfileset dir="classes/production/${module.shortname}"/>
<zipgroupfileset dir="lib" includes="*.jar" excludes="LICENSE-*.jar" />
<manifest>
- <attribute name="Main-Class" value="${main.class}" />
+ <attribute name="Main-Class" value="${module.main.class}" />
<!--attribute name="Class-Path" value="lib/annotations.jar lib/japi-lib-lang-0.1.jar lib/japi-lib-swing-about-0.1.jar lib/japi-lib-swing-action-0.1.jar" /-->
<attribute name="Implementation-Title" value="${module.name}" />
<attribute name="Implementation-Vendor" value="Christian Hujer + the JAPI Developers" />
Modified: tools/dircount/trunk/build.xml
===================================================================
--- tools/dircount/trunk/build.xml 2009-02-01 16:28:43 UTC (rev 785)
+++ tools/dircount/trunk/build.xml 2009-02-01 17:38:36 UTC (rev 786)
@@ -24,7 +24,7 @@
<property name="module.name" value="dircount" />
<property name="module.shortname" value="dircount" />
<property name="module.title" value="DirCount" />
- <property name="main.class" value="net.sf.japi.dircount.DirCount" />
+ <property name="module.main.class" value="net.sf.japi.dircount.DirCount" />
<taskdef name="pack200" classpath="common/antlib/Pack200Task.jar" classname="com.sun.tools.apache.ant.pack200.Pack200Task" />
@@ -101,7 +101,7 @@
<jar destfile="${distName}.jar">
<zipfileset dir="classes/production/${module.shortname}"/>
<manifest>
- <attribute name="Main-Class" value="${main.class}" />
+ <attribute name="Main-Class" value="${module.main.class}" />
<attribute name="Class-Path" value="lib/annotations.jar lib/japi-lib-lang-0.1.jar lib/japi-lib-swing-about-0.1.jar lib/japi-lib-swing-action-0.1.jar" />
<attribute name="Implementation-Title" value="${module.name}" />
<attribute name="Implementation-Vendor" value="Christian Hujer + the JAPI Developers" />
@@ -213,7 +213,7 @@
<zipfileset dir="classes/production/${module.shortname}"/>
<zipgroupfileset dir="lib" includes="*.jar" excludes="LICENSE-*.jar" />
<manifest>
- <attribute name="Main-Class" value="${main.class}" />
+ <attribute name="Main-Class" value="${module.main.class}" />
<!--attribute name="Class-Path" value="lib/annotations.jar lib/japi-lib-lang-0.1.jar lib/japi-lib-swing-about-0.1.jar lib/japi-lib-swing-action-0.1.jar" /-->
<attribute name="Implementation-Title" value="${module.name}" />
<attribute name="Implementation-Vendor" value="Christian Hujer + the JAPI Developers" />
Modified: tools/findLongestPath/trunk/build.xml
===================================================================
--- tools/findLongestPath/trunk/build.xml 2009-02-01 16:28:43 UTC (rev 785)
+++ tools/findLongestPath/trunk/build.xml 2009-02-01 17:38:36 UTC (rev 786)
@@ -25,7 +25,7 @@
<property name="module.name" value="findLongestPath" />
<property name="module.shortname" value="findLongestPath" />
<property name="module.title" value="FindLongestPath" />
- <property name="main.class" value="net.sf.japi.tools.findLongestPath.FindLongestPath" />
+ <property name="module.main.class" value="net.sf.japi.tools.findLongestPath.FindLongestPath" />
<taskdef name="pack200" classpath="common/antlib/Pack200Task.jar" classname="com.sun.tools.apache.ant.pack200.Pack200Task" />
@@ -102,7 +102,7 @@
<jar destfile="${distName}.jar">
<zipfileset dir="classes/production/${module.shortname}"/>
<manifest>
- <attribute name="Main-Class" value="${main.class}" />
+ <attribute name="Main-Class" value="${module.main.class}" />
<attribute name="Class-Path" value="lib/annotations.jar lib/japi-lib-lang-0.1.jar lib/japi-lib-swing-about-0.1.jar lib/japi-lib-swing-action-0.1.jar" />
<attribute name="Implementation-Title" value="${module.name}" />
<attribute name="Implementation-Vendor" value="Christian Hujer + the JAPI Developers" />
@@ -214,7 +214,7 @@
<zipfileset dir="classes/production/${module.shortname}"/>
<zipgroupfileset dir="lib" includes="*.jar" excludes="LICENSE-*.jar" />
<manifest>
- <attribute name="Main-Class" value="${main.class}" />
+ <attribute name="Main-Class" value="${module.main.class}" />
<!--attribute name="Class-Path" value="lib/annotations.jar lib/japi-lib-lang-0.1.jar lib/japi-lib-swing-about-0.1.jar lib/japi-lib-swing-action-0.1.jar" /-->
<attribute name="Implementation-Title" value="${module.name}" />
<attribute name="Implementation-Vendor" value="Christian Hujer + the JAPI Developers" />
Modified: tools/fontbrowser/trunk/build.xml
===================================================================
--- tools/fontbrowser/trunk/build.xml 2009-02-01 16:28:43 UTC (rev 785)
+++ tools/fontbrowser/trunk/build.xml 2009-02-01 17:38:36 UTC (rev 786)
@@ -24,7 +24,7 @@
<property name="module.name" value="dircount" />
<property name="module.shortname" value="dircount" />
<property name="module.title" value="DirCount" />
- <property name="main.class" value="net.sf.japi.dircount.DirCount" />
+ <property name="module.main.class" value="net.sf.japi.dircount.DirCount" />
<taskdef name="pack200" classpath="common/antlib/Pack200Task.jar" classname="com.sun.tools.apache.ant.pack200.Pack200Task" />
@@ -101,7 +101,7 @@
<jar destfile="${distName}.jar">
<zipfileset dir="classes/production/${module.shortname}"/>
<manifest>
- <attribute name="Main-Class" value="${main.class}" />
+ <attribute name="Main-Class" value="${module.main.class}" />
<attribute name="Class-Path" value="lib/annotations.jar lib/japi-lib-lang-0.1.jar lib/japi-lib-swing-about-0.1.jar lib/japi-lib-swing-action-0.1.jar" />
<attribute name="Implementation-Title" value="${module.name}" />
<attribute name="Implementation-Vendor" value="Christian Hujer + the JAPI Developers" />
@@ -213,7 +213,7 @@
<zipfileset dir="classes/production/${module.shortname}"/>
<zipgroupfileset dir="lib" includes="*.jar" excludes="LICENSE-*.jar" />
<manifest>
- <attribute name="Main-Class" value="${main.class}" />
+ <attribute name="Main-Class" value="${module.main.class}" />
<!--attribute name="Class-Path" value="lib/annotations.jar lib/japi-lib-lang-0.1.jar lib/japi-lib-swing-about-0.1.jar lib/japi-lib-swing-action-0.1.jar" /-->
<attribute name="Implementation-Title" value="${module.name}" />
<attribute name="Implementation-Vendor" value="Christian Hujer + the JAPI Developers" />
Modified: tools/gdbControl/trunk/build.xml
===================================================================
--- tools/gdbControl/trunk/build.xml 2009-02-01 16:28:43 UTC (rev 785)
+++ tools/gdbControl/trunk/build.xml 2009-02-01 17:38:36 UTC (rev 786)
@@ -112,7 +112,7 @@
<jar destfile="${distName}.jar">
<zipfileset dir="classes/production/${module.shortname}"/>
<manifest>
- <attribute name="Main-Class" value="${main.class}" />
+ <attribute name="Main-Class" value="${module.main.class}" />
<attribute name="Class-Path" value="lib/annotations.jar lib/japi-lib-lang-0.1.jar lib/japi-lib-swing-about-0.1.jar lib/japi-lib-swing-action-0.1.jar" />
<attribute name="Implementation-Title" value="${module.name}" />
<attribute name="Implementation-Vendor" value="Christian Hujer + the JAPI Developers" />
@@ -225,7 +225,7 @@
<zipfileset dir="classes/production/${module.shortname}"/>
<zipgroupfileset dir="lib" includes="*.jar" excludes="LICENSE-*.jar" />
<manifest>
- <attribute name="Main-Class" value="${main.class}" />
+ <attribute name="Main-Class" value="${module.main.class}" />
<!--attribute name="Class-Path" value="lib/annotations.jar lib/japi-lib-lang-0.1.jar lib/japi-lib-swing-about-0.1.jar lib/japi-lib-swing-action-0.1.jar" /-->
<attribute name="Implementation-Title" value="${module.name}" />
<attribute name="Implementation-Vendor" value="Christian Hujer + the JAPI Developers" />
Modified: tools/gdbControl/trunk/module.properties
===================================================================
--- tools/gdbControl/trunk/module.properties 2009-02-01 16:28:43 UTC (rev 785)
+++ tools/gdbControl/trunk/module.properties 2009-02-01 17:38:36 UTC (rev 786)
@@ -18,7 +18,7 @@
#
update.focus=none
-module.name=GdbCobtrol
-module.shortname=GdbCobtrol
-module.title=GdbCobtrol
+name=GdbCobtrol
+shortname=GdbCobtrol
+title=GdbCobtrol
main.class=net.sf.japi.tools.gdbcontrol.ComWithGdb
Modified: tools/jgrep/trunk/build.xml
===================================================================
--- tools/jgrep/trunk/build.xml 2009-02-01 16:28:43 UTC (rev 785)
+++ tools/jgrep/trunk/build.xml 2009-02-01 17:38:36 UTC (rev 786)
@@ -25,7 +25,7 @@
<property name="module.name" value="Replacer" />
<property name="module.shortname" value="Replacer" />
<property name="module.title" value="Replacer" />
- <property name="main.class" value="net.sf.japi.tools.replacer.Replacer" />
+ <property name="module.main.class" value="net.sf.japi.tools.replacer.Replacer" />
<taskdef name="pack200" classpath="common/antlib/Pack200Task.jar" classname="com.sun.tools.apache.ant.pack200.Pack200Task" />
@@ -102,7 +102,7 @@
<jar destfile="${distName}.jar">
<zipfileset dir="classes/production/${module.shortname}"/>
<manifest>
- <attribute name="Main-Class" value="${main.class}" />
+ <attribute name="Main-Class" value="${module.main.class}" />
<attribute name="Class-Path" value="lib/annotations.jar lib/japi-lib-lang-0.1.jar lib/japi-lib-swing-about-0.1.jar lib/japi-lib-swing-action-0.1.jar" />
<attribute name="Implementation-Title" value="${module.name}" />
<attribute name="Implementation-Vendor" value="Christian Hujer + the JAPI Developers" />
@@ -214,7 +214,7 @@
<zipfileset dir="classes/production/${module.shortname}"/>
<zipgroupfileset dir="lib" includes="*.jar" excludes="LICENSE-*.jar" />
<manifest>
- <attribute name="Main-Class" value="${main.class}" />
+ <attribute name="Main-Class" value="${module.main.class}" />
<!--attribute name="Class-Path" value="lib/annotations.jar lib/japi-lib-lang-0.1.jar lib/japi-lib-swing-about-0.1.jar lib/japi-lib-swing-action-0.1.jar" /-->
<attribute name="Implementation-Title" value="${module.name}" />
<attribute name="Implementation-Vendor" value="Christian Hujer + the JAPI Developers" />
Modified: tools/jwget/trunk/build.xml
===================================================================
--- tools/jwget/trunk/build.xml 2009-02-01 16:28:43 UTC (rev 785)
+++ tools/jwget/trunk/build.xml 2009-02-01 17:38:36 UTC (rev 786)
@@ -24,7 +24,7 @@
<property name="module.name" value="dircount" />
<property name="module.shortname" value="dircount" />
<property name="module.title" value="DirCount" />
- <property name="main.class" value="net.sf.japi.dircount.DirCount" />
+ <property name="module.main.class" value="net.sf.japi.dircount.DirCount" />
<taskdef name="pack200" classpath="common/antlib/Pack200Task.jar" classname="com.sun.tools.apache.ant.pack200.Pack200Task" />
@@ -101,7 +101,7 @@
<jar destfile="${distName}.jar">
<zipfileset dir="classes/production/${module.shortname}"/>
<manifest>
- <attribute name="Main-Class" value="${main.class}" />
+ <attribute name="Main-Class" value="${module.main.class}" />
<attribute name="Class-Path" value="lib/annotations.jar lib/japi-lib-lang-0.1.jar lib/japi-lib-swing-about-0.1.jar lib/japi-lib-swing-action-0.1.jar" />
<attribute name="Implementation-Title" value="${module.name}" />
<attribute name="Implementation-Vendor" value="Christian Hujer + the JAPI Developers" />
@@ -213,7 +213,...
[truncated message content] |
|
From: <chr...@us...> - 2009-02-09 02:35:42
|
Revision: 796
http://japi.svn.sourceforge.net/japi/?rev=796&view=rev
Author: christianhujer
Date: 2009-02-09 02:35:38 +0000 (Mon, 09 Feb 2009)
Log Message:
-----------
Updated svn:externals to use relative urls. Also updated some of the READMEs.
Modified Paths:
--------------
common/trunk/README
libs/argparser/trunk/README
libs/finance/trunk/README
libs/io/trunk/README
libs/lang/trunk/README
libs/logging/trunk/README
libs/net/trunk/README
Property Changed:
----------------
games/jmines/trunk/
historic/trunk/
imajar/trunk/
libs/argparser/trunk/
libs/finance/trunk/
libs/io/trunk/
libs/lang/trunk/
libs/logging/trunk/
libs/midi/trunk/
libs/net/trunk/
libs/registry/trunk/
libs/swing-about/trunk/
libs/swing-action/trunk/
libs/swing-app/trunk/
libs/swing-bookmarks/trunk/
libs/swing-extlib/trunk/
libs/swing-font/trunk/
libs/swing-keyprefs/trunk/
libs/swing-list/trunk/
libs/swing-misc/trunk/
libs/swing-prefs/trunk/
libs/swing-proxyprefs/trunk/
libs/swing-recent/trunk/
libs/swing-tod/trunk/
libs/swing-treetable/trunk/
libs/taglets/trunk/
libs/util/trunk/
libs/xml/trunk/
progs/batcher/trunk/
progs/cardlearn/trunk/
progs/jeduca/trunk/
progs/jhexedit/trunk/
progs/jhexview/trunk/
progs/jirus/trunk/
progs/jtype/trunk/
progs/midilearn/trunk/
progs/pffhtrain/trunk/
progs/textedit/trunk/
site/trunk/
tools/archStat/trunk/
tools/cstyle/trunk/
tools/dircount/trunk/
tools/findLongestPath/trunk/
tools/fontbrowser/trunk/
tools/gdbControl/trunk/
tools/jgrep/trunk/
tools/jwget/trunk/
tools/keystrokes/trunk/
tools/mail/trunk/
tools/midiDeviceLister/trunk/
tools/midiMonitor/trunk/
tools/prefsbrowser/trunk/
tools/replacer/trunk/
tools/scriptEngineLister/trunk/
tools/scriptInterpreter/trunk/
tools/string2bytes/trunk/
tools/todoScanner/trunk/
Modified: common/trunk/README
===================================================================
--- common/trunk/README 2009-02-09 02:09:31 UTC (rev 795)
+++ common/trunk/README 2009-02-09 02:35:38 UTC (rev 796)
@@ -1,8 +1,8 @@
JAPI COMMON README
==================
-This file contains some important information about Japi Common. You should
-read it first.
+This file contains some important information about Japi Common.
+You should read it first.
TABLE OF CONTENTS
@@ -35,9 +35,7 @@
SYSTEM REQUIREMENTS
-------------------
Java 5.0
- Previous versions of Java will not work. JAPI uses Generics, autoboxing,
- static imports, foreach loops, assertions, covariant return types and varargs
- quite a lot.
+ Previous versions of Java will not work.
Ant 1.6.5
Previous versions of Ant might work but are not tested.
@@ -49,26 +47,27 @@
The build file to build the project with Ant.
COPYING
- Japi Common license conditions. Note: applies to Japi Common only, not
- third party libraries.
+ Japi Common license conditions.
+ Note: applies to Japi Common only, not third party libraries.
CREDITS
- List of project contributors. See also MAINTAINERS.
+ List of project contributors.
+ See also MAINTAINERS.
INSTALL
Description of how to build and install Japi Common.
lib/
Directory containing third party libraries used to build Japi Common.
- Please note that these thrid party libraries have their own license
- conditions. The licenses of the third party libraries are included in the
- lib/ directory.
+ These third party libraries have their own license conditions.
+ The third party licenses are included in the lib/ directory.
LICENSE
File with license information.
MAINTAINERS
- List of current project maintainers. See also CREDITS.
+ List of current project maintainers.
+ See also CREDITS.
NEWS
Project News.
@@ -100,8 +99,8 @@
MAILING LISTS
-------------
-Japi mailing lists are the usual sourceforge hosted sourceforge project
-mailing lists. The current mailing lists are:
+Japi mailing lists are the usual sourceforge hosted project mailing lists.
+The current mailing lists are:
* jap...@li...
News for JAPI users and developers (low traffic)
* jap...@li...
Property changes on: games/jmines/trunk
___________________________________________________________________
Modified: svn:externals
- common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
+ ^/common/trunk common
Property changes on: historic/trunk
___________________________________________________________________
Modified: svn:externals
- common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
+ ^/common/trunk common
Property changes on: imajar/trunk
___________________________________________________________________
Modified: svn:externals
- common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
+ ^/common/trunk common
Property changes on: libs/argparser/trunk
___________________________________________________________________
Modified: svn:externals
- common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
+ ^/common/trunk common
Modified: libs/argparser/trunk/README
===================================================================
--- libs/argparser/trunk/README 2009-02-09 02:09:31 UTC (rev 795)
+++ libs/argparser/trunk/README 2009-02-09 02:35:38 UTC (rev 796)
@@ -1,8 +1,8 @@
JAPI ARGPARSER README
=====================
-This file contains some important information about Japi ArgParser. You should
-read it first.
+This file contains some important information about Japi ArgParser.
+You should read it first.
TABLE OF CONTENTS
@@ -17,7 +17,7 @@
* mailing lists
* license information (see file LICENSE)
-
+
PROJECT DESCRIPTION
-------------------
Japi ArgParser is a subproject of Japi.
@@ -37,9 +37,7 @@
SYSTEM REQUIREMENTS
-------------------
Java 5.0
- Previous versions of Java will not work. Japi uses Generics, autoboxing,
- static imports, foreach loops, assertions, covariant return types and varargs
- quite a lot.
+ Previous versions of Java will not work.
Ant 1.6.5
Previous versions of Ant might work but are not tested.
@@ -58,11 +56,12 @@
Changelog with significant changes.
COPYING
- Japi ArgParser license conditions. Note: applies to Japi ArgParser only,
- not third party libraries.
+ Japi ArgParser license conditions.
+ Note: applies to Japi ArgParser only, not third party libraries.
CREDITS
- List of project contributors. See also MAINTAINERS.
+ List of project contributors.
+ See also MAINTAINERS.
INSTALL
Description of how to build and install Japi ArgParser.
@@ -71,7 +70,8 @@
File with license information.
MAINTAINERS
- List of current project maintainers. See also CREDITS.
+ List of current project maintainers.
+ See also CREDITS.
NEWS
Project News.
@@ -103,8 +103,8 @@
MAILING LISTS
-------------
-Japi mailing lists are the usual sourceforge hosted sourceforge project
-mailing lists. The current mailing lists are:
+Japi mailing lists are the usual sourceforge hosted project mailing lists.
+The current mailing lists are:
* jap...@li...
News for JAPI users and developers (low traffic)
* jap...@li...
Property changes on: libs/finance/trunk
___________________________________________________________________
Modified: svn:externals
- common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
+ ^/common/trunk common
Modified: libs/finance/trunk/README
===================================================================
--- libs/finance/trunk/README 2009-02-09 02:09:31 UTC (rev 795)
+++ libs/finance/trunk/README 2009-02-09 02:35:38 UTC (rev 796)
@@ -1,8 +1,8 @@
JAPI COMMON README
==================
-This file contains some important information about Japi Common. You should
-read it first.
+This file contains some important information about Japi Common.
+You should read it first.
TABLE OF CONTENTS
@@ -17,7 +17,7 @@
* mailing lists
* license information (see file LICENSE)
-
+
PROJECT DESCRIPTION
-------------------
Japi Common is a set of libraries and build modules useful for Java projects.
@@ -35,9 +35,7 @@
SYSTEM REQUIREMENTS
-------------------
Java 5.0
- Previous versions of Java will not work. Gridarta uses Generics, autoboxing,
- static imports, foreach loops, assertions, covariant return types and varargs
- quite a lot.
+ Previous versions of Java will not work.
Ant 1.6.5
Previous versions of Ant might work but are not tested.
@@ -49,26 +47,27 @@
The build file to build the project with Ant.
COPYING
- Japi Common license conditions. Note: applies to Japi Common only, not
- third party libraries.
+ Japi Common license conditions.
+ Note: applies to Japi Common only, not third party libraries.
CREDITS
- List of project contributors. See also MAINTAINERS.
+ List of project contributors.
+ See also MAINTAINERS.
INSTALL
Description of how to build and install Japi Common.
lib/
Directory containing third party libraries used to build Japi Common.
- Please note that these thrid party libraries have their own license
- conditions. The licenses of the third party libraries are included in the
- lib/ directory.
+ These third party libraries have their own license conditions.
+ The third party licenses are included in the lib/ directory.
LICENSE
File with license information.
MAINTAINERS
- List of current project maintainers. See also CREDITS.
+ List of current project maintainers.
+ See also CREDITS.
NEWS
Project News.
@@ -100,8 +99,8 @@
MAILING LISTS
-------------
-Japi mailing lists are the usual sourceforge hosted sourceforge project
-mailing lists. The current mailing lists are:
+Japi mailing lists are the usual sourceforge hosted project mailing lists.
+The current mailing lists are:
* jap...@li...
News for JAPI users and developers (low traffic)
* jap...@li...
Property changes on: libs/io/trunk
___________________________________________________________________
Modified: svn:externals
- common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
+ ^/common/trunk common
Modified: libs/io/trunk/README
===================================================================
--- libs/io/trunk/README 2009-02-09 02:09:31 UTC (rev 795)
+++ libs/io/trunk/README 2009-02-09 02:35:38 UTC (rev 796)
@@ -1,8 +1,8 @@
JAPI LIB IO README
==================
-This file contains some important information about Japi Lib IO. You should
-read it first.
+This file contains some important information about Japi Lib IO.
+You should read it first.
TABLE OF CONTENTS
@@ -17,7 +17,7 @@
* mailing lists
* license information (see file LICENSE)
-
+
PROJECT DESCRIPTION
-------------------
Japi Lib IO is a subproject of Japi.
@@ -36,9 +36,7 @@
SYSTEM REQUIREMENTS
-------------------
Java 5.0
- Previous versions of Java will not work. Japi uses Generics, autoboxing,
- static imports, foreach loops, assertions, covariant return types and varargs
- quite a lot.
+ Previous versions of Java will not work.
Ant 1.6.5
Previous versions of Ant might work but are not tested.
@@ -57,11 +55,12 @@
Changelog with significant changes.
COPYING
- Japi Lib IO license conditions. Note: applies to Japi Lib IO only,
- not third party libraries.
+ Japi Lib IO license conditions.
+ Note: applies to Japi Lib IO only, not third party libraries.
CREDITS
- List of project contributors. See also MAINTAINERS.
+ List of project contributors.
+ See also MAINTAINERS.
INSTALL
Description of how to build and install Japi Lib IO.
@@ -70,7 +69,8 @@
File with license information.
MAINTAINERS
- List of current project maintainers. See also CREDITS.
+ List of current project maintainers.
+ See also CREDITS.
NEWS
Project News.
@@ -102,8 +102,8 @@
MAILING LISTS
-------------
-Japi mailing lists are the usual sourceforge hosted sourceforge project
-mailing lists. The current mailing lists are:
+Japi mailing lists are the usual sourceforge hosted project mailing lists.
+The current mailing lists are:
* jap...@li...
News for JAPI users and developers (low traffic)
* jap...@li...
Property changes on: libs/lang/trunk
___________________________________________________________________
Modified: svn:externals
- common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
+ ^/common/trunk common
Modified: libs/lang/trunk/README
===================================================================
--- libs/lang/trunk/README 2009-02-09 02:09:31 UTC (rev 795)
+++ libs/lang/trunk/README 2009-02-09 02:35:38 UTC (rev 796)
@@ -1,8 +1,8 @@
JAPI LIB LANG README
====================
-This file contains some important information about Japi Lib Lang. You should
-read it first.
+This file contains some important information about Japi Lib Lang.
+You should read it first.
TABLE OF CONTENTS
@@ -17,7 +17,7 @@
* mailing lists
* license information (see file LICENSE)
-
+
PROJECT DESCRIPTION
-------------------
Japi Lib Lang is a subproject of Japi.
@@ -36,9 +36,7 @@
SYSTEM REQUIREMENTS
-------------------
Java 5.0
- Previous versions of Java will not work. Japi uses Generics, autoboxing,
- static imports, foreach loops, assertions, covariant return types and varargs
- quite a lot.
+ Previous versions of Java will not work.
Ant 1.6.5
Previous versions of Ant might work but are not tested.
@@ -57,11 +55,12 @@
Changelog with significant changes.
COPYING
- Japi Lib Lang license conditions. Note: applies to Japi Lib Lang only,
- not third party libraries.
+ Japi Lib Lang license conditions.
+ Note: applies to Japi Lib Lang only, not third party libraries.
CREDITS
- List of project contributors. See also MAINTAINERS.
+ List of project contributors.
+ See also MAINTAINERS.
INSTALL
Description of how to build and install Japi Lib Lang.
@@ -70,7 +69,8 @@
File with license information.
MAINTAINERS
- List of current project maintainers. See also CREDITS.
+ List of current project maintainers.
+ See also CREDITS.
NEWS
Project News.
@@ -102,8 +102,8 @@
MAILING LISTS
-------------
-Japi mailing lists are the usual sourceforge hosted sourceforge project
-mailing lists. The current mailing lists are:
+Japi mailing lists are the usual sourceforge hosted project mailing lists.
+The current mailing lists are:
* jap...@li...
News for JAPI users and developers (low traffic)
* jap...@li...
Property changes on: libs/logging/trunk
___________________________________________________________________
Modified: svn:externals
- common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
+ ^/common/trunk common
Modified: libs/logging/trunk/README
===================================================================
--- libs/logging/trunk/README 2009-02-09 02:09:31 UTC (rev 795)
+++ libs/logging/trunk/README 2009-02-09 02:35:38 UTC (rev 796)
@@ -1,8 +1,8 @@
JAPI COMMON README
==================
-This file contains some important information about Japi Common. You should
-read it first.
+This file contains some important information about Japi Common.
+You should read it first.
TABLE OF CONTENTS
@@ -17,7 +17,7 @@
* mailing lists
* license information (see file LICENSE)
-
+
PROJECT DESCRIPTION
-------------------
Japi Common is a set of libraries and build modules useful for Java projects.
@@ -35,9 +35,7 @@
SYSTEM REQUIREMENTS
-------------------
Java 5.0
- Previous versions of Java will not work. Gridarta uses Generics, autoboxing,
- static imports, foreach loops, assertions, covariant return types and varargs
- quite a lot.
+ Previous versions of Java will not work.
Ant 1.6.5
Previous versions of Ant might work but are not tested.
@@ -49,26 +47,27 @@
The build file to build the project with Ant.
COPYING
- Japi Common license conditions. Note: applies to Japi Common only, not
- third party libraries.
+ Japi Common license conditions.
+ Note: applies to Japi Common only, not third party libraries.
CREDITS
- List of project contributors. See also MAINTAINERS.
+ List of project contributors.
+ See also MAINTAINERS.
INSTALL
Description of how to build and install Japi Common.
lib/
Directory containing third party libraries used to build Japi Common.
- Please note that these thrid party libraries have their own license
- conditions. The licenses of the third party libraries are included in the
- lib/ directory.
+ These third party libraries have their own license conditions.
+ The third party licenses are included in the lib/ directory.
LICENSE
File with license information.
MAINTAINERS
- List of current project maintainers. See also CREDITS.
+ List of current project maintainers.
+ See also CREDITS.
NEWS
Project News.
@@ -100,8 +99,8 @@
MAILING LISTS
-------------
-Japi mailing lists are the usual sourceforge hosted sourceforge project
-mailing lists. The current mailing lists are:
+Japi mailing lists are the usual sourceforge hosted project mailing lists.
+The current mailing lists are:
* jap...@li...
News for JAPI users and developers (low traffic)
* jap...@li...
Property changes on: libs/midi/trunk
___________________________________________________________________
Modified: svn:externals
- common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
+ ^/common/trunk common
Property changes on: libs/net/trunk
___________________________________________________________________
Modified: svn:externals
- common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
+ ^/common/trunk common
Modified: libs/net/trunk/README
===================================================================
--- libs/net/trunk/README 2009-02-09 02:09:31 UTC (rev 795)
+++ libs/net/trunk/README 2009-02-09 02:35:38 UTC (rev 796)
@@ -1,8 +1,8 @@
JAPI LIB NET README
===================
-This file contains some important information about Japi Lib Net. You should
-read it first.
+This file contains some important information about Japi Lib Net.
+You should read it first.
TABLE OF CONTENTS
@@ -17,7 +17,7 @@
* mailing lists
* license information (see file LICENSE)
-
+
PROJECT DESCRIPTION
-------------------
Japi Lib Net is a subproject of Japi.
@@ -36,9 +36,7 @@
SYSTEM REQUIREMENTS
-------------------
Java 5.0
- Previous versions of Java will not work. Japi uses Generics, autoboxing,
- static imports, foreach loops, assertions, covariant return types and varargs
- quite a lot.
+ Previous versions of Java will not work.
Ant 1.6.5
Previous versions of Ant might work but are not tested.
@@ -57,11 +55,12 @@
Changelog with significant changes.
COPYING
- Japi Lib Net license conditions. Note: applies to Japi Lib Net only,
- not third party libraries.
+ Japi Lib Net license conditions.
+ Note: applies to Japi Lib Net only, not third party libraries.
CREDITS
- List of project contributors. See also MAINTAINERS.
+ List of project contributors.
+ See also MAINTAINERS.
INSTALL
Description of how to build and install Japi Lib Net.
@@ -70,7 +69,8 @@
File with license information.
MAINTAINERS
- List of current project maintainers. See also CREDITS.
+ List of current project maintainers.
+ See also CREDITS.
NEWS
Project News.
@@ -102,8 +102,8 @@
MAILING LISTS
-------------
-Japi mailing lists are the usual sourceforge hosted sourceforge project
-mailing lists. The current mailing lists are:
+Japi mailing lists are the usual sourceforge hosted project mailing lists.
+The current mailing lists are:
* jap...@li...
News for JAPI users and developers (low traffic)
* jap...@li...
Property changes on: libs/registry/trunk
___________________________________________________________________
Modified: svn:externals
- common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
+ ^/common/trunk common
Property changes on: libs/swing-about/trunk
___________________________________________________________________
Modified: svn:externals
- common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
+ ^/common/trunk common
Property changes on: libs/swing-action/trunk
___________________________________________________________________
Modified: svn:externals
- common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
+ ^/common/trunk common
Property changes on: libs/swing-app/trunk
___________________________________________________________________
Modified: svn:externals
- common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
+ ^/common/trunk common
Property changes on: libs/swing-bookmarks/trunk
___________________________________________________________________
Modified: svn:externals
- common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
+ ^/common/trunk common
Property changes on: libs/swing-extlib/trunk
___________________________________________________________________
Modified: svn:externals
- common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
+ ^/common/trunk common
Property changes on: libs/swing-font/trunk
___________________________________________________________________
Modified: svn:externals
- common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
+ ^/common/trunk common
Property changes on: libs/swing-keyprefs/trunk
___________________________________________________________________
Modified: svn:externals
- common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
+ ^/common/trunk common
Property changes on: libs/swing-list/trunk
___________________________________________________________________
Modified: svn:externals
- common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
+ ^/common/trunk common
Property changes on: libs/swing-misc/trunk
___________________________________________________________________
Modified: svn:externals
- common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
+ ^/common/trunk common
Property changes on: libs/swing-prefs/trunk
___________________________________________________________________
Modified: svn:externals
- common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
+ ^/common/trunk common
Property changes on: libs/swing-proxyprefs/trunk
___________________________________________________________________
Modified: svn:externals
- common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
+ ^/common/trunk common
Property changes on: libs/swing-recent/trunk
___________________________________________________________________
Modified: svn:externals
- common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
+ ^/common/trunk common
Property changes on: libs/swing-tod/trunk
___________________________________________________________________
Modified: svn:externals
- common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
+ ^/common/trunk common
Property changes on: libs/swing-treetable/trunk
___________________________________________________________________
Modified: svn:externals
- common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
+ ^/common/trunk common
Property changes on: libs/taglets/trunk
___________________________________________________________________
Modified: svn:externals
- common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
+ ^/common/trunk common
Property changes on: libs/util/trunk
___________________________________________________________________
Modified: svn:externals
- common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
+ ^/common/trunk common
Property changes on: libs/xml/trunk
___________________________________________________________________
Modified: svn:externals
- common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
+ ^/common/trunk common
Property changes on: progs/batcher/trunk
___________________________________________________________________
Modified: svn:externals
- common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
+ ^/common/trunk common
Property changes on: progs/cardlearn/trunk
___________________________________________________________________
Modified: svn:externals
- common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
+ ^/common/trunk common
Property changes on: progs/jeduca/trunk
___________________________________________________________________
Modified: svn:externals
- common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
+ ^/common/trunk common
Property changes on: progs/jhexedit/trunk
___________________________________________________________________
Modified: svn:externals
- common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
+ ^/common/trunk common
Property changes on: progs/jhexview/trunk
___________________________________________________________________
Modified: svn:externals
- common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
+ ^/common/trunk common
Property changes on: progs/jirus/trunk
___________________________________________________________________
Modified: svn:externals
- common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
+ ^/common/trunk common
Property changes on: progs/jtype/trunk
___________________________________________________________________
Modified: svn:externals
- common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
+ ^/common/trunk common
Property changes on: progs/midilearn/trunk
___________________________________________________________________
Modified: svn:externals
- common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
+ ^/common/trunk common
Property changes on: progs/pffhtrain/trunk
___________________________________________________________________
Modified: svn:externals
- common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
+ ^/common/trunk common
Property changes on: progs/textedit/trunk
___________________________________________________________________
Modified: svn:externals
- common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
+ ^/common/trunk common
Property changes on: site/trunk
___________________________________________________________________
Modified: svn:externals
- common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
+ ^/common/trunk common
Property changes on: tools/archStat/trunk
___________________________________________________________________
Modified: svn:externals
- common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
+ ^/common/trunk common
Property changes on: tools/cstyle/trunk
___________________________________________________________________
Modified: svn:externals
- common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
+ ^/common/trunk common
Property changes on: tools/dircount/trunk
___________________________________________________________________
Modified: svn:externals
- common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
+ ^/common/trunk common
Property changes on: tools/findLongestPath/trunk
___________________________________________________________________
Modified: svn:externals
- common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
+ ^/common/trunk common
Property changes on: tools/fontbrowser/trunk
___________________________________________________________________
Modified: svn:externals
- common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
+ ^/common/trunk common
Property changes on: tools/gdbControl/trunk
___________________________________________________________________
Modified: svn:externals
- common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
+ ^/common/trunk common
Property changes on: tools/jgrep/trunk
___________________________________________________________________
Modified: svn:externals
- common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
+ ^/common/trunk common
Property changes on: tools/jwget/trunk
___________________________________________________________________
Modified: svn:externals
- common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
+ ^/common/trunk common
Property changes on: tools/keystrokes/trunk
___________________________________________________________________
Modified: svn:externals
- common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
+ ^/common/trunk common
Property changes on: tools/mail/trunk
___________________________________________________________________
Modified: svn:externals
- common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
+ ^/common/trunk common
Property changes on: tools/midiDeviceLister/trunk
___________________________________________________________________
Modified: svn:externals
- common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
+ ^/common/trunk common
Property changes on: tools/midiMonitor/trunk
___________________________________________________________________
Modified: svn:externals
- common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
+ ^/common/trunk common
Property changes on: tools/prefsbrowser/trunk
___________________________________________________________________
Modified: svn:externals
- common https://japi.svn.sourceforge.net...
[truncated message content] |
|
From: <chr...@us...> - 2009-02-15 15:41:59
|
Revision: 899
http://japi.svn.sourceforge.net/japi/?rev=899&view=rev
Author: christianhujer
Date: 2009-02-15 15:41:47 +0000 (Sun, 15 Feb 2009)
Log Message:
-----------
Moved action classes from net.sf.japi.swing to net.sf.japi.swing.action.
Makes subpackages of net.sf.japi.swing look better and more independent of the action stuff.
Modified Paths:
--------------
games/jmines/trunk/src/prj/net/sf/japi/games/jmines/JMines.java
historic/trunk/src/app/net/sf/japi/swing/LookAndFeelManager.java
historic/trunk/src/doc/guide/swing/action/basic/src/ex/Application.java
historic/trunk/src/doc/guide/swing/action/fromScratch/src/net/sf/japi/examples/editor/Editor.java
historic/trunk/src/doc/guide/swing/prefs/keys/src/ex/PrefsExampleApp.java
historic/trunk/src/doc/guide/swing/tod/src/ex/TodExampleApp.java
libs/midi/trunk/src/prj/net/sf/japi/midi/gui/OutputConfigurator.java
libs/swing-about/trunk/src/prj/net/sf/japi/swing/about/AboutDialog.java
libs/swing-action/trunk/src/tst/test/net/sf/japi/swing/ActionBuilderFactoryTest.java
libs/swing-action/trunk/src/tst/test/net/sf/japi/swing/DefaultActionBuilderTest.java
libs/swing-action/trunk/src/tst/test/net/sf/japi/swing/ReflectionActionTest.java
libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/Application.java
libs/swing-bookmarks/trunk/src/prj/net/sf/japi/swing/bookmarks/BookmarkManager.java
libs/swing-font/trunk/src/prj/net/sf/japi/swing/font/FontChooser.java
libs/swing-font/trunk/src/prj/net/sf/japi/swing/font/FontPreview.java
libs/swing-font/trunk/src/prj/net/sf/japi/swing/font/FontStyleListCellRenderer.java
libs/swing-keyprefs/trunk/src/prj/net/sf/japi/swing/prefs/keys/ActionKeyDisplay.java
libs/swing-keyprefs/trunk/src/prj/net/sf/japi/swing/prefs/keys/ActionMapNode.java
libs/swing-keyprefs/trunk/src/prj/net/sf/japi/swing/prefs/keys/KeyStrokePrefs.java
libs/swing-keyprefs/trunk/src/prj/net/sf/japi/swing/prefs/keys/KeyStrokeRootNode.java
libs/swing-keyprefs/trunk/src/prj/net/sf/japi/swing/prefs/keys/KeyStrokeTreeTableModel.java
libs/swing-list/trunk/src/prj/net/sf/japi/swing/list/ListControlPanel.java
libs/swing-misc/trunk/src/prj/net/sf/japi/swing/misc/JFileChooserButton.java
libs/swing-misc/trunk/src/prj/net/sf/japi/swing/misc/JSAXErrorHandler.java
libs/swing-prefs/trunk/src/prj/net/sf/japi/swing/prefs/PreferencesPane.java
libs/swing-prefs/trunk/src/tst/test/net/sf/japi/swing/prefs/MockActionBuilder.java
libs/swing-prefs/trunk/src/tst/test/net/sf/japi/swing/prefs/PreferencesPaneTest.java
libs/swing-recent/trunk/src/prj/net/sf/japi/swing/recent/RecentURLsMenu.java
libs/swing-tod/trunk/src/prj/net/sf/japi/swing/tod/TipOfTheDayManager.java
progs/batcher/trunk/src/prj/net/sf/japi/progs/batcher/Main.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/swing/AbstractManager.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/swing/LookAndFeelManager.java
progs/jtype/trunk/src/prj/net/sf/japi/jtype/PerformancePane.java
progs/pffhtrain/trunk/src/prj/net/sf/japi/pffhtrain/PffhTrain.java
tools/fontbrowser/trunk/src/prj/net/sf/japi/tools/fontbrowser/FontBrowser.java
tools/keystrokes/trunk/src/prj/net/sf/japi/tools/keystrokes/KeyStrokes.java
tools/prefsbrowser/trunk/src/prj/net/sf/japi/tools/prefsbrowser/PrefsBrowser.java
tools/prefsbrowser/trunk/src/prj/net/sf/japi/tools/prefsbrowser/PrefsTreeTableModel.java
tools/string2bytes/trunk/src/prj/net/sf/japi/string2bytes/CodecSelectionPanel.java
tools/string2bytes/trunk/src/prj/net/sf/japi/string2bytes/DoubleListController.java
tools/string2bytes/trunk/src/prj/net/sf/japi/string2bytes/ListOrderController.java
tools/string2bytes/trunk/src/prj/net/sf/japi/string2bytes/String2Bytes.java
Added Paths:
-----------
libs/swing-action/trunk/src/prj/net/sf/japi/swing/action/
libs/swing-action/trunk/src/prj/net/sf/japi/swing/action/ActionBuilder.java
libs/swing-action/trunk/src/prj/net/sf/japi/swing/action/ActionBuilderFactory.java
libs/swing-action/trunk/src/prj/net/sf/japi/swing/action/ActionMethod.java
libs/swing-action/trunk/src/prj/net/sf/japi/swing/action/ActionProvider.java
libs/swing-action/trunk/src/prj/net/sf/japi/swing/action/ComponentFactory.java
libs/swing-action/trunk/src/prj/net/sf/japi/swing/action/DefaultActionBuilder.java
libs/swing-action/trunk/src/prj/net/sf/japi/swing/action/DisposeAction.java
libs/swing-action/trunk/src/prj/net/sf/japi/swing/action/DummyAction.java
libs/swing-action/trunk/src/prj/net/sf/japi/swing/action/DummyActionBuilder.java
libs/swing-action/trunk/src/prj/net/sf/japi/swing/action/IconManager.java
libs/swing-action/trunk/src/prj/net/sf/japi/swing/action/NamedActionMap.java
libs/swing-action/trunk/src/prj/net/sf/japi/swing/action/ReflectionAction.java
libs/swing-action/trunk/src/prj/net/sf/japi/swing/action/ToggleAction.java
libs/swing-action/trunk/src/prj/net/sf/japi/swing/action/action.properties
libs/swing-action/trunk/src/prj/net/sf/japi/swing/action/action_de.properties
libs/swing-action/trunk/src/prj/net/sf/japi/swing/action/package-info.java
Removed Paths:
-------------
libs/swing-action/trunk/src/prj/net/sf/japi/swing/ActionBuilder.java
libs/swing-action/trunk/src/prj/net/sf/japi/swing/ActionBuilderFactory.java
libs/swing-action/trunk/src/prj/net/sf/japi/swing/ActionMethod.java
libs/swing-action/trunk/src/prj/net/sf/japi/swing/ActionProvider.java
libs/swing-action/trunk/src/prj/net/sf/japi/swing/ComponentFactory.java
libs/swing-action/trunk/src/prj/net/sf/japi/swing/DefaultActionBuilder.java
libs/swing-action/trunk/src/prj/net/sf/japi/swing/DisposeAction.java
libs/swing-action/trunk/src/prj/net/sf/japi/swing/DummyAction.java
libs/swing-action/trunk/src/prj/net/sf/japi/swing/DummyActionBuilder.java
libs/swing-action/trunk/src/prj/net/sf/japi/swing/IconManager.java
libs/swing-action/trunk/src/prj/net/sf/japi/swing/NamedActionMap.java
libs/swing-action/trunk/src/prj/net/sf/japi/swing/ReflectionAction.java
libs/swing-action/trunk/src/prj/net/sf/japi/swing/ToggleAction.java
libs/swing-action/trunk/src/prj/net/sf/japi/swing/action.properties
libs/swing-action/trunk/src/prj/net/sf/japi/swing/action_de.properties
libs/swing-action/trunk/src/prj/net/sf/japi/swing/package-info.java
Modified: games/jmines/trunk/src/prj/net/sf/japi/games/jmines/JMines.java
===================================================================
--- games/jmines/trunk/src/prj/net/sf/japi/games/jmines/JMines.java 2009-02-15 14:24:43 UTC (rev 898)
+++ games/jmines/trunk/src/prj/net/sf/japi/games/jmines/JMines.java 2009-02-15 15:41:47 UTC (rev 899)
@@ -19,7 +19,7 @@
import javax.swing.JApplet;
import javax.swing.JComponent;
-import net.sf.japi.swing.ActionMethod;
+import net.sf.japi.swing.action.ActionMethod;
/** A MineSweeper implementation in Java.
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
Modified: historic/trunk/src/app/net/sf/japi/swing/LookAndFeelManager.java
===================================================================
--- historic/trunk/src/app/net/sf/japi/swing/LookAndFeelManager.java 2009-02-15 14:24:43 UTC (rev 898)
+++ historic/trunk/src/app/net/sf/japi/swing/LookAndFeelManager.java 2009-02-15 15:41:47 UTC (rev 899)
@@ -39,6 +39,7 @@
import static javax.swing.UIManager.getLookAndFeel;
import static javax.swing.UIManager.installLookAndFeel;
import static javax.swing.UIManager.setLookAndFeel;
+import net.sf.japi.swing.action.ActionBuilderFactory;
/** A class that manages look and feel and provides a corresponding menu.
* If you want your frames and dialogs to be default look and feel decorated, you currently must invoke the corresponding method {@link
Modified: historic/trunk/src/doc/guide/swing/action/basic/src/ex/Application.java
===================================================================
--- historic/trunk/src/doc/guide/swing/action/basic/src/ex/Application.java 2009-02-15 14:24:43 UTC (rev 898)
+++ historic/trunk/src/doc/guide/swing/action/basic/src/ex/Application.java 2009-02-15 15:41:47 UTC (rev 899)
@@ -4,9 +4,9 @@
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import javax.swing.JFrame;
-import net.sf.japi.swing.ActionBuilder;
-import net.sf.japi.swing.ActionBuilderFactory;
-import net.sf.japi.swing.ActionMethod;
+import net.sf.japi.swing.action.ActionBuilder;
+import net.sf.japi.swing.action.ActionBuilderFactory;
+import net.sf.japi.swing.action.ActionMethod;
/** Example application. */
public class Application extends WindowAdapter {
@@ -53,7 +53,8 @@
// Implement this method for closing the current document
}
- @ActionMethod public void fileQuit() {
+ @ActionMethod
+ public void fileQuit() {
// Change this method for asking whether to really quit the application
frame.dispose();
}
Modified: historic/trunk/src/doc/guide/swing/action/fromScratch/src/net/sf/japi/examples/editor/Editor.java
===================================================================
--- historic/trunk/src/doc/guide/swing/action/fromScratch/src/net/sf/japi/examples/editor/Editor.java 2009-02-15 14:24:43 UTC (rev 898)
+++ historic/trunk/src/doc/guide/swing/action/fromScratch/src/net/sf/japi/examples/editor/Editor.java 2009-02-15 15:41:47 UTC (rev 899)
@@ -16,10 +16,10 @@
import javax.swing.JTextPane;
import static javax.swing.WindowConstants.DISPOSE_ON_CLOSE;
import javax.swing.text.DefaultEditorKit;
-import net.sf.japi.swing.ActionBuilder;
-import net.sf.japi.swing.ActionBuilderFactory;
-import net.sf.japi.swing.ActionMethod;
-import net.sf.japi.swing.ActionProvider;
+import net.sf.japi.swing.action.ActionBuilder;
+import net.sf.japi.swing.action.ActionBuilderFactory;
+import net.sf.japi.swing.action.ActionMethod;
+import net.sf.japi.swing.action.ActionProvider;
import org.jetbrains.annotations.Nullable;
public class Editor implements ActionProvider {
@@ -74,7 +74,8 @@
}
/** Action method. */
- @ActionMethod public void fileNew() {
+ @ActionMethod
+ public void fileNew() {
textPane.setText("");
file = null;
}
Modified: historic/trunk/src/doc/guide/swing/prefs/keys/src/ex/PrefsExampleApp.java
===================================================================
--- historic/trunk/src/doc/guide/swing/prefs/keys/src/ex/PrefsExampleApp.java 2009-02-15 14:24:43 UTC (rev 898)
+++ historic/trunk/src/doc/guide/swing/prefs/keys/src/ex/PrefsExampleApp.java 2009-02-15 15:41:47 UTC (rev 899)
@@ -1,7 +1,7 @@
package ex;
-import net.sf.japi.swing.ActionBuilder;
-import net.sf.japi.swing.ActionBuilderFactory;
+import net.sf.japi.swing.action.ActionBuilder;
+import net.sf.japi.swing.action.ActionBuilderFactory;
import net.sf.japi.swing.prefs.PreferencesGroup;
import static net.sf.japi.swing.prefs.PreferencesPane.showPreferencesDialog;
import net.sf.japi.swing.prefs.keys.KeyStrokePrefs;
Modified: historic/trunk/src/doc/guide/swing/tod/src/ex/TodExampleApp.java
===================================================================
--- historic/trunk/src/doc/guide/swing/tod/src/ex/TodExampleApp.java 2009-02-15 14:24:43 UTC (rev 898)
+++ historic/trunk/src/doc/guide/swing/tod/src/ex/TodExampleApp.java 2009-02-15 15:41:47 UTC (rev 899)
@@ -3,8 +3,8 @@
import javax.swing.JButton;
import javax.swing.JFrame;
import static javax.swing.WindowConstants.DISPOSE_ON_CLOSE;
-import net.sf.japi.swing.ActionBuilder;
-import net.sf.japi.swing.ActionBuilderFactory;
+import net.sf.japi.swing.action.ActionBuilder;
+import net.sf.japi.swing.action.ActionBuilderFactory;
import net.sf.japi.swing.tod.TipOfTheDayManager;
public class TodExampleApp {
Modified: libs/midi/trunk/src/prj/net/sf/japi/midi/gui/OutputConfigurator.java
===================================================================
--- libs/midi/trunk/src/prj/net/sf/japi/midi/gui/OutputConfigurator.java 2009-02-15 14:24:43 UTC (rev 898)
+++ libs/midi/trunk/src/prj/net/sf/japi/midi/gui/OutputConfigurator.java 2009-02-15 15:41:47 UTC (rev 899)
@@ -34,8 +34,8 @@
import javax.swing.SpinnerNumberModel;
import net.sf.japi.midi.MidiUtils;
import net.sf.japi.midi.OutputConfiguration;
-import net.sf.japi.swing.ActionBuilder;
-import net.sf.japi.swing.ActionBuilderFactory;
+import net.sf.japi.swing.action.ActionBuilder;
+import net.sf.japi.swing.action.ActionBuilderFactory;
import org.jetbrains.annotations.Nullable;
/** UI component for configuring a midi output.
Modified: libs/swing-about/trunk/src/prj/net/sf/japi/swing/about/AboutDialog.java
===================================================================
--- libs/swing-about/trunk/src/prj/net/sf/japi/swing/about/AboutDialog.java 2009-02-15 14:24:43 UTC (rev 898)
+++ libs/swing-about/trunk/src/prj/net/sf/japi/swing/about/AboutDialog.java 2009-02-15 15:41:47 UTC (rev 899)
@@ -42,10 +42,9 @@
import javax.swing.JScrollPane;
import javax.swing.JTabbedPane;
import javax.swing.JTextArea;
-import javax.swing.SwingConstants;
import javax.swing.UIManager;
-import net.sf.japi.swing.ActionBuilder;
-import net.sf.japi.swing.ActionBuilderFactory;
+import net.sf.japi.swing.action.ActionBuilder;
+import net.sf.japi.swing.action.ActionBuilderFactory;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
Deleted: libs/swing-action/trunk/src/prj/net/sf/japi/swing/ActionBuilder.java
===================================================================
--- libs/swing-action/trunk/src/prj/net/sf/japi/swing/ActionBuilder.java 2009-02-15 14:24:43 UTC (rev 898)
+++ libs/swing-action/trunk/src/prj/net/sf/japi/swing/ActionBuilder.java 2009-02-15 15:41:47 UTC (rev 899)
@@ -1,525 +0,0 @@
-/*
- * Copyright (C) 2009 Christian Hujer.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-package net.sf.japi.swing;
-
-import java.awt.Component;
-import java.awt.event.ActionEvent;
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-import java.util.prefs.Preferences;
-import javax.swing.AbstractAction;
-import javax.swing.Action;
-import javax.swing.ActionMap;
-import javax.swing.Icon;
-import javax.swing.JLabel;
-import javax.swing.JMenu;
-import javax.swing.JMenuBar;
-import javax.swing.JMenuItem;
-import javax.swing.JOptionPane;
-import javax.swing.JPopupMenu;
-import javax.swing.JToolBar;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-/** Interface for creating and initializing {@link Action}s that are localized, user configurable and may invoke their final methods using Reflection;
- * also handles extremely much useful stuff for i18n/l10n.
- * It is meant as a general service for creating Action objects that have some comfort for the programmer in several aspects:
- * <ul>
- * <li>Allow zero or more ResourceBundles to be used when creating Actions</li>
- * <li>Allow zero or more UserPreferences to be used when creating Actions</li>
- * <li>Manage an ActionMap to which created Actions are automatically added</li>
- * </ul>
- * You may choose to use one or more ActionBuilders, depending on the size of your application.
- * You may use to spread Action configuration information accross one or more ResourceBundles and one or more Preferences, as you wish.
- * When looking for values, the Preferences are queried first, in addition order, after that the ResourceBundles, again in addition order, until
- * a value was found. The behaviour when no value was found is undefined.
- * <h3>Usage</h3>
- * The recommended usage is to
- * <ol>
- * <li>
- * create and initialize an ActionBuilder similar as the following example code, put it somewhere at the start of your program:
- * <pre>
- * ActionBuilder myActionBuilder = ActionBuilder.getActionBuilder("MyApplication");
- * myActionBuilder.addBundle("com.mycompany.mypackage.myresource"); // not always required
- * myActionBuilder.addPref(MyClass.class);
- * </pre>
- * </li>
- * <li>
- * then use the ActionBuilder from anywhere within the application like this:
- * <pre>
- * ActionBuilder myActionBuilder = ActionBuilder.getActionBuilder("MyApplication");
- * Action myAction = myActionBuilder.createAction("load", this);
- * </pre>
- * </li>
- * </ol>
- * <p>
- * All actions created or initialized by an instance of this class are optionally put into that instance's {@link ActionMap}.
- * If they are stored, you can use that map for later retrieval.
- * </p>
- * <h4>Usage Notes: Builder Name</h4>
- * <ul>
- * <li>
- * The builder name is used to try to load a resource bundle when a bundle is created.
- * The builder name is used as package name for the bundle, the bundle name itself is "action".
- * Example: When calling <code>ActionBuilder.getActionBuilder("net.sf.japi.swing");</code> for the first time, it is tried to load a
- * {@link ResourceBundle} named <code>net.sf.japi.swing.actions</code> for that <code>ActionBuilder</code>.
- * This automatism has been implemented to save you from the need of initializing an ActionBuilder before use.
- * </li>
- * </ul>
- * <h4>Usage Notes: Action Key / Action Name</h4>
- * The key you supply as first argument of {@link #createAction(boolean, String, Object)} determines several things:
- * <ul>
- * <li>The base name for the different keys in the preferences / resource bundle and other known Action Keys:
- * <table border="1">
- * <tr><th>What</th><th>Preferences / Bundle key</th><th>Action key if stored in an action</th></tr>
- * <tr><td>An (somewhat unique) ID</td><td>(<var>basename</var> itself)</td><td>{@link #ACTION_ID}</td></tr>
- * <tr><td>The icon</td><td><code><var>basename</var> + ".icon"</code></td><td>{@link Action#SMALL_ICON}</td></tr>
- * <tr><td>The tooltip help</td><td><code><var>basename</var> + ".shortdescription"</code></td><td>{@link Action#SHORT_DESCRIPTION}</td></tr>
- * <tr><td>The long help</td><td><code><var>basename</var> + ".longdescription"</code></td><td>{@link Action#LONG_DESCRIPTION}</td></tr>
- * <tr><td>The text label</td><td><code><var>basename</var> + ".text"</code></td><td>{@link Action#NAME}</td></tr>
- * <tr><td>The keyboard accelerator</td><td><code><var>basename</var> + ".accel"</code></td><td>{@link Action#ACCELERATOR_KEY}</td></tr>
- * <tr><td>The alternate keyboard accelerator</td><td><code><var>basename</var> + ".accel2"</code></td><td>{@link #ACCELERATOR_KEY_2}</td></tr>
- * <tr><td>The mnemonic</td><td><code><var>basename</var> + ".mnemonic"</code></td><td>{@link Action#MNEMONIC_KEY}</td></tr>
- * <tr><td>The method name</td><td></td><td>{@link ReflectionAction#REFLECTION_METHOD_NAME}</td></tr>
- * <tr><td>The method</td><td></td><td>{@link ReflectionAction#REFLECTION_METHOD}</td></tr>
- * <tr><td>The boolean property name</td><td></td><td>{@link ToggleAction#REFLECTION_PROPERTY_NAME}</td></tr>
- * <tr><td>The target instance</td><td></td><td>{@link ReflectionAction#REFLECTION_TARGET}</td></tr>
- * <tr><td>Exception handler dialogs</td><td><code><var>basename</var> + ".exception." + <var>exception class name</var> + ...</code><br/>The message can be formatted with 1 parameter that will be the localized message of the thrown exception.</td><td>n/a</td></tr>
- * </table>
- * </li>
- * </ul>
- * <p>Some methods are not related to actions, yet take base keys:</p>
- * <ul>
- * <li>The methods for dialogs, e.g. {@link #showMessageDialog(Component, String, Object...)}:
- * <table border="1">
- * <tr><th>What</th><th>Preferences / Bundle key</th></tr>
- * <tr><td>Dialog title</td><td><code><var>basename</var> + ".title"</code></td></tr>
- * <tr><td>Dialog message</td><td><code><var>basename</var> + ".message"</code></td></tr>
- * <tr><td>Dialog messagetype </td><td><code><var>basename</var> + ".messagetype"</code><br/>The message type should be one of the message types defined in {@link JOptionPane}, e.g. {@link JOptionPane#PLAIN_MESSAGE}.</td></tr>
- * </table>
- * </li>
- * </ul>
- * <h4>Final Notes</h4>
- * <ul>
- * <li>
- * If by having read all this you think it might often be a good idea to use a package name as a builder name: this is completely right and the
- * most common way of using an ActionBuilder.
- * </li>
- * <li>
- * If you think you're too lazy to hold your own ActionBuilder reference and instead more often call {@link ActionBuilderFactory#getActionBuilder(String)}, just go ahead
- * and do so.
- * Looking up created ActionBuilders is extremely fast, and of course they are initialized exactly once, not more.
- * </li>
- * </ul>
- * @see AbstractAction
- * @see Action
- * @see Preferences
- * @see ResourceBundle
- * @todo think about toolbar interaction
- * @todo think about toolbar configuration
- * @todo whether a dialog is a onetime dialog should be a property and user configurable
- * @todo Implement serialization.
- * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
- */
-public interface ActionBuilder {
-
- /** The key used for storing a somewhat unique id for this Action. */
- @NotNull String ACTION_ID = "ActionID";
-
- /** The key used for storing an alternative accelerator for this Action.
- * Currently unused.
- */
- @NotNull String ACCELERATOR_KEY_2 = "AcceleratorKey2";
-
- /** Add a ResourceBundle to the list of used bundles.
- * @param baseName the base name of the resource bundle, a fully qualified class name
- * @see ResourceBundle#getBundle(String)
- */
- void addBundle(@NotNull String baseName);
-
- /** Get the ActionMap.
- * @return ActionMap
- */
- @NotNull ActionMap getActionMap();
-
- /** Add a ResourceBundle to the list of used bundles.
- * @param bundle ResourceBundle to add
- * @throws NullPointerException if <code>bundle == null</code>
- */
- void addBundle(@NotNull ResourceBundle bundle) throws NullPointerException;
-
- /** Add a parent to the list of used parents.
- * @param parent Parent to use if lookups failed in this ActionBuilder
- * WARNING: Adding a descendents as parents of ancestors or vice versa will result in endless recursion and thus stack overflow!
- * @throws NullPointerException if <code>parent == null</code>
- */
- void addParent(@NotNull ActionBuilder parent) throws NullPointerException;
-
- /** Add a Preferences to the list of used preferences.
- * @param pref Preferences to add
- * @throws NullPointerException if <code>pref == null</code>
- */
- void addPref(@NotNull Preferences pref) throws NullPointerException;
-
- /** Add a Preferences to the list of used preferences.
- * @param clazz the class whose package a user preference node is desired
- * @see Preferences#userNodeForPackage(Class)
- * @throws NullPointerException if <code>clazz == null</code>
- */
- void addPref(@NotNull Class<?> clazz);
-
- /** Creates actions.
- * This is a loop variant of {@link #createAction(boolean,String)}.
- * The actions created can be retrieved using {@link #getAction(String)} or via the ActionMap returned by {@link #getActionMap()}.
- * @param store whether to store the initialized Action in the ActionMap of this ActionBuilder
- * @param keys Keys of actions to create
- * @return Array with created actions
- * @throws NullPointerException in case keys is or contains <code>null</code>
- */
- Action[] createActions(boolean store, @NotNull String... keys) throws NullPointerException;
-
- /** Create an Action.
- * The created Action is automatically stored together with all other Actions created by this Builder instance in an ActionMap, which you can
- * retreive using {@link #getActionMap()}.
- * @param store whether to store the initialized Action in the ActionMap of this ActionBuilder
- * @param key Key for Action, which is used as basename for access to Preferences and ResourceBundles and as ActionMap key (may not be
- * <code>null</code>)
- * @return created Action, which is a dummy in the sense that its {@link Action#actionPerformed(ActionEvent)} method does not do anything
- * @throws NullPointerException in case <var>key</var> was <code>null</code>
- * @see #createAction(boolean,String,Object)
- * @see #createToggle(boolean,String,Object)
- * @see #initAction(boolean,Action,String)
- */
- Action createAction(boolean store, @NotNull String key) throws NullPointerException;
-
- /** Initialize an Action.
- * This is a convenience method for Action users which want to use the services provided by this {@link ActionBuilder} class but need more
- * sophisticated Action objects they created on their own.
- * So you can simply create an Action and pass it to this Initialization method to fill its data.
- * The initialized Action is automatically stored together with all other Actions created by this Builder instance in an ActionMap, which you can
- * retreive using {@link #getActionMap()}.
- * @param store whether to store the initialized Action in the ActionMap of this ActionBuilder
- * @param action Action to fill
- * @param key Key for Action, which is used as basename for access to Preferences and ResourceBundles and as ActionMap key (may not be <code>null</code>)
- * @return the supplied Action object (<var>action</var>) is returned for convenience
- * @throws NullPointerException in case <var>key</var> was <code>null</code>
- */
- @SuppressWarnings({"NestedAssignment"})
- @NotNull Action initAction(boolean store, @NotNull Action action, @NotNull String key) throws NullPointerException;
-
- /** Get a String.
- * First looks one pref after another, in their addition order.
- * Then looks one bundle after another, in their addition order.
- * @param key Key to get String for
- * @return the first value found or <code>null</code> if no value could be found
- * @throws NullPointerException if <var>key</var> is <code>null</code>
- */
- @Nullable String getString(@NotNull String key) throws NullPointerException;
-
- /** Get a String from the preferences, ignoring the resource bundles.
- * @param key Key to get String for
- * @return the first value found or <code>null</code> if no value could be found
- * @throws NullPointerException if <var>key</var> is <code>null</code>
- */
- @Nullable String getStringFromPrefs(@NotNull String key) throws NullPointerException;
-
- /** Get a String from the resource bundles, ignoring the preferences.
- * @param key Key to get String for
- * @return the first value found or <code>null</code> if no value could be found
- * @throws NullPointerException if <var>key</var> is <code>null</code>
- */
- @Nullable String getStringFromBundles(@NotNull String key) throws NullPointerException;
-
- /** Creates actions.
- * This is a loop variant of {@link #createAction(boolean,String,Object)}.
- * The actions created can be retrieved using {@link #getAction(String)} or via the ActionMap returned by {@link #getActionMap()}.
- * @param store whether to store the initialized Action in the ActionMap of this ActionBuilder
- * @param target Target object
- * @param keys Keys of actions to create
- * @return Array with created actions
- * @throws NullPointerException in case keys is or contains <code>null</code>
- */
- Action[] createActions(boolean store, Object target, String... keys) throws NullPointerException;
-
- /** Create an Action.
- * The created Action is automatically stored together with all other Actions created by this Builder instance in an ActionMap, which you can
- * retreive using {@link #getActionMap()}.
- * The supplied object needs to have a zero argument method named <var>key</var>.
- * You may pass <code>null</code> as object, which means that the object the method is invoked on is not defined yet.
- * You may safely use the Action, it will not throw any Exceptions upon {@link Action#actionPerformed(ActionEvent)} but simply silently do nothing.
- * The desired object can be set later using <code>action.putValue({@link ReflectionAction#REFLECTION_TARGET}, <var>object</var>)</code>.
- * <p />
- * Users of this method can assume that the returned object behaves quite like {@link ReflectionAction}.
- * Whether or not this method returns an instance of {@link ReflectionAction} should not be relied on.
- * @param store whether to store the initialized Action in the ActionMap of this ActionBuilder
- * @param key Key for Action, which is used as basename for access to Preferences and ResourceBundles, as ActionMap key and as Reflection Method
- * name within the supplied object (may not be <code>null</code>)
- * @param object Instance to invok...
[truncated message content] |
|
From: <chr...@us...> - 2009-02-15 20:34:52
|
Revision: 906
http://japi.svn.sourceforge.net/japi/?rev=906&view=rev
Author: christianhujer
Date: 2009-02-15 20:34:48 +0000 (Sun, 15 Feb 2009)
Log Message:
-----------
Added lib directories which are now required for building (even if empty).
Modified Paths:
--------------
tools/cstyle/trunk/build.xml
Added Paths:
-----------
games/jmines/trunk/lib/
progs/batcher/trunk/lib/
progs/cardlearn/trunk/lib/
progs/jhexview/trunk/lib/
progs/jirus/trunk/lib/
progs/jtype/trunk/lib/
progs/midilearn/trunk/lib/
progs/pffhtrain/trunk/lib/
progs/textedit/trunk/lib/
tools/findLongestPath/trunk/lib/
tools/fontbrowser/trunk/lib/
tools/jwget/trunk/lib/
tools/keystrokes/trunk/lib/
tools/midiDeviceLister/trunk/lib/
tools/midiMonitor/trunk/lib/
tools/prefsbrowser/trunk/lib/
tools/scriptEngineLister/trunk/lib/
Modified: tools/cstyle/trunk/build.xml
===================================================================
--- tools/cstyle/trunk/build.xml 2009-02-15 20:23:04 UTC (rev 905)
+++ tools/cstyle/trunk/build.xml 2009-02-15 20:34:48 UTC (rev 906)
@@ -15,210 +15,11 @@
~ You should have received a copy of the GNU General Public License
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
+<!DOCTYPE project [
+ <!ENTITY commonBuild SYSTEM "common/commonBuild.xml">
+]>
+<project name="CStyle" default="compile">
-<project name="cstyle" default="compile">
+ &commonBuild;
- <property name="module.version" value="0.1" />
- <property name="module.name" value="cstyle" />
- <property name="module.shortname" value="cstyle" />
- <property name="module.title" value="CStyle" />
- <property name="module.main.class" value="net.sf.japi.cstyle.CStyle" />
-
- <taskdef name="pack200" classpath="common/antlib/Pack200Task.jar" classname="com.sun.tools.apache.ant.pack200.Pack200Task" />
-
- <target
- name = "clean"
- description = "Cleans Sandbox"
- >
- <delete dir="classes" />
- <delete dir="docs" />
- </target>
-
- <target
- name = "compile"
- description = "Compiles production classes"
- >
- <mkdir dir="classes/production/${module.shortname}" />
- <mkdir dir="classes/test/${module.shortname}" />
- <javac
- srcdir="src/prj"
- destdir="classes/production/${module.shortname}"
- encoding="utf-8"
- source="1.5"
- target="1.5"
- >
- <classpath>
- <fileset dir="lib" includes="*.jar" excludes="LICENSE-*.jar" />
- <fileset dir="common/lib" includes="*.jar" excludes="LICENSE-*.jar" />
- </classpath>
- <exclude name="test/**/*.java" />
- </javac>
- <copy
- todir="classes/production/${module.shortname}"
- >
- <fileset dir="src/prj" includes="**/*.properties" excludes="test/**/*.properties" />
- <fileset dir="src/prj" includes="META-INF/services/**" />
- </copy>
- <copy
- todir="classes/production/${module.shortname}"
- >
- <fileset dir="lib" includes="LICENSE-*" />
- <fileset dir="." includes="COPYING" />
- </copy>
- </target>
-
- <target
- name = "dist"
- description = "Packs distribution archives."
- depends = "clean, compile"
- >
- <!--depends = "clean, compile, doc"
- -->
- <delete dir="dist" />
- <mkdir dir="dist" />
- <property name="distName" value="dist/${module.name}-${module.version}" />
- <parallel>
- <tar tarfile="${distName}.src.tar">
- <tarfileset dir="." prefix="${module.name}-${module.version}">
- <include name="src/**" />
- <include name="build.xml" />
- </tarfileset>
- </tar>
- <zip destfile="${distName}.src.zip">
- <zipfileset dir="." prefix="${module.name}-${module.version}">
- <include name="src/**" />
- <include name="build.xml" />
- </zipfileset>
- </zip>
- <jar destfile="${distName}.src.jar">
- <zipfileset dir="." prefix="${module.name}-${module.version}">
- <include name="src/**" />
- <include name="build.xml" />
- </zipfileset>
- </jar>
- <jar destfile="${distName}.jar">
- <zipfileset dir="classes/production/${module.shortname}"/>
- <manifest>
- <attribute name="Main-Class" value="${module.main.class}" />
- <attribute name="Class-Path" value="lib/annotations.jar lib/japi-lib-lang-0.1.jar lib/japi-lib-swing-about-0.1.jar lib/japi-lib-swing-action-0.1.jar" />
- <attribute name="Implementation-Title" value="${module.name}" />
- <attribute name="Implementation-Vendor" value="Christian Hujer + the JAPI Developers" />
- <attribute name="Implementation-Version" value="${module.version}" />
- <attribute name="Implementation-URL" value="http://sourceforge.net/projects/japi/" />
- </manifest>
- </jar>
- <tar tarfile="${distName}.doc.tar">
- <tarfileset dir="." prefix="${module.name}-${module.version}">
- <include name="docs/**" />
- <include name="build.xml" />
- </tarfileset>
- </tar>
- <zip destfile="${distName}.doc.zip">
- <zipfileset dir="." prefix="${module.name}-${module.version}">
- <include name="docs/**" />
- <include name="build.xml" />
- </zipfileset>
- </zip>
- <jar destfile="${distName}.doc.jar">
- <zipfileset dir="." prefix="${module.name}-${module.version}">
- <include name="docs/**" />
- </zipfileset>
- </jar>
- </parallel>
- <parallel>
- <gzip src="${distName}.src.tar" destfile="${distName}.src.tar.gz" />
- <bzip2 src="${distName}.src.tar" destfile="${distName}.src.tar.bz2" />
- <gzip src="${distName}.doc.tar" destfile="${distName}.doc.tar.gz" />
- <bzip2 src="${distName}.doc.tar" destfile="${distName}.doc.tar.bz2" />
- <pack200
- src="${distName}.jar"
- destfile="${distName}.pack.gz"
- gzipoutput="true"
- stripdebug="true"
- effort="9"
- keepfileorder="false"
- modificationtime="latest"
- deflatehint="false"
- />
- </parallel>
- <delete file="${distName}.src.tar" />
- <delete file="${distName}.doc.tar" />
- </target>
-
- <target
- name = "doc"
- description = "Creates public javadoc documentation."
- >
- <mkdir dir="docs/api" />
- <!--copy todir="docs/api" file="src/doc/api/public/copyright.html" />
- <copy todir="docs/api" file="src/doc/api/public/.htaccess" /-->
- <javadoc
- destdir = "docs/api"
- access = "protected"
- author = "yes"
- version = "yes"
- locale = "en_US"
- use = "yes"
- splitindex = "yes"
- windowtitle = "JAPI Library ${module.title} ${module.version} API documentation"
- doctitle = "JAPI<br />Yet another Java API<br />Library ${module.title} ${module.version} API documentation"
- header = "JAPI Library ${module.title} ${module.version}<br />API Documentation"
- footer = "JAPI<br />Yet another Java API<br />Library ${module.title} ${module.version} API documentation"
- bottom = "<div style=" text-align:center;">© 2005-2006 Christian Hujer. All rights reserved. See <a href="{@docRoot}/copyright.html">copyright</a></div>"
- serialwarn = "yes"
- charset = "utf-8"
- docencoding = "utf-8"
- encoding = "utf-8"
- source = "1.5"
- linksource = "yes"
- link = "${user.javadoc.link}"
- >
- <!--
- overview = "src/overview.html"
- -->
- <classpath>
- <fileset dir="lib" includes="annotations.jar" />
- </classpath>
- <sourcepath>
- <pathelement path="${user.javadoc.javasrc}" />
- <pathelement path="src/prj" />
- </sourcepath>
- <packageset
- dir="src/prj"
- defaultexcludes="yes"
- >
- <include name="net/**" />
- </packageset>
- <tag enabled="true" name="retval" description="Return Values:" scope="methods" />
- <tag enabled="true" name="pre" description="Preconditions:" scope="methods,constructors" />
- <tag enabled="true" name="post" description="Postconditions:" scope="methods" />
- <tag enabled="true" name="invariant" description="Invariant:" scope="methods,fields" />
- <tag enabled="true" name="note" description="Notes:" />
- <tag enabled="true" name="warning" description="Warnings:" />
- <!--tag enabled="true" name="todo" description="Todo:" /-->
- <taglet name="com.sun.tools.doclets.ToDoTaglet" path="" />
- <tag enabled="true" name="fixme" description="Fixme:" />
- <tag enabled="true" name="xxx" description="XXX:" />
- </javadoc>
- </target>
-
- <target
- name = "buildapp"
- description = "Creates executable jar"
- >
- <property name="appName" value="${module.name}-${module.version}-app" />
- <jar destfile="${appName}.jar">
- <zipfileset dir="classes/production/${module.shortname}"/>
- <zipgroupfileset dir="lib" includes="*.jar" excludes="LICENSE-*.jar" />
- <manifest>
- <attribute name="Main-Class" value="${module.main.class}" />
- <!--attribute name="Class-Path" value="lib/annotations.jar lib/japi-lib-lang-0.1.jar lib/japi-lib-swing-about-0.1.jar lib/japi-lib-swing-action-0.1.jar" /-->
- <attribute name="Implementation-Title" value="${module.name}" />
- <attribute name="Implementation-Vendor" value="Christian Hujer + the JAPI Developers" />
- <attribute name="Implementation-Version" value="${module.version}" />
- <attribute name="Implementation-URL" value="http://sourceforge.net/projects/japi/" />
- </manifest>
- </jar>
- </target>
-
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|