diff options
Diffstat (limited to 'framework')
3 files changed, 16 insertions, 8 deletions
diff --git a/framework/bundles/org.eclipse.ecf.console/src/org/eclipse/ecf/console/AbstractCommand.java b/framework/bundles/org.eclipse.ecf.console/src/org/eclipse/ecf/console/AbstractCommand.java index 7530934d6..c19c5c13e 100644 --- a/framework/bundles/org.eclipse.ecf.console/src/org/eclipse/ecf/console/AbstractCommand.java +++ b/framework/bundles/org.eclipse.ecf.console/src/org/eclipse/ecf/console/AbstractCommand.java @@ -85,7 +85,7 @@ public abstract class AbstractCommand { } case Converter.INSPECT: try (Formatter f = new Formatter();) { - f.format("ID%s\n" + "\tIDNamespace=%s\n" + "\tImplClass=%s\n" + "\tConnectedTo=%s\n" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + f.format("ID%s\n" + "\tNamespace=%s\n" + "\tClass=%s\n" + "\tConnectedTo=%s\n" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + "\tConnectNamespace=%s\n" + "\tConfig=%s", //$NON-NLS-1$ //$NON-NLS-2$ cID.getName(), cID.getNamespace().getName(), cClass.getName(), conIDStr, c.getConnectNamespace().getName(), getContainerTypeDescription(cID).getName()); @@ -107,10 +107,10 @@ public abstract class AbstractCommand { } case Converter.INSPECT: try (Formatter f = new Formatter();) { - f.format("ID=%s\n" + "\tScheme=%s\n" + "\tImplClass=%s\n" + "\tDescription=%s\n" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ - + "\tFactoryConstructors=%s\n" + "\tSupportedSchemes=%s", //$NON-NLS-1$ //$NON-NLS-2$ + f.format("ID=%s\n" + "\tUri Scheme=%s\n" + "\tClass=%s\n" + "\tDescription=%s\n" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + + "\tFactoryConstructors=%s", //$NON-NLS-1$ //$NON-NLS-2$ ns.getName(), ns.getScheme(), ns.getClass().getName(), ns.getDescription(), - printClassArrays(ns.getSupportedParameterTypes()), printStringArray(ns.getSupportedSchemes())); + printClassArrays(ns.getSupportedParameterTypes())); return f.toString(); } default: @@ -130,7 +130,7 @@ public abstract class AbstractCommand { case Converter.INSPECT: try (Formatter f = new Formatter();) { f.format("ID=%s\n" + "\tDescription=%s\n" + "\tSupportedConfigs=%s\n" + "\tSupportedIntents=%s\n" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ - + "\tFactoryConstructors=%s\n" + "\tAdapterTypes=%s\n" + "\tHidden=%b\n" + "\tServer=%b", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + + "\tFactoryConstructors=%s\n" + "\tAdapters=%s\n" + "\tHidden=%b\n" + "\tServer=%b", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ ctd.getName(), ctd.getDescription(), printStringArray(ctd.getSupportedConfigs()), printStringArray(ctd.getSupportedIntents()), printClassArrays(ctd.getSupportedParameterTypes()), printStringArray(ctd.getSupportedAdapterTypes()), ctd.isHidden(), ctd.isServer()); diff --git a/framework/bundles/org.eclipse.ecf.console/src/org/eclipse/ecf/internal/console/ContainerCommand.java b/framework/bundles/org.eclipse.ecf.console/src/org/eclipse/ecf/internal/console/ContainerCommand.java index f5298e376..f5ec26c9c 100644 --- a/framework/bundles/org.eclipse.ecf.console/src/org/eclipse/ecf/internal/console/ContainerCommand.java +++ b/framework/bundles/org.eclipse.ecf.console/src/org/eclipse/ecf/internal/console/ContainerCommand.java @@ -35,19 +35,20 @@ public class ContainerCommand extends AbstractCommand implements Converter { void bindContainerManager(IContainerManager cm) { this.containerManager = cm; } - + void unbindContainerManager(IContainerManager cm) { this.containerManager = null; } - + @Reference void bindIdentityFactory(IIDFactory idf) { this.idFactory = idf; } - + void unbindIdentityFactory(IIDFactory idf) { this.idFactory = null; } + protected IContainerManager getContainerManager() { return this.containerManager; } diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RemoteServiceNamespace.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RemoteServiceNamespace.java index 4dc086a48..23ecabb81 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RemoteServiceNamespace.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RemoteServiceNamespace.java @@ -44,4 +44,11 @@ public class RemoteServiceNamespace extends Namespace { return REMOTE_SERVICE_SCHEME; } + /** + * @since 8.12 + */ + @Override + public Class<?>[][] getSupportedParameterTypes() { + return new Class<?>[][] {{String.class, Long.class}}; + } } |