diff --git a/plugins/github/src/META-INF/github-tracker.xml b/plugins/github/src/META-INF/github-tracker.xml index ecf12f702243..e33dd36dd775 100644 --- a/plugins/github/src/META-INF/github-tracker.xml +++ b/plugins/github/src/META-INF/github-tracker.xml @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/plugins/github/src/META-INF/plugin.xml b/plugins/github/src/META-INF/plugin.xml index 4a6e27813d2e..cbf17ddf1075 100644 --- a/plugins/github/src/META-INF/plugin.xml +++ b/plugins/github/src/META-INF/plugin.xml @@ -15,7 +15,7 @@ serviceImplementation="org.jetbrains.plugins.github.GithubSettings"/> - + diff --git a/plugins/github/src/org/jetbrains/plugins/github/GithubCheckoutListener.java b/plugins/github/src/org/jetbrains/plugins/github/GithubCheckoutListener.java index 1969bf09050b..b0fcf5fd9ee7 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/GithubCheckoutListener.java +++ b/plugins/github/src/org/jetbrains/plugins/github/GithubCheckoutListener.java @@ -9,8 +9,8 @@ import com.intellij.tasks.impl.TaskManagerImpl; import git4idea.repo.GitRepository; import org.jetbrains.annotations.Nullable; import org.jetbrains.plugins.github.api.GithubFullPath; -import org.jetbrains.plugins.github.tasks.GitHubRepository; -import org.jetbrains.plugins.github.tasks.GitHubRepositoryType; +import org.jetbrains.plugins.github.tasks.GithubRepository; +import org.jetbrains.plugins.github.tasks.GithubRepositoryType; import java.io.File; import java.util.ArrayList; @@ -76,12 +76,12 @@ public class GithubCheckoutListener implements CheckoutListener { final TaskManagerImpl manager = (TaskManagerImpl)TaskManager.getManager(project); final TaskRepository[] allRepositories = manager.getAllRepositories(); for (TaskRepository repository : allRepositories) { - if (repository instanceof GitHubRepository) { + if (repository instanceof GithubRepository) { return; } } // Create new one if not found exists - final GitHubRepository repository = new GitHubRepository(new GitHubRepositoryType()); + final GithubRepository repository = new GithubRepository(new GithubRepositoryType()); repository.setToken(""); repository.setRepoAuthor(author); repository.setRepoName(name); diff --git a/plugins/github/src/org/jetbrains/plugins/github/GithubCreateGistAction.java b/plugins/github/src/org/jetbrains/plugins/github/GithubCreateGistAction.java index df1aa4745a44..f6c075f0fda6 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/GithubCreateGistAction.java +++ b/plugins/github/src/org/jetbrains/plugins/github/GithubCreateGistAction.java @@ -39,7 +39,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.plugins.github.api.GithubApiUtil; import org.jetbrains.plugins.github.api.GithubGist; -import org.jetbrains.plugins.github.ui.GitHubCreateGistDialog; +import org.jetbrains.plugins.github.ui.GithubCreateGistDialog; import java.io.IOException; import java.util.*; @@ -100,7 +100,7 @@ public class GithubCreateGistAction extends DumbAwareAction { @Nullable final VirtualFile[] files) { // Ask for description and other params - final GitHubCreateGistDialog dialog = new GitHubCreateGistDialog(project, editor, file); + final GithubCreateGistDialog dialog = new GithubCreateGistDialog(project, editor, file); dialog.show(); if (!dialog.isOK()) { return; diff --git a/plugins/github/src/org/jetbrains/plugins/github/tasks/GitHubComment.java b/plugins/github/src/org/jetbrains/plugins/github/tasks/GithubComment.java similarity index 95% rename from plugins/github/src/org/jetbrains/plugins/github/tasks/GitHubComment.java rename to plugins/github/src/org/jetbrains/plugins/github/tasks/GithubComment.java index 248f97f5ac32..9c1ac8c891d1 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/tasks/GitHubComment.java +++ b/plugins/github/src/org/jetbrains/plugins/github/tasks/GithubComment.java @@ -26,11 +26,11 @@ import java.util.Date; /** * @author Dennis.Ushakov */ -public class GitHubComment extends SimpleComment { +public class GithubComment extends SimpleComment { @Nullable private final String myGravatarId; @NotNull private final String myUserHtmlUrl; - public GitHubComment(@Nullable Date date, + public GithubComment(@Nullable Date date, @Nullable String author, @NotNull String text, @Nullable String gravatarId, diff --git a/plugins/github/src/org/jetbrains/plugins/github/tasks/GitHubRepository.java b/plugins/github/src/org/jetbrains/plugins/github/tasks/GithubRepository.java similarity index 93% rename from plugins/github/src/org/jetbrains/plugins/github/tasks/GitHubRepository.java rename to plugins/github/src/org/jetbrains/plugins/github/tasks/GithubRepository.java index 1a568632123d..f02f78a92592 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/tasks/GitHubRepository.java +++ b/plugins/github/src/org/jetbrains/plugins/github/tasks/GithubRepository.java @@ -33,7 +33,7 @@ import java.util.regex.Pattern; * @author Dennis.Ushakov */ @Tag("GitHub") -public class GitHubRepository extends BaseRepositoryImpl { +public class GithubRepository extends BaseRepositoryImpl { private static final Logger LOG = GithubUtil.LOG; private Pattern myPattern = Pattern.compile("($^)"); @@ -46,16 +46,16 @@ public class GitHubRepository extends BaseRepositoryImpl { } @SuppressWarnings({"UnusedDeclaration"}) - public GitHubRepository() {} + public GithubRepository() {} - public GitHubRepository(GitHubRepository other) { + public GithubRepository(GithubRepository other) { super(other); setRepoName(other.myRepoName); setRepoAuthor(other.myRepoAuthor); setToken(other.myToken); } - public GitHubRepository(GitHubRepositoryType type) { + public GithubRepository(GithubRepositoryType type) { super(type); } @@ -167,7 +167,7 @@ public class GitHubRepository extends BaseRepositoryImpl { @Override public TaskRepository getRepository() { - return GitHubRepository.this; + return GithubRepository.this; } @Override @@ -183,7 +183,7 @@ public class GitHubRepository extends BaseRepositoryImpl { return ContainerUtil.map2Array(result, Comment.class, new Function() { @Override public Comment fun(GithubIssueComment comment) { - return new GitHubComment(comment.getCreatedAt(), comment.getUser().getLogin(), comment.getBody(), comment.getUser().getGravatarId(), + return new GithubComment(comment.getCreatedAt(), comment.getUser().getLogin(), comment.getBody(), comment.getUser().getGravatarId(), comment.getUser().getHtmlUrl()); } }); @@ -203,7 +203,7 @@ public class GitHubRepository extends BaseRepositoryImpl { @Override public BaseRepository clone() { - return new GitHubRepository(this); + return new GithubRepository(this); } public String getRepoName() { @@ -253,9 +253,9 @@ public class GitHubRepository extends BaseRepositoryImpl { @Override public boolean equals(Object o) { if (!super.equals(o)) return false; - if (!(o instanceof GitHubRepository)) return false; + if (!(o instanceof GithubRepository)) return false; - GitHubRepository that = (GitHubRepository)o; + GithubRepository that = (GithubRepository)o; if (!Comparing.equal(getRepoAuthor(), that.getRepoAuthor())) return false; if (!Comparing.equal(getRepoName(), that.getRepoName())) return false; if (!Comparing.equal(getToken(), that.getToken())) return false; diff --git a/plugins/github/src/org/jetbrains/plugins/github/tasks/GitHubRepositoryEditor.java b/plugins/github/src/org/jetbrains/plugins/github/tasks/GithubRepositoryEditor.java similarity index 96% rename from plugins/github/src/org/jetbrains/plugins/github/tasks/GitHubRepositoryEditor.java rename to plugins/github/src/org/jetbrains/plugins/github/tasks/GithubRepositoryEditor.java index d15ddbfcca24..d2b4a8728ba1 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/tasks/GitHubRepositoryEditor.java +++ b/plugins/github/src/org/jetbrains/plugins/github/tasks/GithubRepositoryEditor.java @@ -27,7 +27,7 @@ import java.util.Collections; /** * @author Dennis.Ushakov */ -public class GitHubRepositoryEditor extends BaseRepositoryEditor { +public class GithubRepositoryEditor extends BaseRepositoryEditor { private JTextField myToken; private JTextField myRepoName; private JTextField myRepoAuthor; @@ -36,7 +36,7 @@ public class GitHubRepositoryEditor extends BaseRepositoryEditor changeListener) { + public GithubRepositoryEditor(final Project project, final GithubRepository repository, Consumer changeListener) { super(project, repository, changeListener); myUserNameText.setVisible(false); myUsernameLabel.setVisible(false); diff --git a/plugins/github/src/org/jetbrains/plugins/github/tasks/GitHubRepositoryType.java b/plugins/github/src/org/jetbrains/plugins/github/tasks/GithubRepositoryType.java similarity index 66% rename from plugins/github/src/org/jetbrains/plugins/github/tasks/GitHubRepositoryType.java rename to plugins/github/src/org/jetbrains/plugins/github/tasks/GithubRepositoryType.java index 6a68bd1ac657..a677fad0d781 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/tasks/GitHubRepositoryType.java +++ b/plugins/github/src/org/jetbrains/plugins/github/tasks/GithubRepositoryType.java @@ -13,7 +13,7 @@ import javax.swing.*; /** * @author Dennis.Ushakov */ -public class GitHubRepositoryType extends BaseRepositoryType { +public class GithubRepositoryType extends BaseRepositoryType { @NotNull @Override @@ -30,19 +30,19 @@ public class GitHubRepositoryType extends BaseRepositoryType { @NotNull @Override public TaskRepository createRepository() { - return new GitHubRepository(this); + return new GithubRepository(this); } @Override - public Class getRepositoryClass() { - return GitHubRepository.class; + public Class getRepositoryClass() { + return GithubRepository.class; } @NotNull @Override - public TaskRepositoryEditor createEditor(GitHubRepository repository, + public TaskRepositoryEditor createEditor(GithubRepository repository, Project project, - Consumer changeListener) { - return new GitHubRepositoryEditor(project, repository, changeListener); + Consumer changeListener) { + return new GithubRepositoryEditor(project, repository, changeListener); } } diff --git a/plugins/github/src/org/jetbrains/plugins/github/ui/GitHubCreateGistDialog.java b/plugins/github/src/org/jetbrains/plugins/github/ui/GithubCreateGistDialog.java similarity index 92% rename from plugins/github/src/org/jetbrains/plugins/github/ui/GitHubCreateGistDialog.java rename to plugins/github/src/org/jetbrains/plugins/github/ui/GithubCreateGistDialog.java index e6ccd2195e56..259cb393a77f 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/ui/GitHubCreateGistDialog.java +++ b/plugins/github/src/org/jetbrains/plugins/github/ui/GithubCreateGistDialog.java @@ -29,12 +29,12 @@ import javax.swing.*; * @author oleg * @date 9/27/11 */ -public class GitHubCreateGistDialog extends DialogWrapper { - private final GitHubCreateGistPanel myGithubCreateGistPanel; +public class GithubCreateGistDialog extends DialogWrapper { + private final GithubCreateGistPanel myGithubCreateGistPanel; - public GitHubCreateGistDialog(@NotNull final Project project, @Nullable Editor editor, @Nullable VirtualFile file) { + public GithubCreateGistDialog(@NotNull final Project project, @Nullable Editor editor, @Nullable VirtualFile file) { super(project, true); - myGithubCreateGistPanel = new GitHubCreateGistPanel(); + myGithubCreateGistPanel = new GithubCreateGistPanel(); // Use saved settings for controls final GithubSettings settings = GithubSettings.getInstance(); myGithubCreateGistPanel.setAnonymous(settings.isAnonymousGist()); diff --git a/plugins/github/src/org/jetbrains/plugins/github/ui/GitHubCreateGistPanel.form b/plugins/github/src/org/jetbrains/plugins/github/ui/GithubCreateGistPanel.form similarity index 98% rename from plugins/github/src/org/jetbrains/plugins/github/ui/GitHubCreateGistPanel.form rename to plugins/github/src/org/jetbrains/plugins/github/ui/GithubCreateGistPanel.form index 9154d1e31130..bc2c02451e28 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/ui/GitHubCreateGistPanel.form +++ b/plugins/github/src/org/jetbrains/plugins/github/ui/GithubCreateGistPanel.form @@ -1,5 +1,5 @@ -
+ diff --git a/plugins/github/src/org/jetbrains/plugins/github/ui/GitHubCreateGistPanel.java b/plugins/github/src/org/jetbrains/plugins/github/ui/GithubCreateGistPanel.java similarity index 96% rename from plugins/github/src/org/jetbrains/plugins/github/ui/GitHubCreateGistPanel.java rename to plugins/github/src/org/jetbrains/plugins/github/ui/GithubCreateGistPanel.java index ec4807fdd6a2..eda78b9aba65 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/ui/GitHubCreateGistPanel.java +++ b/plugins/github/src/org/jetbrains/plugins/github/ui/GithubCreateGistPanel.java @@ -23,7 +23,7 @@ import javax.swing.*; * @author oleg * @date 9/27/11 */ -public class GitHubCreateGistPanel { +public class GithubCreateGistPanel { private JTextArea myDescriptionTextArea; private JCheckBox myPrivateCheckBox; private JPanel myPanel; @@ -32,7 +32,7 @@ public class GitHubCreateGistPanel { private JTextField myFileNameField; private JLabel myFileNameLabel; - public GitHubCreateGistPanel() { + public GithubCreateGistPanel() { myDescriptionTextArea.setBorder(BorderFactory.createEtchedBorder()); myFileNameLabel.setVisible(false); myFileNameField.setVisible(false); diff --git a/plugins/github/src/org/jetbrains/plugins/github/ui/GitHubSettingsConfigurable.java b/plugins/github/src/org/jetbrains/plugins/github/ui/GithubSettingsConfigurable.java similarity index 94% rename from plugins/github/src/org/jetbrains/plugins/github/ui/GitHubSettingsConfigurable.java rename to plugins/github/src/org/jetbrains/plugins/github/ui/GithubSettingsConfigurable.java index ef2aefa47122..03e3b08801ef 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/ui/GitHubSettingsConfigurable.java +++ b/plugins/github/src/org/jetbrains/plugins/github/ui/GithubSettingsConfigurable.java @@ -14,11 +14,11 @@ import javax.swing.*; /** * @author oleg */ -public class GitHubSettingsConfigurable implements SearchableConfigurable, VcsConfigurableProvider { +public class GithubSettingsConfigurable implements SearchableConfigurable, VcsConfigurableProvider { private GithubSettingsPanel mySettingsPane; private final GithubSettings mySettings; - public GitHubSettingsConfigurable() { + public GithubSettingsConfigurable() { mySettings = GithubSettings.getInstance(); }