From 73295e6c4508aff45a377874e83172d062d04efa Mon Sep 17 00:00:00 2001
From: Nelson Tavares de Sousa <stu103017@mail.uni-kiel.de>
Date: Wed, 26 Aug 2015 14:11:55 +0200
Subject: [PATCH] switched wrong javadocs

---
 .../stage/basic/distributor/Distributor.java  | 43 ++++++++++---------
 .../teetime/stage/basic/merger/Merger.java    | 42 +++++++++---------
 2 files changed, 43 insertions(+), 42 deletions(-)

diff --git a/src/main/java/teetime/stage/basic/distributor/Distributor.java b/src/main/java/teetime/stage/basic/distributor/Distributor.java
index 0185d3a0..64e175d0 100644
--- a/src/main/java/teetime/stage/basic/distributor/Distributor.java
+++ b/src/main/java/teetime/stage/basic/distributor/Distributor.java
@@ -23,35 +23,36 @@ import teetime.stage.basic.distributor.strategy.IDistributorStrategy;
 import teetime.stage.basic.distributor.strategy.RoundRobinStrategy2;
 
 /**
+ * New output ports can be created by calling {@link #getNewOutputPort()}.
  *
  * @stage.sketch
- * 
- * 				<pre>
- *   +---------------------------+
- *   |                           |
- * +---+                         |
- * |   | +-----------+           |
- * +---+             |           |
- *   |               |           |
- *                   |         +---+
- *   .      . . . ---+-------&gt; |   |
- *                   |         +---+
- *   |               |           |
- * +---+             |           |
- * |   | +-----------+           |
- * +---+                         |
- *   |                           |
- *   +---------------------------+
- *
  *
+ * 				<pre>
+ *     +----------------------------+
+ *     |                            |
+ *     |                          +---+
+ *     |           +------------&gt; |   |
+ *     |           |              +---+
+ *     |           |                |
+ *   +---+         |
+ *   |   | +-------+--- . . .       .
+ *   +---+         |
+ *     |           |                |
+ *     |           |              +---+
+ *     |           +------------&gt; |   |
+ *     |                          +---+
+ *     |                            |
+ *     +----------------------------+
  *               </pre>
  *
- * @author Christian Wulf
+ * @stage.output The incoming element will be passed to output ports, which are selected by a strategy.
+ *
+ * @author Christian Wulf, Nelson Tavares de Sousa
  *
  * @since 1.0
  *
- * @param T
- *            the type of the input port and the output ports
+ * @param <T>
+ *            the type of both the input and output ports
  */
 public class Distributor<T> extends AbstractConsumerStage<T> {
 
diff --git a/src/main/java/teetime/stage/basic/merger/Merger.java b/src/main/java/teetime/stage/basic/merger/Merger.java
index 746673f1..9f6ca96b 100644
--- a/src/main/java/teetime/stage/basic/merger/Merger.java
+++ b/src/main/java/teetime/stage/basic/merger/Merger.java
@@ -26,36 +26,36 @@ import teetime.stage.basic.merger.strategy.RoundRobinStrategy;
 /**
  *
  * This stage merges data from the input ports, by taking elements according to the chosen merge strategy and by putting them to the output port.
- * New output ports can be created by calling {@link #createOutputPort()}.
+ * New input ports can be created by calling {@link #getNewInputPort()}.
  *
  * @stage.sketch
  *
  * 				<pre>
- *     +----------------------------+
- *     |                            |
- *     |                          +---+
- *     |           +------------&gt; |   |
- *     |           |              +---+
- *     |           |                |
- *   +---+         |
- *   |   | +-------+--- . . .       .
- *   +---+         |
- *     |           |                |
- *     |           |              +---+
- *     |           +------------&gt; |   |
- *     |                          +---+
- *     |                            |
- *     +----------------------------+
- *               </pre>
+ *   +---------------------------+
+ *   |                           |
+ * +---+                         |
+ * |   | +-----------+           |
+ * +---+             |           |
+ *   |               |           |
+ *                   |         +---+
+ *   .      . . . ---+-------&gt; |   |
+ *                   |         +---+
+ *   |               |           |
+ * +---+             |           |
+ * |   | +-----------+           |
+ * +---+                         |
+ *   |                           |
+ *   +---------------------------+
+ *
  *
- * @stage.output The incoming element will be passed to output ports, which are selected by a strategy.
+ *               </pre>
  *
- * @author Christian Wulf, Nelson Tavares de Sousa
+ * @author Christian Wulf
  *
  * @since 1.0
  *
- * @param <T>
- *            the type of both the input and output ports
+ * @param T
+ *            the type of the input port and the output ports
  */
 public class Merger<T> extends AbstractStage {
 
-- 
GitLab