japi-cvs Mailing List for JAPI (Page 32)
Status: Beta
Brought to you by:
christianhujer
Menu
▾
▴
japi-cvs — svn commit digest list
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
(115) |
May
(11) |
Jun
(5) |
Jul
(2) |
Aug
(10) |
Sep
(35) |
Oct
(14) |
Nov
(49) |
Dec
(27) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(57) |
Feb
(1) |
Mar
|
Apr
(2) |
May
(25) |
Jun
(134) |
Jul
(76) |
Aug
(34) |
Sep
(27) |
Oct
(5) |
Nov
|
Dec
(1) |
| 2008 |
Jan
(3) |
Feb
|
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(63) |
Nov
(30) |
Dec
(43) |
| 2009 |
Jan
(10) |
Feb
(420) |
Mar
(67) |
Apr
(3) |
May
(61) |
Jun
(21) |
Jul
(19) |
Aug
|
Sep
(6) |
Oct
(16) |
Nov
(1) |
Dec
|
| 2010 |
Jan
(1) |
Feb
|
Mar
|
Apr
(7) |
May
(3) |
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
|
From: <chr...@us...> - 2008-01-15 00:03:56
|
Revision: 635
http://japi.svn.sourceforge.net/japi/?rev=635&view=rev
Author: christianhujer
Date: 2008-01-14 16:03:52 -0800 (Mon, 14 Jan 2008)
Log Message:
-----------
Added TODO.
Modified Paths:
--------------
libs/argparser/trunk/src/prj/net/sf/japi/io/args/ArgParser.java
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-01-06 20:36:30 UTC (rev 634)
+++ libs/argparser/trunk/src/prj/net/sf/japi/io/args/ArgParser.java 2008-01-15 00:03:52 UTC (rev 635)
@@ -48,6 +48,7 @@
* @todo Treat a single dash not as option
* @todo Alternative way of getting arguments by a callback mechanism which processes single arguments.
* @todo Disallow "W" as Option argument.
+ * @todo Move option names into a / the properties file.
*/
public final class ArgParser {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-01-06 20:36:32
|
Revision: 634
http://japi.svn.sourceforge.net/japi/?rev=634&view=rev
Author: christianhujer
Date: 2008-01-06 12:36:30 -0800 (Sun, 06 Jan 2008)
Log Message:
-----------
Improved help text for --exit.
Modified Paths:
--------------
libs/argparser/trunk/src/prj/net/sf/japi/io/args/messages.properties
libs/argparser/trunk/src/prj/net/sf/japi/io/args/messages_de.properties
Modified: libs/argparser/trunk/src/prj/net/sf/japi/io/args/messages.properties
===================================================================
--- libs/argparser/trunk/src/prj/net/sf/japi/io/args/messages.properties 2008-01-06 20:35:59 UTC (rev 633)
+++ libs/argparser/trunk/src/prj/net/sf/japi/io/args/messages.properties 2008-01-06 20:36:30 UTC (rev 634)
@@ -24,8 +24,7 @@
net.sf.japi.io.args.OptionType.TERMINAL=terminal
net.sf.japi.io.args.OptionType.TERMINAL.description=terminal
help=Display this help and exit.
-setExiting=Quit Java VM with error code.
-setNotExiting=Don't quit Java VM (default).
+setExiting=Quit Java VM with error code. Recommended in Makefiles, shell scripts or DOS batches.
helpHeader=
helpFooter=
setLevel=Sets the log level.
Modified: libs/argparser/trunk/src/prj/net/sf/japi/io/args/messages_de.properties
===================================================================
--- libs/argparser/trunk/src/prj/net/sf/japi/io/args/messages_de.properties 2008-01-06 20:35:59 UTC (rev 633)
+++ libs/argparser/trunk/src/prj/net/sf/japi/io/args/messages_de.properties 2008-01-06 20:36:30 UTC (rev 634)
@@ -24,8 +24,7 @@
net.sf.japi.io.args.OptionType.TERMINAL=abbrechend
net.sf.japi.io.args.OptionType.TERMINAL.description=abbrechend
help=Diese Hilfe anzeigen und beenden.
-setExiting=Java VM mit Fehlercode beenden
-setNotExiting=Java VM nicht beenden (Voreinstellung).
+setExiting=Java VM mit Fehlercode beenden. Empfohlen in Makefiles, Shell-Skripten oder DOS-Batches.
helpHeader=
helpFooter=
setLevel=Legt den Log-Level fest.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-01-06 20:36:05
|
Revision: 633
http://japi.svn.sourceforge.net/japi/?rev=633&view=rev
Author: christianhujer
Date: 2008-01-06 12:35:59 -0800 (Sun, 06 Jan 2008)
Log Message:
-----------
Minor documentation change.
Modified Paths:
--------------
libs/argparser/trunk/src/doc/start.xhtml
Modified: libs/argparser/trunk/src/doc/start.xhtml
===================================================================
--- libs/argparser/trunk/src/doc/start.xhtml 2007-12-16 23:40:08 UTC (rev 632)
+++ libs/argparser/trunk/src/doc/start.xhtml 2008-01-06 20:35:59 UTC (rev 633)
@@ -58,7 +58,7 @@
<li>
Indirect Audience: Users
<ul>
- <li>Makes command line argument parsing consistent between programs</li>
+ <li>Makes command line argument parsing more consistent between programs</li>
<li>Increases chance of at least a minimum help being available</li>
<li>Makes even command line argument value parsing consistent between programs</li>
</ul>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-12-16 23:40:11
|
Revision: 632
http://japi.svn.sourceforge.net/japi/?rev=632&view=rev
Author: christianhujer
Date: 2007-12-16 15:40:08 -0800 (Sun, 16 Dec 2007)
Log Message:
-----------
Implemented -W for GNU style long option parsing.
Modified Paths:
--------------
libs/argparser/trunk/src/prj/net/sf/japi/io/args/ArgParser.java
libs/argparser/trunk/src/prj/net/sf/japi/io/args/Option.java
libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/ArgParserTest.java
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 2007-10-21 12:57:24 UTC (rev 631)
+++ libs/argparser/trunk/src/prj/net/sf/japi/io/args/ArgParser.java 2007-12-16 23:40:08 UTC (rev 632)
@@ -43,11 +43,11 @@
* @todo better handling of boolean arguments
* @todo Handling of - for STDIN as input argument filestream
* @todo automatic printout of default values if property getter available.
- * @todo Add -W long for gnu style long option parsing
* @todo Let the programmer choose whether long options with one dash should be supported (for Ragnor). If long options with one dash are supported, short option concatenation should be disabled.
* @todo Abbreviation of long options as long as the abbreviation is unique
* @todo Treat a single dash not as option
* @todo Alternative way of getting arguments by a callback mechanism which processes single arguments.
+ * @todo Disallow "W" as Option argument.
*/
public final class ArgParser {
@@ -226,7 +226,12 @@
break;
}
final boolean doubleDash = arg.charAt(1) == '-';
- currentOption = arg.substring(doubleDash ? 2 : 1);
+ if ("-W".equals(arg)) {
+ currentOption = argIterator.next();
+ argIterator.remove();
+ } else {
+ currentOption = arg.substring(doubleDash ? 2 : 1);
+ }
final int indexOfEq = currentOption.indexOf('=');
if (indexOfEq != -1) {
argIterator.add(currentOption.substring(indexOfEq + 1));
Modified: libs/argparser/trunk/src/prj/net/sf/japi/io/args/Option.java
===================================================================
--- libs/argparser/trunk/src/prj/net/sf/japi/io/args/Option.java 2007-10-21 12:57:24 UTC (rev 631)
+++ libs/argparser/trunk/src/prj/net/sf/japi/io/args/Option.java 2007-12-16 23:40:08 UTC (rev 632)
@@ -46,6 +46,8 @@
* The option names.
* Usually this is two Strings, a single letter and a descriptive String.
* Multiple descriptive Strings as well as no single letter String are allowed.
+ * It is an error to use an empty array.
+ * It is an error to use "W".
* @note the supplied string values MUST consist of ASCII-letters only (match regex <code>[a-zA-Z]+</code>).
* @return option names
*/
Modified: libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/ArgParserTest.java
===================================================================
--- libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/ArgParserTest.java 2007-10-21 12:57:24 UTC (rev 631)
+++ libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/ArgParserTest.java 2007-12-16 23:40:08 UTC (rev 632)
@@ -38,6 +38,7 @@
/**
* Test for {@link ArgParser}.
+ * @todo Add a test that empty @Option value is not allowed.
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
*/
public class ArgParserTest {
@@ -331,6 +332,24 @@
}
/**
+ * Tests that GNU style options with -W are accepted and processed properly.
+ * @throws RequiredOptionsMissingException (unexpected)
+ * @throws TerminalException (unexpected)
+ * @throws UnknownOptionException (unexpected)
+ * @throws MissingArgumentException (unexpected)
+ * @throws ArgumentFileNotFoundException (unexpected)
+ */
+ @Test
+ public void testPosixStyleLong() throws RequiredOptionsMissingException, MissingArgumentException, TerminalException, UnknownOptionException, ArgumentFileNotFoundException {
+ final MockCommand command = new MockCommand();
+ ArgParser.parseAndRun(command, "-W", "input", "fooInput");
+ Assert.assertEquals("Option value must be stored.", "fooInput", command.getInput());
+ Assert.assertTrue("Run must be called even with zero arguments.", command.isRunCalled());
+ Assert.assertEquals("Argument list for invocation without arguments must be empty.", 0, command.getArgs().size());
+ // TODO -W as an option should either be disallowed or disable GNU style option parsing.
+ }
+
+ /**
* This MockCommand serves as a command for performing simple tests.
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-10-21 12:57:26
|
Revision: 631
http://japi.svn.sourceforge.net/japi/?rev=631&view=rev
Author: christianhujer
Date: 2007-10-21 05:57:24 -0700 (Sun, 21 Oct 2007)
Log Message:
-----------
Project file update for IJ7
Modified Paths:
--------------
japi.ipr
Modified: japi.ipr
===================================================================
--- japi.ipr 2007-10-21 12:01:49 UTC (rev 630)
+++ japi.ipr 2007-10-21 12:57:24 UTC (rev 631)
@@ -470,6 +470,7 @@
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="svn" />
</component>
+ <component name="WebServicesPlugin" addRequiredLibraries="true" />
<component name="com.intellij.jsf.UserDefinedFacesConfigs">
<option name="USER_DEFINED_CONFIGS">
<value>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-10-21 12:01:52
|
Revision: 630
http://japi.svn.sourceforge.net/japi/?rev=630&view=rev
Author: christianhujer
Date: 2007-10-21 05:01:49 -0700 (Sun, 21 Oct 2007)
Log Message:
-----------
Created ComponentFactory, moved factory methods from ISwingUtilities to ComponentFactory.
Modified Paths:
--------------
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/ISwingUtilities.java
Added Paths:
-----------
libs/swing-action/trunk/src/prj/net/sf/japi/swing/ComponentFactory.java
Added: libs/swing-action/trunk/src/prj/net/sf/japi/swing/ComponentFactory.java
===================================================================
--- libs/swing-action/trunk/src/prj/net/sf/japi/swing/ComponentFactory.java (rev 0)
+++ libs/swing-action/trunk/src/prj/net/sf/japi/swing/ComponentFactory.java 2007-10-21 12:01:49 UTC (rev 630)
@@ -0,0 +1,58 @@
+/*
+ * JAPI libs-swing-action is a library for creating and managing javax.swing.Action objects.
+ * Copyright (C) 2007 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 javax.swing.Action;
+import javax.swing.JToolBar;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/** The ComponentFactory provides some convenience methods for creating Swing Components.
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
+ */
+public class ComponentFactory {
+
+ /** Creates a JToolBar from Actions.
+ * @param name Name of the JToolBar, which is used as title for the undocked JToolBar.
+ * @param actions Actions to create JToolBar for.
+ * @return JToolBar with all supplied actions.
+ */
+ public static JToolBar createJToolBar(@Nullable final String name, @NotNull final Action... actions) {
+ final JToolBar toolBar = name != null ? new JToolBar(name) : new JToolBar();
+ for (final Action action : actions) {
+ toolBar.add(action);
+ }
+ return toolBar;
+ }
+
+ /** Creates a JToolBar from Actions.
+ * @param name Name of the JToolBar, which is used as title for the undocked JToolBar.
+ * @param actions Actions to create JToolBar for.
+ * @return JToolBar with all supplied actions.
+ */
+ public static JToolBar createJToolBar(@Nullable final String name, @NotNull final Iterable<Action> actions) {
+ final JToolBar toolBar = name != null ? new JToolBar(name) : new JToolBar();
+ for (final Action action : actions) {
+ toolBar.add(action);
+ }
+ return toolBar;
+ }
+
+} // class ComponentFactory
Property changes on: libs/swing-action/trunk/src/prj/net/sf/japi/swing/ComponentFactory.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ LF
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/ProgramFrame.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/ProgramFrame.java 2007-10-12 19:27:40 UTC (rev 629)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/ProgramFrame.java 2007-10-21 12:01:49 UTC (rev 630)
@@ -44,7 +44,6 @@
import javax.swing.JToolBar;
import net.sf.japi.progs.jeduca.jtest.Program;
import net.sf.japi.progs.jeduca.jtest.Settings;
-import net.sf.japi.progs.jeduca.swing.ISwingUtilities;
import net.sf.japi.progs.jeduca.swing.InternalFrameManager;
import net.sf.japi.progs.jeduca.swing.MenuManager;
import net.sf.japi.progs.jeduca.swing.OpenURLPane;
@@ -55,6 +54,7 @@
import net.sf.japi.progs.jeduca.swing.settings.SettingsPane;
import net.sf.japi.swing.ActionBuilder;
import net.sf.japi.swing.ActionBuilderFactory;
+import net.sf.japi.swing.ComponentFactory;
import net.sf.japi.swing.LookAndFeelManager;
import net.sf.japi.swing.ToolBarLayout;
import net.sf.japi.swing.about.AboutDialog;
@@ -339,7 +339,7 @@
* @return Toolbar with essential program actions
*/
public JToolBar createProgramToolBar() {
- return ISwingUtilities.createToolBar(RES.getString("programToolBar.name"), open, save, print);
+ return ComponentFactory.createJToolBar(RES.getString("programToolBar.name"), open, save, print);
}
/** Create Menu with essential program actions.
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/QuestionCollectionGUI.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/QuestionCollectionGUI.java 2007-10-12 19:27:40 UTC (rev 629)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/QuestionCollectionGUI.java 2007-10-21 12:01:49 UTC (rev 630)
@@ -34,9 +34,9 @@
import net.sf.japi.progs.jeduca.jtest.QuestionCollection;
import net.sf.japi.progs.jeduca.jtest.QuestionText;
import net.sf.japi.progs.jeduca.jtest.Settings;
-import net.sf.japi.progs.jeduca.swing.ISwingUtilities;
import net.sf.japi.swing.ActionBuilder;
import net.sf.japi.swing.ActionBuilderFactory;
+import net.sf.japi.swing.ComponentFactory;
/** User Interface for a Collection of Questions.
* @author $Author: chris $
@@ -330,7 +330,7 @@
* @return Navigation Toolbar
*/
public JToolBar createNavigationToolBar() {
- return ISwingUtilities.createToolBar(res.getString("navigationToolBar.name"), navigationActions);
+ return ComponentFactory.createJToolBar(res.getString("navigationToolBar.name"), navigationActions);
}
/** Get the index of the question currently being displayed.
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/ISwingUtilities.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/ISwingUtilities.java 2007-10-12 19:27:40 UTC (rev 629)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/ISwingUtilities.java 2007-10-21 12:01:49 UTC (rev 630)
@@ -29,40 +29,9 @@
import javax.swing.JToolBar;
/** JAPI Swing Utilities.
- * @todo provide methods which create toolbars that get information from preferences and resource bundles
*/
public class ISwingUtilities {
- /** Create a toolbar.
- * @param name Name for toolbar
- * @param actions Actions to create toolbar from
- * @return ToolBar for the specified actions.
- */
- public static JToolBar createToolBar(final String name, final Action... actions) {
- final JToolBar toolBar = new JToolBar(name);
- for (final Action action : actions) {
- final JButton button = new JButton(action);
- button.setText(null);
- toolBar.add(button);
- }
- return toolBar;
- }
-
- /** Create a toolbar.
- * @param name Name for toolbar
- * @param actions Actions to create toolbar from
- * @return ToolBar for the specified actions.
- */
- public static JToolBar createToolBar(final String name, final Iterable<Action> actions) {
- final JToolBar toolBar = new JToolBar(name);
- for (final Action action : actions) {
- final JButton button = new JButton(action);
- button.setText(null);
- toolBar.add(button);
- }
- return toolBar;
- }
-
/** Find the Window for a Component.
* Searches for a Frame or a Dialog which is the parent component of the supplied argument.
* Windows are treated like normal Components since in Java Windows can't stand for themselves but must have another Window as a parent.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-10-12 19:27:42
|
Revision: 629
http://japi.svn.sourceforge.net/japi/?rev=629&view=rev
Author: christianhujer
Date: 2007-10-12 12:27:40 -0700 (Fri, 12 Oct 2007)
Log Message:
-----------
[ 1812417 ] auto-add newline to help header and footer
Modified Paths:
--------------
libs/argparser/trunk/src/prj/net/sf/japi/io/args/BasicCommand.java
libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/BasicCommandTest.java
libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/RBMockCommand.properties
libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/RBMockCommandMyBundle.properties
Modified: libs/argparser/trunk/src/prj/net/sf/japi/io/args/BasicCommand.java
===================================================================
--- libs/argparser/trunk/src/prj/net/sf/japi/io/args/BasicCommand.java 2007-10-12 19:23:31 UTC (rev 628)
+++ libs/argparser/trunk/src/prj/net/sf/japi/io/args/BasicCommand.java 2007-10-12 19:27:40 UTC (rev 629)
@@ -165,7 +165,8 @@
* @return Help header.
*/
@NotNull public String getHelpHeader() {
- return getString("helpHeader");
+ final String helpHeader = getString("helpHeader");
+ return helpHeader.endsWith("\n") ? helpHeader : helpHeader + "\n";
}
/**
@@ -175,7 +176,8 @@
* @return Help footer.
*/
@NotNull public String getHelpFooter() {
- return getString("helpFooter");
+ final String helpFooter = getString("helpFooter");
+ return helpFooter.endsWith("\n") ? helpFooter : helpFooter + "\n";
}
/**
Modified: libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/BasicCommandTest.java
===================================================================
--- libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/BasicCommandTest.java 2007-10-12 19:23:31 UTC (rev 628)
+++ libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/BasicCommandTest.java 2007-10-12 19:27:40 UTC (rev 629)
@@ -115,4 +115,42 @@
Assert.assertEquals("HelpHeaderFromMyBundle", mock.getString("helpHeader"));
}
+ /**
+ * Tests that {@link BasicCommand#getHelpHeader()} returns either the empty String or a String ending on "\n".
+ * @see <a href="http://sourceforge.net/tracker/index.php?func=detail&aid=1812417&group_id=149894&atid=776737">[ 1812417 ] auto-add newline to help header and footer</a>
+ */
+ @Test
+ public void testGetHelpHeaderNewline() {
+ final RBMockCommand mock = new RBMockCommand();
+ mock.setReturnOwnBundle(false);
+ Assert.assertEquals("HelpHeaderFromDefaultBundle\n", mock.getHelpHeader());
+ mock.setReturnOwnBundle(true);
+ Assert.assertEquals("HelpHeaderFromMyBundle\n", mock.getHelpHeader());
+ }
+
+ /**
+ * Tests that {@link BasicCommand#getHelpFooter()} returns the value from the correct bundle.
+ */
+ @Test
+ public void testGetHelpFooter() {
+ final RBMockCommand mock = new RBMockCommand();
+ mock.setReturnOwnBundle(false);
+ Assert.assertEquals("HelpFooterFromDefaultBundle", mock.getString("helpFooter"));
+ mock.setReturnOwnBundle(true);
+ Assert.assertEquals("HelpFooterFromMyBundle", mock.getString("helpFooter"));
+ }
+
+ /**
+ * Tests that {@link BasicCommand#getHelpFooter()} returns either the empty String or a String ending on "\n".
+ * @see <a href="http://sourceforge.net/tracker/index.php?func=detail&aid=1812417&group_id=149894&atid=776737">[ 1812417 ] auto-add newline to help header and footer</a>
+ */
+ @Test
+ public void testGetHelpFooterNewline() {
+ final RBMockCommand mock = new RBMockCommand();
+ mock.setReturnOwnBundle(false);
+ Assert.assertEquals("HelpFooterFromDefaultBundle\n", mock.getHelpFooter());
+ mock.setReturnOwnBundle(true);
+ Assert.assertEquals("HelpFooterFromMyBundle\n", mock.getHelpFooter());
+ }
+
} // class BasicCommandTest
Modified: libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/RBMockCommand.properties
===================================================================
--- libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/RBMockCommand.properties 2007-10-12 19:23:31 UTC (rev 628)
+++ libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/RBMockCommand.properties 2007-10-12 19:27:40 UTC (rev 629)
@@ -19,3 +19,4 @@
testGetString1=String1FromDefaultBundle
testGetString2=String2FromDefaultBundle
helpHeader=HelpHeaderFromDefaultBundle
+helpFooter=HelpFooterFromDefaultBundle
Modified: libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/RBMockCommandMyBundle.properties
===================================================================
--- libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/RBMockCommandMyBundle.properties 2007-10-12 19:23:31 UTC (rev 628)
+++ libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/RBMockCommandMyBundle.properties 2007-10-12 19:27:40 UTC (rev 629)
@@ -18,3 +18,4 @@
#
testGetString1=String1FromMyBundle
helpHeader=HelpHeaderFromMyBundle
+helpFooter=HelpFooterFromMyBundle
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-10-12 19:23:32
|
Revision: 628
http://japi.svn.sourceforge.net/japi/?rev=628&view=rev
Author: christianhujer
Date: 2007-10-12 12:23:31 -0700 (Fri, 12 Oct 2007)
Log Message:
-----------
Added test case for IllegalArgumentException in case no missing options were given.
Modified Paths:
--------------
libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/RequiredOptionsMissingExceptionTest.java
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 2007-10-12 19:00:32 UTC (rev 627)
+++ libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/RequiredOptionsMissingExceptionTest.java 2007-10-12 19:23:31 UTC (rev 628)
@@ -51,4 +51,13 @@
testRequiredOptionsMissingException();
}
+ /**
+ * Tests that {@link RequiredOptionsMissingException#RequiredOptionsMissingException(String[])} throws an IllegalArgumentException in case no missing options were given.
+ * @throws IllegalArgumentException (expected).
+ */
+ @Test(expected = IllegalArgumentException.class)
+ public void testNoMissingOptions() throws Exception {
+ new RequiredOptionsMissingException();
+ }
+
} // class RequiredOptionsMissingExceptionTest
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-10-12 19:00:33
|
Revision: 627
http://japi.svn.sourceforge.net/japi/?rev=627&view=rev
Author: christianhujer
Date: 2007-10-12 12:00:32 -0700 (Fri, 12 Oct 2007)
Log Message:
-----------
Fixed bug in javac task: wrong srcdir.
Modified Paths:
--------------
common/trunk/commonBuild.xml
Modified: common/trunk/commonBuild.xml
===================================================================
--- common/trunk/commonBuild.xml 2007-09-30 14:03:43 UTC (rev 626)
+++ common/trunk/commonBuild.xml 2007-10-12 19:00:32 UTC (rev 627)
@@ -107,7 +107,7 @@
<target name="compile" description="Compiles this module.">
<mkdir dir="classes/production/${module.shortname}" />
<javac
- srcdir="src"
+ srcdir="src/prj"
destdir="classes/production/${module.shortname}"
encoding="utf-8"
source="${javaversion}"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-09-30 14:03:48
|
Revision: 626
http://japi.svn.sourceforge.net/japi/?rev=626&view=rev
Author: christianhujer
Date: 2007-09-30 07:03:43 -0700 (Sun, 30 Sep 2007)
Log Message:
-----------
Updated IntelliJ IDEA module files.
Modified Paths:
--------------
common/trunk/common.iml
historic/trunk/historic.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/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/jeduca/trunk/JEduca.iml
site/trunk/site.iml
tools/cstyle/trunk/cstyle.iml
tools/dircount/trunk/dircount.iml
tools/findLongestPath/trunk/findLongestPath.iml
tools/fontbrowser/trunk/fontbrowser.iml
tools/jwget/trunk/jwget.iml
tools/keystrokes/trunk/keystrokes.iml
tools/prefsbrowser/trunk/prefsbrowser.iml
tools/string2bytes/trunk/string2bytes.iml
Modified: common/trunk/common.iml
===================================================================
--- common/trunk/common.iml 2007-09-30 14:02:44 UTC (rev 625)
+++ common/trunk/common.iml 2007-09-30 14:03:43 UTC (rev 626)
@@ -33,6 +33,27 @@
<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>
Modified: historic/trunk/historic.iml
===================================================================
--- historic/trunk/historic.iml 2007-09-30 14:02:44 UTC (rev 625)
+++ historic/trunk/historic.iml 2007-09-30 14:03:43 UTC (rev 626)
@@ -44,6 +44,27 @@
<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>
Modified: libs/finance/trunk/libs-finance.iml
===================================================================
--- libs/finance/trunk/libs-finance.iml 2007-09-30 14:02:44 UTC (rev 625)
+++ libs/finance/trunk/libs-finance.iml 2007-09-30 14:03:43 UTC (rev 626)
@@ -50,6 +50,27 @@
<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>
Modified: libs/io/trunk/libs-io.iml
===================================================================
--- libs/io/trunk/libs-io.iml 2007-09-30 14:02:44 UTC (rev 625)
+++ libs/io/trunk/libs-io.iml 2007-09-30 14:03:43 UTC (rev 626)
@@ -52,6 +52,27 @@
<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>
Modified: libs/lang/trunk/libs-lang.iml
===================================================================
--- libs/lang/trunk/libs-lang.iml 2007-09-30 14:02:44 UTC (rev 625)
+++ libs/lang/trunk/libs-lang.iml 2007-09-30 14:03:43 UTC (rev 626)
@@ -53,6 +53,27 @@
<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>
Modified: libs/logging/trunk/libs-logging.iml
===================================================================
--- libs/logging/trunk/libs-logging.iml 2007-09-30 14:02:44 UTC (rev 625)
+++ libs/logging/trunk/libs-logging.iml 2007-09-30 14:03:43 UTC (rev 626)
@@ -52,6 +52,27 @@
<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>
Modified: libs/net/trunk/libs-net.iml
===================================================================
--- libs/net/trunk/libs-net.iml 2007-09-30 14:02:44 UTC (rev 625)
+++ libs/net/trunk/libs-net.iml 2007-09-30 14:03:43 UTC (rev 626)
@@ -53,6 +53,27 @@
<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>
Modified: libs/registry/trunk/libs-registry.iml
===================================================================
--- libs/registry/trunk/libs-registry.iml 2007-09-30 14:02:44 UTC (rev 625)
+++ libs/registry/trunk/libs-registry.iml 2007-09-30 14:03:43 UTC (rev 626)
@@ -52,6 +52,27 @@
<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>
Modified: libs/swing-about/trunk/libs-swing-about.iml
===================================================================
--- libs/swing-about/trunk/libs-swing-about.iml 2007-09-30 14:02:44 UTC (rev 625)
+++ libs/swing-about/trunk/libs-swing-about.iml 2007-09-30 14:03:43 UTC (rev 626)
@@ -53,6 +53,27 @@
<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>
Modified: libs/swing-action/trunk/libs-swing-action.iml
===================================================================
--- libs/swing-action/trunk/libs-swing-action.iml 2007-09-30 14:02:44 UTC (rev 625)
+++ libs/swing-action/trunk/libs-swing-action.iml 2007-09-30 14:03:43 UTC (rev 626)
@@ -54,6 +54,27 @@
<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>
Modified: libs/swing-app/trunk/libs-swing-app.iml
===================================================================
--- libs/swing-app/trunk/libs-swing-app.iml 2007-09-30 14:02:44 UTC (rev 625)
+++ libs/swing-app/trunk/libs-swing-app.iml 2007-09-30 14:03:43 UTC (rev 626)
@@ -52,6 +52,27 @@
<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>
Modified: libs/swing-bookmarks/trunk/libs-swing-bookmarks.iml
===================================================================
--- libs/swing-bookmarks/trunk/libs-swing-bookmarks.iml 2007-09-30 14:02:44 UTC (rev 625)
+++ libs/swing-bookmarks/trunk/libs-swing-bookmarks.iml 2007-09-30 14:03:43 UTC (rev 626)
@@ -55,6 +55,27 @@
<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>
Modified: libs/swing-extlib/trunk/libs-swing-extlib.iml
===================================================================
--- libs/swing-extlib/trunk/libs-swing-extlib.iml 2007-09-30 14:02:44 UTC (rev 625)
+++ libs/swing-extlib/trunk/libs-swing-extlib.iml 2007-09-30 14:03:43 UTC (rev 626)
@@ -53,6 +53,27 @@
<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>
Modified: libs/swing-font/trunk/libs-swing-font.iml
===================================================================
--- libs/swing-font/trunk/libs-swing-font.iml 2007-09-30 14:02:44 UTC (rev 625)
+++ libs/swing-font/trunk/libs-swing-font.iml 2007-09-30 14:03:43 UTC (rev 626)
@@ -53,6 +53,27 @@
<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>
Modified: libs/swing-keyprefs/trunk/libs-swing-keyprefs.iml
===================================================================
--- libs/swing-keyprefs/trunk/libs-swing-keyprefs.iml 2007-09-30 14:02:44 UTC (rev 625)
+++ libs/swing-keyprefs/trunk/libs-swing-keyprefs.iml 2007-09-30 14:03:43 UTC (rev 626)
@@ -55,6 +55,27 @@
<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>
Modified: libs/swing-list/trunk/libs-swing-list.iml
===================================================================
--- libs/swing-list/trunk/libs-swing-list.iml 2007-09-30 14:02:44 UTC (rev 625)
+++ libs/swing-list/trunk/libs-swing-list.iml 2007-09-30 14:03:43 UTC (rev 626)
@@ -54,6 +54,27 @@
<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>
Modified: libs/swing-misc/trunk/libs-swing-misc.iml
===================================================================
--- libs/swing-misc/trunk/libs-swing-misc.iml 2007-09-30 14:02:44 UTC (rev 625)
+++ libs/swing-misc/trunk/libs-swing-misc.iml 2007-09-30 14:03:43 UTC (rev 626)
@@ -53,6 +53,27 @@
<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>
Modified: libs/swing-prefs/trunk/libs-swing-prefs.iml
===================================================================
--- libs/swing-prefs/trunk/libs-swing-prefs.iml 2007-09-30 14:02:44 UTC (rev 625)
+++ libs/swing-prefs/trunk/libs-swing-prefs.iml 2007-09-30 14:03:43 UTC (rev 626)
@@ -55,6 +55,27 @@
<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>
Modified: libs/swing-proxyprefs/trunk/libs-swing-proxyprefs.iml
===================================================================
--- libs/swing-proxyprefs/trunk/libs-swing-proxyprefs.iml 2007-09-30 14:02:44 UTC (rev 625)
+++ libs/swing-proxyprefs/trunk/libs-swing-proxyprefs.iml 2007-09-30 14:03:43 UTC (rev 626)
@@ -54,6 +54,27 @@
<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>
Modified: libs/swing-recent/trunk/libs-swing-recent.iml
===================================================================
--- libs/swing-recent/trunk/libs-swing-recent.iml 2007-09-30 14:02:44 UTC (rev 625)
+++ libs/swing-recent/trunk/libs-swing-recent.iml 2007-09-30 14:03:43 UTC (rev 626)
@@ -50,6 +50,27 @@
<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>
Modified: libs/swing-tod/trunk/libs-swing-tod.iml
===================================================================
--- libs/swing-tod/trunk/libs-swing-tod.iml 2007-09-30 14:02:44 UTC (rev 625)
+++ libs/swing-tod/trunk/libs-swing-tod.iml 2007-09-30 14:03:43 UTC (rev 626)
@@ -53,6 +53,27 @@
<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>
Modified: libs/swing-treetable/trunk/libs-swing-treetable.iml
===================================================================
--- libs/swing-treetable/trunk/libs-swing-treetable.iml 2007-09-30 14:02:44 UTC (rev 625)
+++ libs/swing-treetable/trunk/libs-swing-treetable.iml 2007-09-30 14:03:43 UTC (rev 626)
@@ -52,6 +52,27 @@
<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>
Modified: libs/taglets/trunk/libs-taglets.iml
===================================================================
--- libs/taglets/trunk/libs-taglets.iml 2007-09-30 14:02:44 UTC (rev 625)
+++ libs/taglets/trunk/libs-taglets.iml 2007-09-30 14:03:43 UTC (rev 626)
@@ -54,6 +54,27 @@
<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>
Modified: libs/util/trunk/libs-util.iml
===================================================================
--- libs/util/trunk/libs-util.iml 2007-09-30 14:02:44 UTC (rev 625)
+++ libs/util/trunk/libs-util.iml 2007-09-30 14:03:43 UTC (rev 626)
@@ -53,6 +53,27 @@
<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>
Modified: libs/xml/trunk/libs-xml.iml
===================================================================
--- libs/xml/trunk/libs-xml.iml 2007-09-30 14:02:44 UTC (rev 625)
+++ libs/xml/trunk/libs-xml.iml 2007-09-30 14:03:43 UTC (rev 626)
@@ -52,6 +52,27 @@
<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>
Modified: progs/jeduca/trunk/JEduca.iml
===================================================================
--- progs/jeduca/trunk/JEduca.iml 2007-09-30 14:02:44 UTC (rev 625)
+++ progs/jeduca/trunk/JEduca.iml 2007-09-30 14:03:43 UTC (rev 626)
@@ -43,6 +43,27 @@
<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>
Modified: site/trunk/site.iml
===================================================================
--- site/trunk/site.iml 2007-09-30 14:02:44 UTC (rev 625)
+++ site/trunk/site.iml 2007-09-30 14:03:43 UTC (rev 626)
@@ -35,6 +35,27 @@
<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>
Modified: tools/cstyle/trunk/cstyle.iml
===================================================================
--- tools/cstyle/trunk/cstyle.iml 2007-09-30 14:02:44 UTC (rev 625)
+++ tools/cstyle/trunk/cstyle.iml 2007-09-30 14:03:43 UTC (rev 626)
@@ -54,6 +54,27 @@
<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>
Modified: tools/dircount/trunk/dircount.iml
===================================================================
--- tools/dircount/trunk/dircount.iml 2007-09-30 14:02:44 UTC (rev 625)
+++ tools/dircount/trunk/dircount.iml 2007-09-30 14:03:43 UTC (rev 626)
@@ -4,6 +4,7 @@
<exclude-output />
<content url="file://$MODULE_DIR$">
<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" />
@@ -37,6 +38,27 @@
<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>
Modified: tools/findLongestPath/trunk/findLongestPath.iml
===================================================================
--- tools/findLongestPath/trunk/findLongestPath.iml 2007-09-30 14:02:44 UTC (rev 625)
+++ tools/findLongestPath/trunk/findLongestPath.iml 2007-09-30 14:03:43 UTC (rev 626)
@@ -53,6 +53,27 @@
<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>
Modified: tools/fontbrowser/trunk/fontbrowser.iml
===================================================================
--- tools/fontbrowser/trunk/fontbrowser.iml 2007-09-30 14:02:44 UTC (rev 625)
+++ tools/fontbrowser/trunk/fontbrowser.iml 2007-09-30 14:03:43 UTC (rev 626)
@@ -53,6 +53,27 @@
<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>
Modified: tools/jwget/trunk/jwget.iml
===================================================================
--- tools/jwget/trunk/jwget.iml 2007-09-30 14:02:44 UTC (rev 625)
+++ tools/jwget/trunk/jwget.iml 2007-09-30 14:03:43 UTC (rev 626)
@@ -53,6 +53,27 @@
<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>
Modified: tools/keystrokes/trunk/keystrokes.iml
===================================================================
--- tools/keystrokes/trunk/keystrokes.iml 2007-09-30 14:02:44 UTC (rev 625)
+++ tools/keystrokes/trunk/keystrokes.iml 2007-09-30 14:03:43 UTC (rev 626)
@@ -53,6 +53,27 @@
<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>
Modified: tools/prefsbrowser/trunk/prefsbrowser.iml
===================================================================
--- tools/prefsbrowser/trunk/prefsbrowser.iml 2007-09-30 14:02:44 UTC (rev 625)
+++ tools/prefsbrowser/trunk/prefsbrowser.iml 2007-09-30 14:03:43 UTC (rev 626)
@@ -54,6 +54,27 @@
<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>
Modified: tools/string2bytes/trunk/string2bytes.iml
===================================================================
--- tools/string2bytes/trunk/string2bytes.iml 2007-09-30 14:02:44 UTC (rev 625)
+++ tools/string2bytes/trunk/string2bytes.iml 2007-09-30 14:03:43 UTC (rev 626)
@@ -39,6 +39,27 @@
<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>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-09-30 14:02:46
|
Revision: 625
http://japi.svn.sourceforge.net/japi/?rev=625&view=rev
Author: christianhujer
Date: 2007-09-30 07:02:44 -0700 (Sun, 30 Sep 2007)
Log Message:
-----------
Added dircount to IntelliJ IDEA project.
Modified Paths:
--------------
japi.ipr
Modified: japi.ipr
===================================================================
--- japi.ipr 2007-09-30 13:49:43 UTC (rev 624)
+++ japi.ipr 2007-09-30 14:02:44 UTC (rev 625)
@@ -414,6 +414,7 @@
<module fileurl="file://$PROJECT_DIR$/progs/jeduca/trunk/JEduca.iml" filepath="$PROJECT_DIR$/progs/jeduca/trunk/JEduca.iml" group="progs" />
<module fileurl="file://$PROJECT_DIR$/common/trunk/common.iml" filepath="$PROJECT_DIR$/common/trunk/common.iml" />
<module fileurl="file://$PROJECT_DIR$/tools/cstyle/trunk/cstyle.iml" filepath="$PROJECT_DIR$/tools/cstyle/trunk/cstyle.iml" group="tools" />
+ <module fileurl="file://$PROJECT_DIR$/tools/dircount/trunk/dircount.iml" filepath="$PROJECT_DIR$/tools/dircount/trunk/dircount.iml" group="tools" />
<module fileurl="file://$PROJECT_DIR$/tools/findLongestPath/trunk/findLongestPath.iml" filepath="$PROJECT_DIR$/tools/findLongestPath/trunk/findLongestPath.iml" group="tools" />
<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$/historic/trunk/historic.iml" filepath="$PROJECT_DIR$/historic/trunk/historic.iml" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-09-30 13:49:46
|
Revision: 624
http://japi.svn.sourceforge.net/japi/?rev=624&view=rev
Author: christianhujer
Date: 2007-09-30 06:49:43 -0700 (Sun, 30 Sep 2007)
Log Message:
-----------
Added test stub.
Added Paths:
-----------
tools/dircount/trunk/src/tst/
tools/dircount/trunk/src/tst/test/
tools/dircount/trunk/src/tst/test/net/
tools/dircount/trunk/src/tst/test/net/sf/
tools/dircount/trunk/src/tst/test/net/sf/japi/
tools/dircount/trunk/src/tst/test/net/sf/japi/dircount/
tools/dircount/trunk/src/tst/test/net/sf/japi/dircount/DirCountTest.java
Added: tools/dircount/trunk/src/tst/test/net/sf/japi/dircount/DirCountTest.java
===================================================================
--- tools/dircount/trunk/src/tst/test/net/sf/japi/dircount/DirCountTest.java (rev 0)
+++ tools/dircount/trunk/src/tst/test/net/sf/japi/dircount/DirCountTest.java 2007-09-30 13:49:43 UTC (rev 624)
@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2007, Your Corporation. All Rights Reserved.
+ */
+
+package test.net.sf.japi.dircount;
+
+import net.sf.japi.dircount.DirCount;
+
+/**
+ * Unit Test for {@link DirCount}.
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
+ */
+public class DirCountTest {
+
+} // class DirCountTest
Property changes on: tools/dircount/trunk/src/tst/test/net/sf/japi/dircount/DirCountTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ LF
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-09-30 12:46:10
|
Revision: 623
http://japi.svn.sourceforge.net/japi/?rev=623&view=rev
Author: christianhujer
Date: 2007-09-30 05:46:08 -0700 (Sun, 30 Sep 2007)
Log Message:
-----------
Added maximum depth and made printing the total optional.
Modified Paths:
--------------
tools/dircount/trunk/src/prj/net/sf/japi/dircount/DirCount.java
tools/dircount/trunk/src/prj/net/sf/japi/dircount/DirCount.properties
Modified: tools/dircount/trunk/src/prj/net/sf/japi/dircount/DirCount.java
===================================================================
--- tools/dircount/trunk/src/prj/net/sf/japi/dircount/DirCount.java 2007-09-30 11:49:23 UTC (rev 622)
+++ tools/dircount/trunk/src/prj/net/sf/japi/dircount/DirCount.java 2007-09-30 12:46:08 UTC (rev 623)
@@ -5,6 +5,7 @@
import java.util.List;
import net.sf.japi.io.args.ArgParser;
import net.sf.japi.io.args.LogCommand;
+import net.sf.japi.io.args.Option;
import org.jetbrains.annotations.NotNull;
/**
@@ -21,6 +22,21 @@
}
};
+ /** The default maximum depth. */
+ private static final int DEFAULT_MAX_DEPTH = -1;
+
+ /** The maximum depth to scan. */
+ private int maxDepth = DEFAULT_MAX_DEPTH;
+
+ /** The current depth in the scan. */
+ private int depth = 0;
+
+ /** The default whether to print the total. */
+ private static final boolean DEFAULT_PRINT_TOTAL = true;
+
+ /** Whether to print the total. */
+ private boolean printTotal = DEFAULT_PRINT_TOTAL;
+
/** Main program.
* @param args Command line arguments (try --help).
*/
@@ -28,16 +44,34 @@
ArgParser.simpleParseAndRun(new DirCount(), args);
}
+ /** Sets the maximum depth for printouts while scanning.
+ * @param maxDepth Maximum depth for printouts while scanning.
+ */
+ @Option("maxDepth")
+ public void setMaxDepth(@NotNull final Integer maxDepth) {
+ this.maxDepth = maxDepth;
+ }
+
+ /** Sets whether to print the total.
+ * @param printTotal <code>true</code> if the total should be printed, otherwise <code>false</code>.
+ */
+ @Option("printTotal")
+ public void setPrintTotal(@NotNull final Boolean printTotal) {
+ this.printTotal = printTotal;
+ }
+
/** {@inheritDoc} */
@SuppressWarnings({"InstanceMethodNamingConvention"})
public int run(@NotNull final List<String> args) throws Exception {
+ int sum = 0;
if (args.size() == 0) {
- count(".");
+ sum += count(".");
} else {
- int sum = 0;
for (final String dir : args) {
sum += count(dir);
}
+ }
+ if (printTotal) {
System.out.println("Total: " + sum);
}
return 0;
@@ -63,10 +97,14 @@
int count = 0;
final File[] subDirs = dir.listFiles(DIR_FILTER);
for (final File subDir : subDirs) {
+ depth++;
count += count(subDir);
+ depth--;
}
count += dir.listFiles().length;
- System.out.println(dir + ": " + count);
+ if (depth < (maxDepth & 0xFFFFFFFFl)) {
+ System.out.println(dir + ": " + count);
+ }
return count;
}
Modified: tools/dircount/trunk/src/prj/net/sf/japi/dircount/DirCount.properties
===================================================================
--- tools/dircount/trunk/src/prj/net/sf/japi/dircount/DirCount.properties 2007-09-30 11:49:23 UTC (rev 622)
+++ tools/dircount/trunk/src/prj/net/sf/japi/dircount/DirCount.properties 2007-09-30 12:46:08 UTC (rev 623)
@@ -2,3 +2,6 @@
# Copyright (c) 2007, Your Corporation. All Rights Reserved.
#
+helpHeader=Count the number of files and directories in a tree.
+setMaxDepth=Sets the maximum depth for which the sum should be printed.
+setPrintTotal=Sets whether the total should be printed (default: true).
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-09-30 11:49:28
|
Revision: 622
http://japi.svn.sourceforge.net/japi/?rev=622&view=rev
Author: christianhujer
Date: 2007-09-30 04:49:23 -0700 (Sun, 30 Sep 2007)
Log Message:
-----------
Added language options for CSS to IntelliJ IDEA module configuration.
Modified Paths:
--------------
libs/argparser/trunk/libs-argparser.iml
Modified: libs/argparser/trunk/libs-argparser.iml
===================================================================
--- libs/argparser/trunk/libs-argparser.iml 2007-09-30 11:01:34 UTC (rev 621)
+++ libs/argparser/trunk/libs-argparser.iml 2007-09-30 11:49:23 UTC (rev 622)
@@ -54,6 +54,27 @@
<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>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-09-30 11:01:36
|
Revision: 621
http://japi.svn.sourceforge.net/japi/?rev=621&view=rev
Author: christianhujer
Date: 2007-09-30 04:01:34 -0700 (Sun, 30 Sep 2007)
Log Message:
-----------
Moved META-INF to src/prj where it belongs.
Added Paths:
-----------
libs/argparser/trunk/src/prj/META-INF/
Removed Paths:
-------------
libs/argparser/trunk/src/META-INF/
Copied: libs/argparser/trunk/src/prj/META-INF (from rev 619, libs/argparser/trunk/src/META-INF)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-09-30 11:01:14
|
Revision: 620
http://japi.svn.sourceforge.net/japi/?rev=620&view=rev
Author: christianhujer
Date: 2007-09-30 04:01:11 -0700 (Sun, 30 Sep 2007)
Log Message:
-----------
Added missing properties for log config.
Modified Paths:
--------------
libs/argparser/trunk/src/prj/net/sf/japi/io/args/messages.properties
libs/argparser/trunk/src/prj/net/sf/japi/io/args/messages_de.properties
Modified: libs/argparser/trunk/src/prj/net/sf/japi/io/args/messages.properties
===================================================================
--- libs/argparser/trunk/src/prj/net/sf/japi/io/args/messages.properties 2007-09-27 21:36:45 UTC (rev 619)
+++ libs/argparser/trunk/src/prj/net/sf/japi/io/args/messages.properties 2007-09-30 11:01:11 UTC (rev 620)
@@ -29,3 +29,4 @@
helpHeader=
helpFooter=
setLevel=Sets the log level.
+setLogConfig=Sets the log configuration file.
Modified: libs/argparser/trunk/src/prj/net/sf/japi/io/args/messages_de.properties
===================================================================
--- libs/argparser/trunk/src/prj/net/sf/japi/io/args/messages_de.properties 2007-09-27 21:36:45 UTC (rev 619)
+++ libs/argparser/trunk/src/prj/net/sf/japi/io/args/messages_de.properties 2007-09-30 11:01:11 UTC (rev 620)
@@ -29,3 +29,4 @@
helpHeader=
helpFooter=
setLevel=Legt den Log-Level fest.
+setLogConfig=Legt die Konfigurationsdatei f\xFCr das Log fest.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-09-27 21:36:47
|
Revision: 619
http://japi.svn.sourceforge.net/japi/?rev=619&view=rev
Author: christianhujer
Date: 2007-09-27 14:36:45 -0700 (Thu, 27 Sep 2007)
Log Message:
-----------
First buildable version.
Modified Paths:
--------------
tools/dircount/trunk/build.xml
tools/dircount/trunk/src/prj/net/sf/japi/dircount/DirCount.java
Added Paths:
-----------
tools/dircount/trunk/lib/
tools/dircount/trunk/lib/japi-lib-argparser-trunk.jar
tools/dircount/trunk/src/prj/net/sf/japi/dircount/DirCount.properties
Modified: tools/dircount/trunk/build.xml
===================================================================
--- tools/dircount/trunk/build.xml 2007-09-27 21:15:29 UTC (rev 618)
+++ tools/dircount/trunk/build.xml 2007-09-27 21:36:45 UTC (rev 619)
@@ -26,7 +26,7 @@
<property name="module.title" value="DirCount" />
<property name="main.class" value="net.sf.japi.dircount.DirCount" />
- <taskdef name="pack200" classpath="lib/Pack200Task.jar" classname="com.sun.tools.apache.ant.pack200.Pack200Task" />
+ <taskdef name="pack200" classpath="common/antlib/Pack200Task.jar" classname="com.sun.tools.apache.ant.pack200.Pack200Task" />
<target
name = "clean"
@@ -51,6 +51,7 @@
>
<classpath>
<fileset dir="lib" includes="*.jar" excludes="LICENSE-*.jar" />
+ <fileset dir="common/lib" includes="*.jar" excludes="LICENSE-*.jar" />
</classpath>
<exclude name="test/**/*.java" />
</javac>
Added: tools/dircount/trunk/lib/japi-lib-argparser-trunk.jar
===================================================================
(Binary files differ)
Property changes on: tools/dircount/trunk/lib/japi-lib-argparser-trunk.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: tools/dircount/trunk/src/prj/net/sf/japi/dircount/DirCount.java
===================================================================
--- tools/dircount/trunk/src/prj/net/sf/japi/dircount/DirCount.java 2007-09-27 21:15:29 UTC (rev 618)
+++ tools/dircount/trunk/src/prj/net/sf/japi/dircount/DirCount.java 2007-09-27 21:36:45 UTC (rev 619)
@@ -3,6 +3,7 @@
import java.io.File;
import java.io.FileFilter;
import java.util.List;
+import net.sf.japi.io.args.ArgParser;
import net.sf.japi.io.args.LogCommand;
import org.jetbrains.annotations.NotNull;
@@ -20,6 +21,13 @@
}
};
+ /** Main program.
+ * @param args Command line arguments (try --help).
+ */
+ public static void main(@NotNull final String... args) {
+ ArgParser.simpleParseAndRun(new DirCount(), args);
+ }
+
/** {@inheritDoc} */
@SuppressWarnings({"InstanceMethodNamingConvention"})
public int run(@NotNull final List<String> args) throws Exception {
Added: tools/dircount/trunk/src/prj/net/sf/japi/dircount/DirCount.properties
===================================================================
--- tools/dircount/trunk/src/prj/net/sf/japi/dircount/DirCount.properties (rev 0)
+++ tools/dircount/trunk/src/prj/net/sf/japi/dircount/DirCount.properties 2007-09-27 21:36:45 UTC (rev 619)
@@ -0,0 +1,4 @@
+#
+# Copyright (c) 2007, Your Corporation. All Rights Reserved.
+#
+
Property changes on: tools/dircount/trunk/src/prj/net/sf/japi/dircount/DirCount.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ LF
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-09-27 21:15:33
|
Revision: 618
http://japi.svn.sourceforge.net/japi/?rev=618&view=rev
Author: christianhujer
Date: 2007-09-27 14:15:29 -0700 (Thu, 27 Sep 2007)
Log Message:
-----------
Fixed bogus mime types for build.xml and dircount.iml.
Property Changed:
----------------
tools/dircount/trunk/build.xml
tools/dircount/trunk/dircount.iml
Property changes on: tools/dircount/trunk/build.xml
___________________________________________________________________
Name: svn:mime-type
- application/xml
+ text/xml
Property changes on: tools/dircount/trunk/dircount.iml
___________________________________________________________________
Name: svn:mime-type
- application/xml
+ text/xml
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-09-27 21:14:46
|
Revision: 617
http://japi.svn.sourceforge.net/japi/?rev=617&view=rev
Author: christianhujer
Date: 2007-09-27 14:14:42 -0700 (Thu, 27 Sep 2007)
Log Message:
-----------
Adding stub for dircount
Added Paths:
-----------
tools/dircount/
tools/dircount/branches/
tools/dircount/tags/
tools/dircount/trunk/
tools/dircount/trunk/COPYING
tools/dircount/trunk/build.xml
tools/dircount/trunk/dircount.iml
tools/dircount/trunk/src/
tools/dircount/trunk/src/prj/
tools/dircount/trunk/src/prj/net/
tools/dircount/trunk/src/prj/net/sf/
tools/dircount/trunk/src/prj/net/sf/japi/
tools/dircount/trunk/src/prj/net/sf/japi/dircount/
tools/dircount/trunk/src/prj/net/sf/japi/dircount/DirCount.java
Property changes on: tools/dircount/trunk
___________________________________________________________________
Name: svn:externals
+ common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
Added: tools/dircount/trunk/COPYING
===================================================================
--- tools/dircount/trunk/COPYING (rev 0)
+++ tools/dircount/trunk/COPYING 2007-09-27 21:14:42 UTC (rev 617)
@@ -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/dircount/trunk/COPYING
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ LF
Added: tools/dircount/trunk/build.xml
===================================================================
(Binary files differ)
Property changes on: tools/dircount/trunk/build.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ LF
Added: tools/dircount/trunk/dircount.iml
===================================================================
(Binary files differ)
Property changes on: tools/dircount/trunk/dircount.iml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Added: tools/dircount/trunk/src/prj/net/sf/japi/dircount/DirCount.java
===================================================================
--- tools/dircount/trunk/src/prj/net/sf/japi/dircount/DirCount.java (rev 0)
+++ tools/dircount/trunk/src/prj/net/sf/japi/dircount/DirCount.java 2007-09-27 21:14:42 UTC (rev 617)
@@ -0,0 +1,65 @@
+package net.sf.japi.dircount;
+
+import java.io.File;
+import java.io.FileFilter;
+import java.util.List;
+import net.sf.japi.io.args.LogCommand;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * A command that counts subdirectories and files.
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
+ */
+public class DirCount extends LogCommand {
+
+ /** Filter for directories. */
+ private static final FileFilter DIR_FILTER = new FileFilter() {
+ /** {@inheritDoc} */
+ public boolean accept(final File pathname) {
+ return pathname.isDirectory();
+ }
+ };
+
+ /** {@inheritDoc} */
+ @SuppressWarnings({"InstanceMethodNamingConvention"})
+ public int run(@NotNull final List<String> args) throws Exception {
+ if (args.size() == 0) {
+ count(".");
+ } else {
+ int sum = 0;
+ for (final String dir : args) {
+ sum += count(dir);
+ }
+ System.out.println("Total: " + sum);
+ }
+ return 0;
+ }
+
+ /** Prints and returns the number of files found in the specified directory.
+ * @param dir Directory to create count for.
+ * @return The number of files found in the specified directory.
+ */
+ public int count(@NotNull final String dir) {
+ return count(new File(dir));
+ }
+
+ /** Prints and returns the number of files found in the specified directory.
+ * @param dir Directory to create count for.
+ * @return The number of files found in the specified directory.
+ * @throws IllegalArgumentException in case <var>dir</var> is not a directory.
+ */
+ public int count(@NotNull final File dir) {
+ if (!dir.isDirectory()) {
+ throw new IllegalArgumentException(dir + " is not a directory.");
+ }
+ int count = 0;
+ final File[] subDirs = dir.listFiles(DIR_FILTER);
+ for (final File subDir : subDirs) {
+ count += count(subDir);
+ }
+ count += dir.listFiles().length;
+ System.out.println(dir + ": " + count);
+ return count;
+ }
+
+} // class DirCount
Property changes on: tools/dircount/trunk/src/prj/net/sf/japi/dircount/DirCount.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ LF
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-09-27 20:45:49
|
Revision: 616
http://japi.svn.sourceforge.net/japi/?rev=616&view=rev
Author: christianhujer
Date: 2007-09-27 13:45:46 -0700 (Thu, 27 Sep 2007)
Log Message:
-----------
Updated IntelliJ IDEA project files to reflect the new source code layout structure.
Modified Paths:
--------------
common/trunk/common.iml
historic/trunk/historic.iml
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/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/jeduca/trunk/JEduca.iml
site/trunk/site.iml
tools/cstyle/trunk/cstyle.iml
tools/findLongestPath/trunk/findLongestPath.iml
tools/fontbrowser/trunk/fontbrowser.iml
tools/jwget/trunk/jwget.iml
tools/keystrokes/trunk/keystrokes.iml
tools/prefsbrowser/trunk/prefsbrowser.iml
tools/string2bytes/trunk/string2bytes.iml
Modified: common/trunk/common.iml
===================================================================
--- common/trunk/common.iml 2007-09-23 21:19:05 UTC (rev 615)
+++ common/trunk/common.iml 2007-09-27 20:45:46 UTC (rev 616)
@@ -2,9 +2,7 @@
<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" isTestSource="false" />
- </content>
+ <content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="annotations" level="project" />
@@ -35,27 +33,6 @@
<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>
Modified: historic/trunk/historic.iml
===================================================================
--- historic/trunk/historic.iml 2007-09-23 21:19:05 UTC (rev 615)
+++ historic/trunk/historic.iml 2007-09-27 20:45:46 UTC (rev 616)
@@ -44,27 +44,6 @@
<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>
Modified: libs/argparser/trunk/libs-argparser.iml
===================================================================
--- libs/argparser/trunk/libs-argparser.iml 2007-09-23 21:19:05 UTC (rev 615)
+++ libs/argparser/trunk/libs-argparser.iml 2007-09-27 20:45:46 UTC (rev 616)
@@ -3,9 +3,9 @@
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/doc" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" packagePrefix="test" />
+ <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" />
@@ -54,27 +54,6 @@
<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>
Modified: libs/finance/trunk/libs-finance.iml
===================================================================
--- libs/finance/trunk/libs-finance.iml 2007-09-23 21:19:05 UTC (rev 615)
+++ libs/finance/trunk/libs-finance.iml 2007-09-27 20:45:46 UTC (rev 616)
@@ -2,9 +2,7 @@
<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" isTestSource="false" />
- </content>
+ <content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library">
@@ -52,27 +50,6 @@
<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>
Modified: libs/io/trunk/libs-io.iml
===================================================================
--- libs/io/trunk/libs-io.iml 2007-09-23 21:19:05 UTC (rev 615)
+++ libs/io/trunk/libs-io.iml 2007-09-27 20:45:46 UTC (rev 616)
@@ -3,7 +3,7 @@
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/prj" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
@@ -52,27 +52,6 @@
<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>
Modified: libs/lang/trunk/libs-lang.iml
===================================================================
--- libs/lang/trunk/libs-lang.iml 2007-09-23 21:19:05 UTC (rev 615)
+++ libs/lang/trunk/libs-lang.iml 2007-09-27 20:45:46 UTC (rev 616)
@@ -3,8 +3,8 @@
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" packagePrefix="test" />
+ <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" />
@@ -53,27 +53,6 @@
<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>
Modified: libs/logging/trunk/libs-logging.iml
===================================================================
--- libs/logging/trunk/libs-logging.iml 2007-09-23 21:19:05 UTC (rev 615)
+++ libs/logging/trunk/libs-logging.iml 2007-09-27 20:45:46 UTC (rev 616)
@@ -3,7 +3,7 @@
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/prj" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
@@ -52,27 +52,6 @@
<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>
Modified: libs/net/trunk/libs-net.iml
===================================================================
--- libs/net/trunk/libs-net.iml 2007-09-23 21:19:05 UTC (rev 615)
+++ libs/net/trunk/libs-net.iml 2007-09-27 20:45:46 UTC (rev 616)
@@ -3,7 +3,7 @@
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/prj" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
@@ -53,27 +53,6 @@
<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>
Modified: libs/registry/trunk/libs-registry.iml
===================================================================
--- libs/registry/trunk/libs-registry.iml 2007-09-23 21:19:05 UTC (rev 615)
+++ libs/registry/trunk/libs-registry.iml 2007-09-27 20:45:46 UTC (rev 616)
@@ -3,7 +3,7 @@
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/prj" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
@@ -52,27 +52,6 @@
<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>
Modified: libs/swing-about/trunk/libs-swing-about.iml
===================================================================
--- libs/swing-about/trunk/libs-swing-about.iml 2007-09-23 21:19:05 UTC (rev 615)
+++ libs/swing-about/trunk/libs-swing-about.iml 2007-09-27 20:45:46 UTC (rev 616)
@@ -3,7 +3,7 @@
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/prj" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
@@ -53,27 +53,6 @@
<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>
Modified: libs/swing-action/trunk/libs-swing-action.iml
===================================================================
--- libs/swing-action/trunk/libs-swing-action.iml 2007-09-23 21:19:05 UTC (rev 615)
+++ libs/swing-action/trunk/libs-swing-action.iml 2007-09-27 20:45:46 UTC (rev 616)
@@ -3,8 +3,8 @@
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" packagePrefix="test" />
+ <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" />
@@ -54,27 +54,6 @@
<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>
Modified: libs/swing-app/trunk/libs-swing-app.iml
===================================================================
--- libs/swing-app/trunk/libs-swing-app.iml 2007-09-23 21:19:05 UTC (rev 615)
+++ libs/swing-app/trunk/libs-swing-app.iml 2007-09-27 20:45:46 UTC (rev 616)
@@ -3,7 +3,7 @@
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/prj" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
@@ -52,27 +52,6 @@
<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>
Modified: libs/swing-bookmarks/trunk/libs-swing-bookmarks.iml
===================================================================
--- libs/swing-bookmarks/trunk/libs-swing-bookmarks.iml 2007-09-23 21:19:05 UTC (rev 615)
+++ libs/swing-bookmarks/trunk/libs-swing-bookmarks.iml 2007-09-27 20:45:46 UTC (rev 616)
@@ -3,7 +3,7 @@
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/prj" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
@@ -55,27 +55,6 @@
<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>
Modified: libs/swing-extlib/trunk/libs-swing-extlib.iml
===================================================================
--- libs/swing-extlib/trunk/libs-swing-extlib.iml 2007-09-23 21:19:05 UTC (rev 615)
+++ libs/swing-extlib/trunk/libs-swing-extlib.iml 2007-09-27 20:45:46 UTC (rev 616)
@@ -3,8 +3,8 @@
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" packagePrefix="test" />
+ <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" />
@@ -53,27 +53,6 @@
<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>
Modified: libs/swing-font/trunk/libs-swing-font.iml
===================================================================
--- libs/swing-font/trunk/libs-swing-font.iml 2007-09-23 21:19:05 UTC (rev 615)
+++ libs/swing-font/trunk/libs-swing-font.iml 2007-09-27 20:45:46 UTC (rev 616)
@@ -3,7 +3,7 @@
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/prj" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
@@ -53,27 +53,6 @@
<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>
Modified: libs/swing-keyprefs/trunk/libs-swing-keyprefs.iml
===================================================================
--- libs/swing-keyprefs/trunk/libs-swing-keyprefs.iml 2007-09-23 21:19:05 UTC (rev 615)
+++ libs/swing-keyprefs/trunk/libs-swing-keyprefs.iml 2007-09-27 20:45:46 UTC (rev 616)
@@ -3,7 +3,7 @@
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/prj" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
@@ -55,27 +55,6 @@
<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>
Modified: libs/swing-list/trunk/libs-swing-list.iml
===================================================================
--- libs/swing-list/trunk/libs-swing-list.iml 2007-09-23 21:19:05 UTC (rev 615)
+++ libs/swing-list/trunk/libs-swing-list.iml 2007-09-27 20:45:46 UTC (rev 616)
@@ -3,8 +3,8 @@
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" packagePrefix="test" />
+ <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" />
@@ -54,27 +54,6 @@
<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>
Modified: libs/swing-misc/trunk/libs-swing-misc.iml
===================================================================
--- libs/swing-misc/trunk/libs-swing-misc.iml 2007-09-23 21:19:05 UTC (rev 615)
+++ libs/swing-misc/trunk/libs-swing-misc.iml 2007-09-27 20:45:46 UTC (rev 616)
@@ -3,7 +3,7 @@
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/prj" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
@@ -53,27 +53,6 @@
<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>
Modified: libs/swing-prefs/trunk/libs-swing-prefs.iml
===================================================================
--- libs/swing-prefs/trunk/libs-swing-prefs.iml 2007-09-23 21:19:05 UTC (rev 615)
+++ libs/swing-prefs/trunk/libs-swing-prefs.iml 2007-09-27 20:45:46 UTC (rev 616)
@@ -3,8 +3,8 @@
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" packagePrefix="test" />
+ <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" />
@@ -55,27 +55,6 @@
<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>
Modified: libs/swing-proxyprefs/trunk/libs-swing-proxyprefs.iml
===================================================================
--- libs/swing-proxyprefs/trunk/libs-swing-proxyprefs.iml 2007-09-23 21:19:05 UTC (rev 615)
+++ libs/swing-proxyprefs/trunk/libs-swing-proxyprefs.iml 2007-09-27 20:45:46 UTC (rev 616)
@@ -3,7 +3,7 @@
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/prj" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
@@ -54,27 +54,6 @@
<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>
Modified: libs/swing-recent/trunk/libs-swing-recent.iml
===================================================================
--- libs/swing-recent/trunk/libs-swing-recent.iml 2007-09-23 21:19:05 UTC (rev 615)
+++ libs/swing-recent/trunk/libs-swing-recent.iml 2007-09-27 20:45:46 UTC (rev 616)
@@ -2,9 +2,7 @@
<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" isTestSource="false" />
- </content>
+ <content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library">
@@ -52,27 +50,6 @@
<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>
Modified: libs/swing-tod/trunk/libs-swing-tod.iml
===================================================================
--- libs/swing-tod/trunk/libs-swing-tod.iml 2007-09-23 21:19:05 UTC (rev 615)
+++ libs/swing-tod/trunk/libs-swing-tod.iml 2007-09-27 20:45:46 UTC (rev 616)
@@ -3,7 +3,7 @@
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/prj" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
@@ -53,27 +53,6 @@
<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>
Modified: libs/swing-treetable/trunk/libs-swing-treetable.iml
===================================================================
--- libs/swing-treetable/trunk/libs-swing-treetable.iml 2007-09-23 21:19:05 UTC (rev 615)
+++ libs/swing-treetable/trunk/libs-swing-treetable.iml 2007-09-27 20:45:46 UTC (rev 616)
@@ -3,7 +3,7 @@
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/prj" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
@@ -52,27 +52,6 @@
<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>
Modified: libs/taglets/trunk/libs-taglets.iml
===================================================================
--- libs/taglets/trunk/libs-taglets.iml 2007-09-23 21:19:05 UTC (rev 615)
+++ libs/taglets/trunk/libs-taglets.iml 2007-09-27 20:45:46 UTC (rev 616)
@@ -3,7 +3,8 @@
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/doc" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/prj" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
@@ -53,27 +54,6 @@
<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>
Modified: libs/util/trunk/libs-util.iml
===================================================================
--- libs/util/trunk/libs-util.iml 2007-09-23 21:19:05 UTC (rev 615)
+++ libs/util/trunk/libs-util.iml 2007-09-27 20:45:46 UTC (rev 616)
@@ -3,8 +3,8 @@
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" packagePrefix="test" />
+ <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" />
@@ -53,27 +53,6 @@
<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>
Modified: libs/xml/trunk/libs-xml.iml
===================================================================
--- libs/xml/trunk/libs-xml.iml 2007-09-23 21:19:05 UTC (rev 615)
+++ libs/xml/trunk/libs-xml.iml 2007-09-27 20:45:46 UTC (rev 616)
@@ -3,7 +3,7 @@
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/prj" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
@@ -52,27 +52,6 @@
<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>
Modified: progs/jeduca/trunk/JEduca.iml
===================================================================
--- progs/jeduca/trunk/JEduca.iml 2007-09-23 21:19:05 UTC (rev 615)
+++ progs/jeduca/trunk/JEduca.iml 2007-09-27 20:45:46 UTC (rev 616)
@@ -3,7 +3,7 @@
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/prj" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
@@ -43,27 +43,6 @@
<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>
Modified: site/trunk/site.iml
===================================================================
--- site/trunk/site.iml 2007-09-23 21:19:05 UTC (rev 615)
+++ site/trunk/site.iml 2007-09-27 20:45:46 UTC (rev 616)
@@ -3,7 +3,7 @@
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/doc" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
@@ -35,27 +35,6 @@
<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>
Modified: tools/cstyle/trunk/cstyle.iml
===================================================================
--- tools/cstyle/trunk/cstyle.iml 2007-09-23 21:19:05 UTC (rev 615)
+++ tools/cstyle/trunk/cstyle.iml 2007-09-27 20:45:46 UTC (rev 616)
@@ -3,8 +3,8 @@
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" packagePrefix="test" />
+ <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" />
@@ -54,27 +54,6 @@
<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>
Modified: tools/findLongestPath/trunk/findLongestPath.iml
===================================================================
--- tools/findLongestPath/trunk/findLongestPath.iml 2007-09-23 21:19:05 UTC (rev 615)
+++ tools/findLongestPath/trunk/findLongestPath.iml 2007-09-27 20:45:46 UTC (rev 616)
@@ -3,7 +3,7 @@
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/prj" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
@@ -53,27 +53,6 @@
<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>
Modified: tools/fontbrowser/trunk/fontbrowser.iml
===================================================================
--- tools/fontbrowser/trunk/fontbrowser.iml 2007-09-23 21:19:05 UTC (rev 615)
+++ tools/fontbrowser/trunk/fontbrowser.iml 2007-09-27 20:45:46 UTC (rev 616)
@@ -3,7 +3,7 @@
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude...
[truncated message content] |
|
From: <chr...@us...> - 2007-09-23 21:19:09
|
Revision: 615
http://japi.svn.sourceforge.net/japi/?rev=615&view=rev
Author: christianhujer
Date: 2007-09-23 14:19:05 -0700 (Sun, 23 Sep 2007)
Log Message:
-----------
Changing src layout to make project directory layout compatible with NetBeans.
Modified Paths:
--------------
common/trunk/commonBuild.xml
japi.ipr
libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/ArgParserTest.java
Added Paths:
-----------
libs/argparser/trunk/src/prj/
libs/argparser/trunk/src/prj/net/
libs/argparser/trunk/src/tst/
libs/argparser/trunk/src/tst/test/
libs/io/trunk/src/prj/
libs/io/trunk/src/prj/net/
libs/lang/trunk/src/prj/
libs/lang/trunk/src/prj/net/
libs/lang/trunk/src/tst/
libs/lang/trunk/src/tst/test/
libs/logging/trunk/src/prj/
libs/logging/trunk/src/prj/net/
libs/net/trunk/src/prj/
libs/net/trunk/src/prj/net/
libs/registry/trunk/src/prj/
libs/registry/trunk/src/prj/net/
libs/swing-about/trunk/src/prj/
libs/swing-about/trunk/src/prj/net/
libs/swing-action/trunk/src/prj/
libs/swing-action/trunk/src/prj/net/
libs/swing-action/trunk/src/tst/
libs/swing-action/trunk/src/tst/test/
libs/swing-app/trunk/src/prj/
libs/swing-app/trunk/src/prj/net/
libs/swing-bookmarks/trunk/src/prj/
libs/swing-bookmarks/trunk/src/prj/net/
libs/swing-extlib/trunk/src/prj/
libs/swing-extlib/trunk/src/prj/net/
libs/swing-extlib/trunk/src/tst/
libs/swing-extlib/trunk/src/tst/test/
libs/swing-font/trunk/src/prj/
libs/swing-font/trunk/src/prj/net/
libs/swing-keyprefs/trunk/src/prj/
libs/swing-keyprefs/trunk/src/prj/net/
libs/swing-list/trunk/src/prj/
libs/swing-list/trunk/src/prj/net/
libs/swing-list/trunk/src/tst/
libs/swing-list/trunk/src/tst/test/
libs/swing-misc/trunk/src/prj/
libs/swing-misc/trunk/src/prj/net/
libs/swing-prefs/trunk/src/prj/
libs/swing-prefs/trunk/src/prj/net/
libs/swing-prefs/trunk/src/tst/
libs/swing-prefs/trunk/src/tst/test/
libs/swing-proxyprefs/trunk/src/prj/
libs/swing-proxyprefs/trunk/src/prj/net/
libs/swing-tod/trunk/src/prj/
libs/swing-tod/trunk/src/prj/net/
libs/swing-treetable/trunk/src/prj/
libs/swing-treetable/trunk/src/prj/net/
libs/taglets/trunk/src/prj/
libs/taglets/trunk/src/prj/net/
libs/util/trunk/src/prj/
libs/util/trunk/src/prj/net/
libs/util/trunk/src/tst/
libs/util/trunk/src/tst/test/
libs/xml/trunk/src/prj/
libs/xml/trunk/src/prj/net/
progs/jeduca/trunk/src/prj/
progs/jeduca/trunk/src/prj/net/
progs/jeduca/trunk/src/prj/overview.html
tools/cstyle/trunk/src/prj/
tools/cstyle/trunk/src/prj/net/
tools/cstyle/trunk/src/tst/
tools/cstyle/trunk/src/tst/test/
tools/findLongestPath/trunk/src/prj/
tools/findLongestPath/trunk/src/prj/net/
tools/fontbrowser/trunk/src/prj/
tools/fontbrowser/trunk/src/prj/net/
tools/jwget/trunk/src/prj/
tools/jwget/trunk/src/prj/net/
tools/keystrokes/trunk/src/prj/
tools/keystrokes/trunk/src/prj/net/
tools/prefsbrowser/trunk/src/prj/
tools/prefsbrowser/trunk/src/prj/net/
tools/string2bytes/trunk/src/prj/
tools/string2bytes/trunk/src/prj/net/
tools/string2bytes/trunk/src/tst/
tools/string2bytes/trunk/src/tst/test/
Removed Paths:
-------------
libs/argparser/trunk/src/net/
libs/argparser/trunk/src/test/
libs/io/trunk/src/net/
libs/lang/trunk/src/net/
libs/lang/trunk/src/test/
libs/logging/trunk/src/net/
libs/net/trunk/src/net/
libs/registry/trunk/src/net/
libs/swing-about/trunk/src/net/
libs/swing-action/trunk/src/net/
libs/swing-action/trunk/src/test/
libs/swing-app/trunk/src/net/
libs/swing-bookmarks/trunk/src/net/
libs/swing-extlib/trunk/src/net/
libs/swing-extlib/trunk/src/test/
libs/swing-font/trunk/src/net/
libs/swing-keyprefs/trunk/src/net/
libs/swing-list/trunk/src/net/
libs/swing-list/trunk/src/test/
libs/swing-misc/trunk/src/net/
libs/swing-prefs/trunk/src/net/
libs/swing-prefs/trunk/src/test/
libs/swing-proxyprefs/trunk/src/net/
libs/swing-tod/trunk/src/net/
libs/swing-treetable/trunk/src/net/
libs/taglets/trunk/src/net/
libs/util/trunk/src/net/
libs/util/trunk/src/test/
libs/xml/trunk/src/net/
progs/jeduca/trunk/src/net/
progs/jeduca/trunk/src/overview.html
tools/cstyle/trunk/src/net/
tools/cstyle/trunk/src/test/
tools/findLongestPath/trunk/src/net/
tools/fontbrowser/trunk/src/net/
tools/jwget/trunk/src/net/
tools/keystrokes/trunk/src/net/
tools/prefsbrowser/trunk/src/net/
tools/string2bytes/trunk/src/net/
tools/string2bytes/trunk/src/test/
Modified: common/trunk/commonBuild.xml
===================================================================
--- common/trunk/commonBuild.xml 2007-09-23 20:21:52 UTC (rev 614)
+++ common/trunk/commonBuild.xml 2007-09-23 21:19:05 UTC (rev 615)
@@ -3,6 +3,23 @@
<!--
~ Common build.xml for use in multiple projects.
~
+ ~ The source structure of a project must be like this:
+ ~ * src/prj - the production source
+ ~ supported files:
+ ~ - **/*.java (compiled)
+ ~ - **/*.properties (copied)
+ ~ - META-INF/services/** (copied)
+ ~ * src/tst - the unit test source
+ ~ supported files:
+ ~ - **/*.java (compiled)
+ ~ - **/*.properties (copied)
+ ~ * src/doc - the documentation source (not for javadoc, but for hypertext documentation, e.g. examples)
+ ~ currently ignored except in checkstyle
+ ~
+ ~ The destination structure of a project (generated files) will be:
+ ~ * dist/** - contains distribution archives
+ ~ * classes/** - contains compiled classes
+ ~
~ Note:
~ Taskdefs and targets are sorted alphabetically.
~ Properties are also sorted alphabetically unless they depend on each other.
@@ -72,7 +89,9 @@
<checkstyle
config="${commonPath}/sun_checks.xml"
>
- <fileset dir="src" includes="**/*.java,**/*.properties" />
+ <fileset dir="src/doc" includes="**/*.java,**/*.properties" />
+ <fileset dir="src/prj" includes="**/*.java,**/*.properties" />
+ <fileset dir="src/tst" includes="**/*.java,**/*.properties" />
</checkstyle>
</target>
@@ -96,15 +115,13 @@
debug="yes"
>
<classpath refid="class.path" />
- <exclude name="test/**/*.java" />
- <exclude name="doc/**/*.java" />
<exclude name="**/package-info.java" />
</javac>
<copy
todir="classes/production/${module.shortname}"
>
- <fileset dir="src" includes="net/**/*.properties" />
- <fileset dir="src" includes="META-INF/services/**" />
+ <fileset dir="src/prj" includes="net/**/*.properties" />
+ <fileset dir="src/prj" includes="META-INF/services/**" />
</copy>
</target>
@@ -229,12 +246,9 @@
<!--pathelement path="src" /--><!-- This is handled via packageset. -->
</sourcepath>
<packageset
- dir="src"
+ dir="src/prj"
defaultexcludes="yes"
- >
- <include name="net/**" />
- <exclude name="test/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" />
@@ -280,13 +294,10 @@
<classpath refid="class.path" />
<sourcepath>
<pathelement path="${user.javadoc.javasrc}" />
- <pathelement path="src" />
</sourcepath>
- <packageset
- dir="src"
- defaultexcludes="yes"
- >
- </packageset>
+ <packageset dir="src/doc" defaultexcludes="yes" />
+ <packageset dir="src/prj" defaultexcludes="yes" />
+ <packageset dir="src/tst" defaultexcludes="yes" />
<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" />
@@ -306,7 +317,7 @@
<mkdir dir="classes/test/${module.shortname}" />
<mkdir dir="docs/test" />
<javac
- srcdir="src"
+ srcdir="src/tst"
destdir="classes/test/${module.shortname}"
encoding="utf-8"
source="${javaversion}"
@@ -315,13 +326,12 @@
>
<classpath refid="class.path" />
<classpath location="classes/production/${module.shortname}" />
- <include name="test/**/*.java" />
<exclude name="**/package-info.java" />
</javac>
<copy
todir="classes/test/${module.shortname}"
>
- <fileset dir="src" includes="test/**/*.properties" />
+ <fileset dir="src/tst" includes="test/**/*.properties" />
</copy>
<junit printsummary="yes" haltonfailure="yes">
<classpath refid="class.path" />
@@ -330,7 +340,7 @@
<formatter type="plain" />
<formatter type="xml" />
<batchtest todir="docs/test">
- <fileset dir="src">
+ <fileset dir="src/tst">
<include name="test/**/*Test.java" />
<exclude name="test/**/Abstract*Test.java" />
</fileset>
Modified: japi.ipr
===================================================================
--- japi.ipr 2007-09-23 20:21:52 UTC (rev 614)
+++ japi.ipr 2007-09-23 21:19:05 UTC (rev 615)
@@ -60,8 +60,6 @@
<option name="JD_KEEP_EMPTY_RETURN" value="false" />
<option name="HTML_ELEMENTS_TO_INSERT_NEW_LINE_BEFORE" value="" />
<option name="HTML_DO_NOT_INDENT_CHILDREN_OF" value="" />
- <option name="METHOD_ANNOTATION_WRAP" value="1" />
- <option name="FIELD_ANNOTATION_WRAP" value="1" />
<option name="ENUM_CONSTANTS_WRAP" value="2" />
<ADDITIONAL_INDENT_OPTIONS fileType="js">
<option name="INDENT_SIZE" value="4" />
@@ -223,6 +221,7 @@
<inspection_tool class="UnnecessaryEnumModifier" level="WARNING" enabled="true" />
<inspection_tool class="UnnecessaryInterfaceModifier" level="WARNING" enabled="true" />
<inspection_tool class="UnnecessaryQualifierForThis" level="WARNING" enabled="true" />
+ <inspection_tool class="FallthruInSwitchStatement" level="WARNING" enabled="true" />
</profile>
</profiles>
<list size="4">
@@ -445,6 +444,7 @@
<module fileurl="file://$PROJECT_DIR$/libs/util/trunk/libs-util.iml" filepath="$PROJECT_DIR$/libs/util/trunk/libs-util.iml" group="libs" />
<module fileurl="file://$PROJECT_DIR$/libs/xml/trunk/libs-xml.iml" filepath="$PROJECT_DIR$/libs/xml/trunk/libs-xml.iml" group="libs" />
<module fileurl="file://$PROJECT_DIR$/tools/prefsbrowser/trunk/prefsbrowser.iml" filepath="$PROJECT_DIR$/tools/prefsbrowser/trunk/prefsbrowser.iml" group="tools" />
+ <module fileurl="file://$PROJECT_DIR$/progs/requisitor/trunk/requisitor.iml" filepath="$PROJECT_DIR$/progs/requisitor/trunk/requisitor.iml" group="progs" />
<module fileurl="file://$PROJECT_DIR$/site/trunk/site.iml" filepath="$PROJECT_DIR$/site/trunk/site.iml" />
<module fileurl="file://$PROJECT_DIR$/tools/string2bytes/trunk/string2bytes.iml" filepath="$PROJECT_DIR$/tools/string2bytes/trunk/string2bytes.iml" group="tools" />
</modules>
Copied: libs/argparser/trunk/src/prj/net (from rev 614, libs/argparser/trunk/src/net)
Copied: libs/argparser/trunk/src/tst/test (from rev 614, libs/argparser/trunk/src/test)
Modified: libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/ArgParserTest.java
===================================================================
--- libs/argparser/trunk/src/test/net/sf/japi/io/args/ArgParserTest.java 2007-09-23 20:21:52 UTC (rev 614)
+++ libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/ArgParserTest.java 2007-09-23 21:19:05 UTC (rev 615)
@@ -264,7 +264,7 @@
@Test
public void testOptionsFromFileSingleLine() throws RequiredOptionsMissingException, MissingArgumentException, TerminalException, UnknownOptionException, ArgumentFileNotFoundException {
final MockCommand command = new MockCommand();
- ArgParser.parseAndRun(command, "@src/test/net/sf/japi/io/args/ArgParserTest_OptionsFileSingleLine");
+ ArgParser.parseAndRun(command, "@src/tst/test/net/sf/japi/io/args/ArgParserTest_OptionsFileSingleLine");
final List<String> args = command.getArgs();
Assert.assertEquals("Option value must be stored.", "fooInput", command.getInput());
Assert.assertTrue("Run must be called even with zero arguments.", command.isRunCalled());
@@ -285,7 +285,7 @@
@Test
public void testOptionsFromFileMultiple() throws RequiredOptionsMissingException, MissingArgumentException, TerminalException, UnknownOptionException, ArgumentFileNotFoundException {
final MockCommand command = new MockCommand();
- ArgParser.parseAndRun(command, "@src/test/net/sf/japi/io/args/ArgParserTest_MultipleOptionsFileMaster");
+ ArgParser.parseAndRun(command, "@src/tst/test/net/sf/japi/io/args/ArgParserTest_MultipleOptionsFileMaster");
final List<String> args = command.getArgs();
Assert.assertEquals("Option value must be stored.", "fooInput", command.getInput());
Assert.assertTrue("Run must be called even with zero arguments.", command.isRunCalled());
@@ -301,7 +301,7 @@
* @throws UnknownOptionException (unexpected)
* @throws MissingArgumentException (unexpected)
* @throws ArgumentFileNotFoundException (unexpected)
- * @see <a href="http://sourceforge.net/tracker/index.php?func=detail&aid=1750198&group_id=149894&atid=776740">[ 1750198 ] Allow single dash instead of double dash</a>
+ * @see <a href="http://sourceforge.net/tracker/index.php?func=detail&aid=1750198&group_id=149894&atid=776740">[ 1750198 ] Allow single dash instead of double dash</a>
*/
@Test
public void testSingleDashOption() throws RequiredOptionsMissingException, MissingArgumentException, TerminalException, UnknownOptionException, ArgumentFileNotFoundException {
@@ -319,7 +319,7 @@
* @throws UnknownOptionException (unexpected)
* @throws MissingArgumentException (unexpected)
* @throws ArgumentFileNotFoundException (unexpected)
- * @see <a href="http://sourceforge.net/tracker/index.php?func=detail&aid=1750198&group_id=149894&atid=776740">[ 1750198 ] Allow single dash instead of double dash</a>
+ * @see <a href="http://sourceforge.net/tracker/index.php?func=detail&aid=1750198&group_id=149894&atid=776740">[ 1750198 ] Allow single dash instead of double dash</a>
*/
@Test
public void testSingleDashOptionWithEquals() throws RequiredOptionsMissingException, MissingArgumentException, TerminalException, UnknownOptionException, ArgumentFileNotFoundException {
Copied: libs/io/trunk/src/prj/net (from rev 614, libs/io/trunk/src/net)
Copied: libs/lang/trunk/src/prj/net (from rev 614, libs/lang/trunk/src/net)
Copied: libs/lang/trunk/src/tst/test (from rev 614, libs/lang/trunk/src/test)
Copied: libs/logging/trunk/src/prj/net (from rev 614, libs/logging/trunk/src/net)
Copied: libs/net/trunk/src/prj/net (from rev 614, libs/net/trunk/src/net)
Copied: libs/registry/trunk/src/prj/net (from rev 614, libs/registry/trunk/src/net)
Copied: libs/swing-about/trunk/src/prj/net (from rev 614, libs/swing-about/trunk/src/net)
Copied: libs/swing-action/trunk/src/prj/net (from rev 614, libs/swing-action/trunk/src/net)
Copied: libs/swing-action/trunk/src/tst/test (from rev 614, libs/swing-action/trunk/src/test)
Copied: libs/swing-app/trunk/src/prj/net (from rev 614, libs/swing-app/trunk/src/net)
Copied: libs/swing-bookmarks/trunk/src/prj/net (from rev 614, libs/swing-bookmarks/trunk/src/net)
Copied: libs/swing-extlib/trunk/src/prj/net (from rev 614, libs/swing-extlib/trunk/src/net)
Copied: libs/swing-extlib/trunk/src/tst/test (from rev 614, libs/swing-extlib/trunk/src/test)
Copied: libs/swing-font/trunk/src/prj/net (from rev 614, libs/swing-font/trunk/src/net)
Copied: libs/swing-keyprefs/trunk/src/prj/net (from rev 614, libs/swing-keyprefs/trunk/src/net)
Copied: libs/swing-list/trunk/src/prj/net (from rev 614, libs/swing-list/trunk/src/net)
Copied: libs/swing-list/trunk/src/tst/test (from rev 614, libs/swing-list/trunk/src/test)
Copied: libs/swing-misc/trunk/src/prj/net (from rev 614, libs/swing-misc/trunk/src/net)
Copied: libs/swing-prefs/trunk/src/prj/net (from rev 614, libs/swing-prefs/trunk/src/net)
Copied: libs/swing-prefs/trunk/src/tst/test (from rev 614, libs/swing-prefs/trunk/src/test)
Copied: libs/swing-proxyprefs/trunk/src/prj/net (from rev 614, libs/swing-proxyprefs/trunk/src/net)
Copied: libs/swing-tod/trunk/src/prj/net (from rev 614, libs/swing-tod/trunk/src/net)
Copied: libs/swing-treetable/trunk/src/prj/net (from rev 614, libs/swing-treetable/trunk/src/net)
Copied: libs/taglets/trunk/src/prj/net (from rev 614, libs/taglets/trunk/src/net)
Copied: libs/util/trunk/src/prj/net (from rev 614, libs/util/trunk/src/net)
Copied: libs/util/trunk/src/tst/test (from rev 614, libs/util/trunk/src/test)
Copied: libs/xml/trunk/src/prj/net (from rev 614, libs/xml/trunk/src/net)
Deleted: progs/jeduca/trunk/src/overview.html
===================================================================
--- progs/jeduca/trunk/src/overview.html 2007-09-23 20:21:52 UTC (rev 614)
+++ progs/jeduca/trunk/src/overview.html 2007-09-23 21:19:05 UTC (rev 615)
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="de">
- <head>
- <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=utf-8" />
- <title>API Documentation overview for JAPI JEduca</title>
- </head>
- <body>
- <p>
- API Documentation overview for JAPI JEduca.
- </p>
- <p>
- JAPI JEduca is a software for running electronic tests.
- Currently it supports multiple choice test and uses the same file format as KEduca.
- </p>
- </body>
-</html>
Copied: progs/jeduca/trunk/src/prj/net (from rev 614, progs/jeduca/trunk/src/net)
Copied: progs/jeduca/trunk/src/prj/overview.html (from rev 614, progs/jeduca/trunk/src/overview.html)
===================================================================
--- progs/jeduca/trunk/src/prj/overview.html (rev 0)
+++ progs/jeduca/trunk/src/prj/overview.html 2007-09-23 21:19:05 UTC (rev 615)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="de">
+ <head>
+ <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=utf-8" />
+ <title>API Documentation overview for JAPI JEduca</title>
+ </head>
+ <body>
+ <p>
+ API Documentation overview for JAPI JEduca.
+ </p>
+ <p>
+ JAPI JEduca is a software for running electronic tests.
+ Currently it supports multiple choice test and uses the same file format as KEduca.
+ </p>
+ </body>
+</html>
Copied: tools/cstyle/trunk/src/prj/net (from rev 614, tools/cstyle/trunk/src/net)
Copied: tools/cstyle/trunk/src/tst/test (from rev 614, tools/cstyle/trunk/src/test)
Copied: tools/findLongestPath/trunk/src/prj/net (from rev 614, tools/findLongestPath/trunk/src/net)
Copied: tools/fontbrowser/trunk/src/prj/net (from rev 614, tools/fontbrowser/trunk/src/net)
Copied: tools/jwget/trunk/src/prj/net (from rev 614, tools/jwget/trunk/src/net)
Copied: tools/keystrokes/trunk/src/prj/net (from rev 614, tools/keystrokes/trunk/src/net)
Copied: tools/prefsbrowser/trunk/src/prj/net (from rev 614, tools/prefsbrowser/trunk/src/net)
Copied: tools/string2bytes/trunk/src/prj/net (from rev 614, tools/string2bytes/trunk/src/net)
Copied: tools/string2bytes/trunk/src/tst/test (from rev 614, tools/string2bytes/trunk/src/test)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-09-23 20:21:54
|
Revision: 614
http://japi.svn.sourceforge.net/japi/?rev=614&view=rev
Author: christianhujer
Date: 2007-09-23 13:21:52 -0700 (Sun, 23 Sep 2007)
Log Message:
-----------
Added tests for preferences. Fixed update bug.
Modified Paths:
--------------
libs/swing-prefs/trunk/libs-swing-prefs.iml
libs/swing-prefs/trunk/src/net/sf/japi/swing/prefs/PreferencesPane.java
Added Paths:
-----------
libs/swing-prefs/trunk/src/test/
libs/swing-prefs/trunk/src/test/net/
libs/swing-prefs/trunk/src/test/net/sf/
libs/swing-prefs/trunk/src/test/net/sf/japi/
libs/swing-prefs/trunk/src/test/net/sf/japi/swing/
libs/swing-prefs/trunk/src/test/net/sf/japi/swing/prefs/
libs/swing-prefs/trunk/src/test/net/sf/japi/swing/prefs/MockActionBuilder.java
libs/swing-prefs/trunk/src/test/net/sf/japi/swing/prefs/MockPrefs.java
libs/swing-prefs/trunk/src/test/net/sf/japi/swing/prefs/PreferencesPaneTest.java
libs/swing-prefs/trunk/src/test/net/sf/japi/swing/prefs/package-info.java
Modified: libs/swing-prefs/trunk/libs-swing-prefs.iml
===================================================================
--- libs/swing-prefs/trunk/libs-swing-prefs.iml 2007-09-23 20:11:01 UTC (rev 613)
+++ libs/swing-prefs/trunk/libs-swing-prefs.iml 2007-09-23 20:21:52 UTC (rev 614)
@@ -4,6 +4,7 @@
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" packagePrefix="test" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
Modified: libs/swing-prefs/trunk/src/net/sf/japi/swing/prefs/PreferencesPane.java
===================================================================
--- libs/swing-prefs/trunk/src/net/sf/japi/swing/prefs/PreferencesPane.java 2007-09-23 20:11:01 UTC (rev 613)
+++ libs/swing-prefs/trunk/src/net/sf/japi/swing/prefs/PreferencesPane.java 2007-09-23 20:21:52 UTC (rev 614)
@@ -95,6 +95,9 @@
*/
private final JPanel cardPanel = new JPanel(cards);
+ /** The JList that displays the list of prefs modules. */
+ private final JList prefsList;
+
/** Show Preferences.
* @param parentComponent determines the Frame in which the dialog is displayed; if <code>null</code>, or if the <code>parentComponent</code> has
* no <code>Frame</code>, a default <code>Frame</code> is used
@@ -119,8 +122,9 @@
/** Create a PreferencesPane.
* @param prefs PreferencesGroup to create panel for
*/
- private PreferencesPane(final PreferencesGroup prefs) {
+ public PreferencesPane(final PreferencesGroup prefs) {
this.prefs = prefs;
+ prefsList = new JList(prefs);
setMessage(createMessage());
setOptions(createOptions());
}
@@ -139,11 +143,10 @@
* @return list
*/
private JComponent createList() {
- final JList list = new JList(prefs);
- list.setCellRenderer(new PrefsListCellRenderer());
- list.setSelectedIndex(0);
- list.addListSelectionListener(this);
- return new JScrollPane(list);
+ prefsList.setCellRenderer(new PrefsListCellRenderer());
+ prefsList.setSelectedIndex(0);
+ prefsList.addListSelectionListener(this);
+ return new JScrollPane(prefsList);
}
/** Create the Panel.
@@ -196,6 +199,8 @@
currentPref.apply();
break;
case NO_OPTION:
+ currentPref.revert();
+ break;
default:
}
}
@@ -256,6 +261,13 @@
}
}
+ /** Returns the JList for selecting the prefs modules.
+ * @return The JList for selecting the prefs modules.
+ */
+ public JList getPrefsList() {
+ return prefsList;
+ }
+
/** Class for rendering preferences list items. */
private static final class PrefsListCellRenderer extends DefaultListCellRenderer {
Added: libs/swing-prefs/trunk/src/test/net/sf/japi/swing/prefs/MockActionBuilder.java
===================================================================
--- libs/swing-prefs/trunk/src/test/net/sf/japi/swing/prefs/MockActionBuilder.java (rev 0)
+++ libs/swing-prefs/trunk/src/test/net/sf/japi/swing/prefs/MockActionBuilder.java 2007-09-23 20:21:52 UTC (rev 614)
@@ -0,0 +1,30 @@
+/*
+ * JAPI libs-swing-prefs is a library for adding preferences dialogs to an application.
+ * Copyright (C) 2007 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 test.net.sf.japi.swing.prefs;
+
+import net.sf.japi.swing.DefaultActionBuilder;
+
+/**
+ * Created by IntelliJ IDEA.
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
+ */
+public class MockActionBuilder extends DefaultActionBuilder {
+
+} // class MockActionBuilder
Property changes on: libs/swing-prefs/trunk/src/test/net/sf/japi/swing/prefs/MockActionBuilder.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ LF
Added: libs/swing-prefs/trunk/src/test/net/sf/japi/swing/prefs/MockPrefs.java
===================================================================
--- libs/swing-prefs/trunk/src/test/net/sf/japi/swing/prefs/MockPrefs.java (rev 0)
+++ libs/swing-prefs/trunk/src/test/net/sf/japi/swing/prefs/MockPrefs.java 2007-09-23 20:21:52 UTC (rev 614)
@@ -0,0 +1,121 @@
+/*
+ * JAPI libs-swing-prefs is a library for adding preferences dialogs to an application.
+ * Copyright (C) 2007 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 test.net.sf.japi.swing.prefs;
+
+import java.util.HashMap;
+import java.util.Map;
+import javax.swing.JTextField;
+import net.sf.japi.swing.prefs.AbstractPrefs;
+import net.sf.japi.swing.prefs.Prefs;
+import org.jetbrains.annotations.NotNull;
+
+/** MockPrefs is a {@link Prefs} implementation for testing.
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
+ * @todo Extract invocation counter. This probably would be a good use case for AOP.
+ */
+public class MockPrefs extends AbstractPrefs {
+
+ /** Invocation Counter. */
+ private final Map<String, int[]> invocationCounter = new HashMap<String, int[]>();
+
+ /** The Textfield for changes. */
+ private JTextField textfield = new JTextField();
+
+ /** The text for changes. */
+ private String text = "";
+
+ /** Creates MockPrefs. */
+ public MockPrefs() {
+ // Initialize the invocation counter.
+ final String[] keys = { "apply", "defaults", "isChanged", "revert" };
+ for (final String key : keys) {
+ invocationCounter.put(key, new int[1]);
+ }
+ add(textfield);
+ }
+
+ /** {@inheritDoc} */
+ public void apply() {
+ increment("apply");
+ text = textfield.getText();
+ }
+
+ /** {@inheritDoc} */
+ public void defaults() {
+ increment("defaults");
+ text = "";
+ textfield.setText(text);
+ }
+
+ /** {@inheritDoc} */
+ public boolean isChanged() {
+ increment("isChanged");
+ return !text.equals(textfield.getText());
+ }
+
+ /** {@inheritDoc} */
+ public void revert() {
+ increment("revert");
+ textfield.setText(text);
+ }
+
+ /** Increments an invocation count.
+ * @param key Key to increment.
+ */
+ protected void increment(@NotNull final String key) {
+ invocationCounter.get(key)[0]++;
+ }
+
+ /** Resets an invocation count.
+ * @param key Key to reset.
+ */
+ public void reset(@NotNull final String key) {
+ invocationCounter.get(key)[0] = 0;
+ }
+
+ /** Resets all invocation counts. */
+ public void resetAll() {
+ for (final int[] val : invocationCounter.values()) {
+ val[0] = 0;
+ }
+ }
+
+ /** Returns the text of this preferences.
+ * @return The text of this preferences.
+ */
+ public String getText() {
+ return text;
+ }
+
+ /** Sets the text of this preferences.
+ * @param text The text of this preferences.
+ */
+ public void setText(final String text) {
+ this.text = text;
+ }
+
+ /** Returns the textfield of this preferences.
+ * @return The textfield of this preferences.
+ */
+ public JTextField getTextfield() {
+ return textfield;
+ }
+
+} // class MockPrefs
Property changes on: libs/swing-prefs/trunk/src/test/net/sf/japi/swing/prefs/MockPrefs.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ LF
Added: libs/swing-prefs/trunk/src/test/net/sf/japi/swing/prefs/PreferencesPaneTest.java
===================================================================
--- libs/swing-prefs/trunk/src/test/net/sf/japi/swing/prefs/PreferencesPaneTest.java (rev 0)
+++ libs/swing-prefs/trunk/src/test/net/sf/japi/swing/prefs/PreferencesPaneTest.java 2007-09-23 20:21:52 UTC (rev 614)
@@ -0,0 +1,58 @@
+/*
+ * JAPI libs-swing-prefs is a library for adding preferences dialogs to an application.
+ * Copyright (C) 2007 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 test.net.sf.japi.swing.prefs;
+
+import javax.swing.JList;
+import javax.swing.JTextField;
+import net.sf.japi.swing.ActionBuilderFactory;
+import net.sf.japi.swing.prefs.PreferencesGroup;
+import net.sf.japi.swing.prefs.PreferencesPane;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/** Test for {@link PreferencesPane}.
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
+ */
+public class PreferencesPaneTest {
+
+ @BeforeClass
+ public void setUpSuite() {
+ ActionBuilderFactory.getInstance().putActionBuilder("net.sf.japi.swing.prefs", new MockActionBuilder());
+ }
+
+ /** Tests that when selecting another preferences for changed preferences, "no" will revert the changes.
+ * @see <a href="http://sourceforge.net/tracker/index.php?func=detail&aid=1769634&group_id=149894&atid=776737">[ 1769634 ] Selecting "No" for changed preferences should revert</a>
+ */
+ @Test
+ public void testSelectingNoForChangedPrefsReverts() {
+ final MockPrefs prefs1 = new MockPrefs();
+ final MockPrefs prefs2 = new MockPrefs();
+ final PreferencesGroup prefsGroup = new PreferencesGroup("", prefs1, prefs2);
+ final PreferencesPane pane = new PreferencesPane(prefsGroup);
+ final JList list = pane.getPrefsList();
+ final JTextField tf1 = prefs1.getTextfield();
+ tf1.setText(tf1.getText() + "_");
+ list.setSelectedIndex(1);
+ // TODO: Check whether the dialog (apply changes? yes | no | cancel) is shown
+ // TODO: Tell Dialog to select "No"
+ // TODO: Check whether revert() was called and actually reverted the value.
+ }
+
+} // class PreferencesPaneTest
Property changes on: libs/swing-prefs/trunk/src/test/net/sf/japi/swing/prefs/PreferencesPaneTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ LF
Added: libs/swing-prefs/trunk/src/test/net/sf/japi/swing/prefs/package-info.java
===================================================================
--- libs/swing-prefs/trunk/src/test/net/sf/japi/swing/prefs/package-info.java (rev 0)
+++ libs/swing-prefs/trunk/src/test/net/sf/japi/swing/prefs/package-info.java 2007-09-23 20:21:52 UTC (rev 614)
@@ -0,0 +1,23 @@
+/*
+ * JAPI libs-swing-prefs is a library for adding preferences dialogs to an application.
+ * Copyright (C) 2007 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
+ */
+
+/** Tests for {@link net.sf.japi.swing.prefs}.
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
+ */
+package test.net.sf.japi.swing.prefs;
Property changes on: libs/swing-prefs/trunk/src/test/net/sf/japi/swing/prefs/package-info.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ LF
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-09-23 20:11:04
|
Revision: 613
http://japi.svn.sourceforge.net/japi/?rev=613&view=rev
Author: christianhujer
Date: 2007-09-23 13:11:01 -0700 (Sun, 23 Sep 2007)
Log Message:
-----------
Committing current intermediate work of cstyle. This is unfinnished. Committing due to source directory layout refactoring.
Modified Paths:
--------------
tools/cstyle/trunk/src/net/sf/japi/cstyle/CStyle.java
Added Paths:
-----------
tools/cstyle/trunk/src/net/sf/japi/cstyle/AbstractParser.java
tools/cstyle/trunk/src/net/sf/japi/cstyle/ByteParser.java
tools/cstyle/trunk/src/net/sf/japi/cstyle/CharParser.java
tools/cstyle/trunk/src/net/sf/japi/cstyle/LineEndingParser.java
tools/cstyle/trunk/src/net/sf/japi/cstyle/LineParser.java
tools/cstyle/trunk/src/net/sf/japi/cstyle/ParseEvent.java
tools/cstyle/trunk/src/net/sf/japi/cstyle/ParseListener.java
tools/cstyle/trunk/src/net/sf/japi/cstyle/Parser.java
Added: tools/cstyle/trunk/src/net/sf/japi/cstyle/AbstractParser.java
===================================================================
--- tools/cstyle/trunk/src/net/sf/japi/cstyle/AbstractParser.java (rev 0)
+++ tools/cstyle/trunk/src/net/sf/japi/cstyle/AbstractParser.java 2007-09-23 20:11:01 UTC (rev 613)
@@ -0,0 +1,69 @@
+/*
+ * CStyle is a program that verifies that a C source code adheres to a specific coding convention.
+ * 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.
+ */
+
+package net.sf.japi.cstyle;
+
+import javax.swing.event.EventListenerList;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Useful baseclass for Parsers.
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
+ */
+public abstract class AbstractParser implements Parser {
+
+ /** The listeners. */
+ private final EventListenerList listeners = new EventListenerList();
+
+ /** Create an AbstractParser. */
+ protected AbstractParser() {
+ }
+
+ /** {@inheritDoc} */
+ public void addParseListener(@NotNull final ParseListener listener) {
+ listeners.add(ParseListener.class, listener);
+ }
+
+ /** {@inheritDoc} */
+ public void removeParseListener(@NotNull final ParseListener listener) {
+ listeners.remove(ParseListener.class, listener);
+ }
+
+ /** {@inheritDoc} */
+ public void init() {
+ }
+
+ /** {@inheritDoc} */
+ public void reset() {
+ }
+
+ /** {@inheritDoc} */
+ public void end() {
+ }
+
+ /** Fires a ParseEvent.
+ * @param event ParseEvent to fire
+ */
+ protected void fireParseEvent(@NotNull final ParseEvent event) {
+ for (final ParseListener listener : listeners.getListeners(ParseListener.class)) {
+ listener.parseEvent(event);
+ }
+ }
+
+} // class AbstractParser
Property changes on: tools/cstyle/trunk/src/net/sf/japi/cstyle/AbstractParser.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ LF
Added: tools/cstyle/trunk/src/net/sf/japi/cstyle/ByteParser.java
===================================================================
--- tools/cstyle/trunk/src/net/sf/japi/cstyle/ByteParser.java (rev 0)
+++ tools/cstyle/trunk/src/net/sf/japi/cstyle/ByteParser.java 2007-09-23 20:11:01 UTC (rev 613)
@@ -0,0 +1,33 @@
+/*
+ * CStyle is a program that verifies that a C source code adheres to a specific coding convention.
+ * 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.
+ */
+
+package net.sf.japi.cstyle;
+
+/**
+ * Parser at byte level.
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
+ */
+public interface ByteParser extends Parser {
+
+ /** Processes a byte.
+ * @param b Byte to process.
+ */
+ void process(byte b);
+
+} // interface ByteParser
Property changes on: tools/cstyle/trunk/src/net/sf/japi/cstyle/ByteParser.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ LF
Modified: tools/cstyle/trunk/src/net/sf/japi/cstyle/CStyle.java
===================================================================
--- tools/cstyle/trunk/src/net/sf/japi/cstyle/CStyle.java 2007-09-23 19:49:21 UTC (rev 612)
+++ tools/cstyle/trunk/src/net/sf/japi/cstyle/CStyle.java 2007-09-23 20:11:01 UTC (rev 613)
@@ -42,7 +42,7 @@
/** Main program.
* @param args Command line arguments.
*/
- public static void main(final String... args) {
+ public static void main(@NotNull final String... args) {
ArgParser.simpleParseAndRun(new CStyle(), args);
}
Added: tools/cstyle/trunk/src/net/sf/japi/cstyle/CharParser.java
===================================================================
--- tools/cstyle/trunk/src/net/sf/japi/cstyle/CharParser.java (rev 0)
+++ tools/cstyle/trunk/src/net/sf/japi/cstyle/CharParser.java 2007-09-23 20:11:01 UTC (rev 613)
@@ -0,0 +1,33 @@
+/*
+ * CStyle is a program that verifies that a C source code adheres to a specific coding convention.
+ * 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.
+ */
+
+package net.sf.japi.cstyle;
+
+/**
+ * Parser at char level.
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
+ */
+public interface CharParser extends Parser {
+
+ /** Processes a character.
+ * @param c Character to process.
+ */
+ void process(char c);
+
+} // interface CharParser
Property changes on: tools/cstyle/trunk/src/net/sf/japi/cstyle/CharParser.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ LF
Added: tools/cstyle/trunk/src/net/sf/japi/cstyle/LineEndingParser.java
===================================================================
--- tools/cstyle/trunk/src/net/sf/japi/cstyle/LineEndingParser.java (rev 0)
+++ tools/cstyle/trunk/src/net/sf/japi/cstyle/LineEndingParser.java 2007-09-23 20:11:01 UTC (rev 613)
@@ -0,0 +1,75 @@
+/*
+ * CStyle is a program that verifies that a C source code adheres to a specific coding convention.
+ * 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.
+ */
+
+package net.sf.japi.cstyle;
+
+import org.jetbrains.annotations.NotNull;
+
+/** A LineEndingParser can verify whether a file has the correct line ending.
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
+ */
+public class LineEndingParser extends AbstractParser implements CharParser {
+
+ /** Whether the previous character was {@link #ASCII_CR}. */
+ private boolean carriageReturn;
+
+ /** ASCII control character CR (Carriage Return). */
+ private static final int ASCII_CR = 0x0D;
+
+ /** ASCII control character LF (Line Feed). */
+ private static final int ASCII_LF = 0x0A;
+
+ /** The desired NewLine. */
+ @NotNull private NewLine desiredNewLine;
+
+ /** {@inheritDoc} */
+ public void process(final char b) {
+ final boolean lineFeed = b == ASCII_LF;
+ final NewLine newLineFound;
+ newLineFound = lineFeed
+ ? carriageReturn ? NewLine.DOS : NewLine.UNIX
+ : carriageReturn ? NewLine.MAC : null;
+ carriageReturn = b == ASCII_CR;
+ if (newLineFound != null && newLineFound != desiredNewLine) {
+ // TODO
+ }
+ }
+
+ /** Set the desired NewLine.
+ * @param desiredNewLine Desired NewLine.
+ */
+ public void setDesiredNewLine(@NotNull final NewLine desiredNewLine) {
+ this.desiredNewLine = desiredNewLine;
+ }
+
+ /** Newline state. */
+ public enum NewLine {
+
+ /** CRLF DOS NewLine. */
+ DOS,
+
+ /** LF UNIX NewLine. */
+ UNIX,
+
+ /** CR MAC NewLine. */
+ MAC
+
+ } // enum NewLine
+
+} // class LineEndingParser
Property changes on: tools/cstyle/trunk/src/net/sf/japi/cstyle/LineEndingParser.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ LF
Added: tools/cstyle/trunk/src/net/sf/japi/cstyle/LineParser.java
===================================================================
--- tools/cstyle/trunk/src/net/sf/japi/cstyle/LineParser.java (rev 0)
+++ tools/cstyle/trunk/src/net/sf/japi/cstyle/LineParser.java 2007-09-23 20:11:01 UTC (rev 613)
@@ -0,0 +1,33 @@
+/*
+ * CStyle is a program that verifies that a C source code adheres to a specific coding convention.
+ * 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.
+ */
+
+package net.sf.japi.cstyle;
+
+/**
+ * Parser at line level.
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
+ */
+public interface LineParser extends Parser {
+
+ /** Processes a line.
+ * @param line Line to process.
+ */
+ void parse(String line);
+
+} // interface LineParser
Property changes on: tools/cstyle/trunk/src/net/sf/japi/cstyle/LineParser.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ LF
Added: tools/cstyle/trunk/src/net/sf/japi/cstyle/ParseEvent.java
===================================================================
--- tools/cstyle/trunk/src/net/sf/japi/cstyle/ParseEvent.java (rev 0)
+++ tools/cstyle/trunk/src/net/sf/japi/cstyle/ParseEvent.java 2007-09-23 20:11:01 UTC (rev 613)
@@ -0,0 +1,27 @@
+package net.sf.japi.cstyle;
+
+import java.util.EventObject;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Event for information while parsing.
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
+ */
+public class ParseEvent extends EventObject {
+
+ /**
+ * Constructs a ParseEvent.
+ * @param source The Parser on which the Event initially occurred.
+ * @throws IllegalArgumentException if source is <code>null</code>.
+ */
+ public ParseEvent(@NotNull final Parser source) {
+ super(source);
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public Parser getSource() {
+ return (Parser) super.getSource();
+ }
+
+}// class ParseEvent
Property changes on: tools/cstyle/trunk/src/net/sf/japi/cstyle/ParseEvent.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ LF
Added: tools/cstyle/trunk/src/net/sf/japi/cstyle/ParseListener.java
===================================================================
--- tools/cstyle/trunk/src/net/sf/japi/cstyle/ParseListener.java (rev 0)
+++ tools/cstyle/trunk/src/net/sf/japi/cstyle/ParseListener.java 2007-09-23 20:11:01 UTC (rev 613)
@@ -0,0 +1,36 @@
+/*
+ * CStyle is a program that verifies that a C source code adheres to a specific coding convention.
+ * 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.
+ */
+
+package net.sf.japi.cstyle;
+
+import java.util.EventListener;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Created by IntelliJ IDEA.
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
+ */
+public interface ParseListener extends EventListener {
+
+ /** Report an event during parsing.
+ * @param event Event that's reported.
+ */
+ void parseEvent(@NotNull ParseEvent event);
+
+} // interface ParseListener
Property changes on: tools/cstyle/trunk/src/net/sf/japi/cstyle/ParseListener.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ LF
Added: tools/cstyle/trunk/src/net/sf/japi/cstyle/Parser.java
===================================================================
--- tools/cstyle/trunk/src/net/sf/japi/cstyle/Parser.java (rev 0)
+++ tools/cstyle/trunk/src/net/sf/japi/cstyle/Parser.java 2007-09-23 20:11:01 UTC (rev 613)
@@ -0,0 +1,48 @@
+/*
+ * CStyle is a program that verifies that a C source code adheres to a specific coding convention.
+ * 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.
+ */
+
+package net.sf.japi.cstyle;
+
+import org.jetbrains.annotations.NotNull;
+
+/** A Parser processes a file character by character.
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
+ */
+public interface Parser {
+
+ /** Initializes this Parser. */
+ void init();
+
+ /** Resets this parser. */
+ void reset();
+
+ /** Tells this parser that the stream it was parsing came to its regular end. */
+ void end();
+
+ /** Registers a ParseListener with this Parser.
+ * @param listener ParseListener to register.
+ */
+ void addParseListener(@NotNull ParseListener listener);
+
+ /** Removes a ParseListener from this Parser.
+ * @param listener ParseListener to unregister.
+ */
+ void removeParseListener(@NotNull ParseListener listener);
+
+} // interface Parser
Property changes on: tools/cstyle/trunk/src/net/sf/japi/cstyle/Parser.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ LF
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-09-23 19:49:25
|
Revision: 612
http://japi.svn.sourceforge.net/japi/?rev=612&view=rev
Author: christianhujer
Date: 2007-09-23 12:49:21 -0700 (Sun, 23 Sep 2007)
Log Message:
-----------
Renamed unittest to test. New target test now performs static and dynamic tests, currently checkstyle and junit.
Modified Paths:
--------------
common/trunk/commonBuild.xml
Modified: common/trunk/commonBuild.xml
===================================================================
--- common/trunk/commonBuild.xml 2007-09-23 19:28:14 UTC (rev 611)
+++ common/trunk/commonBuild.xml 2007-09-23 19:49:21 UTC (rev 612)
@@ -32,7 +32,7 @@
<target
name = "all"
description = "incrementally executes all standard build targets."
- depends = "compile, checkstyle, test"
+ depends = "compile, test"
/>
<target
@@ -111,7 +111,7 @@
<target
name = "dist"
description = "Creates and packs distribution archives."
- depends = "clean, compile, checkstyle, test, doc"
+ depends = "clean, compile, test, doc"
>
<delete dir="dist" />
<mkdir dir="dist" />
@@ -300,7 +300,9 @@
</javadoc>
</target>
-<target name="test" description="Performs JUnit tests." depends="compile">
+<target name="test" description="Performs all tests (static and dynamic)" depends="checkstyle, unittest" />
+
+<target name="unittest" description="Performs JUnit tests." depends="compile">
<mkdir dir="classes/test/${module.shortname}" />
<mkdir dir="docs/test" />
<javac
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-09-23 19:28:20
|
Revision: 611
http://japi.svn.sourceforge.net/japi/?rev=611&view=rev
Author: christianhujer
Date: 2007-09-23 12:28:14 -0700 (Sun, 23 Sep 2007)
Log Message:
-----------
Fixed fallthrough in switch statement bug.
Modified Paths:
--------------
libs/argparser/trunk/src/net/sf/japi/io/args/TokenReader.java
Modified: libs/argparser/trunk/src/net/sf/japi/io/args/TokenReader.java
===================================================================
--- libs/argparser/trunk/src/net/sf/japi/io/args/TokenReader.java 2007-09-23 15:57:35 UTC (rev 610)
+++ libs/argparser/trunk/src/net/sf/japi/io/args/TokenReader.java 2007-09-23 19:28:14 UTC (rev 611)
@@ -158,6 +158,7 @@
} else {
nextToken.append(c);
}
+ break;
default:
assert false;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
