### Eclipse Workspace Patch 1.0
#P org.eclipse.datatools.sqltools.data.ui
Index: src/org/eclipse/datatools/sqltools/data/internal/ui/bidi/BidiLayout.java
===================================================================
RCS file: src/org/eclipse/datatools/sqltools/data/internal/ui/bidi/BidiLayout.java
diff -N src/org/eclipse/datatools/sqltools/data/internal/ui/bidi/BidiLayout.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/datatools/sqltools/data/internal/ui/bidi/BidiLayout.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,757 @@
+/*******************************************************************************
+ * Copyright (c) 2010 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ ******************************************************************************/
+
+package org.eclipse.datatools.sqltools.data.internal.ui.bidi;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.BidiSegmentEvent;
+import org.eclipse.swt.custom.BidiSegmentListener;
+import org.eclipse.swt.custom.LineBackgroundListener;
+import org.eclipse.swt.custom.MovementListener;
+import org.eclipse.swt.custom.ST;
+import org.eclipse.swt.custom.StyleRange;
+import org.eclipse.swt.custom.StyledText;
+import org.eclipse.swt.custom.StyledTextContent;
+import org.eclipse.swt.custom.StyledTextPrintOptions;
+import org.eclipse.swt.events.KeyEvent;
+import org.eclipse.swt.events.KeyListener;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.events.VerifyListener;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.GC;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.LineAttributes;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.internal.BidiUtil;
+import org.eclipse.swt.internal.win32.OS;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.printing.Printer;
+import org.eclipse.swt.widgets.Canvas;
+import org.eclipse.swt.widgets.Caret;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Listener;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.MenuItem;
+
+@SuppressWarnings("restriction")
+public class BidiLayout extends Canvas {
+	
+	public static final int LANG_ARABIC = 0x01;
+	public static final int LANG_HEBREW = 0x0d;
+	public static final int LANG_ENGLISH = 0x09;
+	
+    private static final char LRO = '\u202d';
+    private static final char RLO = '\u202e';
+    private static final char PDF = '\u202c';
+    static final String eolStr = "\r\n";
+    
+    
+    
+    Listener listener;
+	StyledText styledText;
+	int bidiLangCode = 0;
+	int nonBidiLangCode = 0;
+	boolean isPushMode;
+	boolean isWidgetReversed;
+	boolean isAutoPush;
+	int indxPushSegmentStart = -1;
+	int lengthPushSegment = 0;
+	Caret defaultCaret = null;
+	MenuItem rtlMenuItem;
+	MenuItem autopushMenuItem;
+	char[] arrOfIgnoredChars = null;
+	private int prevLength = 0;
+	
+	
+    public BidiLayout(Composite parent, int style){
+		super(parent, 0);
+		this.setLayout(new FillLayout());
+		if ((parent.getLayout() instanceof FillLayout) ||
+			(parent.getLayout() instanceof GridLayout))
+			styledText = new StyledText(this, style);
+		else
+			styledText = new StyledText(parent, style);
+
+		addBidiSegmentListener();
+		addListeners();
+		styledText.setMenu(createContextMenu());
+    }
+	
+    public void setBidiLang (int lang) {
+    	bidiLangCode = lang;
+    }
+    public void setNonBidiLang (int lang) {
+    	nonBidiLangCode = lang;
+    }
+    
+    public void setArrOfIgnoredChars(char[] arr){
+    	arrOfIgnoredChars = (char[])arr.clone();
+    }
+    
+	private void addListeners() {
+		listener = new Listener() {
+			
+			public void handleEvent(Event event) {
+				switch (event.type) {
+				case SWT.MouseDown: handleMouseDown(event); break;
+				case SWT.KeyDown: handleKeyDown(event); break;
+			}
+				
+			}
+		};
+		addAndReorderListener(SWT.KeyDown, listener);
+		styledText.addListener(SWT.MouseDown, listener);
+		addAndReorderListener(SWT.Show, listener);
+		
+		styledText.addKeyListener(new KeyListener() {
+			public void keyReleased(KeyEvent keyEvent) {
+				if ((keyEvent.keyCode == 'u') &&
+					((keyEvent.stateMask & SWT.CTRL) != 0)){
+					setPush(true);
+					keyEvent.doit = false;
+				}else if ((keyEvent.keyCode == 'o') &&
+					((keyEvent.stateMask & SWT.CTRL) != 0)) {
+					setPush(false);
+					keyEvent.doit = false;
+				} else if ((keyEvent.keyCode == 't') &&
+						((keyEvent.stateMask & SWT.CTRL) != 0)){
+					switchAutoPush();
+					keyEvent.doit = false;
+				} else if (isPushMode && (keyEvent.keyCode == SWT.HOME || keyEvent.keyCode==SWT.END)){
+					int carPos = getCaretOffset();
+					setPush(false);
+					setCaretOffset(carPos);
+				}
+			}
+
+			public void keyPressed(KeyEvent e) {
+			}
+		});
+	}
+
+	public void addAndReorderListener(int eventType, Listener listener){
+		//have to 'reorder' listeners in eventTable. BidiLayout's listener should come first (before StyledText's one)
+		Listener[] listeners = styledText.getListeners(eventType);
+		Listener styledTextListener = null;
+		for (int i=0; i<listeners.length; i++) {
+			if (listeners[i].getClass().getSimpleName().startsWith("StyledText")){
+				styledTextListener = listeners[i];
+				break;
+			}
+		}
+		if (styledTextListener != null){
+			styledText.removeListener(eventType, styledTextListener);
+		}
+		styledText.addListener(eventType, listener);
+		if (styledTextListener != null){
+			styledText.addListener(eventType, styledTextListener);
+		}
+	}
+
+	private Menu createContextMenu(){
+		Menu menu;
+		if (styledText.getMenu() == null)
+			menu = new Menu(styledText);
+		else
+			menu = styledText.getMenu();
+
+		MenuItem copy = new MenuItem(menu, SWT.CASCADE);
+		copy.setText("&Copy"); //$NON-NLS-1$ 
+		copy.setAccelerator(SWT.CTRL+'c');	//$NON-NLS-1$ 
+		copy.addListener(SWT.Selection, new Listener() {
+			public void handleEvent(Event e) {
+				copy();
+				e.doit = false;
+			}
+		});	
+		MenuItem cut = new MenuItem(menu, SWT.CASCADE);
+		cut.setText("Cu&t"); //$NON-NLS-1$ 
+		cut.setAccelerator(SWT.CTRL+'x');  //$NON-NLS-1$ 
+		cut.addListener(SWT.Selection, new Listener() {
+			public void handleEvent(Event e) {
+				cut();
+				e.doit = false;			
+			}
+		});
+		MenuItem paste = new MenuItem(menu, SWT.CASCADE);
+		paste.setText("&Paste"); //$NON-NLS-1$ 
+		paste.setAccelerator(SWT.CTRL+'v'); //$NON-NLS-1$ 
+		paste.addListener(SWT.Selection, new Listener() {
+			public void handleEvent(Event e) {
+				paste();
+				e.doit = false;
+			}
+		});
+
+		rtlMenuItem = new MenuItem(menu, SWT.CHECK);
+		rtlMenuItem.setText("Right to Left Reading Order"); //$NON-NLS-1$ 
+		rtlMenuItem.setAccelerator(SWT.CTRL | SWT.SHIFT); //$NON-NLS-1$
+		rtlMenuItem.setData("#PopupMenu");
+		rtlMenuItem.addListener(SWT.Selection, new Listener() {
+			public void handleEvent(Event e) {
+				e = createEventForSwithchDir(e);
+				handleKeyDown(e);
+				styledText.notifyListeners(SWT.KeyUp, e);
+				rtlMenuItem.setSelection(isWidgetReversed);
+			}
+			Event createEventForSwithchDir(Event e) {
+				e.widget = styledText;
+				e.keyCode = SWT.SHIFT;
+				if (isWidgetReversed)
+					e.keyLocation = SWT.LEFT;
+				else
+					e.keyLocation = SWT.RIGHT;
+				e.stateMask = SWT.CTRL;
+				return e;
+			}
+		});
+
+		new MenuItem(menu, SWT.SEPARATOR);
+	
+		autopushMenuItem = new MenuItem(menu, SWT.CHECK);
+		autopushMenuItem.setText("AutoPush [Ctrl+T]");
+		autopushMenuItem.addListener(SWT.Selection, new Listener() {
+			public void handleEvent(Event e) {
+				switchAutoPush();			
+			}
+		});
+		final MenuItem pushon = new MenuItem(menu, SWT.CASCADE/*SWT.CHECK*/);
+		pushon.setText("Push On [Ctrl+U]");
+		pushon.addListener(SWT.Selection, new Listener() {
+			public void handleEvent(Event e) {
+				setPush(true);			
+			}
+		});
+		
+		final MenuItem pushoff = new MenuItem(menu, SWT.CASCADE/*SWT.CHECK*/);
+		pushoff.setText("Push Off [Ctrl+O]");
+		pushoff.addListener(SWT.Selection, new Listener() {
+			public void handleEvent(Event e) {
+				setPush(false);			
+			}
+		});
+		
+		return menu;
+	}
+	
+	public void copy() {
+		styledText.copy();
+	}
+	
+	public void cut() {
+		styledText.cut();
+	}
+	public void paste() {
+		styledText.paste();
+	}
+	protected void handleMouseDown (Event event){
+		if (isPushMode && !isCaretInsidePushSegment()){
+			int caretPos = styledText.getCaretOffset();
+			setPush(false);
+			styledText.setCaretOffset(getUpdatedCaret(caretPos));
+		}
+	}
+	protected void handleKeyDown(Event event) {
+		if (event.keyCode == SWT.ARROW_RIGHT && isPushMode){
+			if (!isWidgetReversed && isCursorAtStartPushSegemet())
+				setPush(false);
+			else if (isWidgetReversed && isCursorAtEndPushSegemet()){
+				int newCaretPos = indxPushSegmentStart;
+				setPush(false);
+				styledText.setCaretOffset (newCaretPos);
+				styledText.invokeAction(ST.COLUMN_NEXT);
+			} else
+				event.keyCode = SWT.ARROW_LEFT;
+		} else if (event.keyCode == SWT.ARROW_LEFT && isPushMode){
+			if (!isWidgetReversed && isCursorAtEndPushSegemet()){
+				int newCaretPos = indxPushSegmentStart;
+				setPush(false);
+				styledText.setCaretOffset (newCaretPos);
+				styledText.invokeAction(ST.COLUMN_NEXT);
+			} else if (isWidgetReversed && isCursorAtStartPushSegemet()){
+				setPush(false);
+				styledText.invokeAction(ST.COLUMN_NEXT);
+			} else
+				event.keyCode = SWT.ARROW_RIGHT;
+		}else if (isPushMode && (event.keyCode == SWT.HOME || event.keyCode==SWT.END)){
+			setPush(false);
+			styledText.notifyListeners(SWT.KeyDown, event);
+		} else if (event.keyCode == SWT.DEL && isPushMode){
+			if (!isCursorAtEndPushSegemet()){
+				lengthPushSegment--;
+			}else {
+				event.doit = false;
+				event.type = SWT.None;
+			}	
+		} else if (event.keyCode == SWT.BS && isPushMode){
+			if (!isCursorAtStartPushSegemet()){ 
+				lengthPushSegment --;
+			}else {
+				setPush(false);
+			}
+		}else if ((event.stateMask & SWT.MODIFIER_MASK) == SWT.CTRL && event.keyCode == SWT.SHIFT && BidiUtil.isBidiPlatform()){
+			if ((!isWidgetReversed && event.keyLocation == SWT.RIGHT) ||
+					(isWidgetReversed && event.keyLocation == SWT.LEFT)){
+				switchWidgetDir();
+				styledText.notifyListeners(SWT.KeyDown, event);
+			}
+		} else if (isPushMode && (event.character == SWT.CR) ) { 
+			setPush(false);
+			styledText.notifyListeners(SWT.KeyDown, event);
+		} else {
+			if (isAutoPush && event.character >= ' ' && event.character != SWT.DEL){
+				handleAutoPush();
+			}
+			if ((arrOfIgnoredChars != null) && ((new String(arrOfIgnoredChars)).indexOf(event.character) != -1)){
+				event.doit = false;
+				event.type = SWT.None;
+				return;
+			}
+		}
+	}
+	
+	private boolean isCursorAtStartPushSegemet() {
+		int caretOffset = styledText.getCaretOffset();
+		if (isCaretAtTheLAstLine()) //it is the last line of string
+			caretOffset --;
+		//pushSegmentStart was stored when string had similar to widget orientation, therefore it needs to be 'mirrored' for comparison
+		int mirroredBoundPosition = calculateMirroredPushSegmentStart();
+		if (mirroredBoundPosition == (caretOffset-1))
+			return true;
+		return false;
+	}
+	private boolean isCursorAtEndPushSegemet() {
+		int caretOffset = styledText.getCaretOffset();
+		if (isCaretAtTheLAstLine())
+			caretOffset --;
+		//pushSegmentStart was stored when string had similar to widget orientation, therefore it needs to be 'mirrored' for comparison
+		int mirroredBoundPosition = calculateMirroredPushSegmentEnd();
+		
+		if (mirroredBoundPosition == caretOffset)
+			return true;
+		return false;
+	}
+	private int calculateMirroredCaretPosition(int caretPos) {
+		LineIndx lineIndx = new LineIndx(styledText.getText(),styledText.getCaretOffset());
+		return lineIndx.getEndIndx() - (caretPos - lineIndx.getStartIndx());
+	}
+	private int calculateMirroredPushSegmentEnd() {
+		return calculateMirroredCaretPosition(indxPushSegmentStart);
+	}
+	private int calculateMirroredPushSegmentStart() {
+		return calculateMirroredPushSegmentEnd() - lengthPushSegment;
+	}
+	
+	private boolean isCaretAtTheLAstLine(){
+		LineIndx lineIndx = new LineIndx(styledText.getText(),styledText.getCaretOffset());
+		if (lineIndx.getEndIndx() == styledText.getText().length()-1)
+			return true;
+		return false;
+	}
+	
+	private boolean isCaretInsidePushSegment(){
+		int mirroredPushSegmentEnd = calculateMirroredPushSegmentEnd();
+		int mirroredPushSegmentStart = calculateMirroredPushSegmentStart();
+		int caretPos = styledText.getCaretOffset();
+		if ((caretPos >= mirroredPushSegmentStart) && (caretPos <= mirroredPushSegmentEnd))
+			return true;
+		return false;
+	}
+	
+	protected void switchAutoPush() {
+		isAutoPush = !isAutoPush;
+		autopushMenuItem.setSelection(isAutoPush);
+	}
+	public boolean isPushMode(){
+		return isPushMode;
+	}
+	public void switchWidgetDir() {
+		switchWidgetDir(true);
+	}
+	public void switchWidgetDir(boolean forceSringReverse) {
+		isWidgetReversed = !isWidgetReversed;
+		int carPos = styledText.getCaretOffset();
+		if (forceSringReverse)
+			styledText.setText(reverseStr(styledText.getText()));
+		styledText.setCaretOffset (carPos);
+		rtlMenuItem.setSelection(isWidgetReversed);
+		
+		if (isPushMode)
+			setPush(false);
+		if (isWidgetReversed)
+			setBidiKeyboardLanguage();
+		else 
+			setNonBidiKeyboardLanguage();
+	}
+
+	public void setPush(boolean pushOn) {
+		if (isPushMode == pushOn)
+			return;
+		isPushMode = pushOn;
+		if (pushOn) {
+			startPushMode();
+		}
+		else {
+			endPushMode();
+			indxPushSegmentStart = -1;
+			lengthPushSegment = 0;
+		}
+	}
+	
+	private void endPushMode() {
+		styledText.setCaret(defaultCaret);
+		styledText.setCaret(defaultCaret);
+		styledText.setText(reverseStr(styledText.getText()));
+		styledText.setCaretOffset (indxPushSegmentStart + lengthPushSegment);
+		if (!isWidgetReversed)
+			setNonBidiKeyboardLanguage();
+		else
+			setBidiKeyboardLanguage();
+		
+	}
+	
+	public static String reverseStr (String str) {
+		String resultStr = "";
+		String orgStr = new String(str);
+		int i=-1;
+		while ((i = orgStr.indexOf(eolStr)) != -1){
+			StringBuffer sb = new StringBuffer(orgStr.substring(0,i));
+			resultStr += sb.reverse() + eolStr;
+			orgStr = orgStr.substring(i + eolStr.length());
+		}
+		if (orgStr.length()>0){
+			StringBuffer sb = new StringBuffer(orgStr);
+			resultStr += sb.reverse();
+		}
+		return resultStr;
+	}
+	
+	public void addBidiSegmentListener() {
+		styledText.addBidiSegmentListener(new BidiSegmentListener() {
+			public void lineGetSegments(BidiSegmentEvent event) {
+				int length = event.lineText.length();
+				if ((isPushMode && !isWidgetReversed) ||
+					(!isPushMode && isWidgetReversed)){
+					event.segments = new int[] { 0};
+					event.segmentsChars = new char[] { RLO};
+				} else {
+					event.segments = new int[] { 0, length };
+					event.segmentsChars = new char[] { LRO, PDF };
+				}
+				if (isPushMode && (indxPushSegmentStart != -1) && (prevLength< length))
+					lengthPushSegment++;
+				prevLength  = length;
+			}
+		});
+	
+	}
+	protected void startPushMode() {
+		final Image image = new Image (styledText.getDisplay(), 20, 20);
+		GC gc = new GC (image);
+		gc.setBackground (styledText.getDisplay().getSystemColor(SWT.COLOR_BLACK));
+		gc.fillRectangle (0, 0, 20, 20);
+		gc.setForeground (styledText.getDisplay().getSystemColor(SWT.COLOR_WHITE));
+		gc.setLineAttributes(new LineAttributes(2));
+		gc.drawLine (0, 13, gc.getFontMetrics().getAverageCharWidth(), 13);
+		gc.dispose ();
+		defaultCaret = styledText.getCaret();
+		Caret cc = new Caret(styledText, 0);
+		cc.setImage(image);
+		styledText.setCaret(cc);
+		int carOffset = styledText.getCaretOffset();
+		
+
+		String str = reverseStr(styledText.getText());
+		styledText.setText(str);
+		indxPushSegmentStart = carOffset;
+		styledText.setCaretOffset(getUpdatedCaret(carOffset));
+		if (!isWidgetReversed)
+			setBidiKeyboardLanguage();
+		else
+			setNonBidiKeyboardLanguage();
+	}
+	private int getUpdatedCaret(int carOffset) {
+		String str = styledText.getText();
+		LineIndx lineIndx = new LineIndx(str, carOffset);
+		int starIndx = lineIndx.getStartIndx();
+		int endIndx = lineIndx.getEndIndx();
+		if (endIndx == str.length()-1) //it is the last line of string
+			carOffset --;
+		return starIndx + (endIndx - carOffset);
+	}
+	private void handleAutoPush(){
+		if ((isPushMode && !isWidgetReversed && (BidiUtil.getKeyboardLanguage() == BidiUtil.KEYBOARD_NON_BIDI))||
+			(isPushMode && isWidgetReversed && (BidiUtil.getKeyboardLanguage() == BidiUtil.KEYBOARD_BIDI)))
+			setPush(false);
+		else if ((!isPushMode && !isWidgetReversed && (BidiUtil.getKeyboardLanguage() == BidiUtil.KEYBOARD_BIDI)) ||
+				 (!isPushMode && isWidgetReversed && (BidiUtil.getKeyboardLanguage() == BidiUtil.KEYBOARD_NON_BIDI)))
+			setPush(true);
+	}
+	
+	public boolean isWidgetReversed() {
+		return isWidgetReversed;
+	}
+
+	
+	private void setBidiKeyboardLanguage(){
+		if (bidiLangCode == 0)
+			BidiUtil.setKeyboardLanguage(BidiUtil.KEYBOARD_BIDI);
+		else
+			setSpecificKeyboardLanguage(bidiLangCode);
+	}
+	
+	private void setNonBidiKeyboardLanguage(){
+		if (nonBidiLangCode == 0)
+			BidiUtil.setKeyboardLanguage(BidiUtil.KEYBOARD_NON_BIDI);
+		else
+			setSpecificKeyboardLanguage(nonBidiLangCode);
+	}
+	
+	public static boolean setSpecificKeyboardLanguage(int langCode){
+		int currentLang = OS.PRIMARYLANGID(OS.LOWORD(OS.GetKeyboardLayout(0)));
+		if (currentLang == langCode)
+			return true;
+		int [] list = getKeyboardLanguageList();
+		for (int i=0; i<list.length; i++) {
+			if (langCode == OS.PRIMARYLANGID(OS.LOWORD(list[i]))) {
+				OS.ActivateKeyboardLayout(list[i], 0);
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	public void setText(String text){
+		if (isWidgetReversed)
+			text = reverseStr(text);
+		styledText.setText(text);
+	}
+	
+	public String getText(){
+		return styledText.getText();
+	}
+	public void addSelectionListener(SelectionListener listener) {
+		styledText.addSelectionListener(listener);
+	}
+	public void removeSelectionListener(SelectionListener listener) {
+		styledText.removeSelectionListener(listener);
+	}
+	public void addLineBackgroundListener(LineBackgroundListener listener) {
+		styledText.addLineBackgroundListener(listener);
+	}
+	public void removeLineBackgroundListener(LineBackgroundListener listener) {
+		styledText.removeLineBackgroundListener(listener);
+	}
+	public void addVerifyListener(VerifyListener listener){
+		styledText.addVerifyListener(listener);
+	}
+	public void removeVerifyListener(VerifyListener listener){
+		styledText.removeVerifyListener(listener);
+	}
+	public void addWordMovementListener(MovementListener listener){
+		styledText.addWordMovementListener(listener);
+	}
+	public void removeWordMovementListener(MovementListener listener){
+		styledText.removeWordMovementListener(listener);
+	}
+	public void addModifyListener(ModifyListener modifyListener) {
+		styledText.addModifyListener(modifyListener);
+	}
+	public void removeModifyListener(ModifyListener modifyListener) {
+		styledText.removeModifyListener(modifyListener);
+	}
+	public void redraw() {
+		styledText.redraw();
+	}
+	public int getCharCount() {
+		return styledText.getCharCount();
+	}
+	public Point getLocationAtOffset(int offset){
+		return styledText.getLocationAtOffset(offset);
+	}
+	public int getLineHeight(){
+		return styledText.getLineHeight();
+	}
+	public int getLineHeight(int lineIndex) {
+		return styledText.getLineHeight(lineIndex);
+	}
+	public void redraw(int x, int y, int width, int height, boolean all){
+		styledText.redraw(x,y,width,height,all);
+	}
+	public void redrawRange(int start, int length, boolean clearBackground) {
+		styledText.redrawRange(start, length, clearBackground);
+	}
+	public int getTopIndex(){
+		return styledText.getTopIndex();
+	}
+	public StyledText getStyledText (){
+		return styledText;
+	}
+	public boolean getBlockSelection() {
+		return styledText.getBlockSelection();
+	}
+	public Rectangle getBlockSelectionBounds() {
+		return styledText.getBlockSelectionBounds();
+	}
+	public void setTopIndex(int topIndex) {
+		styledText.setTopIndex(topIndex);
+	}
+	public boolean getEditable(){
+		return styledText.getEditable();
+	}
+	public int styledText(){
+		return styledText.getHorizontalPixel();
+	}
+	public int getLineAtOffset(int offset){
+		return styledText.getLineAtOffset(offset);
+	}
+	public int getHorizontalPixel(){
+		return styledText.getHorizontalPixel();
+	}
+	public int getHorizontalIndex(){
+		return styledText.getHorizontalIndex();
+	}
+	public void setHorizontalIndex(int offset) {
+		styledText.setHorizontalIndex(offset);
+	}
+	public Point getSelection(){
+		return styledText.getSelection();
+	}
+	public void setSelection(int start) {
+		styledText.setSelection(start);
+	}
+	public void setSelection(int start, int end) {
+		styledText.setSelection(start, end);
+	}
+	public void setSelectionRange(int start, int length) {
+		styledText.setSelectionRange(start, length);
+	}
+	public void selectAll(){
+		styledText.selectAll();
+	}
+	public void setStyleRange(StyleRange range) {
+		styledText.setStyleRange(range);
+	}
+	public void setStyleRanges(StyleRange[] ranges) {
+		styledText.setStyleRanges(ranges);
+	}
+	public void showSelection() {
+		styledText.showSelection();
+	}
+	public int getSelectionCount() {
+		return styledText.getSelectionCount();
+	}
+	public Point getSelectionRange(){
+		return styledText.getSelectionRange();
+	}
+	public int[] getSelectionRanges() {
+		return styledText.getSelectionRanges();
+	}
+	public int getTabs() {
+		return styledText.getTabs();
+	}
+	public Rectangle getTextBounds(int start, int end) {
+		return styledText.getTextBounds(start, end);
+	}
+	public int getTopPixel() {
+		return styledText.getTopPixel();
+	}
+	public int getCaretOffset() {
+		return styledText.getCaretOffset();
+	}
+	public void invokeAction(int action){
+		styledText.invokeAction(action);
+	}
+	public Runnable print(Printer printer, StyledTextPrintOptions options) {
+		return styledText.print(printer, options);
+	}
+	public void replaceStyleRanges(int start, int length, StyleRange[] ranges) {
+		styledText.replaceStyleRanges(start, length, ranges);
+	}
+	public void setBlockSelectionBounds(int x, int y, int width, int height) {
+		styledText.setBlockSelectionBounds(x, y, width, height);
+	}
+	public void setBlockSelectionBounds(Rectangle rect) {
+		styledText.setBlockSelectionBounds(rect);
+	}
+	public void setCaretOffset(int offset) {
+		styledText.setCaretOffset(offset);
+	}
+	public void setContent(StyledTextContent newContent) {
+		styledText.setContent(newContent);
+	}
+	public void setDoubleClickEnabled(boolean enable) {
+		styledText.setDoubleClickEnabled(enable);
+	}
+	public void setEditable(boolean editable) {
+		if (editable)
+			styledText.setBackground(null);
+		else
+			styledText.setBackground(styledText.getParent().getBackground());
+		styledText.setEditable(editable);
+	}
+	public void setEnabled (boolean enabled){
+		if (enabled)
+			styledText.setBackground(null);
+		else
+			styledText.setBackground(styledText.getParent().getBackground());
+		styledText.setEnabled(enabled);
+		super.setEnabled(enabled);
+	}
+
+	public void setBackground (Color color) {
+		styledText.setBackground(color);
+	}
+	//this method was copied from BidiUtil (since it isn't public)
+	static int [] getKeyboardLanguageList() {
+		int maxSize = 10;
+		int [] tempList = new int [maxSize];
+		int size = OS.GetKeyboardLayoutList(maxSize, tempList);
+		int [] list = new int [size];
+		System.arraycopy(tempList, 0, list, 0, size);
+		return list;
+	}
+	
+	private class LineIndx {
+		private int startIndx = -1;
+		private int endIndx = -1;
+		
+		LineIndx (String str, int indx){
+			startIndx = str.substring(0, indx).lastIndexOf(eolStr);
+			if (startIndx == -1)
+				startIndx = 0;
+			else
+				startIndx += eolStr.length();
+			endIndx = str.substring(startIndx).indexOf(eolStr);
+			if (endIndx == -1)
+				endIndx = str.substring(startIndx).length()-1;
+			endIndx += startIndx;
+		}
+		
+		public int getStartIndx(){
+			return startIndx;
+		}
+		
+		public int getEndIndx(){
+			return endIndx;
+		}
+
+	}
+
+	
+	
+	
+
+	 
+}
Index: src/org/eclipse/datatools/sqltools/data/internal/ui/bidi/BidiLayoutCellEditor.java
===================================================================
RCS file: src/org/eclipse/datatools/sqltools/data/internal/ui/bidi/BidiLayoutCellEditor.java
diff -N src/org/eclipse/datatools/sqltools/data/internal/ui/bidi/BidiLayoutCellEditor.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/datatools/sqltools/data/internal/ui/bidi/BidiLayoutCellEditor.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,164 @@
+/*******************************************************************************
+ * Copyright (c) 2010 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ ******************************************************************************/
+
+package org.eclipse.datatools.sqltools.data.internal.ui.bidi;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.jface.viewers.TextCellEditor;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.FocusAdapter;
+import org.eclipse.swt.events.FocusEvent;
+import org.eclipse.swt.events.KeyAdapter;
+import org.eclipse.swt.events.KeyEvent;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.TraverseEvent;
+import org.eclipse.swt.events.TraverseListener;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Event;
+
+/**
+ * A cell editor that manages a text entry field.
+ * The cell editor's value is the text string itself.
+ * The class is used when JDBC connection is of 3270 type
+ */
+public class BidiLayoutCellEditor extends TextCellEditor {
+	/*
+	 * The Field3270 control; initially <code>null</code>.
+	 */
+	private BidiLayout bidiLayout;
+	
+	/**
+	 * Creates a new BidiLayout string cell editor with no control
+     * The cell editor value is the string itself, which is initially the empty
+     * string. 
+	 */
+	public BidiLayoutCellEditor() {
+		super();
+	}
+
+	/**
+	 * Creates a new BidiLayout string cell editor with no control
+     * The cell editor value is the string itself, which is initially the empty
+     * string. 
+	 * @param parent
+	 */
+	public BidiLayoutCellEditor(Composite parent) {
+		super(parent);
+	}
+
+	/**
+	 * Creates a new BidiLayout string cell editor with no control
+     * The cell editor value is the string itself, which is initially the empty
+     * string. 
+	 * @param parent
+	 * @param style
+	 */
+	public BidiLayoutCellEditor(Composite parent, int style) {
+		super(parent, style);
+	}
+	
+	protected Control createControl(Composite parent) {
+		bidiLayout = new BidiLayout(parent, getStyle());
+		bidiLayout.setArrOfIgnoredChars(new char[] {'\t'});
+		bidiLayout.addSelectionListener(new SelectionAdapter() {
+            public void widgetDefaultSelected(SelectionEvent e) {
+                handleDefaultSelection(e);
+            }
+        });
+		bidiLayout.addKeyListener(new KeyAdapter() {
+            public void keyPressed(KeyEvent e) {
+                keyReleaseOccured(e);
+                if ((getControl() == null) || getControl().isDisposed()) {
+					return;
+				}
+                if (e.character == '\r') { // Return key
+                	Event event = new Event();
+                	event.widget = e.widget;
+                	event.stateMask = e.stateMask;
+                	event.doit = e.doit;
+                	
+                	SelectionEvent selectionEvent = new SelectionEvent(event); 
+                	handleDefaultSelection(selectionEvent);
+                }
+            }
+        });
+		bidiLayout.getStyledText().addTraverseListener(new TraverseListener() {
+            public void keyTraversed(TraverseEvent e) {
+                if (e.detail == SWT.TRAVERSE_ESCAPE
+                        || e.detail == SWT.TRAVERSE_RETURN) {
+                    e.doit = false;
+                } 
+                
+            }
+        });
+       
+		bidiLayout.addFocusListener(new FocusAdapter() {
+            public void focusLost(FocusEvent e) {
+            	BidiLayoutCellEditor.this.focusLost();
+            }
+        });
+		bidiLayout.setFont(parent.getFont());
+		bidiLayout.setBackground(parent.getBackground());
+		bidiLayout.setText("");//$NON-NLS-1$
+        return bidiLayout.getStyledText();
+    }
+	
+
+	protected Object doGetValue() {
+		
+		String returnStr;
+		if (bidiLayout.isWidgetReversed() ^ bidiLayout.isPushMode())
+			returnStr = BidiLayout.reverseStr(bidiLayout.getText());
+		else
+			returnStr = bidiLayout.getText();
+		if (bidiLayout.isPushMode())
+			bidiLayout.setPush(false);
+		return returnStr;
+    }
+	protected void doSetValue(Object value) {
+        Assert.isTrue(bidiLayout != null && bidiLayout.getStyledText() != null && (value instanceof String));
+        String bidiValue;
+        if (bidiLayout.isPushMode())
+        	bidiValue = BidiLayout.reverseStr((String) value);
+        else
+        	bidiValue = (String) value;
+        bidiLayout.setText(bidiValue);
+    }
+	protected void doSetFocus() {
+        if ((bidiLayout != null) && (bidiLayout.getStyledText() != null)) {
+        	bidiLayout.selectAll();
+        	bidiLayout.getStyledText().setFocus();
+        } 
+    }
+	
+	 
+	protected int getTextSelectionCount(){
+    	return bidiLayout.getSelectionCount();
+    }
+
+	public Control getTextWidget(){
+		return bidiLayout;
+	}
+	
+    protected int getTextCaretPosition(){
+    	return bidiLayout.getCaretOffset();
+    }
+    
+    protected int getTextCharCount(){
+    	return bidiLayout.getCharCount();
+    }
+    
+	protected String getText() {
+		return bidiLayout.getText();
+	}
+}
Index: src/org/eclipse/datatools/sqltools/data/internal/ui/editor/BidiLayoutTableDataCellEditor.java
===================================================================
RCS file: src/org/eclipse/datatools/sqltools/data/internal/ui/editor/BidiLayoutTableDataCellEditor.java
diff -N src/org/eclipse/datatools/sqltools/data/internal/ui/editor/BidiLayoutTableDataCellEditor.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/datatools/sqltools/data/internal/ui/editor/BidiLayoutTableDataCellEditor.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,54 @@
+/*******************************************************************************
+ * Copyright (c) 2010 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ ******************************************************************************/
+
+package org.eclipse.datatools.sqltools.data.internal.ui.editor;
+
+import org.eclipse.datatools.sqltools.data.internal.ui.bidi.BidiLayoutCellEditor;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.TraverseEvent;
+import org.eclipse.swt.events.TraverseListener;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+
+public class BidiLayoutTableDataCellEditor extends BidiLayoutCellEditor {
+
+    protected TableDataEditor editor;
+    
+    public BidiLayoutTableDataCellEditor(TableDataEditor editor, Composite parent)
+    {
+        super(parent);
+        this.editor = editor;
+    }
+    
+    protected Control createControl(Composite parent) {
+        Control c = super.createControl(parent);
+		c.addTraverseListener(new TraverseListener() {
+            public void keyTraversed(TraverseEvent e) {
+                handleTraverse(e);
+                
+            }
+		});
+        return c;
+    }
+        
+    protected void handleTraverse(TraverseEvent e)
+    {
+        if (e.detail == SWT.TRAVERSE_TAB_PREVIOUS || e.detail == SWT.TRAVERSE_TAB_NEXT) {
+            fireApplyEditorValue();
+            deactivate();
+            editor.getCursor().handleTraverse(e);
+            editor.getCursor().forceFocus();
+            editor.getCursor().edit();
+        } else if (e.detail == SWT.TRAVERSE_RETURN){
+        	editor.getCursor().forceFocus();
+        }
+    }
+}
Index: src/org/eclipse/datatools/sqltools/data/internal/ui/editor/DefaultExternalTableDataWizardPage.java
===================================================================
RCS file: /cvsroot/datatools/org.eclipse.datatools.sqltools/plugins/org.eclipse.datatools.sqltools.data.ui/src/org/eclipse/datatools/sqltools/data/internal/ui/editor/DefaultExternalTableDataWizardPage.java,v
retrieving revision 1.5
diff -u -r1.5 DefaultExternalTableDataWizardPage.java
--- src/org/eclipse/datatools/sqltools/data/internal/ui/editor/DefaultExternalTableDataWizardPage.java	24 May 2010 04:52:22 -0000	1.5
+++ src/org/eclipse/datatools/sqltools/data/internal/ui/editor/DefaultExternalTableDataWizardPage.java	6 Oct 2010 12:50:12 -0000
@@ -19,10 +19,13 @@
 import java.io.IOException;
 
 import org.eclipse.core.runtime.IStatus;
+import org.eclipse.datatools.connectivity.internal.bidi.BidiUtils;
+import org.eclipse.datatools.connectivity.sqm.internal.core.connection.ConnectionAdapter;
 import org.eclipse.datatools.modelbase.sql.tables.Column;
 import org.eclipse.datatools.sqltools.data.internal.core.editor.IRowData;
 import org.eclipse.datatools.sqltools.data.internal.core.editor.ITableData2;
 import org.eclipse.datatools.sqltools.data.internal.ui.DataUIPlugin;
+import org.eclipse.datatools.sqltools.data.internal.ui.bidi.BidiLayout;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.wizard.WizardPage;
@@ -35,8 +38,8 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Text;
 import org.eclipse.swt.widgets.TableItem;
+import org.eclipse.swt.widgets.Text;
 
 /**
  * The default Wizard Page for external editing of the TableDataEditor.
@@ -56,6 +59,8 @@
     /** the default implementation of the edit area, a simple Text area */
     protected Text textWidget; 
     
+    /** the bidi-specific implementation of the edit area, a Bidi area based on StyledText */
+    protected BidiLayout bidiLayoutWidget; 
     /** The Import button */
     protected Button btnImport;
     
@@ -86,6 +91,9 @@
     
     protected int buttonAreaSpan;
     
+    private boolean isBidiVisualSupportRequired = false;
+    private boolean isBidiRTLSupportRequired = false;
+    
     /**
      * Creates the default page with the given editor
 	 * @param pageName the name of the page
@@ -129,6 +137,14 @@
         
         // how many buttons we create in the buttonArea
         buttonAreaSpan = 1;
+        
+        if ((rowData.getTable() instanceof ITableData2) &&
+            	(((ITableData2)rowData.getTable()).getConnection() instanceof  ConnectionAdapter)){
+            	ConnectionAdapter ca = (ConnectionAdapter)((ITableData2)rowData.getTable()).getConnection();
+            	String schemaName =   ((ITableData2)rowData.getTable()).getSQLTable().getSchema().getName();
+            	isBidiVisualSupportRequired = BidiUtils.isBidiVisualSupportRequired(ca.getConnectionInfo().getConnectionProfile(), schemaName, editor.getTitle());
+            	isBidiRTLSupportRequired = BidiUtils.isBidiRTLSupportRequired(ca.getConnectionInfo().getConnectionProfile(), schemaName, editor.getTitle());
+        }
 	}
 
 	/**
@@ -198,10 +214,20 @@
 		glEditor.marginWidth = 0;
         editorComp.setLayout(glEditor);
         editorComp.setLayoutData( new GridData(GridData.FILL_BOTH) );
+        int style = SWT.MULTI | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL;
+        if (isBidiRTLSupportRequired)
+        	style |= SWT.RIGHT_TO_LEFT;
+        
+        if (!isBidiVisualSupportRequired){ 
+        	textWidget = new Text(editorComp, style);
+        } else {
+       		bidiLayoutWidget = new BidiLayout(editorComp, style);
+       		if (isBidiRTLSupportRequired)
+        		bidiLayoutWidget.switchWidgetDir(false);
+        }
         
-        textWidget = new Text(editorComp, SWT.MULTI | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL );
 		// always enable it so that at least a manual copy and paste from a read-only table can be copied..
-        textWidget.setEnabled(true);
+        getEditWidget().setEnabled(true);  
         boolean editable = (!hasNullValue && !editor.isReadonly()) ;
         
         // if it is new (yet null) value of a non-nullable column (i.e. non-nullable and set to null) 
@@ -214,13 +240,16 @@
         else {
             nonNullableCheck =  (!((Column)editor.getSqlTable().getColumns().get(columnIndex)).isNullable() && hasNullValue);
         }
-        textWidget.setEditable(editable || nonNullableCheck);
 	
+        if (!isBidiVisualSupportRequired)
+        	textWidget.setEditable(editable || nonNullableCheck);
+        else
+        	bidiLayoutWidget.setEditable(editable || nonNullableCheck); 
         editorAreaIsSerialized = true;  // as we deal with a text field, we want it serialized
 		GridData gdtxtTextValue = new GridData(GridData.FILL_BOTH);
 		gdtxtTextValue.grabExcessHorizontalSpace = true;
 		gdtxtTextValue.grabExcessVerticalSpace = true;
-		textWidget.setLayoutData(gdtxtTextValue);   
+		getEditWidget().setLayoutData(gdtxtTextValue);   
         gdtxtTextValue.horizontalSpan = 1;
         //limit width/height of text area when string content is very wide or long
         gdtxtTextValue.widthHint = 400;
@@ -435,7 +464,9 @@
         // for others disable widget itself
         if (getEditWidget() instanceof Text){
             ((Text)getEditWidget()).setEditable(!btnSetNull.getSelection());
-        } else{
+        } else if (getEditWidget() instanceof BidiLayout){ 
+        	((BidiLayout)getEditWidget()).setEditable(!btnSetNull.getSelection());
+        } else {
             getEditWidget().setEnabled(!btnSetNull.getSelection());
         }
         if(displayImportBtn){
@@ -644,7 +675,12 @@
     protected Object getEditorAreaContent(){
         // we dont need to deserialize
         // as we deal with Strings
-        return textWidget.getText();
+    	if (!isBidiVisualSupportRequired)  
+          return textWidget.getText();
+    	else                         
+    		if (bidiLayoutWidget.isWidgetReversed() ^ bidiLayoutWidget.isPushMode())
+    			return BidiLayout.reverseStr(bidiLayoutWidget.getText()); 
+    		return bidiLayoutWidget.getText(); 
     }
     
     /**
@@ -660,9 +696,15 @@
     	}
         if (serializedContent == null){
             hasNullValue = true;  // input is still null
-            textWidget.setText(""); //$NON-NLS-1$
+            if (!isBidiVisualSupportRequired)  
+            	textWidget.setText(""); //$NON-NLS-1$
+            else
+            	bidiLayoutWidget.setText(""); //$NON-NLS-1$ 
         } else{
-            textWidget.setText(serializedContent);
+        	if (!isBidiVisualSupportRequired)
+        		textWidget.setText(serializedContent);
+        	else
+        		bidiLayoutWidget.setText(serializedContent); ;
             hasNullValue = false;
         }
     }
@@ -698,6 +740,8 @@
      * @return the edit widget
      */
     protected Control getEditWidget(){
-        return textWidget;
-    }
+    	if (!isBidiVisualSupportRequired)
+    		return textWidget;
+    	return bidiLayoutWidget; 
+}    
 }    
Index: src/org/eclipse/datatools/sqltools/data/internal/ui/editor/TableDataEditor.java
===================================================================
RCS file: /cvsroot/datatools/org.eclipse.datatools.sqltools/plugins/org.eclipse.datatools.sqltools.data.ui/src/org/eclipse/datatools/sqltools/data/internal/ui/editor/TableDataEditor.java,v
retrieving revision 1.8
diff -u -r1.8 TableDataEditor.java
--- src/org/eclipse/datatools/sqltools/data/internal/ui/editor/TableDataEditor.java	29 Apr 2010 18:59:09 -0000	1.8
+++ src/org/eclipse/datatools/sqltools/data/internal/ui/editor/TableDataEditor.java	6 Oct 2010 12:50:12 -0000
@@ -18,6 +18,9 @@
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
+import org.eclipse.datatools.connectivity.IConnectionProfile;
+import org.eclipse.datatools.connectivity.internal.bidi.BidiConstants;
+import org.eclipse.datatools.connectivity.internal.bidi.BidiUtils;
 import org.eclipse.datatools.connectivity.sqm.core.connection.ConnectionInfo;
 import org.eclipse.datatools.connectivity.sqm.core.connection.DatabaseConnectionRegistry;
 import org.eclipse.datatools.connectivity.sqm.internal.core.connection.ConnectionInfoImpl;
@@ -29,6 +32,8 @@
 import org.eclipse.datatools.sqltools.data.internal.core.editor.TableDataImpl;
 import org.eclipse.datatools.sqltools.data.internal.ui.DataUIPlugin;
 import org.eclipse.datatools.sqltools.data.internal.ui.OutputItemAdapter;
+import org.eclipse.datatools.sqltools.data.internal.ui.bidi.BidiLayout;
+import org.eclipse.datatools.sqltools.data.internal.ui.bidi.BidiLayoutCellEditor;
 import org.eclipse.datatools.sqltools.result.OperationCommand;
 import org.eclipse.datatools.sqltools.result.ResultsViewAPI;
 import org.eclipse.jface.action.GroupMarker;
@@ -97,8 +102,11 @@
     }
     
     public void createPartControl(Composite parent) {
-        
-        tableViewer = new TableViewer(parent, SWT.HIDE_SELECTION);
+    	
+    	int style = SWT.HIDE_SELECTION;
+    	if (BidiUtils.isBidiEnabled() && isRTLTable())
+    		style |= SWT.RIGHT_TO_LEFT;
+    	tableViewer = new TableViewer(parent, style);
         tableViewer.getTable().setHeaderVisible(true);      
         tableViewer.getTable().setLinesVisible(true);
         tableViewer.getTable().setLayoutData(new GridData(GridData.FILL_BOTH));
@@ -130,7 +138,16 @@
         createContextMenu();
     }
     
-    public void dispose() {
+    private boolean isRTLTable() {
+        Database database = sqlTable.getSchema().getCatalog() != null ?
+        		sqlTable.getSchema().getCatalog().getDatabase():
+        		sqlTable.getSchema().getDatabase();        
+        ConnectionInfo connInfo = DatabaseConnectionRegistry.getConnectionForDatabase(database);
+        IConnectionProfile connectionProfie = ((ConnectionInfoImpl)connInfo).getConnectionProfile();
+        return BidiUtils.isBidiRTLSupportRequired(connectionProfie, sqlTable.getSchema().getName(), sqlTable.getName());
+	}
+
+	public void dispose() {
         if (tableData!=null)
             tableData.dispose();
         super.dispose();
@@ -362,15 +379,31 @@
 
     protected void configureTable()
     {
-        TextCellEditor textEditor = new TableDataCellEditor(this, tableViewer.getTable());
+        TextCellEditor textEditor;
+    	
+    	Database database = sqlTable.getSchema().getCatalog().getDatabase();
+    	ConnectionInfo connInfo = DatabaseConnectionRegistry.getConnectionForDatabase(database);
+    	
+    	if (!BidiUtils.isBidiVisualSupportRequired(connInfo.getConnectionProfile(), sqlTable.getSchema().getName(), getTitle()))//isBidiSupportRequired(connInfo.getConnectionProfile()))
+    		textEditor = new TableDataCellEditor(this, tableViewer.getTable());
+    	else {
+    		textEditor = new BidiLayoutTableDataCellEditor(this, tableViewer.getTable());
+    		if (BidiUtils.isBidiRTLSupportRequired(connInfo.getConnectionProfile(), sqlTable.getSchema().getName(), getTitle())) {
+    			BidiLayout bl = (BidiLayout)((BidiLayoutCellEditor)textEditor).getTextWidget();
+    			bl.switchWidgetDir(false);
+    		}
+    	}
         
         CellEditor[] editors = new CellEditor[tableData.getColumnCount()];
         String[] properties = new String[tableData.getColumnCount()];
-
+        boolean isBidiRTL = (tableViewer.getTable().getStyle() & SWT.RIGHT_TO_LEFT) != 0;
         for (int i=0; i<tableData.getColumnCount(); ++i) {
             TableColumn col = new TableColumn(tableViewer.getTable(), SWT.NONE);
             col.setWidth(100);
-            col.setText(tableData.getColumnHeader(i));
+            if (isBidiRTL)
+            	col.setText(BidiConstants.LRO + tableData.getColumnHeader(i));
+            else
+            	col.setText(tableData.getColumnHeader(i));
             col.pack();
             editors[i] = textEditor;
             properties[i] = tableData.getColumnName(i);
Index: src/org/eclipse/datatools/sqltools/data/internal/ui/editor/TableDataLabelProvider.java
===================================================================
RCS file: /cvsroot/datatools/org.eclipse.datatools.sqltools/plugins/org.eclipse.datatools.sqltools.data.ui/src/org/eclipse/datatools/sqltools/data/internal/ui/editor/TableDataLabelProvider.java,v
retrieving revision 1.3
diff -u -r1.3 TableDataLabelProvider.java
--- src/org/eclipse/datatools/sqltools/data/internal/ui/editor/TableDataLabelProvider.java	25 Aug 2008 21:20:15 -0000	1.3
+++ src/org/eclipse/datatools/sqltools/data/internal/ui/editor/TableDataLabelProvider.java	6 Oct 2010 12:50:12 -0000
@@ -12,8 +12,12 @@
 package org.eclipse.datatools.sqltools.data.internal.ui.editor;
 
 import org.eclipse.core.runtime.IStatus;
+import org.eclipse.datatools.connectivity.internal.bidi.BidiUtils;
+import org.eclipse.datatools.connectivity.sqm.internal.core.connection.ConnectionAdapter;
 import org.eclipse.datatools.sqltools.data.internal.core.common.IColumnDataAccessor;
 import org.eclipse.datatools.sqltools.data.internal.core.editor.IRowData;
+import org.eclipse.datatools.sqltools.data.internal.core.editor.ITableData;
+import org.eclipse.datatools.sqltools.data.internal.core.editor.TableDataImpl;
 import org.eclipse.datatools.sqltools.data.internal.ui.DataUIPlugin;
 import org.eclipse.jface.viewers.ILabelProviderListener;
 import org.eclipse.jface.viewers.ITableLabelProvider;
@@ -22,6 +26,8 @@
 public class TableDataLabelProvider implements ITableLabelProvider
 {
     protected static final int MAX_LABEL_LENGTH = Integer.MAX_VALUE;
+    private boolean isBidiVisualSupportRequired = false;
+    private boolean isBidiVisualSupportInitialized = false;
    
     public TableDataLabelProvider()
     {
@@ -37,7 +43,20 @@
             return (columnIndex==0)?Messages.getString("TableDataLabelProvider.newRow"):""; //$NON-NLS-1$ //$NON-NLS-2$
     
         IRowData row = (IRowData)element;
-    
+        if (!isBidiVisualSupportInitialized){ 
+        	if ((row.getTable() instanceof ITableData) &&
+        		(((TableDataImpl)row.getTable()).getConnection() instanceof  ConnectionAdapter)){
+        		ConnectionAdapter ca = (ConnectionAdapter)((TableDataImpl)row.getTable()).getConnection();
+        		String tableName = "";
+        		String schemaName ="";
+        		if (((IRowData)element).getTable() instanceof TableDataImpl){
+        			tableName = ((TableDataImpl)((IRowData)element).getTable()).getSQLTable().getName();
+        			schemaName = ((TableDataImpl)((IRowData)element).getTable()).getSQLTable().getSchema().getName();
+        		}
+        		isBidiVisualSupportRequired = BidiUtils.isBidiVisualSupportRequired(ca.getConnectionInfo().getConnectionProfile(), schemaName, tableName);        		
+        	}
+        	isBidiVisualSupportInitialized = true;
+        }
         try {
             Object o = row.getValue(columnIndex);
             IColumnDataAccessor acc = row.getTable().getColumnDataAccessor(columnIndex);
@@ -56,6 +75,9 @@
         	    }
         	    if (truncated)
         	        s += "..."; //$NON-NLS-1$  
+        	    if (isBidiVisualSupportRequired) {
+        	    	s = BidiUtils.addMarkersToStr(s);
+        	    }
         	    return s;
             }
         } catch (Exception ex) {