Skip to content

Improve console water mark error messages #2763

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
elsazac wants to merge 1 commit into
base: master
Choose a base branch
from
+10 −1
Open

Improve console water mark error messages #2763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .../org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleMessages.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ public class ConsoleMessages extends NLS {

public static String ConsoleTerminateAction_0;
public static String ConsoleTerminateAction_1;
public static String ConsoleBufferConfigurationError;

public static String ProcessConsole_0;

Expand Down
1 change: 1 addition & 0 deletions ...clipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleMessages.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ ConsoleRemoveTerminatedAction_1=Remove Launch

ConsoleTerminateAction_0=&Terminate
ConsoleTerminateAction_1=Terminate
ConsoleBufferConfigurationError=Console buffer configuration error: High water mark ({0}) must be greater than low water mark ({1}).

ProcessConsole_0=<terminated> {0}

Expand Down
6 changes: 6 additions & 0 deletions ...g/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsole.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@
import org.eclipse.jface.text.IRegion;
import org.eclipse.jface.util.IPropertyChangeListener;
import org.eclipse.jface.util.PropertyChangeEvent;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.graphics.Color;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IPersistableElement;
Expand Down Expand Up @@ -527,6 +528,11 @@ public void propertyChange(PropertyChangeEvent evt) {
int lowWater = store.getInt(IDebugPreferenceConstants.CONSOLE_LOW_WATER_MARK);
if (highWater > lowWater) {
setWaterMarks(lowWater, highWater);
} else {
String msg = NLS.bind(
ConsoleMessages.ConsoleBufferConfigurationError,
highWater, lowWater);
DebugUIPlugin.log(new Status(IStatus.WARNING, IDebugUIConstants.PLUGIN_ID, msg));
}
} else {
setWaterMarks(-1, -1);
Expand Down
3 changes: 2 additions & 1 deletion debug/org.eclipse.ui.console/src/org/eclipse/ui/console/IOConsole.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,8 @@ public int getLowWaterMark() {
public void setWaterMarks(int low, int high) {
if (low >= 0) {
if (low >= high) {
throw new IllegalArgumentException("High water mark must be greater than low water mark"); //$NON-NLS-1$
throw new IllegalArgumentException(
String.format("High water mark (%d) must be greater than low water mark (%d)", high, low)); //$NON-NLS-1$
}
}
partitioner.setWaterMarks(low, high);
Expand Down
Loading