You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2007/08/29 04:39:44 UTC
svn commit: r570613 - in /geronimo/sandbox/gshell/trunk:
gshell-api/src/main/java/org/apache/geronimo/gshell/command/
gshell-clp/src/main/java/org/apache/geronimo/gshell/clp/
gshell-clp/src/main/java/org/apache/geronimo/gshell/clp/handler/
gshell-clp/s...
Author: jdillon
Date: Tue Aug 28 19:39:43 2007
New Revision: 570613
URL: http://svn.apache.org/viewvc?rev=570613&view=rev
Log:
Fixe IDEA's retardo formatting
Modified:
geronimo/sandbox/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandSupport.java
geronimo/sandbox/gshell/trunk/gshell-clp/src/main/java/org/apache/geronimo/gshell/clp/ArgumentDescriptor.java
geronimo/sandbox/gshell/trunk/gshell-clp/src/main/java/org/apache/geronimo/gshell/clp/CommandLineProcessor.java
geronimo/sandbox/gshell/trunk/gshell-clp/src/main/java/org/apache/geronimo/gshell/clp/Descriptor.java
geronimo/sandbox/gshell/trunk/gshell-clp/src/main/java/org/apache/geronimo/gshell/clp/IllegalAnnotationError.java
geronimo/sandbox/gshell/trunk/gshell-clp/src/main/java/org/apache/geronimo/gshell/clp/OptionDescriptor.java
geronimo/sandbox/gshell/trunk/gshell-clp/src/main/java/org/apache/geronimo/gshell/clp/Printer.java
geronimo/sandbox/gshell/trunk/gshell-clp/src/main/java/org/apache/geronimo/gshell/clp/ProcessingException.java
geronimo/sandbox/gshell/trunk/gshell-clp/src/main/java/org/apache/geronimo/gshell/clp/StopProcessingOptionsNotification.java
geronimo/sandbox/gshell/trunk/gshell-clp/src/main/java/org/apache/geronimo/gshell/clp/handler/BooleanHandler.java
geronimo/sandbox/gshell/trunk/gshell-clp/src/main/java/org/apache/geronimo/gshell/clp/handler/EnumHandler.java
geronimo/sandbox/gshell/trunk/gshell-clp/src/main/java/org/apache/geronimo/gshell/clp/handler/IntegerHandler.java
geronimo/sandbox/gshell/trunk/gshell-clp/src/test/java/org/apache/geronimo/gshell/clp/handler/StopHandlerTest.java
geronimo/sandbox/gshell/trunk/gshell-prefs/src/main/java/org/apache/geronimo/gshell/prefs/IllegalAnnotationError.java
geronimo/sandbox/gshell/trunk/gshell-prefs/src/main/java/org/apache/geronimo/gshell/prefs/PreferenceDescriptor.java
geronimo/sandbox/gshell/trunk/gshell-prefs/src/main/java/org/apache/geronimo/gshell/prefs/ProcessingException.java
Modified: geronimo/sandbox/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandSupport.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandSupport.java?rev=570613&r1=570612&r2=570613&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandSupport.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/command/CommandSupport.java Tue Aug 28 19:39:43 2007
@@ -222,6 +222,10 @@
CommandLineProcessor clp = new CommandLineProcessor(this);
clp.process(Arguments.toStringArray(args));
+ //
+ // TODO: Need to mark this option as superceeding other required arguments/options
+ //
+
// Handle --help/-h automatically for the command
if (displayHelp) {
displayHelp(clp);
Modified: geronimo/sandbox/gshell/trunk/gshell-clp/src/main/java/org/apache/geronimo/gshell/clp/ArgumentDescriptor.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-clp/src/main/java/org/apache/geronimo/gshell/clp/ArgumentDescriptor.java?rev=570613&r1=570612&r2=570613&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-clp/src/main/java/org/apache/geronimo/gshell/clp/ArgumentDescriptor.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-clp/src/main/java/org/apache/geronimo/gshell/clp/ArgumentDescriptor.java Tue Aug 28 19:39:43 2007
@@ -27,12 +27,12 @@
public class ArgumentDescriptor
extends Descriptor
{
- public ArgumentDescriptor(Argument argument, boolean forceMultiValued) {
- super(argument.description(), argument.metaVar(), argument.required(), argument.handler(), argument.multiValued() || forceMultiValued);
- }
+ public ArgumentDescriptor(Argument argument, boolean forceMultiValued) {
+ super(argument.description(), argument.metaVar(), argument.required(), argument.handler(), argument.multiValued() || forceMultiValued);
+ }
- @Override
- public String toString() {
- return metaVar() != null ? metaVar() : "ARG";
- }
+ @Override
+ public String toString() {
+ return metaVar() != null ? metaVar() : "ARG";
+ }
}
Modified: geronimo/sandbox/gshell/trunk/gshell-clp/src/main/java/org/apache/geronimo/gshell/clp/CommandLineProcessor.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-clp/src/main/java/org/apache/geronimo/gshell/clp/CommandLineProcessor.java?rev=570613&r1=570612&r2=570613&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-clp/src/main/java/org/apache/geronimo/gshell/clp/CommandLineProcessor.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-clp/src/main/java/org/apache/geronimo/gshell/clp/CommandLineProcessor.java Tue Aug 28 19:39:43 2007
@@ -117,9 +117,9 @@
// Sanity check the argument indexes
for (int i=0; i< argumentHandlers.size(); i++) {
- if (argumentHandlers.get(i) == null) {
+ if (argumentHandlers.get(i) == null) {
throw new IllegalAnnotationError("No argument annotation for index: " + i);
- }
+ }
}
}
@@ -140,7 +140,7 @@
// Make sure the argument will fit in the list
while (index >= argumentHandlers.size()) {
- argumentHandlers.add(null);
+ argumentHandlers.add(null);
}
if (argumentHandlers.get(index) != null) {
@@ -155,17 +155,17 @@
checkOptionNotInMap(option.name());
for (String alias : option.aliases()) {
- checkOptionNotInMap(alias);
+ checkOptionNotInMap(alias);
}
optionHandlers.add(handler);
}
- private void checkOptionNotInMap(final String name) throws IllegalAnnotationError {
- if (findOptionByName(name) != null) {
+ private void checkOptionNotInMap(final String name) throws IllegalAnnotationError {
+ if (findOptionByName(name) != null) {
throw new IllegalAnnotationError("Duplicate option name: " + name);
}
- }
+ }
//
// Processing
@@ -203,7 +203,7 @@
}
public String get(final int idx) throws ProcessingException {
- if (pos + idx >= args.length) {
+ if (pos + idx >= args.length) {
throw new ProcessingException(Messages.MISSING_OPERAND.format(getOptionName()));
}
@@ -250,14 +250,14 @@
else {
// Complain if we have more arguments than we have handlers configured
if (argIndex >= argumentHandlers.size()) {
- Messages msg = argumentHandlers.size() == 0 ? Messages.NO_ARGUMENT_ALLOWED : Messages.TOO_MANY_ARGUMENTS;
+ Messages msg = argumentHandlers.size() == 0 ? Messages.NO_ARGUMENT_ALLOWED : Messages.TOO_MANY_ARGUMENTS;
throw new ProcessingException(msg.format(arg));
}
// known argument
handler = argumentHandlers.get(argIndex);
if (!handler.descriptor.isMultiValued()) {
- argIndex++;
+ argIndex++;
}
}
@@ -299,63 +299,52 @@
//
private Handler findOptionHandler(String name) {
- Handler handler = findOptionByName(name);
+ Handler handler = findOptionByName(name);
if (handler == null) {
- // Have not found by its name, maybe its a property?
- // Search for parts of the name (=prefix) - most specific first
- for (int i=name.length(); i>1; i--) {
- String prefix = name.substring(0, i);
- Map<String, Handler> possibleHandlers = filter(optionHandlers, prefix);
- handler = possibleHandlers.get(prefix);
+ // Have not found by its name, maybe its a property?
+ // Search for parts of the name (=prefix) - most specific first
+ for (int i=name.length(); i>1; i--) {
+ String prefix = name.substring(0, i);
+ Map<String, Handler> possibleHandlers = filter(optionHandlers, prefix);
+ handler = possibleHandlers.get(prefix);
if (handler != null) {
return handler;
}
- }
- }
+ }
+ }
return handler;
- }
+ }
private Map<String, Handler> filter(List<Handler> handlers, String keyFilter) {
- Map<String, Handler> map = new TreeMap<String, Handler>();
+ Map<String, Handler> map = new TreeMap<String, Handler>();
for (Handler handler : handlers) {
- if (handlers.toString().startsWith(keyFilter)) {
+ if (handlers.toString().startsWith(keyFilter)) {
map.put(handlers.toString(), handler);
}
- }
+ }
return map;
- }
+ }
private Handler findOptionByName(String name) {
- for (Handler handler : optionHandlers) {
- OptionDescriptor option = (OptionDescriptor)handler.descriptor;
+ for (Handler handler : optionHandlers) {
+ OptionDescriptor option = (OptionDescriptor)handler.descriptor;
if (name.equals(option.name())) {
- return handler;
- }
+ return handler;
+ }
for (String alias : option.aliases()) {
- if (name.equals(alias)) {
- return handler;
- }
- }
- }
+ if (name.equals(alias)) {
+ return handler;
+ }
+ }
+ }
return null;
- }
-
- //
- // Static Helpers
- //
-
- /*
- public static void process(final Object bean, final String... args) throws ProcessingException {
- CommandLineProcessor clp = new CommandLineProcessor(bean);
- clp.process(args);
}
- */
}
Modified: geronimo/sandbox/gshell/trunk/gshell-clp/src/main/java/org/apache/geronimo/gshell/clp/Descriptor.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-clp/src/main/java/org/apache/geronimo/gshell/clp/Descriptor.java?rev=570613&r1=570612&r2=570613&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-clp/src/main/java/org/apache/geronimo/gshell/clp/Descriptor.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-clp/src/main/java/org/apache/geronimo/gshell/clp/Descriptor.java Tue Aug 28 19:39:43 2007
@@ -28,7 +28,7 @@
*/
public abstract class Descriptor
{
- private final String description;
+ private final String description;
private final String metaVar;
@@ -38,31 +38,31 @@
private final Class<? extends Handler> handler;
- protected Descriptor(final String description, final String metaVar, final boolean required, final Class<? extends Handler> handler, final boolean multiValued) {
- this.description = description;
- this.metaVar = metaVar;
- this.required = required;
- this.handler = handler;
- this.multiValued = multiValued;
- }
-
- public String description() {
- return description;
- }
-
- public String metaVar() {
- return metaVar;
- }
-
- public boolean required() {
- return required;
- }
-
- public Class<? extends Handler> handler() {
- return handler;
- }
-
- public boolean isMultiValued() {
- return multiValued;
- }
+ protected Descriptor(final String description, final String metaVar, final boolean required, final Class<? extends Handler> handler, final boolean multiValued) {
+ this.description = description;
+ this.metaVar = metaVar;
+ this.required = required;
+ this.handler = handler;
+ this.multiValued = multiValued;
+ }
+
+ public String description() {
+ return description;
+ }
+
+ public String metaVar() {
+ return metaVar;
+ }
+
+ public boolean required() {
+ return required;
+ }
+
+ public Class<? extends Handler> handler() {
+ return handler;
+ }
+
+ public boolean isMultiValued() {
+ return multiValued;
+ }
}
Modified: geronimo/sandbox/gshell/trunk/gshell-clp/src/main/java/org/apache/geronimo/gshell/clp/IllegalAnnotationError.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-clp/src/main/java/org/apache/geronimo/gshell/clp/IllegalAnnotationError.java?rev=570613&r1=570612&r2=570613&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-clp/src/main/java/org/apache/geronimo/gshell/clp/IllegalAnnotationError.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-clp/src/main/java/org/apache/geronimo/gshell/clp/IllegalAnnotationError.java Tue Aug 28 19:39:43 2007
@@ -27,14 +27,14 @@
public class IllegalAnnotationError
extends Error
{
- private static final long serialVersionUID = 1;
+ private static final long serialVersionUID = 1;
- public IllegalAnnotationError(String message) {
- super(message);
+ public IllegalAnnotationError(String msg) {
+ super(msg);
}
- public IllegalAnnotationError(String message, Throwable cause) {
- super(message, cause);
+ public IllegalAnnotationError(String msg, Throwable cause) {
+ super(msg, cause);
}
public IllegalAnnotationError(Throwable cause) {
Modified: geronimo/sandbox/gshell/trunk/gshell-clp/src/main/java/org/apache/geronimo/gshell/clp/OptionDescriptor.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-clp/src/main/java/org/apache/geronimo/gshell/clp/OptionDescriptor.java?rev=570613&r1=570612&r2=570613&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-clp/src/main/java/org/apache/geronimo/gshell/clp/OptionDescriptor.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-clp/src/main/java/org/apache/geronimo/gshell/clp/OptionDescriptor.java Tue Aug 28 19:39:43 2007
@@ -56,14 +56,14 @@
@Override
public String toString() {
if (aliases.length > 0) {
- String str = "";
+ String str = "";
for (String alias : aliases) {
- if (str.length() > 0) {
- str += ", ";
- }
- str += alias;
- }
+ if (str.length() > 0) {
+ str += ", ";
+ }
+ str += alias;
+ }
return name() + " (" + str + ")";
}
Modified: geronimo/sandbox/gshell/trunk/gshell-clp/src/main/java/org/apache/geronimo/gshell/clp/Printer.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-clp/src/main/java/org/apache/geronimo/gshell/clp/Printer.java?rev=570613&r1=570612&r2=570613&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-clp/src/main/java/org/apache/geronimo/gshell/clp/Printer.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-clp/src/main/java/org/apache/geronimo/gshell/clp/Printer.java Tue Aug 28 19:39:43 2007
@@ -74,10 +74,10 @@
String meta = getMetaVariable(handler, bundle);
if (meta != null) {
- if (str.length() > 0) {
- str += " ";
- }
- str += meta;
+ if (str.length() > 0) {
+ str += " ";
+ }
+ str += meta;
}
return str;
@@ -87,11 +87,11 @@
assert handler != null;
if (handler.descriptor.description().length() == 0) {
- return 0;
+ return 0;
}
return getNameAndMeta(handler, bundle).length();
- }
+ }
public void printUsage(final Writer writer, final ResourceBundle bundle) {
assert writer != null;
@@ -106,10 +106,10 @@
// For display purposes, we like the argument handlers in argument order, but the option handlers in alphabetical order
Collections.sort(optionHandlers, new Comparator<Handler>() {
- public int compare(Handler a, Handler b) {
- return a.descriptor.toString().compareTo(b.descriptor.toString());
- }
- });
+ public int compare(Handler a, Handler b) {
+ return a.descriptor.toString().compareTo(b.descriptor.toString());
+ }
+ });
// Compute the maximum length of the syntax column
int len = 0;
@@ -126,11 +126,11 @@
// And then render the handler usage
for (Handler handler : argumentHandlers) {
- printHandler(out, handler, len, bundle);
+ printHandler(out, handler, len, bundle);
}
for (Handler handler : optionHandlers) {
- printHandler(out, handler, len, bundle);
+ printHandler(out, handler, len, bundle);
}
out.flush();
@@ -206,7 +206,7 @@
}
}
- private void indent(final PrintWriter out, int i) {
+ private void indent(final PrintWriter out, int i) {
assert out != null;
for (; i>0; i--) {
Modified: geronimo/sandbox/gshell/trunk/gshell-clp/src/main/java/org/apache/geronimo/gshell/clp/ProcessingException.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-clp/src/main/java/org/apache/geronimo/gshell/clp/ProcessingException.java?rev=570613&r1=570612&r2=570613&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-clp/src/main/java/org/apache/geronimo/gshell/clp/ProcessingException.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-clp/src/main/java/org/apache/geronimo/gshell/clp/ProcessingException.java Tue Aug 28 19:39:43 2007
@@ -27,17 +27,17 @@
public class ProcessingException
extends Exception
{
- private static final long serialVersionUID = 1;
+ private static final long serialVersionUID = 1;
- public ProcessingException(String message) {
- super(message);
+ public ProcessingException(String msg) {
+ super(msg);
}
- public ProcessingException(String message, Throwable cause) {
- super(message, cause);
+ public ProcessingException(String msg, Throwable cause) {
+ super(msg, cause);
}
public ProcessingException(Throwable cause) {
- super(cause);
+ super(msg);
}
}
Modified: geronimo/sandbox/gshell/trunk/gshell-clp/src/main/java/org/apache/geronimo/gshell/clp/StopProcessingOptionsNotification.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-clp/src/main/java/org/apache/geronimo/gshell/clp/StopProcessingOptionsNotification.java?rev=570613&r1=570612&r2=570613&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-clp/src/main/java/org/apache/geronimo/gshell/clp/StopProcessingOptionsNotification.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-clp/src/main/java/org/apache/geronimo/gshell/clp/StopProcessingOptionsNotification.java Tue Aug 28 19:39:43 2007
@@ -27,4 +27,5 @@
public class StopProcessingOptionsNotification
extends Error
{
+ // empty
}
Modified: geronimo/sandbox/gshell/trunk/gshell-clp/src/main/java/org/apache/geronimo/gshell/clp/handler/BooleanHandler.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-clp/src/main/java/org/apache/geronimo/gshell/clp/handler/BooleanHandler.java?rev=570613&r1=570612&r2=570613&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-clp/src/main/java/org/apache/geronimo/gshell/clp/handler/BooleanHandler.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-clp/src/main/java/org/apache/geronimo/gshell/clp/handler/BooleanHandler.java Tue Aug 28 19:39:43 2007
@@ -33,7 +33,7 @@
public class BooleanHandler
extends Handler<Boolean>
{
- public BooleanHandler(final Descriptor desc, final Setter<? super Boolean> setter) {
+ public BooleanHandler(final Descriptor desc, final Setter<? super Boolean> setter) {
super(desc, setter);
}
Modified: geronimo/sandbox/gshell/trunk/gshell-clp/src/main/java/org/apache/geronimo/gshell/clp/handler/EnumHandler.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-clp/src/main/java/org/apache/geronimo/gshell/clp/handler/EnumHandler.java?rev=570613&r1=570612&r2=570613&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-clp/src/main/java/org/apache/geronimo/gshell/clp/handler/EnumHandler.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-clp/src/main/java/org/apache/geronimo/gshell/clp/handler/EnumHandler.java Tue Aug 28 19:39:43 2007
@@ -70,8 +70,8 @@
buff.append("[");
for (T constants : enumType.getEnumConstants()) {
- buff.append(constants).append(" | ");
- }
+ buff.append(constants).append(" | ");
+ }
buff.delete(buff.length()-3, buff.length());
buff.append("]");
Modified: geronimo/sandbox/gshell/trunk/gshell-clp/src/main/java/org/apache/geronimo/gshell/clp/handler/IntegerHandler.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-clp/src/main/java/org/apache/geronimo/gshell/clp/handler/IntegerHandler.java?rev=570613&r1=570612&r2=570613&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-clp/src/main/java/org/apache/geronimo/gshell/clp/handler/IntegerHandler.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-clp/src/main/java/org/apache/geronimo/gshell/clp/handler/IntegerHandler.java Tue Aug 28 19:39:43 2007
@@ -31,23 +31,23 @@
public class IntegerHandler
extends Handler<Integer>
{
- public IntegerHandler(final Descriptor desc, final Setter<? super Integer> setter) {
- super(desc, setter);
- }
+ public IntegerHandler(final Descriptor desc, final Setter<? super Integer> setter) {
+ super(desc, setter);
+ }
@Override
- public int handle(final Parameters params) throws ProcessingException {
- assert params != null;
+ public int handle(final Parameters params) throws ProcessingException {
+ assert params != null;
String token = params.get(0);
int value = Integer.parseInt(token);
setter.set(value);
return 1;
- }
+ }
@Override
- public String getDefaultMetaVariable() {
- return "N";
- }
+ public String getDefaultMetaVariable() {
+ return "N";
+ }
}
Modified: geronimo/sandbox/gshell/trunk/gshell-clp/src/test/java/org/apache/geronimo/gshell/clp/handler/StopHandlerTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-clp/src/test/java/org/apache/geronimo/gshell/clp/handler/StopHandlerTest.java?rev=570613&r1=570612&r2=570613&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-clp/src/test/java/org/apache/geronimo/gshell/clp/handler/StopHandlerTest.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-clp/src/test/java/org/apache/geronimo/gshell/clp/handler/StopHandlerTest.java Tue Aug 28 19:39:43 2007
@@ -59,7 +59,6 @@
assertEquals(2, bean.args.size());
assertEquals("-foo", bean.args.get(0));
assertEquals("bar", bean.args.get(1));
-
}
private static class TestBean
Modified: geronimo/sandbox/gshell/trunk/gshell-prefs/src/main/java/org/apache/geronimo/gshell/prefs/IllegalAnnotationError.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-prefs/src/main/java/org/apache/geronimo/gshell/prefs/IllegalAnnotationError.java?rev=570613&r1=570612&r2=570613&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-prefs/src/main/java/org/apache/geronimo/gshell/prefs/IllegalAnnotationError.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-prefs/src/main/java/org/apache/geronimo/gshell/prefs/IllegalAnnotationError.java Tue Aug 28 19:39:43 2007
@@ -27,9 +27,9 @@
public class IllegalAnnotationError
extends Error
{
- private static final long serialVersionUID = 1;
+ private static final long serialVersionUID = 1;
- public IllegalAnnotationError(String message) {
+ public IllegalAnnotationError(String message) {
super(message);
}
Modified: geronimo/sandbox/gshell/trunk/gshell-prefs/src/main/java/org/apache/geronimo/gshell/prefs/PreferenceDescriptor.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-prefs/src/main/java/org/apache/geronimo/gshell/prefs/PreferenceDescriptor.java?rev=570613&r1=570612&r2=570613&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-prefs/src/main/java/org/apache/geronimo/gshell/prefs/PreferenceDescriptor.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-prefs/src/main/java/org/apache/geronimo/gshell/prefs/PreferenceDescriptor.java Tue Aug 28 19:39:43 2007
@@ -26,7 +26,7 @@
*/
public class PreferenceDescriptor
{
- private final String key;
+ private final String key;
public PreferenceDescriptor(final Preference pref) {
this(pref.key());
Modified: geronimo/sandbox/gshell/trunk/gshell-prefs/src/main/java/org/apache/geronimo/gshell/prefs/ProcessingException.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-prefs/src/main/java/org/apache/geronimo/gshell/prefs/ProcessingException.java?rev=570613&r1=570612&r2=570613&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-prefs/src/main/java/org/apache/geronimo/gshell/prefs/ProcessingException.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-prefs/src/main/java/org/apache/geronimo/gshell/prefs/ProcessingException.java Tue Aug 28 19:39:43 2007
@@ -27,9 +27,9 @@
public class ProcessingException
extends Exception
{
- private static final long serialVersionUID = 1;
+ private static final long serialVersionUID = 1;
- public ProcessingException(String message) {
+ public ProcessingException(String message) {
super(message);
}