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

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

Revision: 907
          http://svn.sourceforge.net/gridarta/?rev=907&view=rev
Author:   akirschbaum
Date:     2006-12-05 13:47:28 -0800 (Tue, 05 Dec 2006)

Log Message:
-----------
Unify annotations.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/gameobject/ArchetypeParser.java
    trunk/crossfire/src/cfeditor/gui/map/DefaultLevelRenderer.java
    trunk/crossfire/src/cfeditor/map/MapArchObject.java
    trunk/daimonin/src/daieditor/CMainControl.java

Modified: trunk/crossfire/src/cfeditor/gameobject/ArchetypeParser.java
===================================================================

--- trunk/crossfire/src/cfeditor/gameobject/ArchetypeParser.java	2006-12-05 21:26:36 UTC (rev 906)
+++ trunk/crossfire/src/cfeditor/gameobject/ArchetypeParser.java	2006-12-05 21:47:28 UTC (rev 907)
@@ -168,7 +168,7 @@
 
     /** {@inheritDoc} */
     @Nullable
-    public GameObject parseArchetypeFromStream(final BufferedReader in, @Nullable final GameObject prototype, final String line, final String archName, int index, final String fname) throws IOException {
+    public GameObject parseArchetypeFromStream(final BufferedReader in, @Nullable final GameObject prototype, @Nullable final String line, @Nullable final String archName, int index, final String fname) throws IOException {
         // start with new clean GameObject instance
         GameObject archetype;
         GameObject archlast = null;

Modified: trunk/crossfire/src/cfeditor/gui/map/DefaultLevelRenderer.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/map/DefaultLevelRenderer.java	2006-12-05 21:26:36 UTC (rev 906)
+++ trunk/crossfire/src/cfeditor/gui/map/DefaultLevelRenderer.java	2006-12-05 21:47:28 UTC (rev 907)
@@ -50,6 +50,8 @@
 import javax.swing.JComponent;
 import net.sf.gridarta.Size2D;
 import org.apache.log4j.Logger;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * The component that does the actual rendering of tiles in the palette.
@@ -469,7 +471,7 @@
     // i'll change it to a fixed point... i want use this for mouse tracking
     // and don't want have millions of mallocs here
     // this should be reworked more intelligent later
-    public Point getTileLocationAt(final Point point) {
+    @Nullable public Point getTileLocationAt(@NotNull final Point point) {
         try {
             renderTransform.inverseTransform(point, point);
         } catch (final NoninvertibleTransformException e) {

Modified: trunk/crossfire/src/cfeditor/map/MapArchObject.java
===================================================================
--- trunk/crossfire/src/cfeditor/map/MapArchObject.java	2006-12-05 21:26:36 UTC (rev 906)
+++ trunk/crossfire/src/cfeditor/map/MapArchObject.java	2006-12-05 21:47:28 UTC (rev 907)
@@ -29,6 +29,8 @@
 import java.io.IOException;
 import net.sf.gridarta.Size2D;
 import net.sf.gridarta.map.AbstractMapArchObject;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * MapArchObject contains the specific meta data about a map that is stored in
@@ -182,7 +184,7 @@
         return tilePaths[n];
     }
 
-    public void setTilePath(final int n, final String tilePath) {
+    public void setTilePath(final int n, @Nullable final String tilePath) {
         tilePaths[n] = tilePath;
     }
 
@@ -286,7 +288,7 @@
      * Append 'text' to the map text.
      * @param text string to add
      */
-    public void addText(final String text) {
+    public void addText(@NotNull final String text) {
         msgText.append(text);
     }
 
@@ -305,7 +307,7 @@
     }
 
     /** @return the maptext */
-    public String getText() {
+    @NotNull public String getText() {
         return msgText.toString();
     }
 
@@ -333,7 +335,7 @@
      *         otherwise false
      * @throws IOException in case of I/O problems
      */
-    public boolean parseMapArch(final BufferedReader reader, final String fname) throws IOException {
+    public boolean parseMapArch(@NotNull final BufferedReader reader, @NotNull final String fname) throws IOException {
         setFileName(fname);
         String line2;      // input line, includes leading and trailing white space
         boolean loreflag = false;    // flag for lore-text
@@ -470,7 +472,7 @@
      * @param s the attribute line to be parsed
      * @return attribute value, zero if value not readable
      */
-    private static int getLineValue(final String s) {
+    private static int getLineValue(@NotNull final String s) {
         try {
             if (s.lastIndexOf(" ") > 0) {
                 return Integer.valueOf(s.substring(s.lastIndexOf(" ") + 1));
@@ -498,7 +500,7 @@
      * @throws java.io.FileNotFoundException the mapfile could not be found
      * @throws IOException           an I/O error occured during writing to the file
      */
-    public void writeMapArch(final Appendable appendable) throws IOException {
+    public void writeMapArch(@NotNull final Appendable appendable) throws IOException {
         int i;
 
         appendable.append("arch map\n");

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2006-12-05 21:26:36 UTC (rev 906)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2006-12-05 21:47:28 UTC (rev 907)
@@ -1176,7 +1176,7 @@
      * @param view only create a view if this is true
      * @return MapControl of loaded file or <code>null</code> if the file couldn't be opened
      */
-    public MapControl openFile(final File file, final boolean view) {
+    @Nullable public MapControl openFile(final File file, final boolean view) {
         // First look whether the file isn't already open.
         // If so, return the previously loaded map.
         try {


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: [907] trunk (Page 9)

gridarta-commit