[brailleblaster] [brailleblaster.newdesign] push by brandon....@xxxxxxxxx - Updated code for resetting BBDocument class on 2013-09-16 13:13 GMT

  • From: brailleblaster@xxxxxxxxxxxxxx
  • To: brailleblaster@xxxxxxxxxxxxx
  • Date: Mon, 16 Sep 2013 13:13:32 +0000

Revision: 001354545f88
Branch:   default
Author:   Brandon Roller <brandon.r.roller@xxxxxxxxx>
Date:     Mon Sep 16 13:11:54 2013 UTC
Log:      Updated code for resetting BBDocument class
http://code.google.com/p/brailleblaster/source/detail?r=001354545f88&repo=newdesign

Modified:
 /src/main/org/brailleblaster/document/BBDocument.java
 /src/main/org/brailleblaster/document/SemanticFileHandler.java
 /src/main/org/brailleblaster/wordprocessor/DocumentManager.java

=======================================
--- /src/main/org/brailleblaster/document/BBDocument.java Fri Sep 13 17:44:22 2013 UTC +++ /src/main/org/brailleblaster/document/BBDocument.java Mon Sep 16 13:11:54 2013 UTC 
@@ -81,7 +81,7 @@
        public BBDocument(DocumentManager dm, BBSemanticsTable table){
                this.dm = dm;
                this.missingSemanticsList = new ArrayList<String>();
-               this.semHandler = new 
SemanticFileHandler(BBIni.getDefaultConfigFile());
+               this.semHandler = new 
SemanticFileHandler(dm.getCurrentConfig());
                this.table = table;
        }

@@ -774,6 +774,11 @@
        public String getOutfile(){
                return BBIni.getTempFilesPath() + fileSep + "outFile.utd";
        }
+
+       public void resetBBDocument(String config){
+               deleteDOM();
+               semHandler.resetSemanticHandler(config);
+       }

        public void deleteDOM(){
                this.doc = null;
=======================================
--- /src/main/org/brailleblaster/document/SemanticFileHandler.java Fri Sep 13 17:44:22 2013 UTC +++ /src/main/org/brailleblaster/document/SemanticFileHandler.java Mon Sep 16 13:11:54 2013 UTC 
@@ -170,6 +170,13 @@
                log.log(Level.SEVERE, "IO Exception", e);
        }
        }
+
+       public void resetSemanticHandler(String config){
+               defaults.clear();
+ configPath = fu.findInProgramData ("liblouisutdml" + BBIni.getFileSep() + "lbu_files" + BBIni.getFileSep() + config); 
+               defaultSemanticsFiles = getSemanticsFile(this.configPath);
+               makeDefaultMap();
+       }

        public String getDefaultSemanticsFiles(){
                return defaultSemanticsFiles;
=======================================
--- /src/main/org/brailleblaster/wordprocessor/DocumentManager.java Fri Sep 13 17:44:22 2013 UTC +++ /src/main/org/brailleblaster/wordprocessor/DocumentManager.java Mon Sep 16 13:11:54 2013 UTC 
@@ -240,11 +240,6 @@
                // Update file we're about to work on.
                workingFilePath = fileName;

-               if(!currentConfig.equals(BBIni.getDefaultConfigFile())){
-                       currentConfig = BBIni.getDefaultConfigFile();
-                       styles.resetStyleTable(currentConfig);
-                       sm.getStyleTable().resetTable(currentConfig);
-               }
                ////////////////////////
                // Zip and Recent Files.

@@ -1093,6 +1088,12 @@

        public void closeUntitledTab(){
                document.deleteDOM();
+               if(!currentConfig.equals(BBIni.getDefaultConfigFile())){
+                       currentConfig = BBIni.getDefaultConfigFile();
+                       document.resetBBDocument(currentConfig);
+                       styles.resetStyleTable(currentConfig);
+                       sm.getStyleTable().resetTable(currentConfig);
+               }
                treeView.removeListeners();
                treeView.clearTree();
                text.removeListeners();

Other related posts:

  • » [brailleblaster] [brailleblaster.newdesign] push by brandon....@xxxxxxxxx - Updated code for resetting BBDocument class on 2013-09-16 13:13 GMT - brailleblaster
  1. Home
  2. brailleblaster
  3. Archive
  4. 09-2013