diff --git a/plugins/terminal/lib/jediterm-pty-0.05.jar b/plugins/terminal/lib/jediterm-pty-0.05.jar new file mode 100644 index 000000000000..7767509f2c40 Binary files /dev/null and b/plugins/terminal/lib/jediterm-pty-0.05.jar differ diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/JBTerminal.java b/plugins/terminal/src/org/jetbrains/plugins/terminal/JBTerminal.java index 7c19c78285a9..8a633edf5a8c 100644 --- a/plugins/terminal/src/org/jetbrains/plugins/terminal/JBTerminal.java +++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/JBTerminal.java @@ -9,7 +9,6 @@ import com.intellij.openapi.util.WriteExternalException; import com.intellij.ui.components.JBScrollBar; import com.intellij.util.containers.HashMap; import com.jediterm.terminal.display.BackBuffer; -import com.jediterm.terminal.display.LinesBuffer; import com.jediterm.terminal.display.StyleState; import com.jediterm.terminal.ui.SwingJediTerminal; import com.jediterm.terminal.ui.SwingTerminalPanel; @@ -27,8 +26,8 @@ public class JBTerminal extends SwingJediTerminal { } @Override - protected SwingTerminalPanel createTerminalPanel(StyleState styleState, BackBuffer backBuffer, LinesBuffer scrollBuffer) { - return new JBTerminalPanel(backBuffer, scrollBuffer, styleState, getColorScheme()); + protected SwingTerminalPanel createTerminalPanel(StyleState styleState, BackBuffer backBuffer) { + return new JBTerminalPanel(backBuffer, styleState, getColorScheme()); } public EditorColorsScheme getColorScheme() { diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/JBTerminalPanel.java b/plugins/terminal/src/org/jetbrains/plugins/terminal/JBTerminalPanel.java index c7cf51faa3c0..7693623e3f5e 100644 --- a/plugins/terminal/src/org/jetbrains/plugins/terminal/JBTerminalPanel.java +++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/JBTerminalPanel.java @@ -27,7 +27,6 @@ import com.intellij.openapi.ide.CopyPasteManager; import com.intellij.util.ui.GraphicsUtil; import com.jediterm.terminal.TextStyle; import com.jediterm.terminal.display.BackBuffer; -import com.jediterm.terminal.display.LinesBuffer; import com.jediterm.terminal.display.StyleState; import com.jediterm.terminal.ui.SwingTerminalPanel; @@ -41,8 +40,8 @@ import java.io.IOException; public class JBTerminalPanel extends SwingTerminalPanel { private final EditorColorsScheme myColorScheme; - public JBTerminalPanel(BackBuffer backBuffer, LinesBuffer scrollBuffer, StyleState styleState, EditorColorsScheme scheme) { - super(backBuffer, scrollBuffer, styleState); + public JBTerminalPanel(BackBuffer backBuffer, StyleState styleState, EditorColorsScheme scheme) { + super(backBuffer, styleState); myColorScheme = scheme; styleState.setDefaultStyle(new TextStyle(myColorScheme.getDefaultForeground(), myColorScheme.getDefaultBackground())); diff --git a/plugins/terminal/terminal.iml b/plugins/terminal/terminal.iml index 679498b504bc..41e2aa06ec0a 100644 --- a/plugins/terminal/terminal.iml +++ b/plugins/terminal/terminal.iml @@ -42,13 +42,12 @@ - + -