rename DocumentProxy to AeshDocument

jbosstools · Feb 25, 2014 · 7aa34c5 · 7aa34c5
1 parent 727f0d7
commit 7aa34c5
Show file tree

Hide file tree

Showing 15 changed files with 37 additions and 38 deletions.
diff --git a/plugins/org.jboss.tools.aesh.core/src/org/jboss/tools/aesh/core/ansi/ControlSequence.java b/plugins/org.jboss.tools.aesh.core/src/org/jboss/tools/aesh/core/ansi/ControlSequence.java
@@ -1,12 +1,12 @@
 package org.jboss.tools.aesh.core.ansi;
 
-import org.jboss.tools.aesh.core.document.DocumentProxy;
+import org.jboss.tools.aesh.core.document.AeshDocument;
 
 public abstract class ControlSequence {
 
 	public abstract ControlSequenceType getType();
 
-	public void handle(DocumentProxy document) {
+	public void handle(AeshDocument document) {
 		throw new RuntimeException("not implemented!");
 	}
 

diff --git a/plugins/org.jboss.tools.aesh.core/src/org/jboss/tools/aesh/core/ansi/CursorBack.java b/plugins/org.jboss.tools.aesh.core/src/org/jboss/tools/aesh/core/ansi/CursorBack.java
@@ -1,6 +1,6 @@
 package org.jboss.tools.aesh.core.ansi;
 
-import org.jboss.tools.aesh.core.document.DocumentProxy;
+import org.jboss.tools.aesh.core.document.AeshDocument;
 
 
 public class CursorBack extends ControlSequence {
@@ -17,7 +17,7 @@ public ControlSequenceType getType() {
 	}
 
 	@Override
-	public void handle(DocumentProxy document) {
+	public void handle(AeshDocument document) {
 		document.moveCursorTo(document.getCursorOffset() - amount);
 	}
 

diff --git a/plugins/org.jboss.tools.aesh.core/src/org/jboss/tools/aesh/core/ansi/CursorForward.java b/plugins/org.jboss.tools.aesh.core/src/org/jboss/tools/aesh/core/ansi/CursorForward.java
@@ -1,6 +1,6 @@
 package org.jboss.tools.aesh.core.ansi;
 
-import org.jboss.tools.aesh.core.document.DocumentProxy;
+import org.jboss.tools.aesh.core.document.AeshDocument;
 
 
 public class CursorForward extends ControlSequence {
@@ -17,7 +17,7 @@ public ControlSequenceType getType() {
 	}
 
 	@Override
-	public void handle(DocumentProxy document) {
+	public void handle(AeshDocument document) {
 		document.moveCursorTo(document.getCursorOffset() + amount);
 	}
 

diff --git a/...rg.jboss.tools.aesh.core/src/org/jboss/tools/aesh/core/ansi/CursorHorizontalAbsolute.java b/...rg.jboss.tools.aesh.core/src/org/jboss/tools/aesh/core/ansi/CursorHorizontalAbsolute.java
@@ -1,6 +1,6 @@
 package org.jboss.tools.aesh.core.ansi;
 
-import org.jboss.tools.aesh.core.document.DocumentProxy;
+import org.jboss.tools.aesh.core.document.AeshDocument;
 
 
 public class CursorHorizontalAbsolute extends ControlSequence {
@@ -17,7 +17,7 @@ public ControlSequenceType getType() {
 	}
 
 	@Override
-	public void handle(DocumentProxy document) {
+	public void handle(AeshDocument document) {
 		int lineStart = document.getLineOffset(document.getLineOfOffset(document.getCursorOffset()));
 		document.moveCursorTo(lineStart + column); 
 	}

diff --git a/plugins/org.jboss.tools.aesh.core/src/org/jboss/tools/aesh/core/ansi/CursorPosition.java b/plugins/org.jboss.tools.aesh.core/src/org/jboss/tools/aesh/core/ansi/CursorPosition.java
@@ -1,6 +1,6 @@
 package org.jboss.tools.aesh.core.ansi;
 
-import org.jboss.tools.aesh.core.document.DocumentProxy;
+import org.jboss.tools.aesh.core.document.AeshDocument;
 
 
 public class CursorPosition extends ControlSequence {
@@ -23,7 +23,7 @@ public ControlSequenceType getType() {
 	}
 
 	@Override
-	public void handle(DocumentProxy document) {
+	public void handle(AeshDocument document) {
     	int offset = document.getLineOffset(line);
     	int maxColumn = document.getLineLength(line);
     	offset += Math.min(maxColumn, column);

diff --git a/plugins/org.jboss.tools.aesh.core/src/org/jboss/tools/aesh/core/ansi/EraseData.java b/plugins/org.jboss.tools.aesh.core/src/org/jboss/tools/aesh/core/ansi/EraseData.java
@@ -1,6 +1,6 @@
 package org.jboss.tools.aesh.core.ansi;
 
-import org.jboss.tools.aesh.core.document.DocumentProxy;
+import org.jboss.tools.aesh.core.document.AeshDocument;
 
 
 public class EraseData extends ControlSequence {
@@ -17,7 +17,7 @@ public ControlSequenceType getType() {
 	}
 
 	@Override
-	public void handle(DocumentProxy document) {
+	public void handle(AeshDocument document) {
     	if ("2".equals(arguments)) {
     		document.reset();
     	}		

diff --git a/plugins/org.jboss.tools.aesh.core/src/org/jboss/tools/aesh/core/ansi/EraseInLine.java b/plugins/org.jboss.tools.aesh.core/src/org/jboss/tools/aesh/core/ansi/EraseInLine.java
@@ -1,6 +1,6 @@
 package org.jboss.tools.aesh.core.ansi;
 
-import org.jboss.tools.aesh.core.document.DocumentProxy;
+import org.jboss.tools.aesh.core.document.AeshDocument;
 
 
 public class EraseInLine extends ControlSequence {
@@ -13,7 +13,7 @@ public ControlSequenceType getType() {
 	}
 
 	@Override
-	public void handle(DocumentProxy document) {
+	public void handle(AeshDocument document) {
 		document.replace(
 				document.getCursorOffset(), 
 				document.getLength() - document.getCursorOffset(), 

diff --git a/...s/org.jboss.tools.aesh.core/src/org/jboss/tools/aesh/core/ansi/RestoreCursorPosition.java b/...s/org.jboss.tools.aesh.core/src/org/jboss/tools/aesh/core/ansi/RestoreCursorPosition.java
@@ -1,6 +1,6 @@
 package org.jboss.tools.aesh.core.ansi;
 
-import org.jboss.tools.aesh.core.document.DocumentProxy;
+import org.jboss.tools.aesh.core.document.AeshDocument;
 
 
 public class RestoreCursorPosition extends ControlSequence {
@@ -13,7 +13,7 @@ public ControlSequenceType getType() {
 	}
 
 	@Override
-	public void handle(DocumentProxy document) {
+	public void handle(AeshDocument document) {
 		document.restoreCursor();
 	}
 

diff --git a/plugins/org.jboss.tools.aesh.core/src/org/jboss/tools/aesh/core/ansi/SaveCursorPosition.java b/plugins/org.jboss.tools.aesh.core/src/org/jboss/tools/aesh/core/ansi/SaveCursorPosition.java
@@ -1,6 +1,6 @@
 package org.jboss.tools.aesh.core.ansi;
 
-import org.jboss.tools.aesh.core.document.DocumentProxy;
+import org.jboss.tools.aesh.core.document.AeshDocument;
 
 
 public class SaveCursorPosition extends ControlSequence {
@@ -13,7 +13,7 @@ public ControlSequenceType getType() {
 	}
 
 	@Override
-	public void handle(DocumentProxy document) {
+	public void handle(AeshDocument document) {
 		document.saveCursor();
 	}
 

diff --git a/.../org.jboss.tools.aesh.core/src/org/jboss/tools/aesh/core/ansi/SelectGraphicRendition.java b/.../org.jboss.tools.aesh.core/src/org/jboss/tools/aesh/core/ansi/SelectGraphicRendition.java
@@ -2,7 +2,7 @@
 
 import java.util.StringTokenizer;
 
-import org.jboss.tools.aesh.core.document.DocumentProxy;
+import org.jboss.tools.aesh.core.document.AeshDocument;
 import org.jboss.tools.aesh.core.document.StyleRangeProxy;
 import org.jboss.tools.aesh.core.internal.AeshCorePlugin;
 
@@ -21,7 +21,7 @@ public ControlSequenceType getType() {
 	}
 
 	@Override
-	public void handle(DocumentProxy document) {
+	public void handle(AeshDocument document) {
 		StyleRangeProxy styleRange = document.newStyleRangeFromCurrent();
 		StringTokenizer tokenizer = new StringTokenizer(arguments, ";");
 		while (tokenizer.hasMoreTokens()) {

diff --git a/...ols/aesh/core/document/DocumentProxy.java → ...ools/aesh/core/document/AeshDocument.java b/...ols/aesh/core/document/DocumentProxy.java → ...ools/aesh/core/document/AeshDocument.java
@@ -1,6 +1,6 @@
 package org.jboss.tools.aesh.core.document;
 
-public interface DocumentProxy {
+public interface AeshDocument {
 
 	int getCursorOffset();
 	int getLineOfOffset(int offset);

diff --git a/.../tools/aesh/ui/document/AeshDocument.java → ...ls/aesh/ui/document/DelegateDocument.java b/.../tools/aesh/ui/document/AeshDocument.java → ...ls/aesh/ui/document/DelegateDocument.java
@@ -13,11 +13,10 @@
 import org.jboss.tools.aesh.core.ansi.ControlSequence;
 import org.jboss.tools.aesh.core.ansi.ControlSequenceFilter;
 import org.jboss.tools.aesh.core.console.AeshConsole;
-import org.jboss.tools.aesh.core.document.DocumentProxy;
 import org.jboss.tools.aesh.core.io.StreamListener;
 import org.jboss.tools.aesh.ui.fonts.FontManager;
 
-public class AeshDocument extends Document {
+public class DelegateDocument extends Document {
 
 	public interface CursorListener {
 		void cursorMoved();
@@ -29,12 +28,12 @@ public interface CursorListener {
 	private AeshConsole console;
 	private Set<CursorListener> cursorListeners = new HashSet<CursorListener>();
 	private StyleRange currentStyleRange;
-	private DocumentProxy proxy;
+	private DelegatingDocument proxy;
 
 	private int savedCursor = 0;
 
-	public AeshDocument() {
-		proxy = new AeshDocumentProxy(this);
+	public DelegateDocument() {
+		proxy = new DelegatingDocument(this);
 		currentStyleRange = getDefaultStyleRange();
 		stdOutListener = new StreamListener() {			
 			@Override

diff --git a/...s/aesh/ui/document/AeshDocumentProxy.java → .../aesh/ui/document/DelegatingDocument.java b/...s/aesh/ui/document/AeshDocumentProxy.java → .../aesh/ui/document/DelegatingDocument.java
@@ -2,15 +2,15 @@
 
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.swt.custom.StyleRange;
-import org.jboss.tools.aesh.core.document.DocumentProxy;
+import org.jboss.tools.aesh.core.document.AeshDocument;
 import org.jboss.tools.aesh.core.document.StyleRangeProxy;
 import org.jboss.tools.aesh.ui.AeshUIPlugin;
 
-public class AeshDocumentProxy implements DocumentProxy {
+public class DelegatingDocument implements AeshDocument {
 
-	private AeshDocument document;
+	private DelegateDocument document;
 
-	public AeshDocumentProxy(AeshDocument document) {
+	public DelegatingDocument(DelegateDocument document) {
 		this.document = document;
 	}
 

diff --git a/plugins/org.jboss.tools.aesh.ui/src/org/jboss/tools/aesh/ui/view/AeshTextViewer.java b/plugins/org.jboss.tools.aesh.ui/src/org/jboss/tools/aesh/ui/view/AeshTextViewer.java
@@ -13,8 +13,8 @@
 import org.eclipse.swt.widgets.Composite;
 import org.jboss.tools.aesh.core.console.AeshConsole;
 import org.jboss.tools.aesh.ui.AeshUIConstants;
-import org.jboss.tools.aesh.ui.document.AeshDocument;
-import org.jboss.tools.aesh.ui.document.AeshDocument.CursorListener;;
+import org.jboss.tools.aesh.ui.document.DelegateDocument;
+import org.jboss.tools.aesh.ui.document.DelegateDocument.CursorListener;;
 
 public class AeshTextViewer extends TextViewer {
 
@@ -30,7 +30,7 @@ public class AeshTextViewer extends TextViewer {
 	private static String DELETE_NEXT_CHAR = new String(new char[] {(char)27,(char)91,(char)51,(char)126});
 
 	protected AeshConsole aeshConsole;
-	protected AeshDocument aeshDocument;
+	protected DelegateDocument aeshDocument;
 
 	protected CursorListener cursorListener = new CursorListener() {		
 		@Override
@@ -70,7 +70,7 @@ protected void initializeConsole() {
     }
 
     protected void initializeDocument() {
-    	aeshDocument = new AeshDocument();
+    	aeshDocument = new DelegateDocument();
     	aeshDocument.connect(aeshConsole);
     	aeshDocument.addCursorListener(cursorListener);
     	aeshDocument.addDocumentListener(documentListener);
@@ -150,8 +150,8 @@ protected void handleVerifyEvent(VerifyEvent e) {
 		e.doit = false;    	
     }
 
-    public AeshDocument getDocument() {
-    	return (AeshDocument)super.getDocument();
+    public DelegateDocument getDocument() {
+    	return (DelegateDocument)super.getDocument();
     }
 
 }

diff --git a/plugins/org.jboss.tools.forge.ui.ext/src/org/jboss/tools/forge/ui/ext/cli/F2TextViewer.java b/plugins/org.jboss.tools.forge.ui.ext/src/org/jboss/tools/forge/ui/ext/cli/F2TextViewer.java
@@ -2,7 +2,7 @@
 
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
-import org.jboss.tools.aesh.ui.document.AeshDocument;
+import org.jboss.tools.aesh.ui.document.DelegateDocument;
 import org.jboss.tools.aesh.ui.view.AeshTextViewer;
 
 public class F2TextViewer extends AeshTextViewer {
@@ -12,7 +12,7 @@ public F2TextViewer(Composite parent) {
 	}
 
     protected void initializeDocument() {
-    	aeshDocument = new AeshDocument();
+    	aeshDocument = new DelegateDocument();
     	aeshDocument.addCursorListener(cursorListener);
     	aeshDocument.addDocumentListener(documentListener);
     }