Browse Source

Replace 'occured' by 'occurred'

This change fixes a common typo.

Signed-off-by: Philipp Thun <philipp.thun@sap.com>
stable-0.12
Philipp Thun 14 years ago
parent
commit
79ad15924a
  1. 4
      org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties
  2. 4
      org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java
  3. 4
      org.eclipse.jgit/src/org/eclipse/jgit/api/CommitCommand.java
  4. 2
      org.eclipse.jgit/src/org/eclipse/jgit/api/LogCommand.java
  5. 2
      org.eclipse.jgit/src/org/eclipse/jgit/api/MergeResult.java
  6. 6
      org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java

4
org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties

@ -180,8 +180,8 @@ exceptionCaughtDuringExecutionOfResetCommand=Exception caught during execution o
exceptionCaughtDuringExecutionOfRevertCommand=Exception caught during execution of revert command. {0}
exceptionCaughtDuringExecutionOfRmCommand=Exception caught during execution of rm command
exceptionCaughtDuringExecutionOfTagCommand=Exception caught during execution of tag command
exceptionOccuredDuringAddingOfOptionToALogCommand=Exception occured during adding of {0} as option to a Log command
exceptionOccuredDuringReadingOfGIT_DIR=Exception occured during reading of $GIT_DIR/{0}. {1}
exceptionOccurredDuringAddingOfOptionToALogCommand=Exception occurred during adding of {0} as option to a Log command
exceptionOccurredDuringReadingOfGIT_DIR=Exception occurred during reading of $GIT_DIR/{0}. {1}
expectedACKNAKFoundEOF=Expected ACK/NAK, found EOF
expectedACKNAKGot=Expected ACK/NAK, got: {0}
expectedBooleanStringValue=Expected boolean string value

4
org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java

@ -240,8 +240,8 @@ public class JGitText extends TranslationBundle {
/***/ public String exceptionCaughtDuringExecutionOfRevertCommand;
/***/ public String exceptionCaughtDuringExecutionOfRmCommand;
/***/ public String exceptionCaughtDuringExecutionOfTagCommand;
/***/ public String exceptionOccuredDuringAddingOfOptionToALogCommand;
/***/ public String exceptionOccuredDuringReadingOfGIT_DIR;
/***/ public String exceptionOccurredDuringAddingOfOptionToALogCommand;
/***/ public String exceptionOccurredDuringReadingOfGIT_DIR;
/***/ public String expectedACKNAKFoundEOF;
/***/ public String expectedACKNAKGot;
/***/ public String expectedBooleanStringValue;

4
org.eclipse.jgit/src/org/eclipse/jgit/api/CommitCommand.java

@ -441,7 +441,7 @@ public class CommitCommand extends GitCommand<RevCommit> {
parents = repo.readMergeHeads();
} catch (IOException e) {
throw new JGitInternalException(MessageFormat.format(
JGitText.get().exceptionOccuredDuringReadingOfGIT_DIR,
JGitText.get().exceptionOccurredDuringReadingOfGIT_DIR,
Constants.MERGE_HEAD, e), e);
}
if (message == null) {
@ -449,7 +449,7 @@ public class CommitCommand extends GitCommand<RevCommit> {
message = repo.readMergeCommitMsg();
} catch (IOException e) {
throw new JGitInternalException(MessageFormat.format(
JGitText.get().exceptionOccuredDuringReadingOfGIT_DIR,
JGitText.get().exceptionOccurredDuringReadingOfGIT_DIR,
Constants.MERGE_MSG, e), e);
}
}

2
org.eclipse.jgit/src/org/eclipse/jgit/api/LogCommand.java

@ -219,7 +219,7 @@ public class LogCommand extends GitCommand<Iterable<RevCommit>> {
throw e;
} catch (IOException e) {
throw new JGitInternalException(MessageFormat.format(
JGitText.get().exceptionOccuredDuringAddingOfOptionToALogCommand
JGitText.get().exceptionOccurredDuringAddingOfOptionToALogCommand
, start), e);
}
}

2
org.eclipse.jgit/src/org/eclipse/jgit/api/MergeResult.java

@ -311,7 +311,7 @@ public class MergeResult {
* }
* }</pre>
*
* @return the conflicts or <code>null</code> if no conflict occured
* @return the conflicts or <code>null</code> if no conflict occurred
*/
public Map<String, int[][]> getConflicts() {
return conflicts;

6
org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java

@ -351,7 +351,7 @@ public class ResolveMerger extends ThreeWayMerger {
* the file in the working tree
* @return <code>false</code> if the merge will fail because the index entry
* didn't match ours or the working-dir file was dirty and a
* conflict occured
* conflict occurred
* @throws MissingObjectException
* @throws IncorrectObjectTypeException
* @throws CorruptObjectException
@ -507,7 +507,7 @@ public class ResolveMerger extends ThreeWayMerger {
}
if (result.containsConflicts()) {
// a conflict occured, the file will contain conflict markers
// a conflict occurred, the file will contain conflict markers
// the index will be populated with the three stages and only the
// workdir (if used) contains the halfways merged content
add(tw.getRawPath(), base, DirCacheEntry.STAGE_1);
@ -516,7 +516,7 @@ public class ResolveMerger extends ThreeWayMerger {
mergeResults.put(tw.getPathString(), result);
return false;
} else {
// no conflict occured, the file will contain fully merged content.
// no conflict occurred, the file will contain fully merged content.
// the index will be populated with the new merged version
DirCacheEntry dce = new DirCacheEntry(tw.getPathString());
dce.setFileMode(tw.getFileMode(0));

Loading…
Cancel
Save