From 379b5636bfe4919c83c185964ae552e442b8d28c Mon Sep 17 00:00:00 2001 From: tkellner Date: Mon, 16 May 2011 15:27:17 +0000 Subject: Spelling git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@934 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4 --- .../AbstractCommandSequenceBindingProcessor.java | 6 +- .../java/at/gv/egiz/mocca/id/SLCommandBrocker.java | 100 --------------------- .../java/at/gv/egiz/mocca/id/SLCommandBroker.java | 100 +++++++++++++++++++++ 3 files changed, 103 insertions(+), 103 deletions(-) delete mode 100644 BKUOnline/src/main/java/at/gv/egiz/mocca/id/SLCommandBrocker.java create mode 100644 BKUOnline/src/main/java/at/gv/egiz/mocca/id/SLCommandBroker.java (limited to 'BKUOnline/src/main/java') diff --git a/BKUOnline/src/main/java/at/gv/egiz/mocca/id/AbstractCommandSequenceBindingProcessor.java b/BKUOnline/src/main/java/at/gv/egiz/mocca/id/AbstractCommandSequenceBindingProcessor.java index 897ec227..be0bb842 100644 --- a/BKUOnline/src/main/java/at/gv/egiz/mocca/id/AbstractCommandSequenceBindingProcessor.java +++ b/BKUOnline/src/main/java/at/gv/egiz/mocca/id/AbstractCommandSequenceBindingProcessor.java @@ -50,7 +50,7 @@ public abstract class AbstractCommandSequenceBindingProcessor extends AbstractBi private Exception error; - private SLCommandBrocker commandBrocker = new SLCommandBrocker(); + private SLCommandBroker commandBroker = new SLCommandBroker(); /** * External processing? @@ -94,7 +94,7 @@ public abstract class AbstractCommandSequenceBindingProcessor extends AbstractBi SLCommandContext context = new SLCommandContext(getSTAL(), getUrlDereferencer(), locale); SLResult result = null; if (external) { - result = commandBrocker.execute(command, context, 3 * 60 * 1000); + result = commandBroker.execute(command, context, 3 * 60 * 1000); } else { if (command != null) { result = command.execute(context); @@ -117,7 +117,7 @@ public abstract class AbstractCommandSequenceBindingProcessor extends AbstractBi } public SLCommand setExternalResult(SLResult slResult) throws SLCommandException, InterruptedException { - return commandBrocker.nextCommand(slResult, 3 * 60 * 1000); + return commandBroker.nextCommand(slResult, 3 * 60 * 1000); } } diff --git a/BKUOnline/src/main/java/at/gv/egiz/mocca/id/SLCommandBrocker.java b/BKUOnline/src/main/java/at/gv/egiz/mocca/id/SLCommandBrocker.java deleted file mode 100644 index 2e46a220..00000000 --- a/BKUOnline/src/main/java/at/gv/egiz/mocca/id/SLCommandBrocker.java +++ /dev/null @@ -1,100 +0,0 @@ -/* -* Copyright 2009 Federal Chancellery Austria and -* Graz University of Technology -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -package at.gv.egiz.mocca.id; - -import at.gv.egiz.bku.slcommands.SLCommand; -import at.gv.egiz.bku.slcommands.SLCommandContext; -import at.gv.egiz.bku.slcommands.SLResult; -import at.gv.egiz.bku.slcommands.impl.ErrorResultImpl; -import at.gv.egiz.bku.slexceptions.SLCommandException; - -public class SLCommandBrocker { - - private Sync commandSync = new Sync(); - - private Sync resultSync = new Sync(); - - public SLResult execute(SLCommand command, SLCommandContext context, long timeout) throws InterruptedException { - try { - commandSync.put(command, timeout); - if (command != null) { - return resultSync.get(timeout); - } else { - return null; - } - } catch (SLCommandException e) { - return new ErrorResultImpl(e, context.getLocale()); - } - } - - public SLCommand nextCommand(SLResult result, long timeout) throws SLCommandException, InterruptedException { - if (result != null) { - resultSync.put(result, timeout); - } - return commandSync.get(timeout); - } - - public class Sync { - - private boolean available; - - private R r; - - public synchronized R get(long timeout) throws SLCommandException, InterruptedException { - - long t0 = System.currentTimeMillis(); - long elapsed = 0; - - while (!available) { - wait(timeout - elapsed); - elapsed = System.currentTimeMillis() - t0; - if (elapsed > timeout) { - notifyAll(); - throw new SLCommandException(6000); - } - } - - R r = this.r; - this.r = null; - available = false; - notifyAll(); - return r; - } - - public synchronized void put(R r, long timeout) throws SLCommandException, InterruptedException { - - long t0 = System.currentTimeMillis(); - long elapsed = 0; - - while (available) { - wait(timeout - elapsed); - elapsed = System.currentTimeMillis() - t0; - if (elapsed > timeout) { - notifyAll(); - throw new SLCommandException(6000); - } - } - - this.r = r; - available = true; - notifyAll(); - } - - } - -} diff --git a/BKUOnline/src/main/java/at/gv/egiz/mocca/id/SLCommandBroker.java b/BKUOnline/src/main/java/at/gv/egiz/mocca/id/SLCommandBroker.java new file mode 100644 index 00000000..4d4f0f67 --- /dev/null +++ b/BKUOnline/src/main/java/at/gv/egiz/mocca/id/SLCommandBroker.java @@ -0,0 +1,100 @@ +/* +* Copyright 2009 Federal Chancellery Austria and +* Graz University of Technology +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +package at.gv.egiz.mocca.id; + +import at.gv.egiz.bku.slcommands.SLCommand; +import at.gv.egiz.bku.slcommands.SLCommandContext; +import at.gv.egiz.bku.slcommands.SLResult; +import at.gv.egiz.bku.slcommands.impl.ErrorResultImpl; +import at.gv.egiz.bku.slexceptions.SLCommandException; + +public class SLCommandBroker { + + private Sync commandSync = new Sync(); + + private Sync resultSync = new Sync(); + + public SLResult execute(SLCommand command, SLCommandContext context, long timeout) throws InterruptedException { + try { + commandSync.put(command, timeout); + if (command != null) { + return resultSync.get(timeout); + } else { + return null; + } + } catch (SLCommandException e) { + return new ErrorResultImpl(e, context.getLocale()); + } + } + + public SLCommand nextCommand(SLResult result, long timeout) throws SLCommandException, InterruptedException { + if (result != null) { + resultSync.put(result, timeout); + } + return commandSync.get(timeout); + } + + public class Sync { + + private boolean available; + + private R r; + + public synchronized R get(long timeout) throws SLCommandException, InterruptedException { + + long t0 = System.currentTimeMillis(); + long elapsed = 0; + + while (!available) { + wait(timeout - elapsed); + elapsed = System.currentTimeMillis() - t0; + if (elapsed > timeout) { + notifyAll(); + throw new SLCommandException(6000); + } + } + + R r = this.r; + this.r = null; + available = false; + notifyAll(); + return r; + } + + public synchronized void put(R r, long timeout) throws SLCommandException, InterruptedException { + + long t0 = System.currentTimeMillis(); + long elapsed = 0; + + while (available) { + wait(timeout - elapsed); + elapsed = System.currentTimeMillis() - t0; + if (elapsed > timeout) { + notifyAll(); + throw new SLCommandException(6000); + } + } + + this.r = r; + available = true; + notifyAll(); + } + + } + +} -- cgit v1.2.3