Home Verkennen Help
Registreren Inloggen
L2j
/
l2j-server-game
2
0
Vork 0
Bestanden Issues 0 Wiki
Bladeren bron

BETA: Enabling Indirect access to static member warning.
* Respective fixes.

'''Note:''' This means that you are calling a ''constant'' defined in a superclass referencing it from a subclass.

Zoey76 13 jaren geleden
bovenliggende
ac51f7d097
commit
afbb870475
6 gewijzigde bestanden met toevoegingen van 16 en 13 verwijderingen
Zij-aan-zij weergave Toon Diff Stats
  1. 2 2
      L2J_Server_BETA/.settings/org.eclipse.jdt.core.prefs
  2. 2 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2VillageMasterInstance.java
  3. 1 2
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestPackageSend.java
  4. 2 1
      L2J_Server_BETA/java/com/l2jserver/tools/configurator/ConfigUserInterface.java
  5. 6 5
      L2J_Server_BETA/java/com/l2jserver/tools/dbinstaller/gui/DBConfigGUI.java
  6. 3 2
      L2J_Server_BETA/java/com/l2jserver/tools/gsregistering/RegisterDialog.java

+ 2 - 2
L2J_Server_BETA/.settings/org.eclipse.jdt.core.prefs
Bestand weergeven 

@@ -1,4 +1,4 @@
 
-#Sun Feb 05 16:44:50 UYST 2012

+#Tue Mar 20 12:54:53 UYT 2012

 eclipse.preferences.version=1

 org.eclipse.jdt.core.codeComplete.argumentPrefixes=

 org.eclipse.jdt.core.codeComplete.argumentSuffixes=

@@ -30,7 +30,7 @@ org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
 
 org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled

 org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning

 org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore

-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore

+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning

 org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning

 org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled

 org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled

+ 2 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2VillageMasterInstance.java
Bestand weergeven 

@@ -34,6 +34,7 @@ import com.l2jserver.gameserver.model.L2Clan;
 
 import com.l2jserver.gameserver.model.L2Clan.SubPledge;

 import com.l2jserver.gameserver.model.L2ClanMember;

 import com.l2jserver.gameserver.model.L2SkillLearn;

+import com.l2jserver.gameserver.model.actor.L2Character;

 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;

 import com.l2jserver.gameserver.model.base.ClassId;

 import com.l2jserver.gameserver.model.base.PlayerClass;

@@ -830,7 +831,7 @@ public class L2VillageMasterInstance extends L2NpcInstance
 
 			}

 		}

 		

-		if (player.isInsideZone(L2PcInstance.ZONE_SIEGE))

+		if (player.isInsideZone(L2Character.ZONE_SIEGE))

 		{

 			player.sendPacket(SystemMessageId.CANNOT_DISSOLVE_WHILE_IN_SIEGE);

 			return;

+ 1 - 2
L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestPackageSend.java
Bestand weergeven 

@@ -18,7 +18,6 @@ import java.util.logging.Level;
 
 

 import com.l2jserver.Config;

 import com.l2jserver.gameserver.model.actor.L2Npc;

-import com.l2jserver.gameserver.model.actor.instance.L2NpcInstance;

 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;

 import com.l2jserver.gameserver.model.holders.ItemHolder;

 import com.l2jserver.gameserver.model.itemcontainer.ItemContainer;

@@ -86,7 +85,7 @@ public class RequestPackageSend extends L2GameClientPacket
 
 			return;

 		

 		L2Npc manager = player.getLastFolkNPC();

-		if ((manager == null || !player.isInsideRadius(manager, L2NpcInstance.INTERACTION_DISTANCE, false, false)) && !player.isGM())

+		if ((manager == null || !player.isInsideRadius(manager, L2Npc.INTERACTION_DISTANCE, false, false)) && !player.isGM())

 			return;

 		

 		if (player.getActiveEnchantItem() != null)

+ 2 - 1
L2J_Server_BETA/java/com/l2jserver/tools/configurator/ConfigUserInterface.java
Bestand weergeven 

@@ -53,6 +53,7 @@ import javax.swing.JScrollPane;
 
 import javax.swing.JTabbedPane;

 import javax.swing.JTextArea;

 import javax.swing.JToolBar;

+import javax.swing.SwingConstants;

 import javax.swing.SwingUtilities;

 import javax.swing.ToolTipManager;

 import javax.swing.UIManager;

@@ -206,7 +207,7 @@ public class ConfigUserInterface extends JFrame implements ActionListener
 
 				ConfigProperty cp = (ConfigProperty) cc;

 				cons.gridx = 0;

 				

-				JLabel keyLabel = new JLabel(cp.getDisplayName()+':', ImagesTable.getImage("help.png"), JLabel.LEFT);

+				JLabel keyLabel = new JLabel(cp.getDisplayName()+':', ImagesTable.getImage("help.png"), SwingConstants.LEFT);

 				String comments = "<b>"+cp.getName()+":</b><br>"+cp.getComments();

 				comments = comments.replace("\r\n", "<br>");

 				comments = "<html>"+comments+"</html>";

+ 6 - 5
L2J_Server_BETA/java/com/l2jserver/tools/dbinstaller/gui/DBConfigGUI.java
Bestand weergeven 

@@ -27,6 +27,7 @@ import javax.swing.JOptionPane;
 
 import javax.swing.JPasswordField;

 import javax.swing.JTextField;

 import javax.swing.SpringLayout;

+import javax.swing.SwingConstants;

 

 import com.l2jserver.tools.dbinstaller.RunTasks;

 import com.l2jserver.tools.dbinstaller.util.mysql.MySqlConnect;

@@ -74,7 +75,7 @@ public class DBConfigGUI extends JFrame
 
 		_prop = Preferences.userRoot();

 		

 		// Host

-		JLabel labelDbHost = new JLabel("Host: ", JLabel.LEFT);

+		JLabel labelDbHost = new JLabel("Host: ", SwingConstants.LEFT);

 		add(labelDbHost);

 		_dbHost = new JTextField(15);

 		_dbHost.setText(_prop.get("dbHost_" + db, "localhost"));

@@ -82,7 +83,7 @@ public class DBConfigGUI extends JFrame
 
 		add(_dbHost);

 		

 		// Port

-		JLabel labelDbPort = new JLabel("Port: ", JLabel.LEFT);

+		JLabel labelDbPort = new JLabel("Port: ", SwingConstants.LEFT);

 		add(labelDbPort);

 		_dbPort = new JTextField(15);

 		_dbPort.setText(_prop.get("dbPort_" + db, "3306"));

@@ -90,7 +91,7 @@ public class DBConfigGUI extends JFrame
 
 		add(_dbPort);

 		

 		// Username

-		JLabel labelDbUser = new JLabel("Username: ", JLabel.LEFT);

+		JLabel labelDbUser = new JLabel("Username: ", SwingConstants.LEFT);

 		add(labelDbUser);

 		_dbUser = new JTextField(15);

 		_dbUser.setText(_prop.get("dbUser_" + db, "root"));

@@ -98,7 +99,7 @@ public class DBConfigGUI extends JFrame
 
 		add(_dbUser);

 		

 		// Password

-		JLabel labelDbPass = new JLabel("Password: ", JLabel.LEFT);

+		JLabel labelDbPass = new JLabel("Password: ", SwingConstants.LEFT);

 		add(labelDbPass);

 		_dbPass = new JPasswordField(15);

 		_dbPass.setText(_prop.get("dbPass_" + db, ""));

@@ -106,7 +107,7 @@ public class DBConfigGUI extends JFrame
 
 		add(_dbPass);

 		

 		// Database

-		JLabel labelDbDbse = new JLabel("Database: ", JLabel.LEFT);

+		JLabel labelDbDbse = new JLabel("Database: ", SwingConstants.LEFT);

 		add(labelDbDbse);

 		_dbDbse = new JTextField(15);

 		_dbDbse.setText(_prop.get("dbDbse_" + db, db));

+ 3 - 2
L2J_Server_BETA/java/com/l2jserver/tools/gsregistering/RegisterDialog.java
Bestand weergeven 

@@ -29,6 +29,7 @@ import javax.swing.JDialog;
 
 import javax.swing.JFileChooser;

 import javax.swing.JLabel;

 import javax.swing.JTextPane;

+import javax.swing.WindowConstants;

 import javax.swing.filechooser.FileFilter;

 

 import com.l2jserver.loginserver.GameServerTable;

@@ -48,7 +49,7 @@ public class RegisterDialog extends JDialog implements ActionListener
 
 	{

 		super(owner.getFrame(), true);

 		_owner = owner;

-		this.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);

+		this.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);

 		_bundle = owner.getBundle();

 		this.setTitle(_bundle.getString("registerGS"));

 		this.setResizable(false);

@@ -183,7 +184,7 @@ public class RegisterDialog extends JDialog implements ActionListener
 
 			

 			try

 			{

-				GUserInterface.registerGameServer(gsId, fc.getSelectedFile().getAbsolutePath());

+				BaseGameServerRegister.registerGameServer(gsId, fc.getSelectedFile().getAbsolutePath());

 				_owner.refreshAsync();

 				this.setVisible(false);

 			}