Merge remote-tracking branch 'origin/master'

# Conflicts:
#	README.md
#	pom.xml
#	src/com/termmed/owl/RF2Parser.java
#	src/com/termmed/owl/Runner.java

Author: alopezo

pom.xml

@@ -28,8 +28,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>2.3.2</version>
 				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
+					<source>1.8</source>
+					<target>1.8</target>
 				</configuration>
 			</plugin>
 			<plugin>

src/com/termmed/rf2/model/Component.java

@@ -22,47 +22,98 @@
 import java.util.UUID;
 
 /**
+ * The Class Component.
  *
  * @author Alejandro Rodriguez
  */
 public class Component {
 
+    /** The uuid. */
     private UUID uuid;
+    
+    /** The active. */
     private Boolean active;
+    
+    /** The effective time. */
     private String effectiveTime;
+    
+    /** The module. */
     private Long module;
 
+    /**
+     * Instantiates a new component.
+     */
     public Component() {
     }
 
+    /**
+     * Gets the effective time.
+     *
+     * @return the effective time
+     */
     public String getEffectiveTime() {
         return effectiveTime;
     }
 
+    /**
+     * Sets the effective time.
+     *
+     * @param effectiveTime the new effective time
+     */
     public void setEffectiveTime(String effectiveTime) {
         this.effectiveTime = effectiveTime;
     }
 
+    /**
+     * Gets the active.
+     *
+     * @return the active
+     */
     public Boolean getActive() {
 		return active;
 	}
 
+	/**
+	 * Sets the active.
+	 *
+	 * @param active the new active
+	 */
 	public void setActive(Boolean active) {
 		this.active = active;
 	}
 
+	/**
+	 * Gets the module.
+	 *
+	 * @return the module
+	 */
 	public Long getModule() {
 		return module;
 	}
 
+	/**
+	 * Sets the module.
+	 *
+	 * @param module the new module
+	 */
 	public void setModule(Long module) {
 		this.module = module;
 	}
 
+	/**
+	 * Gets the uuid.
+	 *
+	 * @return the uuid
+	 */
 	public UUID getUuid() {
         return uuid;
     }
 
+    /**
+     * Sets the uuid.
+     *
+     * @param uuid the new uuid
+     */
     public void setUuid(UUID uuid) {
         this.uuid = uuid;
     }

src/com/termmed/rf2/model/ConceptDescriptor.java

@@ -19,26 +19,72 @@
 
 package com.termmed.rf2.model;
 
+/**
+ * The Class ConceptDescriptor.
+ *
+ * @author Alejandro Rodriguez
+ */
 public class ConceptDescriptor extends Component{
 
+	/** The concept id. */
 	Long conceptId;
+	
+	/** The default term. */
 	String defaultTerm;
+    
+    /** The definition status. */
     String definitionStatus;
+	
+	/**
+	 * Gets the concept id.
+	 *
+	 * @return the concept id
+	 */
 	public Long getConceptId() {
 		return conceptId;
 	}
+	
+	/**
+	 * Sets the concept id.
+	 *
+	 * @param conceptId the new concept id
+	 */
 	public void setConceptId(Long conceptId) {
 		this.conceptId = conceptId;
 	}
+	
+	/**
+	 * Gets the default term.
+	 *
+	 * @return the default term
+	 */
 	public String getDefaultTerm() {
 		return defaultTerm;
 	}
+	
+	/**
+	 * Sets the default term.
+	 *
+	 * @param defaultTerm the new default term
+	 */
 	public void setDefaultTerm(String defaultTerm) {
 		this.defaultTerm = defaultTerm;
 	}
+	
+	/**
+	 * Gets the definition status.
+	 *
+	 * @return the definition status
+	 */
 	public String getDefinitionStatus() {
 		return definitionStatus;
 	}
+	
+	/**
+	 * Sets the definition status.
+	 *
+	 * @param definitionStatus the new definition status
+	 */
 	public void setDefinitionStatus(String definitionStatus) {
 		this.definitionStatus = definitionStatus;
 	}

src/com/termmed/rf2/model/LightRelationship.java

@@ -21,51 +21,135 @@
 
 
 /**
+ * The Class LightRelationship.
  *
  * @author Alejandro Rodriguez
  */
 
 public class LightRelationship extends Component {
 
+    /** The type. */
     private Long type;
+    
+    /** The target. */
     private Long target;
+    
+    /** The source id. */
     private Long sourceId;
+    
+    /** The group id. */
     private Integer groupId;
+    
+    /** The char type. */
     private Long charType;
+    
+    /** The modifier. */
     private Long modifier;
+	
+	/**
+	 * Gets the type.
+	 *
+	 * @return the type
+	 */
 	public Long getType() {
 		return type;
 	}
+	
+	/**
+	 * Sets the type.
+	 *
+	 * @param type the new type
+	 */
 	public void setType(Long type) {
 		this.type = type;
 	}
+	
+	/**
+	 * Gets the target.
+	 *
+	 * @return the target
+	 */
 	public Long getTarget() {
 		return target;
 	}
+	
+	/**
+	 * Sets the target.
+	 *
+	 * @param target the new target
+	 */
 	public void setTarget(Long target) {
 		this.target = target;
 	}
+	
+	/**
+	 * Gets the source id.
+	 *
+	 * @return the source id
+	 */
 	public Long getSourceId() {
 		return sourceId;
 	}
+	
+	/**
+	 * Sets the source id.
+	 *
+	 * @param sourceId the new source id
+	 */
 	public void setSourceId(Long sourceId) {
 		this.sourceId = sourceId;
 	}
+	
+	/**
+	 * Gets the group id.
+	 *
+	 * @return the group id
+	 */
 	public Integer getGroupId() {
 		return groupId;
 	}
+	
+	/**
+	 * Sets the group id.
+	 *
+	 * @param groupId the new group id
+	 */
 	public void setGroupId(Integer groupId) {
 		this.groupId = groupId;
 	}
+	
+	/**
+	 * Gets the char type.
+	 *
+	 * @return the char type
+	 */
 	public Long getCharType() {
 		return charType;
 	}
+	
+	/**
+	 * Sets the char type.
+	 *
+	 * @param charType the new char type
+	 */
 	public void setCharType(Long charType) {
 		this.charType = charType;
 	}
+	
+	/**
+	 * Gets the modifier.
+	 *
+	 * @return the modifier
+	 */
 	public Long getModifier() {
 		return modifier;
 	}
+	
+	/**
+	 * Sets the modifier.
+	 *
+	 * @param modifier the new modifier
+	 */
 	public void setModifier(Long modifier) {
 		this.modifier = modifier;
 	}