MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

vcs: cleanup - remove duplicating setters

Browse Source
This commit is contained in:
Aleksey Pivovarov
2016-12-20 17:22:58 +03:00
committed by Aleksey Pivovarov
parent f04eb6b3c7
commit d7e65b11e3
2 changed files with 11 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListWorker.java
+3 -3
View File
@@ -209,7 +209,7 @@ public class ChangeListWorker implements ChangeListsWriteOperations {
newList.setData(data);
if (description != null) {
newList.setCommentImpl(description);
newList.setComment(description);
}
if (id != null) {
newList.setId(id);
@@ -296,7 +296,7 @@ public class ChangeListWorker implements ChangeListsWriteOperations {
final boolean canEdit = list != null && (!list.isReadOnly());
if (canEdit) {
final LocalChangeListImpl listImpl = (LocalChangeListImpl) list;
listImpl.setNameImpl(toName);
listImpl.setName(toName);
myMap.remove(fromName);
myMap.put(toName, list);
}
@@ -310,7 +310,7 @@ public class ChangeListWorker implements ChangeListsWriteOperations {
final String oldComment = list.getComment();
if (! Comparing.equal(oldComment, newComment)) {
final LocalChangeListImpl listImpl = (LocalChangeListImpl) list;
listImpl.setCommentImpl(newComment);
listImpl.setComment(newComment);
}
return oldComment;
}
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/LocalChangeListImpl.java
+8 -22
View File
@@ -3,7 +3,6 @@ package com.intellij.openapi.vcs.changes;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Comparing;
import com.intellij.openapi.util.Computable;
import com.intellij.openapi.util.registry.Registry;
import com.intellij.openapi.util.text.StringUtil;
@@ -43,13 +42,13 @@ public class LocalChangeListImpl extends LocalChangeList {
private LocalChangeListImpl(Project project, final String name) {
myProject = project;
myId = UUID.randomUUID().toString();
setNameImpl(name);
setName(name);
}
private LocalChangeListImpl(LocalChangeListImpl origin) {
myId = origin.getId();
myProject = origin.myProject;
setNameImpl(origin.myName);
setName(origin.myName);
}
@NotNull
@@ -76,31 +75,18 @@ public class LocalChangeListImpl extends LocalChangeList {
}
public void setName(@NotNull final String name) {
if (! myName.equals(name)) {
setNameImpl(name);
}
}
public String getComment() {
return myComment;
}
// same as for setName()
public void setComment(final String comment) {
if (! Comparing.equal(comment, myComment)) {
myComment = comment != null ? comment : "";
}
}
void setNameImpl(@NotNull final String name) {
if (StringUtil.isEmptyOrSpaces(name) && Registry.is("vcs.log.empty.change.list.creation")) {
LOG.info("Creating a changelist with empty name");
}
myName = name;
}
void setCommentImpl(final String comment) {
myComment = comment;
public String getComment() {
return myComment;
}
public void setComment(final String comment) {
myComment = comment != null ? comment : "";
}
public boolean isDefault() {