diff options
| author | Jonah Graham | 2018-11-23 13:04:51 +0000 |
|---|---|---|
| committer | Jonah Graham | 2018-11-23 13:59:46 +0000 |
| commit | 3caea240a38caa9b4913481ba9fb41d9b57a032c (patch) | |
| tree | 240ffcb07ecd6e2d5029743bacd81e280e07adf8 /dsf-gdb/org.eclipse.cdt.dsf.gdb | |
| parent | ff75ae80fa44dfc925064f7ca0169ac80997bc77 (diff) | |
| download | org.eclipse.cdt-3caea240a38caa9b4913481ba9fb41d9b57a032c.tar.gz org.eclipse.cdt-3caea240a38caa9b4913481ba9fb41d9b57a032c.tar.xz org.eclipse.cdt-3caea240a38caa9b4913481ba9fb41d9b57a032c.zip | |
Bug 540373: Format some Java files that were missed
Some files which has other cleanups applied meant they needed to be
reformatted again. e.g. the removing of type parameters shortened
some lines of code that meant the wrapping changed.
Change-Id: I68ca09567b9530cc2a085c33923642b6de2ec77b
Diffstat (limited to 'dsf-gdb/org.eclipse.cdt.dsf.gdb')
2 files changed, 4 insertions, 8 deletions
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBPatternMatchingExpressions.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBPatternMatchingExpressions.java index 0783c3d8732..40da8bd16e1 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBPatternMatchingExpressions.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBPatternMatchingExpressions.java @@ -662,8 +662,7 @@ public class GDBPatternMatchingExpressions extends AbstractDsfService implements // Not only does selecting the element jump back and forth between the duplicates, // but children of duplicated elements are not always right. Because of this, we // remove all duplicates here. - LinkedHashSet<IExpressionDMContext> uniqueSubExprSet = new LinkedHashSet<>( - subExprList); + LinkedHashSet<IExpressionDMContext> uniqueSubExprSet = new LinkedHashSet<>(subExprList); subExprList.clear(); subExprList.addAll(uniqueSubExprSet); @@ -776,8 +775,7 @@ public class GDBPatternMatchingExpressions extends AbstractDsfService implements matchArrays(exprDmc, new ImmediateDataRequestMonitor<List<IExpressionDMContext>>(rm) { @Override protected void handleSuccess() { - final List<IExpressionDMContext> exprList = getData() != null ? getData() - : new ArrayList<>(); + final List<IExpressionDMContext> exprList = getData() != null ? getData() : new ArrayList<>(); matchLocals(exprDmc, new ImmediateDataRequestMonitor<List<IExpressionDMContext>>(rm) { @Override protected void handleSuccess() { @@ -865,8 +863,7 @@ public class GDBPatternMatchingExpressions extends AbstractDsfService implements final CountingRequestMonitor varNameCRM = new CountingRequestMonitor(getExecutor(), rm) { @Override public void handleSuccess() { - ArrayList<IExpressionDMContext> matches = new ArrayList<>( - localsDMData.length); + ArrayList<IExpressionDMContext> matches = new ArrayList<>(localsDMData.length); String fullExpr = globDmc.getExpression().trim(); if (fullExpr.startsWith(GLOB_EXPRESSION_PREFIX)) { diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBRunControl_7_0_NS.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBRunControl_7_0_NS.java index 7bae81e398d..fd2afcd16d0 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBRunControl_7_0_NS.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBRunControl_7_0_NS.java @@ -2595,8 +2595,7 @@ public class GDBRunControl_7_0_NS extends AbstractDsfService Set<IExecutionDMContext> specifiedExedDmcSet = new HashSet<>(Arrays.asList(contexts)); // A list that ignores threads for which the process is also present - List<IExecutionDMContext> execDmcForOperationList = new ArrayList<>( - specifiedExedDmcSet.size()); + List<IExecutionDMContext> execDmcForOperationList = new ArrayList<>(specifiedExedDmcSet.size()); // Check for the case of a process selected along with some of its threads for (IExecutionDMContext execDmc : specifiedExedDmcSet) { |