From cb56fbf0278a5849386f938414b0734da69aabdb Mon Sep 17 00:00:00 2001
From: Nelson Tavares de Sousa <stu103017@mail.uni-kiel.de>
Date: Mon, 27 Jul 2015 12:49:55 +0200
Subject: [PATCH] visibility changes and renameing
---
.../framework/AbstractRunnableStage.java | 6 +++---
.../framework/ConfigurationContext.java | 18 +++++++++---------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/main/java/teetime/framework/AbstractRunnableStage.java b/src/main/java/teetime/framework/AbstractRunnableStage.java
index b280d143..0bc84bd0 100644
--- a/src/main/java/teetime/framework/AbstractRunnableStage.java
+++ b/src/main/java/teetime/framework/AbstractRunnableStage.java
@@ -33,7 +33,7 @@ abstract class AbstractRunnableStage implements Runnable {
this.logger = LoggerFactory.getLogger(stage.getClass());
if (stage.getTerminationStrategy() != TerminationStrategy.BY_INTERRUPT) {
- stage.owningContext.getRuntimeService().getRunnableCounter().inc();
+ stage.owningContext.getThreadService().getRunnableCounter().inc();
}
}
@@ -50,7 +50,7 @@ abstract class AbstractRunnableStage implements Runnable {
} while (!stage.shouldBeTerminated());
} catch (TerminateException e) {
this.stage.terminate();
- stage.owningContext.getRuntimeService().onTerminate();
+ stage.owningContext.getThreadService().onTerminate();
throw e; // FIXME: Still needed?
} finally {
afterStageExecution();
@@ -64,7 +64,7 @@ abstract class AbstractRunnableStage implements Runnable {
}
} finally {
if (stage.getTerminationStrategy() != TerminationStrategy.BY_INTERRUPT) {
- stage.owningContext.getRuntimeService().getRunnableCounter().dec();
+ stage.owningContext.getThreadService().getRunnableCounter().dec();
}
}
diff --git a/src/main/java/teetime/framework/ConfigurationContext.java b/src/main/java/teetime/framework/ConfigurationContext.java
index 2e4e3ece..c55e3b22 100644
--- a/src/main/java/teetime/framework/ConfigurationContext.java
+++ b/src/main/java/teetime/framework/ConfigurationContext.java
@@ -32,7 +32,7 @@ import teetime.framework.pipe.InstantiationPipe;
*/
final class ConfigurationContext {
- public static final ConfigurationContext EMPTY_CONTEXT = new ConfigurationContext(null);
+ static final ConfigurationContext EMPTY_CONTEXT = new ConfigurationContext(null);
private static final Logger LOGGER = LoggerFactory.getLogger(ConfigurationContext.class);
@@ -52,7 +52,7 @@ final class ConfigurationContext {
* @see AbstractCompositeStage#addThreadableStage(Stage)
*/
final void addThreadableStage(final Stage stage, final String threadName) {
- childFunction(stage);
+ addChildContext(stage);
threadService.addThreadableStage(stage, threadName);
}
@@ -69,13 +69,13 @@ final class ConfigurationContext {
LOGGER.warn("Overwriting existing pipe while connecting stages " +
sourcePort.getOwningStage().getId() + " and " + targetPort.getOwningStage().getId() + ".");
}
- childFunction(sourcePort.getOwningStage());
- childFunction(targetPort.getOwningStage());
+ addChildContext(sourcePort.getOwningStage());
+ addChildContext(targetPort.getOwningStage());
new InstantiationPipe(sourcePort, targetPort, capacity);
}
// FIXME: Rename method
- final void childFunction(final Stage stage) {
+ final void addChildContext(final Stage stage) {
if (!stage.owningContext.equals(EMPTY_CONTEXT)) {
if (stage.owningContext != this) { // Performance
childs.add(stage.owningContext);
@@ -98,7 +98,7 @@ final class ConfigurationContext {
}
private void mergeContexts(final ConfigurationContext child) {
- threadService.merge(child.getRuntimeService());
+ threadService.merge(child.getThreadService());
// Finally copy parent services
child.threadService = this.threadService;
@@ -116,12 +116,12 @@ final class ConfigurationContext {
this.threadService.onFinish();
}
- public ThreadService getRuntimeService() {
+ ThreadService getThreadService() {
return threadService;
}
- public void setRuntimeService(final ThreadService runtimeService) {
- this.threadService = runtimeService;
+ void setThreadService(final ThreadService threadService) {
+ this.threadService = threadService;
}
}
--
GitLab