From: <aki...@us...> - 2010-05-26 20:12:30
|
Revision: 8006 http://gridarta.svn.sourceforge.net/gridarta/?rev=8006&view=rev Author: akirschbaum Date: 2010-05-26 20:12:24 +0000 (Wed, 26 May 2010) Log Message: ----------- Rename function names. Modified Paths: -------------- trunk/src/app/net/sf/gridarta/gui/archetypechooser/ArchetypePanel.java trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/GameObjectAttributesDialog.java trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/GameObjectAttributesDialogFactory.java trunk/src/app/net/sf/gridarta/gui/gameobjectattributespanel/GameObjectAttributesControl.java trunk/src/app/net/sf/gridarta/gui/map/cursor/MapCursorActions.java trunk/src/app/net/sf/gridarta/gui/selectedsquare/SelectedSquareControl.java Modified: trunk/src/app/net/sf/gridarta/gui/archetypechooser/ArchetypePanel.java =================================================================== --- trunk/src/app/net/sf/gridarta/gui/archetypechooser/ArchetypePanel.java 2010-05-26 20:08:23 UTC (rev 8005) +++ trunk/src/app/net/sf/gridarta/gui/archetypechooser/ArchetypePanel.java 2010-05-26 20:12:24 UTC (rev 8006) @@ -256,7 +256,7 @@ /** * Sets the currently selected archetype in the list. Makes sure the * archetype is visible. - * @param archetype the selected archetype or <code>null</code> to unselect + * @param archetype the selected archetype or <code>null</code> to deselect * all */ private void setSelectedArchetype(@Nullable final R archetype) { @@ -331,7 +331,7 @@ */ @ActionMethod public void editPopup() { - //XXX: gameObjectAttributesDialogFactory.showAttribDialog(getSelectedArchetype()); + //XXX: gameObjectAttributesDialogFactory.showAttributeDialog(getSelectedArchetype()); } /** Modified: trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/GameObjectAttributesDialog.java =================================================================== --- trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/GameObjectAttributesDialog.java 2010-05-26 20:08:23 UTC (rev 8005) +++ trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/GameObjectAttributesDialog.java 2010-05-26 20:12:24 UTC (rev 8006) @@ -863,7 +863,7 @@ public void setValue(@NotNull final Object newValue) { super.setValue(newValue); if (newValue != UNINITIALIZED_VALUE) { - gameObjectAttributesDialogFactory.hideAttribDialog(gameObject); + gameObjectAttributesDialogFactory.hideAttributeDialog(gameObject); mapModel.removeMapModelListener(mapModelListener); mapManager.removeMapManagerListener(mapManagerListener); } Modified: trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/GameObjectAttributesDialogFactory.java =================================================================== --- trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/GameObjectAttributesDialogFactory.java 2010-05-26 20:08:23 UTC (rev 8005) +++ trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/GameObjectAttributesDialogFactory.java 2010-05-26 20:12:24 UTC (rev 8006) @@ -210,7 +210,7 @@ * instance. * @param gameObject the GameObject to be displayed by this dialog */ - public void showAttribDialog(@NotNull final G gameObject) { + public void showAttributeDialog(@NotNull final G gameObject) { if (archetypeTypeSet.isEmpty()) { // types.xml is missing! ACTION_BUILDER.showMessageDialog(parent, "openAttrDialogNoTypes"); @@ -241,7 +241,7 @@ * instance. * @param gameObject the GameObject to be displayed by this dialog */ - public void hideAttribDialog(@NotNull final G gameObject) { + public void hideAttributeDialog(@NotNull final G gameObject) { final Window dialog = dialogs.remove(gameObject); if (dialog != null) { dialog.dispose(); Modified: trunk/src/app/net/sf/gridarta/gui/gameobjectattributespanel/GameObjectAttributesControl.java =================================================================== --- trunk/src/app/net/sf/gridarta/gui/gameobjectattributespanel/GameObjectAttributesControl.java 2010-05-26 20:08:23 UTC (rev 8005) +++ trunk/src/app/net/sf/gridarta/gui/gameobjectattributespanel/GameObjectAttributesControl.java 2010-05-26 20:12:24 UTC (rev 8006) @@ -560,7 +560,7 @@ @ActionMethod public void mapArchAttrib() { if (selectedGameObject != null) { - gameObjectAttributesDialogFactory.showAttribDialog(selectedGameObject); + gameObjectAttributesDialogFactory.showAttributeDialog(selectedGameObject); } } Modified: trunk/src/app/net/sf/gridarta/gui/map/cursor/MapCursorActions.java =================================================================== --- trunk/src/app/net/sf/gridarta/gui/map/cursor/MapCursorActions.java 2010-05-26 20:08:23 UTC (rev 8005) +++ trunk/src/app/net/sf/gridarta/gui/map/cursor/MapCursorActions.java 2010-05-26 20:12:24 UTC (rev 8006) @@ -651,7 +651,7 @@ } if (performAction) { - gameObjectAttributesDialogFactory.showAttribDialog(gameObject); + gameObjectAttributesDialogFactory.showAttributeDialog(gameObject); } return true; Modified: trunk/src/app/net/sf/gridarta/gui/selectedsquare/SelectedSquareControl.java =================================================================== --- trunk/src/app/net/sf/gridarta/gui/selectedsquare/SelectedSquareControl.java 2010-05-26 20:08:23 UTC (rev 8005) +++ trunk/src/app/net/sf/gridarta/gui/selectedsquare/SelectedSquareControl.java 2010-05-26 20:12:24 UTC (rev 8006) @@ -143,7 +143,7 @@ public void mousePressed(final MouseEvent e) { if (isSelect(e)) { if (e.getClickCount() > 1) { // LMB Double click - gameObjectAttributesDialogFactory.showAttribDialog(selectedSquareModel.getSelectedGameObject()); + gameObjectAttributesDialogFactory.showAttributeDialog(selectedSquareModel.getSelectedGameObject()); } } else if (isInsert(e)) { insertGameObjectFromObjectChooser(selectedSquareView.getListIndex(e)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |