From 1f13a2b67683eeb502402d6ca301570ae1ee4203 Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 21:32:55 +0000 Subject: [PATCH] - Fixed several misspellings, changed occured to occurred. --- res/lang/en.properties | 2 +- src/forge/error/ErrorViewer.java | 2 +- src/forge/properties/ForgeProps.java | 2 +- src/org/jdesktop/swingx/painter/AbstractPainter.java | 2 +- src/treeProperties/TreeProperties.java | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/res/lang/en.properties b/res/lang/en.properties index e9ea065842e..90270e5997b 100644 --- a/res/lang/en.properties +++ b/res/lang/en.properties @@ -85,7 +85,7 @@ DownloadPictures/errors/other=You must be connected to the Internet. Error downl ErrorViewer/show=Stack Report ErrorViewer/title=Error -ErrorViewer/message=An error has occured. You can copy/paste this message or save it to a file.\n\ +ErrorViewer/message=An error has occurred. You can copy/paste this message or save it to a file.\n\ Please report this, plus what you tried to do, to:\n\ \t%s\n\ If you don't want to register an account, you can mail it directly to\n\ diff --git a/src/forge/error/ErrorViewer.java b/src/forge/error/ErrorViewer.java index 7af305477c1..a95d9934be2 100644 --- a/src/forge/error/ErrorViewer.java +++ b/src/forge/error/ErrorViewer.java @@ -32,7 +32,7 @@ import forge.properties.NewConstants; /** - * The class ErrorViewer. Enables showing and saving error messages that occured in forge. + * The class ErrorViewer. Enables showing and saving error messages that occurred in forge. * * @version V1.0 02.08.2009 * @author Clemens Koza diff --git a/src/forge/properties/ForgeProps.java b/src/forge/properties/ForgeProps.java index 05fb3b57344..bbeedaa5998 100644 --- a/src/forge/properties/ForgeProps.java +++ b/src/forge/properties/ForgeProps.java @@ -115,7 +115,7 @@ public class ForgeProps { //exceptions are skipped here; also the error viewer uses this, and reporting exceptions may result //in a more fatal error (stack overflow) } catch(Exception ex) {} - //if no property was found, or an error occured, return the default value + //if no property was found, or an error occurred, return the default value return def; } } diff --git a/src/org/jdesktop/swingx/painter/AbstractPainter.java b/src/org/jdesktop/swingx/painter/AbstractPainter.java index 00552c42f95..a42fa7196e7 100644 --- a/src/org/jdesktop/swingx/painter/AbstractPainter.java +++ b/src/org/jdesktop/swingx/painter/AbstractPainter.java @@ -421,7 +421,7 @@ public abstract class AbstractPainter extends AbstractBean implements Painter doPaint(g, obj, width, height); } - //painting has occured, so restore the dirty bit to false + //painting has occurred, so restore the dirty bit to false setDirty(false); } } \ No newline at end of file diff --git a/src/treeProperties/TreeProperties.java b/src/treeProperties/TreeProperties.java index 0dd36d610bd..1453e531f5d 100644 --- a/src/treeProperties/TreeProperties.java +++ b/src/treeProperties/TreeProperties.java @@ -200,12 +200,12 @@ public class TreeProperties implements Iterable { } /** - * If exceptions occured during construction, this method throws an IOException that combines the messages of + * If exceptions occurred during construction, this method throws an IOException that combines the messages of * those exceptions. */ public void rethrow() throws IOException { if(exceptions.isEmpty()) return; - StringBuilder sb = new StringBuilder("The following exceptions occured:"); + StringBuilder sb = new StringBuilder("The following exceptions occurred:"); for(Exception ex:exceptions) { sb.append("\n"); sb.append(ex.getMessage());