diff --git a/WoPeD-AProMoRe/src/main/java/org/woped/apromore/ApromorePasswordSecurity.java b/WoPeD-AProMoRe/src/main/java/org/woped/apromore/ApromorePasswordSecurity.java
index acaecec37..7b558d564 100644
--- a/WoPeD-AProMoRe/src/main/java/org/woped/apromore/ApromorePasswordSecurity.java
+++ b/WoPeD-AProMoRe/src/main/java/org/woped/apromore/ApromorePasswordSecurity.java
@@ -13,7 +13,9 @@
 import javax.crypto.NoSuchPaddingException;
 import javax.crypto.spec.SecretKeySpec;
 
-/** @author Sascha Schneider, Philip Allgaier */
+/**
+ * @author Sascha Schneider, Philip Allgaier
+ */
 public class ApromorePasswordSecurity {
 
   // Encoding
diff --git a/WoPeD-BPELExport/src/main/java/org/woped/bpel/datamodel/WhileTransition.java b/WoPeD-BPELExport/src/main/java/org/woped/bpel/datamodel/WhileTransition.java
index 15498958f..9d628cd6d 100644
--- a/WoPeD-BPELExport/src/main/java/org/woped/bpel/datamodel/WhileTransition.java
+++ b/WoPeD-BPELExport/src/main/java/org/woped/bpel/datamodel/WhileTransition.java
@@ -13,12 +13,16 @@
 import org.oasisOpen.docs.wsbpel.x20.process.executable.TWait;
 import org.oasisOpen.docs.wsbpel.x20.process.executable.TWhile;
 
-/** @author Frank Schüler */
+/**
+ * @author Frank Schüler
+ */
 public class WhileTransition extends TerminalElement<TWhile> {
 
   private AbstractElement<?> begin;
 
-  /** @param */
+  /**
+   * @param
+   */
   public WhileTransition(AbstractElement<?> Begin) {
     super(null);
     this.begin = Begin;
diff --git a/WoPeD-Core/src/main/java/org/apromore/manager/service_portal/ManagerPortalService.java b/WoPeD-Core/src/main/java/org/apromore/manager/service_portal/ManagerPortalService.java
index 0c4f90114..a22c5d85c 100644
--- a/WoPeD-Core/src/main/java/org/apromore/manager/service_portal/ManagerPortalService.java
+++ b/WoPeD-Core/src/main/java/org/apromore/manager/service_portal/ManagerPortalService.java
@@ -65,7 +65,9 @@ public ManagerPortalService(URL wsdlLocation, QName serviceName, WebServiceFeatu
     super(wsdlLocation, serviceName);
   }
 
-  /** @return returns ManagerPortalPortType */
+  /**
+   * @return returns ManagerPortalPortType
+   */
   @WebEndpoint(name = "ManagerPortal")
   public ManagerPortalPortType getManagerPortal() {
     return super.getPort(
diff --git a/WoPeD-Core/src/main/java/org/woped/core/config/DefaultStaticConfiguration.java b/WoPeD-Core/src/main/java/org/woped/core/config/DefaultStaticConfiguration.java
index 201042ee0..8155a6d99 100644
--- a/WoPeD-Core/src/main/java/org/woped/core/config/DefaultStaticConfiguration.java
+++ b/WoPeD-Core/src/main/java/org/woped/core/config/DefaultStaticConfiguration.java
@@ -630,42 +630,58 @@ public String getUserdir() {
     return this.userdir;
   }
 
-  /** @see org.woped.config.IGeneralConfiguration#getPortColor() */
+  /**
+   * @see org.woped.config.IGeneralConfiguration#getPortColor()
+   */
   public Color getPortColor() {
     return portColor;
   }
 
-  /** @see org.woped.config.IGeneralConfiguration#setPortColor(java.awt.Color) */
+  /**
+   * @see org.woped.config.IGeneralConfiguration#setPortColor(java.awt.Color)
+   */
   public void setPortColor(Color color) {
     portColor = color;
   }
 
-  /** @see org.woped.config.IGeneralConfiguration#getLocaleLanguage() */
+  /**
+   * @see org.woped.config.IGeneralConfiguration#getLocaleLanguage()
+   */
   public String getLocaleLanguage() {
     return language;
   }
 
-  /** @see org.woped.config.IGeneralConfiguration#setLocaleLanguage(java.lang.String) */
+  /**
+   * @see org.woped.config.IGeneralConfiguration#setLocaleLanguage(java.lang.String)
+   */
   public void setLocaleLanguage(String language) {
     this.language = language;
   }
 
-  /** @see org.woped.config.IGeneralConfiguration#getLocaleCountry() */
+  /**
+   * @see org.woped.config.IGeneralConfiguration#getLocaleCountry()
+   */
   public String getLocaleCountry() {
     return country;
   }
 
-  /** @see org.woped.config.IGeneralConfiguration#setLocaleCountry(java.lang.String) */
+  /**
+   * @see org.woped.config.IGeneralConfiguration#setLocaleCountry(java.lang.String)
+   */
   public void setLocaleCountry(String country) {
     this.country = country;
   }
 
-  /** @see org.woped.config.IGeneralConfiguration#getLocaleVariant() */
+  /**
+   * @see org.woped.config.IGeneralConfiguration#getLocaleVariant()
+   */
   public String getLocaleVariant() {
     return variant;
   }
 
-  /** @see org.woped.config.IGeneralConfiguration#setLocaleVariant(java.lang.String) */
+  /**
+   * @see org.woped.config.IGeneralConfiguration#setLocaleVariant(java.lang.String)
+   */
   public void setLocaleVariant(String variant) {
     this.variant = variant;
   }
diff --git a/WoPeD-Core/src/main/java/org/woped/core/controller/AbstractApplicationMediator.java b/WoPeD-Core/src/main/java/org/woped/core/controller/AbstractApplicationMediator.java
index 60c3cfeee..5924e3fbc 100644
--- a/WoPeD-Core/src/main/java/org/woped/core/controller/AbstractApplicationMediator.java
+++ b/WoPeD-Core/src/main/java/org/woped/core/controller/AbstractApplicationMediator.java
@@ -39,7 +39,9 @@
 import org.woped.core.utilities.LoggerManager;
 import org.woped.core.utilities.Platform;
 
-/** @author <a href="mailto:slandes@kybeidos.de">Simon Landes </a> <br> */
+/**
+ * @author <a href="mailto:slandes@kybeidos.de">Simon Landes </a> <br>
+ */
 public abstract class AbstractApplicationMediator implements IViewListener {
   private HashMap<String, IViewController> viewControllerMap = null;
   private VEPController vepController = null;
diff --git a/WoPeD-Core/src/main/java/org/woped/core/controller/AbstractEventProcessor.java b/WoPeD-Core/src/main/java/org/woped/core/controller/AbstractEventProcessor.java
index 6d891962c..5559e81b5 100644
--- a/WoPeD-Core/src/main/java/org/woped/core/controller/AbstractEventProcessor.java
+++ b/WoPeD-Core/src/main/java/org/woped/core/controller/AbstractEventProcessor.java
@@ -12,7 +12,9 @@ public AbstractEventProcessor(AbstractApplicationMediator mediator) {
     this.mediator = mediator;
   }
 
-  /** @return */
+  /**
+   * @return
+   */
   public AbstractApplicationMediator getMediator() {
     return mediator;
   }
diff --git a/WoPeD-Core/src/main/java/org/woped/core/controller/AbstractGraph.java b/WoPeD-Core/src/main/java/org/woped/core/controller/AbstractGraph.java
index 93a9b344d..95174b8b6 100644
--- a/WoPeD-Core/src/main/java/org/woped/core/controller/AbstractGraph.java
+++ b/WoPeD-Core/src/main/java/org/woped/core/controller/AbstractGraph.java
@@ -314,14 +314,18 @@ public Vector<Object> getAllCellsForLocation(double x, double y) {
     return allCells;
   }
 
-  /** @see org.jgraph.jgraph.startEditingAtCell */
+  /**
+   * @see org.jgraph.jgraph.startEditingAtCell
+   */
   @Override
   public void startEditingAtCell(Object cell) {
     super.startEditingAtCell(cell);
     lastEdited = cell;
   }
 
-  /** @return the last edited cell of the graph */
+  /**
+   * @return the last edited cell of the graph
+   */
   public NameModel getLastEdited() {
     if (lastEdited != null) {
       if (lastEdited.getClass() == NameModel.class) {
diff --git a/WoPeD-Core/src/main/java/org/woped/core/controller/LayoutCache.java b/WoPeD-Core/src/main/java/org/woped/core/controller/LayoutCache.java
index dc695e408..532184df7 100644
--- a/WoPeD-Core/src/main/java/org/woped/core/controller/LayoutCache.java
+++ b/WoPeD-Core/src/main/java/org/woped/core/controller/LayoutCache.java
@@ -29,7 +29,9 @@
 import org.woped.core.Constants;
 import org.woped.core.utilities.LoggerManager;
 
-/** @author Thomas Pohl TODO: DOCUMENTATION (xraven) */
+/**
+ * @author Thomas Pohl TODO: DOCUMENTATION (xraven)
+ */
 /**
  * @author <a href="mailto:slandes@kybeidos.de">Simon Landes </a> <br>
  *     <br>
diff --git a/WoPeD-Core/src/main/java/org/woped/core/controller/ViewEvent.java b/WoPeD-Core/src/main/java/org/woped/core/controller/ViewEvent.java
index 1e5906b6b..5fdb93674 100644
--- a/WoPeD-Core/src/main/java/org/woped/core/controller/ViewEvent.java
+++ b/WoPeD-Core/src/main/java/org/woped/core/controller/ViewEvent.java
@@ -22,7 +22,9 @@
  */
 package org.woped.core.controller;
 
-/** @author <a href="mailto:slandes@kybeidos.de">Simon Landes </a> <br> */
+/**
+ * @author <a href="mailto:slandes@kybeidos.de">Simon Landes </a> <br>
+ */
 @SuppressWarnings("serial")
 public class ViewEvent extends AbstractViewEvent {
   public static final int VIEWEVENTTYPE_GUI = 3;
diff --git a/WoPeD-Core/src/main/java/org/woped/core/model/ArcModel.java b/WoPeD-Core/src/main/java/org/woped/core/model/ArcModel.java
index 75a6b2bdd..aac5fc78a 100644
--- a/WoPeD-Core/src/main/java/org/woped/core/model/ArcModel.java
+++ b/WoPeD-Core/src/main/java/org/woped/core/model/ArcModel.java
@@ -359,7 +359,9 @@ public void setPoints(Point2D[] points) {
     }
   }
 
-  /** @param l */
+  /**
+   * @param l
+   */
   public void removePoint(Point2D l) {
     int pos = getPointPosition(l, 10);
     AttributeMap map = getAttributes();
diff --git a/WoPeD-Core/src/main/java/org/woped/core/model/ModelElementContainer.java b/WoPeD-Core/src/main/java/org/woped/core/model/ModelElementContainer.java
index f868f466c..b1826c2bd 100644
--- a/WoPeD-Core/src/main/java/org/woped/core/model/ModelElementContainer.java
+++ b/WoPeD-Core/src/main/java/org/woped/core/model/ModelElementContainer.java
@@ -577,17 +577,23 @@ public int compare(PlaceModel o1, PlaceModel o2) {
 
   /* Bpel extension */
 
-  /** @return */
+  /**
+   * @return
+   */
   public BpelVariableList getVariableList() {
     return this.variablesList;
   }
 
-  /** @return */
+  /**
+   * @return
+   */
   public PartnerlinkList getPartnerlinkList() {
     return this.partnerLinkList;
   }
 
-  /** @return */
+  /**
+   * @return
+   */
   public TPartnerLinks getTPartnerLinkList() {
     return this.partnerLinkList.getBpelCode();
   }
@@ -699,7 +705,9 @@ public boolean existPLName(String newname) {
     return false;
   }
 
-  /** @param arg */
+  /**
+   * @param arg
+   */
   public void addVariable(TVariable arg) {
     this.variablesList.addVariable(arg);
   }
@@ -729,22 +737,30 @@ public BpelVariable findBpelVariableByName(String Name) {
     return this.variablesList.findBpelVaraibleByName(Name);
   }
 
-  /** @return */
+  /**
+   * @return
+   */
   public String[] getBpelVariableNameList() {
     return this.variablesList.getVariableNameArray();
   }
 
-  /** @return */
+  /**
+   * @return
+   */
   public HashSet<BpelVariable> getBpelVariableList() {
     return this.variablesList.getBpelVariableList();
   }
 
-  /** @Param: Name, URL */
+  /**
+   * @Param: Name, URL
+   */
   public void addUddiVariable(String name, String url) {
     this.uddiVariableList.addVariable(name, url);
   }
 
-  /** @return */
+  /**
+   * @return
+   */
   public String[] getUddiVariableNameList() {
     return this.uddiVariableList.getVariableNameArray();
   }
diff --git a/WoPeD-Core/src/main/java/org/woped/core/model/PetriNetModelProcessor.java b/WoPeD-Core/src/main/java/org/woped/core/model/PetriNetModelProcessor.java
index 4596a5a96..87f4655fb 100644
--- a/WoPeD-Core/src/main/java/org/woped/core/model/PetriNetModelProcessor.java
+++ b/WoPeD-Core/src/main/java/org/woped/core/model/PetriNetModelProcessor.java
@@ -429,17 +429,23 @@ public Vector<String> getResourceClassesResourceIsAssignedTo(String resourceId)
     return assignedVector;
   }
 
-  /** @return */
+  /**
+   * @return
+   */
   public Dimension getNetWindowSize() {
     return netWindowSize;
   }
 
-  /** @param dimension */
+  /**
+   * @param dimension
+   */
   public void setNetWindowSize(Dimension dimension) {
     netWindowSize = dimension;
   }
 
-  /** @return */
+  /**
+   * @return
+   */
   public String getType() {
     return type;
   }
@@ -565,7 +571,9 @@ public void addUnknownToolSpecs(Object unknownToolSpecs) {
     getUnknownToolSpecs().add(unknownToolSpecs);
   }
 
-  /** @return Returns the organizationUnits. */
+  /**
+   * @return Returns the organizationUnits.
+   */
   public Vector<ResourceClassModel> getOrganizationUnits() {
     if (organizationUnits == null) {
       organizationUnits = new Vector<ResourceClassModel>();
@@ -573,12 +581,16 @@ public Vector<ResourceClassModel> getOrganizationUnits() {
     return organizationUnits;
   }
 
-  /** @param organizationUnits The organizationUnits to set. */
+  /**
+   * @param organizationUnits The organizationUnits to set.
+   */
   public void setOrganizationUnits(Vector<ResourceClassModel> organizationUnits) {
     this.organizationUnits = organizationUnits;
   }
 
-  /** @return Returns the resourceMap. */
+  /**
+   * @return Returns the resourceMap.
+   */
   public HashMap<String, Vector<String>> getResourceMapping() {
     if (resourceMapping == null) {
       resourceMapping = new HashMap<String, Vector<String>>();
@@ -590,7 +602,9 @@ public void setResourceMapping(HashMap<String, Vector<String>> resourceMapping)
     this.resourceMapping = resourceMapping;
   }
 
-  /** @return Returns the roles. */
+  /**
+   * @return Returns the roles.
+   */
   public Vector<ResourceClassModel> getRoles() {
     if (roles == null) {
       roles = new Vector<ResourceClassModel>();
@@ -598,12 +612,16 @@ public Vector<ResourceClassModel> getRoles() {
     return roles;
   }
 
-  /** @param roles The roles to set. */
+  /**
+   * @param roles The roles to set.
+   */
   public void setRoles(Vector<ResourceClassModel> roles) {
     this.roles = roles;
   }
 
-  /** @return Returns the resources. */
+  /**
+   * @return Returns the resources.
+   */
   public Vector<ResourceModel> getResources() {
     if (resources == null) {
       resources = new Vector<ResourceModel>();
@@ -615,7 +633,9 @@ public void setResources(Vector<ResourceModel> resources) {
     this.resources = resources;
   }
 
-  /** @return Returns the simulations. */
+  /**
+   * @return Returns the simulations.
+   */
   public Vector<SimulationModel> getSimulations() {
     if (simulations == null) {
       simulations = new Vector<SimulationModel>();
diff --git a/WoPeD-Core/src/main/java/org/woped/core/model/bpel/BpelVariable.java b/WoPeD-Core/src/main/java/org/woped/core/model/bpel/BpelVariable.java
index df33532df..87727e488 100644
--- a/WoPeD-Core/src/main/java/org/woped/core/model/bpel/BpelVariable.java
+++ b/WoPeD-Core/src/main/java/org/woped/core/model/bpel/BpelVariable.java
@@ -34,13 +34,17 @@ public BpelVariable(String name, String namespace, String type) {
     this._data.setMessageType(new QName(namespace, type));
   }
 
-  /** @param arg */
+  /**
+   * @param arg
+   */
   public BpelVariable(TVariable arg) {
     this();
     this._data.set(arg);
   }
 
-  /** @return */
+  /**
+   * @return
+   */
   private TVariable genTVariable() {
     return TVariable.Factory.newInstance();
   }
@@ -93,22 +97,30 @@ public static String[] getTypes() {
     return list;
   }
 
-  /** @return */
+  /**
+   * @return
+   */
   public String getName() {
     return this._data.getName();
   }
 
-  /** @return */
+  /**
+   * @return
+   */
   public String getType() {
     return this._data.getMessageType().getLocalPart();
   }
 
-  /** @return */
+  /**
+   * @return
+   */
   public String toString() {
     return this.getName();
   }
 
-  /** @return */
+  /**
+   * @return
+   */
   public boolean equals(Object obj) {
     if (!BpelVariable.class.isInstance(obj)) return false;
     if (this.getName().compareToIgnoreCase(((BpelVariable) obj).getName()) != 0) return false;
@@ -124,7 +136,9 @@ public boolean equalByName(String Name) {
     return false;
   }
 
-  /** @return */
+  /**
+   * @return
+   */
   public TVariable getBpelCode() {
     return this._data;
   }
diff --git a/WoPeD-Core/src/main/java/org/woped/core/model/bpel/BpelVariableList.java b/WoPeD-Core/src/main/java/org/woped/core/model/bpel/BpelVariableList.java
index fd2aba186..a48feb9a3 100644
--- a/WoPeD-Core/src/main/java/org/woped/core/model/bpel/BpelVariableList.java
+++ b/WoPeD-Core/src/main/java/org/woped/core/model/bpel/BpelVariableList.java
@@ -51,12 +51,16 @@ public String[] getVariableNameArray() {
     return list;
   }
 
-  /** @return */
+  /**
+   * @return
+   */
   public HashSet<BpelVariable> getBpelVariableList() {
     return this._list;
   }
 
-  /** @return */
+  /**
+   * @return
+   */
   public HashMap<String, String> getListOfVariablesWithType() {
     HashMap<String, String> list = new HashMap<String, String>();
     Iterator<BpelVariable> iter = this._list.iterator();
@@ -67,7 +71,9 @@ public HashMap<String, String> getListOfVariablesWithType() {
     return list;
   }
 
-  /** @return */
+  /**
+   * @return
+   */
   public TVariables getBpelCode() {
     TVariables list = this.genVariableList();
     Iterator<BpelVariable> iter = this._list.iterator();
@@ -77,7 +83,9 @@ public TVariables getBpelCode() {
     return list;
   }
 
-  /** @param arg */
+  /**
+   * @param arg
+   */
   public void removeVariable(TVariable arg) {
     // TODO noch schreiben
   }
diff --git a/WoPeD-Core/src/main/java/org/woped/core/model/bpel/Partnerlink.java b/WoPeD-Core/src/main/java/org/woped/core/model/bpel/Partnerlink.java
index f053a7d99..4baac362b 100644
--- a/WoPeD-Core/src/main/java/org/woped/core/model/bpel/Partnerlink.java
+++ b/WoPeD-Core/src/main/java/org/woped/core/model/bpel/Partnerlink.java
@@ -111,27 +111,37 @@ public String getMyRole() {
     return this.partnerLink.getMyRole();
   }
 
-  /** @param URL */
+  /**
+   * @param URL
+   */
   public void setWsdlUrl(String URL) {
     this.wsdlurl = URL;
   }
 
-  /** @return */
+  /**
+   * @return
+   */
   public String getWsdlUrl() {
     return this.wsdlurl;
   }
 
-  /** @return */
+  /**
+   * @return
+   */
   public TPartnerLink getTPartnerlink() {
     return this.partnerLink;
   }
 
-  /** @return String */
+  /**
+   * @return String
+   */
   public String toString() {
     return this.partnerLink.getName();
   }
 
-  /** @return */
+  /**
+   * @return
+   */
   public boolean equals(Object obj) {
     if (!Partnerlink.class.isInstance(obj)) return false;
     if (this.toString().compareToIgnoreCase(((Partnerlink) obj).toString()) != 0) return false;
diff --git a/WoPeD-Core/src/main/java/org/woped/core/model/bpel/PartnerlinkList.java b/WoPeD-Core/src/main/java/org/woped/core/model/bpel/PartnerlinkList.java
index 0b5b48a39..19302b4a6 100644
--- a/WoPeD-Core/src/main/java/org/woped/core/model/bpel/PartnerlinkList.java
+++ b/WoPeD-Core/src/main/java/org/woped/core/model/bpel/PartnerlinkList.java
@@ -4,7 +4,9 @@
 import java.util.Iterator;
 import org.oasisOpen.docs.wsbpel.x20.process.executable.TPartnerLinks;
 
-/** @author Frank Schüler */
+/**
+ * @author Frank Schüler
+ */
 public class PartnerlinkList {
 
   private HashSet<Partnerlink> _list;
@@ -76,7 +78,9 @@ public void addPartnerLinkWithoutMyRole(
     this._list.add(p);
   }
 
-  /** @return */
+  /**
+   * @return
+   */
   public String[] getPartnerlinkNameArray() {
     String[] list = new String[this._list.size()];
     Iterator<Partnerlink> iter = this._list.iterator();
@@ -88,12 +92,16 @@ public String[] getPartnerlinkNameArray() {
     return list;
   }
 
-  /** @return */
+  /**
+   * @return
+   */
   private TPartnerLinks genPartnerLinks() {
     return TPartnerLinks.Factory.newInstance();
   }
 
-  /** @return */
+  /**
+   * @return
+   */
   public TPartnerLinks getBpelCode() {
     TPartnerLinks list = this.genPartnerLinks();
     Iterator<Partnerlink> iter = this._list.iterator();
@@ -112,7 +120,9 @@ public String[] getWsdlUrls() {
     return urls;
   }
 
-  /** @param Name */
+  /**
+   * @param Name
+   */
   public void removePartnerlinkByName(String Name) {
     // TODO fertigschreiben
   }
diff --git a/WoPeD-Core/src/main/java/org/woped/core/model/petrinet/PlaceModel.java b/WoPeD-Core/src/main/java/org/woped/core/model/petrinet/PlaceModel.java
index 2a3068d9b..abbdd2df3 100644
--- a/WoPeD-Core/src/main/java/org/woped/core/model/petrinet/PlaceModel.java
+++ b/WoPeD-Core/src/main/java/org/woped/core/model/petrinet/PlaceModel.java
@@ -39,7 +39,9 @@ public class PlaceModel extends AbstractPetriNetElementModel {
   private int m_token = 0;
   private int m_virtualToken = 0;
 
-  /** @param map the map containing the information to create the place */
+  /**
+   * @param map the map containing the information to create the place
+   */
   public PlaceModel(CreationMap map) {
     super(map);
     AttributeMap attributes = getAttributes();
diff --git a/WoPeD-Core/src/main/java/org/woped/core/model/petrinet/ResourceClassModel.java b/WoPeD-Core/src/main/java/org/woped/core/model/petrinet/ResourceClassModel.java
index 3092a87bc..7278148fa 100644
--- a/WoPeD-Core/src/main/java/org/woped/core/model/petrinet/ResourceClassModel.java
+++ b/WoPeD-Core/src/main/java/org/woped/core/model/petrinet/ResourceClassModel.java
@@ -4,7 +4,9 @@
 import java.util.ArrayList;
 import java.util.Iterator;
 
-/** @author waschtl */
+/**
+ * @author waschtl
+ */
 @SuppressWarnings("serial")
 public class ResourceClassModel implements Serializable {
   private String name = null;
@@ -19,7 +21,9 @@ public ResourceClassModel(String name, int type) {
     this.type = type;
   }
 
-  /** @return Returns the name. */
+  /**
+   * @return Returns the name.
+   */
   public String getName() {
     return name;
   }
@@ -51,17 +55,23 @@ public void removeSuperModel(ResourceClassModel model) {
     }
   }
 
-  /** @param name The name to set. */
+  /**
+   * @param name The name to set.
+   */
   public void setName(String name) {
     this.name = name;
   }
 
-  /** @return Returns the type. */
+  /**
+   * @return Returns the type.
+   */
   public int getType() {
     return type;
   }
 
-  /** @param type The type to set. */
+  /**
+   * @param type The type to set.
+   */
   public void setType(int type) {
     this.type = type;
   }
diff --git a/WoPeD-Core/src/main/java/org/woped/core/model/petrinet/ResourceModel.java b/WoPeD-Core/src/main/java/org/woped/core/model/petrinet/ResourceModel.java
index 9291fc58e..7086491c7 100644
--- a/WoPeD-Core/src/main/java/org/woped/core/model/petrinet/ResourceModel.java
+++ b/WoPeD-Core/src/main/java/org/woped/core/model/petrinet/ResourceModel.java
@@ -2,7 +2,9 @@
 
 import java.io.Serializable;
 
-/** @author waschtl */
+/**
+ * @author waschtl
+ */
 @SuppressWarnings("serial")
 public class ResourceModel implements Serializable {
   private String name = null;
@@ -11,12 +13,16 @@ public ResourceModel(String name) {
     this.name = name;
   }
 
-  /** @return Returns the name. */
+  /**
+   * @return Returns the name.
+   */
   public String getName() {
     return name;
   }
 
-  /** @param name The name to set. */
+  /**
+   * @param name The name to set.
+   */
   public void setName(String name) {
     this.name = name;
   }
diff --git a/WoPeD-Core/src/main/java/org/woped/core/model/petrinet/SimulationModel.java b/WoPeD-Core/src/main/java/org/woped/core/model/petrinet/SimulationModel.java
index 23fc8013f..779696929 100644
--- a/WoPeD-Core/src/main/java/org/woped/core/model/petrinet/SimulationModel.java
+++ b/WoPeD-Core/src/main/java/org/woped/core/model/petrinet/SimulationModel.java
@@ -32,17 +32,23 @@ public SimulationModel(
     occuredTransitions = HistoryVector;
   }
 
-  /** @return Returns the name. */
+  /**
+   * @return Returns the name.
+   */
   public String getName() {
     return name;
   }
 
-  /** @param name The name to set. */
+  /**
+   * @param name The name to set.
+   */
   public void setName(String name) {
     this.name = name;
   }
 
-  /** @return Returns the vector with the fired transitions */
+  /**
+   * @return Returns the vector with the fired transitions
+   */
   public Vector<TransitionModel> getOccuredTransitions() {
     return occuredTransitions;
   }
@@ -66,12 +72,16 @@ public String toString() {
     return getName();
   }
 
-  /** @return Returns the fingerprint of the petrinet the simulation was created with. */
+  /**
+   * @return Returns the fingerprint of the petrinet the simulation was created with.
+   */
   public String getFingerprint() {
     return fingerprint;
   }
 
-  /** @param fingerprint The fingerprint to set. */
+  /**
+   * @param fingerprint The fingerprint to set.
+   */
   public void setFingerprint(String fingerprint) {
     this.fingerprint = fingerprint;
   }
@@ -80,12 +90,16 @@ public String getId() {
     return id;
   }
 
-  /** @return Returns the date of creation. */
+  /**
+   * @return Returns the date of creation.
+   */
   public Date getSavedDate() {
     return savedDate;
   }
 
-  /** @param creationDate The date of creation to set. */
+  /**
+   * @param creationDate The date of creation to set.
+   */
   public void setSavedDate(Date savedDate) {
     this.savedDate = savedDate;
   }
diff --git a/WoPeD-Core/src/main/java/org/woped/core/model/petrinet/Toolspecific.java b/WoPeD-Core/src/main/java/org/woped/core/model/petrinet/Toolspecific.java
index 3eaf7679a..15eebb0e7 100644
--- a/WoPeD-Core/src/main/java/org/woped/core/model/petrinet/Toolspecific.java
+++ b/WoPeD-Core/src/main/java/org/woped/core/model/petrinet/Toolspecific.java
@@ -189,7 +189,9 @@ public void setSubprocess(boolean subprocess) {
     // setOperatorType(PetriNetModelElement.SUBP_TYPE);
   }
 
-  /** @return Returns the transResource. */
+  /**
+   * @return Returns the transResource.
+   */
   public TransitionResourceModel getTransResource() {
     return transResource;
   }
@@ -200,7 +202,9 @@ public void removeTransResource() {
     LoggerManager.debug(Constants.CORE_LOGGER, "ResourceModel deleted.");
   }
 
-  /** @param transResource The transResource to set. */
+  /**
+   * @param transResource The transResource to set.
+   */
   public TransitionResourceModel setTransResource(TransitionResourceModel transResource) {
     this.transResource = transResource;
     return transResource;
diff --git a/WoPeD-Core/src/main/java/org/woped/core/model/petrinet/TransitionResourceModel.java b/WoPeD-Core/src/main/java/org/woped/core/model/petrinet/TransitionResourceModel.java
index 145572b7c..62d4943a1 100644
--- a/WoPeD-Core/src/main/java/org/woped/core/model/petrinet/TransitionResourceModel.java
+++ b/WoPeD-Core/src/main/java/org/woped/core/model/petrinet/TransitionResourceModel.java
@@ -17,7 +17,9 @@
 import org.jgraph.graph.GraphConstants;
 import org.woped.core.model.CreationMap;
 
-/** @author waschtl */
+/**
+ * @author waschtl
+ */
 @SuppressWarnings("serial")
 public class TransitionResourceModel extends DefaultGraphCell {
   public static final int DEFAULT_WIDTH = 60;
@@ -82,22 +84,30 @@ public String getId() {
     return transResourceId;
   }
 
-  /** @return Returns the transOrgUnitName. */
+  /**
+   * @return Returns the transOrgUnitName.
+   */
   public String getTransOrgUnitName() {
     return transOrgUnitName;
   }
 
-  /** @param transOrgUnitName The transOrgUnitName to set. */
+  /**
+   * @param transOrgUnitName The transOrgUnitName to set.
+   */
   public void setTransOrgUnitName(String transOrgUnitName) {
     this.transOrgUnitName = transOrgUnitName;
   }
 
-  /** @return Returns the transRoleName. */
+  /**
+   * @return Returns the transRoleName.
+   */
   public String getTransRoleName() {
     return transRoleName;
   }
 
-  /** @param transRoleName The transRoleName to set. */
+  /**
+   * @param transRoleName The transRoleName to set.
+   */
   public void setTransRoleName(String transRoleName) {
     this.transRoleName = transRoleName;
   }
diff --git a/WoPeD-Core/src/main/java/org/woped/core/utilities/IntegerFilter.java b/WoPeD-Core/src/main/java/org/woped/core/utilities/IntegerFilter.java
index a3c209138..84224a765 100644
--- a/WoPeD-Core/src/main/java/org/woped/core/utilities/IntegerFilter.java
+++ b/WoPeD-Core/src/main/java/org/woped/core/utilities/IntegerFilter.java
@@ -5,7 +5,9 @@
 import java.awt.event.KeyEvent;
 import javax.swing.JTextField;
 
-/** @author Frank Schüler */
+/**
+ * @author Frank Schüler
+ */
 public class IntegerFilter implements IEvaluationFilter {
 
   private JTextField _source = null;
diff --git a/WoPeD-Core/src/main/java/org/woped/core/utilities/JTextFieldEvalution.java b/WoPeD-Core/src/main/java/org/woped/core/utilities/JTextFieldEvalution.java
index 7917d4fa1..9c058f750 100644
--- a/WoPeD-Core/src/main/java/org/woped/core/utilities/JTextFieldEvalution.java
+++ b/WoPeD-Core/src/main/java/org/woped/core/utilities/JTextFieldEvalution.java
@@ -30,7 +30,9 @@ public JTextFieldEvalution(
     this.setEvaluateByKeyTyped(EvaluateByKeyTyped);
   }
 
-  /** @param EvaluateByKeyPressed */
+  /**
+   * @param EvaluateByKeyPressed
+   */
   public void setEvaluateByKeyPressed(IEvaluationFilter EvaluateByKeyPressed) {
     if (EvaluateByKeyPressed != null) {
       this._evaluateByKeyPressed = EvaluateByKeyPressed;
@@ -38,7 +40,9 @@ public void setEvaluateByKeyPressed(IEvaluationFilter EvaluateByKeyPressed) {
     }
   }
 
-  /** @param EvaluateByKeyReleased */
+  /**
+   * @param EvaluateByKeyReleased
+   */
   public void setEvaluateByKeyReleased(IEvaluationFilter EvaluateByKeyReleased) {
     if (EvaluateByKeyReleased != null) {
       this._evaluateByKeyReleased = EvaluateByKeyReleased;
@@ -46,7 +50,9 @@ public void setEvaluateByKeyReleased(IEvaluationFilter EvaluateByKeyReleased) {
     }
   }
 
-  /** @param EvaluateByKeyTyped */
+  /**
+   * @param EvaluateByKeyTyped
+   */
   public void setEvaluateByKeyTyped(IEvaluationFilter EvaluateByKeyTyped) {
     if (EvaluateByKeyTyped != null) {
       this._evaluateByKeyTyped = EvaluateByKeyTyped;
@@ -87,13 +93,17 @@ public final void keyTyped(KeyEvent e) {
     this.doing(this._evaluateByKeyTyped, e);
   }
 
-  /** @param filter */
+  /**
+   * @param filter
+   */
   private final void doing(IEvaluationFilter filter, KeyEvent e) {
     if (this._acceptedInput) filter.doingByAccept(e);
     else filter.doingByFault(e);
   }
 
-  /** @return */
+  /**
+   * @return
+   */
   public final boolean isInputAccepted() {
     return this._acceptedInput;
   }
diff --git a/WoPeD-Core/src/main/java/org/woped/core/view/AbstractElementView.java b/WoPeD-Core/src/main/java/org/woped/core/view/AbstractElementView.java
index c500c3cf0..2d14d2860 100644
--- a/WoPeD-Core/src/main/java/org/woped/core/view/AbstractElementView.java
+++ b/WoPeD-Core/src/main/java/org/woped/core/view/AbstractElementView.java
@@ -47,7 +47,9 @@ public AbstractElementView(Object cell) {
     setAttributes(new AttributeMap());
   }
 
-  /** @see com.jgraph.graph.CellView#getEditor() */
+  /**
+   * @see com.jgraph.graph.CellView#getEditor()
+   */
   public GraphCellEditor getEditor() {
     return cellEditor;
   }
diff --git a/WoPeD-Editor/src/main/java/org/woped/editor/action/EditorViewEvent.java b/WoPeD-Editor/src/main/java/org/woped/editor/action/EditorViewEvent.java
index 2ad159a43..47b45f5ac 100644
--- a/WoPeD-Editor/src/main/java/org/woped/editor/action/EditorViewEvent.java
+++ b/WoPeD-Editor/src/main/java/org/woped/editor/action/EditorViewEvent.java
@@ -24,7 +24,9 @@
 
 import org.woped.core.controller.AbstractViewEvent;
 
-/** @author <a href="mailto:slandes@kybeidos.de">Simon Landes </a> <br> */
+/**
+ * @author <a href="mailto:slandes@kybeidos.de">Simon Landes </a> <br>
+ */
 @SuppressWarnings("serial")
 public class EditorViewEvent extends AbstractViewEvent {
 
diff --git a/WoPeD-Editor/src/main/java/org/woped/editor/controller/ArcPropertyEditor.java b/WoPeD-Editor/src/main/java/org/woped/editor/controller/ArcPropertyEditor.java
index 033fc17c2..3d3ffb956 100644
--- a/WoPeD-Editor/src/main/java/org/woped/editor/controller/ArcPropertyEditor.java
+++ b/WoPeD-Editor/src/main/java/org/woped/editor/controller/ArcPropertyEditor.java
@@ -331,7 +331,9 @@ private void apply() {
     getEditor().updateNet();
   }
 
-  /** @return Returns the editor. */
+  /**
+   * @return Returns the editor.
+   */
   public EditorVC getEditor() {
     return editor;
   }
diff --git a/WoPeD-Editor/src/main/java/org/woped/editor/controller/PetriNetResourceEditor.java b/WoPeD-Editor/src/main/java/org/woped/editor/controller/PetriNetResourceEditor.java
index f740f6421..83b903907 100644
--- a/WoPeD-Editor/src/main/java/org/woped/editor/controller/PetriNetResourceEditor.java
+++ b/WoPeD-Editor/src/main/java/org/woped/editor/controller/PetriNetResourceEditor.java
@@ -109,7 +109,9 @@
 import org.woped.editor.controller.vc.EditorVC;
 import org.woped.gui.translations.Messages;
 
-/** @author Tobias Rehnig, Stephanie Obergfell, Jenny Braun, Linda Linsenbolz */
+/**
+ * @author Tobias Rehnig, Stephanie Obergfell, Jenny Braun, Linda Linsenbolz
+ */
 @SuppressWarnings("serial")
 public class PetriNetResourceEditor extends JPanel {
 
diff --git a/WoPeD-Editor/src/main/java/org/woped/editor/controller/PlacePropertyEditor.java b/WoPeD-Editor/src/main/java/org/woped/editor/controller/PlacePropertyEditor.java
index c29bc8d91..54341387e 100644
--- a/WoPeD-Editor/src/main/java/org/woped/editor/controller/PlacePropertyEditor.java
+++ b/WoPeD-Editor/src/main/java/org/woped/editor/controller/PlacePropertyEditor.java
@@ -44,7 +44,9 @@
 import org.woped.gui.lookAndFeel.WopedButton;
 import org.woped.gui.translations.Messages;
 
-/** @author tfreytag */
+/**
+ * @author tfreytag
+ */
 @SuppressWarnings("serial")
 public class PlacePropertyEditor extends JDialog {
   // General
@@ -341,7 +343,9 @@ private void apply() {
    *
    * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
    */
-  /** @return Returns the editor. */
+  /**
+   * @return Returns the editor.
+   */
   public EditorVC getEditor() {
     return editor;
   }
diff --git a/WoPeD-Editor/src/main/java/org/woped/editor/controller/TransitionPropertyEditor.java b/WoPeD-Editor/src/main/java/org/woped/editor/controller/TransitionPropertyEditor.java
index 1e282192b..b26b34748 100644
--- a/WoPeD-Editor/src/main/java/org/woped/editor/controller/TransitionPropertyEditor.java
+++ b/WoPeD-Editor/src/main/java/org/woped/editor/controller/TransitionPropertyEditor.java
@@ -83,7 +83,9 @@
 import org.woped.gui.lookAndFeel.WopedButton;
 import org.woped.gui.translations.Messages;
 
-/** @author waschtl */
+/**
+ * @author waschtl
+ */
 @SuppressWarnings("serial")
 public class TransitionPropertyEditor extends JDialog implements ActionListener, IDialog {
 
@@ -1968,7 +1970,9 @@ public void actionPerformed(ActionEvent e) {
     }
   }
 
-  /** @return Returns the editor. */
+  /**
+   * @return Returns the editor.
+   */
   public EditorVC getEditor() {
     return editor;
   }
diff --git a/WoPeD-Editor/src/main/java/org/woped/editor/controller/bpel/Assign.java b/WoPeD-Editor/src/main/java/org/woped/editor/controller/bpel/Assign.java
index 8831aae92..29a06b912 100644
--- a/WoPeD-Editor/src/main/java/org/woped/editor/controller/bpel/Assign.java
+++ b/WoPeD-Editor/src/main/java/org/woped/editor/controller/bpel/Assign.java
@@ -3,9 +3,13 @@
 import org.oasisOpen.docs.wsbpel.x20.process.executable.TAssign;
 import org.oasisOpen.docs.wsbpel.x20.process.executable.TCopy;
 
-/** @author Alexander Roßwog, Frank Schüler (redesign) */
+/**
+ * @author Alexander Roßwog, Frank Schüler (redesign)
+ */
 public class Assign extends BaseActivity<TAssign> {
-  /** @param Name */
+  /**
+   * @param Name
+   */
   public Assign(String Name) {
     super(Name);
   }
@@ -20,7 +24,9 @@ public Assign(String Name, String FromVariable, String ToVariable) {
     this.fillAssign(FromVariable, ToVariable);
   }
 
-  /** @param Name */
+  /**
+   * @param Name
+   */
   protected final void genTActivity(String Name) {
     this.setActivity(TAssign.Factory.newInstance());
     this.getActivity().setName(Name);
@@ -43,7 +49,9 @@ public final void fillAssign(String FromVariable, String ToVariable) {
     }
   }
 
-  /** @param bip */
+  /**
+   * @param bip
+   */
   public BaseActivity<?> saveInformation(BPELadditionalPanel bip) {
     if (!BPELassignPanel.class.isInstance(bip)) return this;
     BPELassignPanel panel = (BPELassignPanel) bip;
@@ -51,7 +59,9 @@ public BaseActivity<?> saveInformation(BPELadditionalPanel bip) {
     return this;
   }
 
-  /** @param bip */
+  /**
+   * @param bip
+   */
   public void setInformationToPanel(BPELadditionalPanel bip) {
     if (!BPELassignPanel.class.isInstance(bip)) return;
     BPELassignPanel panel = (BPELassignPanel) bip;
@@ -59,12 +69,16 @@ public void setInformationToPanel(BPELadditionalPanel bip) {
     panel.setToVariable(this.getToVariable());
   }
 
-  /** @return */
+  /**
+   * @return
+   */
   public String getFromVariable() {
     return this.getActivity().getCopyArray(0).getFrom().getVariable();
   }
 
-  /** @return */
+  /**
+   * @return
+   */
   public String getToVariable() {
     return this.getActivity().getCopyArray(0).getTo().getVariable();
   }
diff --git a/WoPeD-Editor/src/main/java/org/woped/editor/controller/bpel/BPELadditionalPanel.java b/WoPeD-Editor/src/main/java/org/woped/editor/controller/bpel/BPELadditionalPanel.java
index b434d23aa..1f87379fd 100644
--- a/WoPeD-Editor/src/main/java/org/woped/editor/controller/bpel/BPELadditionalPanel.java
+++ b/WoPeD-Editor/src/main/java/org/woped/editor/controller/bpel/BPELadditionalPanel.java
@@ -812,7 +812,9 @@ public void actionPerformed(ActionEvent e) {
     errorPopup.setVisible(true);
   }
 
-  /** @param box */
+  /**
+   * @param box
+   */
   protected void fillVariableToComboBox(JComboBox box) {
     HashSet<BpelVariable> list = modelElementContainer.getVariableList().getBpelVariableList();
     box.removeAllItems();
diff --git a/WoPeD-Editor/src/main/java/org/woped/editor/controller/bpel/BPELassignPanel.java b/WoPeD-Editor/src/main/java/org/woped/editor/controller/bpel/BPELassignPanel.java
index b08f42264..3f2279ef2 100644
--- a/WoPeD-Editor/src/main/java/org/woped/editor/controller/bpel/BPELassignPanel.java
+++ b/WoPeD-Editor/src/main/java/org/woped/editor/controller/bpel/BPELassignPanel.java
@@ -114,7 +114,9 @@ public BPELassignPanel(TransitionPropertyEditor t_editor, TransitionModel transi
     add(getNewToVariableButton(), c);
   }
 
-  /** @return */
+  /**
+   * @return
+   */
   private JLabel getFromVariableLabel() {
     if (fromVariableLabel == null) {
       fromVariableLabel = new JLabel("Variable:");
@@ -123,7 +125,9 @@ private JLabel getFromVariableLabel() {
     return fromVariableLabel;
   }
 
-  /** @return */
+  /**
+   * @return
+   */
   private JComboBox getFromVariableComboBox() {
     if (fromVariableComboBox == null) {
       fromVariableComboBox = new JComboBox();
@@ -133,7 +137,9 @@ private JComboBox getFromVariableComboBox() {
     return fromVariableComboBox;
   }
 
-  /** @return */
+  /**
+   * @return
+   */
   private JButton getNewFromVariableButton() {
     if (newFromVariableButton == null) {
       newFromVariableButton = new JButton(NEW);
@@ -162,7 +168,9 @@ public void actionPerformed(ActionEvent e) {
     return newFromVariableButton;
   }
 
-  /** @return */
+  /**
+   * @return
+   */
   private JLabel getToVariableLabel() {
     if (toVariableLabel == null) {
       toVariableLabel = new JLabel("Variable:");
@@ -180,7 +188,9 @@ private JComboBox getToVariableComboBox() {
     return toVariableComboBox;
   }
 
-  /** @return */
+  /**
+   * @return
+   */
   private JButton getNewToVariableButton() {
     if (newToVariableButton == null) {
       newToVariableButton = new JButton(NEW);
@@ -220,13 +230,17 @@ public String getFromVariable() {
     return ((BpelVariable) fromVariableComboBox.getSelectedItem()).getName();
   }
 
-  /** @return */
+  /**
+   * @return
+   */
   public String getToVariable() {
     if (toVariableComboBox.getSelectedItem() == null) return "";
     return toVariableComboBox.getSelectedItem().toString();
   }
 
-  /** @return */
+  /**
+   * @return
+   */
   public boolean allFieldsFilled() {
     if (fromVariableComboBox.getSelectedIndex() == 0
         || toVariableComboBox.getSelectedIndex() == 0) {
@@ -246,7 +260,9 @@ public void setFromVariable(String variable) {
             .findBpelVariableByName(variable));
   }
 
-  /** @param variable */
+  /**
+   * @param variable
+   */
   public void setToVariable(String variable) {
     toVariableComboBox.addItem(
         this.t_editor
diff --git a/WoPeD-Editor/src/main/java/org/woped/editor/controller/bpel/BaseActivity.java b/WoPeD-Editor/src/main/java/org/woped/editor/controller/bpel/BaseActivity.java
index 0f18d9191..6bc5ef5c2 100644
--- a/WoPeD-Editor/src/main/java/org/woped/editor/controller/bpel/BaseActivity.java
+++ b/WoPeD-Editor/src/main/java/org/woped/editor/controller/bpel/BaseActivity.java
@@ -14,31 +14,45 @@ public BaseActivity(String Name) {
     this.genTActivity(Name);
   }
 
-  /** @return */
+  /**
+   * @return
+   */
   public final E getActivity() {
     return this._data;
   }
 
-  /** @param ta */
+  /**
+   * @param ta
+   */
   public final void setActivity(E ta) {
     this._data = ta;
   }
 
-  /** @return */
+  /**
+   * @return
+   */
   public final String getName() {
     return this._data.getName();
   }
 
-  /** @param Name */
+  /**
+   * @param Name
+   */
   protected abstract void genTActivity(String Name);
 
-  /** @param bip */
+  /**
+   * @param bip
+   */
   public abstract BaseActivity<?> saveInformation(BPELadditionalPanel bip);
 
-  /** @param bip */
+  /**
+   * @param bip
+   */
   public abstract void setInformationToPanel(BPELadditionalPanel bip);
 
-  /** @return String */
+  /**
+   * @return String
+   */
   public String toString() {
     return this.getName();
   }
diff --git a/WoPeD-Editor/src/main/java/org/woped/editor/controller/bpel/Empty.java b/WoPeD-Editor/src/main/java/org/woped/editor/controller/bpel/Empty.java
index 438193670..a056f1117 100644
--- a/WoPeD-Editor/src/main/java/org/woped/editor/controller/bpel/Empty.java
+++ b/WoPeD-Editor/src/main/java/org/woped/editor/controller/bpel/Empty.java
@@ -2,7 +2,9 @@
 
 import org.oasisOpen.docs.wsbpel.x20.process.executable.TEmpty;
 
-/** @author Alexander Roßwog, Frank Schüler */
+/**
+ * @author Alexander Roßwog, Frank Schüler
+ */
 public class Empty extends BaseActivity<TEmpty> {
 
   public Empty(String Name) {
diff --git a/WoPeD-Editor/src/main/java/org/woped/editor/controller/bpel/Invoke.java b/WoPeD-Editor/src/main/java/org/woped/editor/controller/bpel/Invoke.java
index d2ea79174..5c525898b 100644
--- a/WoPeD-Editor/src/main/java/org/woped/editor/controller/bpel/Invoke.java
+++ b/WoPeD-Editor/src/main/java/org/woped/editor/controller/bpel/Invoke.java
@@ -10,7 +10,9 @@
 
 public class Invoke extends BaseActivity<TInvoke> {
 
-  /** @param Name */
+  /**
+   * @param Name
+   */
   public Invoke(String Name) {
     super(Name);
   }
@@ -34,7 +36,9 @@ public Invoke(
     this.fillInvoke(PartnerLink, Operation, PortType, InVariable, OutVariable);
   }
 
-  /** @param Name */
+  /**
+   * @param Name
+   */
   protected final void genTActivity(String Name) {
     this.setActivity(TInvoke.Factory.newInstance());
     this.getActivity().setName(Name);
@@ -60,7 +64,9 @@ public final void fillInvoke(
     this.getActivity().setOutputVariable("" + OutVariable);
   }
 
-  /** @param bip */
+  /**
+   * @param bip
+   */
   public BaseActivity<?> saveInformation(BPELadditionalPanel bip) {
     if (!BPELinvokePanel.class.isInstance(bip)) return this;
     BPELinvokePanel panel = (BPELinvokePanel) bip;
@@ -73,7 +79,9 @@ public BaseActivity<?> saveInformation(BPELadditionalPanel bip) {
     return this;
   }
 
-  /** @param bip */
+  /**
+   * @param bip
+   */
   public void setInformationToPanel(BPELadditionalPanel bip) {
     if (!BPELinvokePanel.class.isInstance(bip)) return;
     BPELinvokePanel panel = (BPELinvokePanel) bip;
@@ -85,27 +93,37 @@ public void setInformationToPanel(BPELadditionalPanel bip) {
     panel.setOutVariable("" + this.getActivity().getOutputVariable());
   }
 
-  /** @return */
+  /**
+   * @return
+   */
   public String getPartnerLink() {
     return this.getActivity().getPartnerLink();
   }
 
-  /** @return */
+  /**
+   * @return
+   */
   public final String getOperation() {
     return this.getActivity().getOperation();
   }
 
-  /** @return */
+  /**
+   * @return
+   */
   public final String getPortType() {
     return this.getActivity().getPortType().getLocalPart();
   }
 
-  /** @return */
+  /**
+   * @return
+   */
   public final String getInputVariable() {
     return this.getActivity().getInputVariable();
   }
 
-  /** @return */
+  /**
+   * @return
+   */
   public final String getOutputVariable() {
     return this.getActivity().getOutputVariable();
   }
diff --git a/WoPeD-Editor/src/main/java/org/woped/editor/controller/bpel/NewUddiVariableDialog.java b/WoPeD-Editor/src/main/java/org/woped/editor/controller/bpel/NewUddiVariableDialog.java
index f9ef19504..5406255f4 100644
--- a/WoPeD-Editor/src/main/java/org/woped/editor/controller/bpel/NewUddiVariableDialog.java
+++ b/WoPeD-Editor/src/main/java/org/woped/editor/controller/bpel/NewUddiVariableDialog.java
@@ -120,12 +120,16 @@ public JPanel addVariableDialogButtons() {
     return dialogButtons;
   }
 
-  /** @param Name */
+  /**
+   * @param Name
+   */
   public void setVariableName(String Name) {
     this.VariableName.setText(Name);
   }
 
-  /** @return */
+  /**
+   * @return
+   */
   public String getVariableName() {
     return this.VariableName.getText();
   }
@@ -139,7 +143,9 @@ public void setVariableURL(String URL) {
     this.VariableURL.setText(URL);
   }
 
-  /** @return */
+  /**
+   * @return
+   */
   public String getVariableURL() {
     return this.VariableURL.getText();
   }
diff --git a/WoPeD-Editor/src/main/java/org/woped/editor/controller/bpel/NewVariableDialog.java b/WoPeD-Editor/src/main/java/org/woped/editor/controller/bpel/NewVariableDialog.java
index 1b7e06001..16f70b798 100644
--- a/WoPeD-Editor/src/main/java/org/woped/editor/controller/bpel/NewVariableDialog.java
+++ b/WoPeD-Editor/src/main/java/org/woped/editor/controller/bpel/NewVariableDialog.java
@@ -19,7 +19,9 @@
 import org.woped.editor.gui.PopUpDialog;
 import org.woped.gui.translations.Messages;
 
-/** @author Frank Sch���ler, Ester Landes */
+/**
+ * @author Frank Sch���ler, Ester Landes
+ */
 @SuppressWarnings("serial")
 public class NewVariableDialog extends JDialog {
 
diff --git a/WoPeD-Editor/src/main/java/org/woped/editor/controller/bpel/Receive.java b/WoPeD-Editor/src/main/java/org/woped/editor/controller/bpel/Receive.java
index 129af2c31..d3f138571 100644
--- a/WoPeD-Editor/src/main/java/org/woped/editor/controller/bpel/Receive.java
+++ b/WoPeD-Editor/src/main/java/org/woped/editor/controller/bpel/Receive.java
@@ -2,12 +2,20 @@
 
 import org.oasisOpen.docs.wsbpel.x20.process.executable.TReceive;
 
-/** @author Frank Schüler */
-/** @author Titus */
-/** @author Titus */
+/**
+ * @author Frank Schüler
+ */
+/**
+ * @author Titus
+ */
+/**
+ * @author Titus
+ */
 public class Receive extends BaseActivity<TReceive> {
 
-  /** @param Name */
+  /**
+   * @param Name
+   */
   public Receive(String Name) {
     super(Name);
   }
@@ -34,13 +42,17 @@ public final void fillReceive(String PartnerLink, String Operation, String Varia
     this.getActivity().setVariable(Variable);
   }
 
-  /** @param Name */
+  /**
+   * @param Name
+   */
   protected final void genTActivity(String Name) {
     this.setActivity(TReceive.Factory.newInstance());
     this.getActivity().setName(Name);
   }
 
-  /** @param bip */
+  /**
+   * @param bip
+   */
   public BaseActivity<?> saveInformation(BPELadditionalPanel bip) {
     if (!BPELreceivePanel.class.isInstance(bip)) return this;
     ;
@@ -49,7 +61,9 @@ public BaseActivity<?> saveInformation(BPELadditionalPanel bip) {
     return this;
   }
 
-  /** @param bip */
+  /**
+   * @param bip
+   */
   public void setInformationToPanel(BPELadditionalPanel bip) {
     if (!BPELreceivePanel.class.isInstance(bip)) return;
     BPELreceivePanel panel = (BPELreceivePanel) bip;
@@ -58,17 +72,23 @@ public void setInformationToPanel(BPELadditionalPanel bip) {
     panel.setVariable(this.getVariable());
   }
 
-  /** @return */
+  /**
+   * @return
+   */
   public final String getPartnerLink() {
     return this.getActivity().getPartnerLink();
   }
 
-  /** @return */
+  /**
+   * @return
+   */
   public final String getOperation() {
     return this.getActivity().getOperation();
   }
 
-  /** @return */
+  /**
+   * @return
+   */
   public final String getVariable() {
     return this.getActivity().getVariable();
   }
diff --git a/WoPeD-Editor/src/main/java/org/woped/editor/controller/bpel/Reply.java b/WoPeD-Editor/src/main/java/org/woped/editor/controller/bpel/Reply.java
index c3e5073fe..89e20a8c0 100644
--- a/WoPeD-Editor/src/main/java/org/woped/editor/controller/bpel/Reply.java
+++ b/WoPeD-Editor/src/main/java/org/woped/editor/controller/bpel/Reply.java
@@ -2,10 +2,14 @@
 
 import org.oasisOpen.docs.wsbpel.x20.process.executable.TReply;
 
-/** @author Frank Schüler, Alexander Roßwog */
+/**
+ * @author Frank Schüler, Alexander Roßwog
+ */
 public class Reply extends BaseActivity<TReply> {
 
-  /** @param Name */
+  /**
+   * @param Name
+   */
   public Reply(String Name) {
     super(Name);
   }
@@ -32,13 +36,17 @@ public final void fillReply(String PartnerLink, String Operation, String Variabl
     this.getActivity().setVariable(Variable);
   }
 
-  /** @param Name */
+  /**
+   * @param Name
+   */
   protected final void genTActivity(String Name) {
     this.setActivity(TReply.Factory.newInstance());
     this.getActivity().setName(Name);
   }
 
-  /** @param bip */
+  /**
+   * @param bip
+   */
   public BaseActivity<?> saveInformation(BPELadditionalPanel bip) {
     if (!BPELreplyPanel.class.isInstance(bip)) return this;
     BPELreplyPanel panel = (BPELreplyPanel) bip;
@@ -46,7 +54,9 @@ public BaseActivity<?> saveInformation(BPELadditionalPanel bip) {
     return this;
   }
 
-  /** @param bip */
+  /**
+   * @param bip
+   */
   public void setInformationToPanel(BPELadditionalPanel bip) {
     if (!BPELreplyPanel.class.isInstance(bip)) return;
     BPELreplyPanel panel = (BPELreplyPanel) bip;
@@ -55,17 +65,23 @@ public void setInformationToPanel(BPELadditionalPanel bip) {
     panel.setVariable(this.getVariable());
   }
 
-  /** @return */
+  /**
+   * @return
+   */
   public final String getPartnerLink() {
     return this.getActivity().getPartnerLink();
   }
 
-  /** @return */
+  /**
+   * @return
+   */
   public final String getOperation() {
     return this.getActivity().getOperation();
   }
 
-  /** @return */
+  /**
+   * @return
+   */
   public final String getVariable() {
     return this.getActivity().getVariable();
   }
diff --git a/WoPeD-Editor/src/main/java/org/woped/editor/controller/bpel/Wait.java b/WoPeD-Editor/src/main/java/org/woped/editor/controller/bpel/Wait.java
index 022a828fd..f6ef4449e 100644
--- a/WoPeD-Editor/src/main/java/org/woped/editor/controller/bpel/Wait.java
+++ b/WoPeD-Editor/src/main/java/org/woped/editor/controller/bpel/Wait.java
@@ -3,7 +3,9 @@
 import org.oasisOpen.docs.wsbpel.x20.process.executable.TWait;
 import org.woped.gui.translations.Messages;
 
-/** @author Frank Sch�ler, Alexander Ro�wog, Johannes H�ndel */
+/**
+ * @author Frank Sch�ler, Alexander Ro�wog, Johannes H�ndel
+ */
 public class Wait extends BaseActivity<TWait> {
 
   public static final int _NOWAITCONDITIONTYPE = -1;
@@ -19,7 +21,9 @@ public class Wait extends BaseActivity<TWait> {
 
   private int _waitconditiontype = -1;
 
-  /** @param Name */
+  /**
+   * @param Name
+   */
   public Wait(String Name) {
     super(Name);
   }
@@ -92,13 +96,17 @@ public final void fillWait(String Condition, int WaitConditionType) {
     }
   }
 
-  /** @param Name */
+  /**
+   * @param Name
+   */
   protected void genTActivity(String Name) {
     this.setActivity(TWait.Factory.newInstance());
     this.getActivity().setName(Name);
   }
 
-  /** @param bip */
+  /**
+   * @param bip
+   */
   public BaseActivity<?> saveInformation(BPELadditionalPanel bip) {
     if (!BPELwaitPanel.class.isInstance(bip)) return this;
     BPELwaitPanel panel = (BPELwaitPanel) bip;
@@ -115,7 +123,9 @@ public BaseActivity<?> saveInformation(BPELadditionalPanel bip) {
     return this;
   }
 
-  /** @param bip */
+  /**
+   * @param bip
+   */
   public void setInformationToPanel(BPELadditionalPanel bip) {
     if (!BPELwaitPanel.class.isInstance(bip)) return;
     // BPELwaitPanel panel = (BPELwaitPanel) bip;
@@ -125,32 +135,44 @@ public void setInformationToPanel(BPELadditionalPanel bip) {
     }
   }
 
-  /** @return */
+  /**
+   * @return
+   */
   public final boolean hasDeadLine() {
     return this._waitconditiontype == Wait._DEADLINE;
   }
 
-  /** @return */
+  /**
+   * @return
+   */
   public final boolean hasDuration() {
     return this._waitconditiontype == Wait._DURATION;
   }
 
-  /** @return */
+  /**
+   * @return
+   */
   public final boolean hasNoWaitConditionType() {
     return this._waitconditiontype == Wait._NOWAITCONDITIONTYPE;
   }
 
-  /** @return */
+  /**
+   * @return
+   */
   public final boolean hasCondition() {
     return this.hasDeadLine() | this.hasDuration();
   }
 
-  /** @return */
+  /**
+   * @return
+   */
   public final int getWaitConditionType() {
     return this._waitconditiontype;
   }
 
-  /** @return */
+  /**
+   * @return
+   */
   public final String getDeadLineCondition() {
     if (this.getActivity().isSetUntil()) {
       return this.getActivity().getUntil().getValue();
@@ -158,7 +180,9 @@ public final String getDeadLineCondition() {
     return "";
   }
 
-  /** @return */
+  /**
+   * @return
+   */
   public final String getDurationCondition() {
     if (this.getActivity().isSetFor()) {
       return this.getActivity().getFor().getValue();
diff --git a/WoPeD-Editor/src/main/java/org/woped/editor/controller/vc/ConfigVC.java b/WoPeD-Editor/src/main/java/org/woped/editor/controller/vc/ConfigVC.java
index 4424c817f..5faef1efc 100644
--- a/WoPeD-Editor/src/main/java/org/woped/editor/controller/vc/ConfigVC.java
+++ b/WoPeD-Editor/src/main/java/org/woped/editor/controller/vc/ConfigVC.java
@@ -218,7 +218,9 @@ public void importConf() {
    * .TreeSelectionEvent)
    */
   // ######################## GUI COMPONENTS ############################ */
-  /** @return Returns the splitPane. */
+  /**
+   * @return Returns the splitPane.
+   */
   private JTabbedPane getTabbedPane() {
     if (tabbedPane == null) {
       tabbedPane = new JTabbedPane();
diff --git a/WoPeD-Editor/src/main/java/org/woped/editor/controller/vc/EditorPanel.java b/WoPeD-Editor/src/main/java/org/woped/editor/controller/vc/EditorPanel.java
index 209b36db3..16f067be8 100644
--- a/WoPeD-Editor/src/main/java/org/woped/editor/controller/vc/EditorPanel.java
+++ b/WoPeD-Editor/src/main/java/org/woped/editor/controller/vc/EditorPanel.java
@@ -589,7 +589,9 @@ public void setSavedLayoutInfo(EditorLayoutInfo layoutInfo) {
     }
   }
 
-  /** @author Mathias Gruschinske, Stefan Hackenberg */
+  /**
+   * @author Mathias Gruschinske, Stefan Hackenberg
+   */
   public void hideMetricsBar() {
     if (metricsBarVisible) {
       remove(mainsplitPaneWithAnalysisBar);
@@ -857,7 +859,9 @@ public void setUnderstandColoring(NetColorScheme newScheme) {
     m_understandColoring = newScheme;
   }
 
-  /** @author Lennart Oess, Arthur Vetter, Jens Tessen, Heiko Herzog */
+  /**
+   * @author Lennart Oess, Arthur Vetter, Jens Tessen, Heiko Herzog
+   */
   public void autoRefreshAnalysisBar() {
     if (analysisBarVisible && autoRefresh != null && autoRefresh.isSelected()) {
       qualitativeAnalysisSideBar.refresh();
diff --git a/WoPeD-Editor/src/main/java/org/woped/editor/controller/vc/EditorVC.java b/WoPeD-Editor/src/main/java/org/woped/editor/controller/vc/EditorVC.java
index 64c52c883..1c18328c4 100644
--- a/WoPeD-Editor/src/main/java/org/woped/editor/controller/vc/EditorVC.java
+++ b/WoPeD-Editor/src/main/java/org/woped/editor/controller/vc/EditorVC.java
@@ -1518,7 +1518,9 @@ public void graphChanged(GraphModelEvent e) {
     }
   }
 
-  /** @see KeyListener#keyReleased(java.awt.event.KeyEvent) */
+  /**
+   * @see KeyListener#keyReleased(java.awt.event.KeyEvent)
+   */
   public void keyReleased(KeyEvent e) {
     // setKeyPressed(false);
     getGraph().setCursor(Cursor.getDefaultCursor());
@@ -1527,7 +1529,9 @@ public void keyReleased(KeyEvent e) {
     smartEditActive = true;
   }
 
-  /** @see KeyListener#keyTyped(java.awt.event.KeyEvent) */
+  /**
+   * @see KeyListener#keyTyped(java.awt.event.KeyEvent)
+   */
   public void keyTyped(KeyEvent e) {}
 
   /**
@@ -1902,7 +1906,9 @@ public PetriNetModelProcessor getModelProcessor() {
     return modelProcessor;
   }
 
-  /** @param modelProcessor The modelProcessor to set. */
+  /**
+   * @param modelProcessor The modelProcessor to set.
+   */
   public void setModelProcessor(PetriNetModelProcessor modelProcessor) {
     this.modelProcessor = modelProcessor;
     getGraph().drawNet(modelProcessor);
diff --git a/WoPeD-Editor/src/main/java/org/woped/editor/controller/vc/TaskBarVC.java b/WoPeD-Editor/src/main/java/org/woped/editor/controller/vc/TaskBarVC.java
index 244782239..5763ffc0e 100644
--- a/WoPeD-Editor/src/main/java/org/woped/editor/controller/vc/TaskBarVC.java
+++ b/WoPeD-Editor/src/main/java/org/woped/editor/controller/vc/TaskBarVC.java
@@ -21,7 +21,9 @@
 import org.woped.editor.controller.ActionFactory;
 import org.woped.editor.controller.ApplicationMediator;
 
-/** @author ABBASA */
+/**
+ * @author ABBASA
+ */
 @SuppressWarnings("serial")
 public class TaskBarVC extends JPanel implements IViewController, IEditorAware {
 
@@ -177,7 +179,9 @@ public final void fireViewEvent(AbstractViewEvent viewevent) {
     }
   }
 
-  /** @return Return selected editor */
+  /**
+   * @return Return selected editor
+   */
   public IEditor getSelectedEditor() {
     return selectedEditor;
   }
diff --git a/WoPeD-Editor/src/main/java/org/woped/editor/controller/vep/ApplicationEventProcessor.java b/WoPeD-Editor/src/main/java/org/woped/editor/controller/vep/ApplicationEventProcessor.java
index 5762e5519..eff41346c 100644
--- a/WoPeD-Editor/src/main/java/org/woped/editor/controller/vep/ApplicationEventProcessor.java
+++ b/WoPeD-Editor/src/main/java/org/woped/editor/controller/vep/ApplicationEventProcessor.java
@@ -229,7 +229,9 @@ public void print(IEditor editor) {
       }
   }*/
 
-  /** @return Returns the mediator. */
+  /**
+   * @return Returns the mediator.
+   */
   private ApplicationMediator getWopedMediator() {
     return mediator;
   }
diff --git a/WoPeD-Editor/src/main/java/org/woped/editor/gui/EditorToolTip.java b/WoPeD-Editor/src/main/java/org/woped/editor/gui/EditorToolTip.java
index 2962521a6..2a5bd1974 100644
--- a/WoPeD-Editor/src/main/java/org/woped/editor/gui/EditorToolTip.java
+++ b/WoPeD-Editor/src/main/java/org/woped/editor/gui/EditorToolTip.java
@@ -28,7 +28,9 @@
 
 import javax.swing.JToolTip;
 
-/** @author Thomas Pohl TODO: DOCUMENTATION (xraven) */
+/**
+ * @author Thomas Pohl TODO: DOCUMENTATION (xraven)
+ */
 @SuppressWarnings("serial")
 public class EditorToolTip extends JToolTip {
   /** TODO: DOCUMENTATION (xraven) */
diff --git a/WoPeD-Editor/src/main/java/org/woped/editor/gui/EditorToolTipUI.java b/WoPeD-Editor/src/main/java/org/woped/editor/gui/EditorToolTipUI.java
index 33cc8255c..bc217b8a1 100644
--- a/WoPeD-Editor/src/main/java/org/woped/editor/gui/EditorToolTipUI.java
+++ b/WoPeD-Editor/src/main/java/org/woped/editor/gui/EditorToolTipUI.java
@@ -34,7 +34,9 @@
 import javax.swing.plaf.basic.BasicToolTipUI;
 import org.woped.core.config.DefaultStaticConfiguration;
 
-/** @author Thomas Pohl TODO: DOCUMENTATION (xraven) */
+/**
+ * @author Thomas Pohl TODO: DOCUMENTATION (xraven)
+ */
 public class EditorToolTipUI extends BasicToolTipUI {
 
   CellRendererPane m_renderPane = new CellRendererPane();
diff --git a/WoPeD-Editor/src/main/java/org/woped/editor/gui/config/AbstractConfPanel.java b/WoPeD-Editor/src/main/java/org/woped/editor/gui/config/AbstractConfPanel.java
index b6b316df9..23824719d 100644
--- a/WoPeD-Editor/src/main/java/org/woped/editor/gui/config/AbstractConfPanel.java
+++ b/WoPeD-Editor/src/main/java/org/woped/editor/gui/config/AbstractConfPanel.java
@@ -68,14 +68,18 @@ public AbstractConfPanel(String name) {
     this.setLayout(new BorderLayout());
   }
 
-  /** @param mainPanel */
+  /**
+   * @param mainPanel
+   */
   protected void setMainPanel(JPanel mainPanel) {
     JScrollPane scrollPanel = new JScrollPane(mainPanel);
     scrollPanel.setPreferredSize(ConfigVC.SCROLL_DIM);
     this.add(scrollPanel, BorderLayout.CENTER);
   }
 
-  /** @return Returns the namePanel. */
+  /**
+   * @return Returns the namePanel.
+   */
   public JPanel getNamePanel() {
     if (namePanel == null) {
       namePanel = new JPanel();
diff --git a/WoPeD-Editor/src/main/java/org/woped/editor/gui/config/ConfApromorePanel.java b/WoPeD-Editor/src/main/java/org/woped/editor/gui/config/ConfApromorePanel.java
index 04415888d..d08fcceda 100644
--- a/WoPeD-Editor/src/main/java/org/woped/editor/gui/config/ConfApromorePanel.java
+++ b/WoPeD-Editor/src/main/java/org/woped/editor/gui/config/ConfApromorePanel.java
@@ -141,7 +141,9 @@ public ConfApromorePanel(String name) {
     initialize();
   }
 
-  /** @see AbstractConfPanel#applyConfiguration() saves actual configuration in xml-file */
+  /**
+   * @see AbstractConfPanel#applyConfiguration() saves actual configuration in xml-file
+   */
   public boolean applyConfiguration() {
 
     boolean newsetting = useBox.isSelected();
@@ -233,7 +235,9 @@ public void saveConfig() {
     }
   }
 
-  /** @see AbstractConfPanel#readConfiguration() reads actual configuration from xml-file */
+  /**
+   * @see AbstractConfPanel#readConfiguration() reads actual configuration from xml-file
+   */
   public void readConfiguration() {
     getUseBox().setSelected(ConfigurationManager.getConfiguration().getApromoreUse());
     if (ConfigurationManager.getConfiguration().isSetApromoreServers())
diff --git a/WoPeD-Editor/src/main/java/org/woped/editor/gui/config/ConfBusinessDashboardPanel.java b/WoPeD-Editor/src/main/java/org/woped/editor/gui/config/ConfBusinessDashboardPanel.java
index 343bdf7c8..64c552694 100644
--- a/WoPeD-Editor/src/main/java/org/woped/editor/gui/config/ConfBusinessDashboardPanel.java
+++ b/WoPeD-Editor/src/main/java/org/woped/editor/gui/config/ConfBusinessDashboardPanel.java
@@ -58,7 +58,9 @@ public ConfBusinessDashboardPanel(String name) {
     initialize();
   }
 
-  /** @see AbstractConfPanel#applyConfiguration() */
+  /**
+   * @see AbstractConfPanel#applyConfiguration()
+   */
   public boolean applyConfiguration() {
     boolean newsetting = useByDefaultBox.isSelected();
     boolean oldsetting = ConfigurationManager.getConfiguration().getBusinessDashboardUseByDefault();
@@ -78,7 +80,9 @@ public boolean applyConfiguration() {
     return true;
   }
 
-  /** @see AbstractConfPanel#readConfiguration() */
+  /**
+   * @see AbstractConfPanel#readConfiguration()
+   */
   public void readConfiguration() {
     getServerPortText()
         .setText("" + ConfigurationManager.getConfiguration().getBusinessDashboardServerPort());
diff --git a/WoPeD-Editor/src/main/java/org/woped/editor/gui/config/ConfEditorPanel.java b/WoPeD-Editor/src/main/java/org/woped/editor/gui/config/ConfEditorPanel.java
index d37ff6201..7f585d70a 100644
--- a/WoPeD-Editor/src/main/java/org/woped/editor/gui/config/ConfEditorPanel.java
+++ b/WoPeD-Editor/src/main/java/org/woped/editor/gui/config/ConfEditorPanel.java
@@ -136,7 +136,9 @@ private void initialize() {
     setMainPanel(contentPanel);
   }
 
-  /** @see AbstractConfPanel#applyConfiguration() */
+  /**
+   * @see AbstractConfPanel#applyConfiguration()
+   */
   public boolean applyConfiguration() {
     ConfigurationManager.getConfiguration()
         .setEditingOnCreation(getEditOnCreationCheckBox().isSelected());
@@ -169,7 +171,9 @@ public boolean applyConfiguration() {
     return true;
   }
 
-  /** @see AbstractConfPanel#readConfiguration() */
+  /**
+   * @see AbstractConfPanel#readConfiguration()
+   */
   public void readConfiguration() {
     getEditOnCreationCheckBox()
         .setSelected(ConfigurationManager.getConfiguration().isEditingOnCreation());
diff --git a/WoPeD-Editor/src/main/java/org/woped/editor/gui/config/ConfFilePanel.java b/WoPeD-Editor/src/main/java/org/woped/editor/gui/config/ConfFilePanel.java
index 2e1c3f831..35c50a36a 100644
--- a/WoPeD-Editor/src/main/java/org/woped/editor/gui/config/ConfFilePanel.java
+++ b/WoPeD-Editor/src/main/java/org/woped/editor/gui/config/ConfFilePanel.java
@@ -105,7 +105,9 @@ private void initialize() {
     setMainPanel(contentPanel);
   }
 
-  /** @see AbstractConfPanel#applyConfiguration() */
+  /**
+   * @see AbstractConfPanel#applyConfiguration()
+   */
   public boolean applyConfiguration() {
     String fn = getHomeDirTextField().getText();
 
@@ -135,7 +137,9 @@ public boolean applyConfiguration() {
     return true;
   }
 
-  /** @see AbstractConfPanel#readConfiguration() */
+  /**
+   * @see AbstractConfPanel#readConfiguration()
+   */
   public void readConfiguration() {
     String hd = ConfigurationManager.getConfiguration().getHomedir();
     String dhd = ConfigurationManager.getConfiguration().getDefaultHomedir();
diff --git a/WoPeD-Editor/src/main/java/org/woped/editor/gui/config/ConfLanguagePanel.java b/WoPeD-Editor/src/main/java/org/woped/editor/gui/config/ConfLanguagePanel.java
index bd9215aa1..150f8a26e 100644
--- a/WoPeD-Editor/src/main/java/org/woped/editor/gui/config/ConfLanguagePanel.java
+++ b/WoPeD-Editor/src/main/java/org/woped/editor/gui/config/ConfLanguagePanel.java
@@ -57,7 +57,9 @@ public ConfLanguagePanel(String name) {
     initialize();
   }
 
-  /** @see AbstractConfPanel#applyConfiguration() */
+  /**
+   * @see AbstractConfPanel#applyConfiguration()
+   */
   public boolean applyConfiguration() {
     int selected = getLanguageComboBox().getSelectedIndex();
     Locale locale = language[selected];
@@ -81,7 +83,9 @@ public boolean applyConfiguration() {
     return true;
   }
 
-  /** @see AbstractConfPanel#readConfiguration() */
+  /**
+   * @see AbstractConfPanel#readConfiguration()
+   */
   public void readConfiguration() {
     int selected = 0;
     Locale loc = ConfigurationManager.getConfiguration().getLocale();
diff --git a/WoPeD-Editor/src/main/java/org/woped/editor/gui/config/ConfMetricsPanel.java b/WoPeD-Editor/src/main/java/org/woped/editor/gui/config/ConfMetricsPanel.java
index 094be61e5..82cb984ed 100644
--- a/WoPeD-Editor/src/main/java/org/woped/editor/gui/config/ConfMetricsPanel.java
+++ b/WoPeD-Editor/src/main/java/org/woped/editor/gui/config/ConfMetricsPanel.java
@@ -35,7 +35,9 @@ public ConfMetricsPanel(String name) {
     initialize();
   }
 
-  /** @see AbstractConfPanel#applyConfiguration() */
+  /**
+   * @see AbstractConfPanel#applyConfiguration()
+   */
   public boolean applyConfiguration() {
     if (useMetricsCheckBox.isSelected() != ConfigurationManager.getConfiguration().isUseMetrics()) {
       JOptionPane.showMessageDialog(
@@ -71,7 +73,9 @@ public boolean applyConfiguration() {
     return true;
   }
 
-  /** @see AbstractConfPanel#readConfiguration() */
+  /**
+   * @see AbstractConfPanel#readConfiguration()
+   */
   public void readConfiguration() {
     if (ConfigurationManager.getConfiguration().isUseMetrics())
       useMetricsCheckBox.setSelected(true);
diff --git a/WoPeD-Editor/src/main/java/org/woped/editor/gui/config/ConfNLPToolsPanel.java b/WoPeD-Editor/src/main/java/org/woped/editor/gui/config/ConfNLPToolsPanel.java
index 0ca2ca589..bc47190fa 100644
--- a/WoPeD-Editor/src/main/java/org/woped/editor/gui/config/ConfNLPToolsPanel.java
+++ b/WoPeD-Editor/src/main/java/org/woped/editor/gui/config/ConfNLPToolsPanel.java
@@ -80,7 +80,9 @@ public ConfNLPToolsPanel(String name) {
     initialize();
   }
 
-  /** @see AbstractConfPanel#applyConfiguration() */
+  /**
+   * @see AbstractConfPanel#applyConfiguration()
+   */
   public boolean applyConfiguration() {
     boolean newsetting = useBox.isSelected();
     boolean oldsetting = ConfigurationManager.getConfiguration().getProcess2TextUse();
@@ -118,7 +120,9 @@ public boolean applyConfiguration() {
     return true;
   }
 
-  /** @see AbstractConfPanel#readConfiguration() */
+  /**
+   * @see AbstractConfPanel#readConfiguration()
+   */
   public void readConfiguration() {
 
     getServerURLText().setText(ConfigurationManager.getConfiguration().getProcess2TextServerHost());
diff --git a/WoPeD-Editor/src/main/java/org/woped/editor/gui/config/ConfUnderstandabilityPanel.java b/WoPeD-Editor/src/main/java/org/woped/editor/gui/config/ConfUnderstandabilityPanel.java
index 38ef79eb3..87e27b061 100644
--- a/WoPeD-Editor/src/main/java/org/woped/editor/gui/config/ConfUnderstandabilityPanel.java
+++ b/WoPeD-Editor/src/main/java/org/woped/editor/gui/config/ConfUnderstandabilityPanel.java
@@ -56,7 +56,9 @@ public ConfUnderstandabilityPanel(JDialog frame, String name) {
     initialize();
   }
 
-  /** @see AbstractConfPanel#applyConfiguration() */
+  /**
+   * @see AbstractConfPanel#applyConfiguration()
+   */
   public boolean applyConfiguration() {
     setUnderstandColors();
     ConfigurationManager.getConfiguration()
@@ -66,7 +68,9 @@ public boolean applyConfiguration() {
     return true;
   }
 
-  /** @see AbstractConfPanel#readConfigruation() */
+  /**
+   * @see AbstractConfPanel#readConfigruation()
+   */
   public void readConfiguration() {
     ConfigurationManager.getConfiguration().setColorOn(false);
     for (int i = 0; i < 16; i++) {
diff --git a/WoPeD-Editor/src/main/java/org/woped/editor/gui/config/ConfYAWLPanel.java b/WoPeD-Editor/src/main/java/org/woped/editor/gui/config/ConfYAWLPanel.java
index 6b097da73..abf2a2efd 100644
--- a/WoPeD-Editor/src/main/java/org/woped/editor/gui/config/ConfYAWLPanel.java
+++ b/WoPeD-Editor/src/main/java/org/woped/editor/gui/config/ConfYAWLPanel.java
@@ -46,7 +46,9 @@ public ConfYAWLPanel(String name) {
     initialize();
   }
 
-  /** @see AbstractConfPanel#applyConfiguration() */
+  /**
+   * @see AbstractConfPanel#applyConfiguration()
+   */
   public boolean applyConfiguration() {
     ConfigurationManager.getConfiguration().setYAWLEnabled(getYAWLEnabledBox().isSelected());
     ConfigurationManager.getConfiguration()
@@ -57,7 +59,9 @@ public boolean applyConfiguration() {
     return true;
   }
 
-  /** @see AbstractConfPanel#readConfiguration() */
+  /**
+   * @see AbstractConfPanel#readConfiguration()
+   */
   public void readConfiguration() {
     getYAWLEnabledBox().setSelected(ConfigurationManager.getConfiguration().isYAWLEnabled());
     getYAWLExportExplicitPlacesCheckBox()
diff --git a/WoPeD-Editor/src/main/java/org/woped/editor/help/action/BrowserWebpageAction.java b/WoPeD-Editor/src/main/java/org/woped/editor/help/action/BrowserWebpageAction.java
index 0d2fd3b14..410c8a995 100644
--- a/WoPeD-Editor/src/main/java/org/woped/editor/help/action/BrowserWebpageAction.java
+++ b/WoPeD-Editor/src/main/java/org/woped/editor/help/action/BrowserWebpageAction.java
@@ -30,7 +30,9 @@
 import org.woped.editor.action.WoPeDAction;
 import org.woped.editor.help.HelpBrowser;
 
-/** @author Thomas Freytag */
+/**
+ * @author Thomas Freytag
+ */
 @SuppressWarnings("serial")
 public class BrowserWebpageAction extends WoPeDAction {
   private static final String PROPERTIES_PREFIX = "Action.Browser.WWW";
diff --git a/WoPeD-Editor/src/main/java/org/woped/editor/orientation/EditorSize.java b/WoPeD-Editor/src/main/java/org/woped/editor/orientation/EditorSize.java
index b2a4874c0..ca67d499f 100644
--- a/WoPeD-Editor/src/main/java/org/woped/editor/orientation/EditorSize.java
+++ b/WoPeD-Editor/src/main/java/org/woped/editor/orientation/EditorSize.java
@@ -24,7 +24,9 @@ public class EditorSize {
   public final int SIDEBAR_WIDTH = 320;
   public final int SIDEBAR_MINHEIGHT = 400;
 
-  /** @param editor the editor to size and check */
+  /**
+   * @param editor the editor to size and check
+   */
   public EditorSize(IEditor editor) {
     this.editor = editor;
   }
@@ -126,7 +128,9 @@ private void calculateNewEditorSize() {
     if (newEditorSize.height > maxEditorSize.height) newEditorSize.height = maxEditorSize.height;
   }
 
-  /** @return the container which represents the whole editor-window */
+  /**
+   * @return the container which represents the whole editor-window
+   */
   private Container getEditorParentContainer() {
     if (editor instanceof SubprocessEditorVC)
       return ((EditorVC) editor).getEditorPanel().getParent().getParent().getParent().getParent();
diff --git a/WoPeD-Editor/src/main/java/org/woped/editor/orientation/Orientation.java b/WoPeD-Editor/src/main/java/org/woped/editor/orientation/Orientation.java
index 11cb8732e..f9d494c29 100644
--- a/WoPeD-Editor/src/main/java/org/woped/editor/orientation/Orientation.java
+++ b/WoPeD-Editor/src/main/java/org/woped/editor/orientation/Orientation.java
@@ -161,13 +161,17 @@ void moveAllElements(int moveX, int moveY, ModelElementContainer mec) {
     }
   }
 
-  /** @param transition the TransitionModel to rotate right way */
+  /**
+   * @param transition the TransitionModel to rotate right way
+   */
   public void rotateTransRight(TransitionModel transition) {
     flipTransitionAccessories(transition);
     rotateTransitionIcon(transition, TURN_RIGHT);
   }
 
-  /** @param transition the TransitionModel to rotate left way */
+  /**
+   * @param transition the TransitionModel to rotate left way
+   */
   public void rotateTransLeft(TransitionModel transition) {
     flipTransitionAccessories(transition);
     rotateTransitionIcon(transition, TURN_LEFT);
@@ -190,7 +194,9 @@ private void rotateTransitionIcon(TransitionModel transition, int direction) {
     transition.getToolSpecific().setOperatorPosition(OperatorPosition.values()[newPosition]);
   }
 
-  /** @param transition the TransitionModel to flip accessories of */
+  /**
+   * @param transition the TransitionModel to flip accessories of
+   */
   private void flipTransitionAccessories(TransitionModel transition) {
     int currentPosition = transition.getToolSpecific().getOperatorPosition().ordinal();
     // flip name
@@ -246,12 +252,16 @@ private void flipTransitionAccessories(TransitionModel transition) {
     }
   }
 
-  /** @return the rotateSelected */
+  /**
+   * @return the rotateSelected
+   */
   public boolean isRotateSelected() {
     return rotateSelected;
   }
 
-  /** @param rotateSelected the rotateSelected to set */
+  /**
+   * @param rotateSelected the rotateSelected to set
+   */
   public void setRotateSelected(boolean rotateSelected) {
     this.rotateSelected = rotateSelected;
   }
diff --git a/WoPeD-Editor/src/main/java/org/woped/editor/utilities/Cursors.java b/WoPeD-Editor/src/main/java/org/woped/editor/utilities/Cursors.java
index e24f7e865..e7cb5ad8b 100644
--- a/WoPeD-Editor/src/main/java/org/woped/editor/utilities/Cursors.java
+++ b/WoPeD-Editor/src/main/java/org/woped/editor/utilities/Cursors.java
@@ -11,7 +11,9 @@
 import org.woped.core.model.petrinet.OperatorTransitionModel;
 import org.woped.gui.translations.Messages;
 
-/** @author lai */
+/**
+ * @author lai
+ */
 public class Cursors {
   private static ImageIcon placeIcon = Messages.getCursorImageIcon("ToolBar.DrawPlace");
   public static Cursor placeCursor =
diff --git a/WoPeD-Editor/src/main/java/org/woped/editor/view/WoPeDPortView.java b/WoPeD-Editor/src/main/java/org/woped/editor/view/WoPeDPortView.java
index a539a408d..708f713a5 100644
--- a/WoPeD-Editor/src/main/java/org/woped/editor/view/WoPeDPortView.java
+++ b/WoPeD-Editor/src/main/java/org/woped/editor/view/WoPeDPortView.java
@@ -98,7 +98,9 @@ public void paint(Graphics g) {
     }
   }
 
-  /** @see com.jgraph.graph.AbstractCellView#getRenderer() */
+  /**
+   * @see com.jgraph.graph.AbstractCellView#getRenderer()
+   */
   public CellViewRenderer getRenderer() {
     return renderer;
   }
diff --git a/WoPeD-Editor/src/main/java/org/woped/editor/view/petrinet/PetriNetElementView.java b/WoPeD-Editor/src/main/java/org/woped/editor/view/petrinet/PetriNetElementView.java
index c2cc7ab7a..c93598d3c 100644
--- a/WoPeD-Editor/src/main/java/org/woped/editor/view/petrinet/PetriNetElementView.java
+++ b/WoPeD-Editor/src/main/java/org/woped/editor/view/petrinet/PetriNetElementView.java
@@ -88,7 +88,9 @@ protected Color getInnerDrawingsColor() {
       }
     }
 
-    /** @return */
+    /**
+     * @return
+     */
     public boolean isActive() {
       return PetriNetElementView.this.isActivated();
     }
diff --git a/WoPeD-Editor/src/main/java/org/woped/editor/view/petrinet/SubProcessView.java b/WoPeD-Editor/src/main/java/org/woped/editor/view/petrinet/SubProcessView.java
index 2969afe8d..731dda40a 100644
--- a/WoPeD-Editor/src/main/java/org/woped/editor/view/petrinet/SubProcessView.java
+++ b/WoPeD-Editor/src/main/java/org/woped/editor/view/petrinet/SubProcessView.java
@@ -102,9 +102,13 @@ public void paint(Graphics g) {
     }
   }
 
-  /** @see org.woped.editor.core.view.AbstractElementView#paint() */
+  /**
+   * @see org.woped.editor.core.view.AbstractElementView#paint()
+   */
   public void paint() {}
 
-  /** @see org.woped.editor.core.view.AbstractElementView#refresh() */
+  /**
+   * @see org.woped.editor.core.view.AbstractElementView#refresh()
+   */
   public void refresh() {}
 }
diff --git a/WoPeD-Editor/src/main/java/org/woped/editor/view/petrinet/TransAndJoinXOrSplitView.java b/WoPeD-Editor/src/main/java/org/woped/editor/view/petrinet/TransAndJoinXOrSplitView.java
index 10df94639..ad4f2eb65 100644
--- a/WoPeD-Editor/src/main/java/org/woped/editor/view/petrinet/TransAndJoinXOrSplitView.java
+++ b/WoPeD-Editor/src/main/java/org/woped/editor/view/petrinet/TransAndJoinXOrSplitView.java
@@ -95,7 +95,9 @@ public void paint(Graphics g) {
 
       drawTime(g2, d);
     }
-    /** @return */
+    /**
+     * @return
+     */
     public boolean isActive() {
       return TransAndJoinXOrSplitView.this.isActivated();
     }
diff --git a/WoPeD-Editor/src/main/java/org/woped/editor/view/petrinet/TransAndSplitJoinView.java b/WoPeD-Editor/src/main/java/org/woped/editor/view/petrinet/TransAndSplitJoinView.java
index a64d0337c..4cbdd59c5 100644
--- a/WoPeD-Editor/src/main/java/org/woped/editor/view/petrinet/TransAndSplitJoinView.java
+++ b/WoPeD-Editor/src/main/java/org/woped/editor/view/petrinet/TransAndSplitJoinView.java
@@ -101,7 +101,9 @@ public void paint(Graphics g) {
       drawTime(g2, d);
     }
 
-    /** @return */
+    /**
+     * @return
+     */
     public boolean isActive() {
       return TransAndSplitJoinView.this.isActivated();
     }
diff --git a/WoPeD-Editor/src/main/java/org/woped/editor/view/petrinet/TransAndSplitView.java b/WoPeD-Editor/src/main/java/org/woped/editor/view/petrinet/TransAndSplitView.java
index 0071dc756..7146da1a8 100644
--- a/WoPeD-Editor/src/main/java/org/woped/editor/view/petrinet/TransAndSplitView.java
+++ b/WoPeD-Editor/src/main/java/org/woped/editor/view/petrinet/TransAndSplitView.java
@@ -99,15 +99,21 @@ public void paint(Graphics g) {
       drawTime(g2, d);
     }
 
-    /** @return */
+    /**
+     * @return
+     */
     public boolean isActive() {
       return TransAndSplitView.this.isActivated();
     }
   }
 
-  /** @see org.woped.editor.core.view.AbstractElementView#paint() */
+  /**
+   * @see org.woped.editor.core.view.AbstractElementView#paint()
+   */
   public void paint() {}
 
-  /** @see org.woped.editor.core.view.AbstractElementView#refresh() */
+  /**
+   * @see org.woped.editor.core.view.AbstractElementView#refresh()
+   */
   public void refresh() {}
 }
diff --git a/WoPeD-Editor/src/main/java/org/woped/editor/view/petrinet/TransOrSplitView.java b/WoPeD-Editor/src/main/java/org/woped/editor/view/petrinet/TransOrSplitView.java
index 573958f4d..db03e2dcc 100644
--- a/WoPeD-Editor/src/main/java/org/woped/editor/view/petrinet/TransOrSplitView.java
+++ b/WoPeD-Editor/src/main/java/org/woped/editor/view/petrinet/TransOrSplitView.java
@@ -92,9 +92,13 @@ public void paint(Graphics g) {
     }
   }
 
-  /** @see org.woped.editor.core.view.AbstractElementView#paint() */
+  /**
+   * @see org.woped.editor.core.view.AbstractElementView#paint()
+   */
   public void paint() {}
 
-  /** @see org.woped.editor.core.view.AbstractElementView#refresh() */
+  /**
+   * @see org.woped.editor.core.view.AbstractElementView#refresh()
+   */
   public void refresh() {}
 }
diff --git a/WoPeD-Editor/src/main/java/org/woped/editor/view/petrinet/TransSimpleView.java b/WoPeD-Editor/src/main/java/org/woped/editor/view/petrinet/TransSimpleView.java
index 423cee3d4..2159a5944 100644
--- a/WoPeD-Editor/src/main/java/org/woped/editor/view/petrinet/TransSimpleView.java
+++ b/WoPeD-Editor/src/main/java/org/woped/editor/view/petrinet/TransSimpleView.java
@@ -91,9 +91,13 @@ public void paint(Graphics g) {
     }
   }
 
-  /** @see org.woped.editor.core.view.AbstractElementView#paint() */
+  /**
+   * @see org.woped.editor.core.view.AbstractElementView#paint()
+   */
   public void paint() {}
 
-  /** @see org.woped.editor.core.view.AbstractElementView#refresh() */
+  /**
+   * @see org.woped.editor.core.view.AbstractElementView#refresh()
+   */
   public void refresh() {}
 }
diff --git a/WoPeD-Editor/src/main/java/org/woped/editor/view/petrinet/TransXOrJoinView.java b/WoPeD-Editor/src/main/java/org/woped/editor/view/petrinet/TransXOrJoinView.java
index 8d44cef6f..747421dff 100644
--- a/WoPeD-Editor/src/main/java/org/woped/editor/view/petrinet/TransXOrJoinView.java
+++ b/WoPeD-Editor/src/main/java/org/woped/editor/view/petrinet/TransXOrJoinView.java
@@ -94,7 +94,9 @@ public void paint(Graphics g) {
       drawTime(g2, d);
     }
 
-    /** @return */
+    /**
+     * @return
+     */
     public boolean isActive() {
       return TransXOrJoinView.this.isActivated();
     }
diff --git a/WoPeD-Editor/src/main/java/org/woped/editor/view/petrinet/TransXOrSplitJoinView.java b/WoPeD-Editor/src/main/java/org/woped/editor/view/petrinet/TransXOrSplitJoinView.java
index 00d2659e8..f8fec2652 100644
--- a/WoPeD-Editor/src/main/java/org/woped/editor/view/petrinet/TransXOrSplitJoinView.java
+++ b/WoPeD-Editor/src/main/java/org/woped/editor/view/petrinet/TransXOrSplitJoinView.java
@@ -94,7 +94,9 @@ public void paint(Graphics g) {
       drawTime(g2, d);
     }
 
-    /** @return */
+    /**
+     * @return
+     */
     public boolean isActive() {
       return TransXOrSplitJoinView.this.isActivated();
     }
diff --git a/WoPeD-Editor/src/main/java/org/woped/editor/view/petrinet/TransXOrSplitView.java b/WoPeD-Editor/src/main/java/org/woped/editor/view/petrinet/TransXOrSplitView.java
index b7f7ca7ef..1e3fea1ba 100644
--- a/WoPeD-Editor/src/main/java/org/woped/editor/view/petrinet/TransXOrSplitView.java
+++ b/WoPeD-Editor/src/main/java/org/woped/editor/view/petrinet/TransXOrSplitView.java
@@ -94,16 +94,22 @@ public void paint(Graphics g) {
       drawTime(g2, d);
     }
 
-    /** @return */
+    /**
+     * @return
+     */
     public boolean isActive() {
       return TransXOrSplitView.this.isActivated();
     }
   }
 
-  /** @see org.woped.editor.core.view.AbstractElementView#paint() */
+  /**
+   * @see org.woped.editor.core.view.AbstractElementView#paint()
+   */
   public void paint() {}
 
-  /** @see org.woped.editor.core.view.AbstractElementView#refresh() */
+  /**
+   * @see org.woped.editor.core.view.AbstractElementView#refresh()
+   */
   public void refresh() {}
 
   public boolean isActivated() {
diff --git a/WoPeD-Editor/src/main/java/org/woped/editor/view/petrinet/TransXorJoinAndSplitView.java b/WoPeD-Editor/src/main/java/org/woped/editor/view/petrinet/TransXorJoinAndSplitView.java
index 3f208a79a..3b0ed9107 100644
--- a/WoPeD-Editor/src/main/java/org/woped/editor/view/petrinet/TransXorJoinAndSplitView.java
+++ b/WoPeD-Editor/src/main/java/org/woped/editor/view/petrinet/TransXorJoinAndSplitView.java
@@ -95,7 +95,9 @@ public void paint(Graphics g) {
 
       drawTime(g2, d);
     }
-    /** @return */
+    /**
+     * @return
+     */
     public boolean isActive() {
       return TransXorJoinAndSplitView.this.isActivated();
     }
diff --git a/WoPeD-Editor/src/main/java/org/woped/editor/view/petrinet/TransitionResourceView.java b/WoPeD-Editor/src/main/java/org/woped/editor/view/petrinet/TransitionResourceView.java
index 0bf11ace4..7a7a414ee 100644
--- a/WoPeD-Editor/src/main/java/org/woped/editor/view/petrinet/TransitionResourceView.java
+++ b/WoPeD-Editor/src/main/java/org/woped/editor/view/petrinet/TransitionResourceView.java
@@ -18,12 +18,16 @@
 import org.woped.core.model.petrinet.TransitionResourceModel;
 import org.woped.core.view.AbstractElementView;
 
-/** @author waschtl */
+/**
+ * @author waschtl
+ */
 @SuppressWarnings("serial")
 public class TransitionResourceView extends AbstractElementView {
   private TransitionResourceRenderer renderer = new TransitionResourceRenderer();
 
-  /** @param cell */
+  /**
+   * @param cell
+   */
   public TransitionResourceView(Object cell) {
     super(cell);
   }
diff --git a/WoPeD-FileInterface/src/main/java/org/woped/file/PNMLImport.java b/WoPeD-FileInterface/src/main/java/org/woped/file/PNMLImport.java
index 41028c543..1d533e9ab 100644
--- a/WoPeD-FileInterface/src/main/java/org/woped/file/PNMLImport.java
+++ b/WoPeD-FileInterface/src/main/java/org/woped/file/PNMLImport.java
@@ -1494,7 +1494,9 @@ private boolean isValidOperator(ModelElementContainer elementContainer, String e
             == AbstractPetriNetElementModel.TRANS_OPERATOR_TYPE;
   }
 
-  /** @return Returns the mediator. */
+  /**
+   * @return Returns the mediator.
+   */
   protected AbstractApplicationMediator getMediator() {
     return mediator;
   }
diff --git a/WoPeD-FileInterface/src/main/java/org/woped/file/yawl/PnmlOutput.java b/WoPeD-FileInterface/src/main/java/org/woped/file/yawl/PnmlOutput.java
index 525e9c934..b8100b885 100644
--- a/WoPeD-FileInterface/src/main/java/org/woped/file/yawl/PnmlOutput.java
+++ b/WoPeD-FileInterface/src/main/java/org/woped/file/yawl/PnmlOutput.java
@@ -9,7 +9,9 @@
 import org.woped.file.yawl.wfnet.WfNet;
 import org.woped.file.yawl.wfnet.WfNetNode;
 
-/** @author Chris */
+/**
+ * @author Chris
+ */
 public class PnmlOutput {
 
   private WfNet wfNet;
diff --git a/WoPeD-FileInterface/src/main/java/org/woped/file/yawl/XmlElement.java b/WoPeD-FileInterface/src/main/java/org/woped/file/yawl/XmlElement.java
index 2cb82493a..e41d4d651 100644
--- a/WoPeD-FileInterface/src/main/java/org/woped/file/yawl/XmlElement.java
+++ b/WoPeD-FileInterface/src/main/java/org/woped/file/yawl/XmlElement.java
@@ -6,7 +6,9 @@
 
 import java.util.ArrayList;
 
-/** @author Chris */
+/**
+ * @author Chris
+ */
 public class XmlElement {
   private String name;
   private String contents;
diff --git a/WoPeD-FileInterface/src/main/java/org/woped/file/yawl/YawlArc.java b/WoPeD-FileInterface/src/main/java/org/woped/file/yawl/YawlArc.java
index eb9031457..1a06b7bef 100644
--- a/WoPeD-FileInterface/src/main/java/org/woped/file/yawl/YawlArc.java
+++ b/WoPeD-FileInterface/src/main/java/org/woped/file/yawl/YawlArc.java
@@ -4,7 +4,9 @@
  */
 package org.woped.file.yawl;
 
-/** @author Chris */
+/**
+ * @author Chris
+ */
 public class YawlArc {
 
   private String flowFrom = "";
diff --git a/WoPeD-FileInterface/src/main/java/org/woped/file/yawl/YawlImport.java b/WoPeD-FileInterface/src/main/java/org/woped/file/yawl/YawlImport.java
index 551e5ecd6..6dd354e6b 100644
--- a/WoPeD-FileInterface/src/main/java/org/woped/file/yawl/YawlImport.java
+++ b/WoPeD-FileInterface/src/main/java/org/woped/file/yawl/YawlImport.java
@@ -41,7 +41,9 @@
 import org.woped.file.yawl.wfnet.WfNet;
 import org.woped.file.yawl.wfnet.WfNetNode;
 
-/** @author Chris */
+/**
+ * @author Chris
+ */
 public class YawlImport {
 
   private WfNet wfNet = new WfNet();
diff --git a/WoPeD-FileInterface/src/main/java/org/woped/file/yawl/YawlInterface.java b/WoPeD-FileInterface/src/main/java/org/woped/file/yawl/YawlInterface.java
index 1c4f97daa..17a915b76 100644
--- a/WoPeD-FileInterface/src/main/java/org/woped/file/yawl/YawlInterface.java
+++ b/WoPeD-FileInterface/src/main/java/org/woped/file/yawl/YawlInterface.java
@@ -14,10 +14,14 @@
 import org.woped.file.yawl.wfnet.AutoLayout;
 import org.woped.file.yawl.wfnet.WfNet;
 
-/** @author Chris */
+/**
+ * @author Chris
+ */
 public class YawlInterface {
 
-  /** @param args the command line arguments */
+  /**
+   * @param args the command line arguments
+   */
   public static String importYawlFile(File file) {
     // TODO code application logic here
 
diff --git a/WoPeD-FileInterface/src/main/java/org/woped/file/yawl/YawlToPnmlTransform.java b/WoPeD-FileInterface/src/main/java/org/woped/file/yawl/YawlToPnmlTransform.java
index 1225b8d8e..276b3b130 100644
--- a/WoPeD-FileInterface/src/main/java/org/woped/file/yawl/YawlToPnmlTransform.java
+++ b/WoPeD-FileInterface/src/main/java/org/woped/file/yawl/YawlToPnmlTransform.java
@@ -11,7 +11,9 @@
 import org.woped.file.yawl.wfnet.WfNet;
 import org.woped.file.yawl.wfnet.WfNetNode;
 
-/** @author Chris */
+/**
+ * @author Chris
+ */
 public class YawlToPnmlTransform {
 
   private WfNet wfNet;
diff --git a/WoPeD-FileInterface/src/main/java/org/woped/file/yawl/wfnet/AutoLayout.java b/WoPeD-FileInterface/src/main/java/org/woped/file/yawl/wfnet/AutoLayout.java
index d52845873..02cc059df 100644
--- a/WoPeD-FileInterface/src/main/java/org/woped/file/yawl/wfnet/AutoLayout.java
+++ b/WoPeD-FileInterface/src/main/java/org/woped/file/yawl/wfnet/AutoLayout.java
@@ -7,7 +7,9 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 
-/** @author Chris */
+/**
+ * @author Chris
+ */
 public class AutoLayout {
 
   private WfNet wfNet;
diff --git a/WoPeD-FileInterface/src/main/java/org/woped/file/yawl/wfnet/Place.java b/WoPeD-FileInterface/src/main/java/org/woped/file/yawl/wfnet/Place.java
index bb67cc4d4..1589629a3 100644
--- a/WoPeD-FileInterface/src/main/java/org/woped/file/yawl/wfnet/Place.java
+++ b/WoPeD-FileInterface/src/main/java/org/woped/file/yawl/wfnet/Place.java
@@ -4,7 +4,9 @@
  */
 package org.woped.file.yawl.wfnet;
 
-/** @author Chris */
+/**
+ * @author Chris
+ */
 public class Place extends WfNetNode {
 
   /**
diff --git a/WoPeD-FileInterface/src/main/java/org/woped/file/yawl/wfnet/Rectangle.java b/WoPeD-FileInterface/src/main/java/org/woped/file/yawl/wfnet/Rectangle.java
index abb36dc87..a5b25033f 100644
--- a/WoPeD-FileInterface/src/main/java/org/woped/file/yawl/wfnet/Rectangle.java
+++ b/WoPeD-FileInterface/src/main/java/org/woped/file/yawl/wfnet/Rectangle.java
@@ -4,7 +4,9 @@
  */
 package org.woped.file.yawl.wfnet;
 
-/** @author Chris */
+/**
+ * @author Chris
+ */
 public class Rectangle {
 
   public int x, y, width, height;
diff --git a/WoPeD-FileInterface/src/main/java/org/woped/file/yawl/wfnet/Transition.java b/WoPeD-FileInterface/src/main/java/org/woped/file/yawl/wfnet/Transition.java
index 45778a5b5..58495caac 100644
--- a/WoPeD-FileInterface/src/main/java/org/woped/file/yawl/wfnet/Transition.java
+++ b/WoPeD-FileInterface/src/main/java/org/woped/file/yawl/wfnet/Transition.java
@@ -4,7 +4,9 @@
  */
 package org.woped.file.yawl.wfnet;
 
-/** @author Chris */
+/**
+ * @author Chris
+ */
 public class Transition extends WfNetNode {
 
   private JoinSplitType joinType = JoinSplitType.None;
diff --git a/WoPeD-FileInterface/src/main/java/org/woped/file/yawl/wfnet/WfNet.java b/WoPeD-FileInterface/src/main/java/org/woped/file/yawl/wfnet/WfNet.java
index d3eb023a2..35cdca8c1 100644
--- a/WoPeD-FileInterface/src/main/java/org/woped/file/yawl/wfnet/WfNet.java
+++ b/WoPeD-FileInterface/src/main/java/org/woped/file/yawl/wfnet/WfNet.java
@@ -7,7 +7,9 @@
 import java.util.Collection;
 import java.util.HashMap;
 
-/** @author Christian Klassen */
+/**
+ * @author Christian Klassen
+ */
 public class WfNet {
 
   /** A hash map with the id value of the WfNetNode as key */
diff --git a/WoPeD-FileInterface/src/main/java/org/woped/file/yawl/wfnet/WfNetException.java b/WoPeD-FileInterface/src/main/java/org/woped/file/yawl/wfnet/WfNetException.java
index 5b904fa9a..6f055ad6d 100644
--- a/WoPeD-FileInterface/src/main/java/org/woped/file/yawl/wfnet/WfNetException.java
+++ b/WoPeD-FileInterface/src/main/java/org/woped/file/yawl/wfnet/WfNetException.java
@@ -4,5 +4,7 @@
  */
 package org.woped.file.yawl.wfnet;
 
-/** @author Chris */
+/**
+ * @author Chris
+ */
 public class WfNetException extends Exception {}
diff --git a/WoPeD-FileInterface/src/main/java/org/woped/file/yawl/wfnet/WfNetNode.java b/WoPeD-FileInterface/src/main/java/org/woped/file/yawl/wfnet/WfNetNode.java
index 8182dad0c..6273df1bb 100644
--- a/WoPeD-FileInterface/src/main/java/org/woped/file/yawl/wfnet/WfNetNode.java
+++ b/WoPeD-FileInterface/src/main/java/org/woped/file/yawl/wfnet/WfNetNode.java
@@ -7,7 +7,9 @@
 import java.util.ArrayList;
 import java.util.ListIterator;
 
-/** @author Chris */
+/**
+ * @author Chris
+ */
 public abstract class WfNetNode {
 
   protected String id = "";
diff --git a/WoPeD-Flamingo/src/main/java/org/pushingpixels/flamingo/api/common/JCommandButtonPanel.java b/WoPeD-Flamingo/src/main/java/org/pushingpixels/flamingo/api/common/JCommandButtonPanel.java
index 970ff2b0f..ec9a61969 100644
--- a/WoPeD-Flamingo/src/main/java/org/pushingpixels/flamingo/api/common/JCommandButtonPanel.java
+++ b/WoPeD-Flamingo/src/main/java/org/pushingpixels/flamingo/api/common/JCommandButtonPanel.java
@@ -103,7 +103,9 @@
  * @author Kirill Grouchnikov
  */
 public class JCommandButtonPanel extends JPanel implements Scrollable {
-  /** @see #getUIClassID */
+  /**
+   * @see #getUIClassID
+   */
   public static final String uiClassID = "CommandButtonPanelUI";
 
   /**
diff --git a/WoPeD-Flamingo/src/main/java/org/pushingpixels/flamingo/api/common/JScrollablePanel.java b/WoPeD-Flamingo/src/main/java/org/pushingpixels/flamingo/api/common/JScrollablePanel.java
index da139565e..7d7a4dad7 100644
--- a/WoPeD-Flamingo/src/main/java/org/pushingpixels/flamingo/api/common/JScrollablePanel.java
+++ b/WoPeD-Flamingo/src/main/java/org/pushingpixels/flamingo/api/common/JScrollablePanel.java
@@ -39,7 +39,9 @@
 
 /** ScrollablePanel allows to have scrolling buttons on each side. */
 public class JScrollablePanel<T extends JComponent> extends JPanel {
-  /** @see #getUIClassID */
+  /**
+   * @see #getUIClassID
+   */
   public static final String uiClassID = "ScrollablePanelUI";
 
   private T view;
diff --git a/WoPeD-Flamingo/src/main/java/org/pushingpixels/flamingo/api/common/popup/JCommandPopupMenu.java b/WoPeD-Flamingo/src/main/java/org/pushingpixels/flamingo/api/common/popup/JCommandPopupMenu.java
index 89933bc72..8b2bbc028 100644
--- a/WoPeD-Flamingo/src/main/java/org/pushingpixels/flamingo/api/common/popup/JCommandPopupMenu.java
+++ b/WoPeD-Flamingo/src/main/java/org/pushingpixels/flamingo/api/common/popup/JCommandPopupMenu.java
@@ -54,7 +54,9 @@
  * @author Kirill Grouchnikov
  */
 public class JCommandPopupMenu extends JPopupPanel {
-  /** @see #getUIClassID */
+  /**
+   * @see #getUIClassID
+   */
   public static final String uiClassID = "CommandPopupMenuUI";
 
   /**
diff --git a/WoPeD-Flamingo/src/main/java/org/pushingpixels/flamingo/api/common/popup/JPopupPanel.java b/WoPeD-Flamingo/src/main/java/org/pushingpixels/flamingo/api/common/popup/JPopupPanel.java
index 055757ac5..625138b91 100644
--- a/WoPeD-Flamingo/src/main/java/org/pushingpixels/flamingo/api/common/popup/JPopupPanel.java
+++ b/WoPeD-Flamingo/src/main/java/org/pushingpixels/flamingo/api/common/popup/JPopupPanel.java
@@ -42,7 +42,9 @@
  * @see PopupPanelManager#addPopup(javax.swing.JComponent, javax.swing.Popup, JPopupPanel)
  */
 public abstract class JPopupPanel extends JPanel {
-  /** @see #getUIClassID */
+  /**
+   * @see #getUIClassID
+   */
   public static final String uiClassID = "PopupPanelUI";
 
   /**
diff --git a/WoPeD-Flamingo/src/main/java/org/pushingpixels/flamingo/internal/ui/common/JRichTooltipPanel.java b/WoPeD-Flamingo/src/main/java/org/pushingpixels/flamingo/internal/ui/common/JRichTooltipPanel.java
index 4a874d420..619a5af94 100644
--- a/WoPeD-Flamingo/src/main/java/org/pushingpixels/flamingo/internal/ui/common/JRichTooltipPanel.java
+++ b/WoPeD-Flamingo/src/main/java/org/pushingpixels/flamingo/internal/ui/common/JRichTooltipPanel.java
@@ -36,7 +36,9 @@
 public class JRichTooltipPanel extends JPanel {
   protected RichTooltip tooltipInfo;
 
-  /** @see #getUIClassID */
+  /**
+   * @see #getUIClassID
+   */
   public static final String uiClassID = "RichTooltipPanelUI";
 
   public JRichTooltipPanel(RichTooltip tooltipInfo) {
diff --git a/WoPeD-GUI/src/main/java/org/woped/gui/translations/Messages.java b/WoPeD-GUI/src/main/java/org/woped/gui/translations/Messages.java
index a00cb6fc4..0db3dd4bb 100644
--- a/WoPeD-GUI/src/main/java/org/woped/gui/translations/Messages.java
+++ b/WoPeD-GUI/src/main/java/org/woped/gui/translations/Messages.java
@@ -43,7 +43,9 @@
 import org.woped.core.utilities.LoggerManager;
 import org.woped.core.utilities.Platform;
 
-/** @author Thomas Pohl */
+/**
+ * @author Thomas Pohl
+ */
 public abstract class Messages {
 
   private static final String BUNDLE_NAME = "Messages"; // $NON-NLS-1$
diff --git a/WoPeD-ProcessMetrics/src/main/java/org/woped/metrics/builder/MetricsBuilderErrorFrame.java b/WoPeD-ProcessMetrics/src/main/java/org/woped/metrics/builder/MetricsBuilderErrorFrame.java
index 6e0a57d98..740765101 100644
--- a/WoPeD-ProcessMetrics/src/main/java/org/woped/metrics/builder/MetricsBuilderErrorFrame.java
+++ b/WoPeD-ProcessMetrics/src/main/java/org/woped/metrics/builder/MetricsBuilderErrorFrame.java
@@ -12,7 +12,9 @@
 import org.woped.metrics.exceptions.CalculateFormulaException;
 import org.woped.metrics.exceptions.NestedCalculateFormulaException;
 
-/** @author Tobias Lorentz This UI displays all error which were found by the consistency check */
+/**
+ * @author Tobias Lorentz This UI displays all error which were found by the consistency check
+ */
 public class MetricsBuilderErrorFrame extends JFrame {
   /** */
   private static final long serialVersionUID = -3222238220054903505L;
diff --git a/WoPeD-ProcessMetrics/src/main/java/org/woped/metrics/exceptions/AntlrException.java b/WoPeD-ProcessMetrics/src/main/java/org/woped/metrics/exceptions/AntlrException.java
index b537a2a80..556e8431d 100644
--- a/WoPeD-ProcessMetrics/src/main/java/org/woped/metrics/exceptions/AntlrException.java
+++ b/WoPeD-ProcessMetrics/src/main/java/org/woped/metrics/exceptions/AntlrException.java
@@ -21,7 +21,9 @@ public AntlrException(RecognitionException exception, String shortText, String[]
     this.shortText = shortText;
     AntlrException.tokens = tokens;
   }
-  /** @param exception */
+  /**
+   * @param exception
+   */
   public AntlrException(RecognitionException exception) {
     super();
     this.exception = exception;
@@ -33,11 +35,15 @@ public AntlrException(RecognitionException exception) {
   public String getLocalizedMessage() {
     return shortText;
   }
-  /** @return the exception */
+  /**
+   * @return the exception
+   */
   public RecognitionException getException() {
     return exception;
   }
-  /** @return the shortText */
+  /**
+   * @return the shortText
+   */
   public String getShortText() {
     return shortText;
   }
diff --git a/WoPeD-ProcessMetrics/src/main/java/org/woped/metrics/exceptions/CalculateFormulaException.java b/WoPeD-ProcessMetrics/src/main/java/org/woped/metrics/exceptions/CalculateFormulaException.java
index 0e7ea8a8e..7b7f41170 100644
--- a/WoPeD-ProcessMetrics/src/main/java/org/woped/metrics/exceptions/CalculateFormulaException.java
+++ b/WoPeD-ProcessMetrics/src/main/java/org/woped/metrics/exceptions/CalculateFormulaException.java
@@ -2,7 +2,9 @@
 
 import org.woped.gui.translations.Messages;
 
-/** @author Tobias Lorentz */
+/**
+ * @author Tobias Lorentz
+ */
 public class CalculateFormulaException extends Exception {
 
   /** */
diff --git a/WoPeD-ProcessMetrics/src/main/java/org/woped/metrics/exceptions/InfiniteRecursiveFormulaCallException.java b/WoPeD-ProcessMetrics/src/main/java/org/woped/metrics/exceptions/InfiniteRecursiveFormulaCallException.java
index 345d731c2..a25379128 100644
--- a/WoPeD-ProcessMetrics/src/main/java/org/woped/metrics/exceptions/InfiniteRecursiveFormulaCallException.java
+++ b/WoPeD-ProcessMetrics/src/main/java/org/woped/metrics/exceptions/InfiniteRecursiveFormulaCallException.java
@@ -2,7 +2,9 @@
 
 import org.woped.gui.translations.Messages;
 
-/** @author Tobias Lorentz */
+/**
+ * @author Tobias Lorentz
+ */
 public class InfiniteRecursiveFormulaCallException extends CalculateFormulaException {
 
   /** */
diff --git a/WoPeD-ProcessMetrics/src/main/java/org/woped/metrics/exceptions/NestedCalculateFormulaException.java b/WoPeD-ProcessMetrics/src/main/java/org/woped/metrics/exceptions/NestedCalculateFormulaException.java
index 04bc96882..cba6b4827 100644
--- a/WoPeD-ProcessMetrics/src/main/java/org/woped/metrics/exceptions/NestedCalculateFormulaException.java
+++ b/WoPeD-ProcessMetrics/src/main/java/org/woped/metrics/exceptions/NestedCalculateFormulaException.java
@@ -12,7 +12,9 @@ public class NestedCalculateFormulaException extends CalculateFormulaException {
 
   private ArrayList<CalculateFormulaException> errorList;
 
-  /** @param errorList */
+  /**
+   * @param errorList
+   */
   public NestedCalculateFormulaException(ArrayList<CalculateFormulaException> errorList) {
     super();
     this.errorList = errorList;
diff --git a/WoPeD-ProcessMetrics/src/main/java/org/woped/metrics/formalGrammar/ErrorList.java b/WoPeD-ProcessMetrics/src/main/java/org/woped/metrics/formalGrammar/ErrorList.java
index 060fe5854..163d375fb 100644
--- a/WoPeD-ProcessMetrics/src/main/java/org/woped/metrics/formalGrammar/ErrorList.java
+++ b/WoPeD-ProcessMetrics/src/main/java/org/woped/metrics/formalGrammar/ErrorList.java
@@ -3,7 +3,9 @@
 import java.util.ArrayList;
 import org.woped.metrics.exceptions.CalculateFormulaException;
 
-/** @author Tobias Lorentz */
+/**
+ * @author Tobias Lorentz
+ */
 public class ErrorList {
   private ArrayList<CalculateFormulaException> errorList;
   private static ErrorList instance;
diff --git a/WoPeD-ProcessMetrics/src/main/java/org/woped/metrics/formulaEnhancement/FormulaEnhancementList.java b/WoPeD-ProcessMetrics/src/main/java/org/woped/metrics/formulaEnhancement/FormulaEnhancementList.java
index 791800a86..c19d29bbb 100644
--- a/WoPeD-ProcessMetrics/src/main/java/org/woped/metrics/formulaEnhancement/FormulaEnhancementList.java
+++ b/WoPeD-ProcessMetrics/src/main/java/org/woped/metrics/formulaEnhancement/FormulaEnhancementList.java
@@ -26,7 +26,9 @@ private FormulaEnhancementList() {
     enhancementList = new HashMap<String, String>();
   }
 
-  /** @return an Instance of the class Singleton-Pattern */
+  /**
+   * @return an Instance of the class Singleton-Pattern
+   */
   public static FormulaEnhancementList getInstance() {
     if (instance == null) instance = new FormulaEnhancementList();
 
@@ -43,7 +45,9 @@ public void AddFormula(String formulaID, String enhancedFormula) {
     this.notifyFormulaEnhancementListChangedEvent(new FormulaEnhancementListChangedEvent(this));
   }
 
-  /** @return all FormulaIDs */
+  /**
+   * @return all FormulaIDs
+   */
   public Set<String> getAllFormulaIDs() {
     return enhancementList.keySet();
   }
@@ -96,7 +100,9 @@ public boolean enhancementsAvailable() {
     return !this.enhancementList.isEmpty();
   }
 
-  /** @param formulaID */
+  /**
+   * @param formulaID
+   */
   public void acceptEnhancement(String formulaID) {
     // Put the new formula into the xml-writing-queue
     ConfigurationManager.getMetricsConfiguration()
@@ -107,7 +113,9 @@ public void acceptEnhancement(String formulaID) {
     this.enhancementList.remove(formulaID);
     this.notifyFormulaEnhancementListChangedEvent(new FormulaEnhancementListChangedEvent(this));
   }
-  /** @param selectedRow The Row-Number of the FormulaEnhancementUI */
+  /**
+   * @param selectedRow The Row-Number of the FormulaEnhancementUI
+   */
   public void acceptEnhancement(int selectedRow) {
     this.acceptEnhancement(this.getEnhancementListAsArray()[selectedRow][0]);
   }
diff --git a/WoPeD-ProcessMetrics/src/main/java/org/woped/metrics/formulaEnhancement/FormulaEnhancementListChangedEvent.java b/WoPeD-ProcessMetrics/src/main/java/org/woped/metrics/formulaEnhancement/FormulaEnhancementListChangedEvent.java
index cca453d71..813b104bc 100644
--- a/WoPeD-ProcessMetrics/src/main/java/org/woped/metrics/formulaEnhancement/FormulaEnhancementListChangedEvent.java
+++ b/WoPeD-ProcessMetrics/src/main/java/org/woped/metrics/formulaEnhancement/FormulaEnhancementListChangedEvent.java
@@ -2,7 +2,9 @@
 
 import java.util.EventObject;
 
-/** @author Tobias Lorentz */
+/**
+ * @author Tobias Lorentz
+ */
 public class FormulaEnhancementListChangedEvent extends EventObject {
 
   /** */
diff --git a/WoPeD-ProcessMetrics/src/main/java/org/woped/metrics/formulaEnhancement/FormulaEnhancementListChangedEventListener.java b/WoPeD-ProcessMetrics/src/main/java/org/woped/metrics/formulaEnhancement/FormulaEnhancementListChangedEventListener.java
index e4629eb25..1633c82d4 100644
--- a/WoPeD-ProcessMetrics/src/main/java/org/woped/metrics/formulaEnhancement/FormulaEnhancementListChangedEventListener.java
+++ b/WoPeD-ProcessMetrics/src/main/java/org/woped/metrics/formulaEnhancement/FormulaEnhancementListChangedEventListener.java
@@ -3,7 +3,9 @@
 
 import java.util.EventListener;
 
-/** @author Tobias Lorentz */
+/**
+ * @author Tobias Lorentz
+ */
 public interface FormulaEnhancementListChangedEventListener extends EventListener {
   void formulaEnhancementListChanged(FormulaEnhancementListChangedEvent e);
 }
diff --git a/WoPeD-ProcessMetrics/src/main/java/org/woped/metrics/formulaEnhancement/FormulaEnhancementUI.java b/WoPeD-ProcessMetrics/src/main/java/org/woped/metrics/formulaEnhancement/FormulaEnhancementUI.java
index 6c54a651e..de84de22b 100644
--- a/WoPeD-ProcessMetrics/src/main/java/org/woped/metrics/formulaEnhancement/FormulaEnhancementUI.java
+++ b/WoPeD-ProcessMetrics/src/main/java/org/woped/metrics/formulaEnhancement/FormulaEnhancementUI.java
@@ -13,7 +13,9 @@
 import javax.swing.table.DefaultTableModel;
 import org.woped.gui.translations.Messages;
 
-/** @author Tobias Lorentz */
+/**
+ * @author Tobias Lorentz
+ */
 public class FormulaEnhancementUI extends JFrame
     implements FormulaEnhancementListChangedEventListener {
 
diff --git a/WoPeD-ProcessMetrics/src/main/java/org/woped/metrics/metricsCalculation/MetricsCalculator.java b/WoPeD-ProcessMetrics/src/main/java/org/woped/metrics/metricsCalculation/MetricsCalculator.java
index 9c84db055..fa7dc0b8e 100644
--- a/WoPeD-ProcessMetrics/src/main/java/org/woped/metrics/metricsCalculation/MetricsCalculator.java
+++ b/WoPeD-ProcessMetrics/src/main/java/org/woped/metrics/metricsCalculation/MetricsCalculator.java
@@ -47,7 +47,9 @@ public class MetricsCalculator {
   private MetricsHighlighter highlight = new MetricsHighlighter();
   private boolean algorithmHighlighting =
       ConfigurationManager.getConfiguration().isUseAlgorithmHighlighting();
-  /** @author Tobias Lorentz Key = Variable-Name Value = Variable-Value */
+  /**
+   * @author Tobias Lorentz Key = Variable-Name Value = Variable-Value
+   */
   private HashMap<String, Double> variableValueBuffer;
 
   /**
@@ -481,7 +483,9 @@ public double calculateVariable(String token, HashSet<String> stack, boolean doN
         } catch (EnhancementException ee) {
           // The formula was enhanced. The value for this enhanced Formula
           // is stored inside the exception object.
-          /** @author Tobias Lorentz */
+          /**
+           * @author Tobias Lorentz
+           */
           result = ee.getValue();
           // Add this formula to the EnhancementList
           FormulaEnhancementList.getInstance().AddFormula(token, ee.getEnhancedFormula());
@@ -506,7 +510,9 @@ public double calculateVariable(String token, HashSet<String> stack, boolean doN
         } catch (EnhancementException ee) {
           // The formula was enhanced. The value for this enhanced Formula
           // is stored inside the exception object.
-          /** @author Tobias Lorentz */
+          /**
+           * @author Tobias Lorentz
+           */
           result = ee.getValue();
           // Add this formula to the EnhancementList
           FormulaEnhancementList.getInstance().AddFormula(token, ee.getEnhancedFormula());
diff --git a/WoPeD-ProcessMetrics/src/main/java/org/woped/metrics/sidebar/SideBar.java b/WoPeD-ProcessMetrics/src/main/java/org/woped/metrics/sidebar/SideBar.java
index c4c588981..e13b46fa7 100644
--- a/WoPeD-ProcessMetrics/src/main/java/org/woped/metrics/sidebar/SideBar.java
+++ b/WoPeD-ProcessMetrics/src/main/java/org/woped/metrics/sidebar/SideBar.java
@@ -27,7 +27,9 @@
 import org.woped.metrics.metricsCalculation.UITypes.UIMetricsGroup;
 import org.woped.metrics.sidebar.components.MetricGroup;
 
-/** @author Mathias Gruschinske The sidebar class, which contains the metrics */
+/**
+ * @author Mathias Gruschinske The sidebar class, which contains the metrics
+ */
 public class SideBar extends JPanel {
 
   private static final long serialVersionUID = 1L;
@@ -38,7 +40,9 @@ public class SideBar extends JPanel {
   protected static final String PREFIX_QUALANALYSIS = "AnalysisSideBar.";
   protected static final String PREFIX_BUTTON = PREFIX_QUALANALYSIS + "Beginner.Button.";
 
-  /** @param editor sets the instance variable and adds the components */
+  /**
+   * @param editor sets the instance variable and adds the components
+   */
   public SideBar(IEditor editor) {
     super(new BorderLayout());
     SideBar.editor = editor;
@@ -272,17 +276,23 @@ public void setKeyLabelWidth() {
     }
   }
 
-  /** @param uiHandler sets the UI Request handler */
+  /**
+   * @param uiHandler sets the UI Request handler
+   */
   public void setUiHandler(MetricsUIRequestHandler uiHandler) {
     SideBar.uiHandler = uiHandler;
   }
 
-  /** @return gets the UI Request Handler */
+  /**
+   * @return gets the UI Request Handler
+   */
   public static MetricsUIRequestHandler getUiHandler() {
     return uiHandler;
   }
 
-  /** @author Mathias Gruschinske label with mouse listener and icon to hide the sidebar */
+  /**
+   * @author Mathias Gruschinske label with mouse listener and icon to hide the sidebar
+   */
   class HideLabel extends JLabel {
 
     private static final long serialVersionUID = 1L;
@@ -387,7 +397,9 @@ public void mouseClicked(MouseEvent e) {
     }
   }
 
-  /** @author Mathias Gruschinske label with mouse listener and icon to call the metrics builder */
+  /**
+   * @author Mathias Gruschinske label with mouse listener and icon to call the metrics builder
+   */
   class ConfigLabel extends JLabel {
 
     private static final long serialVersionUID = 1L;
diff --git a/WoPeD-ProcessMetrics/src/main/java/org/woped/metrics/sidebar/components/MetricGroup.java b/WoPeD-ProcessMetrics/src/main/java/org/woped/metrics/sidebar/components/MetricGroup.java
index 4e92ee752..713d8134d 100644
--- a/WoPeD-ProcessMetrics/src/main/java/org/woped/metrics/sidebar/components/MetricGroup.java
+++ b/WoPeD-ProcessMetrics/src/main/java/org/woped/metrics/sidebar/components/MetricGroup.java
@@ -16,7 +16,9 @@
 import org.woped.metrics.metricsCalculation.UITypes.UIMetricsGroup;
 import org.woped.metrics.sidebar.SideBar;
 
-/** @author Mathias Gruschinske A metric group contains metric items and combine them to a group */
+/**
+ * @author Mathias Gruschinske A metric group contains metric items and combine them to a group
+ */
 public class MetricGroup extends JPanel {
 
   private static final long serialVersionUID = 1L;
diff --git a/WoPeD-ProcessMetrics/src/main/java/org/woped/metrics/sidebar/components/MetricItem.java b/WoPeD-ProcessMetrics/src/main/java/org/woped/metrics/sidebar/components/MetricItem.java
index da784a8f0..9a7819a97 100644
--- a/WoPeD-ProcessMetrics/src/main/java/org/woped/metrics/sidebar/components/MetricItem.java
+++ b/WoPeD-ProcessMetrics/src/main/java/org/woped/metrics/sidebar/components/MetricItem.java
@@ -367,7 +367,9 @@ public void mouseClicked(MouseEvent arg0) {
     }
   }
 
-  /** @param isVisible sets the visibility of the detail panel and change the icon of the button */
+  /**
+   * @param isVisible sets the visibility of the detail panel and change the icon of the button
+   */
   public void setDetailsVisiblity(boolean isVisible) {
 
     detailPanel.setVisible(isVisible);
diff --git a/WoPeD-ProcessMetrics/src/main/java/org/woped/metrics/sidebar/components/NetStatistic.java b/WoPeD-ProcessMetrics/src/main/java/org/woped/metrics/sidebar/components/NetStatistic.java
index c24b4e544..1028719bf 100644
--- a/WoPeD-ProcessMetrics/src/main/java/org/woped/metrics/sidebar/components/NetStatistic.java
+++ b/WoPeD-ProcessMetrics/src/main/java/org/woped/metrics/sidebar/components/NetStatistic.java
@@ -14,7 +14,9 @@
 import org.woped.qualanalysis.service.QualAnalysisServiceFactory;
 import org.woped.qualanalysis.sidebar.assistant.components.ClickLabel;
 
-/** @author Mathias Gruschinske own class for Net Statistics from QualAnalysis */
+/**
+ * @author Mathias Gruschinske own class for Net Statistics from QualAnalysis
+ */
 public class NetStatistic extends JPanel {
 
   private static final long serialVersionUID = 1L;
@@ -26,7 +28,9 @@ public class NetStatistic extends JPanel {
   protected static final Font ITEMS_FONT = DefaultStaticConfiguration.DEFAULT_LABEL_FONT;
   protected static final String SUB_POINT = " - ";
 
-  /** @param editor sets the instance variable for the statistics */
+  /**
+   * @param editor sets the instance variable for the statistics
+   */
   public NetStatistic(IEditor editor) {
 
     super(new BorderLayout());
diff --git a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/p2t/P2TSideBar.java b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/p2t/P2TSideBar.java
index ee3eee205..fc606da44 100644
--- a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/p2t/P2TSideBar.java
+++ b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/p2t/P2TSideBar.java
@@ -39,7 +39,9 @@ public class P2TSideBar extends JPanel implements ActionListener {
   private boolean threadInProgress = false;
   private boolean firstTimeDisplayed = false;
 
-  /** @param currentEditor Editor in which the instance of the sidebar is used */
+  /**
+   * @param currentEditor Editor in which the instance of the sidebar is used
+   */
   public P2TSideBar(IEditor currentEditor) {
     super();
     editor = currentEditor;
diff --git a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/service/AbstractQualanalysisService.java b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/service/AbstractQualanalysisService.java
index c5a637ddd..fb0e13eb9 100644
--- a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/service/AbstractQualanalysisService.java
+++ b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/service/AbstractQualanalysisService.java
@@ -244,13 +244,17 @@ public Set<AbstractPetriNetElementModel> getNonLiveTransitions() {
     return nonLiveTransitions;
   }
 
-  /** @see IQualanalysisService#isWorkflowNet() */
+  /**
+   * @see IQualanalysisService#isWorkflowNet()
+   */
   @Override
   public boolean isWorkflowNet() {
     return workflowCheck.isWorkflowNet();
   }
 
-  /** @see IQualanalysisService#isSound() */
+  /**
+   * @see IQualanalysisService#isSound()
+   */
   @Override
   public boolean isSound() {
     if (!isWorkflowNet()) {
diff --git a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/service/IQualanalysisService.java b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/service/IQualanalysisService.java
index 5cab73b0b..499bb8b67 100644
--- a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/service/IQualanalysisService.java
+++ b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/service/IQualanalysisService.java
@@ -14,34 +14,54 @@
  */
 public interface IQualanalysisService {
 
-  /** @return a set of all places */
+  /**
+   * @return a set of all places
+   */
   public Set<AbstractPetriNetElementModel> getPlaces();
 
-  /** @return a set of all transitions */
+  /**
+   * @return a set of all transitions
+   */
   public Set<AbstractPetriNetElementModel> getTransitions();
 
-  /** @return a set of all operators */
+  /**
+   * @return a set of all operators
+   */
   public Set<AbstractPetriNetElementModel> getOperators();
 
-  /** @return a set of all subprocesses */
+  /**
+   * @return a set of all subprocesses
+   */
   public Set<AbstractPetriNetElementModel> getSubprocesses();
 
-  /** @return the number of arcs */
+  /**
+   * @return the number of arcs
+   */
   public int getNumArcs();
 
-  /** @return a set of all freeChoiceViolations (each violation is a set of elements) */
+  /**
+   * @return a set of all freeChoiceViolations (each violation is a set of elements)
+   */
   public Set<Set<AbstractPetriNetElementModel>> getFreeChoiceViolations();
 
-  /** @return a set of all wrongly used operators */
+  /**
+   * @return a set of all wrongly used operators
+   */
   public Set<AbstractPetriNetElementModel> getWronglyUsedOperators();
 
-  /** @return a set of all not-connected nodes */
+  /**
+   * @return a set of all not-connected nodes
+   */
   public Set<AbstractPetriNetElementModel> getNotConnectedNodes();
 
-  /** @return a set of all connected components (each component is a set of elements) */
+  /**
+   * @return a set of all connected components (each component is a set of elements)
+   */
   public Set<Set<AbstractPetriNetElementModel>> getConnectedComponents();
 
-  /** @return a set of all not-strongly-connected nodes */
+  /**
+   * @return a set of all not-strongly-connected nodes
+   */
   public Set<AbstractPetriNetElementModel> getNotStronglyConnectedNodes();
 
   /**
@@ -51,25 +71,39 @@ public interface IQualanalysisService {
    */
   Set<ArcModel> getArcWeightViolations();
 
-  /** @return a set of strongly connected components (each component is a set of elements) */
+  /**
+   * @return a set of strongly connected components (each component is a set of elements)
+   */
   public Set<Set<AbstractPetriNetElementModel>> getStronglyConnectedComponents();
 
-  /** @return a set of all sourcePlaces */
+  /**
+   * @return a set of all sourcePlaces
+   */
   public Set<AbstractPetriNetElementModel> getSourcePlaces();
 
-  /** @return a set of all sinkPlaces */
+  /**
+   * @return a set of all sinkPlaces
+   */
   public Set<AbstractPetriNetElementModel> getSinkPlaces();
 
-  /** @return a set of all sourceTransitions */
+  /**
+   * @return a set of all sourceTransitions
+   */
   public Set<AbstractPetriNetElementModel> getSourceTransitions();
 
-  /** @return a set of all sinkTransitions */
+  /**
+   * @return a set of all sinkTransitions
+   */
   public Set<AbstractPetriNetElementModel> getSinkTransitions();
 
-  /** @return a set of all PTHandles (each handle is a set of elements) */
+  /**
+   * @return a set of all PTHandles (each handle is a set of elements)
+   */
   public Set<Set<AbstractPetriNetElementModel>> getPTHandles();
 
-  /** @return a set of all TPHandles (each handle is a set of elements) */
+  /**
+   * @return a set of all TPHandles (each handle is a set of elements)
+   */
   public Set<Set<AbstractPetriNetElementModel>> getTPHandles();
 
   /**
@@ -79,22 +113,34 @@ public interface IQualanalysisService {
    */
   public HashSet<Set<ClusterElement>> getM_handleClusters();
 
-  /** @return a set of all SComponents (each SComponent is a list of elements) */
+  /**
+   * @return a set of all SComponents (each SComponent is a list of elements)
+   */
   public Set<List<AbstractPetriNetElementModel>> getSComponents();
 
-  /** @return a set of all not-SCovered */
+  /**
+   * @return a set of all not-SCovered
+   */
   public Set<AbstractPetriNetElementModel> getNotSCovered();
 
-  /** @return an set of places with wrong token count in initial marking */
+  /**
+   * @return an set of places with wrong token count in initial marking
+   */
   public Set<AbstractPetriNetElementModel> getWronglyMarkedPlaces();
 
-  /** @return a set of all unbounded places */
+  /**
+   * @return a set of all unbounded places
+   */
   public Set<AbstractPetriNetElementModel> getUnboundedPlaces();
 
-  /** @return a set of all dead transitions */
+  /**
+   * @return a set of all dead transitions
+   */
   public Set<AbstractPetriNetElementModel> getDeadTransitions();
 
-  /** @return a set of all non-live transitions */
+  /**
+   * @return a set of all non-live transitions
+   */
   public Set<AbstractPetriNetElementModel> getNonLiveTransitions();
 
   /**
diff --git a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/service/QualanalysisServiceImplement.java b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/service/QualanalysisServiceImplement.java
index 8403a5adc..03a3f6df2 100644
--- a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/service/QualanalysisServiceImplement.java
+++ b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/service/QualanalysisServiceImplement.java
@@ -11,7 +11,9 @@
  */
 public class QualanalysisServiceImplement extends AbstractQualanalysisService {
 
-  /** @param editor the editor the service is referring to */
+  /**
+   * @param editor the editor the service is referring to
+   */
   public QualanalysisServiceImplement(IEditor editor) {
     super(editor);
     sComponent = new SComponentImplement(editor);
diff --git a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/service/interfaces/INetStatistics.java b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/service/interfaces/INetStatistics.java
index e49291245..c78384eb5 100644
--- a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/service/interfaces/INetStatistics.java
+++ b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/service/interfaces/INetStatistics.java
@@ -11,13 +11,19 @@
  */
 public interface INetStatistics {
 
-  /** @return a set with all places */
+  /**
+   * @return a set with all places
+   */
   public Set<AbstractPetriNetElementModel> getPlaces();
 
-  /** @return a set with all transitions */
+  /**
+   * @return a set with all transitions
+   */
   public Set<AbstractPetriNetElementModel> getTransitions();
 
-  /** @return a set with all operator-transitions */
+  /**
+   * @return a set with all operator-transitions
+   */
   public Set<AbstractPetriNetElementModel> getOperators();
 
   /**
@@ -44,9 +50,13 @@ public interface INetStatistics {
    */
   public Set<AbstractPetriNetElementModel> getXorSplits();
 
-  /** @return a set with all subprocesses */
+  /**
+   * @return a set with all subprocesses
+   */
   public Set<AbstractPetriNetElementModel> getSubprocesses();
 
-  /** @return the number of arcs */
+  /**
+   * @return the number of arcs
+   */
   public int getNumArcs();
 }
diff --git a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/service/interfaces/ISComponent.java b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/service/interfaces/ISComponent.java
index 0feb8b777..8b127e4e9 100644
--- a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/service/interfaces/ISComponent.java
+++ b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/service/interfaces/ISComponent.java
@@ -12,9 +12,13 @@
  */
 public interface ISComponent {
 
-  /** @return a set with all sComponents */
+  /**
+   * @return a set with all sComponents
+   */
   public Set<List<AbstractPetriNetElementModel>> getSComponents();
 
-  /** @return a set with all not-SCovered */
+  /**
+   * @return a set with all not-SCovered
+   */
   public Set<AbstractPetriNetElementModel> getNotSCovered();
 }
diff --git a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/service/interfaces/ISoundnessCheck.java b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/service/interfaces/ISoundnessCheck.java
index 9d844a84b..da10da718 100644
--- a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/service/interfaces/ISoundnessCheck.java
+++ b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/service/interfaces/ISoundnessCheck.java
@@ -11,12 +11,18 @@
  */
 public interface ISoundnessCheck {
 
-  /** @return a set with all dead transitions */
+  /**
+   * @return a set with all dead transitions
+   */
   public Set<AbstractPetriNetElementModel> getDeadTransitions();
 
-  /** @return a set with all nonLive transitions */
+  /**
+   * @return a set with all nonLive transitions
+   */
   public Set<AbstractPetriNetElementModel> getNonLiveTransitions();
 
-  /** @return a set with for all unbounded places */
+  /**
+   * @return a set with for all unbounded places
+   */
   public Set<AbstractPetriNetElementModel> getUnboundedPlaces();
 }
diff --git a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/service/interfaces/IWellStructuredness.java b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/service/interfaces/IWellStructuredness.java
index fb9939b17..4cd344975 100644
--- a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/service/interfaces/IWellStructuredness.java
+++ b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/service/interfaces/IWellStructuredness.java
@@ -13,12 +13,18 @@
  */
 public interface IWellStructuredness {
 
-  /** @return a set with all pt-handles */
+  /**
+   * @return a set with all pt-handles
+   */
   public Set<Set<AbstractPetriNetElementModel>> getPTHandles();
 
-  /** @return a set with all tp-handles */
+  /**
+   * @return a set with all tp-handles
+   */
   public Set<Set<AbstractPetriNetElementModel>> getTPHandles();
 
-  /** @return a set with ?? (what is this for?) */
+  /**
+   * @return a set with ?? (what is this for?)
+   */
   public HashSet<Set<ClusterElement>> getM_handleClusters();
 }
diff --git a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/service/interfaces/IWorkflowCheck.java b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/service/interfaces/IWorkflowCheck.java
index 87c0787ed..4d48737c1 100644
--- a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/service/interfaces/IWorkflowCheck.java
+++ b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/service/interfaces/IWorkflowCheck.java
@@ -12,22 +12,34 @@
  */
 public interface IWorkflowCheck {
 
-  /** @return a set with all source places */
+  /**
+   * @return a set with all source places
+   */
   public Set<AbstractPetriNetElementModel> getSourcePlaces();
 
-  /** @return a set with all sink places */
+  /**
+   * @return a set with all sink places
+   */
   public Set<AbstractPetriNetElementModel> getSinkPlaces();
 
-  /** @return a set with all transitions with empty preset */
+  /**
+   * @return a set with all transitions with empty preset
+   */
   public Set<AbstractPetriNetElementModel> getSourceTransitions();
 
-  /** @return a set with all transitions with empty postset */
+  /**
+   * @return a set with all transitions with empty postset
+   */
   public Set<AbstractPetriNetElementModel> getSinkTransitions();
 
-  /** @return a set with all nodes with empty preset and empty postset */
+  /**
+   * @return a set with all nodes with empty preset and empty postset
+   */
   public Set<AbstractPetriNetElementModel> getNotConnectedNodes();
 
-  /** @return a set with all nodes not being strongly connected */
+  /**
+   * @return a set with all nodes not being strongly connected
+   */
   public Set<AbstractPetriNetElementModel> getNotStronglyConnectedNodes();
 
   /**
@@ -37,12 +49,18 @@ public interface IWorkflowCheck {
    */
   Set<ArcModel> getArcWeightViolations();
 
-  /** @return a set with strongly connected components. */
+  /**
+   * @return a set with strongly connected components.
+   */
   public Set<Set<AbstractPetriNetElementModel>> getStronglyConnectedComponents();
 
-  /** @return a set with strongly connected components. */
+  /**
+   * @return a set with strongly connected components.
+   */
   public Set<Set<AbstractPetriNetElementModel>> getConnectedComponents();
 
-  /** @return true if workflow-property is given */
+  /**
+   * @return true if workflow-property is given
+   */
   public boolean isWorkflowNet();
 }
diff --git a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/sidebar/SideBar.java b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/sidebar/SideBar.java
index 9ac3b54fc..b7406294d 100644
--- a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/sidebar/SideBar.java
+++ b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/sidebar/SideBar.java
@@ -82,7 +82,9 @@ private JPanel createBeginnerPanel() {
     return startPage;
   }
 
-  /** @return new Instance of the ExpertPage */
+  /**
+   * @return new Instance of the ExpertPage
+   */
   private JPanel createExpertPanel() {
     return new ExpertPage(editor, mediator, qualanService);
   }
diff --git a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/sidebar/assistant/components/BeginnerPanel.java b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/sidebar/assistant/components/BeginnerPanel.java
index 62bb0872f..f9776f59c 100644
--- a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/sidebar/assistant/components/BeginnerPanel.java
+++ b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/sidebar/assistant/components/BeginnerPanel.java
@@ -252,7 +252,9 @@ public void itemStateChanged(ItemEvent ie) {
 
   // end of adaption
 
-  /** @return navigation for assistant analysis sidebar */
+  /**
+   * @return navigation for assistant analysis sidebar
+   */
 
   /**
    * add components to the contentpane of the beginnerpanel
diff --git a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/sidebar/expert/ExpertFactory.java b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/sidebar/expert/ExpertFactory.java
index 1285201d9..58aaa45ce 100644
--- a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/sidebar/expert/ExpertFactory.java
+++ b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/sidebar/expert/ExpertFactory.java
@@ -21,29 +21,39 @@ public class ExpertFactory extends DefaultMutableTreeNode {
 
   private static final String prefix = "AnalysisSideBar.";
 
-  /** @return node containing tree title */
+  /**
+   * @return node containing tree title
+   */
   protected static DefaultMutableTreeNode getAnalysisInfo() {
     return new NetInfo(Messages.getString(prefix + "Title"));
   }
 
-  /** @return node containing all information from structural analysis of the petri net */
+  /**
+   * @return node containing all information from structural analysis of the petri net
+   */
   protected static DefaultMutableTreeNode getStructuralInfo() {
     return new NetInfo(Messages.getString(prefix + "StructuralAnalysis"));
   }
 
-  /** @return node containing all basic information about the petri net */
+  /**
+   * @return node containing all basic information about the petri net
+   */
   protected static DefaultMutableTreeNode getNetStatisticsInfo() {
     return new NetInfo(Messages.getString(prefix + "NetStatistics"));
   }
 
-  /** @return node containing information about places */
+  /**
+   * @return node containing information about places
+   */
   protected static DefaultMutableTreeNode getPlacesInfo(IQualanalysisService qualanService) {
     return new NodeGroupNetInfo(
         Messages.getString(prefix + "NumPlaces") + ": " + qualanService.getPlaces().size(),
         qualanService.getPlaces().iterator());
   }
 
-  /** @return node containing information about transitions */
+  /**
+   * @return node containing information about transitions
+   */
   protected static DefaultMutableTreeNode getTransitionsInfo(IQualanalysisService qualanService) {
     return new NodeGroupNetInfo(
         Messages.getString(prefix + "NumTransitions")
@@ -52,14 +62,18 @@ protected static DefaultMutableTreeNode getTransitionsInfo(IQualanalysisService
         qualanService.getTransitions().iterator());
   }
 
-  /** @return node containing information about operators */
+  /**
+   * @return node containing information about operators
+   */
   protected static DefaultMutableTreeNode getOperatorsInfo(IQualanalysisService qualanService) {
     return new NodeGroupNetInfo(
         Messages.getString(prefix + "NumOperators") + ": " + qualanService.getOperators().size(),
         qualanService.getOperators().iterator());
   }
 
-  /** @return node containing information about subprocesses */
+  /**
+   * @return node containing information about subprocesses
+   */
   protected static DefaultMutableTreeNode getSubprocessesInfo(IQualanalysisService qualanService) {
     return new NodeGroupNetInfo(
         Messages.getString(prefix + "NumSubprocesses")
@@ -68,12 +82,16 @@ protected static DefaultMutableTreeNode getSubprocessesInfo(IQualanalysisService
         qualanService.getSubprocesses().iterator());
   }
 
-  /** @return node containing information about arcs */
+  /**
+   * @return node containing information about arcs
+   */
   protected static DefaultMutableTreeNode getArcsInfo(IQualanalysisService qualanService) {
     return new NetInfo(Messages.getString(prefix + "NumArcs") + ": " + qualanService.getNumArcs());
   }
 
-  /** @return node containing information about wrongly used operators */
+  /**
+   * @return node containing information about wrongly used operators
+   */
   protected static DefaultMutableTreeNode getWronglyUsedOperatorsInfo(
       IQualanalysisService qualanService) {
     return new NodeGroupNetInfo(
@@ -93,7 +111,9 @@ public int getInfoState() {
     };
   }
 
-  /** @return node containing information about free-choice violations in the petri net */
+  /**
+   * @return node containing information about free-choice violations in the petri net
+   */
   protected static DefaultMutableTreeNode getFreeChoiceViolationsInfo(
       IQualanalysisService qualanService) {
     return new NodeGroupListNetInfo(
@@ -118,7 +138,9 @@ public int getInfoState() {
     };
   }
 
-  /** @return node containing information about sComponents in the petri net */
+  /**
+   * @return node containing information about sComponents in the petri net
+   */
   protected static DefaultMutableTreeNode getSComponentInfo() {
     return new NetInfo(Messages.getString(prefix + "SComponentAnalysis"));
   }
@@ -220,12 +242,16 @@ public int getInfoState() {
     };
   }
 
-  /** @return node containing information about the wellStructuredness of the net */
+  /**
+   * @return node containing information about the wellStructuredness of the net
+   */
   protected static DefaultMutableTreeNode getWellStructurednessInfo() {
     return new NetInfo(Messages.getString(prefix + "WellStructurednessAnalysis"));
   }
 
-  /** @return node containing information about place-transitions-handles */
+  /**
+   * @return node containing information about place-transitions-handles
+   */
   protected static DefaultMutableTreeNode getPTHandlesInfo(IQualanalysisService qualanService) {
     return new NodeGroupListNetInfo(
         Messages.getString(prefix + "NumPTHandles") + ": " + qualanService.getPTHandles().size(),
@@ -246,7 +272,9 @@ public int getInfoState() {
     };
   }
 
-  /** @return node containing information about transition-places-handles */
+  /**
+   * @return node containing information about transition-places-handles
+   */
   protected static DefaultMutableTreeNode getTPHandlesInfo(IQualanalysisService qualanService) {
     return new NodeGroupListNetInfo(
         Messages.getString(prefix + "NumTPHandles") + ": " + qualanService.getTPHandles().size(),
@@ -267,12 +295,16 @@ public int getInfoState() {
     };
   }
 
-  /** @return node containing information about soundness */
+  /**
+   * @return node containing information about soundness
+   */
   protected static DefaultMutableTreeNode getSoundnessInfo() {
     return new NetInfo(Messages.getString(prefix + "SoundnessAnalysis"));
   }
 
-  /** @return node containing information about the workflow-property of the petri net */
+  /**
+   * @return node containing information about the workflow-property of the petri net
+   */
   protected static DefaultMutableTreeNode getWorkflowInfo(IQualanalysisService qualanService) {
     return new NetInfo(Messages.getString(prefix + "WorkflowAnalysis"));
   }
@@ -300,7 +332,9 @@ public int getInfoState() {
     };
   }
 
-  /** @return node containing information about source-places */
+  /**
+   * @return node containing information about source-places
+   */
   protected static DefaultMutableTreeNode getSourcePlacesInfo(IQualanalysisService qualanService) {
     return new NodeGroupNetInfo(
         Messages.getString(prefix + "NumSourcePlaces")
@@ -319,7 +353,9 @@ public int getInfoState() {
     };
   }
 
-  /** @return node containing information about sink-places */
+  /**
+   * @return node containing information about sink-places
+   */
   protected static DefaultMutableTreeNode getSinkPlacesInfo(IQualanalysisService qualanService) {
     return new NodeGroupNetInfo(
         Messages.getString(prefix + "NumSinkPlaces") + ": " + qualanService.getSinkPlaces().size(),
@@ -336,7 +372,9 @@ public int getInfoState() {
     };
   }
 
-  /** @return node containing information about source-transitions */
+  /**
+   * @return node containing information about source-transitions
+   */
   protected static DefaultMutableTreeNode getSourceTransitionsInfo(
       IQualanalysisService qualanService) {
     return new NodeGroupNetInfo(
@@ -356,7 +394,9 @@ public int getInfoState() {
     };
   }
 
-  /** @return node containing information about sink-transitions */
+  /**
+   * @return node containing information about sink-transitions
+   */
   protected static DefaultMutableTreeNode getSinkTransitionsInfo(
       IQualanalysisService qualanService) {
     return new NodeGroupNetInfo(
@@ -376,7 +416,9 @@ public int getInfoState() {
     };
   }
 
-  /** @return node containing information about unconnected nodes in the petri net */
+  /**
+   * @return node containing information about unconnected nodes in the petri net
+   */
   protected static DefaultMutableTreeNode getUnconnectedNodesInfo(
       IQualanalysisService qualanService) {
     return new NodeGroupNetInfo(
@@ -396,7 +438,9 @@ public int getInfoState() {
     };
   }
 
-  /** @return node containing information about not strongly connected nodes in the petri net */
+  /**
+   * @return node containing information about not strongly connected nodes in the petri net
+   */
   protected static DefaultMutableTreeNode getNotStronglyConnectedInfo(
       IQualanalysisService qualanService) {
     return new NodeGroupNetInfo(
@@ -416,7 +460,9 @@ public int getInfoState() {
     };
   }
 
-  /** @return node containing information about the initial marking */
+  /**
+   * @return node containing information about the initial marking
+   */
   protected static DefaultMutableTreeNode getInitialMarkingInfo() {
     return new NetInfo(Messages.getString(prefix + "InitialMarkingAnalysis"));
   }
@@ -444,12 +490,16 @@ public int getInfoState() {
     };
   }
 
-  /** @return node containing information about boundedness of the petri net */
+  /**
+   * @return node containing information about boundedness of the petri net
+   */
   protected static DefaultMutableTreeNode getBoundednessInfo() {
     return new NetInfo(Messages.getString(prefix + "BoundednessAnalysis"));
   }
 
-  /** @return node containing information about boundedness of places */
+  /**
+   * @return node containing information about boundedness of places
+   */
   protected static DefaultMutableTreeNode getUnboundedPlacesInfo(
       IQualanalysisService qualanService) {
     return new NodeGroupNetInfo(
@@ -469,12 +519,16 @@ public int getInfoState() {
     };
   }
 
-  /** @return node containing information about liveness of the petri net */
+  /**
+   * @return node containing information about liveness of the petri net
+   */
   protected static DefaultMutableTreeNode getLivenessInfo() {
     return new NetInfo(Messages.getString(prefix + "LivenessAnalysis"));
   }
 
-  /** @return node containing information about dead transitions */
+  /**
+   * @return node containing information about dead transitions
+   */
   protected static DefaultMutableTreeNode getDeadTransitionsInfo(
       IQualanalysisService qualanService) {
     return new NodeGroupNetInfo(
@@ -494,7 +548,9 @@ public int getInfoState() {
     };
   }
 
-  /** @return node containing information about non-live transitions */
+  /**
+   * @return node containing information about non-live transitions
+   */
   protected static DefaultMutableTreeNode getNonLiveTransitionsInfo(
       IQualanalysisService qualanService) {
     return new NodeGroupNetInfo(
diff --git a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/sidebar/expert/ExpertPage.java b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/sidebar/expert/ExpertPage.java
index 968f8b929..1dfa7c8ac 100644
--- a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/sidebar/expert/ExpertPage.java
+++ b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/sidebar/expert/ExpertPage.java
@@ -136,7 +136,9 @@ private DefaultMutableTreeNode getNodeTree(IQualanalysisService qualanService) {
     return analysisInfo;
   }
 
-  /** @return the treeObejct */
+  /**
+   * @return the treeObejct
+   */
   public JTree getTreeObject() {
     return treeObject;
   }
diff --git a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/simulation/ReferenceProvider.java b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/simulation/ReferenceProvider.java
index 20809732f..6e488583d 100644
--- a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/simulation/ReferenceProvider.java
+++ b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/simulation/ReferenceProvider.java
@@ -38,7 +38,9 @@ public void setMediatorReference(AbstractApplicationMediator Mediator) {
     MediatorReference = Mediator;
   }
 
-  /** @return Reference to the AbstractApplicationMediator (default: null) */
+  /**
+   * @return Reference to the AbstractApplicationMediator (default: null)
+   */
   public AbstractApplicationMediator getMediatorReference() {
     return MediatorReference;
   }
@@ -52,7 +54,9 @@ public void setUIReference(IUserInterface UI) {
     UIReference = UI;
   }
 
-  /** @return reference to the IUserInterface */
+  /**
+   * @return reference to the IUserInterface
+   */
   public IUserInterface getUIReference() {
     return UIReference;
   }
@@ -66,7 +70,9 @@ public void setDesktopReference(JDesktopPane Desktop) {
     DesktopReference = Desktop;
   }
 
-  /** @return the reference to the JDesktopPane */
+  /**
+   * @return the reference to the JDesktopPane
+   */
   public JDesktopPane getDesktopReference() {
     return DesktopReference;
   }
diff --git a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/simulation/TokenGameSession.java b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/simulation/TokenGameSession.java
index a24137a09..07f8ddd48 100644
--- a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/simulation/TokenGameSession.java
+++ b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/simulation/TokenGameSession.java
@@ -429,7 +429,9 @@ public void setDelaytime(int dt) {
     delaytime = dt;
   }
 
-  /** @return Reference to TokenGameController */
+  /**
+   * @return Reference to TokenGameController
+   */
   public TokenGameController getTokenGameController() {
     return tgController;
   }
@@ -438,7 +440,9 @@ public TokenGameController getTokenGameController() {
    * Special Getters: Reference Providers IndexNumbers and so on
    */
 
-  /** @return Reference to the PetriNet */
+  /**
+   * @return Reference to the PetriNet
+   */
   public PetriNetModelProcessor getPetriNet() {
     return PetriNet;
   }
diff --git a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/SComponentImplement.java b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/SComponentImplement.java
index 94e67b75e..df0af5c47 100644
--- a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/SComponentImplement.java
+++ b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/SComponentImplement.java
@@ -13,7 +13,9 @@
 import org.woped.qualanalysis.soundness.datamodel.AbstractNode;
 import org.woped.qualanalysis.soundness.datamodel.PlaceNode;
 
-/** @author Patrick Spies, Patrick Kirchgaessner, Joern Liebau, Enrico Moeller, Sebastian Fuss */
+/**
+ * @author Patrick Spies, Patrick Kirchgaessner, Joern Liebau, Enrico Moeller, Sebastian Fuss
+ */
 public class SComponentImplement implements ISComponent {
 
   private IEditor editor = null;
@@ -22,7 +24,9 @@ public class SComponentImplement implements ISComponent {
   private Set<AbstractPetriNetElementModel> notSCovered = null;
   private Set<List<AbstractPetriNetElementModel>> sComponentsSet = null;
 
-  /** @param editor source object */
+  /**
+   * @param editor source object
+   */
   public SComponentImplement(IEditor editor) {
     this.editor = editor;
   }
@@ -74,7 +78,9 @@ private AbstractPetriNetElementModel getAEM(AbstractNode node) {
     return editor.getModelProcessor().getElementContainer().getElementById(node.getOriginId());
   }
 
-  /** @return the SComponentTest (if not existing it will be instantiated) */
+  /**
+   * @return the SComponentTest (if not existing it will be instantiated)
+   */
   private ISComponentTest getSComponentTest() {
     if (sComponentTest == null) {
       sComponentTest =
diff --git a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/SoundnessCheckImplement.java b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/SoundnessCheckImplement.java
index 226fd8299..1c5aedad7 100644
--- a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/SoundnessCheckImplement.java
+++ b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/SoundnessCheckImplement.java
@@ -12,7 +12,9 @@
 import org.woped.qualanalysis.soundness.datamodel.TransitionNode;
 import org.woped.qualanalysis.soundness.marking.IMarkingNet;
 
-/** @author Patrick Spies, Patrick Kirchgaessner, Joern Liebau, Enrico Moeller, Sebastian Fuss */
+/**
+ * @author Patrick Spies, Patrick Kirchgaessner, Joern Liebau, Enrico Moeller, Sebastian Fuss
+ */
 public class SoundnessCheckImplement implements ISoundnessCheck {
 
   private IEditor editor = null;
diff --git a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/WorkflowCheckImplement.java b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/WorkflowCheckImplement.java
index 841a303e5..41a22b469 100644
--- a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/WorkflowCheckImplement.java
+++ b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/WorkflowCheckImplement.java
@@ -13,7 +13,9 @@
 import org.woped.qualanalysis.soundness.datamodel.LowLevelPetriNet;
 import org.woped.qualanalysis.structure.StructuralAnalysis;
 
-/** @author Patrick Spies, Patrick Kirchgaessner, Joern Liebau, Enrico Moeller, Sebastian Fuss */
+/**
+ * @author Patrick Spies, Patrick Kirchgaessner, Joern Liebau, Enrico Moeller, Sebastian Fuss
+ */
 public class WorkflowCheckImplement implements IWorkflowCheck {
 
   private IEditor editor = null;
@@ -32,7 +34,9 @@ public WorkflowCheckImplement(IEditor editor) {
     this.editor = editor;
   }
 
-  /** @return the LowLevelPetriNet without t* (if not existing it will be instantiated) */
+  /**
+   * @return the LowLevelPetriNet without t* (if not existing it will be instantiated)
+   */
   public LowLevelPetriNet getLolNetWithoutTStar() {
     if (lolNetWithoutTStar == null) {
       lolNetWithoutTStar =
@@ -41,7 +45,9 @@ public LowLevelPetriNet getLolNetWithoutTStar() {
     return lolNetWithoutTStar;
   }
 
-  /** @return the LowLevelPetriNet without t* (if not existing it will be instantiated) */
+  /**
+   * @return the LowLevelPetriNet without t* (if not existing it will be instantiated)
+   */
   public LowLevelPetriNet getLolNetWithTStar() {
     if (lolNetWithTStar == null) {
       lolNetWithTStar =
@@ -50,7 +56,9 @@ public LowLevelPetriNet getLolNetWithTStar() {
     return lolNetWithTStar;
   }
 
-  /** @return the SourceSinkTest (if not existing it will be instantiated) */
+  /**
+   * @return the SourceSinkTest (if not existing it will be instantiated)
+   */
   public ISourceSinkTest getSourceSinkTest() {
     if (sourceSinkTest == null) {
       sourceSinkTest = AlgorithmFactory.createSourceSinkTest(getLolNetWithoutTStar());
diff --git a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/basedonlowlevelpetrinet/AbstractLowLevelPetriNetTest.java b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/basedonlowlevelpetrinet/AbstractLowLevelPetriNetTest.java
index 881312f7e..c50d11127 100644
--- a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/basedonlowlevelpetrinet/AbstractLowLevelPetriNetTest.java
+++ b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/basedonlowlevelpetrinet/AbstractLowLevelPetriNetTest.java
@@ -10,7 +10,9 @@
 public abstract class AbstractLowLevelPetriNetTest {
   protected ILowLevelPetriNet lolNet;
 
-  /** @param lolNet LowLevelPetriNet the algorithm is based on */
+  /**
+   * @param lolNet LowLevelPetriNet the algorithm is based on
+   */
   public AbstractLowLevelPetriNetTest(ILowLevelPetriNet lolNet) {
     this.lolNet = lolNet;
   }
diff --git a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/basedonlowlevelpetrinet/scomponent/ISComponentTest.java b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/basedonlowlevelpetrinet/scomponent/ISComponentTest.java
index 2bd1ff4a2..1f81f7cd1 100644
--- a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/basedonlowlevelpetrinet/scomponent/ISComponentTest.java
+++ b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/basedonlowlevelpetrinet/scomponent/ISComponentTest.java
@@ -11,9 +11,13 @@
  */
 public interface ISComponentTest {
 
-  /** @return a set of all sComponents. */
+  /**
+   * @return a set of all sComponents.
+   */
   public Set<Set<AbstractNode>> getSComponents();
 
-  /** @return an iterator of all not-SCovered places. */
+  /**
+   * @return an iterator of all not-SCovered places.
+   */
   public Set<PlaceNode> getNotSCovered();
 }
diff --git a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/basedonlowlevelpetrinet/scomponent/SComponentTest.java b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/basedonlowlevelpetrinet/scomponent/SComponentTest.java
index 4524189f3..197ec1e90 100644
--- a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/basedonlowlevelpetrinet/scomponent/SComponentTest.java
+++ b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/basedonlowlevelpetrinet/scomponent/SComponentTest.java
@@ -17,7 +17,9 @@ public class SComponentTest extends AbstractLowLevelPetriNetTest implements ISCo
   private Set<Set<AbstractNode>> sComponents;
   private HashSet<PlaceNode> uncoveredPlaces;
 
-  /** @param lolNetWithTStar LowLevelPetriNet (with t*) the algorithm is based on */
+  /**
+   * @param lolNetWithTStar LowLevelPetriNet (with t*) the algorithm is based on
+   */
   public SComponentTest(LowLevelPetriNet lolNetWithTStar) {
     super(lolNetWithTStar);
     reCalculate();
diff --git a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/basedonlowlevelpetrinet/sourcesink/ISourceSinkTest.java b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/basedonlowlevelpetrinet/sourcesink/ISourceSinkTest.java
index 664cf7964..e5bff54ab 100644
--- a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/basedonlowlevelpetrinet/sourcesink/ISourceSinkTest.java
+++ b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/basedonlowlevelpetrinet/sourcesink/ISourceSinkTest.java
@@ -11,15 +11,23 @@
  */
 public interface ISourceSinkTest {
 
-  /** @return a set of all source places */
+  /**
+   * @return a set of all source places
+   */
   public Set<PlaceNode> getSourcePlaces();
 
-  /** @return a set of all sink places */
+  /**
+   * @return a set of all sink places
+   */
   public Set<PlaceNode> getSinkPlaces();
 
-  /** @return a set of all transitions with empty preset */
+  /**
+   * @return a set of all transitions with empty preset
+   */
   public Set<TransitionNode> getSourceTransitions();
 
-  /** @return a set of all transitions with empty postset */
+  /**
+   * @return a set of all transitions with empty postset
+   */
   public Set<TransitionNode> getSinkTransitions();
 }
diff --git a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/basedonlowlevelpetrinet/sourcesink/SourceSinkTest.java b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/basedonlowlevelpetrinet/sourcesink/SourceSinkTest.java
index 48697b9b9..463f65275 100644
--- a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/basedonlowlevelpetrinet/sourcesink/SourceSinkTest.java
+++ b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/basedonlowlevelpetrinet/sourcesink/SourceSinkTest.java
@@ -13,7 +13,9 @@
  */
 public class SourceSinkTest extends AbstractLowLevelPetriNetTest implements ISourceSinkTest {
 
-  /** @param lolNetWithoutTStar LowLevelPetriNet (without t*) the algorithm is based on */
+  /**
+   * @param lolNetWithoutTStar LowLevelPetriNet (without t*) the algorithm is based on
+   */
   public SourceSinkTest(ILowLevelPetriNet lolNetWithoutTStar) {
     super(lolNetWithoutTStar);
   }
diff --git a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/basedonmarkingnet/AbstractMarkingNetTest.java b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/basedonmarkingnet/AbstractMarkingNetTest.java
index 4130cf3d4..1eb717329 100644
--- a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/basedonmarkingnet/AbstractMarkingNetTest.java
+++ b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/basedonmarkingnet/AbstractMarkingNetTest.java
@@ -10,7 +10,9 @@
 public abstract class AbstractMarkingNetTest {
   protected IMarkingNet mNet;
 
-  /** @param iMarkingNet MarkingNet the algorithm is based on */
+  /**
+   * @param iMarkingNet MarkingNet the algorithm is based on
+   */
   public AbstractMarkingNetTest(IMarkingNet markingNet) {
     this.mNet = markingNet;
   }
diff --git a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/basedonmarkingnet/deadtransition/DeadTransitionTest.java b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/basedonmarkingnet/deadtransition/DeadTransitionTest.java
index 4809d3c5d..9ec3299a7 100644
--- a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/basedonmarkingnet/deadtransition/DeadTransitionTest.java
+++ b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/basedonmarkingnet/deadtransition/DeadTransitionTest.java
@@ -14,12 +14,16 @@
  */
 public class DeadTransitionTest extends AbstractMarkingNetTest implements IDeadTransitionTest {
 
-  /** @param markingNet MarkingNet the algorithm is based on */
+  /**
+   * @param markingNet MarkingNet the algorithm is based on
+   */
   public DeadTransitionTest(IMarkingNet markingNet) {
     super(markingNet);
   }
 
-  /** @see IDeadTransitionTest#getDeadTransitions() */
+  /**
+   * @see IDeadTransitionTest#getDeadTransitions()
+   */
   @Override
   public Set<TransitionNode> getDeadTransitions() {
     Set<TransitionNode> switchableTransitions = new HashSet<TransitionNode>();
diff --git a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/basedonmarkingnet/deadtransition/IDeadTransitionTest.java b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/basedonmarkingnet/deadtransition/IDeadTransitionTest.java
index e6e49bd8d..51b95a669 100644
--- a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/basedonmarkingnet/deadtransition/IDeadTransitionTest.java
+++ b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/basedonmarkingnet/deadtransition/IDeadTransitionTest.java
@@ -9,6 +9,8 @@
  * @author Patrick Spies, Patrick Kirchgaessner, Joern Liebau, Enrico Moeller, Sebastian Fuss
  */
 public interface IDeadTransitionTest {
-  /** @return a set of all dead transitions */
+  /**
+   * @return a set of all dead transitions
+   */
   Set<TransitionNode> getDeadTransitions();
 }
diff --git a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/basedonmarkingnet/nonliveTransitions/INonLiveTranstionTest.java b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/basedonmarkingnet/nonliveTransitions/INonLiveTranstionTest.java
index 80c948fcc..6e84d6d69 100644
--- a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/basedonmarkingnet/nonliveTransitions/INonLiveTranstionTest.java
+++ b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/basedonmarkingnet/nonliveTransitions/INonLiveTranstionTest.java
@@ -9,6 +9,8 @@
  * @author Patrick Spies, Patrick Kirchgaessner, Joern Liebau, Enrico Moeller, Sebastian Fuss
  */
 public interface INonLiveTranstionTest {
-  /** @return set of all non live transtions. */
+  /**
+   * @return set of all non live transtions.
+   */
   Set<TransitionNode> getNonLiveTransitions();
 }
diff --git a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/basedonmarkingnet/nonliveTransitions/NonLiveTransitionTest.java b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/basedonmarkingnet/nonliveTransitions/NonLiveTransitionTest.java
index 316b4485e..4e85aac77 100644
--- a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/basedonmarkingnet/nonliveTransitions/NonLiveTransitionTest.java
+++ b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/basedonmarkingnet/nonliveTransitions/NonLiveTransitionTest.java
@@ -14,12 +14,16 @@
  */
 public class NonLiveTransitionTest extends AbstractMarkingNetTest implements INonLiveTranstionTest {
 
-  /** @param markingNet MarkingNet the algorithm is based on */
+  /**
+   * @param markingNet MarkingNet the algorithm is based on
+   */
   public NonLiveTransitionTest(IMarkingNet markingNet) {
     super(markingNet);
   }
 
-  /** @see INonLiveTranstionTest#getNonLiveTransitions() */
+  /**
+   * @see INonLiveTranstionTest#getNonLiveTransitions()
+   */
   @Override
   public Set<TransitionNode> getNonLiveTransitions() {
     Set<TransitionNode> nonLiveTransitions = new HashSet<TransitionNode>();
diff --git a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/basedonmarkingnet/unboundplaces/IUnboundedPlacesTest.java b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/basedonmarkingnet/unboundplaces/IUnboundedPlacesTest.java
index 542de71c1..733752a32 100644
--- a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/basedonmarkingnet/unboundplaces/IUnboundedPlacesTest.java
+++ b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/basedonmarkingnet/unboundplaces/IUnboundedPlacesTest.java
@@ -9,6 +9,8 @@
  * @author Patrick Spies, Patrick Kirchgaessner, Joern Liebau, Enrico Moeller, Sebastian Fuss
  */
 public interface IUnboundedPlacesTest {
-  /** @return set of unbounded places */
+  /**
+   * @return set of unbounded places
+   */
   Set<PlaceNode> getUnboundedPlaces();
 }
diff --git a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/basedonmarkingnet/unboundplaces/UnboundPlacesTest.java b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/basedonmarkingnet/unboundplaces/UnboundPlacesTest.java
index 49f18d184..8076ef2aa 100644
--- a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/basedonmarkingnet/unboundplaces/UnboundPlacesTest.java
+++ b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/basedonmarkingnet/unboundplaces/UnboundPlacesTest.java
@@ -15,7 +15,9 @@
  */
 public class UnboundPlacesTest extends AbstractMarkingNetTest implements IUnboundedPlacesTest {
 
-  /** @param markingNet MarkingNet the algorithm is based on */
+  /**
+   * @param markingNet MarkingNet the algorithm is based on
+   */
   public UnboundPlacesTest(IMarkingNet markingNet) {
     super(markingNet);
   }
diff --git a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/generic/INode.java b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/generic/INode.java
index aa89e279c..52f3132b8 100644
--- a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/generic/INode.java
+++ b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/generic/INode.java
@@ -8,9 +8,13 @@
  * @param <K> generic node type
  */
 public interface INode<K> {
-  /** @return all successors. */
+  /**
+   * @return all successors.
+   */
   Set<K> getSuccessorNodes();
 
-  /** @return all predecessors. */
+  /**
+   * @return all predecessors.
+   */
   Set<K> getPredecessorNodes();
 }
diff --git a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/generic/INodeNet.java b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/generic/INodeNet.java
index 51590d238..c8fe16610 100644
--- a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/generic/INodeNet.java
+++ b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/generic/INodeNet.java
@@ -9,6 +9,8 @@
  */
 public interface INodeNet<K extends INode<K>> {
 
-  /** @return all contained nodes. */
+  /**
+   * @return all contained nodes.
+   */
   public Set<K> getAllContainedNodes();
 }
diff --git a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/generic/cc/ConnectedComponentTestGen.java b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/generic/cc/ConnectedComponentTestGen.java
index 7ccd66b71..544b1aa7e 100644
--- a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/generic/cc/ConnectedComponentTestGen.java
+++ b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/generic/cc/ConnectedComponentTestGen.java
@@ -20,7 +20,9 @@ public ConnectedComponentTestGen(INodeNet<K> nodeNet) {
     this.nodeNet = nodeNet;
   }
 
-  /** @see IConnectedComponentTestGen#getConnectedComponents() */
+  /**
+   * @see IConnectedComponentTestGen#getConnectedComponents()
+   */
   @Override
   public Set<Set<K>> getConnectedComponents() {
     Set<Set<K>> ccs; // all connected components.
diff --git a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/generic/cc/IConnectedComponentTestGen.java b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/generic/cc/IConnectedComponentTestGen.java
index a4d3171fd..c577796b2 100644
--- a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/generic/cc/IConnectedComponentTestGen.java
+++ b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/generic/cc/IConnectedComponentTestGen.java
@@ -10,6 +10,8 @@
  */
 public interface IConnectedComponentTestGen<K extends INode<K>> {
 
-  /** @return set of connected components. the connected component is a set of the generic type. */
+  /**
+   * @return set of connected components. the connected component is a set of the generic type.
+   */
   Set<Set<K>> getConnectedComponents();
 }
diff --git a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/generic/scc/IStronglyConnectedComponentTestGen.java b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/generic/scc/IStronglyConnectedComponentTestGen.java
index 44b993572..08af9edb4 100644
--- a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/generic/scc/IStronglyConnectedComponentTestGen.java
+++ b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/generic/scc/IStronglyConnectedComponentTestGen.java
@@ -10,7 +10,9 @@
  */
 public interface IStronglyConnectedComponentTestGen<K extends INode<K>> {
 
-  /** @return true, if only one strongly connected component exist. */
+  /**
+   * @return true, if only one strongly connected component exist.
+   */
   boolean isStronglyConnected();
 
   /**
diff --git a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/generic/scc/StronglyConnectedComponentTestGenTarjan.java b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/generic/scc/StronglyConnectedComponentTestGenTarjan.java
index 43a21f27e..96a0e14f9 100644
--- a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/generic/scc/StronglyConnectedComponentTestGenTarjan.java
+++ b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/algorithms/generic/scc/StronglyConnectedComponentTestGenTarjan.java
@@ -26,7 +26,9 @@ public class StronglyConnectedComponentTestGenTarjan<K extends INode<K>>
   private Map<K, Integer> dfs;
   private Map<K, Integer> lowLink;
 
-  /** @param nodeNet MarkingNet the algorithm is based on */
+  /**
+   * @param nodeNet MarkingNet the algorithm is based on
+   */
   public StronglyConnectedComponentTestGenTarjan(INodeNet<K> nodeNet) {
     this.nodeNet = nodeNet;
   }
diff --git a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/builder/lowlevelpetrinet/AbstractLowLevelPetriNetBuilder.java b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/builder/lowlevelpetrinet/AbstractLowLevelPetriNetBuilder.java
index 8ff7b336d..eca78e7f5 100644
--- a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/builder/lowlevelpetrinet/AbstractLowLevelPetriNetBuilder.java
+++ b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/builder/lowlevelpetrinet/AbstractLowLevelPetriNetBuilder.java
@@ -12,12 +12,16 @@ public abstract class AbstractLowLevelPetriNetBuilder {
   protected IEditor editor;
   protected LowLevelPetriNet lowLevelPetriNet;
 
-  /** @param editor source object. */
+  /**
+   * @param editor source object.
+   */
   public AbstractLowLevelPetriNetBuilder(IEditor editor) {
     this.editor = editor;
   }
 
-  /** @return created lowLevelPetriNet, can be null! */
+  /**
+   * @return created lowLevelPetriNet, can be null!
+   */
   public LowLevelPetriNet getLowLevelPetriNet() {
     return lowLevelPetriNet;
   }
diff --git a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/builder/lowlevelpetrinet/AbstractLowLevelPetriNetBuilderUsingSA.java b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/builder/lowlevelpetrinet/AbstractLowLevelPetriNetBuilderUsingSA.java
index d9eb936b5..3340a386d 100644
--- a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/builder/lowlevelpetrinet/AbstractLowLevelPetriNetBuilderUsingSA.java
+++ b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/builder/lowlevelpetrinet/AbstractLowLevelPetriNetBuilderUsingSA.java
@@ -26,7 +26,9 @@ public abstract class AbstractLowLevelPetriNetBuilderUsingSA
   protected StructuralAnalysis sa;
   protected Boolean isSubprocess;
 
-  /** @param editor source object */
+  /**
+   * @param editor source object
+   */
   public AbstractLowLevelPetriNetBuilderUsingSA(IEditor editor) {
     super(editor);
     isSubprocess = editor.isSubprocessEditor();
diff --git a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/builder/lowlevelpetrinet/LowLevelPetriNetWithoutTStarBuilder.java b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/builder/lowlevelpetrinet/LowLevelPetriNetWithoutTStarBuilder.java
index 2a5e8bb5a..df67dd3c5 100644
--- a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/builder/lowlevelpetrinet/LowLevelPetriNetWithoutTStarBuilder.java
+++ b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/builder/lowlevelpetrinet/LowLevelPetriNetWithoutTStarBuilder.java
@@ -10,7 +10,9 @@
  */
 public class LowLevelPetriNetWithoutTStarBuilder extends AbstractLowLevelPetriNetBuilderUsingSA {
 
-  /** @param editor source object. */
+  /**
+   * @param editor source object.
+   */
   public LowLevelPetriNetWithoutTStarBuilder(IEditor editor) {
     super(editor);
     createLowLevelPetriNet();
diff --git a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/builder/markingnet/AbstractMarkingNetBuilder.java b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/builder/markingnet/AbstractMarkingNetBuilder.java
index b023c4ad4..1389181d6 100644
--- a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/builder/markingnet/AbstractMarkingNetBuilder.java
+++ b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/builder/markingnet/AbstractMarkingNetBuilder.java
@@ -13,14 +13,18 @@ public abstract class AbstractMarkingNetBuilder {
   protected ILowLevelPetriNet lolNet;
   protected IMarkingNet mNet;
 
-  /** @param lolNet source low level petri net. */
+  /**
+   * @param lolNet source low level petri net.
+   */
   public AbstractMarkingNetBuilder(ILowLevelPetriNet lolNet) {
     this.lolNet = lolNet;
     initMarkingNet();
     createMarkingNet();
   }
 
-  /** @return created marking net. */
+  /**
+   * @return created marking net.
+   */
   public IMarkingNet getMarkingNet() {
     return mNet;
   }
diff --git a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/builder/markingnet/MarkingNetBuilderBook.java b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/builder/markingnet/MarkingNetBuilderBook.java
index 43f2157e8..1b4b8ff5b 100644
--- a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/builder/markingnet/MarkingNetBuilderBook.java
+++ b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/builder/markingnet/MarkingNetBuilderBook.java
@@ -17,7 +17,9 @@
  */
 public class MarkingNetBuilderBook extends AbstractMarkingNetBuilder {
 
-  /** @param lolNet source low level petri net. */
+  /**
+   * @param lolNet source low level petri net.
+   */
   public MarkingNetBuilderBook(ILowLevelPetriNet lolNet) {
     super(lolNet);
   }
diff --git a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/datamodel/ILowLevelPetriNet.java b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/datamodel/ILowLevelPetriNet.java
index 5963fb687..0c7aa4f2d 100644
--- a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/datamodel/ILowLevelPetriNet.java
+++ b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/datamodel/ILowLevelPetriNet.java
@@ -56,6 +56,8 @@ public interface ILowLevelPetriNet extends INodeNet<AbstractNode> {
    */
   TransitionNode getTransitionNode(TransitionNode node);
 
-  /** @return the transitionNodes */
+  /**
+   * @return the transitionNodes
+   */
   Set<TransitionNode> getTransitions();
 }
diff --git a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/marking/Arc.java b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/marking/Arc.java
index 07aec5da9..f8586bfe1 100644
--- a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/marking/Arc.java
+++ b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/marking/Arc.java
@@ -21,12 +21,16 @@ public Arc(IMarking target, TransitionNode trigger) {
     this.trigger = trigger;
   }
 
-  /** @return the Trigger of an succeeding mark */
+  /**
+   * @return the Trigger of an succeeding mark
+   */
   public TransitionNode getTrigger() {
     return this.trigger;
   }
 
-  /** @return the succeeding mark */
+  /**
+   * @return the succeeding mark
+   */
   public IMarking getTarget() {
     return this.target;
   }
diff --git a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/marking/IMarking.java b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/marking/IMarking.java
index e8e25543c..d41c9ebde 100644
--- a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/marking/IMarking.java
+++ b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/marking/IMarking.java
@@ -14,7 +14,9 @@
  */
 public interface IMarking extends INode<IMarking> {
 
-  /** @return true, if the marking is the initial marking. */
+  /**
+   * @return true, if the marking is the initial marking.
+   */
   boolean isInitial();
 
   /**
@@ -37,16 +39,24 @@ public interface IMarking extends INode<IMarking> {
    */
   boolean isPlaceUnbound(String placeId);
 
-  /** @return the predecessor (marking) */
+  /**
+   * @return the predecessor (marking)
+   */
   IMarking getPredecessor();
 
-  /** @param predecessor the predecessor to set */
+  /**
+   * @param predecessor the predecessor to set
+   */
   void setPredecessor(IMarking predecessor);
 
-  /** @return the arcs that point to the successors (Set<Arc>) */
+  /**
+   * @return the arcs that point to the successors (Set<Arc>)
+   */
   Set<Arc> getSuccessors();
 
-  /** @return all activated transitions. */
+  /**
+   * @return all activated transitions.
+   */
   Set<String> getActivatedTransitions();
 
   /**
@@ -116,7 +126,9 @@ public interface IMarking extends INode<IMarking> {
    */
   boolean less(IMarking other);
 
-  /** @param isInitial the isInitial to set */
+  /**
+   * @param isInitial the isInitial to set
+   */
   void setInitial(boolean isInitial);
 
   /**
diff --git a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/marking/Marking.java b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/marking/Marking.java
index b2532da8e..81a533d87 100644
--- a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/marking/Marking.java
+++ b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/marking/Marking.java
@@ -123,7 +123,9 @@ public TreeMap<String, Integer> getMarking() {
     return marking;
   }
 
-  /** @param position position of the place being unlimited */
+  /**
+   * @param position position of the place being unlimited
+   */
   public void setPlaceUnlimited(Integer position) {
     this.placeUnlimited[position] = true;
     // Reset token count for the new unlimited place to ensure we generate
@@ -150,30 +152,40 @@ private int getIndexOfPlaceNode(String placeId) {
     return -1;
   }
 
-  /** @return the predecessor (marking) */
+  /**
+   * @return the predecessor (marking)
+   */
   @Override
   public IMarking getPredecessor() {
     return predecessor;
   }
 
-  /** @param predecessor the predecessor to set */
+  /**
+   * @param predecessor the predecessor to set
+   */
   @Override
   public void setPredecessor(IMarking predecessor) {
     this.predecessor = predecessor;
   }
 
-  /** @return the arcs that point to the successors (Set<Arc>) */
+  /**
+   * @return the arcs that point to the successors (Set<Arc>)
+   */
   @Override
   public Set<Arc> getSuccessors() {
     return this.successors;
   }
 
-  /** @return the tokens Do not manipulate the returned array! */
+  /**
+   * @return the tokens Do not manipulate the returned array!
+   */
   public int[] getTokens() {
     return this.tokens;
   }
 
-  /** @see IMarking#getActivatedTransitions() */
+  /**
+   * @see IMarking#getActivatedTransitions()
+   */
   @Override
   public HashSet<String> getActivatedTransitions() {
     HashSet<String> transitions = new HashSet<>();
@@ -322,12 +334,16 @@ public int getIndexByPlace(PlaceNode place) {
     }
   }
 
-  /** @return the isInitial */
+  /**
+   * @return the isInitial
+   */
   public boolean isInitial() {
     return isInitial;
   }
 
-  /** @param isInitial the isInitial to set */
+  /**
+   * @param isInitial the isInitial to set
+   */
   @Override
   public void setInitial(boolean isInitial) {
     this.isInitial = isInitial;
@@ -356,13 +372,17 @@ public boolean isTransitionReachable(TransitionNode tn, Set<IMarking> markings)
     return false;
   }
 
-  /** @return the token-array as string */
+  /**
+   * @return the token-array as string
+   */
   @Override
   public String toString() {
     return asTokenVectorString();
   }
 
-  /** @see INode#getSuccessorNodes() */
+  /**
+   * @see INode#getSuccessorNodes()
+   */
   public Set<IMarking> getSuccessorNodes() {
     Set<IMarking> set = new HashSet<>();
     for (Arc arc : getSuccessors()) {
@@ -371,7 +391,9 @@ public Set<IMarking> getSuccessorNodes() {
     return set;
   }
 
-  /** @see INode#getPredecessorNodes() */
+  /**
+   * @see INode#getPredecessorNodes()
+   */
   public Set<IMarking> getPredecessorNodes() {
     Set<IMarking> set = new HashSet<>();
     set.add(predecessor);
diff --git a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/marking/MarkingNet.java b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/marking/MarkingNet.java
index 5dd1ce136..bdf0f8ed3 100644
--- a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/marking/MarkingNet.java
+++ b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/marking/MarkingNet.java
@@ -29,7 +29,9 @@ public class MarkingNet implements IMarkingNet {
   /** initial marking. */
   private Marking initialMarking;
 
-  /** @param lolNet the LowLevelPetriNet on that this marking net is built */
+  /**
+   * @param lolNet the LowLevelPetriNet on that this marking net is built
+   */
   public MarkingNet(ILowLevelPetriNet lolNet) {
 
     this.places = lolNet.getPlaces().toArray(new PlaceNode[lolNet.getPlaces().size()]);
@@ -80,27 +82,37 @@ private boolean transitionIsActivated(IMarking marking, TransitionNode transitio
     return activated;
   }
 
-  /** @return the initialMarking */
+  /**
+   * @return the initialMarking
+   */
   public IMarking getInitialMarking() {
     return initialMarking;
   }
 
-  /** @return the set of markings */
+  /**
+   * @return the set of markings
+   */
   public Set<IMarking> getMarkings() {
     return this.markings;
   }
 
-  /** @return the places as an array */
+  /**
+   * @return the places as an array
+   */
   public PlaceNode[] getPlaces() {
     return this.places;
   }
 
-  /** @return the transitions as an array */
+  /**
+   * @return the transitions as an array
+   */
   public TransitionNode[] getTransitions() {
     return transitions;
   }
 
-  /** @return the places name and id as string */
+  /**
+   * @return the places name and id as string
+   */
   public String placesToString() {
     String line = "";
     for (PlaceNode place : this.places) {
@@ -109,7 +121,9 @@ public String placesToString() {
     return line.substring(0, line.length() - 1);
   }
 
-  /** @return the places id as string */
+  /**
+   * @return the places id as string
+   */
   public String placesToStringId() {
     String line = "";
     for (PlaceNode place : this.places) {
@@ -118,7 +132,9 @@ public String placesToStringId() {
     return line.substring(0, Math.max(line.length() - 1, 0));
   }
 
-  /** @return the places name as string */
+  /**
+   * @return the places name as string
+   */
   public String placesToStringName() {
     String line = "";
     for (PlaceNode place : this.places) {
diff --git a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/testing/LowLevelNetTest.java b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/testing/LowLevelNetTest.java
index 01e87914e..e10ca7681 100644
--- a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/testing/LowLevelNetTest.java
+++ b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/soundness/testing/LowLevelNetTest.java
@@ -9,7 +9,9 @@
 import org.woped.qualanalysis.soundness.marking.IMarkingNet;
 import org.woped.qualanalysis.soundness.marking.MarkingNet;
 
-/** @author Sebastian Fu� */
+/**
+ * @author Sebastian Fu�
+ */
 public class LowLevelNetTest {
 
   public LowLevelNetTest() {
@@ -23,7 +25,9 @@ public LowLevelNetTest() {
     putOut(markingNet);
   }
 
-  /** @param args */
+  /**
+   * @param args
+   */
   public static void main(String[] args) {
     new LowLevelNetTest();
   }
diff --git a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/structure/StructuralAnalysis.java b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/structure/StructuralAnalysis.java
index 72ff0be7f..52f401173 100644
--- a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/structure/StructuralAnalysis.java
+++ b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/structure/StructuralAnalysis.java
@@ -954,7 +954,9 @@ private void calculateHandleClusters() {
     }
   }
 
-  /** @see IWorkflowCheck#getStronglyConnectedComponents() */
+  /**
+   * @see IWorkflowCheck#getStronglyConnectedComponents()
+   */
   @Override
   public Set<Set<AbstractPetriNetElementModel>> getStronglyConnectedComponents() {
     // not implemented
diff --git a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/woflan/QualanalysisServiceImplementWoflan.java b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/woflan/QualanalysisServiceImplementWoflan.java
index 8463a7464..357d4e7b0 100644
--- a/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/woflan/QualanalysisServiceImplementWoflan.java
+++ b/WoPeD-QualAnalysis/src/main/java/org/woped/qualanalysis/woflan/QualanalysisServiceImplementWoflan.java
@@ -12,7 +12,9 @@ public class QualanalysisServiceImplementWoflan extends AbstractQualanalysisServ
 
   private WoflanAnalysis wA;
 
-  /** @param editor the editor the service is referring to */
+  /**
+   * @param editor the editor the service is referring to
+   */
   public QualanalysisServiceImplementWoflan(IEditor editor) {
     super(editor);
 
diff --git a/WoPeD-QuantAnalysis/src/main/java/org/woped/quantana/dashboard/webserver/GetRequestAction.java b/WoPeD-QuantAnalysis/src/main/java/org/woped/quantana/dashboard/webserver/GetRequestAction.java
index 0c8c4894b..845229bc2 100644
--- a/WoPeD-QuantAnalysis/src/main/java/org/woped/quantana/dashboard/webserver/GetRequestAction.java
+++ b/WoPeD-QuantAnalysis/src/main/java/org/woped/quantana/dashboard/webserver/GetRequestAction.java
@@ -10,7 +10,9 @@
 import org.woped.quantana.dashboard.storage.TableInfo;
 import org.woped.quantana.sim.SimParameters;
 
-/** @author chrisn */
+/**
+ * @author chrisn
+ */
 public class GetRequestAction extends ThinServerAction {
 
   TemplateEngine te = new TemplateEngine();
diff --git a/WoPeD-QuantAnalysis/src/main/java/org/woped/quantana/dashboard/webserver/ThinServer.java b/WoPeD-QuantAnalysis/src/main/java/org/woped/quantana/dashboard/webserver/ThinServer.java
index b7858f23f..241ef0a4d 100644
--- a/WoPeD-QuantAnalysis/src/main/java/org/woped/quantana/dashboard/webserver/ThinServer.java
+++ b/WoPeD-QuantAnalysis/src/main/java/org/woped/quantana/dashboard/webserver/ThinServer.java
@@ -18,7 +18,9 @@
 import org.woped.core.utilities.LoggerManager;
 import org.woped.quantana.dashboard.storage.StorageEngine;
 
-/** @author chrisn */
+/**
+ * @author chrisn
+ */
 public class ThinServer {
 
   // Archive
diff --git a/WoPeD-QuantAnalysis/src/main/java/org/woped/quantana/sim/SimNode.java b/WoPeD-QuantAnalysis/src/main/java/org/woped/quantana/sim/SimNode.java
index 0ec585b62..a85749f96 100644
--- a/WoPeD-QuantAnalysis/src/main/java/org/woped/quantana/sim/SimNode.java
+++ b/WoPeD-QuantAnalysis/src/main/java/org/woped/quantana/sim/SimNode.java
@@ -93,37 +93,51 @@ public boolean hasResource() {
     return has_resource;
   }
 
-  /** @param newVal */
+  /**
+   * @param newVal
+   */
   public void setgroup(String newVal) {
     group = newVal;
   }
 
-  /** @param newVal */
+  /**
+   * @param newVal
+   */
   public void setid(String newVal) {
     id = newVal;
   }
 
-  /** @param newVal */
+  /**
+   * @param newVal
+   */
   public void setname(String newVal) {
     name = newVal;
   }
 
-  /** @param newVal */
+  /**
+   * @param newVal
+   */
   public void setrole(String newVal) {
     role = newVal;
   }
 
-  /** @param newVal */
+  /**
+   * @param newVal
+   */
   public void settime(double newVal) {
     time = newVal;
   }
 
-  /** @param newVal */
+  /**
+   * @param newVal
+   */
   public void settimeunit(int newVal) {
     timeunit = newVal;
   }
 
-  /** @param newVal */
+  /**
+   * @param newVal
+   */
   public void settype(byte newVal) {
     type = newVal;
   }
@@ -132,17 +146,23 @@ public byte gettype() {
     return type;
   }
 
-  /** @param newVal */
+  /**
+   * @param newVal
+   */
   public void setandsplit(boolean newVal) {
     is_and_split = newVal;
   }
 
-  /** @param newVal */
+  /**
+   * @param newVal
+   */
   public void setandjoin(boolean newVal) {
     is_and_join = newVal;
   }
 
-  /** @param newVal */
+  /**
+   * @param newVal
+   */
   public void setHasResource(boolean newVal) {
     has_resource = newVal;
   }
diff --git a/WoPeD-Starter/src/main/java/org/woped/starter/DefaultEditorFrame.java b/WoPeD-Starter/src/main/java/org/woped/starter/DefaultEditorFrame.java
index ce245354c..0ca04cffa 100644
--- a/WoPeD-Starter/src/main/java/org/woped/starter/DefaultEditorFrame.java
+++ b/WoPeD-Starter/src/main/java/org/woped/starter/DefaultEditorFrame.java
@@ -151,12 +151,16 @@ private EditorStatusBarVC getStatusBar() {
     return m_statusBar;
   }
 
-  /** @return returns the containing Editor. */
+  /**
+   * @return returns the containing Editor.
+   */
   public IEditor getEditor() {
     return m_editor;
   }
 
-  /** @return Returns the m_petriNetResourceEditor. */
+  /**
+   * @return Returns the m_petriNetResourceEditor.
+   */
   public PetriNetResourceEditor getPetriNetResourceEditor() {
     return m_resourceEditor;
   }
diff --git a/WoPeD-Starter/src/main/java/org/woped/starter/OSXHandler.java b/WoPeD-Starter/src/main/java/org/woped/starter/OSXHandler.java
index e2de2d397..5a933efcb 100644
--- a/WoPeD-Starter/src/main/java/org/woped/starter/OSXHandler.java
+++ b/WoPeD-Starter/src/main/java/org/woped/starter/OSXHandler.java
@@ -43,7 +43,9 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-/** @author ctipper */
+/**
+ * @author ctipper
+ */
 public class OSXHandler implements InvocationHandler {
 
   protected Object targetObject;
diff --git a/WoPeD-Starter/src/main/java/org/woped/starter/controller/vc/DefaultApplicationMediator.java b/WoPeD-Starter/src/main/java/org/woped/starter/controller/vc/DefaultApplicationMediator.java
index 7d2087346..7e108e1a8 100644
--- a/WoPeD-Starter/src/main/java/org/woped/starter/controller/vc/DefaultApplicationMediator.java
+++ b/WoPeD-Starter/src/main/java/org/woped/starter/controller/vc/DefaultApplicationMediator.java
@@ -37,7 +37,9 @@
 import org.woped.starter.DefaultUserInterface;
 import org.woped.starter.controller.vep.GUIViewEventProcessor;
 
-/** @author <a href="mailto:slandes@kybeidos.de">Simon Landes </a> <br> */
+/**
+ * @author <a href="mailto:slandes@kybeidos.de">Simon Landes </a> <br>
+ */
 public class DefaultApplicationMediator extends ApplicationMediator {
   public static final int VIEWCONTROLLER_MENUBAR = 11;
   public static final int VIEWCONTROLLER_STATUSBAR = 12;
diff --git a/WoPeD-Starter/src/main/java/org/woped/starter/controller/vc/StatusBarVC.java b/WoPeD-Starter/src/main/java/org/woped/starter/controller/vc/StatusBarVC.java
index b48342da1..ad2b3a023 100644
--- a/WoPeD-Starter/src/main/java/org/woped/starter/controller/vc/StatusBarVC.java
+++ b/WoPeD-Starter/src/main/java/org/woped/starter/controller/vc/StatusBarVC.java
@@ -64,7 +64,9 @@ private void initialize() {
     this.setPreferredSize(new Dimension(200, 20));
   }
 
-  /** @return */
+  /**
+   * @return
+   */
   public SynchonizeTask getSyncTask() {
     return task;
   }
diff --git a/WoPeD-Starter/src/main/java/org/woped/starter/controller/vep/GUIViewEventProcessor.java b/WoPeD-Starter/src/main/java/org/woped/starter/controller/vep/GUIViewEventProcessor.java
index 7c39b5e8c..263bcdca6 100644
--- a/WoPeD-Starter/src/main/java/org/woped/starter/controller/vep/GUIViewEventProcessor.java
+++ b/WoPeD-Starter/src/main/java/org/woped/starter/controller/vep/GUIViewEventProcessor.java
@@ -56,7 +56,9 @@
 import org.woped.starter.RegistrationUI;
 import org.woped.starter.controller.vc.DefaultApplicationMediator;
 
-/** @author <a href="mailto:slandes@kybeidos.de">Simon Landes </a> <br> */
+/**
+ * @author <a href="mailto:slandes@kybeidos.de">Simon Landes </a> <br>
+ */
 public class GUIViewEventProcessor extends AbstractEventProcessor {
   public GUIViewEventProcessor(DefaultApplicationMediator mediator) {
     super(mediator);