diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2014-10-23 16:28:09 -0230 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2014-10-23 16:28:09 -0230 |
| commit | f6bb0396e7d8fd12ed50f72ab9fc99436d418576 (patch) | |
| tree | ee6ef1cb32f2523839f210eb9ec3b924b97d5998 /java/test/Ice/inheritance/CBI.java | |
| parent | Add Object.equals, and minor fix to HashMap.equals (diff) | |
| download | ice-f6bb0396e7d8fd12ed50f72ab9fc99436d418576.tar.bz2 ice-f6bb0396e7d8fd12ed50f72ab9fc99436d418576.tar.xz ice-f6bb0396e7d8fd12ed50f72ab9fc99436d418576.zip | |
More gradle changes.
Moved android stuff to its own package.
Moved java tests to src/main/java/test subdirectory.
Diffstat (limited to 'java/test/Ice/inheritance/CBI.java')
| -rw-r--r-- | java/test/Ice/inheritance/CBI.java | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/java/test/Ice/inheritance/CBI.java b/java/test/Ice/inheritance/CBI.java deleted file mode 100644 index 6f07ec9b167..00000000000 --- a/java/test/Ice/inheritance/CBI.java +++ /dev/null @@ -1,36 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -package test.Ice.inheritance; - -import test.Ice.inheritance.Test.MA.CAPrx; -import test.Ice.inheritance.Test.MB.CB; -import test.Ice.inheritance.Test.MB.CBPrx; - -public final class CBI extends CB -{ - public - CBI() - { - } - - @Override - public CAPrx - caop(CAPrx p, Ice.Current current) - { - return p; - } - - @Override - public CBPrx - cbop(CBPrx p, Ice.Current current) - { - return p; - } -} |