diff options
| author | Kevin Sawicki | 2011-09-11 19:55:30 +0000 |
|---|---|---|
| committer | Kevin Sawicki | 2011-09-11 19:55:30 +0000 |
| commit | bfbbf3d66b312f5cb9375ea34f6d5670791ba618 (patch) | |
| tree | 47c32cc720aaf55e66f3cbfd681e8e7d720d1b89 /org.eclipse.mylyn.github.core | |
| parent | a850e9b287b7203d974f077eb2c2ecf7d5409f73 (diff) | |
| download | egit-github-bfbbf3d66b312f5cb9375ea34f6d5670791ba618.tar.gz egit-github-bfbbf3d66b312f5cb9375ea34f6d5670791ba618.tar.xz egit-github-bfbbf3d66b312f5cb9375ea34f6d5670791ba618.zip | |
Add message for field error code of already_exists
Change-Id: I020f1e80aa36ee1dd5070d79fb8e58ad4640e3b4
Signed-off-by: Kevin Sawicki <kevin@github.com>
Diffstat (limited to 'org.eclipse.mylyn.github.core')
3 files changed, 18 insertions, 8 deletions
diff --git a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/GitHubException.java b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/GitHubException.java index e57a839c..54952fd2 100644 --- a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/GitHubException.java +++ b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/GitHubException.java @@ -68,6 +68,7 @@ public class GitHubException extends IOException { String value = error.getValue(); String field = error.getField(); String resource = error.getResource(); + if (FieldError.CODE_INVALID.equals(code)) if (value != null) return MessageFormat @@ -76,12 +77,17 @@ public class GitHubException extends IOException { else return MessageFormat.format(Messages.FieldError_InvalidField, field); - else if (FieldError.CODE_MISSING_FIELD.equals(code)) + + if (FieldError.CODE_MISSING_FIELD.equals(code)) return MessageFormat .format(Messages.FieldError_MissingField, field); - else - return MessageFormat.format(Messages.FieldError_ResourceError, - field, resource); - } + if (FieldError.CODE_ALREADY_EXISTS.equals(code)) + return MessageFormat.format( + Messages.FieldError_AlreadyExists, + resource, field); + + return MessageFormat.format(Messages.FieldError_ResourceError, field, + resource); + } } diff --git a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/Messages.java b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/Messages.java index 0c8858bf..60ae28f3 100644 --- a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/Messages.java +++ b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/Messages.java @@ -31,6 +31,9 @@ public class Messages extends NLS { /** */ public static String FieldError_ResourceError; + /** */ + public static String FieldError_AlreadyExists; + static { // initialize resource bundle NLS.initializeMessages(BUNDLE_NAME, Messages.class); diff --git a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/messages.properties b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/messages.properties index afff5176..0900eb94 100644 --- a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/messages.properties +++ b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/messages.properties @@ -1,4 +1,5 @@ FieldError_InvalidField=Invalid value for field {0} -FieldError_InvalidFieldWithValue=Invalid value of {0} for field {1} -FieldError_MissingField=Missing required field {0} -FieldError_ResourceError=Error with field {0} in {1} resource +FieldError_InvalidFieldWithValue=Invalid value of ''{0}'' for field ''{1}'' +FieldError_MissingField=Missing required field ''{0}'' +FieldError_ResourceError=Error with field ''{0}'' in {1} resource +FieldError_AlreadyExists={0} resource with field ''{1}'' already exists |