Moving to 5.0.0-M8-SNAPSHOT

eclipse-che · Nov 23, 2016 · d5c2914 · d5c2914
1 parent 5ead14c
commit d5c2914
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 20 deletions.
diff --git a/plugins/plugin-pair-programming/che-plugin-flux-pair-programming/pom.xml b/plugins/plugin-pair-programming/che-plugin-flux-pair-programming/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <artifactId>che-plugin-pair-programming-parent</artifactId>
         <groupId>org.eclipse.che.plugin</groupId>
-        <version>4.7.0-RC2-SNAPSHOT</version>
+        <version>5.0.0-M8-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <groupId>org.eclipse.che.plugin</groupId>
@@ -40,10 +40,6 @@
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-ide-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>che-plugin-machine-ext-client</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.google.gwt</groupId>
             <artifactId>gwt-user</artifactId>

diff --git a/...programming/src/main/java/org/eclipse/che/ide/flux/liveedit/CheFluxLiveEditExtension.java b/...programming/src/main/java/org/eclipse/che/ide/flux/liveedit/CheFluxLiveEditExtension.java
@@ -31,10 +31,9 @@
 import org.eclipse.che.ide.api.editor.texteditor.TextEditor;
 import org.eclipse.che.ide.api.extension.Extension;
 import org.eclipse.che.ide.api.machine.MachineServiceClient;
+import org.eclipse.che.ide.api.macro.MacroProcessor;
 import org.eclipse.che.ide.api.notification.NotificationManager;
 import org.eclipse.che.ide.api.notification.StatusNotification;
-import org.eclipse.che.ide.extension.machine.client.command.CommandManager;
-import org.eclipse.che.ide.api.machine.CommandPropertyValueProviderRegistry;
 import org.eclipse.che.ide.api.workspace.WorkspaceReadyEvent;
 import org.eclipse.che.ide.rest.DtoUnmarshallerFactory;
 import org.eclipse.che.ide.socketio.Consumer;
@@ -82,10 +81,6 @@ public class CheFluxLiveEditExtension{
 
     private MessageBus                           messageBus;
 
-    private CommandManager                       commandManager;
-
-    private CommandPropertyValueProviderRegistry commandPropertyValueProviderRegistry;
-
     private EventBus                             eventBus;
 
     private AppContext                           appContext;
@@ -108,18 +103,20 @@ public class CheFluxLiveEditExtension{
     private String userId;
     private CursorModelForPairProgramming cursorModelForPairProgramming;
 
+	private MacroProcessor macroProcessor;
+
     @Inject
     public CheFluxLiveEditExtension(final MessageBusProvider messageBusProvider,
                                     final EventBus eventBus,
                                     final MachineServiceClient machineServiceClient,
                                     final DtoUnmarshallerFactory dtoUnmarshallerFactory,
                                     final AppContext appContext,
-                                    final CommandManager commandManager,
-                                    final CommandPropertyValueProviderRegistry commandPropertyValueProviderRegistry, EditorAgent editorAgent, NotificationManager notificationManager) {
+                                    final MacroProcessor macroProcessor,
+                                    final EditorAgent editorAgent,
+                                    final NotificationManager notificationManager) {
         this.dtoUnmarshallerFactory = dtoUnmarshallerFactory;
-        this.commandManager = commandManager;
+        this.macroProcessor = macroProcessor;
         this.messageBus = messageBusProvider.getMessageBus();
-        this.commandPropertyValueProviderRegistry = commandPropertyValueProviderRegistry;
         this.eventBus = eventBus;
         this.appContext = appContext;
         this.machineServiceClient = machineServiceClient;
@@ -197,9 +194,6 @@ private boolean connectIfFluxMicroservice(MachineProcessDto descriptor) {
         }
         if ("flux".equals(descriptor.getName())) {
             String urlToSubstitute = "http://${server.port.3000}";
-            if (commandPropertyValueProviderRegistry == null) {
-                return false;
-            }
             substituteAndConnect(urlToSubstitute);
             return true;
         }
@@ -209,7 +203,7 @@ private boolean connectIfFluxMicroservice(MachineProcessDto descriptor) {
     int trySubstitude = 10;
 
     public void substituteAndConnect(final String previewUrl) {
-            commandManager.substituteProperties(previewUrl).then(new Operation<String>() {
+            macroProcessor.expandMacros(previewUrl).then(new Operation<String>() {
                 @Override
                 public void apply(final String url) throws OperationException {
                     if (url.contains("$")){

diff --git a/plugins/plugin-pair-programming/pom.xml b/plugins/plugin-pair-programming/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <artifactId>che-plugin-parent</artifactId>
         <groupId>org.eclipse.che.plugin</groupId>
-        <version>4.7.0-RC2-SNAPSHOT</version>
+        <version>5.0.0-M8-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>che-plugin-pair-programming-parent</artifactId>