Upstream
/
Multiverse-Core
mirror of https://github.com/Multiverse/Multiverse-Core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Raw types are evil.

This commit is contained in:
main() 2011-12-08 19:17:55 +01:00
parent 56e4e493b1
commit dbf109f051
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/onarandombox/MultiverseCore/MVWorld.java
View File

@ -45,7 +45,7 @@ public class MVWorld implements MultiverseWorld {
private String name; // The Worlds Name, EG its folder name.
private Map<String, List<String>> masterList;
private Map<String, MVConfigProperty> propertyList;
private Map<String, MVConfigProperty<?>> propertyList;
private String generator;
private Permission permission;
@ -82,7 +82,7 @@ public class MVWorld implements MultiverseWorld {
// Start NEW config awesomeness.
ConfigPropertyFactory fac = new ConfigPropertyFactory(this.worldSection);
this.propertyList = new HashMap<String, MVConfigProperty>();
this.propertyList = new HashMap<String, MVConfigProperty<?>>();
// The format of these are either:
// getNewProperty(name, defaultValue, helpText)
// or
@ -344,8 +344,8 @@ public class MVWorld implements MultiverseWorld {
}
@Override
public MVConfigProperty getProperty(String name) throws PropertyDoesNotExistException {
MVConfigProperty p = this.getKnownProperty(name);
public MVConfigProperty<?> getProperty(String name) throws PropertyDoesNotExistException {
MVConfigProperty<?> p = this.getKnownProperty(name);
if (p == null) {
throw new PropertyDoesNotExistException(name);
}
@ -358,7 +358,7 @@ public class MVWorld implements MultiverseWorld {
* @param name The known name of a property
* @return The property object.
*/
private MVConfigProperty getKnownProperty(String name) {
private MVConfigProperty<?> getKnownProperty(String name) {
if (this.propertyList.containsKey(name)) {
return this.propertyList.get(name);
} else if (this.propertyAliases.containsKey(name)) {
@ -377,7 +377,7 @@ public class MVWorld implements MultiverseWorld {
* @return True if the property was saved, false if not.
*/
private boolean setKnownProperty(String name, String value, CommandSender sender) {
MVConfigProperty property;
MVConfigProperty<?> property;
if (this.propertyList.containsKey(name)) {
property = this.getKnownProperty(name);
} else if (this.propertyAliases.containsKey(name)) {

2
src/main/java/com/onarandombox/MultiverseCore/api/MultiverseWorld.java
View File

@ -49,7 +49,7 @@ public interface MultiverseWorld {
* @return A valid MVWorldProperty.
* @throws PropertyDoesNotExistException Thrown if the property was not found in the world.
*/
public MVConfigProperty getProperty(String property) throws PropertyDoesNotExistException;
public MVConfigProperty<?> getProperty(String property) throws PropertyDoesNotExistException;
/**
* Gets the string representation of a property.