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/demo | |
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/demo')
-rw-r--r-- | java/demo/Glacier2/chat/Client.java | 2 | ||||
-rw-r--r-- | java/demo/Glacier2/voip/Server.java | 2 | ||||
-rw-r--r-- | java/demo/Ice/serialize/Client.java | 24 | ||||
-rw-r--r-- | java/demo/Ice/serialize/GreetI.java | 16 | ||||
-rw-r--r-- | java/demo/Ice/serialize/Server.java | 4 |
5 files changed, 24 insertions, 24 deletions
diff --git a/java/demo/Glacier2/chat/Client.java b/java/demo/Glacier2/chat/Client.java index e69fc6ce320..44cf755a125 100644 --- a/java/demo/Glacier2/chat/Client.java +++ b/java/demo/Glacier2/chat/Client.java @@ -297,7 +297,7 @@ public class Client extends JFrame fieldPanel.setLayout(new GridLayout(0, 1)); fieldPanel.add(_hostField); fieldPanel.add(_userNameField); - fieldPanel.add(_passwordField); + fieldPanel.add(_passwordField); _connectionPanel.add(labelPanel); _connectionPanel.add(fieldPanel); diff --git a/java/demo/Glacier2/voip/Server.java b/java/demo/Glacier2/voip/Server.java index f2caef8113d..264533c911b 100644 --- a/java/demo/Glacier2/voip/Server.java +++ b/java/demo/Glacier2/voip/Server.java @@ -124,7 +124,7 @@ public class Server extends Ice.Application return proxy; } }; - + public int run(String[] args) { diff --git a/java/demo/Ice/serialize/Client.java b/java/demo/Ice/serialize/Client.java index f3d290f5060..a4d9f034286 100644 --- a/java/demo/Ice/serialize/Client.java +++ b/java/demo/Ice/serialize/Client.java @@ -62,11 +62,11 @@ public class Client extends Ice.Application return 1; } - MyGreeting greeting = new MyGreeting(); - greeting.text = "Hello there!"; - MyGreeting nullGreeting = null; + MyGreeting greeting = new MyGreeting(); + greeting.text = "Hello there!"; + MyGreeting nullGreeting = null; - boolean sendNull = false; + boolean sendNull = false; menu(); @@ -86,14 +86,14 @@ public class Client extends Ice.Application } if(line.equals("g")) { - if(sendNull) - { - greet.sendGreeting(nullGreeting); - } - else - { - greet.sendGreeting(greeting); - } + if(sendNull) + { + greet.sendGreeting(nullGreeting); + } + else + { + greet.sendGreeting(greeting); + } } else if(line.equals("t")) { diff --git a/java/demo/Ice/serialize/GreetI.java b/java/demo/Ice/serialize/GreetI.java index 45218116458..0073c9ee72b 100644 --- a/java/demo/Ice/serialize/GreetI.java +++ b/java/demo/Ice/serialize/GreetI.java @@ -15,19 +15,19 @@ public class GreetI extends _GreetDisp sendGreeting(MyGreeting greeting, Ice.Current current) { if(greeting != null) - { - System.out.println(greeting.text); - } - else - { - System.out.println("Received null greeting"); - } + { + System.out.println(greeting.text); + } + else + { + System.out.println("Received null greeting"); + } } public void shutdown(Ice.Current current) { System.out.println("Shutting down..."); - current.adapter.getCommunicator().shutdown(); + current.adapter.getCommunicator().shutdown(); } } diff --git a/java/demo/Ice/serialize/Server.java b/java/demo/Ice/serialize/Server.java index 6cf3453d761..5a768a315b8 100644 --- a/java/demo/Ice/serialize/Server.java +++ b/java/demo/Ice/serialize/Server.java @@ -30,8 +30,8 @@ public class Server extends Ice.Application public static void main(String[] args) { - Server app = new Server(); - int status = app.main("Server", args, "config.server"); + Server app = new Server(); + int status = app.main("Server", args, "config.server"); System.exit(status); } } |