[Japi-cvs] SF.net SVN: japi:[752]
Status: Beta
Brought to you by:
christianhujer
Menu
▾
▴
[Japi-cvs] SF.net SVN: japi:[752]
|
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.
|
