diff --git a/src/gui/CircleRenderingFunction.java b/src/gui/CircleRenderingFunction.java new file mode 100644 index 0000000..41b9807 --- /dev/null +++ b/src/gui/CircleRenderingFunction.java @@ -0,0 +1,5 @@ +package gui; + +public class CircleRenderingFunction implements ShapeRenderingFunction { + +} diff --git a/src/gui/DrawboxEditor.java b/src/gui/DrawboxEditor.java index 52b0171..5094560 100644 --- a/src/gui/DrawboxEditor.java +++ b/src/gui/DrawboxEditor.java @@ -150,7 +150,9 @@ public class DrawboxEditor extends Editable { ); } } - + public void clearPoints(){ + + } // эта штука очищает точки при нажатии универскальной кнопки очистки в Main GUI. Это следует рефакторнуть и вместо передачи события сюда, // обрабатывать его прямо в Main GUI(лямбдой) вызывая отсюда только метод в духе clearPoints() @Override diff --git a/src/gui/Editable.java b/src/gui/Editable.java index 0df5f22..7123337 100644 --- a/src/gui/Editable.java +++ b/src/gui/Editable.java @@ -24,7 +24,7 @@ public abstract class Editable extends JPanel implements MouseListener, MouseMot protected Entity entity; protected String selectedEntityName; protected BufferedImage image; - JPanel drawPanel; + EditableCanvas canvas; private static Logger logger = Logger.getLogger("gui.Editable"); diff --git a/src/gui/EditableCanvas.java b/src/gui/EditableCanvas.java new file mode 100644 index 0000000..15f5961 --- /dev/null +++ b/src/gui/EditableCanvas.java @@ -0,0 +1,7 @@ +package gui; + +import javax.swing.JPanel; + +public class EditableCanvas extends JPanel { + +} diff --git a/src/gui/HitboxCircleEditor.java b/src/gui/HitboxCircleEditor.java deleted file mode 100644 index eab02c5..0000000 --- a/src/gui/HitboxCircleEditor.java +++ /dev/null @@ -1,47 +0,0 @@ -package gui; - -import java.awt.Graphics2D; -import java.awt.event.ActionEvent; -import java.awt.event.MouseEvent; - -import javax.swing.JPanel; - -public class HitboxCircleEditor extends Editable { - - HitboxCircleEditor(ListGUI listGUI) { - super(listGUI); - // TODO Auto-generated constructor stub - } - - - @Override - public void drawing(Graphics2D g) { - // TODO Auto-generated method stub - - } - - @Override - public void saveDataInEntity() { - // TODO Auto-generated method stub - - } - - @Override - public void mouseClicked(MouseEvent e) { - // TODO Auto-generated method stub - - } - - @Override - public void mouseMoved(MouseEvent e) { - // TODO Auto-generated method stub - - } - - @Override - public void actionPerformed(ActionEvent e) { - // TODO Auto-generated method stub - - } - -} diff --git a/src/gui/HitboxRectangleEditor.java b/src/gui/HitboxEditor.java similarity index 97% rename from src/gui/HitboxRectangleEditor.java rename to src/gui/HitboxEditor.java index 42f60c0..5b4efc8 100644 --- a/src/gui/HitboxRectangleEditor.java +++ b/src/gui/HitboxEditor.java @@ -10,12 +10,12 @@ import model.Hitbox; import model.Point; -public class HitboxRectangleEditor extends Editable { +public class HitboxEditor extends Editable { Point firstIsoPoint = null; Point currentIsoPoint = new Point(0,0); Point firstCartesianPoint = new Point(0,0), currentCartesianPoint = new Point(0,0); - HitboxRectangleEditor(ListGUI listGUI) { + HitboxEditor(ListGUI listGUI) { super(listGUI); } diff --git a/src/gui/HitboxPoligonEditor.java b/src/gui/HitboxPoligonEditor.java deleted file mode 100644 index cf22388..0000000 --- a/src/gui/HitboxPoligonEditor.java +++ /dev/null @@ -1,48 +0,0 @@ -package gui; - -import java.awt.Graphics2D; -import java.awt.event.ActionEvent; -import java.awt.event.MouseEvent; - -import javax.swing.JPanel; - -public class HitboxPoligonEditor extends Editable { - - HitboxPoligonEditor(ListGUI listGUI) { - super(listGUI); - // TODO Auto-generated constructor stub - } - - - - @Override - public void drawing(Graphics2D g) { - // TODO Auto-generated method stub - - } - - @Override - public void saveDataInEntity() { - // TODO Auto-generated method stub - - } - - @Override - public void mouseClicked(MouseEvent e) { - // TODO Auto-generated method stub - - } - - @Override - public void mouseMoved(MouseEvent e) { - // TODO Auto-generated method stub - - } - - @Override - public void actionPerformed(ActionEvent e) { - // TODO Auto-generated method stub - - } - -} diff --git a/src/gui/MainGUI.java b/src/gui/MainGUI.java index b3cc924..8bf5a48 100644 --- a/src/gui/MainGUI.java +++ b/src/gui/MainGUI.java @@ -27,7 +27,8 @@ public class MainGUI extends JFrame{ JButton clearLinesJButton; public static JTabbedPane editorPane; DrawboxEditor drawBoxPanel; - HitboxRectangleEditor hitboxRectanglePanel; + HitboxEditor hitboxPanel; + public MainGUI() { @@ -41,9 +42,9 @@ public class MainGUI extends JFrame{ list.setVisible(true); drawBoxPanel = new DrawboxEditor(list); - hitboxRectanglePanel = new HitboxRectangleEditor(list); + hitboxPanel = new HitboxEditor(list); list.registerJListListener(drawBoxPanel); - list.registerJListListener(hitboxRectanglePanel); + list.registerJListListener(hitboxPanel); OpenXMLFileButtonListener = new OpenXMLFileButtonListener(list); @@ -59,17 +60,17 @@ public class MainGUI extends JFrame{ add(TopButtonBar,BorderLayout.NORTH); clearLinesJButton.addActionListener(drawBoxPanel); - clearLinesJButton.addActionListener(hitboxRectanglePanel); + clearLinesJButton.addActionListener(hitboxPanel); editorPane = new JTabbedPane(); editorPane.setVisible(true); add(editorPane,BorderLayout.CENTER); - editorPane.addTab("Hitbox", hitboxRectanglePanel); + editorPane.addTab("Hitbox", hitboxPanel); editorPane.addTab("Drawbox", drawBoxPanel); repaint(); - drawBoxPanel.subscribe(Project.getInstance()); // подписка: Project получит данные ввиде обьекта Event, содержащий аднные drawbox при отрисовке последней точки из 4-х. + drawBoxPanel.subscribe(Project.getInstance()); // подписка: Project получит данные ввиде обьекта Event, содержащий данные drawbox при отрисовке последней точки из 4-х. } @Override diff --git a/src/gui/RectengleRenderingFunction.java b/src/gui/RectengleRenderingFunction.java new file mode 100644 index 0000000..5a44b1e --- /dev/null +++ b/src/gui/RectengleRenderingFunction.java @@ -0,0 +1,5 @@ +package gui; + +public class RectengleRenderingFunction implements ShapeRenderingFunction { + +} diff --git a/src/gui/ShapeRenderingFunction.java b/src/gui/ShapeRenderingFunction.java new file mode 100644 index 0000000..e3d4bd3 --- /dev/null +++ b/src/gui/ShapeRenderingFunction.java @@ -0,0 +1,5 @@ +package gui; + +public interface ShapeRenderingFunction { + +} diff --git a/src/model/Entity.java b/src/model/Entity.java index 4a41aaf..ee71d5f 100644 --- a/src/model/Entity.java +++ b/src/model/Entity.java @@ -74,8 +74,8 @@ public class Entity { public void PrintEntity() { System.out.println("---------------------"); System.out.println("Name: "+thisName); - this.thisDrawbox.printToConsole(); - this.thisHitbox.printToConsole(); + thisDrawbox.printToConsole(); + thisHitbox.printToConsole(); System.out.println("---------------------"); }