mirror of
https://github.com/GTNewHorizons/Opis.git
synced 2026-11-19 19:59:37 +00:00
Massive update to the string cache and the panels to allow refresh upon receiving an update.
This commit is contained in:
1 parent
0dae62a1e5
commit
9df348f95d
27 files changed
+208
-13
No files matched your search
@@ -5,4 +5,6 @@ import mcp.mobius.opis.swing.SelectedTab;
|
||||
|
||||
public interface ITabPanel {
|
||||
SelectedTab getSelectedTab();
|
||||
boolean refreshOnString(); //Should we refresh on a cache update ?
|
||||
boolean refresh(); //Do the actual refresh
|
||||
}
|
||||
@@ -52,6 +52,12 @@ public enum TabPanelRegistrar implements ChangeListener{
|
||||
return (JPanel)lookup.get(refname);
|
||||
}
|
||||
|
||||
public void refreshAll(){
|
||||
for (ITabPanel panel : this.lookup.values())
|
||||
if (panel.refreshOnString())
|
||||
panel.refresh();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void stateChanged(ChangeEvent e) {
|
||||
Component source = ((JTabbedPane)e.getSource()).getSelectedComponent();
|
||||
|
||||
@@ -17,12 +17,15 @@ import mcp.mobius.opis.helpers.Helpers;
|
||||
|
||||
public class CachedString implements Comparable, ISerializable{
|
||||
|
||||
String str;
|
||||
int index;
|
||||
public String str;
|
||||
public int index;
|
||||
private boolean valid = false;
|
||||
|
||||
|
||||
public CachedString(int index) {
|
||||
this.index = index;
|
||||
this.str = StringCache.INSTANCE.getString(index);
|
||||
this.valid = !this.str.equals("<ERROR>");
|
||||
}
|
||||
|
||||
public CachedString(String str){
|
||||
@@ -46,7 +49,13 @@ public class CachedString implements Comparable, ISerializable{
|
||||
|
||||
public String toString(){
|
||||
//return String.format("[%d] %s",this.index, this.str);
|
||||
return str;
|
||||
if (!this.valid){
|
||||
this.str = StringCache.INSTANCE.getString(index);
|
||||
this.valid = !this.str.equals("<ERROR>");
|
||||
}
|
||||
|
||||
return this.str;
|
||||
|
||||
}
|
||||
|
||||
public void writeToStream(ByteArrayDataOutput stream){
|
||||
|
||||
@@ -11,6 +11,7 @@ import com.google.common.collect.Maps;
|
||||
|
||||
import mcp.mobius.opis.modOpis;
|
||||
import mcp.mobius.opis.api.IMessageHandler;
|
||||
import mcp.mobius.opis.api.TabPanelRegistrar;
|
||||
import mcp.mobius.opis.data.holders.ISerializable;
|
||||
import mcp.mobius.opis.data.holders.newtypes.DataStringUpdate;
|
||||
import mcp.mobius.opis.network.PacketBase;
|
||||
@@ -82,6 +83,8 @@ public enum StringCache implements IMessageHandler {
|
||||
public boolean handleMessage(Message msg, PacketBase rawdata) {
|
||||
switch(msg){
|
||||
case STATUS_STRINGUPD:{
|
||||
//modOpis.log.info(String.format("Received partial String Cache update : [ %d ] [ %s ]", ((DataStringUpdate)rawdata.value).index, ((DataStringUpdate)rawdata.value).str));
|
||||
|
||||
DataStringUpdate data = (DataStringUpdate)rawdata.value;
|
||||
//modOpis.log.info(String.format("++++ Received String Cache update : [%d] %s", data.index, data.str));
|
||||
try{
|
||||
@@ -91,10 +94,13 @@ public enum StringCache implements IMessageHandler {
|
||||
this.cache.inverse().remove(data.str);
|
||||
this.cache.put(data.index, data.str);
|
||||
}
|
||||
|
||||
TabPanelRegistrar.INSTANCE.refreshAll();
|
||||
|
||||
break;
|
||||
}
|
||||
case STATUS_STRINGUPD_FULL:{
|
||||
modOpis.log.info(String.format("Received full String Cache update containing %d entries", rawdata.array.size()));
|
||||
//modOpis.log.info(String.format("Received full String Cache update containing %d entries", rawdata.array.size()));
|
||||
|
||||
for (ISerializable idata : rawdata.array){
|
||||
DataStringUpdate data = (DataStringUpdate)idata;
|
||||
@@ -108,6 +114,8 @@ public enum StringCache implements IMessageHandler {
|
||||
}
|
||||
}
|
||||
|
||||
TabPanelRegistrar.INSTANCE.refreshAll();
|
||||
|
||||
break;
|
||||
}
|
||||
default:
|
||||
|
||||
@@ -469,5 +469,10 @@ public class PanelSummary extends JPanelMsgHandler implements ITabPanel{
|
||||
@Override
|
||||
public SelectedTab getSelectedTab() {
|
||||
return SelectedTab.SUMMARY;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean refreshOnString(){
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -45,6 +45,7 @@ public class PanelOrphanTileEntities extends JPanelMsgHandler implements ITabPan
|
||||
public boolean handleMessage(Message msg, PacketBase rawdata) {
|
||||
switch(msg){
|
||||
case LIST_ORPHAN_TILEENTS:{
|
||||
this.cacheData(msg, rawdata);
|
||||
|
||||
this.getTable().addTableData(rawdata.array);
|
||||
DefaultTableModel model = this.getTable().getModel();
|
||||
@@ -87,4 +88,9 @@ public class PanelOrphanTileEntities extends JPanelMsgHandler implements ITabPan
|
||||
public JButton getBtnRefresh() {
|
||||
return btnRefresh;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean refreshOnString(){
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -34,6 +34,7 @@ public class PanelThreads extends JPanelMsgHandler implements ITabPanel {
|
||||
public boolean handleMessage(Message msg, PacketBase rawdata) {
|
||||
switch(msg){
|
||||
case LIST_THREADS:{
|
||||
this.cacheData(msg, rawdata);
|
||||
|
||||
this.getTable().setTableData(rawdata.array);
|
||||
|
||||
@@ -61,4 +62,9 @@ public class PanelThreads extends JPanelMsgHandler implements ITabPanel {
|
||||
public SelectedTab getSelectedTab() {
|
||||
return SelectedTab.THREADS;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean refreshOnString(){
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -37,6 +37,7 @@ public class PanelInbound extends JPanelMsgHandler implements ITabPanel {
|
||||
public boolean handleMessage(Message msg, PacketBase rawdata) {
|
||||
switch(msg){
|
||||
case LIST_PACKETS_INBOUND:{
|
||||
this.cacheData(msg, rawdata);
|
||||
|
||||
this.getTable().setTableData(rawdata.array);
|
||||
|
||||
@@ -71,5 +72,9 @@ public class PanelInbound extends JPanelMsgHandler implements ITabPanel {
|
||||
public SelectedTab getSelectedTab() {
|
||||
return SelectedTab.PACKETINBOUND;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public boolean refreshOnString(){
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -38,6 +38,7 @@ public class PanelInbound250 extends JPanelMsgHandler implements ITabPanel {
|
||||
public boolean handleMessage(Message msg, PacketBase rawdata) {
|
||||
switch(msg){
|
||||
case LIST_PACKETS_INBOUND_250:{
|
||||
this.cacheData(msg, rawdata);
|
||||
|
||||
this.getTable().setTableData(rawdata.array);
|
||||
|
||||
@@ -71,4 +72,8 @@ public class PanelInbound250 extends JPanelMsgHandler implements ITabPanel {
|
||||
return SelectedTab.PACKETINBOUND250;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean refreshOnString(){
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -38,6 +38,7 @@ public class PanelOutbound extends JPanelMsgHandler implements ITabPanel {
|
||||
public boolean handleMessage(Message msg, PacketBase rawdata) {
|
||||
switch(msg){
|
||||
case LIST_PACKETS_OUTBOUND:{
|
||||
this.cacheData(msg, rawdata);
|
||||
|
||||
this.getTable().setTableData(rawdata.array);
|
||||
|
||||
@@ -71,5 +72,9 @@ public class PanelOutbound extends JPanelMsgHandler implements ITabPanel {
|
||||
public SelectedTab getSelectedTab() {
|
||||
return SelectedTab.PACKETOUTBOUND;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public boolean refreshOnString(){
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -39,6 +39,7 @@ public class PanelOutbound250 extends JPanelMsgHandler implements ITabPanel {
|
||||
public boolean handleMessage(Message msg, PacketBase rawdata) {
|
||||
switch(msg){
|
||||
case LIST_PACKETS_OUTBOUND_250:{
|
||||
this.cacheData(msg, rawdata);
|
||||
|
||||
this.getTable().setTableData(rawdata.array);
|
||||
|
||||
@@ -71,5 +72,9 @@ public class PanelOutbound250 extends JPanelMsgHandler implements ITabPanel {
|
||||
public SelectedTab getSelectedTab() {
|
||||
return SelectedTab.PACKETOUTBOUND250;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public boolean refreshOnString(){
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -97,4 +97,14 @@ public class PanelEventClient extends JPanel implements ITabPanel, IMessageHandl
|
||||
public SelectedTab getSelectedTab() {
|
||||
return SelectedTab.CLIENTEVENTS;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean refreshOnString(){
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean refresh(){
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -106,5 +106,15 @@ public class PanelRenderEntities extends JPanel implements ITabPanel, IMessageHa
|
||||
@Override
|
||||
public SelectedTab getSelectedTab() {
|
||||
return SelectedTab.RENDERENTITIES;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean refreshOnString(){
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean refresh(){
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -93,4 +93,14 @@ public class PanelRenderHandlers extends JPanel implements ITabPanel, IMessageHa
|
||||
public SelectedTab getSelectedTab() {
|
||||
return SelectedTab.RENDERHANDLERS;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean refreshOnString(){
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean refresh(){
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -115,5 +115,15 @@ public class PanelRenderTileEnts extends JPanel implements ITabPanel, IMessageHa
|
||||
@Override
|
||||
public SelectedTab getSelectedTab() {
|
||||
return SelectedTab.RENDERTILEENTS;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean refreshOnString(){
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean refresh(){
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -59,6 +59,7 @@ public class PanelTimingChunks extends JPanelMsgHandler implements ITabPanel{
|
||||
public boolean handleMessage(Message msg, PacketBase rawdata) {
|
||||
switch(msg){
|
||||
case LIST_TIMING_CHUNK:{
|
||||
this.cacheData(msg, rawdata);
|
||||
|
||||
this.getTable().setTableData(rawdata.array);
|
||||
|
||||
@@ -102,4 +103,9 @@ public class PanelTimingChunks extends JPanelMsgHandler implements ITabPanel{
|
||||
public SelectedTab getSelectedTab() {
|
||||
return SelectedTab.TIMINGCHUNKS;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean refreshOnString(){
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -71,6 +71,7 @@ public class PanelTimingEntities extends JPanelMsgHandler implements ITabPanel{
|
||||
public boolean handleMessage(Message msg, PacketBase rawdata) {
|
||||
switch(msg){
|
||||
case LIST_TIMING_ENTITIES:{
|
||||
this.cacheData(msg, rawdata);
|
||||
|
||||
this.getTable().setTableData(rawdata.array);
|
||||
|
||||
@@ -117,5 +118,10 @@ public class PanelTimingEntities extends JPanelMsgHandler implements ITabPanel{
|
||||
@Override
|
||||
public SelectedTab getSelectedTab() {
|
||||
return SelectedTab.TIMINGENTITES;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean refreshOnString(){
|
||||
return true;
|
||||
}
|
||||
}
|
||||
+6
@@ -45,6 +45,7 @@ public class PanelTimingEntitiesPerClass extends JPanelMsgHandler implements ITa
|
||||
switch(msg){
|
||||
|
||||
case LIST_TIMING_ENTITIES_PER_CLASS:{
|
||||
this.cacheData(msg, rawdata);
|
||||
|
||||
this.getTable().setTableData(rawdata.array);
|
||||
|
||||
@@ -88,4 +89,9 @@ public class PanelTimingEntitiesPerClass extends JPanelMsgHandler implements ITa
|
||||
public JButton getBtnRun() {
|
||||
return btnRun;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean refreshOnString(){
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -45,6 +45,7 @@ public class PanelTimingEvents extends JPanelMsgHandler implements ITabPanel {
|
||||
switch(msg){
|
||||
|
||||
case LIST_TIMING_EVENTS:{
|
||||
this.cacheData(msg, rawdata);
|
||||
|
||||
this.getTable().setTableData(rawdata.array);
|
||||
|
||||
@@ -88,4 +89,9 @@ public class PanelTimingEvents extends JPanelMsgHandler implements ITabPanel {
|
||||
public JButton getBtnRun() {
|
||||
return btnRun;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean refreshOnString(){
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -55,6 +55,7 @@ public class PanelTimingHandlers extends JPanelMsgHandler implements ITabPanel{
|
||||
public boolean handleMessage(Message msg, PacketBase rawdata) {
|
||||
switch(msg){
|
||||
case LIST_TIMING_HANDLERS:{
|
||||
this.cacheData(msg, rawdata);
|
||||
|
||||
this.getTable().setTableData(rawdata.array);
|
||||
|
||||
@@ -63,7 +64,12 @@ public class PanelTimingHandlers extends JPanelMsgHandler implements ITabPanel{
|
||||
|
||||
for (Object o : rawdata.array){
|
||||
DataEvent data = (DataEvent)o;
|
||||
model.addRow(new Object[] {data.mod, data.event.toString().split("\\$")[1], data.update});
|
||||
try{
|
||||
model.addRow(new Object[] {data.mod, data.event.toString().split("\\$")[1], data.update});
|
||||
} catch (ArrayIndexOutOfBoundsException e){
|
||||
System.out.printf("AIOOB : %s %s\n", data.event.index, data.event.toString());
|
||||
model.addRow(new Object[] {data.mod, data.event.toString(), data.update});
|
||||
}
|
||||
}
|
||||
|
||||
this.getTable().dataUpdated(row);
|
||||
@@ -97,4 +103,9 @@ public class PanelTimingHandlers extends JPanelMsgHandler implements ITabPanel{
|
||||
public SelectedTab getSelectedTab() {
|
||||
return SelectedTab.TIMINGHANDLERS;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean refreshOnString(){
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -16,6 +16,7 @@ import mcp.mobius.opis.swing.widgets.JButtonAccess;
|
||||
import mcp.mobius.opis.swing.widgets.JPanelMsgHandler;
|
||||
import mcp.mobius.opis.swing.widgets.JTableStats;
|
||||
import net.miginfocom.swing.MigLayout;
|
||||
|
||||
import javax.swing.JButton;
|
||||
import javax.swing.JScrollPane;
|
||||
import javax.swing.JLabel;
|
||||
@@ -74,6 +75,7 @@ public class PanelTimingTileEnts extends JPanelMsgHandler implements ITabPanel{
|
||||
public boolean handleMessage(Message msg, PacketBase rawdata) {
|
||||
switch(msg){
|
||||
case LIST_TIMING_TILEENTS:{
|
||||
this.cacheData(msg, rawdata);
|
||||
|
||||
this.getTable().setTableData(rawdata.array);
|
||||
|
||||
@@ -128,4 +130,9 @@ public class PanelTimingTileEnts extends JPanelMsgHandler implements ITabPanel{
|
||||
public SelectedTab getSelectedTab() {
|
||||
return SelectedTab.TIMINGTILEENTS;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean refreshOnString(){
|
||||
return true;
|
||||
}
|
||||
}
|
||||
+6
@@ -47,6 +47,7 @@ public class PanelTimingTileEntsPerClass extends JPanelMsgHandler implements ITa
|
||||
switch(msg){
|
||||
|
||||
case LIST_TIMING_TILEENTS_PER_CLASS:{
|
||||
this.cacheData(msg, rawdata);
|
||||
|
||||
this.getTable().setTableData(rawdata.array);
|
||||
|
||||
@@ -103,4 +104,9 @@ public class PanelTimingTileEntsPerClass extends JPanelMsgHandler implements ITa
|
||||
public JButton getBtnRun() {
|
||||
return btnRun;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean refreshOnString(){
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -64,6 +64,8 @@ public class PanelAmountEntities extends JPanelMsgHandler implements ITabPanel{
|
||||
public boolean handleMessage(Message msg, PacketBase rawdata) {
|
||||
switch(msg){
|
||||
case LIST_AMOUNT_ENTITIES:{
|
||||
this.cacheData(msg, rawdata);
|
||||
|
||||
this.getTable().setTableData(rawdata.array);
|
||||
|
||||
DefaultTableModel model = this.getTable().getModel();
|
||||
@@ -91,4 +93,9 @@ public class PanelAmountEntities extends JPanelMsgHandler implements ITabPanel{
|
||||
public SelectedTab getSelectedTab() {
|
||||
return SelectedTab.AMOUNTENTS;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean refreshOnString(){
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -51,6 +51,7 @@ public class PanelAmountTileEnts extends JPanelMsgHandler implements ITabPanel{
|
||||
public boolean handleMessage(Message msg, PacketBase rawdata) {
|
||||
switch(msg){
|
||||
case LIST_AMOUNT_TILEENTS:{
|
||||
this.cacheData(msg, rawdata);
|
||||
|
||||
this.getTable().setTableData(rawdata.array);
|
||||
|
||||
@@ -90,4 +91,9 @@ public class PanelAmountTileEnts extends JPanelMsgHandler implements ITabPanel{
|
||||
public SelectedTab getSelectedTab() {
|
||||
return SelectedTab.AMOUNTTES;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean refreshOnString(){
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -49,6 +49,8 @@ public class PanelDimensions extends JPanelMsgHandler implements IMessageHandler
|
||||
public boolean handleMessage(Message msg, PacketBase rawdata) {
|
||||
switch(msg){
|
||||
case LIST_DIMENSION_DATA:{
|
||||
this.cacheData(msg, rawdata);
|
||||
|
||||
this.getTable().setTableData(rawdata.array);
|
||||
|
||||
DefaultTableModel model = this.getTable().getModel();
|
||||
@@ -86,4 +88,9 @@ public class PanelDimensions extends JPanelMsgHandler implements IMessageHandler
|
||||
public SelectedTab getSelectedTab() {
|
||||
return SelectedTab.DIMENSIONS;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean refreshOnString(){
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -65,6 +65,7 @@ public class PanelPlayers extends JPanelMsgHandler implements ITabPanel{
|
||||
public boolean handleMessage(Message msg, PacketBase rawdata) {
|
||||
switch(msg){
|
||||
case LIST_PLAYERS:{
|
||||
this.cacheData(msg, rawdata);
|
||||
|
||||
this.getTable().setTableData(rawdata.array);
|
||||
|
||||
@@ -96,5 +97,10 @@ public class PanelPlayers extends JPanelMsgHandler implements ITabPanel{
|
||||
@Override
|
||||
public SelectedTab getSelectedTab() {
|
||||
return SelectedTab.PLAYERS;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean refreshOnString(){
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -1,14 +1,33 @@
|
||||
package mcp.mobius.opis.swing.widgets;
|
||||
|
||||
import javax.swing.JPanel;
|
||||
|
||||
import mcp.mobius.opis.api.IMessageHandler;
|
||||
import mcp.mobius.opis.network.PacketBase;
|
||||
import mcp.mobius.opis.network.enums.Message;
|
||||
|
||||
public abstract class JPanelMsgHandler extends JPanel implements IMessageHandler {
|
||||
|
||||
public JTableStats table;
|
||||
public Message cachedmsg;
|
||||
public PacketBase cachedrawdata;
|
||||
|
||||
|
||||
public JTableStats getTable(){
|
||||
return this.table;
|
||||
}
|
||||
|
||||
public boolean cacheData(Message msg, PacketBase rawdata) {
|
||||
this.cachedmsg = msg;
|
||||
this.cachedrawdata = rawdata;
|
||||
return true;
|
||||
}
|
||||
|
||||
public boolean refresh(){
|
||||
if (this.cachedmsg != null && this.cachedrawdata != null)
|
||||
return this.handleMessage(this.cachedmsg, this.cachedrawdata);
|
||||
else
|
||||
return false;
|
||||
}
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user