From: Debayan Sutradhar Date: Mon, 31 May 2021 19:40:27 +0530 Subject: Updated according to the latest Action API --- Updated according to the latest Action API --- --- 'a/src/main/java/com/stream_pi/server/action/ExternalPlugins.java' +++ b/src/main/java/com/stream_pi/server/action/ExternalPlugins.java @@ -355,11 +355,11 @@ public class ExternalPlugins } sortedPlugins.get(eachPlugin.getCategory()).add(eachPlugin); } - catch (Exception e) + catch (MinorException e) { e.printStackTrace(); errorModules.add(eachPlugin); - errorModuleError.add(e.getMessage()); + errorModuleError.add(e.getShortMessage()); } } @@ -403,7 +403,7 @@ public class ExternalPlugins { eachPlugin.initAction(); } - catch (Exception e) + catch (MinorException e) { e.printStackTrace(); isError = true; @@ -413,8 +413,7 @@ public class ExternalPlugins .append(eachPlugin.getModuleName()) .append("\n"); - if(e instanceof StreamPiException) - errors.append(((MinorException) e).getShortMessage()); + errors.append(e.getShortMessage()); errors.append("\n"); } @@ -563,7 +562,7 @@ public class ExternalPlugins { eachPlugin.onShutDown(); } - catch (Exception e) + catch (MinorException e) { e.printStackTrace(); } --- 'a/src/main/java/com/stream_pi/server/connection/ClientConnection.java' +++ b/src/main/java/com/stream_pi/server/connection/ClientConnection.java @@ -124,16 +124,11 @@ public class ClientConnection extends Th { ((ExternalPlugin) action).onClientDisconnected(); } - catch (Exception e) + catch (MinorException e) { - e.printStackTrace(); - - exceptionAndAlertHandler.handleMinorException( - new MinorException( - "Unable to run onClientDisconnected for "+action.getModuleName(), - "Detailed message : "+e.getMessage() - ) - ); + e.setTitle("Unable to run onClientDisconnected for "+action.getModuleName()); + e.setShortMessage("Detailed message :\n\n"+e.getShortMessage()); + exceptionAndAlertHandler.handleMinorException(e); } } } @@ -649,12 +644,11 @@ public class ClientConnection extends Th { newPlugin.onClientConnected(); } - catch (Exception e) + catch (MinorException e) { - e.printStackTrace(); - exceptionAndAlertHandler.handleMinorException( - new MinorException("Failed","Error "+moduleName+" at onClientConnected \nMessage"+e.getMessage()) - ); + e.setTitle("Unable to run onClientConnected for "+moduleName); + e.setShortMessage("Detailed message :\n\n"+e.getShortMessage()); + exceptionAndAlertHandler.handleMinorException(e); } return null; } --- 'a/src/main/java/com/stream_pi/server/controller/Controller.java' +++ b/src/main/java/com/stream_pi/server/controller/Controller.java @@ -339,7 +339,7 @@ public class Controller extends Base imp @Override public void handleMinorException(MinorException e) { - getLogger().log(Level.SEVERE, e.getMessage(), e); + getLogger().log(Level.SEVERE, e.getShortMessage(), e); e.printStackTrace(); @@ -348,7 +348,7 @@ public class Controller extends Base imp @Override public void handleSevereException(SevereException e) { - getLogger().log(Level.SEVERE, e.getMessage(), e); + getLogger().log(Level.SEVERE, e.getShortMessage(), e); e.printStackTrace(); Platform.runLater(()->{ @@ -376,26 +376,10 @@ public class Controller extends Base imp action.onActionClicked(); return true; } - catch (Exception e) + catch (MinorException e) { - e.printStackTrace(); - //check if its windows UAC related - if(e.getMessage().contains("operation requires elevation")) - { - handleMinorException(new MinorException( - "Action Execution Failed!", - "Error running action at ["+action.getLocation().getRow()+","+action.getLocation().getCol()+"] ("+action.getDisplayText()+")\n"+ - "This action requires higher UAC privileges. Re-launch Stream-Pi Server with 'Administrator Privileges' in order to run this command.") - ); - } - else - { - handleMinorException(new MinorException( - "Action Execution Failed!", - "Error running action at ["+action.getLocation().getRow()+","+action.getLocation().getCol()+"] ("+action.getDisplayText()+")\n"+ - "Check stacktrace/log to know what exactly happened\n\nMessage : \n"+e.getMessage() ) - ); - } + e.setTitle("Unable to execute action! ["+action.getDisplayText()+"]"); + handleMinorException(e); return false; } } @@ -403,11 +387,9 @@ public class Controller extends Base imp @Override public boolean onToggleActionClicked(ToggleAction action, boolean toggle, String profileID) { - try{ + try + { getLogger().info("action "+action.getID()+" clicked!"); - - - if(toggle) { action.onToggleOn(); @@ -417,38 +399,12 @@ public class Controller extends Base imp action.onToggleOff(); } -// ActionBox actionBox = getDashboardBase().getActionGridPane().getActionBoxByIDAndProfileID( -// action.getID(), -// profileID -// ); -// -// if(actionBox != null) -// { -// Platform.runLater(()->actionBox.init(toggle)); -// } - return true; } - catch (Exception e) + catch (MinorException e) { - e.printStackTrace(); - //check if its windows UAC related - if(e.getMessage().contains("operation requires elevation")) - { - handleMinorException(new MinorException( - "Action Execution Failed!", - "Error running action at ["+action.getLocation().getRow()+","+action.getLocation().getCol()+"] ("+action.getDisplayText()+")\n"+ - "This action requires higher UAC privileges. Re-launch Stream-Pi Server with 'Administrator Privileges' in order to run this command.") - ); - } - else - { - handleMinorException(new MinorException( - "Action Execution Failed!", - "Error running action at ["+action.getLocation().getRow()+","+action.getLocation().getCol()+"] ("+action.getDisplayText()+")\n"+ - "Check stacktrace/log to know what exactly happened\n\nMessage : \n"+e.getMessage() ) - ); - } + e.setTitle("Unable to execute action! ["+action.getDisplayText()+"]"); + handleMinorException(e); return false; } } --- 'a/src/main/java/com/stream_pi/server/window/dashboard/actiondetailpane/ActionDetailsPane.java' +++ b/src/main/java/com/stream_pi/server/window/dashboard/actiondetailpane/ActionDetailsPane.java @@ -432,9 +432,11 @@ public class ActionDetailsPane extends V { newAction.onActionCreate(); } - catch (Exception e) + catch (MinorException e) { - exceptionAndAlertHandler.handleMinorException(new MinorException("Error","onCreate() failed for "+getAction().getModuleName()+"\n\n"+e.getMessage())); + e.setTitle("Error"); + e.setShortMessage("onCreate() failed for "+getAction().getModuleName()+"\n\n"+e.getShortMessage()); + exceptionAndAlertHandler.handleMinorException(e); } combineActionPropertiesPane.getCombineAction().addChild(newAction.getID()); --- 'a/src/main/java/com/stream_pi/server/window/dashboard/actiondetailpane/OnDeleteActionTask.java' +++ b/src/main/java/com/stream_pi/server/window/dashboard/actiondetailpane/OnDeleteActionTask.java @@ -60,16 +60,11 @@ public class OnDeleteActionTask extends { ((ExternalPlugin) action).onActionDeleted(); } - catch (Exception e) + catch (MinorException e) { - e.printStackTrace(); - - exceptionAndAlertHandler.handleMinorException( - new MinorException( - "Unable to run onActionDeleted for "+action.getModuleName(), - "Detailed message : "+e.getMessage() - ) - ); + e.setTitle("Unable to run onActionDeleted for "+action.getModuleName()); + e.setShortMessage("Display Text: "+action.getDisplayText()+"\nDetailed message : \n\n"+e.getShortMessage()); + exceptionAndAlertHandler.handleMinorException(e); } } --- 'a/src/main/java/com/stream_pi/server/window/dashboard/actiondetailpane/OnSaveActionTask.java' +++ b/src/main/java/com/stream_pi/server/window/dashboard/actiondetailpane/OnSaveActionTask.java @@ -211,14 +211,14 @@ public class OnSaveActionTask extends Ta { if(action instanceof ExternalPlugin) { - System.out.println(action.getSocketAddressForClient()); ((ExternalPlugin) action).onActionSavedFromServer(); } } - catch (Exception e) + catch (MinorException e) { - e.printStackTrace(); - exceptionAndAlertHandler.handleMinorException(new MinorException("Error","onActionSavedFromServer() failed for "+action.getModuleName()+"\n\n"+e.getMessage())); + e.setTitle("Error"); + e.setShortMessage("onActionSavedFromServer() failed for "+action.getModuleName()+"\n\n"+e.getShortMessage()); + exceptionAndAlertHandler.handleMinorException(e); } }