diff options
author | Matthew Newhook <matthew@zeroc.com> | 2014-08-12 15:50:25 -0230 |
---|---|---|
committer | Matthew Newhook <matthew@zeroc.com> | 2014-08-12 15:50:25 -0230 |
commit | 2f5c841cfce2ae5ff26e2e373c3ea7188da8b75b (patch) | |
tree | b460e22e91a9fbb9cfb71631303963fa94dd2c9c /java/test/Ice/inheritance | |
parent | ICE-5492 Tcp Loopback Fast Path for C#/C++ on Windows (diff) | |
download | ice-2f5c841cfce2ae5ff26e2e373c3ea7188da8b75b.tar.bz2 ice-2f5c841cfce2ae5ff26e2e373c3ea7188da8b75b.tar.xz ice-2f5c841cfce2ae5ff26e2e373c3ea7188da8b75b.zip |
Added eclipse project settings for java.
Fix lots of warnings in Ice for Java.
Diffstat (limited to 'java/test/Ice/inheritance')
-rw-r--r-- | java/test/Ice/inheritance/AllTests.java | 2 | ||||
-rw-r--r-- | java/test/Ice/inheritance/CAI.java | 1 | ||||
-rw-r--r-- | java/test/Ice/inheritance/CBI.java | 2 | ||||
-rw-r--r-- | java/test/Ice/inheritance/CCI.java | 3 | ||||
-rw-r--r-- | java/test/Ice/inheritance/CDI.java | 7 | ||||
-rw-r--r-- | java/test/Ice/inheritance/Client.java | 2 | ||||
-rw-r--r-- | java/test/Ice/inheritance/Collocated.java | 2 | ||||
-rw-r--r-- | java/test/Ice/inheritance/IAI.java | 1 | ||||
-rw-r--r-- | java/test/Ice/inheritance/IB1I.java | 2 | ||||
-rw-r--r-- | java/test/Ice/inheritance/IB2I.java | 2 | ||||
-rw-r--r-- | java/test/Ice/inheritance/ICI.java | 4 | ||||
-rw-r--r-- | java/test/Ice/inheritance/InitialI.java | 9 | ||||
-rw-r--r-- | java/test/Ice/inheritance/Server.java | 2 |
13 files changed, 37 insertions, 2 deletions
diff --git a/java/test/Ice/inheritance/AllTests.java b/java/test/Ice/inheritance/AllTests.java index 2b5f9f93873..5a53c6916a1 100644 --- a/java/test/Ice/inheritance/AllTests.java +++ b/java/test/Ice/inheritance/AllTests.java @@ -9,7 +9,6 @@ package test.Ice.inheritance; -import java.io.PrintStream; import java.io.PrintWriter; import test.Ice.inheritance.Test.InitialPrx; @@ -214,7 +213,6 @@ public class AllTests out.print("ditto, but for class implementing interfaces... "); out.flush(); - CDPrx cdo; cao = cd.caop(cd); test(cao.equals(cd)); diff --git a/java/test/Ice/inheritance/CAI.java b/java/test/Ice/inheritance/CAI.java index 4db69aa0d0a..b867eb6f836 100644 --- a/java/test/Ice/inheritance/CAI.java +++ b/java/test/Ice/inheritance/CAI.java @@ -19,6 +19,7 @@ public final class CAI extends CA { } + @Override public CAPrx caop(CAPrx p, Ice.Current current) { diff --git a/java/test/Ice/inheritance/CBI.java b/java/test/Ice/inheritance/CBI.java index e6e8d9f7005..6f07ec9b167 100644 --- a/java/test/Ice/inheritance/CBI.java +++ b/java/test/Ice/inheritance/CBI.java @@ -20,12 +20,14 @@ public final class CBI extends CB { } + @Override public CAPrx caop(CAPrx p, Ice.Current current) { return p; } + @Override public CBPrx cbop(CBPrx p, Ice.Current current) { diff --git a/java/test/Ice/inheritance/CCI.java b/java/test/Ice/inheritance/CCI.java index 3f737b246f6..1d88806b959 100644 --- a/java/test/Ice/inheritance/CCI.java +++ b/java/test/Ice/inheritance/CCI.java @@ -21,18 +21,21 @@ public final class CCI extends CC { } + @Override public CAPrx caop(CAPrx p, Ice.Current current) { return p; } + @Override public CCPrx ccop(CCPrx p, Ice.Current current) { return p; } + @Override public CBPrx cbop(CBPrx p, Ice.Current current) { diff --git a/java/test/Ice/inheritance/CDI.java b/java/test/Ice/inheritance/CDI.java index 6b21b135117..a1ac62fdf14 100644 --- a/java/test/Ice/inheritance/CDI.java +++ b/java/test/Ice/inheritance/CDI.java @@ -25,42 +25,49 @@ public final class CDI extends CD { } + @Override public CAPrx caop(CAPrx p, Ice.Current current) { return p; } + @Override public CCPrx ccop(CCPrx p, Ice.Current current) { return p; } + @Override public CDPrx cdop(CDPrx p, Ice.Current current) { return p; } + @Override public IAPrx iaop(IAPrx p, Ice.Current current) { return p; } + @Override public CBPrx cbop(CBPrx p, Ice.Current current) { return p; } + @Override public IB1Prx ib1op(IB1Prx p, Ice.Current current) { return p; } + @Override public IB2Prx ib2op(IB2Prx p, Ice.Current current) { diff --git a/java/test/Ice/inheritance/Client.java b/java/test/Ice/inheritance/Client.java index f03d0917b5c..1fc5bdb3214 100644 --- a/java/test/Ice/inheritance/Client.java +++ b/java/test/Ice/inheritance/Client.java @@ -13,6 +13,7 @@ import test.Ice.inheritance.Test.InitialPrx; public class Client extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -21,6 +22,7 @@ public class Client extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/inheritance/Collocated.java b/java/test/Ice/inheritance/Collocated.java index af2bda6b221..3c92c35545c 100644 --- a/java/test/Ice/inheritance/Collocated.java +++ b/java/test/Ice/inheritance/Collocated.java @@ -11,6 +11,7 @@ package test.Ice.inheritance; public class Collocated extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -23,6 +24,7 @@ public class Collocated extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/inheritance/IAI.java b/java/test/Ice/inheritance/IAI.java index 9d471939bb8..6f783f0bc58 100644 --- a/java/test/Ice/inheritance/IAI.java +++ b/java/test/Ice/inheritance/IAI.java @@ -19,6 +19,7 @@ public final class IAI extends _IADisp { } + @Override public IAPrx iaop(IAPrx p, Ice.Current current) { diff --git a/java/test/Ice/inheritance/IB1I.java b/java/test/Ice/inheritance/IB1I.java index b71b5e0451e..0c1de6cfb99 100644 --- a/java/test/Ice/inheritance/IB1I.java +++ b/java/test/Ice/inheritance/IB1I.java @@ -20,12 +20,14 @@ public final class IB1I extends _IB1Disp { } + @Override public IAPrx iaop(IAPrx p, Ice.Current current) { return p; } + @Override public IB1Prx ib1op(IB1Prx p, Ice.Current current) { diff --git a/java/test/Ice/inheritance/IB2I.java b/java/test/Ice/inheritance/IB2I.java index d211349eedf..07fc2e53baa 100644 --- a/java/test/Ice/inheritance/IB2I.java +++ b/java/test/Ice/inheritance/IB2I.java @@ -20,12 +20,14 @@ public final class IB2I extends _IB2Disp { } + @Override public IAPrx iaop(IAPrx p, Ice.Current current) { return p; } + @Override public IB2Prx ib2op(IB2Prx p, Ice.Current current) { diff --git a/java/test/Ice/inheritance/ICI.java b/java/test/Ice/inheritance/ICI.java index 158553bf46b..4ff569dbf16 100644 --- a/java/test/Ice/inheritance/ICI.java +++ b/java/test/Ice/inheritance/ICI.java @@ -22,24 +22,28 @@ public final class ICI extends _ICDisp { } + @Override public IAPrx iaop(IAPrx p, Ice.Current current) { return p; } + @Override public ICPrx icop(ICPrx p, Ice.Current current) { return p; } + @Override public IB1Prx ib1op(IB1Prx p, Ice.Current current) { return p; } + @Override public IB2Prx ib2op(IB2Prx p, Ice.Current current) { diff --git a/java/test/Ice/inheritance/InitialI.java b/java/test/Ice/inheritance/InitialI.java index 0c3195d7218..083314cf62d 100644 --- a/java/test/Ice/inheritance/InitialI.java +++ b/java/test/Ice/inheritance/InitialI.java @@ -42,54 +42,63 @@ public final class InitialI extends _InitialDisp _ic = ICPrxHelper.uncheckedCast(adapter.addWithUUID(new ICI())); } + @Override public CAPrx caop(Ice.Current current) { return _ca; } + @Override public CBPrx cbop(Ice.Current current) { return _cb; } + @Override public CCPrx ccop(Ice.Current current) { return _cc; } + @Override public CDPrx cdop(Ice.Current current) { return _cd; } + @Override public IAPrx iaop(Ice.Current current) { return _ia; } + @Override public IB1Prx ib1op(Ice.Current current) { return _ib1; } + @Override public IB2Prx ib2op(Ice.Current current) { return _ib2; } + @Override public ICPrx icop(Ice.Current current) { return _ic; } + @Override public void shutdown(Ice.Current current) { diff --git a/java/test/Ice/inheritance/Server.java b/java/test/Ice/inheritance/Server.java index b55b5213664..7ff0278c2a6 100644 --- a/java/test/Ice/inheritance/Server.java +++ b/java/test/Ice/inheritance/Server.java @@ -11,6 +11,7 @@ package test.Ice.inheritance; public class Server extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -21,6 +22,7 @@ public class Server extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); |