Merging master

Signed-off-by: Anatoliy Bazko <[email protected]>
eclipse-che · Oct 5, 2018 · cefc210 · cefc210
1 parent 33a72bd
commit cefc210
Show file tree

Hide file tree

Showing 112 changed files with 543 additions and 496 deletions.
diff --git a/agents/ls-java/pom.xml b/agents/ls-java/pom.xml
@@ -2,10 +2,11 @@
 <!--
 
     Copyright (c) 2012-2018 Red Hat, Inc.
-    All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
-    which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
+    This program and the accompanying materials are made
+    available under the terms of the Eclipse Public License 2.0
+    which is available at https://www.eclipse.org/legal/epl-2.0/
+
+    SPDX-License-Identifier: EPL-2.0
 
     Contributors:
       Red Hat, Inc. - initial API and implementation
@@ -16,7 +17,7 @@
     <parent>
         <artifactId>che-agents-parent</artifactId>
         <groupId>org.eclipse.che</groupId>
-        <version>6.9.0-SNAPSHOT</version>
+        <version>6.10.0-SNAPSHOT</version>
     </parent>
     <artifactId>ls-java-agent</artifactId>
     <name>Language Server Java Agent</name>

diff --git a/agents/ls-java/src/main/resources/installers/1.0.1/org.eclipse.che.ls.java.script.sh b/agents/ls-java/src/main/resources/installers/1.0.1/org.eclipse.che.ls.java.script.sh
@@ -1,9 +1,10 @@
 #
 # Copyright (c) 2012-2018 Red Hat, Inc.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #   Red Hat, Inc. - initial API and implementation

diff --git a/...-ide-app/src/main/java/org/eclipse/che/ide/project/node/ProjectClasspathChangedEvent.java b/...-ide-app/src/main/java/org/eclipse/che/ide/project/node/ProjectClasspathChangedEvent.java
@@ -1,9 +1,10 @@
 /*
  * Copyright (c) 2012-2018 Red Hat, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   Red Hat, Inc. - initial API and implementation

diff --git a/ide/che-core-ide-ui/src/main/java/org/eclipse/che/ide/ui/window/event/WindowOpenedEvent.java b/ide/che-core-ide-ui/src/main/java/org/eclipse/che/ide/ui/window/event/WindowOpenedEvent.java
@@ -1,9 +1,10 @@
 /*
  * Copyright (c) 2012-2018 Red Hat, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   Red Hat, Inc. - initial API and implementation

diff --git a/...orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/jso/MarkedOverlay.java b/...orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/jso/MarkedOverlay.java
@@ -1,9 +1,10 @@
 /*
  * Copyright (c) 2012-2018 Red Hat, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   Red Hat, Inc. - initial API and implementation

diff --git a/...itor/src/main/java/org/eclipse/che/ide/editor/orion/client/signature/SignatureWidget.java b/...itor/src/main/java/org/eclipse/che/ide/editor/orion/client/signature/SignatureWidget.java
@@ -1,9 +1,10 @@
 /*
  * Copyright (c) 2012-2018 Red Hat, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   Red Hat, Inc. - initial API and implementation

diff --git a/...er-server/src/test/java/org/eclipse/che/plugin/jdb/server/BreakpointsByConditionTest.java b/...er-server/src/test/java/org/eclipse/che/plugin/jdb/server/BreakpointsByConditionTest.java
@@ -1,9 +1,10 @@
 /*
  * Copyright (c) 2012-2018 Red Hat, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   Red Hat, Inc. - initial API and implementation

diff --git a/...java-debugger-server/src/test/java/org/eclipse/che/plugin/jdb/server/BreakpointsTest.java b/...java-debugger-server/src/test/java/org/eclipse/che/plugin/jdb/server/BreakpointsTest.java
@@ -56,9 +56,7 @@ public void tearDown() throws Exception {
 
   @Test
   public void shouldAddBreakpointInsideMethod() throws Exception {
-    Location location =
-        new LocationImpl(
-            "/test/src/org/eclipse/BreakpointsTest.java", 36, false, -1, "/test", null, -1);
+    Location location = new LocationImpl("/test/src/org/eclipse/BreakpointsTest.java", 36, "/test");
 
     try {
       debugger.addBreakpoint(new BreakpointImpl(location, false, null));
@@ -87,8 +85,7 @@ public void shouldAddBreakpointInsideMethod() throws Exception {
 
   @Test(priority = 1)
   public void shouldAddBreakpointByFqn() throws Exception {
-    Location location =
-        new LocationImpl("org.eclipse.BreakpointsTest", 21, false, -1, "/test", null, -1);
+    Location location = new LocationImpl("/test/src/org/eclipse/BreakpointsTest.java", 21, "/test");
 
     try {
       debugger.addBreakpoint(new BreakpointImpl(location, false, null));
@@ -128,10 +125,7 @@ public void shouldRemoveAllBreakpoints() throws Exception {
 
   @Test(priority = 3)
   public void shouldRemoveBreakpoint() throws Exception {
-    Location location =
-        new LocationImpl(
-            "/test/src/org/eclipse/BreakpointsTest.java", 36, false, -1, "/test", null, -1);
-
+    Location location = new LocationImpl("/test/src/org/eclipse/BreakpointsTest.java", 36, "/test");
     debugger.addBreakpoint(new BreakpointImpl(location, false, null));
     assertEquals(debugger.getAllBreakpoints().size(), 1);
 
@@ -141,9 +135,7 @@ public void shouldRemoveBreakpoint() throws Exception {
 
   @Test(priority = 4)
   public void shouldReturnAllBreakpoints() throws Exception {
-    Location location =
-        new LocationImpl(
-            "/test/src/org/eclipse/BreakpointsTest.java", 36, false, -1, "/test", null, -1);
+    Location location = new LocationImpl("/test/src/org/eclipse/BreakpointsTest.java", 36, "/test");
     debugger.addBreakpoint(new BreakpointImpl(location, false, null));
 
     List<Breakpoint> breakpoints = debugger.getAllBreakpoints();

diff --git a/...src/test/java/org/eclipse/che/plugin/jdb/server/util/JavaLanguageServerExtensionStub.java b/...src/test/java/org/eclipse/che/plugin/jdb/server/util/JavaLanguageServerExtensionStub.java
@@ -1,9 +1,10 @@
 /*
  * Copyright (c) 2012-2018 Red Hat, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   Red Hat, Inc. - initial API and implementation

diff --git a/...he-plugin-java-debugger-server/src/test/resources/testclasses/EvaluateExpressionTest.java b/...he-plugin-java-debugger-server/src/test/resources/testclasses/EvaluateExpressionTest.java
@@ -1,9 +1,10 @@
 /*
  * Copyright (c) 2012-2018 Red Hat, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   Red Hat, Inc. - initial API and implementation

diff --git a/...bugger/che-plugin-java-debugger-server/src/test/resources/testclasses/ThreadDumpTest.java b/...bugger/che-plugin-java-debugger-server/src/test/resources/testclasses/ThreadDumpTest.java
@@ -1,9 +1,10 @@
 /*
  * Copyright (c) 2012-2018 Red Hat, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   Red Hat, Inc. - initial API and implementation

diff --git a/...ava-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/MavenResources.java b/...ava-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/MavenResources.java
@@ -1,9 +1,10 @@
 /*
  * Copyright (c) 2012-2018 Red Hat, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   Red Hat, Inc. - initial API and implementation

diff --git a/...lient/src/main/java/org/eclipse/che/ide/ext/java/client/action/OpenDeclarationAction.java b/...lient/src/main/java/org/eclipse/che/ide/ext/java/client/action/OpenDeclarationAction.java
diff --git a/...rc/main/java/org/eclipse/che/ide/ext/java/client/diagnostics/PomDiagnosticsRequestor.java b/...rc/main/java/org/eclipse/che/ide/ext/java/client/diagnostics/PomDiagnosticsRequestor.java
@@ -1,9 +1,10 @@
 /*
  * Copyright (c) 2012-2018 Red Hat, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   Red Hat, Inc. - initial API and implementation

diff --git a/...main/java/org/eclipse/che/ide/ext/java/client/inject/JavaLanguageDescriptionProvider.java b/...main/java/org/eclipse/che/ide/ext/java/client/inject/JavaLanguageDescriptionProvider.java
@@ -1,9 +1,10 @@
 /*
  * Copyright (c) 2012-2018 Red Hat, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   Red Hat, Inc. - initial API and implementation

diff --git a/...main/java/org/eclipse/che/ide/ext/java/client/inject/factories/ProgressWidgetFactory.java b/...main/java/org/eclipse/che/ide/ext/java/client/inject/factories/ProgressWidgetFactory.java
@@ -1,9 +1,10 @@
 /*
  * Copyright (c) 2012-2018 Red Hat, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   Red Hat, Inc. - initial API and implementation

diff --git a/...ava/org/eclipse/che/ide/ext/java/client/navigation/filestructure/FileStructureWindow.java b/...ava/org/eclipse/che/ide/ext/java/client/navigation/filestructure/FileStructureWindow.java
@@ -1,9 +1,10 @@
 /*
  * Copyright (c) 2012-2018 Red Hat, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   Red Hat, Inc. - initial API and implementation

diff --git a/...a/org/eclipse/che/ide/ext/java/client/navigation/filestructure/FileStructureWindow.ui.xml b/...a/org/eclipse/che/ide/ext/java/client/navigation/filestructure/FileStructureWindow.ui.xml
@@ -1,10 +1,11 @@
 <!--
 
     Copyright (c) 2012-2018 Red Hat, Inc.
-    All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
-    which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
+    This program and the accompanying materials are made
+    available under the terms of the Eclipse Public License 2.0
+    which is available at https://www.eclipse.org/legal/epl-2.0/
+
+    SPDX-License-Identifier: EPL-2.0
 
     Contributors:
       Red Hat, Inc. - initial API and implementation

diff --git a/...src/main/java/org/eclipse/che/ide/ext/java/client/progressor/ProgressMessagesHandler.java b/...src/main/java/org/eclipse/che/ide/ext/java/client/progressor/ProgressMessagesHandler.java
@@ -1,9 +1,10 @@
 /*
  * Copyright (c) 2012-2018 Red Hat, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   Red Hat, Inc. - initial API and implementation

diff --git a/...rc/main/java/org/eclipse/che/ide/ext/java/client/progressor/ProgressMonitorPresenter.java b/...rc/main/java/org/eclipse/che/ide/ext/java/client/progressor/ProgressMonitorPresenter.java
@@ -1,9 +1,10 @@
 /*
  * Copyright (c) 2012-2018 Red Hat, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   Red Hat, Inc. - initial API and implementation

diff --git a/...ent/src/main/java/org/eclipse/che/ide/ext/java/client/progressor/ProgressMonitorView.java b/...ent/src/main/java/org/eclipse/che/ide/ext/java/client/progressor/ProgressMonitorView.java
@@ -1,9 +1,10 @@
 /*
  * Copyright (c) 2012-2018 Red Hat, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   Red Hat, Inc. - initial API and implementation