[#528] Modularize markup check into a method.

prmr · Jun 11, 2024 · ca53d73 · ca53d73
1 parent 8ccffc2
commit ca53d73
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/src/org/jetuml/rendering/nodes/TypeNodeRenderer.java b/src/org/jetuml/rendering/nodes/TypeNodeRenderer.java
@@ -116,7 +116,7 @@ private void drawName(TypeNode pNode, Rectangle pBounds, int pSplitY, int pNameB
 		{
 			boolean italic = false;
 			String paddedName = "";
-			if( nameByLine[i].length() > 2 && nameByLine[i].startsWith(ITALIC_MARKUP) && nameByLine[i].endsWith(ITALIC_MARKUP) )
+			if( containsMarkup(nameByLine[i], ITALIC_MARKUP) )
 			{
 				nameByLine[i] = removeMarkup(nameByLine[i]);
 				italic = true;
@@ -154,7 +154,7 @@ private static void drawAttribute(TypeNode pNode, Rectangle pBounds, int pSplitY
 
 		for( String attribute : attributesByLine )
 		{
-			if( attribute.length() > 2 && attribute.startsWith(UNDERLINE_MARKUP) && attribute.endsWith(UNDERLINE_MARKUP) )
+			if( containsMarkup(attribute, UNDERLINE_MARKUP) )
 			{
 				UNDERLINING_STRING_VIEWER.draw(removeMarkup(attribute), pGraphics, 
 						new Rectangle(pBounds.x(), pSplitY + lineSpacing, pBounds.width(), pAttributeBoxHeight));
@@ -176,12 +176,12 @@ private static void drawMethod(TypeNode pNode, Rectangle pBounds, int pSplitY, i
 
 		for( String method : methodsByLine )
 		{
-			if( method.length() > 2 && method.startsWith(UNDERLINE_MARKUP) && method.endsWith(UNDERLINE_MARKUP) )
+			if( containsMarkup(method, UNDERLINE_MARKUP) )
 			{
 				UNDERLINING_STRING_VIEWER.draw(removeMarkup(method), pGraphics, 
 						new Rectangle(pBounds.x(), pSplitY + lineSpacing, pBounds.width(), pMethodBoxHeight));
 			}
-			else if( method.length() > 2 && method.startsWith(ITALIC_MARKUP) && method.endsWith(ITALIC_MARKUP) )
+			else if( containsMarkup(method, ITALIC_MARKUP) )
 			{
 				ITALIC_STRING_VIEWER.draw(removeMarkup(method), pGraphics, 
 						new Rectangle(pBounds.x(), pSplitY + lineSpacing, pBounds.width(), pMethodBoxHeight));
@@ -195,6 +195,11 @@ else if( method.length() > 2 && method.startsWith(ITALIC_MARKUP) && method.endsW
 		}	
 	}
 
+	private static boolean containsMarkup(String pText, String pMarkup)
+	{
+		return pText.length() > 2 && pText.startsWith(pMarkup) && pText.endsWith(pMarkup);
+	}
+
 	private static String removeMarkup(String pString)
 	{
 		StringBuilder result = new StringBuilder(pString);