Index: applications/editors/josm/plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java
===================================================================
--- applications/editors/josm/plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java	(revision 30721)
+++ applications/editors/josm/plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java	(revision 30722)
@@ -132,5 +132,5 @@
             try {
                 time = OpeningTimeUtils.convert(compiler.startCompile());
-            } catch (Throwable t) {
+            } catch (Exception | TokenMgrError t) {
                 Main.warn(t);
                 
Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/filter/Filter.java
===================================================================
--- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/filter/Filter.java	(revision 30721)
+++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/filter/Filter.java	(revision 30722)
@@ -25,5 +25,5 @@
 	
 	public String[] getTagValues() {
-		return (String[])tagValues.toArray();
+		return tagValues.toArray(new String[tagValues.size()]);
 	}
 
Index: applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SystemExecuteAction.java
===================================================================
--- applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SystemExecuteAction.java	(revision 30721)
+++ applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SystemExecuteAction.java	(revision 30722)
@@ -38,9 +38,9 @@
 
                     while ((line = br.readLine()) != null) {
-                        System.out.println(getClass().getSimpleName() + ": " +  line);
+                        Main.info(getClass().getSimpleName() + ": " +  line);
                     }
 
-                    System.out.println(getClass().getSimpleName() + "Program terminated!");
-                } catch (Throwable t) {
+                    Main.info(getClass().getSimpleName() + "Program terminated!");
+                } catch (Exception t) {
                     Main.error(t);
                 }
Index: applications/editors/josm/plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/UndeleteAction.java
===================================================================
--- applications/editors/josm/plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/UndeleteAction.java	(revision 30721)
+++ applications/editors/josm/plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/UndeleteAction.java	(revision 30722)
@@ -200,5 +200,5 @@
                                 }
                             }
-                        } catch (Throwable t) {
+                        } catch (Exception t) {
                             Main.error(t);
                         }
Index: applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoEngine.java
===================================================================
--- applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoEngine.java	(revision 30721)
+++ applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoEngine.java	(revision 30722)
@@ -6,4 +6,6 @@
 import java.util.LinkedList;
 import java.util.List;
+
+import org.openstreetmap.josm.Main;
 
 import uk.co.caprica.vlcj.binding.internal.libvlc_media_t;
@@ -48,5 +50,5 @@
 	                        WindowsRuntimeUtil.VLC_INSTALL_DIR_KEY);
 	            } catch (RuntimeException e) {
-	                System.err.println(e.getMessage());
+	                Main.error(e);
 	            }
 	        }
@@ -58,32 +60,29 @@
 	    
         if (vlcInstallDir != null) {
-            System.out.println("videomapping: found VLC install dir: "+vlcInstallDir);
+            Main.info("videomapping: found VLC install dir: "+vlcInstallDir);
             NativeLibrary.addSearchPath("libvlc", vlcInstallDir);
         } else {
-            System.err.println("videomapping: unable to locate VLC install dir");
+            Main.error("videomapping: unable to locate VLC install dir");
         }
 	}
 	
-	public VideoEngine(Window parent)
-	{
+	public VideoEngine(Window parent) {
 		System.setProperty("logj4.configuration","file:log4j.xml"); //TODO still unsure if we can't link this to the JOSM log4j instance
-		videos = new LinkedList<Video>();
-		observers = new LinkedList<VideosObserver>();
+		videos = new LinkedList<>();
+		observers = new LinkedList<>();
 		try {
 			mediaPlayerFactory = new MediaPlayerFactory(libvlcArgs);
 	        fullScreenStrategy = new DefaultFullScreenStrategy(parent);
 		} catch (NoClassDefFoundError e) {
-            System.err.println(tr("Unable to find JNA Java library!"));
+		    Main.error(tr("Unable to find JNA Java library!"));
         } catch (UnsatisfiedLinkError e) {
-            System.err.println(tr("Unable to find native libvlc library!"));
-        } catch (Throwable t) {
-            System.err.println(t.getMessage());
+            Main.error(tr("Unable to find native libvlc library!"));
+        } catch (Exception t) {
+            Main.error(t);
         }
 	}
 	
-	public void add(Video video)
-	{
-		try
-		{
+	public void add(Video video) {
+		try {
 			EmbeddedMediaPlayer mp = mediaPlayerFactory.newEmbeddedMediaPlayer(fullScreenStrategy);
 			video.player=mp;
@@ -96,12 +95,8 @@
 	        mp.playMedia(mediaPath); 
 	        //now fetching and playback starts automatically			
-		}
-		catch (NoClassDefFoundError e)
-        {
-            System.err.println(tr("Unable to find JNA Java library!"));
-        }
-        catch (UnsatisfiedLinkError e)
-        {
-            System.err.println(tr("Unable to find native libvlc library!"));
+		} catch (NoClassDefFoundError e) {
+		    Main.error(tr("Unable to find JNA Java library!"));
+        } catch (UnsatisfiedLinkError e) {
+            Main.error(tr("Unable to find native libvlc library!"));
         }
 	}
@@ -119,28 +114,19 @@
 	}
 
-	public void play()	
-	{
-		if (singleVideoMode)
-		{
+	public void play() {
+		if (singleVideoMode) {
 			lastAddedVideo.player.play();
-		}
-		else
-		{
+		} else {
 			for (Video video : videos) {
 				video.player.play();
 			}
 		}
-		System.out.println("abspielen");
 	}
 	
 	//toggles pause and play 
-	public void pause()
-	{
-		if (singleVideoMode)
-		{
+	public void pause() {
+		if (singleVideoMode) {
 			lastAddedVideo.player.pause();
-		}
-		else
-		{
+		} else {
 			for (Video video : videos) {
 				video.player.pause();
@@ -159,11 +145,8 @@
 	//jumps relative for ms in all videos
 	public void jumpFor(long ms) {
-		if (singleVideoMode)
-		{
+		if (singleVideoMode) {
 			long start=lastAddedVideo.player.getTime();
 			lastAddedVideo.player.setTime(start+ms);
-		}
-		else
-		{
+		} else {
 			for (Video video : videos) {
 				long start=video.player.getTime();
@@ -175,12 +158,8 @@
 
 	//jumps in all videos to this absolute video time
-	public void jumpTo(long msVideo)
-	{
-		if (singleVideoMode)
-		{
+	public void jumpTo(long msVideo) {
+		if (singleVideoMode) {
 			lastAddedVideo.player.setTime(msVideo);
-		}
-		else
-		{
+		} else {
 			for (Video video : videos) {
 				video.player.setTime(msVideo);
@@ -191,19 +170,14 @@
 			
 	//TODO muss evtl. auf Rückgabe für alle Videos erweitert werden
-	public long getVideoTime()
-	{
+	public long getVideoTime() {
 		return videos.get(0).player.getTime();
 	}
 	
 	//jumps in all videos to this absolute video time percentage
-	public void jumpToPosition(int percent)
-	{
+	public void jumpToPosition(int percent) {
 		float position = ((float)percent/100f);
-		if (singleVideoMode)
-		{
+		if (singleVideoMode) {
 			lastAddedVideo.player.setPosition(position);
-		}
-		else
-		{
+		} else {
 			for (Video video : videos) {
 				video.player.setPosition(position);
@@ -214,13 +188,10 @@
 	
 	//TODO muss evtl. auf Rückgabe für alle Videos erweitert werden
-	public int getPosition()
-	{
+	public int getPosition() {
 		return (int) (videos.get(0).player.getPosition()*100);
 	}	
 	
-	public void setSpeed(int percent)
-	{
-		if (singleVideoMode)
-		{
+	public void setSpeed(int percent) {
+		if (singleVideoMode) {
 			lastAddedVideo.player.setRate((float)(percent/100f));
 		}
@@ -232,12 +203,10 @@
 	
 	//TODO muss evtl. auf Rückgabe für alle Videos erweitert werden
-	public int getSpeed()
-	{
+	public int getSpeed() {
 		return (int) (videos.get(0).player.getRate()*100);
 	}
 	
 	//returns if at least one video has subtitles
-	public boolean hasSubtitles()
-	{
+	public boolean hasSubtitles() {
 		for (Video video : videos) {
 			if (video.player.getSpuCount()>0) return true;
@@ -246,16 +215,11 @@
 	}
 	
-	
-	public void setSubtitles (boolean enabled)
-	{
-		if (enabled)
-		{
+	public void setSubtitles (boolean enabled) {
+		if (enabled) {
 			//VLC uses a list of sub picture units
 			for (Video video : videos) {
 				video.player.setSpu(0);
 			}
-		}
-		else
-		{
+		} else {
 			for (Video video : videos) {
 				video.player.setSpu(-1);
@@ -263,14 +227,9 @@
 		}
 	}
-		
-	
-	public void setDeinterlacer (DeinterlaceMode deinterlacer)
-	{
-		if (singleVideoMode)
-		{
+	
+	public void setDeinterlacer (DeinterlaceMode deinterlacer) {
+		if (singleVideoMode) {
 			lastAddedVideo.player.setDeinterlace(deinterlacer);
-		}
-		else
-		{
+		} else {
 			for (Video video : videos) {
 				video.player.setDeinterlace(deinterlacer);
@@ -279,13 +238,10 @@
 	}
 	
-	public static String[] getDeinterlacers()
-	{
+	public static String[] getDeinterlacers() {
 		return deinterlacers;
 	}
 	
-	public void mute()
-	{
-		if (singleVideoMode)
-		{
+	public void mute() {
+		if (singleVideoMode) {
 			lastAddedVideo.player.mute();
 		}
@@ -295,6 +251,5 @@
 	}
 	
-	public void unload()
-	{
+	public void unload() {
 		for (Video video : videos) {
 			video.player.stop();
@@ -309,9 +264,7 @@
 	public void addObserver(VideosObserver observer) {
 		observers.add(observer);
-		
-	}
-
-	private void notifyObservers(VideoObserversEvents event)
-	{
+	}
+
+	private void notifyObservers(VideoObserversEvents event) {
 		for (VideosObserver observer : observers) {
 			observer.update(event);
@@ -319,5 +272,5 @@
 	}
 
-        @Override
+    @Override
 	public void backward(MediaPlayer arg0) { }
 /*
@@ -326,14 +279,14 @@
 	}
 */
-        @Override
+    @Override
 	public void error(MediaPlayer arg0) { }
 
-        @Override
+    @Override
 	public void finished(MediaPlayer arg0) { }
 
-        @Override
+    @Override
 	public void forward(MediaPlayer arg0) { }
 
-        @Override
+    @Override
 	public void lengthChanged(MediaPlayer arg0, long arg1) { }
 /*
@@ -348,32 +301,32 @@
 	}
 */
-        @Override
+    @Override
 	public void opening(MediaPlayer arg0) {	}
 
-        @Override
+    @Override
 	public void pausableChanged(MediaPlayer arg0, int arg1) { }
 
-        @Override
+    @Override
 	public void paused(MediaPlayer arg0) { }
 
-        @Override
+    @Override
 	public void playing(MediaPlayer arg0) { }
 
-        @Override
+    @Override
 	public void positionChanged(MediaPlayer arg0, float arg1) { }
 
-        @Override
+    @Override
 	public void seekableChanged(MediaPlayer arg0, int arg1) { }
 
-        @Override
+    @Override
 	public void snapshotTaken(MediaPlayer arg0, String arg1) { }
 
-        @Override
+    @Override
 	public void stopped(MediaPlayer arg0) { }
 
-        @Override
+    @Override
 	public void timeChanged(MediaPlayer arg0, long arg1) { }
 
-        @Override
+    @Override
 	public void titleChanged(MediaPlayer arg0, int arg1) { }
 
@@ -388,5 +341,4 @@
 	public void enableSingleVideoMode(boolean enabled) {
 		singleVideoMode = true;
-		
 	}
 
@@ -394,5 +346,4 @@
     public void mediaChanged(MediaPlayer mediaPlayer, libvlc_media_t media, String mrl) {
         // TODO Auto-generated method stub
-        
     }
 
@@ -400,5 +351,4 @@
     public void buffering(MediaPlayer mediaPlayer, float newCache) {
         // TODO Auto-generated method stub
-        
     }
 
@@ -406,5 +356,4 @@
     public void videoOutput(MediaPlayer mediaPlayer, int newCount) {
         // TODO Auto-generated method stub
-        
     }
 
@@ -412,5 +361,4 @@
     public void mediaMetaChanged(MediaPlayer mediaPlayer, int metaType) {
         // TODO Auto-generated method stub
-        
     }
 
@@ -418,5 +366,4 @@
     public void mediaSubItemAdded(MediaPlayer mediaPlayer, libvlc_media_t subItem) {
         // TODO Auto-generated method stub
-        
     }
 
@@ -424,5 +371,4 @@
     public void mediaDurationChanged(MediaPlayer mediaPlayer, long newDuration) {
         // TODO Auto-generated method stub
-        
     }
 
@@ -430,5 +376,4 @@
     public void mediaParsedChanged(MediaPlayer mediaPlayer, int newStatus) {
         // TODO Auto-generated method stub
-        
     }
 
@@ -436,5 +381,4 @@
     public void mediaFreed(MediaPlayer mediaPlayer) {
         // TODO Auto-generated method stub
-        
     }
 
@@ -442,5 +386,4 @@
     public void mediaStateChanged(MediaPlayer mediaPlayer, int newState) {
         // TODO Auto-generated method stub
-        
     }
 
@@ -448,5 +391,4 @@
     public void newMedia(MediaPlayer mediaPlayer) {
         // TODO Auto-generated method stub
-        
     }
 
@@ -454,5 +396,4 @@
     public void subItemPlayed(MediaPlayer mediaPlayer, int subItemIndex) {
         // TODO Auto-generated method stub
-        
     }
 
@@ -460,5 +401,4 @@
     public void subItemFinished(MediaPlayer mediaPlayer, int subItemIndex) {
         // TODO Auto-generated method stub
-        
     }
 
@@ -466,6 +406,4 @@
     public void endOfSubItems(MediaPlayer mediaPlayer) {
         // TODO Auto-generated method stub
-        
-    }
-
+    }
 }