japi-cvs Mailing List for JAPI (Page 27)
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-12-29 04:27:34
|
Revision: 760
http://japi.svn.sourceforge.net/japi/?rev=760&view=rev
Author: christianhujer
Date: 2008-12-29 04:27:31 +0000 (Mon, 29 Dec 2008)
Log Message:
-----------
Removed unnecessary super qualifier.
Modified Paths:
--------------
libs/swing-treetable/trunk/src/prj/net/sf/japi/swing/treetable/JTreeTable.java
Modified: libs/swing-treetable/trunk/src/prj/net/sf/japi/swing/treetable/JTreeTable.java
===================================================================
--- libs/swing-treetable/trunk/src/prj/net/sf/japi/swing/treetable/JTreeTable.java 2008-12-29 04:26:37 UTC (rev 759)
+++ libs/swing-treetable/trunk/src/prj/net/sf/japi/swing/treetable/JTreeTable.java 2008-12-29 04:27:31 UTC (rev 760)
@@ -51,7 +51,7 @@
public JTreeTable(final TreeTableModel<R, T> treeTableModel) {
this.treeTableModel = treeTableModel;
tree = new TreeTableCellRenderer(new TreeTableModelTreeModelAdapter<R, T>(treeTableModel));
- super.setModel(new TreeTableModelTableModelAdapter(treeTableModel, tree));
+ setModel(new TreeTableModelTableModelAdapter(treeTableModel, tree));
// Force the JTable and JTree to share their row selection models.
tree.setSelectionModel(new DefaultTreeSelectionModel() {
@@ -95,7 +95,7 @@
*/
public void setTreeTableModel(final TreeTableModel<R, T> treeTableModel) {
this.treeTableModel = treeTableModel;
- super.setModel(new TreeTableModelTableModelAdapter(treeTableModel, tree));
+ setModel(new TreeTableModelTableModelAdapter(treeTableModel, tree));
}
/** Renderer for TreeTableCells. */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-12-29 04:26:46
|
Revision: 759
http://japi.svn.sourceforge.net/japi/?rev=759&view=rev
Author: christianhujer
Date: 2008-12-29 04:26:37 +0000 (Mon, 29 Dec 2008)
Log Message:
-----------
Removed unnecessary qualified static usage.
Modified Paths:
--------------
historic/trunk/src/app/net/sf/japi/cpp/CPreProcessor.java
libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/DocumentFrame.java
libs/swing-keyprefs/trunk/src/prj/net/sf/japi/swing/prefs/keys/ActionKeyDisplay.java
libs/swing-prefs/trunk/src/prj/net/sf/japi/swing/prefs/PreferencesPane.java
Modified: historic/trunk/src/app/net/sf/japi/cpp/CPreProcessor.java
===================================================================
--- historic/trunk/src/app/net/sf/japi/cpp/CPreProcessor.java 2008-12-29 04:17:21 UTC (rev 758)
+++ historic/trunk/src/app/net/sf/japi/cpp/CPreProcessor.java 2008-12-29 04:26:37 UTC (rev 759)
@@ -135,7 +135,7 @@
}
private void run() throws IOException {
- State state = State.NORMAL;
+ State state = NORMAL;
while ((c = in.read()) != -1) {
switch (state) {
case NORMAL:
Modified: libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/DocumentFrame.java
===================================================================
--- libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/DocumentFrame.java 2008-12-29 04:17:21 UTC (rev 758)
+++ libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/DocumentFrame.java 2008-12-29 04:26:37 UTC (rev 759)
@@ -37,7 +37,7 @@
*/
DocumentFrame(@NotNull final Document<D> document) {
super("TODO", true, true, true, true);
- setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
+ setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
this.document = document;
}
Modified: libs/swing-keyprefs/trunk/src/prj/net/sf/japi/swing/prefs/keys/ActionKeyDisplay.java
===================================================================
--- libs/swing-keyprefs/trunk/src/prj/net/sf/japi/swing/prefs/keys/ActionKeyDisplay.java 2008-12-29 04:17:21 UTC (rev 758)
+++ libs/swing-keyprefs/trunk/src/prj/net/sf/japi/swing/prefs/keys/ActionKeyDisplay.java 2008-12-29 04:26:37 UTC (rev 759)
@@ -144,7 +144,7 @@
*/
public void setAction(@Nullable final Action action) {
this.action = action;
- putValue(Action.NAME, getLocalizedKeyStrokeText(action));
+ putValue(NAME, getLocalizedKeyStrokeText(action));
setEnabled(action != null);
}
@@ -160,7 +160,7 @@
if (action == null) {
return "";
}
- return getLocalizedKeyStrokeText((KeyStroke) action.getValue(Action.ACCELERATOR_KEY));
+ return getLocalizedKeyStrokeText((KeyStroke) action.getValue(ACCELERATOR_KEY));
}
/** Get the localized text of a KeyStroke.
Modified: libs/swing-prefs/trunk/src/prj/net/sf/japi/swing/prefs/PreferencesPane.java
===================================================================
--- libs/swing-prefs/trunk/src/prj/net/sf/japi/swing/prefs/PreferencesPane.java 2008-12-29 04:17:21 UTC (rev 758)
+++ libs/swing-prefs/trunk/src/prj/net/sf/japi/swing/prefs/PreferencesPane.java 2008-12-29 04:26:37 UTC (rev 759)
@@ -35,7 +35,6 @@
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
-import javax.swing.SwingConstants;
import javax.swing.border.Border;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
@@ -278,10 +277,10 @@
/** Create a PrefsListCellRenderer. */
PrefsListCellRenderer() {
- setHorizontalTextPosition(SwingConstants.CENTER);
- setVerticalTextPosition(SwingConstants.BOTTOM);
- setHorizontalAlignment(SwingConstants.CENTER);
- setVerticalAlignment(SwingConstants.CENTER);
+ setHorizontalTextPosition(CENTER);
+ setVerticalTextPosition(BOTTOM);
+ setHorizontalAlignment(CENTER);
+ setVerticalAlignment(CENTER);
}
/** {@inheritDoc} */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-12-29 04:17:24
|
Revision: 758
http://japi.svn.sourceforge.net/japi/?rev=758&view=rev
Author: christianhujer
Date: 2008-12-29 04:17:21 +0000 (Mon, 29 Dec 2008)
Log Message:
-----------
Removed redundant interface declarations.
Modified Paths:
--------------
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/io/JTestSer.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/io/JTestV1.java
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/io/JTestSer.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/io/JTestSer.java 2008-12-29 04:10:11 UTC (rev 757)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/io/JTestSer.java 2008-12-29 04:17:21 UTC (rev 758)
@@ -35,7 +35,7 @@
* @author $Author: chris $
* @version $Id: JTestSer.java,v 1.4 2006/01/31 23:11:54 chris Exp $
*/
-public class JTestSer extends AbstractJTestImport<QuestionCollection> implements Exporter<QuestionCollection>, Importer<QuestionCollection> {
+public class JTestSer extends AbstractJTestImport<QuestionCollection> implements Exporter<QuestionCollection> {
/** Create a new JTestSer interface.
*/
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/io/JTestV1.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/io/JTestV1.java 2008-12-29 04:10:11 UTC (rev 757)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/io/JTestV1.java 2008-12-29 04:17:21 UTC (rev 758)
@@ -36,7 +36,6 @@
import net.sf.japi.progs.jeduca.jtest.QuestionCollection;
import net.sf.japi.progs.jeduca.jtest.QuestionText;
import net.sf.japi.progs.jeduca.swing.io.Exporter;
-import net.sf.japi.progs.jeduca.swing.io.Importer;
import org.w3c.dom.DOMImplementation;
import org.w3c.dom.Document;
import org.w3c.dom.DocumentType;
@@ -53,7 +52,7 @@
* @author $Author: chris $
* @todo use schema
*/
-public class JTestV1 extends AbstractJTestImport<QuestionCollection> implements Importer<QuestionCollection>, Exporter<QuestionCollection> {
+public class JTestV1 extends AbstractJTestImport<QuestionCollection> implements Exporter<QuestionCollection> {
/** The DocumentBuilderFactory. */
private final DocumentBuilderFactory dbf;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-12-29 04:10:15
|
Revision: 757
http://japi.svn.sourceforge.net/japi/?rev=757&view=rev
Author: christianhujer
Date: 2008-12-29 04:10:11 +0000 (Mon, 29 Dec 2008)
Log Message:
-----------
Made all local variables final that can be final.
Modified Paths:
--------------
historic/trunk/src/app/net/sf/japi/finance/SimpleCapitalCalculator.java
historic/trunk/src/app/net/sf/japi/util/Table.java
historic/trunk/src/doc/guide/io/src/UniqPlain.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/io/JTestV1.java
Modified: historic/trunk/src/app/net/sf/japi/finance/SimpleCapitalCalculator.java
===================================================================
--- historic/trunk/src/app/net/sf/japi/finance/SimpleCapitalCalculator.java 2008-12-29 04:02:35 UTC (rev 756)
+++ historic/trunk/src/app/net/sf/japi/finance/SimpleCapitalCalculator.java 2008-12-29 04:10:11 UTC (rev 757)
@@ -41,7 +41,7 @@
* @param numberOfPeriods
* @return the overall capital after numberOfPeriods periods
*/
- public double calculateCapital( int numberOfPeriods ) {
+ public double calculateCapital( final int numberOfPeriods ) {
if ( numberOfPeriods < 0 ) {
throw new IllegalArgumentException("Number of periods has to be at least 0!");
}
@@ -62,14 +62,14 @@
/** Sets new current capital.
* @param currentCapital
*/
- public void setCurrentCapital(double currentCapital) {
+ public void setCurrentCapital(final double currentCapital) {
this.currentCapital = currentCapital;
}
/** Sets new interest rate.
* @param interestRate
*/
- public void setInterestRate(double interestRate) {
+ public void setInterestRate(final double interestRate) {
this.interestRate = interestRate;
}
Modified: historic/trunk/src/app/net/sf/japi/util/Table.java
===================================================================
--- historic/trunk/src/app/net/sf/japi/util/Table.java 2008-12-29 04:02:35 UTC (rev 756)
+++ historic/trunk/src/app/net/sf/japi/util/Table.java 2008-12-29 04:10:11 UTC (rev 757)
@@ -67,7 +67,7 @@
*/
public Collection<Pair<T1,T2>> getPairsByFirst(final T1 first) {
final Set<Pair<T1,T2>> pairsByFirst = new HashSet<Pair<T1,T2>>();
- for (Pair<T1, T2> pair : pairs) {
+ for (final Pair<T1, T2> pair : pairs) {
final T1 pairFirst = pair.getFirst();
if (pairFirst.equals(first)) {
pairsByFirst.add(pair);
@@ -82,7 +82,7 @@
*/
public Collection<Pair<T1,T2>> getPairsBySecond(final T2 second) {
final Set<Pair<T1,T2>> pairsBySecond = new HashSet<Pair<T1,T2>>();
- for (Pair<T1, T2> pair : pairs) {
+ for (final Pair<T1, T2> pair : pairs) {
final T2 pairSecond = pair.getSecond();
if (pairSecond.equals(second)) {
pairsBySecond.add(pair);
Modified: historic/trunk/src/doc/guide/io/src/UniqPlain.java
===================================================================
--- historic/trunk/src/doc/guide/io/src/UniqPlain.java 2008-12-29 04:02:35 UTC (rev 756)
+++ historic/trunk/src/doc/guide/io/src/UniqPlain.java 2008-12-29 04:10:11 UTC (rev 757)
@@ -34,7 +34,7 @@
} else {
for (final String arg : args) {
try {
- BufferedReader in = new BufferedReader(new FileReader(arg));
+ final BufferedReader in = new BufferedReader(new FileReader(arg));
try {
for (String line; (line = in.readLine()) != null;) {
if (!line.equals(prevLine)) {
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/io/JTestV1.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/io/JTestV1.java 2008-12-29 04:02:35 UTC (rev 756)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/io/JTestV1.java 2008-12-29 04:10:11 UTC (rev 757)
@@ -133,21 +133,21 @@
* @throws SAXException in case of XML parsing errors
*/
public QuestionCollection load(final Document doc) throws IOException, SAXException {
- List<QuestionText> questions = new ArrayList<QuestionText>();
- NodeList questionEls = doc.getElementsByTagName("QuestionText");
- int questionElsSize = questionEls.getLength();
+ final List<QuestionText> questions = new ArrayList<QuestionText>();
+ final NodeList questionEls = doc.getElementsByTagName("QuestionText");
+ final int questionElsSize = questionEls.getLength();
for (int i = 0; i < questionElsSize; i++) {
- Element questionEl = (Element) questionEls.item(i);
- String qtype = questionEl.getAttribute("qtype");
+ final Element questionEl = (Element) questionEls.item(i);
+ final String qtype = questionEl.getAttribute("qtype");
if ("regex".equals(qtype)) {
- List<String> expressions = new ArrayList<String>();
- NodeList textEls = questionEl.getChildNodes();
- int textElsSize = textEls.getLength();
+ final List<String> expressions = new ArrayList<String>();
+ final NodeList textEls = questionEl.getChildNodes();
+ final int textElsSize = textEls.getLength();
String questionText = null;
for (int j = 0; j < textElsSize; j++) {
- Node n = textEls.item(j);
+ final Node n = textEls.item(j);
if (n.getNodeType() == ELEMENT_NODE) {
- String tagName = n.getNodeName();
+ final String tagName = n.getNodeName();
if ("text".equals(tagName)) {
questionText = n.getFirstChild().getNodeValue();
} else if ("regex".equals(tagName)) {
@@ -155,19 +155,19 @@
}
}
}
- OpenQuestionText question = new OpenQuestionText(questionText, expressions);
+ final OpenQuestionText question = new OpenQuestionText(questionText, expressions);
question.setType(questionEl.getAttribute("type"));
question.setHTML(true);
questions.add(question);
} else {
- List<MCAnswerText> answers = new ArrayList<MCAnswerText>();
- NodeList textEls = questionEl.getChildNodes();
- int textElsSize = textEls.getLength();
+ final List<MCAnswerText> answers = new ArrayList<MCAnswerText>();
+ final NodeList textEls = questionEl.getChildNodes();
+ final int textElsSize = textEls.getLength();
String questionText = null;
for (int j = 0; j < textElsSize; j++) {
- Node n = textEls.item(j);
+ final Node n = textEls.item(j);
if (n.getNodeType() == ELEMENT_NODE) {
- String tagName = n.getNodeName();
+ final String tagName = n.getNodeName();
if ("text".equals(tagName)) {
questionText = n.getFirstChild().getNodeValue();
} else if ("true".equals(tagName)) {
@@ -177,13 +177,13 @@
}
}
}
- QuestionText question = new MCQuestionText(questionText, answers);
+ final QuestionText question = new MCQuestionText(questionText, answers);
question.setType(questionEl.getAttribute("type"));
question.setHTML(true);
questions.add(question);
}
}
- QuestionCollection col = new QuestionCollection(questions);
+ final QuestionCollection col = new QuestionCollection(questions);
setInfo(col, doc);
return col;
}
@@ -216,7 +216,7 @@
if (!(domImpl instanceof DOMImplementationLS)) {
throw new IOException("DOM Implementation with LS-Feature required, upgrade your Java XML Library");
}
- DOMImplementationLS ls = (DOMImplementationLS) domImpl;
+ final DOMImplementationLS ls = (DOMImplementationLS) domImpl;
ls.createLSSerializer().writeToURI(export(col), f.toURI().toString());
}
@@ -225,12 +225,12 @@
* @return XML Document (KEduca) for <var>col</var>
*/
public Document export(final QuestionCollection col) {
- DocumentType keduca = domImpl.createDocumentType("educa", null, null);
- Document doc = domImpl.createDocument(null, "Document", keduca);
+ final DocumentType keduca = domImpl.createDocumentType("educa", null, null);
+ final Document doc = domImpl.createDocument(null, "Document", keduca);
//System.err.println("<!DOCTYPE " + doc.getDoctype().getName() + ">");
- Element docEl = doc.getDocumentElement();
+ final Element docEl = doc.getDocumentElement();
{
- Element infoEl = doc.createElement("info");
+ final Element infoEl = doc.createElement("info");
docEl.appendChild(infoEl);
infoEl.appendChild(create(doc, "title", col.getTitle()));
infoEl.appendChild(create(doc, "category", col.getCategory()));
@@ -238,7 +238,7 @@
infoEl.appendChild(create(doc, "level", col.getLevel()));
infoEl.appendChild(create(doc, "language", col.getLanguage()));
{
- Element authorEl = doc.createElement("author");
+ final Element authorEl = doc.createElement("author");
infoEl.appendChild(authorEl);
infoEl.appendChild(create(doc, "name", col.getAuthorName()));
infoEl.appendChild(create(doc, "email", col.getAuthorEMail()));
@@ -246,10 +246,10 @@
}
}
{
- Element dataEl = doc.createElement("data");
+ final Element dataEl = doc.createElement("data");
docEl.appendChild(dataEl);
for (int i = 0; i < col.getSize(); i++) {
- QuestionText qt = col.getQuestion(i);
+ final QuestionText qt = col.getQuestion(i);
if (qt instanceof MCQuestionText) { // skip answers other than Multiple Choice
dataEl.appendChild(createQuestionEl(doc, (MCQuestionText) qt));
}
@@ -264,13 +264,13 @@
* @return element for question
*/
private Element createQuestionEl(final Document doc, final MCQuestionText question) {
- Element questionEl = doc.createElement("question");
+ final Element questionEl = doc.createElement("question");
if (question.getType() != null) {
questionEl.setAttribute("type", question.getType());
}
questionEl.appendChild(create(doc, "text", question.getText()));
for (int i = 0; i < question.getSize(); i++) {
- MCAnswerText answer = question.getAnswer(i);
+ final MCAnswerText answer = question.getAnswer(i);
questionEl.appendChild(create(doc, answer.isCorrect() ? "true" : "false", answer.getText()));
}
return questionEl;
@@ -283,7 +283,7 @@
* @return element with name <var>name</var> containing <var>text</var>
*/
private Element create(final Document doc, final String name, final String text) {
- Element el = doc.createElement(name);
+ final Element el = doc.createElement(name);
el.appendChild(doc.createTextNode(text));
return el;
}
@@ -301,7 +301,7 @@
/** {@inheritDoc} */
protected boolean canLoadImpl(final String uri) {
try {
- ErrorCapture capture = new ErrorCapture();
+ final ErrorCapture capture = new ErrorCapture();
db.setErrorHandler(capture);
db.parse(uri);
return capture.hadErrors();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-12-29 04:02:42
|
Revision: 756
http://japi.svn.sourceforge.net/japi/?rev=756&view=rev
Author: christianhujer
Date: 2008-12-29 04:02:35 +0000 (Mon, 29 Dec 2008)
Log Message:
-----------
Made all fields final that can be final.
Modified Paths:
--------------
historic/trunk/src/app/net/sf/japi/cpp/CPreProcessor.java
historic/trunk/src/app/net/sf/japi/sql/DatabaseTreeModel.java
historic/trunk/src/app/net/sf/japi/util/Table.java
historic/trunk/src/doc/guide/swing/action/basic/src/ex/Application.java
libs/argparser/trunk/src/prj/net/sf/japi/io/args/TokenReader.java
libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/RBMockCommand.java
libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/converter/AbstractConverterTest.java
libs/logging/trunk/src/prj/net/sf/japi/log/LoggerFactory.java
libs/midi/trunk/src/prj/net/sf/japi/midi/DeviceComparator.java
libs/swing-action/trunk/src/prj/net/sf/japi/swing/DefaultActionBuilder.java
libs/swing-action/trunk/src/prj/net/sf/japi/swing/DisposeAction.java
libs/swing-action/trunk/src/prj/net/sf/japi/swing/DummyActionBuilder.java
libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/AppLaunchCommand.java
libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/Application.java
libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/ApplicationQuitter.java
libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/Document.java
libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/DocumentEvent.java
libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/DocumentFrame.java
libs/swing-bookmarks/trunk/src/prj/net/sf/japi/swing/bookmarks/BookmarkManager.java
libs/swing-bookmarks/trunk/src/prj/net/sf/japi/swing/bookmarks/BookmarkTransferable.java
libs/swing-bookmarks/trunk/src/prj/net/sf/japi/swing/bookmarks/BookmarkTreeCellRenderer.java
libs/swing-extlib/trunk/src/prj/net/sf/japi/swing/ToolBarLayout.java
libs/swing-misc/trunk/src/prj/net/sf/japi/swing/misc/JSAXErrorHandler.java
libs/swing-prefs/trunk/src/prj/net/sf/japi/swing/prefs/PreferencesPane.java
libs/swing-prefs/trunk/src/tst/test/net/sf/japi/swing/prefs/MockPrefs.java
libs/swing-recent/trunk/src/prj/net/sf/japi/swing/recent/PrefsRecentURLs.java
libs/swing-tod/trunk/src/prj/net/sf/japi/swing/tod/TipOfTheDayManager.java
libs/swing-treetable/trunk/src/prj/net/sf/japi/swing/treetable/JTreeTable.java
libs/swing-treetable/trunk/src/prj/net/sf/japi/swing/treetable/TreeTableModelTableModelAdapter.java
libs/swing-treetable/trunk/src/prj/net/sf/japi/swing/treetable/TreeTableModelTreeModelAdapter.java
libs/util/trunk/src/prj/net/sf/japi/util/IteratorIterable.java
libs/util/trunk/src/prj/net/sf/japi/util/filter/NotFilter.java
progs/cardlearn/trunk/src/prj/net/sf/japi/cardlearn/CardDatabaseConfig.java
progs/cardlearn/trunk/src/prj/net/sf/japi/cardlearn/CardDatabaseConfigEditor.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/Program.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/QuestionCollection.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/Settings.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/AnswerGUI.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/FirstSettingsModule.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/ProgramFrame.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/QuestionCollectionGUI.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/ReviewGUI.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/SettingsGUI.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/SolutionGUI.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/io/AbstractJTestImport.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/io/JTestV1.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/io/KEduca.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/io/XMLUtils.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/AbstractManager.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/HelpManager.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/InternalFrameManager.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/MenuManager.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/OpenURLPane.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/ToolBarManager.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/io/AbstractCachingImporter.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/io/IOModuleProvider.java
progs/jhexedit/trunk/src/prj/net/sf/japi/progs/jhexedit/HexEditPane.java
progs/jhexview/trunk/src/prj/net/sf/japi/progs/jhexview/HexViewPane.java
progs/jirus/trunk/src/prj/net/sf/jirus/MyReceiver.java
progs/jtype/trunk/src/prj/net/sf/japi/jtype/Helper.java
progs/jtype/trunk/src/prj/net/sf/japi/jtype/PerformancePane.java
tools/gdbControl/trunk/src/prj/net/sf/japi/tools/gdbcontrol/ComWithGdb.java
tools/keystrokes/trunk/src/prj/net/sf/japi/tools/keystrokes/KeyStrokes.java
tools/mail/trunk/src/prj/net/sf/japi/tools/mail/Mail.java
tools/prefsbrowser/trunk/src/prj/net/sf/japi/tools/prefsbrowser/PrefsBranchNode.java
tools/prefsbrowser/trunk/src/prj/net/sf/japi/tools/prefsbrowser/PrefsRootNode.java
tools/string2bytes/trunk/src/prj/net/sf/japi/string2bytes/CodecSelectionPanel.java
tools/todoScanner/trunk/src/prj/net/sf/japi/tools/todoScanner/TodoScanner.java
Modified: historic/trunk/src/app/net/sf/japi/cpp/CPreProcessor.java
===================================================================
--- historic/trunk/src/app/net/sf/japi/cpp/CPreProcessor.java 2008-12-28 23:30:05 UTC (rev 755)
+++ historic/trunk/src/app/net/sf/japi/cpp/CPreProcessor.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -66,7 +66,7 @@
private final Map<String, String> defines = new HashMap<String, String>();
/** Setting whether to strip comments. */
- private boolean stripComments = true;
+ private final boolean stripComments = true;
public CPreProcessor() {
}
@@ -122,8 +122,8 @@
private final Reader in;
private final Writer out;
private int c;
- private StringBuilder currentDirective = new StringBuilder();
- private StringBuilder currentDirectiveArgs = new StringBuilder();
+ private final StringBuilder currentDirective = new StringBuilder();
+ private final StringBuilder currentDirectiveArgs = new StringBuilder();
private Processor(final Reader inStream, final Writer outStream) throws IOException {
//noinspection IOResourceOpenedButNotSafelyClosed
Modified: historic/trunk/src/app/net/sf/japi/sql/DatabaseTreeModel.java
===================================================================
--- historic/trunk/src/app/net/sf/japi/sql/DatabaseTreeModel.java 2008-12-28 23:30:05 UTC (rev 755)
+++ historic/trunk/src/app/net/sf/japi/sql/DatabaseTreeModel.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -38,10 +38,10 @@
public class DatabaseTreeModel implements TreeModel {
/** The event listeners. */
- private EventListenerList listenerList = new EventListenerList();
+ private final EventListenerList listenerList = new EventListenerList();
/** The Database nodes in the tree. */
- private List<CatalogTreeNode> catalogs = new ArrayList<CatalogTreeNode>();
+ private final List<CatalogTreeNode> catalogs = new ArrayList<CatalogTreeNode>();
/** The Database Metadata of the database this treemodel reflects. */
private DatabaseMetaData databaseMetaData;
@@ -165,7 +165,7 @@
private String catalog;
/** The tables of this catalog. */
- private List<TableTreeNode> tables = new ArrayList<TableTreeNode>();
+ private final List<TableTreeNode> tables = new ArrayList<TableTreeNode>();
/** Create a CatalogTreeNode.
* @param catalog Catalog for which to create a CatalogTreeNode.
Modified: historic/trunk/src/app/net/sf/japi/util/Table.java
===================================================================
--- historic/trunk/src/app/net/sf/japi/util/Table.java 2008-12-28 23:30:05 UTC (rev 755)
+++ historic/trunk/src/app/net/sf/japi/util/Table.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -35,7 +35,7 @@
public class Table<T1,T2> {
/** The pairs of the table. */
- private Set<Pair<T1,T2>> pairs = new HashSet<Pair<T1,T2>>();
+ private final Set<Pair<T1,T2>> pairs = new HashSet<Pair<T1,T2>>();
/** Create a table. */
public Table() {
Modified: historic/trunk/src/doc/guide/swing/action/basic/src/ex/Application.java
===================================================================
--- historic/trunk/src/doc/guide/swing/action/basic/src/ex/Application.java 2008-12-28 23:30:05 UTC (rev 755)
+++ historic/trunk/src/doc/guide/swing/action/basic/src/ex/Application.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -12,7 +12,7 @@
public class Application extends WindowAdapter {
/** The application frame. */
- private JFrame frame;
+ private final JFrame frame;
/** Main program.
* @param args command line arguments (currently ignored)
@@ -22,7 +22,7 @@
new Application();
}
- private ActionBuilder actionBuilder = ActionBuilderFactory.getInstance().getActionBuilder("ex");
+ private final ActionBuilder actionBuilder = ActionBuilderFactory.getInstance().getActionBuilder("ex");
public Application() {
frame = new JFrame(actionBuilder.getString("appWindow.title"));
Modified: libs/argparser/trunk/src/prj/net/sf/japi/io/args/TokenReader.java
===================================================================
--- libs/argparser/trunk/src/prj/net/sf/japi/io/args/TokenReader.java 2008-12-28 23:30:05 UTC (rev 755)
+++ libs/argparser/trunk/src/prj/net/sf/japi/io/args/TokenReader.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -43,7 +43,7 @@
public class TokenReader implements Closeable, Iterable<String>, Iterator<String> {
/** Reader to read from. */
- @NotNull private Reader in;
+ @NotNull private final Reader in;
/** The next token. */
@Nullable private String next;
Modified: libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/RBMockCommand.java
===================================================================
--- libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/RBMockCommand.java 2008-12-28 23:30:05 UTC (rev 755)
+++ libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/RBMockCommand.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -31,7 +31,7 @@
public class RBMockCommand extends BasicCommand {
/** My own ResourceBundle. */
- private ResourceBundle myBundle = ResourceBundle.getBundle("test.net.sf.japi.io.args.RBMockCommandMyBundle");
+ private final ResourceBundle myBundle = ResourceBundle.getBundle("test.net.sf.japi.io.args.RBMockCommandMyBundle");
/** Whether to return its own ResourceBundle. */
private boolean returnOwnBundle;
Modified: libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/converter/AbstractConverterTest.java
===================================================================
--- libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/converter/AbstractConverterTest.java 2008-12-28 23:30:05 UTC (rev 755)
+++ libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/converter/AbstractConverterTest.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -35,10 +35,10 @@
public abstract class AbstractConverterTest<V, T extends Converter<V>> {
/** The target class. */
- private Class<V> targetClass;
+ private final Class<V> targetClass;
/** The converter testling. */
- private T converter;
+ private final T converter;
/**
* Create an AbstractConverterTest.
Modified: libs/logging/trunk/src/prj/net/sf/japi/log/LoggerFactory.java
===================================================================
--- libs/logging/trunk/src/prj/net/sf/japi/log/LoggerFactory.java 2008-12-28 23:30:05 UTC (rev 755)
+++ libs/logging/trunk/src/prj/net/sf/japi/log/LoggerFactory.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -41,7 +41,7 @@
* Key: logger name, as with {@link java.util.logging.LogManager#getLogger(String)}.
* Value: Logger associated with the Key
*/
- @NotNull private Map<String, Logger> loggers = new HashMap<String, Logger>();
+ @NotNull private final Map<String, Logger> loggers = new HashMap<String, Logger>();
/**
* Private Singleton Constructor.
Modified: libs/midi/trunk/src/prj/net/sf/japi/midi/DeviceComparator.java
===================================================================
--- libs/midi/trunk/src/prj/net/sf/japi/midi/DeviceComparator.java 2008-12-28 23:30:05 UTC (rev 755)
+++ libs/midi/trunk/src/prj/net/sf/japi/midi/DeviceComparator.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -13,7 +13,7 @@
private static final long serialVersionUID = 1L;
/** The convenient default instance. */
- private static Comparator<? super MidiDevice> instance = new DeviceComparator();
+ private static final Comparator<? super MidiDevice> instance = new DeviceComparator();
/** {@inheritDoc} */
public int compare(final MidiDevice o1, final MidiDevice o2) {
Modified: libs/swing-action/trunk/src/prj/net/sf/japi/swing/DefaultActionBuilder.java
===================================================================
--- libs/swing-action/trunk/src/prj/net/sf/japi/swing/DefaultActionBuilder.java 2008-12-28 23:30:05 UTC (rev 755)
+++ libs/swing-action/trunk/src/prj/net/sf/japi/swing/DefaultActionBuilder.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -81,7 +81,7 @@
@NotNull private final ActionMap actionMap = new NamedActionMap();
/** The action providers that were registered and will be queried when an action should be created / retrieved. */
- private List<ActionProvider> actionProviders = new ArrayList<ActionProvider>();
+ private final List<ActionProvider> actionProviders = new ArrayList<ActionProvider>();
/** Add a ResourceBundle to the list of used bundles.
* @param baseName the base name of the resource bundle, a fully qualified class name
Modified: libs/swing-action/trunk/src/prj/net/sf/japi/swing/DisposeAction.java
===================================================================
--- libs/swing-action/trunk/src/prj/net/sf/japi/swing/DisposeAction.java 2008-12-28 23:30:05 UTC (rev 755)
+++ libs/swing-action/trunk/src/prj/net/sf/japi/swing/DisposeAction.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -48,7 +48,7 @@
/** The window to be disposed.
* @serial include
*/
- private Window window;
+ private final Window window;
/** Install the DisposeAction to a JDialog for the ESCAPE key.
* For most users of this method, the return value is irrelevant and can be ignored.
Modified: libs/swing-action/trunk/src/prj/net/sf/japi/swing/DummyActionBuilder.java
===================================================================
--- libs/swing-action/trunk/src/prj/net/sf/japi/swing/DummyActionBuilder.java 2008-12-28 23:30:05 UTC (rev 755)
+++ libs/swing-action/trunk/src/prj/net/sf/japi/swing/DummyActionBuilder.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -45,7 +45,7 @@
/** The ActionMap.
* The DummyActionBuilder at least needs an ActionMap to fulfil the contract of ActionBuilder regarding nullability.
*/
- private ActionMap actionMap = new ActionMap();
+ private final ActionMap actionMap = new ActionMap();
/** {@inheritDoc} */
public void addBundle(@NotNull final String baseName) {
Modified: libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/AppLaunchCommand.java
===================================================================
--- libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/AppLaunchCommand.java 2008-12-28 23:30:05 UTC (rev 755)
+++ libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/AppLaunchCommand.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -15,7 +15,7 @@
@Nullable private final Class<? extends Application<?>> appClass;
/** The Application. */
- @Nullable private Application<?> application;
+ @Nullable private final Application<?> application;
/** Creates an AppLaunchCommand.
* @param appClass Application Class to launch.
Modified: libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/Application.java
===================================================================
--- libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/Application.java 2008-12-28 23:30:05 UTC (rev 755)
+++ libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/Application.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -40,22 +40,22 @@
public abstract class Application<D> implements CanLoad<D>, InternalFrameListener, DocumentListener<D> {
/** The application frame. */
- @NotNull private JFrame appFrame;
+ @NotNull private final JFrame appFrame;
/** The ActionBuilder. */
@NotNull private final ActionBuilder actionBuilder;
/** Whether or not to ask the user before quitting. */
- private boolean askForQuit = true;
+ private final boolean askForQuit = true;
/** The About Dialog. */
private AboutDialog aboutDialog = null; // lazy
/** The file chooser for loading and saving. */
- private JFileChooser fileChooser;
+ private final JFileChooser fileChooser;
/** The MDI handler. */
- private JDesktopPane desktop;
+ private final JDesktopPane desktop;
/** The current document frame. */
@Nullable private DocumentFrame<D> currentDocumentFrame = null;
Modified: libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/ApplicationQuitter.java
===================================================================
--- libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/ApplicationQuitter.java 2008-12-28 23:30:05 UTC (rev 755)
+++ libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/ApplicationQuitter.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -11,7 +11,7 @@
class ApplicationQuitter<D> extends WindowAdapter {
/** Application to quit. */
- @NotNull private Application<D> application;
+ @NotNull private final Application<D> application;
/** Creates an ApplicationQuitter.
* @param application Application to quit when its window is closing.
Modified: libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/Document.java
===================================================================
--- libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/Document.java 2008-12-28 23:30:05 UTC (rev 755)
+++ libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/Document.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -27,7 +27,7 @@
private final EventListenerList listenerList = new EventListenerList();
/** The data of this Document. */
- @NotNull private D data;
+ @NotNull private final D data;
/** The URI of this document. */
@Nullable private String uri;
Modified: libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/DocumentEvent.java
===================================================================
--- libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/DocumentEvent.java 2008-12-28 23:30:05 UTC (rev 755)
+++ libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/DocumentEvent.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -16,7 +16,7 @@
@NotNull private final DocumentEventType type;
/** The source of this event. */
- private Document<D> source;
+ private final Document<D> source;
/** Constructs a DocumentEvent.
* @param source The Document on which the Event initially occurred.
Modified: libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/DocumentFrame.java
===================================================================
--- libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/DocumentFrame.java 2008-12-28 23:30:05 UTC (rev 755)
+++ libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/DocumentFrame.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -15,7 +15,7 @@
class DocumentFrame<D> extends JInternalFrame {
/** The document of this DocumentFrame. */
- @NotNull private Document<D> document;
+ @NotNull private final Document<D> document;
/** The Action for activating this frame. */
private final Action windowAction = new AbstractAction() {
Modified: libs/swing-bookmarks/trunk/src/prj/net/sf/japi/swing/bookmarks/BookmarkManager.java
===================================================================
--- libs/swing-bookmarks/trunk/src/prj/net/sf/japi/swing/bookmarks/BookmarkManager.java 2008-12-28 23:30:05 UTC (rev 755)
+++ libs/swing-bookmarks/trunk/src/prj/net/sf/japi/swing/bookmarks/BookmarkManager.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -87,7 +87,7 @@
private static final ActionBuilder ACTION_BUILDER = ActionBuilderFactory.getInstance().getActionBuilder("net.sf.japi.swing.bookmarks");
/** The ProgramFrame this BookmarkManager manages bookmarks for. */
- private Bookmarkable bookmarkable;
+ private final Bookmarkable bookmarkable;
/** Create a new BookmarkManager.
* @param bookmarkable The bookmarkable to use for this BookmarkManager.
@@ -190,7 +190,7 @@
/** Action for managing the bookmarks.
* @serial include
*/
- private Action manageBookmarks = ACTION_BUILDER.createAction(true, "manageBookmarks", this);
+ private final Action manageBookmarks = ACTION_BUILDER.createAction(true, "manageBookmarks", this);
/** Action for managing the bookmarks. */
public void manageBookmarks() {
@@ -549,12 +549,12 @@
/** The bookmarks in this folder.
* @serial include
*/
- private List<Bookmark> bookmarks = new ArrayList<Bookmark>();
+ private final List<Bookmark> bookmarks = new ArrayList<Bookmark>();
/** The Menus created for this folder.
* @serial include
*/
- private List<JMenu> menus = new ArrayList<JMenu>();
+ private final List<JMenu> menus = new ArrayList<JMenu>();
/** Create a BookmarkFolder without a title.
* This should only be used for the basic BookmarkFolder containing all other BookmarkItems and BookmarkFolders.
@@ -706,12 +706,12 @@
/** Action for adding a bookmark.
* @serial include
*/
- private Action addBookmark = ACTION_BUILDER.createAction(true, "addBookmark", this);
+ private final Action addBookmark = ACTION_BUILDER.createAction(true, "addBookmark", this);
/** Action for creating a new bookmark folder.
* @serial include
*/
- private Action newBookmarkFolder = ACTION_BUILDER.createAction(true, "newBookmarkFolder", this);
+ private final Action newBookmarkFolder = ACTION_BUILDER.createAction(true, "newBookmarkFolder", this);
/** Add a bookmark for the currently selected Question from the currently selected QuestionCollection . */
public void addBookmark() {
Modified: libs/swing-bookmarks/trunk/src/prj/net/sf/japi/swing/bookmarks/BookmarkTransferable.java
===================================================================
--- libs/swing-bookmarks/trunk/src/prj/net/sf/japi/swing/bookmarks/BookmarkTransferable.java 2008-12-28 23:30:05 UTC (rev 755)
+++ libs/swing-bookmarks/trunk/src/prj/net/sf/japi/swing/bookmarks/BookmarkTransferable.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -42,7 +42,7 @@
}
/** Supported DataFlavors. */
- private static DataFlavor[] flavors = {BOOKMARK_DATA_FLAVOR};
+ private static final DataFlavor[] flavors = {BOOKMARK_DATA_FLAVOR};
/** Bookmark to be transferred. */
private final BookmarkManager.Bookmark bookmark;
@@ -61,7 +61,7 @@
/** {@inheritDoc} */
public DataFlavor[] getTransferDataFlavors() {
- return flavors;
+ return flavors.clone();
}
/** {@inheritDoc} */
Modified: libs/swing-bookmarks/trunk/src/prj/net/sf/japi/swing/bookmarks/BookmarkTreeCellRenderer.java
===================================================================
--- libs/swing-bookmarks/trunk/src/prj/net/sf/japi/swing/bookmarks/BookmarkTreeCellRenderer.java 2008-12-28 23:30:05 UTC (rev 755)
+++ libs/swing-bookmarks/trunk/src/prj/net/sf/japi/swing/bookmarks/BookmarkTreeCellRenderer.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -36,7 +36,7 @@
/** JSeparator.
* @serial include
*/
- private JSeparator sep = new JSeparator();
+ private final JSeparator sep = new JSeparator();
/** {@inheritDoc} */
@Override public Component getTreeCellRendererComponent(final JTree tree, final Object value, final boolean sel, final boolean expanded, final boolean leaf, final int row, final boolean hasFocus) {
Modified: libs/swing-extlib/trunk/src/prj/net/sf/japi/swing/ToolBarLayout.java
===================================================================
--- libs/swing-extlib/trunk/src/prj/net/sf/japi/swing/ToolBarLayout.java 2008-12-28 23:30:05 UTC (rev 755)
+++ libs/swing-extlib/trunk/src/prj/net/sf/japi/swing/ToolBarLayout.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -90,22 +90,22 @@
/** Components in the north region.
* @serial include
*/
- private List<Component> north = new ArrayList<Component>();
+ private final List<Component> north = new ArrayList<Component>();
/** Components in the south region.
* @serial include
*/
- private List<Component> south = new ArrayList<Component>();
+ private final List<Component> south = new ArrayList<Component>();
/** Components in the east region.
* @serial include
*/
- private List<Component> east = new ArrayList<Component>();
+ private final List<Component> east = new ArrayList<Component>();
/** Components in the west region.
* @serial include
*/
- private List<Component> west = new ArrayList<Component>();
+ private final List<Component> west = new ArrayList<Component>();
/** Component in the center region.
* @serial include
Modified: libs/swing-misc/trunk/src/prj/net/sf/japi/swing/misc/JSAXErrorHandler.java
===================================================================
--- libs/swing-misc/trunk/src/prj/net/sf/japi/swing/misc/JSAXErrorHandler.java 2008-12-28 23:30:05 UTC (rev 755)
+++ libs/swing-misc/trunk/src/prj/net/sf/japi/swing/misc/JSAXErrorHandler.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -43,7 +43,7 @@
/** The JTextArea which displays the errors.
* @serial include
*/
- private JTextArea errorPane = new JTextArea();
+ private final JTextArea errorPane = new JTextArea();
/** The Dialog.
* @serial include
@@ -58,7 +58,7 @@
/** Button for closing.
* @serial include
*/
- private JButton closeButton;
+ private final JButton closeButton;
/** Create a JSAXErrorHandler.
* @param parent Parent component to display on.
Modified: libs/swing-prefs/trunk/src/prj/net/sf/japi/swing/prefs/PreferencesPane.java
===================================================================
--- libs/swing-prefs/trunk/src/prj/net/sf/japi/swing/prefs/PreferencesPane.java 2008-12-28 23:30:05 UTC (rev 755)
+++ libs/swing-prefs/trunk/src/prj/net/sf/japi/swing/prefs/PreferencesPane.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -274,7 +274,7 @@
/** The border.
* For some reason it gets lost when set in the initializer, so we store it and set it each time the renderer is used.
*/
- private Border border = createEmptyBorder(10, 10, 10, 10);
+ private final Border border = createEmptyBorder(10, 10, 10, 10);
/** Create a PrefsListCellRenderer. */
PrefsListCellRenderer() {
Modified: libs/swing-prefs/trunk/src/tst/test/net/sf/japi/swing/prefs/MockPrefs.java
===================================================================
--- libs/swing-prefs/trunk/src/tst/test/net/sf/japi/swing/prefs/MockPrefs.java 2008-12-28 23:30:05 UTC (rev 755)
+++ libs/swing-prefs/trunk/src/tst/test/net/sf/japi/swing/prefs/MockPrefs.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -36,7 +36,7 @@
private final Map<String, int[]> invocationCounter = new HashMap<String, int[]>();
/** The Textfield for changes. */
- private JTextField textfield = new JTextField();
+ private final JTextField textfield = new JTextField();
/** The text for changes. */
private String text = "";
Modified: libs/swing-recent/trunk/src/prj/net/sf/japi/swing/recent/PrefsRecentURLs.java
===================================================================
--- libs/swing-recent/trunk/src/prj/net/sf/japi/swing/recent/PrefsRecentURLs.java 2008-12-28 23:30:05 UTC (rev 755)
+++ libs/swing-recent/trunk/src/prj/net/sf/japi/swing/recent/PrefsRecentURLs.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -38,13 +38,13 @@
private int maxLastOpened;
/** List with recently opened files. */
- private List<String> recentlyOpenedURLs = new ArrayList<String>();
+ private final List<String> recentlyOpenedURLs = new ArrayList<String>();
/** List with listeners. */
- private EventListenerList listeners = new EventListenerList();
+ private final EventListenerList listeners = new EventListenerList();
/** The Preferences to manage the recent URLs in. */
- private Preferences prefs;
+ private final Preferences prefs;
/** The PrefsRecentURls. */
private static final Map<Class<?>,PrefsRecentURLs> instances = new WeakHashMap<Class<?>,PrefsRecentURLs>();
Modified: libs/swing-tod/trunk/src/prj/net/sf/japi/swing/tod/TipOfTheDayManager.java
===================================================================
--- libs/swing-tod/trunk/src/prj/net/sf/japi/swing/tod/TipOfTheDayManager.java 2008-12-28 23:30:05 UTC (rev 755)
+++ libs/swing-tod/trunk/src/prj/net/sf/japi/swing/tod/TipOfTheDayManager.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -114,16 +114,16 @@
@Nullable private JDialog dialog;
/** JCheckBox for showing at startup. */
- @NotNull private JCheckBox showAtStartup = new JCheckBox(ACTION_BUILDER.createAction(false, "todShowAtStartup", null));
+ @NotNull private final JCheckBox showAtStartup = new JCheckBox(ACTION_BUILDER.createAction(false, "todShowAtStartup", null));
/** The JLabel showing the current number of the tod. */
- @NotNull private JLabel currentTodIndex = new JLabel();
+ @NotNull private final JLabel currentTodIndex = new JLabel();
/** The JEditorPane displaying the tod text. */
- @NotNull private JEditorPane todText = new JEditorPane("text/html", "");
+ @NotNull private final JEditorPane todText = new JEditorPane("text/html", "");
/** List with tod texts. */
- @NotNull private List<String> todTexts = new ArrayList<String>();
+ @NotNull private final List<String> todTexts = new ArrayList<String>();
/** Number of current Tip of the day.
* In visible state, the index must range between 0 and the number of tods available - 1, inclusive.
Modified: libs/swing-treetable/trunk/src/prj/net/sf/japi/swing/treetable/JTreeTable.java
===================================================================
--- libs/swing-treetable/trunk/src/prj/net/sf/japi/swing/treetable/JTreeTable.java 2008-12-28 23:30:05 UTC (rev 755)
+++ libs/swing-treetable/trunk/src/prj/net/sf/japi/swing/treetable/JTreeTable.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -40,7 +40,7 @@
public class JTreeTable<R, T> extends JTable {
/** TreeTableCellRenderer. */
- private TreeTableCellRenderer tree;
+ private final TreeTableCellRenderer tree;
/** The TreeTableModel for this JTreeTable. */
private TreeTableModel<R, T> treeTableModel;
Modified: libs/swing-treetable/trunk/src/prj/net/sf/japi/swing/treetable/TreeTableModelTableModelAdapter.java
===================================================================
--- libs/swing-treetable/trunk/src/prj/net/sf/japi/swing/treetable/TreeTableModelTableModelAdapter.java 2008-12-28 23:30:05 UTC (rev 755)
+++ libs/swing-treetable/trunk/src/prj/net/sf/japi/swing/treetable/TreeTableModelTableModelAdapter.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -34,10 +34,10 @@
private static final long serialVersionUID = 1L;
/** The underlying JTree. */
- private JTree tree;
+ private final JTree tree;
/** The underlying TreeTableModel. */
- private TreeTableModel treeTableModel;
+ private final TreeTableModel treeTableModel;
/** Create a TreeTableModelAdapter.
* @param treeTableModel TreeTableModel to adapt
Modified: libs/swing-treetable/trunk/src/prj/net/sf/japi/swing/treetable/TreeTableModelTreeModelAdapter.java
===================================================================
--- libs/swing-treetable/trunk/src/prj/net/sf/japi/swing/treetable/TreeTableModelTreeModelAdapter.java 2008-12-28 23:30:05 UTC (rev 755)
+++ libs/swing-treetable/trunk/src/prj/net/sf/japi/swing/treetable/TreeTableModelTreeModelAdapter.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -36,7 +36,7 @@
private final EventListenerList listenerList = new EventListenerList();
/** The underlying TreeTableModel. */
- private TreeTableModel<R, T> treeTableModel;
+ private final TreeTableModel<R, T> treeTableModel;
public TreeTableModelTreeModelAdapter(final TreeTableModel<R, T> treeTableModel) {
this.treeTableModel = treeTableModel;
Modified: libs/util/trunk/src/prj/net/sf/japi/util/IteratorIterable.java
===================================================================
--- libs/util/trunk/src/prj/net/sf/japi/util/IteratorIterable.java 2008-12-28 23:30:05 UTC (rev 755)
+++ libs/util/trunk/src/prj/net/sf/japi/util/IteratorIterable.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -31,7 +31,7 @@
public class IteratorIterable<T> implements Iterable<T> {
/** The wrapped Iterator. */
- @NotNull private Iterator<T> iterator;
+ @NotNull private final Iterator<T> iterator;
/**
* Wrap an Iterator in an Iterable.
Modified: libs/util/trunk/src/prj/net/sf/japi/util/filter/NotFilter.java
===================================================================
--- libs/util/trunk/src/prj/net/sf/japi/util/filter/NotFilter.java 2008-12-28 23:30:05 UTC (rev 755)
+++ libs/util/trunk/src/prj/net/sf/japi/util/filter/NotFilter.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -26,7 +26,7 @@
final class NotFilter<T> implements Filter<T> {
/** The filter to negate. */
- private Filter<T> filter;
+ private final Filter<T> filter;
/** Create a NotFilter.
* @param filter Filter to negate
Modified: progs/cardlearn/trunk/src/prj/net/sf/japi/cardlearn/CardDatabaseConfig.java
===================================================================
--- progs/cardlearn/trunk/src/prj/net/sf/japi/cardlearn/CardDatabaseConfig.java 2008-12-28 23:30:05 UTC (rev 755)
+++ progs/cardlearn/trunk/src/prj/net/sf/japi/cardlearn/CardDatabaseConfig.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -10,7 +10,7 @@
/** Serial version. */
private static final long serialVersionUID = 1L;
- private String[] fieldNames = new String[6];
+ private final String[] fieldNames = new String[6];
/** Creates a CardDatabaseConfig.
*/
Modified: progs/cardlearn/trunk/src/prj/net/sf/japi/cardlearn/CardDatabaseConfigEditor.java
===================================================================
--- progs/cardlearn/trunk/src/prj/net/sf/japi/cardlearn/CardDatabaseConfigEditor.java 2008-12-28 23:30:05 UTC (rev 755)
+++ progs/cardlearn/trunk/src/prj/net/sf/japi/cardlearn/CardDatabaseConfigEditor.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -15,13 +15,13 @@
public class CardDatabaseConfigEditor extends JComponent {
/** The CardDatabaseConfig to edit. */
- private CardDatabaseConfig config;
+ private final CardDatabaseConfig config;
/** The labels for the fields. */
- private JLabel[] labels = new JLabel[6];
+ private final JLabel[] labels = new JLabel[6];
/** The textfields for the fields. */
- private JTextField[] fields = new JTextField[6];
+ private final JTextField[] fields = new JTextField[6];
/** Creates a CardDatabaseConfigEditor.
* @param config CardDatabaseConfiguration to edit.
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/Program.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/Program.java 2008-12-28 23:30:05 UTC (rev 755)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/Program.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -37,16 +37,16 @@
public class Program {
/** The IOProvider. */
- private IOModuleProvider<QuestionCollection> ioProvider = IOModuleProvider.getProvider(QuestionCollection.class);
+ private final IOModuleProvider<QuestionCollection> ioProvider = IOModuleProvider.getProvider(QuestionCollection.class);
/** The KEduca filter reference. */
- private KEduca keduca;
+ private final KEduca keduca;
/** The JTestV1 filter reference. */
- private JTestV1 jtestv1;
+ private final JTestV1 jtestv1;
/** The Settings. */
- private Settings settings;
+ private final Settings settings;
/** The currently loaded Question Collection. */
private QuestionCollection col;
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/QuestionCollection.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/QuestionCollection.java 2008-12-28 23:30:05 UTC (rev 755)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/QuestionCollection.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -40,7 +40,7 @@
/** The Questions.
* @serial include
*/
- private List<QuestionText> questions;
+ private final List<QuestionText> questions;
/** The title of this collection.
* @serial include
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/Settings.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/Settings.java 2008-12-28 23:30:05 UTC (rev 755)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/Settings.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -40,10 +40,10 @@
private int maxLastOpened;
/** List with recently opened files. */
- private List<String> recentlyOpenedURLs = new ArrayList<String>();
+ private final List<String> recentlyOpenedURLs = new ArrayList<String>();
/** List with listeners. */
- private List<RecentURLsListener> listeners = new ArrayList<RecentURLsListener>();
+ private final List<RecentURLsListener> listeners = new ArrayList<RecentURLsListener>();
/** Create a Settings with default values. */
public Settings() {
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/AnswerGUI.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/AnswerGUI.java 2008-12-28 23:30:05 UTC (rev 755)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/AnswerGUI.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -47,12 +47,12 @@
private static final String HTML_END = "</body></html>";
/** Answer to display GUI for. */
- private transient MCAnswerText answer;
+ private final transient MCAnswerText answer;
/** The button the user may push.
* @serial include
*/
- private JToggleButton button;
+ private final JToggleButton button;
/** Create an AnswerGUI.
* @param answer Answer to vizualize
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/FirstSettingsModule.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/FirstSettingsModule.java 2008-12-28 23:30:05 UTC (rev 755)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/FirstSettingsModule.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -49,12 +49,12 @@
/** ShowSolutionsOn.
* @serial include
*/
- private JRadioButton showSolutionsOn;
+ private final JRadioButton showSolutionsOn;
/** ShowSolutionsOff.
* @serial include
*/
- private JRadioButton showSolutionsOff;
+ private final JRadioButton showSolutionsOff;
/** Create a FirstSettingsModule.
* @param settings Settings to modify
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 2008-12-28 23:30:05 UTC (rev 755)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/ProgramFrame.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -77,7 +77,7 @@
private transient Program program;
/** The BookmarkManager. */
- private transient BookmarkManager bookmarkManager = new BookmarkManager(this);
+ private final transient BookmarkManager bookmarkManager = new BookmarkManager(this);
/** Action Builder. */
private static final ActionBuilder ACTION_BUILDER = ActionBuilderFactory.getInstance().getActionBuilder("net.sf.japi.progs.jeduca.jtest.gui");
@@ -291,52 +291,52 @@
/** Action for doc.
* @serial include
*/
- private Action doc = ACTION_BUILDER.createAction(false, "doc");
+ private final Action doc = ACTION_BUILDER.createAction(false, "doc");
/** Action for open.
* @serial include
*/
- private Action open = ACTION_BUILDER.createAction(true, "open", this);
+ private final Action open = ACTION_BUILDER.createAction(true, "open", this);
/** Action for save.
* @serial include
*/
- private Action save = ACTION_BUILDER.createAction(true, "save", this);
+ private final Action save = ACTION_BUILDER.createAction(true, "save", this);
/** Action for print.
* @serial include
*/
- private Action print = ACTION_BUILDER.createAction(true, "print", this);
+ private final Action print = ACTION_BUILDER.createAction(true, "print", this);
/** Action for quit.
* @serial include
*/
- private Action quit = ACTION_BUILDER.createAction(true, "quit", this);
+ private final Action quit = ACTION_BUILDER.createAction(true, "quit", this);
/** Action for view.
* @serial include
*/
- private Action view = ACTION_BUILDER.createAction(true, "view");
+ private final Action view = ACTION_BUILDER.createAction(true, "view");
/** Action for settings.
* @serial include
*/
- private Action settings = ACTION_BUILDER.createAction(true, "settings");
+ private final Action settings = ACTION_BUILDER.createAction(true, "settings");
/** Action for config.
* @serial include
*/
- private Action config = ACTION_BUILDER.createAction(true, "config", this);
+ private final Action config = ACTION_BUILDER.createAction(true, "config", this);
/** Action for help.
* @serial include
*/
- private Action help = ACTION_BUILDER.createAction(true, "help");
+ private final Action help = ACTION_BUILDER.createAction(true, "help");
/** Action for about.
* @serial include
*/
- private Action about = ACTION_BUILDER.createAction(true, "about", this);
+ private final Action about = ACTION_BUILDER.createAction(true, "about", this);
/** Create Menu with essential program actions.
* @return 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 2008-12-28 23:30:05 UTC (rev 755)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/QuestionCollectionGUI.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -109,7 +109,7 @@
/** The Settings.
* @serial include
*/
- private Settings settings;
+ private final Settings settings;
/** Create a GUI for a Collection of Questions.
* @param settings Settings to use.
@@ -274,42 +274,42 @@
/** Action for start test.
* @serial include
*/
- private Action start = ACTION_BUILDER.createAction(true, "start", this);
+ private final Action start = ACTION_BUILDER.createAction(true, "start", this);
/** Action for first question.
* @serial include
*/
- private Action first = ACTION_BUILDER.createAction(true, "first", this);
+ private final Action first = ACTION_BUILDER.createAction(true, "first", this);
/** Action for previous question.
* @serial include
*/
- private Action prev = ACTION_BUILDER.createAction(true, "prev", this);
+ private final Action prev = ACTION_BUILDER.createAction(true, "prev", this);
/** Action for next question.
* @serial include
*/
- private Action next = ACTION_BUILDER.createAction(true, "next", this);
+ private final Action next = ACTION_BUILDER.createAction(true, "next", this);
/** Action for last question.
* @serial include
*/
- private Action last = ACTION_BUILDER.createAction(true, "last", this);
+ private final Action last = ACTION_BUILDER.createAction(true, "last", this);
/** Action for review.
* @serial include
*/
- private Action review = ACTION_BUILDER.createAction(true, "review", this);
+ private final Action review = ACTION_BUILDER.createAction(true, "review", this);
/** Action for end.
* @serial include
*/
- private Action end = ACTION_BUILDER.createAction(true, "end", this);
+ private final Action end = ACTION_BUILDER.createAction(true, "end", this);
/** All Actions related to navigation.
* @serial include
*/
- private Action[] navigationActions = { start, first, prev, next, last, review, end };
+ private final Action[] navigationActions = { start, first, prev, next, last, review, end };
/** Create Navigation Menu.
* @return Navigation Menu
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/ReviewGUI.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/ReviewGUI.java 2008-12-28 23:30:05 UTC (rev 755)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/ReviewGUI.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -50,12 +50,12 @@
/** The Panel with the Review elements.
* @serial include
*/
- private JPanel reviews;
+ private final JPanel reviews;
/** The QuestionCollectionGUI.
* @serial include
*/
- private QuestionCollectionGUI questionCollectionGUI;
+ private final QuestionCollectionGUI questionCollectionGUI;
/** The JCheckBoxes.
* @serial include
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/SettingsGUI.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/SettingsGUI.java 2008-12-28 23:30:05 UTC (rev 755)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/SettingsGUI.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -49,12 +49,12 @@
/** ShowSolutionsOn.
* @serial include
*/
- private JRadioButton showSolutionsOn;
+ private final JRadioButton showSolutionsOn;
/** ShowSolutionsOff.
* @serial include
*/
- private JRadioButton showSolutionsOff;
+ private final JRadioButton showSolutionsOff;
/** Create a SettingsGUI.
* @param settings Settings to create a GUI for.
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/SolutionGUI.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/SolutionGUI.java 2008-12-28 23:30:05 UTC (rev 755)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/SolutionGUI.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -58,7 +58,7 @@
/** The JEditorPane to show the solution.
* @serial include
*/
- private JEditorPane solution;
+ private final JEditorPane solution;
/** Create a SolutionGUI. */
public SolutionGUI() {
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/io/AbstractJTestImport.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/io/AbstractJTestImport.java 2008-12-28 23:30:05 UTC (rev 755)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/io/AbstractJTestImport.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -52,7 +52,7 @@
} // class Uptodate
/** Map with uptodate information. */
- private Map<String, Uptodate> acceptable = new WeakHashMap<String, Uptodate>();
+ private final Map<String, Uptodate> acceptable = new WeakHashMap<String, Uptodate>();
/** {@inheritDoc} */
public final boolean canLoad(final String uri) {
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/io/JTestV1.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/io/JTestV1.java 2008-12-28 23:30:05 UTC (rev 755)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/io/JTestV1.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -56,19 +56,19 @@
public class JTestV1 extends AbstractJTestImport<QuestionCollection> implements Importer<QuestionCollection>, Exporter<QuestionCollection> {
/** The DocumentBuilderFactory. */
- private DocumentBuilderFactory dbf;
+ private final DocumentBuilderFactory dbf;
/** The DocumentBuilder. */
- private DocumentBuilder db;
+ private final DocumentBuilder db;
/** The DOMImplementation in use. */
- private DOMImplementation domImpl;
+ private final DOMImplementation domImpl;
/** The XPathFactory. */
- private XPathFactory xpf;
+ private final XPathFactory xpf;
/** The XPath. */
- private XPath xp;
+ private final XPath xp;
/** Create a new JTest interface.
* @throws Error in case of ParserConfigurationExceptions
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/io/KEduca.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/io/KEduca.java 2008-12-28 23:30:05 UTC (rev 755)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/io/KEduca.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -51,19 +51,19 @@
public class KEduca extends AbstractJTestImport<QuestionCollection> implements Exporter<QuestionCollection> {
/** The DocumentBuilderFactory. */
- private DocumentBuilderFactory dbf;
+ private final DocumentBuilderFactory dbf;
/** The DocumentBuilder. */
- private DocumentBuilder db;
+ private final DocumentBuilder db;
/** The DOMImplementation in use. */
- private DOMImplementation domImpl;
+ private final DOMImplementation domImpl;
/** The XPathFactory. */
- private XPathFactory xpf;
+ private final XPathFactory xpf;
/** The XPath. */
- private XPath xp;
+ private final XPath xp;
/** Create a new KEduca interface.
* @throws Error in case of ParserConfigurationExceptions
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/io/XMLUtils.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/io/XMLUtils.java 2008-12-28 23:30:05 UTC (rev 755)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/io/XMLUtils.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -40,7 +40,7 @@
}
/** Quiet error handler. */
- private DefaultHandler2 quietHandler = new DefaultHandler2();
+ private final DefaultHandler2 quietHandler = new DefaultHandler2();
/** Get the quiet error handler.
* @return The quiet error handler.
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/AbstractManager.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/AbstractManager.java 2008-12-28 23:30:05 UTC (rev 755)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/AbstractManager.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -91,7 +91,7 @@
/** View Show All action.
* @see #viewShowAll()
*/
- private Action viewShowAll = ACTION_BUILDER.createAction(true, "viewShowAll", this);
+ private final Action viewShowAll = ACTION_BUILDER.createAction(true, "viewShowAll", this);
/** View Show All action, shows all managed components. */
public void viewShowAll() {
@@ -103,7 +103,7 @@
/** View Hide All action.
* @see #viewHideAll()
*/
- private Action viewHideAll = ACTION_BUILDER.createAction(true, "viewHideAll", this);
+ private final Action viewHideAll = ACTION_BUILDER.createAction(true, "viewHideAll", this);
/** View Hide All action, hides all managed components. */
public void viewHideAll() {
@@ -234,7 +234,7 @@
/** The list of JCheckBoxMenuItems and JCheckBoxes created for this JComponent.
* @serial include
*/
- private List<WeakReference<AbstractButton>> buttons = new ArrayList<WeakReference<AbstractButton>>();
+ private final List<WeakReference<AbstractButton>> buttons = new ArrayList<WeakReference<AbstractButton>>();
/** Create a SubAction.
* @param comp JComponent to create Action for
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/HelpManager.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/HelpManager.java 2008-12-28 23:30:05 UTC (rev 755)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/HelpManager.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -41,7 +41,7 @@
public class HelpManager extends WindowAdapter {
/** The HelpManager instances. */
- private static Map<String,HelpManager> managers = new WeakHashMap<String,HelpManager>();
+ private static final Map<String,HelpManager> managers = new WeakHashMap<String,HelpManager>();
/** Get a HelpManager.
* If no HelpManager already exists, a new one will be created and remembered.
@@ -58,10 +58,10 @@
}
/** The dialog. */
- private JFrame dialog;
+ private final JFrame dialog;
/** The HTML Viewer. */
- private JEditorPane helpView;
+ private final JEditorPane helpView;
/** Create a HelpManager. */
public HelpManager() {
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/InternalFrameManager.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/InternalFrameManager.java 2008-12-28 23:30:05 UTC (rev 755)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/InternalFrameManager.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -46,10 +46,10 @@
}
/** InternalFrames action. */
- private Action internalFrames = ActionBuilderFactory.getInstance().getActionBuilder("net.sf.japi.progs.jeduca.swing").createAction(true, "internalFrames");
+ private final Action internalFrames = ActionBuilderFactory.getInstance().getActionBuilder("net.sf.japi.progs.jeduca.swing").createAction(true, "internalFrames");
/** InternalFrames configuration action. */
- private Action configureInternalFrames = ActionBuilderFactory.getInstance().getActionBuilder("net.sf.japi.progs.jeduca.swing").createAction(true, "configureInternalFrames", this);
+ private final Action configureInternalFrames = ActionBuilderFactory.getInstance().getActionBuilder("net.sf.japi.progs.jeduca.swing").createAction(true, "configureInternalFrames", this);
/** InternalFrames configuration action. */
public void configureInternalFrames() { /* TODO */ }
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/MenuManager.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/MenuManager.java 2008-12-28 23:30:05 UTC (rev 755)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/MenuManager.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -47,10 +47,10 @@
//}
/** Menus action. */
- private Action menus = ActionBuilderFactory.getInstance().getActionBuilder("net.sf.japi.progs.jeduca.swing").createAction(true, "menus");
+ private final Action menus = ActionBuilderFactory.getInstance().getActionBuilder("net.sf.japi.progs.jeduca.swing").createAction(true, "menus");
/** Menus configuration action. */
- private Action configureMenus = ActionBuilderFactory.getInstance().getActionBuilder("net.sf.japi.progs.jeduca.swing").createAction(true, "configureMenus", this);
+ private final Action configureMenus = ActionBuilderFactory.getInstance().getActionBuilder("net.sf.japi.progs.jeduca.swing").createAction(true, "configureMenus", this);
/** Menus configuration action. */
public void configureMenus() { /* TODO */ }
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/OpenURLPane.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/OpenURLPane.java 2008-12-28 23:30:05 UTC (rev 755)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/OpenURLPane.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -112,27 +112,27 @@
/** Action for ok button.
* @serial include
*/
- private Action ok = ActionBuilderFactory.getInstance().getActionBuilder("net.sf.japi.progs.jeduca.swing").createAction(true, "ok", this);
+ private final Action ok = ActionBuilderFactory.getInstance().getActionBuilder("net.sf.japi.progs.jeduca.swing").createAction(true, "ok", this);
/** Action for cancel button.
* @serial include
*/
- private Action cancel = ActionBuilderFactory.getInstance().getActionBuilder("net.sf.japi.progs.jeduca.swing").createAction(true, "cancel", this);
+ private final Action cancel = ActionBuilderFactory.getInstance().getActionBuilder("net.sf.japi.progs.jeduca.swing").createAction(true, "cancel", this);
/** Action for delete button.
* @serial include
*/
- private Action delete = ActionBuilderFactory.getInstance().getActionBuilder("net.sf.japi.progs.jeduca.swing").createAction(true, "delete", this);
+ private final Action delete = ActionBuilderFactory.getInstance().getActionBuilder("net.sf.japi.progs.jeduca.swing").createAction(true, "delete", this);
/** Action for selectFile button.
* @serial include
*/
- private Action selectFile = ActionBuilderFactory.getInstance().getActionBuilder("net.sf.japi.progs.jeduca.swing").createAction(true, "selectFile", this);
+ private final Action selectFile = ActionBuilderFactory.getInstance().getActionBuilder("net.sf.japi.progs.jeduca.swing").createAction(true, "selectFile", this);
/** TextField with user input.
* @serial include
*/
- private JTextField input = new JTextField();
+ private final JTextField input = new JTextField();
/** Dialog to show.
* @serial include
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/ToolBarManager.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/ToolBarManager.java 2008-12-28 23:30:05 UTC (rev 755)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/ToolBarManager.java 2008-12-29 04:02:35 UTC (rev 756)
@@ -86,10 +86,10 @@
}
/** Toolbars action. */
- private Action toolbars = ActionBuilderFactory.getInstance().getActionBuilder("net.sf.japi.progs.jeduca.swing").createAction(true, "toolbars");
+ private final Action toolbars = ActionBuilderFactory.getInstance().getActionBuilder("net.sf.japi.progs.jeduca.swing").createAction(true, "toolbars");
/** Toolbars configuration action. */
- private Action configureToolbars = Ac...
[truncated message content] |
|
From: <chr...@us...> - 2008-12-28 23:30:08
|
Revision: 755
http://japi.svn.sourceforge.net/japi/?rev=755&view=rev
Author: christianhujer
Date: 2008-12-28 23:30:05 +0000 (Sun, 28 Dec 2008)
Log Message:
-----------
Added missing braces to control flow statements.
Modified Paths:
--------------
historic/trunk/src/app/net/sf/japi/finance/SimpleCapitalCalculator.java
historic/trunk/src/doc/guide/io/src/SortPlain.java
Modified: historic/trunk/src/app/net/sf/japi/finance/SimpleCapitalCalculator.java
===================================================================
--- historic/trunk/src/app/net/sf/japi/finance/SimpleCapitalCalculator.java 2008-12-28 23:28:23 UTC (rev 754)
+++ historic/trunk/src/app/net/sf/japi/finance/SimpleCapitalCalculator.java 2008-12-28 23:30:05 UTC (rev 755)
@@ -42,9 +42,12 @@
* @return the overall capital after numberOfPeriods periods
*/
public double calculateCapital( int numberOfPeriods ) {
- if ( numberOfPeriods < 0 ) throw new IllegalArgumentException("Number of periods has to be at least 0!");
- if ( numberOfPeriods == 0 )
+ if ( numberOfPeriods < 0 ) {
+ throw new IllegalArgumentException("Number of periods has to be at least 0!");
+ }
+ if ( numberOfPeriods == 0 ) {
return initialCapital;
+ }
currentCapital = numberOfPeriods == 1 ? initialCapital * (1 + interestRate / 100) : initialCapital * Math.pow((1 + interestRate / 100), numberOfPeriods);
return currentCapital;
}
Modified: historic/trunk/src/doc/guide/io/src/SortPlain.java
===================================================================
--- historic/trunk/src/doc/guide/io/src/SortPlain.java 2008-12-28 23:28:23 UTC (rev 754)
+++ historic/trunk/src/doc/guide/io/src/SortPlain.java 2008-12-28 23:30:05 UTC (rev 755)
@@ -21,7 +21,10 @@
try {
final BufferedReader in = new BufferedReader(new InputStreamReader(System.in));
try {
- for (String line; (line = in.readLine()) != null; lineList.add(line));
+ String line;
+ while ((line = in.readLine()) != null) {
+ lineList.add(line);
+ }
} catch (final IOException e) {
System.err.println(e);
} finally {
@@ -35,7 +38,10 @@
try {
final BufferedReader in = new BufferedReader(new FileReader(arg));
try {
- for (String line; (line = in.readLine()) != null; lineList.add(line));
+ String line;
+ while ((line = in.readLine()) != null) {
+ lineList.add(line);
+ }
} finally {
in.close();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-12-28 23:28:28
|
Revision: 754
http://japi.svn.sourceforge.net/japi/?rev=754&view=rev
Author: christianhujer
Date: 2008-12-28 23:28:23 +0000 (Sun, 28 Dec 2008)
Log Message:
-----------
Improved array initializer.
Modified Paths:
--------------
libs/swing-tod/trunk/src/prj/net/sf/japi/swing/tod/TipOfTheDayManager.java
Modified: libs/swing-tod/trunk/src/prj/net/sf/japi/swing/tod/TipOfTheDayManager.java
===================================================================
--- libs/swing-tod/trunk/src/prj/net/sf/japi/swing/tod/TipOfTheDayManager.java 2008-12-28 23:25:49 UTC (rev 753)
+++ libs/swing-tod/trunk/src/prj/net/sf/japi/swing/tod/TipOfTheDayManager.java 2008-12-28 23:28:23 UTC (rev 754)
@@ -93,7 +93,7 @@
@NotNull private static final Preferences PREFS = userNodeForPackage(TipOfTheDayManager.class);
/** The Action keys used for accelerators. */
- @NotNull private static final String[] ACCELERATOR_KEYS = new String[] { ACCELERATOR_KEY, ACCELERATOR_KEY_2 };
+ @NotNull private static final String[] ACCELERATOR_KEYS = { ACCELERATOR_KEY, ACCELERATOR_KEY_2 };
/** The static instance. */
@NotNull private static final TipOfTheDayManager INSTANCE = new TipOfTheDayManager();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-12-28 23:25:52
|
Revision: 753
http://japi.svn.sourceforge.net/japi/?rev=753&view=rev
Author: christianhujer
Date: 2008-12-28 23:25:49 +0000 (Sun, 28 Dec 2008)
Log Message:
-----------
Improved UnitTest for EnumerationIterator.
Modified Paths:
--------------
libs/util/trunk/src/tst/test/net/sf/japi/util/EnumerationIteratorTest.java
Modified: libs/util/trunk/src/tst/test/net/sf/japi/util/EnumerationIteratorTest.java
===================================================================
--- libs/util/trunk/src/tst/test/net/sf/japi/util/EnumerationIteratorTest.java 2008-12-28 21:50:19 UTC (rev 752)
+++ libs/util/trunk/src/tst/test/net/sf/japi/util/EnumerationIteratorTest.java 2008-12-28 23:25:49 UTC (rev 753)
@@ -23,6 +23,7 @@
import java.util.Arrays;
import java.util.Collections;
+import java.util.Iterator;
import java.util.NoSuchElementException;
import net.sf.japi.util.EnumerationIterator;
import org.junit.Assert;
@@ -33,68 +34,77 @@
*/
public class EnumerationIteratorTest {
- /** Test case for {@link EnumerationIterator#iterator()}.
- * @throws Exception (unexpected).
- */
+ /** Test case for {@link EnumerationIterator#iterator()}. */
@Test
- public void testIterator() throws Exception {
- EnumerationIterator<?> oUT = new EnumerationIterator<String>(Collections.enumeration(Arrays.asList("foo", "bar")));
+ public void testIteratorEmptyList() {
+ final Iterable<?> oUT = new EnumerationIterator<Object>(Collections.enumeration(Arrays.asList()));
Assert.assertNotNull("Even empty enumerations must generate an iterator instance.", oUT.iterator());
- oUT = new EnumerationIterator<Object>(Collections.enumeration(Arrays.asList()));
+ }
+
+ /** Test case for {@link EnumerationIterator#iterator()}. */
+ @Test
+ public void testIteratorTwoElements() {
+ final Iterable<?> oUT = new EnumerationIterator<String>(Collections.enumeration(Arrays.asList("foo", "bar")));
Assert.assertNotNull("Even empty enumerations must generate an iterator instance.", oUT.iterator());
}
- /** Test case for {@link EnumerationIterator#hasNext()}.
- * @throws Exception (unexpected).
- */
- @Test public void testHasNext() throws Exception {
- EnumerationIterator<?> oUT = new EnumerationIterator<Object>(Collections.enumeration(Arrays.asList()));
+ /** Test case for {@link EnumerationIterator#hasNext()}. */
+ @Test public void testHasNextEmpty() {
+ final Iterator<?> oUT = new EnumerationIterator<Object>(Collections.enumeration(Arrays.asList()));
Assert.assertFalse("hasNext() on empty enumeration must instantly return false.", oUT.hasNext());
- oUT = new EnumerationIterator<String>(Collections.enumeration(Arrays.asList("foo", "bar")));
+ }
+
+ /** Test case for {@link EnumerationIterator#hasNext()}. */
+ @Test public void testHasNextTwoElements() {
+ final Iterator<?> oUT = new EnumerationIterator<String>(Collections.enumeration(Arrays.asList("foo", "bar")));
Assert.assertTrue("hasNext() on nonempty enumeration must first return true.", oUT.hasNext());
}
/** Test case for {@link EnumerationIterator#next()}.
- * @throws Exception (unexpected).
+ * @throws NoSuchElementException (expected).
*/
- @Test public void testNext() throws Exception {
- EnumerationIterator<?> oUT = new EnumerationIterator<Object>(Collections.enumeration(Arrays.asList()));
+ @Test(expected = NoSuchElementException.class)
+ public void testNextEmpty() throws NoSuchElementException {
+ final Iterator<?> oUT = new EnumerationIterator<Object>(Collections.enumeration(Arrays.asList()));
+ oUT.next();
+ }
+
+ /** Test case for {@link EnumerationIterator#next()}.
+ * @throws NoSuchElementException (expected).
+ */
+ @Test(expected = NoSuchElementException.class)
+ public void testNextTwoElements() throws NoSuchElementException {
+ final Iterator<?> oUT = new EnumerationIterator<String>(Collections.enumeration(Arrays.asList("foo", "bar")));
try {
oUT.next();
- Assert.fail("next() on empty enumeration must instantly throw NoSuchElementException.");
+ oUT.next();
} catch (final NoSuchElementException ignore) {
- /* Expected exception. */
+ Assert.fail("next() on two elements enumeration must not throw NoSuchElementException before third invocation.");
}
- oUT = new EnumerationIterator<String>(Collections.enumeration(Arrays.asList("foo", "bar")));
oUT.next();
- oUT.next();
- try {
- oUT.next();
- Assert.fail("next() on two elements enumeration must throw NoSuchElementException on third invocation.");
- } catch (final NoSuchElementException ignore) {
- /* Expected exception. */
- }
}
/** Test case for {@link EnumerationIterator#remove()}.
- * @throws Exception (unexpected).
+ * @throws UnsupportedOperationException (unexpected).
*/
- @Test public void testRemove() throws Exception {
- EnumerationIterator<?> oUT = new EnumerationIterator<Object>(Collections.enumeration(Arrays.asList()));
+ @Test(expected = UnsupportedOperationException.class)
+ public void testRemoveEmpty() throws UnsupportedOperationException {
+ final Iterator<?> oUT = new EnumerationIterator<Object>(Collections.enumeration(Arrays.asList()));
+ oUT.remove();
+ }
+
+ /** Test case for {@link EnumerationIterator#remove()}.
+ * @throws UnsupportedOperationException (unexpected).
+ */
+ @Test(expected = UnsupportedOperationException.class)
+ public void testRemoveTwoElements() throws UnsupportedOperationException {
+ final Iterator<?> oUT = new EnumerationIterator<String>(Collections.enumeration(Arrays.asList("foo", "bar")));
try {
- oUT.remove();
- Assert.fail("remove() on empty enumeration must instantly throw UnsupportedOperationException.");
- } catch (final UnsupportedOperationException ignore) {
- /* Expected exception. */
- }
- oUT = new EnumerationIterator<String>(Collections.enumeration(Arrays.asList("foo", "bar")));
- try {
oUT.next();
- oUT.remove();
- Assert.fail("remove() must throw UnsupportedOperationException.");
} catch (final UnsupportedOperationException ignore) {
- /* Expected exception. */
+ Assert.fail("Unexpected UnsupportedOperationException.");
}
+ oUT.remove();
}
} // class EnumerationIteratorTest
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-12-28 21:54:39
|
Revision: 752
http://japi.svn.sourceforge.net/japi/?rev=752&view=rev
Author: christianhujer
Date: 2008-12-28 21:50:19 +0000 (Sun, 28 Dec 2008)
Log Message:
-----------
Renamed ignored exceptions to "ignore" or "ignored".
Modified Paths:
--------------
historic/trunk/src/app/net/sf/japi/cpp/CPreProcessor.java
historic/trunk/src/app/net/sf/japi/io/ARGV.java
historic/trunk/src/app/net/sf/japi/io/ARGVEnumeration.java
historic/trunk/src/app/net/sf/japi/sql/CachedResultSetTableModel.java
historic/trunk/src/app/net/sf/japi/swing/JPropertyEditor.java
historic/trunk/src/app/net/sf/japi/util/Service.java
libs/argparser/trunk/src/prj/net/sf/japi/io/args/ArgParser.java
libs/argparser/trunk/src/prj/net/sf/japi/io/args/CommandWithHelp.java
libs/argparser/trunk/src/prj/net/sf/japi/io/args/LogCommand.java
libs/argparser/trunk/src/prj/net/sf/japi/io/args/OptionType.java
libs/argparser/trunk/src/prj/net/sf/japi/io/args/converter/ConverterRegistry.java
libs/argparser/trunk/src/prj/net/sf/japi/io/args/converter/InputStreamConverter.java
libs/io/trunk/src/prj/net/sf/japi/io/BRLineIterator.java
libs/logging/trunk/src/prj/net/sf/japi/log/LogEntry.java
libs/midi/trunk/src/prj/net/sf/japi/midi/MonitorReceiver.java
libs/net/trunk/src/prj/net/sf/japi/net/Forwarder.java
libs/swing-about/trunk/src/prj/net/sf/japi/swing/about/AboutDialog.java
libs/swing-action/trunk/src/prj/net/sf/japi/swing/DefaultActionBuilder.java
libs/swing-action/trunk/src/prj/net/sf/japi/swing/IconManager.java
libs/swing-action/trunk/src/tst/test/net/sf/japi/swing/DefaultActionBuilderTest.java
libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/DocumentFrame.java
libs/swing-bookmarks/trunk/src/prj/net/sf/japi/swing/bookmarks/BookmarkDropTargetAdapter.java
libs/swing-keyprefs/trunk/src/prj/net/sf/japi/swing/prefs/keys/AbstractSimpleNode.java
libs/swing-misc/trunk/src/prj/net/sf/japi/swing/misc/ConsoleProgress.java
libs/swing-misc/trunk/src/prj/net/sf/japi/swing/misc/JFileChooserButton.java
libs/swing-tod/trunk/src/prj/net/sf/japi/swing/tod/TipOfTheDayManager.java
libs/taglets/trunk/src/prj/net/sf/japi/taglets/HistoryTaglet.java
libs/taglets/trunk/src/prj/net/sf/japi/taglets/TagByTextComparator.java
libs/util/trunk/src/prj/net/sf/japi/util/Collections2.java
libs/util/trunk/src/tst/test/net/sf/japi/util/EnumerationIteratorTest.java
libs/xml/trunk/src/prj/net/sf/japi/xml/FilteredNodeList.java
libs/xml/trunk/src/tst/test/net/sf/japi/xml/NodeListIterator2Test.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/io/JTestSer.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/io/JTestV1.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/io/KEduca.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/io/IOUtilities.java
progs/jtype/trunk/src/prj/net/sf/japi/jtype/ReflectionField.java
progs/textedit/trunk/src/prj/net/sf/japi/progs/textedit/TextDocument.java
tools/midiMonitor/trunk/src/prj/net/sf/japi/tools/midiMonitor/MidiMonitor.java
Modified: historic/trunk/src/app/net/sf/japi/cpp/CPreProcessor.java
===================================================================
--- historic/trunk/src/app/net/sf/japi/cpp/CPreProcessor.java 2008-12-28 20:05:30 UTC (rev 751)
+++ historic/trunk/src/app/net/sf/japi/cpp/CPreProcessor.java 2008-12-28 21:50:19 UTC (rev 752)
@@ -108,7 +108,7 @@
chain.append(buffer, 0, bytesRead);
}
} finally {
- try { in.close(); } catch (final Exception e) { /* ignore */ }
+ in.close();
}
return chain.toString();
}
Modified: historic/trunk/src/app/net/sf/japi/io/ARGV.java
===================================================================
--- historic/trunk/src/app/net/sf/japi/io/ARGV.java 2008-12-28 20:05:30 UTC (rev 751)
+++ historic/trunk/src/app/net/sf/japi/io/ARGV.java 2008-12-28 21:50:19 UTC (rev 752)
@@ -45,7 +45,7 @@
argvReader = new ARGVReader(args);
try {
nextLine = argvReader.readLine();
- } catch (final IOException e) {
+ } catch (final IOException ignore) {
close();
}
}
@@ -56,7 +56,7 @@
try {
assert argvReader != null;
argvReader.close();
- } catch (final IOException e) {
+ } catch (final IOException ignore) {
// ignore
} finally {
argvReader = null;
@@ -84,7 +84,7 @@
try {
assert argvReader != null;
nextLine = argvReader.readLine();
- } catch (final IOException e) {
+ } catch (final IOException ignore) {
close();
}
}
Modified: historic/trunk/src/app/net/sf/japi/io/ARGVEnumeration.java
===================================================================
--- historic/trunk/src/app/net/sf/japi/io/ARGVEnumeration.java 2008-12-28 20:05:30 UTC (rev 751)
+++ historic/trunk/src/app/net/sf/japi/io/ARGVEnumeration.java 2008-12-28 21:50:19 UTC (rev 752)
@@ -79,7 +79,7 @@
if (currentStream != null) {
try {
currentStream.close();
- } catch (final IOException e) {
+ } catch (final IOException ignore) {
/* ignore. */
}
}
Modified: historic/trunk/src/app/net/sf/japi/sql/CachedResultSetTableModel.java
===================================================================
--- historic/trunk/src/app/net/sf/japi/sql/CachedResultSetTableModel.java 2008-12-28 20:05:30 UTC (rev 751)
+++ historic/trunk/src/app/net/sf/japi/sql/CachedResultSetTableModel.java 2008-12-28 21:50:19 UTC (rev 752)
@@ -148,9 +148,9 @@
@Nullable public Object getValueAt(final int rowIndex, final int columnIndex) {
try {
return data[rowIndex][columnIndex];
- } catch (final NullPointerException e) {
+ } catch (final NullPointerException ignore) {
return null;
- } catch (final ArrayIndexOutOfBoundsException e) {
+ } catch (final ArrayIndexOutOfBoundsException ignore) {
return null;
}
}
Modified: historic/trunk/src/app/net/sf/japi/swing/JPropertyEditor.java
===================================================================
--- historic/trunk/src/app/net/sf/japi/swing/JPropertyEditor.java 2008-12-28 20:05:30 UTC (rev 751)
+++ historic/trunk/src/app/net/sf/japi/swing/JPropertyEditor.java 2008-12-28 21:50:19 UTC (rev 752)
@@ -90,9 +90,9 @@
// TODO: Attach property editor
try {
return EDITORS.get(propertyType).newInstance();
- } catch (final InstantiationException e) {
+ } catch (final InstantiationException ignore) {
return null;
- } catch (IllegalAccessException e) {
+ } catch (IllegalAccessException ignore) {
return null;
}
}
Modified: historic/trunk/src/app/net/sf/japi/util/Service.java
===================================================================
--- historic/trunk/src/app/net/sf/japi/util/Service.java 2008-12-28 20:05:30 UTC (rev 751)
+++ historic/trunk/src/app/net/sf/japi/util/Service.java 2008-12-28 21:50:19 UTC (rev 752)
@@ -24,11 +24,11 @@
// return java.util.Service.lookup(service);
//} catch (final NoClassDefFoundError e) {
return (Iterable<T>) getMustangServiceClass().getMethod("load", Class.class).invoke(null, service);
- } catch (final ClassNotFoundException e) {
+ } catch (final ClassNotFoundException ignore) {
return new IteratorIterable<T>(providers(service));
- } catch (final NoSuchMethodException e) {
+ } catch (final NoSuchMethodException ignore) {
return new IteratorIterable<T>(providers(service));
- } catch (final IllegalAccessException e) {
+ } catch (final IllegalAccessException ignore) {
return new IteratorIterable<T>(providers(service));
} catch (final InvocationTargetException e) {
final Throwable t = e.getCause();
@@ -61,11 +61,11 @@
// return java.util.Service.lookup(service, loader);
//} catch (final NoClassDefFoundError e) {
return (Iterable<T>) getMustangServiceClass().getMethod("load", Class.class, ClassLoader.class).invoke(null, service, loader);
- } catch (final ClassNotFoundException e) {
+ } catch (final ClassNotFoundException ignore) {
return new IteratorIterable<T>(providers(service));
- } catch (final NoSuchMethodException e) {
+ } catch (final NoSuchMethodException ignore) {
return new IteratorIterable<T>(providers(service));
- } catch (final IllegalAccessException e) {
+ } catch (final IllegalAccessException ignore) {
return new IteratorIterable<T>(providers(service));
} catch (final InvocationTargetException e) {
final Throwable t = e.getCause();
@@ -94,13 +94,13 @@
@NotNull private static <T> Iterable<T> loadMustang(@NotNull final Class<T> service, @Nullable final ClassLoader loader) throws MustangUnavailableException {
try {
return (Iterable<T>) getMustangServiceClass().getMethod("load", Class.class, ClassLoader.class).invoke(null, service, loader);
- } catch (final IllegalAccessException e) {
+ } catch (final IllegalAccessException ignore) {
throw new MustangUnavailableException();
- } catch (final NoSuchMethodException e) {
+ } catch (final NoSuchMethodException ignore) {
throw new MustangUnavailableException();
- } catch (final ClassNotFoundException e) {
+ } catch (final ClassNotFoundException ignore) {
throw new MustangUnavailableException();
- } catch (final InvocationTargetException e) {
+ } catch (final InvocationTargetException ignore) {
throw new MustangUnavailableException();
}
}
Modified: libs/argparser/trunk/src/prj/net/sf/japi/io/args/ArgParser.java
===================================================================
--- libs/argparser/trunk/src/prj/net/sf/japi/io/args/ArgParser.java 2008-12-28 20:05:30 UTC (rev 751)
+++ libs/argparser/trunk/src/prj/net/sf/japi/io/args/ArgParser.java 2008-12-28 21:50:19 UTC (rev 752)
@@ -315,7 +315,7 @@
throw (TerminalException) cause;
}
System.err.println(e.getCause());
- } catch (final NoSuchElementException e) {
+ } catch (final NoSuchElementException ignore) {
throw new MissingArgumentException(currentOption);
} catch (final Exception e) {
e.printStackTrace();
@@ -333,7 +333,7 @@
public static void simpleParseAndRun(@NotNull final Command command, @NotNull final String... args) {
try {
parseAndRun(command, args);
- } catch (final TerminalException e) {
+ } catch (final TerminalException ignore) {
/* ignore, nothing serious has happend. */
} catch (final RequiredOptionsMissingException e) {
System.err.println(e);
Modified: libs/argparser/trunk/src/prj/net/sf/japi/io/args/CommandWithHelp.java
===================================================================
--- libs/argparser/trunk/src/prj/net/sf/japi/io/args/CommandWithHelp.java 2008-12-28 20:05:30 UTC (rev 751)
+++ libs/argparser/trunk/src/prj/net/sf/japi/io/args/CommandWithHelp.java 2008-12-28 21:50:19 UTC (rev 752)
@@ -148,7 +148,7 @@
}
try {
return ResourceBundle.getBundle(getClass().getName()).getString(key);
- } catch (final MissingResourceException e2) {
+ } catch (final MissingResourceException ignore) {
return ownBundle.getString(key);
}
}
Modified: libs/argparser/trunk/src/prj/net/sf/japi/io/args/LogCommand.java
===================================================================
--- libs/argparser/trunk/src/prj/net/sf/japi/io/args/LogCommand.java 2008-12-28 20:05:30 UTC (rev 751)
+++ libs/argparser/trunk/src/prj/net/sf/japi/io/args/LogCommand.java 2008-12-28 21:50:19 UTC (rev 752)
@@ -56,7 +56,7 @@
public void setLevel(@NotNull final Level level) {
try {
LogManager.getLogManager().readConfiguration(new ByteArrayInputStream((".level=" + level + "\nhandlers=java.util.logging.ConsoleHandler\njava.util.logging.ConsoleHandler.level=" + level).getBytes()));
- } catch (final IOException e) {
+ } catch (final IOException ignore) {
assert false : "This should never happen because we're reading from RAM.";
}
}
Modified: libs/argparser/trunk/src/prj/net/sf/japi/io/args/OptionType.java
===================================================================
--- libs/argparser/trunk/src/prj/net/sf/japi/io/args/OptionType.java 2008-12-28 20:05:30 UTC (rev 751)
+++ libs/argparser/trunk/src/prj/net/sf/japi/io/args/OptionType.java 2008-12-28 21:50:19 UTC (rev 752)
@@ -58,7 +58,7 @@
String name;
try {
name = ResourceBundle.getBundle("net.sf.japi.io.args.messages").getString(getClass().getName() + "." + name());
- } catch (final MissingResourceException e) {
+ } catch (final MissingResourceException ignore) {
name = name();
}
return name;
@@ -73,7 +73,7 @@
String name;
try {
name = ResourceBundle.getBundle("net.sf.japi.io.args.messages", locale).getString(getClass().getName() + "." + name());
- } catch (final MissingResourceException e) {
+ } catch (final MissingResourceException ignore) {
name = name();
}
return name;
@@ -95,7 +95,7 @@
String description;
try {
description = ResourceBundle.getBundle("net.sf.japi.io.args.messages").getString(getClass().getName() + "." + name() + ".description");
- } catch (final MissingResourceException e) {
+ } catch (final MissingResourceException ignore) {
description = name();
}
return description.length() == 0 ? description : " (" + description + ")";
@@ -110,7 +110,7 @@
String description;
try {
description = ResourceBundle.getBundle("net.sf.japi.io.args.messages", locale).getString(getClass().getName() + "." + name() + ".description");
- } catch (final MissingResourceException e) {
+ } catch (final MissingResourceException ignore) {
description = name();
}
return description.length() == 0 ? description : " (" + description + ")";
Modified: libs/argparser/trunk/src/prj/net/sf/japi/io/args/converter/ConverterRegistry.java
===================================================================
--- libs/argparser/trunk/src/prj/net/sf/japi/io/args/converter/ConverterRegistry.java 2008-12-28 20:05:30 UTC (rev 751)
+++ libs/argparser/trunk/src/prj/net/sf/japi/io/args/converter/ConverterRegistry.java 2008-12-28 21:50:19 UTC (rev 752)
@@ -145,7 +145,7 @@
@Nullable public static <T> ConstructorConverter<T> getConstructorConverter(@NotNull final Class<T> targetType) {
try {
return new ConstructorConverter<T>(targetType);
- } catch (final Exception e) {
+ } catch (final Exception ignore) {
return null;
}
}
Modified: libs/argparser/trunk/src/prj/net/sf/japi/io/args/converter/InputStreamConverter.java
===================================================================
--- libs/argparser/trunk/src/prj/net/sf/japi/io/args/converter/InputStreamConverter.java 2008-12-28 20:05:30 UTC (rev 751)
+++ libs/argparser/trunk/src/prj/net/sf/japi/io/args/converter/InputStreamConverter.java 2008-12-28 21:50:19 UTC (rev 752)
@@ -49,7 +49,7 @@
}
try {
return new URL(arg).openStream();
- } catch (final MalformedURLException e) {
+ } catch (final MalformedURLException ignore) {
return new FileInputStream(arg);
}
}
Modified: libs/io/trunk/src/prj/net/sf/japi/io/BRLineIterator.java
===================================================================
--- libs/io/trunk/src/prj/net/sf/japi/io/BRLineIterator.java 2008-12-28 20:05:30 UTC (rev 751)
+++ libs/io/trunk/src/prj/net/sf/japi/io/BRLineIterator.java 2008-12-28 21:50:19 UTC (rev 752)
@@ -52,7 +52,7 @@
private String readLine() {
try {
return in.readLine();
- } catch (final IOException e) {
+ } catch (final IOException ignore) {
return null;
}
}
Modified: libs/logging/trunk/src/prj/net/sf/japi/log/LogEntry.java
===================================================================
--- libs/logging/trunk/src/prj/net/sf/japi/log/LogEntry.java 2008-12-28 20:05:30 UTC (rev 751)
+++ libs/logging/trunk/src/prj/net/sf/japi/log/LogEntry.java 2008-12-28 21:50:19 UTC (rev 752)
@@ -88,7 +88,7 @@
i++;
}
return stackTrace[i];
- } catch (final ArrayIndexOutOfBoundsException e) {
+ } catch (final ArrayIndexOutOfBoundsException ignore) {
assert false;
throw new Error("Couldn'cause find StackTraceElement.");
}
Modified: libs/midi/trunk/src/prj/net/sf/japi/midi/MonitorReceiver.java
===================================================================
--- libs/midi/trunk/src/prj/net/sf/japi/midi/MonitorReceiver.java 2008-12-28 20:05:30 UTC (rev 751)
+++ libs/midi/trunk/src/prj/net/sf/japi/midi/MonitorReceiver.java 2008-12-28 21:50:19 UTC (rev 752)
@@ -67,7 +67,7 @@
if (out instanceof Closeable) {
try {
((Closeable) out).close();
- } catch (final IOException e) {
+ } catch (final IOException ignore) {
// ignore
}
}
Modified: libs/net/trunk/src/prj/net/sf/japi/net/Forwarder.java
===================================================================
--- libs/net/trunk/src/prj/net/sf/japi/net/Forwarder.java 2008-12-28 20:05:30 UTC (rev 751)
+++ libs/net/trunk/src/prj/net/sf/japi/net/Forwarder.java 2008-12-28 21:50:19 UTC (rev 752)
@@ -45,10 +45,10 @@
try {
final Socket client = new Socket(args[1], Integer.parseInt(args[2]));
new Forwarder(client, server).start();
- } catch (final IOException e) {
+ } catch (final IOException ignore) {
try {
server.close();
- } catch (final IOException ignore) {
+ } catch (final IOException ignored) {
/* ignore */
}
}
Modified: libs/swing-about/trunk/src/prj/net/sf/japi/swing/about/AboutDialog.java
===================================================================
--- libs/swing-about/trunk/src/prj/net/sf/japi/swing/about/AboutDialog.java 2008-12-28 20:05:30 UTC (rev 751)
+++ libs/swing-about/trunk/src/prj/net/sf/japi/swing/about/AboutDialog.java 2008-12-28 21:50:19 UTC (rev 752)
@@ -216,9 +216,9 @@
} finally {
in.close();
}
- } catch (final NullPointerException e) {
+ } catch (final NullPointerException ignore) {
licenseText = ACTION_BUILDER.getString("license.missing");
- } catch (final IOException e) {
+ } catch (final IOException ignore) {
licenseText = ACTION_BUILDER.getString("license.missing");
}
final JTextArea license = new JTextArea(licenseText, TEXT_ROWS, TEXT_COLUMNS);
@@ -240,9 +240,9 @@
@Nullable private String getStringFromBundle(@NotNull final ResourceBundle bundle, @NotNull final String key) {
try {
return bundle.getString(key);
- } catch (final MissingResourceException e) {
+ } catch (final MissingResourceException ignore) {
/* ignore */
- } catch (final ClassCastException e) {
+ } catch (final ClassCastException ignore) {
System.err.println("Internal error: value type for key " + key + " in " + bundle + " must be String.");
}
return null;
@@ -261,7 +261,7 @@
buildDeveloper = getStringFromBundle(bundle, "build.developer");
buildNumber = getStringFromBundle(bundle, "build.number");
buildTstamp = getStringFromBundle(bundle, "build.tstamp");
- } catch (final MissingResourceException e) {
+ } catch (final MissingResourceException ignore) {
/* ignore */
}
final Component aboutTab = new JLabel(actionBuilder.format("about", System.getProperty("java.version"), buildNumber, buildDeveloper, buildTstamp), SwingConstants.CENTER);
@@ -317,7 +317,7 @@
.append('=')
.append(bundle.getString(key))
.append('\n');
- } catch (final ClassCastException e) {
+ } catch (final ClassCastException ignore) {
System.err.println("Internal error: expecting build properties to be Strings, but property for key " + key + " was not a String.");
}
}
Modified: libs/swing-action/trunk/src/prj/net/sf/japi/swing/DefaultActionBuilder.java
===================================================================
--- libs/swing-action/trunk/src/prj/net/sf/japi/swing/DefaultActionBuilder.java 2008-12-28 20:05:30 UTC (rev 751)
+++ libs/swing-action/trunk/src/prj/net/sf/japi/swing/DefaultActionBuilder.java 2008-12-28 21:50:19 UTC (rev 752)
@@ -182,7 +182,7 @@
public DefaultActionBuilder(final String key) {
try {
addBundle(key + ".action");
- } catch (final MissingResourceException e) {
+ } catch (final MissingResourceException ignore) {
/* ignore */
}
}
@@ -352,8 +352,8 @@
try {
value = bundle.getString(key);
return value;
- } catch (final MissingResourceException e) { /* ignore */
- } catch (final ClassCastException e) { /* ignore */
+ } catch (final MissingResourceException ignore) { /* ignore */
+ } catch (final ClassCastException ignore) { /* ignore */
} // ignore exceptions because they don't mean errors just there's no resource, so parents are checked or null is returned.
}
for (final ActionBuilder parent : parents) {
@@ -401,8 +401,8 @@
try {
value = bundle.getString(key);
return value;
- } catch (final MissingResourceException e) { /* ignore */
- } catch (final ClassCastException e) { /* ignore */
+ } catch (final MissingResourceException ignore) { /* ignore */
+ } catch (final ClassCastException ignore) { /* ignore */
} // ignore exceptions because they don't mean errors just there's no resource, so parents are checked or null is returned.
}
for (final ActionBuilder parent : parents) {
Modified: libs/swing-action/trunk/src/prj/net/sf/japi/swing/IconManager.java
===================================================================
--- libs/swing-action/trunk/src/prj/net/sf/japi/swing/IconManager.java 2008-12-28 20:05:30 UTC (rev 751)
+++ libs/swing-action/trunk/src/prj/net/sf/japi/swing/IconManager.java 2008-12-28 21:50:19 UTC (rev 752)
@@ -93,7 +93,7 @@
public ClassLoader run() {
try {
return Thread.currentThread().getContextClassLoader();
- } catch (final SecurityException e) {
+ } catch (final SecurityException ignore) {
return getClass().getClassLoader();
}
}
Modified: libs/swing-action/trunk/src/tst/test/net/sf/japi/swing/DefaultActionBuilderTest.java
===================================================================
--- libs/swing-action/trunk/src/tst/test/net/sf/japi/swing/DefaultActionBuilderTest.java 2008-12-28 20:05:30 UTC (rev 751)
+++ libs/swing-action/trunk/src/tst/test/net/sf/japi/swing/DefaultActionBuilderTest.java 2008-12-28 21:50:19 UTC (rev 752)
@@ -46,9 +46,9 @@
//noinspection ConstantConditions
DefaultActionBuilder.find((JMenuBar) null, createSimple("item"));
Assert.fail("Expected NullPointerException or IllegalArgumentException.");
- } catch (final NullPointerException e) {
+ } catch (final NullPointerException ignore) {
// expected without @NotNull support
- } catch (final IllegalArgumentException e) {
+ } catch (final IllegalArgumentException ignore) {
// expected with @NotNull support
}
}
@@ -64,9 +64,9 @@
//noinspection ConstantConditions
DefaultActionBuilder.find(new JMenuBar(), (Action) null);
Assert.fail("Expected NullPointerException or IllegalArgumentException.");
- } catch (final NullPointerException e) {
+ } catch (final NullPointerException ignore) {
// expected without @NotNull support
- } catch (final IllegalArgumentException e) {
+ } catch (final IllegalArgumentException ignore) {
// expected with @NotNull support
}
}
@@ -82,9 +82,9 @@
//noinspection ConstantConditions
DefaultActionBuilder.find((JMenu) null, createSimple("item"));
Assert.fail("Expected NullPointerException or IllegalArgumentException.");
- } catch (final NullPointerException e) {
+ } catch (final NullPointerException ignore) {
// expected without @NotNull support
- } catch (final IllegalArgumentException e) {
+ } catch (final IllegalArgumentException ignore) {
// expected with @NotNull support
}
}
@@ -100,9 +100,9 @@
//noinspection ConstantConditions
DefaultActionBuilder.find(new JMenu(), null);
Assert.fail("Expected NullPointerException or IllegalArgumentException.");
- } catch (final NullPointerException e) {
+ } catch (final NullPointerException ignore) {
// expected without @NotNull support
- } catch (final IllegalArgumentException e) {
+ } catch (final IllegalArgumentException ignore) {
// expected with @NotNull support
}
}
Modified: libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/DocumentFrame.java
===================================================================
--- libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/DocumentFrame.java 2008-12-28 20:05:30 UTC (rev 751)
+++ libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/DocumentFrame.java 2008-12-28 21:50:19 UTC (rev 752)
@@ -26,7 +26,7 @@
public void actionPerformed(final ActionEvent e) {
try {
setSelected(true);
- } catch (final PropertyVetoException e1) {
+ } catch (final PropertyVetoException ignore) {
/* simply ignore this. */
}
}
Modified: libs/swing-bookmarks/trunk/src/prj/net/sf/japi/swing/bookmarks/BookmarkDropTargetAdapter.java
===================================================================
--- libs/swing-bookmarks/trunk/src/prj/net/sf/japi/swing/bookmarks/BookmarkDropTargetAdapter.java 2008-12-28 20:05:30 UTC (rev 751)
+++ libs/swing-bookmarks/trunk/src/prj/net/sf/japi/swing/bookmarks/BookmarkDropTargetAdapter.java 2008-12-28 21:50:19 UTC (rev 752)
@@ -73,9 +73,9 @@
final Transferable source = dtde.getTransferable();
try {
return (BookmarkManager.Bookmark) source.getTransferData(getBookmarkDataFlavor());
- } catch (final UnsupportedFlavorException e) {
+ } catch (final UnsupportedFlavorException ignore) {
return null;
- } catch (final IOException e) {
+ } catch (final IOException ignore) {
return null;
}
}
Modified: libs/swing-keyprefs/trunk/src/prj/net/sf/japi/swing/prefs/keys/AbstractSimpleNode.java
===================================================================
--- libs/swing-keyprefs/trunk/src/prj/net/sf/japi/swing/prefs/keys/AbstractSimpleNode.java 2008-12-28 20:05:30 UTC (rev 751)
+++ libs/swing-keyprefs/trunk/src/prj/net/sf/japi/swing/prefs/keys/AbstractSimpleNode.java 2008-12-28 21:50:19 UTC (rev 752)
@@ -54,7 +54,7 @@
}
try {
return children[index];
- } catch (final ArrayIndexOutOfBoundsException e) {
+ } catch (final ArrayIndexOutOfBoundsException ignore) {
return null;
}
}
Modified: libs/swing-misc/trunk/src/prj/net/sf/japi/swing/misc/ConsoleProgress.java
===================================================================
--- libs/swing-misc/trunk/src/prj/net/sf/japi/swing/misc/ConsoleProgress.java 2008-12-28 20:05:30 UTC (rev 751)
+++ libs/swing-misc/trunk/src/prj/net/sf/japi/swing/misc/ConsoleProgress.java 2008-12-28 21:50:19 UTC (rev 752)
@@ -45,7 +45,7 @@
if (closeOut != null) {
try {
closeOut.close();
- } catch (final IOException e) {
+ } catch (final IOException ignore) {
// ignore
}
}
@@ -56,7 +56,7 @@
if (flushOut != null) {
try {
flushOut.flush();
- } catch (final IOException e) {
+ } catch (final IOException ignore) {
// ignore
}
}
@@ -66,7 +66,7 @@
public void finished() {
try {
out.append("100\n");
- } catch (final IOException e) {
+ } catch (final IOException ignore) {
// ignore
}
flush();
@@ -95,7 +95,7 @@
for (int i = 0; i < " 0%: ".length(); i++) {
out.append('\b');
}
- } catch (final IOException e) {
+ } catch (final IOException ignore) {
// ignore
}
}
@@ -111,7 +111,7 @@
out.append(String.format("%3d", prog));
flush();
out.append("\b\b\b");
- } catch (final IOException e) {
+ } catch (final IOException ignore) {
// ignore
}
}
Modified: libs/swing-misc/trunk/src/prj/net/sf/japi/swing/misc/JFileChooserButton.java
===================================================================
--- libs/swing-misc/trunk/src/prj/net/sf/japi/swing/misc/JFileChooserButton.java 2008-12-28 20:05:30 UTC (rev 751)
+++ libs/swing-misc/trunk/src/prj/net/sf/japi/swing/misc/JFileChooserButton.java 2008-12-28 21:50:19 UTC (rev 752)
@@ -118,7 +118,7 @@
public void setBase(final File base) {
try {
this.base = base.getCanonicalFile();
- } catch (final IOException e) {
+ } catch (final IOException ignore) {
this.base = base.getAbsoluteFile();
}
}
Modified: libs/swing-tod/trunk/src/prj/net/sf/japi/swing/tod/TipOfTheDayManager.java
===================================================================
--- libs/swing-tod/trunk/src/prj/net/sf/japi/swing/tod/TipOfTheDayManager.java 2008-12-28 20:05:30 UTC (rev 751)
+++ libs/swing-tod/trunk/src/prj/net/sf/japi/swing/tod/TipOfTheDayManager.java 2008-12-28 21:50:19 UTC (rev 752)
@@ -215,7 +215,7 @@
if (contextClassLoader != null) {
return contextClassLoader;
}
- } catch (final Exception e) {
+ } catch (final Exception ignore) {
/* ignore */
}
return TipOfTheDayManager.class.getClassLoader();
@@ -231,7 +231,7 @@
@Nullable public ClassLoader run() {
try {
return Thread.currentThread().getContextClassLoader();
- } catch (final SecurityException ex) {
+ } catch (final SecurityException ignore) {
return null;
}
}
@@ -285,7 +285,7 @@
for (int i = 1;; i++) {
try {
todTexts.add(todBundle.getString(new StringBuilder().append("tod.text.").append(i).toString()));
- } catch (final MissingResourceException e) {
+ } catch (final MissingResourceException ignore) {
break;
}
}
@@ -299,7 +299,7 @@
this.todIndex = (todIndex + todTexts.size()) % todTexts.size();
todText.setText(todTexts.get(this.todIndex));
currentTodIndex.setText(ACTION_BUILDER.format("todIndex", this.todIndex + 1, todTexts.size()));
- } catch (final ArithmeticException e) {
+ } catch (final ArithmeticException ignore) {
todText.setText(ACTION_BUILDER.getString("todsUnavailable"));
currentTodIndex.setText("");
}
Modified: libs/taglets/trunk/src/prj/net/sf/japi/taglets/HistoryTaglet.java
===================================================================
--- libs/taglets/trunk/src/prj/net/sf/japi/taglets/HistoryTaglet.java 2008-12-28 20:05:30 UTC (rev 751)
+++ libs/taglets/trunk/src/prj/net/sf/japi/taglets/HistoryTaglet.java 2008-12-28 21:50:19 UTC (rev 752)
@@ -133,7 +133,7 @@
final String comment = matcher.group(3);
try {
ISO_DATE_FORMAT.parse(dateText);
- } catch (final ParseException e) {
+ } catch (final ParseException ignore) {
System.err.println(tag.position() + ": warning: @" + getName() + " has a date in wrong format (not-iso).");
}
sb.append("<TR><TD>");
Modified: libs/taglets/trunk/src/prj/net/sf/japi/taglets/TagByTextComparator.java
===================================================================
--- libs/taglets/trunk/src/prj/net/sf/japi/taglets/TagByTextComparator.java 2008-12-28 20:05:30 UTC (rev 751)
+++ libs/taglets/trunk/src/prj/net/sf/japi/taglets/TagByTextComparator.java 2008-12-28 21:50:19 UTC (rev 752)
@@ -25,6 +25,7 @@
/**
* Compares Javadoc Tags by their text.
+ * Note: this comparator imposes orderings that are inconsistent with equals.
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
*/
public class TagByTextComparator implements Comparator<Tag>, Serializable {
Modified: libs/util/trunk/src/prj/net/sf/japi/util/Collections2.java
===================================================================
--- libs/util/trunk/src/prj/net/sf/japi/util/Collections2.java 2008-12-28 20:05:30 UTC (rev 751)
+++ libs/util/trunk/src/prj/net/sf/japi/util/Collections2.java 2008-12-28 21:50:19 UTC (rev 752)
@@ -43,7 +43,7 @@
Class<? extends List<?>> c = null;
try {
c = (Class<? extends List<?>>) Class.forName("java.util.Arrays.ArrayList");
- } catch (ClassNotFoundException e) { /* ignore, null is okay then. */ }
+ } catch (ClassNotFoundException ignore) { /* ignore, null is okay then. */ }
AL = c;
}
@@ -67,12 +67,12 @@
@Nullable C filtered = null;
try {
filtered = (C) c.getClass().newInstance();
- } catch (final Exception e) { /* ignore, check is done on null. */ }
+ } catch (final Exception ignore) { /* ignore, check is done on null. */ }
if (filtered == null && c instanceof Cloneable) {
try {
filtered = (C) c.getClass().getMethod("clone").invoke(c);
c.clear();
- } catch (final Exception e) {
+ } catch (final Exception ignore) {
filtered = null;
}
}
Modified: libs/util/trunk/src/tst/test/net/sf/japi/util/EnumerationIteratorTest.java
===================================================================
--- libs/util/trunk/src/tst/test/net/sf/japi/util/EnumerationIteratorTest.java 2008-12-28 20:05:30 UTC (rev 751)
+++ libs/util/trunk/src/tst/test/net/sf/japi/util/EnumerationIteratorTest.java 2008-12-28 21:50:19 UTC (rev 752)
@@ -62,7 +62,7 @@
try {
oUT.next();
Assert.fail("next() on empty enumeration must instantly throw NoSuchElementException.");
- } catch (final NoSuchElementException e) {
+ } catch (final NoSuchElementException ignore) {
/* Expected exception. */
}
oUT = new EnumerationIterator<String>(Collections.enumeration(Arrays.asList("foo", "bar")));
@@ -71,7 +71,7 @@
try {
oUT.next();
Assert.fail("next() on two elements enumeration must throw NoSuchElementException on third invocation.");
- } catch (final NoSuchElementException e) {
+ } catch (final NoSuchElementException ignore) {
/* Expected exception. */
}
}
@@ -84,7 +84,7 @@
try {
oUT.remove();
Assert.fail("remove() on empty enumeration must instantly throw UnsupportedOperationException.");
- } catch (final UnsupportedOperationException e) {
+ } catch (final UnsupportedOperationException ignore) {
/* Expected exception. */
}
oUT = new EnumerationIterator<String>(Collections.enumeration(Arrays.asList("foo", "bar")));
@@ -92,7 +92,7 @@
oUT.next();
oUT.remove();
Assert.fail("remove() must throw UnsupportedOperationException.");
- } catch (final UnsupportedOperationException e) {
+ } catch (final UnsupportedOperationException ignore) {
/* Expected exception. */
}
}
Modified: libs/xml/trunk/src/prj/net/sf/japi/xml/FilteredNodeList.java
===================================================================
--- libs/xml/trunk/src/prj/net/sf/japi/xml/FilteredNodeList.java 2008-12-28 20:05:30 UTC (rev 751)
+++ libs/xml/trunk/src/prj/net/sf/japi/xml/FilteredNodeList.java 2008-12-28 21:50:19 UTC (rev 752)
@@ -78,7 +78,7 @@
@Nullable public T item(final int index) {
try {
return nodes[index];
- } catch (final ArrayIndexOutOfBoundsException e) {
+ } catch (final ArrayIndexOutOfBoundsException ignore) {
return null;
}
}
Modified: libs/xml/trunk/src/tst/test/net/sf/japi/xml/NodeListIterator2Test.java
===================================================================
--- libs/xml/trunk/src/tst/test/net/sf/japi/xml/NodeListIterator2Test.java 2008-12-28 20:05:30 UTC (rev 751)
+++ libs/xml/trunk/src/tst/test/net/sf/japi/xml/NodeListIterator2Test.java 2008-12-28 21:50:19 UTC (rev 752)
@@ -75,7 +75,7 @@
try {
testling.next();
Assert.fail("Iterator must throw NoSuchElementException if invoking next() more often than available Nodes.");
- } catch (final NoSuchElementException e) {
+ } catch (final NoSuchElementException ignore) {
/* ignore, this exception is expected to occur. */
}
}
@@ -85,7 +85,7 @@
try {
testling.remove();
Assert.fail("NodeListIterator.remove() is expected to always throw UnsupportedOperationException.");
- } catch (final UnsupportedOperationException e) {
+ } catch (final UnsupportedOperationException ignore) {
/* ignore, this exception is expected to occur. */
}
}
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/io/JTestSer.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/io/JTestSer.java 2008-12-28 20:05:30 UTC (rev 751)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/io/JTestSer.java 2008-12-28 21:50:19 UTC (rev 752)
@@ -114,7 +114,7 @@
try {
load(uri);
return true;
- } catch (Exception e) {
+ } catch (final Exception ignore) {
return false;
}
}
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/io/JTestV1.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/io/JTestV1.java 2008-12-28 20:05:30 UTC (rev 751)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/io/JTestV1.java 2008-12-28 21:50:19 UTC (rev 752)
@@ -84,14 +84,14 @@
dbf.setNamespaceAware(true);
dbf.setValidating(true);
dbf.setXIncludeAware(true);
- } catch (NoSuchMethodError e) {
+ } catch (final NoSuchMethodError ignore) {
/* ignore, this just means there is no XInclude support. */
- } catch (UnsupportedOperationException e) { /* ignore */ }
+ } catch (final UnsupportedOperationException ignore) { /* ignore */ }
db = dbf.newDocumentBuilder();
domImpl = db.getDOMImplementation();
xpf = XPathFactory.newInstance();
xp = xpf.newXPath();
- } catch (ParserConfigurationException e) {
+ } catch (final ParserConfigurationException e) {
throw new Error(e);
}
}
@@ -305,7 +305,7 @@
db.setErrorHandler(capture);
db.parse(uri);
return capture.hadErrors();
- } catch (Exception e) { /* ignore */ }
+ } catch (final Exception ignore) { /* ignore */ }
return false;
}
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/io/KEduca.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/io/KEduca.java 2008-12-28 20:05:30 UTC (rev 751)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/io/KEduca.java 2008-12-28 21:50:19 UTC (rev 752)
@@ -79,9 +79,9 @@
dbf.setNamespaceAware(false);
dbf.setValidating(false);
dbf.setXIncludeAware(false);
- } catch (final NoSuchMethodError e) {
+ } catch (final NoSuchMethodError ignore) {
/* ignore */
- } catch (final UnsupportedOperationException e) { /* ignore */ }
+ } catch (final UnsupportedOperationException ignore) { /* ignore */ }
db = dbf.newDocumentBuilder();
domImpl = db.getDOMImplementation();
xpf = XPathFactory.newInstance();
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/io/IOUtilities.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/io/IOUtilities.java 2008-12-28 20:05:30 UTC (rev 751)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/io/IOUtilities.java 2008-12-28 21:50:19 UTC (rev 752)
@@ -24,7 +24,7 @@
((HttpURLConnection)con).setRequestMethod("HEAD");
}
return con.getLastModified();
- } catch (final IOException e) {
+ } catch (final IOException ignore) {
return 0L;
}
}
Modified: progs/jtype/trunk/src/prj/net/sf/japi/jtype/ReflectionField.java
===================================================================
--- progs/jtype/trunk/src/prj/net/sf/japi/jtype/ReflectionField.java 2008-12-28 20:05:30 UTC (rev 751)
+++ progs/jtype/trunk/src/prj/net/sf/japi/jtype/ReflectionField.java 2008-12-28 21:50:19 UTC (rev 752)
@@ -69,7 +69,7 @@
try {
return clazz.getMethod("is" + capName);
} catch (final NoSuchMethodException e1) {
- System.err.println(e);
+ System.err.println(e1);
return null;
}
}
Modified: progs/textedit/trunk/src/prj/net/sf/japi/progs/textedit/TextDocument.java
===================================================================
--- progs/textedit/trunk/src/prj/net/sf/japi/progs/textedit/TextDocument.java 2008-12-28 20:05:30 UTC (rev 751)
+++ progs/textedit/trunk/src/prj/net/sf/japi/progs/textedit/TextDocument.java 2008-12-28 21:50:19 UTC (rev 752)
@@ -16,6 +16,9 @@
*/
public class TextDocument extends Document<PlainDocument> implements DocumentListener {
+ /** Serial version. */
+ private static final long serialVersionUID = 1L;
+
/**
* Creates a Document.
* @param uri URI for this document.
Modified: tools/midiMonitor/trunk/src/prj/net/sf/japi/tools/midiMonitor/MidiMonitor.java
===================================================================
--- tools/midiMonitor/trunk/src/prj/net/sf/japi/tools/midiMonitor/MidiMonitor.java 2008-12-28 20:05:30 UTC (rev 751)
+++ tools/midiMonitor/trunk/src/prj/net/sf/japi/tools/midiMonitor/MidiMonitor.java 2008-12-28 21:50:19 UTC (rev 752)
@@ -57,7 +57,7 @@
synchronized (this) {
wait();
}
- } catch (final InterruptedException e) {
+ } catch (final InterruptedException ignore) {
/* ignore. */
}
return 0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-12-28 20:05:34
|
Revision: 751
http://japi.svn.sourceforge.net/japi/?rev=751&view=rev
Author: christianhujer
Date: 2008-12-28 20:05:30 +0000 (Sun, 28 Dec 2008)
Log Message:
-----------
Made Comparator implementations Serializable.
Modified Paths:
--------------
historic/trunk/src/app/net/sf/japi/swing/LocaleComparator.java
libs/argparser/trunk/src/prj/net/sf/japi/io/args/CharsetDisplaynameComparator.java
libs/argparser/trunk/src/prj/net/sf/japi/io/args/MethodOptionComparator.java
libs/lang/trunk/src/prj/net/sf/japi/lang/PropertyComparator.java
libs/midi/trunk/src/prj/net/sf/japi/midi/DeviceComparator.java
libs/taglets/trunk/src/prj/net/sf/japi/taglets/TagByTextComparator.java
libs/util/trunk/src/prj/net/sf/japi/util/LocaleComparator.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/util/StringToTextComparatorAdapter.java
Modified: historic/trunk/src/app/net/sf/japi/swing/LocaleComparator.java
===================================================================
--- historic/trunk/src/app/net/sf/japi/swing/LocaleComparator.java 2008-12-28 19:31:55 UTC (rev 750)
+++ historic/trunk/src/app/net/sf/japi/swing/LocaleComparator.java 2008-12-28 20:05:30 UTC (rev 751)
@@ -20,6 +20,7 @@
package net.sf.japi.swing;
+import java.io.Serializable;
import java.text.Collator;
import java.util.Comparator;
import java.util.Locale;
@@ -28,8 +29,11 @@
* The Locale for sorting the Locales is determined at creation time.
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
*/
-public final class LocaleComparator implements Comparator<Locale> {
+public final class LocaleComparator implements Comparator<Locale>, Serializable {
+ /** Serial version. */
+ private static final long serialVersionUID = 1L;
+
/** Collator for comparing the names. */
private final Collator collator = Collator.getInstance();
Modified: libs/argparser/trunk/src/prj/net/sf/japi/io/args/CharsetDisplaynameComparator.java
===================================================================
--- libs/argparser/trunk/src/prj/net/sf/japi/io/args/CharsetDisplaynameComparator.java 2008-12-28 19:31:55 UTC (rev 750)
+++ libs/argparser/trunk/src/prj/net/sf/japi/io/args/CharsetDisplaynameComparator.java 2008-12-28 20:05:30 UTC (rev 751)
@@ -4,14 +4,18 @@
import java.util.Comparator;
import java.util.Locale;
import java.text.Collator;
+import java.io.Serializable;
import org.jetbrains.annotations.NotNull;
/** Comparator that compares Charsets by their displayName.
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
* @todo move to a different library / package.
*/
-public class CharsetDisplaynameComparator implements Comparator<Charset> {
+public class CharsetDisplaynameComparator implements Comparator<Charset>, Serializable {
+ /** Serial version. */
+ private static final long serialVersionUID = 1L;
+
/** Locale to use for the Collator and the displayname.
* Must be set upon instanciation because the behaviour of a Comparator must stay constant over time.
* Otherwise this breaks collections using this Comparator.
Modified: libs/argparser/trunk/src/prj/net/sf/japi/io/args/MethodOptionComparator.java
===================================================================
--- libs/argparser/trunk/src/prj/net/sf/japi/io/args/MethodOptionComparator.java 2008-12-28 19:31:55 UTC (rev 750)
+++ libs/argparser/trunk/src/prj/net/sf/japi/io/args/MethodOptionComparator.java 2008-12-28 20:05:30 UTC (rev 751)
@@ -19,6 +19,7 @@
package net.sf.japi.io.args;
+import java.io.Serializable;
import java.lang.reflect.Method;
import java.util.Arrays;
import java.util.Comparator;
@@ -27,8 +28,11 @@
/** Compares methods by their options.
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
*/
-public class MethodOptionComparator implements Comparator<Method> {
+public class MethodOptionComparator implements Comparator<Method>, Serializable {
+ /** Serial version. */
+ private static final long serialVersionUID = 1L;
+
/** Global instance. */
@NotNull public static final Comparator<Method> INSTANCE = new MethodOptionComparator();
Modified: libs/lang/trunk/src/prj/net/sf/japi/lang/PropertyComparator.java
===================================================================
--- libs/lang/trunk/src/prj/net/sf/japi/lang/PropertyComparator.java 2008-12-28 19:31:55 UTC (rev 750)
+++ libs/lang/trunk/src/prj/net/sf/japi/lang/PropertyComparator.java 2008-12-28 20:05:30 UTC (rev 751)
@@ -19,6 +19,7 @@
package net.sf.japi.lang;
+import java.io.Serializable;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.Comparator;
@@ -33,8 +34,11 @@
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
* @todo think whether net.sf.japi.lang really is the correct package or this should rather go to something like net.sf.japi.beans or net.sf.japi.util.
*/
-public class PropertyComparator<T, C> implements Comparator<C> {
+public class PropertyComparator<T, C> implements Comparator<C>, Serializable {
+ /** Serial version. */
+ private static final long serialVersionUID = 1L;
+
/** The target class. */
@Nullable private final Class<C> targetClass;
Modified: libs/midi/trunk/src/prj/net/sf/japi/midi/DeviceComparator.java
===================================================================
--- libs/midi/trunk/src/prj/net/sf/japi/midi/DeviceComparator.java 2008-12-28 19:31:55 UTC (rev 750)
+++ libs/midi/trunk/src/prj/net/sf/japi/midi/DeviceComparator.java 2008-12-28 20:05:30 UTC (rev 751)
@@ -1,13 +1,17 @@
package net.sf.japi.midi;
+import java.io.Serializable;
import java.util.Comparator;
import javax.sound.midi.MidiDevice;
/** Comparator for MidiDevices which compares them by name.
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
*/
-public class DeviceComparator implements Comparator<MidiDevice> {
+public class DeviceComparator implements Comparator<MidiDevice>, Serializable {
+ /** Serial version. */
+ private static final long serialVersionUID = 1L;
+
/** The convenient default instance. */
private static Comparator<? super MidiDevice> instance = new DeviceComparator();
Modified: libs/taglets/trunk/src/prj/net/sf/japi/taglets/TagByTextComparator.java
===================================================================
--- libs/taglets/trunk/src/prj/net/sf/japi/taglets/TagByTextComparator.java 2008-12-28 19:31:55 UTC (rev 750)
+++ libs/taglets/trunk/src/prj/net/sf/japi/taglets/TagByTextComparator.java 2008-12-28 20:05:30 UTC (rev 751)
@@ -20,14 +20,18 @@
package net.sf.japi.taglets;
import com.sun.javadoc.Tag;
+import java.io.Serializable;
import java.util.Comparator;
/**
* Compares Javadoc Tags by their text.
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
*/
-public class TagByTextComparator implements Comparator<Tag> {
+public class TagByTextComparator implements Comparator<Tag>, Serializable {
+ /** Serial version. */
+ private static final long serialVersionUID = 1L;
+
/** Static instance. */
public static final Comparator<Tag> INSTANCE = new TagByTextComparator();
Modified: libs/util/trunk/src/prj/net/sf/japi/util/LocaleComparator.java
===================================================================
--- libs/util/trunk/src/prj/net/sf/japi/util/LocaleComparator.java 2008-12-28 19:31:55 UTC (rev 750)
+++ libs/util/trunk/src/prj/net/sf/japi/util/LocaleComparator.java 2008-12-28 20:05:30 UTC (rev 751)
@@ -19,6 +19,7 @@
package net.sf.japi.util;
+import java.io.Serializable;
import java.text.Collator;
import java.util.Comparator;
import java.util.Locale;
@@ -29,8 +30,11 @@
* The Locale for sorting the Locales is determined at creation time.
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
*/
-public final class LocaleComparator implements Comparator<Locale> {
+public final class LocaleComparator implements Comparator<Locale>, Serializable {
+ /** Serial version. */
+ private static final long serialVersionUID = 1L;
+
/** Collator for comparing the names. */
@NotNull private final Collator collator = Collator.getInstance();
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/util/StringToTextComparatorAdapter.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/util/StringToTextComparatorAdapter.java 2008-12-28 19:31:55 UTC (rev 750)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/util/StringToTextComparatorAdapter.java 2008-12-28 20:05:30 UTC (rev 751)
@@ -20,6 +20,7 @@
package net.sf.japi.progs.jeduca.util;
+import java.io.Serializable;
import java.util.Comparator;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -27,8 +28,11 @@
/** An adapter to be able to use String comparators for Text objects.
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
*/
-public class StringToTextComparatorAdapter implements Comparator<Text> {
+public class StringToTextComparatorAdapter implements Comparator<Text>, Serializable {
+ /** Serial version. */
+ private static final long serialVersionUID = 1L;
+
/** Mime Comparator. */
@Nullable private final Comparator<String> mime;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-12-28 19:32:01
|
Revision: 750
http://japi.svn.sourceforge.net/japi/?rev=750&view=rev
Author: christianhujer
Date: 2008-12-28 19:31:55 +0000 (Sun, 28 Dec 2008)
Log Message:
-----------
Fixed several I/O issues.
Modified Paths:
--------------
historic/trunk/src/app/net/sf/japi/cpp/CPreProcessor.java
historic/trunk/src/doc/guide/io/src/CatJAPI.java
historic/trunk/src/doc/guide/io/src/SortPlain.java
historic/trunk/src/doc/guide/io/src/UniqPlain.java
libs/argparser/trunk/src/doc/examples/Head.java
libs/argparser/trunk/src/doc/examples/Recode.java
libs/argparser/trunk/src/doc/examples/Tail.java
libs/argparser/trunk/src/doc/examples/Uniq.java
libs/argparser/trunk/src/prj/net/sf/japi/io/args/ArgParser.java
libs/argparser/trunk/src/prj/net/sf/japi/io/args/TokenReader.java
libs/argparser/trunk/src/prj/net/sf/japi/io/args/converter/OututStreamConverter.java
libs/io/trunk/src/prj/net/sf/japi/io/BRLineIterator.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/io/JTestSer.java
progs/jtype/trunk/src/prj/net/sf/japi/jtype/Helper.java
progs/textedit/trunk/src/prj/net/sf/japi/progs/textedit/TextEditApplication.java
tools/archStat/trunk/src/prj/net/sf/japi/archstat/ArchStat.java
tools/cstyle/trunk/src/prj/net/sf/japi/cstyle/CStyle.java
tools/jgrep/trunk/src/prj/net/sf/japi/tools/jgrep/JGrep.java
tools/mail/trunk/src/prj/net/sf/japi/tools/mail/Mail.java
tools/mail/trunk/src/prj/net/sf/japi/tools/mail/PingPongSession.java
tools/replacer/trunk/src/prj/net/sf/japi/tools/replacer/Replacer.java
tools/scriptInterpreter/trunk/src/prj/net/sf/japi/tools/si/ScriptInterpreter.java
tools/todoScanner/trunk/src/prj/net/sf/japi/tools/todoScanner/TodoScanner.java
Modified: historic/trunk/src/app/net/sf/japi/cpp/CPreProcessor.java
===================================================================
--- historic/trunk/src/app/net/sf/japi/cpp/CPreProcessor.java 2008-12-28 16:16:40 UTC (rev 749)
+++ historic/trunk/src/app/net/sf/japi/cpp/CPreProcessor.java 2008-12-28 19:31:55 UTC (rev 750)
@@ -126,7 +126,9 @@
private StringBuilder currentDirectiveArgs = new StringBuilder();
private Processor(final Reader inStream, final Writer outStream) throws IOException {
+ //noinspection IOResourceOpenedButNotSafelyClosed
in = inStream instanceof BufferedReader ? (BufferedReader) inStream : new BufferedReader(inStream);
+ //noinspection IOResourceOpenedButNotSafelyClosed
out = outStream instanceof PrintWriter ? (PrintWriter) outStream : new PrintWriter(outStream);
run();
out.flush();
@@ -205,6 +207,7 @@
}
public void process(final InputStream in, final OutputStream out) throws IOException {
+ //noinspection IOResourceOpenedButNotSafelyClosed
process(new InputStreamReader(in), new OutputStreamWriter(out));
}
Modified: historic/trunk/src/doc/guide/io/src/CatJAPI.java
===================================================================
--- historic/trunk/src/doc/guide/io/src/CatJAPI.java 2008-12-28 16:16:40 UTC (rev 749)
+++ historic/trunk/src/doc/guide/io/src/CatJAPI.java 2008-12-28 19:31:55 UTC (rev 750)
@@ -13,6 +13,7 @@
* @throws IOException in case of I/O problems.
*/
public static void main(final String... args) throws IOException {
+ //noinspection IOResourceOpenedButNotSafelyClosed
copy(new ARGVInputStream(args), out);
}
Modified: historic/trunk/src/doc/guide/io/src/SortPlain.java
===================================================================
--- historic/trunk/src/doc/guide/io/src/SortPlain.java 2008-12-28 16:16:40 UTC (rev 749)
+++ historic/trunk/src/doc/guide/io/src/SortPlain.java 2008-12-28 19:31:55 UTC (rev 750)
@@ -18,25 +18,29 @@
public static void main(final String... args) {
final List<String> lineList = new ArrayList<String>();
if (args.length == 0) {
- BufferedReader in = null;
try {
- in = new BufferedReader(new InputStreamReader(System.in));
- for (String line; (line = in.readLine()) != null; lineList.add(line));
+ final BufferedReader in = new BufferedReader(new InputStreamReader(System.in));
+ try {
+ for (String line; (line = in.readLine()) != null; lineList.add(line));
+ } catch (final IOException e) {
+ System.err.println(e);
+ } finally {
+ in.close();
+ }
} catch (final IOException e) {
System.err.println(e);
- } finally {
- try { in.close(); } catch (final Exception ignore) { /* ignore */ }
}
} else {
for (final String arg : args) {
- BufferedReader in = null;
try {
- in = new BufferedReader(new FileReader(arg));
- for (String line; (line = in.readLine()) != null; lineList.add(line));
+ final BufferedReader in = new BufferedReader(new FileReader(arg));
+ try {
+ for (String line; (line = in.readLine()) != null; lineList.add(line));
+ } finally {
+ in.close();
+ }
} catch (final IOException e) {
System.err.println(e);
- } finally {
- try { in.close(); } catch (final Exception ignore) { /* ignore */ }
}
}
}
Modified: historic/trunk/src/doc/guide/io/src/UniqPlain.java
===================================================================
--- historic/trunk/src/doc/guide/io/src/UniqPlain.java 2008-12-28 16:16:40 UTC (rev 749)
+++ historic/trunk/src/doc/guide/io/src/UniqPlain.java 2008-12-28 19:31:55 UTC (rev 750)
@@ -16,35 +16,37 @@
public static void main(final String... args) {
String prevLine = null;
if (args.length == 0) {
- BufferedReader in = null;
try {
- in = new BufferedReader(new InputStreamReader(System.in));
- for (String line; (line = in.readLine()) != null;) {
- if (!line.equals(prevLine)) {
- out.println(line);
+ final BufferedReader in = new BufferedReader(new InputStreamReader(System.in));
+ try {
+ for (String line; (line = in.readLine()) != null;) {
+ if (!line.equals(prevLine)) {
+ out.println(line);
+ }
+ prevLine = line;
}
- prevLine = line;
+ } finally {
+ in.close();
}
} catch (final IOException e) {
err.println(e);
- } finally {
- try { in.close(); } catch (final Exception ignore) { /* ignore */ }
}
} else {
for (final String arg : args) {
- BufferedReader in = null;
try {
- in = new BufferedReader(new FileReader(arg));
- for (String line; (line = in.readLine()) != null;) {
- if (!line.equals(prevLine)) {
- out.println(line);
+ BufferedReader in = new BufferedReader(new FileReader(arg));
+ try {
+ for (String line; (line = in.readLine()) != null;) {
+ if (!line.equals(prevLine)) {
+ out.println(line);
+ }
+ prevLine = line;
}
- prevLine = line;
+ } finally {
+ in.close();
}
} catch (final IOException e) {
err.println(e);
- } finally {
- try { in.close(); } catch (final Exception ignore) { /* ignore */ }
}
}
}
Modified: libs/argparser/trunk/src/doc/examples/Head.java
===================================================================
--- libs/argparser/trunk/src/doc/examples/Head.java 2008-12-28 16:16:40 UTC (rev 749)
+++ libs/argparser/trunk/src/doc/examples/Head.java 2008-12-28 19:31:55 UTC (rev 750)
@@ -131,6 +131,7 @@
* @throws IOException in case of I/O errors.
*/
private void copyBytes(@NotNull final InputStream in) throws IOException {
+ @SuppressWarnings({"IOResourceOpenedButNotSafelyClosed"})
final InputStream lin = in instanceof BufferedInputStream ? in : new BufferedInputStream(in);
final byte[] buf = new byte[numItems];
final int bytesRead = lin.read(buf, 0, numItems);
@@ -142,6 +143,7 @@
* @throws IOException in case of I/O errors.
*/
private void copyLines(@NotNull final InputStream in) throws IOException {
+ @SuppressWarnings({"IOResourceOpenedButNotSafelyClosed"})
final BufferedReader lin = new BufferedReader(new InputStreamReader(in));
String line;
for (int i = 0; i < numItems && (line = lin.readLine()) != null; i++) {
Modified: libs/argparser/trunk/src/doc/examples/Recode.java
===================================================================
--- libs/argparser/trunk/src/doc/examples/Recode.java 2008-12-28 16:16:40 UTC (rev 749)
+++ libs/argparser/trunk/src/doc/examples/Recode.java 2008-12-28 19:31:55 UTC (rev 750)
@@ -128,7 +128,9 @@
* @throws IOException In case of I/O problems.
*/
public void recode(final InputStream in, final OutputStream out) throws IOException {
+ @SuppressWarnings({"IOResourceOpenedButNotSafelyClosed"})
final Reader cin = new InputStreamReader(in, inputEncoding);
+ @SuppressWarnings({"IOResourceOpenedButNotSafelyClosed"})
final Writer cout = new OutputStreamWriter(out, outputEncoding);
final char[] buf = new char[BUF_SIZE];
//noinspection StatementWithEmptyBody
Modified: libs/argparser/trunk/src/doc/examples/Tail.java
===================================================================
--- libs/argparser/trunk/src/doc/examples/Tail.java 2008-12-28 16:16:40 UTC (rev 749)
+++ libs/argparser/trunk/src/doc/examples/Tail.java 2008-12-28 19:31:55 UTC (rev 750)
@@ -131,6 +131,7 @@
* @throws IOException in case of I/O errors.
*/
private void copyBytes(@NotNull final InputStream in) throws IOException {
+ @SuppressWarnings({"IOResourceOpenedButNotSafelyClosed"})
final InputStream lin = in instanceof BufferedInputStream ? in : new BufferedInputStream(in);
final byte[] buf = new byte[numItems];
int bytesRead;
@@ -150,6 +151,7 @@
*/
private void copyLines(@NotNull final InputStream in) throws IOException {
final String[] buf = new String[numItems];
+ @SuppressWarnings({"IOResourceOpenedButNotSafelyClosed"})
final BufferedReader lin = new BufferedReader(new InputStreamReader(in));
int num = 0;
//noinspection StatementWithEmptyBody
Modified: libs/argparser/trunk/src/doc/examples/Uniq.java
===================================================================
--- libs/argparser/trunk/src/doc/examples/Uniq.java 2008-12-28 16:16:40 UTC (rev 749)
+++ libs/argparser/trunk/src/doc/examples/Uniq.java 2008-12-28 19:31:55 UTC (rev 750)
@@ -89,6 +89,7 @@
* @throws IOException In case of I/O problems.
*/
private void uniq(@NotNull final InputStream in) throws IOException {
+ //noinspection IOResourceOpenedButNotSafelyClosed
uniq(new InputStreamReader(in));
}
@@ -97,6 +98,7 @@
* @throws IOException In case of I/O problems.
*/
private void uniq(@NotNull final Reader in) throws IOException {
+ //noinspection IOResourceOpenedButNotSafelyClosed
final BufferedReader bin = in instanceof BufferedReader ? (BufferedReader) in : new BufferedReader(in);
String previousLine = bin.readLine();
if (previousLine != null) {
Modified: libs/argparser/trunk/src/prj/net/sf/japi/io/args/ArgParser.java
===================================================================
--- libs/argparser/trunk/src/prj/net/sf/japi/io/args/ArgParser.java 2008-12-28 16:16:40 UTC (rev 749)
+++ libs/argparser/trunk/src/prj/net/sf/japi/io/args/ArgParser.java 2008-12-28 19:31:55 UTC (rev 750)
@@ -135,6 +135,7 @@
@NotNull public static List<String> readFromFile(@NotNull final File file) throws ArgumentFileNotFoundException {
final TokenReader in;
try {
+ //noinspection IOResourceOpenedButNotSafelyClosed
in = new TokenReader(new FileInputStream(file));
} catch (final FileNotFoundException e) {
throw new ArgumentFileNotFoundException(e);
Modified: libs/argparser/trunk/src/prj/net/sf/japi/io/args/TokenReader.java
===================================================================
--- libs/argparser/trunk/src/prj/net/sf/japi/io/args/TokenReader.java 2008-12-28 16:16:40 UTC (rev 749)
+++ libs/argparser/trunk/src/prj/net/sf/japi/io/args/TokenReader.java 2008-12-28 19:31:55 UTC (rev 750)
@@ -52,6 +52,7 @@
* @param in InputStream to read from.
*/
public TokenReader(@NotNull final InputStream in) {
+ //noinspection IOResourceOpenedButNotSafelyClosed
this.in = new InputStreamReader(in);
next = readNextToken();
}
Modified: libs/argparser/trunk/src/prj/net/sf/japi/io/args/converter/OututStreamConverter.java
===================================================================
--- libs/argparser/trunk/src/prj/net/sf/japi/io/args/converter/OututStreamConverter.java 2008-12-28 16:16:40 UTC (rev 749)
+++ libs/argparser/trunk/src/prj/net/sf/japi/io/args/converter/OututStreamConverter.java 2008-12-28 19:31:55 UTC (rev 750)
@@ -42,6 +42,7 @@
}
/** {@inheritDoc} */
+ @SuppressWarnings({"IOResourceOpenedButNotSafelyClosed"})
@NotNull public OutputStream convert(@NotNull final Locale locale, @NotNull final String arg) throws FileNotFoundException {
return "-".equals(arg) && !new File("-").exists() ? System.out : new FileOutputStream(arg);
}
Modified: libs/io/trunk/src/prj/net/sf/japi/io/BRLineIterator.java
===================================================================
--- libs/io/trunk/src/prj/net/sf/japi/io/BRLineIterator.java 2008-12-28 16:16:40 UTC (rev 749)
+++ libs/io/trunk/src/prj/net/sf/japi/io/BRLineIterator.java 2008-12-28 19:31:55 UTC (rev 750)
@@ -24,6 +24,7 @@
* @param in BufferedReader from which to return lines.
*/
public BRLineIterator(@NotNull final Reader in) {
+ //noinspection IOResourceOpenedButNotSafelyClosed
this.in = in instanceof BufferedReader ? (BufferedReader) in : new BufferedReader(in);
nextLine = readLine();
}
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/io/JTestSer.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/io/JTestSer.java 2008-12-28 16:16:40 UTC (rev 749)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/io/JTestSer.java 2008-12-28 19:31:55 UTC (rev 750)
@@ -26,7 +26,6 @@
import java.io.InputStream;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
-import java.io.OutputStream;
import java.net.URL;
import net.sf.japi.progs.jeduca.jtest.QuestionCollection;
import net.sf.japi.progs.jeduca.swing.io.Exporter;
@@ -78,9 +77,10 @@
*/
private QuestionCollection load(final InputStream in) throws IOException {
try {
+ //noinspection IOResourceOpenedButNotSafelyClosed
return (QuestionCollection) (new ObjectInputStream(in).readObject());
- } catch (ClassNotFoundException e) {
- throw new IOException("This isn't a serialized JTest file");
+ } catch (final ClassNotFoundException e) {
+ throw new IOException("This isn't a serialized JTest file", e);
}
}
@@ -90,12 +90,11 @@
* @throws IOException in case of I/O-problems
*/
public void save(final QuestionCollection col, final File f) throws IOException {
- final OutputStream fout = new FileOutputStream(f);
+ final ObjectOutputStream out = new ObjectOutputStream(new FileOutputStream(f));
try {
- final ObjectOutputStream out = new ObjectOutputStream(fout);
out.writeObject(col);
} finally {
- fout.close();
+ out.close();
}
}
Modified: progs/jtype/trunk/src/prj/net/sf/japi/jtype/Helper.java
===================================================================
--- progs/jtype/trunk/src/prj/net/sf/japi/jtype/Helper.java 2008-12-28 16:16:40 UTC (rev 749)
+++ progs/jtype/trunk/src/prj/net/sf/japi/jtype/Helper.java 2008-12-28 19:31:55 UTC (rev 750)
@@ -80,6 +80,7 @@
try {
final Process process = runtime.exec(command);
final List<String> lines = new ArrayList<String>();
+ @SuppressWarnings({"IOResourceOpenedButNotSafelyClosed"})
final BufferedReader in = new BufferedReader(new InputStreamReader(process.getInputStream()));
for (String line; (line = in.readLine()) != null; ) {
lines.add(line);
Modified: progs/textedit/trunk/src/prj/net/sf/japi/progs/textedit/TextEditApplication.java
===================================================================
--- progs/textedit/trunk/src/prj/net/sf/japi/progs/textedit/TextEditApplication.java 2008-12-28 16:16:40 UTC (rev 749)
+++ progs/textedit/trunk/src/prj/net/sf/japi/progs/textedit/TextEditApplication.java 2008-12-28 19:31:55 UTC (rev 750)
@@ -37,10 +37,13 @@
@Override
public void save(@NotNull final Document<PlainDocument> doc, @NotNull final String uri) throws Exception {
final Writer out = new BufferedWriter(new OutputStreamWriter(openUriForwriting(uri)));
- final PlainDocument data = doc.getData();
- out.write(data.getText(0, data.getLength()));
- out.flush();
- out.close();
+ try {
+ final PlainDocument data = doc.getData();
+ out.write(data.getText(0, data.getLength()));
+ out.flush();
+ } finally {
+ out.close();
+ }
}
/** {@inheritDoc} */
Modified: tools/archStat/trunk/src/prj/net/sf/japi/archstat/ArchStat.java
===================================================================
--- tools/archStat/trunk/src/prj/net/sf/japi/archstat/ArchStat.java 2008-12-28 16:16:40 UTC (rev 749)
+++ tools/archStat/trunk/src/prj/net/sf/japi/archstat/ArchStat.java 2008-12-28 19:31:55 UTC (rev 750)
@@ -112,10 +112,10 @@
*/
public static CharSequence readFile(final File file) throws IOException {
assert file.isFile();
+ final StringBuilder sb = new StringBuilder((int) file.length());
final BufferedReader in = new BufferedReader(new FileReader(file));
- final StringBuilder sb = new StringBuilder((int) file.length());
- final char[] buf = new char[BUF_SIZE];
try {
+ final char[] buf = new char[BUF_SIZE];
for (int charsRead; (charsRead = in.read(buf)) != -1; ) {
sb.append(buf, 0, charsRead);
}
Modified: tools/cstyle/trunk/src/prj/net/sf/japi/cstyle/CStyle.java
===================================================================
--- tools/cstyle/trunk/src/prj/net/sf/japi/cstyle/CStyle.java 2008-12-28 16:16:40 UTC (rev 749)
+++ tools/cstyle/trunk/src/prj/net/sf/japi/cstyle/CStyle.java 2008-12-28 19:31:55 UTC (rev 750)
@@ -108,6 +108,7 @@
* @throws IOException In case of I/O problems.
*/
public void check(@NotNull final InputStream stream) throws IOException {
+ @SuppressWarnings({"IOResourceOpenedButNotSafelyClosed"})
final Reader in = new BufferedReader(new InputStreamReader(stream, encoding));
check(in);
}
Modified: tools/jgrep/trunk/src/prj/net/sf/japi/tools/jgrep/JGrep.java
===================================================================
--- tools/jgrep/trunk/src/prj/net/sf/japi/tools/jgrep/JGrep.java 2008-12-28 16:16:40 UTC (rev 749)
+++ tools/jgrep/trunk/src/prj/net/sf/japi/tools/jgrep/JGrep.java 2008-12-28 19:31:55 UTC (rev 750)
@@ -201,6 +201,7 @@
* @throws IOException in case of I/O problems.
*/
public void grep(@NotNull final InputStream in, @Nullable final String currentFile) throws IOException {
+ //noinspection IOResourceOpenedButNotSafelyClosed
grep(new InputStreamReader(in, encoding), currentFile);
}
@@ -210,6 +211,7 @@
* @throws IOException in case of I/O problems.
*/
public void grep(@NotNull final Reader reader, @Nullable final String currentFile) throws IOException {
+ @SuppressWarnings({"IOResourceOpenedButNotSafelyClosed"})
final BufferedReader in = reader instanceof BufferedReader ? (BufferedReader) reader : new BufferedReader(reader);
int lineNumber = 0;
for (String line; (line = in.readLine()) != null; ) {
Modified: tools/mail/trunk/src/prj/net/sf/japi/tools/mail/Mail.java
===================================================================
--- tools/mail/trunk/src/prj/net/sf/japi/tools/mail/Mail.java 2008-12-28 16:16:40 UTC (rev 749)
+++ tools/mail/trunk/src/prj/net/sf/japi/tools/mail/Mail.java 2008-12-28 19:31:55 UTC (rev 750)
@@ -68,6 +68,7 @@
}
session.sendAndWait("DATA", "354");
if (msg == null) {
+ @SuppressWarnings({"IOResourceOpenedButNotSafelyClosed"})
final BufferedReader in = new BufferedReader(new InputStreamReader(System.in));
for (String line; (line = in.readLine()) != null && !".".equals(line);) {
session.send(line);
Modified: tools/mail/trunk/src/prj/net/sf/japi/tools/mail/PingPongSession.java
===================================================================
--- tools/mail/trunk/src/prj/net/sf/japi/tools/mail/PingPongSession.java 2008-12-28 16:16:40 UTC (rev 749)
+++ tools/mail/trunk/src/prj/net/sf/japi/tools/mail/PingPongSession.java 2008-12-28 19:31:55 UTC (rev 750)
@@ -68,6 +68,7 @@
* @throws IOException in case of I/O problems when connecting the streams of the socket.
*/
public PingPongSession(@NotNull final InputStream in, @NotNull final OutputStream out, @Nullable final Socket socket) throws IOException {
+ //noinspection IOResourceOpenedButNotSafelyClosed
this(new InputStreamReader(in, "ASCII"), new OutputStreamWriter(out, "ASCII"), socket);
}
@@ -77,7 +78,9 @@
* @param socket Socket to communicate with.
*/
public PingPongSession(@NotNull final Reader in, @NotNull final Writer out, @Nullable final Socket socket) {
+ //noinspection IOResourceOpenedButNotSafelyClosed
sin = in instanceof BufferedReader ? (BufferedReader) in : new BufferedReader(in);
+ //noinspection IOResourceOpenedButNotSafelyClosed
sout = new PrintWriter(out, true);
this.socket = socket;
}
Modified: tools/replacer/trunk/src/prj/net/sf/japi/tools/replacer/Replacer.java
===================================================================
--- tools/replacer/trunk/src/prj/net/sf/japi/tools/replacer/Replacer.java 2008-12-28 16:16:40 UTC (rev 749)
+++ tools/replacer/trunk/src/prj/net/sf/japi/tools/replacer/Replacer.java 2008-12-28 19:31:55 UTC (rev 750)
@@ -194,6 +194,7 @@
*/
@NotNull public CharSequence read(@NotNull final InputStream stream) throws IOException {
final StringBuilder sb = new StringBuilder();
+ @SuppressWarnings({"IOResourceOpenedButNotSafelyClosed"})
final Reader in = new InputStreamReader(stream instanceof BufferedInputStream ? stream : new BufferedInputStream(stream), encoding);
final char[] buf = new char[BUF_SIZE];
//noinspection NestedAssignment
Modified: tools/scriptInterpreter/trunk/src/prj/net/sf/japi/tools/si/ScriptInterpreter.java
===================================================================
--- tools/scriptInterpreter/trunk/src/prj/net/sf/japi/tools/si/ScriptInterpreter.java 2008-12-28 16:16:40 UTC (rev 749)
+++ tools/scriptInterpreter/trunk/src/prj/net/sf/japi/tools/si/ScriptInterpreter.java 2008-12-28 19:31:55 UTC (rev 750)
@@ -1,6 +1,7 @@
package net.sf.japi.tools.si;
import java.io.InputStreamReader;
+import java.io.IOException;
import java.util.List;
import java.util.TreeSet;
import java.util.Collection;
@@ -8,6 +9,7 @@
import javax.script.ScriptEngine;
import javax.script.ScriptEngineFactory;
import javax.script.ScriptEngineManager;
+import javax.script.ScriptException;
import net.sf.japi.io.args.ArgParser;
import net.sf.japi.io.args.BasicCommand;
import net.sf.japi.io.args.Option;
@@ -40,11 +42,16 @@
/** {@inheritDoc} */
@SuppressWarnings({"InstanceMethodNamingConvention"})
- public int run(@NotNull final List<String> args) throws Exception {
+ public int run(@NotNull final List<String> args) throws IOException, ScriptException {
final ScriptEngineManager sem = new ScriptEngineManager();
final ScriptEngine se = sem.getEngineByMimeType(mimeType);
se.getBindings(ScriptContext.ENGINE_SCOPE).put("cmd", this);
- se.eval(new InputStreamReader(System.in));
+ final InputStreamReader in = new InputStreamReader(System.in);
+ try {
+ se.eval(in);
+ } finally {
+ in.close();
+ }
return 0;
}
Modified: tools/todoScanner/trunk/src/prj/net/sf/japi/tools/todoScanner/TodoScanner.java
===================================================================
--- tools/todoScanner/trunk/src/prj/net/sf/japi/tools/todoScanner/TodoScanner.java 2008-12-28 16:16:40 UTC (rev 749)
+++ tools/todoScanner/trunk/src/prj/net/sf/japi/tools/todoScanner/TodoScanner.java 2008-12-28 19:31:55 UTC (rev 750)
@@ -59,6 +59,7 @@
* @throws IOException In case of I/O problems.
*/
public void scanForTodos(@NotNull final InputStream in) throws IOException {
+ //noinspection IOResourceOpenedButNotSafelyClosed
scanForTodos(new InputStreamReader(in, encoding));
}
@@ -67,6 +68,7 @@
* @throws IOException In case of I/O problems.
*/
public void scanForTodos(@NotNull final Reader cin) throws IOException {
+ @SuppressWarnings({"IOResourceOpenedButNotSafelyClosed"})
final BufferedReader in = cin instanceof BufferedReader ? (BufferedReader) cin : new BufferedReader(cin);
int lineNumber = 0;
for (String line; (line = in.readLine()) != null; lineNumber++) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-12-28 16:16:47
|
Revision: 749
http://japi.svn.sourceforge.net/japi/?rev=749&view=rev
Author: christianhujer
Date: 2008-12-28 16:16:40 +0000 (Sun, 28 Dec 2008)
Log Message:
-----------
Fixed some serialization issues.
Modified Paths:
--------------
historic/trunk/src/app/net/sf/japi/swing/WindowsLookAndFeel.java
historic/trunk/src/app/net/sf/japi/util/Service.java
libs/argparser/trunk/src/prj/net/sf/japi/io/args/ArgumentFileNotFoundException.java
libs/argparser/trunk/src/prj/net/sf/japi/io/args/MissingArgumentException.java
libs/argparser/trunk/src/prj/net/sf/japi/io/args/RequiredOptionsMissingException.java
libs/argparser/trunk/src/prj/net/sf/japi/io/args/TerminalException.java
libs/argparser/trunk/src/prj/net/sf/japi/io/args/UnknownOptionException.java
libs/argparser/trunk/src/prj/net/sf/japi/io/args/converter/NoConverterFoundException.java
libs/swing-action/trunk/src/prj/net/sf/japi/swing/DisposeAction.java
libs/swing-action/trunk/src/prj/net/sf/japi/swing/NamedActionMap.java
libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/Document.java
libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/DocumentEvent.java
libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/DocumentFrame.java
libs/swing-bookmarks/trunk/src/prj/net/sf/japi/swing/bookmarks/BookmarkManager.java
libs/swing-keyprefs/trunk/src/prj/net/sf/japi/swing/prefs/keys/ActionKeyDisplay.java
libs/swing-list/trunk/src/prj/net/sf/japi/swing/list/ArrayListModel.java
libs/swing-misc/trunk/src/prj/net/sf/japi/swing/misc/CollectionsListModel.java
libs/swing-prefs/trunk/src/prj/net/sf/japi/swing/prefs/PreferencesGroup.java
libs/swing-treetable/trunk/src/prj/net/sf/japi/swing/treetable/JTreeTable.java
libs/swing-treetable/trunk/src/prj/net/sf/japi/swing/treetable/TreeTableModelTableModelAdapter.java
progs/cardlearn/trunk/src/prj/net/sf/japi/cardlearn/Card.java
progs/cardlearn/trunk/src/prj/net/sf/japi/cardlearn/CardDatabaseConfig.java
tools/cstyle/trunk/src/prj/net/sf/japi/cstyle/ParseEvent.java
tools/string2bytes/trunk/src/prj/net/sf/japi/string2bytes/CodecStepsListModel.java
Modified: historic/trunk/src/app/net/sf/japi/swing/WindowsLookAndFeel.java
===================================================================
--- historic/trunk/src/app/net/sf/japi/swing/WindowsLookAndFeel.java 2008-12-28 15:27:01 UTC (rev 748)
+++ historic/trunk/src/app/net/sf/japi/swing/WindowsLookAndFeel.java 2008-12-28 16:16:40 UTC (rev 749)
@@ -27,6 +27,9 @@
@SuppressWarnings({"ClassNameSameAsAncestorName"})
public class WindowsLookAndFeel extends com.sun.java.swing.plaf.windows.WindowsLookAndFeel {
+ /** Serial version. */
+ private static final long serialVersionUID = 1L;
+
/** {@inheritDoc} */
@Override public void initialize() {
final String osVersion = System.getProperty("os.version");
Modified: historic/trunk/src/app/net/sf/japi/util/Service.java
===================================================================
--- historic/trunk/src/app/net/sf/japi/util/Service.java 2008-12-28 15:27:01 UTC (rev 748)
+++ historic/trunk/src/app/net/sf/japi/util/Service.java 2008-12-28 16:16:40 UTC (rev 749)
@@ -107,6 +107,9 @@
/** Exception thrown when Mustang is unavailable. */
private static class MustangUnavailableException extends Exception {
+
+ /** Serial version. */
+ private static final long serialVersionUID = 1L;
}
} // class Registry
Modified: libs/argparser/trunk/src/prj/net/sf/japi/io/args/ArgumentFileNotFoundException.java
===================================================================
--- libs/argparser/trunk/src/prj/net/sf/japi/io/args/ArgumentFileNotFoundException.java 2008-12-28 15:27:01 UTC (rev 748)
+++ libs/argparser/trunk/src/prj/net/sf/japi/io/args/ArgumentFileNotFoundException.java 2008-12-28 16:16:40 UTC (rev 749)
@@ -28,6 +28,9 @@
*/
public class ArgumentFileNotFoundException extends FileNotFoundException {
+ /** Serial version. */
+ private static final long serialVersionUID = 1L;
+
/** Create an ArgumentFileNotFoundException.
* @param cause The FileNotFoundException that caused this ArgumentFileNotFoundException.
*/
Modified: libs/argparser/trunk/src/prj/net/sf/japi/io/args/MissingArgumentException.java
===================================================================
--- libs/argparser/trunk/src/prj/net/sf/japi/io/args/MissingArgumentException.java 2008-12-28 15:27:01 UTC (rev 748)
+++ libs/argparser/trunk/src/prj/net/sf/japi/io/args/MissingArgumentException.java 2008-12-28 16:16:40 UTC (rev 749)
@@ -27,6 +27,9 @@
*/
public class MissingArgumentException extends Exception {
+ /** Serial version. */
+ private static final long serialVersionUID = 1L;
+
/** The option that was missing its argument.
* @serial include
*/
Modified: libs/argparser/trunk/src/prj/net/sf/japi/io/args/RequiredOptionsMissingException.java
===================================================================
--- libs/argparser/trunk/src/prj/net/sf/japi/io/args/RequiredOptionsMissingException.java 2008-12-28 15:27:01 UTC (rev 748)
+++ libs/argparser/trunk/src/prj/net/sf/japi/io/args/RequiredOptionsMissingException.java 2008-12-28 16:16:40 UTC (rev 749)
@@ -26,6 +26,9 @@
*/
public class RequiredOptionsMissingException extends Exception {
+ /** Serial version. */
+ private static final long serialVersionUID = 1L;
+
/** The list of options that were missing.
* @serial include
*/
Modified: libs/argparser/trunk/src/prj/net/sf/japi/io/args/TerminalException.java
===================================================================
--- libs/argparser/trunk/src/prj/net/sf/japi/io/args/TerminalException.java 2008-12-28 15:27:01 UTC (rev 748)
+++ libs/argparser/trunk/src/prj/net/sf/japi/io/args/TerminalException.java 2008-12-28 16:16:40 UTC (rev 749)
@@ -24,6 +24,9 @@
*/
public class TerminalException extends Exception {
+ /** Serial version. */
+ private static final long serialVersionUID = 1L;
+
/** The return code (eventually reported to the operating system in {@link System#exit(int)}).
* @serial include
*/
Modified: libs/argparser/trunk/src/prj/net/sf/japi/io/args/UnknownOptionException.java
===================================================================
--- libs/argparser/trunk/src/prj/net/sf/japi/io/args/UnknownOptionException.java 2008-12-28 15:27:01 UTC (rev 748)
+++ libs/argparser/trunk/src/prj/net/sf/japi/io/args/UnknownOptionException.java 2008-12-28 16:16:40 UTC (rev 749)
@@ -26,6 +26,9 @@
*/
public class UnknownOptionException extends Exception {
+ /** Serial version. */
+ private static final long serialVersionUID = 1L;
+
/** The list of options that were unknown.
* @serial include
*/
Modified: libs/argparser/trunk/src/prj/net/sf/japi/io/args/converter/NoConverterFoundException.java
===================================================================
--- libs/argparser/trunk/src/prj/net/sf/japi/io/args/converter/NoConverterFoundException.java 2008-12-28 15:27:01 UTC (rev 748)
+++ libs/argparser/trunk/src/prj/net/sf/japi/io/args/converter/NoConverterFoundException.java 2008-12-28 16:16:40 UTC (rev 749)
@@ -25,6 +25,9 @@
*/
public class NoConverterFoundException extends Exception {
+ /** Serial version. */
+ private static final long serialVersionUID = 1L;
+
/**
* The type for that no Converter was found.
* @serial include
Modified: libs/swing-action/trunk/src/prj/net/sf/japi/swing/DisposeAction.java
===================================================================
--- libs/swing-action/trunk/src/prj/net/sf/japi/swing/DisposeAction.java 2008-12-28 15:27:01 UTC (rev 748)
+++ libs/swing-action/trunk/src/prj/net/sf/japi/swing/DisposeAction.java 2008-12-28 16:16:40 UTC (rev 749)
@@ -42,6 +42,9 @@
*/
public final class DisposeAction extends AbstractAction {
+ /** Serial version. */
+ private static final long serialVersionUID = 1L;
+
/** The window to be disposed.
* @serial include
*/
Modified: libs/swing-action/trunk/src/prj/net/sf/japi/swing/NamedActionMap.java
===================================================================
--- libs/swing-action/trunk/src/prj/net/sf/japi/swing/NamedActionMap.java 2008-12-28 15:27:01 UTC (rev 748)
+++ libs/swing-action/trunk/src/prj/net/sf/japi/swing/NamedActionMap.java 2008-12-28 16:16:40 UTC (rev 749)
@@ -26,6 +26,9 @@
*/
public class NamedActionMap extends ActionMap {
+ /** Serial version. */
+ private static final long serialVersionUID = 1L;
+
/** The name.
* @serial include
*/
Modified: libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/Document.java
===================================================================
--- libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/Document.java 2008-12-28 15:27:01 UTC (rev 748)
+++ libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/Document.java 2008-12-28 16:16:40 UTC (rev 749)
@@ -1,6 +1,7 @@
package net.sf.japi.swing.app;
import java.awt.Component;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import javax.swing.event.EventListenerList;
@@ -14,8 +15,11 @@
* @param <D> The document type that is managed by the application.
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
*/
-public abstract class Document<D> {
+public abstract class Document<D> implements Serializable {
+ /** Serial version. */
+ private static final long serialVersionUID = 1L;
+
/** The frames of this document. */
private final List<DocumentFrame<D>> frames = new ArrayList<DocumentFrame<D>>();
Modified: libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/DocumentEvent.java
===================================================================
--- libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/DocumentEvent.java 2008-12-28 15:27:01 UTC (rev 748)
+++ libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/DocumentEvent.java 2008-12-28 16:16:40 UTC (rev 749)
@@ -9,6 +9,9 @@
*/
public class DocumentEvent<D> extends EventObject {
+ /** Serial version. */
+ private static final long serialVersionUID = 1L;
+
/** The type of this event. */
@NotNull private final DocumentEventType type;
Modified: libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/DocumentFrame.java
===================================================================
--- libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/DocumentFrame.java 2008-12-28 15:27:01 UTC (rev 748)
+++ libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/DocumentFrame.java 2008-12-28 16:16:40 UTC (rev 749)
@@ -20,6 +20,9 @@
/** The Action for activating this frame. */
private final Action windowAction = new AbstractAction() {
+ /** Serial version. */
+ private static final long serialVersionUID = 1L;
+
public void actionPerformed(final ActionEvent e) {
try {
setSelected(true);
Modified: libs/swing-bookmarks/trunk/src/prj/net/sf/japi/swing/bookmarks/BookmarkManager.java
===================================================================
--- libs/swing-bookmarks/trunk/src/prj/net/sf/japi/swing/bookmarks/BookmarkManager.java 2008-12-28 15:27:01 UTC (rev 748)
+++ libs/swing-bookmarks/trunk/src/prj/net/sf/japi/swing/bookmarks/BookmarkManager.java 2008-12-28 16:16:40 UTC (rev 749)
@@ -24,6 +24,7 @@
import java.awt.event.ActionEvent;
import java.io.File;
import java.io.IOException;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Enumeration;
@@ -74,8 +75,11 @@
* @todo fix bookmark drag and drop indices
* @todo think about serialization of Actions
*/
-public class BookmarkManager {
+public class BookmarkManager implements Serializable {
+ /** Serial version. */
+ private static final long serialVersionUID = 1L;
+
/** The Bookmarks. */
private BookmarkFolder bookmarks = new BookmarkFolder();
Modified: libs/swing-keyprefs/trunk/src/prj/net/sf/japi/swing/prefs/keys/ActionKeyDisplay.java
===================================================================
--- libs/swing-keyprefs/trunk/src/prj/net/sf/japi/swing/prefs/keys/ActionKeyDisplay.java 2008-12-28 15:27:01 UTC (rev 748)
+++ libs/swing-keyprefs/trunk/src/prj/net/sf/japi/swing/prefs/keys/ActionKeyDisplay.java 2008-12-28 16:16:40 UTC (rev 749)
@@ -121,6 +121,9 @@
*/
class ActionKeyAction extends AbstractAction {
+ /** Serial version. */
+ private static final long serialVersionUID = 1L;
+
/** The Action to be displayed. */
private Action action;
Modified: libs/swing-list/trunk/src/prj/net/sf/japi/swing/list/ArrayListModel.java
===================================================================
--- libs/swing-list/trunk/src/prj/net/sf/japi/swing/list/ArrayListModel.java 2008-12-28 15:27:01 UTC (rev 748)
+++ libs/swing-list/trunk/src/prj/net/sf/japi/swing/list/ArrayListModel.java 2008-12-28 16:16:40 UTC (rev 749)
@@ -31,6 +31,9 @@
*/
public class ArrayListModel<E> extends AbstractMutableListModel<E> {
+ /** Serial version. */
+ private static final long serialVersionUID = 1L;
+
/** The ArrayList that backs this ArrayListModel.
* @serial include
*/
Modified: libs/swing-misc/trunk/src/prj/net/sf/japi/swing/misc/CollectionsListModel.java
===================================================================
--- libs/swing-misc/trunk/src/prj/net/sf/japi/swing/misc/CollectionsListModel.java 2008-12-28 15:27:01 UTC (rev 748)
+++ libs/swing-misc/trunk/src/prj/net/sf/japi/swing/misc/CollectionsListModel.java 2008-12-28 16:16:40 UTC (rev 749)
@@ -32,6 +32,9 @@
*/
public class CollectionsListModel<E> extends AbstractListModel implements List<E> {
+ /** Serial version. */
+ private static final long serialVersionUID = 1L;
+
/** The list to delegate to.
* @serial include
*/
Modified: libs/swing-prefs/trunk/src/prj/net/sf/japi/swing/prefs/PreferencesGroup.java
===================================================================
--- libs/swing-prefs/trunk/src/prj/net/sf/japi/swing/prefs/PreferencesGroup.java 2008-12-28 15:27:01 UTC (rev 748)
+++ libs/swing-prefs/trunk/src/prj/net/sf/japi/swing/prefs/PreferencesGroup.java 2008-12-28 16:16:40 UTC (rev 749)
@@ -29,6 +29,9 @@
*/
public class PreferencesGroup extends AbstractListModel implements Iterable<Prefs> {
+ /** Serial version. */
+ private static final long serialVersionUID = 1L;
+
/** The preferences modules.
* @serial include
*/
Modified: libs/swing-treetable/trunk/src/prj/net/sf/japi/swing/treetable/JTreeTable.java
===================================================================
--- libs/swing-treetable/trunk/src/prj/net/sf/japi/swing/treetable/JTreeTable.java 2008-12-28 15:27:01 UTC (rev 748)
+++ libs/swing-treetable/trunk/src/prj/net/sf/japi/swing/treetable/JTreeTable.java 2008-12-28 16:16:40 UTC (rev 749)
@@ -55,6 +55,9 @@
// Force the JTable and JTree to share their row selection models.
tree.setSelectionModel(new DefaultTreeSelectionModel() {
+
+ /** Serial version. */
+ private static final long serialVersionUID = 1L;
{
setSelectionModel(listSelectionModel);
}
@@ -136,6 +139,9 @@
/** Editor for TreeTableCells. */
public class TreeTableCellEditor extends AbstractCellEditor implements TableCellEditor {
+ /** Serial Version. */
+ private static final long serialVersionUID = 1L;
+
/** {@inheritDoc} */
public Component getTableCellEditorComponent(final JTable table, final Object value, final boolean isSelected, final int row, final int column) {
return tree;
Modified: libs/swing-treetable/trunk/src/prj/net/sf/japi/swing/treetable/TreeTableModelTableModelAdapter.java
===================================================================
--- libs/swing-treetable/trunk/src/prj/net/sf/japi/swing/treetable/TreeTableModelTableModelAdapter.java 2008-12-28 15:27:01 UTC (rev 748)
+++ libs/swing-treetable/trunk/src/prj/net/sf/japi/swing/treetable/TreeTableModelTableModelAdapter.java 2008-12-28 16:16:40 UTC (rev 749)
@@ -30,6 +30,9 @@
*/
public class TreeTableModelTableModelAdapter extends AbstractTableModel {
+ /** Serial version. */
+ private static final long serialVersionUID = 1L;
+
/** The underlying JTree. */
private JTree tree;
Modified: progs/cardlearn/trunk/src/prj/net/sf/japi/cardlearn/Card.java
===================================================================
--- progs/cardlearn/trunk/src/prj/net/sf/japi/cardlearn/Card.java 2008-12-28 15:27:01 UTC (rev 748)
+++ progs/cardlearn/trunk/src/prj/net/sf/japi/cardlearn/Card.java 2008-12-28 16:16:40 UTC (rev 749)
@@ -8,6 +8,9 @@
*/
public class Card implements Serializable {
+ /** Serial version. */
+ private static final long serialVersionUID = 1L;
+
private final String[] fieldContents = new String[6];
public void setField(final int fieldIndex, final String fieldContent) {
Modified: progs/cardlearn/trunk/src/prj/net/sf/japi/cardlearn/CardDatabaseConfig.java
===================================================================
--- progs/cardlearn/trunk/src/prj/net/sf/japi/cardlearn/CardDatabaseConfig.java 2008-12-28 15:27:01 UTC (rev 748)
+++ progs/cardlearn/trunk/src/prj/net/sf/japi/cardlearn/CardDatabaseConfig.java 2008-12-28 16:16:40 UTC (rev 749)
@@ -7,6 +7,9 @@
*/
public class CardDatabaseConfig implements Serializable {
+ /** Serial version. */
+ private static final long serialVersionUID = 1L;
+
private String[] fieldNames = new String[6];
/** Creates a CardDatabaseConfig.
Modified: tools/cstyle/trunk/src/prj/net/sf/japi/cstyle/ParseEvent.java
===================================================================
--- tools/cstyle/trunk/src/prj/net/sf/japi/cstyle/ParseEvent.java 2008-12-28 15:27:01 UTC (rev 748)
+++ tools/cstyle/trunk/src/prj/net/sf/japi/cstyle/ParseEvent.java 2008-12-28 16:16:40 UTC (rev 749)
@@ -9,6 +9,9 @@
*/
public class ParseEvent extends EventObject {
+ /** Serial version. */
+ private static final long serialVersionUID = 1L;
+
/**
* Constructs a ParseEvent.
* @param source The Parser on which the Event initially occurred.
Modified: tools/string2bytes/trunk/src/prj/net/sf/japi/string2bytes/CodecStepsListModel.java
===================================================================
--- tools/string2bytes/trunk/src/prj/net/sf/japi/string2bytes/CodecStepsListModel.java 2008-12-28 15:27:01 UTC (rev 748)
+++ tools/string2bytes/trunk/src/prj/net/sf/japi/string2bytes/CodecStepsListModel.java 2008-12-28 16:16:40 UTC (rev 749)
@@ -30,6 +30,9 @@
*/
public class CodecStepsListModel extends DefaultListModel {
+ /** Serial version. */
+ private static final long serialVersionUID = 1L;
+
/** {@inheritDoc} */
@Override public void insertElementAt(@NotNull final Object object, final int i) {
if (!(object instanceof StringCodec)) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-12-28 15:27:08
|
Revision: 748
http://japi.svn.sourceforge.net/japi/?rev=748&view=rev
Author: christianhujer
Date: 2008-12-28 15:27:01 +0000 (Sun, 28 Dec 2008)
Log Message:
-----------
Fixed code style issues:
- Problems regarding null / @Nullable / @NotNull
- Obsolete @used tags
- Missing exceptions in javadoc
- Missing parameter descriptions in javadoc
Modified Paths:
--------------
historic/trunk/src/app/net/sf/japi/cpp/CPreProcessor.java
historic/trunk/src/app/net/sf/japi/lang/Properties.java
historic/trunk/src/app/net/sf/japi/sql/CachedResultSetTableModel.java
historic/trunk/src/app/net/sf/japi/sql/DatabaseTreeModel.java
historic/trunk/src/app/net/sf/japi/sql/ScrollResultSetTableModel.java
historic/trunk/src/app/net/sf/japi/swing/JPropertyEditor.java
historic/trunk/src/app/net/sf/japi/util/PrintStreamThrowableHandler.java
historic/trunk/src/app/net/sf/japi/util/Service.java
historic/trunk/src/doc/guide/io/src/CatJAPI.java
historic/trunk/src/doc/guide/swing/action/fromScratch/src/net/sf/japi/examples/editor/Editor.java
historic/trunk/src/test/net/sf/japi/util/PairTest.java
historic/trunk/src/test/net/sf/japi/util/TableTest.java
libs/argparser/trunk/src/doc/examples/Recode.java
libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/MissingArgumentExceptionTest.java
libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/RequiredOptionsMissingExceptionTest.java
libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/TerminalExceptionTest.java
libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/UnknownOptionExceptionTest.java
libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/converter/NoConverterFoundExceptionTest.java
libs/logging/trunk/src/prj/net/sf/japi/log/SimpleLogger.java
libs/midi/trunk/src/prj/net/sf/japi/midi/MidiUtils.java
libs/swing-action/trunk/src/tst/test/net/sf/japi/swing/ReflectionActionTest.java
libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/script/Application.java
libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/script/TryApplication.java
libs/swing-bookmarks/trunk/src/prj/net/sf/japi/swing/bookmarks/BookmarkDropTargetAdapter.java
libs/swing-bookmarks/trunk/src/prj/net/sf/japi/swing/bookmarks/BookmarkManager.java
libs/swing-keyprefs/trunk/src/prj/net/sf/japi/swing/prefs/keys/AbstractSimpleNode.java
libs/swing-keyprefs/trunk/src/prj/net/sf/japi/swing/prefs/keys/ActionKeyDisplay.java
libs/swing-misc/trunk/src/prj/net/sf/japi/swing/misc/CollectionsListModel.java
libs/swing-misc/trunk/src/prj/net/sf/japi/swing/misc/JSAXErrorHandler.java
libs/swing-treetable/trunk/src/prj/net/sf/japi/swing/treetable/AbstractTreeTableModel.java
libs/util/trunk/src/tst/test/net/sf/japi/util/EnumerationIteratorTest.java
libs/xml/trunk/src/tst/test/net/sf/japi/xml/NodeListIterator2Test.java
libs/xml/trunk/src/tst/test/net/sf/japi/xml/NodeListIteratorTest.java
progs/cardlearn/trunk/src/prj/net/sf/japi/cardlearn/CardDatabaseConfigEditor.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/OpenURLPane.java
progs/jirus/trunk/src/prj/net/sf/jirus/MyReceiver.java
tools/gdbControl/trunk/src/prj/net/sf/japi/tools/gdbcontrol/ComWithGdb.java
tools/replacer/trunk/src/prj/net/sf/japi/tools/replacer/Replacer.java
tools/string2bytes/trunk/src/tst/test/net/sf/japi/string2bytes/CodecStepTest.java
Modified: historic/trunk/src/app/net/sf/japi/cpp/CPreProcessor.java
===================================================================
--- historic/trunk/src/app/net/sf/japi/cpp/CPreProcessor.java 2008-12-27 21:40:37 UTC (rev 747)
+++ historic/trunk/src/app/net/sf/japi/cpp/CPreProcessor.java 2008-12-28 15:27:01 UTC (rev 748)
@@ -102,9 +102,8 @@
private static String readFile(final String filename) throws IOException {
final StringBuilder chain = new StringBuilder();
final char[] buffer = new char[4096];
- Reader in = null;
+ final Reader in = new FileReader(filename);
try {
- in = new FileReader(filename);
for (int bytesRead; (bytesRead = in.read(buffer)) != -1;) {
chain.append(buffer, 0, bytesRead);
}
@@ -199,6 +198,7 @@
/** Main program.
* @param args command line arguments
+ * @throws IOException in case of I/O problems.
*/
public static void main(final String... args) throws IOException {
new CPreProcessor().process(System.in, System.out);
Modified: historic/trunk/src/app/net/sf/japi/lang/Properties.java
===================================================================
--- historic/trunk/src/app/net/sf/japi/lang/Properties.java 2008-12-27 21:40:37 UTC (rev 747)
+++ historic/trunk/src/app/net/sf/japi/lang/Properties.java 2008-12-28 15:27:01 UTC (rev 748)
@@ -30,8 +30,9 @@
public class Properties {
/** Get a property of an object.
- * @param object
- * @param propertyName
+ * @param object Object of which to get a property as String.
+ * @param propertyName Name of the property to get.
+ * @return Value of <var>propertyName</var> of <var>object</var> as String.
* @see #setPropertyFromString(Object, String, String)
*/
public static String getPropertyAsString(final Object object, final String propertyName) {
Modified: historic/trunk/src/app/net/sf/japi/sql/CachedResultSetTableModel.java
===================================================================
--- historic/trunk/src/app/net/sf/japi/sql/CachedResultSetTableModel.java 2008-12-27 21:40:37 UTC (rev 747)
+++ historic/trunk/src/app/net/sf/japi/sql/CachedResultSetTableModel.java 2008-12-28 15:27:01 UTC (rev 748)
@@ -87,7 +87,7 @@
for (int i = listeners.length - 2; i >= 0; i -= 2) {
//noinspection ObjectEquality
if (listeners[i] == ThrowableHandler.class) {
- ((ThrowableHandler<? super SQLException>)listeners[i+1]).handleThrowable(exception);
+ ((ThrowableHandler<? super SQLException>) listeners[i + 1]).handleThrowable(exception);
}
}
}
@@ -103,7 +103,7 @@
} else {
try {
columnTitles = SQLHelper.getColumnLabels(resultSet);
- columnCount = columnTitles.length;
+ columnCount = columnTitles != null ? columnTitles.length : 0;
rowCount = SQLHelper.getRowCount(resultSet);
data = SQLHelper.getData(resultSet);
this.resultSet = resultSet;
@@ -163,8 +163,8 @@
}
/** {@inheritDoc} */
- @Override public String getColumnName(final int column) {
- return columnTitles[column];
+ @Override @Nullable public String getColumnName(final int column) {
+ return columnTitles != null ? columnTitles[column] : null;
}
} // class CachedResultSetTableModel
Modified: historic/trunk/src/app/net/sf/japi/sql/DatabaseTreeModel.java
===================================================================
--- historic/trunk/src/app/net/sf/japi/sql/DatabaseTreeModel.java 2008-12-27 21:40:37 UTC (rev 747)
+++ historic/trunk/src/app/net/sf/japi/sql/DatabaseTreeModel.java 2008-12-28 15:27:01 UTC (rev 748)
@@ -30,7 +30,6 @@
import javax.swing.event.TreeModelListener;
import javax.swing.tree.TreeModel;
import javax.swing.tree.TreePath;
-import org.jetbrains.annotations.Nullable;
/** A TreeModel displaying the catalogs of a database (usually tables and views) as tree.
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
@@ -68,9 +67,8 @@
public void refresh() throws SQLException {
catalogs.clear();
if (databaseMetaData != null) {
- @Nullable ResultSet rs = null;
+ final ResultSet rs = databaseMetaData.getCatalogs();
try {
- rs = databaseMetaData.getCatalogs();
while (rs.next()) {
try {
catalogs.add(new CatalogTreeNode(rs.getString(1)));
@@ -80,7 +78,7 @@
}
}
} finally {
- try { rs.close(); } catch (final Exception e) { /* ignore **/ } finally { rs = null; }
+ rs.close();
}
}
fireTreeStructureChanged();
@@ -170,18 +168,18 @@
private List<TableTreeNode> tables = new ArrayList<TableTreeNode>();
/** Create a CatalogTreeNode.
+ * @param catalog Catalog for which to create a CatalogTreeNode.
* @throws SQLException in case of database problems
*/
CatalogTreeNode(final String catalog) throws SQLException {
this.catalog = catalog;
- @Nullable ResultSet rs = null;
+ final ResultSet rs = databaseMetaData.getTables(catalog, null, null, null);
try {
- rs = databaseMetaData.getTables(catalog, null, null, null);
while (rs.next()) {
tables.add(new TableTreeNode(rs.getString("TABLE_NAME")));
}
} finally {
- try { rs.close(); } catch (final Exception e) { /* ignore **/ } finally { rs = null; }
+ rs.close();
}
}
@@ -219,7 +217,9 @@
/** The name of this table. */
private String table;
- /** Create a TableTreeNode. */
+ /** Create a TableTreeNode.
+ * @param table Table name for which to create a TableTreeNode.
+ */
TableTreeNode(final String table) {
this.table = table;
}
Modified: historic/trunk/src/app/net/sf/japi/sql/ScrollResultSetTableModel.java
===================================================================
--- historic/trunk/src/app/net/sf/japi/sql/ScrollResultSetTableModel.java 2008-12-27 21:40:37 UTC (rev 747)
+++ historic/trunk/src/app/net/sf/japi/sql/ScrollResultSetTableModel.java 2008-12-28 15:27:01 UTC (rev 748)
@@ -157,6 +157,7 @@
/** {@inheritDoc} */
public int getRowCount() {
+ final ResultSet resultSet = this.resultSet;
if (resultSet == null) {
return 0;
}
@@ -325,7 +326,7 @@
((RowSet) resultSet).addRowSetListener(this);
}
columnTitles = SQLHelper.getColumnLabels(resultSet);
- columnCount = columnTitles.length;
+ columnCount = columnTitles != null ? columnTitles.length : 0;
rowCount = SQLHelper.getRowCount(resultSet);
} catch (final SQLException e) {
handleException(e);
Modified: historic/trunk/src/app/net/sf/japi/swing/JPropertyEditor.java
===================================================================
--- historic/trunk/src/app/net/sf/japi/swing/JPropertyEditor.java 2008-12-27 21:40:37 UTC (rev 747)
+++ historic/trunk/src/app/net/sf/japi/swing/JPropertyEditor.java 2008-12-28 15:27:01 UTC (rev 748)
@@ -83,6 +83,7 @@
/** Create an editor for a property.
* @param propertyType property type
+ * @return Editor component for the specified property type or <code>null</code> if no editor is available.
*/
@SuppressWarnings({"ReturnOfNull"})
private static Component createEditor(final Class<?> propertyType) {
Modified: historic/trunk/src/app/net/sf/japi/util/PrintStreamThrowableHandler.java
===================================================================
--- historic/trunk/src/app/net/sf/japi/util/PrintStreamThrowableHandler.java 2008-12-27 21:40:37 UTC (rev 747)
+++ historic/trunk/src/app/net/sf/japi/util/PrintStreamThrowableHandler.java 2008-12-28 15:27:01 UTC (rev 748)
@@ -34,7 +34,10 @@
private final PrintStream stream;
- /** Private Singleton Constructor. */
+ /** Creates a PrintStreamThrowableHandler for the specified PrintStream.
+ * @param stream Stream for which to create a PrintStreamThrowableHandler.
+ * @see #STDERR for a default global PrintStreamThrowableHandler that wraps {@link System#in}.
+ */
public PrintStreamThrowableHandler(final PrintStream stream) {
this.stream = stream;
}
Modified: historic/trunk/src/app/net/sf/japi/util/Service.java
===================================================================
--- historic/trunk/src/app/net/sf/japi/util/Service.java 2008-12-27 21:40:37 UTC (rev 747)
+++ historic/trunk/src/app/net/sf/japi/util/Service.java 2008-12-28 15:27:01 UTC (rev 748)
@@ -89,6 +89,7 @@
* @param service Service class to look up
* @param loader Class loader to use
* @return implementations found (lazy iterable)
+ * @throws MustangUnavailableException In case Mustang is not available and thus it's not possible to use Mustang services.
*/
@NotNull private static <T> Iterable<T> loadMustang(@NotNull final Class<T> service, @Nullable final ClassLoader loader) throws MustangUnavailableException {
try {
Modified: historic/trunk/src/doc/guide/io/src/CatJAPI.java
===================================================================
--- historic/trunk/src/doc/guide/io/src/CatJAPI.java 2008-12-27 21:40:37 UTC (rev 747)
+++ historic/trunk/src/doc/guide/io/src/CatJAPI.java 2008-12-28 15:27:01 UTC (rev 748)
@@ -10,6 +10,7 @@
/** Main program.
* @param args command line arguments: names of files to concatenate
+ * @throws IOException in case of I/O problems.
*/
public static void main(final String... args) throws IOException {
copy(new ARGVInputStream(args), out);
Modified: historic/trunk/src/doc/guide/swing/action/fromScratch/src/net/sf/japi/examples/editor/Editor.java
===================================================================
--- historic/trunk/src/doc/guide/swing/action/fromScratch/src/net/sf/japi/examples/editor/Editor.java 2008-12-27 21:40:37 UTC (rev 747)
+++ historic/trunk/src/doc/guide/swing/action/fromScratch/src/net/sf/japi/examples/editor/Editor.java 2008-12-28 15:27:01 UTC (rev 748)
@@ -73,16 +73,15 @@
return null;
}
- /** Action method.
- * @used
- */
+ /** Action method. */
@ActionMethod public void fileNew() {
textPane.setText("");
file = null;
}
/** Action method.
- * @used
+ * @throws FileNotFoundException In case the file to open could not be opened or found.
+ * @throws IOException In case of I/O problems when trying to open or read the file.
*/
@ActionMethod public void fileOpen() throws FileNotFoundException, IOException {
if (fileChooser.showOpenDialog(frame) == APPROVE_OPTION) {
@@ -102,9 +101,7 @@
}
}
- /** Action method.
- * @used
- */
+ /** Action method. */
@ActionMethod public void fileQuit() {
if (ACTION_BUILDER.showQuestionDialog(frame, "reallyQuit")) {
frame.dispose();
@@ -112,7 +109,7 @@
}
/** Action method.
- * @used
+ * @throws IOException In case of I/O problems when saving.
*/
@ActionMethod public void fileSave() throws IOException {
if (file == null) {
@@ -128,7 +125,7 @@
}
/** Action method.
- * @used
+ * @throws IOException In case of I/O problems when saving.
*/
@ActionMethod public void fileSaveAs() throws IOException {
if (fileChooser.showSaveDialog(frame) == APPROVE_OPTION) {
Modified: historic/trunk/src/test/net/sf/japi/util/PairTest.java
===================================================================
--- historic/trunk/src/test/net/sf/japi/util/PairTest.java 2008-12-27 21:40:37 UTC (rev 747)
+++ historic/trunk/src/test/net/sf/japi/util/PairTest.java 2008-12-28 15:27:01 UTC (rev 748)
@@ -23,7 +23,6 @@
import junit.framework.TestCase;
import net.sf.japi.util.Pair;
-import org.jetbrains.annotations.Nullable;
/** Test class for {@link Pair}.
* @author <a href="mailto:ch...@it...">Christian Hujer</a>
@@ -31,9 +30,9 @@
public class PairTest extends TestCase {
/** Object Under Test: A Table. */
- @Nullable private Pair<Object,Object> oUT;
- @Nullable private String first;
- @Nullable private String second;
+ private Pair<Object,Object> oUT;
+ private String first;
+ private String second;
/** {@inheritDoc} */
@Override protected void setUp() throws Exception {
@@ -44,6 +43,7 @@
}
/** {@inheritDoc} */
+ @SuppressWarnings({"AssignmentToNull"})
@Override protected void tearDown() throws Exception {
super.tearDown();
oUT = null;
@@ -51,23 +51,31 @@
second = null;
}
- /** Test case for {@link Pair#getFirst()}. */
+ /** Test case for {@link Pair#getFirst()}.
+ * @throws Exception (unexpected).
+ */
public void testGetFirst() throws Exception {
assertSame("First must be retreivable via getFirst()", first, oUT.getFirst());
}
- /** Test case for {@link Pair#getSecond()}. */
+ /** Test case for {@link Pair#getSecond()}.
+ * @throws Exception (unexpected).
+ */
public void testGetSecond() throws Exception {
assertSame("First must be retreivable via getSecond()", second, oUT.getSecond());
}
- /** Test case for {@link Pair#Pair(Object,Object)}. */
+ /** Test case for {@link Pair#Pair(Object,Object)}.
+ * @throws Exception (unexpected).
+ */
public void testPair() throws Exception {
assertTrue("Dummy assertion.", true);
// This test is already implicitly performed by #setUp().
}
- /** Test case for {@link Pair#equals(Object)}. */
+ /** Test case for {@link Pair#equals(Object)}.
+ * @throws Exception (unexpected).
+ */
public void testEquals() throws Exception {
assertFalse("A pair must not be equal to random objects.", oUT.equals(new Object()));
assertTrue("A pair must be equal to itself", oUT.equals(oUT));
Modified: historic/trunk/src/test/net/sf/japi/util/TableTest.java
===================================================================
--- historic/trunk/src/test/net/sf/japi/util/TableTest.java 2008-12-27 21:40:37 UTC (rev 747)
+++ historic/trunk/src/test/net/sf/japi/util/TableTest.java 2008-12-28 15:27:01 UTC (rev 748)
@@ -24,7 +24,6 @@
import junit.framework.TestCase;
import net.sf.japi.util.Pair;
import net.sf.japi.util.Table;
-import org.jetbrains.annotations.Nullable;
/** Test class for Table.
* @author <a href="mailto:ch...@it...">Christian Hujer</a>
@@ -32,7 +31,7 @@
public class TableTest extends TestCase {
/** Object Under Test: A Table. */
- @Nullable private Table<Object,Object> oUT;
+ private Table<Object,Object> oUT;
/** {@inheritDoc} */
@Override public void setUp() throws Exception {
@@ -41,6 +40,7 @@
}
/** {@inheritDoc} */
+ @SuppressWarnings({"AssignmentToNull"})
@Override protected void tearDown() throws Exception {
super.tearDown();
oUT = null;
@@ -51,7 +51,9 @@
assertEquals("Newly created table must be empty.", 0, oUT.size());
}
- /** Test case for clearing a table. */
+ /** Test case for clearing a table.
+ * @throws Exception (unexpected).
+ */
public void testClear() throws Exception {
oUT.putPair(new Object(), new Object());
assertSize("Added 1 Element", 1);
Modified: libs/argparser/trunk/src/doc/examples/Recode.java
===================================================================
--- libs/argparser/trunk/src/doc/examples/Recode.java 2008-12-27 21:40:37 UTC (rev 747)
+++ libs/argparser/trunk/src/doc/examples/Recode.java 2008-12-28 15:27:01 UTC (rev 748)
@@ -115,7 +115,9 @@
try {
copy(tmpFile, file);
} finally {
- tmpFile.delete();
+ if (!tmpFile.delete()) {
+ System.err.println("Couldn't delete temporary file " + tmpFile);
+ }
}
}
Modified: libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/MissingArgumentExceptionTest.java
===================================================================
--- libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/MissingArgumentExceptionTest.java 2008-12-27 21:40:37 UTC (rev 747)
+++ libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/MissingArgumentExceptionTest.java 2008-12-28 15:27:01 UTC (rev 748)
@@ -34,6 +34,7 @@
* Tests that {@link MissingArgumentException#MissingArgumentException(String)} works.
* @throws Exception (unexpected)
*/
+ @SuppressWarnings({"ThrowableInstanceNeverThrown"})
@Test
public void testMissingArgumentException() throws Exception {
final MissingArgumentException exception = new MissingArgumentException("foo");
Modified: libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/RequiredOptionsMissingExceptionTest.java
===================================================================
--- libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/RequiredOptionsMissingExceptionTest.java 2008-12-27 21:40:37 UTC (rev 747)
+++ libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/RequiredOptionsMissingExceptionTest.java 2008-12-28 15:27:01 UTC (rev 748)
@@ -35,6 +35,7 @@
* Tests that {@link RequiredOptionsMissingException#RequiredOptionsMissingException(String[])} works.
* @throws Exception (unexpected)
*/
+ @SuppressWarnings({"ThrowableInstanceNeverThrown"})
@Test
public void testRequiredOptionsMissingException() throws Exception {
final String[] options = { "foo", "bar" };
@@ -55,6 +56,7 @@
* Tests that {@link RequiredOptionsMissingException#RequiredOptionsMissingException(String[])} throws an IllegalArgumentException in case no missing options were given.
* @throws IllegalArgumentException (expected).
*/
+ @SuppressWarnings({"ThrowableInstanceNeverThrown"})
@Test(expected = IllegalArgumentException.class)
public void testNoMissingOptions() throws Exception {
new RequiredOptionsMissingException();
Modified: libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/TerminalExceptionTest.java
===================================================================
--- libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/TerminalExceptionTest.java 2008-12-27 21:40:37 UTC (rev 747)
+++ libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/TerminalExceptionTest.java 2008-12-28 15:27:01 UTC (rev 748)
@@ -34,6 +34,7 @@
* Tests that {@link TerminalException#TerminalException()} works.
* @throws Exception (unexpected)
*/
+ @SuppressWarnings({"ThrowableInstanceNeverThrown"})
@Test
public void testTerminalException() throws Exception {
final TerminalException exception = new TerminalException();
@@ -44,6 +45,7 @@
* Tests that {@link TerminalException#getReturnCode()} works.
* @throws Exception (unexpected)
*/
+ @SuppressWarnings({"ThrowableInstanceNeverThrown"})
@Test
public void testGetReturnCode() throws Exception {
final TerminalException exception = new TerminalException(1);
Modified: libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/UnknownOptionExceptionTest.java
===================================================================
--- libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/UnknownOptionExceptionTest.java 2008-12-27 21:40:37 UTC (rev 747)
+++ libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/UnknownOptionExceptionTest.java 2008-12-28 15:27:01 UTC (rev 748)
@@ -35,6 +35,7 @@
* Tests that {@link UnknownOptionException#UnknownOptionException(String[])} works.
* @throws Exception (unexpected)
*/
+ @SuppressWarnings({"ThrowableInstanceNeverThrown"})
@Test
public void testUnknownOptionException() throws Exception {
final String[] options = { "foo", "bar" };
Modified: libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/converter/NoConverterFoundExceptionTest.java
===================================================================
--- libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/converter/NoConverterFoundExceptionTest.java 2008-12-27 21:40:37 UTC (rev 747)
+++ libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/converter/NoConverterFoundExceptionTest.java 2008-12-28 15:27:01 UTC (rev 748)
@@ -33,6 +33,7 @@
* Tests that the target type is stored correctly.
* @throws Exception (unexpected)
*/
+ @SuppressWarnings({"ThrowableInstanceNeverThrown"})
@Test
public void testGetTargetType() throws Exception {
final NoConverterFoundException exception = new NoConverterFoundException(Object.class);
Modified: libs/logging/trunk/src/prj/net/sf/japi/log/SimpleLogger.java
===================================================================
--- libs/logging/trunk/src/prj/net/sf/japi/log/SimpleLogger.java 2008-12-27 21:40:37 UTC (rev 747)
+++ libs/logging/trunk/src/prj/net/sf/japi/log/SimpleLogger.java 2008-12-28 15:27:01 UTC (rev 748)
@@ -34,24 +34,44 @@
private SimpleLogger() {
}
- /** @see Logger#log(Enum, String) */
- public static void log(final Level level, final String message) {
- DEFAULT_LOGGER.log(level, message);
+ /** Creates a log entry.
+ * @param level Level for the log entry
+ * @param key Key for retrieving the message from the bundle
+ * @see Logger#log(Enum, String)
+ */
+ public static void log(final Level level, final String key) {
+ DEFAULT_LOGGER.log(level, key);
}
- /** @see Logger#log(Enum, String, Object...) */
- public static void log(final Level level, final String message, final Object... params) {
- DEFAULT_LOGGER.log(level, message, params);
+ /** Creates a log entry.
+ * @param level Level for the log entry
+ * @param key Key for retrieving the message from the bundle
+ * @param params Values to use during message formatting
+ * @see Logger#log(Enum, String, Object...)
+ */
+ public static void log(final Level level, final String key, final Object... params) {
+ DEFAULT_LOGGER.log(level, key, params);
}
- /** @see Logger#log(Enum, Throwable, String) */
- public static void log(final Level level, final Throwable t, final String message) {
- DEFAULT_LOGGER.log(level, t, message);
+ /** Creates a log entry.
+ * @param level Level for the log entry
+ * @param key Key for retrieving the message from the bundle
+ * @param t Throwable to log
+ * @see Logger#log(Enum, Throwable, String)
+ */
+ public static void log(final Level level, final Throwable t, final String key) {
+ DEFAULT_LOGGER.log(level, t, key);
}
- /** @see Logger#log(Enum, Throwable, String, Object...) */
- public static void log(final Level level, final Throwable t, final String message, final Object... params) {
- DEFAULT_LOGGER.log(level, t, message, params);
+ /** Creates a log entry.
+ * @param level Level for the log entry
+ * @param key Key for retrieving the message from the bundle
+ * @param t Throwable to log
+ * @param params Values to use during message formatting
+ * @see Logger#log(Enum, Throwable, String, Object...)
+ */
+ public static void log(final Level level, final Throwable t, final String key, final Object... params) {
+ DEFAULT_LOGGER.log(level, t, key, params);
}
} // class SimpleLogger
Modified: libs/midi/trunk/src/prj/net/sf/japi/midi/MidiUtils.java
===================================================================
--- libs/midi/trunk/src/prj/net/sf/japi/midi/MidiUtils.java 2008-12-27 21:40:37 UTC (rev 747)
+++ libs/midi/trunk/src/prj/net/sf/japi/midi/MidiUtils.java 2008-12-28 15:27:01 UTC (rev 748)
@@ -29,7 +29,7 @@
return getReceivingDevices(MidiSystem.getMidiDeviceInfo());
}
- /** Returns all {@iink MidiDevice}s which provide {@link Transmitter}s.
+ /** Returns all {@link MidiDevice}s which provide {@link Transmitter}s.
* @return All {@link MidiDevice}s which provide {@link Transmitter}s.
* @throws MidiUnavailableException if one of the requested devices is unavailable due to resource restrictions.
*/
@@ -124,6 +124,7 @@
/** Returns a device by its name.
* @param name Name of the device to return.
* @return The first device found that matches <var>name</var> or <code>null</code> if the requested device was not found.
+ * @throws MidiUnavailableException In case Midi is not available.
*/
public static MidiDevice getDeviceByName(@NotNull final String name) throws MidiUnavailableException {
for (final MidiDevice.Info deviceInfo : MidiSystem.getMidiDeviceInfo()) {
Modified: libs/swing-action/trunk/src/tst/test/net/sf/japi/swing/ReflectionActionTest.java
===================================================================
--- libs/swing-action/trunk/src/tst/test/net/sf/japi/swing/ReflectionActionTest.java 2008-12-27 21:40:37 UTC (rev 747)
+++ libs/swing-action/trunk/src/tst/test/net/sf/japi/swing/ReflectionActionTest.java 2008-12-28 15:27:01 UTC (rev 748)
@@ -25,7 +25,6 @@
import net.sf.japi.swing.ActionBuilderFactory;
import net.sf.japi.swing.ActionMethod;
import net.sf.japi.swing.ReflectionAction;
-import org.jetbrains.annotations.Nullable;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -42,7 +41,7 @@
private static final ActionBuilder ACTION_BUILDER = ActionBuilderFactory.getInstance().getActionBuilder("test.net.sf.japi.swing");
/** The testling: A ReflectionAction. */
- @Nullable private ReflectionAction testling;
+ private ReflectionAction testling;
/** The Action Mock. */
private ActionMock actionMock;
@@ -55,6 +54,7 @@
}
/** Remove the testling. */
+ @SuppressWarnings({"AssignmentToNull"})
@After
public void tearDown() {
testling = null;
Modified: libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/script/Application.java
===================================================================
--- libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/script/Application.java 2008-12-27 21:40:37 UTC (rev 747)
+++ libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/script/Application.java 2008-12-28 15:27:01 UTC (rev 748)
@@ -1,6 +1,7 @@
package net.sf.japi.swing.app.script;
import java.util.List;
+import org.jetbrains.annotations.NotNull;
/** The Application from a script's view.
* @param <D> The document type that is managed by the application.
@@ -10,8 +11,9 @@
/** Loads a document.
* @param uri URI from which to load the document.
+ * @return The loaded document.
*/
- public abstract Document<D> load(String uri);
+ public abstract Document<D> load(@NotNull String uri);
/** Quits this application. */
public abstract void quit();
@@ -31,7 +33,7 @@
public abstract void save();
/** Saves this document at a different URI.
- * The supplied URI is then the default URI for future saves with {@link save()}.
+ * The supplied URI is then the default URI for future saves with {@link #save()}.
* @param uri URI at which to save this document.
*/
public abstract void saveAs(String uri);
Modified: libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/script/TryApplication.java
===================================================================
--- libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/script/TryApplication.java 2008-12-27 21:40:37 UTC (rev 747)
+++ libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/script/TryApplication.java 2008-12-28 15:27:01 UTC (rev 748)
@@ -1,6 +1,7 @@
package net.sf.japi.swing.app.script;
import java.util.List;
+import org.jetbrains.annotations.NotNull;
/**
* TODO
@@ -9,7 +10,7 @@
public class TryApplication extends Application {
/** {@inheritDoc} */
- public Document load(final String uri) {
+ public Document load(@NotNull final String uri) {
return new Document();
}
Modified: libs/swing-bookmarks/trunk/src/prj/net/sf/japi/swing/bookmarks/BookmarkDropTargetAdapter.java
===================================================================
--- libs/swing-bookmarks/trunk/src/prj/net/sf/japi/swing/bookmarks/BookmarkDropTargetAdapter.java 2008-12-27 21:40:37 UTC (rev 747)
+++ libs/swing-bookmarks/trunk/src/prj/net/sf/japi/swing/bookmarks/BookmarkDropTargetAdapter.java 2008-12-28 15:27:01 UTC (rev 748)
@@ -44,8 +44,10 @@
final BookmarkManager.Bookmark src = getSourceBookmark(dtde);
int pos = -1;
if (!(dest instanceof BookmarkManager.BookmarkFolder)) {
- pos = dest.getFolder().getIndex(dest);
- dest = dest.getFolder();
+ final BookmarkManager.Bookmark newDest = dest.getFolder();
+ assert newDest != null;
+ pos = newDest.getIndex(dest);
+ dest = newDest;
}
assert dest instanceof BookmarkManager.BookmarkFolder;
((BookmarkManager.BookmarkFolder) dest).insert(src, pos);
Modified: libs/swing-bookmarks/trunk/src/prj/net/sf/japi/swing/bookmarks/BookmarkManager.java
===================================================================
--- libs/swing-bookmarks/trunk/src/prj/net/sf/japi/swing/bookmarks/BookmarkManager.java 2008-12-27 21:40:37 UTC (rev 747)
+++ libs/swing-bookmarks/trunk/src/prj/net/sf/japi/swing/bookmarks/BookmarkManager.java 2008-12-28 15:27:01 UTC (rev 748)
@@ -413,7 +413,9 @@
/** {@inheritDoc} */
public void removeFromParent() {
- folder.remove(this);
+ if (folder != null) {
+ folder.remove(this);
+ }
}
/** {@inheritDoc} */
Modified: libs/swing-keyprefs/trunk/src/prj/net/sf/japi/swing/prefs/keys/AbstractSimpleNode.java
===================================================================
--- libs/swing-keyprefs/trunk/src/prj/net/sf/japi/swing/prefs/keys/AbstractSimpleNode.java 2008-12-27 21:40:37 UTC (rev 747)
+++ libs/swing-keyprefs/trunk/src/prj/net/sf/japi/swing/prefs/keys/AbstractSimpleNode.java 2008-12-28 15:27:01 UTC (rev 748)
@@ -34,7 +34,7 @@
private final int length;
/** Create an AbstractSimpleNode.
- * @param children
+ * @param children Children for this AbstractSimpleNode.
*/
protected AbstractSimpleNode(@Nullable final C[] children) {
if (children != null) {
Modified: libs/swing-keyprefs/trunk/src/prj/net/sf/japi/swing/prefs/keys/ActionKeyDisplay.java
===================================================================
--- libs/swing-keyprefs/trunk/src/prj/net/sf/japi/swing/prefs/keys/ActionKeyDisplay.java 2008-12-27 21:40:37 UTC (rev 747)
+++ libs/swing-keyprefs/trunk/src/prj/net/sf/japi/swing/prefs/keys/ActionKeyDisplay.java 2008-12-28 15:27:01 UTC (rev 748)
@@ -153,7 +153,7 @@
* @retval String containing localized text for the accelerator of <var>action</var>
* @throws ClassCastException in case the bound accelerator property is not a {@link KeyStroke}
*/
- public static String getLocalizedKeyStrokeText(final Action action) {
+ public static String getLocalizedKeyStrokeText(@Nullable final Action action) {
if (action == null) {
return "";
}
Modified: libs/swing-misc/trunk/src/prj/net/sf/japi/swing/misc/CollectionsListModel.java
===================================================================
--- libs/swing-misc/trunk/src/prj/net/sf/japi/swing/misc/CollectionsListModel.java 2008-12-27 21:40:37 UTC (rev 747)
+++ libs/swing-misc/trunk/src/prj/net/sf/japi/swing/misc/CollectionsListModel.java 2008-12-28 15:27:01 UTC (rev 748)
@@ -76,6 +76,7 @@
/** {@inheritDoc} */
public <T> T[] toArray(final T[] ts) {
+ //noinspection SuspiciousToArrayCall
return list.toArray(ts);
}
Modified: libs/swing-misc/trunk/src/prj/net/sf/japi/swing/misc/JSAXErrorHandler.java
===================================================================
--- libs/swing-misc/trunk/src/prj/net/sf/japi/swing/misc/JSAXErrorHandler.java 2008-12-27 21:40:37 UTC (rev 747)
+++ libs/swing-misc/trunk/src/prj/net/sf/japi/swing/misc/JSAXErrorHandler.java 2008-12-28 15:27:01 UTC (rev 748)
@@ -27,7 +27,6 @@
import javax.swing.JTextArea;
import net.sf.japi.swing.ActionBuilder;
import net.sf.japi.swing.ActionBuilderFactory;
-import org.jetbrains.annotations.Nullable;
import org.xml.sax.ErrorHandler;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
@@ -49,7 +48,7 @@
/** The Dialog.
* @serial include
*/
- @Nullable private JDialog dialog;
+ private JDialog dialog;
/** Parent component.
* @serial include
@@ -142,6 +141,7 @@
setValue(closeButton);
dialog.setVisible(false);
dialog.dispose();
+ //noinspection AssignmentToNull
dialog = null;
}
Modified: libs/swing-treetable/trunk/src/prj/net/sf/japi/swing/treetable/AbstractTreeTableModel.java
===================================================================
--- libs/swing-treetable/trunk/src/prj/net/sf/japi/swing/treetable/AbstractTreeTableModel.java 2008-12-27 21:40:37 UTC (rev 747)
+++ libs/swing-treetable/trunk/src/prj/net/sf/japi/swing/treetable/AbstractTreeTableModel.java 2008-12-28 15:27:01 UTC (rev 748)
@@ -91,10 +91,10 @@
}
/** Informs all registered listeners of a change.
- * @param source
- * @param path
- * @param childIndices
- * @param children
+ * @param source Event source (usually this).
+ * @param path Path of the change.
+ * @param childIndices Indices of the children that changed.
+ * @param children Children that changed.
*/
protected void fireTreeNodesChanged(final Object source, final T[] path, final int[] childIndices, final T[] children) {
final Object[] listeners = listenerList.getListenerList();
@@ -108,10 +108,10 @@
}
/** Informs all registered listeners of an insertion.
- * @param source
- * @param path
- * @param childIndices
- * @param children
+ * @param source Event source (usually this).
+ * @param path Path of the change.
+ * @param childIndices Indices of the children that changed.
+ * @param children Children that changed.
*/
protected void fireTreeNodesInserted(final Object source, final Object[] path, final int[] childIndices, final Object[] children) {
final Object[] listeners = listenerList.getListenerList();
@@ -125,10 +125,10 @@
}
/** Informs all registered listeners of a removal.
- * @param source
- * @param path
- * @param childIndices
- * @param children
+ * @param source Event source (usually this).
+ * @param path Path of the change.
+ * @param childIndices Indices of the children that changed.
+ * @param children Children that changed.
*/
protected void fireTreeNodesRemoved(final Object source, final Object[] path, final int[] childIndices, final Object[] children) {
final Object[] listeners = listenerList.getListenerList();
@@ -142,10 +142,10 @@
}
/** Informs all registered listeners of a structural change.
- * @param source
- * @param path
- * @param childIndices
- * @param children
+ * @param source Event source (usually this).
+ * @param path Path of the change.
+ * @param childIndices Indices of the children that changed.
+ * @param children Children that changed.
*/
protected void fireTreeStructureChanged(final Object source, final Object[] path, final int[] childIndices, final Object[] children) {
final Object[] listeners = listenerList.getListenerList();
Modified: libs/util/trunk/src/tst/test/net/sf/japi/util/EnumerationIteratorTest.java
===================================================================
--- libs/util/trunk/src/tst/test/net/sf/japi/util/EnumerationIteratorTest.java 2008-12-27 21:40:37 UTC (rev 747)
+++ libs/util/trunk/src/tst/test/net/sf/japi/util/EnumerationIteratorTest.java 2008-12-28 15:27:01 UTC (rev 748)
@@ -33,7 +33,9 @@
*/
public class EnumerationIteratorTest {
- /** Test case for {@link EnumerationIterator#iterator()}. */
+ /** Test case for {@link EnumerationIterator#iterator()}.
+ * @throws Exception (unexpected).
+ */
@Test
public void testIterator() throws Exception {
EnumerationIterator<?> oUT = new EnumerationIterator<String>(Collections.enumeration(Arrays.asList("foo", "bar")));
@@ -42,7 +44,9 @@
Assert.assertNotNull("Even empty enumerations must generate an iterator instance.", oUT.iterator());
}
- /** Test case for {@link EnumerationIterator#hasNext()}. */
+ /** Test case for {@link EnumerationIterator#hasNext()}.
+ * @throws Exception (unexpected).
+ */
@Test public void testHasNext() throws Exception {
EnumerationIterator<?> oUT = new EnumerationIterator<Object>(Collections.enumeration(Arrays.asList()));
Assert.assertFalse("hasNext() on empty enumeration must instantly return false.", oUT.hasNext());
@@ -50,7 +54,9 @@
Assert.assertTrue("hasNext() on nonempty enumeration must first return true.", oUT.hasNext());
}
- /** Test case for {@link EnumerationIterator#next()}. */
+ /** Test case for {@link EnumerationIterator#next()}.
+ * @throws Exception (unexpected).
+ */
@Test public void testNext() throws Exception {
EnumerationIterator<?> oUT = new EnumerationIterator<Object>(Collections.enumeration(Arrays.asList()));
try {
@@ -70,7 +76,9 @@
}
}
- /** Test case for {@link EnumerationIterator#remove()}. */
+ /** Test case for {@link EnumerationIterator#remove()}.
+ * @throws Exception (unexpected).
+ */
@Test public void testRemove() throws Exception {
EnumerationIterator<?> oUT = new EnumerationIterator<Object>(Collections.enumeration(Arrays.asList()));
try {
Modified: libs/xml/trunk/src/tst/test/net/sf/japi/xml/NodeListIterator2Test.java
===================================================================
--- libs/xml/trunk/src/tst/test/net/sf/japi/xml/NodeListIterator2Test.java 2008-12-27 21:40:37 UTC (rev 747)
+++ libs/xml/trunk/src/tst/test/net/sf/japi/xml/NodeListIterator2Test.java 2008-12-28 15:27:01 UTC (rev 748)
@@ -25,7 +25,6 @@
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import net.sf.japi.xml.NodeListIterator;
-import org.jetbrains.annotations.Nullable;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -40,7 +39,7 @@
public class NodeListIterator2Test {
/** Object Under Test: A NodeListIterator. */
- @Nullable private NodeListIterator<Node> testling;
+ private NodeListIterator<Node> testling;
/** Mock NodeList. */
private NodeList mockNodeList;
@@ -53,6 +52,7 @@
}
/** {@inheritDoc} */
+ @SuppressWarnings({"AssignmentToNull"})
@After
public void tearDown() throws Exception {
testling = null;
Modified: libs/xml/trunk/src/tst/test/net/sf/japi/xml/NodeListIteratorTest.java
===================================================================
--- libs/xml/trunk/src/tst/test/net/sf/japi/xml/NodeListIteratorTest.java 2008-12-27 21:40:37 UTC (rev 747)
+++ libs/xml/trunk/src/tst/test/net/sf/japi/xml/NodeListIteratorTest.java 2008-12-28 15:27:01 UTC (rev 748)
@@ -7,7 +7,6 @@
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
import net.sf.japi.xml.NodeListIterator;
-import org.jetbrains.annotations.Nullable;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
@@ -26,7 +25,7 @@
public class NodeListIteratorTest {
/** The DocumentBuilder for creating DOM trees for testing. */
- @Nullable private static DocumentBuilder db;
+ private static DocumentBuilder db;
/** Creates the DocumentBuilder that is used for creating DOM trees for testing.
* @throws ParserConfigurationException (unexpected)
@@ -38,6 +37,7 @@
}
/** */
+ @SuppressWarnings({"AssignmentToNull"})
@AfterClass
public static void deleteDocumentBuilder() {
db = null;
Modified: progs/cardlearn/trunk/src/prj/net/sf/japi/cardlearn/CardDatabaseConfigEditor.java
===================================================================
--- progs/cardlearn/trunk/src/prj/net/sf/japi/cardlearn/CardDatabaseConfigEditor.java 2008-12-27 21:40:37 UTC (rev 747)
+++ progs/cardlearn/trunk/src/prj/net/sf/japi/cardlearn/CardDatabaseConfigEditor.java 2008-12-28 15:27:01 UTC (rev 748)
@@ -49,7 +49,7 @@
* @param config Configuration to edit.
* @return edited configuration (same object as <var>config</var>) or <code>null</code> if the dialog was cancelled, in which case <var>config</var> is unchanged.
*/
- public static CardDatabaseConfig showConfigEditor(@Nullable final Component parent, @NotNull final CardDatabaseConfig config) {
+ @Nullable public static CardDatabaseConfig showConfigEditor(@Nullable final Component parent, @NotNull final CardDatabaseConfig config) {
final CardDatabaseConfigEditor editor = new CardDatabaseConfigEditor(config);
final int returnValue = JOptionPane.showConfirmDialog(parent, editor, "XXX", JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
if (returnValue == JOptionPane.OK_OPTION) {
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/OpenURLPane.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/OpenURLPane.java 2008-12-27 21:40:37 UTC (rev 747)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/OpenURLPane.java 2008-12-28 15:27:01 UTC (rev 748)
@@ -137,7 +137,7 @@
/** Dialog to show.
* @serial include
*/
- @Nullable private JDialog dialog;
+ private JDialog dialog;
/** JFileChooser to use.
* @serial include
@@ -178,6 +178,7 @@
pane.dialog.pack();
pane.dialog.setVisible(true);
pane.dialog.dispose();
+ //noinspection AssignmentToNull
pane.dialog = null;
final String result = pane.result;
if (rootFrame != null) {
Modified: progs/jirus/trunk/src/prj/net/sf/jirus/MyReceiver.java
===================================================================
--- progs/jirus/trunk/src/prj/net/sf/jirus/MyReceiver.java 2008-12-27 21:40:37 UTC (rev 747)
+++ progs/jirus/trunk/src/prj/net/sf/jirus/MyReceiver.java 2008-12-28 15:27:01 UTC (rev 748)
@@ -40,6 +40,7 @@
if (cmd == ShortMessage.NOTE_OFF) {
playingNote = 0xFF;
} else {
+ //noinspection ConstantConditions
assert cmd == ShortMessage.NOTE_ON;
if (note < playingNote) {
smg.setMessage(ShortMessage.NOTE_OFF, Jirus.SPLIT_CHANNEL, playingNote, velo);
Modified: tools/gdbControl/trunk/src/prj/net/sf/japi/tools/gdbcontrol/ComWithGdb.java
===================================================================
--- tools/gdbControl/trunk/src/prj/net/sf/japi/tools/gdbcontrol/ComWithGdb.java 2008-12-27 21:40:37 UTC (rev 747)
+++ tools/gdbControl/trunk/src/prj/net/sf/japi/tools/gdbcontrol/ComWithGdb.java 2008-12-28 15:27:01 UTC (rev 748)
@@ -6,7 +6,6 @@
import java.io.InputStream;
import java.io.OutputStream;
import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
/** A Java wrapper for communication with gdb.
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
@@ -18,7 +17,7 @@
private final CharSequence prompt = "(gdb) ";
/** The process of gdb. */
- @Nullable private Process gdbProcess;
+ private Process gdbProcess;
/** InputStream to read data from gdb's stdout. */
private InputStream gdbIn;
@@ -137,6 +136,7 @@
gdbProcess.waitFor();
final int retVal = gdbProcess.exitValue();
gdbProcess.destroy();
+ //noinspection AssignmentToNull
gdbProcess = null;
return retVal;
}
Modified: tools/replacer/trunk/src/prj/net/sf/japi/tools/replacer/Replacer.java
===================================================================
--- tools/replacer/trunk/src/prj/net/sf/japi/tools/replacer/Replacer.java 2008-12-27 21:40:37 UTC (rev 747)
+++ tools/replacer/trunk/src/prj/net/sf/japi/tools/replacer/Replacer.java 2008-12-28 15:27:01 UTC (rev 748)
@@ -299,7 +299,9 @@
}
System.err.println(p.exitValue());
} else {
- file.setWritable(true);
+ if (!file.setWritable(true)) {
+ System.err.println("Couldn't make " + file + " writable.");
+ }
}
}
Modified: tools/string2bytes/trunk/src/tst/test/net/sf/japi/string2bytes/CodecStepTest.java
===================================================================
--- tools/string2bytes/trunk/src/tst/test/net/sf/japi/string2bytes/CodecStepTest.java 2008-12-27 21:40:37 UTC (rev 747)
+++ tools/string2bytes/trunk/src/tst/test/net/sf/japi/string2bytes/CodecStepTest.java 2008-12-28 15:27:01 UTC (rev 748)
@@ -23,7 +23,6 @@
import net.sf.japi.string2bytes.EntityCodec;
import net.sf.japi.string2bytes.IdentityCodec;
import net.sf.japi.string2bytes.StringCodec;
-import org.jetbrains.annotations.Nullable;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -37,13 +36,13 @@
public class CodecStepTest {
/** The CodecStep to test. */
- @Nullable private CodecStep codecStep;
+ private CodecStep codecStep;
/** The Codec to use for most tests. */
- @Nullable private StringCodec codec;
+ private StringCodec codec;
/** The Charset to use for most tests. */
- @Nullable private String charset;
+ private String charset;
/**
* Creates the test data and a testling.
@@ -59,6 +58,7 @@
* Removes the test data and the testling.
* @throws Exception (unexpected)
*/
+ @SuppressWarnings({"AssignmentToNull"})
@After public void tearDown() throws Exception {
codec = null;
charset = null;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-12-27 22:06:31
|
Revision: 747
http://japi.svn.sourceforge.net/japi/?rev=747&view=rev
Author: christianhujer
Date: 2008-12-27 21:40:37 +0000 (Sat, 27 Dec 2008)
Log Message:
-----------
Code improvements regarding @Nullable / @NotNull, if vs. ?:.
Modified Paths:
--------------
historic/trunk/src/app/net/sf/japi/finance/SimpleCapitalCalculator.java
historic/trunk/src/app/net/sf/japi/io/ARGVEnumeration.java
historic/trunk/src/app/net/sf/japi/sql/CachedResultSetTableModel.java
historic/trunk/src/app/net/sf/japi/sql/DatabaseTreeModel.java
historic/trunk/src/app/net/sf/japi/sql/ScrollResultSetTableModel.java
historic/trunk/src/app/net/sf/japi/swing/JPropertyEditor.java
historic/trunk/src/doc/guide/swing/action/fromScratch/src/net/sf/japi/examples/editor/Editor.java
historic/trunk/src/test/net/sf/japi/util/PairTest.java
historic/trunk/src/test/net/sf/japi/util/TableTest.java
libs/argparser/trunk/src/prj/net/sf/japi/io/args/ArgParser.java
libs/argparser/trunk/src/prj/net/sf/japi/io/args/CommandWithHelp.java
libs/argparser/trunk/src/prj/net/sf/japi/io/args/converter/OututStreamConverter.java
libs/lang/trunk/src/prj/net/sf/japi/lang/PropertyComparator.java
libs/midi/trunk/src/prj/net/sf/japi/midi/gui/SpinnerChannelModel.java
libs/swing-action/trunk/src/tst/test/net/sf/japi/swing/ReflectionActionTest.java
libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/Application.java
libs/swing-bookmarks/trunk/src/prj/net/sf/japi/swing/bookmarks/BookmarkManager.java
libs/swing-extlib/trunk/src/prj/net/sf/japi/swing/ToolBarLayout.java
libs/swing-font/trunk/src/prj/net/sf/japi/swing/font/FontChooser.java
libs/swing-misc/trunk/src/prj/net/sf/japi/swing/misc/ConsoleProgress.java
libs/swing-misc/trunk/src/prj/net/sf/japi/swing/misc/JSAXErrorHandler.java
libs/taglets/trunk/src/prj/net/sf/japi/taglets/BlockListTaglet.java
libs/util/trunk/src/prj/net/sf/japi/util/Collections2.java
libs/util/trunk/src/prj/net/sf/japi/util/filter/file/EndingFileFilter.java
libs/xml/trunk/src/tst/test/net/sf/japi/xml/NodeListIterator2Test.java
libs/xml/trunk/src/tst/test/net/sf/japi/xml/NodeListIteratorTest.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/ProgramFrame.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/AbstractManager.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/OpenURLPane.java
progs/jtype/trunk/src/prj/net/sf/japi/jtype/ReflectionField.java
tools/archStat/trunk/src/prj/net/sf/japi/archstat/FileStat.java
tools/cstyle/trunk/src/prj/net/sf/japi/cstyle/LineEndingParser.java
tools/gdbControl/trunk/src/prj/net/sf/japi/tools/gdbcontrol/ComWithGdb.java
tools/string2bytes/trunk/src/tst/test/net/sf/japi/string2bytes/CodecStepTest.java
Modified: historic/trunk/src/app/net/sf/japi/finance/SimpleCapitalCalculator.java
===================================================================
--- historic/trunk/src/app/net/sf/japi/finance/SimpleCapitalCalculator.java 2008-12-27 03:27:49 UTC (rev 746)
+++ historic/trunk/src/app/net/sf/japi/finance/SimpleCapitalCalculator.java 2008-12-27 21:40:37 UTC (rev 747)
@@ -45,11 +45,7 @@
if ( numberOfPeriods < 0 ) throw new IllegalArgumentException("Number of periods has to be at least 0!");
if ( numberOfPeriods == 0 )
return initialCapital;
- if( numberOfPeriods == 1 ) {
- currentCapital = initialCapital * (1 + interestRate/100);
- } else {
- currentCapital = initialCapital * Math.pow(( 1 + interestRate/100 ), numberOfPeriods);
- }
+ currentCapital = numberOfPeriods == 1 ? initialCapital * (1 + interestRate / 100) : initialCapital * Math.pow((1 + interestRate / 100), numberOfPeriods);
return currentCapital;
}
@@ -93,7 +89,7 @@
public String toString() {
return "initial capital: " + this.initialCapital +
"\ninterest rate: " + this.interestRate +
- "\ncurrent capital: " + this.currentCapital;
+ "\ncurrent capital: " + this.currentCapital;
}
/** Clones the current SimpleCapitalCalculator.
@@ -106,5 +102,5 @@
throw new InternalError();
}
}
-
+
} // class SimpleCapitalCalculator
Modified: historic/trunk/src/app/net/sf/japi/io/ARGVEnumeration.java
===================================================================
--- historic/trunk/src/app/net/sf/japi/io/ARGVEnumeration.java 2008-12-27 03:27:49 UTC (rev 746)
+++ historic/trunk/src/app/net/sf/japi/io/ARGVEnumeration.java 2008-12-27 21:40:37 UTC (rev 747)
@@ -30,6 +30,7 @@
import java.util.List;
import java.util.NoSuchElementException;
import net.sf.japi.util.ThrowableHandler;
+import org.jetbrains.annotations.Nullable;
/** Implementation of {@link Enumeration} for ARGV.
* Used by {@link ARGVInputStream} and {@link ARGVReader}.
@@ -50,7 +51,7 @@
private InputStream currentStream;
/** Next InputStream. */
- private InputStream nextStream;
+ @Nullable private InputStream nextStream;
/** Current filename. */
private String currentFilename;
Modified: historic/trunk/src/app/net/sf/japi/sql/CachedResultSetTableModel.java
===================================================================
--- historic/trunk/src/app/net/sf/japi/sql/CachedResultSetTableModel.java 2008-12-27 03:27:49 UTC (rev 746)
+++ historic/trunk/src/app/net/sf/japi/sql/CachedResultSetTableModel.java 2008-12-27 21:40:37 UTC (rev 747)
@@ -58,15 +58,15 @@
/** The column titles.
* @serial include
*/
- private String[] columnTitles;
+ @Nullable private String[] columnTitles;
/** The Data.
* @serial include
*/
- private Object[][] data;
+ @Nullable private Object[][] data;
/** The ResultSet. */
- private ResultSet resultSet;
+ @Nullable private ResultSet resultSet;
/** Create a CachedResultSetTableModel. */
public CachedResultSetTableModel() {
@@ -75,7 +75,7 @@
/** Create a CachedResultSetTableModel.
* @param rs Initial ResultSet
*/
- public CachedResultSetTableModel(final ResultSet rs) {
+ public CachedResultSetTableModel(@Nullable final ResultSet rs) {
setResultSet(rs);
}
@@ -93,7 +93,7 @@
}
/** {@inheritDoc} */
- public void setResultSet(final ResultSet resultSet) {
+ public void setResultSet(@Nullable final ResultSet resultSet) {
if (resultSet == null) {
this.resultSet = resultSet;
rowCount = 0;
@@ -120,7 +120,7 @@
}
/** {@inheritDoc} */
- public ResultSet getResultSet() {
+ @Nullable public ResultSet getResultSet() {
return resultSet;
}
Modified: historic/trunk/src/app/net/sf/japi/sql/DatabaseTreeModel.java
===================================================================
--- historic/trunk/src/app/net/sf/japi/sql/DatabaseTreeModel.java 2008-12-27 03:27:49 UTC (rev 746)
+++ historic/trunk/src/app/net/sf/japi/sql/DatabaseTreeModel.java 2008-12-27 21:40:37 UTC (rev 747)
@@ -30,6 +30,7 @@
import javax.swing.event.TreeModelListener;
import javax.swing.tree.TreeModel;
import javax.swing.tree.TreePath;
+import org.jetbrains.annotations.Nullable;
/** A TreeModel displaying the catalogs of a database (usually tables and views) as tree.
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
@@ -67,7 +68,7 @@
public void refresh() throws SQLException {
catalogs.clear();
if (databaseMetaData != null) {
- ResultSet rs = null;
+ @Nullable ResultSet rs = null;
try {
rs = databaseMetaData.getCatalogs();
while (rs.next()) {
@@ -118,20 +119,12 @@
/** {@inheritDoc} */
public int getChildCount(final Object parent) {
- if (parent == this) {
- return catalogs.size();
- } else {
- return ((CatalogTreeNode) parent).getTableCount();
- }
+ return parent == this ? catalogs.size() : ((CatalogTreeNode) parent).getTableCount();
}
/** {@inheritDoc} */
public int getIndexOfChild(final Object parent, final Object child) {
- if (parent == this) {
- return catalogs.indexOf(child);
- } else {
- return ((CatalogTreeNode) parent).getTableIndex((CatalogTreeNode.TableTreeNode) child);
- }
+ return parent == this ? catalogs.indexOf(child) : ((CatalogTreeNode) parent).getTableIndex((CatalogTreeNode.TableTreeNode) child);
}
/** {@inheritDoc} */
@@ -181,7 +174,7 @@
*/
CatalogTreeNode(final String catalog) throws SQLException {
this.catalog = catalog;
- ResultSet rs = null;
+ @Nullable ResultSet rs = null;
try {
rs = databaseMetaData.getTables(catalog, null, null, null);
while (rs.next()) {
Modified: historic/trunk/src/app/net/sf/japi/sql/ScrollResultSetTableModel.java
===================================================================
--- historic/trunk/src/app/net/sf/japi/sql/ScrollResultSetTableModel.java 2008-12-27 03:27:49 UTC (rev 746)
+++ historic/trunk/src/app/net/sf/japi/sql/ScrollResultSetTableModel.java 2008-12-27 21:40:37 UTC (rev 747)
@@ -74,7 +74,7 @@
/** The column titles.
* @serial include
*/
- private String[] columnTitles;
+ @Nullable private String[] columnTitles;
/** Create a ResultSetTableModel. */
public ScrollResultSetTableModel() {
@@ -161,11 +161,7 @@
return 0;
}
try {
- if (resultSet.last()) {
- return resultSet.getRow();
- } else {
- return 0;
- }
+ return resultSet.last() ? resultSet.getRow() : 0;
} catch (final SQLException e) {
handleException(e);
return 0;
Modified: historic/trunk/src/app/net/sf/japi/swing/JPropertyEditor.java
===================================================================
--- historic/trunk/src/app/net/sf/japi/swing/JPropertyEditor.java 2008-12-27 03:27:49 UTC (rev 746)
+++ historic/trunk/src/app/net/sf/japi/swing/JPropertyEditor.java 2008-12-27 21:40:37 UTC (rev 747)
@@ -71,12 +71,7 @@
propertyEditor = PropertyEditorManager.findEditor(propertyType);
}
if (propertyEditor != null) {
- final Component editor;
- if (propertyEditor.supportsCustomEditor()) {
- editor = propertyEditor.getCustomEditor();
- } else {
- editor = createEditor(propertyType);
- }
+ final Component editor = propertyEditor.supportsCustomEditor() ? propertyEditor.getCustomEditor() : createEditor(propertyType);
if (editor != null) {
//noinspection ObjectAllocationInLoop
add(new JLabel(propertyName), labelGbc);
Modified: historic/trunk/src/doc/guide/swing/action/fromScratch/src/net/sf/japi/examples/editor/Editor.java
===================================================================
--- historic/trunk/src/doc/guide/swing/action/fromScratch/src/net/sf/japi/examples/editor/Editor.java 2008-12-27 03:27:49 UTC (rev 746)
+++ historic/trunk/src/doc/guide/swing/action/fromScratch/src/net/sf/japi/examples/editor/Editor.java 2008-12-27 21:40:37 UTC (rev 747)
@@ -48,7 +48,7 @@
/** Currently opened file.
* Maybe <code>null</code> in case the current document was not already saved.
*/
- private File file;
+ @Nullable private File file;
/** Create the Editor. */
public Editor() {
Modified: historic/trunk/src/test/net/sf/japi/util/PairTest.java
===================================================================
--- historic/trunk/src/test/net/sf/japi/util/PairTest.java 2008-12-27 03:27:49 UTC (rev 746)
+++ historic/trunk/src/test/net/sf/japi/util/PairTest.java 2008-12-27 21:40:37 UTC (rev 747)
@@ -23,6 +23,7 @@
import junit.framework.TestCase;
import net.sf.japi.util.Pair;
+import org.jetbrains.annotations.Nullable;
/** Test class for {@link Pair}.
* @author <a href="mailto:ch...@it...">Christian Hujer</a>
@@ -30,9 +31,9 @@
public class PairTest extends TestCase {
/** Object Under Test: A Table. */
- private Pair<Object,Object> oUT;
- private String first;
- private String second;
+ @Nullable private Pair<Object,Object> oUT;
+ @Nullable private String first;
+ @Nullable private String second;
/** {@inheritDoc} */
@Override protected void setUp() throws Exception {
Modified: historic/trunk/src/test/net/sf/japi/util/TableTest.java
===================================================================
--- historic/trunk/src/test/net/sf/japi/util/TableTest.java 2008-12-27 03:27:49 UTC (rev 746)
+++ historic/trunk/src/test/net/sf/japi/util/TableTest.java 2008-12-27 21:40:37 UTC (rev 747)
@@ -24,6 +24,7 @@
import junit.framework.TestCase;
import net.sf.japi.util.Pair;
import net.sf.japi.util.Table;
+import org.jetbrains.annotations.Nullable;
/** Test class for Table.
* @author <a href="mailto:ch...@it...">Christian Hujer</a>
@@ -31,7 +32,7 @@
public class TableTest extends TestCase {
/** Object Under Test: A Table. */
- private Table<Object,Object> oUT;
+ @Nullable private Table<Object,Object> oUT;
/** {@inheritDoc} */
@Override public void setUp() throws Exception {
Modified: libs/argparser/trunk/src/prj/net/sf/japi/io/args/ArgParser.java
===================================================================
--- libs/argparser/trunk/src/prj/net/sf/japi/io/args/ArgParser.java 2008-12-27 03:27:49 UTC (rev 746)
+++ libs/argparser/trunk/src/prj/net/sf/japi/io/args/ArgParser.java 2008-12-27 21:40:37 UTC (rev 747)
@@ -111,7 +111,7 @@
final List<String> argList = new ArrayList<String>(args);
for (final ListIterator<String> iterator = argList.listIterator(); iterator.hasNext();) {
final String arg = iterator.next();
- if (arg.equals("--")) {
+ if ("--".equals(arg)) {
break;
}
if (arg.startsWith("@")) {
@@ -186,7 +186,7 @@
// But it's safer to check this.
throw new NullPointerException("null is not allowed for an option name.");
}
- if (optionName.equals("")) {
+ if ("".equals(optionName)) {
throw new IllegalArgumentException("The empty String is not allowed as option name.");
}
if (optionName.startsWith("-")) {
Modified: libs/argparser/trunk/src/prj/net/sf/japi/io/args/CommandWithHelp.java
===================================================================
--- libs/argparser/trunk/src/prj/net/sf/japi/io/args/CommandWithHelp.java 2008-12-27 03:27:49 UTC (rev 746)
+++ libs/argparser/trunk/src/prj/net/sf/japi/io/args/CommandWithHelp.java 2008-12-27 21:40:37 UTC (rev 747)
@@ -70,7 +70,7 @@
final String delim = shortNames.size() > 0 && longNames.size() > 0 ? ", " : " ";
String description;
try {
- final String optionKey = option.key().equals("") ? optionMethod.getName() : option.key();
+ final String optionKey = "".equals(option.key()) ? optionMethod.getName() : option.key();
description = getString(optionKey);
} catch (final MissingResourceException ignore) {
description = "";
Modified: libs/argparser/trunk/src/prj/net/sf/japi/io/args/converter/OututStreamConverter.java
===================================================================
--- libs/argparser/trunk/src/prj/net/sf/japi/io/args/converter/OututStreamConverter.java 2008-12-27 03:27:49 UTC (rev 746)
+++ libs/argparser/trunk/src/prj/net/sf/japi/io/args/converter/OututStreamConverter.java 2008-12-27 21:40:37 UTC (rev 747)
@@ -43,11 +43,7 @@
/** {@inheritDoc} */
@NotNull public OutputStream convert(@NotNull final Locale locale, @NotNull final String arg) throws FileNotFoundException {
- if ("-".equals(arg) && !new File("-").exists()) {
- return System.out;
- } else {
- return new FileOutputStream(arg);
- }
+ return "-".equals(arg) && !new File("-").exists() ? System.out : new FileOutputStream(arg);
}
} // class InputStreamConverter
Modified: libs/lang/trunk/src/prj/net/sf/japi/lang/PropertyComparator.java
===================================================================
--- libs/lang/trunk/src/prj/net/sf/japi/lang/PropertyComparator.java 2008-12-27 03:27:49 UTC (rev 746)
+++ libs/lang/trunk/src/prj/net/sf/japi/lang/PropertyComparator.java 2008-12-27 21:40:37 UTC (rev 747)
@@ -66,11 +66,7 @@
final Method o2Getter = getter != null ? getter : getPropertyGetter(o2.getClass(), propertyName);
final Object o1Value = o1Getter.invoke(o1);
final Object o2Value = o2Getter.invoke(o2);
- if (delegate == null) {
- return ((Comparable) o1Value).compareTo((Comparable) o2Value);
- } else {
- return delegate.compare((T) o1Value, (T) o2Value);
- }
+ return delegate == null ? ((Comparable) o1Value).compareTo((Comparable) o2Value) : delegate.compare((T) o1Value, (T) o2Value);
} catch (final IllegalAccessException e) {
throw new IllegalAccessError(e.getMessage());
} catch (final InvocationTargetException e) {
Modified: libs/midi/trunk/src/prj/net/sf/japi/midi/gui/SpinnerChannelModel.java
===================================================================
--- libs/midi/trunk/src/prj/net/sf/japi/midi/gui/SpinnerChannelModel.java 2008-12-27 03:27:49 UTC (rev 746)
+++ libs/midi/trunk/src/prj/net/sf/japi/midi/gui/SpinnerChannelModel.java 2008-12-27 21:40:37 UTC (rev 747)
@@ -1,6 +1,6 @@
package net.sf.japi.midi.gui;
-import javax.swing.AbstractSpinnerModel;
+import javax.swing.AbstractSpinnerModel;import org.jetbrains.annotations.Nullable;
/** A SpinnerModel for MIDI Channels.
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
@@ -31,12 +31,12 @@
}
/** {@inheritDoc} */
- public Object getNextValue() {
+ @Nullable public Object getNextValue() {
return value < 0xF ? value + 1 : null;
}
/** {@inheritDoc} */
- public Object getPreviousValue() {
+ @Nullable public Object getPreviousValue() {
return value > 0x0 ? value - 1 : null;
}
}
Modified: libs/swing-action/trunk/src/tst/test/net/sf/japi/swing/ReflectionActionTest.java
===================================================================
--- libs/swing-action/trunk/src/tst/test/net/sf/japi/swing/ReflectionActionTest.java 2008-12-27 03:27:49 UTC (rev 746)
+++ libs/swing-action/trunk/src/tst/test/net/sf/japi/swing/ReflectionActionTest.java 2008-12-27 21:40:37 UTC (rev 747)
@@ -25,6 +25,7 @@
import net.sf.japi.swing.ActionBuilderFactory;
import net.sf.japi.swing.ActionMethod;
import net.sf.japi.swing.ReflectionAction;
+import org.jetbrains.annotations.Nullable;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -41,7 +42,7 @@
private static final ActionBuilder ACTION_BUILDER = ActionBuilderFactory.getInstance().getActionBuilder("test.net.sf.japi.swing");
/** The testling: A ReflectionAction. */
- private ReflectionAction testling;
+ @Nullable private ReflectionAction testling;
/** The Action Mock. */
private ActionMock actionMock;
Modified: libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/Application.java
===================================================================
--- libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/Application.java 2008-12-27 03:27:49 UTC (rev 746)
+++ libs/swing-app/trunk/src/prj/net/sf/japi/swing/app/Application.java 2008-12-27 21:40:37 UTC (rev 747)
@@ -408,11 +408,7 @@
*/
private void setActiveDocumentImpl(@Nullable final DocumentFrame<D> docFrame) {
currentDocumentFrame = docFrame;
- if (docFrame != null) {
- currentDocument = docFrame.getDocument();
- } else {
- currentDocument = null;
- }
+ currentDocument = docFrame != null ? docFrame.getDocument() : null;
updateActionStates();
}
Modified: libs/swing-bookmarks/trunk/src/prj/net/sf/japi/swing/bookmarks/BookmarkManager.java
===================================================================
--- libs/swing-bookmarks/trunk/src/prj/net/sf/japi/swing/bookmarks/BookmarkManager.java 2008-12-27 03:27:49 UTC (rev 746)
+++ libs/swing-bookmarks/trunk/src/prj/net/sf/japi/swing/bookmarks/BookmarkManager.java 2008-12-27 21:40:37 UTC (rev 747)
@@ -53,6 +53,7 @@
import net.sf.japi.swing.IconManager;
import net.sf.japi.util.EmptyEnumeration;
import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.w3c.dom.DOMImplementation;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -294,7 +295,7 @@
/** The folder (parent) of this bookmark.
* @serial include
*/
- private BookmarkFolder folder;
+ @Nullable private BookmarkFolder folder;
///** Create a Bookmark without title.
// * Should only be used by {@link BookmarkFolder#BookmarkFolder()}.
@@ -321,14 +322,14 @@
/** Get the folder (parent) of this bookmark.
* @return folder (parent) of this bookmark
*/
- public BookmarkFolder getFolder() {
+ @Nullable public BookmarkFolder getFolder() {
return folder;
}
/** Set the folder (parent) of this bookmark.
* @param folder parent folder of this bookmark
*/
- public void setFolder(final BookmarkFolder folder) {
+ public void setFolder(@Nullable final BookmarkFolder folder) {
if (this.folder != null) {
this.folder.remove(this);
}
Modified: libs/swing-extlib/trunk/src/prj/net/sf/japi/swing/ToolBarLayout.java
===================================================================
--- libs/swing-extlib/trunk/src/prj/net/sf/japi/swing/ToolBarLayout.java 2008-12-27 03:27:49 UTC (rev 746)
+++ libs/swing-extlib/trunk/src/prj/net/sf/japi/swing/ToolBarLayout.java 2008-12-27 21:40:37 UTC (rev 747)
@@ -30,6 +30,7 @@
import java.util.ArrayList;
import java.util.List;
import javax.swing.JToolBar;
+import org.jetbrains.annotations.Nullable;
/** A LayoutManager that manages a layout of a {@link Container} similar to {@link BorderLayout} but with an important difference, it is possible to
* add as many components to a side layout region as you want. The desired purpose is to serve as LayoutManager for containers that shall contain
@@ -109,7 +110,7 @@
/** Component in the center region.
* @serial include
*/
- private Component center;
+ @Nullable private Component center;
/** Create a ToolBarLayout with zero gaps. */
public ToolBarLayout() {
Modified: libs/swing-font/trunk/src/prj/net/sf/japi/swing/font/FontChooser.java
===================================================================
--- libs/swing-font/trunk/src/prj/net/sf/japi/swing/font/FontChooser.java 2008-12-27 03:27:49 UTC (rev 746)
+++ libs/swing-font/trunk/src/prj/net/sf/japi/swing/font/FontChooser.java 2008-12-27 21:40:37 UTC (rev 747)
@@ -211,11 +211,7 @@
@Nullable public static Font showChooseFontDialog(@Nullable final Component parent, @Nullable final Font font) {
final FontChooser chooser = new FontChooser();
chooser.setSelectedFont(font);
- if (showConfirmDialog(parent, chooser, ACTION_BUILDER.getString("chooser.title"), OK_CANCEL_OPTION, PLAIN_MESSAGE) == OK_OPTION) {
- return chooser.selectedFont;
- } else {
- return null;
- }
+ return showConfirmDialog(parent, chooser, ACTION_BUILDER.getString("chooser.title"), OK_CANCEL_OPTION, PLAIN_MESSAGE) == OK_OPTION ? chooser.selectedFont : null;
}
} // class FontChooser
Modified: libs/swing-misc/trunk/src/prj/net/sf/japi/swing/misc/ConsoleProgress.java
===================================================================
--- libs/swing-misc/trunk/src/prj/net/sf/japi/swing/misc/ConsoleProgress.java 2008-12-27 03:27:49 UTC (rev 746)
+++ libs/swing-misc/trunk/src/prj/net/sf/japi/swing/misc/ConsoleProgress.java 2008-12-27 21:40:37 UTC (rev 747)
@@ -16,10 +16,10 @@
private final Appendable out;
/** The flushable for out. */
- private final Flushable flushOut;
+ @Nullable private final Flushable flushOut;
/** The closeable for out. */
- private final Closeable closeOut;
+ @Nullable private final Closeable closeOut;
/** Current maximum. */
private int max;
Modified: libs/swing-misc/trunk/src/prj/net/sf/japi/swing/misc/JSAXErrorHandler.java
===================================================================
--- libs/swing-misc/trunk/src/prj/net/sf/japi/swing/misc/JSAXErrorHandler.java 2008-12-27 03:27:49 UTC (rev 746)
+++ libs/swing-misc/trunk/src/prj/net/sf/japi/swing/misc/JSAXErrorHandler.java 2008-12-27 21:40:37 UTC (rev 747)
@@ -27,6 +27,7 @@
import javax.swing.JTextArea;
import net.sf.japi.swing.ActionBuilder;
import net.sf.japi.swing.ActionBuilderFactory;
+import org.jetbrains.annotations.Nullable;
import org.xml.sax.ErrorHandler;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
@@ -48,7 +49,7 @@
/** The Dialog.
* @serial include
*/
- private JDialog dialog;
+ @Nullable private JDialog dialog;
/** Parent component.
* @serial include
Modified: libs/taglets/trunk/src/prj/net/sf/japi/taglets/BlockListTaglet.java
===================================================================
--- libs/taglets/trunk/src/prj/net/sf/japi/taglets/BlockListTaglet.java 2008-12-27 03:27:49 UTC (rev 746)
+++ libs/taglets/trunk/src/prj/net/sf/japi/taglets/BlockListTaglet.java 2008-12-27 21:40:37 UTC (rev 747)
@@ -21,7 +21,7 @@
import com.sun.javadoc.Tag;
import com.sun.tools.doclets.Taglet;
-import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.NotNull;import org.jetbrains.annotations.Nullable;
/**
* Base class for Taglets that are simple blocks transforming into lists.
@@ -114,7 +114,7 @@
}
/** {@inheritDoc} */
- public String toString(final Tag[] tags) {
+ @Nullable public String toString(final Tag[] tags) {
if (tags == null || tags.length == 0) {
return null;
}
Modified: libs/util/trunk/src/prj/net/sf/japi/util/Collections2.java
===================================================================
--- libs/util/trunk/src/prj/net/sf/japi/util/Collections2.java 2008-12-27 03:27:49 UTC (rev 746)
+++ libs/util/trunk/src/prj/net/sf/japi/util/Collections2.java 2008-12-27 21:40:37 UTC (rev 747)
@@ -64,7 +64,7 @@
* @return collection containing only those elements accepted by the filter or <code>null</code> if the Collection could not be created.
*/
@Nullable public static <T, C extends Collection<T>> C filter(@NotNull final C c, @NotNull final Filter<? super T> filter) {
- C filtered = null;
+ @Nullable C filtered = null;
try {
filtered = (C) c.getClass().newInstance();
} catch (final Exception e) { /* ignore, check is done on null. */ }
Modified: libs/util/trunk/src/prj/net/sf/japi/util/filter/file/EndingFileFilter.java
===================================================================
--- libs/util/trunk/src/prj/net/sf/japi/util/filter/file/EndingFileFilter.java 2008-12-27 03:27:49 UTC (rev 746)
+++ libs/util/trunk/src/prj/net/sf/japi/util/filter/file/EndingFileFilter.java 2008-12-27 21:40:37 UTC (rev 747)
@@ -86,6 +86,7 @@
ret |= fileName.endsWith(ending);
}
}
+ ret = acceptDirectories ? pathname.isDirectory() : !pathname.isDirectory();
if (acceptDirectories) {
ret |= pathname.isDirectory();
} else {
Modified: libs/xml/trunk/src/tst/test/net/sf/japi/xml/NodeListIterator2Test.java
===================================================================
--- libs/xml/trunk/src/tst/test/net/sf/japi/xml/NodeListIterator2Test.java 2008-12-27 03:27:49 UTC (rev 746)
+++ libs/xml/trunk/src/tst/test/net/sf/japi/xml/NodeListIterator2Test.java 2008-12-27 21:40:37 UTC (rev 747)
@@ -25,6 +25,7 @@
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import net.sf.japi.xml.NodeListIterator;
+import org.jetbrains.annotations.Nullable;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -39,7 +40,7 @@
public class NodeListIterator2Test {
/** Object Under Test: A NodeListIterator. */
- private NodeListIterator<Node> testling;
+ @Nullable private NodeListIterator<Node> testling;
/** Mock NodeList. */
private NodeList mockNodeList;
Modified: libs/xml/trunk/src/tst/test/net/sf/japi/xml/NodeListIteratorTest.java
===================================================================
--- libs/xml/trunk/src/tst/test/net/sf/japi/xml/NodeListIteratorTest.java 2008-12-27 03:27:49 UTC (rev 746)
+++ libs/xml/trunk/src/tst/test/net/sf/japi/xml/NodeListIteratorTest.java 2008-12-27 21:40:37 UTC (rev 747)
@@ -7,6 +7,7 @@
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
import net.sf.japi.xml.NodeListIterator;
+import org.jetbrains.annotations.Nullable;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
@@ -25,7 +26,7 @@
public class NodeListIteratorTest {
/** The DocumentBuilder for creating DOM trees for testing. */
- private static DocumentBuilder db;
+ @Nullable private static DocumentBuilder db;
/** Creates the DocumentBuilder that is used for creating DOM trees for testing.
* @throws ParserConfigurationException (unexpected)
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/ProgramFrame.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/ProgramFrame.java 2008-12-27 03:27:49 UTC (rev 746)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/jtest/gui/ProgramFrame.java 2008-12-27 21:40:37 UTC (rev 747)
@@ -59,6 +59,7 @@
import net.sf.japi.swing.prefs.PreferencesPane;
import net.sf.japi.swing.recent.RecentURLsMenu;
import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/** Programmfenster.
* @author $Author: chris $
@@ -99,7 +100,7 @@
/** The URL of the current question collection.
* @serial include
*/
- private String url;
+ @Nullable private String url;
/** Create a ProgramFrame.
* @param program Program object to create frame for
@@ -195,7 +196,7 @@
/** Get the URL to display.
* @return diplayed URL
*/
- public String getURL() {
+ @Nullable public String getURL() {
try {
URL url = new URL(this.url);
final int index = questionCollectionGUI.getIndex();
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/AbstractManager.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/AbstractManager.java 2008-12-27 03:27:49 UTC (rev 746)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/AbstractManager.java 2008-12-27 21:40:37 UTC (rev 747)
@@ -20,14 +20,16 @@
package net.sf.japi.progs.jeduca.swing;
-import java.awt.Component;import java.awt.Container;
+import java.awt.Component;
+import java.awt.Container;
import java.awt.event.ActionEvent;
import java.awt.event.ComponentEvent;
import java.awt.event.ComponentListener;
import java.lang.ref.WeakReference;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Iterator;
-import java.util.List;import java.util.Collection;
+import java.util.List;
import javax.swing.AbstractAction;
import javax.swing.AbstractButton;
import javax.swing.Action;
@@ -42,6 +44,7 @@
import javax.swing.JToolBar;
import net.sf.japi.swing.ActionBuilder;
import net.sf.japi.swing.ActionBuilderFactory;
+import org.jetbrains.annotations.Nullable;
/** Base class for Manager classes that manage visibility of components and provide corresponding menus.
* <p />
@@ -148,7 +151,7 @@
* @param comp component to find Action for
* @return SubAction for the specified comp.
*/
- private Action findActionFor(final T comp) {
+ @Nullable private Action findActionFor(final T comp) {
for (final SubAction<?> action : actions) {
if (action.getComponent() == comp) {
return action;
@@ -189,7 +192,7 @@
* The default implementation returns <code>null</code>, you might want to override this method.
* @return Configure Action
*/
- protected Action getConfigureAction() {
+ @Nullable protected Action getConfigureAction() {
return null;
}
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/OpenURLPane.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/OpenURLPane.java 2008-12-27 03:27:49 UTC (rev 746)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/OpenURLPane.java 2008-12-27 21:40:37 UTC (rev 747)
@@ -44,6 +44,7 @@
import javax.swing.JTextField;
import javax.swing.border.EmptyBorder;
import net.sf.japi.swing.ActionBuilderFactory;
+import org.jetbrains.annotations.Nullable;
/** Class for displaying a Dialog which requests that the user enters a URL or opens a File selection box.
* It works quite like {@link JFileChooser}, even a bit simpler.
@@ -136,7 +137,7 @@
/** Dialog to show.
* @serial include
*/
- private JDialog dialog;
+ @Nullable private JDialog dialog;
/** JFileChooser to use.
* @serial include
@@ -146,7 +147,7 @@
/** String with result of user selection / input.
* @serial include
*/
- private String result;
+ @Nullable private String result;
/** Show a dialog using a default JFileChooser.
* @param parent Parent component
@@ -201,12 +202,12 @@
}
/** Frame if now owner frame. */
- private static Frame rootFrame;
+ @Nullable private static Frame rootFrame;
/** Get the root frame to use if there is no owner frame.
* @return frame
*/
- private static synchronized Window getRootFrame() {
+ @Nullable private static synchronized Window getRootFrame() {
if (rootFrame == null) {
rootFrame = new JFrame();
}
Modified: progs/jtype/trunk/src/prj/net/sf/japi/jtype/ReflectionField.java
===================================================================
--- progs/jtype/trunk/src/prj/net/sf/japi/jtype/ReflectionField.java 2008-12-27 03:27:49 UTC (rev 746)
+++ progs/jtype/trunk/src/prj/net/sf/japi/jtype/ReflectionField.java 2008-12-27 21:40:37 UTC (rev 747)
@@ -6,7 +6,7 @@
import java.lang.reflect.InvocationTargetException;
import java.awt.GridBagLayout;
import java.util.Locale;
-import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.NotNull;import org.jetbrains.annotations.Nullable;
/** A component that displays a property value along with a label.
* It uses reflection to get the object's value.
@@ -60,7 +60,7 @@
* @param propertyName Name of the property for which the getter method shall be returned.
* @return The getter method for the specified property of the specified class or <code>null</code> if such a getter method cannot be returned.
*/
- private static Method getGetterMethod(@NotNull final Class<?> clazz, @NotNull final String propertyName) {
+ @Nullable private static Method getGetterMethod(@NotNull final Class<?> clazz, @NotNull final String propertyName) {
final String capName = propertyName.substring(0, 1).toUpperCase(Locale.ENGLISH) + propertyName.substring(1);
try {
return clazz.getMethod("get" + capName);
Modified: tools/archStat/trunk/src/prj/net/sf/japi/archstat/FileStat.java
===================================================================
--- tools/archStat/trunk/src/prj/net/sf/japi/archstat/FileStat.java 2008-12-27 03:27:49 UTC (rev 746)
+++ tools/archStat/trunk/src/prj/net/sf/japi/archstat/FileStat.java 2008-12-27 21:40:37 UTC (rev 747)
@@ -1,13 +1,14 @@
package net.sf.japi.archstat;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.HashMap;
-import java.util.ArrayList;
import java.util.TreeSet;
-import java.io.File;
-import java.io.IOException;
import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/** Per-File statistics.
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
@@ -30,7 +31,7 @@
private final String title;
/** The file (regular file or directory) of this statistic. */
- private final File file;
+ @Nullable private final File file;
private int linesRaw;
Modified: tools/cstyle/trunk/src/prj/net/sf/japi/cstyle/LineEndingParser.java
===================================================================
--- tools/cstyle/trunk/src/prj/net/sf/japi/cstyle/LineEndingParser.java 2008-12-27 03:27:49 UTC (rev 746)
+++ tools/cstyle/trunk/src/prj/net/sf/japi/cstyle/LineEndingParser.java 2008-12-27 21:40:37 UTC (rev 747)
@@ -20,6 +20,7 @@
package net.sf.japi.cstyle;
import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/** A LineEndingParser can verify whether a file has the correct line ending.
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
@@ -41,7 +42,7 @@
/** {@inheritDoc} */
public void process(final char b) {
final boolean lineFeed = b == ASCII_LF;
- final NewLine newLineFound;
+ @Nullable final NewLine newLineFound;
newLineFound = lineFeed
? carriageReturn ? NewLine.DOS : NewLine.UNIX
: carriageReturn ? NewLine.MAC : null;
Modified: tools/gdbControl/trunk/src/prj/net/sf/japi/tools/gdbcontrol/ComWithGdb.java
===================================================================
--- tools/gdbControl/trunk/src/prj/net/sf/japi/tools/gdbcontrol/ComWithGdb.java 2008-12-27 03:27:49 UTC (rev 746)
+++ tools/gdbControl/trunk/src/prj/net/sf/japi/tools/gdbcontrol/ComWithGdb.java 2008-12-27 21:40:37 UTC (rev 747)
@@ -6,6 +6,7 @@
import java.io.InputStream;
import java.io.OutputStream;
import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/** A Java wrapper for communication with gdb.
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
@@ -17,7 +18,7 @@
private final CharSequence prompt = "(gdb) ";
/** The process of gdb. */
- private Process gdbProcess;
+ @Nullable private Process gdbProcess;
/** InputStream to read data from gdb's stdout. */
private InputStream gdbIn;
Modified: tools/string2bytes/trunk/src/tst/test/net/sf/japi/string2bytes/CodecStepTest.java
===================================================================
--- tools/string2bytes/trunk/src/tst/test/net/sf/japi/string2bytes/CodecStepTest.java 2008-12-27 03:27:49 UTC (rev 746)
+++ tools/string2bytes/trunk/src/tst/test/net/sf/japi/string2bytes/CodecStepTest.java 2008-12-27 21:40:37 UTC (rev 747)
@@ -23,6 +23,7 @@
import net.sf.japi.string2bytes.EntityCodec;
import net.sf.japi.string2bytes.IdentityCodec;
import net.sf.japi.string2bytes.StringCodec;
+import org.jetbrains.annotations.Nullable;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -36,13 +37,13 @@
public class CodecStepTest {
/** The CodecStep to test. */
- private CodecStep codecStep;
+ @Nullable private CodecStep codecStep;
/** The Codec to use for most tests. */
- private StringCodec codec;
+ @Nullable private StringCodec codec;
/** The Charset to use for most tests. */
- private String charset;
+ @Nullable private String charset;
/**
* Creates the test data and a testling.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-12-27 03:27:51
|
Revision: 746
http://japi.svn.sourceforge.net/japi/?rev=746&view=rev
Author: christianhujer
Date: 2008-12-27 03:27:49 +0000 (Sat, 27 Dec 2008)
Log Message:
-----------
Replaced deprecated code with its suggested alternative (File.toURL() -> File.toURI().toURL()).
Modified Paths:
--------------
libs/swing-bookmarks/trunk/src/prj/net/sf/japi/swing/bookmarks/BookmarkManager.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/OpenURLPane.java
progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/io/ImporterFileFilter.java
Modified: libs/swing-bookmarks/trunk/src/prj/net/sf/japi/swing/bookmarks/BookmarkManager.java
===================================================================
--- libs/swing-bookmarks/trunk/src/prj/net/sf/japi/swing/bookmarks/BookmarkManager.java 2008-12-27 03:27:26 UTC (rev 745)
+++ libs/swing-bookmarks/trunk/src/prj/net/sf/japi/swing/bookmarks/BookmarkManager.java 2008-12-27 03:27:49 UTC (rev 746)
@@ -209,7 +209,7 @@
* @throws SAXException in case of XML document problems
*/
public void load() throws IOException, ParserConfigurationException, SAXException {
- load(new File(System.getProperty("user.home"), ".jeduca.bookmarks.xml").toURL().toString());
+ load(new File(System.getProperty("user.home"), ".jeduca.bookmarks.xml").toURI().toURL().toString());
}
/** Save bookmarks to default file.
@@ -217,7 +217,7 @@
* @throws ParserConfigurationException in case of XML configuration problems
*/
public void save() throws IOException, ParserConfigurationException {
- save(new File(System.getProperty("user.home"), ".jeduca.bookmarks.xml").toURL().toString());
+ save(new File(System.getProperty("user.home"), ".jeduca.bookmarks.xml").toURI().toURL().toString());
}
/** Save bookmarks to a file.
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/OpenURLPane.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/OpenURLPane.java 2008-12-27 03:27:26 UTC (rev 745)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/OpenURLPane.java 2008-12-27 03:27:49 UTC (rev 746)
@@ -236,7 +236,7 @@
if (res == JFileChooser.CANCEL_OPTION) {
} else if (res == JFileChooser.APPROVE_OPTION) {
try {
- input.setText(fileChooser.getSelectedFile().toURL().toString());
+ input.setText(fileChooser.getSelectedFile().toURI().toURL().toString());
} catch (MalformedURLException e) {
JOptionPane.showMessageDialog(this, e, "Interner Fehler", JOptionPane.ERROR_MESSAGE);
}
Modified: progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/io/ImporterFileFilter.java
===================================================================
--- progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/io/ImporterFileFilter.java 2008-12-27 03:27:26 UTC (rev 745)
+++ progs/jeduca/trunk/src/prj/net/sf/japi/progs/jeduca/swing/io/ImporterFileFilter.java 2008-12-27 03:27:49 UTC (rev 746)
@@ -70,7 +70,7 @@
boolean accept = f.isDirectory();
try {
if (!accept) {
- accept = importer.canLoad(f.toURL().toString());
+ accept = importer.canLoad(f.toURI().toURL().toString());
}
} catch (MalformedURLException e) {
System.err.println(e);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-12-27 03:27:29
|
Revision: 745
http://japi.svn.sourceforge.net/japi/?rev=745&view=rev
Author: christianhujer
Date: 2008-12-27 03:27:26 +0000 (Sat, 27 Dec 2008)
Log Message:
-----------
Changed tools into a global user library.
Modified Paths:
--------------
libs/taglets/trunk/libs-taglets.iml
Modified: libs/taglets/trunk/libs-taglets.iml
===================================================================
--- libs/taglets/trunk/libs-taglets.iml 2008-12-27 03:27:08 UTC (rev 744)
+++ libs/taglets/trunk/libs-taglets.iml 2008-12-27 03:27:26 UTC (rev 745)
@@ -27,6 +27,7 @@
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="library" name="tools" level="application" />
</component>
<component name="copyright">
<Base>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-12-27 03:27:11
|
Revision: 744
http://japi.svn.sourceforge.net/japi/?rev=744&view=rev
Author: christianhujer
Date: 2008-12-27 03:27:08 +0000 (Sat, 27 Dec 2008)
Log Message:
-----------
Added missing svn:externals property.
Property Changed:
----------------
tools/scriptEngineLister/trunk/
Property changes on: tools/scriptEngineLister/trunk
___________________________________________________________________
Added: svn:externals
+ common https://japi.svn.sourceforge.net/svnroot/japi/common/trunk
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-12-27 02:56:13
|
Revision: 743
http://japi.svn.sourceforge.net/japi/?rev=743&view=rev
Author: christianhujer
Date: 2008-12-27 02:56:08 +0000 (Sat, 27 Dec 2008)
Log Message:
-----------
Updated ignore properties to ignore bin directory of eclipse workspace.
Property Changed:
----------------
common/trunk/
games/jmines/trunk/
historic/trunk/
imajar/trunk/
libs/argparser/trunk/
libs/finance/trunk/
libs/io/trunk/
libs/lang/trunk/
libs/logging/trunk/
libs/midi/trunk/
libs/net/trunk/
libs/registry/trunk/
libs/swing-about/trunk/
libs/swing-action/trunk/
libs/swing-app/trunk/
libs/swing-bookmarks/trunk/
libs/swing-extlib/trunk/
libs/swing-font/trunk/
libs/swing-keyprefs/trunk/
libs/swing-list/trunk/
libs/swing-misc/trunk/
libs/swing-prefs/trunk/
libs/swing-proxyprefs/trunk/
libs/swing-recent/trunk/
libs/swing-tod/trunk/
libs/swing-treetable/trunk/
libs/taglets/trunk/
libs/util/trunk/
libs/xml/trunk/
progs/batcher/trunk/
progs/cardlearn/trunk/
progs/jeduca/trunk/
progs/jhexedit/trunk/
progs/jhexview/trunk/
progs/jirus/trunk/
progs/jtype/trunk/
progs/midilearn/trunk/
progs/textedit/trunk/
site/trunk/
tools/archStat/trunk/
tools/cstyle/trunk/
tools/dircount/trunk/
tools/findLongestPath/trunk/
tools/fontbrowser/trunk/
tools/gdbControl/trunk/
tools/jgrep/trunk/
tools/jwget/trunk/
tools/keystrokes/trunk/
tools/mail/trunk/
tools/midiDeviceLister/trunk/
tools/midiMonitor/trunk/
tools/prefsbrowser/trunk/
tools/replacer/trunk/
tools/scriptEngineLister/trunk/
tools/scriptInterpreter/trunk/
tools/string2bytes/trunk/
tools/todoScanner/trunk/
Property changes on: common/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: games/jmines/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: historic/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: imajar/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: libs/argparser/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: libs/finance/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: libs/io/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: libs/lang/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: libs/logging/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: libs/midi/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: libs/net/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: libs/registry/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: libs/swing-about/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: libs/swing-action/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: libs/swing-app/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: libs/swing-bookmarks/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: libs/swing-extlib/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: libs/swing-font/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: libs/swing-keyprefs/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: libs/swing-list/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: libs/swing-misc/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: libs/swing-prefs/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: libs/swing-proxyprefs/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: libs/swing-recent/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: libs/swing-tod/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: libs/swing-treetable/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: libs/taglets/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: libs/util/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: libs/xml/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: progs/batcher/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: progs/cardlearn/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: progs/jeduca/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: progs/jhexedit/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: progs/jhexview/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: progs/jirus/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: progs/jtype/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: progs/midilearn/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: progs/textedit/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: site/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: tools/archStat/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: tools/cstyle/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: tools/dircount/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: tools/findLongestPath/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: tools/fontbrowser/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: tools/gdbControl/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: tools/jgrep/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: tools/jwget/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: tools/keystrokes/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: tools/mail/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: tools/midiDeviceLister/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: tools/midiMonitor/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: tools/prefsbrowser/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: tools/replacer/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: tools/scriptEngineLister/trunk
___________________________________________________________________
Added: svn:ignore
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: tools/scriptInterpreter/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: tools/string2bytes/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
Property changes on: tools/todoScanner/trunk
___________________________________________________________________
Modified: svn:ignore
- classes
dest
developer.properties
dist
docs
+ bin
classes
dest
developer.properties
dist
docs
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-12-27 02:40:43
|
Revision: 742
http://japi.svn.sourceforge.net/japi/?rev=742&view=rev
Author: christianhujer
Date: 2008-12-27 02:40:38 +0000 (Sat, 27 Dec 2008)
Log Message:
-----------
Improved IntelliJ IDEA project settings / configuration.
That includes preparations for exporting the project to Eclipse.
Modified Paths:
--------------
japi.ipr
libs/argparser/trunk/libs-argparser.iml
libs/midi/trunk/midi.iml
libs/net/trunk/libs-net.iml
libs/registry/trunk/libs-registry.iml
libs/swing-app/trunk/libs-swing-app.iml
libs/swing-bookmarks/trunk/libs-swing-bookmarks.iml
libs/swing-extlib/trunk/libs-swing-extlib.iml
libs/swing-font/trunk/libs-swing-font.iml
libs/swing-keyprefs/trunk/libs-swing-keyprefs.iml
libs/swing-list/trunk/libs-swing-list.iml
libs/swing-misc/trunk/libs-swing-misc.iml
libs/swing-prefs/trunk/libs-swing-prefs.iml
libs/swing-proxyprefs/trunk/libs-swing-proxyprefs.iml
libs/swing-recent/trunk/libs-swing-recent.iml
libs/swing-tod/trunk/libs-swing-tod.iml
libs/swing-treetable/trunk/libs-swing-treetable.iml
libs/taglets/trunk/libs-taglets.iml
libs/util/trunk/libs-util.iml
progs/batcher/trunk/Batcher.iml
progs/cardlearn/trunk/cardlearn.iml
progs/jeduca/trunk/JEduca.iml
progs/jhexedit/trunk/jhexedit.iml
progs/jhexview/trunk/jhexview.iml
progs/jirus/trunk/jirus.iml
progs/jtype/trunk/jtype.iml
progs/midilearn/trunk/midilearn.iml
progs/textedit/trunk/textedit.iml
tools/archStat/trunk/archStat.iml
tools/cstyle/trunk/cstyle.iml
tools/dircount/trunk/dircount.iml
tools/findLongestPath/trunk/findLongestPath.iml
tools/gdbControl/trunk/gdbControl.iml
tools/jgrep/trunk/jgrep.iml
tools/mail/trunk/mail.iml
tools/midiDeviceLister/trunk/midiDeviceLister.iml
tools/midiMonitor/trunk/midiMonitor.iml
tools/replacer/trunk/replacer.iml
tools/scriptEngineLister/trunk/scriptEngineLister.iml
tools/scriptInterpreter/trunk/scriptInterpreter.iml
tools/string2bytes/trunk/string2bytes.iml
tools/todoScanner/trunk/todoScanner.iml
Added Paths:
-----------
progs/batcher/trunk/src/doc/
progs/batcher/trunk/src/prj/
progs/batcher/trunk/src/prj/net/
progs/batcher/trunk/src/tst/
Removed Paths:
-------------
libs/taglets/trunk/taglets.iml
progs/batcher/trunk/src/net/
Modified: japi.ipr
===================================================================
--- japi.ipr 2008-12-27 01:15:43 UTC (rev 741)
+++ japi.ipr 2008-12-27 02:40:38 UTC (rev 742)
@@ -63,6 +63,24 @@
<option name="HTML_ELEMENTS_TO_INSERT_NEW_LINE_BEFORE" value="" />
<option name="HTML_DO_NOT_INDENT_CHILDREN_OF" value="" />
<option name="ENUM_CONSTANTS_WRAP" value="2" />
+ <ADDITIONAL_INDENT_OPTIONS fileType="groovy">
+ <option name="INDENT_SIZE" value="2" />
+ <option name="CONTINUATION_INDENT_SIZE" value="8" />
+ <option name="TAB_SIZE" value="4" />
+ <option name="USE_TAB_CHARACTER" value="false" />
+ <option name="SMART_TABS" value="false" />
+ <option name="LABEL_INDENT_SIZE" value="0" />
+ <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+ </ADDITIONAL_INDENT_OPTIONS>
+ <ADDITIONAL_INDENT_OPTIONS fileType="gsp">
+ <option name="INDENT_SIZE" value="2" />
+ <option name="CONTINUATION_INDENT_SIZE" value="8" />
+ <option name="TAB_SIZE" value="4" />
+ <option name="USE_TAB_CHARACTER" value="false" />
+ <option name="SMART_TABS" value="false" />
+ <option name="LABEL_INDENT_SIZE" value="0" />
+ <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+ </ADDITIONAL_INDENT_OPTIONS>
<ADDITIONAL_INDENT_OPTIONS fileType="java">
<option name="INDENT_SIZE" value="4" />
<option name="CONTINUATION_INDENT_SIZE" value="8" />
Modified: libs/argparser/trunk/libs-argparser.iml
===================================================================
--- libs/argparser/trunk/libs-argparser.iml 2008-12-27 01:15:43 UTC (rev 741)
+++ libs/argparser/trunk/libs-argparser.iml 2008-12-27 02:40:38 UTC (rev 742)
@@ -12,7 +12,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
+ <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -21,7 +21,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
+ <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Modified: libs/midi/trunk/midi.iml
===================================================================
--- libs/midi/trunk/midi.iml 2008-12-27 01:15:43 UTC (rev 741)
+++ libs/midi/trunk/midi.iml 2008-12-27 02:40:38 UTC (rev 742)
@@ -9,8 +9,24 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="annotations" level="project" />
- <orderEntry type="library" name="junit" level="project" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntry type="module" module-name="libs-swing-action" />
</component>
</module>
Modified: libs/net/trunk/libs-net.iml
===================================================================
--- libs/net/trunk/libs-net.iml 2008-12-27 01:15:43 UTC (rev 741)
+++ libs/net/trunk/libs-net.iml 2008-12-27 02:40:38 UTC (rev 742)
@@ -9,11 +9,10 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="libs-io" />
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
+ <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -22,12 +21,13 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
+ <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module" module-name="libs-io" />
</component>
<component name="copyright">
<Base>
Modified: libs/registry/trunk/libs-registry.iml
===================================================================
--- libs/registry/trunk/libs-registry.iml 2008-12-27 01:15:43 UTC (rev 741)
+++ libs/registry/trunk/libs-registry.iml 2008-12-27 02:40:38 UTC (rev 742)
@@ -12,7 +12,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
+ <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -21,7 +21,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
+ <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Modified: libs/swing-app/trunk/libs-swing-app.iml
===================================================================
--- libs/swing-app/trunk/libs-swing-app.iml 2008-12-27 01:15:43 UTC (rev 741)
+++ libs/swing-app/trunk/libs-swing-app.iml 2008-12-27 02:40:38 UTC (rev 742)
@@ -12,7 +12,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
+ <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -21,7 +21,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
+ <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Modified: libs/swing-bookmarks/trunk/libs-swing-bookmarks.iml
===================================================================
--- libs/swing-bookmarks/trunk/libs-swing-bookmarks.iml 2008-12-27 01:15:43 UTC (rev 741)
+++ libs/swing-bookmarks/trunk/libs-swing-bookmarks.iml 2008-12-27 02:40:38 UTC (rev 742)
@@ -9,13 +9,10 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="libs-swing-action" />
- <orderEntry type="module" module-name="libs-util" />
- <orderEntry type="module" module-name="libs-swing-app" />
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
+ <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -24,12 +21,15 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
+ <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module" module-name="libs-swing-action" />
+ <orderEntry type="module" module-name="libs-util" />
+ <orderEntry type="module" module-name="libs-swing-app" />
</component>
<component name="copyright">
<Base>
Modified: libs/swing-extlib/trunk/libs-swing-extlib.iml
===================================================================
--- libs/swing-extlib/trunk/libs-swing-extlib.iml 2008-12-27 01:15:43 UTC (rev 741)
+++ libs/swing-extlib/trunk/libs-swing-extlib.iml 2008-12-27 02:40:38 UTC (rev 742)
@@ -12,7 +12,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
+ <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -21,7 +21,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
+ <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Modified: libs/swing-font/trunk/libs-swing-font.iml
===================================================================
--- libs/swing-font/trunk/libs-swing-font.iml 2008-12-27 01:15:43 UTC (rev 741)
+++ libs/swing-font/trunk/libs-swing-font.iml 2008-12-27 02:40:38 UTC (rev 742)
@@ -9,11 +9,10 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="libs-swing-action" />
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
+ <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -22,12 +21,13 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
+ <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module" module-name="libs-swing-action" />
</component>
<component name="copyright">
<Base>
Modified: libs/swing-keyprefs/trunk/libs-swing-keyprefs.iml
===================================================================
--- libs/swing-keyprefs/trunk/libs-swing-keyprefs.iml 2008-12-27 01:15:43 UTC (rev 741)
+++ libs/swing-keyprefs/trunk/libs-swing-keyprefs.iml 2008-12-27 02:40:38 UTC (rev 742)
@@ -9,13 +9,10 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="libs-swing-action" />
- <orderEntry type="module" module-name="libs-swing-prefs" />
- <orderEntry type="module" module-name="libs-swing-treetable" />
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
+ <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -24,12 +21,15 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
+ <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module" module-name="libs-swing-action" />
+ <orderEntry type="module" module-name="libs-swing-prefs" />
+ <orderEntry type="module" module-name="libs-swing-treetable" />
</component>
<component name="copyright">
<Base>
Modified: libs/swing-list/trunk/libs-swing-list.iml
===================================================================
--- libs/swing-list/trunk/libs-swing-list.iml 2008-12-27 01:15:43 UTC (rev 741)
+++ libs/swing-list/trunk/libs-swing-list.iml 2008-12-27 02:40:38 UTC (rev 742)
@@ -9,7 +9,6 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="libs-swing-action" />
<orderEntry type="module-library">
<library>
<CLASSES>
@@ -28,6 +27,7 @@
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module" module-name="libs-swing-action" />
</component>
<component name="copyright">
<Base>
Modified: libs/swing-misc/trunk/libs-swing-misc.iml
===================================================================
--- libs/swing-misc/trunk/libs-swing-misc.iml 2008-12-27 01:15:43 UTC (rev 741)
+++ libs/swing-misc/trunk/libs-swing-misc.iml 2008-12-27 02:40:38 UTC (rev 742)
@@ -9,7 +9,6 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="libs-swing-action" />
<orderEntry type="module-library">
<library>
<CLASSES>
@@ -28,6 +27,7 @@
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module" module-name="libs-swing-action" />
</component>
<component name="copyright">
<Base>
Modified: libs/swing-prefs/trunk/libs-swing-prefs.iml
===================================================================
--- libs/swing-prefs/trunk/libs-swing-prefs.iml 2008-12-27 01:15:43 UTC (rev 741)
+++ libs/swing-prefs/trunk/libs-swing-prefs.iml 2008-12-27 02:40:38 UTC (rev 742)
@@ -9,8 +9,6 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="libs-swing-action" />
- <orderEntry type="module" module-name="libs-swing-extlib" />
<orderEntry type="module-library">
<library>
<CLASSES>
@@ -29,6 +27,8 @@
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module" module-name="libs-swing-action" />
+ <orderEntry type="module" module-name="libs-swing-extlib" />
</component>
<component name="copyright">
<Base>
Modified: libs/swing-proxyprefs/trunk/libs-swing-proxyprefs.iml
===================================================================
--- libs/swing-proxyprefs/trunk/libs-swing-proxyprefs.iml 2008-12-27 01:15:43 UTC (rev 741)
+++ libs/swing-proxyprefs/trunk/libs-swing-proxyprefs.iml 2008-12-27 02:40:38 UTC (rev 742)
@@ -9,12 +9,10 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="libs-swing-action" />
- <orderEntry type="module" module-name="libs-swing-prefs" />
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
+ <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -23,12 +21,14 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
+ <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module" module-name="libs-swing-action" />
+ <orderEntry type="module" module-name="libs-swing-prefs" />
</component>
<component name="copyright">
<Base>
Modified: libs/swing-recent/trunk/libs-swing-recent.iml
===================================================================
--- libs/swing-recent/trunk/libs-swing-recent.iml 2008-12-27 01:15:43 UTC (rev 741)
+++ libs/swing-recent/trunk/libs-swing-recent.iml 2008-12-27 02:40:38 UTC (rev 742)
@@ -12,7 +12,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
+ <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -21,7 +21,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
+ <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Modified: libs/swing-tod/trunk/libs-swing-tod.iml
===================================================================
--- libs/swing-tod/trunk/libs-swing-tod.iml 2008-12-27 01:15:43 UTC (rev 741)
+++ libs/swing-tod/trunk/libs-swing-tod.iml 2008-12-27 02:40:38 UTC (rev 742)
@@ -9,11 +9,10 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="libs-swing-action" />
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
+ <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -22,12 +21,13 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
+ <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module" module-name="libs-swing-action" />
</component>
<component name="copyright">
<Base>
Modified: libs/swing-treetable/trunk/libs-swing-treetable.iml
===================================================================
--- libs/swing-treetable/trunk/libs-swing-treetable.iml 2008-12-27 01:15:43 UTC (rev 741)
+++ libs/swing-treetable/trunk/libs-swing-treetable.iml 2008-12-27 02:40:38 UTC (rev 742)
@@ -12,7 +12,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
+ <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -21,7 +21,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
+ <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Modified: libs/taglets/trunk/libs-taglets.iml
===================================================================
--- libs/taglets/trunk/libs-taglets.iml 2008-12-27 01:15:43 UTC (rev 741)
+++ libs/taglets/trunk/libs-taglets.iml 2008-12-27 02:40:38 UTC (rev 742)
@@ -27,7 +27,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="library" name="tools" level="application" />
</component>
<component name="copyright">
<Base>
Deleted: libs/taglets/trunk/taglets.iml
===================================================================
--- libs/taglets/trunk/taglets.iml 2008-12-27 01:15:43 UTC (rev 741)
+++ libs/taglets/trunk/taglets.iml 2008-12-27 02:40:38 UTC (rev 742)
@@ -1,196 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4" relativePaths="true" type="JAVA_MODULE">
- <component name="ModuleRootManager" />
- <component name="NewModuleRootManager" inherit-compiler-output="true">
- <exclude-output />
- <content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../Documents/Downloads/jdk1.6.0/lib/tools.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntryProperties />
- </component>
- <component name="copyright">
- <Base>
- <setting name="state" value="2" />
- </Base>
- <LanguageOptions name="$TEMPLATE$">
- <option name="templateOptions">
- <value>
- <option name="block" value="true" />
- <option name="separateBefore" value="false" />
- <option name="separateAfter" value="false" />
- <option name="prefixLines" value="true" />
- <option name="lenBefore" value="80" />
- <option name="lenAfter" value="80" />
- <option name="box" value="false" />
- <option name="filler" value=" " />
- </value>
- </option>
- <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
- <option name="keyword" value="Copyright" />
- <option name="fileTypeOverride" value="4" />
- <option name="relativeBefore" value="true" />
- <option name="addBlankAfter" value="true" />
- <option name="fileLocation" value="1" />
- <option name="useAlternate" value="false" />
- </LanguageOptions>
- <LanguageOptions name="CSS">
- <option name="templateOptions">
- <value>
- <option name="block" value="true" />
- <option name="separateBefore" value="false" />
- <option name="separateAfter" value="false" />
- <option name="prefixLines" value="true" />
- <option name="lenBefore" value="80" />
- <option name="lenAfter" value="80" />
- <option name="box" value="false" />
- <option name="filler" value=" " />
- </value>
- </option>
- <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
- <option name="keyword" value="Copyright" />
- <option name="fileTypeOverride" value="2" />
- <option name="relativeBefore" value="true" />
- <option name="addBlankAfter" value="true" />
- <option name="fileLocation" value="1" />
- <option name="useAlternate" value="false" />
- </LanguageOptions>
- <LanguageOptions name="HTML">
- <option name="templateOptions">
- <value>
- <option name="block" value="true" />
- <option name="separateBefore" value="false" />
- <option name="separateAfter" value="false" />
- <option name="prefixLines" value="true" />
- <option name="lenBefore" value="80" />
- <option name="lenAfter" value="80" />
- <option name="box" value="false" />
- <option name="filler" value=" " />
- </value>
- </option>
- <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
- <option name="keyword" value="Copyright" />
- <option name="fileTypeOverride" value="2" />
- <option name="relativeBefore" value="true" />
- <option name="addBlankAfter" value="true" />
- <option name="fileLocation" value="1" />
- <option name="useAlternate" value="false" />
- </LanguageOptions>
- <LanguageOptions name="JAVA">
- <option name="templateOptions">
- <value>
- <option name="block" value="true" />
- <option name="separateBefore" value="false" />
- <option name="separateAfter" value="false" />
- <option name="prefixLines" value="true" />
- <option name="lenBefore" value="80" />
- <option name="lenAfter" value="80" />
- <option name="box" value="false" />
- <option name="filler" value=" " />
- </value>
- </option>
- <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
- <option name="keyword" value="Copyright" />
- <option name="fileTypeOverride" value="2" />
- <option name="relativeBefore" value="true" />
- <option name="addBlankAfter" value="true" />
- <option name="fileLocation" value="1" />
- <option name="useAlternate" value="false" />
- </LanguageOptions>
- <LanguageOptions name="JSP">
- <option name="templateOptions">
- <value>
- <option name="block" value="true" />
- <option name="separateBefore" value="false" />
- <option name="separateAfter" value="false" />
- <option name="prefixLines" value="true" />
- <option name="lenBefore" value="80" />
- <option name="lenAfter" value="80" />
- <option name="box" value="false" />
- <option name="filler" value=" " />
- </value>
- </option>
- <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
- <option name="keyword" value="Copyright" />
- <option name="fileTypeOverride" value="2" />
- <option name="relativeBefore" value="true" />
- <option name="addBlankAfter" value="true" />
- <option name="fileLocation" value="1" />
- <option name="useAlternate" value="false" />
- </LanguageOptions>
- <LanguageOptions name="JavaScript">
- <option name="templateOptions">
- <value>
- <option name="block" value="true" />
- <option name="separateBefore" value="false" />
- <option name="separateAfter" value="false" />
- <option name="prefixLines" value="true" />
- <option name="lenBefore" value="80" />
- <option name="lenAfter" value="80" />
- <option name="box" value="false" />
- <option name="filler" value=" " />
- </value>
- </option>
- <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
- <option name="keyword" value="Copyright" />
- <option name="fileTypeOverride" value="2" />
- <option name="relativeBefore" value="true" />
- <option name="addBlankAfter" value="true" />
- <option name="fileLocation" value="1" />
- <option name="useAlternate" value="false" />
- </LanguageOptions>
- <LanguageOptions name="Properties">
- <option name="templateOptions">
- <value>
- <option name="block" value="true" />
- <option name="separateBefore" value="false" />
- <option name="separateAfter" value="false" />
- <option name="prefixLines" value="true" />
- <option name="lenBefore" value="80" />
- <option name="lenAfter" value="80" />
- <option name="box" value="false" />
- <option name="filler" value=" " />
- </value>
- </option>
- <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
- <option name="keyword" value="Copyright" />
- <option name="fileTypeOverride" value="2" />
- <option name="relativeBefore" value="true" />
- <option name="addBlankAfter" value="true" />
- <option name="fileLocation" value="1" />
- <option name="useAlternate" value="false" />
- </LanguageOptions>
- <LanguageOptions name="XML">
- <option name="templateOptions">
- <value>
- <option name="block" value="true" />
- <option name="separateBefore" value="false" />
- <option name="separateAfter" value="false" />
- <option name="prefixLines" value="true" />
- <option name="lenBefore" value="80" />
- <option name="lenAfter" value="80" />
- <option name="box" value="false" />
- <option name="filler" value=" " />
- </value>
- </option>
- <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
- <option name="keyword" value="Copyright" />
- <option name="fileTypeOverride" value="2" />
- <option name="relativeBefore" value="true" />
- <option name="addBlankAfter" value="true" />
- <option name="fileLocation" value="1" />
- <option name="useAlternate" value="false" />
- </LanguageOptions>
- </component>
-</module>
-
Modified: libs/util/trunk/libs-util.iml
===================================================================
--- libs/util/trunk/libs-util.iml 2008-12-27 01:15:43 UTC (rev 741)
+++ libs/util/trunk/libs-util.iml 2008-12-27 02:40:38 UTC (rev 742)
@@ -12,7 +12,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
+ <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -21,7 +21,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
+ <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Modified: progs/batcher/trunk/Batcher.iml
===================================================================
--- progs/batcher/trunk/Batcher.iml 2008-12-27 01:15:43 UTC (rev 741)
+++ progs/batcher/trunk/Batcher.iml 2008-12-27 02:40:38 UTC (rev 742)
@@ -3,13 +3,39 @@
<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" />
+ <sourceFolder url="file://$MODULE_DIR$/src/tst" isTestSource="true" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="annotations" level="project" />
- <orderEntry type="library" name="jlfgr-1_0" level="project" />
- <orderEntry type="library" name="junit" level="project" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/common/lib/jlfgr-1_0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntry type="module" module-name="libs-swing-about" />
<orderEntry type="module" module-name="libs-swing-action" />
</component>
Property changes on: progs/batcher/trunk/src/prj/net
___________________________________________________________________
Added: svn:mergeinfo
+
Modified: progs/cardlearn/trunk/cardlearn.iml
===================================================================
--- progs/cardlearn/trunk/cardlearn.iml 2008-12-27 01:15:43 UTC (rev 741)
+++ progs/cardlearn/trunk/cardlearn.iml 2008-12-27 02:40:38 UTC (rev 742)
@@ -9,8 +9,24 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="annotations" level="project" />
- <orderEntry type="library" name="junit" level="project" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
</component>
</module>
Modified: progs/jeduca/trunk/JEduca.iml
===================================================================
--- progs/jeduca/trunk/JEduca.iml 2008-12-27 01:15:43 UTC (rev 741)
+++ progs/jeduca/trunk/JEduca.iml 2008-12-27 02:40:38 UTC (rev 742)
@@ -9,17 +9,41 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/common/lib/jlfgr-1_0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module" module-name="libs-swing-about" />
<orderEntry type="module" module-name="libs-swing-action" />
+ <orderEntry type="module" module-name="libs-swing-app" />
+ <orderEntry type="module" module-name="libs-swing-bookmarks" />
<orderEntry type="module" module-name="libs-swing-extlib" />
- <orderEntry type="module" module-name="libs-swing-bookmarks" />
- <orderEntry type="module" module-name="libs-swing-app" />
- <orderEntry type="module" module-name="libs-xml" />
- <orderEntry type="library" name="annotations" level="project" />
- <orderEntry type="library" name="jlfgr-1_0" level="project" />
- <orderEntry type="library" name="junit" level="project" />
- <orderEntry type="module" module-name="libs-swing-about" />
<orderEntry type="module" module-name="libs-swing-prefs" />
<orderEntry type="module" module-name="libs-swing-recent" />
+ <orderEntry type="module" module-name="libs-xml" />
</component>
<component name="copyright">
<Base>
Modified: progs/jhexedit/trunk/jhexedit.iml
===================================================================
--- progs/jhexedit/trunk/jhexedit.iml 2008-12-27 01:15:43 UTC (rev 741)
+++ progs/jhexedit/trunk/jhexedit.iml 2008-12-27 02:40:38 UTC (rev 742)
@@ -9,9 +9,25 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntry type="module" module-name="libs-argparser" />
- <orderEntry type="library" name="annotations" level="project" />
- <orderEntry type="library" name="junit" level="project" />
<orderEntry type="module" module-name="libs-swing-app" />
</component>
</module>
Modified: progs/jhexview/trunk/jhexview.iml
===================================================================
--- progs/jhexview/trunk/jhexview.iml 2008-12-27 01:15:43 UTC (rev 741)
+++ progs/jhexview/trunk/jhexview.iml 2008-12-27 02:40:38 UTC (rev 742)
@@ -9,8 +9,24 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="annotations" level="project" />
- <orderEntry type="library" name="junit" level="project" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntry type="module" module-name="libs-argparser" />
<orderEntry type="module" module-name="libs-swing-app" />
</component>
Modified: progs/jirus/trunk/jirus.iml
===================================================================
--- progs/jirus/trunk/jirus.iml 2008-12-27 01:15:43 UTC (rev 741)
+++ progs/jirus/trunk/jirus.iml 2008-12-27 02:40:38 UTC (rev 742)
@@ -9,10 +9,34 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/common/lib/jlfgr-1_0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntry type="module" module-name="libs-argparser" />
- <orderEntry type="library" name="annotations" level="project" />
- <orderEntry type="library" name="junit" level="project" />
- <orderEntry type="library" name="jlfgr-1_0" level="project" />
<orderEntry type="module" module-name="midi" />
</component>
</module>
Modified: progs/jtype/trunk/jtype.iml
===================================================================
--- progs/jtype/trunk/jtype.iml 2008-12-27 01:15:43 UTC (rev 741)
+++ progs/jtype/trunk/jtype.iml 2008-12-27 02:40:38 UTC (rev 742)
@@ -9,8 +9,24 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="annotations" level="project" />
- <orderEntry type="library" name="junit" level="project" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntry type="module" module-name="libs-swing-action" />
</component>
</module>
Modified: progs/midilearn/trunk/midilearn.iml
===================================================================
--- progs/midilearn/trunk/midilearn.iml 2008-12-27 01:15:43 UTC (rev 741)
+++ progs/midilearn/trunk/midilearn.iml 2008-12-27 02:40:38 UTC (rev 742)
@@ -9,8 +9,24 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="annotations" level="project" />
- <orderEntry type="library" name="junit" level="project" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
</component>
</module>
Modified: progs/textedit/trunk/textedit.iml
===================================================================
--- progs/textedit/trunk/textedit.iml 2008-12-27 01:15:43 UTC (rev 741)
+++ progs/textedit/trunk/textedit.iml 2008-12-27 02:40:38 UTC (rev 742)
@@ -9,8 +9,24 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="annotations" level="project" />
- <orderEntry type="library" name="junit" level="project" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntry type="module" module-name="libs-argparser" />
<orderEntry type="module" module-name="libs-swing-app" />
</component>
Modified: tools/archStat/trunk/archStat.iml
===================================================================
--- tools/archStat/trunk/archStat.iml 2008-12-27 01:15:43 UTC (rev 741)
+++ tools/archStat/trunk/archStat.iml 2008-12-27 02:40:38 UTC (rev 742)
@@ -9,8 +9,24 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="annotations" level="project" />
- <orderEntry type="library" name="junit" level="project" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntry type="module" module-name="libs-argparser" />
</component>
</module>
Modified: tools/cstyle/trunk/cstyle.iml
===================================================================
--- tools/cstyle/trunk/cstyle.iml 2008-12-27 01:15:43 UTC (rev 741)
+++ tools/cstyle/trunk/cstyle.iml 2008-12-27 02:40:38 UTC (rev 742)
@@ -12,7 +12,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
+ <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -21,7 +21,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
+ <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Modified: tools/dircount/trunk/dircount.iml
===================================================================
--- tools/dircount/trunk/dircount.iml 2008-12-27 01:15:43 UTC (rev 741)
+++ tools/dircount/trunk/dircount.iml 2008-12-27 02:40:38 UTC (rev 742)
@@ -9,9 +9,25 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntry type="module" module-name="libs-argparser" />
- <orderEntry type="library" name="annotations" level="project" />
- <orderEntry type="library" name="junit" level="project" />
</component>
<component name="copyright">
<Base>
Modified: tools/findLongestPath/trunk/findLongestPath.iml
===================================================================
--- tools/findLongestPath/trunk/findLongestPath.iml 2008-12-27 01:15:43 UTC (rev 741)
+++ tools/findLongestPath/trunk/findLongestPath.iml 2008-12-27 02:40:38 UTC (rev 742)
@@ -12,7 +12,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
+ <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -21,7 +21,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
+ <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Modified: tools/gdbControl/trunk/gdbControl.iml
===================================================================
--- tools/gdbControl/trunk/gdbControl.iml 2008-12-27 01:15:43 UTC (rev 741)
+++ tools/gdbControl/trunk/gdbControl.iml 2008-12-27 02:40:38 UTC (rev 742)
@@ -9,8 +9,24 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="annotations" level="project" />
- <orderEntry type="library" name="junit" level="project" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
</component>
</module>
Modified: tools/jgrep/trunk/jgrep.iml
===================================================================
--- tools/jgrep/trunk/jgrep.iml 2008-12-27 01:15:43 UTC (rev 741)
+++ tools/jgrep/trunk/jgrep.iml 2008-12-27 02:40:38 UTC (rev 742)
@@ -9,8 +9,24 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="annotations" level="project" />
- <orderEntry type="library" name="junit" level="project" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntry type="module" module-name="libs-argparser" />
</component>
</module>
Modified: tools/mail/trunk/mail.iml
===================================================================
--- tools/mail/trunk/mail.iml 2008-12-27 01:15:43 UTC (rev 741)
+++ tools/mail/trunk/mail.iml 2008-12-27 02:40:38 UTC (rev 742)
@@ -9,8 +9,25 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntry type="module" module-name="libs-argparser" />
- <orderEntry type="library" name="annotations" level="project" />
</component>
</module>
Modified: tools/midiDeviceLister/trunk/midiDeviceLister.iml
===================================================================
--- tools/midiDeviceLister/trunk/midiDeviceLister.iml 2008-12-27 01:15:43 UTC (rev 741)
+++ tools/midiDeviceLister/trunk/midiDeviceLister.iml 2008-12-27 02:40:38 UTC (rev 742)
@@ -9,9 +9,25 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntry type="module" module-name="libs-argparser" />
- <orderEntry type="library" name="annotations" level="project" />
- <orderEntry type="library" name="junit" level="project" />
</component>
</module>
Modified: tools/midiMonitor/trunk/midiMonitor.iml
===================================================================
--- tools/midiMonitor/trunk/midiMonitor.iml 2008-12-27 01:15:43 UTC (rev 741)
+++ tools/midiMonitor/trunk/midiMonitor.iml 2008-12-27 02:40:38 UTC (rev 742)
@@ -9,9 +9,25 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntry type="module" module-name="libs-argparser" />
- <orderEntry type="library" name="annotations" level="project" />
- <orderEntry type="library" name="junit" level="project" />
<orderEntry type="module" module-name="midi" />
</component>
</module>
Modified: tools/replacer/trunk/replacer.iml
===================================================================
--- tools/replacer/trunk/replacer.iml 2008-12-27 01:15:43 UTC (rev 741)
+++ tools/replacer/trunk/replacer.iml 2008-12-27 02:40:38 UTC (rev 742)
@@ -9,8 +9,24 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="annotations" level="project" />
- <orderEntry type="library" name="junit" level="project" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntry type="module" module-name="libs-argparser" />
</component>
</module>
Modified: tools/scriptEngineLister/trunk/scriptEngineLister.iml
===================================================================
--- tools/scriptEngineLister/trunk/scriptEngineLister.iml 2008-12-27 01:15:43 UTC (rev 741)
+++ tools/scriptEngineLister/trunk/scriptEngineLister.iml 2008-12-27 02:40:38 UTC (rev 742)
@@ -9,8 +9,24 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="annotations" level="project" />
- <orderEntry type="library" name="junit" level="project" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntry type="module" module-name="libs-argparser" />
</component>
</module>
Modified: tools/scriptInterpreter/trunk/scriptInterpreter.iml
===================================================================
--- tools/scriptInterpreter/trunk/scriptInterpreter.iml 2008-12-27 01:15:43 UTC (rev 741)
+++ tools/scriptInterpreter/trunk/scriptInterpreter.iml 2008-12-27 02:40:38 UTC (rev 742)
@@ -9,8 +9,24 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="annotations" level="project" />
- <orderEntry type="library" name="junit" level="project" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntry type="module" module-name="libs-argparser" />
</component>
</module>
Modified: tools/string2bytes/trunk/string2bytes.iml
===================================================================
--- tools/string2bytes/trunk/string2bytes.iml 2008-12-27 01:15:43 UTC (rev 741)
+++ tools/string2bytes/trunk/string2bytes.iml 2008-12-27 02:40:38 UTC (rev 742)
@@ -9,10 +9,26 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntry type="module" module-name="libs-swing-action" />
<orderEntry type="module" module-name="libs-swing-about" />
- <orderEntry type="library" name="annotations" level="project" />
- <orderEntry type="library" name="junit" level="project" />
</component>
<component name="copyright">
<Base>
Modified: tools/todoScanner/trunk/todoScanner.iml
===================================================================
--- tools/todoScanner/trunk/todoScanner.iml 2008-12-27 01:15:43 UTC (rev 741)
+++ tools/todoScanner/trunk/todoScanner.iml 2008-12-27 02:40:38 UTC (rev 742)
@@ -9,9 +9,25 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/common/lib/annotations.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/common/lib/junit.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntry type="module" module-name="libs-argparser" />
- <orderEntry type="library" name="annotations" level="project" />
- <orderEntry type="library" name="junit" level="project" />
</component>
</module>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-12-27 01:15:50
|
Revision: 741
http://japi.svn.sourceforge.net/japi/?rev=741&view=rev
Author: christianhujer
Date: 2008-12-27 01:15:43 +0000 (Sat, 27 Dec 2008)
Log Message:
-----------
Update project so it is loadable without warnings in IntelliJ IDEA again.
Modified Paths:
--------------
common/trunk/common.iml
games/jmines/trunk/jmines.iml
historic/trunk/historic.iml
japi.ipr
libs/argparser/trunk/libs-argparser.iml
libs/finance/trunk/libs-finance.iml
libs/io/trunk/libs-io.iml
libs/lang/trunk/libs-lang.iml
libs/logging/trunk/libs-logging.iml
libs/midi/trunk/midi.iml
libs/net/trunk/libs-net.iml
libs/registry/trunk/libs-registry.iml
libs/swing-about/trunk/libs-swing-about.iml
libs/swing-action/trunk/libs-swing-action.iml
libs/swing-app/trunk/libs-swing-app.iml
libs/swing-bookmarks/trunk/libs-swing-bookmarks.iml
libs/swing-extlib/trunk/libs-swing-extlib.iml
libs/swing-font/trunk/libs-swing-font.iml
libs/swing-keyprefs/trunk/libs-swing-keyprefs.iml
libs/swing-list/trunk/libs-swing-list.iml
libs/swing-misc/trunk/libs-swing-misc.iml
libs/swing-prefs/trunk/libs-swing-prefs.iml
libs/swing-proxyprefs/trunk/libs-swing-proxyprefs.iml
libs/swing-recent/trunk/libs-swing-recent.iml
libs/swing-tod/trunk/libs-swing-tod.iml
libs/swing-treetable/trunk/libs-swing-treetable.iml
libs/taglets/trunk/libs-taglets.iml
libs/util/trunk/libs-util.iml
libs/xml/trunk/libs-xml.iml
progs/batcher/trunk/Batcher.iml
progs/cardlearn/trunk/cardlearn.iml
progs/jeduca/trunk/JEduca.iml
progs/jhexedit/trunk/jhexedit.iml
progs/jhexview/trunk/jhexview.iml
progs/jirus/trunk/jirus.iml
progs/jtype/trunk/jtype.iml
progs/midilearn/trunk/midilearn.iml
progs/textedit/trunk/textedit.iml
site/trunk/site.iml
tools/archStat/trunk/archStat.iml
tools/cstyle/trunk/cstyle.iml
tools/dircount/trunk/dircount.iml
tools/findLongestPath/trunk/findLongestPath.iml
tools/fontbrowser/trunk/fontbrowser.iml
tools/gdbControl/trunk/gdbControl.iml
tools/jgrep/trunk/jgrep.iml
tools/jwget/trunk/jwget.iml
tools/keystrokes/trunk/keystrokes.iml
tools/mail/trunk/mail.iml
tools/midiDeviceLister/trunk/midiDeviceLister.iml
tools/midiMonitor/trunk/midiMonitor.iml
tools/prefsbrowser/trunk/prefsbrowser.iml
tools/replacer/trunk/replacer.iml
tools/scriptEngineLister/trunk/scriptEngineLister.iml
tools/scriptInterpreter/trunk/scriptInterpreter.iml
tools/string2bytes/trunk/string2bytes.iml
tools/todoScanner/trunk/todoScanner.iml
Added Paths:
-----------
tools/scriptEngineLister/trunk/
Removed Paths:
-------------
tools/scriptEngineLister/trunkbak/
Modified: common/trunk/common.iml
===================================================================
--- common/trunk/common.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ common/trunk/common.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -6,7 +6,6 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="annotations" level="project" />
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: games/jmines/trunk/jmines.iml
===================================================================
--- games/jmines/trunk/jmines.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ games/jmines/trunk/jmines.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -10,7 +10,6 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="libs-swing-action" />
- <orderEntryProperties />
</component>
</module>
Modified: historic/trunk/historic.iml
===================================================================
--- historic/trunk/historic.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ historic/trunk/historic.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -24,7 +24,6 @@
<orderEntry type="module" module-name="libs-swing-prefs" />
<orderEntry type="library" name="junit" level="project" />
<orderEntry type="module" module-name="libs-xml" />
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: japi.ipr
===================================================================
--- japi.ipr 2008-12-26 18:26:50 UTC (rev 740)
+++ japi.ipr 2008-12-27 01:15:43 UTC (rev 741)
@@ -63,6 +63,15 @@
<option name="HTML_ELEMENTS_TO_INSERT_NEW_LINE_BEFORE" value="" />
<option name="HTML_DO_NOT_INDENT_CHILDREN_OF" value="" />
<option name="ENUM_CONSTANTS_WRAP" value="2" />
+ <ADDITIONAL_INDENT_OPTIONS fileType="java">
+ <option name="INDENT_SIZE" value="4" />
+ <option name="CONTINUATION_INDENT_SIZE" value="8" />
+ <option name="TAB_SIZE" value="8" />
+ <option name="USE_TAB_CHARACTER" value="false" />
+ <option name="SMART_TABS" value="false" />
+ <option name="LABEL_INDENT_SIZE" value="0" />
+ <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+ </ADDITIONAL_INDENT_OPTIONS>
<ADDITIONAL_INDENT_OPTIONS fileType="js">
<option name="INDENT_SIZE" value="4" />
<option name="CONTINUATION_INDENT_SIZE" value="8" />
@@ -72,6 +81,24 @@
<option name="LABEL_INDENT_SIZE" value="0" />
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
</ADDITIONAL_INDENT_OPTIONS>
+ <ADDITIONAL_INDENT_OPTIONS fileType="jsp">
+ <option name="INDENT_SIZE" value="4" />
+ <option name="CONTINUATION_INDENT_SIZE" value="8" />
+ <option name="TAB_SIZE" value="4" />
+ <option name="USE_TAB_CHARACTER" value="false" />
+ <option name="SMART_TABS" value="false" />
+ <option name="LABEL_INDENT_SIZE" value="0" />
+ <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+ </ADDITIONAL_INDENT_OPTIONS>
+ <ADDITIONAL_INDENT_OPTIONS fileType="xml">
+ <option name="INDENT_SIZE" value="4" />
+ <option name="CONTINUATION_INDENT_SIZE" value="8" />
+ <option name="TAB_SIZE" value="4" />
+ <option name="USE_TAB_CHARACTER" value="false" />
+ <option name="SMART_TABS" value="false" />
+ <option name="LABEL_INDENT_SIZE" value="0" />
+ <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+ </ADDITIONAL_INDENT_OPTIONS>
</value>
</option>
<option name="USE_PER_PROJECT_SETTINGS" value="true" />
@@ -118,6 +145,7 @@
<option name="ADDITIONAL_OPTIONS_STRING" value="" />
<option name="MAXIMUM_HEAP_SIZE" value="128" />
</component>
+ <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
<component name="EntryPointsManager">
<entry_points version="2.0" />
</component>
@@ -204,9 +232,7 @@
<inspection_tool class="ClassNameDiffersFromFileName" level="WARNING" enabled="true" />
<inspection_tool class="ClassInTopLevelPackage" level="WARNING" enabled="true" />
<inspection_tool class="MissingDeprecatedAnnotation" level="WARNING" enabled="true" />
- <inspection_tool class="MissingOverrideAnnotation" level="WARNING" enabled="true">
- <option name="useJdk6Rules" value="false" />
- </inspection_tool>
+ <inspection_tool class="MissingOverrideAnnotation" level="WARNING" enabled="true" />
<inspection_tool class="CloneableImplementsClone" level="WARNING" enabled="true">
<option name="m_ignoreCloneableDueToInheritance" value="true" />
</inspection_tool>
@@ -232,6 +258,7 @@
</inspection_tool>
<inspection_tool class="TypeMayBeWeakened" level="WARNING" enabled="true">
<option name="useRighthandTypeAsWeakestTypeInAssignments" value="true" />
+ <option name="useParameterizedTypeForCollectionMethods" value="true" />
</inspection_tool>
<inspection_tool class="FinalMethodInFinalClass" level="WARNING" enabled="true" />
<inspection_tool class="MultipleTopLevelClassesInFile" level="WARNING" enabled="true" />
@@ -627,6 +654,9 @@
</item>
</group>
</component>
+ <component name="ProjectDetails">
+ <option name="projectName" value="japi" />
+ </component>
<component name="ProjectFileVersion" converted="true" />
<component name="ProjectModuleManager">
<modules>
@@ -641,7 +671,7 @@
<module fileurl="file://$PROJECT_DIR$/tools/fontbrowser/trunk/fontbrowser.iml" filepath="$PROJECT_DIR$/tools/fontbrowser/trunk/fontbrowser.iml" group="tools" />
<module fileurl="file://$PROJECT_DIR$/tools/gdbControl/trunk/gdbControl.iml" filepath="$PROJECT_DIR$/tools/gdbControl/trunk/gdbControl.iml" group="tools" />
<module fileurl="file://$PROJECT_DIR$/historic/trunk/historic.iml" filepath="$PROJECT_DIR$/historic/trunk/historic.iml" />
- <module fileurl="file://$PROJECT_DIR$/tools/jgrep/jgrep/jgrep.iml" filepath="$PROJECT_DIR$/tools/jgrep/jgrep/jgrep.iml" group="tools" />
+ <module fileurl="file://$PROJECT_DIR$/tools/jgrep/trunk/jgrep.iml" filepath="$PROJECT_DIR$/tools/jgrep/trunk/jgrep.iml" group="tools" />
<module fileurl="file://$PROJECT_DIR$/progs/jhexedit/trunk/jhexedit.iml" filepath="$PROJECT_DIR$/progs/jhexedit/trunk/jhexedit.iml" group="progs" />
<module fileurl="file://$PROJECT_DIR$/progs/jhexview/trunk/jhexview.iml" filepath="$PROJECT_DIR$/progs/jhexview/trunk/jhexview.iml" group="progs" />
<module fileurl="file://$PROJECT_DIR$/progs/jirus/trunk/jirus.iml" filepath="$PROJECT_DIR$/progs/jirus/trunk/jirus.iml" group="progs" />
@@ -688,11 +718,11 @@
<module fileurl="file://$PROJECT_DIR$/tools/todoScanner/trunk/todoScanner.iml" filepath="$PROJECT_DIR$/tools/todoScanner/trunk/todoScanner.iml" group="tools" />
</modules>
</component>
- <component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="true" project-jdk-name="latest" project-jdk-type="JavaSDK">
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_5" assert-keyword="true" jdk-15="true" project-jdk-name="latest" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/classes" />
</component>
<component name="ProjectRunConfigurationManager">
- <configuration default="false" name="JEduca" type="Application" factoryName="Application" enabled="false" merge="false">
+ <configuration default="false" name="JEduca" type="Application" factoryName="Application" enabled="false" merge="false" runner="emma">
<option name="MAIN_CLASS_NAME" value="net.sf.japi.progs.jeduca.jtest.Main" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="" />
@@ -725,6 +755,9 @@
<option name="GENERATE_IIOP_STUBS" value="false" />
<option name="ADDITIONAL_OPTIONS_STRING" value="" />
</component>
+ <component name="SvnBranchConfigurationManager">
+ <option name="myVersion" value="124" />
+ </component>
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="svn" />
</component>
Modified: libs/argparser/trunk/libs-argparser.iml
===================================================================
--- libs/argparser/trunk/libs-argparser.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ libs/argparser/trunk/libs-argparser.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -27,7 +27,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: libs/finance/trunk/libs-finance.iml
===================================================================
--- libs/finance/trunk/libs-finance.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ libs/finance/trunk/libs-finance.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -27,7 +27,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: libs/io/trunk/libs-io.iml
===================================================================
--- libs/io/trunk/libs-io.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ libs/io/trunk/libs-io.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -27,7 +27,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: libs/lang/trunk/libs-lang.iml
===================================================================
--- libs/lang/trunk/libs-lang.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ libs/lang/trunk/libs-lang.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -27,7 +27,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: libs/logging/trunk/libs-logging.iml
===================================================================
--- libs/logging/trunk/libs-logging.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ libs/logging/trunk/libs-logging.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -27,7 +27,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: libs/midi/trunk/midi.iml
===================================================================
--- libs/midi/trunk/midi.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ libs/midi/trunk/midi.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -12,7 +12,6 @@
<orderEntry type="library" name="annotations" level="project" />
<orderEntry type="library" name="junit" level="project" />
<orderEntry type="module" module-name="libs-swing-action" />
- <orderEntryProperties />
</component>
</module>
Modified: libs/net/trunk/libs-net.iml
===================================================================
--- libs/net/trunk/libs-net.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ libs/net/trunk/libs-net.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -28,7 +28,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: libs/registry/trunk/libs-registry.iml
===================================================================
--- libs/registry/trunk/libs-registry.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ libs/registry/trunk/libs-registry.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -27,7 +27,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: libs/swing-about/trunk/libs-swing-about.iml
===================================================================
--- libs/swing-about/trunk/libs-swing-about.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ libs/swing-about/trunk/libs-swing-about.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -28,7 +28,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: libs/swing-action/trunk/libs-swing-action.iml
===================================================================
--- libs/swing-action/trunk/libs-swing-action.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ libs/swing-action/trunk/libs-swing-action.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -28,7 +28,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: libs/swing-app/trunk/libs-swing-app.iml
===================================================================
--- libs/swing-app/trunk/libs-swing-app.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ libs/swing-app/trunk/libs-swing-app.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -32,7 +32,6 @@
<orderEntry type="module" module-name="libs-swing-about" />
<orderEntry type="module" module-name="libs-swing-extlib" />
<orderEntry type="module" module-name="libs-argparser" />
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: libs/swing-bookmarks/trunk/libs-swing-bookmarks.iml
===================================================================
--- libs/swing-bookmarks/trunk/libs-swing-bookmarks.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ libs/swing-bookmarks/trunk/libs-swing-bookmarks.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -30,7 +30,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: libs/swing-extlib/trunk/libs-swing-extlib.iml
===================================================================
--- libs/swing-extlib/trunk/libs-swing-extlib.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ libs/swing-extlib/trunk/libs-swing-extlib.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -27,7 +27,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: libs/swing-font/trunk/libs-swing-font.iml
===================================================================
--- libs/swing-font/trunk/libs-swing-font.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ libs/swing-font/trunk/libs-swing-font.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -28,7 +28,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: libs/swing-keyprefs/trunk/libs-swing-keyprefs.iml
===================================================================
--- libs/swing-keyprefs/trunk/libs-swing-keyprefs.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ libs/swing-keyprefs/trunk/libs-swing-keyprefs.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -30,7 +30,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: libs/swing-list/trunk/libs-swing-list.iml
===================================================================
--- libs/swing-list/trunk/libs-swing-list.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ libs/swing-list/trunk/libs-swing-list.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -28,7 +28,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: libs/swing-misc/trunk/libs-swing-misc.iml
===================================================================
--- libs/swing-misc/trunk/libs-swing-misc.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ libs/swing-misc/trunk/libs-swing-misc.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -28,7 +28,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: libs/swing-prefs/trunk/libs-swing-prefs.iml
===================================================================
--- libs/swing-prefs/trunk/libs-swing-prefs.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ libs/swing-prefs/trunk/libs-swing-prefs.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -29,7 +29,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: libs/swing-proxyprefs/trunk/libs-swing-proxyprefs.iml
===================================================================
--- libs/swing-proxyprefs/trunk/libs-swing-proxyprefs.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ libs/swing-proxyprefs/trunk/libs-swing-proxyprefs.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -29,7 +29,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: libs/swing-recent/trunk/libs-swing-recent.iml
===================================================================
--- libs/swing-recent/trunk/libs-swing-recent.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ libs/swing-recent/trunk/libs-swing-recent.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -29,7 +29,6 @@
</orderEntry>
<orderEntry type="module" module-name="libs-swing-action" />
<orderEntry type="module" module-name="libs-swing-app" />
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: libs/swing-tod/trunk/libs-swing-tod.iml
===================================================================
--- libs/swing-tod/trunk/libs-swing-tod.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ libs/swing-tod/trunk/libs-swing-tod.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -28,7 +28,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: libs/swing-treetable/trunk/libs-swing-treetable.iml
===================================================================
--- libs/swing-treetable/trunk/libs-swing-treetable.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ libs/swing-treetable/trunk/libs-swing-treetable.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -27,7 +27,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: libs/taglets/trunk/libs-taglets.iml
===================================================================
--- libs/taglets/trunk/libs-taglets.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ libs/taglets/trunk/libs-taglets.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -28,7 +28,6 @@
</library>
</orderEntry>
<orderEntry type="library" name="tools" level="application" />
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: libs/util/trunk/libs-util.iml
===================================================================
--- libs/util/trunk/libs-util.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ libs/util/trunk/libs-util.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -27,7 +27,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: libs/xml/trunk/libs-xml.iml
===================================================================
--- libs/xml/trunk/libs-xml.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ libs/xml/trunk/libs-xml.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -27,7 +27,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: progs/batcher/trunk/Batcher.iml
===================================================================
--- progs/batcher/trunk/Batcher.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ progs/batcher/trunk/Batcher.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -12,7 +12,6 @@
<orderEntry type="library" name="junit" level="project" />
<orderEntry type="module" module-name="libs-swing-about" />
<orderEntry type="module" module-name="libs-swing-action" />
- <orderEntryProperties />
</component>
</module>
Modified: progs/cardlearn/trunk/cardlearn.iml
===================================================================
--- progs/cardlearn/trunk/cardlearn.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ progs/cardlearn/trunk/cardlearn.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -11,7 +11,6 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="annotations" level="project" />
<orderEntry type="library" name="junit" level="project" />
- <orderEntryProperties />
</component>
</module>
Modified: progs/jeduca/trunk/JEduca.iml
===================================================================
--- progs/jeduca/trunk/JEduca.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ progs/jeduca/trunk/JEduca.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -20,7 +20,6 @@
<orderEntry type="module" module-name="libs-swing-about" />
<orderEntry type="module" module-name="libs-swing-prefs" />
<orderEntry type="module" module-name="libs-swing-recent" />
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: progs/jhexedit/trunk/jhexedit.iml
===================================================================
--- progs/jhexedit/trunk/jhexedit.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ progs/jhexedit/trunk/jhexedit.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -13,7 +13,6 @@
<orderEntry type="library" name="annotations" level="project" />
<orderEntry type="library" name="junit" level="project" />
<orderEntry type="module" module-name="libs-swing-app" />
- <orderEntryProperties />
</component>
</module>
Modified: progs/jhexview/trunk/jhexview.iml
===================================================================
--- progs/jhexview/trunk/jhexview.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ progs/jhexview/trunk/jhexview.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -13,7 +13,6 @@
<orderEntry type="library" name="junit" level="project" />
<orderEntry type="module" module-name="libs-argparser" />
<orderEntry type="module" module-name="libs-swing-app" />
- <orderEntryProperties />
</component>
</module>
Modified: progs/jirus/trunk/jirus.iml
===================================================================
--- progs/jirus/trunk/jirus.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ progs/jirus/trunk/jirus.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -14,7 +14,6 @@
<orderEntry type="library" name="junit" level="project" />
<orderEntry type="library" name="jlfgr-1_0" level="project" />
<orderEntry type="module" module-name="midi" />
- <orderEntryProperties />
</component>
</module>
Modified: progs/jtype/trunk/jtype.iml
===================================================================
--- progs/jtype/trunk/jtype.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ progs/jtype/trunk/jtype.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -12,7 +12,6 @@
<orderEntry type="library" name="annotations" level="project" />
<orderEntry type="library" name="junit" level="project" />
<orderEntry type="module" module-name="libs-swing-action" />
- <orderEntryProperties />
</component>
</module>
Modified: progs/midilearn/trunk/midilearn.iml
===================================================================
--- progs/midilearn/trunk/midilearn.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ progs/midilearn/trunk/midilearn.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -11,7 +11,6 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="annotations" level="project" />
<orderEntry type="library" name="junit" level="project" />
- <orderEntryProperties />
</component>
</module>
Modified: progs/textedit/trunk/textedit.iml
===================================================================
--- progs/textedit/trunk/textedit.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ progs/textedit/trunk/textedit.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -13,7 +13,6 @@
<orderEntry type="library" name="junit" level="project" />
<orderEntry type="module" module-name="libs-argparser" />
<orderEntry type="module" module-name="libs-swing-app" />
- <orderEntryProperties />
</component>
</module>
Modified: site/trunk/site.iml
===================================================================
--- site/trunk/site.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ site/trunk/site.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -8,7 +8,6 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="annotations" level="project" />
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: tools/archStat/trunk/archStat.iml
===================================================================
--- tools/archStat/trunk/archStat.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ tools/archStat/trunk/archStat.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -12,7 +12,6 @@
<orderEntry type="library" name="annotations" level="project" />
<orderEntry type="library" name="junit" level="project" />
<orderEntry type="module" module-name="libs-argparser" />
- <orderEntryProperties />
</component>
</module>
Modified: tools/cstyle/trunk/cstyle.iml
===================================================================
--- tools/cstyle/trunk/cstyle.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ tools/cstyle/trunk/cstyle.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -28,7 +28,6 @@
</library>
</orderEntry>
<orderEntry type="module" module-name="libs-argparser" />
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: tools/dircount/trunk/dircount.iml
===================================================================
--- tools/dircount/trunk/dircount.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ tools/dircount/trunk/dircount.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -12,7 +12,6 @@
<orderEntry type="module" module-name="libs-argparser" />
<orderEntry type="library" name="annotations" level="project" />
<orderEntry type="library" name="junit" level="project" />
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: tools/findLongestPath/trunk/findLongestPath.iml
===================================================================
--- tools/findLongestPath/trunk/findLongestPath.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ tools/findLongestPath/trunk/findLongestPath.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -28,7 +28,6 @@
</library>
</orderEntry>
<orderEntry type="module" module-name="libs-argparser" />
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: tools/fontbrowser/trunk/fontbrowser.iml
===================================================================
--- tools/fontbrowser/trunk/fontbrowser.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ tools/fontbrowser/trunk/fontbrowser.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -28,7 +28,6 @@
</library>
</orderEntry>
<orderEntry type="module" module-name="libs-swing-action" />
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: tools/gdbControl/trunk/gdbControl.iml
===================================================================
--- tools/gdbControl/trunk/gdbControl.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ tools/gdbControl/trunk/gdbControl.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -11,7 +11,6 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="annotations" level="project" />
<orderEntry type="library" name="junit" level="project" />
- <orderEntryProperties />
</component>
</module>
Modified: tools/jgrep/trunk/jgrep.iml
===================================================================
--- tools/jgrep/trunk/jgrep.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ tools/jgrep/trunk/jgrep.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -2,17 +2,16 @@
<module relativePaths="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
- <content url="file://$MODULE_DIR$/../trunk">
- <sourceFolder url="file://$MODULE_DIR$/../trunk/src/doc" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/../trunk/src/prj" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/../trunk/src/tst" isTestSource="true" />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/doc" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/prj" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/tst" isTestSource="true" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="annotations" level="project" />
<orderEntry type="library" name="junit" level="project" />
<orderEntry type="module" module-name="libs-argparser" />
- <orderEntryProperties />
</component>
</module>
Modified: tools/jwget/trunk/jwget.iml
===================================================================
--- tools/jwget/trunk/jwget.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ tools/jwget/trunk/jwget.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -28,7 +28,6 @@
</library>
</orderEntry>
<orderEntry type="module" module-name="libs-argparser" />
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: tools/keystrokes/trunk/keystrokes.iml
===================================================================
--- tools/keystrokes/trunk/keystrokes.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ tools/keystrokes/trunk/keystrokes.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -28,7 +28,6 @@
</library>
</orderEntry>
<orderEntry type="module" module-name="libs-swing-action" />
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: tools/mail/trunk/mail.iml
===================================================================
--- tools/mail/trunk/mail.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ tools/mail/trunk/mail.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -11,7 +11,6 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="libs-argparser" />
<orderEntry type="library" name="annotations" level="project" />
- <orderEntryProperties />
</component>
</module>
Modified: tools/midiDeviceLister/trunk/midiDeviceLister.iml
===================================================================
--- tools/midiDeviceLister/trunk/midiDeviceLister.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ tools/midiDeviceLister/trunk/midiDeviceLister.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -12,7 +12,6 @@
<orderEntry type="module" module-name="libs-argparser" />
<orderEntry type="library" name="annotations" level="project" />
<orderEntry type="library" name="junit" level="project" />
- <orderEntryProperties />
</component>
</module>
Modified: tools/midiMonitor/trunk/midiMonitor.iml
===================================================================
--- tools/midiMonitor/trunk/midiMonitor.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ tools/midiMonitor/trunk/midiMonitor.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -13,7 +13,6 @@
<orderEntry type="library" name="annotations" level="project" />
<orderEntry type="library" name="junit" level="project" />
<orderEntry type="module" module-name="midi" />
- <orderEntryProperties />
</component>
</module>
Modified: tools/prefsbrowser/trunk/prefsbrowser.iml
===================================================================
--- tools/prefsbrowser/trunk/prefsbrowser.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ tools/prefsbrowser/trunk/prefsbrowser.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -29,7 +29,6 @@
</orderEntry>
<orderEntry type="module" module-name="libs-swing-action" />
<orderEntry type="module" module-name="libs-swing-treetable" />
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: tools/replacer/trunk/replacer.iml
===================================================================
--- tools/replacer/trunk/replacer.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ tools/replacer/trunk/replacer.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -12,7 +12,6 @@
<orderEntry type="library" name="annotations" level="project" />
<orderEntry type="library" name="junit" level="project" />
<orderEntry type="module" module-name="libs-argparser" />
- <orderEntryProperties />
</component>
</module>
Property changes on: tools/scriptEngineLister/trunk
___________________________________________________________________
Added: svn:mergeinfo
+
Modified: tools/scriptEngineLister/trunk/scriptEngineLister.iml
===================================================================
--- tools/scriptEngineLister/trunkbak/scriptEngineLister.iml 2008-12-26 14:43:17 UTC (rev 735)
+++ tools/scriptEngineLister/trunk/scriptEngineLister.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -12,7 +12,6 @@
<orderEntry type="library" name="annotations" level="project" />
<orderEntry type="library" name="junit" level="project" />
<orderEntry type="module" module-name="libs-argparser" />
- <orderEntryProperties />
</component>
</module>
Modified: tools/scriptInterpreter/trunk/scriptInterpreter.iml
===================================================================
--- tools/scriptInterpreter/trunk/scriptInterpreter.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ tools/scriptInterpreter/trunk/scriptInterpreter.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -12,7 +12,6 @@
<orderEntry type="library" name="annotations" level="project" />
<orderEntry type="library" name="junit" level="project" />
<orderEntry type="module" module-name="libs-argparser" />
- <orderEntryProperties />
</component>
</module>
Modified: tools/string2bytes/trunk/string2bytes.iml
===================================================================
--- tools/string2bytes/trunk/string2bytes.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ tools/string2bytes/trunk/string2bytes.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -13,7 +13,6 @@
<orderEntry type="module" module-name="libs-swing-about" />
<orderEntry type="library" name="annotations" level="project" />
<orderEntry type="library" name="junit" level="project" />
- <orderEntryProperties />
</component>
<component name="copyright">
<Base>
Modified: tools/todoScanner/trunk/todoScanner.iml
===================================================================
--- tools/todoScanner/trunk/todoScanner.iml 2008-12-26 18:26:50 UTC (rev 740)
+++ tools/todoScanner/trunk/todoScanner.iml 2008-12-27 01:15:43 UTC (rev 741)
@@ -12,7 +12,6 @@
<orderEntry type="module" module-name="libs-argparser" />
<orderEntry type="library" name="annotations" level="project" />
<orderEntry type="library" name="junit" level="project" />
- <orderEntryProperties />
</component>
</module>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-12-26 18:26:52
|
Revision: 740
http://japi.svn.sourceforge.net/japi/?rev=740&view=rev
Author: christianhujer
Date: 2008-12-26 18:26:50 +0000 (Fri, 26 Dec 2008)
Log Message:
-----------
Improved documentation.
Modified Paths:
--------------
imajar/trunk/bin/imajar.sh
imajar/trunk/bin/insjar.sh
Modified: imajar/trunk/bin/imajar.sh
===================================================================
--- imajar/trunk/bin/imajar.sh 2008-12-26 15:08:28 UTC (rev 739)
+++ imajar/trunk/bin/imajar.sh 2008-12-26 18:26:50 UTC (rev 740)
@@ -1,4 +1,9 @@
#!/bin/sh
+
+# WARNING
+# This program MUST NOT have any options!
+# All arguments MUST BE passed further to the invoked jar.
+
USERJARS=~/bin/jars/
JARNAME=$(basename $0)
#java -client -Xshare:on -jar "$USERJARS/$JARNAME.jar" "$@"
Modified: imajar/trunk/bin/insjar.sh
===================================================================
--- imajar/trunk/bin/insjar.sh 2008-12-26 15:08:28 UTC (rev 739)
+++ imajar/trunk/bin/insjar.sh 2008-12-26 18:26:50 UTC (rev 740)
@@ -1,7 +1,42 @@
#!/bin/sh
+
+function usage {
+ cat <<END
+Usage: imajar.sh [OPTION]... JARNAME LINKNAME
+Installs a jar as "executable program".
+
+JARNAME: Path to the jar file that shall be copied.
+LINKNAME: Name of the link that shall be used for the executable.
+
+Options:
+ -h Display this help information
+
+This program normally is not run by a user or admin directly.
+END
+};
+
+while getopts ":h" option
+do
+ case $option in
+ h)
+ usage
+ ;;
+ \?)
+ usage
+ exit 1
+ ;;
+ *)
+ usage
+ exit 1
+ ;;
+ esac
+done
+
+exit
+
mkdir -p $HOME/bin/jars/
-cp "$1" $HOME/bin/jars/
-rm -f "$HOME/bin/jars/$2.jar"
-ln -s "$HOME/bin/jars/$1" "$HOME/bin/jars/$2.jar"
-rm -f "$HOME/bin/$2"
-ln -s "$HOME/bin/imajar.sh" "$HOME/bin/$2"
+cp "$1" $HOME/bin/jars/
+rm -f "$HOME/bin/jars/$2.jar"
+ln -s "$HOME/bin/jars/$1" "$HOME/bin/jars/$2.jar"
+rm -f "$HOME/bin/$2"
+ln -s "$HOME/bin/imajar.sh" "$HOME/bin/$2"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-12-26 15:08:31
|
Revision: 739
http://japi.svn.sourceforge.net/japi/?rev=739&view=rev
Author: christianhujer
Date: 2008-12-26 15:08:28 +0000 (Fri, 26 Dec 2008)
Log Message:
-----------
Updated some of the LICENSE files.
Modified Paths:
--------------
common/trunk/LICENSE
libs/argparser/trunk/LICENSE
libs/io/trunk/LICENSE
libs/lang/trunk/LICENSE
libs/net/trunk/LICENSE
libs/taglets/trunk/LICENSE
Added Paths:
-----------
games/jmines/trunk/LICENSE
libs/logging/trunk/LICENSE
libs/midi/trunk/LICENSE
Modified: common/trunk/LICENSE
===================================================================
--- common/trunk/LICENSE 2008-12-26 15:07:38 UTC (rev 738)
+++ common/trunk/LICENSE 2008-12-26 15:08:28 UTC (rev 739)
@@ -1,9 +1,9 @@
JAPI COMMON LICENSE INFORMATION
-------------------------------
-Japi Common is licensed under GPL. See file COPYING.
+Japi Common is licensed under LGPL.
+See file COPYING.
-Japi Common uses some third part libraries, especially for building. These
-libraries are contained in the lib/ directory and have their own licenses. See
-the corresponding LICENSE-*-files in the common/lib/ directory for the licenses
-of third party libraries.
+Japi Common uses some third part libraries, especially for building.
+These libraries are contained in the lib/ directory and have their own licenses.
+See the corresponding LICENSE-*-files in the common/lib/ directory for the licenses of third party libraries.
Added: games/jmines/trunk/LICENSE
===================================================================
--- games/jmines/trunk/LICENSE (rev 0)
+++ games/jmines/trunk/LICENSE 2008-12-26 15:08:28 UTC (rev 739)
@@ -0,0 +1,9 @@
+JAPI JMines LICENSE INFORMATION
+-------------------------------
+
+Japi JMines is licensed under GPL.
+See file COPYING.
+
+Japi JMines uses some third part libraries, especially for building.
+These libraries are contained in the lib/ directory and have their own licenses.
+See the corresponding LICENSE-*-files in the common/lib/ directory for the licenses of third party libraries.
Property changes on: games/jmines/trunk/LICENSE
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ LF
Modified: libs/argparser/trunk/LICENSE
===================================================================
--- libs/argparser/trunk/LICENSE 2008-12-26 15:07:38 UTC (rev 738)
+++ libs/argparser/trunk/LICENSE 2008-12-26 15:08:28 UTC (rev 739)
@@ -1,9 +1,9 @@
JAPI ARGPARSER LICENSE INFORMATION
----------------------------------
-Japi ArgParser is licensed under GPL. See file COPYING.
+Japi ArgParser is licensed under GPL.
+See file COPYING.
-Japi ArgParser uses some third part libraries, especially for building. These
-libraries are contained in the lib/ directory and have their own licenses. See
-the corresponding LICENSE-*-files in the common/lib/ directory for the licenses
-of third party libraries.
+Japi ArgParser uses some third part libraries, especially for building.
+These libraries are contained in the lib/ directory and have their own licenses.
+See the corresponding LICENSE-*-files in the common/lib/ directory for the licenses of third party libraries.
Modified: libs/io/trunk/LICENSE
===================================================================
--- libs/io/trunk/LICENSE 2008-12-26 15:07:38 UTC (rev 738)
+++ libs/io/trunk/LICENSE 2008-12-26 15:08:28 UTC (rev 739)
@@ -1,9 +1,9 @@
JAPI LIB IO LICENSE INFORMATION
-------------------------------
-Japi Lib IO is licensed under GPL. See file COPYING.
+Japi Lib IO is licensed under LGPL.
+See file COPYING.
-Japi Lib IO uses some third part libraries, especially for building. These
-libraries are contained in the lib/ directory and have their own licenses. See
-the corresponding LICENSE-*-files in the common/lib/ directory for the licenses
-of third party libraries.
+Japi Lib IO uses some third part libraries, especially for building.
+These libraries are contained in the lib/ directory and have their own licenses.
+See the corresponding LICENSE-*-files in the common/lib/ directory for the licenses of third party libraries.
Modified: libs/lang/trunk/LICENSE
===================================================================
--- libs/lang/trunk/LICENSE 2008-12-26 15:07:38 UTC (rev 738)
+++ libs/lang/trunk/LICENSE 2008-12-26 15:08:28 UTC (rev 739)
@@ -1,9 +1,9 @@
JAPI LIB LANG LICENSE INFORMATION
---------------------------------
-Japi Lib Lang is licensed under GPL. See file COPYING.
+Japi Lib Lang is licensed under LGPL.
+See file COPYING.
-Japi Lib Lang uses some third part libraries, especially for building. These
-libraries are contained in the lib/ directory and have their own licenses. See
-the corresponding LICENSE-*-files in the common/lib/ directory for the licenses
-of third party libraries.
+Japi Lib Lang uses some third part libraries, especially for building.
+These libraries are contained in the lib/ directory and have their own licenses.
+See the corresponding LICENSE-*-files in the common/lib/ directory for the licenses of third party libraries.
Added: libs/logging/trunk/LICENSE
===================================================================
--- libs/logging/trunk/LICENSE (rev 0)
+++ libs/logging/trunk/LICENSE 2008-12-26 15:08:28 UTC (rev 739)
@@ -0,0 +1,9 @@
+JAPI LOGGING LANG LICENSE INFORMATION
+-------------------------------------
+
+Japi Lib Logging is licensed under LGPL.
+See file COPYING.
+
+Japi Lib Logging uses some third part libraries, especially for building.
+These libraries are contained in the lib/ directory and have their own licenses.
+See the corresponding LICENSE-*-files in the common/lib/ directory for the licenses of third party libraries.
Property changes on: libs/logging/trunk/LICENSE
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ LF
Added: libs/midi/trunk/LICENSE
===================================================================
--- libs/midi/trunk/LICENSE (rev 0)
+++ libs/midi/trunk/LICENSE 2008-12-26 15:08:28 UTC (rev 739)
@@ -0,0 +1,9 @@
+JAPI MIDI LICENSE INFORMATION
+-------------------------------------
+
+Japi Lib Midi is licensed under LGPL.
+See file COPYING.
+
+Japi Lib Midi uses some third part libraries, especially for building.
+These libraries are contained in the lib/ directory and have their own licenses.
+See the corresponding LICENSE-*-files in the common/lib/ directory for the licenses of third party libraries.
Property changes on: libs/midi/trunk/LICENSE
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ LF
Modified: libs/net/trunk/LICENSE
===================================================================
--- libs/net/trunk/LICENSE 2008-12-26 15:07:38 UTC (rev 738)
+++ libs/net/trunk/LICENSE 2008-12-26 15:08:28 UTC (rev 739)
@@ -1,9 +1,9 @@
JAPI LIB NET LICENSE INFORMATION
--------------------------------
-Japi Lib Net is licensed under GPL. See file COPYING.
+Japi Lib Net is licensed under GPL.
+See file COPYING.
-Japi Lib Net uses some third part libraries, especially for building. These
-libraries are contained in the lib/ directory and have their own licenses. See
-the corresponding LICENSE-*-files in the common/lib/ directory for the licenses
-of third party libraries.
+Japi Lib Net uses some third part libraries, especially for building.
+These libraries are contained in the lib/ directory and have their own licenses.
+See the corresponding LICENSE-*-files in the common/lib/ directory for the licenses of third party libraries.
Modified: libs/taglets/trunk/LICENSE
===================================================================
--- libs/taglets/trunk/LICENSE 2008-12-26 15:07:38 UTC (rev 738)
+++ libs/taglets/trunk/LICENSE 2008-12-26 15:08:28 UTC (rev 739)
@@ -1,9 +1,9 @@
JAPI TAGLETS LICENSE INFORMATION
--------------------------------
-Japi Taglets is licensed under GPL. See file COPYING.
+Japi Taglets is licensed under GPL.
+See file COPYING.
-Japi Taglets uses some third part libraries, especially for building. These
-libraries are contained in the lib/ directory and have their own licenses. See
-the corresponding LICENSE-*-files in the common/lib/ directory for the licenses
-of third party libraries.
+Japi Taglets uses some third part libraries, especially for building.
+These libraries are contained in the lib/ directory and have their own licenses.
+See the corresponding LICENSE-*-files in the common/lib/ directory for the licenses of third party libraries.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-12-26 15:07:44
|
Revision: 738
http://japi.svn.sourceforge.net/japi/?rev=738&view=rev
Author: christianhujer
Date: 2008-12-26 15:07:38 +0000 (Fri, 26 Dec 2008)
Log Message:
-----------
Added LICENSE and COPYRIGHT to imajar.
Added Paths:
-----------
imajar/trunk/COPYING
imajar/trunk/LICENSE
Added: imajar/trunk/COPYING
===================================================================
--- imajar/trunk/COPYING (rev 0)
+++ imajar/trunk/COPYING 2008-12-26 15:07:38 UTC (rev 738)
@@ -0,0 +1,504 @@
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL. It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+ This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it. You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+ When we speak of free software, we are referring to freedom of use,
+not price. Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+ To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights. These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+ For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you. You must make sure that they, too, receive or can get the source
+code. If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it. And you must show them these terms so they know their rights.
+
+ We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+ To protect each distributor, we want to make it very clear that
+there is no warranty for the free library. Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+ Finally, software patents pose a constant threat to the existence of
+any free program. We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder. Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+ Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License. This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License. We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+ When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library. The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom. The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+ We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License. It also provides other free software developers Less
+of an advantage over competing non-free programs. These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries. However, the Lesser license provides advantages in certain
+special circumstances.
+
+ For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard. To achieve this, non-free programs must be
+allowed to use the library. A more frequent case is that a free
+library does the same job as widely used non-free libraries. In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+ In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software. For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+ Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+ The precise terms and conditions for copying, distribution and
+modification follow. Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library". The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+ GNU LESSER GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+ A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+ The "Library", below, refers to any such software library or work
+which has been distributed under these terms. A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language. (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+ "Source code" for a work means the preferred form of the work for
+making modifications to it. For a library, 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 library.
+
+ Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it). Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+ 1. You may copy and distribute verbatim copies of the Library's
+complete 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 distribute a copy of this License along with the
+Library.
+
+ 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 Library or any portion
+of it, thus forming a work based on the Library, 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) The modified work must itself be a software library.
+
+ b) You must cause the files modified to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ c) You must cause the whole of the work to be licensed at no
+ charge to all third parties under the terms of this License.
+
+ d) If a facility in the modified Library refers to a function or a
+ table of data to be supplied by an application program that uses
+ the facility, other than as an argument passed when the facility
+ is invoked, then you must make a good faith effort to ensure that,
+ in the event an application does not supply such function or
+ table, the facility still operates, and performs whatever part of
+ its purpose remains meaningful.
+
+ (For example, a function in a library to compute square roots has
+ a purpose that is entirely well-defined independent of the
+ application. Therefore, Subsection 2d requires that any
+ application-supplied function or table used by this function must
+ be optional: if the application does not supply it, the square
+ root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Library,
+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 Library, 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 Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library. To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License. (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.) Do not make any other change in
+these notices.
+
+ Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+ This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+ 4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you 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.
+
+ If distribution of 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 satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library". Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+ However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library". The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+ When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library. The
+threshold for this to be true is not precisely defined by law.
+
+ If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work. (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+ Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+ 6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+ You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License. You must supply a copy of this License. If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License. Also, you must do one
+of these things:
+
+ a) Accompany the work with the complete corresponding
+ machine-readable source code for the Library including whatever
+ changes were used in the work (which must be distributed under
+ Sections 1 and 2 above); and, if the work is an executable linked
+ with the Library, with the complete machine-readable "work that
+ uses the Library", as object code and/or source code, so that the
+ user can modify the Library and then relink to produce a modified
+ executable containing the modified Library. (It is understood
+ that the user who changes the contents of definitions files in the
+ Library will not necessarily be able to recompile the application
+ to use the modified definitions.)
+
+ b) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (1) uses at run time a
+ copy of the library already present on the user's computer system,
+ rather than copying library functions into the executable, and (2)
+ will operate properly with a modified version of the library, if
+ the user installs one, as long as the modified version is
+ interface-compatible with the version that the work was made with.
+
+ c) Accompany the work with a written offer, valid for at
+ least three years, to give the same user the materials
+ specified in Subsection 6a, above, for a charge no more
+ than the cost of performing this distribution.
+
+ d) If distribution of the work is made by offering access to copy
+ from a designated place, offer equivalent access to copy the above
+ specified materials from the same place.
+
+ e) Verify that the user has already received a copy of these
+ materials or that you have already sent this user a copy.
+
+ For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it. However, as a special exception,
+the materials to be 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.
+
+ It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system. Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+ 7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+ a) Accompany the combined library with a copy of the same work
+ based on the Library, uncombined with any other library
+ facilities. This must be distributed under the terms of the
+ Sections above.
+
+ b) Give prominent notice with the combined library of the fact
+ that part of it is a work based on the Library, and explaining
+ where to find the accompanying uncombined form of the same work.
+
+ 8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License. Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library 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.
+
+ 9. 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 Library or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+ 10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+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 with
+this License.
+
+ 11. 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 Library at all. For example, if a patent
+license would not permit royalty-free redistribution of the Library 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 Library.
+
+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.
+
+ 12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library 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.
+
+ 13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser 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 Library
+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 Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+ 14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+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
+
+ 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "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
+LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. 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 LIBRARY 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
+LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), 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 Libraries
+
+ If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change. You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+ To apply these terms, attach the following notices to the library. 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 library's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ 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
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the
+ library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+ <signature of Ty Coon>, 1 April 1990
+ Ty Coon, President of Vice
+
+That's all there is to it!
+
+
Property changes on: imajar/trunk/COPYING
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ LF
Added: imajar/trunk/LICENSE
===================================================================
--- imajar/trunk/LICENSE (rev 0)
+++ imajar/trunk/LICENSE 2008-12-26 15:07:38 UTC (rev 738)
@@ -0,0 +1,9 @@
+JAPI imajar LICENSE INFORMATION
+-------------------------------
+
+Japi imajar is licensed under LGPL.
+See file COPYING.
+
+Japi imajar uses some third part libraries, especially for building.
+These libraries are contained in the lib/ directory and have their own licenses.
+See the corresponding LICENSE-*-files in the common/lib/ directory for the licenses of third party libraries.
Property changes on: imajar/trunk/LICENSE
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ LF
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-12-26 15:05:38
|
Revision: 737
http://japi.svn.sourceforge.net/japi/?rev=737&view=rev
Author: christianhujer
Date: 2008-12-26 15:05:34 +0000 (Fri, 26 Dec 2008)
Log Message:
-----------
Removed module.version from module.properties - now this is auto-set.
Modified Paths:
--------------
libs/argparser/trunk/module.properties
libs/io/trunk/module.properties
libs/lang/trunk/module.properties
libs/logging/trunk/module.properties
libs/midi/trunk/module.properties
libs/net/trunk/module.properties
libs/registry/trunk/module.properties
libs/swing-about/trunk/module.properties
libs/swing-action/trunk/module.properties
libs/swing-app/trunk/module.properties
libs/swing-bookmarks/trunk/module.properties
libs/swing-extlib/trunk/module.properties
libs/swing-font/trunk/module.properties
libs/swing-keyprefs/trunk/module.properties
libs/swing-list/trunk/module.properties
libs/swing-misc/trunk/module.properties
libs/swing-prefs/trunk/module.properties
libs/swing-proxyprefs/trunk/module.properties
libs/swing-recent/trunk/module.properties
libs/swing-tod/trunk/module.properties
libs/swing-treetable/trunk/module.properties
libs/taglets/trunk/module.properties
libs/util/trunk/module.properties
libs/xml/trunk/module.properties
Modified: libs/argparser/trunk/module.properties
===================================================================
--- libs/argparser/trunk/module.properties 2008-12-26 15:01:47 UTC (rev 736)
+++ libs/argparser/trunk/module.properties 2008-12-26 15:05:34 UTC (rev 737)
@@ -18,7 +18,6 @@
#
update.focus=none
-module.version=trunk
module.name=japi-lib-argparser
module.shortname=argparser
module.title=ArgParser
Modified: libs/io/trunk/module.properties
===================================================================
--- libs/io/trunk/module.properties 2008-12-26 15:01:47 UTC (rev 736)
+++ libs/io/trunk/module.properties 2008-12-26 15:05:34 UTC (rev 737)
@@ -18,7 +18,6 @@
#
update.focus=none
-module.version=trunk
module.name=japi-lib-io
module.shortname=io
module.title=IO
Modified: libs/lang/trunk/module.properties
===================================================================
--- libs/lang/trunk/module.properties 2008-12-26 15:01:47 UTC (rev 736)
+++ libs/lang/trunk/module.properties 2008-12-26 15:05:34 UTC (rev 737)
@@ -18,7 +18,6 @@
#
update.focus=none
-module.version=trunk
module.name=japi-lib-lang
module.shortname=lang
module.title=Lang
Modified: libs/logging/trunk/module.properties
===================================================================
--- libs/logging/trunk/module.properties 2008-12-26 15:01:47 UTC (rev 736)
+++ libs/logging/trunk/module.properties 2008-12-26 15:05:34 UTC (rev 737)
@@ -18,7 +18,6 @@
#
update.focus=none
-module.version=trunk
module.name=japi-lib-logging
module.shortname=logging
module.title=Logging
Modified: libs/midi/trunk/module.properties
===================================================================
--- libs/midi/trunk/module.properties 2008-12-26 15:01:47 UTC (rev 736)
+++ libs/midi/trunk/module.properties 2008-12-26 15:05:34 UTC (rev 737)
@@ -18,7 +18,6 @@
#
update.focus=none
-module.version=trunk
module.name=japi-lib-midi
module.shortname=midi
module.title=Midi
Modified: libs/net/trunk/module.properties
===================================================================
--- libs/net/trunk/module.properties 2008-12-26 15:01:47 UTC (rev 736)
+++ libs/net/trunk/module.properties 2008-12-26 15:05:34 UTC (rev 737)
@@ -18,7 +18,6 @@
#
update.focus=none
-module.version=trunk
module.name=japi-lib-net
module.shortname=net
module.title=Net
Modified: libs/registry/trunk/module.properties
===================================================================
--- libs/registry/trunk/module.properties 2008-12-26 15:01:47 UTC (rev 736)
+++ libs/registry/trunk/module.properties 2008-12-26 15:05:34 UTC (rev 737)
@@ -18,7 +18,6 @@
#
update.focus=none
-module.version=trunk
module.name=japi-lib-registry
module.shortname=registry
module.title=Registry
Modified: libs/swing-about/trunk/module.properties
===================================================================
--- libs/swing-about/trunk/module.properties 2008-12-26 15:01:47 UTC (rev 736)
+++ libs/swing-about/trunk/module.properties 2008-12-26 15:05:34 UTC (rev 737)
@@ -18,7 +18,6 @@
#
update.focus=none
-module.version=trunk
module.name=japi-lib-swing-about
module.shortname=swing-about
module.title=SwingAbout
Modified: libs/swing-action/trunk/module.properties
===================================================================
--- libs/swing-action/trunk/module.properties 2008-12-26 15:01:47 UTC (rev 736)
+++ libs/swing-action/trunk/module.properties 2008-12-26 15:05:34 UTC (rev 737)
@@ -18,7 +18,6 @@
#
update.focus=none
-module.version=trunk
module.name=japi-lib-swing-action
module.shortname=swing-action
module.title=SwingAction
Modified: libs/swing-app/trunk/module.properties
===================================================================
--- libs/swing-app/trunk/module.properties 2008-12-26 15:01:47 UTC (rev 736)
+++ libs/swing-app/trunk/module.properties 2008-12-26 15:05:34 UTC (rev 737)
@@ -18,7 +18,6 @@
#
update.focus=none
-module.version=trunk
module.name=japi-lib-swing-app
module.shortname=swing-app
module.title=SwingApp
Modified: libs/swing-bookmarks/trunk/module.properties
===================================================================
--- libs/swing-bookmarks/trunk/module.properties 2008-12-26 15:01:47 UTC (rev 736)
+++ libs/swing-bookmarks/trunk/module.properties 2008-12-26 15:05:34 UTC (rev 737)
@@ -18,7 +18,6 @@
#
update.focus=none
-module.version=trunk
module.name=japi-lib-swing-bookmarks
module.shortname=swing-bookmarks
module.title=SwingBookmarks
Modified: libs/swing-extlib/trunk/module.properties
===================================================================
--- libs/swing-extlib/trunk/module.properties 2008-12-26 15:01:47 UTC (rev 736)
+++ libs/swing-extlib/trunk/module.properties 2008-12-26 15:05:34 UTC (rev 737)
@@ -18,7 +18,6 @@
#
update.focus=none
-module.version=trunk
module.name=japi-lib-swing-extlib
module.shortname=swing-extlib
module.title=SwingExtlib
Modified: libs/swing-font/trunk/module.properties
===================================================================
--- libs/swing-font/trunk/module.properties 2008-12-26 15:01:47 UTC (rev 736)
+++ libs/swing-font/trunk/module.properties 2008-12-26 15:05:34 UTC (rev 737)
@@ -18,7 +18,6 @@
#
update.focus=none
-module.version=trunk
module.name=japi-lib-swing-font
module.shortname=swing-font
module.title=SwingFont
Modified: libs/swing-keyprefs/trunk/module.properties
===================================================================
--- libs/swing-keyprefs/trunk/module.properties 2008-12-26 15:01:47 UTC (rev 736)
+++ libs/swing-keyprefs/trunk/module.properties 2008-12-26 15:05:34 UTC (rev 737)
@@ -18,7 +18,6 @@
#
update.focus=none
-module.version=trunk
module.name=japi-lib-swing-keyprefs
module.shortname=swing-keyprefs
module.title=SwingKeyprefs
Modified: libs/swing-list/trunk/module.properties
===================================================================
--- libs/swing-list/trunk/module.properties 2008-12-26 15:01:47 UTC (rev 736)
+++ libs/swing-list/trunk/module.properties 2008-12-26 15:05:34 UTC (rev 737)
@@ -18,7 +18,6 @@
#
update.focus=none
-module.version=trunk
module.name=japi-lib-swing-list
module.shortname=swing-list
module.title=SwingList
Modified: libs/swing-misc/trunk/module.properties
===================================================================
--- libs/swing-misc/trunk/module.properties 2008-12-26 15:01:47 UTC (rev 736)
+++ libs/swing-misc/trunk/module.properties 2008-12-26 15:05:34 UTC (rev 737)
@@ -18,7 +18,6 @@
#
update.focus=none
-module.version=trunk
module.name=japi-lib-swing-misc
module.shortname=swing-misc
module.title=SwingMisc
Modified: libs/swing-prefs/trunk/module.properties
===================================================================
--- libs/swing-prefs/trunk/module.properties 2008-12-26 15:01:47 UTC (rev 736)
+++ libs/swing-prefs/trunk/module.properties 2008-12-26 15:05:34 UTC (rev 737)
@@ -18,7 +18,6 @@
#
update.focus=none
-module.version=trunk
module.name=japi-lib-swing-prefs
module.shortname=swing-prefs
module.title=SwingPrefs
Modified: libs/swing-proxyprefs/trunk/module.properties
===================================================================
--- libs/swing-proxyprefs/trunk/module.properties 2008-12-26 15:01:47 UTC (rev 736)
+++ libs/swing-proxyprefs/trunk/module.properties 2008-12-26 15:05:34 UTC (rev 737)
@@ -18,7 +18,6 @@
#
update.focus=none
-module.version=trunk
module.name=japi-lib-swing-proxyprefs
module.shortname=swing-proxyprefs
module.title=SwingProxyprefs
Modified: libs/swing-recent/trunk/module.properties
===================================================================
--- libs/swing-recent/trunk/module.properties 2008-12-26 15:01:47 UTC (rev 736)
+++ libs/swing-recent/trunk/module.properties 2008-12-26 15:05:34 UTC (rev 737)
@@ -18,7 +18,6 @@
#
update.focus=none
-module.version=trunk
module.name=japi-lib-swing-recent
module.shortname=swing-recent
module.title=SwingRecent
Modified: libs/swing-tod/trunk/module.properties
===================================================================
--- libs/swing-tod/trunk/module.properties 2008-12-26 15:01:47 UTC (rev 736)
+++ libs/swing-tod/trunk/module.properties 2008-12-26 15:05:34 UTC (rev 737)
@@ -18,7 +18,6 @@
#
update.focus=none
-module.version=trunk
module.name=japi-lib-swing-tod
module.shortname=swing-tod
module.title=SwingTod
Modified: libs/swing-treetable/trunk/module.properties
===================================================================
--- libs/swing-treetable/trunk/module.properties 2008-12-26 15:01:47 UTC (rev 736)
+++ libs/swing-treetable/trunk/module.properties 2008-12-26 15:05:34 UTC (rev 737)
@@ -18,7 +18,6 @@
#
update.focus=none
-module.version=trunk
module.name=japi-lib-swing-treetable
module.shortname=swing-treetable
module.title=SwingTreetable
Modified: libs/taglets/trunk/module.properties
===================================================================
--- libs/taglets/trunk/module.properties 2008-12-26 15:01:47 UTC (rev 736)
+++ libs/taglets/trunk/module.properties 2008-12-26 15:05:34 UTC (rev 737)
@@ -18,7 +18,6 @@
#
update.focus=none
-module.version=trunk
module.name=japi-lib-taglets
module.shortname=taglets
module.title=Taglets
Modified: libs/util/trunk/module.properties
===================================================================
--- libs/util/trunk/module.properties 2008-12-26 15:01:47 UTC (rev 736)
+++ libs/util/trunk/module.properties 2008-12-26 15:05:34 UTC (rev 737)
@@ -18,7 +18,6 @@
#
update.focus=none
-module.version=trunk
module.name=japi-lib-util
module.shortname=util
module.title=Util
Modified: libs/xml/trunk/module.properties
===================================================================
--- libs/xml/trunk/module.properties 2008-12-26 15:01:47 UTC (rev 736)
+++ libs/xml/trunk/module.properties 2008-12-26 15:05:34 UTC (rev 737)
@@ -18,7 +18,6 @@
#
update.focus=none
-module.version=trunk
module.name=japi-lib-xml
module.shortname=xml
module.title=Xml
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-12-26 15:01:52
|
Revision: 736
http://japi.svn.sourceforge.net/japi/?rev=736&view=rev
Author: christianhujer
Date: 2008-12-26 15:01:47 +0000 (Fri, 26 Dec 2008)
Log Message:
-----------
Added lib directory.
Added Paths:
-----------
libs/swing-keyprefs/trunk/lib/
libs/swing-keyprefs/trunk/lib/japi-lib-swing-action-trunk.jar
Added: libs/swing-keyprefs/trunk/lib/japi-lib-swing-action-trunk.jar
===================================================================
(Binary files differ)
Property changes on: libs/swing-keyprefs/trunk/lib/japi-lib-swing-action-trunk.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
