diff options
143 files changed, 430 insertions, 81 deletions
diff --git a/java/demo/Database/library/BookI.java b/java/demo/Database/library/BookI.java index 45a6ead30f0..18a86d7337e 100644 --- a/java/demo/Database/library/BookI.java +++ b/java/demo/Database/library/BookI.java @@ -15,6 +15,7 @@ import Demo.*; // class BookI extends _BookDisp { + @Override public void ice_ping(Ice.Current current) { @@ -40,6 +41,7 @@ class BookI extends _BookDisp } } + @Override public BookDescription describe(Ice.Current current) { @@ -66,6 +68,7 @@ class BookI extends _BookDisp } } + @Override public void setTitle(String title, Ice.Current current) { @@ -89,6 +92,7 @@ class BookI extends _BookDisp } } + @Override public void setAuthors(java.util.List<String> authors, Ice.Current current) { @@ -156,6 +160,7 @@ class BookI extends _BookDisp } } + @Override public void destroy(Ice.Current current) { @@ -181,6 +186,7 @@ class BookI extends _BookDisp } } + @Override public String getRenter(Ice.Current current) throws BookNotRentedException @@ -220,6 +226,12 @@ class BookI extends _BookDisp } } + // + // The context automatically closes the associated statements at the end of + // the request. + // + @SuppressWarnings("resource") + @Override public void rentBook(String name, Ice.Current current) throws InvalidCustomerException, BookRentedException @@ -290,6 +302,7 @@ class BookI extends _BookDisp } } + @Override public void returnBook(Ice.Current current) throws BookNotRentedException @@ -306,7 +319,7 @@ class BookI extends _BookDisp { throw new Ice.ObjectNotExistException(); } - Integer renterId = rs.getInt("renter_id"); + rs.getInt("renter_id"); if(rs.wasNull()) { throw new BookNotRentedException(); diff --git a/java/demo/Database/library/BookQueryResultI.java b/java/demo/Database/library/BookQueryResultI.java index 5fa01c6bfa5..20d9a1e9688 100644 --- a/java/demo/Database/library/BookQueryResultI.java +++ b/java/demo/Database/library/BookQueryResultI.java @@ -24,6 +24,7 @@ class BookQueryResultI extends _BookQueryResultDisp } } + @Override synchronized public java.util.List<BookDescription> next(int n, Ice.BooleanHolder destroyed, Ice.Current current) { @@ -59,6 +60,7 @@ class BookQueryResultI extends _BookQueryResultDisp return l; } + @Override synchronized public void destroy(Ice.Current current) { diff --git a/java/demo/Database/library/Client.java b/java/demo/Database/library/Client.java index 435bd7af97e..68abe0f8a9f 100644 --- a/java/demo/Database/library/Client.java +++ b/java/demo/Database/library/Client.java @@ -11,6 +11,7 @@ public class Client extends Ice.Application { class ShutdownHook extends Thread { + @Override public void run() { @@ -25,6 +26,7 @@ public class Client extends Ice.Application } } + @Override public int run(String[] args) { diff --git a/java/demo/Database/library/ConnectionPool.java b/java/demo/Database/library/ConnectionPool.java index 069baeea74b..d8879349d25 100644 --- a/java/demo/Database/library/ConnectionPool.java +++ b/java/demo/Database/library/ConnectionPool.java @@ -69,6 +69,7 @@ class ConnectionPool // Probe the connection with the database. java.sql.PreparedStatement stmt = conn.prepareStatement("SELECT 1"); java.sql.ResultSet rs = stmt.executeQuery(); + rs.close(); stmt.close(); } } diff --git a/java/demo/Database/library/DispatchInterceptorI.java b/java/demo/Database/library/DispatchInterceptorI.java index 69d7f1d3068..ad3b356d35d 100644 --- a/java/demo/Database/library/DispatchInterceptorI.java +++ b/java/demo/Database/library/DispatchInterceptorI.java @@ -11,6 +11,7 @@ import Demo.*; class DispatchInterceptorI extends Ice.DispatchInterceptor { + @Override public Ice.DispatchStatus dispatch(Ice.Request request) { diff --git a/java/demo/Database/library/Glacier2SessionManagerI.java b/java/demo/Database/library/Glacier2SessionManagerI.java index e1632ba66f1..8fdff755cfa 100644 --- a/java/demo/Database/library/Glacier2SessionManagerI.java +++ b/java/demo/Database/library/Glacier2SessionManagerI.java @@ -11,6 +11,7 @@ import Demo.*; class Glacier2SessionManagerI extends Glacier2._SessionManagerDisp { + @Override public Glacier2.SessionPrx create(String userId, Glacier2.SessionControlPrx control, Ice.Current c) { diff --git a/java/demo/Database/library/LibraryI.java b/java/demo/Database/library/LibraryI.java index 6ef3acfc363..b7f91a89e1a 100644 --- a/java/demo/Database/library/LibraryI.java +++ b/java/demo/Database/library/LibraryI.java @@ -14,6 +14,7 @@ import Demo.*; // class LibraryI extends _LibraryDisp { + @Override public void queryByIsbn(String isbn, int n, BookDescriptionSeqHolder first, Ice.IntHolder nrows, BookQueryResultPrxHolder result, Ice.Current current) @@ -64,6 +65,7 @@ class LibraryI extends _LibraryDisp } } + @Override public void queryByAuthor(String author, int n, BookDescriptionSeqHolder first, Ice.IntHolder nrows, BookQueryResultPrxHolder result, Ice.Current current) @@ -146,6 +148,7 @@ class LibraryI extends _LibraryDisp } } + @Override public void queryByTitle(String title, int n, BookDescriptionSeqHolder first, Ice.IntHolder nrows, BookQueryResultPrxHolder result, Ice.Current current) @@ -196,6 +199,7 @@ class LibraryI extends _LibraryDisp } } + @Override public BookPrx createBook(String isbn, String title, java.util.List<String> authors, Ice.Current current) throws BookExistsException, InvalidISBNException diff --git a/java/demo/Database/library/Parser.java b/java/demo/Database/library/Parser.java index fe5c9dbdf30..28b3578e5e0 100644 --- a/java/demo/Database/library/Parser.java +++ b/java/demo/Database/library/Parser.java @@ -54,7 +54,7 @@ class Parser authors.add(st.nextToken().trim()); } - BookPrx book = _library.createBook(isbn, title, authors); + _library.createBook(isbn, title, authors); System.out.println("added new book with isbn " + isbn); } catch(BookExistsException ex) @@ -281,7 +281,7 @@ class Parser if(_current != null) { _current.proxy.rentBook(args.get(0)); - System.out.println("the book is now rented by `" + (String)args.get(0) + "'"); + System.out.println("the book is now rented by `" + args.get(0) + "'"); _current = _current.proxy.describe(); } else @@ -443,5 +443,4 @@ class Parser private LibraryPrx _library; private java.io.BufferedReader _in; - private boolean _interactive; } diff --git a/java/demo/Database/library/ReapTask.java b/java/demo/Database/library/ReapTask.java index 3ded348c1a6..ccdc720caff 100644 --- a/java/demo/Database/library/ReapTask.java +++ b/java/demo/Database/library/ReapTask.java @@ -38,6 +38,7 @@ class ReapTask implements Runnable _timeout = timeout; } + @Override synchronized public void run() { diff --git a/java/demo/Database/library/RunParser.java b/java/demo/Database/library/RunParser.java index 691eda79a00..9728da0f6de 100644 --- a/java/demo/Database/library/RunParser.java +++ b/java/demo/Database/library/RunParser.java @@ -70,11 +70,13 @@ class RunParser final Glacier2SessionPrx sess = Glacier2SessionPrxHelper.uncheckedCast(glacier2session); session = new SessionAdapter() { + @Override public LibraryPrx getLibrary() { return sess.getLibrary(); } + @Override public void destroy() { try @@ -92,11 +94,13 @@ class RunParser } } + @Override public void refresh() { sess.refresh(); } + @Override public long getTimeout() { return to; @@ -117,22 +121,26 @@ class RunParser final long timeout = factory.getSessionTimeout()/2; session = new SessionAdapter() { + @Override public LibraryPrx getLibrary() { return sess.getLibrary(); } + @Override public void destroy() { sess.destroy(); } + @Override public void refresh() { sess.refresh(); } - public long getTimeout() + @Override + public long getTimeout() { return timeout; } @@ -153,6 +161,7 @@ class RunParser java.util.concurrent.ScheduledExecutorService executor = java.util.concurrent.Executors.newScheduledThreadPool(1); executor.scheduleAtFixedRate(new Runnable() { + @Override public void run() { diff --git a/java/demo/Database/library/Server.java b/java/demo/Database/library/Server.java index e1f7b6816a2..df1e133ad86 100644 --- a/java/demo/Database/library/Server.java +++ b/java/demo/Database/library/Server.java @@ -7,12 +7,13 @@ // // ********************************************************************** -import Demo.*; + class Server extends Ice.Application { static class LocatorI implements Ice.ServantLocator { + @Override public Ice.Object locate(Ice.Current c, Ice.LocalObjectHolder cookie) { @@ -20,11 +21,13 @@ class Server extends Ice.Application return _servant; } + @Override public void finished(Ice.Current c, Ice.Object servant, Object cookie) { } + @Override public void deactivate(String category) { @@ -38,6 +41,7 @@ class Server extends Ice.Application private Ice.Object _servant; } + @Override public int run(String[] args) { diff --git a/java/demo/Database/library/SessionFactoryI.java b/java/demo/Database/library/SessionFactoryI.java index b3c3606719a..080d6e6e349 100644 --- a/java/demo/Database/library/SessionFactoryI.java +++ b/java/demo/Database/library/SessionFactoryI.java @@ -11,6 +11,7 @@ import Demo.*; class SessionFactoryI extends _SessionFactoryDisp { + @Override public synchronized SessionPrx create(Ice.Current c) { @@ -27,6 +28,7 @@ class SessionFactoryI extends _SessionFactoryDisp return proxy; } + @Override public long getSessionTimeout(Ice.Current c) { diff --git a/java/demo/Database/library/SessionI.java b/java/demo/Database/library/SessionI.java index 73286804f1f..a6bd290c98a 100644 --- a/java/demo/Database/library/SessionI.java +++ b/java/demo/Database/library/SessionI.java @@ -11,6 +11,7 @@ import Demo.*; class SessionI implements _SessionOperations, _Glacier2SessionOperations { + @Override synchronized public LibraryPrx getLibrary(Ice.Current c) { @@ -21,6 +22,7 @@ class SessionI implements _SessionOperations, _Glacier2SessionOperations return _library; } + @Override synchronized public void refresh(Ice.Current c) { @@ -41,6 +43,7 @@ class SessionI implements _SessionOperations, _Glacier2SessionOperations return 5000; } + @Override synchronized public void destroy(Ice.Current c) { diff --git a/java/demo/Freeze/casino/BankI.java b/java/demo/Freeze/casino/BankI.java index e10a57be527..7d0e2eee0ff 100644 --- a/java/demo/Freeze/casino/BankI.java +++ b/java/demo/Freeze/casino/BankI.java @@ -9,6 +9,7 @@ class BankI extends CasinoStore.PersistentBank { + @Override public boolean buyChips(int chips, Casino.PlayerPrx p, Ice.Current current) { @@ -30,6 +31,7 @@ class BankI extends CasinoStore.PersistentBank return true; } + @Override public Casino.PlayerPrx[] getPlayers(Ice.Current current) { @@ -46,24 +48,28 @@ class BankI extends CasinoStore.PersistentBank return result.toArray(new Casino.PlayerPrx[0]); } + @Override public int getOutstandingChips(Ice.Current current) { return outstandingChips; } + @Override public int getEarnings(Ice.Current current) { return chipsSold - outstandingChips; } + @Override public int getLiveBetCount(Ice.Current current) { return _betResolver.getBetCount(); } + @Override public boolean checkAllChips(Ice.Current current) { @@ -92,6 +98,7 @@ class BankI extends CasinoStore.PersistentBank return (playerTotal + betTotal) == outstandingChips; } + @Override public Casino.BetPrx createBet(int amount, int lifetime, Ice.Current current) { @@ -108,12 +115,14 @@ class BankI extends CasinoStore.PersistentBank return newBet; } + @Override public void win(int count, Ice.Current current) { outstandingChips -= count; } + @Override public void returnAllChips(CasinoStore.PersistentPlayerPrx p, Ice.Current current) { @@ -151,6 +160,7 @@ class BankI extends CasinoStore.PersistentBank } } + @Override public void reloadBets(Ice.Current current) { diff --git a/java/demo/Freeze/casino/BetI.java b/java/demo/Freeze/casino/BetI.java index 82eb0a18856..e66f94e0de1 100644 --- a/java/demo/Freeze/casino/BetI.java +++ b/java/demo/Freeze/casino/BetI.java @@ -9,12 +9,14 @@ class BetI extends CasinoStore.PersistentBet { + @Override public int getAmount(Ice.Current current) { return amount; } + @Override public void accept(Casino.PlayerPrx p, Ice.Current current) throws Casino.OutOfChipsException @@ -37,18 +39,21 @@ class BetI extends CasinoStore.PersistentBet } } + @Override public int getChipsInPlay(Ice.Current current) { return amount * potentialWinners.size(); } + @Override public long getCloseTime(Ice.Current current) { return closeTime; } + @Override public void complete(int random, Ice.Current current) { diff --git a/java/demo/Freeze/casino/BetResolver.java b/java/demo/Freeze/casino/BetResolver.java index 4e5238e1584..a4aeecb2fbe 100644 --- a/java/demo/Freeze/casino/BetResolver.java +++ b/java/demo/Freeze/casino/BetResolver.java @@ -20,6 +20,7 @@ class BetResolver { Runnable task = new Runnable() { + @Override public void run() { diff --git a/java/demo/Freeze/casino/Client.java b/java/demo/Freeze/casino/Client.java index 1ae0418bafc..9190d2ad7fb 100644 --- a/java/demo/Freeze/casino/Client.java +++ b/java/demo/Freeze/casino/Client.java @@ -41,6 +41,7 @@ public class Client extends Ice.Application } } + @Override public int run(String[] args) { diff --git a/java/demo/Freeze/casino/PlayerI.java b/java/demo/Freeze/casino/PlayerI.java index c32cf4dce25..a85c30f3fec 100644 --- a/java/demo/Freeze/casino/PlayerI.java +++ b/java/demo/Freeze/casino/PlayerI.java @@ -9,12 +9,14 @@ class PlayerI extends CasinoStore.PersistentPlayer { + @Override public int getChips(Ice.Current current) { return chips; } + @Override public void destroy(Ice.Current current) { @@ -22,6 +24,7 @@ class PlayerI extends CasinoStore.PersistentPlayer _evictor.remove(current.id); } + @Override public void withdraw(int count, Ice.Current current) throws Casino.OutOfChipsException @@ -34,6 +37,7 @@ class PlayerI extends CasinoStore.PersistentPlayer chips = newBalance; } + @Override public void win(int count, Ice.Current current) { diff --git a/java/demo/Freeze/casino/Server.java b/java/demo/Freeze/casino/Server.java index 0c44db9f695..2ec61682f94 100644 --- a/java/demo/Freeze/casino/Server.java +++ b/java/demo/Freeze/casino/Server.java @@ -11,11 +11,12 @@ class Server extends Ice.Application { static class ObjectFactory implements Ice.ObjectFactory { - ObjectFactory(Class factoryClass) + ObjectFactory(Class<?> factoryClass) { _factoryClass = factoryClass; } + @Override public Ice.Object create(String type) { @@ -33,12 +34,13 @@ class Server extends Ice.Application } } + @Override public void destroy() { } - private Class _factoryClass; + private Class<?> _factoryClass; } private java.util.Map<String, String> @@ -49,6 +51,7 @@ class Server extends Ice.Application return result; } + @Override public int run(String[] args) { @@ -89,6 +92,7 @@ class Server extends Ice.Application Freeze.ServantInitializer bankInitializer = new Freeze.ServantInitializer() { + @Override public void initialize(Ice.ObjectAdapter adapter, Ice.Identity identity, String facet, Ice.Object servant) { @@ -115,6 +119,7 @@ class Server extends Ice.Application Freeze.ServantInitializer playerInitializer = new Freeze.ServantInitializer() { + @Override public void initialize(Ice.ObjectAdapter adapter, Ice.Identity identity, String facet, Ice.Object servant) { @@ -143,6 +148,7 @@ class Server extends Ice.Application Freeze.ServantInitializer betInitializer = new Freeze.ServantInitializer() { + @Override public void initialize(Ice.ObjectAdapter adapter, Ice.Identity identity, String facet, Ice.Object servant) { diff --git a/java/demo/Freeze/library/BookFactory.java b/java/demo/Freeze/library/BookFactory.java index 6f1214edde4..b0cb14097c7 100644 --- a/java/demo/Freeze/library/BookFactory.java +++ b/java/demo/Freeze/library/BookFactory.java @@ -9,6 +9,7 @@ class BookFactory implements Ice.ObjectFactory { + @Override public Ice.Object create(String type) { @@ -16,6 +17,7 @@ class BookFactory implements Ice.ObjectFactory return new BookI(_library); } + @Override public void destroy() { diff --git a/java/demo/Freeze/library/BookI.java b/java/demo/Freeze/library/BookI.java index cdb94d07421..47bf5ff5090 100644 --- a/java/demo/Freeze/library/BookI.java +++ b/java/demo/Freeze/library/BookI.java @@ -16,6 +16,7 @@ class BookI extends Book // synchronization. // + @Override synchronized public BookDescription getBookDescription(Ice.Current current) { @@ -30,6 +31,7 @@ class BookI extends Book return description; } + @Override synchronized public String getRenterName(Ice.Current current) throws BookNotRentedException @@ -46,6 +48,7 @@ class BookI extends Book return rentalCustomerName; } + @Override synchronized public void rentBook(String name, Ice.Current current) throws BookRentedException @@ -62,6 +65,7 @@ class BookI extends Book rentalCustomerName = name; } + @Override synchronized public void returnBook(Ice.Current current) throws BookNotRentedException @@ -78,6 +82,7 @@ class BookI extends Book rentalCustomerName = new String();; } + @Override synchronized public void destroy(Ice.Current current) throws DatabaseException diff --git a/java/demo/Freeze/library/Client.java b/java/demo/Freeze/library/Client.java index 5c8b64c3360..1b2f851bcd2 100644 --- a/java/demo/Freeze/library/Client.java +++ b/java/demo/Freeze/library/Client.java @@ -11,6 +11,7 @@ public class Client extends Ice.Application { class ShutdownHook extends Thread { + @Override public void run() { @@ -25,6 +26,7 @@ public class Client extends Ice.Application } } + @Override public int run(String[] args) { diff --git a/java/demo/Freeze/library/Collocated.java b/java/demo/Freeze/library/Collocated.java index 83a7f34a38b..f3892e20062 100644 --- a/java/demo/Freeze/library/Collocated.java +++ b/java/demo/Freeze/library/Collocated.java @@ -11,6 +11,7 @@ class Collocated extends Ice.Application { class ShutdownHook extends Thread { + @Override public void run() { @@ -25,6 +26,7 @@ class Collocated extends Ice.Application } } + @Override public int run(String[] args) { diff --git a/java/demo/Freeze/library/LibraryI.java b/java/demo/Freeze/library/LibraryI.java index 99decf1a68d..c7d99d0f549 100644 --- a/java/demo/Freeze/library/LibraryI.java +++ b/java/demo/Freeze/library/LibraryI.java @@ -11,6 +11,7 @@ import Demo.*; class LibraryI extends _LibraryDisp { + @Override public synchronized BookPrx createBook(BookDescription description, Ice.Current current) throws DatabaseException, BookExistsException @@ -81,6 +82,7 @@ class LibraryI extends _LibraryDisp // No locking is necessary since no internal mutable state is // accessed. // + @Override public BookPrx findByIsbn(String isbn, Ice.Current current) throws DatabaseException @@ -101,6 +103,7 @@ class LibraryI extends _LibraryDisp } } + @Override public synchronized BookPrx[] findByAuthors(String authors, Ice.Current current) throws DatabaseException @@ -134,6 +137,7 @@ class LibraryI extends _LibraryDisp } } + @Override public void setEvictorSize(int size, Ice.Current current) throws DatabaseException @@ -144,6 +148,7 @@ class LibraryI extends _LibraryDisp _evictor.setSize(size); } + @Override public void shutdown(Ice.Current current) { diff --git a/java/demo/Freeze/library/Parser.java b/java/demo/Freeze/library/Parser.java index e72921da7c4..e43bf477c99 100644 --- a/java/demo/Freeze/library/Parser.java +++ b/java/demo/Freeze/library/Parser.java @@ -50,7 +50,7 @@ class Parser desc.title = args.get(1); desc.authors = args.get(2); - BookPrx book = _library.createBook(desc); + _library.createBook(desc); System.out.println("added new book with isbn " + desc.isbn); } catch(DatabaseException ex) @@ -362,5 +362,4 @@ class Parser private LibraryPrx _library; private java.io.BufferedReader _in; - private boolean _interactive; } diff --git a/java/demo/Freeze/library/Server.java b/java/demo/Freeze/library/Server.java index 891d658a4b7..da2a98cae49 100644 --- a/java/demo/Freeze/library/Server.java +++ b/java/demo/Freeze/library/Server.java @@ -9,6 +9,7 @@ class Server extends Ice.Application { + @Override public int run(String[] args) { diff --git a/java/demo/Freeze/phonebook/Client.java b/java/demo/Freeze/phonebook/Client.java index 12406199cf3..07f3d1f12c6 100644 --- a/java/demo/Freeze/phonebook/Client.java +++ b/java/demo/Freeze/phonebook/Client.java @@ -11,6 +11,7 @@ public class Client extends Ice.Application { class ShutdownHook extends Thread { + @Override public void run() { @@ -25,6 +26,7 @@ public class Client extends Ice.Application } } + @Override public int run(String[] args) { diff --git a/java/demo/Freeze/phonebook/Collocated.java b/java/demo/Freeze/phonebook/Collocated.java index 02d585d8512..71fc235cf3c 100644 --- a/java/demo/Freeze/phonebook/Collocated.java +++ b/java/demo/Freeze/phonebook/Collocated.java @@ -11,6 +11,7 @@ class Collocated extends Ice.Application { class ShutdownHook extends Thread { + @Override public void run() { @@ -25,6 +26,7 @@ class Collocated extends Ice.Application } } + @Override public int run(String[] args) { diff --git a/java/demo/Freeze/phonebook/ContactFactory.java b/java/demo/Freeze/phonebook/ContactFactory.java index 491c8755802..4b01c7db0a8 100644 --- a/java/demo/Freeze/phonebook/ContactFactory.java +++ b/java/demo/Freeze/phonebook/ContactFactory.java @@ -9,6 +9,7 @@ class ContactFactory implements Ice.ObjectFactory { + @Override public Ice.Object create(String type) { @@ -16,6 +17,7 @@ class ContactFactory implements Ice.ObjectFactory return new ContactI(this); } + @Override public void destroy() { diff --git a/java/demo/Freeze/phonebook/ContactI.java b/java/demo/Freeze/phonebook/ContactI.java index b40e755dd22..0bceaba2a64 100644 --- a/java/demo/Freeze/phonebook/ContactI.java +++ b/java/demo/Freeze/phonebook/ContactI.java @@ -16,12 +16,14 @@ class ContactI extends Contact // synchronization. // + @Override synchronized public String getName(Ice.Current current) { return name; } + @Override synchronized public void setName(String name, Ice.Current current) throws DatabaseException @@ -29,30 +31,35 @@ class ContactI extends Contact this.name = name; } + @Override synchronized public String getAddress(Ice.Current current) { return address; } + @Override synchronized public void setAddress(String address, Ice.Current current) { this.address = address; } + @Override synchronized public String getPhone(Ice.Current current) { return phone; } + @Override synchronized public void setPhone(String phone, Ice.Current current) { this.phone = phone; } + @Override public void destroy(Ice.Current current) throws DatabaseException diff --git a/java/demo/Freeze/phonebook/Parser.java b/java/demo/Freeze/phonebook/Parser.java index b356903e37c..c7f692a5563 100644 --- a/java/demo/Freeze/phonebook/Parser.java +++ b/java/demo/Freeze/phonebook/Parser.java @@ -11,9 +11,8 @@ import Demo.*; class Parser { - Parser(Ice.Communicator communicator, PhoneBookPrx phoneBook) + Parser(PhoneBookPrx phoneBook) { - _communicator = communicator; _phoneBook = phoneBook; } @@ -343,7 +342,6 @@ class Parser private ContactPrx[] _foundContacts; private int _current; - private Ice.Communicator _communicator; private PhoneBookPrx _phoneBook; private java.io.BufferedReader _in; diff --git a/java/demo/Freeze/phonebook/PhoneBookI.java b/java/demo/Freeze/phonebook/PhoneBookI.java index 1b3bd85548b..a3820796289 100644 --- a/java/demo/Freeze/phonebook/PhoneBookI.java +++ b/java/demo/Freeze/phonebook/PhoneBookI.java @@ -11,6 +11,7 @@ import Demo.*; class PhoneBookI extends _PhoneBookDisp { + @Override public ContactPrx createContact(Ice.Current current) throws DatabaseException @@ -36,6 +37,7 @@ class PhoneBookI extends _PhoneBookDisp return ContactPrxHelper.uncheckedCast(current.adapter.createProxy(ident)); } + @Override public ContactPrx[] findContacts(String name, Ice.Current current) throws DatabaseException @@ -60,6 +62,7 @@ class PhoneBookI extends _PhoneBookDisp } } + @Override public void setEvictorSize(int size, Ice.Current current) throws DatabaseException @@ -70,6 +73,7 @@ class PhoneBookI extends _PhoneBookDisp _evictor.setSize(size); } + @Override public void shutdown(Ice.Current current) { diff --git a/java/demo/Freeze/phonebook/RunParser.java b/java/demo/Freeze/phonebook/RunParser.java index 3b2294f422a..bc66468c15f 100644 --- a/java/demo/Freeze/phonebook/RunParser.java +++ b/java/demo/Freeze/phonebook/RunParser.java @@ -21,7 +21,7 @@ class RunParser return 1; } - Parser parser = new Parser(communicator, phoneBook); + Parser parser = new Parser(phoneBook); return parser.parse(); } } diff --git a/java/demo/Freeze/phonebook/Server.java b/java/demo/Freeze/phonebook/Server.java index 339b3b9b1de..a6c02ca3fa9 100644 --- a/java/demo/Freeze/phonebook/Server.java +++ b/java/demo/Freeze/phonebook/Server.java @@ -9,6 +9,7 @@ class Server extends Ice.Application { + @Override public int run(String[] args) { diff --git a/java/demo/Freeze/transform/Create.java b/java/demo/Freeze/transform/Create.java index 2efab5b4703..4014a9a9442 100644 --- a/java/demo/Freeze/transform/Create.java +++ b/java/demo/Freeze/transform/Create.java @@ -12,6 +12,7 @@ import Freeze.*; class Create extends Ice.Application { + @Override public int run(String[] args) { @@ -29,6 +30,7 @@ class Create extends Ice.Application final java.util.Comparator<String> less = new java.util.Comparator<String>() { + @Override public int compare(String s1, String s2) { if(s1 == s2) diff --git a/java/demo/Freeze/transform/Read.java b/java/demo/Freeze/transform/Read.java index b02d39fef6d..08f3d2459f7 100644 --- a/java/demo/Freeze/transform/Read.java +++ b/java/demo/Freeze/transform/Read.java @@ -12,6 +12,7 @@ import Freeze.*; class Read extends Ice.Application { + @Override public int run(String[] args) { @@ -25,6 +26,7 @@ class Read extends Ice.Application final java.util.Comparator<String> less = new java.util.Comparator<String>() { + @Override public int compare(String s1, String s2) { if(s1 == s2) diff --git a/java/demo/Freeze/transform/ReadNew.java b/java/demo/Freeze/transform/ReadNew.java index 02af867363d..9e3fda5085b 100644 --- a/java/demo/Freeze/transform/ReadNew.java +++ b/java/demo/Freeze/transform/ReadNew.java @@ -12,6 +12,7 @@ import Freeze.*; class ReadNew extends Ice.Application { + @Override public int run(String[] args) { @@ -25,6 +26,7 @@ class ReadNew extends Ice.Application final java.util.Comparator<String> less = new java.util.Comparator<String>() { + @Override public int compare(String s1, String s2) { if(s1 == s2) diff --git a/java/demo/Freeze/transform/Recreate.java b/java/demo/Freeze/transform/Recreate.java index 9df9844cfd5..43efbab971f 100644 --- a/java/demo/Freeze/transform/Recreate.java +++ b/java/demo/Freeze/transform/Recreate.java @@ -12,6 +12,7 @@ import Freeze.*; class Recreate extends Ice.Application { + @Override public int run(String[] args) { @@ -25,6 +26,7 @@ class Recreate extends Ice.Application final java.util.Comparator<String> less = new java.util.Comparator<String>() { + @Override public int compare(String s1, String s2) { if(s1 == s2) diff --git a/java/demo/Glacier2/callback/CallbackI.java b/java/demo/Glacier2/callback/CallbackI.java index edbd8feced2..46f0967d776 100644 --- a/java/demo/Glacier2/callback/CallbackI.java +++ b/java/demo/Glacier2/callback/CallbackI.java @@ -11,6 +11,7 @@ import Demo.*; public final class CallbackI extends _CallbackDisp { + @Override public void initiateCallback(CallbackReceiverPrx proxy, Ice.Current current) { @@ -25,6 +26,7 @@ public final class CallbackI extends _CallbackDisp } } + @Override public void shutdown(Ice.Current current) { diff --git a/java/demo/Glacier2/callback/CallbackReceiverI.java b/java/demo/Glacier2/callback/CallbackReceiverI.java index fc998dcb407..17bba2555c8 100644 --- a/java/demo/Glacier2/callback/CallbackReceiverI.java +++ b/java/demo/Glacier2/callback/CallbackReceiverI.java @@ -11,6 +11,7 @@ import Demo.*; public final class CallbackReceiverI extends _CallbackReceiverDisp { + @Override public void callback(Ice.Current current) { diff --git a/java/demo/Glacier2/callback/Client.java b/java/demo/Glacier2/callback/Client.java index a27bbbcfcea..2d24492184a 100644 --- a/java/demo/Glacier2/callback/Client.java +++ b/java/demo/Glacier2/callback/Client.java @@ -13,6 +13,7 @@ public class Client extends Glacier2.Application { class ShutdownHook extends Thread { + @Override public void run() { @@ -44,11 +45,13 @@ public class Client extends Glacier2.Application "?: help\n"); } + @Override public void sessionDestroyed() { System.out.println("The Glacier2 session has been destroyed."); } + @Override public Glacier2.SessionPrx createSession() { Glacier2.SessionPrx session; @@ -92,6 +95,7 @@ public class Client extends Glacier2.Application return session; } + @Override public int runWithSession(String[] args) throws RestartSessionException diff --git a/java/demo/Glacier2/callback/Server.java b/java/demo/Glacier2/callback/Server.java index e2e5d708adb..68e7535a86c 100644 --- a/java/demo/Glacier2/callback/Server.java +++ b/java/demo/Glacier2/callback/Server.java @@ -7,10 +7,11 @@ // // ********************************************************************** -import Demo.*; + public class Server extends Ice.Application { + @Override public int run(String[] args) { diff --git a/java/demo/Glacier2/chat/Client.java b/java/demo/Glacier2/chat/Client.java index 7a7fd1de632..971aa6047d0 100644 --- a/java/demo/Glacier2/chat/Client.java +++ b/java/demo/Glacier2/chat/Client.java @@ -38,7 +38,10 @@ import javax.swing.JSeparator; import javax.swing.JSplitPane; import javax.swing.JTextArea; import javax.swing.JTextField; +import javax.swing.ScrollPaneConstants; +import javax.swing.SwingConstants; import javax.swing.SwingUtilities; +import javax.swing.WindowConstants; import javax.swing.text.AttributeSet; import javax.swing.text.BadLocationException; import javax.swing.text.DefaultEditorKit; @@ -62,6 +65,7 @@ public class Client extends JFrame { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { @@ -96,6 +100,7 @@ public class Client extends JFrame _output.addMouseListener(new MouseAdapter() { + @Override public void mousePressed(MouseEvent e) { @@ -112,6 +117,7 @@ public class Client extends JFrame _input.setEditable(true); _input.addKeyListener(new KeyListener() { + @Override public void keyTyped(KeyEvent e) { @@ -148,11 +154,13 @@ public class Client extends JFrame } } + @Override public void keyPressed(KeyEvent e) { } + @Override public void keyReleased(KeyEvent e) { @@ -160,7 +168,7 @@ public class Client extends JFrame }); _outputScroll = new JScrollPane(_output); - _outputScroll.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); + _outputScroll.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); _outputScroll.setBorder(null); _outputScroll.setMinimumSize(new Dimension(100, 100)); @@ -170,7 +178,7 @@ public class Client extends JFrame verticalSplit.setTopComponent(_outputScroll); JScrollPane conversationInputScroll = new JScrollPane(_input); - conversationInputScroll.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); + conversationInputScroll.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); conversationInputScroll.setBorder(null); conversationInputScroll.setMinimumSize(new Dimension(100, 100)); @@ -181,22 +189,26 @@ public class Client extends JFrame _output.addComponentListener(new ComponentListener() { + @Override public void componentResized(ComponentEvent e) { JScrollBar vertivalScrollbar = _outputScroll.getVerticalScrollBar(); vertivalScrollbar.setValue(vertivalScrollbar.getMaximum()); } + @Override public void componentHidden(ComponentEvent e) { } + @Override public void componentMoved(ComponentEvent e) { } + @Override public void componentShown(ComponentEvent e) { @@ -220,6 +232,7 @@ public class Client extends JFrame _login = new AbstractAction("Login") { + @Override public void actionPerformed(ActionEvent e) { @@ -229,6 +242,7 @@ public class Client extends JFrame _logout = new AbstractAction("Logout") { + @Override public void actionPerformed(ActionEvent e) { @@ -242,6 +256,7 @@ public class Client extends JFrame _exit = new AbstractAction("Exit") { + @Override public void actionPerformed(ActionEvent e) { @@ -260,10 +275,11 @@ public class Client extends JFrame setJMenuBar(menuBar); - setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE); + setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE); addWindowListener(new WindowAdapter() { + @Override public void windowClosing(WindowEvent e) { @@ -277,13 +293,13 @@ public class Client extends JFrame setVisible(true); // Create the labels and text fields. - JLabel hostLabel = new JLabel("Host: ", JLabel.RIGHT); + JLabel hostLabel = new JLabel("Host: ", SwingConstants.RIGHT); _hostField = new JTextField("", 12); _hostField.setText("127.0.0.1"); - JLabel userNameLabel = new JLabel("Username: ", JLabel.RIGHT); + JLabel userNameLabel = new JLabel("Username: ", SwingConstants.RIGHT); _userNameField = new JTextField("", 12); _userNameField.setText("test"); - JLabel passwordLabel = new JLabel("Password: ", JLabel.RIGHT); + JLabel passwordLabel = new JLabel("Password: ", SwingConstants.RIGHT); _passwordField = new JPasswordField("", 12); _connectionPanel = new JPanel(false); _connectionPanel.setLayout(new BoxLayout(_connectionPanel, BoxLayout.X_AXIS)); @@ -314,6 +330,7 @@ public class Client extends JFrame // Setup a dispatcher to dispath Ice and Glacier2 helper callbacks to the GUI thread. initData.dispatcher = new Ice.Dispatcher() { + @Override public void dispatch(Runnable runnable, Ice.Connection connection) { @@ -323,6 +340,7 @@ public class Client extends JFrame _factory = new SessionFactoryHelper(initData, new SessionCallback() { + @Override public void connected(SessionHelper session) throws SessionNotExistException @@ -338,6 +356,7 @@ public class Client extends JFrame // simple. Demo._ChatCallbackDisp servant = new Demo._ChatCallbackDisp() { + @Override public void message(final String data, Current current) { @@ -374,6 +393,7 @@ public class Client extends JFrame }); } + @Override public void disconnected(SessionHelper session) { @@ -398,6 +418,7 @@ public class Client extends JFrame _status.setText("Not connected"); } + @Override public void connectFailed(SessionHelper session, Throwable ex) { @@ -415,6 +436,7 @@ public class Client extends JFrame _status.setText(ex.getClass().getName()); } + @Override public void createdCommunicator(SessionHelper session) { @@ -476,7 +498,7 @@ public class Client extends JFrame public void appendMessage(String message) { - Document doc = (Document) _output.getDocument(); + Document doc = _output.getDocument(); Element e = doc.getDefaultRootElement(); AttributeSet attr = e.getAttributes().copyAttributes(); try diff --git a/java/demo/Glacier2/voip/Server.java b/java/demo/Glacier2/voip/Server.java index b1bff6b1968..0cfc9a8c60b 100644 --- a/java/demo/Glacier2/voip/Server.java +++ b/java/demo/Glacier2/voip/Server.java @@ -7,7 +7,6 @@ // // ********************************************************************** -import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.TimeUnit; @@ -35,15 +34,18 @@ public class Server extends Ice.Application private ControlPrx _ctrl; private long _timestamp = System.currentTimeMillis(); + @Override public void setControl(ControlPrx ctrl, Current current) { _ctrl = ctrl; } + @Override public void simulateCall(int delay, Current current) { _executor.schedule(new Runnable() { + @Override public void run() { if(_ctrl != null) @@ -51,12 +53,14 @@ public class Server extends Ice.Application System.out.println("calling incoming call"); _ctrl.begin_incomingCall(new Callback_Control_incomingCall() { + @Override public void exception(LocalException ex) { System.out.println("incoming call failed"); ex.printStackTrace(); } + @Override public void response() { System.out.println("incoming call succeeded"); @@ -67,6 +71,7 @@ public class Server extends Ice.Application }, delay, TimeUnit.MILLISECONDS); } + @Override public void destroy(Current current) { try @@ -79,6 +84,7 @@ public class Server extends Ice.Application } } + @Override public void refresh(Current current) { _timestamp = System.currentTimeMillis(); @@ -92,6 +98,7 @@ public class Server extends Ice.Application class PermissionsVerifierI extends _PermissionsVerifierDisp { + @Override public boolean checkPermissions(String userId, String password, StringHolder reason, Current current) { return true; @@ -100,6 +107,7 @@ public class Server extends Ice.Application class SessionManagerI extends _SessionManagerDisp { + @Override public SessionPrx create(String userId, SessionControlPrx control, Current current) throws CannotCreateSessionException { @@ -109,6 +117,7 @@ public class Server extends Ice.Application final SessionPrx proxy = SessionPrxHelper.uncheckedCast(current.adapter.addWithUUID(session)); _executor.scheduleWithFixedDelay(new Runnable() { + @Override public void run() { // If the session has already been destroyed the ONE will @@ -131,6 +140,7 @@ public class Server extends Ice.Application _executor.setExecuteExistingDelayedTasksAfterShutdownPolicy(false); } + @Override public int run(String[] args) { diff --git a/java/demo/Ice/applet/HelloApplet.java b/java/demo/Ice/applet/HelloApplet.java index dc284d0a064..1291e116f04 100644 --- a/java/demo/Ice/applet/HelloApplet.java +++ b/java/demo/Ice/applet/HelloApplet.java @@ -14,6 +14,7 @@ import javax.swing.event.*; public class HelloApplet extends JApplet { + @Override public void init() { // @@ -23,6 +24,7 @@ public class HelloApplet extends JApplet { SwingUtilities.invokeAndWait(new Runnable() { + @Override public void run() { initUI(); @@ -45,6 +47,7 @@ public class HelloApplet extends JApplet initData.properties.load("config.applet"); initData.dispatcher = new Ice.Dispatcher() { + @Override public void dispatch(Runnable runnable, Ice.Connection connection) { @@ -59,16 +62,19 @@ public class HelloApplet extends JApplet } } + @Override public void start() { // Nothing to do. } + @Override public void stop() { // Nothing to do. } + @Override public void destroy() { // @@ -95,7 +101,7 @@ public class HelloApplet extends JApplet JLabel l1 = new JLabel("Hostname"); _hostname = new JTextField(); JLabel l2 = new JLabel("Mode"); - _mode = new JComboBox(); + _mode = new JComboBox<String>(); JLabel l3 = new JLabel("Timeout"); _timeoutSlider = new JSlider(0, MAX_TIME); _timeoutLabel = new JLabel("0.0"); @@ -107,7 +113,6 @@ public class HelloApplet extends JApplet _shutdown = new JButton("Shutdown"); _flush = new JButton("Flush"); _flush.setEnabled(false); - JPanel statusPanel = new JPanel(); JSeparator statusPanelSeparator = new JSeparator(); _status = new JLabel(); _status.setText("Ready"); @@ -122,10 +127,11 @@ public class HelloApplet extends JApplet "Twoway", "Twoway Secure", "Oneway", "Oneway Batch", "Oneway Secure", "Oneway Secure Batch", "Datagram", "Datagram Batch" }; - _mode.setModel(new DefaultComboBoxModel(modes)); + _mode.setModel(new DefaultComboBoxModel<String>(modes)); _hello.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { sayHello(); @@ -133,6 +139,7 @@ public class HelloApplet extends JApplet }); _shutdown.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { shutdown(); @@ -140,6 +147,7 @@ public class HelloApplet extends JApplet }); _flush.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { flush(); @@ -147,6 +155,7 @@ public class HelloApplet extends JApplet }); _mode.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { changeDeliveryMode(_mode.getSelectedIndex()); @@ -340,7 +349,7 @@ public class HelloApplet extends JApplet int timeout = _timeoutSlider.getValue(); if(timeout != 0) { - prx = prx.ice_timeout(timeout); + prx = prx.ice_invocationTimeout(timeout); } return Demo.HelloPrxHelper.uncheckedCast(prx); } @@ -464,6 +473,7 @@ public class HelloApplet extends JApplet { _communicator.begin_flushBatchRequests(new Ice.Callback_Communicator_flushBatchRequests() { + @Override public void exception(final Ice.LocalException ex) { handleException(ex); @@ -519,6 +529,7 @@ public class HelloApplet extends JApplet _label = label; } + @Override public void stateChanged(ChangeEvent ce) { float value = (float)(_slider.getValue() / 1000.0); @@ -532,7 +543,7 @@ public class HelloApplet extends JApplet private static final int MAX_TIME = 5000; // 5 seconds private JTextField _hostname; - private JComboBox _mode; + private JComboBox<String> _mode; private JSlider _timeoutSlider; private JLabel _timeoutLabel; private JSlider _delaySlider; diff --git a/java/demo/Ice/async/Client.java b/java/demo/Ice/async/Client.java index e0bbad6ecf7..035ec75cf05 100644 --- a/java/demo/Ice/async/Client.java +++ b/java/demo/Ice/async/Client.java @@ -13,6 +13,7 @@ public class Client extends Ice.Application { class ShutdownHook extends Thread { + @Override public void run() { @@ -67,6 +68,7 @@ public class Client extends Ice.Application "?: help\n"); } + @Override public int run(String[] args) { diff --git a/java/demo/Ice/async/HelloI.java b/java/demo/Ice/async/HelloI.java index 31b7fd7706d..e51a90976de 100644 --- a/java/demo/Ice/async/HelloI.java +++ b/java/demo/Ice/async/HelloI.java @@ -17,6 +17,7 @@ public class HelloI extends _HelloDisp _workQueue = workQueue; } + @Override public void sayHello_async(AMD_Hello_sayHello cb, int delay, Ice.Current current) { @@ -31,6 +32,7 @@ public class HelloI extends _HelloDisp } } + @Override public void shutdown(Ice.Current current) { diff --git a/java/demo/Ice/async/Server.java b/java/demo/Ice/async/Server.java index 02db1f88529..6fbc9291c5b 100644 --- a/java/demo/Ice/async/Server.java +++ b/java/demo/Ice/async/Server.java @@ -7,12 +7,13 @@ // // ********************************************************************** -import Demo.*; + public class Server extends Ice.Application { class ShutdownHook extends Thread { + @Override public void run() { @@ -21,6 +22,7 @@ public class Server extends Ice.Application } } + @Override public int run(String[] args) { diff --git a/java/demo/Ice/async/WorkQueue.java b/java/demo/Ice/async/WorkQueue.java index b3181ac1252..98e3eb43603 100644 --- a/java/demo/Ice/async/WorkQueue.java +++ b/java/demo/Ice/async/WorkQueue.java @@ -17,6 +17,7 @@ public class WorkQueue extends Thread int delay; } + @Override public synchronized void run() { @@ -38,7 +39,7 @@ public class WorkQueue extends Thread // // Get next work item. // - CallbackEntry entry = (CallbackEntry)_callbacks.getFirst(); + CallbackEntry entry = _callbacks.getFirst(); // // Wait for the amount of time indicated in delay to diff --git a/java/demo/Ice/bidir/CallbackReceiverI.java b/java/demo/Ice/bidir/CallbackReceiverI.java index 9e3117dc597..f840d1f2a4b 100644 --- a/java/demo/Ice/bidir/CallbackReceiverI.java +++ b/java/demo/Ice/bidir/CallbackReceiverI.java @@ -15,6 +15,7 @@ class CallbackReceiverI extends _CallbackReceiverDisp { } + @Override public void callback(int num, Ice.Current current) { diff --git a/java/demo/Ice/bidir/CallbackSenderI.java b/java/demo/Ice/bidir/CallbackSenderI.java index d214ced1be9..66919cf6642 100644 --- a/java/demo/Ice/bidir/CallbackSenderI.java +++ b/java/demo/Ice/bidir/CallbackSenderI.java @@ -25,6 +25,7 @@ class CallbackSenderI extends _CallbackSenderDisp implements java.lang.Runnable this.notify(); } + @Override synchronized public void addClient(Ice.Identity ident, Ice.Current current) { @@ -35,6 +36,7 @@ class CallbackSenderI extends _CallbackSenderDisp implements java.lang.Runnable _clients.add(client); } + @Override public void run() { diff --git a/java/demo/Ice/bidir/Client.java b/java/demo/Ice/bidir/Client.java index 97727c2bb72..352c9d47812 100644 --- a/java/demo/Ice/bidir/Client.java +++ b/java/demo/Ice/bidir/Client.java @@ -11,6 +11,7 @@ import Demo.*; public class Client extends Ice.Application { + @Override public int run(String[] args) { diff --git a/java/demo/Ice/bidir/Server.java b/java/demo/Ice/bidir/Server.java index 5049483e377..b2de19bf1d0 100644 --- a/java/demo/Ice/bidir/Server.java +++ b/java/demo/Ice/bidir/Server.java @@ -7,10 +7,11 @@ // // ********************************************************************** -import Demo.*; + public class Server extends Ice.Application { + @Override public int run(String[] args) { diff --git a/java/demo/Ice/callback/CallbackReceiverI.java b/java/demo/Ice/callback/CallbackReceiverI.java index fc998dcb407..17bba2555c8 100644 --- a/java/demo/Ice/callback/CallbackReceiverI.java +++ b/java/demo/Ice/callback/CallbackReceiverI.java @@ -11,6 +11,7 @@ import Demo.*; public final class CallbackReceiverI extends _CallbackReceiverDisp { + @Override public void callback(Ice.Current current) { diff --git a/java/demo/Ice/callback/CallbackSenderI.java b/java/demo/Ice/callback/CallbackSenderI.java index 55b4e2fd516..2f51659cb53 100644 --- a/java/demo/Ice/callback/CallbackSenderI.java +++ b/java/demo/Ice/callback/CallbackSenderI.java @@ -11,6 +11,7 @@ import Demo.*; public final class CallbackSenderI extends _CallbackSenderDisp { + @Override public void initiateCallback(CallbackReceiverPrx proxy, Ice.Current current) { @@ -25,6 +26,7 @@ public final class CallbackSenderI extends _CallbackSenderDisp } } + @Override public void shutdown(Ice.Current current) { diff --git a/java/demo/Ice/callback/Client.java b/java/demo/Ice/callback/Client.java index 950c3702207..105a538339c 100644 --- a/java/demo/Ice/callback/Client.java +++ b/java/demo/Ice/callback/Client.java @@ -13,6 +13,7 @@ public class Client extends Ice.Application { class ShutdownHook extends Thread { + @Override public void run() { @@ -38,6 +39,7 @@ public class Client extends Ice.Application "?: help\n"); } + @Override public int run(String[] args) { diff --git a/java/demo/Ice/callback/Server.java b/java/demo/Ice/callback/Server.java index d04e09b9e8a..b11845054e0 100644 --- a/java/demo/Ice/callback/Server.java +++ b/java/demo/Ice/callback/Server.java @@ -7,10 +7,11 @@ // // ********************************************************************** -import Demo.*; + public class Server extends Ice.Application { + @Override public int run(String[] args) { diff --git a/java/demo/Ice/context/Client.java b/java/demo/Ice/context/Client.java index 3b808b05199..25b5e058d6b 100644 --- a/java/demo/Ice/context/Client.java +++ b/java/demo/Ice/context/Client.java @@ -13,6 +13,7 @@ public class Client extends Ice.Application { class ShutdownHook extends Thread { + @Override public void run() { @@ -41,6 +42,7 @@ public class Client extends Ice.Application "?: help\n"); } + @Override public int run(String[] args) { diff --git a/java/demo/Ice/context/ContextI.java b/java/demo/Ice/context/ContextI.java index 1fb3287747c..1cc4d2cd545 100644 --- a/java/demo/Ice/context/ContextI.java +++ b/java/demo/Ice/context/ContextI.java @@ -11,6 +11,7 @@ import Demo.*; public class ContextI extends _ContextDisp { + @Override public void call(Ice.Current current) { @@ -27,6 +28,7 @@ public class ContextI extends _ContextDisp System.out.println(); } + @Override public void shutdown(Ice.Current current) { diff --git a/java/demo/Ice/context/Server.java b/java/demo/Ice/context/Server.java index a9152ade77a..99018fb538d 100644 --- a/java/demo/Ice/context/Server.java +++ b/java/demo/Ice/context/Server.java @@ -7,10 +7,11 @@ // // ********************************************************************** -import Demo.*; + public class Server extends Ice.Application { + @Override public int run(String[] args) { diff --git a/java/demo/Ice/hello/Client.java b/java/demo/Ice/hello/Client.java index 688644c92c1..795ac57b76f 100644 --- a/java/demo/Ice/hello/Client.java +++ b/java/demo/Ice/hello/Client.java @@ -13,6 +13,7 @@ public class Client extends Ice.Application { class ShutdownHook extends Thread { + @Override public void run() { @@ -46,6 +47,7 @@ public class Client extends Ice.Application "?: help\n"); } + @Override public int run(String[] args) { diff --git a/java/demo/Ice/hello/HelloI.java b/java/demo/Ice/hello/HelloI.java index eecfd43e409..8c1fff4f6e8 100644 --- a/java/demo/Ice/hello/HelloI.java +++ b/java/demo/Ice/hello/HelloI.java @@ -11,6 +11,7 @@ import Demo.*; public class HelloI extends _HelloDisp { + @Override public void sayHello(int delay, Ice.Current current) { @@ -18,7 +19,8 @@ public class HelloI extends _HelloDisp { try { - Thread.currentThread().sleep(delay); + Thread.currentThread(); + Thread.sleep(delay); } catch(InterruptedException ex1) { @@ -27,6 +29,7 @@ public class HelloI extends _HelloDisp System.out.println("Hello World!"); } + @Override public void shutdown(Ice.Current current) { diff --git a/java/demo/Ice/hello/Server.java b/java/demo/Ice/hello/Server.java index 9af67c58f7c..5af6abd51fa 100644 --- a/java/demo/Ice/hello/Server.java +++ b/java/demo/Ice/hello/Server.java @@ -7,10 +7,11 @@ // // ********************************************************************** -import Demo.*; + public class Server extends Ice.Application { + @Override public int run(String[] args) { diff --git a/java/demo/Ice/interrupt/Client.java b/java/demo/Ice/interrupt/Client.java index 93af8923cd0..cb666ef6839 100644 --- a/java/demo/Ice/interrupt/Client.java +++ b/java/demo/Ice/interrupt/Client.java @@ -21,6 +21,7 @@ public class Client extends Ice.Application { class ShutdownHook extends Thread { + @Override public void run() { diff --git a/java/demo/Ice/invoke/Client.java b/java/demo/Ice/invoke/Client.java index 2554415b001..19dbea5efbb 100644 --- a/java/demo/Ice/invoke/Client.java +++ b/java/demo/Ice/invoke/Client.java @@ -7,7 +7,7 @@ // // ********************************************************************** -import Demo.*; + public class Client extends Ice.Application { @@ -32,6 +32,7 @@ public class Client extends Ice.Application class ShutdownHook extends Thread { + @Override public void run() { @@ -46,6 +47,7 @@ public class Client extends Ice.Application } } + @Override public int run(String[] args) { diff --git a/java/demo/Ice/invoke/PrinterI.java b/java/demo/Ice/invoke/PrinterI.java index 8e8c455a865..ec6308dd9a6 100644 --- a/java/demo/Ice/invoke/PrinterI.java +++ b/java/demo/Ice/invoke/PrinterI.java @@ -9,6 +9,7 @@ public class PrinterI extends Ice.Blobject { + @Override public boolean ice_invoke(byte[] inParams, Ice.ByteSeqHolder outParams, Ice.Current current) { diff --git a/java/demo/Ice/invoke/Server.java b/java/demo/Ice/invoke/Server.java index e02185c1a4c..b216d93bf74 100644 --- a/java/demo/Ice/invoke/Server.java +++ b/java/demo/Ice/invoke/Server.java @@ -7,10 +7,11 @@ // // ********************************************************************** -import Demo.*; + public class Server extends Ice.Application { + @Override public int run(String[] args) { diff --git a/java/demo/Ice/latency/Client.java b/java/demo/Ice/latency/Client.java index 7e98b6d08a1..b88c3102083 100644 --- a/java/demo/Ice/latency/Client.java +++ b/java/demo/Ice/latency/Client.java @@ -11,6 +11,7 @@ import Demo.*; class Client extends Ice.Application { + @Override public int run(String[] args) { @@ -53,7 +54,7 @@ if((i % 100) == 0) System.out.println("" + i); } long tv2 = System.currentTimeMillis(); - double total = (double)(tv2 - tv1); + double total = tv2 - tv1; double perPing = total / repetitions; System.out.println("time for " + repetitions + " pings: " + total + "ms"); diff --git a/java/demo/Ice/latency/Server.java b/java/demo/Ice/latency/Server.java index 91135b81845..2d8df970b08 100644 --- a/java/demo/Ice/latency/Server.java +++ b/java/demo/Ice/latency/Server.java @@ -11,6 +11,7 @@ import Demo.*; public class Server extends Ice.Application { + @Override public int run(String[] args) { diff --git a/java/demo/Ice/minimal/HelloI.java b/java/demo/Ice/minimal/HelloI.java index d1cb7c6b597..bbfe02d6792 100644 --- a/java/demo/Ice/minimal/HelloI.java +++ b/java/demo/Ice/minimal/HelloI.java @@ -11,6 +11,7 @@ import Demo.*; public class HelloI extends _HelloDisp { + @Override public void sayHello(Ice.Current current) { diff --git a/java/demo/Ice/minimal/Server.java b/java/demo/Ice/minimal/Server.java index 9eeecf883f8..6bb8e700cd9 100644 --- a/java/demo/Ice/minimal/Server.java +++ b/java/demo/Ice/minimal/Server.java @@ -7,7 +7,7 @@ // // ********************************************************************** -import Demo.*; + public class Server { diff --git a/java/demo/Ice/multicast/Client.java b/java/demo/Ice/multicast/Client.java index 0283f2d654a..568ea80d686 100644 --- a/java/demo/Ice/multicast/Client.java +++ b/java/demo/Ice/multicast/Client.java @@ -11,6 +11,7 @@ import Demo.*; public class Client extends Ice.Application { + @Override public int run(String[] args) { diff --git a/java/demo/Ice/multicast/DiscoverI.java b/java/demo/Ice/multicast/DiscoverI.java index c66b9571f6a..19b265edde8 100644 --- a/java/demo/Ice/multicast/DiscoverI.java +++ b/java/demo/Ice/multicast/DiscoverI.java @@ -16,6 +16,7 @@ public class DiscoverI extends _DiscoverDisp _obj = obj; } + @Override public void lookup(DiscoverReplyPrx reply, Ice.Current current) { diff --git a/java/demo/Ice/multicast/DiscoverReplyI.java b/java/demo/Ice/multicast/DiscoverReplyI.java index b9625e73762..7fc8e95250c 100644 --- a/java/demo/Ice/multicast/DiscoverReplyI.java +++ b/java/demo/Ice/multicast/DiscoverReplyI.java @@ -11,6 +11,7 @@ import Demo.*; public class DiscoverReplyI extends _DiscoverReplyDisp { + @Override public synchronized void reply(Ice.ObjectPrx obj, Ice.Current current) { diff --git a/java/demo/Ice/multicast/HelloI.java b/java/demo/Ice/multicast/HelloI.java index d1cb7c6b597..bbfe02d6792 100644 --- a/java/demo/Ice/multicast/HelloI.java +++ b/java/demo/Ice/multicast/HelloI.java @@ -11,6 +11,7 @@ import Demo.*; public class HelloI extends _HelloDisp { + @Override public void sayHello(Ice.Current current) { diff --git a/java/demo/Ice/multicast/Server.java b/java/demo/Ice/multicast/Server.java index 0cc9598d677..9df210c3ecb 100644 --- a/java/demo/Ice/multicast/Server.java +++ b/java/demo/Ice/multicast/Server.java @@ -7,10 +7,11 @@ // // ********************************************************************** -import Demo.*; + public class Server extends Ice.Application { + @Override public int run(String[] args) { diff --git a/java/demo/Ice/nested/Client.java b/java/demo/Ice/nested/Client.java index 82c0f166c42..885743b1d43 100644 --- a/java/demo/Ice/nested/Client.java +++ b/java/demo/Ice/nested/Client.java @@ -13,6 +13,7 @@ public class Client extends Ice.Application { class ShutdownHook extends Thread { + @Override public void run() { @@ -33,6 +34,7 @@ public class Client extends Ice.Application } } + @Override public int run(String[] args) { diff --git a/java/demo/Ice/nested/NestedI.java b/java/demo/Ice/nested/NestedI.java index 3622b7933a6..7234bf687b9 100644 --- a/java/demo/Ice/nested/NestedI.java +++ b/java/demo/Ice/nested/NestedI.java @@ -16,6 +16,7 @@ class NestedI extends _NestedDisp _self = self; } + @Override public void nestedCall(int level, NestedPrx proxy, Ice.Current current) { diff --git a/java/demo/Ice/nested/Server.java b/java/demo/Ice/nested/Server.java index 2ccead73772..cb340924679 100644 --- a/java/demo/Ice/nested/Server.java +++ b/java/demo/Ice/nested/Server.java @@ -11,6 +11,7 @@ import Demo.*; public class Server extends Ice.Application { + @Override public int run(String[] args) { diff --git a/java/demo/Ice/optional/Client.java b/java/demo/Ice/optional/Client.java index a65052cde49..e2b3224c61d 100644 --- a/java/demo/Ice/optional/Client.java +++ b/java/demo/Ice/optional/Client.java @@ -14,6 +14,7 @@ public class Client extends Ice.Application { class ShutdownHook extends Thread { + @Override public void run() { @@ -28,6 +29,7 @@ public class Client extends Ice.Application } } + @Override public int run(String[] args) { diff --git a/java/demo/Ice/optional/ContactDBI.java b/java/demo/Ice/optional/ContactDBI.java index 18370fe1161..10ec853de98 100644 --- a/java/demo/Ice/optional/ContactDBI.java +++ b/java/demo/Ice/optional/ContactDBI.java @@ -13,6 +13,7 @@ public class ContactDBI extends _ContactDBDisp { private java.util.Map<String, Contact> _contacts = new java.util.HashMap<String, Contact>(); + @Override public final void addContact(String name, Ice.Optional<NumberType> type, Ice.Optional<String> number, Ice.IntOptional dialGroup, Ice.Current current) @@ -34,6 +35,7 @@ public class ContactDBI extends _ContactDBDisp _contacts.put(name, contact); } + @Override public final void updateContact(String name, Ice.Optional<NumberType> type, Ice.Optional<String> number, Ice.IntOptional dialGroup, Ice.Current current) @@ -56,12 +58,14 @@ public class ContactDBI extends _ContactDBDisp } } + @Override public final Contact query(String name, Ice.Current current) { return _contacts.get(name); } + @Override public final void queryDialgroup(String name, Ice.IntOptional dialGroup, Ice.Current current) { @@ -72,6 +76,7 @@ public class ContactDBI extends _ContactDBDisp } } + @Override public final Ice.Optional<String> queryNumber(String name, Ice.Current current) { @@ -84,6 +89,7 @@ public class ContactDBI extends _ContactDBDisp return ret; } + @Override public void shutdown(Ice.Current current) { diff --git a/java/demo/Ice/optional/Server.java b/java/demo/Ice/optional/Server.java index 0554d083b08..6fda9f35aa8 100644 --- a/java/demo/Ice/optional/Server.java +++ b/java/demo/Ice/optional/Server.java @@ -7,10 +7,11 @@ // // ********************************************************************** -import Demo.*; + public class Server extends Ice.Application { + @Override public int run(String[] args) { diff --git a/java/demo/Ice/plugin/Client.java b/java/demo/Ice/plugin/Client.java index ed71bf74eaf..02a08e83950 100644 --- a/java/demo/Ice/plugin/Client.java +++ b/java/demo/Ice/plugin/Client.java @@ -13,6 +13,7 @@ public class Client extends Ice.Application { class ShutdownHook extends Thread { + @Override public void run() { @@ -38,6 +39,7 @@ public class Client extends Ice.Application "?: help\n"); } + @Override public int run(String[] args) { diff --git a/java/demo/Ice/plugin/HelloI.java b/java/demo/Ice/plugin/HelloI.java index 8b156060124..13a0ff852d9 100644 --- a/java/demo/Ice/plugin/HelloI.java +++ b/java/demo/Ice/plugin/HelloI.java @@ -11,12 +11,14 @@ import Demo.*; public class HelloI extends _HelloDisp { + @Override public void sayHello(Ice.Current current) { current.adapter.getCommunicator().getLogger().print("Hello World!"); } + @Override public void shutdown(Ice.Current current) { diff --git a/java/demo/Ice/plugin/HelloPluginFactoryI.java b/java/demo/Ice/plugin/HelloPluginFactoryI.java index 951bec921bf..5a2754e694d 100644 --- a/java/demo/Ice/plugin/HelloPluginFactoryI.java +++ b/java/demo/Ice/plugin/HelloPluginFactoryI.java @@ -7,11 +7,12 @@ // // ********************************************************************** -import Ice.PluginFactory; + public class HelloPluginFactoryI implements Ice.PluginFactory { - public Ice.Plugin + @Override + public Ice.Plugin create(Ice.Communicator communicator, String name, String[] args) { return new HelloPluginI(communicator); diff --git a/java/demo/Ice/plugin/HelloPluginI.java b/java/demo/Ice/plugin/HelloPluginI.java index f5c92687202..a4aa88ae4d7 100644 --- a/java/demo/Ice/plugin/HelloPluginI.java +++ b/java/demo/Ice/plugin/HelloPluginI.java @@ -7,7 +7,7 @@ // // ********************************************************************** -import Demo.*; + public class HelloPluginI implements Ice.Plugin { @@ -17,6 +17,7 @@ public class HelloPluginI implements Ice.Plugin _communicator = communicator; } + @Override public void initialize() { @@ -25,6 +26,7 @@ public class HelloPluginI implements Ice.Plugin adapter.activate(); } + @Override public void destroy() { diff --git a/java/demo/Ice/plugin/LoggerI.java b/java/demo/Ice/plugin/LoggerI.java index 9e9eb79ec29..0d14f0640e9 100644 --- a/java/demo/Ice/plugin/LoggerI.java +++ b/java/demo/Ice/plugin/LoggerI.java @@ -7,34 +7,39 @@ // // ********************************************************************** -import Ice.Logger; + public class LoggerI implements Ice.Logger { + @Override public void print(String message) { System.out.println("PRINT: " + message); } + @Override public void trace(String category, String message) { System.out.println("TRACE(" + category + "): " + message); } + @Override public void warning(String message) { System.out.println("WARNING: " + message); } + @Override public void error(String message) { System.out.println("ERROR: " + message); } + @Override public Ice.Logger cloneWithPrefix(String prefix) { diff --git a/java/demo/Ice/plugin/LoggerPluginFactoryI.java b/java/demo/Ice/plugin/LoggerPluginFactoryI.java index 5e22eda154e..bc25f1f9806 100644 --- a/java/demo/Ice/plugin/LoggerPluginFactoryI.java +++ b/java/demo/Ice/plugin/LoggerPluginFactoryI.java @@ -7,12 +7,12 @@ // // ********************************************************************** -import Ice.PluginFactory; -import Ice.LoggerPlugin; + public class LoggerPluginFactoryI implements Ice.PluginFactory { - public Ice.Plugin + @Override + public Ice.Plugin create(Ice.Communicator communicator, String name, String[] args) { return new Ice.LoggerPlugin(communicator, new LoggerI()); diff --git a/java/demo/Ice/plugin/Server.java b/java/demo/Ice/plugin/Server.java index 679bfec5ebd..b756419085c 100644 --- a/java/demo/Ice/plugin/Server.java +++ b/java/demo/Ice/plugin/Server.java @@ -9,6 +9,7 @@ public class Server extends Ice.Application { + @Override public int run(String[] args) { diff --git a/java/demo/Ice/properties/Client.java b/java/demo/Ice/properties/Client.java index fdd5dd37b79..72bc1c4fe8b 100644 --- a/java/demo/Ice/properties/Client.java +++ b/java/demo/Ice/properties/Client.java @@ -13,6 +13,7 @@ public class Client extends Ice.Application { class ShutdownHook extends Thread { + @Override public void run() { @@ -52,6 +53,7 @@ public class Client extends Ice.Application } } + @Override public int run(String[] args) { diff --git a/java/demo/Ice/properties/Server.java b/java/demo/Ice/properties/Server.java index e2ec029602d..cc371df7ead 100644 --- a/java/demo/Ice/properties/Server.java +++ b/java/demo/Ice/properties/Server.java @@ -7,7 +7,7 @@ // // ********************************************************************** -import Demo.*; + public class Server extends Ice.Application { @@ -22,6 +22,7 @@ public class Server extends Ice.Application _called = false; } + @Override public synchronized java.util.Map<String, String> getChanges(Ice.Current current) { // @@ -43,11 +44,13 @@ public class Server extends Ice.Application return _changes; } + @Override public void shutdown(Ice.Current current) { current.adapter.getCommunicator().shutdown(); } + @Override public synchronized void updated(java.util.Map<String, String> changes) { _changes = changes; @@ -59,6 +62,7 @@ public class Server extends Ice.Application private boolean _called; } + @Override public int run(String[] args) { diff --git a/java/demo/Ice/serialize/Client.java b/java/demo/Ice/serialize/Client.java index 54654fbe532..c7cf071138c 100644 --- a/java/demo/Ice/serialize/Client.java +++ b/java/demo/Ice/serialize/Client.java @@ -13,6 +13,7 @@ public class Client extends Ice.Application { class ShutdownHook extends Thread { + @Override public void run() { @@ -39,6 +40,7 @@ public class Client extends Ice.Application "?: help\n"); } + @Override public int run(String[] args) { diff --git a/java/demo/Ice/serialize/GreetI.java b/java/demo/Ice/serialize/GreetI.java index e618aa09d5b..99bd50c8b19 100644 --- a/java/demo/Ice/serialize/GreetI.java +++ b/java/demo/Ice/serialize/GreetI.java @@ -11,6 +11,7 @@ import Demo.*; public class GreetI extends _GreetDisp { + @Override public void sendGreeting(MyGreeting greeting, Ice.Current current) { @@ -24,6 +25,7 @@ public class GreetI extends _GreetDisp } } + @Override public void shutdown(Ice.Current current) { diff --git a/java/demo/Ice/serialize/Server.java b/java/demo/Ice/serialize/Server.java index f2d2dd6050a..7e60b478bf7 100644 --- a/java/demo/Ice/serialize/Server.java +++ b/java/demo/Ice/serialize/Server.java @@ -7,10 +7,11 @@ // // ********************************************************************** -import Demo.*; + public class Server extends Ice.Application { + @Override public int run(String[] args) { diff --git a/java/demo/Ice/session/Client.java b/java/demo/Ice/session/Client.java index 060e7a20ddf..5ab10738338 100644 --- a/java/demo/Ice/session/Client.java +++ b/java/demo/Ice/session/Client.java @@ -13,6 +13,7 @@ public class Client extends Ice.Application { class ShutdownHook extends Thread { + @Override public void run() { @@ -41,6 +42,7 @@ public class Client extends Ice.Application "?: help\n"); } + @Override public int run(String[] args) { @@ -88,6 +90,7 @@ public class Client extends Ice.Application _session = factory.create(name); _executor.scheduleAtFixedRate(new Runnable() { + @Override public void run() { diff --git a/java/demo/Ice/session/HelloI.java b/java/demo/Ice/session/HelloI.java index d2b801f1e79..828b9cafee6 100644 --- a/java/demo/Ice/session/HelloI.java +++ b/java/demo/Ice/session/HelloI.java @@ -18,6 +18,7 @@ public class HelloI extends _HelloDisp _id = id; } + @Override public void sayHello(Ice.Current current) { diff --git a/java/demo/Ice/session/ReapTask.java b/java/demo/Ice/session/ReapTask.java index 39b8bb1fad5..5bb07c01a58 100644 --- a/java/demo/Ice/session/ReapTask.java +++ b/java/demo/Ice/session/ReapTask.java @@ -23,6 +23,7 @@ class ReapTask implements Runnable SessionI session; } + @Override synchronized public void run() { diff --git a/java/demo/Ice/session/Server.java b/java/demo/Ice/session/Server.java index 4f8582a0775..9e32d4d9849 100644 --- a/java/demo/Ice/session/Server.java +++ b/java/demo/Ice/session/Server.java @@ -7,10 +7,11 @@ // // ********************************************************************** -import Demo.*; + public class Server extends Ice.Application { + @Override public int run(String[] args) { diff --git a/java/demo/Ice/session/SessionFactoryI.java b/java/demo/Ice/session/SessionFactoryI.java index 0695713b271..5ce2c405e7b 100644 --- a/java/demo/Ice/session/SessionFactoryI.java +++ b/java/demo/Ice/session/SessionFactoryI.java @@ -16,6 +16,7 @@ class SessionFactoryI extends _SessionFactoryDisp _reaper = reaper; } + @Override public synchronized SessionPrx create(String name, Ice.Current c) { @@ -25,6 +26,7 @@ class SessionFactoryI extends _SessionFactoryDisp return proxy; } + @Override public void shutdown(Ice.Current c) { diff --git a/java/demo/Ice/session/SessionI.java b/java/demo/Ice/session/SessionI.java index 5a9fa225b2b..0ecb774a9ea 100644 --- a/java/demo/Ice/session/SessionI.java +++ b/java/demo/Ice/session/SessionI.java @@ -19,6 +19,7 @@ class SessionI extends _SessionDisp System.out.println("The session " + _name + " is now created."); } + @Override synchronized public HelloPrx createHello(Ice.Current c) { @@ -31,6 +32,7 @@ class SessionI extends _SessionDisp return hello; } + @Override synchronized public void refresh(Ice.Current c) { @@ -41,6 +43,7 @@ class SessionI extends _SessionDisp _timestamp = System.currentTimeMillis(); } + @Override synchronized public String getName(Ice.Current c) { @@ -51,6 +54,7 @@ class SessionI extends _SessionDisp return _name; } + @Override synchronized public void destroy(Ice.Current c) { diff --git a/java/demo/Ice/swing/Client.java b/java/demo/Ice/swing/Client.java index 94893709544..b2465443656 100644 --- a/java/demo/Ice/swing/Client.java +++ b/java/demo/Ice/swing/Client.java @@ -9,6 +9,7 @@ import java.awt.*; import java.awt.event.*; + import javax.swing.*; import javax.swing.event.*; @@ -18,6 +19,7 @@ public class Client extends JFrame { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { try @@ -72,6 +74,7 @@ public class Client extends JFrame initData.properties.load("config.client"); initData.dispatcher = new Ice.Dispatcher() { + @Override public void dispatch(Runnable runnable, Ice.Connection connection) { @@ -90,7 +93,7 @@ public class Client extends JFrame JLabel l1 = new JLabel("Hostname"); _hostname = new JTextField(); JLabel l2 = new JLabel("Mode"); - _mode = new JComboBox(); + _mode = new JComboBox<String>(); JLabel l3 = new JLabel("Timeout"); _timeoutSlider = new JSlider(0, MAX_TIME); _timeoutLabel = new JLabel("0.0"); @@ -102,7 +105,6 @@ public class Client extends JFrame _shutdown = new JButton("Shutdown"); _flush = new JButton("Flush"); _flush.setEnabled(false); - JPanel statusPanel = new JPanel(); JSeparator statusPanelSeparator = new JSeparator(); _status = new JLabel(); _status.setText("Ready"); @@ -117,10 +119,11 @@ public class Client extends JFrame "Twoway", "Twoway Secure", "Oneway", "Oneway Batch", "Oneway Secure", "Oneway Secure Batch", "Datagram", "Datagram Batch" }; - _mode.setModel(new DefaultComboBoxModel(modes)); + _mode.setModel(new DefaultComboBoxModel<String>(modes)); _hello.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { sayHello(); @@ -128,6 +131,7 @@ public class Client extends JFrame }); _shutdown.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { shutdown(); @@ -135,6 +139,7 @@ public class Client extends JFrame }); _flush.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { flush(); @@ -142,6 +147,7 @@ public class Client extends JFrame }); _mode.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { changeDeliveryMode(_mode.getSelectedIndex()); @@ -270,10 +276,11 @@ public class Client extends JFrame gridBagConstraints.insets = new Insets(0, 5, 5, 5); cp.add(_status, gridBagConstraints); - setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE); + setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE); _shutdownHook = new Thread("Shutdown hook") { + @Override public void run() { destroyCommunicator(); @@ -293,6 +300,7 @@ public class Client extends JFrame addWindowListener(new WindowAdapter() { + @Override public void windowClosing(WindowEvent e) { destroyCommunicator(); @@ -389,7 +397,7 @@ public class Client extends JFrame int timeout = _timeoutSlider.getValue(); if(timeout != 0) { - prx = prx.ice_timeout(timeout); + prx = prx.ice_invocationTimeout(timeout); } return Demo.HelloPrxHelper.uncheckedCast(prx); } @@ -510,6 +518,7 @@ public class Client extends JFrame { _communicator.begin_flushBatchRequests(new Ice.Callback_Communicator_flushBatchRequests() { + @Override public void exception(final Ice.LocalException ex) { handleException(ex); @@ -571,6 +580,7 @@ public class Client extends JFrame _label = label; } + @Override public void stateChanged(ChangeEvent ce) { float value = (float)(_slider.getValue() / 1000.0); @@ -591,7 +601,7 @@ public class Client extends JFrame private static final int MAX_TIME = 5000; // 5 seconds private JTextField _hostname; - private JComboBox _mode; + private JComboBox<String> _mode; private JSlider _timeoutSlider; private JLabel _timeoutLabel; private JSlider _delaySlider; diff --git a/java/demo/Ice/throughput/Client.java b/java/demo/Ice/throughput/Client.java index 3d9d219be0a..e0ef6e74aa8 100644 --- a/java/demo/Ice/throughput/Client.java +++ b/java/demo/Ice/throughput/Client.java @@ -13,6 +13,7 @@ public class Client extends Ice.Application { class ShutdownHook extends Thread { + @Override public void run() { @@ -51,6 +52,7 @@ public class Client extends Ice.Application "?: help\n"); } + @Override public int run(String[] args) { diff --git a/java/demo/Ice/throughput/Server.java b/java/demo/Ice/throughput/Server.java index b54d967cf20..a1dd6d06984 100644 --- a/java/demo/Ice/throughput/Server.java +++ b/java/demo/Ice/throughput/Server.java @@ -7,10 +7,11 @@ // // ********************************************************************** -import Demo.*; + public class Server extends Ice.Application { + @Override public int run(String[] args) { diff --git a/java/demo/Ice/throughput/ThroughputI.java b/java/demo/Ice/throughput/ThroughputI.java index bd6a8cb4102..1b745375917 100644 --- a/java/demo/Ice/throughput/ThroughputI.java +++ b/java/demo/Ice/throughput/ThroughputI.java @@ -40,6 +40,7 @@ public final class ThroughputI extends _ThroughputDisp } } + @Override public boolean needsWarmup(Ice.Current current) { @@ -47,12 +48,14 @@ public final class ThroughputI extends _ThroughputDisp return _needsWarmup; } + @Override public void startWarmup(Ice.Current current) { _warmup = true; } + @Override public void endWarmup(Ice.Current current) { @@ -60,11 +63,13 @@ public final class ThroughputI extends _ThroughputDisp _needsWarmup = false; } + @Override public void sendByteSeq(byte[] seq, Ice.Current current) { } + @Override public byte[] recvByteSeq(Ice.Current current) { @@ -78,17 +83,20 @@ public final class ThroughputI extends _ThroughputDisp } } + @Override public byte[] echoByteSeq(byte[] seq, Ice.Current current) { return seq; } + @Override public void sendStringSeq(String[] seq, Ice.Current current) { } + @Override public String[] recvStringSeq(Ice.Current current) { @@ -102,17 +110,20 @@ public final class ThroughputI extends _ThroughputDisp } } + @Override public String[] echoStringSeq(String[] seq, Ice.Current current) { return seq; } + @Override public void sendStructSeq(StringDouble[] seq, Ice.Current current) { } + @Override public StringDouble[] recvStructSeq(Ice.Current current) { @@ -126,17 +137,20 @@ public final class ThroughputI extends _ThroughputDisp } } + @Override public StringDouble[] echoStructSeq(StringDouble[] seq, Ice.Current current) { return seq; } + @Override public void sendFixedSeq(Fixed[] seq, Ice.Current current) { } + @Override public Fixed[] recvFixedSeq(Ice.Current current) { @@ -150,12 +164,14 @@ public final class ThroughputI extends _ThroughputDisp } } + @Override public Fixed[] echoFixedSeq(Fixed[] seq, Ice.Current current) { return seq; } + @Override public void shutdown(Ice.Current current) { diff --git a/java/demo/Ice/value/Client.java b/java/demo/Ice/value/Client.java index e1b1e1f80ef..986b3a1260a 100644 --- a/java/demo/Ice/value/Client.java +++ b/java/demo/Ice/value/Client.java @@ -13,6 +13,7 @@ public class Client extends Ice.Application { class ShutdownHook extends Thread { + @Override public void run() { @@ -40,6 +41,7 @@ public class Client extends Ice.Application } } + @Override public int run(String[] args) { @@ -84,7 +86,6 @@ public class Client extends Ice.Application PrinterHolder printer = new PrinterHolder(); PrinterPrxHolder printerProxy = new PrinterPrxHolder(); - boolean gotException = false; try { initial.getPrinter(printer, printerProxy); diff --git a/java/demo/Ice/value/ClientPrinterI.java b/java/demo/Ice/value/ClientPrinterI.java index e409c09b5f3..066a397e767 100644 --- a/java/demo/Ice/value/ClientPrinterI.java +++ b/java/demo/Ice/value/ClientPrinterI.java @@ -11,6 +11,7 @@ import Demo.*; class ClientPrinterI extends ClientPrinter { + @Override public void printBackwards(Ice.Current current) { diff --git a/java/demo/Ice/value/DerivedPrinterI.java b/java/demo/Ice/value/DerivedPrinterI.java index 8647b4caea8..4ee48ca8545 100644 --- a/java/demo/Ice/value/DerivedPrinterI.java +++ b/java/demo/Ice/value/DerivedPrinterI.java @@ -11,6 +11,7 @@ import Demo.*; class DerivedPrinterI extends DerivedPrinter { + @Override public void printBackwards(Ice.Current current) { @@ -24,6 +25,7 @@ class DerivedPrinterI extends DerivedPrinter System.out.println(new String(arr)); } + @Override public void printUppercase(Ice.Current current) { diff --git a/java/demo/Ice/value/InitialI.java b/java/demo/Ice/value/InitialI.java index 25ef1ac0cf8..99ebb69148c 100644 --- a/java/demo/Ice/value/InitialI.java +++ b/java/demo/Ice/value/InitialI.java @@ -23,12 +23,14 @@ class InitialI extends _InitialDisp adapter.addWithUUID(_derivedPrinter); } + @Override public Simple getSimple(Ice.Current current) { return _simple; } + @Override public void getPrinter(PrinterHolder impl, PrinterPrxHolder proxy, Ice.Current current) { @@ -36,12 +38,14 @@ class InitialI extends _InitialDisp proxy.value = _printerProxy; } + @Override public Printer getDerivedPrinter(Ice.Current current) { return _derivedPrinter; } + @Override public Printer updatePrinterMessage(Printer printer, Ice.Current current) { @@ -49,6 +53,7 @@ class InitialI extends _InitialDisp return printer; } + @Override public void throwDerivedPrinter(Ice.Current current) throws DerivedPrinterException @@ -58,6 +63,7 @@ class InitialI extends _InitialDisp throw ex; } + @Override public void shutdown(Ice.Current current) { diff --git a/java/demo/Ice/value/ObjectFactory.java b/java/demo/Ice/value/ObjectFactory.java index 97655323330..800cb4beb96 100644 --- a/java/demo/Ice/value/ObjectFactory.java +++ b/java/demo/Ice/value/ObjectFactory.java @@ -9,6 +9,7 @@ class ObjectFactory implements Ice.ObjectFactory { + @Override public Ice.Object create(String type) { @@ -31,6 +32,7 @@ class ObjectFactory implements Ice.ObjectFactory return null; } + @Override public void destroy() { diff --git a/java/demo/Ice/value/PrinterI.java b/java/demo/Ice/value/PrinterI.java index e65c43c34f1..720a8b034d8 100644 --- a/java/demo/Ice/value/PrinterI.java +++ b/java/demo/Ice/value/PrinterI.java @@ -11,6 +11,7 @@ import Demo.*; class PrinterI extends Printer { + @Override public void printBackwards(Ice.Current current) { diff --git a/java/demo/Ice/value/Server.java b/java/demo/Ice/value/Server.java index a8f0f59fcf6..33368a75ea8 100644 --- a/java/demo/Ice/value/Server.java +++ b/java/demo/Ice/value/Server.java @@ -9,6 +9,7 @@ public class Server extends Ice.Application { + @Override public int run(String[] args) { diff --git a/java/demo/IceBox/hello/Client.java b/java/demo/IceBox/hello/Client.java index 5d3db6a884a..ea190b5c299 100644 --- a/java/demo/IceBox/hello/Client.java +++ b/java/demo/IceBox/hello/Client.java @@ -13,6 +13,7 @@ public class Client extends Ice.Application { class ShutdownHook extends Thread { + @Override public void run() { @@ -42,6 +43,7 @@ public class Client extends Ice.Application "?: help\n"); } + @Override public int run(String[] args) { diff --git a/java/demo/IceBox/hello/HelloI.java b/java/demo/IceBox/hello/HelloI.java index d1cb7c6b597..bbfe02d6792 100644 --- a/java/demo/IceBox/hello/HelloI.java +++ b/java/demo/IceBox/hello/HelloI.java @@ -11,6 +11,7 @@ import Demo.*; public class HelloI extends _HelloDisp { + @Override public void sayHello(Ice.Current current) { diff --git a/java/demo/IceBox/hello/HelloServiceI.java b/java/demo/IceBox/hello/HelloServiceI.java index 429d339a5c6..9e6bc04f20c 100644 --- a/java/demo/IceBox/hello/HelloServiceI.java +++ b/java/demo/IceBox/hello/HelloServiceI.java @@ -9,6 +9,7 @@ public class HelloServiceI implements IceBox.Service { + @Override public void start(String name, Ice.Communicator communicator, String[] args) { @@ -17,6 +18,7 @@ public class HelloServiceI implements IceBox.Service _adapter.activate(); } + @Override public void stop() { diff --git a/java/demo/IceDiscovery/hello/Client.java b/java/demo/IceDiscovery/hello/Client.java index 31d55f70c8c..651532ec2c6 100644 --- a/java/demo/IceDiscovery/hello/Client.java +++ b/java/demo/IceDiscovery/hello/Client.java @@ -13,6 +13,7 @@ public class Client extends Ice.Application { class ShutdownHook extends Thread { + @Override public void run() { @@ -46,6 +47,7 @@ public class Client extends Ice.Application "?: help\n"); } + @Override public int run(String[] args) { diff --git a/java/demo/IceDiscovery/hello/HelloI.java b/java/demo/IceDiscovery/hello/HelloI.java index 416ee68e93b..9c8523a82c9 100644 --- a/java/demo/IceDiscovery/hello/HelloI.java +++ b/java/demo/IceDiscovery/hello/HelloI.java @@ -11,6 +11,7 @@ import Demo.*; public class HelloI extends _HelloDisp { + @Override public void sayHello(int delay, Ice.Current current) { @@ -18,7 +19,8 @@ public class HelloI extends _HelloDisp { try { - Thread.currentThread().sleep(delay); + Thread.currentThread(); + Thread.sleep(delay); } catch(InterruptedException ex1) { @@ -27,6 +29,7 @@ public class HelloI extends _HelloDisp System.out.println("Hello World!"); } + @Override public void shutdown(Ice.Current current) { diff --git a/java/demo/IceDiscovery/hello/Server.java b/java/demo/IceDiscovery/hello/Server.java index 809282f6b25..6c71a0703b8 100644 --- a/java/demo/IceDiscovery/hello/Server.java +++ b/java/demo/IceDiscovery/hello/Server.java @@ -7,10 +7,11 @@ // // ********************************************************************** -import Demo.*; + public class Server extends Ice.Application { + @Override public int run(String[] args) { diff --git a/java/demo/IceDiscovery/replication/Client.java b/java/demo/IceDiscovery/replication/Client.java index 94e489d4724..26156ab802f 100644 --- a/java/demo/IceDiscovery/replication/Client.java +++ b/java/demo/IceDiscovery/replication/Client.java @@ -13,6 +13,7 @@ public class Client extends Ice.Application { class ShutdownHook extends Thread { + @Override public void run() { @@ -27,6 +28,7 @@ public class Client extends Ice.Application } } + @Override public int run(String[] args) { @@ -97,7 +99,8 @@ public class Client extends Ice.Application System.out.println(hello.getGreeting()); try { - Thread.currentThread().sleep(delay); + Thread.currentThread(); + Thread.sleep(delay); } catch(InterruptedException ex1) { diff --git a/java/demo/IceDiscovery/replication/HelloI.java b/java/demo/IceDiscovery/replication/HelloI.java index 83eff590b44..f973c3e4ba7 100644 --- a/java/demo/IceDiscovery/replication/HelloI.java +++ b/java/demo/IceDiscovery/replication/HelloI.java @@ -16,12 +16,14 @@ public class HelloI extends _HelloDisp _name = name; } + @Override public String getGreeting(Ice.Current current) { return _name + " says Hello World!"; } + @Override public void shutdown(Ice.Current current) { diff --git a/java/demo/IceDiscovery/replication/Server.java b/java/demo/IceDiscovery/replication/Server.java index 523921ba2b0..204487942b5 100644 --- a/java/demo/IceDiscovery/replication/Server.java +++ b/java/demo/IceDiscovery/replication/Server.java @@ -7,10 +7,11 @@ // // ********************************************************************** -import Demo.*; + public class Server extends Ice.Application { + @Override public int run(String[] args) { diff --git a/java/demo/IceGrid/icebox/Client.java b/java/demo/IceGrid/icebox/Client.java index c1d7287a14a..6752885cc33 100644 --- a/java/demo/IceGrid/icebox/Client.java +++ b/java/demo/IceGrid/icebox/Client.java @@ -11,6 +11,7 @@ import Demo.*; public class Client extends Ice.Application { + @Override public int run(String[] args) { diff --git a/java/demo/IceGrid/icebox/HelloI.java b/java/demo/IceGrid/icebox/HelloI.java index fa27d2b9778..612a7a4b2ca 100644 --- a/java/demo/IceGrid/icebox/HelloI.java +++ b/java/demo/IceGrid/icebox/HelloI.java @@ -16,6 +16,7 @@ public class HelloI extends _HelloDisp _serviceName = serviceName; } + @Override public void sayHello(Ice.Current current) { diff --git a/java/demo/IceGrid/icebox/HelloServiceI.java b/java/demo/IceGrid/icebox/HelloServiceI.java index 6b6191f3ec9..05fc38b17d1 100644 --- a/java/demo/IceGrid/icebox/HelloServiceI.java +++ b/java/demo/IceGrid/icebox/HelloServiceI.java @@ -9,6 +9,7 @@ public class HelloServiceI implements IceBox.Service { + @Override public void start(String name, Ice.Communicator communicator, String[] args) { @@ -19,6 +20,7 @@ public class HelloServiceI implements IceBox.Service _adapter.activate(); } + @Override public void stop() { diff --git a/java/demo/IceGrid/simple/Client.java b/java/demo/IceGrid/simple/Client.java index 26764921a85..81543af91e7 100644 --- a/java/demo/IceGrid/simple/Client.java +++ b/java/demo/IceGrid/simple/Client.java @@ -13,6 +13,7 @@ public class Client extends Ice.Application { class ShutdownHook extends Thread { + @Override public void run() { @@ -38,6 +39,7 @@ public class Client extends Ice.Application "?: help\n"); } + @Override public int run(String[] args) { diff --git a/java/demo/IceGrid/simple/HelloI.java b/java/demo/IceGrid/simple/HelloI.java index a3229d06d64..89b168d8676 100644 --- a/java/demo/IceGrid/simple/HelloI.java +++ b/java/demo/IceGrid/simple/HelloI.java @@ -16,12 +16,14 @@ public class HelloI extends _HelloDisp _name = name; } + @Override public void sayHello(Ice.Current current) { System.out.println(_name + " says Hello World!"); } + @Override public void shutdown(Ice.Current current) { diff --git a/java/demo/IceGrid/simple/Server.java b/java/demo/IceGrid/simple/Server.java index 2fccc0aac4e..a6192538037 100644 --- a/java/demo/IceGrid/simple/Server.java +++ b/java/demo/IceGrid/simple/Server.java @@ -9,6 +9,7 @@ public class Server extends Ice.Application { + @Override public int run(String[] args) { diff --git a/java/demo/IceStorm/clock/Publisher.java b/java/demo/IceStorm/clock/Publisher.java index 4a095ee0b80..217066a0179 100644 --- a/java/demo/IceStorm/clock/Publisher.java +++ b/java/demo/IceStorm/clock/Publisher.java @@ -17,6 +17,7 @@ public class Publisher extends Ice.Application System.out.println("Usage: " + appName() + " [--datagram|--twoway|--oneway] [topic]"); } + @Override public int run(String[] args) { @@ -122,7 +123,8 @@ public class Publisher extends Ice.Application try { - Thread.currentThread().sleep(1000); + Thread.currentThread(); + Thread.sleep(1000); } catch(java.lang.InterruptedException e) { diff --git a/java/demo/IceStorm/clock/Subscriber.java b/java/demo/IceStorm/clock/Subscriber.java index 2cdcb981188..c9aa36011d4 100644 --- a/java/demo/IceStorm/clock/Subscriber.java +++ b/java/demo/IceStorm/clock/Subscriber.java @@ -13,6 +13,7 @@ public class Subscriber extends Ice.Application { public class ClockI extends _ClockDisp { + @Override public void tick(String date, Ice.Current current) { @@ -27,6 +28,7 @@ public class Subscriber extends Ice.Application "[--retryCount count] [--id id] [topic]"); } + @Override public int run(String[] args) { diff --git a/java/demo/book/evictor_filesystem/Client.java b/java/demo/book/evictor_filesystem/Client.java index 34ced33acfb..93a48deb2b5 100644 --- a/java/demo/book/evictor_filesystem/Client.java +++ b/java/demo/book/evictor_filesystem/Client.java @@ -11,6 +11,7 @@ import Filesystem.*; public class Client extends Ice.Application { + @Override public int run(String[] args) { diff --git a/java/demo/book/evictor_filesystem/DirectoryI.java b/java/demo/book/evictor_filesystem/DirectoryI.java index 8017e2889cc..73074c8b5ec 100644 --- a/java/demo/book/evictor_filesystem/DirectoryI.java +++ b/java/demo/book/evictor_filesystem/DirectoryI.java @@ -18,6 +18,7 @@ public final class DirectoryI extends PersistentDirectory nodes = new java.util.HashMap<java.lang.String, NodeDesc>(); } + @Override public synchronized String name(Ice.Current current) { @@ -29,6 +30,7 @@ public final class DirectoryI extends PersistentDirectory return nodeName; } + @Override public void destroy(Ice.Current current) throws PermissionDenied @@ -58,6 +60,7 @@ public final class DirectoryI extends PersistentDirectory _evictor.remove(current.id); } + @Override public synchronized NodeDesc[] list(Ice.Current current) { @@ -68,14 +71,15 @@ public final class DirectoryI extends PersistentDirectory NodeDesc[] result = new NodeDesc[nodes.size()]; int i = 0; - java.util.Iterator p = nodes.values().iterator(); + java.util.Iterator<NodeDesc> p = nodes.values().iterator(); while(p.hasNext()) { - result[i++] = (NodeDesc)p.next(); + result[i++] = p.next(); } return result; } + @Override public synchronized NodeDesc find(String name, Ice.Current current) throws NoSuchName @@ -90,9 +94,10 @@ public final class DirectoryI extends PersistentDirectory throw new NoSuchName(name); } - return (NodeDesc)nodes.get(name); + return nodes.get(name); } + @Override public synchronized DirectoryPrx createDirectory(String name, Ice.Current current) throws NameInUse @@ -122,6 +127,7 @@ public final class DirectoryI extends PersistentDirectory return proxy; } + @Override public synchronized FilePrx createFile(String name, Ice.Current current) throws NameInUse @@ -151,6 +157,7 @@ public final class DirectoryI extends PersistentDirectory return proxy; } + @Override public synchronized void removeNode(String name, Ice.Current current) { diff --git a/java/demo/book/evictor_filesystem/FileI.java b/java/demo/book/evictor_filesystem/FileI.java index fd58c50f219..f8904d52490 100644 --- a/java/demo/book/evictor_filesystem/FileI.java +++ b/java/demo/book/evictor_filesystem/FileI.java @@ -17,6 +17,7 @@ public final class FileI extends PersistentFile _destroyed = false; } + @Override public synchronized String name(Ice.Current current) { @@ -28,6 +29,7 @@ public final class FileI extends PersistentFile return nodeName; } + @Override public void destroy(Ice.Current current) throws PermissionDenied @@ -48,6 +50,7 @@ public final class FileI extends PersistentFile _evictor.remove(current.id); } + @Override public synchronized String[] read(Ice.Current current) { @@ -56,9 +59,10 @@ public final class FileI extends PersistentFile throw new Ice.ObjectNotExistException(current.id, current.facet, current.operation); } - return (String[])text.clone(); + return text.clone(); } + @Override public synchronized void write(String[] text, Ice.Current current) throws GenericError diff --git a/java/demo/book/evictor_filesystem/Grammar.java b/java/demo/book/evictor_filesystem/Grammar.java index 183f21dfe53..16234c61ea5 100644 --- a/java/demo/book/evictor_filesystem/Grammar.java +++ b/java/demo/book/evictor_filesystem/Grammar.java @@ -119,7 +119,7 @@ class Grammar } else { - _parser.cd((String)s.get(0)); + _parser.cd(s.get(0)); } } else if(_token.type == Token.TOK_CAT) @@ -133,7 +133,7 @@ class Grammar { throw new ParseError("usage: cat FILE"); } - _parser.cat((String)s.get(0)); + _parser.cat(s.get(0)); } else if(_token.type == Token.TOK_WRITE) { diff --git a/java/demo/book/evictor_filesystem/NodeFactory.java b/java/demo/book/evictor_filesystem/NodeFactory.java index 66684a6ad2b..80669a9bde2 100644 --- a/java/demo/book/evictor_filesystem/NodeFactory.java +++ b/java/demo/book/evictor_filesystem/NodeFactory.java @@ -11,6 +11,7 @@ import Filesystem.*; public class NodeFactory implements Ice.ObjectFactory { + @Override public Ice.Object create(String type) { @@ -29,6 +30,7 @@ public class NodeFactory implements Ice.ObjectFactory } } + @Override public void destroy() { diff --git a/java/demo/book/evictor_filesystem/Server.java b/java/demo/book/evictor_filesystem/Server.java index c847e598ed1..93449bf215c 100644 --- a/java/demo/book/evictor_filesystem/Server.java +++ b/java/demo/book/evictor_filesystem/Server.java @@ -17,6 +17,7 @@ public class Server extends Ice.Application _envName = envName; } + @Override public int run(String[] args) { diff --git a/java/demo/book/lifecycle/Client.java b/java/demo/book/lifecycle/Client.java index 9ecd482c2bf..aac2733bc58 100644 --- a/java/demo/book/lifecycle/Client.java +++ b/java/demo/book/lifecycle/Client.java @@ -11,6 +11,7 @@ import Filesystem.*; public class Client extends Ice.Application { + @Override public int run(String[] args) { diff --git a/java/demo/book/lifecycle/FilesystemI/FileI.java b/java/demo/book/lifecycle/FilesystemI/FileI.java index 9331b022e8e..7912d4bc83e 100644 --- a/java/demo/book/lifecycle/FilesystemI/FileI.java +++ b/java/demo/book/lifecycle/FilesystemI/FileI.java @@ -11,7 +11,6 @@ package FilesystemI; import Ice.*; import Filesystem.*; -import FilesystemI.*; public class FileI extends _FileDisp implements NodeI { diff --git a/java/demo/book/lifecycle/Grammar.java b/java/demo/book/lifecycle/Grammar.java index 183f21dfe53..16234c61ea5 100644 --- a/java/demo/book/lifecycle/Grammar.java +++ b/java/demo/book/lifecycle/Grammar.java @@ -119,7 +119,7 @@ class Grammar } else { - _parser.cd((String)s.get(0)); + _parser.cd(s.get(0)); } } else if(_token.type == Token.TOK_CAT) @@ -133,7 +133,7 @@ class Grammar { throw new ParseError("usage: cat FILE"); } - _parser.cat((String)s.get(0)); + _parser.cat(s.get(0)); } else if(_token.type == Token.TOK_WRITE) { diff --git a/java/demo/book/lifecycle/Server.java b/java/demo/book/lifecycle/Server.java index 8650e581a91..2a5fe5d103a 100644 --- a/java/demo/book/lifecycle/Server.java +++ b/java/demo/book/lifecycle/Server.java @@ -11,6 +11,7 @@ import FilesystemI.*; class Server extends Ice.Application { + @Override public int run(String[] args) { @@ -18,7 +19,6 @@ class Server extends Ice.Application // Terminate cleanly on receipt of a signal. // shutdownOnInterrupt(); - Ice.Properties properties = communicator().getProperties(); // // Create an object adapter diff --git a/java/demo/book/map_filesystem/Client.java b/java/demo/book/map_filesystem/Client.java index 1eb032116bc..2309f6a3b23 100644 --- a/java/demo/book/map_filesystem/Client.java +++ b/java/demo/book/map_filesystem/Client.java @@ -11,6 +11,7 @@ import Filesystem.*; public class Client extends Ice.Application { + @Override public int run(String[] args) { diff --git a/java/demo/book/map_filesystem/DirectoryI.java b/java/demo/book/map_filesystem/DirectoryI.java index 22061d0c5fa..226814d5981 100644 --- a/java/demo/book/map_filesystem/DirectoryI.java +++ b/java/demo/book/map_filesystem/DirectoryI.java @@ -54,6 +54,7 @@ public class DirectoryI extends _DirectoryDisp } } + @Override public String name(Ice.Current c) { @@ -89,6 +90,7 @@ public class DirectoryI extends _DirectoryDisp } } + @Override public NodeDesc[] list(Ice.Current c) { @@ -130,6 +132,7 @@ public class DirectoryI extends _DirectoryDisp } } + @Override public NodeDesc find(String name, Ice.Current c) throws NoSuchName @@ -171,6 +174,7 @@ public class DirectoryI extends _DirectoryDisp } } + @Override public FilePrx createFile(String name, Ice.Current c) throws NameInUse @@ -238,6 +242,7 @@ public class DirectoryI extends _DirectoryDisp } } + @Override public DirectoryPrx createDirectory(String name, Ice.Current c) throws NameInUse @@ -304,6 +309,7 @@ public class DirectoryI extends _DirectoryDisp } } + @Override public void destroy(Ice.Current c) throws PermissionDenied diff --git a/java/demo/book/map_filesystem/FileI.java b/java/demo/book/map_filesystem/FileI.java index 4f0dc793cb8..33b8ece4e85 100644 --- a/java/demo/book/map_filesystem/FileI.java +++ b/java/demo/book/map_filesystem/FileI.java @@ -19,6 +19,7 @@ public class FileI extends _FileDisp _envName = envName; } + @Override public String name(Ice.Current c) { @@ -54,6 +55,7 @@ public class FileI extends _FileDisp } } + @Override public String[] read(Ice.Current c) { @@ -89,6 +91,7 @@ public class FileI extends _FileDisp } } + @Override public void write(String[] text, Ice.Current c) throws GenericError @@ -127,6 +130,7 @@ public class FileI extends _FileDisp } } + @Override public void destroy(Ice.Current c) throws PermissionDenied @@ -153,7 +157,7 @@ public class FileI extends _FileDisp throw new Ice.ObjectNotExistException(); } - DirectoryEntry dirEntry = (DirectoryEntry)dirDB.get(entry.parent); + DirectoryEntry dirEntry = dirDB.get(entry.parent); if(dirEntry == null) { halt(new Freeze.DatabaseException("consistency error: file without parent")); diff --git a/java/demo/book/map_filesystem/Grammar.java b/java/demo/book/map_filesystem/Grammar.java index 183f21dfe53..16234c61ea5 100644 --- a/java/demo/book/map_filesystem/Grammar.java +++ b/java/demo/book/map_filesystem/Grammar.java @@ -119,7 +119,7 @@ class Grammar } else { - _parser.cd((String)s.get(0)); + _parser.cd(s.get(0)); } } else if(_token.type == Token.TOK_CAT) @@ -133,7 +133,7 @@ class Grammar { throw new ParseError("usage: cat FILE"); } - _parser.cat((String)s.get(0)); + _parser.cat(s.get(0)); } else if(_token.type == Token.TOK_WRITE) { diff --git a/java/demo/book/map_filesystem/Server.java b/java/demo/book/map_filesystem/Server.java index 0f6537ec0ed..8ce2d5f586a 100644 --- a/java/demo/book/map_filesystem/Server.java +++ b/java/demo/book/map_filesystem/Server.java @@ -7,7 +7,6 @@ // // ********************************************************************** -import Filesystem.*; import FilesystemDB.*; public class Server extends Ice.Application @@ -18,6 +17,7 @@ public class Server extends Ice.Application _envName = envName; } + @Override public int run(String[] args) { @@ -35,9 +35,8 @@ public class Server extends Ice.Application // application for performance reasons. // connection = Freeze.Util.createConnection(communicator(), _envName); - IdentityFileEntryMap fileDB = new IdentityFileEntryMap(connection, FileI.filesDB(), true); - IdentityDirectoryEntryMap dirDB = new IdentityDirectoryEntryMap( - connection, DirectoryI.directoriesDB(), true); + new IdentityFileEntryMap(connection, FileI.filesDB(), true); + new IdentityDirectoryEntryMap(connection, DirectoryI.directoriesDB(), true); // // Add default servants for the file and directory. |