diff --git a/assembly/assembly-ide-war/pom.xml b/assembly/assembly-ide-war/pom.xml index f0493b002f6..2476d68fd9b 100644 --- a/assembly/assembly-ide-war/pom.xml +++ b/assembly/assembly-ide-war/pom.xml @@ -139,14 +139,6 @@ org.eclipse.che.plugin che-plugin-ext-dashboard-client - - org.eclipse.che.plugin - che-plugin-factory-ide - - - org.eclipse.che.plugin - che-plugin-factory-shared - org.eclipse.che.plugin che-plugin-gdb-ide diff --git a/ide/che-core-ide-app/pom.xml b/ide/che-core-ide-app/pom.xml index e47c499dd9d..f27e41f8221 100644 --- a/ide/che-core-ide-app/pom.xml +++ b/ide/che-core-ide-app/pom.xml @@ -69,6 +69,10 @@ org.eclipse.che.core che-core-api-factory-shared + + org.eclipse.che.core + che-core-api-git-shared + org.eclipse.che.core che-core-api-machine-shared diff --git a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/CoreLocalizationConstant.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/CoreLocalizationConstant.java index 7ede481944c..b1b14443478 100644 --- a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/CoreLocalizationConstant.java +++ b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/CoreLocalizationConstant.java @@ -943,4 +943,109 @@ public interface CoreLocalizationConstant extends Messages { @Key("authentication.dialog.rejected.by.user") String authenticationDialogRejectedByUser(); + + /* Factories */ + @Key("projects.import.configuring.cloning") + String cloningSource(); + + @Key("create.factory.action.title") + String createFactoryActionTitle(); + + @Key("create.factory.already.exist") + String createFactoryAlreadyExist(); + + @Key("create.factory.unable.create.from.current.workspace") + String createFactoryFromCurrentWorkspaceFailed(); + + @Key("create.factory.form.title") + String createFactoryTitle(); + + @Key("create.factory.label.name") + String createFactoryName(); + + @Key("create.factory.label.link") + String createFactoryLink(); + + @Key("create.factory.button.create") + String createFactoryButton(); + + @Key("create.factory.button.close") + String createFactoryButtonClose(); + + @Key("create.factory.configure.button.tooltip") + String createFactoryConfigureTooltip(); + + @Key("create.factory.launch.button.tooltip") + String createFactoryLaunchTooltip(); + + + @Key("import.config.view.name") + String importFromConfigurationName(); + + @Key("import.config.view.description") + String importFromConfigurationDescription(); + + @Key("project.import.configured.cloned") + String clonedSource(String projectName); + + @Key("import.config.form.button.import") + String importButton(); + + @Key("import.config.view.title") + String importFromConfigurationTitle(); + + @Key("import.config.form.prompt") + String configFileTitle(); + + @Key("project.already.imported") + String projectAlreadyImported(String projectName); + + @Key("project.import.cloned.with.checkout") + String clonedSourceWithCheckout(String projectName, String repoName, String ref, String branch); + + @Key("project.import.cloned.with.checkout.start.point") + String clonedWithCheckoutOnStartPoint(String projectName, String repoName, String startPoint, String branch); + + @Key("project.import.configuring.cloning") + String cloningSource(String projectName); + + @Key("project.import.ssh.key.upload.failed.title") + String cloningSourceSshKeyUploadFailedTitle(); + + @Key("project.import.ssh.key.upload.failed.text") + String cloningSourcesSshKeyUploadFailedText(); + + @Key("message.ssh.key.not.found.text") + String acceptSshNotFoundText(); + + @Key("project.import.cloning.failed.without.start.point") + String cloningSourceWithCheckoutFailed(String branch, String repoName); + + @Key("project.import.cloning.failed.with.start.point") + String cloningSourceCheckoutFailed(String project, String branch); + + @Key("project.import.cloning.failed.title") + String cloningSourceFailedTitle(String projectName); + + @Key("project.import.configuring.failed") + String configuringSourceFailed(String projectName); + + @Key("welcome.preferences.title") + String welcomePreferencesTitle(); + + @Key("export.config.view.name") + String exportConfigName(); + + @Key("export.config.view.description") + String exportConfigDescription(); + + @Key("export.config.error.message") + String exportConfigErrorMessage(); + + @Key("export.config.dialog.not.under.vcs.title") + String exportConfigDialogNotUnderVcsTitle(); + + @Key("export.config.dialog.not.under.vcs.text") + String exportConfigDialogNotUnderVcsText(); + } diff --git a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/core/CoreGinModule.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/core/CoreGinModule.java index 0bbc8d47587..f2b004f8e62 100644 --- a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/core/CoreGinModule.java +++ b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/core/CoreGinModule.java @@ -48,7 +48,7 @@ import org.eclipse.che.ide.debug.DebugApiModule; import org.eclipse.che.ide.editor.EditorApiModule; import org.eclipse.che.ide.editor.preferences.EditorPreferencesModule; -import org.eclipse.che.ide.factory.FactoryApiModule; +import org.eclipse.che.ide.factory.inject.FactoryGinModule; import org.eclipse.che.ide.filetypes.FileTypeApiModule; import org.eclipse.che.ide.keybinding.KeyBindingManager; import org.eclipse.che.ide.machine.MachineApiModule; @@ -110,7 +110,7 @@ protected void configure() { install(new ProjectApiModule()); install(new ProjectImportModule()); install(new OAuthApiModule()); - install(new FactoryApiModule()); + install(new FactoryGinModule()); // configure miscellaneous core components bind(StandardComponentInitializer.class).in(Singleton.class); diff --git a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/FactoryApiModule.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/FactoryApiModule.java deleted file mode 100644 index fdb9b74ca3a..00000000000 --- a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/FactoryApiModule.java +++ /dev/null @@ -1,29 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2012-2017 Codenvy, S.A. - * 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 - * - * Contributors: - * Codenvy, S.A. - initial API and implementation - *******************************************************************************/ -package org.eclipse.che.ide.factory; - -import com.google.gwt.inject.client.AbstractGinModule; -import com.google.inject.Singleton; - -import org.eclipse.che.ide.api.factory.FactoryServiceClient; - -/** - * GIN module for configuring Factory API components. - * - * @author Artem Zatsarynnyi - */ -public class FactoryApiModule extends AbstractGinModule { - - @Override - protected void configure() { - bind(FactoryServiceClient.class).to(FactoryServiceClientImpl.class).in(Singleton.class); - } -} diff --git a/plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/FactoryExtension.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/FactoryExtension.java similarity index 91% rename from plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/FactoryExtension.java rename to ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/FactoryExtension.java index 170cf516e35..8b7c8875820 100644 --- a/plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/FactoryExtension.java +++ b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/FactoryExtension.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.plugin.factory.ide; +package org.eclipse.che.ide.factory; import com.google.gwt.core.client.Callback; import com.google.gwt.core.client.ScriptInjector; @@ -18,10 +18,10 @@ import org.eclipse.che.ide.api.action.ActionManager; import org.eclipse.che.ide.api.action.DefaultActionGroup; import org.eclipse.che.ide.api.extension.Extension; -import org.eclipse.che.plugin.factory.ide.accept.AcceptFactoryHandler; -import org.eclipse.che.plugin.factory.ide.action.CreateFactoryAction; -import org.eclipse.che.plugin.factory.ide.json.ImportFromConfigAction; -import org.eclipse.che.plugin.factory.ide.welcome.OpenWelcomePageAction; +import org.eclipse.che.ide.factory.accept.AcceptFactoryHandler; +import org.eclipse.che.ide.factory.action.CreateFactoryAction; +import org.eclipse.che.ide.factory.json.ImportFromConfigAction; +import org.eclipse.che.ide.factory.welcome.OpenWelcomePageAction; import static com.google.gwt.core.client.ScriptInjector.TOP_WINDOW; import static org.eclipse.che.ide.api.action.IdeActions.GROUP_PROJECT; diff --git a/plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/FactoryResources.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/FactoryResources.java similarity index 88% rename from plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/FactoryResources.java rename to ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/FactoryResources.java index 22049d24272..80e31cab802 100644 --- a/plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/FactoryResources.java +++ b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/FactoryResources.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.plugin.factory.ide; +package org.eclipse.che.ide.factory; import com.google.gwt.resources.client.ClientBundle; import com.google.gwt.resources.client.CssResource; @@ -40,15 +40,15 @@ interface Style extends CssResource { @Source({"Factory.css", "org/eclipse/che/ide/api/ui/style.css", "org/eclipse/che/ide/ui/Styles.css"}) FactoryCSS factoryCSS(); - @Source("svg/export-config.svg") + @Source("export-config.svg") SVGResource exportConfig(); - @Source("svg/import-config.svg") + @Source("import-config.svg") SVGResource importConfig(); - @Source("svg/execute.svg") + @Source("execute.svg") SVGResource execute(); - @Source("svg/cog-icon.svg") + @Source("cog-icon.svg") SVGResource configure(); } diff --git a/plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/accept/AcceptFactoryHandler.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/accept/AcceptFactoryHandler.java similarity index 85% rename from plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/accept/AcceptFactoryHandler.java rename to ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/accept/AcceptFactoryHandler.java index a576bc4c358..b1d015acc0a 100644 --- a/plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/accept/AcceptFactoryHandler.java +++ b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/accept/AcceptFactoryHandler.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.plugin.factory.ide.accept; +package org.eclipse.che.ide.factory.accept; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.inject.Singleton; @@ -17,6 +17,7 @@ import org.eclipse.che.api.factory.shared.dto.FactoryDto; import org.eclipse.che.api.factory.shared.dto.IdeActionDto; import org.eclipse.che.api.factory.shared.dto.IdeDto; +import org.eclipse.che.ide.CoreLocalizationConstant; import org.eclipse.che.ide.api.action.ActionManager; import org.eclipse.che.ide.api.app.AppContext; import org.eclipse.che.ide.api.factory.FactoryAcceptedEvent; @@ -24,8 +25,7 @@ import org.eclipse.che.ide.api.machine.events.WsAgentStateHandler; import org.eclipse.che.ide.api.notification.NotificationManager; import org.eclipse.che.ide.api.notification.StatusNotification; -import org.eclipse.che.plugin.factory.ide.FactoryLocalizationConstant; -import org.eclipse.che.plugin.factory.ide.utils.FactoryProjectImporter; +import org.eclipse.che.ide.factory.utils.FactoryProjectImporter; import javax.inject.Inject; @@ -37,25 +37,25 @@ */ @Singleton public class AcceptFactoryHandler { - private final FactoryLocalizationConstant factoryLocalization; - private final FactoryProjectImporter factoryProjectImporter; - private final EventBus eventBus; - private final AppContext appContext; - private final ActionManager actionManager; - private final NotificationManager notificationManager; + private final CoreLocalizationConstant localizationConstant; + private final FactoryProjectImporter factoryProjectImporter; + private final EventBus eventBus; + private final AppContext appContext; + private final ActionManager actionManager; + private final NotificationManager notificationManager; private StatusNotification notification; private boolean isImportingStarted; @Inject - public AcceptFactoryHandler(FactoryLocalizationConstant factoryLocalization, + public AcceptFactoryHandler(CoreLocalizationConstant localizationConstant, FactoryProjectImporter factoryProjectImporter, EventBus eventBus, AppContext appContext, ActionManager actionManager, NotificationManager notificationManager) { this.factoryProjectImporter = factoryProjectImporter; - this.factoryLocalization = factoryLocalization; + this.localizationConstant = localizationConstant; this.eventBus = eventBus; this.appContext = appContext; this.actionManager = actionManager; @@ -80,7 +80,7 @@ public void onWsAgentStarted(final WsAgentStateEvent event) { isImportingStarted = true; notification = notificationManager - .notify(factoryLocalization.cloningSource(), StatusNotification.Status.PROGRESS, NOT_EMERGE_MODE); + .notify(localizationConstant.cloningSource(), StatusNotification.Status.PROGRESS, NOT_EMERGE_MODE); performOnAppLoadedActions(factory); startImporting(factory); } @@ -98,7 +98,7 @@ private void startImporting(final FactoryDto factory) { @Override public void onSuccess(Void result) { notification.setStatus(StatusNotification.Status.SUCCESS); - notification.setContent(factoryLocalization.cloningSource()); + notification.setContent(localizationConstant.cloningSource()); performOnProjectsLoadedActions(factory); } diff --git a/plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/action/CreateFactoryAction.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/action/CreateFactoryAction.java similarity index 80% rename from plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/action/CreateFactoryAction.java rename to ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/action/CreateFactoryAction.java index 891b7ca3102..0694ede6a2b 100644 --- a/plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/action/CreateFactoryAction.java +++ b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/action/CreateFactoryAction.java @@ -8,15 +8,15 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.plugin.factory.ide.action; +package org.eclipse.che.ide.factory.action; import com.google.inject.Inject; import com.google.inject.Singleton; +import org.eclipse.che.ide.CoreLocalizationConstant; import org.eclipse.che.ide.api.action.AbstractPerspectiveAction; import org.eclipse.che.ide.api.action.ActionEvent; -import org.eclipse.che.plugin.factory.ide.FactoryLocalizationConstant; -import org.eclipse.che.plugin.factory.ide.configure.CreateFactoryPresenter; +import org.eclipse.che.ide.factory.configure.CreateFactoryPresenter; import javax.validation.constraints.NotNull; import java.util.Collections; @@ -31,8 +31,8 @@ public class CreateFactoryAction extends AbstractPerspectiveAction { @Inject public CreateFactoryAction(CreateFactoryPresenter presenter, - FactoryLocalizationConstant locale) { - super(Collections.singletonList("Project Perspective"), locale.createFactoryActionTitle(), null, null, null); + CoreLocalizationConstant localizationConstant) { + super(Collections.singletonList("Project Perspective"), localizationConstant.createFactoryActionTitle(), null, null, null); this.presenter = presenter; } diff --git a/plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/configure/CreateFactoryPresenter.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/configure/CreateFactoryPresenter.java similarity index 85% rename from plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/configure/CreateFactoryPresenter.java rename to ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/configure/CreateFactoryPresenter.java index dbbb979683b..221833780d2 100644 --- a/plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/configure/CreateFactoryPresenter.java +++ b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/configure/CreateFactoryPresenter.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.plugin.factory.ide.configure; +package org.eclipse.che.ide.factory.configure; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -18,10 +18,10 @@ import org.eclipse.che.api.promises.client.Operation; import org.eclipse.che.api.promises.client.OperationException; import org.eclipse.che.api.promises.client.PromiseError; +import org.eclipse.che.ide.CoreLocalizationConstant; import org.eclipse.che.ide.api.app.AppContext; import org.eclipse.che.ide.api.factory.FactoryServiceClient; import org.eclipse.che.ide.util.Pair; -import org.eclipse.che.plugin.factory.ide.FactoryLocalizationConstant; import java.util.Collections; import java.util.List; @@ -33,20 +33,20 @@ public class CreateFactoryPresenter implements CreateFactoryView.ActionDelegate { public static final String CONFIGURE_LINK = "/dashboard/#/factory/"; - private final CreateFactoryView view; - private final AppContext appContext; - private final FactoryServiceClient factoryService; - private final FactoryLocalizationConstant locale; + private final CreateFactoryView view; + private final AppContext appContext; + private final FactoryServiceClient factoryService; + private final CoreLocalizationConstant localizationConstant; @Inject public CreateFactoryPresenter(CreateFactoryView view, AppContext appContext, FactoryServiceClient factoryService, - FactoryLocalizationConstant locale) { + CoreLocalizationConstant localizationConstant) { this.view = view; this.appContext = appContext; this.factoryService = factoryService; - this.locale = locale; + this.localizationConstant = localizationConstant; view.setDelegate(this); } @@ -84,7 +84,7 @@ private Operation> saveFactory(final FactoryDto factory, final @Override public void apply(List factories) throws OperationException { if (!factories.isEmpty()) { - view.showFactoryNameError(locale.createFactoryAlreadyExist(), null); + view.showFactoryNameError(localizationConstant.createFactoryAlreadyExist(), null); } else { factoryService.saveFactory(factory.withName(factoryName)) .then(new Operation() { @@ -104,7 +104,7 @@ public void apply(FactoryDto factory) throws OperationException { } private Operation logError() { - return err -> view.showFactoryNameError(locale.createFactoryFromCurrentWorkspaceFailed(), err.getMessage()); + return err -> view.showFactoryNameError(localizationConstant.createFactoryFromCurrentWorkspaceFailed(), err.getMessage()); } private boolean isValidFactoryName(String name) { diff --git a/plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/configure/CreateFactoryView.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/configure/CreateFactoryView.java similarity index 97% rename from plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/configure/CreateFactoryView.java rename to ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/configure/CreateFactoryView.java index 679451d4c70..ab3168e9eb4 100644 --- a/plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/configure/CreateFactoryView.java +++ b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/configure/CreateFactoryView.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.plugin.factory.ide.configure; +package org.eclipse.che.ide.factory.configure; import com.google.inject.ImplementedBy; diff --git a/plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/configure/CreateFactoryViewImpl.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/configure/CreateFactoryViewImpl.java similarity index 96% rename from plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/configure/CreateFactoryViewImpl.java rename to ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/configure/CreateFactoryViewImpl.java index 43a485a7e35..09ca6192342 100644 --- a/plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/configure/CreateFactoryViewImpl.java +++ b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/configure/CreateFactoryViewImpl.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.plugin.factory.ide.configure; +package org.eclipse.che.ide.factory.configure; import com.google.common.base.Strings; import com.google.gwt.event.dom.client.KeyCodes; @@ -27,12 +27,12 @@ import com.google.inject.Singleton; import org.eclipse.che.commons.annotation.Nullable; +import org.eclipse.che.ide.CoreLocalizationConstant; +import org.eclipse.che.ide.factory.FactoryResources; import org.eclipse.che.ide.ui.Tooltip; import org.eclipse.che.ide.ui.menu.PositionController; import org.eclipse.che.ide.ui.window.Window; import org.eclipse.che.ide.ui.zeroclipboard.ClipboardButtonBuilder; -import org.eclipse.che.plugin.factory.ide.FactoryLocalizationConstant; -import org.eclipse.che.plugin.factory.ide.FactoryResources; import javax.validation.constraints.NotNull; @@ -82,7 +82,7 @@ interface FactoryViewImplUiBinder extends UiBinder - - - + + + @eval tabBorderColor org.eclipse.che.ide.api.theme.Style.theme.tabBorderColor(); .border { diff --git a/plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/inject/FactoryGinModule.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/inject/FactoryGinModule.java similarity index 64% rename from plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/inject/FactoryGinModule.java rename to ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/inject/FactoryGinModule.java index bc942c5f93b..df627ec8326 100644 --- a/plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/inject/FactoryGinModule.java +++ b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/inject/FactoryGinModule.java @@ -8,27 +8,27 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.plugin.factory.ide.inject; +package org.eclipse.che.ide.factory.inject; import com.google.gwt.inject.client.AbstractGinModule; import com.google.gwt.inject.client.multibindings.GinMultibinder; -import org.eclipse.che.ide.api.extension.ExtensionGinModule; +import org.eclipse.che.ide.api.factory.FactoryServiceClient; import org.eclipse.che.ide.api.preferences.PreferencePagePresenter; -import org.eclipse.che.plugin.factory.ide.json.ImportFromConfigView; -import org.eclipse.che.plugin.factory.ide.json.ImportFromConfigViewImpl; -import org.eclipse.che.plugin.factory.ide.welcome.GreetingPartView; -import org.eclipse.che.plugin.factory.ide.welcome.GreetingPartViewImpl; -import org.eclipse.che.plugin.factory.ide.welcome.preferences.ShowWelcomePreferencePagePresenter; -import org.eclipse.che.plugin.factory.ide.welcome.preferences.ShowWelcomePreferencePageView; -import org.eclipse.che.plugin.factory.ide.welcome.preferences.ShowWelcomePreferencePageViewImpl; +import org.eclipse.che.ide.factory.FactoryServiceClientImpl; +import org.eclipse.che.ide.factory.json.ImportFromConfigView; +import org.eclipse.che.ide.factory.json.ImportFromConfigViewImpl; +import org.eclipse.che.ide.factory.welcome.GreetingPartView; +import org.eclipse.che.ide.factory.welcome.GreetingPartViewImpl; +import org.eclipse.che.ide.factory.welcome.preferences.ShowWelcomePreferencePagePresenter; +import org.eclipse.che.ide.factory.welcome.preferences.ShowWelcomePreferencePageView; +import org.eclipse.che.ide.factory.welcome.preferences.ShowWelcomePreferencePageViewImpl; import javax.inject.Singleton; /** * @author Vladyslav Zhukovskii */ -@ExtensionGinModule public class FactoryGinModule extends AbstractGinModule { @Override @@ -36,6 +36,7 @@ protected void configure() { bind(GreetingPartView.class).to(GreetingPartViewImpl.class).in(Singleton.class); bind(ImportFromConfigView.class).to(ImportFromConfigViewImpl.class).in(Singleton.class); bind(ShowWelcomePreferencePageView.class).to(ShowWelcomePreferencePageViewImpl.class).in(Singleton.class); + bind(FactoryServiceClient.class).to(FactoryServiceClientImpl.class).in(Singleton.class); final GinMultibinder prefBinder = GinMultibinder.newSetBinder(binder(), PreferencePagePresenter.class); prefBinder.addBinding().to(ShowWelcomePreferencePagePresenter.class); diff --git a/plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/json/ImportFromConfigAction.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/json/ImportFromConfigAction.java similarity index 84% rename from plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/json/ImportFromConfigAction.java rename to ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/json/ImportFromConfigAction.java index d3a2b500331..2e8af1d3903 100644 --- a/plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/json/ImportFromConfigAction.java +++ b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/json/ImportFromConfigAction.java @@ -8,15 +8,15 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.plugin.factory.ide.json; +package org.eclipse.che.ide.factory.json; import com.google.inject.Inject; import com.google.inject.Singleton; +import org.eclipse.che.ide.CoreLocalizationConstant; import org.eclipse.che.ide.api.action.Action; import org.eclipse.che.ide.api.action.ActionEvent; -import org.eclipse.che.plugin.factory.ide.FactoryLocalizationConstant; -import org.eclipse.che.plugin.factory.ide.FactoryResources; +import org.eclipse.che.ide.factory.FactoryResources; /** * @author Sergii Leschenko @@ -28,7 +28,7 @@ public class ImportFromConfigAction extends Action { @Inject public ImportFromConfigAction(final ImportFromConfigPresenter presenter, - FactoryLocalizationConstant locale, + CoreLocalizationConstant locale, FactoryResources resources) { super(locale.importFromConfigurationName(), locale.importFromConfigurationDescription(), null, resources.importConfig()); this.presenter = presenter; diff --git a/plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/json/ImportFromConfigPresenter.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/json/ImportFromConfigPresenter.java similarity index 77% rename from plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/json/ImportFromConfigPresenter.java rename to ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/json/ImportFromConfigPresenter.java index 09e9b14aeda..b99b5173926 100644 --- a/plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/json/ImportFromConfigPresenter.java +++ b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/json/ImportFromConfigPresenter.java @@ -8,18 +8,18 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.plugin.factory.ide.json; +package org.eclipse.che.ide.factory.json; import com.google.gwt.json.client.JSONException; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.inject.Inject; import org.eclipse.che.api.factory.shared.dto.FactoryDto; +import org.eclipse.che.ide.CoreLocalizationConstant; import org.eclipse.che.ide.api.notification.NotificationManager; import org.eclipse.che.ide.api.notification.StatusNotification; import org.eclipse.che.ide.dto.DtoFactory; -import org.eclipse.che.plugin.factory.ide.FactoryLocalizationConstant; -import org.eclipse.che.plugin.factory.ide.utils.FactoryProjectImporter; +import org.eclipse.che.ide.factory.utils.FactoryProjectImporter; import static org.eclipse.che.ide.api.notification.StatusNotification.DisplayMode.NOT_EMERGE_MODE; @@ -29,22 +29,22 @@ * @author Sergii Leschenko */ public class ImportFromConfigPresenter implements ImportFromConfigView.ActionDelegate { - private final FactoryLocalizationConstant factoryLocalization; - private final ImportFromConfigView view; - private final NotificationManager notificationManager; - private final DtoFactory dtoFactory; - private final FactoryProjectImporter projectImporter; - private final AsyncCallback importerCallback; + private final CoreLocalizationConstant localizationConstant; + private final ImportFromConfigView view; + private final NotificationManager notificationManager; + private final DtoFactory dtoFactory; + private final FactoryProjectImporter projectImporter; + private final AsyncCallback importerCallback; private StatusNotification notification; @Inject - public ImportFromConfigPresenter(final FactoryLocalizationConstant factoryLocalization, + public ImportFromConfigPresenter(final CoreLocalizationConstant localizationConstant, FactoryProjectImporter projectImporter, ImportFromConfigView view, NotificationManager notificationManager, DtoFactory dtoFactory) { - this.factoryLocalization = factoryLocalization; + this.localizationConstant = localizationConstant; this.notificationManager = notificationManager; this.view = view; this.dtoFactory = dtoFactory; @@ -54,7 +54,7 @@ public ImportFromConfigPresenter(final FactoryLocalizationConstant factoryLocali importerCallback = new AsyncCallback() { @Override public void onSuccess(Void result) { - notification.setContent(factoryLocalization.clonedSource(null)); + notification.setContent(localizationConstant.clonedSource(null)); notification.setStatus(StatusNotification.Status.SUCCESS); } @@ -91,7 +91,7 @@ public void onImportClicked() { return; } - notification = notificationManager.notify(factoryLocalization.cloningSource(), null, StatusNotification.Status.PROGRESS, NOT_EMERGE_MODE); + notification = notificationManager.notify(localizationConstant.cloningSource(), null, StatusNotification.Status.PROGRESS, NOT_EMERGE_MODE); projectImporter.startImporting(factoryJson, importerCallback); } diff --git a/plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/json/ImportFromConfigView.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/json/ImportFromConfigView.java similarity index 96% rename from plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/json/ImportFromConfigView.java rename to ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/json/ImportFromConfigView.java index fb2dd797218..ce99ca956b6 100644 --- a/plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/json/ImportFromConfigView.java +++ b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/json/ImportFromConfigView.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.plugin.factory.ide.json; +package org.eclipse.che.ide.factory.json; import com.google.gwt.user.client.ui.IsWidget; diff --git a/plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/json/ImportFromConfigViewImpl.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/json/ImportFromConfigViewImpl.java similarity index 82% rename from plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/json/ImportFromConfigViewImpl.java rename to ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/json/ImportFromConfigViewImpl.java index 766e76fb344..aea7ba3a4e2 100644 --- a/plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/json/ImportFromConfigViewImpl.java +++ b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/json/ImportFromConfigViewImpl.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.plugin.factory.ide.json; +package org.eclipse.che.ide.factory.json; import com.google.gwt.dom.client.Element; @@ -21,8 +21,8 @@ import com.google.gwt.user.client.ui.Widget; import com.google.inject.Inject; +import org.eclipse.che.ide.CoreLocalizationConstant; import org.eclipse.che.ide.ui.window.Window; -import org.eclipse.che.plugin.factory.ide.FactoryLocalizationConstant; /** * The implementation of {@link ImportFromConfigView}. @@ -52,7 +52,7 @@ public interface ImportFromConfigViewBinder extends UiBinder max_size * 100000) { - instance.@org.eclipse.che.plugin.factory.ide.json.ImportFromConfigViewImpl::resetUploadFileField()(); - instance.@org.eclipse.che.plugin.factory.ide.json.ImportFromConfigViewImpl::setErrorMessageOnForm(Ljava/lang/String;) + instance.@org.eclipse.che.ide.factory.json.ImportFromConfigViewImpl::resetUploadFileField()(); + instance.@org.eclipse.che.ide.factory.json.ImportFromConfigViewImpl::setErrorMessageOnForm(Ljava/lang/String;) ('File size exceeds the limit ' + max_size + 'mb'); return; } @@ -137,13 +137,13 @@ function readFileContent(evt) { var reader = new FileReader(); reader.onload = function () { //reseting error message - instance.@org.eclipse.che.plugin.factory.ide.json.ImportFromConfigViewImpl::setErrorMessageOnForm(Ljava/lang/String;)(''); + instance.@org.eclipse.che.ide.factory.json.ImportFromConfigViewImpl::setErrorMessageOnForm(Ljava/lang/String;)(''); //getting file's content - instance.@org.eclipse.che.plugin.factory.ide.json.ImportFromConfigViewImpl::fileContent = reader.result; + instance.@org.eclipse.che.ide.factory.json.ImportFromConfigViewImpl::fileContent = reader.result; }; reader.onerror = function (event) { - instance.@org.eclipse.che.plugin.factory.ide.json.ImportFromConfigViewImpl::onError(Ljava/lang/String;) + instance.@org.eclipse.che.ide.factory.json.ImportFromConfigViewImpl::onError(Ljava/lang/String;) ('Error reading config file ' + event.target.error.code); }; diff --git a/plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/json/ImportFromConfigViewImpl.ui.xml b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/json/ImportFromConfigViewImpl.ui.xml similarity index 93% rename from plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/json/ImportFromConfigViewImpl.ui.xml rename to ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/json/ImportFromConfigViewImpl.ui.xml index dbefa24a4c9..d4b9c90dd1c 100644 --- a/plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/json/ImportFromConfigViewImpl.ui.xml +++ b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/json/ImportFromConfigViewImpl.ui.xml @@ -13,7 +13,7 @@ - + .emptyBorder { margin: 6px; diff --git a/plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/utils/FactoryProjectImporter.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/utils/FactoryProjectImporter.java similarity index 98% rename from plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/utils/FactoryProjectImporter.java rename to ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/utils/FactoryProjectImporter.java index b0d1b37ea0f..07248c3d559 100644 --- a/plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/utils/FactoryProjectImporter.java +++ b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/utils/FactoryProjectImporter.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.plugin.factory.ide.utils; +package org.eclipse.che.ide.factory.utils; import com.google.gwt.user.client.rpc.AsyncCallback; @@ -23,6 +23,7 @@ import org.eclipse.che.api.promises.client.PromiseError; import org.eclipse.che.api.promises.client.js.Promises; import org.eclipse.che.api.workspace.shared.dto.ProjectConfigDto; +import org.eclipse.che.ide.CoreLocalizationConstant; import org.eclipse.che.ide.api.app.AppContext; import org.eclipse.che.ide.api.dialogs.DialogFactory; import org.eclipse.che.ide.api.importer.AbstractImporter; @@ -35,8 +36,8 @@ import org.eclipse.che.ide.api.project.wizard.ImportProjectNotificationSubscriberFactory; import org.eclipse.che.ide.api.project.wizard.ProjectNotificationSubscriber; import org.eclipse.che.ide.api.resources.Project; -import org.eclipse.che.ide.api.user.Credentials; import org.eclipse.che.ide.api.user.AskCredentialsDialog; +import org.eclipse.che.ide.api.user.Credentials; import org.eclipse.che.ide.resource.Path; import org.eclipse.che.ide.rest.DtoUnmarshallerFactory; import org.eclipse.che.ide.rest.RestContext; @@ -46,7 +47,6 @@ import org.eclipse.che.ide.websocket.MessageBusProvider; import org.eclipse.che.ide.websocket.WebSocketException; import org.eclipse.che.ide.websocket.rest.SubscriptionHandler; -import org.eclipse.che.plugin.factory.ide.FactoryLocalizationConstant; import org.eclipse.che.security.oauth.OAuthStatus; import javax.validation.constraints.NotNull; @@ -80,7 +80,7 @@ public class FactoryProjectImporter extends AbstractImporter { private final MessageBusProvider messageBusProvider; private final AskCredentialsDialog askCredentialsDialog; - private final FactoryLocalizationConstant locale; + private final CoreLocalizationConstant locale; private final NotificationManager notificationManager; private final String restContext; private final DialogFactory dialogFactory; @@ -94,7 +94,7 @@ public class FactoryProjectImporter extends AbstractImporter { public FactoryProjectImporter(AppContext appContext, NotificationManager notificationManager, AskCredentialsDialog askCredentialsDialog, - FactoryLocalizationConstant locale, + CoreLocalizationConstant locale, ImportProjectNotificationSubscriberFactory subscriberFactory, @RestContext String restContext, DialogFactory dialogFactory, diff --git a/plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/welcome/GreetingPartPresenter.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/welcome/GreetingPartPresenter.java similarity index 98% rename from plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/welcome/GreetingPartPresenter.java rename to ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/welcome/GreetingPartPresenter.java index cd2401fb02b..6a027c3e9cb 100644 --- a/plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/welcome/GreetingPartPresenter.java +++ b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/welcome/GreetingPartPresenter.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.plugin.factory.ide.welcome; +package org.eclipse.che.ide.factory.welcome; import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.ui.AcceptsOneWidget; diff --git a/plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/welcome/GreetingPartView.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/welcome/GreetingPartView.java similarity index 95% rename from plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/welcome/GreetingPartView.java rename to ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/welcome/GreetingPartView.java index 2068d345554..9d55603248d 100644 --- a/plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/welcome/GreetingPartView.java +++ b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/welcome/GreetingPartView.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.plugin.factory.ide.welcome; +package org.eclipse.che.ide.factory.welcome; import org.eclipse.che.ide.api.mvp.View; import org.eclipse.che.ide.api.parts.base.BaseActionDelegate; diff --git a/plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/welcome/GreetingPartViewImpl.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/welcome/GreetingPartViewImpl.java similarity index 94% rename from plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/welcome/GreetingPartViewImpl.java rename to ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/welcome/GreetingPartViewImpl.java index 9023f09546a..39e626b49d1 100644 --- a/plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/welcome/GreetingPartViewImpl.java +++ b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/welcome/GreetingPartViewImpl.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.plugin.factory.ide.welcome; +package org.eclipse.che.ide.factory.welcome; import com.google.gwt.core.client.JavaScriptObject; import com.google.gwt.dom.client.Style; @@ -67,7 +67,7 @@ private native void handleFrameEvents(final JavaScriptObject frame) /*-{ $wnd.addEventListener('blur', function (e) { if (frame["hovered"] == true) { - instance.@org.eclipse.che.plugin.factory.ide.welcome.GreetingPartViewImpl::activatePart()(); + instance.@org.eclipse.che.ide.factory.welcome.GreetingPartViewImpl::activatePart()(); } }, false); }-*/; diff --git a/plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/welcome/OpenWelcomePageAction.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/welcome/OpenWelcomePageAction.java similarity index 95% rename from plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/welcome/OpenWelcomePageAction.java rename to ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/welcome/OpenWelcomePageAction.java index e143d254a65..c4bba6b8fc8 100644 --- a/plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/welcome/OpenWelcomePageAction.java +++ b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/welcome/OpenWelcomePageAction.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.plugin.factory.ide.welcome; +package org.eclipse.che.ide.factory.welcome; import org.eclipse.che.ide.api.action.Action; import org.eclipse.che.ide.api.action.ActionEvent; diff --git a/plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/welcome/TooltipHint.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/welcome/TooltipHint.java similarity index 98% rename from plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/welcome/TooltipHint.java rename to ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/welcome/TooltipHint.java index d7a4610a022..5723d903b35 100644 --- a/plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/welcome/TooltipHint.java +++ b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/welcome/TooltipHint.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.plugin.factory.ide.welcome; +package org.eclipse.che.ide.factory.welcome; import com.google.gwt.core.client.GWT; import com.google.gwt.dom.client.DivElement; diff --git a/plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/welcome/TooltipHint.ui.xml b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/welcome/TooltipHint.ui.xml similarity index 100% rename from plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/welcome/TooltipHint.ui.xml rename to ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/welcome/TooltipHint.ui.xml diff --git a/plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/welcome/preferences/ShowWelcomePreferencePagePresenter.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/welcome/preferences/ShowWelcomePreferencePagePresenter.java similarity index 92% rename from plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/welcome/preferences/ShowWelcomePreferencePagePresenter.java rename to ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/welcome/preferences/ShowWelcomePreferencePagePresenter.java index c0e54d884d9..fbacc76845e 100644 --- a/plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/welcome/preferences/ShowWelcomePreferencePagePresenter.java +++ b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/welcome/preferences/ShowWelcomePreferencePagePresenter.java @@ -8,15 +8,15 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.plugin.factory.ide.welcome.preferences; +package org.eclipse.che.ide.factory.welcome.preferences; import com.google.gwt.user.client.ui.AcceptsOneWidget; import com.google.inject.Inject; import com.google.inject.Singleton; +import org.eclipse.che.ide.CoreLocalizationConstant; import org.eclipse.che.ide.api.preferences.AbstractPreferencePagePresenter; import org.eclipse.che.ide.api.preferences.PreferencesManager; -import org.eclipse.che.plugin.factory.ide.FactoryLocalizationConstant; /** * @author Vitaliy Guliy @@ -30,7 +30,7 @@ public class ShowWelcomePreferencePagePresenter extends AbstractPreferencePagePr private PreferencesManager preferencesManager; @Inject - public ShowWelcomePreferencePagePresenter(FactoryLocalizationConstant localizationConstant, + public ShowWelcomePreferencePagePresenter(CoreLocalizationConstant localizationConstant, ShowWelcomePreferencePageView view, PreferencesManager preferencesManager) { super(localizationConstant.welcomePreferencesTitle()); diff --git a/plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/welcome/preferences/ShowWelcomePreferencePageView.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/welcome/preferences/ShowWelcomePreferencePageView.java similarity index 88% rename from plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/welcome/preferences/ShowWelcomePreferencePageView.java rename to ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/welcome/preferences/ShowWelcomePreferencePageView.java index 3845ece9e83..0c78e547098 100644 --- a/plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/welcome/preferences/ShowWelcomePreferencePageView.java +++ b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/welcome/preferences/ShowWelcomePreferencePageView.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.plugin.factory.ide.welcome.preferences; +package org.eclipse.che.ide.factory.welcome.preferences; import com.google.gwt.user.client.ui.HasValue; @@ -19,10 +19,8 @@ */ public interface ShowWelcomePreferencePageView extends View { - public interface ActionDelegate { - + interface ActionDelegate { void onDirtyChanged(); - } HasValue welcomeField(); diff --git a/plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/welcome/preferences/ShowWelcomePreferencePageViewImpl.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/welcome/preferences/ShowWelcomePreferencePageViewImpl.java similarity index 77% rename from plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/welcome/preferences/ShowWelcomePreferencePageViewImpl.java rename to ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/welcome/preferences/ShowWelcomePreferencePageViewImpl.java index b5cad2c4007..0bbd507f93c 100644 --- a/plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/welcome/preferences/ShowWelcomePreferencePageViewImpl.java +++ b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/welcome/preferences/ShowWelcomePreferencePageViewImpl.java @@ -8,10 +8,8 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.plugin.factory.ide.welcome.preferences; +package org.eclipse.che.ide.factory.welcome.preferences; -import com.google.gwt.event.logical.shared.ValueChangeEvent; -import com.google.gwt.event.logical.shared.ValueChangeHandler; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; import com.google.gwt.user.client.ui.CheckBox; @@ -40,12 +38,9 @@ interface ShowWelcomePreferencePageViewImplUiBinder extends UiBinder() { - @Override - public void onValueChange(ValueChangeEvent booleanValueChangeEvent) { - if (delegate != null) { - delegate.onDirtyChanged(); - } + showWelcome.addValueChangeHandler(booleanValueChangeEvent -> { + if (delegate != null) { + delegate.onDirtyChanged(); } }); } diff --git a/plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/welcome/preferences/ShowWelcomePreferencePageViewImpl.ui.xml b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/welcome/preferences/ShowWelcomePreferencePageViewImpl.ui.xml similarity index 100% rename from plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/welcome/preferences/ShowWelcomePreferencePageViewImpl.ui.xml rename to ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/welcome/preferences/ShowWelcomePreferencePageViewImpl.ui.xml diff --git a/ide/che-core-ide-app/src/main/resources/org/eclipse/che/ide/Core.gwt.xml b/ide/che-core-ide-app/src/main/resources/org/eclipse/che/ide/Core.gwt.xml index 2eb0043ea55..2ff2e855712 100644 --- a/ide/che-core-ide-app/src/main/resources/org/eclipse/che/ide/Core.gwt.xml +++ b/ide/che-core-ide-app/src/main/resources/org/eclipse/che/ide/Core.gwt.xml @@ -36,5 +36,6 @@ + diff --git a/ide/che-core-ide-app/src/main/resources/org/eclipse/che/ide/CoreLocalizationConstant.properties b/ide/che-core-ide-app/src/main/resources/org/eclipse/che/ide/CoreLocalizationConstant.properties index 71662027793..41b8155f898 100644 --- a/ide/che-core-ide-app/src/main/resources/org/eclipse/che/ide/CoreLocalizationConstant.properties +++ b/ide/che-core-ide-app/src/main/resources/org/eclipse/che/ide/CoreLocalizationConstant.properties @@ -415,3 +415,46 @@ authentication.dialog.password=Password: authentication.dialog.authenticate.button=Authenticate authentication.dialog.rejected.by.user="Authorization request rejected by user." +################ Factories ####################### +message.ssh.key.not.found.text=Unable to get private SSH key. Enter valid key in Preferences. + +projects.import.configuring.cloning=Configuring project and cloning source code. +project.import.configuring.cloning=Configuring and cloning source code of {0}. +project.import.configured.cloned=Successfully configured and cloned source code of {0}. +project.import.cloned.with.checkout=Project: {0} | cloned from: {1} | remote branch: {2} | local branch: {3} +project.import.cloned.with.checkout.start.point=Project: {0} | cloned from: {1} | start point: {2} | local branch: {3} +project.import.cloning.failed.without.start.point=Cannot find remote branch {0} in repo {1} and start point undefined +project.import.cloning.failed.with.start.point=Project: {0} | cannot find remote branch {1} and start point is undefined +project.import.cloning.failed.title=Project: {0} Sources cannot be cloned +project.import.configuring.failed=Failed to configure source code of {0}. +project.already.imported=Project {0} already imported. +project.import.ssh.key.upload.failed.title=Clone failed +project.import.ssh.key.upload.failed.text=We are unable to clone your repository even though you gave us oAuth access. \ + Some providers do not allow automatic upload of SSH keys. Please paste your SSH key manually in your provider account preferences. + +import.config.view.name=Import From Codenvy Config... +import.config.view.description=Import factory json +import.config.view.title=Import From Codenvy Config... + +import.config.form.prompt=Config file to import +import.config.form.button.import=Import + +export.config.view.name=Export Config +export.config.view.description=Export Config +export.config.error.message=Open the project before export config +export.config.dialog.not.under.vcs.title=Not able to generate project configuration +export.config.dialog.not.under.vcs.text=project has to be under version control system. Would you like to initialize a Git repository? + +welcome.preferences.title=Welcome + +create.factory.form.title=Create Factory +create.factory.action.title=Create Factory... +create.factory.label.name=Name +create.factory.button.create=Create +create.factory.button.close=Close +create.factory.label.link=Factory +create.factory.already.exist=Factory with given name already exists +create.factory.unable.create.from.current.workspace=Unable to create factory(?) +create.factory.launch.button.tooltip=Invoke the factory +create.factory.configure.button.tooltip=Configure the factory + diff --git a/plugins/plugin-factory/che-plugin-factory-ide/src/main/resources/org/eclipse/che/plugin/factory/ide/Factory.css b/ide/che-core-ide-app/src/main/resources/org/eclipse/che/ide/factory/Factory.css similarity index 100% rename from plugins/plugin-factory/che-plugin-factory-ide/src/main/resources/org/eclipse/che/plugin/factory/ide/Factory.css rename to ide/che-core-ide-app/src/main/resources/org/eclipse/che/ide/factory/Factory.css diff --git a/plugins/plugin-factory/che-plugin-factory-ide/src/main/resources/org/eclipse/che/plugin/factory/ide/svg/cog-icon.svg b/ide/che-core-ide-app/src/main/resources/org/eclipse/che/ide/factory/cog-icon.svg similarity index 100% rename from plugins/plugin-factory/che-plugin-factory-ide/src/main/resources/org/eclipse/che/plugin/factory/ide/svg/cog-icon.svg rename to ide/che-core-ide-app/src/main/resources/org/eclipse/che/ide/factory/cog-icon.svg diff --git a/plugins/plugin-factory/che-plugin-factory-ide/src/main/resources/org/eclipse/che/plugin/factory/ide/svg/execute.svg b/ide/che-core-ide-app/src/main/resources/org/eclipse/che/ide/factory/execute.svg similarity index 100% rename from plugins/plugin-factory/che-plugin-factory-ide/src/main/resources/org/eclipse/che/plugin/factory/ide/svg/execute.svg rename to ide/che-core-ide-app/src/main/resources/org/eclipse/che/ide/factory/execute.svg diff --git a/plugins/plugin-factory/che-plugin-factory-ide/src/main/resources/org/eclipse/che/plugin/factory/ide/svg/export-config.svg b/ide/che-core-ide-app/src/main/resources/org/eclipse/che/ide/factory/export-config.svg similarity index 100% rename from plugins/plugin-factory/che-plugin-factory-ide/src/main/resources/org/eclipse/che/plugin/factory/ide/svg/export-config.svg rename to ide/che-core-ide-app/src/main/resources/org/eclipse/che/ide/factory/export-config.svg diff --git a/plugins/plugin-factory/che-plugin-factory-ide/src/main/resources/org/eclipse/che/plugin/factory/ide/svg/import-config.svg b/ide/che-core-ide-app/src/main/resources/org/eclipse/che/ide/factory/import-config.svg similarity index 100% rename from plugins/plugin-factory/che-plugin-factory-ide/src/main/resources/org/eclipse/che/plugin/factory/ide/svg/import-config.svg rename to ide/che-core-ide-app/src/main/resources/org/eclipse/che/ide/factory/import-config.svg diff --git a/plugins/plugin-factory/che-plugin-factory-ide/pom.xml b/plugins/plugin-factory/che-plugin-factory-ide/pom.xml deleted file mode 100644 index fc036c044b9..00000000000 --- a/plugins/plugin-factory/che-plugin-factory-ide/pom.xml +++ /dev/null @@ -1,168 +0,0 @@ - - - - 4.0.0 - - che-plugin-factory-parent - org.eclipse.che.plugin - 5.7.0-SNAPSHOT - - che-plugin-factory-ide - - ${project.build.directory}/generated-sources/dto/ - - - - com.google.guava - guava - - - com.google.gwt - gwt-elemental - - - com.google.gwt - gwt-user - - - com.google.gwt.inject - gin - - - com.google.inject - guice - - - javax.inject - javax.inject - - - javax.validation - validation-api - - - org.eclipse.che.core - che-core-api-core - - - org.eclipse.che.core - che-core-api-factory-shared - - - org.eclipse.che.core - che-core-api-git-shared - - - org.eclipse.che.core - che-core-api-model - - - org.eclipse.che.core - che-core-api-workspace-shared - - - org.eclipse.che.core - che-core-commons-annotations - - - org.eclipse.che.core - che-core-commons-gwt - - - org.eclipse.che.core - che-core-ide-api - - - org.eclipse.che.core - che-core-ide-ui - - - org.vectomatic - lib-gwt-svg - - - junit - junit - test - - - org.mockito - mockito-core - test - - - - src/main/java - src/test/java - target/classes - - - src/main/java - - - src/main/resources - - - ${project.build.directory}/generated-sources/dto/ - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - add-resource - process-sources - - add-resource - - - - - ${dto-generator-out-directory}/META-INF - META-INF - - - - - - add-source - process-sources - - add-source - - - - ${dto-generator-out-directory} - - - - - - - maven-compiler-plugin - - - pre-compile - generate-sources - - compile - - - - - - - diff --git a/plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/FactoryLocalizationConstant.java b/plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/FactoryLocalizationConstant.java deleted file mode 100644 index c334b59059b..00000000000 --- a/plugins/plugin-factory/che-plugin-factory-ide/src/main/java/org/eclipse/che/plugin/factory/ide/FactoryLocalizationConstant.java +++ /dev/null @@ -1,161 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2012-2017 Codenvy, S.A. - * 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 - * - * Contributors: - * Codenvy, S.A. - initial API and implementation - *******************************************************************************/ -package org.eclipse.che.plugin.factory.ide; - -import com.google.gwt.i18n.client.Messages; - -/** - * @author vzhukovskii@codenvy.com - */ -public interface FactoryLocalizationConstant extends Messages { - - /* ************************************************************************************************************ - * - * Accept - * - * ************************************************************************************************************/ - - @Key("projects.import.configuring.cloning") - String cloningSource(); - - @Key("project.import.configuring.cloning") - String cloningSource(String projectName); - - @Key("project.import.configured.cloned") - String clonedSource(String projectName); - - @Key("project.import.cloned.with.checkout") - String clonedSourceWithCheckout(String projectName, String repoName, String ref, String branch); - - @Key("project.import.cloned.with.checkout.start.point") - String clonedWithCheckoutOnStartPoint(String projectName, String repoName, String startPoint, String branch); - - @Key("project.import.cloning.failed.without.start.point") - String cloningSourceWithCheckoutFailed(String branch, String repoName); - - @Key("project.import.cloning.failed.with.start.point") - String cloningSourceCheckoutFailed(String project, String branch); - - @Key("project.import.cloning.failed.title") - String cloningSourceFailedTitle(String projectName); - - @Key("project.import.configuring.failed") - String configuringSourceFailed(String projectName); - - @Key("project.import.ssh.key.upload.failed.title") - String cloningSourceSshKeyUploadFailedTitle(); - - @Key("project.import.ssh.key.upload.failed.text") - String cloningSourcesSshKeyUploadFailedText(); - - @Key("project.already.imported") - String projectAlreadyImported(String projectName); - - - @Key("oauth.failed.to.get.authenticator.title") - String oauthFailedToGetAuthenticatorTitle(); - - @Key("oauth.failed.to.get.authenticator.text") - String oauthFailedToGetAuthenticatorText(); - - @Key("message.ssh.not.found.text") - String acceptSshNotFoundText(); - - /* *************************************************************************************************************** - * - * Importing from Config File - * - * **************************************************************************************************************/ - - @Key("import.config.view.name") - String importFromConfigurationName(); - - @Key("import.config.view.description") - String importFromConfigurationDescription(); - - @Key("import.config.view.title") - String importFromConfigurationTitle(); - - @Key("import.config.form.prompt") - String configFileTitle(); - - @Key("import.config.form.button.cancel") - String cancelButton(); - - @Key("import.config.form.button.import") - String importButton(); - - /* *************************************************************************************************************** - * - * Exporting Config File - * - * **************************************************************************************************************/ - - @Key("export.config.view.name") - String exportConfigName(); - - @Key("export.config.view.description") - String exportConfigDescription(); - - @Key("export.config.error.message") - String exportConfigErrorMessage(); - - @Key("export.config.dialog.not.under.vcs.title") - String exportConfigDialogNotUnderVcsTitle(); - - @Key("export.config.dialog.not.under.vcs.text") - String exportConfigDialogNotUnderVcsText(); - - /* *************************************************************************************************************** - * - * Welcome - * - * **************************************************************************************************************/ - - @Key("welcome.preferences.title") - String welcomePreferencesTitle(); - - /* *************************************************************************************************************** - * - * Create factory - * - * **************************************************************************************************************/ - - @Key("create.factory.form.title") - String createFactoryTitle(); - - @Key("create.factory.action.title") - String createFactoryActionTitle(); - - @Key("create.factory.label.name") - String createFactoryName(); - - @Key("create.factory.button.create") - String createFactoryButton(); - - @Key("create.factory.button.close") - String createFactoryButtonClose(); - - @Key("create.factory.label.link") - String createFactoryLink(); - - @Key("create.factory.already.exist") - String createFactoryAlreadyExist(); - - @Key("create.factory.unable.create.from.current.workspace") - String createFactoryFromCurrentWorkspaceFailed(); - - @Key("create.factory.configure.button.tooltip") - String createFactoryConfigureTooltip(); - - @Key("create.factory.launch.button.tooltip") - String createFactoryLaunchTooltip(); -} diff --git a/plugins/plugin-factory/che-plugin-factory-ide/src/main/resources/org/eclipse/che/plugin/factory/Factory.gwt.xml b/plugins/plugin-factory/che-plugin-factory-ide/src/main/resources/org/eclipse/che/plugin/factory/Factory.gwt.xml deleted file mode 100644 index fd6f624aef1..00000000000 --- a/plugins/plugin-factory/che-plugin-factory-ide/src/main/resources/org/eclipse/che/plugin/factory/Factory.gwt.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/plugin-factory/che-plugin-factory-ide/src/main/resources/org/eclipse/che/plugin/factory/ide/FactoryLocalizationConstant.properties b/plugins/plugin-factory/che-plugin-factory-ide/src/main/resources/org/eclipse/che/plugin/factory/ide/FactoryLocalizationConstant.properties deleted file mode 100644 index 1276d6a276b..00000000000 --- a/plugins/plugin-factory/che-plugin-factory-ide/src/main/resources/org/eclipse/che/plugin/factory/ide/FactoryLocalizationConstant.properties +++ /dev/null @@ -1,56 +0,0 @@ -# -# Copyright (c) 2012-2017 Codenvy, S.A. -# 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 -# -# Contributors: -# Codenvy, S.A. - initial API and implementation -# - -oauth.failed.to.get.authenticator.title=Error -oauth.failed.to.get.authenticator.text=Remote repository requires authentication, but no OAuth provider found for this url -message.ssh.not.found.text=Unable to get private SSH key. Enter valid key in Preferences. - - -projects.import.configuring.cloning=Configuring project and cloning source code. -project.import.configuring.cloning=Configuring and cloning source code of {0}. -project.import.configured.cloned=Successfully configured and cloned source code of {0}. -project.import.cloned.with.checkout=Project: {0} | cloned from: {1} | remote branch: {2} | local branch: {3} -project.import.cloned.with.checkout.start.point=Project: {0} | cloned from: {1} | start point: {2} | local branch: {3} -project.import.cloning.failed.without.start.point=Cannot find remote branch {0} in repo {1} and start point undefined -project.import.cloning.failed.with.start.point=Project: {0} | cannot find remote branch {1} and start point is undefined -project.import.cloning.failed.title=Project: {0} Sources cannot be cloned -project.import.configuring.failed=Failed to configure source code of {0}. -project.already.imported=Project {0} already imported. -project.import.ssh.key.upload.failed.title=Clone failed -project.import.ssh.key.upload.failed.text=We are unable to clone your repository even though you gave us oAuth access. \ - Some providers do not allow automatic upload of SSH keys. Please paste your SSH key manually in your provider account preferences. - -import.config.view.name=Import From Codenvy Config... -import.config.view.description=Import factory json -import.config.view.title=Import From Codenvy Config... - -import.config.form.prompt=Config file to import -import.config.form.button.import=Import -import.config.form.button.cancel=Cancel - -export.config.view.name=Export Config -export.config.view.description=Export Config -export.config.error.message=Open the project before export config -export.config.dialog.not.under.vcs.title=Not able to generate project configuration -export.config.dialog.not.under.vcs.text=project has to be under version control system. Would you like to initialize a Git repository? - -welcome.preferences.title=Welcome - -create.factory.form.title=Create Factory -create.factory.action.title=Create Factory... -create.factory.label.name=Name -create.factory.button.create=Create -create.factory.button.close=Close -create.factory.label.link=Factory -create.factory.already.exist=Factory with given name already exists -create.factory.unable.create.from.current.workspace=Unable to create factory(?) -create.factory.launch.button.tooltip=Invoke the factory -create.factory.configure.button.tooltip=Configure the factory diff --git a/plugins/plugin-factory/che-plugin-factory-server/pom.xml b/plugins/plugin-factory/che-plugin-factory-server/pom.xml deleted file mode 100644 index 2c8f5417e8b..00000000000 --- a/plugins/plugin-factory/che-plugin-factory-server/pom.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - 4.0.0 - - che-plugin-factory-parent - org.eclipse.che.plugin - 5.7.0-SNAPSHOT - - che-plugin-factory-server - - - com.google.inject - guice - - - com.google.inject.extensions - guice-multibindings - - - javax.inject - javax.inject - - - org.eclipse.che.core - che-core-api-model - - - org.eclipse.che.core - che-core-api-project - - - org.eclipse.che.core - che-core-commons-inject - - - org.eclipse.che.plugin - che-plugin-factory-shared - provided - - - diff --git a/plugins/plugin-factory/che-plugin-factory-server/src/main/java/org/eclipse/che/plugin/factory/server/FactoryProjectType.java b/plugins/plugin-factory/che-plugin-factory-server/src/main/java/org/eclipse/che/plugin/factory/server/FactoryProjectType.java deleted file mode 100644 index eaa33a1c034..00000000000 --- a/plugins/plugin-factory/che-plugin-factory-server/src/main/java/org/eclipse/che/plugin/factory/server/FactoryProjectType.java +++ /dev/null @@ -1,30 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2012-2017 Codenvy, S.A. - * 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 - * - * Contributors: - * Codenvy, S.A. - initial API and implementation - *******************************************************************************/ -package org.eclipse.che.plugin.factory.server; - -import org.eclipse.che.api.project.server.type.ProjectTypeDef; -import org.eclipse.che.plugin.factory.shared.Constants; - -import javax.inject.Singleton; - - -/** - * Factory project type mixin. - * - * @author Max Shaposhnik (mshaposhnik@codenvy.com) - */ -@Singleton -public class FactoryProjectType extends ProjectTypeDef { - public FactoryProjectType() { - super(Constants.FACTORY_PROJECT_TYPE_ID, Constants.FACTORY_PROJECT_TYPE_DISPLAY_NAME, false, true); - addVariableDefinition(Constants.FACTORY_ID_ATTRIBUTE_NAME, "Factory flag", false); - } -} diff --git a/plugins/plugin-factory/che-plugin-factory-server/src/main/java/org/eclipse/che/plugin/factory/server/inject/FactoryProjectTypeModule.java b/plugins/plugin-factory/che-plugin-factory-server/src/main/java/org/eclipse/che/plugin/factory/server/inject/FactoryProjectTypeModule.java deleted file mode 100644 index 2c17f4f4de3..00000000000 --- a/plugins/plugin-factory/che-plugin-factory-server/src/main/java/org/eclipse/che/plugin/factory/server/inject/FactoryProjectTypeModule.java +++ /dev/null @@ -1,32 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2012-2017 Codenvy, S.A. - * 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 - * - * Contributors: - * Codenvy, S.A. - initial API and implementation - *******************************************************************************/ -package org.eclipse.che.plugin.factory.server.inject; - -import com.google.inject.AbstractModule; -import com.google.inject.multibindings.Multibinder; - -import org.eclipse.che.api.core.model.project.type.ProjectType; -import org.eclipse.che.inject.DynaModule; -import org.eclipse.che.plugin.factory.server.FactoryProjectType; - -/** - * Factory project type binding - * - * @author Max Shaposhnik (mshaposhnik@codenvy.com) - */ -@DynaModule -public class FactoryProjectTypeModule extends AbstractModule { - @Override - protected void configure() { - final Multibinder projectTypeMultibinder = Multibinder.newSetBinder(binder(), ProjectType.class); - projectTypeMultibinder.addBinding().to(FactoryProjectType.class); - } -} diff --git a/plugins/plugin-factory/che-plugin-factory-shared/pom.xml b/plugins/plugin-factory/che-plugin-factory-shared/pom.xml deleted file mode 100644 index 01848da4ffb..00000000000 --- a/plugins/plugin-factory/che-plugin-factory-shared/pom.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - 4.0.0 - - che-plugin-factory-parent - org.eclipse.che.plugin - 5.7.0-SNAPSHOT - - che-plugin-factory-shared - diff --git a/plugins/plugin-factory/che-plugin-factory-shared/src/main/java/org/eclipse/che/plugin/factory/shared/Constants.java b/plugins/plugin-factory/che-plugin-factory-shared/src/main/java/org/eclipse/che/plugin/factory/shared/Constants.java deleted file mode 100644 index 314ef5f5221..00000000000 --- a/plugins/plugin-factory/che-plugin-factory-shared/src/main/java/org/eclipse/che/plugin/factory/shared/Constants.java +++ /dev/null @@ -1,24 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2012-2017 Codenvy, S.A. - * 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 - * - * Contributors: - * Codenvy, S.A. - initial API and implementation - *******************************************************************************/ -package org.eclipse.che.plugin.factory.shared; - -/** - * Factory constants. - * - * @author Max Shaposhnik (mshaposhnik@codenvy.com) - */ -public class Constants { - public static final String FACTORY_PROJECT_TYPE_ID = "factory"; - public static final String FACTORY_PROJECT_TYPE_DISPLAY_NAME = "factory"; - public static final String FACTORY_ID_ATTRIBUTE_NAME = "sourceFactoryId"; - - private Constants() {} -} diff --git a/plugins/plugin-factory/pom.xml b/plugins/plugin-factory/pom.xml deleted file mode 100644 index 46ca55d04c5..00000000000 --- a/plugins/plugin-factory/pom.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - 4.0.0 - - che-plugin-parent - org.eclipse.che.plugin - 5.7.0-SNAPSHOT - ../pom.xml - - che-plugin-factory-parent - pom - Che Plugin :: Factory :: Parent - - che-plugin-factory-shared - che-plugin-factory-server - che-plugin-factory-ide - - diff --git a/plugins/pom.xml b/plugins/pom.xml index 536b0197860..5f549ae3d52 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -39,7 +39,6 @@ plugin-sdk plugin-orion plugin-git - plugin-factory plugin-github plugin-dashboard plugin-gwt diff --git a/wsmaster/che-core-api-factory/src/main/java/org/eclipse/che/api/factory/server/impl/FactoryBaseValidator.java b/wsmaster/che-core-api-factory/src/main/java/org/eclipse/che/api/factory/server/impl/FactoryBaseValidator.java index 54c62b05dfd..ffede6b89e2 100644 --- a/wsmaster/che-core-api-factory/src/main/java/org/eclipse/che/api/factory/server/impl/FactoryBaseValidator.java +++ b/wsmaster/che-core-api-factory/src/main/java/org/eclipse/che/api/factory/server/impl/FactoryBaseValidator.java @@ -59,6 +59,11 @@ protected void validateProjects(FactoryDto factory) throws BadRequestException { if (project.getPath().indexOf('/', 1) == -1) { + if (project.getSource() == null) { + throw new BadRequestException(format(FactoryConstants.MISSING_MANDATORY_MESSAGE, + "project.source")); + } + final String location = project.getSource().getLocation(); final String parameterLocationName = "project.source.location";