Index: applications/editors/josm/plugins/geochat/src/geochat/ChatPaneManager.java
===================================================================
--- applications/editors/josm/plugins/geochat/src/geochat/ChatPaneManager.java	(revision 30513)
+++ applications/editors/josm/plugins/geochat/src/geochat/ChatPaneManager.java	(revision 30737)
@@ -30,5 +30,5 @@
         this.tabs = tabs;
         this.collapsed = panel.isDialogInCollapsedView();
-        chatPanes = new HashMap<String, ChatPane>();
+        chatPanes = new HashMap<>();
         createChatPane(null);
         tabs.addChangeListener(new ChangeListener() {
@@ -196,5 +196,5 @@
 
     public void closePrivateChatPanes() {
-        List<String> entries = new ArrayList<String>(chatPanes.keySet());
+        List<String> entries = new ArrayList<>(chatPanes.keySet());
         for( String user : entries )
             if( !user.equals(PUBLIC_PANE) )
Index: applications/editors/josm/plugins/geochat/src/geochat/ChatServerConnection.java
===================================================================
--- applications/editors/josm/plugins/geochat/src/geochat/ChatServerConnection.java	(revision 30513)
+++ applications/editors/josm/plugins/geochat/src/geochat/ChatServerConnection.java	(revision 30737)
@@ -43,5 +43,5 @@
         userId = 0;
         userName = null;
-        listeners = new HashSet<ChatServerConnectionListener>();
+        listeners = new HashSet<>();
         requestThread = new LogRequest();
         new Thread(requestThread).start();
@@ -398,5 +398,5 @@
 
         private List<ChatMessage> parseMessages( JsonArray messages, boolean priv ) {
-            List<ChatMessage> result = new ArrayList<ChatMessage>();
+            List<ChatMessage> result = new ArrayList<>();
             for( int i = 0; i < messages.size(); i++ ) {
                 try {
@@ -423,5 +423,5 @@
 
         private Map<String, LatLon> parseUsers( JsonArray users ) {
-            Map<String, LatLon> result = new HashMap<String, LatLon>();
+            Map<String, LatLon> result = new HashMap<>();
             for( int i = 0; i < users.size(); i++ ) {
                 try {
Index: applications/editors/josm/plugins/geochat/src/geochat/GeoChatPanel.java
===================================================================
--- applications/editors/josm/plugins/geochat/src/geochat/GeoChatPanel.java	(revision 30513)
+++ applications/editors/josm/plugins/geochat/src/geochat/GeoChatPanel.java	(revision 30737)
@@ -65,5 +65,5 @@
         createLayout(gcPanel, false, null);
 
-        users = new TreeMap<String, LatLon>();
+        users = new TreeMap<>();
         // Start threads
         connection = ChatServerConnection.getInstance();