Kunda
Newbie
Joined: Jan 8, 2017
Post Count: 18
Status:
Offline
|
|
Misc typo fix patch
|
Patch cleans up some typos in the code. Can be applied with:
patch -p0 < sweethome3d-typos.patch
diff --git trunk/SweetHome3D/build.xml trunk/SweetHome3D/build.xml index ea94089a4..87103f936 100644 --- trunk/SweetHome3D/build.xml +++ trunk/SweetHome3D/build.xml @@ -27,7 +27,7 @@ - sourceArchive : Builds SweetHome3D-version-src.zip file in install directory - javadoc : Builds SweetHome3D-version-javadoc.zip file install directory - - jdepend : Launchs a JDepend graphical UI to help update dependencies in PackageDependenciesTest + - jdepend : Launches a JDepend graphical UI to help update dependencies in PackageDependenciesTest --> <project basedir="." default="jarExecutable" name="SweetHome3D"> <!-- The current version of Sweet Home 3D --> @@ -1382,9 +1382,9 @@ <echo message="install/SweetHome3D-${version}-javadoc.zip ready for ftp"/> </target> - <!-- Launchs a JDepend graphical UI to help update dependencies in PackageDependenciesTest test --> + <!-- Launches a JDepend graphical UI to help update dependencies in PackageDependenciesTest test --> <target name="jdepend" depends="build" - description="Launchs a JDepend graphical UI"> + description="Launches a JDepend graphical UI"> <!-- Create jdepend.properties file in build directory that specifies ignored Java packages --> <concat destfile="build/jdepend.properties">ignore.java=java.*</concat> diff --git trunk/SweetHome3D/src/com/eteks/sweethome3d/applet/HomeAppletRecorder.java trunk/SweetHome3D/src/com/eteks/sweethome3d/applet/HomeAppletRecorder.java index 69816c441..d649fb800 100644 --- trunk/SweetHome3D/src/com/eteks/sweethome3d/applet/HomeAppletRecorder.java +++ trunk/SweetHome3D/src/com/eteks/sweethome3d/applet/HomeAppletRecorder.java @@ -171,7 +171,7 @@ public class HomeAppletRecorder implements HomeRecorder { URLConnection connection = null; DefaultHomeInputStream in = null; try { - // Replace % sequence by %% except %s before formating readHomeURL with home name + // Replace % sequence by %% except %s before formatting readHomeURL with home name String readHomeURL = String.format(this.readHomeURL.replaceAll("(%[^s])", "%$1"), URLEncoder.encode(name, "UTF-8")); // Open a home input stream to server @@ -278,7 +278,7 @@ public class HomeAppletRecorder implements HomeRecorder { } HttpURLConnection connection = null; try { - // Replace % sequence by %% except %s before formating readHomeURL with home name + // Replace % sequence by %% except %s before formatting readHomeURL with home name String deletedHomeURL = String.format(this.deleteHomeURL.replaceAll("(%[^s])", "%$1"), URLEncoder.encode(name, "UTF-8")); // Send request to server diff --git trunk/SweetHome3D/src/com/eteks/sweethome3d/io/Base64.java trunk/SweetHome3D/src/com/eteks/sweethome3d/io/Base64.java index 596cd74be..e7f8e3c97 100644 --- trunk/SweetHome3D/src/com/eteks/sweethome3d/io/Base64.java +++ trunk/SweetHome3D/src/com/eteks/sweethome3d/io/Base64.java @@ -453,7 +453,7 @@ public class Base64 { * anywhere along their length by specifying * <var>srcOffset</var> and <var>destOffset</var>. * This method does not check to make sure your arrays - * are large enough to accomodate <var>srcOffset</var> + 3 for + * are large enough to accommodate <var>srcOffset</var> + 3 for * the <var>source</var> array or <var>destOffset</var> + 4 for * the <var>destination</var> array. * The actual number of significant bytes in your array is @@ -785,7 +785,7 @@ public class Base64 { * anywhere along their length by specifying * <var>srcOffset</var> and <var>destOffset</var>. * This method does not check to make sure your arrays - * are large enough to accomodate <var>srcOffset</var> + 4 for + * are large enough to accommodate <var>srcOffset</var> + 4 for * the <var>source</var> array or <var>destOffset</var> + 3 for * the <var>destination</var> array. * This method returns the actual number of bytes that diff --git trunk/SweetHome3D/src/com/eteks/sweethome3d/model/Room.java trunk/SweetHome3D/src/com/eteks/sweethome3d/model/Room.java index c9be41efb..ae0cc909c 100644 --- trunk/SweetHome3D/src/com/eteks/sweethome3d/model/Room.java +++ trunk/SweetHome3D/src/com/eteks/sweethome3d/model/Room.java @@ -80,7 +80,7 @@ public class Room extends HomeObject implements Selectable, Elevatable { */ public Room(float [][] points) { if (points.length <= 1) { - throw new IllegalStateException("Room points must containt at least two points"); + throw new IllegalStateException("Room points must contain at least two points"); } this.points = deepCopy(points); this.areaVisible = true; @@ -319,7 +319,7 @@ public class Room extends HomeObject implements Selectable, Elevatable { if (index < 0 || index >= this.points.length) { throw new IndexOutOfBoundsException("Invalid index " + index); } else if (this.points.length <= 1) { - throw new IllegalStateException("Room points must containt at least one point"); + throw new IllegalStateException("Room points must contain at least one point"); } float [][] newPoints = new float [this.points.length - 1][];
|