Jelajahi Sumber

- Some parameterization
- Default settings for compiler compliance set to java 1.6 (default was 1.5 for some odd reason, which would automatically give people issues if they didn't know how to resolve them)

Ahmed 17 tahun lalu
induk
melakukan
75499b1b1f

+ 4 - 4
L2_GameServer_T1/.settings/org.eclipse.jdt.core.prefs

@@ -1,4 +1,4 @@
-#Sun Dec 16 06:06:20 GMT-02:00 2007
+#Fri Feb 22 21:44:16 EST 2008
 eclipse.preferences.version=1
 eclipse.preferences.version=1
 org.eclipse.jdt.core.builder.cleanOutputFolder=clean
 org.eclipse.jdt.core.builder.cleanOutputFolder=clean
 org.eclipse.jdt.core.builder.duplicateResourceTask=warning
 org.eclipse.jdt.core.builder.duplicateResourceTask=warning
@@ -16,9 +16,9 @@ org.eclipse.jdt.core.codeComplete.localSuffixes=
 org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=_
 org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=_
 org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
 org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.6
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -70,7 +70,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=di
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=0
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=0
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

+ 1 - 2
L2_GameServer_T1/.settings/org.eclipse.jdt.ui.prefs

@@ -1,8 +1,7 @@
-#Thu Aug 02 17:37:59 BRT 2007
+#Fri Feb 22 21:44:16 EST 2008
 eclipse.preferences.version=1
 eclipse.preferences.version=1
 formatter_profile=_KenM
 formatter_profile=_KenM
 formatter_settings_version=10
 formatter_settings_version=10
-internal.default.compliance=default
 org.eclipse.jdt.ui.exception.name=e
 org.eclipse.jdt.ui.exception.name=e
 org.eclipse.jdt.ui.gettersetter.use.is=true
 org.eclipse.jdt.ui.gettersetter.use.is=true
 org.eclipse.jdt.ui.javadoc=true
 org.eclipse.jdt.ui.javadoc=true

+ 1 - 1
L2_GameServer_T1/java/net/sf/l2j/gameserver/Item.java

@@ -35,7 +35,7 @@ import net.sf.l2j.gameserver.templates.StatsSet;
 public class Item
 public class Item
 {
 {
     public int      id;
     public int      id;
-    public Enum     type;
+    public Enum<?>     type;
     public String   name;
     public String   name;
     public StatsSet set;
     public StatsSet set;
     public int      currentLevel;
     public int      currentLevel;

+ 1 - 1
L2_GameServer_T1/java/net/sf/l2j/gameserver/cache/FastMRUCache.java

@@ -62,7 +62,7 @@ public class FastMRUCache<K,V> extends FastCollection implements Reusable
     /**
     /**
      * Holds the set factory.
      * Holds the set factory.
      */
      */
-    private static final Factory FACTORY = new Factory() {
+    private static final Factory<?> FACTORY = new Factory() {
 
 
         @Override
         @Override
 		public Object create() {
 		public Object create() {

+ 1 - 1
L2_GameServer_T1/java/net/sf/l2j/gameserver/handler/itemhandlers/Potions.java

@@ -418,7 +418,7 @@ public class Potions implements IItemHandler
 			playable.destroyItem("Consume", item.getObjectId(), 1, null, false);
 			playable.destroyItem("Consume", item.getObjectId(), 1, null, false);
 	}
 	}
 
 
-	private boolean isEffectReplaceable(L2PcInstance activeChar, Enum effectType, int itemId)
+	private boolean isEffectReplaceable(L2PcInstance activeChar, Enum<?> effectType, int itemId)
 	{
 	{
 		L2Effect[] effects = activeChar.getAllEffects();
 		L2Effect[] effects = activeChar.getAllEffects();
 
 

+ 1 - 1
L2_GameServer_T1/java/net/sf/l2j/gameserver/model/L2ItemInstance.java

@@ -405,7 +405,7 @@ public final class L2ItemInstance extends L2Object
 	 * Returns the type of item
 	 * Returns the type of item
 	 * @return Enum
 	 * @return Enum
 	 */
 	 */
-	public Enum getItemType()
+	public Enum<?> getItemType()
 	{
 	{
 		return _item.getItemType();
 		return _item.getItemType();
 	}
 	}

+ 2 - 2
L2_GameServer_T1/java/net/sf/l2j/gameserver/templates/L2Item.java

@@ -140,7 +140,7 @@ public abstract class L2Item
 	private final boolean _destroyable;
 	private final boolean _destroyable;
 	private final boolean _tradeable;
 	private final boolean _tradeable;
 
 
-	protected final Enum _type;
+	protected final Enum<?>  _type;
 
 
 	protected FuncTemplate[] _funcTemplates;
 	protected FuncTemplate[] _funcTemplates;
 	protected EffectTemplate[] _effectTemplates;
 	protected EffectTemplate[] _effectTemplates;
@@ -193,7 +193,7 @@ public abstract class L2Item
 	 * Returns the itemType.
 	 * Returns the itemType.
 	 * @return Enum
 	 * @return Enum
 	 */
 	 */
-	public Enum getItemType()
+	public Enum<?>  getItemType()
 	{
 	{
 		return _type;
 		return _type;
 	}
 	}