Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CHE-3614: Rework Git commit window #5081

Merged
merged 17 commits into from
May 31, 2017
Merged

CHE-3614: Rework Git commit window #5081

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
be271ff
CHE-3614: Rework Git commit window
May 15, 2017
ffd4f3f
fixup! CHE-3614: Rework Git commit window
May 17, 2017
7b4c4ce
Merge branch 'master' of github.com:eclipse/che into CHE-3614
May 17, 2017
2f63cb6
Merge branch 'master' of github.com:eclipse/che into CHE-3614
May 18, 2017
c3be9d1
Merge branch 'master' of github.com:eclipse/che into CHE-3614
May 18, 2017
0aaa755
fixup! CHE-3614: Rework Git commit window
May 19, 2017
c9a5476
Merge branch 'master' of github.com:eclipse/che into CHE-3614
May 19, 2017
163907f
fixup! CHE-3614: Rework Git commit window
May 19, 2017
c975066
Merge branch 'master' of github.com:eclipse/che into CHE-3614
May 22, 2017
942e659
fixup! CHE-3614: Rework Git commit window
May 22, 2017
670237a
fixup! CHE-3614: Rework Git commit window
May 22, 2017
c5cf3b4
Merge branch 'master' of github.com:eclipse/che into CHE-3614
May 23, 2017
fbf4318
Merge branch 'master' of github.com:eclipse/che into CHE-3614
May 23, 2017
ad233c0
fixup! CHE-3614: Rework Git commit window
May 24, 2017
8924ec9
Merge branch 'master' of github.com:eclipse/che into CHE-3614
May 24, 2017
d0ec0a7
fixup! CHE-3614: Rework Git commit window
May 24, 2017
e6563e6
fixup! CHE-3614: Rework Git commit window
May 24, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions ...git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/GitLocalizationConstant.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand All @@ -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();

Expand Down
2 changes: 1 addition & 1 deletion ...-git/src/main/java/org/eclipse/che/ide/ext/git/client/action/CompareWithBranchAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
10 changes: 5 additions & 5 deletions ...-git/src/main/java/org/eclipse/che/ide/ext/git/client/action/CompareWithLatestAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...it/src/main/java/org/eclipse/che/ide/ext/git/client/action/CompareWithRevisionAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Loading