[brailleblaster] [brailleblaster.newdesign] push by john.bo...@xxxxxxxxxxxxxxxxx - Changing Document to DocumentBase because of conflict on 2013-01-11 08:09 GMT
- From: brailleblaster@xxxxxxxxxxxxxx
- To: brailleblaster@xxxxxxxxxxxxx
- Date: Fri, 11 Jan 2013 08:09:52 +0000
Revision: e8e8ccd4654c
Branch: default
Author: John Boyer <john.boyer@xxxxxxxxxxxxxxxxx>
Date: Fri Jan 11 00:08:35 2013
Log: Changing Document to DocumentBase because of conflict
http://code.google.com/p/brailleblaster/source/detail?r=e8e8ccd4654c&repo=newdesign
Added:
/src/main/org/brailleblaster/document/DocumentBase.java
Deleted:
/src/main/org/brailleblaster/document/Document.java
=======================================
--- /dev/null
+++ /src/main/org/brailleblaster/document/DocumentBase.java Fri Jan 11
00:08:35 2013
@@ -0,0 +1,77 @@
+/* BrailleBlaster Braille Transcription Application
+ *
+ * Copyright (C) 2010, 2012
+ * ViewPlus Technologies, Inc. www.viewplus.com
+ * and
+ * Abilitiessoft, Inc. www.abilitiessoft.com
+ * and
+ * American Printing House for the Blind, Inc. www.aph.org
+ *
+ * All rights reserved
+ *
+ * This file may contain code borrowed from files produced by various
+ * Java development teams. These are gratefully acknoledged.
+ *
+ * This file is free software; you can redistribute it and/or modify it
+ * under the terms of the Apache 2.0 License, as given at
+ * http://www.apache.org/licenses/
+ *
+ * This file is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE
+ * See the Apache 2.0 License for more details.
+ *
+ * You should have received a copy of the Apache 2.0 License along with
+ * this program; see the file LICENSE.
+ * If not, see
+ * http://www.apache.org/licenses/
+ *
+ * Maintained by John J. Boyer john.boyer@xxxxxxxxxxxxxxxxx
+*/
+
+package org.brailleblaster.document;
+
+import nu.xom.Document;
+import nu.xom.Node;
+import nu.xom.Nodes;
+import java.io.InputStream;
+
+public class DocumentBase {
+
+private Semantics sm = new Semantics();
+private Styles st = new Styles();
+private Actions act = new Actions();
+
+public void startDocument (InputStream inputStream, String configFile,
+String configSettings) throws Exception {
+String fileName = "xxx";
+sm.makeSemantics (fileName);
+}
+
+public void saveWorkingFile (String completePath) {
+sm.saveWorkingFile (completePath);
+}
+
+public void saveEnhancedDocument (String completePath) {
+sm.saveEnhancedDocument (completePath);
+}
+
+public Document getDocumentTree() {
+return sm.workingDocument;
+}
+
+public void editCreateStyle (String styleName) {
+Styles.StyleType styleType = st.readStyle (styleName);
+st.editStyle (styleType);
+st.writeStyle (styleType);
+}
+
+public Nodes getNodes (Node node, String xpathExpr) {
+return null;
+}
+
+public Node getContextNode() {
+return null;
+}
+
+}
=======================================
--- /src/main/org/brailleblaster/document/Document.java Thu Jan 10 20:26:03
2013
+++ /dev/null
@@ -1,72 +0,0 @@
-/* BrailleBlaster Braille Transcription Application
- *
- * Copyright (C) 2010, 2012
- * ViewPlus Technologies, Inc. www.viewplus.com
- * and
- * Abilitiessoft, Inc. www.abilitiessoft.com
- * and
- * American Printing House for the Blind, Inc. www.aph.org
- *
- * All rights reserved
- *
- * This file may contain code borrowed from files produced by various
- * Java development teams. These are gratefully acknoledged.
- *
- * This file is free software; you can redistribute it and/or modify it
- * under the terms of the Apache 2.0 License, as given at
- * http://www.apache.org/licenses/
- *
- * This file is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE
- * See the Apache 2.0 License for more details.
- *
- * You should have received a copy of the Apache 2.0 License along with
- * this program; see the file LICENSE.
- * If not, see
- * http://www.apache.org/licenses/
- *
- * Maintained by John J. Boyer john.boyer@xxxxxxxxxxxxxxxxx
-*/
-
-package org.brailleblaster.document;
-
-import nu.xom.Node;
-import nu.xom.Nodes;
-import java.io.InputStream;
-
-public class Document {
-
-private Semantics sm = new Semantics();
-private Styles st = new Styles();
-private Actions act = new Actions();
-
-public void startDocument (InputStream inputStream, String configFile,
-String configSettings) throws Exception {
-String fileName = "xxx";
-sm.makeSemantics (fileName);
-}
-
-public void saveWorkingFile (String completePath) {
-sm.saveWorkingFile (completePath);
-}
-
-public void saveEnhancedDocument (String completePath) {
-sm.saveEnhancedDocument (completePath);
-}
-
-public void editCreateStyle (String styleName) {
-Styles.StyleType styleType = st.readStyle (styleName);
-st.editStyle (styleType);
-st.writeStyle (styleType);
-}
-
-public Nodes getNodes (Node node, String xpathExpr) {
-return null;
-}
-
-public Node getContextNode() {
-return null;
-}
-
-}
Other related posts:
