Revision: e868f3418db6 Branch: default Author: John Boyer <john.boyer@xxxxxxxxxxxxxxxxx> Date: Wed Jan 9 23:35:09 2013 Log: Some work on org.brailleblaster.document package http://code.google.com/p/brailleblaster/source/detail?r=e868f3418db6&repo=newdesign Modified: /src/main/org/brailleblaster/document/Actions.java /src/main/org/brailleblaster/document/Document.java /src/main/org/brailleblaster/document/Semantics.java /src/main/org/brailleblaster/document/Styles.java =======================================--- /src/main/org/brailleblaster/document/Actions.java Tue Jan 8 20:58:18 2013 +++ /src/main/org/brailleblaster/document/Actions.java Wed Jan 9 23:35:09 2013
@@ -54,7 +54,7 @@ * This class contains the actions which can be performed on elements. * They are distinct from styles. */ -public class Actions { +class Actions { /** * The various actions that can be carried out on an xml document, in @@ -92,7 +92,7 @@ * element, such as skipping it and its subtree, the method returns * false. */ -public boolean actionBeforeElement (Element element) { +boolean actionBeforeElement (Element element) { Action act = Action.valueOf ("blankLine"); return true; } @@ -101,7 +101,7 @@ * This method is called after an element and its subtree have been * processed to take any action that might be necessary at this point. */ -public void actionAfterElement() { +void actionAfterElement() { } } =======================================--- /src/main/org/brailleblaster/document/Document.java Tue Jan 8 20:58:18 2013 +++ /src/main/org/brailleblaster/document/Document.java Wed Jan 9 23:35:09 2013
@@ -39,7 +39,8 @@ private Styles st = new Styles(); private Actions act = new Actions(); -public void startDocument (InputStream inputStream) throws Exception { +public void startDocument (InputStream inputStream, String configFile, +String configSettings) throws Exception { String fileName = "xxx"; sm.makeDocumentModel (fileName); } =======================================--- /src/main/org/brailleblaster/document/Semantics.java Tue Jan 8 20:58:18 2013 +++ /src/main/org/brailleblaster/document/Semantics.java Wed Jan 9 23:35:09 2013
@@ -62,7 +62,7 @@ * <p>Instances of this class may not be reused. A new instance must be * created for each document.</p> */ -public class Semantics { +class Semantics { /** * This is the parsed xml document (Containing UTDML). It is available @@ -75,7 +75,7 @@ */ private Element rootElement; -public Semantics() { +Semantics() { workingDocument = null; semanticsList = null; } @@ -90,7 +90,7 @@ * @param fileName: The complete path to a file in which UTDML has been * added to the original xml document. */ -public void makeDocumentModel (String fileName) throws Exception { +void makeDocumentModel (String fileName) throws Exception { if (workingDocument != null) { throw new Exception ("Attempt to reuse instance"); } @@ -337,7 +337,7 @@ * a style, the semantic-action file must be arranged so that the preferred * markup is nearest the beginning. */ -public String findStyleMarkup (String styleName) { +String findStyleMarkup (String styleName) { for (int i = 0; i < semanticsCount; i++) { if (semanticsTable[i].operation.equals ("style") && semanticsTable[i].operand.equals (styleName)) @@ -352,7 +352,7 @@ * an action, the semantic-action file must be arranged so that the * preferred markup is nearest the beginning. */ -public String findActionMarkup (String actionName) { +String findActionMarkup (String actionName) { for (int i = 0; i < semanticsCount; i++) { if (semanticsTable[i].operation.equals ("action") && semanticsTable[i].operand.equals (actionName)) @@ -519,7 +519,7 @@ * scrolling and cursor movements. The doStyleOrAction method is called * for each element in the semanticsList. */ -public void readAndEdit() { +void readAndEdit() { for (int i = 0; i < semanticsList.size(); i++) { } } @@ -530,7 +530,7 @@ * @Param fileName: The complete path of the file to which the document * is to be saved. */ -public void saveWorkingFile (String fileName) { +void saveWorkingFile (String fileName) { FileOutputStream writer = null; try { writer = new FileOutputStream(fileName); @@ -556,7 +556,7 @@ * @param fileName: The complete path of the file to which the document * is to be saved. */ -public void saveEnhancedDocument(String fileName) { +void saveEnhancedDocument(String fileName) { } } =======================================--- /src/main/org/brailleblaster/document/Styles.java Tue Jan 8 20:58:18 2013 +++ /src/main/org/brailleblaster/document/Styles.java Wed Jan 9 23:35:09 2013
@@ -54,7 +54,7 @@ * <p>Note that BrailleBlaster styles deal with layout. Italic, bold, * etc. are dealt with by action methods in the Actions class.</p> */ -public class Styles { +class Styles { FileUtils fu = new FileUtils(); String fileSep = BBIni.getFileSep(); @@ -187,7 +187,7 @@ /** * Edit a StyleType. This is done in a dialog box. */ -public void editStyle (StyleType st) { +void editStyle (StyleType st) { } /** @@ -223,7 +223,7 @@ * Begins the processing of a style and places a strylRecord on the top * of the stack. If the element does not have a style it returns false. */ -public boolean startStyle (Element element) { +boolean startStyle (Element element) { return true; } @@ -231,7 +231,7 @@ * Completes the processing of the styleRecord on the top of the stack * and pops it. */ -public void endStyle () { +void endStyle () { } /** @@ -240,7 +240,7 @@ * subtree. For example, its children may be emphasized or MathML * expressions or images. */ -public void applyStyle (Element element) { +void applyStyle (Element element) { } }