Merge branch 'master' into spi

6.19.x
Artem Zatsarynnyi 2017-07-20 12:30:15 +03:00
commit b851196df5
308 changed files with 1682 additions and 1892 deletions

View File

@ -1,5 +1,76 @@
# Change Log
## [5.15.0](https://github.com/eclipse/che/tree/5.15.0) (2017-07-19)
[Full Changelog](https://github.com/eclipse/che/compare/5.14.0...5.15.0)
**Merged pull requests:**
- Rework Composer plugin to avoid using Everrest based Websocket calls [\#5629](https://github.com/eclipse/che/pull/5629) ([kaloyan-raev](https://github.com/kaloyan-raev))
- C/CPP compilation error/warning messages support \#5565 [\#5604](https://github.com/eclipse/che/pull/5604) ([vrubezhny](https://github.com/vrubezhny))
- Move mvn and svn tests execution to integration profile [\#5596](https://github.com/eclipse/che/pull/5596) ([garagatyi](https://github.com/garagatyi))
- Fix dependencies [\#5590](https://github.com/eclipse/che/pull/5590) ([vparfonov](https://github.com/vparfonov))
- Try to fix occasionally failing tests on CI [\#5585](https://github.com/eclipse/che/pull/5585) ([garagatyi](https://github.com/garagatyi))
- Handle no-content response in DefaultHttpJsonRequest [\#5577](https://github.com/eclipse/che/pull/5577) ([dmytro-ndp](https://github.com/dmytro-ndp))
- Maven Server tests execution on integration phase [\#5574](https://github.com/eclipse/che/pull/5574) ([vparfonov](https://github.com/vparfonov))
- Rework Navigate to File feature to avoid using Everrest based Websocket calls [\#5561](https://github.com/eclipse/che/pull/5561) ([dkuleshov](https://github.com/dkuleshov))
- Rework Find Usages feature to avoid using Everrest based Websocket calls [\#5550](https://github.com/eclipse/che/pull/5550) ([dkuleshov](https://github.com/dkuleshov))
- Use Orion annotation model instead 'showProblems' method [\#5518](https://github.com/eclipse/che/pull/5518) ([evidolob](https://github.com/evidolob))
- Improve idling implementation [\#5512](https://github.com/eclipse/che/pull/5512) ([mkuznyetsov](https://github.com/mkuznyetsov))
- Normalize agent names [\#5479](https://github.com/eclipse/che/pull/5479) ([vinokurig](https://github.com/vinokurig))
- Update lsp4J lib to newer version. [\#5292](https://github.com/eclipse/che/pull/5292) ([AndrienkoAleksandr](https://github.com/AndrienkoAleksandr))
- Openshift connector improvements [\#5052](https://github.com/eclipse/che/pull/5052) ([sunix](https://github.com/sunix))
- Move file header under imports [\#5727](https://github.com/eclipse/che/pull/5727) ([akorneta](https://github.com/akorneta))
- Show notification when the creation of workspace failed [\#5723](https://github.com/eclipse/che/pull/5723) ([akurinnoy](https://github.com/akurinnoy))
- Refresh commands list in project's context menu in IDE [\#5717](https://github.com/eclipse/che/pull/5717) ([akurinnoy](https://github.com/akurinnoy))
- Fixed displaying of Preview URL at refreshing page [\#5709](https://github.com/eclipse/che/pull/5709) ([RomanNikitenko](https://github.com/RomanNikitenko))
- Openshift: add mounted volume for logs [\#5708](https://github.com/eclipse/che/pull/5708) ([benoitf](https://github.com/benoitf))
- Display notifications about external delete operation in Events panel [\#5707](https://github.com/eclipse/che/pull/5707) ([RomanNikitenko](https://github.com/RomanNikitenko))
- Auto-detect recipe format and fix Git url pattern [\#5677](https://github.com/eclipse/che/pull/5677) ([ashumilova](https://github.com/ashumilova))
- Fixed focus position at editor state restoring [\#5665](https://github.com/eclipse/che/pull/5665) ([RomanNikitenko](https://github.com/RomanNikitenko))
- Use LSP for pom editor [\#5641](https://github.com/eclipse/che/pull/5641) ([tsmaeder](https://github.com/tsmaeder))
- Avoid using ProjectManager just for taking project root dir [\#5636](https://github.com/eclipse/che/pull/5636) ([vparfonov](https://github.com/vparfonov))
- Show 'Quick Start' tab by default and consider stacks priority order [\#5632](https://github.com/eclipse/che/pull/5632) ([ashumilova](https://github.com/ashumilova))
- Fixed using project path and fileUri [\#5625](https://github.com/eclipse/che/pull/5625) ([vparfonov](https://github.com/vparfonov))
- Fixed machine's default docker image [\#5619](https://github.com/eclipse/che/pull/5619) ([ashumilova](https://github.com/ashumilova))
- Fixed Kotlin stack and dashboard reaction on missing workspace config in stack [\#5618](https://github.com/eclipse/che/pull/5618) ([ashumilova](https://github.com/ashumilova))
- Replaced Window.open\(\) with JS native call [\#5584](https://github.com/eclipse/che/pull/5584) ([vparfonov](https://github.com/vparfonov))
- Fix possible NullPointerException [\#5582](https://github.com/eclipse/che/pull/5582) ([vparfonov](https://github.com/vparfonov))
- Run sync container in an interactive mode [\#5576](https://github.com/eclipse/che/pull/5576) ([eivantsov](https://github.com/eivantsov))
- Save button in Workspace config tab appears only after adding second symbol to config [\#5566](https://github.com/eclipse/che/pull/5566) ([bdshadow](https://github.com/bdshadow))
- Sort imports/ fix indent in openshift connector [\#5552](https://github.com/eclipse/che/pull/5552) ([benoitf](https://github.com/benoitf))
- Change names of methods for WebSocket communication [\#5543](https://github.com/eclipse/che/pull/5543) ([svor](https://github.com/svor))
- Move binding ServerIdleDetctor to the assembly module [\#5541](https://github.com/eclipse/che/pull/5541) ([vparfonov](https://github.com/vparfonov))
- .NET C\# stacktrace support \#5489 [\#5534](https://github.com/eclipse/che/pull/5534) ([vrubezhny](https://github.com/vrubezhny))
- Fixed broken links to che-docs [\#5531](https://github.com/eclipse/che/pull/5531) ([jonahkichwacoders](https://github.com/jonahkichwacoders))
- Register refresh method for ProjectExplorer native object [\#5530](https://github.com/eclipse/che/pull/5530) ([vzhukovskii](https://github.com/vzhukovskii))
- Rework Maven plugin to avoid using Everrest Websocket [\#5527](https://github.com/eclipse/che/pull/5527) ([svor](https://github.com/svor))
- Avoid possible NPE [\#5526](https://github.com/eclipse/che/pull/5526) ([vparfonov](https://github.com/vparfonov))
- Added Kotlin runtime stack [\#5520](https://github.com/eclipse/che/pull/5520) ([eivantsov](https://github.com/eivantsov))
- Ability to handle import logs from multiple projects [\#5511](https://github.com/eclipse/che/pull/5511) ([vzhukovskii](https://github.com/vzhukovskii))
- Fixed NPE in DockerConnector [\#5510](https://github.com/eclipse/che/pull/5510) ([mmorhun](https://github.com/mmorhun))
- Fixed for DefaultOutputCustomizerTest.java - wrong API is used in place… [\#5509](https://github.com/eclipse/che/pull/5509) ([vrubezhny](https://github.com/vrubezhny))
- Fixed entrypoint to respect CHE\_DOCKER\_IP [\#5507](https://github.com/eclipse/che/pull/5507) ([eivantsov](https://github.com/eivantsov))
- Remove unnecessary stack trace [\#5506](https://github.com/eclipse/che/pull/5506) ([mmorhun](https://github.com/mmorhun))
- Fixed group by folders view in commit dialog [\#5504](https://github.com/eclipse/che/pull/5504) ([vinokurig](https://github.com/vinokurig))
- Updated Bitnami stacks to latest versions [\#5501](https://github.com/eclipse/che/pull/5501) ([amrecio](https://github.com/amrecio))
- Add repository and registry host in log on snapshot deletion failure [\#5500](https://github.com/eclipse/che/pull/5500) ([mmorhun](https://github.com/mmorhun))
- Make gwt-logger project m2e-compatible [\#5496](https://github.com/eclipse/che/pull/5496) ([tsmaeder](https://github.com/tsmaeder))
- CHE-5215. Add ability to exclude tracking files by file watcher [\#5495](https://github.com/eclipse/che/pull/5495) ([RomanNikitenko](https://github.com/RomanNikitenko))
- Reworked importing a project while consuming Factory to avoid using Everrest based Websocket calls [\#5493](https://github.com/eclipse/che/pull/5493) ([dkuleshov](https://github.com/dkuleshov))
- Removed deprecated single descriptor and move to multi descriptors which is the replacement [\#5490](https://github.com/eclipse/che/pull/5490) ([benoitf](https://github.com/benoitf))
- Rework git client-service and other git client classes [\#5476](https://github.com/eclipse/che/pull/5476) ([vinokurig](https://github.com/vinokurig))
- New runner for TestNG tests [\#5472](https://github.com/eclipse/che/pull/5472) ([svor](https://github.com/svor))
- Let users to use .Chefile in addition to Chefile [\#5471](https://github.com/eclipse/che/pull/5471) ([benoitf](https://github.com/benoitf))
- Added new workspace creation flow [\#5447](https://github.com/eclipse/che/pull/5447) ([akurinnoy](https://github.com/akurinnoy))
- Added support for using multiple language servers to be registered for the same files \#4609 [\#5442](https://github.com/eclipse/che/pull/5442) ([tsmaeder](https://github.com/tsmaeder))
- Java stacktrace support \(From Platform to Che Workspace\) [\#5396](https://github.com/eclipse/che/pull/5396) ([vrubezhny](https://github.com/vrubezhny))
- Updated modification stamp on open and on update document. [\#5391](https://github.com/eclipse/che/pull/5391) ([AndrienkoAleksandr](https://github.com/AndrienkoAleksandr))
- Added CentOS based Golang stack to default assembly [\#5282](https://github.com/eclipse/che/pull/5282) ([dharmit](https://github.com/dharmit))
- Ability to register language servers for file names instead of extensions \#5107 [\#5156](https://github.com/eclipse/che/pull/5156) ([tsmaeder](https://github.com/tsmaeder))
- Support for multiple highlights [\#5038](https://github.com/eclipse/che/pull/5038) ([tsmaeder](https://github.com/tsmaeder))
- Added CentOS based minimal stack with only git to default assembly [\#4847](https://github.com/eclipse/che/pull/4847) ([dharmit](https://github.com/dharmit))
## [5.14.0](https://github.com/eclipse/che/tree/5.14.0) (2017-06-29)
[Full Changelog](https://github.com/eclipse/che/compare/5.13.0...5.14.0)

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<artifactId>bootstrapper</artifactId>
<name>Agents :: Bootstrapper</name>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<artifactId>exec-agent</artifactId>
<name>Agent :: Exec</name>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<artifactId>git-credentials-agent</artifactId>
<name>Git Credentials Agent</name>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<artifactId>go-agents</artifactId>
<name>Agent :: Golang agents</name>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<artifactId>ls-csharp-agent</artifactId>
<name>Language Server C# Agent</name>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<artifactId>ls-json-agent</artifactId>
<name>Language Server Json Agent</name>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<artifactId>ls-php-agent</artifactId>
<name>Language Server PHP Agent</name>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<artifactId>ls-python-agent</artifactId>
<name>Language Server python Agent</name>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<artifactId>ls-typescript-agent</artifactId>
<name>Language Server typescript Agent</name>

View File

@ -16,11 +16,11 @@
<parent>
<artifactId>che-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-agents-parent</artifactId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Che Agents Parent</name>
<modules>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<artifactId>ssh-agent</artifactId>
<name>SSH Agent</name>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<artifactId>terminal-agent</artifactId>
<name>Agent :: Terminal</name>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<artifactId>unison-agent</artifactId>
<name>Unison Agent</name>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-assembly-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<artifactId>assembly-ide-war</artifactId>
<packaging>war</packaging>
@ -191,18 +191,10 @@
<groupId>org.eclipse.che.plugin</groupId>
<artifactId>che-plugin-testing-ide</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.plugin</groupId>
<artifactId>che-plugin-testing-junit-ide</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.plugin</groupId>
<artifactId>che-plugin-testing-phpunit-ide</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.plugin</groupId>
<artifactId>che-plugin-testing-testng-ide</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.plugin</groupId>
<artifactId>che-plugin-web-ext-web</artifactId>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-assembly-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<artifactId>assembly-main</artifactId>
<packaging>pom</packaging>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-assembly-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<artifactId>assembly-wsagent-server</artifactId>
<packaging>pom</packaging>

View File

@ -0,0 +1,3 @@
1500540484000
(?:[^/]+/)*?[^/]*?
META-INF(?:$|/.+)

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-assembly-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<artifactId>assembly-wsagent-war</artifactId>
<packaging>war</packaging>
@ -107,6 +107,10 @@
<groupId>org.eclipse.che.plugin</groupId>
<artifactId>che-plugin-testing-classpath</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.plugin</groupId>
<artifactId>che-plugin-testing-junit-runtime</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.plugin</groupId>
<artifactId>che-plugin-testing-junit-server</artifactId>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-assembly-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<artifactId>assembly-wsmaster-war</artifactId>
<packaging>war</packaging>

View File

@ -16,12 +16,12 @@
<parent>
<artifactId>che-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.eclipse.che</groupId>
<artifactId>che-assembly-parent</artifactId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Che IDE :: Parent</name>
<modules>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-core</artifactId>
<packaging>jar</packaging>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-dto-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-dto</artifactId>
<packaging>jar</packaging>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-model</artifactId>
<packaging>jar</packaging>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-db-vendor-h2</artifactId>
<name>Che Core :: DB :: Vendor H2</name>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-db-vendor-postgresql</artifactId>
<name>Che Core :: DB :: Vendor PostgreSQL</name>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-db</artifactId>
<name>Che Core :: DB</name>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-typescript-dto-maven-plugin</artifactId>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-commons-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-commons-annotations</artifactId>
<packaging>jar</packaging>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-commons-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-commons-inject</artifactId>
<packaging>jar</packaging>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-commons-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-commons-j2ee</artifactId>
<packaging>jar</packaging>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-commons-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-commons-json</artifactId>
<packaging>jar</packaging>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-commons-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-commons-lang</artifactId>
<packaging>jar</packaging>

View File

@ -26,6 +26,16 @@ public class ParametersList {
parameters.add(value);
}
/**
* Adds a parameter without name.
*
* @param value
* value of the parameter
*/
public void add(String value) {
parameters.add(value);
}
public List<String> getParameters() {
return unmodifiableList(parameters);
}

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-commons-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-commons-schedule</artifactId>
<packaging>jar</packaging>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-commons-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-commons-test</artifactId>
<packaging>jar</packaging>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-commons-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-commons-xml</artifactId>
<packaging>jar</packaging>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-core-commons-parent</artifactId>

View File

@ -16,12 +16,12 @@
<parent>
<artifactId>che-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-parent</artifactId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Che Core Parent</name>
<modules>

View File

@ -16,12 +16,12 @@
<parent>
<artifactId>che-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.eclipse.che.dashboard</groupId>
<artifactId>che-dashboard-war</artifactId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
<packaging>war</packaging>
<name>Che Dashboard :: Web App</name>
<inceptionYear>2015</inceptionYear>

View File

@ -0,0 +1,4 @@
IMAGE_INIT=eclipse/che-init:5.16.0
IMAGE_CHE=eclipse/che-server:5.16.0
IMAGE_COMPOSE=docker/compose:1.8.1
IMAGE_TRAEFIK=traefik:v1.3.0-rc3

View File

@ -0,0 +1,24 @@
eclipse/alpine_jdk8
eclipse/aspnet
eclipse/centos_jdk8
eclipse/cpp_gcc
eclipse/debian_jdk8
eclipse/debian_jdk8_node
eclipse/debian_jre
eclipse/dotnet_core
eclipse/hadoop-dev
eclipse/meteor
eclipse/node
eclipse/php
eclipse/platformio
eclipse/ruby_rails
eclipse/selenium
eclipse/ubuntu_android
eclipse/ubuntu_go
eclipse/ubuntu_gradle
eclipse/ubuntu_jdk8
eclipse/ubuntu_jre
eclipse/ubuntu_python
eclipse/ubuntu_wildfly8
registry.centos.org/che-stacks/vertx

View File

@ -1 +1 @@
5.14.0
5.15.0

View File

@ -17,13 +17,13 @@
<parent>
<artifactId>maven-depmgt-pom</artifactId>
<groupId>org.eclipse.che.depmgt</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<artifactId>dto-typescript</artifactId>
<packaging>pom</packaging>
<name>Che TypeScript DTO</name>
<properties>
<che.version>5.15.0-SNAPSHOT</che.version>
<che.version>5.16.0-SNAPSHOT</che.version>
</properties>
<repositories>
<repository>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-ide-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-dyna-provider-generator-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-ide-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-ide-api</artifactId>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-ide-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-ide-app</artifactId>
<packaging>jar</packaging>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-ide-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-ide-generators</artifactId>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-ide-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-ide-stacks</artifactId>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-ide-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-ide-templates</artifactId>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-ide-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-ide-ui</artifactId>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-ide-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-orion-editor</artifactId>
<packaging>jar</packaging>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.eclipse.che.core</groupId>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-ide-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-commons-gwt</artifactId>
<name>Che Core :: Commons :: GWT</name>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-ide-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-gwt-logger</artifactId>
<name>Che Core :: Commons :: GWT Logger</name>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.eclipse.che.core</groupId>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-infrastructures-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>infrastructure-docker</artifactId>

View File

@ -16,11 +16,11 @@
<parent>
<artifactId>che-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-infrastructures-parent</artifactId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Che Infrastructures Parent</name>
<modules>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-composer-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-composer-ide</artifactId>
<packaging>jar</packaging>

View File

@ -13,7 +13,6 @@ package org.eclipse.che.plugin.composer.ide.communication;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import org.eclipse.che.ide.api.app.AppContext;
import org.eclipse.che.ide.console.CommandConsoleFactory;
import org.eclipse.che.ide.console.DefaultOutputConsole;
import org.eclipse.che.ide.processes.panel.ProcessesPanelPresenter;
@ -29,17 +28,14 @@ import org.eclipse.che.plugin.composer.shared.dto.ComposerOutput;
public class ComposerOutputHandler {
private final ProcessesPanelPresenter processesPanelPresenter;
private final AppContext appContext;
private DefaultOutputConsole outputConsole;
@Inject
public ComposerOutputHandler(ComposerJsonRpcHandler composerJsonRpcHandler,
ProcessesPanelPresenter processesPanelPresenter,
CommandConsoleFactory commandConsoleFactory,
AppContext appContext) {
CommandConsoleFactory commandConsoleFactory) {
this.processesPanelPresenter = processesPanelPresenter;
this.appContext = appContext;
composerJsonRpcHandler.addComposerOutputHandler(this::onComposerOutput);
@ -50,7 +46,7 @@ public class ComposerOutputHandler {
String message = output.getOutput();
switch (output.getState()) {
case START:
processesPanelPresenter.addCommandOutput(appContext.getDevMachine().getId(), outputConsole);
processesPanelPresenter.addCommandOutput(outputConsole);
outputConsole.clearOutputsButtonClicked();
outputConsole.printText(message, "green");
break;

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-composer-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-composer-server</artifactId>
<name>Che Plugin :: Composer :: Server</name>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-composer-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-composer-shared</artifactId>
<name>Che Plugin :: Composer :: Shared</name>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-plugin-composer-parent</artifactId>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-cpp-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-cpp-lang-ide</artifactId>
<packaging>jar</packaging>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-cpp-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-cpp-lang-server</artifactId>
<name>Che Plugin :: C/C++ :: Extension Server</name>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-cpp-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-cpp-lang-shared</artifactId>
<name>Che Plugin :: C/C++ :: Shared</name>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-plugin-cpp-parent</artifactId>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-csharp-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-csharp-lang-ide</artifactId>
<packaging>jar</packaging>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-csharp-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-csharp-lang-server</artifactId>
<name>Che Plugin :: C# :: Extension Server</name>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-csharp-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-csharp-lang-shared</artifactId>
<name>Che Plugin :: C# :: Shared</name>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-plugin-csharp-parent</artifactId>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-dashboard-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-ext-dashboard-client</artifactId>
<packaging>jar</packaging>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-plugin-dashboard-parent</artifactId>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-debugger-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-debugger-ide</artifactId>
<packaging>jar</packaging>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-plugin-debugger-parent</artifactId>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-docker-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-docker-client</artifactId>
<packaging>jar</packaging>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-docker-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-openshift-client</artifactId>
<packaging>jar</packaging>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-plugin-docker-parent</artifactId>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-gdb-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-gdb-ide</artifactId>
<packaging>jar</packaging>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-gdb-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-gdb-server</artifactId>
<packaging>jar</packaging>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-gdb-parent</artifactId>
<packaging>pom</packaging>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-git-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-git-ext-git</artifactId>
<packaging>jar</packaging>

View File

@ -107,7 +107,7 @@ public class FetchPresenter implements FetchView.ActionDelegate {
.catchError(error -> {
GitOutputConsole console = gitOutputConsoleFactory.create(FETCH_COMMAND_NAME);
console.printError(constant.remoteListFailed());
processesPanelPresenter.addCommandOutput(appContext.getDevMachine().getId(), console);
processesPanelPresenter.addCommandOutput(console);
notificationManager.notify(constant.remoteListFailed(), FAIL, FLOAT_MODE);
view.setEnableFetchButton(false);
});
@ -139,7 +139,7 @@ public class FetchPresenter implements FetchView.ActionDelegate {
final String errorMessage = error.getMessage() != null ? error.getMessage() : constant.branchesListFailed();
GitOutputConsole console = gitOutputConsoleFactory.create(FETCH_COMMAND_NAME);
console.printError(errorMessage);
processesPanelPresenter.addCommandOutput(appContext.getDevMachine().getId(), console);
processesPanelPresenter.addCommandOutput(console);
notificationManager.notify(constant.branchesListFailed(), FAIL, FLOAT_MODE);
view.setEnableFetchButton(false);
});
@ -156,13 +156,13 @@ public class FetchPresenter implements FetchView.ActionDelegate {
service.fetch(project.getLocation(), view.getRepositoryName(), getRefs(), view.isRemoveDeletedRefs())
.then(ignored -> {
console.print(constant.fetchSuccess(remoteUrl));
processesPanelPresenter.addCommandOutput(appContext.getDevMachine().getId(), console);
processesPanelPresenter.addCommandOutput(console);
notification.setStatus(SUCCESS);
notification.setTitle(constant.fetchSuccess(remoteUrl));
})
.catchError(error -> {
handleError(error.getCause(), remoteUrl, notification, console);
processesPanelPresenter.addCommandOutput(appContext.getDevMachine().getId(), console);
processesPanelPresenter.addCommandOutput(console);
});
view.close();
}

View File

@ -208,7 +208,9 @@ public class HistoryViewImpl extends Window implements HistoryView {
@UiHandler("revisionsPanel")
public void onPanelScrolled(ScrollEvent ignored) {
if (revisionsPanel.getVerticalScrollPosition() == revisionsPanel.getMaximumVerticalScrollPosition()) {
// We cannot rely on exact equality of scroll positions because GWT sometimes round such values
// and it is possible that the actual max scroll position is a pixel less then declared.
if (revisionsPanel.getMaximumVerticalScrollPosition() - revisionsPanel.getVerticalScrollPosition() <= 1) {
// to avoid autoscrolling to selected item
revisionsPanel.getElement().focus();

View File

@ -113,7 +113,7 @@ public class PushToRemotePresenter implements PushToRemoteView.ActionDelegate {
String errorMessage = error.getMessage() != null ? error.getMessage() : constant.remoteListFailed();
GitOutputConsole console = gitOutputConsoleFactory.create(REMOTE_REPO_COMMAND_NAME);
console.printError(errorMessage);
processesPanelPresenter.addCommandOutput(appContext.getDevMachine().getId(), console);
processesPanelPresenter.addCommandOutput(console);
notificationManager.notify(constant.remoteListFailed(), FAIL, FLOAT_MODE);
view.setEnablePushButton(false);
});
@ -146,7 +146,7 @@ public class PushToRemotePresenter implements PushToRemoteView.ActionDelegate {
String errorMessage = exception.getMessage() != null ? exception.getMessage() : constant.localBranchesListFailed();
GitOutputConsole console = gitOutputConsoleFactory.create(BRANCH_LIST_COMMAND_NAME);
console.printError(errorMessage);
processesPanelPresenter.addCommandOutput(appContext.getDevMachine().getId(), console);
processesPanelPresenter.addCommandOutput(console);
notificationManager.notify(constant.localBranchesListFailed(), FAIL, FLOAT_MODE);
view.setEnablePushButton(false);
}
@ -196,7 +196,7 @@ public class PushToRemotePresenter implements PushToRemoteView.ActionDelegate {
public void onFailure(Throwable caught) {
GitOutputConsole console = gitOutputConsoleFactory.create(CONFIG_COMMAND_NAME);
console.printError(constant.failedGettingConfig());
processesPanelPresenter.addCommandOutput(appContext.getDevMachine().getId(), console);
processesPanelPresenter.addCommandOutput(console);
notificationManager.notify(constant.failedGettingConfig(), FAIL, FLOAT_MODE);
}
});
@ -207,7 +207,7 @@ public class PushToRemotePresenter implements PushToRemoteView.ActionDelegate {
String errorMessage = exception.getMessage() != null ? exception.getMessage() : constant.remoteBranchesListFailed();
GitOutputConsole console = gitOutputConsoleFactory.create(BRANCH_LIST_COMMAND_NAME);
console.printError(errorMessage);
processesPanelPresenter.addCommandOutput(appContext.getDevMachine().getId(), console);
processesPanelPresenter.addCommandOutput(console);
notificationManager.notify(constant.remoteBranchesListFailed(), FAIL, FLOAT_MODE);
view.setEnablePushButton(false);
}
@ -270,7 +270,7 @@ public class PushToRemotePresenter implements PushToRemoteView.ActionDelegate {
service.push(project.getLocation(), getRefs(), repository, view.isForcePushSelected())
.then(response -> {
console.print(response.getCommandOutput());
processesPanelPresenter.addCommandOutput(appContext.getDevMachine().getId(), console);
processesPanelPresenter.addCommandOutput(console);
notification.setStatus(SUCCESS);
if (response.getCommandOutput().contains("Everything up-to-date")) {
notification.setTitle(constant.pushUpToDate());
@ -280,7 +280,7 @@ public class PushToRemotePresenter implements PushToRemoteView.ActionDelegate {
})
.catchError(error -> {
handleError(error.getCause(), notification, console);
processesPanelPresenter.addCommandOutput(appContext.getDevMachine().getId(), console);
processesPanelPresenter.addCommandOutput(console);
});
view.close();
}

View File

@ -18,16 +18,20 @@ import org.eclipse.che.api.git.shared.ResetRequest;
import org.eclipse.che.api.git.shared.Revision;
import org.eclipse.che.ide.api.app.AppContext;
import org.eclipse.che.ide.api.dialogs.DialogFactory;
import org.eclipse.che.ide.ext.git.client.GitServiceClient;
import org.eclipse.che.ide.api.notification.NotificationManager;
import org.eclipse.che.ide.api.resources.Project;
import org.eclipse.che.ide.ext.git.client.GitLocalizationConstant;
import org.eclipse.che.ide.ext.git.client.GitServiceClient;
import org.eclipse.che.ide.ext.git.client.outputconsole.GitOutputConsole;
import org.eclipse.che.ide.ext.git.client.outputconsole.GitOutputConsoleFactory;
import org.eclipse.che.ide.processes.panel.ProcessesPanelPresenter;
import javax.validation.constraints.NotNull;
import java.util.ArrayList;
import java.util.List;
import static org.eclipse.che.api.git.shared.Constants.DEFAULT_PAGE_SIZE;
import static org.eclipse.che.ide.api.notification.StatusNotification.DisplayMode.FLOAT_MODE;
import static org.eclipse.che.ide.api.notification.StatusNotification.Status.FAIL;
import static org.eclipse.che.ide.util.ExceptionUtils.getErrorCode;
@ -52,8 +56,10 @@ public class ResetToCommitPresenter implements ResetToCommitView.ActionDelegate
private final GitLocalizationConstant constant;
private final NotificationManager notificationManager;
private Revision selectedRevision;
private Project project;
private Revision selectedRevision;
private List<Revision> revisions;
private Project project;
private int skip;
@Inject
public ResetToCommitPresenter(ResetToCommitView view,
@ -77,29 +83,12 @@ public class ResetToCommitPresenter implements ResetToCommitView.ActionDelegate
public void showDialog(final Project project) {
this.project = project;
this.skip = 0;
this.revisions = new ArrayList<>();
this.selectedRevision = null;
this.view.resetRevisionSelection();
service.log(project.getLocation(), null, -1, -1, false)
.then(log -> {
view.setRevisions(log.getCommits());
view.setMixMode(true);
view.setEnableResetButton(selectedRevision != null);
view.showDialog();
project.synchronize();
})
.catchError(error -> {
if (getErrorCode(error.getCause()) == ErrorCodes.INIT_COMMIT_WAS_NOT_PERFORMED) {
dialogFactory.createMessageDialog(constant.resetCommitViewTitle(),
constant.initCommitWasNotPerformed(),
null).show();
return;
}
String errorMessage = (error.getMessage() != null) ? error.getMessage() : constant.logFailed();
GitOutputConsole console = gitOutputConsoleFactory.create(LOG_COMMAND_NAME);
console.printError(errorMessage);
consolesPanelPresenter.addCommandOutput(console);
notificationManager.notify(constant.logFailed(), FAIL, FLOAT_MODE);
});
fetchAndAddNextRevisions();
}
/**
@ -128,6 +117,41 @@ public class ResetToCommitPresenter implements ResetToCommitView.ActionDelegate
view.setEnableResetButton(selectedRevision != null);
}
@Override
public void onScrolledToBottom() {
fetchAndAddNextRevisions();
}
private void fetchAndAddNextRevisions() {
service.log(project.getLocation(), null, skip, DEFAULT_PAGE_SIZE, false)
.then(log -> {
List<Revision> commits = log.getCommits();
if (!commits.isEmpty()) {
skip += commits.size();
revisions.addAll(commits);
view.setEnableResetButton(selectedRevision != null);
view.setRevisions(revisions);
view.setMixMode(true);
view.showDialog();
project.synchronize();
}
})
.catchError(error -> {
if (getErrorCode(error.getCause()) == ErrorCodes.INIT_COMMIT_WAS_NOT_PERFORMED) {
dialogFactory.createMessageDialog(constant.resetCommitViewTitle(),
constant.initCommitWasNotPerformed(),
null).show();
return;
}
String errorMessage = (error.getMessage() != null) ? error.getMessage() : constant.logFailed();
GitOutputConsole console = gitOutputConsoleFactory.create(LOG_COMMAND_NAME);
console.printError(errorMessage);
consolesPanelPresenter.addCommandOutput(console);
notificationManager.notify(constant.logFailed(), FAIL, FLOAT_MODE);
});
}
/**
* Reset current HEAD to the specified state and refresh project in the success case.
*/

View File

@ -37,6 +37,11 @@ public interface ResetToCommitView extends View<ResetToCommitView.ActionDelegate
* selected revision
*/
void onRevisionSelected(@NotNull Revision revision);
/**
* Occurs when the last entry in the list has been displayed.
*/
void onScrolledToBottom();
}
/**
@ -47,6 +52,11 @@ public interface ResetToCommitView extends View<ResetToCommitView.ActionDelegate
*/
void setRevisions(@NotNull List<Revision> revisions);
/**
* Deselect active revision in the table of available revisions.
*/
void resetRevisionSelection();
/** @return <code>true</code> if soft mode is chosen, and <code>false</code> otherwise */
boolean isSoftMode();
@ -80,28 +90,6 @@ public interface ResetToCommitView extends View<ResetToCommitView.ActionDelegate
*/
void setHardMode(boolean isHard);
// /** @return <code>true</code> if keep mode is chosen, and <code>false</code> otherwise */
// boolean isKeepMode();
//
// /**
// * Select keep mode.
// *
// * @param isKeep
// * <code>true</code> to select keep mode, <code>false</code> not to select
// */
// void setKeepMode(boolean isKeep);
//
// /** @return <code>true</code> if merge mode is chosen, and <code>false</code> otherwise */
// boolean isMergeMode();
//
// /**
// * Select merge mode.
// *
// * @param isMerge
// * <code>true</code> to select merge mode, <code>false</code> not to select
// */
// void setMergeMode(boolean isMerge);
/**IDEUI-166 No cursor in terminal

View File

@ -10,6 +10,7 @@
*******************************************************************************/
package org.eclipse.che.ide.ext.git.client.reset.commit;
import com.google.gwt.view.client.SelectionModel;
import org.eclipse.che.ide.ext.git.client.GitLocalizationConstant;
import org.eclipse.che.api.git.shared.Revision;
import org.eclipse.che.ide.ext.git.client.GitResources;
@ -22,10 +23,12 @@ import com.google.gwt.core.client.Scheduler;
import com.google.gwt.dom.client.Element;
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.ClickHandler;
import com.google.gwt.event.dom.client.ScrollEvent;
import com.google.gwt.i18n.client.DateTimeFormat;
import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
import com.google.gwt.uibinder.client.UiBinder;
import com.google.gwt.uibinder.client.UiField;
import com.google.gwt.uibinder.client.UiHandler;
import com.google.gwt.user.cellview.client.CellTable;
import com.google.gwt.user.cellview.client.Column;
import com.google.gwt.user.client.DOM;
@ -59,12 +62,10 @@ public class ResetToCommitViewImpl extends Window implements ResetToCommitView {
RadioButton mixed;
@UiField
RadioButton hard;
// @UiField
// RadioButton keep;
// @UiField
// RadioButton merge;
Button btnReset;
Button btnCancel;
@UiField
ScrollPanel revisionsPanel;
@UiField(provided = true)
CellTable<Revision> commits;
@UiField(provided = true)
@ -130,8 +131,6 @@ public class ResetToCommitViewImpl extends Window implements ResetToCommitView {
addDescription(soft, locale.resetSoftTypeDescription());
addDescription(mixed, locale.resetMixedTypeDescription());
addDescription(hard, locale.resetHardTypeDescription());
// addDescription(keep, locale.resetKeepTypeDescription());
// addDescription(merge, locale.resetMergeTypeDescription());
}
/**
@ -214,14 +213,17 @@ public class ResetToCommitViewImpl extends Window implements ResetToCommitView {
@Override
public void setRevisions(@NotNull List<Revision> revisions) {
// Wraps Array in java.util.List
List<Revision> list = new ArrayList<Revision>();
for (int i = 0; i < revisions.size(); i++) {
list.add(revisions.get(i));
}
List<Revision> list = new ArrayList<>();
list.addAll(revisions);
this.commits.setRowData(list);
}
@Override
public void resetRevisionSelection() {
((SingleSelectionModel) commits.getSelectionModel()).clear();
}
/** {@inheritDoc} */
@Override
public boolean isSoftMode() {
@ -258,30 +260,6 @@ public class ResetToCommitViewImpl extends Window implements ResetToCommitView {
hard.setValue(isHard);
}
// /** {@inheritDoc} */
// @Override
// public boolean isKeepMode() {
// return keep.getValue();
// }
//
// /** {@inheritDoc} */
// @Override
// public void setKeepMode(boolean isKeep) {
// keep.setValue(isKeep);
// }
//
// /** {@inheritDoc} */
// @Override
// public boolean isMergeMode() {
// return merge.getValue();
// }
//
// /** {@inheritDoc} */
// @Override
// public void setMergeMode(boolean isMerge) {
// merge.setValue(isMerge);
// }
/** {@inheritDoc} */
@Override
public void setEnableResetButton(final boolean enabled) {
@ -312,4 +290,15 @@ public class ResetToCommitViewImpl extends Window implements ResetToCommitView {
this.delegate = delegate;
}
@UiHandler("revisionsPanel")
public void onPanelScrolled(ScrollEvent ignored) {
// We cannot rely on exact equality of scroll positions because GWT sometimes round such values
// and it is possible that the actual max scroll position is a pixel less then declared.
if (revisionsPanel.getMaximumVerticalScrollPosition() - revisionsPanel.getVerticalScrollPosition() <= 1) {
// to avoid autoscrolling to selected item
revisionsPanel.getElement().focus();
delegate.onScrolledToBottom();
}
}
}

View File

@ -47,18 +47,10 @@
<g:RadioButton ui:field="hard" name="type" addStyleNames="{res.gitCSS.textFont}" text="{locale.resetHardTypeTitle}"
debugId="git-reset-hard"/>
</g:north>
<!--<g:north size="20">-->
<!--<g:RadioButton ui:field="keep" name="type" visible="false" addStyleNames="{res.gitCSS.textFont}"-->
<!--text="{locale.resetKeepTypeTitle}" debugId="git-reset-keep"/>-->
<!--</g:north>-->
<!--<g:north size="20">-->
<!--<g:RadioButton ui:field="merge" name="type" visible="false" addStyleNames="{res.gitCSS.textFont}"-->
<!--text="{locale.resetMergeTypeTitle}" debugId="git-reset-merge"/>-->
<!--</g:north>-->
</g:DockLayoutPanel>
</g:south>
<g:center>
<g:ScrollPanel addStyleNames="{style.commits}">
<g:ScrollPanel ui:field="revisionsPanel" addStyleNames="{style.commits}">
<p1:CellTable width="100%" ui:field="commits" focus="false"/>
</g:ScrollPanel>
</g:center>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-plugin-git-parent</artifactId>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-github-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-github-factory-resolver</artifactId>
<packaging>jar</packaging>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-github-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-github-ide</artifactId>
<packaging>jar</packaging>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-github-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-github-oauth2</artifactId>
<packaging>jar</packaging>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-github-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-github-provider-github</artifactId>
<name>Che Plugin :: Github :: Credential provider</name>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-github-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-github-pullrequest</artifactId>
<name>Che Plugin :: Github :: Pull request</name>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-github-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-github-server</artifactId>
<packaging>jar</packaging>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-github-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-github-shared</artifactId>
<name>Che Plugin :: Github :: Shared</name>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-plugin-github-parent</artifactId>

View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-gwt-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.15.0-SNAPSHOT</version>
<version>5.16.0-SNAPSHOT</version>
</parent>
<artifactId>che-plugin-gwt-ext-gwt</artifactId>
<packaging>jar</packaging>

Some files were not shown because too many files have changed in this diff Show More