Menu
▾
▴
[Gridarta-commit] SF.net SVN: gridarta:[4463] trunk
|
From: <aki...@us...> - 2008-07-26 07:00:30
|
Revision: 4463
http://gridarta.svn.sourceforge.net/gridarta/?rev=4463&view=rev
Author: akirschbaum
Date: 2008-07-26 07:00:38 +0000 (Sat, 26 Jul 2008)
Log Message:
-----------
Add nullable annotations.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/gui/gameobjectattributesdialog/GameObjectAttributesDialog.java
trunk/crossfire/src/cfeditor/gui/gameobjectattributesdialog/GameObjectAttributesDialogFactory.java
trunk/daimonin/src/daieditor/gui/gameobjectattributesdialog/GameObjectAttributesDialog.java
trunk/daimonin/src/daieditor/gui/gameobjectattributesdialog/GameObjectAttributesDialogFactory.java
Modified: trunk/crossfire/src/cfeditor/gui/gameobjectattributesdialog/GameObjectAttributesDialog.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/gameobjectattributesdialog/GameObjectAttributesDialog.java 2008-07-26 06:53:55 UTC (rev 4462)
+++ trunk/crossfire/src/cfeditor/gui/gameobjectattributesdialog/GameObjectAttributesDialog.java 2008-07-26 07:00:38 UTC (rev 4463)
@@ -65,6 +65,7 @@
private static final long serialVersionUID = 1L;
/** The map manager. */
+ @NotNull
private final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager;
/**
@@ -79,7 +80,7 @@
* @param faceObjects the FaceObjects instance to use
* @param mapFileFilter the Swing file filter to use
*/
- public GameObjectAttributesDialog(@NotNull final AbstractGameObjectAttributesDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gameObjectAttributesDialogFactory, final CFArchTypeList archTypeList, @NotNull final GameObject gameObject, final MainControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mainControl, @NotNull final AnimationObjects<?> animationObjects, final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager, @NotNull final CFTreasureListTree<GameObject, MapArchObject, Archetype> treasureListTree, @NotNull final FaceObjects faceObjects, final FileFilter mapFileFilter) {
+ public GameObjectAttributesDialog(@NotNull final AbstractGameObjectAttributesDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gameObjectAttributesDialogFactory, @NotNull final CFArchTypeList archTypeList, @NotNull final GameObject gameObject, @NotNull final MainControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mainControl, @NotNull final AnimationObjects<?> animationObjects, @NotNull final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager, @NotNull final CFTreasureListTree<GameObject, MapArchObject, Archetype> treasureListTree, @NotNull final FaceObjects faceObjects, @NotNull final FileFilter mapFileFilter) {
super(gameObjectAttributesDialogFactory, archTypeList, gameObject, mainControl, animationObjects, treasureListTree, faceObjects, mapFileFilter);
this.mapManager = mapManager;
}
Modified: trunk/crossfire/src/cfeditor/gui/gameobjectattributesdialog/GameObjectAttributesDialogFactory.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/gameobjectattributesdialog/GameObjectAttributesDialogFactory.java 2008-07-26 06:53:55 UTC (rev 4462)
+++ trunk/crossfire/src/cfeditor/gui/gameobjectattributesdialog/GameObjectAttributesDialogFactory.java 2008-07-26 07:00:38 UTC (rev 4463)
@@ -84,7 +84,7 @@
}
/** {@inheritDoc} */
- public void showAttribDialog(final GameObject gameObject) {
+ public void showAttribDialog(@NotNull final GameObject gameObject) {
synchronized (dialogs) {
if (dialogs.containsKey(gameObject)) {
dialogs.get(gameObject).toFront();
Modified: trunk/daimonin/src/daieditor/gui/gameobjectattributesdialog/GameObjectAttributesDialog.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/gameobjectattributesdialog/GameObjectAttributesDialog.java 2008-07-26 06:53:55 UTC (rev 4462)
+++ trunk/daimonin/src/daieditor/gui/gameobjectattributesdialog/GameObjectAttributesDialog.java 2008-07-26 07:00:38 UTC (rev 4463)
@@ -64,6 +64,7 @@
private static final long serialVersionUID = 1L;
/** The map manager. */
+ @NotNull
private final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager;
/**
@@ -78,7 +79,7 @@
* @param faceObjects the FaceObjects instance to use
* @param mapFileFilter the Swing file filter to use
*/
- public GameObjectAttributesDialog(@NotNull final AbstractGameObjectAttributesDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gameObjectAttributesDialogFactory, final CFArchTypeList archTypeList, @NotNull final GameObject gameObject, final MainControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mainControl, @NotNull final AnimationObjects<?> animationObjects, final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager, @NotNull final CFTreasureListTree<GameObject, MapArchObject, Archetype> treasureListTree, @NotNull final FaceObjects faceObjects, final FileFilter mapFileFilter) {
+ public GameObjectAttributesDialog(@NotNull final AbstractGameObjectAttributesDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gameObjectAttributesDialogFactory, @NotNull final CFArchTypeList archTypeList, @NotNull final GameObject gameObject, @NotNull final MainControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mainControl, @NotNull final AnimationObjects<?> animationObjects, @NotNull final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager, @NotNull final CFTreasureListTree<GameObject, MapArchObject, Archetype> treasureListTree, @NotNull final FaceObjects faceObjects, @NotNull final FileFilter mapFileFilter) {
super(gameObjectAttributesDialogFactory, archTypeList, gameObject, mainControl, animationObjects, treasureListTree, faceObjects, mapFileFilter);
this.mapManager = mapManager;
}
Modified: trunk/daimonin/src/daieditor/gui/gameobjectattributesdialog/GameObjectAttributesDialogFactory.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/gameobjectattributesdialog/GameObjectAttributesDialogFactory.java 2008-07-26 06:53:55 UTC (rev 4462)
+++ trunk/daimonin/src/daieditor/gui/gameobjectattributesdialog/GameObjectAttributesDialogFactory.java 2008-07-26 07:00:38 UTC (rev 4463)
@@ -75,7 +75,7 @@
* @param faceObjects the FaceObjects instance to use
* @param mapFileFilter the Swing file filter to use
*/
- public GameObjectAttributesDialogFactory(final CFArchTypeList archTypeList, final CMainControl mainControl, final AnimationObjects<AnimationObject> animationObjects, final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager, final CFTreasureListTree<GameObject, MapArchObject, Archetype> treasureListTree, final daieditor.gameobject.face.FaceObjects faceObjects, final FileFilter mapFileFilter) {
+ public GameObjectAttributesDialogFactory(@NotNull final CFArchTypeList archTypeList, @NotNull final CMainControl mainControl, @NotNull final AnimationObjects<AnimationObject> animationObjects, @NotNull final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager, @NotNull final CFTreasureListTree<GameObject, MapArchObject, Archetype> treasureListTree, @NotNull final daieditor.gameobject.face.FaceObjects faceObjects, @NotNull final FileFilter mapFileFilter) {
this.archTypeList = archTypeList;
this.mainControl = mainControl;
this.animationObjects = animationObjects;
@@ -86,7 +86,7 @@
}
/** {@inheritDoc} */
- public void showAttribDialog(final GameObject gameObject) {
+ public void showAttribDialog(@NotNull final GameObject gameObject) {
synchronized (dialogs) {
if (dialogs.containsKey(gameObject)) {
dialogs.get(gameObject).toFront();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
