From 76d271e3e9a312e598e668bb68344d104bdd22da Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Tue, 11 Sep 2012 21:10:27 +0200 Subject: [PATCH] [#1472] Add a Settings.executeDebugging property, and move server-side Console logic to core - Removed unused LocalMessage --- .../jooq/tools/debug/impl/Communication.java | 9 --- .../jooq/tools/debug/impl/LocalMessage.java | 74 ------------------- 2 files changed, 83 deletions(-) delete mode 100644 jOOQ-console/src/main/java/org/jooq/tools/debug/impl/LocalMessage.java diff --git a/jOOQ-console/src/main/java/org/jooq/tools/debug/impl/Communication.java b/jOOQ-console/src/main/java/org/jooq/tools/debug/impl/Communication.java index dd16befe95..ec6799edea 100644 --- a/jOOQ-console/src/main/java/org/jooq/tools/debug/impl/Communication.java +++ b/jOOQ-console/src/main/java/org/jooq/tools/debug/impl/Communication.java @@ -110,10 +110,6 @@ abstract class Communication { */ public final S syncSend(final Message message) { checkOpen(); - if (message instanceof LocalMessage) { - LocalMessage localMessage = (LocalMessage) message; - return localMessage.runCommand(new MessageContext(this)); - } return messagingInterface.syncSend(message); } @@ -126,11 +122,6 @@ abstract class Communication { } else { checkOpen(); - if (message instanceof LocalMessage) { - LocalMessage localMessage = (LocalMessage) message; - localMessage.runCommand(new MessageContext(this)); - return; - } messagingInterface.asyncSend(message); } } diff --git a/jOOQ-console/src/main/java/org/jooq/tools/debug/impl/LocalMessage.java b/jOOQ-console/src/main/java/org/jooq/tools/debug/impl/LocalMessage.java deleted file mode 100644 index 53a114373e..0000000000 --- a/jOOQ-console/src/main/java/org/jooq/tools/debug/impl/LocalMessage.java +++ /dev/null @@ -1,74 +0,0 @@ -/** - * Copyright (c) 2009-2012, Lukas Eder, lukas.eder@gmail.com - * Christopher Deckers, chrriis@gmail.com - * All rights reserved. - * - * This software is licensed to you under the Apache License, Version 2.0 - * (the "License"); You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * . Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * . Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * . Neither the name "jOOQ" nor the names of its contributors may be - * used to endorse or promote products derived from this software without - * specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ -package org.jooq.tools.debug.impl; - -import java.io.Serializable; - -/** - * A local message is a special message that is not sent through the messaging - * interface. It is normally used to sequence a local command among remote - * commands. - * - * @author Christopher Deckers - */ -abstract class LocalMessage extends CommandMessage { - - /** - * Generated UID - */ - private static final long serialVersionUID = 5946023022822987264L; - - public LocalMessage() {} - - @Override - S runCommand(MessageContext context) { - try { - return super.runCommand(context); - } - catch (RuntimeException e) { - throw e; - } - catch (Exception e) { - e.printStackTrace(); - } - return null; - } - - @Override - public abstract S run(MessageContext context); - -}