summaryrefslogtreecommitdiff
path: root/vb
diff options
context:
space:
mode:
Diffstat (limited to 'vb')
-rw-r--r--vb/demo/Glacier2/callback/Client.vb36
-rwxr-xr-xvb/demo/Ice/async/Client.vb26
-rwxr-xr-xvb/demo/Ice/async/HelloI.vb14
-rwxr-xr-xvb/demo/Ice/async/Server.vb30
-rwxr-xr-xvb/demo/Ice/async/WorkQueue.vb72
-rwxr-xr-xvb/demo/Ice/callback/CallbackReceiverI.vb2
-rwxr-xr-xvb/demo/Ice/callback/CallbackSenderI.vb24
-rwxr-xr-xvb/demo/Ice/hello/HelloI.vb10
-rwxr-xr-xvb/demo/Ice/latency/Client.vb22
-rwxr-xr-xvb/demo/Ice/nested/NestedI.vb12
-rwxr-xr-xvb/demo/Ice/throughput/Client.vb30
-rwxr-xr-xvb/demo/Ice/throughput/ThroughputI.vb22
-rwxr-xr-xvb/demo/Ice/value/Client.vb2
-rwxr-xr-xvb/demo/Ice/value/DerivedPrinterI.vb16
-rwxr-xr-xvb/demo/Ice/value/InitialI.vb20
-rwxr-xr-xvb/demo/Ice/value/ObjectFactory.vb18
-rwxr-xr-xvb/demo/Ice/value/PrinterI.vb14
-rwxr-xr-xvb/demo/IceBox/hello/HelloI.vb2
-rwxr-xr-xvb/demo/IceBox/hello/HelloServiceI.vb18
-rwxr-xr-xvb/demo/IceGrid/allocate/Client.vb192
-rwxr-xr-xvb/demo/IceGrid/allocate/HelloI.vb6
-rwxr-xr-xvb/demo/IceGrid/allocate/Server.vb4
-rwxr-xr-xvb/demo/IceGrid/sessionActivation/Client.vb182
-rwxr-xr-xvb/demo/IceGrid/sessionActivation/HelloI.vb6
-rwxr-xr-xvb/demo/IceGrid/sessionActivation/Server.vb4
-rwxr-xr-xvb/demo/IceGrid/simple/Client.vb30
-rwxr-xr-xvb/demo/IceGrid/simple/HelloI.vb6
-rwxr-xr-xvb/demo/IceGrid/simple/Server.vb4
-rwxr-xr-xvb/demo/IceStorm/clock/Publisher.vb18
-rwxr-xr-xvb/demo/IceStorm/clock/Subscriber.vb74
-rwxr-xr-xvb/demo/book/printer/Printer.ice2
-rwxr-xr-xvb/demo/book/simple_filesystem/DirectoryI.vb54
-rwxr-xr-xvb/demo/book/simple_filesystem/FileI.vb28
-rwxr-xr-xvb/demo/book/simple_filesystem/Filesystem.ice10
-rwxr-xr-xvb/generate/Generate.vb12
-rwxr-xr-xvb/makedist.py4
36 files changed, 513 insertions, 513 deletions
diff --git a/vb/demo/Glacier2/callback/Client.vb b/vb/demo/Glacier2/callback/Client.vb
index eaa824a5e7b..f91c28bec29 100644
--- a/vb/demo/Glacier2/callback/Client.vb
+++ b/vb/demo/Glacier2/callback/Client.vb
@@ -44,24 +44,24 @@ Module Glacier2callbackC
While True
Console.WriteLine("This demo accepts any user-id / password combination.")
- Dim id As String
- Console.Write("user id: ")
- Console.Out.Flush()
- id = Console.In.ReadLine()
-
- Dim pw As String
- Console.Write("password: ")
- Console.Out.Flush()
- pw = Console.In.ReadLine()
-
- Try
- router.createSession(id, pw)
- Exit While
- Catch ex As Glacier2.PermissionDeniedException
- Console.Write("permission denied:\n" & ex.reason)
- Catch ex As Glacier2.CannotCreateSessionException
- Console.Write("cannot create session:\n" & ex.reason)
- End Try
+ Dim id As String
+ Console.Write("user id: ")
+ Console.Out.Flush()
+ id = Console.In.ReadLine()
+
+ Dim pw As String
+ Console.Write("password: ")
+ Console.Out.Flush()
+ pw = Console.In.ReadLine()
+
+ Try
+ router.createSession(id, pw)
+ Exit While
+ Catch ex As Glacier2.PermissionDeniedException
+ Console.Write("permission denied:\n" & ex.reason)
+ Catch ex As Glacier2.CannotCreateSessionException
+ Console.Write("cannot create session:\n" & ex.reason)
+ End Try
End While
diff --git a/vb/demo/Ice/async/Client.vb b/vb/demo/Ice/async/Client.vb
index 86089df89f6..c64c447a46e 100755
--- a/vb/demo/Ice/async/Client.vb
+++ b/vb/demo/Ice/async/Client.vb
@@ -15,20 +15,20 @@ Module AsyncC
Class Client
Inherits Ice.Application
- Class AMI_Hello_sayHelloI
- Inherits AMI_Hello_sayHello
+ Class AMI_Hello_sayHelloI
+ Inherits AMI_Hello_sayHello
- Public Overloads Overrides Sub ice_response()
- End Sub
+ Public Overloads Overrides Sub ice_response()
+ End Sub
- Public Overloads Overrides Sub ice_exception(ByVal ex As Ice.Exception)
- If TypeOf ex Is RequestCanceledException Then
- Console.Error.WriteLine("Request canceled")
- Else
- Console.Error.WriteLine(ex)
- End If
- End Sub
- End Class
+ Public Overloads Overrides Sub ice_exception(ByVal ex As Ice.Exception)
+ If TypeOf ex Is RequestCanceledException Then
+ Console.Error.WriteLine("Request canceled")
+ Else
+ Console.Error.WriteLine(ex)
+ End If
+ End Sub
+ End Class
Private Sub menu()
Console.WriteLine("usage:")
@@ -58,7 +58,7 @@ Module AsyncC
Exit Try
End If
If line.Equals("i") Then
- hello.sayHello(0)
+ hello.sayHello(0)
ElseIf line.Equals("d") Then
hello.sayHello_async(new AMI_Hello_sayHelloI(), 5000)
ElseIf line.Equals("s") Then
diff --git a/vb/demo/Ice/async/HelloI.vb b/vb/demo/Ice/async/HelloI.vb
index 38cdb15e950..fbcc26e809d 100755
--- a/vb/demo/Ice/async/HelloI.vb
+++ b/vb/demo/Ice/async/HelloI.vb
@@ -19,18 +19,18 @@ Public Class HelloI
Public Overloads Overrides Sub sayHello_async(ByVal cb As AMD_Hello_sayHello, ByVal delay As Integer, ByVal current As Ice.Current)
If delay = 0 Then
- Console.WriteLine("Hello World!")
- cb.ice_response()
- Else
- _workQueue.Add(cb, delay)
- End If
+ Console.WriteLine("Hello World!")
+ cb.ice_response()
+ Else
+ _workQueue.Add(cb, delay)
+ End If
End Sub
Public Overloads Overrides Sub shutdown(ByVal current As Ice.Current)
_workQueue.destroy()
- _workQueue.Join()
+ _workQueue.Join()
- current.adapter.getCommunicator().shutdown()
+ current.adapter.getCommunicator().shutdown()
End Sub
Private _workQueue As WorkQueue
diff --git a/vb/demo/Ice/async/Server.vb b/vb/demo/Ice/async/Server.vb
index dd2f5f70067..01d1edf3345 100755
--- a/vb/demo/Ice/async/Server.vb
+++ b/vb/demo/Ice/async/Server.vb
@@ -13,33 +13,33 @@ Module AsyncS
Inherits Ice.Application
Public Overloads Overrides Function run(ByVal args() As String) As Integer
- callbackOnInterrupt()
+ callbackOnInterrupt()
Dim adapter As Ice.ObjectAdapter = communicator().createObjectAdapter("Hello")
- _workQueue = New WorkQueue
+ _workQueue = New WorkQueue
adapter.add(New HelloI(_workQueue), communicator().stringToIdentity("hello"))
- _workQueue.Start()
+ _workQueue.Start()
adapter.activate()
communicator().waitForShutdown()
Return 0
End Function
- Public Overloads Overrides Sub interruptCallback(ByVal sig As Integer)
- _workQueue.destroy()
- _workQueue.Join()
+ Public Overloads Overrides Sub interruptCallback(ByVal sig As Integer)
+ _workQueue.destroy()
+ _workQueue.Join()
- Try
- communicator().destroy()
- Catch ex As Ice.LocalException
- Console.Error.WriteLine(ex)
- Catch ex As System.Exception
- Console.Error.WriteLine(ex)
- End Try
- End Sub
+ Try
+ communicator().destroy()
+ Catch ex As Ice.LocalException
+ Console.Error.WriteLine(ex)
+ Catch ex As System.Exception
+ Console.Error.WriteLine(ex)
+ End Try
+ End Sub
- Private _workQueue As WorkQueue
+ Private _workQueue As WorkQueue
End Class
Public Sub Main(ByVal args() As String)
diff --git a/vb/demo/Ice/async/WorkQueue.vb b/vb/demo/Ice/async/WorkQueue.vb
index 7114e0fe822..d42d099ebb1 100755
--- a/vb/demo/Ice/async/WorkQueue.vb
+++ b/vb/demo/Ice/async/WorkQueue.vb
@@ -16,7 +16,7 @@ Public Class WorkQueue
Private Class CallbackEntry
Public cb As AMD_Hello_sayHello
- Public delay As Integer
+ Public delay As Integer
End Class
Public Sub Join()
@@ -25,57 +25,57 @@ Public Class WorkQueue
Public Sub Start()
_thread = New Thread(New ThreadStart(AddressOf Me.Run))
- _thread.Start()
+ _thread.Start()
End Sub
Public Sub Run()
SyncLock Me
- While Not _done
- If _callbacks.Count = 0 Then
- Monitor.Wait(Me)
- End If
+ While Not _done
+ If _callbacks.Count = 0 Then
+ Monitor.Wait(Me)
+ End If
- If Not _callbacks.Count = 0 Then
- Dim entry As CallbackEntry = _callbacks(0)
- Monitor.Wait(Me, entry.delay)
+ If Not _callbacks.Count = 0 Then
+ Dim entry As CallbackEntry = _callbacks(0)
+ Monitor.Wait(Me, entry.delay)
- If Not _done Then
- _callbacks.RemoveAt(0)
- Console.WriteLine("Belated Hello World!")
- entry.cb.ice_response()
- End If
- End If
- End While
+ If Not _done Then
+ _callbacks.RemoveAt(0)
+ Console.WriteLine("Belated Hello World!")
+ entry.cb.ice_response()
+ End If
+ End If
+ End While
- Dim e As CallbackEntry
- For Each e In _callbacks
- e.cb.ice_exception(New RequestCanceledException())
- Next
- End SyncLock
+ Dim e As CallbackEntry
+ For Each e In _callbacks
+ e.cb.ice_exception(New RequestCanceledException())
+ Next
+ End SyncLock
End Sub
Public Sub Add(ByVal cb As AMD_Hello_sayHello, ByVal delay As Integer)
SyncLock Me
- If Not _done Then
- Dim entry As CallbackEntry = New CallbackEntry
- entry.cb = cb
- entry.delay = delay
+ If Not _done Then
+ Dim entry As CallbackEntry = New CallbackEntry
+ entry.cb = cb
+ entry.delay = delay
- If _callbacks.Count = 0 Then
- Monitor.Pulse(Me)
- End If
- _callbacks.Add(entry)
- Else
- cb.ice_exception(New RequestCanceledException())
- End If
- End SyncLock
+ If _callbacks.Count = 0 Then
+ Monitor.Pulse(Me)
+ End If
+ _callbacks.Add(entry)
+ Else
+ cb.ice_exception(New RequestCanceledException())
+ End If
+ End SyncLock
End Sub
Public Sub destroy()
SyncLock Me
- _done = True
- Monitor.Pulse(Me)
- End SyncLock
+ _done = True
+ Monitor.Pulse(Me)
+ End SyncLock
End Sub
Private _thread As Thread
diff --git a/vb/demo/Ice/callback/CallbackReceiverI.vb b/vb/demo/Ice/callback/CallbackReceiverI.vb
index e2344c8a05d..ee324923212 100755
--- a/vb/demo/Ice/callback/CallbackReceiverI.vb
+++ b/vb/demo/Ice/callback/CallbackReceiverI.vb
@@ -13,7 +13,7 @@ Public NotInheritable Class CallbackReceiverI
Inherits CallbackReceiverDisp_
Public Overloads Overrides Sub callback(ByVal current As Ice.Current)
- System.Console.Out.WriteLine("received callback")
+ System.Console.Out.WriteLine("received callback")
End Sub
End Class
diff --git a/vb/demo/Ice/callback/CallbackSenderI.vb b/vb/demo/Ice/callback/CallbackSenderI.vb
index abf9d903e80..cb945684dc1 100755
--- a/vb/demo/Ice/callback/CallbackSenderI.vb
+++ b/vb/demo/Ice/callback/CallbackSenderI.vb
@@ -13,21 +13,21 @@ Public NotInheritable Class CallbackSenderI
Inherits CallbackSenderDisp_
Public Overloads Overrides Sub initiateCallback(ByVal proxy As CallbackReceiverPrx, ByVal current As Ice.Current)
- System.Console.Out.WriteLine("initiating callback")
- Try
- proxy.callback(current.ctx)
- Catch ex As System.Exception
- System.Console.Error.WriteLine(ex)
- End Try
+ System.Console.Out.WriteLine("initiating callback")
+ Try
+ proxy.callback(current.ctx)
+ Catch ex As System.Exception
+ System.Console.Error.WriteLine(ex)
+ End Try
End Sub
Public Overloads Overrides Sub shutdown(ByVal current As Ice.Current)
- System.Console.Out.WriteLine("Shutting down...")
- Try
- current.adapter.getCommunicator().shutdown()
- Catch ex As System.Exception
- System.Console.Error.WriteLine(ex)
- End Try
+ System.Console.Out.WriteLine("Shutting down...")
+ Try
+ current.adapter.getCommunicator().shutdown()
+ Catch ex As System.Exception
+ System.Console.Error.WriteLine(ex)
+ End Try
End Sub
End Class
diff --git a/vb/demo/Ice/hello/HelloI.vb b/vb/demo/Ice/hello/HelloI.vb
index b2d9825c3c6..cca09c627d7 100755
--- a/vb/demo/Ice/hello/HelloI.vb
+++ b/vb/demo/Ice/hello/HelloI.vb
@@ -14,13 +14,13 @@ Public Class HelloI
Public Overloads Overrides Sub sayHello(ByVal delay As Integer, ByVal current As Ice.Current)
If delay > 0 Then
- System.Threading.Thread.Sleep(delay)
- End If
- System.Console.Out.WriteLine("Hello World!")
+ System.Threading.Thread.Sleep(delay)
+ End If
+ System.Console.Out.WriteLine("Hello World!")
End Sub
Public Overloads Overrides Sub shutdown(ByVal current As Ice.Current)
- System.Console.Out.WriteLine("Shutting down...")
- current.adapter.getCommunicator().shutdown()
+ System.Console.Out.WriteLine("Shutting down...")
+ current.adapter.getCommunicator().shutdown()
End Sub
End Class
diff --git a/vb/demo/Ice/latency/Client.vb b/vb/demo/Ice/latency/Client.vb
index 1c0fa9ec554..48f342ce735 100755
--- a/vb/demo/Ice/latency/Client.vb
+++ b/vb/demo/Ice/latency/Client.vb
@@ -22,18 +22,18 @@ Module LatencyC
Return 1
End If
- '
+ '
' A method needs to be invoked thousands of times before the JIT compiler
- ' will convert it to native code. To ensure an accurate throughput measurement,
- ' we need to "warm up" the JIT compiler.
- '
- Dim repetitions As Integer = 20000
- Console.Out.Write("warming up the JIT compiler...")
- Console.Out.Flush()
- For i As Integer = 0 To repetitions - 1
- ping.ice_ping()
- Next
- Console.Out.WriteLine("ok")
+ ' will convert it to native code. To ensure an accurate throughput measurement,
+ ' we need to "warm up" the JIT compiler.
+ '
+ Dim repetitions As Integer = 20000
+ Console.Out.Write("warming up the JIT compiler...")
+ Console.Out.Flush()
+ For i As Integer = 0 To repetitions - 1
+ ping.ice_ping()
+ Next
+ Console.Out.WriteLine("ok")
ping.ice_ping()
Dim tv1 As Long = (System.DateTime.Now.Ticks - 621355968000000000) / 10000
diff --git a/vb/demo/Ice/nested/NestedI.vb b/vb/demo/Ice/nested/NestedI.vb
index 739fb320c5b..02ba35130fd 100755
--- a/vb/demo/Ice/nested/NestedI.vb
+++ b/vb/demo/Ice/nested/NestedI.vb
@@ -13,15 +13,15 @@ Public Class NestedI
Inherits NestedDisp_
Public Sub New(ByVal self As NestedPrx)
- _self = self
+ _self = self
End Sub
Public Overloads Overrides Sub nestedCall(ByVal level As Integer, ByVal proxy As NestedPrx, ByVal current As Ice.Current)
- System.Console.Out.WriteLine("" & level)
- level -= 1
- If level > 0 Then
- proxy.nestedCall(level, _self, current.ctx)
- End If
+ System.Console.Out.WriteLine("" & level)
+ level -= 1
+ If level > 0 Then
+ proxy.nestedCall(level, _self, current.ctx)
+ End If
End Sub
Private _self As NestedPrx
diff --git a/vb/demo/Ice/throughput/Client.vb b/vb/demo/Ice/throughput/Client.vb
index 88aeda62711..30a5c75f166 100755
--- a/vb/demo/Ice/throughput/Client.vb
+++ b/vb/demo/Ice/throughput/Client.vb
@@ -53,7 +53,7 @@ Module ThroughputC
Dim structSeq() As StringDouble = New StringDouble(StringDoubleSeqSize.value - 1) {}
For i As Integer = 0 To StringDoubleSeqSize.value - 1
- structSeq(i) = New StringDouble
+ structSeq(i) = New StringDouble
structSeq(i).s = "hello"
structSeq(i).d = 3.14
Next
@@ -65,22 +65,22 @@ Module ThroughputC
fixedSeq(i).d = 0
Next
- '
- ' A method needs to be invoked thousands of times before the JIT compiler
- ' will convert it to native code. To ensure an accurate throughput measurement,
- ' we need to "warm up" the JIT compiler.
- '
+ '
+ ' A method needs to be invoked thousands of times before the JIT compiler
+ ' will convert it to native code. To ensure an accurate throughput measurement,
+ ' we need to "warm up" the JIT compiler.
+ '
Dim emptyBytes() As Byte = New Byte(0) {}
Dim emptyStrings() As String = New String(0) {}
Dim emptyStructs() As StringDouble = New StringDouble(0) {}
- emptyStructs(0) = New StringDouble
+ emptyStructs(0) = New StringDouble
Dim emptyFixed() As Fixed = New Fixed(0) {}
- emptyFixed(0) = New Fixed
+ emptyFixed(0) = New Fixed
- Dim repetitions As Integer = 10000
- Console.Out.Write("warming up the JIT compiler...")
- Console.Out.Flush()
- For i As Integer = 0 To repetitions - 1
+ Dim repetitions As Integer = 10000
+ Console.Out.Write("warming up the JIT compiler...")
+ Console.Out.Flush()
+ For i As Integer = 0 To repetitions - 1
throughput.sendByteSeq(emptyBytes)
throughput.sendStringSeq(emptyStrings)
throughput.sendStructSeq(emptyStructs)
@@ -95,9 +95,9 @@ Module ThroughputC
throughput.echoStringSeq(emptyStrings)
throughput.echoStructSeq(emptyStructs)
throughput.echoFixedSeq(emptyFixed)
- Next
- throughput.endWarmup()
- Console.Out.WriteLine("ok")
+ Next
+ throughput.endWarmup()
+ Console.Out.WriteLine("ok")
menu()
diff --git a/vb/demo/Ice/throughput/ThroughputI.vb b/vb/demo/Ice/throughput/ThroughputI.vb
index f4f5f07fc99..efdbb499782 100755
--- a/vb/demo/Ice/throughput/ThroughputI.vb
+++ b/vb/demo/Ice/throughput/ThroughputI.vb
@@ -15,14 +15,14 @@ Public NotInheritable Class ThroughputI
Public Sub New()
_warmup = True
- _byteSeq = New Byte(ByteSeqSize.value) {}
+ _byteSeq = New Byte(ByteSeqSize.value) {}
_stringSeq = New String(StringSeqSize.value - 1) {}
For i As Integer = 0 To StringSeqSize.value - 1
_stringSeq(i) = "hello"
Next
_structSeq = New StringDouble(StringDoubleSeqSize.value - 1) {}
For i As Integer = 0 To StringDoubleSeqSize.value - 1
- _structSeq(i) = New StringDouble
+ _structSeq(i) = New StringDouble
_structSeq(i).s = "hello"
_structSeq(i).d = 3.14
Next
@@ -44,13 +44,13 @@ Public NotInheritable Class ThroughputI
Public Overloads Overrides Function recvByteSeq(ByVal current As Ice.Current) As Byte()
If _warmup Then
Return _emptyByteSeq
- Else
+ Else
Return _byteSeq
- End If
+ End If
End Function
Public Overloads Overrides Function echoByteSeq(ByVal seq() As Byte, ByVal current As Ice.Current) As Byte()
- Return seq
+ Return seq
End Function
Public Overloads Overrides Sub sendStringSeq(ByVal seq() As String, ByVal current As Ice.Current)
@@ -59,9 +59,9 @@ Public NotInheritable Class ThroughputI
Public Overloads Overrides Function recvStringSeq(ByVal current As Ice.Current) As String()
If _warmup Then
Return _emptyStringSeq
- Else
+ Else
Return _stringSeq
- End If
+ End If
End Function
Public Overloads Overrides Function echoStringSeq(ByVal seq() As String, ByVal current As Ice.Current) As String()
@@ -74,9 +74,9 @@ Public NotInheritable Class ThroughputI
Public Overloads Overrides Function recvStructSeq(ByVal current As Ice.Current) As StringDouble()
If _warmup Then
Return _emptyStructSeq
- Else
+ Else
Return _structSeq
- End If
+ End If
End Function
Public Overloads Overrides Function echoStructSeq(ByVal seq As StringDouble(), ByVal current As Ice.Current) As StringDouble()
@@ -89,9 +89,9 @@ Public NotInheritable Class ThroughputI
Public Overloads Overrides Function recvFixedSeq(ByVal current As Ice.Current) As Fixed()
If _warmup Then
Return _emptyFixedSeq
- Else
+ Else
Return _fixedSeq
- End If
+ End If
End Function
Public Overloads Overrides Function echoFixedSeq(ByVal seq As Fixed(), ByVal current As Ice.Current) As Fixed()
diff --git a/vb/demo/Ice/value/Client.vb b/vb/demo/Ice/value/Client.vb
index 52db2b79756..dd5b453d495 100755
--- a/vb/demo/Ice/value/Client.vb
+++ b/vb/demo/Ice/value/Client.vb
@@ -138,7 +138,7 @@ Module ValueC
Console.Out.WriteLine()
Console.Out.WriteLine("That's it for this demo. Have fun with Ice!")
- initial.shutdown()
+ initial.shutdown()
Return 0
End Function
diff --git a/vb/demo/Ice/value/DerivedPrinterI.vb b/vb/demo/Ice/value/DerivedPrinterI.vb
index 091c7fcd170..1d7770fb4f1 100755
--- a/vb/demo/Ice/value/DerivedPrinterI.vb
+++ b/vb/demo/Ice/value/DerivedPrinterI.vb
@@ -13,17 +13,17 @@ Public Class DerivedPrinterI
Inherits DerivedPrinter
Public Overloads Overrides Sub printBackwards(ByVal current As Ice.Current)
- Dim arr() As Char = message.ToCharArray()
- For i As Integer = 0 To arr.Length / 2 - 1
- Dim tmp As Char = arr(arr.Length - i - 1)
- arr(arr.Length - i - 1) = arr(i)
- arr(i) = tmp
- Next
- System.Console.Out.WriteLine(New String(arr))
+ Dim arr() As Char = message.ToCharArray()
+ For i As Integer = 0 To arr.Length / 2 - 1
+ Dim tmp As Char = arr(arr.Length - i - 1)
+ arr(arr.Length - i - 1) = arr(i)
+ arr(i) = tmp
+ Next
+ System.Console.Out.WriteLine(New String(arr))
End Sub
Public Overloads Overrides Sub printUppercase(ByVal current As Ice.Current)
- System.Console.Out.WriteLine(derivedMessage.ToUpper())
+ System.Console.Out.WriteLine(derivedMessage.ToUpper())
End Sub
End Class
diff --git a/vb/demo/Ice/value/InitialI.vb b/vb/demo/Ice/value/InitialI.vb
index 570d65f195e..024a64a8388 100755
--- a/vb/demo/Ice/value/InitialI.vb
+++ b/vb/demo/Ice/value/InitialI.vb
@@ -13,17 +13,17 @@ Public Class InitialI
Inherits Initial
Public Sub New(ByVal adapter As Ice.ObjectAdapter)
- _simple = New Simple
- _simple.message = "a message 4 u"
+ _simple = New Simple
+ _simple.message = "a message 4 u"
- _printer = New PrinterI
- _printer.message = "Ice rulez!"
- _printerProxy = PrinterPrxHelper.uncheckedCast(adapter.addWithUUID(_printer))
+ _printer = New PrinterI
+ _printer.message = "Ice rulez!"
+ _printerProxy = PrinterPrxHelper.uncheckedCast(adapter.addWithUUID(_printer))
- _derivedPrinter = New DerivedPrinterI
- _derivedPrinter.message = _printer.message
- _derivedPrinter.derivedMessage = "a derived message 4 u"
- adapter.addWithUUID(_derivedPrinter)
+ _derivedPrinter = New DerivedPrinterI
+ _derivedPrinter.message = _printer.message
+ _derivedPrinter.derivedMessage = "a derived message 4 u"
+ adapter.addWithUUID(_derivedPrinter)
End Sub
Public Overloads Overrides Function getSimple(ByVal current As Ice.Current) As Simple
@@ -46,7 +46,7 @@ Public Class InitialI
End Sub
Public Overloads Overrides Sub shutdown(ByVal current As Ice.Current)
- current.adapter.getCommunicator().shutdown()
+ current.adapter.getCommunicator().shutdown()
End Sub
Private _simple As Simple
diff --git a/vb/demo/Ice/value/ObjectFactory.vb b/vb/demo/Ice/value/ObjectFactory.vb
index f81ea049ab4..8eea89d6cf5 100755
--- a/vb/demo/Ice/value/ObjectFactory.vb
+++ b/vb/demo/Ice/value/ObjectFactory.vb
@@ -14,20 +14,20 @@ Public Class ObjectFactory
Implements Ice.ObjectFactory
Public Overloads Function create(ByVal type As String) As Ice.Object Implements Ice.ObjectFactory.create
- If type.Equals("::Demo::Printer") Then
- Return New PrinterI
- End If
+ If type.Equals("::Demo::Printer") Then
+ Return New PrinterI
+ End If
- If type.Equals("::Demo::DerivedPrinter") Then
- Return New DerivedPrinterI
- End If
+ If type.Equals("::Demo::DerivedPrinter") Then
+ Return New DerivedPrinterI
+ End If
- ' Debug.Assert(False) ' Bug in VB 7.1: Diagnostics.Debug is not found
- Return Nothing
+ ' Debug.Assert(False) ' Bug in VB 7.1: Diagnostics.Debug is not found
+ Return Nothing
End Function
Public Overloads Sub destroy() Implements Ice.ObjectFactory.destroy
- ' Nothing to do
+ ' Nothing to do
End Sub
End Class
diff --git a/vb/demo/Ice/value/PrinterI.vb b/vb/demo/Ice/value/PrinterI.vb
index b9b57b6454a..71d5d82abed 100755
--- a/vb/demo/Ice/value/PrinterI.vb
+++ b/vb/demo/Ice/value/PrinterI.vb
@@ -13,13 +13,13 @@ Public Class PrinterI
Inherits Printer
Public Overloads Overrides Sub printBackwards(ByVal current As Ice.Current)
- Dim arr() As Char = message.ToCharArray()
- For i As Integer = 0 To arr.Length / 2 - 1
- Dim tmp As Char = arr(arr.Length - i - 1)
- arr(arr.Length - i - 1) = arr(i)
- arr(i) = tmp
- Next
- System.Console.Out.WriteLine(New String(arr))
+ Dim arr() As Char = message.ToCharArray()
+ For i As Integer = 0 To arr.Length / 2 - 1
+ Dim tmp As Char = arr(arr.Length - i - 1)
+ arr(arr.Length - i - 1) = arr(i)
+ arr(i) = tmp
+ Next
+ System.Console.Out.WriteLine(New String(arr))
End Sub
End Class
diff --git a/vb/demo/IceBox/hello/HelloI.vb b/vb/demo/IceBox/hello/HelloI.vb
index 665939c40a1..a618b26457a 100755
--- a/vb/demo/IceBox/hello/HelloI.vb
+++ b/vb/demo/IceBox/hello/HelloI.vb
@@ -13,6 +13,6 @@ Public Class HelloI
Inherits HelloDisp_
Public Overloads Overrides Sub sayHello(ByVal current As Ice.Current)
- System.Console.Out.WriteLine("Hello World!")
+ System.Console.Out.WriteLine("Hello World!")
End Sub
End Class
diff --git a/vb/demo/IceBox/hello/HelloServiceI.vb b/vb/demo/IceBox/hello/HelloServiceI.vb
index 7206473f999..47e2d868a8f 100755
--- a/vb/demo/IceBox/hello/HelloServiceI.vb
+++ b/vb/demo/IceBox/hello/HelloServiceI.vb
@@ -10,20 +10,20 @@
Module HelloIceBoxS
Public Class HelloServiceI
- Inherits Ice.LocalObjectImpl
- Implements IceBox.Service
+ Inherits Ice.LocalObjectImpl
+ Implements IceBox.Service
- Public Overridable Sub start(ByVal name As String, ByVal communicator As Ice.Communicator, ByVal args() As String) Implements IceBox.Service.start
- _adapter = communicator.createObjectAdapter(name)
- _adapter.add(new HelloI(), communicator.stringToIdentity("hello"))
- _adapter.activate()
- End Sub
+ Public Overridable Sub start(ByVal name As String, ByVal communicator As Ice.Communicator, ByVal args() As String) Implements IceBox.Service.start
+ _adapter = communicator.createObjectAdapter(name)
+ _adapter.add(new HelloI(), communicator.stringToIdentity("hello"))
+ _adapter.activate()
+ End Sub
Public Overridable Sub [stop]() Implements IceBox.Service.stop
- _adapter.deactivate()
+ _adapter.deactivate()
End Sub
- Private _adapter As Ice.ObjectAdapter
+ Private _adapter As Ice.ObjectAdapter
End Class
End Module
diff --git a/vb/demo/IceGrid/allocate/Client.vb b/vb/demo/IceGrid/allocate/Client.vb
index 075ef124960..da619131d75 100755
--- a/vb/demo/IceGrid/allocate/Client.vb
+++ b/vb/demo/IceGrid/allocate/Client.vb
@@ -29,12 +29,12 @@ Module AllocateC
While Not _terminated
System.Threading.Monitor.Wait(Me, _timeout)
If _terminated Then
- Exit While
+ Exit While
End If
Try
_session.keepAlive()
Catch ex As Ice.Exception
- Exit While
+ Exit While
End Try
End While
End SyncLock
@@ -52,100 +52,100 @@ Module AllocateC
Private _terminated As Boolean
End Class
- Private Sub menu()
- Console.WriteLine("usage:")
- Console.WriteLine("t: send greeting")
- Console.WriteLine("s: shutdown server")
- Console.WriteLine("x: exit")
- Console.WriteLine("?: help")
- End Sub
-
- Public Overloads Overrides Function run(ByVal args() As String) As Integer
- Dim status As Integer = 0
- Dim registry As IceGrid.RegistryPrx
- registry = IceGrid.RegistryPrxHelper.checkedCast(communicator().stringToProxy("DemoIceGrid/Registry"))
- If registry Is Nothing Then
- Console.Error.WriteLine("could not contact registry")
- End If
-
- Dim session As IceGrid.SessionPrx = Nothing
- While True
- Console.Out.WriteLine("This demo accepts any user-id / password combination.")
-
- Console.Out.Write("user id: ")
- Console.Out.Flush()
- Dim id As String = Console.In.ReadLine()
-
- Console.Out.Write("password: ")
- Console.Out.Flush()
- Dim pw As String = Console.In.ReadLine()
-
- Try
- session = registry.createSession(id, pw)
- Exit While
- Catch ex As IceGrid.PermissionDeniedException
- Console.Error.WriteLine("permission denied:\n" + ex.reason)
- End Try
- End While
-
- Dim keepAlive As SessionKeepAliveThread = New SessionKeepAliveThread(session, registry.getSessionTimeout() / 2)
- Dim keepAliveThread As Thread = New Thread(New ThreadStart(AddressOf keepAlive.run))
- keepAliveThread.Start()
-
- Try
- Dim hello As HelloPrx = Nothing
- Try
- hello = HelloPrxHelper.checkedCast(session.allocateObjectById(communicator().stringToIdentity("hello")))
- Catch ex As IceGrid.ObjectNotRegisteredException
- hello = HelloPrxHelper.checkedCast(session.allocateObjectByType("::Demo::Hello"))
- End Try
-
- menu()
-
- Dim line As String = Nothing
- Do
- Try
- Console.Out.Write("==> ")
- Console.Out.Flush()
- line = Console.In.ReadLine()
- If line Is Nothing Then
- Exit Try
- End If
- If line.Equals("t") Then
- hello.sayHello()
- ElseIf line.Equals("s") Then
- hello.shutdown()
- ElseIf line.Equals("x") Then
- ' Nothing to do
- ElseIf line.Equals("?") Then
- menu()
- Else
- Console.WriteLine("unknown command `" & line & "'")
- menu()
- End If
- Catch ex As System.Exception
- Console.Error.WriteLine(ex)
- End Try
- Loop While Not line.Equals("x")
- Catch ex As IceGrid.AllocationException
- Console.Error.WriteLine("could not allocate object: " + ex.reason)
- status = 1
- Catch ex As Exception
- Console.Error.WriteLine("unexpected exception: " + ex.ToString())
- status = 1
- End Try
-
- '
- ' Destroy the keepAlive thread and the sesion object otherwise
- ' the session will be kept allocated until the timeout occurs.
- ' Destroying the session will release all allocated objects.
- '
- keepAlive.terminate()
- keepAliveThread.Join()
- session.destroy()
-
- Return status
- End Function
+ Private Sub menu()
+ Console.WriteLine("usage:")
+ Console.WriteLine("t: send greeting")
+ Console.WriteLine("s: shutdown server")
+ Console.WriteLine("x: exit")
+ Console.WriteLine("?: help")
+ End Sub
+
+ Public Overloads Overrides Function run(ByVal args() As String) As Integer
+ Dim status As Integer = 0
+ Dim registry As IceGrid.RegistryPrx
+ registry = IceGrid.RegistryPrxHelper.checkedCast(communicator().stringToProxy("DemoIceGrid/Registry"))
+ If registry Is Nothing Then
+ Console.Error.WriteLine("could not contact registry")
+ End If
+
+ Dim session As IceGrid.SessionPrx = Nothing
+ While True
+ Console.Out.WriteLine("This demo accepts any user-id / password combination.")
+
+ Console.Out.Write("user id: ")
+ Console.Out.Flush()
+ Dim id As String = Console.In.ReadLine()
+
+ Console.Out.Write("password: ")
+ Console.Out.Flush()
+ Dim pw As String = Console.In.ReadLine()
+
+ Try
+ session = registry.createSession(id, pw)
+ Exit While
+ Catch ex As IceGrid.PermissionDeniedException
+ Console.Error.WriteLine("permission denied:\n" + ex.reason)
+ End Try
+ End While
+
+ Dim keepAlive As SessionKeepAliveThread = New SessionKeepAliveThread(session, registry.getSessionTimeout() / 2)
+ Dim keepAliveThread As Thread = New Thread(New ThreadStart(AddressOf keepAlive.run))
+ keepAliveThread.Start()
+
+ Try
+ Dim hello As HelloPrx = Nothing
+ Try
+ hello = HelloPrxHelper.checkedCast(session.allocateObjectById(communicator().stringToIdentity("hello")))
+ Catch ex As IceGrid.ObjectNotRegisteredException
+ hello = HelloPrxHelper.checkedCast(session.allocateObjectByType("::Demo::Hello"))
+ End Try
+
+ menu()
+
+ Dim line As String = Nothing
+ Do
+ Try
+ Console.Out.Write("==> ")
+ Console.Out.Flush()
+ line = Console.In.ReadLine()
+ If line Is Nothing Then
+ Exit Try
+ End If
+ If line.Equals("t") Then
+ hello.sayHello()
+ ElseIf line.Equals("s") Then
+ hello.shutdown()
+ ElseIf line.Equals("x") Then
+ ' Nothing to do
+ ElseIf line.Equals("?") Then
+ menu()
+ Else
+ Console.WriteLine("unknown command `" & line & "'")
+ menu()
+ End If
+ Catch ex As System.Exception
+ Console.Error.WriteLine(ex)
+ End Try
+ Loop While Not line.Equals("x")
+ Catch ex As IceGrid.AllocationException
+ Console.Error.WriteLine("could not allocate object: " + ex.reason)
+ status = 1
+ Catch ex As Exception
+ Console.Error.WriteLine("unexpected exception: " + ex.ToString())
+ status = 1
+ End Try
+
+ '
+ ' Destroy the keepAlive thread and the sesion object otherwise
+ ' the session will be kept allocated until the timeout occurs.
+ ' Destroying the session will release all allocated objects.
+ '
+ keepAlive.terminate()
+ keepAliveThread.Join()
+ session.destroy()
+
+ Return status
+ End Function
End Class
Public Sub Main(ByVal args() As String)
diff --git a/vb/demo/IceGrid/allocate/HelloI.vb b/vb/demo/IceGrid/allocate/HelloI.vb
index a70e9852431..b9d2ae639b4 100755
--- a/vb/demo/IceGrid/allocate/HelloI.vb
+++ b/vb/demo/IceGrid/allocate/HelloI.vb
@@ -17,12 +17,12 @@ Public Class HelloI
End Sub
Public Overloads Overrides Sub sayHello(ByVal current As Ice.Current)
- System.Console.Out.WriteLine(_name + " says Hello World!")
+ System.Console.Out.WriteLine(_name + " says Hello World!")
End Sub
Public Overloads Overrides Sub shutdown(ByVal current As Ice.Current)
- System.Console.Out.WriteLine(_name + " shutting down...")
- current.adapter.getCommunicator().shutdown()
+ System.Console.Out.WriteLine(_name + " shutting down...")
+ current.adapter.getCommunicator().shutdown()
End Sub
Private _name As String
diff --git a/vb/demo/IceGrid/allocate/Server.vb b/vb/demo/IceGrid/allocate/Server.vb
index b9047fbba9d..121226b489b 100755
--- a/vb/demo/IceGrid/allocate/Server.vb
+++ b/vb/demo/IceGrid/allocate/Server.vb
@@ -14,8 +14,8 @@ Module AllocateS
Public Overloads Overrides Function run(ByVal args() As String) As Integer
Dim adapter As Ice.ObjectAdapter = communicator().createObjectAdapter("Hello")
- Dim properties As Ice.Properties = communicator().getProperties()
- Dim id As Ice.Identity = communicator().stringToIdentity(properties.getProperty("Identity"))
+ Dim properties As Ice.Properties = communicator().getProperties()
+ Dim id As Ice.Identity = communicator().stringToIdentity(properties.getProperty("Identity"))
adapter.add(New HelloI(properties.getProperty("Ice.ServerId")), id)
adapter.activate()
communicator.waitForShutdown()
diff --git a/vb/demo/IceGrid/sessionActivation/Client.vb b/vb/demo/IceGrid/sessionActivation/Client.vb
index e2107d4d7a9..860e7dc8602 100755
--- a/vb/demo/IceGrid/sessionActivation/Client.vb
+++ b/vb/demo/IceGrid/sessionActivation/Client.vb
@@ -29,12 +29,12 @@ Module SessionActivationC
While Not _terminated
System.Threading.Monitor.Wait(Me, _timeout)
If _terminated Then
- Exit While
+ Exit While
End If
Try
_session.keepAlive()
Catch ex As Ice.Exception
- Exit While
+ Exit While
End Try
End While
End SyncLock
@@ -52,95 +52,95 @@ Module SessionActivationC
Private _terminated As Boolean
End Class
- Private Sub menu()
- Console.WriteLine("usage:")
- Console.WriteLine("t: send greeting")
- Console.WriteLine("x: exit")
- Console.WriteLine("?: help")
- End Sub
-
- Public Overloads Overrides Function run(ByVal args() As String) As Integer
- Dim status As Integer = 0
- Dim registry As IceGrid.RegistryPrx
- registry = IceGrid.RegistryPrxHelper.checkedCast(communicator().stringToProxy("DemoIceGrid/Registry"))
- If registry Is Nothing Then
- Console.Error.WriteLine("could not contact registry")
- End If
-
- Dim session As IceGrid.SessionPrx = Nothing
- While True
- Console.Out.WriteLine("This demo accepts any user-id / password combination.")
-
- Console.Out.Write("user id: ")
- Console.Out.Flush()
- Dim id As String = Console.In.ReadLine()
-
- Console.Out.Write("password: ")
- Console.Out.Flush()
- Dim pw As String = Console.In.ReadLine()
-
- Try
- session = registry.createSession(id, pw)
- Exit While
- Catch ex As IceGrid.PermissionDeniedException
- Console.Error.WriteLine("permission denied:\n" + ex.reason)
- End Try
- End While
-
- Dim keepAlive As SessionKeepAliveThread = New SessionKeepAliveThread(session, registry.getSessionTimeout() / 2)
- Dim keepAliveThread As Thread = New Thread(New ThreadStart(AddressOf keepAlive.run))
- keepAliveThread.Start()
-
- Try
- Dim hello As HelloPrx = HelloPrxHelper.checkedCast(session.allocateObjectById(communicator().stringToIdentity("hello")))
-
- menu()
-
- Dim line As String = Nothing
- Do
- Try
- Console.Out.Write("==> ")
- Console.Out.Flush()
- line = Console.In.ReadLine()
- If line Is Nothing Then
- Exit Try
- End If
- If line.Equals("t") Then
- hello.sayHello()
- ElseIf line.Equals("x") Then
- ' Nothing to do
- ElseIf line.Equals("?") Then
- menu()
- Else
- Console.WriteLine("unknown command `" & line & "'")
- menu()
- End If
- Catch ex As System.Exception
- Console.Error.WriteLine(ex)
- End Try
- Loop While Not line.Equals("x")
- Catch ex As IceGrid.AllocationException
- Console.Error.WriteLine("could not allocate object: " + ex.reason)
- status = 1
- Catch ex As IceGrid.ObjectNotRegisteredException
- Console.Error.WriteLine("object not registered with registry")
- status = 1
- Catch ex As Exception
- Console.Error.WriteLine("unexpected exception: " + ex.ToString())
- status = 1
- End Try
-
- '
- ' Destroy the keepAlive thread and the sesion object otherwise
- ' the session will be kept allocated until the timeout occurs.
- ' Destroying the session will release all allocated objects.
- '
- keepAlive.terminate()
- keepAliveThread.Join()
- session.destroy()
-
- Return status
- End Function
+ Private Sub menu()
+ Console.WriteLine("usage:")
+ Console.WriteLine("t: send greeting")
+ Console.WriteLine("x: exit")
+ Console.WriteLine("?: help")
+ End Sub
+
+ Public Overloads Overrides Function run(ByVal args() As String) As Integer
+ Dim status As Integer = 0
+ Dim registry As IceGrid.RegistryPrx
+ registry = IceGrid.RegistryPrxHelper.checkedCast(communicator().stringToProxy("DemoIceGrid/Registry"))
+ If registry Is Nothing Then
+ Console.Error.WriteLine("could not contact registry")
+ End If
+
+ Dim session As IceGrid.SessionPrx = Nothing
+ While True
+ Console.Out.WriteLine("This demo accepts any user-id / password combination.")
+
+ Console.Out.Write("user id: ")
+ Console.Out.Flush()
+ Dim id As String = Console.In.ReadLine()
+
+ Console.Out.Write("password: ")
+ Console.Out.Flush()
+ Dim pw As String = Console.In.ReadLine()
+
+ Try
+ session = registry.createSession(id, pw)
+ Exit While
+ Catch ex As IceGrid.PermissionDeniedException
+ Console.Error.WriteLine("permission denied:\n" + ex.reason)
+ End Try
+ End While
+
+ Dim keepAlive As SessionKeepAliveThread = New SessionKeepAliveThread(session, registry.getSessionTimeout() / 2)
+ Dim keepAliveThread As Thread = New Thread(New ThreadStart(AddressOf keepAlive.run))
+ keepAliveThread.Start()
+
+ Try
+ Dim hello As HelloPrx = HelloPrxHelper.checkedCast(session.allocateObjectById(communicator().stringToIdentity("hello")))
+
+ menu()
+
+ Dim line As String = Nothing
+ Do
+ Try
+ Console.Out.Write("==> ")
+ Console.Out.Flush()
+ line = Console.In.ReadLine()
+ If line Is Nothing Then
+ Exit Try
+ End If
+ If line.Equals("t") Then
+ hello.sayHello()
+ ElseIf line.Equals("x") Then
+ ' Nothing to do
+ ElseIf line.Equals("?") Then
+ menu()
+ Else
+ Console.WriteLine("unknown command `" & line & "'")
+ menu()
+ End If
+ Catch ex As System.Exception
+ Console.Error.WriteLine(ex)
+ End Try
+ Loop While Not line.Equals("x")
+ Catch ex As IceGrid.AllocationException
+ Console.Error.WriteLine("could not allocate object: " + ex.reason)
+ status = 1
+ Catch ex As IceGrid.ObjectNotRegisteredException
+ Console.Error.WriteLine("object not registered with registry")
+ status = 1
+ Catch ex As Exception
+ Console.Error.WriteLine("unexpected exception: " + ex.ToString())
+ status = 1
+ End Try
+
+ '
+ ' Destroy the keepAlive thread and the sesion object otherwise
+ ' the session will be kept allocated until the timeout occurs.
+ ' Destroying the session will release all allocated objects.
+ '
+ keepAlive.terminate()
+ keepAliveThread.Join()
+ session.destroy()
+
+ Return status
+ End Function
End Class
Public Sub Main(ByVal args() As String)
diff --git a/vb/demo/IceGrid/sessionActivation/HelloI.vb b/vb/demo/IceGrid/sessionActivation/HelloI.vb
index ee083e8d0bc..37865089422 100755
--- a/vb/demo/IceGrid/sessionActivation/HelloI.vb
+++ b/vb/demo/IceGrid/sessionActivation/HelloI.vb
@@ -17,12 +17,12 @@ Public Class HelloI
End Sub
Public Overloads Overrides Sub sayHello(ByVal current As Ice.Current)
- System.Console.Out.WriteLine(_name + " says Hello World!")
+ System.Console.Out.WriteLine(_name + " says Hello World!")
End Sub
Public Overloads Overrides Sub shutdown(ByVal current As Ice.Current)
- System.Console.Out.WriteLine(_name + " shutting down...")
- current.adapter.getCommunicator().shutdown()
+ System.Console.Out.WriteLine(_name + " shutting down...")
+ current.adapter.getCommunicator().shutdown()
End Sub
Private _name As String
diff --git a/vb/demo/IceGrid/sessionActivation/Server.vb b/vb/demo/IceGrid/sessionActivation/Server.vb
index d023cbeb2db..12645b4a46e 100755
--- a/vb/demo/IceGrid/sessionActivation/Server.vb
+++ b/vb/demo/IceGrid/sessionActivation/Server.vb
@@ -14,8 +14,8 @@ Module SessionActivationS
Public Overloads Overrides Function run(ByVal args() As String) As Integer
Dim adapter As Ice.ObjectAdapter = communicator().createObjectAdapter("Hello")
- Dim properties As Ice.Properties = communicator().getProperties()
- Dim id As Ice.Identity = communicator().stringToIdentity(properties.getProperty("Identity"))
+ Dim properties As Ice.Properties = communicator().getProperties()
+ Dim id As Ice.Identity = communicator().stringToIdentity(properties.getProperty("Identity"))
adapter.add(New HelloI(properties.getProperty("Ice.ServerId")), id)
adapter.activate()
communicator.waitForShutdown()
diff --git a/vb/demo/IceGrid/simple/Client.vb b/vb/demo/IceGrid/simple/Client.vb
index 841def213a0..e8add72069c 100755
--- a/vb/demo/IceGrid/simple/Client.vb
+++ b/vb/demo/IceGrid/simple/Client.vb
@@ -15,28 +15,28 @@ Module SimpleIceGridC
Class Client
Inherits Ice.Application
- Private Sub menu()
- Console.WriteLine("usage:")
- Console.WriteLine("t: send greeting")
- Console.WriteLine("s: shutdown server")
- Console.WriteLine("x: exit")
- Console.WriteLine("?: help")
- End Sub
+ Private Sub menu()
+ Console.WriteLine("usage:")
+ Console.WriteLine("t: send greeting")
+ Console.WriteLine("s: shutdown server")
+ Console.WriteLine("x: exit")
+ Console.WriteLine("?: help")
+ End Sub
Public Overloads Overrides Function run(ByVal args() As String) As Integer
- Dim hello As HelloPrx = Nothing
- Try
- hello = HelloPrxHelper.checkedCast(communicator().stringToProxy("hello"))
- Catch ex As Ice.NotRegisteredException
- Dim query As IceGrid.QueryPrx = IceGrid.QueryPrxHelper.checkedCast(communicator().stringToProxy("DemoIceGrid/Query"))
- hello = HelloPrxHelper.checkedCast(query.findObjectByType("::Demo::Hello"))
- End Try
+ Dim hello As HelloPrx = Nothing
+ Try
+ hello = HelloPrxHelper.checkedCast(communicator().stringToProxy("hello"))
+ Catch ex As Ice.NotRegisteredException
+ Dim query As IceGrid.QueryPrx = IceGrid.QueryPrxHelper.checkedCast(communicator().stringToProxy("DemoIceGrid/Query"))
+ hello = HelloPrxHelper.checkedCast(query.findObjectByType("::Demo::Hello"))
+ End Try
If hello Is Nothing Then
Console.Error.WriteLine("couldn't find a `::Demo::Hello' object")
Return 1
End If
- menu()
+ menu()
Dim line As String = Nothing
Do
diff --git a/vb/demo/IceGrid/simple/HelloI.vb b/vb/demo/IceGrid/simple/HelloI.vb
index eff5407771f..55c30003619 100755
--- a/vb/demo/IceGrid/simple/HelloI.vb
+++ b/vb/demo/IceGrid/simple/HelloI.vb
@@ -17,12 +17,12 @@ Public Class HelloI
End Sub
Public Overloads Overrides Sub sayHello(ByVal current As Ice.Current)
- System.Console.Out.WriteLine(_name + " says Hello World!")
+ System.Console.Out.WriteLine(_name + " says Hello World!")
End Sub
Public Overloads Overrides Sub shutdown(ByVal current As Ice.Current)
- System.Console.Out.WriteLine(_name + " shutting down...")
- current.adapter.getCommunicator().shutdown()
+ System.Console.Out.WriteLine(_name + " shutting down...")
+ current.adapter.getCommunicator().shutdown()
End Sub
Private _name As String
diff --git a/vb/demo/IceGrid/simple/Server.vb b/vb/demo/IceGrid/simple/Server.vb
index dbe5314b03b..eae42b3f1f3 100755
--- a/vb/demo/IceGrid/simple/Server.vb
+++ b/vb/demo/IceGrid/simple/Server.vb
@@ -14,8 +14,8 @@ Module SimpleIceGridS
Public Overloads Overrides Function run(ByVal args() As String) As Integer
Dim adapter As Ice.ObjectAdapter = communicator().createObjectAdapter("Hello")
- Dim properties As Ice.Properties = communicator().getProperties()
- Dim id As Ice.Identity = communicator().stringToIdentity(properties.getProperty("Identity"))
+ Dim properties As Ice.Properties = communicator().getProperties()
+ Dim id As Ice.Identity = communicator().stringToIdentity(properties.getProperty("Identity"))
adapter.add(New HelloI(properties.getProperty("Ice.ServerId")), id)
adapter.activate()
communicator.waitForShutdown()
diff --git a/vb/demo/IceStorm/clock/Publisher.vb b/vb/demo/IceStorm/clock/Publisher.vb
index 3bd00aded39..515a8c334d3 100755
--- a/vb/demo/IceStorm/clock/Publisher.vb
+++ b/vb/demo/IceStorm/clock/Publisher.vb
@@ -50,17 +50,17 @@ Module ClockC
End Try
End Try
- Dim clock As ClockPrx = ClockPrxHelper.uncheckedCast(topic.getPublisher().ice_oneway())
+ Dim clock As ClockPrx = ClockPrxHelper.uncheckedCast(topic.getPublisher().ice_oneway())
- Console.Out.WriteLine("publishing tick events. Press ^C to terminate the application.")
- Try
- While 1
- clock.tick(DateTime.Now.ToString("MM/dd/yyyy HH:mm:ss"))
+ Console.Out.WriteLine("publishing tick events. Press ^C to terminate the application.")
+ Try
+ While 1
+ clock.tick(DateTime.Now.ToString("MM/dd/yyyy HH:mm:ss"))
- System.Threading.Thread.Sleep(1000)
- End While
- Catch ex As Ice.CommunicatorDestroyedException
- End Try
+ System.Threading.Thread.Sleep(1000)
+ End While
+ Catch ex As Ice.CommunicatorDestroyedException
+ End Try
Return 0
End Function
diff --git a/vb/demo/IceStorm/clock/Subscriber.vb b/vb/demo/IceStorm/clock/Subscriber.vb
index b691d50793d..1ea97093286 100755
--- a/vb/demo/IceStorm/clock/Subscriber.vb
+++ b/vb/demo/IceStorm/clock/Subscriber.vb
@@ -26,43 +26,43 @@ Module ClockS
Inherits Ice.Application
Public Overloads Overrides Function run(ByVal args() As String) As Integer
- Dim basePrx As Ice.ObjectPrx = communicator().propertyToProxy("IceStorm.TopicManager.Proxy")
- Dim manager As IceStorm.TopicManagerPrx = IceStorm.TopicManagerPrxHelper.checkedCast(basePrx)
- If manager Is Nothing Then
- Console.Error.WriteLine("invalid proxy")
- Return 1
- End If
-
- Dim topicName As String = "time"
- If not args.Length = 0 Then:
- topicName = args(0)
- End If
-
- Dim topic As IceStorm.TopicPrx
- Try
- topic = manager.retrieve(topicName)
- Catch ex As IceStorm.NoSuchTopic
- Try
- topic = manager.create(topicName)
- Catch e As IceStorm.TopicExists
- Console.Error.WriteLine("temporary error. try again.")
- Return 1
- End Try
- End Try
-
- Dim adapter As Ice.ObjectAdapter = communicator().createObjectAdapter("Clock.Subscriber")
-
- Dim subscriber As Ice.ObjectPrx = adapter.addWithUUID(New ClockI)
-
- Dim qos As IceStorm.Qos = New IceStorm.Qos
-
- topic.subscribe(qos, subscriber)
- adapter.activate()
-
- shutdownOnInterrupt()
- communicator().waitForShutdown()
-
- topic.unsubscribe(subscriber)
+ Dim basePrx As Ice.ObjectPrx = communicator().propertyToProxy("IceStorm.TopicManager.Proxy")
+ Dim manager As IceStorm.TopicManagerPrx = IceStorm.TopicManagerPrxHelper.checkedCast(basePrx)
+ If manager Is Nothing Then
+ Console.Error.WriteLine("invalid proxy")
+ Return 1
+ End If
+
+ Dim topicName As String = "time"
+ If not args.Length = 0 Then:
+ topicName = args(0)
+ End If
+
+ Dim topic As IceStorm.TopicPrx
+ Try
+ topic = manager.retrieve(topicName)
+ Catch ex As IceStorm.NoSuchTopic
+ Try
+ topic = manager.create(topicName)
+ Catch e As IceStorm.TopicExists
+ Console.Error.WriteLine("temporary error. try again.")
+ Return 1
+ End Try
+ End Try
+
+ Dim adapter As Ice.ObjectAdapter = communicator().createObjectAdapter("Clock.Subscriber")
+
+ Dim subscriber As Ice.ObjectPrx = adapter.addWithUUID(New ClockI)
+
+ Dim qos As IceStorm.Qos = New IceStorm.Qos
+
+ topic.subscribe(qos, subscriber)
+ adapter.activate()
+
+ shutdownOnInterrupt()
+ communicator().waitForShutdown()
+
+ topic.unsubscribe(subscriber)
Return 0
End Function
diff --git a/vb/demo/book/printer/Printer.ice b/vb/demo/book/printer/Printer.ice
index 87146f1288e..4a35e77a02b 100755
--- a/vb/demo/book/printer/Printer.ice
+++ b/vb/demo/book/printer/Printer.ice
@@ -13,7 +13,7 @@
module Demo {
interface Printer
{
- void printString(string s);
+ void printString(string s);
};
};
diff --git a/vb/demo/book/simple_filesystem/DirectoryI.vb b/vb/demo/book/simple_filesystem/DirectoryI.vb
index dca77cd4468..3553791ed35 100755
--- a/vb/demo/book/simple_filesystem/DirectoryI.vb
+++ b/vb/demo/book/simple_filesystem/DirectoryI.vb
@@ -6,42 +6,42 @@ Public Class DirectoryI
Inherits DirectoryDisp_
Public Sub New(ByVal name As String, ByVal parent As DirectoryI)
- _name = name
- _parent = parent
-
- ' Create an identity. The
- ' parent has the fixed identity "/"
- '
- Dim myId As Ice.Identity
- If Not _parent Is Nothing Then
- myId = _adapter.getCommunicator().stringToIdentity(Ice.Util.generateUUID())
- Else
- myId = _adapter.getCommunicator().stringToIdentity("RootDir")
- End If
-
- ' Add the identity to the object adapter
- '
- _adapter.add(Me, myId)
-
- ' Create a proxy for the new node and
- ' add it as a child to the parent
- '
- Dim thisNode As NodePrx = NodePrxHelper.uncheckedCast(_adapter.createProxy(myId))
- If Not _parent Is Nothing Then
- _parent.addChild(thisNode)
- End If
+ _name = name
+ _parent = parent
+
+ ' Create an identity. The
+ ' parent has the fixed identity "/"
+ '
+ Dim myId As Ice.Identity
+ If Not _parent Is Nothing Then
+ myId = _adapter.getCommunicator().stringToIdentity(Ice.Util.generateUUID())
+ Else
+ myId = _adapter.getCommunicator().stringToIdentity("RootDir")
+ End If
+
+ ' Add the identity to the object adapter
+ '
+ _adapter.add(Me, myId)
+
+ ' Create a proxy for the new node and
+ ' add it as a child to the parent
+ '
+ Dim thisNode As NodePrx = NodePrxHelper.uncheckedCast(_adapter.createProxy(myId))
+ If Not _parent Is Nothing Then
+ _parent.addChild(thisNode)
+ End If
End Sub
Public Sub addChild(ByVal child As NodePrx)
- _contents.Add(child)
+ _contents.Add(child)
End Sub
Public Overloads Overrides Function name(ByVal current As Ice.Current) As String
- Return _name
+ Return _name
End Function
Public Overloads Overrides Function list(ByVal current As Ice.Current) As NodePrx()
- Return CType(_contents.ToArray(GetType(NodePrx)), NodePrx())
+ Return CType(_contents.ToArray(GetType(NodePrx)), NodePrx())
End Function
Public Shared _adapter As Ice.ObjectAdapter
diff --git a/vb/demo/book/simple_filesystem/FileI.vb b/vb/demo/book/simple_filesystem/FileI.vb
index 0ba0dd880b8..a3cfb40233d 100755
--- a/vb/demo/book/simple_filesystem/FileI.vb
+++ b/vb/demo/book/simple_filesystem/FileI.vb
@@ -6,24 +6,24 @@ Public Class FileI
Inherits FileDisp_
Public Sub New(ByVal name As String, ByVal parent As DirectoryI)
- _name = name
- _parent = parent
+ _name = name
+ _parent = parent
- Debug.Assert(Not _parent Is Nothing)
+ Debug.Assert(Not _parent Is Nothing)
- ' Create an identity
- '
- Dim myId As Ice.Identity = _adapter.getCommunicator().stringToIdentity(Ice.Util.generateUUID())
+ ' Create an identity
+ '
+ Dim myId As Ice.Identity = _adapter.getCommunicator().stringToIdentity(Ice.Util.generateUUID())
- ' Add the identity to the object adapter
- '
- _adapter.add(Me, myId)
+ ' Add the identity to the object adapter
+ '
+ _adapter.add(Me, myId)
- ' Create a proxy for the new node and
- ' add it as a child to the parent
- '
- Dim thisNode As NodePrx = NodePrxHelper.uncheckedCast(_adapter.createProxy(myId))
- _parent.addChild(thisNode)
+ ' Create a proxy for the new node and
+ ' add it as a child to the parent
+ '
+ Dim thisNode As NodePrx = NodePrxHelper.uncheckedCast(_adapter.createProxy(myId))
+ _parent.addChild(thisNode)
End Sub
' Slice Node::name() operation
diff --git a/vb/demo/book/simple_filesystem/Filesystem.ice b/vb/demo/book/simple_filesystem/Filesystem.ice
index 1fab7e0a7c2..c2458a5e8a8 100755
--- a/vb/demo/book/simple_filesystem/Filesystem.ice
+++ b/vb/demo/book/simple_filesystem/Filesystem.ice
@@ -9,23 +9,23 @@
module Filesystem {
exception GenericError {
- string reason;
+ string reason;
};
interface Node {
- idempotent string name();
+ idempotent string name();
};
sequence<string> Lines;
interface File extends Node {
- idempotent Lines read();
- idempotent void write(Lines text) throws GenericError;
+ idempotent Lines read();
+ idempotent void write(Lines text) throws GenericError;
};
sequence<Node*> NodeSeq;
interface Directory extends Node {
- idempotent NodeSeq list();
+ idempotent NodeSeq list();
};
};
diff --git a/vb/generate/Generate.vb b/vb/generate/Generate.vb
index 922fc092458..524bcbeda0e 100755
--- a/vb/generate/Generate.vb
+++ b/vb/generate/Generate.vb
@@ -53,10 +53,10 @@ Module Generate
Dim sp As StringBuilder = New StringBuilder
sp.Length = 1024 ' TODO: This should be replaced with MAX_PATH for Win32
Dim result As Long = GetShortPathName(longPath, sp, sp.Capacity)
- If result = 0 Or result > sp.capacity Then
- ' Can occur if short pathnames are not supported on the specified filesystem
+ If result = 0 Or result > sp.capacity Then
+ ' Can occur if short pathnames are not supported on the specified filesystem
Return longPath
- End If
+ End If
Return sp.ToString
End Function
@@ -64,7 +64,7 @@ Module Generate
If Not longPath.EndsWith(".exe") Then
longPath = longPath + ".exe"
End If
- return ShortPath(longPath)
+ return ShortPath(longPath)
End Function
#End If
@@ -169,7 +169,7 @@ Module Generate
Const slicePat As String = "*.ice"
Dim sliceFiles() As String = Directory.GetFiles(currentDir, slicePat)
For Each sliceFile As String In sliceFiles
- If sliceFile.EndsWith(".ice") Then
+ If sliceFile.EndsWith(".ice") Then
Dim vbFile As String = Path.GetFileName(Path.ChangeExtension(sliceFile, ".vb"))
vbFile = Path.Combine(outputDir, vbFile)
Select Case _action
@@ -198,7 +198,7 @@ Module Generate
Console.WriteLine(vbFile & ": deleted")
End If
End Select
- End If
+ End If
Next
'
diff --git a/vb/makedist.py b/vb/makedist.py
index 75a214ffa1d..70996000c24 100755
--- a/vb/makedist.py
+++ b/vb/makedist.py
@@ -61,7 +61,7 @@ def sedFile(path, patt, replace):
dstLines = []
for x in srcLines:
- dstLines.append(re.sub(patt, replace, x))
+ dstLines.append(re.sub(patt, replace, x))
src.close()
dst = open(path, "w")
@@ -195,7 +195,7 @@ hintPathReplace = r'\1IceCS-' + version + r'\3'
projectFiles = find(os.path.join("icevb", "demo"), "*.vbproj")
for x in projectFiles:
if not x.endswith("D.vbproj"):
- sedFile(x, hintPathSearch, hintPathReplace)
+ sedFile(x, hintPathSearch, hintPathReplace)
#
# Create source archives.