Browse Source

Changes gradle plugin to application

TomTroppmann 2 years ago
parent
commit
77a481b07e
3 changed files with 11 additions and 43 deletions
  1. 0 36
      .gitignore
  2. 5 1
      build.gradle
  3. 6 6
      src/holeg/ui/view/canvas/Canvas.java

+ 0 - 36
.gitignore

@@ -40,12 +40,6 @@ local.properties
 # Locally stored "Eclipse launch configurations"
 *.launch
 
-# PyDev specific (Python IDE for Eclipse)
-*.pydevproject
-
-# CDT-specific (C/C++ Development Tooling)
-.cproject
-
 # JDT-specific (Eclipse Java Development Tools)
 .classpath
 
@@ -75,31 +69,6 @@ local.properties
 .scala_dependencies
 .worksheet
 
-### Intellij ###
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
-# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
-
-# User-specific stuff:
-.idea/**/workspace.xml
-.idea/**/tasks.xml
-.idea/dictionaries
-
-# Sensitive or high-churn files:
-.idea/**/dataSources/
-.idea/**/dataSources.ids
-.idea/**/dataSources.xml
-.idea/**/dataSources.local.xml
-.idea/**/sqlDataSources.xml
-.idea/**/dynamic.xml
-.idea/**/uiDesigner.xml
-
-# Gradle:
-.idea/**/gradle.xml
-.idea/**/libraries
-
-# Mongo Explorer plugin:
-.idea/**/mongoSettings.xml
-
 ## File-based project format:
 *.iws
 
@@ -141,10 +110,5 @@ dist/
 nbdist/
 .nb-gradle/
 
-<<<<<<< HEAD
-=======
 ### added manually ###
 .idea/
-praktikum-holons.iml
-/target/
->>>>>>> refs/heads/XChart-integration

+ 5 - 1
build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'java'
+    id 'application'
 }
 group = 'holeg'
 version = '2.2.0'
@@ -8,6 +8,10 @@ description = 'HOLEG'
 sourceSets.main.java.srcDirs = ['src']
 sourceSets.test.java.srcDirs = ['tests']
 
+application {
+    mainClass = 'holeg.ui.view.main.Main'
+}
+
 repositories {
     mavenCentral()
 }

+ 6 - 6
src/holeg/ui/view/canvas/Canvas.java

@@ -20,7 +20,7 @@ public class Canvas extends JPanel {
     private static final Logger log = Logger.getLogger(Canvas.class.getName());
     private final GroupNode groupNode;
     private final Control control;
-    private final CanvasMouseListener listener = new CanvasMouseListener();
+    private final CanvasMouseListener canvasMouseListener = new CanvasMouseListener();
     private boolean enabled = true;
 
 
@@ -30,8 +30,8 @@ public class Canvas extends JPanel {
         control.OnGuiSetEnabled.addListener(this::setCanvasEnabled);
         control.OnSelectionChanged.addListener(this::repaint);
         // TODO(Tom2022-01-14): remove listener when not needed anymore
-        this.addMouseListener(listener);
-        this.addMouseMotionListener(listener);
+        this.addMouseListener(canvasMouseListener);
+        this.addMouseMotionListener(canvasMouseListener);
     }
 
     public static Rectangle getBoundsOfObject(AbstractCanvasObject obj) {
@@ -69,9 +69,9 @@ public class Canvas extends JPanel {
         groupNode.getSwitches().forEach(hS -> Rendering.drawSwitchObject(g2d, hS));
         groupNode.getGroupNodes().forEach(groupNode -> Rendering.drawGroupNode(g2d, groupNode));
         groupNode.getNodes().forEach(node -> Rendering.drawNode(g2d, node));
-        switch (listener.state) {
-            case BoxSelection -> Rendering.drawSelectionBox(g2d, listener.getRectangleOfSelectionBox());
-            case EdgeCreation -> Rendering.drawNewEdgeLine(g2d, listener.selectedOnPressed.getPosition(), listener.lastPosition);
+        switch (canvasMouseListener.state) {
+            case BoxSelection -> Rendering.drawSelectionBox(g2d, canvasMouseListener.getRectangleOfSelectionBox());
+            case EdgeCreation -> Rendering.drawNewEdgeLine(g2d, canvasMouseListener.selectedOnPressed.getPosition(), canvasMouseListener.lastPosition);
         }