Close #227

Author: Open Lowcode SAS

src/org/openlowcode/tools/misc/SplitString.java

@@ -22,9 +22,14 @@
  *         SAS</a>
  *
  */
+/**
+ * @author demau
+ *
+ */
 public class SplitString {
 	private ArrayList<String> stringsplit;
 	private ArrayList<Boolean> transitions;
+	private ArrayList<Boolean> hasbullet;
 
 	/**
 	 * @return the number of sections of this string
@@ -53,19 +58,31 @@ public boolean getTransitionAt(int index) {
 		return transitions.get(index).booleanValue();
 	}
 
+	/**
+	 * provides information if the current section is a bullet
+	 * 
+	 * @param index index of the section
+	 * @return true if the section is a bullet, false else
+	 * @since 1.12
+	 */
+	public boolean getBulletAt(int index) {
+		return hasbullet.get(index).booleanValue();
+	}
+
 	/**
 	 * create a Split chain, parsing the string for new lines only (\n or \r\n)
-	 * (carriage returns are kept in sections), or for all
+	 * (carriage returns are kept in sections), or for all. Also manages bullet
+	 * points in the text
 	 * 
 	 * @param chaintosplit the string to split
 	 * @param onlymajor    if true, only new lines are considered, if false, new
 	 *                     lines and carriage returns are considered
-	 *                     @since 1.5
+	 * @since 1.5
 	 */
 	public SplitString(String chaintosplit, boolean onlymajor) {
 		stringsplit = new ArrayList<String>();
 		transitions = new ArrayList<Boolean>();
-
+		hasbullet = new ArrayList<Boolean>();
 		boolean lastsplitismajor = true;
 		StringBuffer currentstring = new StringBuffer();
 		int parseindex = 0;
@@ -78,18 +95,20 @@ public SplitString(String chaintosplit, boolean onlymajor) {
 			}
 			if (currentchar == 10) { // \n
 				specialcharacter = true;
-				
+
 				if (lastisbackslashr) {
 					// treats \r\n as a maj carriage return ()
 					stringsplit.add(currentstring.toString());
+					hasbullet.add(hasBullet(currentstring.toString()));
 					transitions.add(new Boolean(lastsplitismajor));
 					lastsplitismajor = true;
 					currentstring = new StringBuffer();
-					
+
 				} else {
 					// treats \n as minor carriage return (print as \n)
 					if (!onlymajor) {
 						stringsplit.add(currentstring.toString());
+						hasbullet.add(hasBullet(currentstring.toString()));
 						transitions.add(new Boolean(lastsplitismajor));
 						lastsplitismajor = false;
 						currentstring = new StringBuffer();
@@ -104,22 +123,38 @@ public SplitString(String chaintosplit, boolean onlymajor) {
 					// treats \r\n as a maj carriage return ()
 					specialcharacter = true;
 					stringsplit.add(currentstring.toString());
+					hasbullet.add(hasBullet(currentstring.toString()));
 					transitions.add(new Boolean(lastsplitismajor));
 					lastsplitismajor = true;
 					lastisbackslashr = false;
 					currentstring = new StringBuffer();
-			
-					
-				} 
+
+				}
 				currentstring.append((char) currentchar);
-				
+
 			}
 			if (currentchar == 13)
 				lastisbackslashr = true;
 			parseindex++;
 		}
 		stringsplit.add(currentstring.toString());
 		transitions.add(new Boolean(lastsplitismajor));
+		hasbullet.add(hasBullet(currentstring.toString()));
+	}
+
+	/**
+	 * 
+	 * @param string a String
+	 * @return true if a bullet is detected, false else
+	 * @since 1.12
+	 */
+	public static boolean hasBullet(String string) {
+
+		if (string.indexOf('\u25CF') >= 0)
+			return true;
+		if (string.indexOf('\u2022') >= 0)
+			return true;
+		return false;
 	}
 
 	/**

src/org/openlowcode/tools/richtext/Paragraph.java

@@ -1210,6 +1210,7 @@ public void handle(KeyEvent keyevent) {
 										+ splitstring.getNumberOfSections() + " --- ");
 								for (int i = 0; i < splitstring.getNumberOfSections(); i++)
 									logger.finest("                 |" + splitstring.getTransitionAt(i) + "| "
+											 + splitstring.getBulletAt(i) + "| "
 											+ splitstring.getSplitStringAt(i));
 								logger.finest(" ---------------------------------------------------------------");
 								if (splitstring.getNumberOfSections() > 1) {

src/org/openlowcode/tools/richtext/RichTextArea.java

@@ -335,7 +335,7 @@ void mergeCurrentParagraphWithPrevious() {
 	}
 
 	/**
-	 * insert a multi-line split string at the current carret. Only works with SplitString with several sections
+	 * insert a multi-line split string at the current carret. Only works with SplitString with several sections. Also manages the fact text may contain bullets.
 	 * @param templatetext a FormattedText that has the target format for the inserted text
 	 * 
 	 * @param splistring a splitstring with 
@@ -347,16 +347,25 @@ void insertSplitStringAtCarret(SplitString splitstring, FormattedText templatete
 		// split section at current carret
 		Paragraph newprevious = activeparagraph.generateParagraphBeforeCarret();
 		Paragraph newnext = activeparagraph.generateParagraphAfterCarret();
-		
+		boolean firsthasbullet = splitstring.getBulletAt(0);
 		// add text before first carriage return to before section
-		newprevious.addTextAtEnd(splitstring.getSplitStringAt(0));
+		if (!firsthasbullet) newprevious.addTextAtEnd(splitstring.getSplitStringAt(0));
 		logger.finest("added text in new previous "+splitstring.getSplitStringAt(0));
 		// if intermediate,add each intermediate at standaalone with previous section formatting
 		ArrayList<Paragraph> middleparagraphestoadd = new ArrayList<Paragraph>();
-		for (int i=1;i<splitstring.getNumberOfSections()-1;i++) {
+		int startindex = (firsthasbullet?0:1);
+		for (int i=startindex;i<splitstring.getNumberOfSections()-1;i++) {
+			
 			Paragraph paragraph = new Paragraph(this.richtext,this.editable, this);
+			boolean bullet = splitstring.getBulletAt(i);
+			String textstring = splitstring.getSplitStringAt(i);
+			if (bullet) {
+				paragraph.setBulletParagraph();
+				textstring=textstring.replace('\u25CF',' ').replace('\u2022',' ').trim();
+			}
 			FormattedText formattedtext = new FormattedText(templatetext,paragraph);
-			formattedtext.refreshText(splitstring.getSplitStringAt(i));
+			
+			formattedtext.refreshText(textstring);
 			paragraph.addText(formattedtext);
 			middleparagraphestoadd.add(paragraph);
 		}