Bladeren bron

BETA: Some more cleanup, getting rid of some warnings.

Zoey76 13 jaren geleden
bovenliggende
commit
17cb2c26bc

+ 6 - 4
L2J_Server_BETA/java/com/l2jserver/gameserver/FortUpdater.java

@@ -22,12 +22,9 @@ import com.l2jserver.gameserver.instancemanager.CastleManager;
 import com.l2jserver.gameserver.model.L2Clan;
 import com.l2jserver.gameserver.model.entity.Fort;
 
-
 /**
- *
- * Vice - 2008
  * Class managing periodical events with castle
- *
+ * @author Vice - 2008
  */
 public class FortUpdater implements Runnable
 {
@@ -92,4 +89,9 @@ public class FortUpdater implements Runnable
 			_log.log(Level.WARNING, "", e);
 		}
 	}
+	
+	public int getRunCount()
+	{
+		return _runCount;
+	}
 }

+ 18 - 0
L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/Siege.java

@@ -1591,6 +1591,24 @@ public class Siege implements Siegable
 		return _controlTowerCount;
 	}
 	
+	/**
+	 * TODO: Use it.
+	 * @return the max count of control type towers.
+	 */
+	public int getControlTowerMaxCount()
+	{
+		return _controlTowerMaxCount;
+	}
+	
+	/**
+	 * TODO: Use it.
+	 * @return the max count of flame type towers.
+	 */
+	public int getFlameTowerMaxCount()
+	{
+		return _flameTowerMaxCount;
+	}
+	
 	public void disableTraps()
 	{
 		_flameTowerCount--;

+ 5 - 25
L2J_Server_BETA/java/com/l2jserver/gsregistering/GUserInterface.java

@@ -31,24 +31,14 @@ import javax.swing.table.TableColumnModel;
 import com.l2jserver.images.ImagesTable;
 import com.l2jserver.loginserver.GameServerTable;
 
-
 /**
  * @author KenM
- *
  */
 public class GUserInterface extends BaseGameServerRegister implements ActionListener
 {
-	
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-	
 	private final JFrame _frame;
-	
-	
-	JTableModel _dtm;
-	JProgressBar _progressBar;
+	private JTableModel _dtm;
+	private JProgressBar _progressBar;
 	
 	public JTable _gsTable;
 	
@@ -276,11 +266,6 @@ public class GUserInterface extends BaseGameServerRegister implements ActionList
 		}
 	}
 	
-	
-	
-	/* (non-Javadoc)
-	 * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
-	 */
 	@Override
 	public void actionPerformed(ActionEvent e)
 	{
@@ -325,12 +310,8 @@ public class GUserInterface extends BaseGameServerRegister implements ActionList
 		return _frame;
 	}
 	
-	class ButtonCellRenderer implements TableCellRenderer
+	private class ButtonCellRenderer implements TableCellRenderer
 	{
-		
-		/* (non-Javadoc)
-		 * @see javax.swing.table.TableCellRenderer#getTableCellRendererComponent(javax.swing.JTable, java.lang.Object, boolean, boolean, int, int)
-		 */
 		@Override
 		public Component getTableCellRendererComponent(JTable table,
 				Object value, boolean isSelected, boolean hasFocus, int row,
@@ -338,7 +319,6 @@ public class GUserInterface extends BaseGameServerRegister implements ActionList
 		{
 			return (Component) value;
 		}
-		
 	}
 	
 	/**
@@ -347,7 +327,7 @@ public class GUserInterface extends BaseGameServerRegister implements ActionList
 	 *
 	 * @author  KenM
 	 */
-	class JTableButtonMouseListener implements MouseListener
+	private class JTableButtonMouseListener implements MouseListener
 	{
 		private final JTable _table;
 		
@@ -413,7 +393,7 @@ public class GUserInterface extends BaseGameServerRegister implements ActionList
 	}
 	
 	@SuppressWarnings("serial")
-	class JTableModel extends DefaultTableModel
+	private class JTableModel extends DefaultTableModel
 	{
 		public JTableModel(Object[] columnNames)
 		{