CHE-3614: Rework Git commit window (eclipse-che#5081)

Reworked Git commit window with changed files panel and check-boxes to select witch file or folder to commit or not
dgomezleon · May 31, 2017 · f2047ea · f2047ea
1 parent 1c7818f
commit f2047ea
Show file tree

Hide file tree

Showing 36 changed files with 1,208 additions and 722 deletions.
diff --git a/...git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/GitLocalizationConstant.java b/...git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/GitLocalizationConstant.java
@@ -355,15 +355,6 @@ public interface GitLocalizationConstant extends Messages {
     @Key("view.commit.title")
     String commitTitle();
 
-    @Key("view.commit.all_field_title")
-    String commitAddAllFieldTitle();
-
-    @Key("view.commit.selection_field_title")
-    String commitSelectionFieldTitle();
-
-    @Key("view.commit.all_project_field_title")
-    String commitAllFieldTitle();
-
     @Key("view.commit.amend_field_title")
     String commitAmendFieldTitle();
 
@@ -376,6 +367,12 @@ public interface GitLocalizationConstant extends Messages {
     @Key("view.commit.grid.comment")
     String commitGridComment();
 
+    @Key("view.commit.push.checkbox.title")
+    String commitPushCheckboxTitle();
+
+    @Key("view.commit.nothing_to_commit.text")
+    String commitNothingToCommitMessageText();
+
     @Key("view.push.title")
     String pushViewTitle();
 

diff --git a/...-git/src/main/java/org/eclipse/che/ide/ext/git/client/action/CompareWithBranchAction.java b/...-git/src/main/java/org/eclipse/che/ide/ext/git/client/action/CompareWithBranchAction.java
@@ -18,7 +18,7 @@
 import org.eclipse.che.ide.api.resources.Project;
 import org.eclipse.che.ide.api.resources.Resource;
 import org.eclipse.che.ide.ext.git.client.GitLocalizationConstant;
-import org.eclipse.che.ide.ext.git.client.compare.branchList.BranchListPresenter;
+import org.eclipse.che.ide.ext.git.client.compare.branchlist.BranchListPresenter;
 
 import static com.google.common.base.Preconditions.checkState;
 

diff --git a/...-git/src/main/java/org/eclipse/che/ide/ext/git/client/action/CompareWithLatestAction.java b/...-git/src/main/java/org/eclipse/che/ide/ext/git/client/action/CompareWithLatestAction.java
@@ -27,7 +27,7 @@
 import org.eclipse.che.ide.ext.git.client.GitLocalizationConstant;
 import org.eclipse.che.ide.ext.git.client.compare.ComparePresenter;
 import org.eclipse.che.ide.ext.git.client.compare.FileStatus.Status;
-import org.eclipse.che.ide.ext.git.client.compare.changedList.ChangedListPresenter;
+import org.eclipse.che.ide.ext.git.client.compare.changeslist.ChangesListPresenter;
 import org.eclipse.che.ide.api.dialogs.DialogFactory;
 
 import java.util.HashMap;
@@ -49,7 +49,7 @@
 @Singleton
 public class CompareWithLatestAction extends GitAction {
     private final ComparePresenter        comparePresenter;
-    private final ChangedListPresenter    changedListPresenter;
+    private final ChangesListPresenter    changesListPresenter;
     private final DialogFactory           dialogFactory;
     private final NotificationManager     notificationManager;
     private final GitServiceClient        service;
@@ -59,15 +59,15 @@ public class CompareWithLatestAction extends GitAction {
 
     @Inject
     public CompareWithLatestAction(ComparePresenter presenter,
-                                   ChangedListPresenter changedListPresenter,
+                                   ChangesListPresenter changesListPresenter,
                                    AppContext appContext,
                                    DialogFactory dialogFactory,
                                    NotificationManager notificationManager,
                                    GitServiceClient service,
                                    GitLocalizationConstant constant) {
         super(constant.compareWithLatestTitle(), constant.compareWithLatestTitle(), null, appContext);
         this.comparePresenter = presenter;
-        this.changedListPresenter = changedListPresenter;
+        this.changesListPresenter = changesListPresenter;
         this.dialogFactory = dialogFactory;
         this.notificationManager = notificationManager;
         this.service = service;
@@ -117,7 +117,7 @@ public void apply(Optional<File> file) throws OperationException {
                                for (String item : changedFiles) {
                                    items.put(item.substring(2, item.length()), defineStatus(item.substring(0, 1)));
                                }
-                               changedListPresenter.show(items, REVISION, null, project);
+                               changesListPresenter.show(items, REVISION, null, project);
                            }
                        }
                    }

diff --git a/...it/src/main/java/org/eclipse/che/ide/ext/git/client/action/CompareWithRevisionAction.java b/...it/src/main/java/org/eclipse/che/ide/ext/git/client/action/CompareWithRevisionAction.java
@@ -19,7 +19,7 @@
 import org.eclipse.che.ide.api.resources.Project;
 import org.eclipse.che.ide.api.resources.Resource;
 import org.eclipse.che.ide.ext.git.client.GitLocalizationConstant;
-import org.eclipse.che.ide.ext.git.client.compare.revisionsList.RevisionListPresenter;
+import org.eclipse.che.ide.ext.git.client.compare.revisionslist.RevisionListPresenter;
 
 import javax.validation.constraints.NotNull;