diff options
3 files changed, 41 insertions, 46 deletions
diff --git a/org.eclipse.core.variables/src/org/eclipse/core/internal/variables/StringSubstitutionEngine.java b/org.eclipse.core.variables/src/org/eclipse/core/internal/variables/StringSubstitutionEngine.java index 03d772137..542fc7b9f 100644 --- a/org.eclipse.core.variables/src/org/eclipse/core/internal/variables/StringSubstitutionEngine.java +++ b/org.eclipse.core.variables/src/org/eclipse/core/internal/variables/StringSubstitutionEngine.java @@ -257,33 +257,29 @@ public class StringSubstitutionEngine { // no variables with the given name if (reportUndefinedVariables) { throw new CoreException(new Status(IStatus.ERROR, VariablesPlugin.getUniqueIdentifier(), VariablesPlugin.INTERNAL_ERROR, MessageFormat.format(VariablesMessages.getString("StringSubstitutionEngine.3"), new String[]{name}), null)); //$NON-NLS-1$ - } else { - // leave as is - return getOriginalVarText(var); - } - } else { - if (resolveVariables) { - fSubs = true; - return dynamicVariable.getValue(arg); - } else { - //leave as is - return getOriginalVarText(var); - } - } - } else { - if (arg == null) { - if (resolveVariables) { - fSubs = true; - return valueVariable.getValue(); - } else { - //leave as is - return getOriginalVarText(var); - } - } else { - // error - an argument specified for a value variable - throw new CoreException(new Status(IStatus.ERROR, VariablesPlugin.getUniqueIdentifier(), VariablesPlugin.INTERNAL_ERROR, MessageFormat.format(VariablesMessages.getString("StringSubstitutionEngine.4"), new String[]{valueVariable.getName()}), null)); //$NON-NLS-1$ - } - } + } + // leave as is + return getOriginalVarText(var); + } + + if (resolveVariables) { + fSubs = true; + return dynamicVariable.getValue(arg); + } + //leave as is + return getOriginalVarText(var); + } + + if (arg == null) { + if (resolveVariables) { + fSubs = true; + return valueVariable.getValue(); + } + //leave as is + return getOriginalVarText(var); + } + // error - an argument specified for a value variable + throw new CoreException(new Status(IStatus.ERROR, VariablesPlugin.getUniqueIdentifier(), VariablesPlugin.INTERNAL_ERROR, MessageFormat.format(VariablesMessages.getString("StringSubstitutionEngine.4"), new String[]{valueVariable.getName()}), null)); //$NON-NLS-1$ } private String getOriginalVarText(VariableReference var) { diff --git a/org.eclipse.ui.console/src/org/eclipse/ui/console/MessageConsole.java b/org.eclipse.ui.console/src/org/eclipse/ui/console/MessageConsole.java index 0b9b5387e..99d833fca 100644 --- a/org.eclipse.ui.console/src/org/eclipse/ui/console/MessageConsole.java +++ b/org.eclipse.ui.console/src/org/eclipse/ui/console/MessageConsole.java @@ -146,9 +146,8 @@ public class MessageConsole extends AbstractConsole { public Font getFont() { if (fFont == null) { return JFaceResources.getTextFont(); - } else { - return fFont; - } + } + return fFont; } /** diff --git a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/MessageConsolePartitioner.java b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/MessageConsolePartitioner.java index 2647b114e..9f9cc85bd 100644 --- a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/MessageConsolePartitioner.java +++ b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/MessageConsolePartitioner.java @@ -169,20 +169,19 @@ public class MessageConsolePartitioner implements IDocumentPartitioner, IDocumen public ITypedRegion[] computePartitioning(int offset, int length) { if (offset == 0 && length == fDocument.getLength()) { return (ITypedRegion[])fPartitions.toArray(new ITypedRegion[fPartitions.size()]); - } else { - int end = offset + length; - List list = new ArrayList(); - for (int i = 0; i < fPartitions.size(); i++) { - ITypedRegion partition = (ITypedRegion)fPartitions.get(i); - int partitionStart = partition.getOffset(); - int partitionEnd = partitionStart + partition.getLength(); - if ((offset >= partitionStart && offset <= partitionEnd) || - (offset < partitionStart && end >= partitionStart)) { - list.add(partition); - } - } - return (ITypedRegion[])list.toArray(new ITypedRegion[list.size()]); + } + int end = offset + length; + List list = new ArrayList(); + for (int i = 0; i < fPartitions.size(); i++) { + ITypedRegion partition = (ITypedRegion)fPartitions.get(i); + int partitionStart = partition.getOffset(); + int partitionEnd = partitionStart + partition.getLength(); + if ((offset >= partitionStart && offset <= partitionEnd) || + (offset < partitionStart && end >= partitionStart)) { + list.add(partition); + } } + return (ITypedRegion[])list.toArray(new ITypedRegion[list.size()]); } /** @@ -322,10 +321,11 @@ public class MessageConsolePartitioner implements IDocumentPartitioner, IDocumen * */ private void startUpdaterThread() { - if (updaterThreadStarted) + if (updaterThreadStarted) { return; - else - updaterThreadStarted = true; + } + + updaterThreadStarted = true; Runnable r = new Runnable() { public void run() { |