Skip to content

Commit

Permalink
rename: IIdentificate -> Identified
Browse files Browse the repository at this point in the history
  • Loading branch information
vestrial committed May 17, 2012
1 parent cbf28d0 commit 1cee7aa
Show file tree
Hide file tree
Showing 200 changed files with 4,194 additions and 4,195 deletions.
@@ -1,8 +1,8 @@
package net.sf.anathema.campaign.music.presenter;

import net.sf.anathema.lib.util.IIdentificate;
import net.sf.anathema.lib.util.Identified;

public interface IMusicEvent extends IIdentificate {
public interface IMusicEvent extends Identified {

// Nothing to do
}
@@ -1,7 +1,7 @@
package net.sf.anathema.campaign.music.presenter;

import net.sf.anathema.lib.util.IIdentificate;
import net.sf.anathema.lib.util.Identified;

public interface IMusicMood extends IIdentificate {
public interface IMusicMood extends Identified {
// Nothing to do
}
@@ -1,7 +1,7 @@
package net.sf.anathema.campaign.music.presenter;

import net.sf.anathema.lib.util.IIdentificate;
import net.sf.anathema.lib.util.Identified;

public interface IMusicTheme extends IIdentificate {
public interface IMusicTheme extends Identified {
// Nothing to do
}
@@ -1,9 +1,9 @@
package net.sf.anathema.campaign.model.plot;

import net.sf.anathema.framework.itemdata.model.IItemDescription;
import net.sf.anathema.lib.util.IIdentificate;
import net.sf.anathema.lib.util.Identified;

public interface IPlotElementContainer extends IIdentificate {
public interface IPlotElementContainer extends Identified {

IPlotElement addChild(IItemDescription description, String repositoryId);

Expand Down
@@ -1,9 +1,9 @@
package net.sf.anathema.campaign.model.plot;

import net.sf.anathema.lib.util.IIdentificate;
import net.sf.anathema.lib.util.Identified;

// Story, Episode, Scene
public interface IPlotTimeUnit extends IIdentificate {
public interface IPlotTimeUnit extends Identified {

@Override
String getId();
Expand Down
@@ -1,100 +1,100 @@
package net.sf.anathema.character.abyssal.equipment;

import net.sf.anathema.character.equipment.impl.character.model.stats.AbstractCombatStats;
import net.sf.anathema.character.equipment.impl.creation.model.WeaponTag;
import net.sf.anathema.character.generic.equipment.weapon.IEquipmentStats;
import net.sf.anathema.character.generic.equipment.weapon.IWeaponStats;
import net.sf.anathema.character.generic.health.HealthType;
import net.sf.anathema.character.generic.traits.ITraitType;
import net.sf.anathema.character.generic.traits.types.AbilityType;
import net.sf.anathema.character.generic.traits.types.AttributeType;
import net.sf.anathema.lib.util.IIdentificate;
import net.sf.anathema.lib.util.Identificate;

public class FangStats extends AbstractCombatStats implements IWeaponStats {

@Override
public int getAccuracy() {
return 0;
}

@Override
public int getDamage() {
return 0;
}

@Override
public int getMinimumDamage() {
return 1;
}

@Override
public int getMobilityPenalty() {
return 0;
}

@Override
public ITraitType getDamageTraitType() {
return AttributeType.Strength;
}

@Override
public HealthType getDamageType() {
return HealthType.Lethal;
}

@Override
public Integer getDefence() {
return 0;
}

@Override
public Integer getRange() {
return null;
}

@Override
public Integer getRate() {
return null;
}

@Override
public int getSpeed() {
return 6;
}

@Override
public IIdentificate[] getTags() {
return new IIdentificate[]{WeaponTag.ClinchEnhancer, WeaponTag.Natural, WeaponTag.Piercing};
}

@Override
public ITraitType getTraitType() {
return AbilityType.MartialArts;
}

@Override
public boolean inflictsNoDamage() {
return false;
}

@Override
public boolean isRangedCombat() {
return false;
}

@Override
public IIdentificate getName() {
return new Identificate("Abyssal.Fangs"); //$NON-NLS-1$
}

@Override
public IEquipmentStats[] getViews() {
return new IEquipmentStats[] { this };
}

@Override
public String getId() {
return getName().getId();
}
package net.sf.anathema.character.abyssal.equipment;

import net.sf.anathema.character.equipment.impl.character.model.stats.AbstractCombatStats;
import net.sf.anathema.character.equipment.impl.creation.model.WeaponTag;
import net.sf.anathema.character.generic.equipment.weapon.IEquipmentStats;
import net.sf.anathema.character.generic.equipment.weapon.IWeaponStats;
import net.sf.anathema.character.generic.health.HealthType;
import net.sf.anathema.character.generic.traits.ITraitType;
import net.sf.anathema.character.generic.traits.types.AbilityType;
import net.sf.anathema.character.generic.traits.types.AttributeType;
import net.sf.anathema.lib.util.Identificate;
import net.sf.anathema.lib.util.Identified;

public class FangStats extends AbstractCombatStats implements IWeaponStats {

@Override
public int getAccuracy() {
return 0;
}

@Override
public int getDamage() {
return 0;
}

@Override
public int getMinimumDamage() {
return 1;
}

@Override
public int getMobilityPenalty() {
return 0;
}

@Override
public ITraitType getDamageTraitType() {
return AttributeType.Strength;
}

@Override
public HealthType getDamageType() {
return HealthType.Lethal;
}

@Override
public Integer getDefence() {
return 0;
}

@Override
public Integer getRange() {
return null;
}

@Override
public Integer getRate() {
return null;
}

@Override
public int getSpeed() {
return 6;
}

@Override
public Identified[] getTags() {
return new Identified[]{WeaponTag.ClinchEnhancer, WeaponTag.Natural, WeaponTag.Piercing};
}

@Override
public ITraitType getTraitType() {
return AbilityType.MartialArts;
}

@Override
public boolean inflictsNoDamage() {
return false;
}

@Override
public boolean isRangedCombat() {
return false;
}

@Override
public Identified getName() {
return new Identificate("Abyssal.Fangs"); //$NON-NLS-1$
}

@Override
public IEquipmentStats[] getViews() {
return new IEquipmentStats[] { this };
}

@Override
public String getId() {
return getName().getId();
}
}
Expand Up @@ -3,7 +3,7 @@
import net.sf.anathema.character.generic.equipment.ArtifactAttuneType;
import net.sf.anathema.character.generic.type.ICharacterType;
import net.sf.anathema.character.generic.type.ICharacterTypeVisitor;
import net.sf.anathema.lib.util.IIdentificate;
import net.sf.anathema.lib.util.Identified;

import java.util.List;

Expand All @@ -13,7 +13,7 @@
import static net.sf.anathema.character.generic.equipment.ArtifactAttuneType.Unattuned;
import static net.sf.anathema.character.generic.equipment.ArtifactAttuneType.UnharmoniouslyAttuned;

public enum MagicalMaterial implements IIdentificate {
public enum MagicalMaterial implements Identified {
Orichalcum, Jade, Moonsilver, Starmetal, Soulsteel, Adamant,
VitriolOrichalcum, VitriolJade, VitriolMoonsilver, VitriolStarmetal, VitriolSoulsteel, VitriolAdamant;

Expand Down
@@ -1,8 +1,8 @@
package net.sf.anathema.character.equipment;

import net.sf.anathema.lib.util.IIdentificate;
import net.sf.anathema.lib.util.Identified;

public enum MaterialComposition implements IIdentificate {
public enum MaterialComposition implements Identified {
None() {
@Override
public boolean requiresMaterial() {
Expand Down
Expand Up @@ -10,7 +10,7 @@
import net.sf.anathema.character.generic.health.HealthType;
import net.sf.anathema.lib.exception.UnreachableCodeReachedException;
import net.sf.anathema.lib.resources.IResources;
import net.sf.anathema.lib.util.IIdentificate;
import net.sf.anathema.lib.util.Identified;

public class EquipmentStringBuilder implements IEquipmentStringBuilder {

Expand Down Expand Up @@ -55,9 +55,9 @@ private String getStatsString(String keyPart, Integer value, boolean printSignum
return createtNewStatsStart(keyPart) + signum + value;
}

private String getTagsString( IIdentificate[] tags ) {
private String getTagsString( Identified[] tags ) {
StringBuilder result = new StringBuilder();
for( IIdentificate tag : tags ) {
for( Identified tag : tags ) {
result.append( " " + tag.getId() );
}
return result.toString();
Expand Down
@@ -1,14 +1,14 @@
package net.sf.anathema.character.equipment.character;

import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;

import net.sf.anathema.character.equipment.character.model.IEquipmentItem;
import net.sf.anathema.character.generic.equipment.weapon.IEquipmentStats;
import net.sf.anathema.character.generic.equipment.weapon.IWeaponStats;
import net.sf.anathema.lib.resources.IResources;
import net.sf.anathema.lib.util.IIdentificate;
import net.sf.anathema.lib.util.Identified;

import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;

public class WeaponStatsNameStringFactory {

Expand All @@ -32,10 +32,10 @@ private boolean hasMultipleViews(IEquipmentItem item, IWeaponStats stats) {
if (item == null) {
return true;
}
return Collections.frequency(getStatNames(item, new ArrayList<IIdentificate>()), stats.getName()) > 1;
return Collections.frequency(getStatNames(item, new ArrayList<Identified>()), stats.getName()) > 1;
}

private Collection<IIdentificate> getStatNames(IEquipmentItem item, Collection<IIdentificate> names) {
private Collection<Identified> getStatNames(IEquipmentItem item, Collection<Identified> names) {
for (IEquipmentStats stats : item.getStats()) {
names.add(stats.getName());
}
Expand Down
@@ -1,7 +1,7 @@
package net.sf.anathema.character.equipment.creation.model.stats;

import net.sf.anathema.lib.util.IIdentificate;
import net.sf.anathema.lib.util.Identified;

public interface IWeaponTag extends IIdentificate {
public interface IWeaponTag extends Identified {
// nothing to do
}

0 comments on commit 1cee7aa

Please sign in to comment.