diff --git a/mcp/mobius/opis/api/ITabPanel.java b/mcp/mobius/opis/api/ITabPanel.java index 97d9f26..3352c16 100644 --- a/mcp/mobius/opis/api/ITabPanel.java +++ b/mcp/mobius/opis/api/ITabPanel.java @@ -4,6 +4,5 @@ import mcp.mobius.opis.network.enums.Message; import mcp.mobius.opis.swing.SelectedTab; public interface ITabPanel { - String getTabRefName(); SelectedTab getSelectedTab(); } diff --git a/mcp/mobius/opis/api/TabPanelRegistrar.java b/mcp/mobius/opis/api/TabPanelRegistrar.java index 244a0e0..1f5cdc0 100644 --- a/mcp/mobius/opis/api/TabPanelRegistrar.java +++ b/mcp/mobius/opis/api/TabPanelRegistrar.java @@ -13,14 +13,16 @@ import cpw.mods.fml.common.network.PacketDispatcher; import mcp.mobius.opis.data.holders.basetypes.SerialInt; import mcp.mobius.opis.network.enums.Message; import mcp.mobius.opis.network.packets.client.Packet_ReqData; +import mcp.mobius.opis.swing.SelectedTab; import mcp.mobius.opis.swing.SwingUI; public enum TabPanelRegistrar implements ChangeListener{ INSTANCE; //private ArrayList panels = new ArrayList(); - private HashMap lookup = new HashMap(); - private HashMap sections = new HashMap(); + //private HashMap lookup = new HashMap(); + private HashMap sections = new HashMap(); + private HashMap lookup = new HashMap(); public JTabbedPane registerSection(String name){ JTabbedPane pane = new JTabbedPane(); @@ -31,22 +33,22 @@ public enum TabPanelRegistrar implements ChangeListener{ } public ITabPanel registerTab(ITabPanel panel, String name){ - this.lookup.put(panel.getTabRefName(), panel); + this.lookup.put(panel.getSelectedTab(), panel); SwingUI.instance().getTabbedPane().addTab(name, (JPanel)panel); return panel; } public ITabPanel registerTab(ITabPanel panel, String name, String section){ - this.lookup.put(panel.getTabRefName(), panel); + this.lookup.put(panel.getSelectedTab(), panel); this.sections.get(section).addTab(name, (JPanel)panel); return panel; } - public ITabPanel getTab(String refname){ + public ITabPanel getTab(SelectedTab refname){ return lookup.get(refname); } - public JPanel getTabAsPanel(String refname){ + public JPanel getTabAsPanel(SelectedTab refname){ return (JPanel)lookup.get(refname); } diff --git a/mcp/mobius/opis/events/OpisClientTickHandler.java b/mcp/mobius/opis/events/OpisClientTickHandler.java index 62c0b99..f26e5ae 100644 --- a/mcp/mobius/opis/events/OpisClientTickHandler.java +++ b/mcp/mobius/opis/events/OpisClientTickHandler.java @@ -21,6 +21,7 @@ import mcp.mobius.opis.data.profilers.ProfilerRenderEntity; import mcp.mobius.opis.data.profilers.ProfilerRenderTileEntity; import mcp.mobius.opis.network.enums.Message; import mcp.mobius.opis.network.packets.client.Packet_ReqData; +import mcp.mobius.opis.swing.SelectedTab; import mcp.mobius.opis.swing.panels.PanelRenderEntities; import mcp.mobius.opis.swing.panels.PanelRenderTileEnts; import cpw.mods.fml.common.ITickHandler; @@ -53,12 +54,12 @@ public enum OpisClientTickHandler implements ITickHandler { if (modOpis.profilerRunClient){ - ((PanelRenderTileEnts)(TabPanelRegistrar.INSTANCE.getTab("opis.client.terender"))).getBtnRunRender().setText("Running..."); - ((PanelRenderEntities)(TabPanelRegistrar.INSTANCE.getTab("opis.client.entrender"))).getBtnRunRender().setText("Running..."); + ((PanelRenderTileEnts)(TabPanelRegistrar.INSTANCE.getTab(SelectedTab.RENDERENTITIES))).getBtnRunRender().setText("Running..."); + ((PanelRenderEntities)(TabPanelRegistrar.INSTANCE.getTab(SelectedTab.RENDERTILEENTS))).getBtnRunRender().setText("Running..."); } else{ - ((PanelRenderTileEnts)(TabPanelRegistrar.INSTANCE.getTab("opis.client.terender"))).getBtnRunRender().setText("Run Render"); - ((PanelRenderEntities)(TabPanelRegistrar.INSTANCE.getTab("opis.client.entrender"))).getBtnRunRender().setText("Run Render"); + ((PanelRenderTileEnts)(TabPanelRegistrar.INSTANCE.getTab(SelectedTab.RENDERENTITIES))).getBtnRunRender().setText("Run Render"); + ((PanelRenderEntities)(TabPanelRegistrar.INSTANCE.getTab(SelectedTab.RENDERTILEENTS))).getBtnRunRender().setText("Run Render"); } profilerUpdateTickCounter++; @@ -106,8 +107,8 @@ public enum OpisClientTickHandler implements ITickHandler { System.out.printf("Rendered %d TileEntities\n", tileEntData.size()); Collections.sort(tileEntData); - ((PanelRenderTileEnts)(TabPanelRegistrar.INSTANCE.getTab("opis.client.terender"))).setTable(tileEntData); - ((PanelRenderTileEnts)(TabPanelRegistrar.INSTANCE.getTab("opis.client.terender"))).getLblTotal().setText(String.format("Total : %.3f µs", tileEntTotal / 1000.0)); + ((PanelRenderTileEnts)(TabPanelRegistrar.INSTANCE.getTab(SelectedTab.RENDERTILEENTS))).setTable(tileEntData); + ((PanelRenderTileEnts)(TabPanelRegistrar.INSTANCE.getTab(SelectedTab.RENDERTILEENTS))).getLblTotal().setText(String.format("Total : %.3f µs", tileEntTotal / 1000.0)); //==================================================================================== @@ -126,8 +127,8 @@ public enum OpisClientTickHandler implements ITickHandler { System.out.printf("Rendered %d Entities\n", entData.size()); Collections.sort(entData); - ((PanelRenderEntities)(TabPanelRegistrar.INSTANCE.getTab("opis.client.entrender"))).setTable(entData); - ((PanelRenderEntities)(TabPanelRegistrar.INSTANCE.getTab("opis.client.entrender"))).getLblTotal().setText(String.format("Total : %.3f µs", entTotal / 1000.0)); + ((PanelRenderEntities)(TabPanelRegistrar.INSTANCE.getTab(SelectedTab.RENDERENTITIES))).setTable(entData); + ((PanelRenderEntities)(TabPanelRegistrar.INSTANCE.getTab(SelectedTab.RENDERENTITIES))).getLblTotal().setText(String.format("Total : %.3f µs", entTotal / 1000.0)); //==================================================================================== diff --git a/mcp/mobius/opis/swing/actions/ActionAmountEntities.java b/mcp/mobius/opis/swing/actions/ActionAmountEntities.java index e29bb22..44df370 100644 --- a/mcp/mobius/opis/swing/actions/ActionAmountEntities.java +++ b/mcp/mobius/opis/swing/actions/ActionAmountEntities.java @@ -7,6 +7,7 @@ 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.SelectedTab; import mcp.mobius.opis.swing.SwingUI; import mcp.mobius.opis.swing.panels.PanelAmountEntities; import mcp.mobius.opis.swing.widgets.JTableStats; @@ -26,7 +27,7 @@ public class ActionAmountEntities implements ActionListener, ItemListener { @Override public void actionPerformed(ActionEvent e) { - PanelAmountEntities panel = (PanelAmountEntities)TabPanelRegistrar.INSTANCE.getTab("opis.amountents"); + PanelAmountEntities panel = (PanelAmountEntities)TabPanelRegistrar.INSTANCE.getTab(SelectedTab.AMOUNTENTS); JTableStats table = panel.getTable(); diff --git a/mcp/mobius/opis/swing/actions/ActionDimensions.java b/mcp/mobius/opis/swing/actions/ActionDimensions.java index edee80f..5bca3fd 100644 --- a/mcp/mobius/opis/swing/actions/ActionDimensions.java +++ b/mcp/mobius/opis/swing/actions/ActionDimensions.java @@ -11,6 +11,7 @@ import mcp.mobius.opis.data.holders.basetypes.SerialInt; import mcp.mobius.opis.data.holders.newtypes.DataDimension; import mcp.mobius.opis.network.enums.Message; import mcp.mobius.opis.network.packets.client.Packet_ReqData; +import mcp.mobius.opis.swing.SelectedTab; import mcp.mobius.opis.swing.panels.PanelDimensions; import mcp.mobius.opis.swing.widgets.JTableStats; @@ -18,7 +19,7 @@ public class ActionDimensions implements ActionListener { @Override public void actionPerformed(ActionEvent e) { - PanelDimensions panel = (PanelDimensions)TabPanelRegistrar.INSTANCE.getTab("opis.dimensions"); + PanelDimensions panel = (PanelDimensions)TabPanelRegistrar.INSTANCE.getTab(SelectedTab.DIMENSIONS); if (e.getSource() == panel.getBtnPurgeAll()){ if (JOptionPane.showConfirmDialog (null, "Do you want to kill all hostiles in game ?","Warning", JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION) diff --git a/mcp/mobius/opis/swing/actions/ActionPlayers.java b/mcp/mobius/opis/swing/actions/ActionPlayers.java index 1fd1453..3c38ecd 100644 --- a/mcp/mobius/opis/swing/actions/ActionPlayers.java +++ b/mcp/mobius/opis/swing/actions/ActionPlayers.java @@ -10,6 +10,7 @@ import mapwriter.api.MwAPI; import mapwriter.gui.MwGui; import mcp.mobius.opis.network.enums.Message; import mcp.mobius.opis.network.packets.client.Packet_ReqData; +import mcp.mobius.opis.swing.SelectedTab; import mcp.mobius.opis.swing.SwingUI; import mcp.mobius.opis.swing.panels.PanelPlayers; import mcp.mobius.opis.swing.widgets.JTableStats; @@ -31,7 +32,7 @@ public class ActionPlayers implements ActionListener { @Override public void actionPerformed(ActionEvent e) { - PanelPlayers panel = (PanelPlayers)TabPanelRegistrar.INSTANCE.getTab("opis.players"); + PanelPlayers panel = (PanelPlayers)TabPanelRegistrar.INSTANCE.getTab(SelectedTab.PLAYERS); JTableStats table = panel.getTable(); if (table == null || table.getSelectedRow() == -1) return; diff --git a/mcp/mobius/opis/swing/actions/ActionTimingChunks.java b/mcp/mobius/opis/swing/actions/ActionTimingChunks.java index 962bd3f..c21f4e4 100644 --- a/mcp/mobius/opis/swing/actions/ActionTimingChunks.java +++ b/mcp/mobius/opis/swing/actions/ActionTimingChunks.java @@ -10,6 +10,7 @@ import mapwriter.api.MwAPI; import mapwriter.gui.MwGui; import mcp.mobius.opis.network.enums.Message; import mcp.mobius.opis.network.packets.client.Packet_ReqData; +import mcp.mobius.opis.swing.SelectedTab; import mcp.mobius.opis.swing.SwingUI; import mcp.mobius.opis.swing.panels.PanelTimingChunks; import mcp.mobius.opis.swing.widgets.JTableStats; @@ -30,7 +31,7 @@ public class ActionTimingChunks implements ActionListener { @Override public void actionPerformed(ActionEvent e) { - PanelTimingChunks panel = (PanelTimingChunks)TabPanelRegistrar.INSTANCE.getTab("opis.timingchunks"); + PanelTimingChunks panel = (PanelTimingChunks)TabPanelRegistrar.INSTANCE.getTab(SelectedTab.TIMINGCHUNKS); JTableStats table = panel.getTable(); if (table == null || table.getSelectedRow() == -1) return; diff --git a/mcp/mobius/opis/swing/actions/ActionTimingEntities.java b/mcp/mobius/opis/swing/actions/ActionTimingEntities.java index 6c1e354..9ff1c70 100644 --- a/mcp/mobius/opis/swing/actions/ActionTimingEntities.java +++ b/mcp/mobius/opis/swing/actions/ActionTimingEntities.java @@ -10,6 +10,7 @@ import mapwriter.api.MwAPI; import mapwriter.gui.MwGui; import mcp.mobius.opis.network.enums.Message; import mcp.mobius.opis.network.packets.client.Packet_ReqData; +import mcp.mobius.opis.swing.SelectedTab; import mcp.mobius.opis.swing.SwingUI; import mcp.mobius.opis.swing.panels.PanelTimingEntities; import mcp.mobius.opis.swing.widgets.JTableStats; @@ -31,7 +32,7 @@ public class ActionTimingEntities implements ActionListener { @Override public void actionPerformed(ActionEvent e) { - PanelTimingEntities panel = (PanelTimingEntities)TabPanelRegistrar.INSTANCE.getTab("opis.timingents"); + PanelTimingEntities panel = (PanelTimingEntities)TabPanelRegistrar.INSTANCE.getTab(SelectedTab.TIMINGENTITES); JTableStats table = panel.getTable(); if (table == null || table.getSelectedRow() == -1) return; diff --git a/mcp/mobius/opis/swing/actions/ActionTimingTileEnts.java b/mcp/mobius/opis/swing/actions/ActionTimingTileEnts.java index 6f6ca26..c5eaf84 100644 --- a/mcp/mobius/opis/swing/actions/ActionTimingTileEnts.java +++ b/mcp/mobius/opis/swing/actions/ActionTimingTileEnts.java @@ -11,6 +11,7 @@ import mapwriter.gui.MwGui; import mcp.mobius.opis.modOpis; import mcp.mobius.opis.network.enums.Message; import mcp.mobius.opis.network.packets.client.Packet_ReqData; +import mcp.mobius.opis.swing.SelectedTab; import mcp.mobius.opis.swing.SwingUI; import mcp.mobius.opis.swing.panels.PanelTimingTileEnts; import mcp.mobius.opis.swing.widgets.JTableStats; @@ -30,7 +31,7 @@ public class ActionTimingTileEnts implements ActionListener { @Override public void actionPerformed(ActionEvent e) { - PanelTimingTileEnts panel = (PanelTimingTileEnts)TabPanelRegistrar.INSTANCE.getTab("opis.timingtileents"); + PanelTimingTileEnts panel = (PanelTimingTileEnts)TabPanelRegistrar.INSTANCE.getTab(SelectedTab.TIMINGTILEENTS); JTableStats table = panel.getTable(); if (table == null || table.getSelectedRow() == -1) return; diff --git a/mcp/mobius/opis/swing/panels/PanelAmountEntities.java b/mcp/mobius/opis/swing/panels/PanelAmountEntities.java index 8efcc6c..6af83ec 100644 --- a/mcp/mobius/opis/swing/panels/PanelAmountEntities.java +++ b/mcp/mobius/opis/swing/panels/PanelAmountEntities.java @@ -120,11 +120,6 @@ public class PanelAmountEntities extends JPanelMsgHandler implements ITabPanel{ return true; } - @Override - public String getTabRefName() { - return "opis.amountents"; - } - @Override public SelectedTab getSelectedTab() { return SelectedTab.AMOUNTENTS; diff --git a/mcp/mobius/opis/swing/panels/PanelDimensions.java b/mcp/mobius/opis/swing/panels/PanelDimensions.java index 9d0a956..a03de5d 100644 --- a/mcp/mobius/opis/swing/panels/PanelDimensions.java +++ b/mcp/mobius/opis/swing/panels/PanelDimensions.java @@ -81,9 +81,6 @@ public class PanelDimensions extends JPanelMsgHandler implements IMessageHandler //JTableButton buttonColumn = new JTableButton(table, new ActionDimensions(), 8, AccessLevel.PRIVILEGED); } - @Override - public String getTabRefName() { return "opis.dimensions"; } - @Override public boolean handleMessage(Message msg, NetDataRaw rawdata) { switch(msg){ diff --git a/mcp/mobius/opis/swing/panels/PanelPackets.java b/mcp/mobius/opis/swing/panels/PanelPackets.java index 13516e8..f027193 100644 --- a/mcp/mobius/opis/swing/panels/PanelPackets.java +++ b/mcp/mobius/opis/swing/panels/PanelPackets.java @@ -121,9 +121,6 @@ public class PanelPackets extends JPanelMsgHandler implements ITabPanel { } - @Override - public String getTabRefName() { return "opis.packets"; } - @Override public boolean handleMessage(Message msg, NetDataRaw rawdata) { switch(msg){ diff --git a/mcp/mobius/opis/swing/panels/PanelPlayers.java b/mcp/mobius/opis/swing/panels/PanelPlayers.java index af5c3cd..412fed6 100644 --- a/mcp/mobius/opis/swing/panels/PanelPlayers.java +++ b/mcp/mobius/opis/swing/panels/PanelPlayers.java @@ -125,11 +125,6 @@ public class PanelPlayers extends JPanelMsgHandler implements ITabPanel{ } - @Override - public String getTabRefName() { - return "opis.players"; - } - @Override public SelectedTab getSelectedTab() { return SelectedTab.PLAYERS; diff --git a/mcp/mobius/opis/swing/panels/PanelRenderEntities.java b/mcp/mobius/opis/swing/panels/PanelRenderEntities.java index ef0f312..663db53 100644 --- a/mcp/mobius/opis/swing/panels/PanelRenderEntities.java +++ b/mcp/mobius/opis/swing/panels/PanelRenderEntities.java @@ -72,11 +72,6 @@ public class PanelRenderEntities extends JPanel implements ITabPanel, IMessageHa } - @Override - public String getTabRefName() { - return "opis.client.entrender"; - } - public void setTable(ArrayList data){ DefaultTableModel model = (DefaultTableModel)table.getModel(); diff --git a/mcp/mobius/opis/swing/panels/PanelRenderTileEnts.java b/mcp/mobius/opis/swing/panels/PanelRenderTileEnts.java index c9b6bb8..2f00ee9 100644 --- a/mcp/mobius/opis/swing/panels/PanelRenderTileEnts.java +++ b/mcp/mobius/opis/swing/panels/PanelRenderTileEnts.java @@ -73,11 +73,6 @@ public class PanelRenderTileEnts extends JPanel implements ITabPanel, IMessageHa } - @Override - public String getTabRefName() { - return "opis.client.terender"; - } - public void setTable(ArrayList data){ DefaultTableModel model = (DefaultTableModel)table.getModel(); diff --git a/mcp/mobius/opis/swing/panels/PanelSummary.java b/mcp/mobius/opis/swing/panels/PanelSummary.java index 897d317..6266e48 100644 --- a/mcp/mobius/opis/swing/panels/PanelSummary.java +++ b/mcp/mobius/opis/swing/panels/PanelSummary.java @@ -404,10 +404,6 @@ public class PanelSummary extends JPanelMsgHandler implements ITabPanel{ return true; } - @Override - public String getTabRefName() { - return "opis.summary"; - } public JLabel getLblTimingNetwork() { return lblTimingNetwork; } diff --git a/mcp/mobius/opis/swing/panels/PanelTimingChunks.java b/mcp/mobius/opis/swing/panels/PanelTimingChunks.java index 991bebb..fda7196 100644 --- a/mcp/mobius/opis/swing/panels/PanelTimingChunks.java +++ b/mcp/mobius/opis/swing/panels/PanelTimingChunks.java @@ -131,11 +131,6 @@ public class PanelTimingChunks extends JPanelMsgHandler implements ITabPanel{ return true; } - @Override - public String getTabRefName() { - return "opis.timingchunks"; - } - @Override public SelectedTab getSelectedTab() { return SelectedTab.TIMINGCHUNKS; diff --git a/mcp/mobius/opis/swing/panels/PanelTimingEntities.java b/mcp/mobius/opis/swing/panels/PanelTimingEntities.java index a0b1deb..b7e7a8b 100644 --- a/mcp/mobius/opis/swing/panels/PanelTimingEntities.java +++ b/mcp/mobius/opis/swing/panels/PanelTimingEntities.java @@ -148,11 +148,6 @@ public class PanelTimingEntities extends JPanelMsgHandler implements ITabPanel{ return true; } - @Override - public String getTabRefName() { - return "opis.timingents"; - } - @Override public SelectedTab getSelectedTab() { return SelectedTab.TIMINGENTITES; diff --git a/mcp/mobius/opis/swing/panels/PanelTimingEvents.java b/mcp/mobius/opis/swing/panels/PanelTimingEvents.java index 4672acc..3191ccc 100644 --- a/mcp/mobius/opis/swing/panels/PanelTimingEvents.java +++ b/mcp/mobius/opis/swing/panels/PanelTimingEvents.java @@ -91,11 +91,6 @@ public class PanelTimingEvents extends JPanelMsgHandler implements ITabPanel { return true; } - @Override - public String getTabRefName() { - return "opis.events"; - } - @Override public SelectedTab getSelectedTab() { return SelectedTab.TIMINGEVENTS; diff --git a/mcp/mobius/opis/swing/panels/PanelTimingHandlers.java b/mcp/mobius/opis/swing/panels/PanelTimingHandlers.java index 3451977..4960abb 100644 --- a/mcp/mobius/opis/swing/panels/PanelTimingHandlers.java +++ b/mcp/mobius/opis/swing/panels/PanelTimingHandlers.java @@ -127,11 +127,6 @@ public class PanelTimingHandlers extends JPanelMsgHandler implements ITabPanel{ return true; } - @Override - public String getTabRefName() { - return "opis.timinghandlers"; - } - @Override public SelectedTab getSelectedTab() { return SelectedTab.TIMINGHANDLERS; diff --git a/mcp/mobius/opis/swing/panels/PanelTimingTileEnts.java b/mcp/mobius/opis/swing/panels/PanelTimingTileEnts.java index c253718..32251aa 100644 --- a/mcp/mobius/opis/swing/panels/PanelTimingTileEnts.java +++ b/mcp/mobius/opis/swing/panels/PanelTimingTileEnts.java @@ -168,11 +168,6 @@ public class PanelTimingTileEnts extends JPanelMsgHandler implements ITabPanel{ return true; } - @Override - public String getTabRefName() { - return "opis.timingtileents"; - } - @Override public SelectedTab getSelectedTab() { return SelectedTab.TIMINGTILEENTS;