[brailleblaster] push by brandon....@xxxxxxxxx - Refactored some code on 2014-12-01 18:23 GMT
- From: brailleblaster@xxxxxxxxxxxxxx
- To: brailleblaster@xxxxxxxxxxxxx
- Date: Mon, 01 Dec 2014 18:23:33 +0000
Revision: 8a97b7e9285c
Branch: rt1835-UndoRemoveElement
Author: Brandon Roller<brandon.r.roller@xxxxxxxxx>
Date: Mon Dec 1 18:24:59 2014 UTC
Log: Refactored some code
https://code.google.com/p/brailleblaster/source/detail?r=8a97b7e9285c
Modified:
/src/main/org/brailleblaster/perspectives/braille/eventQueue/UndoQueue.java
/src/main/org/brailleblaster/perspectives/braille/stylers/ElementRemover.java
/src/main/org/brailleblaster/perspectives/braille/views/tree/TreeView.java
/src/main/org/brailleblaster/perspectives/braille/views/wp/BrailleView.java
/src/main/org/brailleblaster/settings/ui/PageNumbersTab.java
/src/main/org/brailleblaster/wordprocessor/RecentDocuments.java
=======================================
---
/src/main/org/brailleblaster/perspectives/braille/eventQueue/UndoQueue.java
Tue Nov 25 18:49:04 2014 UTC
+++
/src/main/org/brailleblaster/perspectives/braille/eventQueue/UndoQueue.java
Mon Dec 1 18:24:59 2014 UTC
@@ -24,10 +24,11 @@
case Insert:
break;
case Hide:
- case Delete:
ElementInserter es = new
ElementInserter(vi, doc, list, manager);
es.resetElement(event);
break;
+ case Delete:
+ break;
default:
break;
}
=======================================
---
/src/main/org/brailleblaster/perspectives/braille/stylers/ElementRemover.java
Mon Dec 1 16:01:25 2014 UTC
+++
/src/main/org/brailleblaster/perspectives/braille/stylers/ElementRemover.java
Mon Dec 1 18:24:59 2014 UTC
@@ -40,9 +40,9 @@
int index = (Integer)message.getValue("index");
tree.removeItem(list.get(index), message);
manager.getDocument().updateDOM(list, message);
- list.get(index).brailleList.clear();
- vi.remove(list, index);
-
+ list.get(index).brailleList.clear();
+ vi.remove(list, index);
+
if(list.size() == 0){
text.removeListeners();
braille.removeListeners();
=======================================
---
/src/main/org/brailleblaster/perspectives/braille/views/tree/TreeView.java
Fri Nov 21 17:40:12 2014 UTC
+++
/src/main/org/brailleblaster/perspectives/braille/views/tree/TreeView.java
Mon Dec 1 18:24:59 2014 UTC
@@ -94,13 +94,14 @@
public ArrayList<Integer> getItemPath(){
ArrayList<Integer> list = new ArrayList<Integer>();
- TreeItem item = tree.getSelection()[0];
- int first = 0;
- while(item.getParentItem() != null){
- list.add(first, item.getParentItem().indexOf(item));
- item = item.getParentItem();
+ if(tree.getSelection().length > 0){
+ TreeItem item = tree.getSelection()[0];
+ int first = 0;
+ while(item.getParentItem() != null){
+ list.add(first,
item.getParentItem().indexOf(item));
+ item = item.getParentItem();
+ }
}
-
return list;
}
}
=======================================
---
/src/main/org/brailleblaster/perspectives/braille/views/wp/BrailleView.java
Fri Nov 21 17:40:12 2014 UTC
+++
/src/main/org/brailleblaster/perspectives/braille/views/wp/BrailleView.java
Mon Dec 1 18:24:59 2014 UTC
@@ -1046,7 +1046,11 @@
* Remove indicator at all lines except input given line
*/
private void removeIndicator(){
- int lineNumber=view.getLineAtOffset(currentStart);
+ int lineNumber;
+ if(currentStart > view.getCharCount())
+ lineNumber = view.getLineAtOffset(view.getCharCount());
+ else
+ lineNumber = view.getLineAtOffset(currentStart);
for (int i = lineNumber; i < view.getLineCount(); i++) {
// Check to find bullet which are in indication array
list
=======================================
--- /src/main/org/brailleblaster/settings/ui/PageNumbersTab.java Wed Sep 17
18:38:05 2014 UTC
+++ /src/main/org/brailleblaster/settings/ui/PageNumbersTab.java Mon Dec 1
18:24:59 2014 UTC
@@ -1,26 +1,16 @@
package org.brailleblaster.settings.ui;
-import java.io.File;
-import java.io.IOException;
import java.util.HashMap;
-import nu.xom.Builder;
-import nu.xom.Document;
-import nu.xom.Element;
-import nu.xom.ParsingException;
-import nu.xom.ValidityException;
-
-import org.brailleblaster.BBIni;
import org.brailleblaster.localization.LocaleHandler;
import org.brailleblaster.settings.SettingsManager;
-import org.brailleblaster.settings.TranslationConfiguration;
+
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.layout.FormAttachment;
import org.eclipse.swt.layout.FormData;
-import org.eclipse.swt.layout.FormLayout;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Combo;
=======================================
--- /src/main/org/brailleblaster/wordprocessor/RecentDocuments.java Tue Apr
15 14:34:57 2014 UTC
+++ /src/main/org/brailleblaster/wordprocessor/RecentDocuments.java Mon
Dec 1 18:24:59 2014 UTC
@@ -155,7 +155,7 @@
private void processDocsList() {
recentDocsArr = recentDocsList.toArray(new
String[recentDocsList.size()]);
boolean[] dupArr = new boolean[recentDocsArr.length];
- for(boolean b:dupArr) b=false;
+ // for(boolean b:dupArr) b=false;
for( int i=0; (i < recentDocsArr.length-1)&&(!dupArr[i]);i++) {
String s1 = recentDocsArr[i];
int index = s1.lastIndexOf(fileSep);
Other related posts:
- » [brailleblaster] push by brandon....@xxxxxxxxx - Refactored some code on 2014-12-01 18:23 GMT - brailleblaster
