diff options
author | Bernard Normier <bernard@zeroc.com> | 2012-10-23 16:19:38 -0400 |
---|---|---|
committer | Bernard Normier <bernard@zeroc.com> | 2012-10-23 16:19:38 -0400 |
commit | ada25bad3511a359eb28cf48f018d6a42e166f10 (patch) | |
tree | 430749f887a1c6f708c2d4a23b3e3ec4ef18ef2c /java/src/IceGridGUI/Application/Communicator.java | |
parent | Ruby 1.8 fix (diff) | |
download | ice-ada25bad3511a359eb28cf48f018d6a42e166f10.tar.bz2 ice-ada25bad3511a359eb28cf48f018d6a42e166f10.tar.xz ice-ada25bad3511a359eb28cf48f018d6a42e166f10.zip |
Fixed ICE-4855: expand tabs to space (8) for .php, .cpp, .h, .java and .cs files
Diffstat (limited to 'java/src/IceGridGUI/Application/Communicator.java')
-rw-r--r-- | java/src/IceGridGUI/Application/Communicator.java | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/java/src/IceGridGUI/Application/Communicator.java b/java/src/IceGridGUI/Application/Communicator.java index a793da76921..738140f1f0b 100644 --- a/java/src/IceGridGUI/Application/Communicator.java +++ b/java/src/IceGridGUI/Application/Communicator.java @@ -699,24 +699,24 @@ abstract class Communicator extends TreeNode implements DescriptorHolder TemplateDescriptor templateDescriptor = getRoot().findServiceTemplateDescriptor(descriptor.template); - if(templateDescriptor == null) - { - throw new UpdateFailedException("Cannot find template descriptor '" + - descriptor.template + - "' referenced by service-instance"); - } + if(templateDescriptor == null) + { + throw new UpdateFailedException("Cannot find template descriptor '" + + descriptor.template + + "' referenced by service-instance"); + } serviceResolver = new Utils.Resolver(getResolver(), descriptor.parameterValues, templateDescriptor.parameterDefaults); ServiceDescriptor serviceDescriptor = (ServiceDescriptor)templateDescriptor.descriptor; - - // - // If it's not null, it's a bug in the provider of this descriptor, e.g. - // the icegridadmin parsing code. - // - assert serviceDescriptor != null; + + // + // If it's not null, it's a bug in the provider of this descriptor, e.g. + // the icegridadmin parsing code. + // + assert serviceDescriptor != null; serviceName = serviceResolver.substitute(serviceDescriptor.name); serviceResolver.put("service", serviceName); |