This commit is contained in:
Evgeny Zakrevsky
2012-10-10 02:25:02 +04:00
parent ed8ca38d25
commit 3ea06f5d17
5 changed files with 30 additions and 28 deletions
@@ -116,7 +116,7 @@
<tasks.repositoryType implementation="com.intellij.tasks.trac.TracRepositoryType"/>
<tasks.repositoryType implementation="com.intellij.tasks.fogbugz.FogBugzRepositoryType"/>
<tasks.repositoryType implementation="com.intellij.tasks.mantis.MantisRepositoryType"/>
<tasks.repositoryType implementation="com.intellij.tasks.connector.WebRepositoryType"/>
<tasks.repositoryType implementation="com.intellij.tasks.generic.GenericWebRepositoryType"/>
<checkinHandlerFactory implementation="com.intellij.tasks.impl.TaskCheckinHandlerFactory"/>
</extensions>
@@ -1,4 +1,4 @@
package com.intellij.tasks.connector;
package com.intellij.tasks.generic;
import com.intellij.openapi.util.Comparing;
import com.intellij.tasks.Task;
@@ -22,7 +22,7 @@ import java.util.regex.Pattern;
* Date: 10/4/12
*/
@Tag("Web")
public class WebRepository extends BaseRepositoryImpl {
public class GenericWebRepository extends BaseRepositoryImpl {
private String myTasksListURL;
private String myTaskPattern;
private String myLoginURL;
@@ -36,14 +36,14 @@ public class WebRepository extends BaseRepositoryImpl {
final static String PAGE_PLACEHOLDER = "{page}";
@SuppressWarnings({"UnusedDeclaration"})
public WebRepository() {
public GenericWebRepository() {
}
public WebRepository(final TaskRepositoryType type) {
public GenericWebRepository(final TaskRepositoryType type) {
super(type);
}
public WebRepository(final WebRepository other) {
public GenericWebRepository(final GenericWebRepository other) {
super(other);
myTasksListURL = other.getTasksListURL();
myTaskPattern = other.getTaskPattern();
@@ -75,7 +75,7 @@ public class WebRepository extends BaseRepositoryImpl {
while (matcher.find()) {
final String id = matcher.group(placeholders.indexOf(ID_PLACEHOLDER) + 1);
final String summary = matcher.group(placeholders.indexOf(SUMMARY_PLACEHOLDER) + 1);
tasks.add(new WebTask(id, summary));
tasks.add(new GenericWebTask(id, summary));
}
tasks = TaskSearchSupport.filterTasks(query != null ? query : "", tasks);
@@ -129,7 +129,7 @@ public class WebRepository extends BaseRepositoryImpl {
@Override
public BaseRepository clone() {
return new WebRepository(this);
return new GenericWebRepository(this);
}
public String getTasksListURL() {
@@ -151,9 +151,9 @@ public class WebRepository extends BaseRepositoryImpl {
@Override
public boolean equals(final Object o) {
if (this == o) return true;
if (!(o instanceof WebRepository)) return false;
if (!(o instanceof GenericWebRepository)) return false;
if (!super.equals(o)) return false;
WebRepository that = (WebRepository)o;
GenericWebRepository that = (GenericWebRepository)o;
if (!Comparing.equal(getTasksListURL(), that.getTasksListURL())) return false;
if (!Comparing.equal(getTaskPattern(), that.getTaskPattern())) return false;
if (!Comparing.equal(getLoginURL(), that.getLoginURL())) return false;
@@ -1,4 +1,4 @@
package com.intellij.tasks.connector;
package com.intellij.tasks.generic;
import com.intellij.openapi.project.Project;
import com.intellij.tasks.config.BaseRepositoryEditor;
@@ -13,7 +13,7 @@ import javax.swing.*;
* User: Evgeny.Zakrevsky
* Date: 10/4/12
*/
public class WebRepositoryEditor extends BaseRepositoryEditor<WebRepository> {
public class GenericWebRepositoryEditor extends BaseRepositoryEditor<GenericWebRepository> {
private JBLabel myTasksListURLLabel;
private JBLabel myTaskPatternLabel;
private JTextField myTasksListURLText;
@@ -21,7 +21,9 @@ public class WebRepositoryEditor extends BaseRepositoryEditor<WebRepository> {
private JBLabel myLoginURLLabel;
private JTextField myLoginURLText;
public WebRepositoryEditor(final Project project, final WebRepository repository, final Consumer<WebRepository> changeListener) {
public GenericWebRepositoryEditor(final Project project,
final GenericWebRepository repository,
final Consumer<GenericWebRepository> changeListener) {
super(project, repository, changeListener);
myUrlLabel.setText("{serverUrl}:");
myUsernameLabel.setText("{username}:");
@@ -57,10 +59,10 @@ public class WebRepositoryEditor extends BaseRepositoryEditor<WebRepository> {
installListener(myLoginURLText);
return FormBuilder.createFormBuilder().setAlignLabelOnRight(true)
.addLabeledComponent(myLoginURLLabel, myLoginURLText)
.addTooltip("Available placeholders: " + WebRepository.SERVER_URL_PLACEHOLDER + ", " +
WebRepository.USERNAME_PLACEHOLDER + ", " + WebRepository.PASSWORD_PLACEHOLDER)
.addTooltip("Available placeholders: " + GenericWebRepository.SERVER_URL_PLACEHOLDER + ", " +
GenericWebRepository.USERNAME_PLACEHOLDER + ", " + GenericWebRepository.PASSWORD_PLACEHOLDER)
.addLabeledComponent(myTasksListURLLabel, myTasksListURLText)
.addTooltip("Available placeholders: " + WebRepository.SERVER_URL_PLACEHOLDER)
.addTooltip("Available placeholders: " + GenericWebRepository.SERVER_URL_PLACEHOLDER)
.addLabeledComponent(myTaskPatternLabel, myTaskPatternText)
.addTooltip("Task pattern should be a regexp with two matching group: ({id}.+?) and ({summary}.+?)")
.getPanel();
@@ -1,4 +1,4 @@
package com.intellij.tasks.connector;
package com.intellij.tasks.generic;
import com.intellij.icons.AllIcons;
import com.intellij.openapi.project.Project;
@@ -14,11 +14,11 @@ import javax.swing.*;
* User: Evgeny.Zakrevsky
* Date: 10/4/12
*/
public class WebRepositoryType extends BaseRepositoryType<WebRepository> {
public class GenericWebRepositoryType extends BaseRepositoryType<GenericWebRepository> {
@NotNull
@Override
public String getName() {
return "Web Repository";
return "Generic Web Repository";
}
@Override
@@ -29,20 +29,20 @@ public class WebRepositoryType extends BaseRepositoryType<WebRepository> {
@NotNull
@Override
public TaskRepository createRepository() {
return new WebRepository(this);
return new GenericWebRepository(this);
}
@Override
public Class<WebRepository> getRepositoryClass() {
return WebRepository.class;
public Class<GenericWebRepository> getRepositoryClass() {
return GenericWebRepository.class;
}
@NotNull
@Override
public TaskRepositoryEditor createEditor(final WebRepository repository,
public TaskRepositoryEditor createEditor(final GenericWebRepository repository,
final Project project,
final Consumer<WebRepository> changeListener) {
return new WebRepositoryEditor(project, repository, changeListener);
final Consumer<GenericWebRepository> changeListener) {
return new GenericWebRepositoryEditor(project, repository, changeListener);
}
@Override
@@ -1,4 +1,4 @@
package com.intellij.tasks.connector;
package com.intellij.tasks.generic;
import com.intellij.tasks.Comment;
import com.intellij.tasks.Task;
@@ -10,11 +10,11 @@ import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.util.Date;
public class WebTask extends Task {
public class GenericWebTask extends Task {
private final String myId;
private final String myDescription;
public WebTask(final String id, final String description) {
public GenericWebTask(final String id, final String description) {
myId = id;
myDescription = description;
}