From dff4d56251ad9ac4f919dd1061ed7b8bb39772da Mon Sep 17 00:00:00 2001
From: Martin Oberhuber < martin.oberhuber@windriver.com>
Date: Fri, 6 Nov 2009 15:25:20 +0000
Subject: [PATCH] Bug 294327 -  [terminal][regression] After logging in, the
 remote prompt is hidden

---
 .../org.eclipse.rse-feature/feature.xml         |  6 +++---
 .../org.eclipse.rse.core-feature/feature.xml    |  6 +++---
 .../org.eclipse.rse.sdk-feature/feature.xml     |  6 +++---
 .../feature.xml                                 |  6 +++---
 .../org.eclipse.rse.sdk/META-INF/MANIFEST.MF    |  2 +-
 .../org.eclipse.rse/META-INF/MANIFEST.MF        |  2 +-
 .../org.eclipse.tm.terminal-feature/feature.xml | 15 +++++++++++++--
 .../feature.xml                                 | 15 +++++++++++++--
 .../META-INF/MANIFEST.MF                        |  2 +-
 .../terminal/textcanvas/TextCanvas.java         | 17 +++++++++++++----
 10 files changed, 54 insertions(+), 23 deletions(-)

diff --git a/rse/features/org.eclipse.rse-feature/feature.xml b/rse/features/org.eclipse.rse-feature/feature.xml
index 7eb1c0269c9..f18675a378d 100644
--- a/rse/features/org.eclipse.rse-feature/feature.xml
+++ b/rse/features/org.eclipse.rse-feature/feature.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!--
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
      Copyright (c) 2005, 2009 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
@@ -8,11 +9,10 @@
      Contributors:
          IBM Corporation - initial API and implementation
  -->
-
 <feature
       id="org.eclipse.rse"
       label="%featureName"
-      version="3.1.1.qualifier"
+      version="3.2.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.rse"
       image="eclipse_update_120.jpg">
diff --git a/rse/features/org.eclipse.rse.core-feature/feature.xml b/rse/features/org.eclipse.rse.core-feature/feature.xml
index 304898b267b..c0f2bde1cf2 100644
--- a/rse/features/org.eclipse.rse.core-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.core-feature/feature.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!--
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
      Copyright (c) 2005, 2009 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
@@ -8,11 +9,10 @@
      Contributors:
          IBM Corporation - initial API and implementation
  -->
-
 <feature
       id="org.eclipse.rse.core"
       label="%featureName"
-      version="3.1.1.qualifier"
+      version="3.2.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.rse.core">
 
diff --git a/rse/features/org.eclipse.rse.sdk-feature/feature.xml b/rse/features/org.eclipse.rse.sdk-feature/feature.xml
index fecea1c2093..b70fcd52195 100644
--- a/rse/features/org.eclipse.rse.sdk-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.sdk-feature/feature.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!--
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
      Copyright (c) 2005, 2009 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
@@ -8,11 +9,10 @@
      Contributors:
          IBM Corporation - initial API and implementation
  -->
-
 <feature
       id="org.eclipse.rse.sdk"
       label="%featureName"
-      version="3.1.1.qualifier"
+      version="3.2.0.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg">
 
diff --git a/rse/features/org.eclipse.rse.terminals-feature/feature.xml b/rse/features/org.eclipse.rse.terminals-feature/feature.xml
index 6daab01074b..8f7035f79ff 100644
--- a/rse/features/org.eclipse.rse.terminals-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.terminals-feature/feature.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!--
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
      Copyright (c) 2005, 2009 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
@@ -8,11 +9,10 @@
      Contributors:
          IBM Corporation - initial API and implementation
  -->
-
 <feature
       id="org.eclipse.rse.terminals"
       label="%featureName"
-      version="1.0.1.qualifier"
+      version="1.0.100.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.rse.terminals.ui"
       image="eclipse_update_120.jpg">
diff --git a/rse/plugins/org.eclipse.rse.sdk/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.sdk/META-INF/MANIFEST.MF
index fcea9675eac..769b2151eed 100644
--- a/rse/plugins/org.eclipse.rse.sdk/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.sdk/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.sdk
-Bundle-Version: 3.1.0.qualifier
+Bundle-Version: 3.2.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/rse/plugins/org.eclipse.rse/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse/META-INF/MANIFEST.MF
index 25443d07231..b11ea745c34 100644
--- a/rse/plugins/org.eclipse.rse/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse
-Bundle-Version: 3.1.0.qualifier
+Bundle-Version: 3.2.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/terminal/org.eclipse.tm.terminal-feature/feature.xml b/terminal/org.eclipse.tm.terminal-feature/feature.xml
index bdfd78be801..b2858e5bc40 100644
--- a/terminal/org.eclipse.tm.terminal-feature/feature.xml
+++ b/terminal/org.eclipse.tm.terminal-feature/feature.xml
@@ -1,8 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!--
     Copyright (c) 2006, 2009 Wind River Systems, Inc. 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:
         Wind River - initial API and implementation
         Uwe Stieber (Wind River) - [282996] [terminal][api] Add "hidden" attribute to terminal connector extension point
 -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Copyright (c) 2006, 2009 Wind River Systems, Inc. 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:
+         Wind River - initial API and implementation
+         Uwe Stieber (Wind River) - [282996] [terminal][api] Add "hidden" attribute to terminal connector extension point
+ -->
 <feature
       id="org.eclipse.tm.terminal"
       label="%featureName"
-      version="3.0.1.qualifier"
+      version="3.0.100.qualifier"
       provider-name="%providerName">
 
    <description>
diff --git a/terminal/org.eclipse.tm.terminal.sdk-feature/feature.xml b/terminal/org.eclipse.tm.terminal.sdk-feature/feature.xml
index 7aa2b7c3ac1..1114a8f9688 100644
--- a/terminal/org.eclipse.tm.terminal.sdk-feature/feature.xml
+++ b/terminal/org.eclipse.tm.terminal.sdk-feature/feature.xml
@@ -1,8 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!--
     Copyright (c) 2006, 2009 Wind River Systems, Inc. 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:
         Wind River - initial API and implementation
         Uwe Stieber (Wind River) - [282996] [terminal][api] Add "hidden" attribute to terminal connector extension point
 -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Copyright (c) 2006, 2009 Wind River Systems, Inc. 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:
+         Wind River - initial API and implementation
+         Uwe Stieber (Wind River) - [282996] [terminal][api] Add "hidden" attribute to terminal connector extension point
+ -->
 <feature
       id="org.eclipse.tm.terminal.sdk"
       label="%featureName"
-      version="3.0.1.qualifier"
+      version="3.0.100.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg">
 
diff --git a/terminal/org.eclipse.tm.terminal/META-INF/MANIFEST.MF b/terminal/org.eclipse.tm.terminal/META-INF/MANIFEST.MF
index 432fbcec826..0176cf33bf4 100644
--- a/terminal/org.eclipse.tm.terminal/META-INF/MANIFEST.MF
+++ b/terminal/org.eclipse.tm.terminal/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.tm.terminal; singleton:=true
-Bundle-Version: 3.0.1.qualifier
+Bundle-Version: 3.0.100.qualifier
 Bundle-Activator: org.eclipse.tm.internal.terminal.control.impl.TerminalPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/TextCanvas.java b/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/TextCanvas.java
index d42eb2a3aa6..8e3232dd95a 100644
--- a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/TextCanvas.java
+++ b/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/TextCanvas.java
@@ -8,7 +8,8 @@
  * Contributors:
  * Michael Scharf (Wind River) - initial API and implementation
  * Michael Scharf (Wind River) - [240098] The cursor should not blink when the terminal is disconnected
- * Uwe Stieber (Wind River) - [281238] The very first few characters might be missing in the terminal control if opened and connected programmatically
+ * Uwe Stieber (Wind River) - [281328] The very first few characters might be missing in the terminal control if opened and connected programmatically
+ * Martin Oberhuber (Wind River) - [294327] After logging in, the remote prompt is hidden
  *******************************************************************************/
 package org.eclipse.tm.internal.terminal.textcanvas;
 
@@ -185,7 +186,7 @@ public class TextCanvas extends GridCanvas {
 			int columns=bonds.width/getCellWidth();
 			// when the view is minimised, its size is set to 0
 			// we don't sent this to the terminal!
-			if(lines>0 && columns>0 || init) {
+			if((lines>0 && columns>0) || init) {
 				if(columns<fMinColumns) {
 					if(!isHorizontalBarVisble()) {
 						setHorizontalBarVisible(true);
@@ -300,12 +301,20 @@ public class TextCanvas extends GridCanvas {
 			throw new IllegalArgumentException("There can be at most one listener at the moment!"); //$NON-NLS-1$
 		fResizeListener=listener;
 
-		// Bug 281238: [terminal] The very first few characters might be missing in
+		// Bug 281328: [terminal] The very first few characters might be missing in
 		//             the terminal control if opened and connected programmatically
 		//
 		// In case the terminal had not been visible yet or is to small (less than one
 		// line visible), the terminal should have a minimum size to avoid RuntimeExceptions.
-		setMinColumns(80); setMinLines(24);
+		//
+		// Bug 294327: Min lines 1 is sufficient to avoid the exception, and ensures
+		//             that on a new connection, the initial prompt is visible.
+		// MinColumns was changed from 20 to 80 in TM 3.1.1 -- Having MinColumns 80
+		// ensures that dumb terminals render properly. On a narrow Terminal, users
+		// will not see everything, but since the backing store is 80 wide they can
+		// always resize the terminal to see all. A better solution than guessing the
+		// MinColumns here should be implemented with bug 196462 (optional fixed-width).
+		setMinColumns(80); setMinLines(1);
 		onResize(true);
 	}