CHE-1964: add libraries from containers for building classpath

plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/command/ClasspathContainer.java

@@ -31,6 +31,8 @@
  */
 @Singleton
 public class ClasspathContainer implements ClasspathChangedEvent.ClasspathChangedHandler {
+    public static String JRE_CONTAINER = "org.eclipse.jdt.launching.JRE_CONTAINER";
+
     private final ClasspathServiceClient classpathServiceClient;
 
     private Map<String, Promise<List<ClasspathEntryDto>>> classpathes;

plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/command/valueproviders/ClasspathProvider.java

@@ -30,6 +30,9 @@
 import java.util.List;
 import java.util.Set;
 
+import static org.eclipse.che.ide.ext.java.client.command.ClasspathContainer.JRE_CONTAINER;
+import static org.eclipse.che.ide.ext.java.shared.ClasspathEntryKind.LIBRARY;
+
 /**
  * Provides project's classpath.
  *
@@ -88,6 +91,12 @@ public String apply(List<ClasspathEntryDto> arg) throws FunctionException {
                     classpath.append(lib).append(':');
                 }
 
+                for (ClasspathEntryDto container : classpathResolver.getContainers()) {
+                    if (!JRE_CONTAINER.equals(container.getPath())) {
+                        addLibsFromContainer(container, classpath);
+                    }
+                }
+
                 if (classpath.toString().isEmpty()) {
                     classpath.append(appContext.getProjectsRoot().toString()).append(projectPath).append(':');
                 }
@@ -97,4 +106,12 @@ public String apply(List<ClasspathEntryDto> arg) throws FunctionException {
         });
     }
 
+    private void addLibsFromContainer(ClasspathEntryDto container, StringBuilder classpath) {
+        for (ClasspathEntryDto entry : container.getExpandedEntries()) {
+            if (LIBRARY == entry.getEntryKind()) {
+                classpath.append(entry.getPath()).append(':');
+            }
+        }
+    }
+
 }

plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/refactoring/preview/PreviewViewImpl.java

@@ -227,6 +227,8 @@ public void onClick(ClickEvent event) {
 
         root.setWidget(element);
 
+        element.getElement().getParentElement().getStyle().setMargin(1, PX);
+
         itemCheckBox.addValueChangeHandler(new ValueChangeHandler<Boolean>() {
             @Override
             public void onValueChange(ValueChangeEvent<Boolean> event) {

plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/command/valueproviders/ClasspathProviderTest.java

@@ -39,9 +39,12 @@
 import java.util.Map;
 import java.util.Set;
 
+import static java.util.Arrays.asList;
 import static java.util.Collections.singletonList;
+import static org.eclipse.che.ide.ext.java.shared.ClasspathEntryKind.LIBRARY;
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -117,6 +120,43 @@ public void classpathShouldBeBuiltWith2Libraries() throws Exception {
         assertEquals("lib2.jar:lib1.jar:", classpath);
     }
 
+    @Test
+    public void classpathShouldBeBuiltWith2ExternalLibrariesAnd2LibrariesFromContainer() throws Exception {
+        String lib1 = "lib1.jar";
+        String lib2 = "lib2.jar";
+
+        List<ClasspathEntryDto> entries = new ArrayList<>();
+
+        Set<String> libs = new HashSet<>();
+        libs.add(lib1);
+        libs.add(lib2);
+
+        ClasspathEntryDto container = mock(ClasspathEntryDto.class);
+        ClasspathEntryDto cLib1 = mock(ClasspathEntryDto.class);
+        ClasspathEntryDto cLib2 = mock(ClasspathEntryDto.class);
+        when(container.getPath()).thenReturn("containerPath");
+        when(container.getExpandedEntries()).thenReturn(asList(cLib1, cLib2));
+        when(cLib1.getPath()).thenReturn("cLib1.jar");
+        when(cLib1.getEntryKind()).thenReturn(LIBRARY);
+        when(cLib2.getPath()).thenReturn("cLib2.jar");
+        when(cLib2.getEntryKind()).thenReturn(LIBRARY);
+
+        Set<ClasspathEntryDto> containers = new HashSet<>();
+        containers.add(container);
+
+        when(classpathContainer.getClasspathEntries(anyString())).thenReturn(classpathEntriesPromise);
+        when(classpathResolver.getLibs()).thenReturn(libs);
+        when(classpathResolver.getContainers()).thenReturn(containers);
+
+        classpathProvider.getValue();
+
+        verify(classpathEntriesPromise).then(classpathEntriesCapture.capture());
+        String classpath = classpathEntriesCapture.getValue().apply(entries);
+
+        verify(classpathResolver).resolveClasspathEntries(entries);
+        assertEquals("lib2.jar:lib1.jar:cLib1.jar:cLib2.jar:", classpath);
+    }
+
     @Test
     public void defaultValueOfClasspathShouldBeBuilt() throws Exception {
         List<ClasspathEntryDto> entries = new ArrayList<>();

plugins/plugin-ssh-key/che-plugin-ssh-key-ide/pom.xml

@@ -28,10 +28,6 @@
         <maven.compiler.target>1.7</maven.compiler.target>
     </properties>
     <dependencies>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.google.gwt.inject</groupId>
             <artifactId>gin</artifactId>