rename DelegatingStyleRange into StyleImpl

jbosstools · Mar 25, 2014 · 9d72e46 · 9d72e46
1 parent af4c64b
commit 9d72e46
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 20 deletions.
diff --git a/...jboss.tools.aesh.ui/src/org/jboss/tools/aesh/ui/internal/document/DelegatingDocument.java b/...jboss.tools.aesh.ui/src/org/jboss/tools/aesh/ui/internal/document/DelegatingDocument.java
@@ -13,14 +13,14 @@
 public class DelegatingDocument implements org.jboss.tools.aesh.core.document.Document {
 
 	private Document delegate;
-	private DelegatingStyleRange currentStyle;
+	private StyleImpl currentStyle;
 	private int savedCursor = 0;
 	private int cursorOffset = 0;
 	private Set<CursorListener> cursorListeners = new HashSet<CursorListener>();
 
 	public DelegatingDocument() {
 		this.delegate = new Document();
-		this.currentStyle = DelegatingStyleRange.getDefault();
+		this.currentStyle = StyleImpl.getDefault();
 	}
 
 	@Override
@@ -122,17 +122,17 @@ public void saveCursor() {
 
 	@Override
 	public Style newStyleFromCurrent() {
-		StyleRange oldStyleRange = currentStyle.getDelegate();
+		StyleRange oldStyleRange = currentStyle.getStyleRange();
 		StyleRange newStyleRange = new StyleRange(oldStyleRange);
 		newStyleRange.start = oldStyleRange.start + oldStyleRange.length;
 		newStyleRange.length = 0;
-		return new DelegatingStyleRange(newStyleRange);
+		return new StyleImpl(newStyleRange);
 	}
 
 	@Override
 	public void setCurrentStyle(Style styleRangeProxy) {
-		if (styleRangeProxy instanceof DelegatingStyleRange) {
-			currentStyle = (DelegatingStyleRange)styleRangeProxy;
+		if (styleRangeProxy instanceof StyleImpl) {
+			currentStyle = (StyleImpl)styleRangeProxy;
 		}
 	}
 
@@ -143,7 +143,7 @@ public Style getCurrentStyle() {
 
 	@Override
 	public void setDefaultStyle() {
-		DelegatingStyleRange defaultStyle = DelegatingStyleRange.getDefault();
+		StyleImpl defaultStyle = StyleImpl.getDefault();
 		StyleRange styleRange = defaultStyle.getStyleRange();
 		styleRange.start = delegate.getLength();
 		styleRange.length = 0;
@@ -154,7 +154,7 @@ public Document getDelegate() {
 		return delegate;
 	}
 
-	public DelegatingStyleRange getCurrentStyleRange() {
+	public StyleImpl getCurrentStyleRange() {
 		return currentStyle;
 	}
 

diff --git a/...ternal/document/DelegatingStyleRange.java → .../aesh/ui/internal/document/StyleImpl.java b/...ternal/document/DelegatingStyleRange.java → .../aesh/ui/internal/document/StyleImpl.java
@@ -9,15 +9,15 @@
 import org.jboss.tools.aesh.ui.internal.util.ColorConstants;
 import org.jboss.tools.aesh.ui.internal.util.FontManager;
 
-public class DelegatingStyleRange implements Style {
+public class StyleImpl implements Style {
 
 	private StyleRange styleRange;
 
-	public DelegatingStyleRange(StyleRange styleRange) {
+	public StyleImpl(StyleRange styleRange) {
 		this.styleRange = styleRange;
 	}
 
-	StyleRange getStyleRange() {
+	public StyleRange getStyleRange() {
 		return styleRange;
 	}
 
@@ -216,17 +216,13 @@ private void reverseVideo() {
 		styleRange.foreground = background;
 	}
 
-	public static DelegatingStyleRange getDefault() {
+	public static StyleImpl getDefault() {
 		Font font = FontManager.INSTANCE.getDefault();
 		Color foreground = ColorConstants.BLACK;
 		Color background = ColorConstants.WHITE;
 		TextStyle textStyle = new TextStyle(font, foreground, background);
 		StyleRange styleRange = new StyleRange(textStyle);
-		return new DelegatingStyleRange(styleRange);
-	}
-
-	public StyleRange getDelegate() {
-		return styleRange;
+		return new StyleImpl(styleRange);
 	}
 
 }
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
@@ -15,7 +15,7 @@
 import org.jboss.tools.aesh.core.console.Console;
 import org.jboss.tools.aesh.ui.internal.document.CursorListener;
 import org.jboss.tools.aesh.ui.internal.document.DelegatingDocument;
-import org.jboss.tools.aesh.ui.internal.document.DelegatingStyleRange;
+import org.jboss.tools.aesh.ui.internal.document.StyleImpl;
 import org.jboss.tools.aesh.ui.internal.util.CharacterConstants;
 import org.jboss.tools.aesh.ui.internal.util.FontManager;
 
@@ -44,8 +44,8 @@ public void documentChanged(final DocumentEvent event) {
             if (textWidget != null && !textWidget.isDisposed()) {
                 int lineCount = textWidget.getLineCount();
                 textWidget.setTopIndex(lineCount - 1);
-                DelegatingStyleRange style = aeshDocument.getCurrentStyleRange();
-    			StyleRange styleRange = style.getDelegate();
+                StyleImpl style = aeshDocument.getCurrentStyleRange();
+    			StyleRange styleRange = style.getStyleRange();
     			if (styleRange != null && 
     					event.getLength() == 0 && 
     					styleRange.start <= getDocument().getLength() &&