seg_yinzy
/
che-server
mirror of https://github.com/eclipse-che/che-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CHE-6844: Fix Git markers on maven multi-module projects (#7753)

6.19.x
Igor Vinokur 2017-12-07 09:50:05 +00:00 committed by GitHub
parent f9726f7bfa
commit 7f06d4d248
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ide/che-core-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/OrionEditorPresenter.java
View File

@ -125,6 +125,7 @@ import org.eclipse.che.ide.api.parts.EditorTab;
import org.eclipse.che.ide.api.parts.PartPresenter;
import org.eclipse.che.ide.api.parts.WorkspaceAgent;
import org.eclipse.che.ide.api.preferences.PreferencesManager;
import org.eclipse.che.ide.api.resources.Container;
import org.eclipse.che.ide.api.resources.File;
import org.eclipse.che.ide.api.resources.Project;
import org.eclipse.che.ide.api.resources.Resource;
@ -1221,8 +1222,12 @@ public class OrionEditorPresenter extends AbstractEditorPresenter
resolve.apply(null);
return;
}
String vcsName = project.getAttribute("vcs.provider.name");
Container parent = getRoot(project);
if (!(parent instanceof Project)) {
resolve.apply(null);
return;
}
String vcsName = ((Project) parent).getAttribute("vcs.provider.name");
VcsChangeMarkerRenderFactory vcsChangeMarkerRenderFactory =
vcsChangeMarkerRenderFactoryMap.get(vcsName);
if (vcsChangeMarkerRenderFactory != null) {
@ -1233,6 +1238,14 @@ public class OrionEditorPresenter extends AbstractEditorPresenter
}));
}
private Container getRoot(Container container) {
Container root = container;
while (root.getParent() != null) {
root = root.getParent();
}
return root;
}
@Override
public boolean isWrapLines() {
return editorWidget.getTextView().getOptions().getWrapMode();