rename AnsiControlSequence to ControlSequence

jbosstools · Mar 5, 2014 · d625e0f · d625e0f
1 parent 790a0c6
commit d625e0f
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 19 deletions.
diff --git a/...g.jboss.tools.aesh.core/src/org/jboss/tools/aesh/core/ansi/AnsiControlSequenceFilter.java b/...g.jboss.tools.aesh.core/src/org/jboss/tools/aesh/core/ansi/AnsiControlSequenceFilter.java
@@ -42,10 +42,10 @@ private void charAppended(char c) {
 			escapeSequence.append(c);
 		} else if (escapeSequence.length() > 1) {
 			escapeSequence.append(c);
-			AnsiControlSequence command = controlSequenceFactory.create(escapeSequence.toString());
-			if (command != null) {
+			ControlSequence controlSequence = controlSequenceFactory.create(escapeSequence.toString());
+			if (controlSequence != null) {
 				escapeSequence.setLength(0);
-				controlSequenceHandler.handle(command);;
+				controlSequenceHandler.handle(controlSequence);;
 			}
 		} else {
 			targetBuffer.append(c);

diff --git a/....jboss.tools.aesh.core/src/org/jboss/tools/aesh/core/ansi/AnsiControlSequenceHandler.java b/....jboss.tools.aesh.core/src/org/jboss/tools/aesh/core/ansi/AnsiControlSequenceHandler.java
@@ -2,6 +2,6 @@
 
 public interface AnsiControlSequenceHandler {
 
-	void handle(AnsiControlSequence controlSequence);
+	void handle(ControlSequence controlSequence);
 
 }
diff --git a/...s/aesh/core/ansi/AnsiControlSequence.java → ...tools/aesh/core/ansi/ControlSequence.java b/...s/aesh/core/ansi/AnsiControlSequence.java → ...tools/aesh/core/ansi/ControlSequence.java
@@ -1,7 +1,7 @@
 package org.jboss.tools.aesh.core.ansi;
 
 
-public interface AnsiControlSequence {
+public interface ControlSequence {
 
 	void handle(AnsiDocument document);
 

diff --git a/...ls.aesh.core/src/org/jboss/tools/aesh/core/internal/ansi/AbstractAnsiControlSequence.java b/...ls.aesh.core/src/org/jboss/tools/aesh/core/internal/ansi/AbstractAnsiControlSequence.java
@@ -1,9 +1,9 @@
 package org.jboss.tools.aesh.core.internal.ansi;
 
 import org.jboss.tools.aesh.core.ansi.AnsiDocument;
-import org.jboss.tools.aesh.core.ansi.AnsiControlSequence;
+import org.jboss.tools.aesh.core.ansi.ControlSequence;
 
-public abstract class AbstractAnsiControlSequence implements AnsiControlSequence {
+public abstract class AbstractAnsiControlSequence implements ControlSequence {
 
 	public abstract AnsiControlSequenceType getType();
 

diff --git a/...ols.aesh.core/src/org/jboss/tools/aesh/core/internal/ansi/AnsiControlSequenceFactory.java b/...ols.aesh.core/src/org/jboss/tools/aesh/core/internal/ansi/AnsiControlSequenceFactory.java
@@ -1,9 +1,9 @@
 package org.jboss.tools.aesh.core.internal.ansi;
 
-import org.jboss.tools.aesh.core.ansi.AnsiControlSequence;
+import org.jboss.tools.aesh.core.ansi.ControlSequence;
 
 public interface AnsiControlSequenceFactory {
 
-	AnsiControlSequence create(String controlSequence);
+	ControlSequence create(String controlSequence);
 
 }
diff --git a/....aesh.core/src/org/jboss/tools/aesh/core/internal/ansi/DefaultControlSequenceFactory.java b/....aesh.core/src/org/jboss/tools/aesh/core/internal/ansi/DefaultControlSequenceFactory.java
@@ -1,6 +1,6 @@
 package org.jboss.tools.aesh.core.internal.ansi;
 
-import org.jboss.tools.aesh.core.ansi.AnsiControlSequence;
+import org.jboss.tools.aesh.core.ansi.ControlSequence;
 
 
 
@@ -10,7 +10,7 @@ public class DefaultControlSequenceFactory implements AnsiControlSequenceFactory
 
 	private DefaultControlSequenceFactory() {}
 
-	public AnsiControlSequence create(String controlSequence) {
+	public ControlSequence create(String controlSequence) {
 		int last = controlSequence.length() - 1;
 		char c = controlSequence.charAt(last);
 		AnsiControlSequenceType type = AnsiControlSequenceType.fromCharacter(c);
@@ -22,7 +22,7 @@ public AnsiControlSequence create(String controlSequence) {
 		}
 	}
 
-	private static AnsiControlSequence create(
+	private static ControlSequence create(
 			AnsiControlSequenceType type, 
 			String arguments) {
 		switch (type) {

diff --git a/plugins/org.jboss.tools.aesh.ui/src/org/jboss/tools/aesh/ui/document/DelegateDocument.java b/plugins/org.jboss.tools.aesh.ui/src/org/jboss/tools/aesh/ui/document/DelegateDocument.java
@@ -10,7 +10,7 @@
 import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.graphics.TextStyle;
 import org.eclipse.swt.widgets.Display;
-import org.jboss.tools.aesh.core.ansi.AnsiControlSequence;
+import org.jboss.tools.aesh.core.ansi.ControlSequence;
 import org.jboss.tools.aesh.core.ansi.AnsiControlSequenceFilter;
 import org.jboss.tools.aesh.core.ansi.AnsiControlSequenceHandler;
 import org.jboss.tools.aesh.core.console.AeshConsole;
@@ -50,7 +50,7 @@ public void run() {
 		};
 		ansiCommandSequenceHandler = new AnsiControlSequenceHandler() {			
 			@Override
-			public void handle(final AnsiControlSequence controlSequence) {
+			public void handle(final ControlSequence controlSequence) {
 				Display.getDefault().syncExec(new Runnable() {
 					@Override
 					public void run() {

diff --git a/...ools.aesh.core.test/src/org/jboss/tools/aesh/core/ansi/AnsiControlSequenceFilterTest.java b/...ools.aesh.core.test/src/org/jboss/tools/aesh/core/ansi/AnsiControlSequenceFilterTest.java
@@ -12,22 +12,22 @@
 
 public class AnsiControlSequenceFilterTest {
 
-	private static final AnsiControlSequence TEST_CONTROL_SEQUENCE = 
-			new AnsiControlSequence() {		
+	private static final ControlSequence TEST_CONTROL_SEQUENCE = 
+			new ControlSequence() {		
 				@Override
 				public void handle(AnsiDocument document) {}
 			};
 	private static final AnsiControlSequenceFactory TEST_CONTROL_SEQUENCE_FACTORY = 
 			new AnsiControlSequenceFactory() {				
 				@Override
-				public AnsiControlSequence create(String controlSequence) {					// TODO Auto-generated method stub
+				public ControlSequence create(String controlSequence) {					// TODO Auto-generated method stub
 					return TEST_CONTROL_SEQUENCE;
 				}
 			};
 	private static final byte[] sequence = new byte[] { 27, '[', '#' };
 
 	private ArrayList<String> producedOutput;
-	private AnsiControlSequence availableControlSequence;	
+	private ControlSequence availableControlSequence;	
 	private StreamListener listener;	
 	private AnsiControlSequenceFilter filter;
 	private AnsiControlSequenceHandler handler;
@@ -47,7 +47,7 @@ public void outputAvailable(String str) {
 		};
 		handler = new AnsiControlSequenceHandler() {			
 			@Override
-			public void handle(AnsiControlSequence controlSequence) {
+			public void handle(ControlSequence controlSequence) {
 				availableControlSequence = controlSequence;
 			}
 		};