You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2013/12/14 07:07:30 UTC
svn commit: r1550882 - in
/karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands: ./
converter/
Author: jbonofre
Date: Sat Dec 14 06:07:30 2013
New Revision: 1550882
URL: http://svn.apache.org/r1550882
Log:
Flag all org.apache.felix.gogo.commands* classes as deprecated
Modified:
karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/Action.java
karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/Argument.java
karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/Command.java
karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/CommandException.java
karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/CompleterValues.java
karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/Option.java
karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/converter/DefaultConverter.java
karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/converter/GenericType.java
karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/converter/ReifiedType.java
Modified: karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/Action.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/Action.java?rev=1550882&r1=1550881&r2=1550882&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/Action.java (original)
+++ karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/Action.java Sat Dec 14 06:07:30 2013
@@ -20,8 +20,8 @@ package org.apache.felix.gogo.commands;
import org.apache.felix.service.command.CommandSession;
-public interface Action
-{
+@Deprecated
+public interface Action {
Object execute(CommandSession session) throws Exception;
Modified: karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/Argument.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/Argument.java?rev=1550882&r1=1550881&r2=1550882&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/Argument.java (original)
+++ karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/Argument.java Sat Dec 14 06:07:30 2013
@@ -29,9 +29,9 @@ import java.lang.annotation.ElementType;
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.FIELD})
@Deprecated
-public @interface Argument
-{
- public static final String DEFAULT_STRING= "DEFAULT";
+public @interface Argument {
+
+ public static final String DEFAULT_STRING = "DEFAULT";
String DEFAULT = "##default";
Modified: karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/Command.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/Command.java?rev=1550882&r1=1550881&r2=1550882&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/Command.java (original)
+++ karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/Command.java Sat Dec 14 06:07:30 2013
@@ -30,8 +30,7 @@ import java.lang.annotation.ElementType;
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.TYPE})
@Deprecated
-public @interface Command
-{
+public @interface Command {
/**
* Returns the scope or sub shell of the command
*/
Modified: karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/CommandException.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/CommandException.java?rev=1550882&r1=1550881&r2=1550882&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/CommandException.java (original)
+++ karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/CommandException.java Sat Dec 14 06:07:30 2013
@@ -23,6 +23,7 @@ import org.fusesource.jansi.Ansi;
/**
* Base class for exceptions thrown when executing commands.
*/
+@Deprecated
public class CommandException extends Exception {
private String help;
@@ -53,7 +54,7 @@ public class CommandException extends Ex
}
public String getNiceHelp() {
- return help != null ? help
+ return help != null ? help
: Ansi.ansi()
.fg(Ansi.Color.RED)
.a("Error executing command: ")
Modified: karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/CompleterValues.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/CompleterValues.java?rev=1550882&r1=1550881&r2=1550882&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/CompleterValues.java (original)
+++ karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/CompleterValues.java Sat Dec 14 06:07:30 2013
@@ -31,7 +31,7 @@ import java.lang.annotation.Target;
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.METHOD, ElementType.FIELD})
-public @interface CompleterValues
-{
+@Deprecated
+public @interface CompleterValues {
int index() default 0;
}
Modified: karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/Option.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/Option.java?rev=1550882&r1=1550881&r2=1550882&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/Option.java (original)
+++ karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/Option.java Sat Dec 14 06:07:30 2013
@@ -29,9 +29,9 @@ import java.lang.annotation.ElementType;
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.FIELD})
@Deprecated
-public @interface Option
-{
- public static final String DEFAULT_STRING= "DEFAULT";
+public @interface Option {
+
+ public static final String DEFAULT_STRING = "DEFAULT";
String name();
@@ -44,4 +44,5 @@ public @interface Option
boolean multiValued() default false;
String valueToShowInHelp() default DEFAULT_STRING;
+
}
Modified: karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/converter/DefaultConverter.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/converter/DefaultConverter.java?rev=1550882&r1=1550881&r2=1550882&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/converter/DefaultConverter.java (original)
+++ karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/converter/DefaultConverter.java Sat Dec 14 06:07:30 2013
@@ -51,8 +51,8 @@ import java.lang.reflect.Array;
import java.lang.reflect.Type;
import java.lang.reflect.InvocationTargetException;
-public class DefaultConverter
-{
+@Deprecated
+public class DefaultConverter {
private Object loader;
@@ -61,7 +61,7 @@ public class DefaultConverter
}
public Object convert(Object source, Type target) throws Exception {
- return convert( source, new GenericType(target));
+ return convert(source, new GenericType(target));
}
public Object convert(Object fromValue, ReifiedType type) throws Exception {
@@ -187,7 +187,7 @@ public class DefaultConverter
} else if (Character.class == toType) {
if (value.length() == 6 && value.startsWith("\\u")) {
int code = Integer.parseInt(value.substring(2), 16);
- return (char)code;
+ return (char) code;
} else if (value.length() == 1) {
return value.charAt(0);
} else {
@@ -255,7 +255,7 @@ public class DefaultConverter
Dictionary newDic = new Hashtable();
if (obj instanceof Dictionary) {
Dictionary dic = (Dictionary) obj;
- for (Enumeration keyEnum = dic.keys(); keyEnum.hasMoreElements();) {
+ for (Enumeration keyEnum = dic.keys(); keyEnum.hasMoreElements(); ) {
Object key = keyEnum.nextElement();
try {
newDic.put(convert(key, keyType), convert(dic.get(key), valueType));
@@ -264,7 +264,7 @@ public class DefaultConverter
}
}
} else {
- for (Map.Entry e : ((Map<Object,Object>) obj).entrySet()) {
+ for (Map.Entry e : ((Map<Object, Object>) obj).entrySet()) {
try {
newDic.put(convert(e.getKey(), keyType), convert(e.getValue(), valueType));
} catch (Exception t) {
@@ -281,7 +281,7 @@ public class DefaultConverter
Map newMap = (Map) getMap(toClass(type)).newInstance();
if (obj instanceof Dictionary) {
Dictionary dic = (Dictionary) obj;
- for (Enumeration keyEnum = dic.keys(); keyEnum.hasMoreElements();) {
+ for (Enumeration keyEnum = dic.keys(); keyEnum.hasMoreElements(); ) {
Object key = keyEnum.nextElement();
try {
newMap.put(convert(key, keyType), convert(dic.get(key), valueType));
@@ -290,7 +290,7 @@ public class DefaultConverter
}
}
} else {
- for (Map.Entry e : ((Map<Object,Object>) obj).entrySet()) {
+ for (Map.Entry e : ((Map<Object, Object>) obj).entrySet()) {
try {
newMap.put(convert(e.getKey(), keyType), convert(e.getValue(), valueType));
} catch (Exception t) {
@@ -382,6 +382,7 @@ public class DefaultConverter
}
private static final Map<Class, Class> primitives;
+
static {
primitives = new HashMap<Class, Class>();
primitives.put(byte.class, Byte.class);
Modified: karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/converter/GenericType.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/converter/GenericType.java?rev=1550882&r1=1550881&r2=1550882&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/converter/GenericType.java (original)
+++ karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/converter/GenericType.java Sat Dec 14 06:07:30 2013
@@ -29,6 +29,7 @@ import java.util.Map;
import org.osgi.framework.Bundle;
+@Deprecated
public class GenericType extends ReifiedType {
private static final GenericType[] EMPTY = new GenericType[0];
Modified: karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/converter/ReifiedType.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/converter/ReifiedType.java?rev=1550882&r1=1550881&r2=1550882&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/converter/ReifiedType.java (original)
+++ karaf/trunk/shell/console/src/main/java/org/apache/felix/gogo/commands/converter/ReifiedType.java Sat Dec 14 06:07:30 2013
@@ -35,7 +35,9 @@ package org.apache.felix.gogo.commands.c
*
* @Immutable
*/
+@Deprecated
public class ReifiedType {
+
final static ReifiedType ALL = new ReifiedType(Object.class);
private final Class clazz;