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/Test.ice | |
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/Test.ice')
-rw-r--r-- | java/test/Ice/inheritance/Test.ice | 84 |
1 files changed, 0 insertions, 84 deletions
diff --git a/java/test/Ice/inheritance/Test.ice b/java/test/Ice/inheritance/Test.ice deleted file mode 100644 index 82d63b5078f..00000000000 --- a/java/test/Ice/inheritance/Test.ice +++ /dev/null @@ -1,84 +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. -// -// ********************************************************************** - -#pragma once - -[["java:package:test.Ice.inheritance"]] -module Test -{ - -module MA -{ - -interface IA -{ - IA* iaop(IA* p); -}; - -class CA -{ - CA* caop(CA* p); -}; - -}; - -module MB -{ - -interface IB1 extends MA::IA -{ - IB1* ib1op(IB1* p); -}; - -interface IB2 extends MA::IA -{ - IB2* ib2op(IB2* p); -}; - -class CB extends MA::CA -{ - CB* cbop(CB* p); -}; - -}; - -module MA -{ - -interface IC extends MB::IB1, MB::IB2 -{ - IC* icop(IC* p); -}; - -class CC extends MB::CB -{ - CC* ccop(CC* p); -}; - -class CD extends CC implements MB::IB1, MB::IB2 -{ - CD* cdop(CD* p); -}; - -}; - -interface Initial -{ - void shutdown(); - MA::CA* caop(); - MB::CB* cbop(); - MA::CC* ccop(); - MA::CD* cdop(); - MA::IA* iaop(); - MB::IB1* ib1op(); - MB::IB2* ib2op(); - MA::IC* icop(); -}; - -}; |