Menu
▾
▴
[Gridarta-commit] SF.net SVN: gridarta:[9222] trunk
|
From: <aki...@us...> - 2013-05-24 20:38:24
|
Revision: 9222
http://sourceforge.net/p/gridarta/code/9222
Author: akirschbaum
Date: 2013-05-24 20:38:21 +0000 (Fri, 24 May 2013)
Log Message:
-----------
Rename function names.
Modified Paths:
--------------
trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/gameobject/GameObject.java
trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/model/gameobject/GameObject.java
trunk/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeTypeSet.java
trunk/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParser.java
trunk/model/src/test/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetTest.java
trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/GameObjectAttributesDialog.java
trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/TypesBoxItemListener.java
trunk/src/app/net/sf/gridarta/gui/panel/gameobjecttexteditor/GameObjectTextEditor.java
Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/gameobject/GameObject.java
===================================================================
--- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/gameobject/GameObject.java 2013-05-24 20:33:54 UTC (rev 9221)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/gameobject/GameObject.java 2013-05-24 20:38:21 UTC (rev 9222)
@@ -74,7 +74,7 @@
@Override
public void addLast(@NotNull final GameObject gameObject) {
// force type change when a MONSTER is put in a spawn point
- if (archetypeTypeSet.getArchetypeType(this).getTypeNo() == Archetype.TYPE_SPAWN_POINT && archetypeTypeSet.getArchetypeType(gameObject).getTypeNo() == Archetype.TYPE_MOB) {
+ if (archetypeTypeSet.getArchetypeTypeByBaseObject(this).getTypeNo() == Archetype.TYPE_SPAWN_POINT && archetypeTypeSet.getArchetypeTypeByBaseObject(gameObject).getTypeNo() == Archetype.TYPE_MOB) {
gameObject.setAttributeInt(TYPE, Archetype.TYPE_SPAWN_POINT_MOB); // change to SPAWN_POINT_MOB
}
super.addLast(gameObject);
@@ -86,7 +86,7 @@
@Override
public void addFirst(@NotNull final GameObject gameObject) {
// force type change when a MONSTER is put in a spawn point
- if (archetypeTypeSet.getArchetypeType(this).getTypeNo() == Archetype.TYPE_SPAWN_POINT && archetypeTypeSet.getArchetypeType(gameObject).getTypeNo() == Archetype.TYPE_MOB) {
+ if (archetypeTypeSet.getArchetypeTypeByBaseObject(this).getTypeNo() == Archetype.TYPE_SPAWN_POINT && archetypeTypeSet.getArchetypeTypeByBaseObject(gameObject).getTypeNo() == Archetype.TYPE_MOB) {
gameObject.setAttributeInt(TYPE, Archetype.TYPE_SPAWN_POINT_MOB); // change to SPAWN_POINT_MOB
}
super.addFirst(gameObject);
Modified: trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/model/gameobject/GameObject.java
===================================================================
--- trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/model/gameobject/GameObject.java 2013-05-24 20:33:54 UTC (rev 9221)
+++ trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/model/gameobject/GameObject.java 2013-05-24 20:38:21 UTC (rev 9222)
@@ -81,7 +81,7 @@
@Override
public void addLast(@NotNull final GameObject gameObject) {
// force type change when a MONSTER is put in a spawn point
- if (archetypeTypeSet.getArchetypeType(this).getTypeNo() == Archetype.TYPE_SPAWN_POINT && archetypeTypeSet.getArchetypeType(gameObject).getTypeNo() == Archetype.TYPE_MOB) {
+ if (archetypeTypeSet.getArchetypeTypeByBaseObject(this).getTypeNo() == Archetype.TYPE_SPAWN_POINT && archetypeTypeSet.getArchetypeTypeByBaseObject(gameObject).getTypeNo() == Archetype.TYPE_MOB) {
gameObject.setAttributeInt(TYPE, Archetype.TYPE_SPAWN_POINT_MOB); // change to SPAWN_POINT_MOB
}
super.addLast(gameObject);
@@ -93,7 +93,7 @@
@Override
public void addFirst(@NotNull final GameObject gameObject) {
// force type change when a MONSTER is put in a spawn point
- if (archetypeTypeSet.getArchetypeType(this).getTypeNo() == Archetype.TYPE_SPAWN_POINT && archetypeTypeSet.getArchetypeType(gameObject).getTypeNo() == Archetype.TYPE_MOB) {
+ if (archetypeTypeSet.getArchetypeTypeByBaseObject(this).getTypeNo() == Archetype.TYPE_SPAWN_POINT && archetypeTypeSet.getArchetypeTypeByBaseObject(gameObject).getTypeNo() == Archetype.TYPE_MOB) {
gameObject.setAttributeInt(TYPE, Archetype.TYPE_SPAWN_POINT_MOB); // change to SPAWN_POINT_MOB
}
super.addFirst(gameObject);
Modified: trunk/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeTypeSet.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeTypeSet.java 2013-05-24 20:33:54 UTC (rev 9221)
+++ trunk/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeTypeSet.java 2013-05-24 20:38:21 UTC (rev 9222)
@@ -76,7 +76,7 @@
* Adds an {@link ArchetypeType} instance.
* @param archetypeType the archetype type instance
*/
- public void add(@NotNull final ArchetypeType archetypeType) {
+ public void addArchetypeType(@NotNull final ArchetypeType archetypeType) {
archetypeTypeList.add(archetypeType);
final String typeName = archetypeType.getTypeName();
archetypeTypeNames.put(typeName, archetypeType);
@@ -106,7 +106,7 @@
* ("Misc") type if no match is found
*/
@NotNull
- public ArchetypeType getTypeByName(@NotNull final String typeName) {
+ public ArchetypeType getArchetypeTypeByName(@NotNull final String typeName) {
final ArchetypeType type = archetypeTypeNames.get(typeName.trim());
if (type != null) {
return type;
@@ -122,7 +122,7 @@
* if no match was found
*/
@NotNull
- public ArchetypeType getArchetypeType(@NotNull final BaseObject<?, ?, ?, ?> baseObject) {
+ public ArchetypeType getArchetypeTypeByBaseObject(@NotNull final BaseObject<?, ?, ?, ?> baseObject) {
for (final ArchetypeType archetypeType : archetypeTypeList) {
if (archetypeType.matches(baseObject)) {
return archetypeType;
@@ -155,7 +155,7 @@
* counted.
* @return the number of archetype types in the list
*/
- public int getLength() {
+ public int getArchetypeTypeCount() {
return archetypeTypeList.size();
}
@@ -215,7 +215,7 @@
*/
@NotNull
public String getDisplayName(@NotNull final BaseObject<?, ?, ?, ?> baseObject) {
- return getArchetypeType(baseObject).getDisplayName(baseObject);
+ return getArchetypeTypeByBaseObject(baseObject).getDisplayName(baseObject);
}
/**
Modified: trunk/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParser.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParser.java 2013-05-24 20:33:54 UTC (rev 9221)
+++ trunk/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParser.java 2013-05-24 20:38:21 UTC (rev 9222)
@@ -304,7 +304,7 @@
}
if (log.isInfoEnabled()) {
- log.info("Loaded " + archetypeTypeSet.getLength() + " types from '" + filename + "\'");
+ log.info("Loaded " + archetypeTypeSet.getArchetypeTypeCount() + " types from '" + filename + "\'");
}
}
@@ -552,7 +552,7 @@
*/
private void parseTypes(@NotNull final Element typeElement, @NotNull final ErrorViewCollector errorViewCollector, @NotNull final IgnorelistsDefinition ignorelistsDefinition) {
if (!typeElement.getAttribute(XML_TYPE_AVAILABLE).equals("no")) {
- archetypeTypeSet.add(archetypeTypeParser.loadAttributeList(typeElement, errorViewCollector, defaultArchetypeType, archetypeTypeSet, ignorelistsDefinition, false));
+ archetypeTypeSet.addArchetypeType(archetypeTypeParser.loadAttributeList(typeElement, errorViewCollector, defaultArchetypeType, archetypeTypeSet, ignorelistsDefinition, false));
}
}
Modified: trunk/model/src/test/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetTest.java
===================================================================
--- trunk/model/src/test/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetTest.java 2013-05-24 20:33:54 UTC (rev 9221)
+++ trunk/model/src/test/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetTest.java 2013-05-24 20:38:21 UTC (rev 9222)
@@ -36,7 +36,7 @@
@Test(expected = UnsupportedOperationException.class)
public void testIteratorReadOnly() {
final ArchetypeTypeSet archetypeTypeSet = new ArchetypeTypeSet();
- archetypeTypeSet.add(new ArchetypeType("name", 0, "", false, null, false, null, null, 0, new ArchetypeAttributes(), new ArchetypeAttributesDefinition()));
+ archetypeTypeSet.addArchetypeType(new ArchetypeType("name", 0, "", false, null, false, null, null, 0, new ArchetypeAttributes(), new ArchetypeAttributesDefinition()));
final Iterator<ArchetypeType> iterator = archetypeTypeSet.iterator();
Assert.assertTrue(iterator.hasNext());
iterator.next();
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/GameObjectAttributesDialog.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/GameObjectAttributesDialog.java 2013-05-24 20:33:54 UTC (rev 9221)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/GameObjectAttributesDialog.java 2013-05-24 20:38:21 UTC (rev 9222)
@@ -788,7 +788,7 @@
mapManager.addMapManagerListener(mapManagerListener);
// first split top-left and -right
- final ArchetypeType archetypeType = archetypeTypeSet.getArchetypeType(gameObject);
+ final ArchetypeType archetypeType = archetypeTypeSet.getArchetypeTypeByBaseObject(gameObject);
final JComponent leftPane = buildHeader(archetypeTypeSet.getArchetypeTypeIndex(archetypeType), archetypeType);
// Now split horizontally
@@ -860,7 +860,7 @@
*/
@NotNull
private Component buildTypesBox(final int type, @NotNull final ArchetypeType archetypeType) {
- final String[] nameList = new String[archetypeTypeSet.getLength()];
+ final String[] nameList = new String[archetypeTypeSet.getArchetypeTypeCount()];
// read all type names
int i = 0;
@@ -1175,7 +1175,7 @@
* @return true if the settings were applied, false if error occurred
*/
private boolean applySettings2() {
- final ArchetypeType tmpArchetypeType = archetypeTypeSet.getArchetypeType(gameObject); // the type structure for this gameObject
+ final ArchetypeType tmpArchetypeType = archetypeTypeSet.getArchetypeTypeByBaseObject(gameObject); // the type structure for this gameObject
final StringBuilder newArchText = new StringBuilder();
final String[] newMsg = new String[1];
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/TypesBoxItemListener.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/TypesBoxItemListener.java 2013-05-24 20:33:54 UTC (rev 9221)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/TypesBoxItemListener.java 2013-05-24 20:38:21 UTC (rev 9222)
@@ -130,7 +130,7 @@
if (e.getStateChange() == ItemEvent.DESELECTED) {
deselected = ((String) e.getItem()).trim();
} else if (e.getStateChange() == ItemEvent.SELECTED && !e.getItem().equals(deselected)) {
- final ArchetypeType newType = archetypeTypeSet.getTypeByName((String) e.getItem());
+ final ArchetypeType newType = archetypeTypeSet.getArchetypeTypeByName((String) e.getItem());
typeComboBox.hidePopup();
gameObjectAttributesDialog.update(gameObjectAttributesDialog.getGraphics());
Modified: trunk/src/app/net/sf/gridarta/gui/panel/gameobjecttexteditor/GameObjectTextEditor.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/panel/gameobjecttexteditor/GameObjectTextEditor.java 2013-05-24 20:33:54 UTC (rev 9221)
+++ trunk/src/app/net/sf/gridarta/gui/panel/gameobjecttexteditor/GameObjectTextEditor.java 2013-05-24 20:38:21 UTC (rev 9222)
@@ -124,7 +124,7 @@
try {
final Document document = archEdit.getDocument();
- final ArchetypeType typeStruct = archetypeTypeSet.getArchetypeType(gameObject);
+ final ArchetypeType typeStruct = archetypeTypeSet.getArchetypeTypeByBaseObject(gameObject);
final String errorText = GameObjectUtils.getSyntaxErrors(gameObject, typeStruct);
final String objectText = gameObject.getObjectText();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
