Task #2

robots/src/application/Main.java

@@ -0,0 +1,35 @@
+package application;
+
+import application.view.GameView;
+import application.view.GameWindow;
+import application.model.GameModel;
+import application.viewModel.ViewModel;
+
+import javax.swing.*;
+import java.awt.*;
+
+public class Main
+{
+    public static void main(String[] args)
+    {
+        try
+        {
+            UIManager.setLookAndFeel("com.formdev.flatlaf.FlatLightLaf");
+        }
+        catch (Exception e)
+        {
+            e.printStackTrace();
+        }
+        GameModel gameModel = new GameModel();
+        GameView gameView = new GameView(gameModel);
+        GameWindow gameWindow = new GameWindow(gameView);
+        ViewModel viewModel = new ViewModel(gameModel, gameWindow);
+
+        SwingUtilities.invokeLater(() -> {
+            MainApplicationFrame frame = new MainApplicationFrame(viewModel);
+            frame.pack();
+            frame.setVisible(true);
+            frame.setExtendedState(Frame.MAXIMIZED_BOTH);
+        });
+    }
+}

robots/src/application/MainApplicationFrame.java

@@ -0,0 +1,114 @@
+package application;
+
+import application.view.GameWindow;
+import application.log.LogWindow;
+import application.log.Logger;
+import application.viewModel.ViewModel;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionListener;
+import java.awt.event.KeyEvent;
+
+public class MainApplicationFrame extends JFrame
+{
+    private final JDesktopPane desktopPane = new JDesktopPane();
+
+    public MainApplicationFrame(ViewModel gameViewModel)
+    {
+
+        int inset = 50;
+        Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
+        setBounds(inset, inset,
+                screenSize.width - inset * 2,
+                screenSize.height - inset * 2);
+
+        setContentPane(desktopPane);
+
+        LogWindow logWindow = createLogWindow();
+        addWindow(logWindow);
+
+        GameWindow gameWindow = gameViewModel.getGameWindow();
+        addWindow(gameWindow);
+
+        setJMenuBar(generateMenuBar());
+        setDefaultCloseOperation(EXIT_ON_CLOSE);
+    }
+
+    protected LogWindow createLogWindow()
+    {
+        LogWindow logWindow = new LogWindow(Logger.getDefaultLogSource());
+        logWindow.setLocation(10, 10);
+        logWindow.setSize(300, 800);
+        setMinimumSize(logWindow.getSize());
+        logWindow.pack();
+        Logger.debug("Протокол работает");
+        return logWindow;
+    }
+
+    protected void addWindow(JInternalFrame frame)
+    {
+        desktopPane.add(frame);
+        frame.setVisible(true);
+    }
+
+    private JMenu createMenu(String nameOfMenu, String description)
+    {
+        JMenu lookAndFeelMenu = new JMenu(nameOfMenu);
+        lookAndFeelMenu.setMnemonic(KeyEvent.VK_V);
+        lookAndFeelMenu.getAccessibleContext().setAccessibleDescription(
+                description);
+        return lookAndFeelMenu;
+    }
+
+    private JMenuItem createMenuItem(String name, ActionListener l)
+    {
+        JMenuItem systemLookAndFeel = new JMenuItem(name, KeyEvent.VK_S);
+        systemLookAndFeel.addActionListener(l);
+
+        return systemLookAndFeel;
+    }
+
+    private JMenuBar generateMenuBar()
+    {
+        JMenuBar menuBar = new JMenuBar();
+
+        JMenu lookAndFeelMenu = createMenu("Режим отображения",
+                "Управление режимом отображения приложения");
+        JMenuItem systemLookAndFeel = createMenuItem("Системная схема", (event) -> {
+            setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+            this.invalidate();
+        });
+        lookAndFeelMenu.add(systemLookAndFeel);
+
+        JMenuItem crossplatformLookAndFeel = createMenuItem("Универсальная схема", (event) -> {
+            setLookAndFeel(UIManager.getCrossPlatformLookAndFeelClassName());
+            this.invalidate();
+        });
+        lookAndFeelMenu.add(crossplatformLookAndFeel);
+
+        JMenu testMenu = createMenu("Тесты", "Тестовые команды");
+
+        JMenuItem addLogMessageItem = createMenuItem("Сообщение в лог",
+                (event) -> Logger.debug("Новая строка"));
+        testMenu.add(addLogMessageItem);
+
+        menuBar.add(lookAndFeelMenu);
+        menuBar.add(testMenu);
+        return menuBar;
+    }
+
+    private void setLookAndFeel(String className)
+    {
+        try
+        {
+            UIManager.setLookAndFeel(className);
+            SwingUtilities.updateComponentTreeUI(this);
+        }
+        catch (ClassNotFoundException | InstantiationException
+                 | IllegalAccessException | UnsupportedLookAndFeelException e)
+        {
+            // skip
+        }
+    }
+}

robots/src/application/log/LogChangeListener.java

@@ -0,0 +1,6 @@
+package application.log;
+
+public interface LogChangeListener
+{
+    void onLogChanged();
+}

robots/src/log/LogEntry.java → robots/src/application/log/LogEntry.java

@@ -1,24 +1,23 @@
-package log;
+package application.log;
 
 public class LogEntry
 {
-    private LogLevel m_logLevel;
-    private String m_strMessage;
-    
+    private final LogLevel m_logLevel;
+    private final String m_strMessage;
+
     public LogEntry(LogLevel logLevel, String strMessage)
     {
-        m_strMessage = strMessage;
         m_logLevel = logLevel;
+        m_strMessage = strMessage;
     }
-    
+
     public String getMessage()
     {
         return m_strMessage;
     }
-    
+
     public LogLevel getLevel()
     {
         return m_logLevel;
     }
 }
-

robots/src/log/LogLevel.java → robots/src/application/log/LogLevel.java

@@ -1,4 +1,4 @@
-package log;
+package application.log;
 
 public enum LogLevel
 {
@@ -8,17 +8,16 @@ public enum LogLevel
     Warning(3),
     Error(4),
     Fatal(5);
-    
-    private int m_iLevel;
-    
+
+    private final int m_iLevel;
+
     private LogLevel(int iLevel)
     {
         m_iLevel = iLevel;
     }
-    
+
     public int level()
     {
         return m_iLevel;
     }
 }
-

robots/src/gui/LogWindow.java → robots/src/application/log/LogWindow.java

@@ -1,29 +1,22 @@
-package gui;
-
+package application.log;
 import java.awt.BorderLayout;
 import java.awt.EventQueue;
 import java.awt.TextArea;
-
 import javax.swing.JInternalFrame;
 import javax.swing.JPanel;
 
-import log.LogChangeListener;
-import log.LogEntry;
-import log.LogWindowSource;
-
 public class LogWindow extends JInternalFrame implements LogChangeListener
 {
-    private LogWindowSource m_logSource;
-    private TextArea m_logContent;
+    private final LogWindowSource m_logSource;
+    private final TextArea m_logContent;
 
-    public LogWindow(LogWindowSource logSource) 
+    public LogWindow(LogWindowSource logSource)
     {
-        super("Протокол работы", true, true, true, true);
+        super("work protocol", true, true, true, true);
         m_logSource = logSource;
         m_logSource.registerListener(this);
         m_logContent = new TextArea("");
         m_logContent.setSize(200, 500);
-
         JPanel panel = new JPanel(new BorderLayout());
         panel.add(m_logContent, BorderLayout.CENTER);
         getContentPane().add(panel);
@@ -35,13 +28,11 @@ private void updateLogContent()
     {
         StringBuilder content = new StringBuilder();
         for (LogEntry entry : m_logSource.all())
-        {
-            content.append(entry.getMessage()).append("\n");
-        }
+            content.append(entry.getMessage());
         m_logContent.setText(content.toString());
         m_logContent.invalidate();
     }
-    
+
     @Override
     public void onLogChanged()
     {

robots/src/log/LogWindowSource.java → robots/src/application/log/LogWindowSource.java

@@ -1,62 +1,56 @@
-package log;
+package application.log;
 
 import java.util.ArrayList;
 import java.util.Collections;
 
-/**
- * Что починить:
- * 1. Этот класс порождает утечку ресурсов (связанные слушатели оказываются
- * удерживаемыми в памяти)
- * 2. Этот класс хранит активные сообщения лога, но в такой реализации он 
- * их лишь накапливает. Надо же, чтобы количество сообщений в логе было ограничено 
- * величиной m_iQueueLength (т.е. реально нужна очередь сообщений 
- * ограниченного размера) 
- */
 public class LogWindowSource
 {
-    private int m_iQueueLength;
-    
-    private ArrayList<LogEntry> m_messages;
+    private final int m_iQueueLength;
+
+    private final ArrayList<LogEntry> m_messages;
     private final ArrayList<LogChangeListener> m_listeners;
     private volatile LogChangeListener[] m_activeListeners;
-    
-    public LogWindowSource(int iQueueLength) 
+
+    public LogWindowSource(int iQueueLength)
     {
         m_iQueueLength = iQueueLength;
         m_messages = new ArrayList<LogEntry>(iQueueLength);
         m_listeners = new ArrayList<LogChangeListener>();
     }
-    
+
     public void registerListener(LogChangeListener listener)
     {
-        synchronized(m_listeners)
+        synchronized (m_listeners)
         {
             m_listeners.add(listener);
             m_activeListeners = null;
         }
     }
-    
+
     public void unregisterListener(LogChangeListener listener)
     {
-        synchronized(m_listeners)
+        synchronized (m_listeners)
         {
             m_listeners.remove(listener);
             m_activeListeners = null;
         }
     }
-    
+
     public void append(LogLevel logLevel, String strMessage)
     {
         LogEntry entry = new LogEntry(logLevel, strMessage);
+        if (size() >= m_iQueueLength)
+            m_messages.remove(0);
+
         m_messages.add(entry);
-        LogChangeListener [] activeListeners = m_activeListeners;
+        LogChangeListener[] activeListeners = m_activeListeners;
         if (activeListeners == null)
         {
             synchronized (m_listeners)
             {
                 if (m_activeListeners == null)
                 {
-                    activeListeners = m_listeners.toArray(new LogChangeListener [0]);
+                    activeListeners = m_listeners.toArray(new LogChangeListener[0]);
                     m_activeListeners = activeListeners;
                 }
             }
@@ -66,7 +60,7 @@ public void append(LogLevel logLevel, String strMessage)
             listener.onLogChanged();
         }
     }
-    
+
     public int size()
     {
         return m_messages.size();
@@ -75,9 +69,7 @@ public int size()
     public Iterable<LogEntry> range(int startFrom, int count)
     {
         if (startFrom < 0 || startFrom >= m_messages.size())
-        {
             return Collections.emptyList();
-        }
         int indexTo = Math.min(startFrom + count, m_messages.size());
         return m_messages.subList(startFrom, indexTo);
     }

robots/src/log/Logger.java → robots/src/application/log/Logger.java

@@ -1,21 +1,20 @@
-package log;
+package application.log;
 
-public final class Logger
-{
+public final class Logger {
     private static final LogWindowSource defaultLogSource;
-    static {
-        defaultLogSource = new LogWindowSource(100);
-    }
-
-    private Logger()
+
+    static
     {
+        defaultLogSource = new LogWindowSource(3);
     }
 
+    private Logger() {}
+
     public static void debug(String strMessage)
     {
         defaultLogSource.append(LogLevel.Debug, strMessage);
     }
-    
+
     public static void error(String strMessage)
     {
         defaultLogSource.append(LogLevel.Error, strMessage);