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

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

Revision: 1432
          http://svn.sourceforge.net/gridarta/?rev=1432&view=rev
Author:   christianhujer
Date:     2007-01-04 13:39:42 -0800 (Thu, 04 Jan 2007)

Log Message:
-----------
Added some @Nullable annotations where null is returned always.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/AutojoinList.java
    trunk/crossfire/src/cfeditor/CMainControl.java
    trunk/crossfire/src/cfeditor/gameobject/GameObject.java
    trunk/crossfire/src/cfeditor/gui/GameObjectAttributesDialog.java
    trunk/daimonin/src/daieditor/gameobject/GameObject.java
    trunk/daimonin/src/daieditor/gui/GameObjectAttributesDialog.java
    trunk/src/app/net/sf/gridarta/gameobject/GameObject.java
    trunk/src/app/net/sf/gridarta/gui/maptilelist/MapTileSelectionCache.java

Modified: trunk/crossfire/src/cfeditor/AutojoinList.java
===================================================================

--- trunk/crossfire/src/cfeditor/AutojoinList.java	2007-01-04 20:46:09 UTC (rev 1431)
+++ trunk/crossfire/src/cfeditor/AutojoinList.java	2007-01-04 21:39:42 UTC (rev 1432)
@@ -194,7 +194,7 @@
      * @return the archetype name of the (default) arch to be inserted at point
      *         <code>null</code> if there's already an arch of this list on point
      */
-    public String joinInsert(final MapModel map, final Point point) {
+    @Nullable public String joinInsert(final MapModel map, final Point point) {
         int newIndex = 0;      // return value, see above
 
         // if there already is an arch of this list at point -> abort

Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java	2007-01-04 20:46:09 UTC (rev 1431)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2007-01-04 21:39:42 UTC (rev 1432)
@@ -1794,7 +1794,7 @@
      * @return the value of the given parameter name, or <code>null</code> if
      * the parameter does not exist
      */
-    private static String getRandomMapParameter(final GameObject exit, final String parameterName) {
+    @Nullable private static String getRandomMapParameter(final GameObject exit, final String parameterName) {
         final String msg = exit.getMsgText();
         if (msg == null) {
             return null;

Modified: trunk/crossfire/src/cfeditor/gameobject/GameObject.java
===================================================================
--- trunk/crossfire/src/cfeditor/gameobject/GameObject.java	2007-01-04 20:46:09 UTC (rev 1431)
+++ trunk/crossfire/src/cfeditor/gameobject/GameObject.java	2007-01-04 21:39:42 UTC (rev 1432)
@@ -322,6 +322,8 @@
     // face name
     public void setFaceName(final String name) {
         final String newFaceName = name != null ? name.intern() : null;
+        // Using == on these Strings is okay, they are both interned.
+        //noinspection StringEquality
         if (faceName == newFaceName) {
             return;
         }

Modified: trunk/crossfire/src/cfeditor/gui/GameObjectAttributesDialog.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/GameObjectAttributesDialog.java	2007-01-04 20:46:09 UTC (rev 1431)
+++ trunk/crossfire/src/cfeditor/gui/GameObjectAttributesDialog.java	2007-01-04 21:39:42 UTC (rev 1432)
@@ -345,7 +345,7 @@
                 final String inline = ((JTextComponent) attr.input).getText().trim(); // input string
 
                 if (inline != null) {
-                    final boolean isNone = inline.equals(CFTreasureListTree.NONE_SYM) || inline.length() == 0;
+                    final boolean isNone = inline.equals(net.sf.gridarta.CFTreasureListTree.NONE_SYM) || inline.length() == 0;
 
                     if (!isNone && !CFTreasureListTree.containsTreasureList(inline) && !inline.equalsIgnoreCase(archetype.getAttributeString(attr.ref.getNameOld()))) {
                         // The user has specified a WRONG treasurelist name, and it does not come

Modified: trunk/daimonin/src/daieditor/gameobject/GameObject.java
===================================================================
--- trunk/daimonin/src/daieditor/gameobject/GameObject.java	2007-01-04 20:46:09 UTC (rev 1431)
+++ trunk/daimonin/src/daieditor/gameobject/GameObject.java	2007-01-04 21:39:42 UTC (rev 1432)
@@ -289,6 +289,8 @@
     // face name
     private void setFaceObjName(final String faceObjName) {
         final String newFaceObjName = faceObjName != null ? faceObjName.intern() : null;
+        // Using == on these Strings is okay, they are both interned.
+        //noinspection StringEquality
         if (this.faceObjName == newFaceObjName) {
             return;
         }
@@ -304,6 +306,8 @@
     // face name
     public void setFaceRealName(final String faceRealName) {
         final String newFaceRealName = faceRealName != null ? faceRealName.intern() : null;
+        // Using == on these Strings is okay, they are both interned.
+        //noinspection StringEquality
         if (this.faceRealName == newFaceRealName) {
             return;
         }
@@ -489,6 +493,8 @@
      */
     public void setAnimName(final String animName) {
         final String newAnimName = animName != null ? animName.intern() : null;
+        // Using == on these Strings is okay, they are both interned.
+        //noinspection StringEquality
         if (this.animName == newAnimName) {
             return;
         }

Modified: trunk/daimonin/src/daieditor/gui/GameObjectAttributesDialog.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/GameObjectAttributesDialog.java	2007-01-04 20:46:09 UTC (rev 1431)
+++ trunk/daimonin/src/daieditor/gui/GameObjectAttributesDialog.java	2007-01-04 21:39:42 UTC (rev 1432)
@@ -338,7 +338,7 @@
                 final String inline = ((JTextComponent) attr.input).getText().trim(); // input string
 
                 if (inline != null) {
-                    final boolean isNone = inline.equals(CFTreasureListTree.NONE_SYM) || inline.length() == 0;
+                    final boolean isNone = inline.equals(net.sf.gridarta.CFTreasureListTree.NONE_SYM) || inline.length() == 0;
 
                     if (!isNone && !CFTreasureListTree.containsTreasureList(inline) && !inline.equalsIgnoreCase(archetype.getAttributeString(attr.ref.getNameOld()))) {
                         // The user has specified a WRONG treasurelist name, and it does not come

Modified: trunk/src/app/net/sf/gridarta/gameobject/GameObject.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/GameObject.java	2007-01-04 20:46:09 UTC (rev 1431)
+++ trunk/src/app/net/sf/gridarta/gameobject/GameObject.java	2007-01-04 21:39:42 UTC (rev 1432)
@@ -866,13 +866,15 @@
      * @param objName the name of this object.
      */
     public void setObjName(@Nullable final String objName) {
-         final String newObjName = objName != null ? objName.intern() : null;
-         if (this.objName == newObjName) {
-             return;
-         }
+        final String newObjName = objName != null ? objName.intern() : null;
+        // Using == on these Strings is okay, they are both interned.
+        //noinspection StringEquality
+        if (this.objName == newObjName) {
+            return;
+        }
 
-         this.objName = newObjName;
-         squareChanged();
+        this.objName = newObjName;
+        squareChanged();
     }
 
     /**

Modified: trunk/src/app/net/sf/gridarta/gui/maptilelist/MapTileSelectionCache.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/maptilelist/MapTileSelectionCache.java	2007-01-04 20:46:09 UTC (rev 1431)
+++ trunk/src/app/net/sf/gridarta/gui/maptilelist/MapTileSelectionCache.java	2007-01-04 21:39:42 UTC (rev 1432)
@@ -34,7 +34,7 @@
      * @return the associated map tile selection instance, or <code>null</code>
      * if <code>null</code> was passed in
      */
-    public MapTileSelection<G, C> findOrCreate(@Nullable final C mapControl) {
+    @Nullable public MapTileSelection<G, C> findOrCreate(@Nullable final C mapControl) {
         if (mapControl == null) {
             return null;
         }


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: [1432] trunk (Page 18)

gridarta-commit