|
From: <vic...@us...> - 2006-03-08 19:13:20
|
Revision: 6905 Author: victormote Date: 2006-03-08 11:13:16 -0800 (Wed, 08 Mar 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=6905&view=rev Log Message: ----------- Improvements to indentation. Modified Paths: -------------- trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java Modified: trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java =================================================================== --- trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java 2006-03-08 18:55:35 UTC (rev 6904) +++ trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java 2006-03-08 19:13:16 UTC (rev 6905) @@ -121,6 +121,15 @@ /** The maximum number of characters desired on each line. */ private int desiredLineLength = 80; + + /** + * Block elements are started on a new line. However, if they are inside + * elements containing mixed content, the default behavior is to start the + * element at column 0. If it should be indented, set this variable to + * true. + */ + private boolean indentBlocksInsideMixedContent = false; + /* End configuration variables. */ /** @@ -232,11 +241,6 @@ if (this.topElementWritten) { return; } -// boolean isEmpty = false; -// DTDElement topElement = this.elementStack.peek(); -// if (topElement != null) { -// isEmpty = topElement.isEmpty(); -// } writeElement(this.lastStartedLocal, this.lastStartedAttributes, isEmpty); this.topElementWritten = true; } @@ -254,7 +258,9 @@ if (this.startTagOnNewLine()) { newLine(); - indent(); + if (this.shouldIndent()) { + indent(); + } } /* Now write the element itself. */ @@ -274,6 +280,17 @@ } } + private boolean shouldIndent() { + if (! this.elementStack.topIsBlockElement()) { + return false; + } + if (this.elementStack.topIsInsideMixedContent()) { + return this.indentBlocksInsideMixedContent; + } + /* It is a block element, not inside mixed content. Indent it. */ + return true; + } + private void newLine() { write(this.lineTerminator); this.lastColumnWritten = 0; @@ -304,6 +321,7 @@ flushQueue(); } } else { + /* Element was empty. */ ensureTopElementWritten(true); } if (local.equals(this.rootElement)) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-03-08 19:19:45
|
Revision: 6906 Author: victormote Date: 2006-03-08 11:19:40 -0800 (Wed, 08 Mar 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=6906&view=rev Log Message: ----------- Don't increment the column counter twice. Modified Paths: -------------- trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java Modified: trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java =================================================================== --- trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java 2006-03-08 19:13:16 UTC (rev 6905) +++ trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java 2006-03-08 19:19:40 UTC (rev 6906) @@ -301,7 +301,6 @@ while (numIndents > 0) { write(" "); numIndents --; - this.lastColumnWritten ++; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-03-08 19:29:27
|
Revision: 6907 Author: victormote Date: 2006-03-08 11:29:21 -0800 (Wed, 08 Mar 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=6907&view=rev Log Message: ----------- Simplify logic by treating the root element as a normal element WRT whether it starts on a new line. Modified Paths: -------------- trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java Modified: trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java =================================================================== --- trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java 2006-03-08 19:19:40 UTC (rev 6906) +++ trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java 2006-03-08 19:29:21 UTC (rev 6907) @@ -108,7 +108,7 @@ /** The line terminator that should be used in the output. */ private String lineTerminator = "\n"; private String outputEncoding = "UTF-8"; - private String preRootText = "\n"; + private String preRootText = null; private String postRootText = "\n"; /** * Set this to true if PCDATA content can have space characters replaced @@ -143,7 +143,7 @@ /* Set the line terminator to the default for this operating system. */ this.lineTerminator = System.getProperty("line.separator"); /* Default the pre- and post- root text to one line separator. */ - this.preRootText = this.lineTerminator; + this.preRootText = null; this.postRootText = this.lineTerminator; } @@ -535,6 +535,9 @@ } private void write(String outputString) { + if (outputString == null) { + return; + } if (outputString.length() < 1) { return; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-03-08 20:26:33
|
Revision: 6908 Author: victormote Date: 2006-03-08 12:26:28 -0800 (Wed, 08 Mar 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=6908&view=rev Log Message: ----------- Put all text into the queue. Modified Paths: -------------- trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java Modified: trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java =================================================================== --- trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java 2006-03-08 19:29:21 UTC (rev 6907) +++ trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java 2006-03-08 20:26:28 UTC (rev 6908) @@ -388,46 +388,38 @@ } ensureTopElementWritten(false); if (this.breakPCDATA) { - breakPCDATA(); + /* Note: SAX input has linefeeds normalized to \n. */ + normalizeWhitespace(); + this.queue.add(this.charBuffer.toString()); } else { writeRawPCDATA(this.charBuffer.toString()); } - this.charBuffer.delete(0, this.charBuffer.length()); + this.charBuffer.setLength(0); } - private void breakPCDATA() { - /* SAX input has linefeeds normalized to \n. - * The goal here is to write as much as we are forced to write and to - * leave any text that we do not have to write in the buffer. */ - int lastBreak = 0; - int lastBreakOpportunity = -1; - for (int i = 0; i < this.charBuffer.length(); i++) { - int lineLengthSoFar = i - lastBreak + this.lastColumnWritten; - if (lineLengthSoFar > this.desiredLineLength) { - if (lastBreakOpportunity > -1) { - /* String excludes the character that gave the break - * opportunity. We'll write the newline manually. */ - String textToWrite = this.charBuffer.substring(lastBreak, - lastBreakOpportunity); - write(textToWrite); - newLine(); - lastBreak = lastBreakOpportunity + 1; - lastBreakOpportunity = -1; - } + private void normalizeWhitespace() { + /* Convert all line-feeds to spaces. */ + convertString(this.charBuffer, "\n", " "); + /* Convert all tabs to spaces. */ + convertString(this.charBuffer, "\t", " "); + /* Remove extra spaces. */ + convertString(this.charBuffer, " ", " "); + } + + /** + * Replaces all occurrences of a given String with a different Strings. + */ + private static void convertString(StringBuffer buffer, String oldString, + String newString) { + boolean anyChanges = true; + while (anyChanges) { + anyChanges = false; + int index = buffer.indexOf(oldString); + if (index > -1) { + buffer.replace(index, index + oldString.length(), newString); + anyChanges = true; } - char c = this.charBuffer.charAt(i); - switch (c) { - case ' ': - case '\t': - case '\n': { - lastBreakOpportunity = i; - break; - } - } } - String textToWrite = this.charBuffer.substring(lastBreak, - this.charBuffer.length()); - addToQueue(textToWrite); } private void addToQueue(String string) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-03-08 20:59:12
|
Revision: 6909 Author: victormote Date: 2006-03-08 12:59:04 -0800 (Wed, 08 Mar 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=6909&view=rev Log Message: ----------- Since spaces between attributes can cause line breaks, queue up attributes like other content. Modified Paths: -------------- trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java Modified: trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java =================================================================== --- trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java 2006-03-08 20:26:28 UTC (rev 6908) +++ trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java 2006-03-08 20:59:04 UTC (rev 6909) @@ -263,21 +263,36 @@ } } - /* Now write the element itself. */ + /* Always write the tag opener and the element name itself. */ write("<"); write(local); + + /* Accumulate the attributes. */ + StringBuffer attributesBuffer = new StringBuffer(); for (int i = 0; i < attributes.getLength(); i++) { - write(" "); - write(attributes.getLocalName(i)); - write("=\""); - write(attributes.getValue(i)); - write("\""); + attributesBuffer.append(" "); + attributesBuffer.append(attributes.getLocalName(i)); + attributesBuffer.append("=\""); + attributesBuffer.append(attributes.getValue(i)); + attributesBuffer.append("\""); } + + /* Accumulate the tag closer. */ + StringBuffer tagCloseBuffer = new StringBuffer(); if (isEmpty) { - write("/>"); + tagCloseBuffer.append("/>"); } else { - write(">"); + tagCloseBuffer.append(">"); } + + /* If there are attributes, they must be queued up for output.*/ + if (attributes.getLength() > 0) { + this.queue.add(attributesBuffer.toString() + + tagCloseBuffer.toString()); + } else { + /* Otherwise write the tag closer now. */ + write(tagCloseBuffer.toString()); + } } private boolean shouldIndent() { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-03-08 21:19:25
|
Revision: 6910 Author: victormote Date: 2006-03-08 13:19:19 -0800 (Wed, 08 Mar 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=6910&view=rev Log Message: ----------- Improvements to queue processing. Modified Paths: -------------- trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java Modified: trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java =================================================================== --- trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java 2006-03-08 20:59:04 UTC (rev 6909) +++ trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java 2006-03-08 21:19:19 UTC (rev 6910) @@ -214,11 +214,11 @@ public void startDocument() { write(this.xmlDeclaration); - newLine(); + write(newLine()); } public void endDocument() { - newLine(); + write(newLine()); } public void startElement(String uri, String local, String qName, @@ -257,9 +257,9 @@ } if (this.startTagOnNewLine()) { - newLine(); + write(newLine()); if (this.shouldIndent()) { - indent(); + write(indent()); } } @@ -306,17 +306,18 @@ return true; } - private void newLine() { - write(this.lineTerminator); - this.lastColumnWritten = 0; + private String newLine() { + return this.lineTerminator; } - private void indent() { + private String indent() { int numIndents = currentIndentation() * this.indent; + StringBuffer buffer = new StringBuffer(); while (numIndents > 0) { - write(" "); + buffer.append(" "); numIndents --; } + return buffer.toString(); } public void endElement(String uri, String local, String qName) { @@ -324,15 +325,15 @@ if (this.topElementWritten) { if (this.elementStack.topIsBlockElement()) { - flushQueue(); + this.queue.flush(); } if (endTagOnNewLine()) { - newLine(); - indent(); + write(newLine()); + write(indent()); } addToQueue("</" + local + ">"); if (this.elementStack.topIsBlockElement()) { - flushQueue(); + this.queue.flush(); } } else { /* Element was empty. */ @@ -346,18 +347,6 @@ this.elementStack.pop(); } - private void flushQueue() { - /* If they all fit on the current line, write them all. */ - if (this.queue.charCount() + this.lastColumnWritten - <= this.desiredLineLength) { - this.queue.writeAll(); - return; - } - this.queue.breakAtLastOpportunity(); - /* Otherwise, search backwards through the items in the queue looking - * for the last break opportunity*/ - } - /** * Determines whether the start tag for the current element should * be written on a new line or whether it should be written inside the @@ -465,19 +454,19 @@ } public void startDTD(String name, String publicId, String systemId) { - newLine(); + write(newLine()); write("<!DOCTYPE "); write(name); - newLine(); + write(newLine()); // Indentation. write(" "); write("PUBLIC "); write("\"" + publicId + "\""); - newLine(); + write(newLine()); write(" "); write("\"" + systemId + "\""); write(">"); - newLine(); + write(newLine()); this.inDTD = true; this.rootElement = name; } @@ -601,6 +590,29 @@ Queue() { } + private void flush() { + if (attemptWriteAll()) { + return; + } + breakAtLastOpportunity(); + /* Otherwise, search backwards through the items in the queue looking + * for the last break opportunity*/ + } + + /** + * If everything can be written on the current line, do it. Otherwise, + * do nothing. + * @return True if everything was written, false otherwise. + */ + private boolean attemptWriteAll() { + /* If they all fit on the current line, write them all. */ + if (charCount() + lastColumnWritten <= desiredLineLength) { + writeAll(); + return true; + } + return false; + } + private void writeAll() { while (this.toWriteQueue.size() > 0) { String returnItem = (String) this.toWriteQueue.get(0); @@ -664,7 +676,7 @@ /* Otherwise, split into two chunks. */ /* Write the first chunk. */ writeChunk(0, 0, lastBreakItem, lastBreakItemIndex - 1); - newLine(); + write(newLine()); /* Write the second chunk. */ writeChunk(lastBreakItem, lastBreakItemIndex + 1, this.toWriteQueue.size() - 1, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-03-08 21:49:09
|
Revision: 6911 Author: victormote Date: 2006-03-08 13:49:04 -0800 (Wed, 08 Mar 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=6911&view=rev Log Message: ----------- Use new break opportunity logic to compute last break opportunity. Modified Paths: -------------- trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java Modified: trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java =================================================================== --- trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java 2006-03-08 21:19:19 UTC (rev 6910) +++ trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java 2006-03-08 21:49:04 UTC (rev 6911) @@ -583,9 +583,17 @@ private class Queue { /** Collection of Strings that need to be written as soon as we know * enough of what comes after them to choose line breaks. This is needed - * for PCDATA and inline tags that must stay on the current line. */ + * for PCDATA and inline tags that must stay on the current line. + * It is tempting to turn this all into one long StringBuffer, but we + * need to handle attributes differently from PCDATA. */ private ArrayList toWriteQueue = new ArrayList(); + /* After running listBreakOpportunities, these two arrays hold a list of + * break opportunities. The "Items" element points to the item in + * toWriteQueue. The "Indexes" element points to a specific character + * in that queue item. */ + private int[] breakOpportunityItems; + private int[] breakOpportunityIndexes; Queue() { } @@ -646,45 +654,60 @@ } private void breakAtLastOpportunity() { - if (this.size() < 1) { - return; - } - int lastBreakItem = -1; - int lastBreakItemIndex = -1; - for (int i = this.toWriteQueue.size() - 1; - i >= 0 && lastBreakItem < 0; i--) { - String string = this.get(i); - for (int j = string.length() - 1; j >= 0 && lastBreakItem < 0; - j--) { - char c = string.charAt(j); - switch (c) { - case ' ': - case '\t': - case '\n': { - lastBreakItem = i; - lastBreakItemIndex = j; - } - } - } - } + this.listBreakOpportunities(); /* If there is no break, there is nothing to do but write the whole * thing.*/ - if (lastBreakItem < 0) { + if (this.breakOpportunityItems.length < 1) { this.writeAll(); return; } /* Otherwise, split into two chunks. */ /* Write the first chunk. */ - writeChunk(0, 0, lastBreakItem, lastBreakItemIndex - 1); + int lastIndex = this.breakOpportunityItems.length - 1; + int lastBreakItem = this.breakOpportunityItems[lastIndex]; + int lastBreakIndex = this.breakOpportunityIndexes[lastIndex]; + writeChunk(0, 0, lastBreakItem, lastBreakIndex); write(newLine()); /* Write the second chunk. */ - writeChunk(lastBreakItem, lastBreakItemIndex + 1, + writeChunk(lastBreakItem, lastBreakIndex + 1, this.toWriteQueue.size() - 1, this.getLastItem().length() - 1); /* Clear the queue contents. */ this.toWriteQueue.clear(); } + private void listBreakOpportunities() { + int count = countBreakOpportunities(); + this.breakOpportunityItems = new int[count]; + this.breakOpportunityIndexes = new int[count]; + count = 0; + for (int i = 0; i < this.toWriteQueue.size(); i++) { + String string = this.get(i); + for (int j = 0; j < string.length(); j++) { + char c = string.charAt(j); + if (c == ' ') { + this.breakOpportunityItems[count] = i; + this.breakOpportunityIndexes[count] = j; + count ++; + } + } + } + } + + private int countBreakOpportunities() { + int count = 0; + for (int i = 0; i < this.toWriteQueue.size(); i++) { + String string = this.get(i); + for (int j = 0; j < string.length(); j++) { + char c = string.charAt(j); + if (c == ' ') { + count ++; + } + } + } + return count; + } + private void writeChunk(int startItem, int startItemIndex, int endItem, int endItemIndex) { for (int i = startItem; i <= endItem; i++) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-03-08 22:25:19
|
Revision: 6912 Author: victormote Date: 2006-03-08 14:25:15 -0800 (Wed, 08 Mar 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=6912&view=rev Log Message: ----------- Only write the tag if it starts a new line. Otherwise queue it up. Modified Paths: -------------- trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java Modified: trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java =================================================================== --- trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java 2006-03-08 21:49:04 UTC (rev 6911) +++ trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java 2006-03-08 22:25:15 UTC (rev 6912) @@ -256,17 +256,11 @@ write(this.preRootText); } - if (this.startTagOnNewLine()) { - write(newLine()); - if (this.shouldIndent()) { - write(indent()); - } - } + /* Accumulate the tag opener. */ + StringBuffer tagOpenBuffer = new StringBuffer(); + tagOpenBuffer.append("<"); + tagOpenBuffer.append(local); - /* Always write the tag opener and the element name itself. */ - write("<"); - write(local); - /* Accumulate the attributes. */ StringBuffer attributesBuffer = new StringBuffer(); for (int i = 0; i < attributes.getLength(); i++) { @@ -284,15 +278,23 @@ } else { tagCloseBuffer.append(">"); } - - /* If there are attributes, they must be queued up for output.*/ - if (attributes.getLength() > 0) { - this.queue.add(attributesBuffer.toString() - + tagCloseBuffer.toString()); + + /* If starting on new line, write the tag open buffer. */ + if (this.startTagOnNewLine()) { + this.queue.flush(); + write(newLine()); + if (this.shouldIndent()) { + write(indent()); + } + write(tagOpenBuffer.toString()); } else { - /* Otherwise write the tag closer now. */ - write(tagCloseBuffer.toString()); + /* Otherwise queue it up. */ + this.queue.add(tagOpenBuffer.toString()); } + + /* Queue up the attributes and tag close. */ + this.queue.add(attributesBuffer.toString() + + tagCloseBuffer.toString()); } private boolean shouldIndent() { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-03-08 23:31:33
|
Revision: 6913 Author: victormote Date: 2006-03-08 15:31:27 -0800 (Wed, 08 Mar 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=6913&view=rev Log Message: ----------- Add logic for writing multiple break opportunities. Modified Paths: -------------- trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java Modified: trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java =================================================================== --- trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java 2006-03-08 22:25:15 UTC (rev 6912) +++ trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java 2006-03-08 23:31:27 UTC (rev 6913) @@ -596,7 +596,24 @@ * in that queue item. */ private int[] breakOpportunityItems; private int[] breakOpportunityIndexes; + /* chunkSizes[n] = the size in chars of the chunk ending at + * breakOpportunityItems[n], breakOpportunityIndex[n]. */ + private int[] chunkSizes; + /* If there are n break opportunities, there are n + 1 chunks. This + * stores the size of the last chunk. */ + private int lastChunkSize; + /* The following items are similar to breakOpportunityItems and + * breakOpportunityIndexes, except they represent breaks actually + * chosen. */ + private int[] breakChosenItems; + private int[] breakChosenIndexes; + + /* The last index used in the "breakChosen" variables. Those items are + * sized to generally be larger than they need to be, so this is needed + * to keep track of the amount actually used. */ + private int breakChosenIndex = -1; + Queue() { } @@ -604,11 +621,35 @@ if (attemptWriteAll()) { return; } - breakAtLastOpportunity(); - /* Otherwise, search backwards through the items in the queue looking - * for the last break opportunity*/ + this.listBreakOpportunities(); + this.chooseBreaks(); + this.writeChosenChunks(); + this.reset(); } + private void chooseBreaks() { + /* Make these arrays as big as the opportunity arrays to avoid + * resizing. */ + int arraySize = this.breakOpportunityIndexes.length; + this.breakChosenItems = new int[arraySize]; + this.breakChosenIndexes = new int[arraySize]; + + if (arraySize < 1) { + return; + } + + /* For now, just choose the last opportunity. */ + this.breakChosenIndex ++; + this.breakChosenItems[this.breakChosenIndex] + = this.breakOpportunityItems[arraySize - 1]; + this.breakChosenIndexes[this.breakChosenIndex] + = this.breakOpportunityIndexes[arraySize - 1]; + + /* The main thing to watch out for here is that the last line is not + * too long. */ +// if (this.lastChunkSize >) + } + /** * If everything can be written on the current line, do it. Otherwise, * do nothing. @@ -629,8 +670,20 @@ writeRawPCDATA(returnItem); this.toWriteQueue.remove(0); } + reset(); } + private void reset() { + this.breakChosenIndex = -1; + this.breakChosenItems = null; + this.breakChosenIndexes = null; + this.breakOpportunityItems = null; + this.breakOpportunityIndexes = null; + this.chunkSizes = null; + this.lastChunkSize = -1; + this.toWriteQueue.clear(); + } + protected int size() { return toWriteQueue.size(); } @@ -655,33 +708,50 @@ return charCount; } - private void breakAtLastOpportunity() { - this.listBreakOpportunities(); - /* If there is no break, there is nothing to do but write the whole - * thing.*/ - if (this.breakOpportunityItems.length < 1) { + private void writeChosenChunks() { + /* If there are no breaks, there is nothing to do but write the + * whole thing.*/ + if (this.breakChosenIndex < 1) { this.writeAll(); return; } - /* Otherwise, split into two chunks. */ - /* Write the first chunk. */ - int lastIndex = this.breakOpportunityItems.length - 1; - int lastBreakItem = this.breakOpportunityItems[lastIndex]; - int lastBreakIndex = this.breakOpportunityIndexes[lastIndex]; - writeChunk(0, 0, lastBreakItem, lastBreakIndex); - write(newLine()); - /* Write the second chunk. */ - writeChunk(lastBreakItem, lastBreakIndex + 1, - this.toWriteQueue.size() - 1, - this.getLastItem().length() - 1); - /* Clear the queue contents. */ - this.toWriteQueue.clear(); + /* Notice that if there are n breaks, we loop through n + 1 + * times, so that the last chunk gets written. */ + for (int i = 0; i <= this.breakChosenIndex; i++) { + int startItem = 0; + int startIndex = 0; + int endItem = 0; + int endIndex = 0; + + /* Adjust starting items for the items after the first. */ + if (i != 0) { + startItem = this.breakChosenItems[i - 1]; + startIndex = this.breakChosenIndexes[i - 1]; + } + + /* Set the ending items. */ + if (i == this.breakChosenIndex) { + endItem = this.toWriteQueue.size() - 1; + endIndex = this.getLastItem().length() - 1; + } else { + endItem = this.breakChosenItems[i]; + endItem = this.breakChosenIndexes[i]; + } + + /* Write the chunk. */ + writeChunk(startItem, startIndex, endItem, endIndex); + write(newLine()); + } } private void listBreakOpportunities() { int count = countBreakOpportunities(); this.breakOpportunityItems = new int[count]; this.breakOpportunityIndexes = new int[count]; + this.chunkSizes = new int[count]; + if (count == 0) { + return; + } count = 0; for (int i = 0; i < this.toWriteQueue.size(); i++) { String string = this.get(i); @@ -690,12 +760,34 @@ if (c == ' ') { this.breakOpportunityItems[count] = i; this.breakOpportunityIndexes[count] = j; + int startItem = 0; + int startIndex = 0; + if (count > 0) { + startItem = this.breakOpportunityItems[count - 1]; + startIndex = this.breakOpportunityIndexes[count - 1]; + } + int endItem = i; + int endIndex = j; + int chunkSize = chunkSize(startItem, startIndex, + endItem, endIndex); + this.chunkSizes[count] = chunkSize; count ++; } } } + count = this.breakOpportunityItems.length; + this.lastChunkSize = chunkSize( + this.breakOpportunityItems[count - 1], + this.breakOpportunityIndexes[count - 1], + this.toWriteQueue.size() - 1, + this.getLastItem().length() - 1); } + private int chunkSize(int startItem, int startItemIndex, int endItem, + int endItemIndex) { + return 0; + } + private int countBreakOpportunities() { int count = 0; for (int i = 0; i < this.toWriteQueue.size(); i++) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-03-08 23:46:18
|
Revision: 6914 Author: victormote Date: 2006-03-08 15:46:14 -0800 (Wed, 08 Mar 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=6914&view=rev Log Message: ----------- Fix some problems related to getting the choices written. Modified Paths: -------------- trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java Modified: trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java =================================================================== --- trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java 2006-03-08 23:31:27 UTC (rev 6913) +++ trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java 2006-03-08 23:46:14 UTC (rev 6914) @@ -326,15 +326,13 @@ flushCharacters(); if (this.topElementWritten) { - if (this.elementStack.topIsBlockElement()) { + if (endTagOnNewLine()) { this.queue.flush(); - } - if (endTagOnNewLine()) { write(newLine()); write(indent()); } addToQueue("</" + local + ">"); - if (this.elementStack.topIsBlockElement()) { + if (endTagOnNewLine()) { this.queue.flush(); } } else { @@ -711,7 +709,7 @@ private void writeChosenChunks() { /* If there are no breaks, there is nothing to do but write the * whole thing.*/ - if (this.breakChosenIndex < 1) { + if (this.breakChosenIndex < 0) { this.writeAll(); return; } @@ -740,7 +738,9 @@ /* Write the chunk. */ writeChunk(startItem, startIndex, endItem, endIndex); - write(newLine()); + if (i != this.breakChosenIndex) { + write(newLine()); + } } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-03-09 00:09:04
|
Revision: 6915 Author: victormote Date: 2006-03-08 16:08:55 -0800 (Wed, 08 Mar 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=6915&view=rev Log Message: ----------- Fix some problems related to getting the choices written. Modified Paths: -------------- trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java Modified: trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java =================================================================== --- trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java 2006-03-08 23:46:14 UTC (rev 6914) +++ trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java 2006-03-09 00:08:55 UTC (rev 6915) @@ -713,13 +713,16 @@ this.writeAll(); return; } + /* Usable size of the arrays is 1 greater than the last index. */ + int chosenSize = this.breakChosenIndex + 1; + + int startItem = 0; + int startIndex = 0; + int endItem = 0; + int endIndex = 0; /* Notice that if there are n breaks, we loop through n + 1 * times, so that the last chunk gets written. */ - for (int i = 0; i <= this.breakChosenIndex; i++) { - int startItem = 0; - int startIndex = 0; - int endItem = 0; - int endIndex = 0; + for (int i = 0; i < chosenSize; i++) { /* Adjust starting items for the items after the first. */ if (i != 0) { @@ -728,20 +731,32 @@ } /* Set the ending items. */ - if (i == this.breakChosenIndex) { - endItem = this.toWriteQueue.size() - 1; - endIndex = this.getLastItem().length() - 1; - } else { - endItem = this.breakChosenItems[i]; - endItem = this.breakChosenIndexes[i]; - } + endItem = this.breakChosenItems[i]; + endIndex = this.breakChosenIndexes[i]; + /* Start writing one past the break, and stop one before. */ + startIndex ++; + endIndex --; + /* Write the chunk. */ writeChunk(startItem, startIndex, endItem, endIndex); - if (i != this.breakChosenIndex) { - write(newLine()); - } + write(newLine()); } + + /* Write the final chunk, the portion from the last break chosen + * to the end of the data items. */ + startItem = this.breakChosenItems[this.breakChosenIndex]; + startIndex = this.breakChosenIndexes[this.breakChosenIndex]; + endItem = this.toWriteQueue.size() - 1; + endIndex = this.getLastItem().length() - 1; + + /* Start writing one past the break. The ending index is already + * adjusted. */ + startIndex ++; + + writeChunk(startItem, startIndex, endItem, endIndex); + /* Do not write a new line here. This will be controlled at a + * higher level. */ } private void listBreakOpportunities() { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-03-09 02:38:33
|
Revision: 6916 Author: victormote Date: 2006-03-08 18:38:25 -0800 (Wed, 08 Mar 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=6916&view=rev Log Message: ----------- 1. Add logic to compute size of chunks. 2. Fill in some of the logic for selecting line breaks. Modified Paths: -------------- trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java Modified: trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java =================================================================== --- trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java 2006-03-09 00:08:55 UTC (rev 6915) +++ trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java 2006-03-09 02:38:25 UTC (rev 6916) @@ -631,21 +631,45 @@ int arraySize = this.breakOpportunityIndexes.length; this.breakChosenItems = new int[arraySize]; this.breakChosenIndexes = new int[arraySize]; + this.breakChosenIndex = -1; if (arraySize < 1) { return; } - /* For now, just choose the last opportunity. */ + int lastIndexChosen = -1; + for (int i = 0; i < arraySize; i++) { + int sizeIfAccepted = 0; + /* If it is the first item, we must consider what has already + * been written on the line. */ + if (lastIndexChosen < 0) { + sizeIfAccepted += lastColumnWritten; + } + int firstChunkToConsider = lastIndexChosen; + if (lastIndexChosen < 0) { + firstChunkToConsider = 0; + } + for (int j = firstChunkToConsider; j <= i; j++) { + sizeIfAccepted += this.chunkSizes[j]; + } + if (sizeIfAccepted > desiredLineLength) { + if (i == 0) { + lastIndexChosen = i; + markBreak(this.breakChosenItems[i], + this.breakChosenIndexes[i]); + } else { + lastIndexChosen = i - 1; + markBreak(this.breakChosenItems[i - 1], + this.breakChosenIndexes[i - 1]); + } + } + } + } + + private void markBreak(int item, int itemIndex) { this.breakChosenIndex ++; - this.breakChosenItems[this.breakChosenIndex] - = this.breakOpportunityItems[arraySize - 1]; - this.breakChosenIndexes[this.breakChosenIndex] - = this.breakOpportunityIndexes[arraySize - 1]; - - /* The main thing to watch out for here is that the last line is not - * too long. */ -// if (this.lastChunkSize >) + this.breakChosenItems[this.breakChosenIndex] = item; + this.breakChosenIndexes[this.breakChosenIndex] = itemIndex; } /** @@ -800,7 +824,22 @@ private int chunkSize(int startItem, int startItemIndex, int endItem, int endItemIndex) { - return 0; + int size = 0; + for (int i = startItem; i <= endItem; i++) { + int startIndex = 0; + int endIndex = 0; + if (i == startItem) { + startIndex = startItemIndex; + } + if (i == endItem) { + endIndex = endItemIndex - 1; + } else { + String item = this.get(i); + endIndex = item.length() - 1; + } + size += endIndex - startIndex + 1; + } + return size; } private int countBreakOpportunities() { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-03-09 19:33:13
|
Revision: 6917 Author: victormote Date: 2006-03-09 11:32:58 -0800 (Thu, 09 Mar 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=6917&view=rev Log Message: ----------- Fix problems in the way sizes of chunks were computed. Modified Paths: -------------- trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java Modified: trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java =================================================================== --- trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java 2006-03-09 02:38:25 UTC (rev 6916) +++ trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java 2006-03-09 19:32:58 UTC (rev 6917) @@ -800,7 +800,9 @@ this.breakOpportunityItems[count] = i; this.breakOpportunityIndexes[count] = j; int startItem = 0; - int startIndex = 0; + /* Must pretend there is a break right before the first + * index of the first item. */ + int startIndex = -1; if (count > 0) { startItem = this.breakOpportunityItems[count - 1]; startIndex = this.breakOpportunityIndexes[count - 1]; @@ -819,7 +821,10 @@ this.breakOpportunityItems[count - 1], this.breakOpportunityIndexes[count - 1], this.toWriteQueue.size() - 1, - this.getLastItem().length() - 1); + /* Don't subtract 1 here. We must pretend there is a break + * opportunity immediately after the last index of the last + * item. */ + this.getLastItem().length()); } private int chunkSize(int startItem, int startItemIndex, int endItem, @@ -837,7 +842,12 @@ String item = this.get(i); endIndex = item.length() - 1; } - size += endIndex - startIndex + 1; + size += endIndex - startIndex; + if (i != startItem) { + /* For all but the first item, we must add the space that + * separates the chunks in order to get the complete size.*/ + size ++; + } } return size; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-03-09 19:54:50
|
Revision: 6918 Author: victormote Date: 2006-03-09 11:54:45 -0800 (Thu, 09 Mar 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=6918&view=rev Log Message: ----------- Select the correct break opportunity. Modified Paths: -------------- trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java Modified: trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java =================================================================== --- trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java 2006-03-09 19:32:58 UTC (rev 6917) +++ trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java 2006-03-09 19:54:45 UTC (rev 6918) @@ -651,16 +651,21 @@ } for (int j = firstChunkToConsider; j <= i; j++) { sizeIfAccepted += this.chunkSizes[j]; + if (j != firstChunkToConsider) { + /* For all but the first item, we must consider the + * space between the items. */ + sizeIfAccepted ++; + } } if (sizeIfAccepted > desiredLineLength) { if (i == 0) { lastIndexChosen = i; - markBreak(this.breakChosenItems[i], - this.breakChosenIndexes[i]); + markBreak(this.breakOpportunityItems[i], + this.breakOpportunityIndexes[i]); } else { lastIndexChosen = i - 1; - markBreak(this.breakChosenItems[i - 1], - this.breakChosenIndexes[i - 1]); + markBreak(this.breakOpportunityItems[i - 1], + this.breakOpportunityIndexes[i - 1]); } } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-03-09 21:04:38
|
Revision: 6919 Author: victormote Date: 2006-03-09 13:04:33 -0800 (Thu, 09 Mar 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=6919&view=rev Log Message: ----------- Just keep track of which indexes were selected instead of copying them around. Modified Paths: -------------- trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java Modified: trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java =================================================================== --- trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java 2006-03-09 19:54:45 UTC (rev 6918) +++ trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java 2006-03-09 21:04:33 UTC (rev 6919) @@ -601,17 +601,10 @@ * stores the size of the last chunk. */ private int lastChunkSize; - /* The following items are similar to breakOpportunityItems and - * breakOpportunityIndexes, except they represent breaks actually - * chosen. */ - private int[] breakChosenItems; - private int[] breakChosenIndexes; + /* List of Integer indexes into the breakOpportunity arrays that + * indicate which opportunities have actually been chosen. */ + private ArrayList breaksChosen = new ArrayList(); - /* The last index used in the "breakChosen" variables. Those items are - * sized to generally be larger than they need to be, so this is needed - * to keep track of the amount actually used. */ - private int breakChosenIndex = -1; - Queue() { } @@ -629,9 +622,7 @@ /* Make these arrays as big as the opportunity arrays to avoid * resizing. */ int arraySize = this.breakOpportunityIndexes.length; - this.breakChosenItems = new int[arraySize]; - this.breakChosenIndexes = new int[arraySize]; - this.breakChosenIndex = -1; + this.breaksChosen.clear(); if (arraySize < 1) { return; @@ -660,23 +651,15 @@ if (sizeIfAccepted > desiredLineLength) { if (i == 0) { lastIndexChosen = i; - markBreak(this.breakOpportunityItems[i], - this.breakOpportunityIndexes[i]); + this.breaksChosen.add(new Integer(i)); } else { lastIndexChosen = i - 1; - markBreak(this.breakOpportunityItems[i - 1], - this.breakOpportunityIndexes[i - 1]); + this.breaksChosen.add(new Integer(i - 1)); } } } } - private void markBreak(int item, int itemIndex) { - this.breakChosenIndex ++; - this.breakChosenItems[this.breakChosenIndex] = item; - this.breakChosenIndexes[this.breakChosenIndex] = itemIndex; - } - /** * If everything can be written on the current line, do it. Otherwise, * do nothing. @@ -701,14 +684,12 @@ } private void reset() { - this.breakChosenIndex = -1; - this.breakChosenItems = null; - this.breakChosenIndexes = null; this.breakOpportunityItems = null; this.breakOpportunityIndexes = null; this.chunkSizes = null; this.lastChunkSize = -1; this.toWriteQueue.clear(); + this.breaksChosen.clear(); } protected int size() { @@ -738,30 +719,28 @@ private void writeChosenChunks() { /* If there are no breaks, there is nothing to do but write the * whole thing.*/ - if (this.breakChosenIndex < 0) { + if (this.breaksChosen.size() < 0) { this.writeAll(); return; } - /* Usable size of the arrays is 1 greater than the last index. */ - int chosenSize = this.breakChosenIndex + 1; int startItem = 0; int startIndex = 0; int endItem = 0; int endIndex = 0; - /* Notice that if there are n breaks, we loop through n + 1 - * times, so that the last chunk gets written. */ - for (int i = 0; i < chosenSize; i++) { - + + for (int i = 0; i < this.breaksChosen.size(); i++) { + int activeBreak = this.getBreakChosen(i); /* Adjust starting items for the items after the first. */ if (i != 0) { - startItem = this.breakChosenItems[i - 1]; - startIndex = this.breakChosenIndexes[i - 1]; + int previousBreak = this.getBreakChosen(i - 1); + startItem = this.breakOpportunityItems[previousBreak]; + startIndex = this.breakOpportunityIndexes[previousBreak]; } /* Set the ending items. */ - endItem = this.breakChosenItems[i]; - endIndex = this.breakChosenIndexes[i]; + endItem = this.breakOpportunityItems[activeBreak]; + endIndex = this.breakOpportunityIndexes[activeBreak]; /* Start writing one past the break, and stop one before. */ startIndex ++; @@ -774,8 +753,14 @@ /* Write the final chunk, the portion from the last break chosen * to the end of the data items. */ - startItem = this.breakChosenItems[this.breakChosenIndex]; - startIndex = this.breakChosenIndexes[this.breakChosenIndex]; + int lastChosen = this.getBreakChosen(this.breaksChosen.size() - 1); + if (lastChosen < 0) { + startItem = 0; + startIndex = -1; + } else { + startItem = this.breakOpportunityItems[lastChosen]; + startIndex = this.breakOpportunityIndexes[lastChosen]; + } endItem = this.toWriteQueue.size() - 1; endIndex = this.getLastItem().length() - 1; @@ -788,6 +773,17 @@ * higher level. */ } + private int getBreakChosen(int index) { + if (this.breaksChosen == null + || index < 0 + || index >= this.breaksChosen.size()) { + return -1; + } + Object object = this.breaksChosen.get(index); + Integer integer = (Integer) object; + return integer.intValue(); + } + private void listBreakOpportunities() { int count = countBreakOpportunities(); this.breakOpportunityItems = new int[count]; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-03-09 22:34:47
|
Revision: 6920 Author: victormote Date: 2006-03-09 14:34:42 -0800 (Thu, 09 Mar 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=6920&view=rev Log Message: ----------- More simplification. Modified Paths: -------------- trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java Modified: trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java =================================================================== --- trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java 2006-03-09 21:04:33 UTC (rev 6919) +++ trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java 2006-03-09 22:34:42 UTC (rev 6920) @@ -628,16 +628,15 @@ return; } - int lastIndexChosen = -1; for (int i = 0; i < arraySize; i++) { int sizeIfAccepted = 0; /* If it is the first item, we must consider what has already * been written on the line. */ - if (lastIndexChosen < 0) { + if (this.breaksChosen.size() < 1) { sizeIfAccepted += lastColumnWritten; } - int firstChunkToConsider = lastIndexChosen; - if (lastIndexChosen < 0) { + int firstChunkToConsider = this.getLastBreakChosen(); + if (firstChunkToConsider < 0) { firstChunkToConsider = 0; } for (int j = firstChunkToConsider; j <= i; j++) { @@ -650,10 +649,8 @@ } if (sizeIfAccepted > desiredLineLength) { if (i == 0) { - lastIndexChosen = i; this.breaksChosen.add(new Integer(i)); } else { - lastIndexChosen = i - 1; this.breaksChosen.add(new Integer(i - 1)); } } @@ -784,6 +781,11 @@ return integer.intValue(); } + private int getLastBreakChosen() { + int lastIndex = this.breaksChosen.size() - 1; + return getBreakChosen(lastIndex); + } + private void listBreakOpportunities() { int count = countBreakOpportunities(); this.breakOpportunityItems = new int[count]; @@ -800,36 +802,37 @@ if (c == ' ') { this.breakOpportunityItems[count] = i; this.breakOpportunityIndexes[count] = j; - int startItem = 0; - /* Must pretend there is a break right before the first - * index of the first item. */ - int startIndex = -1; - if (count > 0) { - startItem = this.breakOpportunityItems[count - 1]; - startIndex = this.breakOpportunityIndexes[count - 1]; - } - int endItem = i; - int endIndex = j; - int chunkSize = chunkSize(startItem, startIndex, - endItem, endIndex); + int chunkSize = chunkSize(count - 1, count); this.chunkSizes[count] = chunkSize; count ++; } } } count = this.breakOpportunityItems.length; - this.lastChunkSize = chunkSize( - this.breakOpportunityItems[count - 1], - this.breakOpportunityIndexes[count - 1], - this.toWriteQueue.size() - 1, - /* Don't subtract 1 here. We must pretend there is a break - * opportunity immediately after the last index of the last - * item. */ - this.getLastItem().length()); + this.lastChunkSize = chunkSize(count - 1, count); } - private int chunkSize(int startItem, int startItemIndex, int endItem, - int endItemIndex) { + private int chunkSize(int startOpportunity, int endOpportunity) { + int startItem; + int startItemIndex; + int endItem; + int endItemIndex; + if (startOpportunity < 0) { + startItem = 0; + startItemIndex = -1; + } else { + startItem = this.breakOpportunityItems[startOpportunity]; + startItemIndex = this.breakOpportunityIndexes[startOpportunity]; + } + int lastOpportunity = this.breakOpportunityItems.length - 1; + if (endOpportunity > lastOpportunity) { + endItem = this.breakOpportunityItems[lastOpportunity]; + String string = this.get(endItem); + endItemIndex = string.length(); + } else { + endItem = this.breakOpportunityItems[endOpportunity]; + endItemIndex = this.breakOpportunityIndexes[endOpportunity]; + } int size = 0; for (int i = startItem; i <= endItem; i++) { int startIndex = 0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-03-09 23:07:41
|
Revision: 6921 Author: victormote Date: 2006-03-09 15:07:36 -0800 (Thu, 09 Mar 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=6921&view=rev Log Message: ----------- Improvements to line-breaking. Modified Paths: -------------- trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java Modified: trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java =================================================================== --- trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java 2006-03-09 22:34:42 UTC (rev 6920) +++ trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java 2006-03-09 23:07:36 UTC (rev 6921) @@ -619,16 +619,14 @@ } private void chooseBreaks() { - /* Make these arrays as big as the opportunity arrays to avoid - * resizing. */ - int arraySize = this.breakOpportunityIndexes.length; this.breaksChosen.clear(); - if (arraySize < 1) { + if (this.breakOpportunityIndexes.length < 1) { return; } - for (int i = 0; i < arraySize; i++) { + /* Loop one extra time to catch the last chunk. */ + for (int i = 0; i <= this.breakOpportunityIndexes.length; i++) { int sizeIfAccepted = 0; /* If it is the first item, we must consider what has already * been written on the line. */ @@ -639,14 +637,10 @@ if (firstChunkToConsider < 0) { firstChunkToConsider = 0; } - for (int j = firstChunkToConsider; j <= i; j++) { - sizeIfAccepted += this.chunkSizes[j]; - if (j != firstChunkToConsider) { - /* For all but the first item, we must consider the - * space between the items. */ - sizeIfAccepted ++; - } - } + sizeIfAccepted += this.chunkSize(firstChunkToConsider, i); + /* Add one for the first break opportunity, which is outside the + * computation above. */ + sizeIfAccepted ++; if (sizeIfAccepted > desiredLineLength) { if (i == 0) { this.breaksChosen.add(new Integer(i)); @@ -813,6 +807,9 @@ } private int chunkSize(int startOpportunity, int endOpportunity) { + if (startOpportunity == endOpportunity) { + return 0; + } int startItem; int startItemIndex; int endItem; @@ -853,6 +850,11 @@ size ++; } } + /* If the parameters go past the end of the opportunities, it means + * they want the length of the last chunk included. */ + if (endOpportunity > lastOpportunity) { + size += this.lastChunkSize + 1; + } return size; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-03-10 00:15:07
|
Revision: 6922 Author: victormote Date: 2006-03-09 16:15:01 -0800 (Thu, 09 Mar 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=6922&view=rev Log Message: ----------- Simplify the writing of a chunk. Modified Paths: -------------- trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java Modified: trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java =================================================================== --- trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java 2006-03-09 23:07:36 UTC (rev 6921) +++ trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java 2006-03-10 00:15:01 UTC (rev 6922) @@ -715,53 +715,22 @@ return; } - int startItem = 0; - int startIndex = 0; - int endItem = 0; - int endIndex = 0; - + int activeBreak; + int previousBreak; for (int i = 0; i < this.breaksChosen.size(); i++) { - int activeBreak = this.getBreakChosen(i); - /* Adjust starting items for the items after the first. */ - if (i != 0) { - int previousBreak = this.getBreakChosen(i - 1); - startItem = this.breakOpportunityItems[previousBreak]; - startIndex = this.breakOpportunityIndexes[previousBreak]; + activeBreak = this.getBreakChosen(i); + if (i == 0) { + previousBreak = 0; + } else { + previousBreak = this.getBreakChosen(i - 1); } - - /* Set the ending items. */ - endItem = this.breakOpportunityItems[activeBreak]; - endIndex = this.breakOpportunityIndexes[activeBreak]; - - /* Start writing one past the break, and stop one before. */ - startIndex ++; - endIndex --; - - /* Write the chunk. */ - writeChunk(startItem, startIndex, endItem, endIndex); + this.writeChunk(previousBreak, activeBreak); write(newLine()); } - - /* Write the final chunk, the portion from the last break chosen - * to the end of the data items. */ - int lastChosen = this.getBreakChosen(this.breaksChosen.size() - 1); - if (lastChosen < 0) { - startItem = 0; - startIndex = -1; - } else { - startItem = this.breakOpportunityItems[lastChosen]; - startIndex = this.breakOpportunityIndexes[lastChosen]; - } - endItem = this.toWriteQueue.size() - 1; - endIndex = this.getLastItem().length() - 1; - - /* Start writing one past the break. The ending index is already - * adjusted. */ - startIndex ++; - - writeChunk(startItem, startIndex, endItem, endIndex); - /* Do not write a new line here. This will be controlled at a - * higher level. */ + /* Write the last chunk. Don't write a new-line after it. That will + * be controlled at a higher level. */ + activeBreak = this.getBreakChosen(this.breaksChosen.size() - 1); + this.writeChunk(activeBreak, Integer.MAX_VALUE); } private int getBreakChosen(int index) { @@ -872,8 +841,26 @@ return count; } - private void writeChunk(int startItem, int startItemIndex, int endItem, - int endItemIndex) { + private void writeChunk(int startOpportunity, int endOpportunity) { + int startItem; + int startItemIndex; + int endItem; + int endItemIndex; + if (startOpportunity < 0) { + startItem = 0; + startItemIndex = 0; + } else { + startItem = this.breakOpportunityItems[startOpportunity]; + startItemIndex = this.breakOpportunityIndexes[startOpportunity]; + } + if (endOpportunity >= this.breakOpportunityIndexes.length) { + int lastItem = this.toWriteQueue.size() - 1; + endItem = lastItem; + endItemIndex = this.getLastItem().length() - 1; + } else { + endItem = this.breakOpportunityItems[endOpportunity]; + endItemIndex = this.breakOpportunityIndexes[endOpportunity]; + } for (int i = startItem; i <= endItem; i++) { String string = this.get(i); int startIndex = 0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-03-10 00:58:54
|
Revision: 6923 Author: victormote Date: 2006-03-09 16:58:50 -0800 (Thu, 09 Mar 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=6923&view=rev Log Message: ----------- More improvements to line writing. Modified Paths: -------------- trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java Modified: trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java =================================================================== --- trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java 2006-03-10 00:15:01 UTC (rev 6922) +++ trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java 2006-03-10 00:58:50 UTC (rev 6923) @@ -715,22 +715,13 @@ return; } - int activeBreak; - int previousBreak; for (int i = 0; i < this.breaksChosen.size(); i++) { - activeBreak = this.getBreakChosen(i); - if (i == 0) { - previousBreak = 0; - } else { - previousBreak = this.getBreakChosen(i - 1); - } - this.writeChunk(previousBreak, activeBreak); + this.writeChunk(i); write(newLine()); } /* Write the last chunk. Don't write a new-line after it. That will * be controlled at a higher level. */ - activeBreak = this.getBreakChosen(this.breaksChosen.size() - 1); - this.writeChunk(activeBreak, Integer.MAX_VALUE); + this.writeChunk(Integer.MAX_VALUE); } private int getBreakChosen(int index) { @@ -841,7 +832,20 @@ return count; } - private void writeChunk(int startOpportunity, int endOpportunity) { + private void writeChunk(int breakSelected) { + int startOpportunity; + int endOpportunity; + if (breakSelected == 0) { + startOpportunity = Integer.MIN_VALUE; + endOpportunity = this.getBreakChosen(breakSelected); + } else if (breakSelected > this.breaksChosen.size() - 1) { + startOpportunity = this.getLastBreakChosen(); + endOpportunity = Integer.MAX_VALUE; + } else { + startOpportunity = this.getBreakChosen(breakSelected - 1); + endOpportunity = this.getBreakChosen(breakSelected); + } + int startItem; int startItemIndex; int endItem; @@ -866,17 +870,21 @@ int startIndex = 0; if (i == startItem) { startIndex = startItemIndex; + /* If the first character on a line is a space, don't write + * it. */ + if (string.charAt(startIndex) == ' ' + && lastColumnWritten == 0) { + startIndex ++; + } } int endIndex = string.length() - 1; if (i == endItem) { endIndex = endItemIndex; + if (string.charAt(endIndex) == ' ') { + endIndex --; + } } - if (startIndex == 0 - && endIndex == string.length() - 1) { - write(string); - } else { - write(string.substring(startIndex, endIndex + 1)); - } + write(string.substring(startIndex, endIndex + 1)); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-03-10 01:15:37
|
Revision: 6924 Author: victormote Date: 2006-03-09 17:15:31 -0800 (Thu, 09 Mar 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=6924&view=rev Log Message: ----------- Improvements to line-breaking logic. Modified Paths: -------------- trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java Modified: trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java =================================================================== --- trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java 2006-03-10 00:58:50 UTC (rev 6923) +++ trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java 2006-03-10 01:15:31 UTC (rev 6924) @@ -642,11 +642,7 @@ * computation above. */ sizeIfAccepted ++; if (sizeIfAccepted > desiredLineLength) { - if (i == 0) { - this.breaksChosen.add(new Integer(i)); - } else { - this.breaksChosen.add(new Integer(i - 1)); - } + this.breaksChosen.add(new Integer(i - 1)); } } } @@ -783,7 +779,7 @@ } int lastOpportunity = this.breakOpportunityItems.length - 1; if (endOpportunity > lastOpportunity) { - endItem = this.breakOpportunityItems[lastOpportunity]; + endItem = this.toWriteQueue.size() - 1; String string = this.get(endItem); endItemIndex = string.length(); } else { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-03-10 21:21:10
|
Revision: 6925 Author: victormote Date: 2006-03-10 13:20:59 -0800 (Fri, 10 Mar 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=6925&view=rev Log Message: ----------- 1. Don't count the last chunk twice when computing the sizes. 2. Remove count variables as they are no longer used. Modified Paths: -------------- trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java Modified: trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java =================================================================== --- trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java 2006-03-10 01:15:31 UTC (rev 6924) +++ trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java 2006-03-10 21:20:59 UTC (rev 6925) @@ -594,12 +594,6 @@ * in that queue item. */ private int[] breakOpportunityItems; private int[] breakOpportunityIndexes; - /* chunkSizes[n] = the size in chars of the chunk ending at - * breakOpportunityItems[n], breakOpportunityIndex[n]. */ - private int[] chunkSizes; - /* If there are n break opportunities, there are n + 1 chunks. This - * stores the size of the last chunk. */ - private int lastChunkSize; /* List of Integer indexes into the breakOpportunity arrays that * indicate which opportunities have actually been chosen. */ @@ -673,8 +667,6 @@ private void reset() { this.breakOpportunityItems = null; this.breakOpportunityIndexes = null; - this.chunkSizes = null; - this.lastChunkSize = -1; this.toWriteQueue.clear(); this.breaksChosen.clear(); } @@ -740,7 +732,6 @@ int count = countBreakOpportunities(); this.breakOpportunityItems = new int[count]; this.breakOpportunityIndexes = new int[count]; - this.chunkSizes = new int[count]; if (count == 0) { return; } @@ -752,14 +743,11 @@ if (c == ' ') { this.breakOpportunityItems[count] = i; this.breakOpportunityIndexes[count] = j; - int chunkSize = chunkSize(count - 1, count); - this.chunkSizes[count] = chunkSize; count ++; } } } count = this.breakOpportunityItems.length; - this.lastChunkSize = chunkSize(count - 1, count); } private int chunkSize(int startOpportunity, int endOpportunity) { @@ -806,11 +794,6 @@ size ++; } } - /* If the parameters go past the end of the opportunities, it means - * they want the length of the last chunk included. */ - if (endOpportunity > lastOpportunity) { - size += this.lastChunkSize + 1; - } return size; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-03-10 21:58:52
|
Revision: 6926 Author: victormote Date: 2006-03-10 13:58:48 -0800 (Fri, 10 Mar 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=6926&view=rev Log Message: ----------- Must consider queued items before the first break opportunity. Modified Paths: -------------- trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java Modified: trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java =================================================================== --- trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java 2006-03-10 21:20:59 UTC (rev 6925) +++ trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java 2006-03-10 21:58:48 UTC (rev 6926) @@ -628,9 +628,6 @@ sizeIfAccepted += lastColumnWritten; } int firstChunkToConsider = this.getLastBreakChosen(); - if (firstChunkToConsider < 0) { - firstChunkToConsider = 0; - } sizeIfAccepted += this.chunkSize(firstChunkToConsider, i); /* Add one for the first break opportunity, which is outside the * computation above. */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-03-10 22:59:38
|
Revision: 6927 Author: victormote Date: 2006-03-10 14:59:33 -0800 (Fri, 10 Mar 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=6927&view=rev Log Message: ----------- Fix problem with chunks that have no valid break in them. Modified Paths: -------------- trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java Modified: trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java =================================================================== --- trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java 2006-03-10 21:58:48 UTC (rev 6926) +++ trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java 2006-03-10 22:59:33 UTC (rev 6927) @@ -701,12 +701,11 @@ } for (int i = 0; i < this.breaksChosen.size(); i++) { - this.writeChunk(i); - write(newLine()); + this.writeChunk(i, true); } /* Write the last chunk. Don't write a new-line after it. That will * be controlled at a higher level. */ - this.writeChunk(Integer.MAX_VALUE); + this.writeChunk(Integer.MAX_VALUE, false); } private int getBreakChosen(int index) { @@ -808,7 +807,13 @@ return count; } - private void writeChunk(int breakSelected) { + /** + * Write one of the chunks selected. + * @param breakSelected The break selection that should be written. + * @param newLine Set to true if a new-line should be written after + * the text of the line. + */ + private void writeChunk(int breakSelected, boolean newLine) { int startOpportunity; int endOpportunity; if (breakSelected == 0) { @@ -833,7 +838,10 @@ startItem = this.breakOpportunityItems[startOpportunity]; startItemIndex = this.breakOpportunityIndexes[startOpportunity]; } - if (endOpportunity >= this.breakOpportunityIndexes.length) { + if (endOpportunity < 0) { + /* This was no break recorded. */ + return; + } else if (endOpportunity >= this.breakOpportunityIndexes.length) { int lastItem = this.toWriteQueue.size() - 1; endItem = lastItem; endItemIndex = this.getLastItem().length() - 1; @@ -862,6 +870,9 @@ } write(string.substring(startIndex, endIndex + 1)); } + if (newLine) { + write(newLine()); + } } private String getLastItem() { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-03-10 23:10:56
|
Revision: 6928 Author: victormote Date: 2006-03-10 15:10:47 -0800 (Fri, 10 Mar 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=6928&view=rev Log Message: ----------- Remove erroneous incrementation of size. Modified Paths: -------------- trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java Modified: trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java =================================================================== --- trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java 2006-03-10 22:59:33 UTC (rev 6927) +++ trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java 2006-03-10 23:10:47 UTC (rev 6928) @@ -629,9 +629,6 @@ } int firstChunkToConsider = this.getLastBreakChosen(); sizeIfAccepted += this.chunkSize(firstChunkToConsider, i); - /* Add one for the first break opportunity, which is outside the - * computation above. */ - sizeIfAccepted ++; if (sizeIfAccepted > desiredLineLength) { this.breaksChosen.add(new Integer(i - 1)); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-03-10 23:21:26
|
Revision: 6929 Author: victormote Date: 2006-03-10 15:21:21 -0800 (Fri, 10 Mar 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=6929&view=rev Log Message: ----------- Make better fix for situation where the content is too long to fit on a line. Specifically, prevent the same break opportunity from being selected more than once. Modified Paths: -------------- trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java Modified: trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java =================================================================== --- trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java 2006-03-10 23:10:47 UTC (rev 6928) +++ trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java 2006-03-10 23:21:21 UTC (rev 6929) @@ -630,7 +630,14 @@ int firstChunkToConsider = this.getLastBreakChosen(); sizeIfAccepted += this.chunkSize(firstChunkToConsider, i); if (sizeIfAccepted > desiredLineLength) { - this.breaksChosen.add(new Integer(i - 1)); + int breakSelected = i - 1; + if (breakSelected <= this.getLastBreakChosen()) { + /* Don't let the same break get chosen again. If the + * content is too long, we still need to write it + * once. */ + breakSelected = this.getLastBreakChosen() + 1; + } + this.breaksChosen.add(new Integer(breakSelected)); } } } @@ -835,10 +842,7 @@ startItem = this.breakOpportunityItems[startOpportunity]; startItemIndex = this.breakOpportunityIndexes[startOpportunity]; } - if (endOpportunity < 0) { - /* This was no break recorded. */ - return; - } else if (endOpportunity >= this.breakOpportunityIndexes.length) { + if (endOpportunity >= this.breakOpportunityIndexes.length) { int lastItem = this.toWriteQueue.size() - 1; endItem = lastItem; endItemIndex = this.getLastItem().length() - 1; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |