Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorspingel2009-06-14 23:38:26 +0000
committerspingel2009-06-14 23:38:26 +0000
commit188c3cc1a05475a6e47a523687633aa51e6ae560 (patch)
tree11ee642dfd0336dc67f51f7fbfce686ba055d1ad /org.eclipse.mylyn.trac.core
parentca814281c55598e546a17efbcf9536e3c3c82583 (diff)
downloadorg.eclipse.mylyn.tasks-188c3cc1a05475a6e47a523687633aa51e6ae560.tar.gz
org.eclipse.mylyn.tasks-188c3cc1a05475a6e47a523687633aa51e6ae560.tar.xz
org.eclipse.mylyn.tasks-188c3cc1a05475a6e47a523687633aa51e6ae560.zip
RESOLVED - bug 175211: Support Trac 0.11
https://bugs.eclipse.org/bugs/show_bug.cgi?id=175211
Diffstat (limited to 'org.eclipse.mylyn.trac.core')
-rw-r--r--org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/Messages.java2
-rw-r--r--org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracRepositoryConnector.java4
-rw-r--r--org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/client/Messages.java1
-rw-r--r--org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/client/TracWebClient.java5
-rw-r--r--org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/client/messages.properties1
-rw-r--r--org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/messages.properties1
6 files changed, 9 insertions, 5 deletions
diff --git a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/Messages.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/Messages.java
index 61259f013..cc5be6cfb 100644
--- a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/Messages.java
+++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/Messages.java
@@ -75,6 +75,8 @@ public class Messages extends NLS {
public static String TracRepositoryConnector_Querying_repository;
+ public static String TracRepositoryConnector_Trac_Client_Label;
+
public static String TracRepositoryConnector_TRAC_SUPPORTS_0_9_OR_0_10_THROUGH_WEB_AND_XML_RPC;
public static String TracTaskDataHandler_Accept;
diff --git a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracRepositoryConnector.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracRepositoryConnector.java
index a90723327..d480f048f 100644
--- a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracRepositoryConnector.java
+++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracRepositoryConnector.java
@@ -225,8 +225,6 @@ public class TracRepositoryConnector extends AbstractRepositoryConnector {
}
}
- private final static String CLIENT_LABEL = Messages.TracRepositoryConnector_TRAC_SUPPORTS_0_9_OR_0_10_THROUGH_WEB_AND_XML_RPC;
-
private final static Date DEFAULT_COMPLETION_DATE = new Date(0);
private static int TASK_PRIORITY_LEVELS = 5;
@@ -374,7 +372,7 @@ public class TracRepositoryConnector extends AbstractRepositoryConnector {
@Override
public String getLabel() {
- return CLIENT_LABEL;
+ return Messages.TracRepositoryConnector_Trac_Client_Label;
}
@Override
diff --git a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/client/Messages.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/client/Messages.java
index 2bb978305..1356ad718 100644
--- a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/client/Messages.java
+++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/client/Messages.java
@@ -26,6 +26,7 @@ public class Messages extends NLS {
NLS.initializeMessages(BUNDLE_NAME, Messages.class);
}
+ public static String TracWebClient_Trac_version_X_is_unsupported_Error;
public static String TracWebClient_Updating_attributes;
public static String TracXmlRpcClient_API_version_unsupported_Error;
public static String TracXmlRpcClient_API_version_X_unsupported_Error;
diff --git a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/client/TracWebClient.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/client/TracWebClient.java
index f96bd434c..5fd6c4873 100644
--- a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/client/TracWebClient.java
+++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/client/TracWebClient.java
@@ -66,6 +66,7 @@ import org.eclipse.mylyn.internal.trac.core.model.TracSearchFilter.CompareOperat
import org.eclipse.mylyn.internal.trac.core.model.TracTicket.Key;
import org.eclipse.mylyn.internal.trac.core.util.TracUtil;
import org.eclipse.mylyn.internal.trac.core.util.TracHttpClientTransportFactory.TracHttpException;
+import org.eclipse.osgi.util.NLS;
/**
* Represents a Trac repository that is accessed through the Trac's query script and web interface.
@@ -432,8 +433,8 @@ public class TracWebClient extends AbstractTracClient {
} else if (version.startsWith("Trac 0.11")) { //$NON-NLS-1$
return new TracRepositoryInfo(1, 0, 0, version);
} else {
- throw new TracException("The Trac version " + version //$NON-NLS-1$
- + " is unsupported. Please use version 0.9, 0.10. or 0.11"); //$NON-NLS-1$
+ throw new TracException(NLS.bind(
+ Messages.TracWebClient_Trac_version_X_is_unsupported_Error, version));
}
}
diff --git a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/client/messages.properties b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/client/messages.properties
index 516300688..dbbb3efff 100644
--- a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/client/messages.properties
+++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/client/messages.properties
@@ -1,3 +1,4 @@
+TracWebClient_Trac_version_X_is_unsupported_Error=The Trac version {0} is unsupported. Please use a version from 0.9 to 0.11
TracWebClient_Updating_attributes=Updating attributes
TracXmlRpcClient_API_version_unsupported_Error=The API version is unsupported, update the Trac XML-RPC Plugin to revision {0} or later
TracXmlRpcClient_API_version_X_unsupported_Error=The API version {0} is unsupported, update the Trac XML-RPC Plugin to revision {1} or later
diff --git a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/messages.properties b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/messages.properties
index cecf43ac6..679b37d57 100644
--- a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/messages.properties
+++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/messages.properties
@@ -26,6 +26,7 @@ TracCorePlugin_Unexpected_server_response_=Unexpected server response:
TracRepositoryConnector_Getting_changed_tasks=Getting changed tasks
TracRepositoryConnector_Querying_repository=Querying repository
+TracRepositoryConnector_Trac_Client_Label=Trac (supports 0.9 to 0.11 through Web and XML-RPC)
TracRepositoryConnector_TRAC_SUPPORTS_0_9_OR_0_10_THROUGH_WEB_AND_XML_RPC=Trac (supports 0.9 or 0.10 through Web and XML-RPC)
TracTaskDataHandler_Accept=Accept
TracTaskDataHandler_Leave=Leave

Back to the top