mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-09 18:56:02 +02:00
Code Issues Wiki Activity

[386262] fixed NPE in setTerminalSize.

Browse source
This commit is contained in:
Anna Dushistova 2012-10-01 18:17:14 +00:00
parent 9cd9abaaa0
commit f43fdf19c2
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalConnector.java
View file

@ -1,14 +1,15 @@
/*************************************************************************************************** /***************************************************************************************************
* Copyright (c) 2008, 2010 Mirko Raner and others. * Copyright (c) 2008, 2012 Mirko Raner and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html * http://www.eclipse.org/legal/epl-v10.html
* *
* Contributors: * Contributors:
* Mirko Raner - [196337] initial implementation; some methods adapted from * Mirko Raner - [196337] initial implementation; some methods adapted from
* org.eclipse.tm.terminal.ssh/SshConnector * org.eclipse.tm.terminal.ssh/SshConnector
* Mirko Raner - [314977] Dynamically disable when no PTY is available * Mirko Raner - [314977] Dynamically disable when no PTY is available
* Anna Dushistova(MontaVista) - [386262] NPE in setTerminalSize
**************************************************************************************************/ **************************************************************************************************/
package org.eclipse.tm.internal.terminal.local; package org.eclipse.tm.internal.terminal.local;
@ -52,7 +53,7 @@ import org.eclipse.tm.internal.terminal.provisional.api.provider.TerminalConnect
* <code>vi</code> editor). * <code>vi</code> editor).
* *
* @author Mirko Raner * @author Mirko Raner
* @version $Revision: 1.5 $ * @version $Revision: 1.6 $
*/ */
public class LocalTerminalConnector extends TerminalConnectorImpl public class LocalTerminalConnector extends TerminalConnectorImpl
implements IDebugEventSetListener { implements IDebugEventSetListener {
@ -342,13 +343,14 @@ implements IDebugEventSetListener {
* @param height the new terminal height (in lines) * @param height the new terminal height (in lines)
*/ */
public void setTerminalSize(int width, int height) { public void setTerminalSize(int width, int height) {
if(process != null){
PTY pty = process.getPTY();
if (pty != null && (width != lastWidth || height != lastHeight)) {
PTY pty = process.getPTY(); pty.setTerminalSize(width, height);
if (pty != null && (width != lastWidth || height != lastHeight)) { lastWidth = width;
lastHeight = height;
pty.setTerminalSize(width, height); }
lastWidth = width;
lastHeight = height;
} }
} }