You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by rw...@apache.org on 2013/02/13 05:36:50 UTC
svn commit: r1445472 -
/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkin.java
Author: rwhitcomb
Date: Wed Feb 13 04:36:50 2013
New Revision: 1445472
URL: http://svn.apache.org/r1445472
Log:
Undo bad commit to TextAreaSkin.java
Modified:
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkin.java
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkin.java?rev=1445472&r1=1445471&r2=1445472&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkin.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkin.java Wed Feb 13 04:36:50 2013
@@ -34,7 +34,6 @@ import org.apache.pivot.collections.Sequ
import org.apache.pivot.wtk.ApplicationContext;
import org.apache.pivot.wtk.Bounds;
import org.apache.pivot.wtk.Component;
-import org.apache.pivot.wtk.Cursor;
import org.apache.pivot.wtk.Dimensions;
import org.apache.pivot.wtk.GraphicsUtilities;
import org.apache.pivot.wtk.Insets;
@@ -136,7 +135,6 @@ public class TextAreaSkin extends Compon
private int tabWidth;
private int lineWidth;
private boolean acceptsEnter = true;
- private boolean acceptsTab = false;
private Dimensions averageCharacterSize;
@@ -167,8 +165,6 @@ public class TextAreaSkin extends Compon
textArea.getTextAreaListeners().add(this);
textArea.getTextAreaContentListeners().add(this);
textArea.getTextAreaSelectionListeners().add(this);
-
- textArea.setCursor(Cursor.TEXT);
}
@Override
@@ -775,34 +771,6 @@ public class TextAreaSkin extends Compon
this.acceptsEnter = acceptsEnter;
}
- /**
- * Gets current value of style that determines the
- * behavior of <tt>TAB</tt> and <tt>Ctrl-TAB</tt>
- * characters.
- * @return <tt>true</tt> if <tt>TAB</tt> inserts an
- * appropriate number of spaces, while <tt>Ctrl-TAB</tt>
- * shifts focus to next component. <tt>false</tt> (default)
- * means <tt>TAB</tt> shifts focus and <tt>Ctrl-TAB</tt>
- * inserts spaces.
- */
- public boolean getAcceptsTab() {
- return acceptsTab;
- }
-
- /**
- * Sets current value of style that determines the
- * behavior of <tt>TAB</tt> and <tt>Ctrl-TAB</tt>
- * characters.
- * @param acceptsTab <tt>true</tt> if <tt>TAB</tt> inserts an
- * appropriate number of spaces, while <tt>Ctrl-TAB</tt>
- * shifts focus to next component. <tt>false</tt> (default)
- * means <tt>TAB</tt> shifts focus and <tt>Ctrl-TAB</tt>
- * inserts spaces.
- */
- public void setAcceptsTab(boolean acceptsTab) {
- this.acceptsTab = acceptsTab;
- }
-
@Override
public int getTabWidth() {
return tabWidth;
@@ -954,74 +922,6 @@ public class TextAreaSkin extends Compon
return consumed;
}
- private void selectSpan(TextArea textArea, int start) {
- int rowStart = textArea.getRowOffset(start);
- int rowLength = textArea.getRowLength(start);
- if (start - rowStart >= rowLength) {
- start = rowStart + rowLength - 1;
- char ch = textArea.getCharacterAt(start);
- if (ch == '\r' || ch == '\n') {
- start--;
- }
- }
- char ch = textArea.getCharacterAt(start);
- int selectionStart = start;
- int selectionLength = 1;
- if (Character.isWhitespace(ch)) {
- // Move backward to beginning of whitespace block
- // but not before the beginning of the line.
- do {
- selectionStart--;
- } while (selectionStart >= rowStart &&
- Character.isWhitespace(textArea.getCharacterAt(selectionStart)));
- selectionStart++;
- selectionLength = start - selectionStart;
- // Move forward to end of whitespace block
- // but not past the end of the text or the end of line
- do {
- selectionLength++;
- } while (selectionStart + selectionLength - rowStart < rowLength &&
- Character.isWhitespace(textArea.getCharacterAt(selectionStart + selectionLength)));
- } else if (Character.isJavaIdentifierPart(ch)) {
- // Move backward to beginning of identifier block
- do {
- selectionStart--;
- } while (selectionStart >= rowStart &&
- Character.isJavaIdentifierPart(textArea.getCharacterAt(selectionStart)));
- selectionStart++;
- selectionLength = start - selectionStart;
- // Move forward to end of identifier block
- // but not past end of text
- do {
- selectionLength++;
- } while (selectionStart + selectionLength - rowStart < rowLength &&
- Character.isJavaIdentifierPart(textArea.getCharacterAt(selectionStart + selectionLength)));
- } else {
- return;
- }
- textArea.setSelection(selectionStart, selectionLength);
- }
-
- @Override
- public boolean mouseClick(Component component, Mouse.Button button,
- int x, int y, int count) {
- boolean consumed = super.mouseClick(component, button, x, y, count);
-
- TextArea textArea = (TextArea)component;
-
- if (button == Mouse.Button.LEFT) {
- int index = getInsertionPoint(x, y);
- if (index != -1) {
- if (count == 2) {
- selectSpan(textArea, index);
- } else if (count == 3) {
- textArea.setSelection(textArea.getRowOffset(index), textArea.getRowLength(index));
- }
- }
- }
- return consumed;
- }
-
@Override
public boolean keyTyped(Component component, char character) {
boolean consumed = super.keyTyped(component, character);
@@ -1095,21 +995,19 @@ public class TextAreaSkin extends Compon
consumed = true;
}
} else if (keyCode == Keyboard.KeyCode.TAB
- && (acceptsTab != Keyboard.isPressed(Keyboard.Modifier.CTRL))
+ && Keyboard.isPressed(Keyboard.Modifier.CTRL)
&& textArea.isEditable()) {
- int selectionStart = textArea.getSelectionStart();
int selectionLength = textArea.getSelectionLength();
- int rowOffset = textArea.getRowOffset(selectionStart);
- int linePos = selectionStart - rowOffset;
StringBuilder tabBuilder = new StringBuilder(tabWidth);
- for (int i = 0; i < tabWidth - (linePos % tabWidth); i++) {
+ for (int i = 0; i < tabWidth; i++) {
tabBuilder.append(" ");
}
if (textArea.getCharacterCount() - selectionLength + tabWidth > textArea.getMaximumLength()) {
Toolkit.getDefaultToolkit().beep();
} else {
+ int selectionStart = textArea.getSelectionStart();
textArea.removeText(selectionStart, selectionLength);
textArea.insertText(tabBuilder, selectionStart);
}