summaryrefslogtreecommitdiff
path: root/java/core/src/main/java/com/google/protobuf/AbstractMessage.java
diff options
context:
space:
mode:
authorFeng Xiao <xiaofeng@google.com>2016-07-06 15:44:34 -0700
committerGitHub <noreply@github.com>2016-07-06 15:44:34 -0700
commit0d5091ee8878484ccd407aa58cb80c9cac7e2d61 (patch)
tree08e996dc8eed8dc34910fff9bc2af12c1d867157 /java/core/src/main/java/com/google/protobuf/AbstractMessage.java
parentc10938a1d9c4002370f750662520869f35838921 (diff)
parentd2ae4966238564b51f6b962d870b121131767f64 (diff)
downloadprotobuf-javalite-0d5091ee8878484ccd407aa58cb80c9cac7e2d61.tar.gz
Merge pull request #1742 from ottok/fix-spelling
Fix spelling
Diffstat (limited to 'java/core/src/main/java/com/google/protobuf/AbstractMessage.java')
-rw-r--r--java/core/src/main/java/com/google/protobuf/AbstractMessage.java12
1 files changed, 6 insertions, 6 deletions
diff --git a/java/core/src/main/java/com/google/protobuf/AbstractMessage.java b/java/core/src/main/java/com/google/protobuf/AbstractMessage.java
index b8fdb2b2..46ddbf48 100644
--- a/java/core/src/main/java/com/google/protobuf/AbstractMessage.java
+++ b/java/core/src/main/java/com/google/protobuf/AbstractMessage.java
@@ -498,7 +498,7 @@ public abstract class AbstractMessage
* override this method.
*/
void markClean() {
- throw new IllegalStateException("Should be overriden by subclasses.");
+ throw new IllegalStateException("Should be overridden by subclasses.");
}
/**
@@ -510,7 +510,7 @@ public abstract class AbstractMessage
* override this method.
*/
void dispose() {
- throw new IllegalStateException("Should be overriden by subclasses.");
+ throw new IllegalStateException("Should be overridden by subclasses.");
}
// ===============================================================
@@ -605,7 +605,7 @@ public abstract class AbstractMessage
}
/**
- * @deprecated from v3.0.0-beta-3+, for compatiblity with v2.5.0 and v2.6.1
+ * @deprecated from v3.0.0-beta-3+, for compatibility with v2.5.0 and v2.6.1
* generated code.
*/
@Deprecated
@@ -614,7 +614,7 @@ public abstract class AbstractMessage
}
//
/**
- * @deprecated from v3.0.0-beta-3+, for compatiblity with v2.5.0 and v2.6.1
+ * @deprecated from v3.0.0-beta-3+, for compatibility with v2.5.0 and v2.6.1
* generated code.
*/
@Deprecated
@@ -623,7 +623,7 @@ public abstract class AbstractMessage
}
//
/**
- * @deprecated from v3.0.0-beta-3+, for compatiblity with v2.5.0 and v2.6.1
+ * @deprecated from v3.0.0-beta-3+, for compatibility with v2.5.0 and v2.6.1
* generated code.
*/
@Deprecated
@@ -632,7 +632,7 @@ public abstract class AbstractMessage
}
//
/**
- * @deprecated from v3.0.0-beta-3+, for compatiblity with v2.5.0 and v2.6.1
+ * @deprecated from v3.0.0-beta-3+, for compatibility with v2.5.0 and v2.6.1
* generated code.
*/
@Deprecated