Thread: [Gridarta-commit] SF.net SVN: gridarta: [3689] trunk (Page 52)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 3689
          http://gridarta.svn.sourceforge.net/gridarta/?rev=3689&view=rev
Author:   akirschbaum
Date:     2008-03-14 14:48:12 -0700 (Fri, 14 Mar 2008)

Log Message:
-----------
Fix typos.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/filter/Filter.java
    trunk/crossfire/src/cfeditor/filter/NamedFilterList.java
    trunk/crossfire/src/cfeditor/gameobject/scripts/ScriptedEvent.java
    trunk/crossfire/src/cfeditor/gui/map/MapPropertiesDialog.java
    trunk/crossfire/src/cfeditor/gui/prefs/GUIPrefs.java
    trunk/crossfire/src/cfeditor/map/MapArchObject.java
    trunk/crossfire/src/cfeditor/map/package-info.java
    trunk/daimonin/src/daieditor/gameobject/face/FaceObject.java
    trunk/daimonin/src/daieditor/gameobject/scripts/ScriptedEvent.java
    trunk/daimonin/src/daieditor/gui/map/MapPropertiesDialog.java
    trunk/daimonin/src/daieditor/gui/prefs/GUIPrefs.java
    trunk/daimonin/src/daieditor/map/package-info.java
    trunk/src/app/net/sf/gridarta/gameobject/GameObject.java
    trunk/src/app/net/sf/gridarta/gui/GameObjectAttributesPanel.java
    trunk/src/app/net/sf/gridarta/gui/MainView.java
    trunk/src/app/net/sf/gridarta/gui/MapFileFilter.java
    trunk/src/app/net/sf/gridarta/help/Help.java
    trunk/src/app/net/sf/gridarta/io/PathManager.java
    trunk/src/app/net/sf/gridarta/map/validation/AbstractValidator.java
    trunk/src/app/net/sf/gridarta/treasurelist/TreasureCellRenderer.java

Modified: trunk/crossfire/src/cfeditor/filter/Filter.java
===================================================================

--- trunk/crossfire/src/cfeditor/filter/Filter.java	2008-03-14 21:02:06 UTC (rev 3688)
+++ trunk/crossfire/src/cfeditor/filter/Filter.java	2008-03-14 21:48:12 UTC (rev 3689)
@@ -26,7 +26,7 @@
 /**
  * Interface for Filters.
  *
- * <p> Interface used to filter and analyse maps. Basically a filter gets an
+ * <p> Interface used to filter and analyze maps. Basically a filter gets an
  * {@link GameObject} and tells if it got a match. It also gets reset when the
  * map square is changed, So more complex behavior can be achieved.
  *
@@ -35,16 +35,16 @@
 public interface Filter {
 
     /**
-     * Tells wether we got a match on specific {@link GameObject}. The analysis
+     * Tells whether we got a match on specific {@link GameObject}. The analysis
      * tool will call this function with every game object on a given map
-     * square. The match function is responsible for analysing inventories if
+     * square. The match function is responsible for analyzing inventories if
      * it needs to. Unless {@link #hasGlobalMatch(FilterConfig)} returns
-     * <code>true</code>, when a match occured, this function is not called
+     * <code>true</code>, when a match occurred, this function is not called
      * with the remaining game objects on the map square and a reset is issued.
      *
      * @param config The filter configuration to use.
      *
-     * @param gameObject The game object being analysed on the map.
+     * @param gameObject The game object being analyzed on the map.
      *
      * @return <code>true</code> if it match the criteria, <code>false</code>
      * otherwise. This value is ignored if <code>hasGlobalMatch()</code>
@@ -71,7 +71,7 @@
      * match result. If all game objects must be analyzed to decide the result
      * of a match, the return value of {@link #match(FilterConfig,GameObject)}
      * is ignored and the returning value of {@link #reset(FilterConfig)} is
-     * used as replacement. This should mainly used by complex analyse
+     * used as replacement. This should mainly used by complex analyze
      * filters.
      *
      * @param config The filter configuration to use.

Modified: trunk/crossfire/src/cfeditor/filter/NamedFilterList.java
===================================================================
--- trunk/crossfire/src/cfeditor/filter/NamedFilterList.java	2008-03-14 21:02:06 UTC (rev 3688)
+++ trunk/crossfire/src/cfeditor/filter/NamedFilterList.java	2008-03-14 21:48:12 UTC (rev 3689)
@@ -36,10 +36,10 @@
 /**
  * Filter that aggregates named filters.
  * <p/>
- * This filter agregate a list of named filters.
- * Each subFilter can be (dis)enabled.
- * The names of filters are harcoded for now.
- * They may need to be loaded from, eg, an xml file later.
+ * This filter aggregates a list of named filters.
+ * Each sub-filter can be (dis)enabled.
+ * The names of filters are hard-coded for now.
+ * They may need to be loaded from, e.g., an XML file later.
  * @author tchize
  */
 public class NamedFilterList implements Filter {

Modified: trunk/crossfire/src/cfeditor/gameobject/scripts/ScriptedEvent.java
===================================================================
--- trunk/crossfire/src/cfeditor/gameobject/scripts/ScriptedEvent.java	2008-03-14 21:02:06 UTC (rev 3688)
+++ trunk/crossfire/src/cfeditor/gameobject/scripts/ScriptedEvent.java	2008-03-14 21:48:12 UTC (rev 3689)
@@ -83,7 +83,7 @@
      * @param eventType    type of the event
      * @param pluginName   name of the plugin
      * @param scriptPath   path to the file for this event
-     * @param options      options for this event
+     * @param options      the options for this event
      * @throws UndefinedEventArchetypeException In case there is no Archetype to create a ScriptedEvent.
      */
     ScriptedEvent(final int eventType, final String pluginName, final String scriptPath, final String options) throws UndefinedEventArchetypeException {
@@ -152,7 +152,7 @@
 
     /**
      * Edit path and plugin name for this event. A popup dialog is shown
-     * with input textfields for file path and plugin name.
+     * with input text fields for file path and plugin name.
      */
     public void editParameters() {
         if (pathFrame == null) {
@@ -239,7 +239,7 @@
     /**
      * Return the underlying event game object.
      *
-     * @return the underlynig event game object
+     * @return the underlying event game object
      */
     public GameObject getEventArch() {
         return event;

Modified: trunk/crossfire/src/cfeditor/gui/map/MapPropertiesDialog.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/map/MapPropertiesDialog.java	2008-03-14 21:02:06 UTC (rev 3688)
+++ trunk/crossfire/src/cfeditor/gui/map/MapPropertiesDialog.java	2008-03-14 21:48:12 UTC (rev 3689)
@@ -134,7 +134,7 @@
     /** The MapTilePane. */
     private final MapTilePane mapTilePane;
 
-    /** Wether the map tile pane was enabled. */
+    /** Whether the map tile pane was enabled. */
     private final boolean mapTilePaneEnabled;
 
     /**

Modified: trunk/crossfire/src/cfeditor/gui/prefs/GUIPrefs.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/prefs/GUIPrefs.java	2008-03-14 21:02:06 UTC (rev 3688)
+++ trunk/crossfire/src/cfeditor/gui/prefs/GUIPrefs.java	2008-03-14 21:48:12 UTC (rev 3689)
@@ -58,7 +58,7 @@
     /** ComboBox for choosing the locale. */
     private JComboBox localeBox;
 
-    /** Wether to place the map tile panel at the bottom or the right. */
+    /** Whether to place the map tile panel at the bottom or the right. */
     private JCheckBox mapPanelBottom;
 
     /** Locale[]. */

Modified: trunk/crossfire/src/cfeditor/map/MapArchObject.java
===================================================================
--- trunk/crossfire/src/cfeditor/map/MapArchObject.java	2008-03-14 21:02:06 UTC (rev 3688)
+++ trunk/crossfire/src/cfeditor/map/MapArchObject.java	2008-03-14 21:48:12 UTC (rev 3689)
@@ -24,7 +24,7 @@
 
 /**
  * MapArchObject contains the specific meta data about a map that is stored in
- * the map-arch, at the very beginning of the map file. The map metadata is
+ * the map-arch, at the very beginning of the map file. The map meta data is
  * information like mapSize, difficulty level, darkness etc.).
  * @author <a href="mailto:and...@gm...">Andreas Vogl</a>
  * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
@@ -72,7 +72,7 @@
     /** The item spec for the shop, if there is one. */
     @NotNull private String shopItems = "";
 
-    /** The prefered race of the shop. */
+    /** The preferred race of the shop. */
     @NotNull private String shopRace = "";
 
     /** The greed of the shop. */

Modified: trunk/crossfire/src/cfeditor/map/package-info.java
===================================================================
--- trunk/crossfire/src/cfeditor/map/package-info.java	2008-03-14 21:02:06 UTC (rev 3688)
+++ trunk/crossfire/src/cfeditor/map/package-info.java	2008-03-14 21:48:12 UTC (rev 3689)
@@ -18,9 +18,9 @@
  */
 
 /**
- * This package containes classes and subpackages related to maps.
- * A map is a two-dimensional datastructure.
- * The map is modelled by {@link MapModel}.
+ * This package contains classes and sub-packages related to maps.
+ * A map is a two-dimensional data structure.
+ * The map is modeled by {@link MapModel}.
  * The elements of a map are {@link MapSquare}s.
  * Each {@link MapSquare} consist of zero or more {@link GameObject}s that are at this map position.
  * {@link GameObject}s can have {@link GameObject}s as content.

Modified: trunk/daimonin/src/daieditor/gameobject/face/FaceObject.java
===================================================================
--- trunk/daimonin/src/daieditor/gameobject/face/FaceObject.java	2008-03-14 21:02:06 UTC (rev 3688)
+++ trunk/daimonin/src/daieditor/gameobject/face/FaceObject.java	2008-03-14 21:48:12 UTC (rev 3689)
@@ -57,7 +57,7 @@
     private final int size;
 
     /**
-     * Wether this face is a "double" face.
+     * Whether this face is a "double" face.
      * @see "Usage FACE_FLAG_DOUBLE in client/src/client.c, client/src/map.c defined by client/src/include/main.h"
      */
     private final boolean isDouble;

Modified: trunk/daimonin/src/daieditor/gameobject/scripts/ScriptedEvent.java
===================================================================
--- trunk/daimonin/src/daieditor/gameobject/scripts/ScriptedEvent.java	2008-03-14 21:02:06 UTC (rev 3688)
+++ trunk/daimonin/src/daieditor/gameobject/scripts/ScriptedEvent.java	2008-03-14 21:48:12 UTC (rev 3689)
@@ -82,7 +82,7 @@
      * @param eventType    type of the event
      * @param pluginName   name of the plugin
      * @param scriptPath   path to the file for this event
-     * @param options      options for this event
+     * @param options      the options for this event
      * @throws UndefinedEventArchetypeException In case there is no Archetype to create a ScriptedEvent.
      */
     ScriptedEvent(final int eventType, final String pluginName, final String scriptPath, final String options) throws UndefinedEventArchetypeException {
@@ -151,7 +151,7 @@
 
     /**
      * Edit path and plugin name for this event. A popup dialog is shown
-     * with input textfields for file path and plugin name.
+     * with input text fields for file path and plugin name.
      */
     public void editParameters() {
         if (pathFrame == null) {
@@ -240,7 +240,7 @@
     /**
      * Return the underlying event game object.
      *
-     * @return the underlynig event game object
+     * @return the underlying event game object
      */
     public GameObject getEventArch() {
         return event;

Modified: trunk/daimonin/src/daieditor/gui/map/MapPropertiesDialog.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/map/MapPropertiesDialog.java	2008-03-14 21:02:06 UTC (rev 3688)
+++ trunk/daimonin/src/daieditor/gui/map/MapPropertiesDialog.java	2008-03-14 21:48:12 UTC (rev 3689)
@@ -136,7 +136,7 @@
     /** The MapTilePane. */
     private final MapTilePane mapTilePane;
 
-    /** Wether the map tile pane was enabled. */
+    /** Whether the map tile pane was enabled. */
     private final boolean mapTilePaneEnabled;
 
     /**

Modified: trunk/daimonin/src/daieditor/gui/prefs/GUIPrefs.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/prefs/GUIPrefs.java	2008-03-14 21:02:06 UTC (rev 3688)
+++ trunk/daimonin/src/daieditor/gui/prefs/GUIPrefs.java	2008-03-14 21:48:12 UTC (rev 3689)
@@ -58,7 +58,7 @@
     /** ComboBox for choosing the locale. */
     private JComboBox localeBox;
 
-    /** Wether to place the map tile panel at the bottom or the right. */
+    /** Whether to place the map tile panel at the bottom or the right. */
     private JCheckBox mapPanelBottom;
 
     /** Locale[]. */

Modified: trunk/daimonin/src/daieditor/map/package-info.java
===================================================================
--- trunk/daimonin/src/daieditor/map/package-info.java	2008-03-14 21:02:06 UTC (rev 3688)
+++ trunk/daimonin/src/daieditor/map/package-info.java	2008-03-14 21:48:12 UTC (rev 3689)
@@ -18,9 +18,9 @@
  */
 
 /**
- * This package containes classes and subpackages related to maps.
- * A map is a two-dimensional datastructure.
- * The map is modelled by {@link MapModel}.
+ * This package contains classes and sub packages related to maps.
+ * A map is a two-dimensional data structure.
+ * The map is modeled by {@link MapModel}.
  * The elements of a map are {@link MapSquare}s.
  * Each {@link MapSquare} consist of zero or more {@link GameObject}s that are at this map position.
  * {@link GameObject}s can have {@link GameObject}s as content.

Modified: trunk/src/app/net/sf/gridarta/gameobject/GameObject.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/GameObject.java	2008-03-14 21:02:06 UTC (rev 3688)
+++ trunk/src/app/net/sf/gridarta/gameobject/GameObject.java	2008-03-14 21:48:12 UTC (rev 3689)
@@ -734,7 +734,7 @@
 
     /**
      * Get the EditType of an GameObject (e.g. floor, monster, etc). These are
-     * determined by the various attributes of the GameObject (->objectText).
+     * determined by the various attributes of the GameObject (-&gt;objectText).
      * @param checkType bitmask containing the edit type(s) to be calculated
      * @return new editType for this GameObject
      * @see #getEditType()
@@ -1189,10 +1189,10 @@
     }
 
     /**
-     * Return whether this game object is unmodifed from its underlying
+     * Return whether this game object is unmodified from its underlying
      * archetype.
      *
-     * @return Wether this game object is unmodified.
+     * @return Whether this game object is unmodified.
      */
     public boolean isDefaultGameObject() {
             return artifact == archetype.isArtifact()

Modified: trunk/src/app/net/sf/gridarta/gui/GameObjectAttributesPanel.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/GameObjectAttributesPanel.java	2008-03-14 21:02:06 UTC (rev 3688)
+++ trunk/src/app/net/sf/gridarta/gui/GameObjectAttributesPanel.java	2008-03-14 21:48:12 UTC (rev 3689)
@@ -690,7 +690,7 @@
             return;
         }
 
-        // If the active gameObject is part of a multi, the mutli-head's stats
+        // If the active gameObject is part of a multi, the multi-head's stats
         // are taken instead:
         final G gameObject = activeArch.getHead();
 
@@ -746,7 +746,7 @@
         gameObject.setObjectFace();
 
         // we look for 'type' in the ArchText. In future maybe type should get
-        // a seperate textfield
+        // a separate text field
         if (gameObject.getAttributeString("type", false).length() > 0) {
             gameObject.setArchTypNr(gameObject.getAttributeInt("type", false)); // specified type
         }

Modified: trunk/src/app/net/sf/gridarta/gui/MainView.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/MainView.java	2008-03-14 21:02:06 UTC (rev 3688)
+++ trunk/src/app/net/sf/gridarta/gui/MainView.java	2008-03-14 21:48:12 UTC (rev 3689)
@@ -66,7 +66,7 @@
     /** The key used to store the main windows divider location to the preferences. */
     protected static final String DIVIDER_LOCATION_KEY3 = "MainWindow.dividerLocation3";
 
-    /** Key for info whether map-tile panel is seperate or at bottom. */
+    /** Key for info whether map-tile panel is separate or at bottom. */
     public static final String MAP_TILE_LIST_BOTTOM_KEY = "MapTileBottom";
 
     /** The main statusbar. */

Modified: trunk/src/app/net/sf/gridarta/gui/MapFileFilter.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/MapFileFilter.java	2008-03-14 21:02:06 UTC (rev 3688)
+++ trunk/src/app/net/sf/gridarta/gui/MapFileFilter.java	2008-03-14 21:48:12 UTC (rev 3689)
@@ -43,7 +43,7 @@
     private static final MapFileFilter instance = new MapFileFilter();
 
     /**
-     * Wether to actually perform real checks or just file endings.
+     * Whether to actually perform real checks or just file endings.
      * <code>true</code> = real checks,
      * <code>false</code> = fileendings only.
      */
@@ -72,7 +72,7 @@
 
     /**
      * Set whether to actually perform real checks or just file endings.
-     * @param performingRealChecks <code>true</code> for performing real checks, <code>false</code> to compare only fileendings
+     * @param performingRealChecks <code>true</code> for performing real checks, <code>false</code> to compare only file endings
      */
     public static void setPerformingRealChecks(final boolean performingRealChecks) {
         MapFileFilter.performingRealChecks = performingRealChecks;

Modified: trunk/src/app/net/sf/gridarta/help/Help.java
===================================================================
--- trunk/src/app/net/sf/gridarta/help/Help.java	2008-03-14 21:02:06 UTC (rev 3688)
+++ trunk/src/app/net/sf/gridarta/help/Help.java	2008-03-14 21:48:12 UTC (rev 3689)
@@ -25,7 +25,7 @@
 import net.sf.japi.swing.DisposeAction;
 
 /**
- * <code>CFHelp</code> implements the Help Window is a seperate frame with html content.
+ * <code>CFHelp</code> implements the Help Window is a separate frame with html content.
  * @author <a href="mailto:mic...@no...">Michael Toennies</a>
  * @author <a href="mailto:and...@gm...">Andreas Vogl</a>
  * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
@@ -46,7 +46,7 @@
      * Creates a "Help".
      * @param parent the main view to get bounds from to position the help
      * @param fname  may contain different things:
-     *               1. null -> the file "start.html" is opened
+     *               1. null -&gt; the file "start.html" is opened
      *               2. File name of a html-file to be opened
      *               3. html-text to be displayed directly (no file)
      *               (this text must start with "&lt;HTML&gt;")
@@ -60,7 +60,7 @@
         final Rectangle mvb = parent.getBounds(); // get main view bounds
         setBounds(mvb.x + (mvb.width >> 1) - 260, mvb.y + 70, 520, 600); // standard
 
-        if (fname == null) { // FIXME: Do not hardcode "start.html"
+        if (fname == null) { // FIXME: Do not hard-code "start.html"
             fname = "start.html";
         }
         final HtmlPane html;

Modified: trunk/src/app/net/sf/gridarta/io/PathManager.java
===================================================================
--- trunk/src/app/net/sf/gridarta/io/PathManager.java	2008-03-14 21:02:06 UTC (rev 3688)
+++ trunk/src/app/net/sf/gridarta/io/PathManager.java	2008-03-14 21:48:12 UTC (rev 3689)
@@ -25,7 +25,7 @@
 
 /**
  * This class contains methods for converting relative map paths to absolute map paths and vice versa.
- * Serverside, paths to maps always are URIs with the maps directory being the root directory for the maps.
+ * Server-side, paths to maps always are URIs with the maps directory being the root directory for the maps.
  * Therefore it makes sense to treat them as URIs in the editor as well.
  * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
  * @todo make more use of URI
@@ -39,7 +39,7 @@
 
     /**
      * Private constructor.
-     * There are only static methods, so prevent this class from being instanciated.
+     * There are only static methods, so prevent this class from being instantiated.
      */
     private PathManager() {
     }
@@ -54,7 +54,7 @@
 
     /**
      * Create arch path.
-     * Replaces all occurences of '\' with '/' and removes the path to the arch directory (absolute, relative or canonical) from the path.
+     * Replaces all occurrences of '\' with '/' and removes the path to the arch directory (absolute, relative or canonical) from the path.
      * @param path to create arch path from
      * @return fixed path
      */
@@ -73,7 +73,7 @@
 
     /**
      * Create map path.
-     * Replaces all occurences of '\' with '/' and removes the path to the map directory (absolute, relative or canonical) from the path.
+     * Replaces all occurrences of '\' with '/' and removes the path to the map directory (absolute, relative or canonical) from the path.
      * @param path to create map path from
      * @return fixed path
      */
@@ -125,7 +125,7 @@
      * Converts a relative path to an absolute path.
      * If the path already is relative, this method simply returns the path.
      * If the reference ends on "/", it is treated as being a base directory, otherwise a file that's directory is taken as base.
-     * @param reference reference file the relative path works on.
+     * @param reference the reference file the relative path works on.
      * @param relative  destination file with relative path
      * @return absolute path from the base directory
      */
@@ -149,7 +149,7 @@
      * Converts an absolute path to a relative path.
      * If the path already is absolute, this method simply returns the path.
      * If the reference ends on "/", it is treated as being a base directory, otherwise a file that's directory is taken as base.
-     * @param reference reference file the relative path works on
+     * @param reference the reference file the relative path works on
      * @param absolute  destination file with relative path
      * @return absolute path from the base directory
      */
@@ -201,7 +201,7 @@
      * Counts the occurrences of a character within a string.
      * @param s String to count in
      * @param c character to count
-     * @return number of occurences of <var>c</var> in <var>s</var>
+     * @return number of occurrences of <var>c</var> in <var>s</var>
      */
     private static int findOccurrences(final String s, final char c) {
         int occurrences = 0;

Modified: trunk/src/app/net/sf/gridarta/map/validation/AbstractValidator.java
===================================================================
--- trunk/src/app/net/sf/gridarta/map/validation/AbstractValidator.java	2008-03-14 21:02:06 UTC (rev 3688)
+++ trunk/src/app/net/sf/gridarta/map/validation/AbstractValidator.java	2008-03-14 21:48:12 UTC (rev 3689)
@@ -26,7 +26,7 @@
 /**
  * This is the base class for validators.
  * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
- * @note that this class completely implements the interface Validator but does not declare it to force subclasses to choose the interface to implement.
+ * @note that this class completely implements the interface {@link Validator} but does not declare it to force subclasses to choose the interface to implement.
  */
 public abstract class AbstractValidator implements Validator {
 
@@ -39,10 +39,10 @@
     /** Key. */
     private final String key;
 
-    /** Wether this MapValidator is enabled. */
+    /** Whether this MapValidator is enabled. */
     private boolean enabled;
 
-    /** Wether this MapValidator is enabled by default. */
+    /** Whether this MapValidator is enabled by default. */
     private final boolean defaultEnabled;
 
     /**

Modified: trunk/src/app/net/sf/gridarta/treasurelist/TreasureCellRenderer.java
===================================================================
--- trunk/src/app/net/sf/gridarta/treasurelist/TreasureCellRenderer.java	2008-03-14 21:02:06 UTC (rev 3688)
+++ trunk/src/app/net/sf/gridarta/treasurelist/TreasureCellRenderer.java	2008-03-14 21:48:12 UTC (rev 3689)
@@ -124,7 +124,7 @@
                 } else {
                     setIcon(noarch);
                 }
-                // small empty border to keep icons seperated:
+                // small empty border to keep icons separated:
                 setBorder(BorderFactory.createEmptyBorder(1, 0, 1, 0));
             }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




Thread: [Gridarta-commit] SF.net SVN: gridarta: [3689] trunk (Page 52)

gridarta-commit