diff --git a/mcp/mobius/opis/swing/actions/ActionAmountEntities.java b/mcp/mobius/opis/swing/actions/ActionAmountEntities.java index 44d9f85..9b0d4fd 100644 --- a/mcp/mobius/opis/swing/actions/ActionAmountEntities.java +++ b/mcp/mobius/opis/swing/actions/ActionAmountEntities.java @@ -4,6 +4,7 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; + import mcp.mobius.opis.network.enums.Message; import mcp.mobius.opis.network.packets.client.Packet_ReqData; import mcp.mobius.opis.swing.widgets.JTableStats; @@ -11,6 +12,7 @@ import mcp.mobius.opis.swing.widgets.JTableStats; import javax.swing.JButton; import cpw.mods.fml.common.network.PacketDispatcher; +import mcp.mobius.opis.data.holders.basetypes.AmountHolder; import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock; import mcp.mobius.opis.data.holders.stats.StatAbstract; import mcp.mobius.opis.swing.widgets.JPanelMsgHandler; @@ -23,7 +25,7 @@ public class ActionAmountEntities implements ActionListener, ItemListener { JTableStats table = ((JPanelMsgHandler)((JButton)e.getSource()).getParent()).getTable(); if (table == null || table.getSelectedRow() == -1) return; int indexData = table.convertRowIndexToModel(table.getSelectedRow()); - StatAbstract data = table.getStatistics().get(indexData); + AmountHolder data = (AmountHolder)table.getStatistics().get(indexData); } diff --git a/mcp/mobius/opis/swing/actions/ActionPlayers.java b/mcp/mobius/opis/swing/actions/ActionPlayers.java index 0f25ab6..9b287c7 100644 --- a/mcp/mobius/opis/swing/actions/ActionPlayers.java +++ b/mcp/mobius/opis/swing/actions/ActionPlayers.java @@ -4,6 +4,7 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; + import mcp.mobius.opis.network.enums.Message; import mcp.mobius.opis.network.packets.client.Packet_ReqData; import mcp.mobius.opis.swing.widgets.JTableStats; @@ -13,6 +14,7 @@ import javax.swing.JButton; import cpw.mods.fml.common.network.PacketDispatcher; import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock; import mcp.mobius.opis.data.holders.stats.StatAbstract; +import mcp.mobius.opis.data.holders.stats.StatsPlayer; import mcp.mobius.opis.swing.widgets.JPanelMsgHandler; import mcp.mobius.opis.swing.widgets.JTableStats; @@ -23,7 +25,7 @@ public class ActionPlayers implements ActionListener { JTableStats table = ((JPanelMsgHandler)((JButton)e.getSource()).getParent()).getTable(); if (table == null || table.getSelectedRow() == -1) return; int indexData = table.convertRowIndexToModel(table.getSelectedRow()); - StatAbstract data = table.getStatistics().get(indexData); + StatsPlayer data = (StatsPlayer)table.getStatistics().get(indexData); } diff --git a/mcp/mobius/opis/swing/actions/ActionTimingChunks.java b/mcp/mobius/opis/swing/actions/ActionTimingChunks.java index 5da99fd..ca1365b 100644 --- a/mcp/mobius/opis/swing/actions/ActionTimingChunks.java +++ b/mcp/mobius/opis/swing/actions/ActionTimingChunks.java @@ -4,6 +4,7 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; + import mcp.mobius.opis.network.enums.Message; import mcp.mobius.opis.network.packets.client.Packet_ReqData; import mcp.mobius.opis.swing.widgets.JTableStats; @@ -13,6 +14,7 @@ import javax.swing.JButton; import cpw.mods.fml.common.network.PacketDispatcher; import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock; import mcp.mobius.opis.data.holders.stats.StatAbstract; +import mcp.mobius.opis.data.holders.stats.StatsChunk; import mcp.mobius.opis.swing.widgets.JPanelMsgHandler; import mcp.mobius.opis.swing.widgets.JTableStats; @@ -23,7 +25,7 @@ public class ActionTimingChunks implements ActionListener { JTableStats table = ((JPanelMsgHandler)((JButton)e.getSource()).getParent()).getTable(); if (table == null || table.getSelectedRow() == -1) return; int indexData = table.convertRowIndexToModel(table.getSelectedRow()); - StatAbstract data = table.getStatistics().get(indexData); + StatsChunk data = (StatsChunk)table.getStatistics().get(indexData); } diff --git a/mcp/mobius/opis/swing/actions/ActionTimingEntities.java b/mcp/mobius/opis/swing/actions/ActionTimingEntities.java index e8ede94..bc1daa9 100644 --- a/mcp/mobius/opis/swing/actions/ActionTimingEntities.java +++ b/mcp/mobius/opis/swing/actions/ActionTimingEntities.java @@ -4,6 +4,7 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; + import mcp.mobius.opis.network.enums.Message; import mcp.mobius.opis.network.packets.client.Packet_ReqData; import mcp.mobius.opis.swing.widgets.JTableStats; @@ -13,6 +14,7 @@ import javax.swing.JButton; import cpw.mods.fml.common.network.PacketDispatcher; import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock; import mcp.mobius.opis.data.holders.stats.StatAbstract; +import mcp.mobius.opis.data.holders.stats.StatsEntity; import mcp.mobius.opis.swing.widgets.JPanelMsgHandler; import mcp.mobius.opis.swing.widgets.JTableStats; @@ -23,7 +25,7 @@ public class ActionTimingEntities implements ActionListener { JTableStats table = ((JPanelMsgHandler)((JButton)e.getSource()).getParent()).getTable(); if (table == null || table.getSelectedRow() == -1) return; int indexData = table.convertRowIndexToModel(table.getSelectedRow()); - StatAbstract data = table.getStatistics().get(indexData); + StatsEntity data = (StatsEntity)table.getStatistics().get(indexData); } diff --git a/mcp/mobius/opis/swing/actions/ActionTimingHandlers.java b/mcp/mobius/opis/swing/actions/ActionTimingHandlers.java deleted file mode 100644 index f243777..0000000 --- a/mcp/mobius/opis/swing/actions/ActionTimingHandlers.java +++ /dev/null @@ -1,30 +0,0 @@ -package mcp.mobius.opis.swing.actions; - -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.ItemEvent; -import java.awt.event.ItemListener; -import mcp.mobius.opis.network.enums.Message; -import mcp.mobius.opis.network.packets.client.Packet_ReqData; -import mcp.mobius.opis.swing.widgets.JTableStats; - -import javax.swing.JButton; - -import cpw.mods.fml.common.network.PacketDispatcher; -import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock; -import mcp.mobius.opis.data.holders.stats.StatAbstract; -import mcp.mobius.opis.swing.widgets.JPanelMsgHandler; -import mcp.mobius.opis.swing.widgets.JTableStats; - -public class ActionTimingHandlers implements ActionListener { - - @Override - public void actionPerformed(ActionEvent e) { - JTableStats table = ((JPanelMsgHandler)((JButton)e.getSource()).getParent()).getTable(); - if (table == null || table.getSelectedRow() == -1) return; - int indexData = table.convertRowIndexToModel(table.getSelectedRow()); - StatAbstract data = table.getStatistics().get(indexData); - - } - -} diff --git a/mcp/mobius/opis/swing/actions/ActionTimingTileEnts.java b/mcp/mobius/opis/swing/actions/ActionTimingTileEnts.java index 3a108ea..72cf62f 100644 --- a/mcp/mobius/opis/swing/actions/ActionTimingTileEnts.java +++ b/mcp/mobius/opis/swing/actions/ActionTimingTileEnts.java @@ -4,6 +4,7 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; + import mcp.mobius.opis.network.enums.Message; import mcp.mobius.opis.network.packets.client.Packet_ReqData; import mcp.mobius.opis.swing.widgets.JTableStats; @@ -13,6 +14,7 @@ import javax.swing.JButton; import cpw.mods.fml.common.network.PacketDispatcher; import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock; import mcp.mobius.opis.data.holders.stats.StatAbstract; +import mcp.mobius.opis.data.holders.stats.StatsTileEntity; import mcp.mobius.opis.swing.widgets.JPanelMsgHandler; import mcp.mobius.opis.swing.widgets.JTableStats; @@ -23,7 +25,7 @@ public class ActionTimingTileEnts implements ActionListener { JTableStats table = ((JPanelMsgHandler)((JButton)e.getSource()).getParent()).getTable(); if (table == null || table.getSelectedRow() == -1) return; int indexData = table.convertRowIndexToModel(table.getSelectedRow()); - StatAbstract data = table.getStatistics().get(indexData); + StatsTileEntity data = (StatsTileEntity)table.getStatistics().get(indexData); } diff --git a/mcp/mobius/opis/swing/widgets/JTableStats.java b/mcp/mobius/opis/swing/widgets/JTableStats.java index 9377af6..a4f4ea2 100644 --- a/mcp/mobius/opis/swing/widgets/JTableStats.java +++ b/mcp/mobius/opis/swing/widgets/JTableStats.java @@ -9,23 +9,23 @@ import mcp.mobius.opis.data.holders.stats.StatAbstract; public class JTableStats extends JTable { - protected ArrayList statistics; + protected ArrayList statistics; - public ArrayList getStatistics(){ + public ArrayList getStatistics(){ return this.statistics; } - /* - public void setStatistics(ArrayList statistics){ + public void setStatistics(ArrayList statistics){ this.statistics = statistics; } - */ - + + /* public void setStatistics(ArrayList statistics){ - this.statistics = new ArrayList(); + this.statistics = new ArrayList(); for (Object o : statistics){ this.statistics.add((StatAbstract)o); } - } + } + */ }