deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

[cooja] plugins/Visualizer: Use more specific catches and multi-catches

Browse source 
if possible
This commit is contained in:
Enrico Joerns 2014-04-10 19:00:24 +02:00
parent 84b687efeb
commit ea979fa027
1 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
tools/cooja/java/org/contikios/cooja/plugins/Visualizer.java
View file

@ -527,7 +527,7 @@ public class Visualizer extends VisPlugin implements HasQuickHelp {
} }
file = list.get(0); file = list.get(0);
} }
catch (Exception e) { catch (UnsupportedFlavorException | IOException e) {
return; return;
} }
@ -564,9 +564,7 @@ public class Visualizer extends VisPlugin implements HasQuickHelp {
return false; return false;
} }
file = list.get(0); file = list.get(0);
} catch (UnsupportedFlavorException e) { } catch (UnsupportedFlavorException | IOException e) {
return false;
} catch (IOException e) {
return false; return false;
} }
@ -603,9 +601,7 @@ public class Visualizer extends VisPlugin implements HasQuickHelp {
VisualizerSkin newSkin = skinClass.newInstance(); VisualizerSkin newSkin = skinClass.newInstance();
newSkin.setActive(Visualizer.this.simulation, Visualizer.this); newSkin.setActive(Visualizer.this.simulation, Visualizer.this);
currentSkins.add(0, newSkin); currentSkins.add(0, newSkin);
} catch (InstantiationException e1) { } catch (InstantiationException | IllegalAccessException e1) {
e1.printStackTrace();
} catch (IllegalAccessException e1) {
e1.printStackTrace(); e1.printStackTrace();
} }
repaint(); repaint();
@ -707,9 +703,7 @@ public class Visualizer extends VisPlugin implements HasQuickHelp {
}); });
menu.add(menuItem); menu.add(menuItem);
} }
} catch (InstantiationException e1) { } catch (InstantiationException | IllegalAccessException e1) {
logger.fatal("Error: " + e1.getMessage(), e1);
} catch (IllegalAccessException e1) {
logger.fatal("Error: " + e1.getMessage(), e1); logger.fatal("Error: " + e1.getMessage(), e1);
} }
} }
@ -731,9 +725,7 @@ public class Visualizer extends VisPlugin implements HasQuickHelp {
}); });
menu.add(menuItem); menu.add(menuItem);
} }
} catch (InstantiationException e1) { } catch (InstantiationException | IllegalAccessException e1) {
logger.fatal("Error: " + e1.getMessage(), e1);
} catch (IllegalAccessException e1) {
logger.fatal("Error: " + e1.getMessage(), e1); logger.fatal("Error: " + e1.getMessage(), e1);
} }
} }
@ -1483,7 +1475,7 @@ public class Visualizer extends VisPlugin implements HasQuickHelp {
Double.parseDouble(matrix[5]) Double.parseDouble(matrix[5])
); );
resetViewport = 0; resetViewport = 0;
} catch (Exception e) { } catch (NumberFormatException e) {
logger.warn("Bad viewport: " + e.getMessage()); logger.warn("Bad viewport: " + e.getMessage());
resetViewport(); resetViewport();
} }