From dd42ca2cb9e0265b060076a7883f1b90d1d44514 Mon Sep 17 00:00:00 2001
From: Radek Oslejsek <oslejsek@fi.muni.cz>
Date: Fri, 16 Apr 2021 17:26:17 +0200
Subject: [PATCH] CanvasPanel renamed to Canvas
---
.../analyst/newgui/swing/{CanvasPanel.form => Canvas.form} | 0
.../analyst/newgui/swing/{CanvasPanel.java => Canvas.java} | 4 ++--
.../cz/fidentis/analyst/newgui/swing/CanvasListener.java | 4 ++--
.../java/cz/fidentis/analyst/newgui/swing/CanvasTC.form | 4 ++--
.../java/cz/fidentis/analyst/newgui/swing/CanvasTC.java | 6 +++---
.../analyst/newgui/swing/MouseRotationListener.java | 4 ++--
6 files changed, 11 insertions(+), 11 deletions(-)
rename GUI/src/main/java/cz/fidentis/analyst/newgui/swing/{CanvasPanel.form => Canvas.form} (100%)
rename GUI/src/main/java/cz/fidentis/analyst/newgui/swing/{CanvasPanel.java => Canvas.java} (99%)
diff --git a/GUI/src/main/java/cz/fidentis/analyst/newgui/swing/CanvasPanel.form b/GUI/src/main/java/cz/fidentis/analyst/newgui/swing/Canvas.form
similarity index 100%
rename from GUI/src/main/java/cz/fidentis/analyst/newgui/swing/CanvasPanel.form
rename to GUI/src/main/java/cz/fidentis/analyst/newgui/swing/Canvas.form
diff --git a/GUI/src/main/java/cz/fidentis/analyst/newgui/swing/CanvasPanel.java b/GUI/src/main/java/cz/fidentis/analyst/newgui/swing/Canvas.java
similarity index 99%
rename from GUI/src/main/java/cz/fidentis/analyst/newgui/swing/CanvasPanel.java
rename to GUI/src/main/java/cz/fidentis/analyst/newgui/swing/Canvas.java
index b83da4c1..fc7a3923 100644
--- a/GUI/src/main/java/cz/fidentis/analyst/newgui/swing/CanvasPanel.java
+++ b/GUI/src/main/java/cz/fidentis/analyst/newgui/swing/Canvas.java
@@ -29,7 +29,7 @@ import javax.swing.JOptionPane;
* @author Natalia Bebjakova
* @author Radek Oslejsek
*/
-public class CanvasPanel extends javax.swing.JPanel {
+public class Canvas extends javax.swing.JPanel {
private final GLCanvas glCanvas;
@@ -60,7 +60,7 @@ public class CanvasPanel extends javax.swing.JPanel {
/**
* Constructor.
*/
- public CanvasPanel() {
+ public Canvas() {
initComponents();
// gl version 2 is used
diff --git a/GUI/src/main/java/cz/fidentis/analyst/newgui/swing/CanvasListener.java b/GUI/src/main/java/cz/fidentis/analyst/newgui/swing/CanvasListener.java
index dadf8db5..bb1bf1c9 100644
--- a/GUI/src/main/java/cz/fidentis/analyst/newgui/swing/CanvasListener.java
+++ b/GUI/src/main/java/cz/fidentis/analyst/newgui/swing/CanvasListener.java
@@ -9,7 +9,7 @@ import com.jogamp.opengl.GLEventListener;
*/
public class CanvasListener implements GLEventListener {
- private CanvasPanel canvas;
+ private Canvas canvas;
/**
* Constructor.
@@ -17,7 +17,7 @@ public class CanvasListener implements GLEventListener {
* @param canvas Canvas
* @throws IllegalArgumentException if the canvas is {@code null}
*/
- public CanvasListener(CanvasPanel canvas) {
+ public CanvasListener(Canvas canvas) {
if (canvas == null) {
throw new IllegalArgumentException("canvas is null");
}
diff --git a/GUI/src/main/java/cz/fidentis/analyst/newgui/swing/CanvasTC.form b/GUI/src/main/java/cz/fidentis/analyst/newgui/swing/CanvasTC.form
index aa825366..83772ac2 100644
--- a/GUI/src/main/java/cz/fidentis/analyst/newgui/swing/CanvasTC.form
+++ b/GUI/src/main/java/cz/fidentis/analyst/newgui/swing/CanvasTC.form
@@ -47,7 +47,7 @@
</DimensionLayout>
</Layout>
<SubComponents>
- <Component class="cz.fidentis.analyst.newgui.swing.CanvasPanel" name="canvas1">
+ <Component class="cz.fidentis.analyst.newgui.swing.Canvas" name="canvas1">
</Component>
</SubComponents>
-</Form>
+</Form>
\ No newline at end of file
diff --git a/GUI/src/main/java/cz/fidentis/analyst/newgui/swing/CanvasTC.java b/GUI/src/main/java/cz/fidentis/analyst/newgui/swing/CanvasTC.java
index 92ec84d8..d2f5ada5 100644
--- a/GUI/src/main/java/cz/fidentis/analyst/newgui/swing/CanvasTC.java
+++ b/GUI/src/main/java/cz/fidentis/analyst/newgui/swing/CanvasTC.java
@@ -57,7 +57,7 @@ public final class CanvasTC extends TopComponent {
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
private void initComponents() {
- canvas1 = new cz.fidentis.analyst.newgui.swing.CanvasPanel();
+ canvas1 = new cz.fidentis.analyst.newgui.swing.Canvas();
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
this.setLayout(layout);
@@ -72,7 +72,7 @@ public final class CanvasTC extends TopComponent {
}// </editor-fold>//GEN-END:initComponents
// Variables declaration - do not modify//GEN-BEGIN:variables
- private cz.fidentis.analyst.newgui.swing.CanvasPanel canvas1;
+ private cz.fidentis.analyst.newgui.swing.Canvas canvas1;
// End of variables declaration//GEN-END:variables
@Override
public void componentOpened() {
@@ -96,7 +96,7 @@ public final class CanvasTC extends TopComponent {
// TODO read your settings according to their version
}
- public CanvasPanel getCanvas() {
+ public Canvas getCanvas() {
return canvas1;
}
}
diff --git a/GUI/src/main/java/cz/fidentis/analyst/newgui/swing/MouseRotationListener.java b/GUI/src/main/java/cz/fidentis/analyst/newgui/swing/MouseRotationListener.java
index 7f4a876b..da57e8f6 100644
--- a/GUI/src/main/java/cz/fidentis/analyst/newgui/swing/MouseRotationListener.java
+++ b/GUI/src/main/java/cz/fidentis/analyst/newgui/swing/MouseRotationListener.java
@@ -12,7 +12,7 @@ import javax.swing.SwingUtilities;
*/
public class MouseRotationListener extends MouseAdapter {
- private final CanvasPanel canvas;
+ private final Canvas canvas;
private float lastX = 0;
private float lastY = 0;
@@ -26,7 +26,7 @@ public class MouseRotationListener extends MouseAdapter {
* @param canvas Canvas
* @throws IllegalArgumentException if the canvas is {@code null}
*/
- public MouseRotationListener(CanvasPanel canvas) {
+ public MouseRotationListener(Canvas canvas) {
if (canvas == null) {
throw new IllegalArgumentException("canvas is nuull");
}
--
GitLab