diff --git a/releng/org.eclipse.rse.build/maps/terminal.map b/releng/org.eclipse.rse.build/maps/terminal.map index 0e85855c01a..a82509fb83c 100644 --- a/releng/org.eclipse.rse.build/maps/terminal.map +++ b/releng/org.eclipse.rse.build/maps/terminal.map @@ -1,13 +1,13 @@ -feature@org.eclipse.tm.terminal=v20080214,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal-feature +feature@org.eclipse.tm.terminal=v20080224,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal-feature feature@org.eclipse.tm.terminal.sdk=v20080214,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.sdk-feature feature@org.eclipse.tm.terminal.serial=v20080212,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.serial-feature feature@org.eclipse.tm.terminal.ssh=v20080212,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.ssh-feature feature@org.eclipse.tm.terminal.telnet=v20080212,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.telnet-feature feature@org.eclipse.tm.terminal.test=v20080214,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.test-feature -feature@org.eclipse.tm.terminal.view=v20080212,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.view-feature -plugin@org.eclipse.tm.terminal=v20080214,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal +feature@org.eclipse.tm.terminal.view=v20080224,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.view-feature +plugin@org.eclipse.tm.terminal=v20080224,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal plugin@org.eclipse.tm.terminal.serial=v20080212,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.serial plugin@org.eclipse.tm.terminal.ssh=v20080212,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.ssh -plugin@org.eclipse.tm.terminal.telnet=v20080212,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.telnet +plugin@org.eclipse.tm.terminal.telnet=v20080224,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.telnet plugin@org.eclipse.tm.terminal.test=v20080214,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.test -plugin@org.eclipse.tm.terminal.view=v20080213,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.view \ No newline at end of file +plugin@org.eclipse.tm.terminal.view=v20080224,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.view \ No newline at end of file diff --git a/terminal/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetConnection.java b/terminal/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetConnection.java index 6fcb145ca3f..6453add3e9f 100644 --- a/terminal/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetConnection.java +++ b/terminal/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetConnection.java @@ -11,6 +11,7 @@ * Ted Williams (Wind River) - repackaged into org.eclipse namespace * Michael Scharf (Wind River) - split into core, view and connector plugins * Martin Oberhuber (Wind River) - fixed copyright headers and beautified + * Michael Scharf (Wind River) - [209665] Add ability to log byte streams from terminal *******************************************************************************/ package org.eclipse.tm.internal.terminal.telnet; diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalView.java b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalView.java index 3a60706deca..2a821a8ce13 100644 --- a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalView.java +++ b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalView.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2003, 2008 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 @@ -16,6 +16,7 @@ * Martin Oberhuber (Wind River) - [206892] State handling: Only allow connect when CLOSED * Michael Scharf (Wind River) - [209656] ClassCastException in TerminalView under Eclipse-3.4M3 * Michael Scharf (Wind River) - [189774] Ctrl+V does not work in the command input field. + * Michael Scharf (Wind River) - [217999] Duplicate context menu entries in Terminal *******************************************************************************/ package org.eclipse.tm.internal.terminal.view; diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/CommandInputFieldWithHistory.java b/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/CommandInputFieldWithHistory.java index 39e8b1a323c..5403e4ce613 100644 --- a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/CommandInputFieldWithHistory.java +++ b/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/CommandInputFieldWithHistory.java @@ -113,7 +113,7 @@ public class CommandInputFieldWithHistory implements ICommandInputField { } /** * Add a line to the history. - * @param line + * @param line The line to be added to the history. */ protected void pushLine(String line) { endHistoryMode(); @@ -158,7 +158,7 @@ public class CommandInputFieldWithHistory implements ICommandInputField { return buff.toString(); } /** - * @param currLine + * @param currLine Line of text to be moved in history * @param count (+1 or -1) for forward and backward movement. -1 goes back * @return the new string to be displayed in the command line or null, * if the limit is reached. diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/VT100Emulator.java b/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/VT100Emulator.java index cd6e24ebcb3..5441bbf5277 100644 --- a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/VT100Emulator.java +++ b/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/VT100Emulator.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2003, 2008 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 diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/VT100TerminalControl.java b/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/VT100TerminalControl.java index f3a541cf2d0..c76f0279271 100644 --- a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/VT100TerminalControl.java +++ b/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/VT100TerminalControl.java @@ -17,6 +17,7 @@ * Martin Oberhuber (Wind River) - [206883] Serial Terminal leaks Jobs * Martin Oberhuber (Wind River) - [208145] Terminal prints garbage after quick disconnect/reconnect * Martin Oberhuber (Wind River) - [207785] NPE when trying to send char while no longer connected + * Michael Scharf (Wind River) - [209665] Add ability to log byte streams from terminal * Ruslan Sychev (Xored Software) - [217675] NPE or SWTException when closing Terminal View while connection establishing *******************************************************************************/ package org.eclipse.tm.internal.terminal.emulator; diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/TerminalTextData.java b/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/TerminalTextData.java index 341e3b740a5..bfa4f2fde5a 100644 --- a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/TerminalTextData.java +++ b/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/TerminalTextData.java @@ -60,8 +60,8 @@ public class TerminalTextData implements ITerminalTextData { /** * Show the first 100 lines * see {@link #toMultiLineText(ITerminalTextDataReadOnly, int, int)} - * @param term - * @return a string representaron of the terminal + * @param term A read-only terminal model + * @return a string representation of the terminal */ static public String toMultiLineText(ITerminalTextDataReadOnly term) { return toMultiLineText(term, 0, 100); @@ -156,9 +156,9 @@ public class TerminalTextData implements ITerminalTextData { /** * Notify snapshot that a region was scrolled - * @param startLine - * @param size - * @param shift + * @param startLine first line of scrolled region + * @param size size of scrolled region (number of lines) + * @param shift delta by which the region is scrolled */ protected void sendScrolledToSnapshots(int startLine,int size, int shift) { for (int i = 0; i < fSnapshots.length; i++) { @@ -172,7 +172,7 @@ public class TerminalTextData implements ITerminalTextData { } /** * Removes the snapshot from the @observer@ list - * @param snapshot + * @param snapshot A snapshot of a terminal model */ protected void removeSnapshot(TerminalTextDataSnapshot snapshot) { // poor mans approach to modify the array diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/GridCanvas.java b/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/GridCanvas.java index f920c92df6e..522b29db5d2 100644 --- a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/GridCanvas.java +++ b/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/GridCanvas.java @@ -186,9 +186,9 @@ abstract public class GridCanvas extends VirtualCanvas { * Override when you need this information.... * Is only called if the values change (well, almost) * @param x origin of visible cells - * @param y + * @param y origin of visible cells * @param width number of cells visible in x direction - * @param height + * @param height number of cells visible in y direction */ protected void visibleCellRectangleChanged(int x, int y, int width, int height) { } diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/PipedInputStream.java b/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/PipedInputStream.java index aacebffbe90..6a589632f9a 100644 --- a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/PipedInputStream.java +++ b/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/PipedInputStream.java @@ -76,8 +76,9 @@ public class PipedInputStream extends InputStream { } /** * Writes a single byte to the buffer. Blocks if the buffer is full. - * @param b - * @throws InterruptedException + * @param b byte to write to the buffer + * @throws InterruptedException when the thread is interrupted while waiting + * for the buffer to become ready * Must be called with a lock on this! */ public void write(byte b) throws InterruptedException { @@ -112,7 +113,8 @@ public class PipedInputStream extends InputStream { /** * Read a single byte. Blocks until a byte is available. * @return a byte from the buffer - * @throws InterruptedException + * @throws InterruptedException when the thread is interrupted while waiting + * for the buffer to become ready * Must be called with a lock on this! */ public int read() throws InterruptedException { @@ -224,7 +226,8 @@ public class PipedInputStream extends InputStream { /** * Waits until data is available for reading. * @param millis see {@link Object#wait(long)} - * @throws InterruptedException + * @throws InterruptedException when the thread is interrupted while waiting + * for the buffer to become ready */ public void waitForAvailable(long millis) throws InterruptedException { synchronized(fQueue) { diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/StyleMap.java b/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/StyleMap.java index 74b001b26f0..5d1f25333e4 100644 --- a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/StyleMap.java +++ b/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/StyleMap.java @@ -214,7 +214,8 @@ public class StyleMap { return fProportional; } /** - * @param c + * Return the offset in pixels required to center a given character + * @param c the character to measure * @return the offset in x direction to center this character */ public int getCharOffset(char c) { diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/TextLineRenderer.java b/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/TextLineRenderer.java index cb08db942e7..06f0069b28a 100644 --- a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/TextLineRenderer.java +++ b/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/TextLineRenderer.java @@ -7,6 +7,8 @@ * * Contributors: * Michael Scharf (Wind River) - initial API and implementation + * Michael Scharf (Wind River) - [205260] Terminal does not take the font from the preferences + * Michael Scharf (Wind River) - [206328] Terminal does not draw correctly with proportional fonts *******************************************************************************/ package org.eclipse.tm.internal.terminal.textcanvas; diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/VirtualCanvas.java b/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/VirtualCanvas.java index d47325e85ee..080188023d9 100644 --- a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/VirtualCanvas.java +++ b/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/VirtualCanvas.java @@ -145,7 +145,9 @@ public abstract class VirtualCanvas extends Canvas { } /** - * @param gc + * Paint the virtual canvas. + * Override to implement actual paint method. + * @param gc graphics context to paint in */ abstract protected void paint(GC gc); protected Color getTerminalBackgroundColor() { @@ -203,9 +205,9 @@ public abstract class VirtualCanvas extends Canvas { } /** - * Sets the extend of the virtual display ares - * @param width - * @param height + * Sets the extent of the virtual display area + * @param width width of the display area + * @param height height of the display area */ protected void setVirtualExtend(int width, int height) { fVirtualBounds.width=width; @@ -233,7 +235,7 @@ public abstract class VirtualCanvas extends Canvas { } /** * @param x - * @return the virtual coordinate in scree space + * @return the virtual coordinate in screen space */ protected int virtualXtoScreen(int x) { return x+fVirtualBounds.x;