diff options
Diffstat (limited to 'plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/util/ResourceUIUtil.java')
| -rw-r--r-- | plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/util/ResourceUIUtil.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/util/ResourceUIUtil.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/util/ResourceUIUtil.java index 518b06c53..e1e5b4f9f 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/util/ResourceUIUtil.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/util/ResourceUIUtil.java @@ -641,8 +641,8 @@ public class ResourceUIUtil { Match matchParent = comparison.getMatch(firstLoadedParent); if (matchParent != null) { if (!comparison.getMatches().contains(matchParent)) { - container = new MergeViewerItem.Container(comparison, null, match.getLeft(), match - .getRight(), match.getOrigin(), side, adapterFactory); + container = new MergeViewerItem.Container(comparison, null, match.getLeft(), + match.getRight(), match.getOrigin(), side, adapterFactory); } else { container = null; } @@ -680,7 +680,8 @@ public class ResourceUIUtil { // Need to replace by top-container NotLoadedFragment item NotLoadedFragmentMatch notLoadedFragmentMatch = new NotLoadedFragmentMatch( notLoadedFragmentMatches); - for (NotLoadedFragmentMatch match : filter(notLoadedFragmentMatches, NotLoadedFragmentMatch.class)) { + for (NotLoadedFragmentMatch match : filter(notLoadedFragmentMatches, + NotLoadedFragmentMatch.class)) { match.setName(getResourceName(match)); } newContainer = new MergeViewerItem.Container(comparison, null, notLoadedFragmentMatch, |