Creato progetto grafica, sistemato shape

.gitignore

@@ -35,3 +35,4 @@ hs_err_pid*
 /NetBeans Projects/BankAccount/build/
 /NetBeans Projects/BankAccount/dist/
 /NetBeans Projects/Inventory/build/
+/NetBeans Projects/Grafica/nbproject/private/

NetBeans Projects/Grafica/build.xml

@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- You may freely edit this file. See commented blocks below for -->
+<!-- some examples of how to customize the build. -->
+<!-- (If you delete it and reopen the project it will be recreated.) -->
+<!-- By default, only the Clean and Build commands use this build script. -->
+<!-- Commands such as Run, Debug, and Test only use this build script if -->
+<!-- the Compile on Save feature is turned off for the project. -->
+<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
+<!-- in the project's Project Properties dialog box.-->
+<project name="Grafica" default="default" basedir=".">
+    <description>Builds, tests, and runs the project Grafica.</description>
+    <import file="nbproject/build-impl.xml"/>
+    <!--
+
+    There exist several targets which are by default empty and which can be 
+    used for execution of your tasks. These targets are usually executed 
+    before and after some main targets. They are: 
+
+      -pre-init:                 called before initialization of project properties
+      -post-init:                called after initialization of project properties
+      -pre-compile:              called before javac compilation
+      -post-compile:             called after javac compilation
+      -pre-compile-single:       called before javac compilation of single file
+      -post-compile-single:      called after javac compilation of single file
+      -pre-compile-test:         called before javac compilation of JUnit tests
+      -post-compile-test:        called after javac compilation of JUnit tests
+      -pre-compile-test-single:  called before javac compilation of single JUnit test
+      -post-compile-test-single: called after javac compilation of single JUunit test
+      -pre-jar:                  called before JAR building
+      -post-jar:                 called after JAR building
+      -post-clean:               called after cleaning build products
+
+    (Targets beginning with '-' are not intended to be called on their own.)
+
+    Example of inserting an obfuscator after compilation could look like this:
+
+        <target name="-post-compile">
+            <obfuscate>
+                <fileset dir="${build.classes.dir}"/>
+            </obfuscate>
+        </target>
+
+    For list of available properties check the imported 
+    nbproject/build-impl.xml file. 
+
+
+    Another way to customize the build is by overriding existing main targets.
+    The targets of interest are: 
+
+      -init-macrodef-javac:     defines macro for javac compilation
+      -init-macrodef-junit:     defines macro for junit execution
+      -init-macrodef-debug:     defines macro for class debugging
+      -init-macrodef-java:      defines macro for class execution
+      -do-jar:                  JAR building
+      run:                      execution of project 
+      -javadoc-build:           Javadoc generation
+      test-report:              JUnit report generation
+
+    An example of overriding the target for project execution could look like this:
+
+        <target name="run" depends="Grafica-impl.jar">
+            <exec dir="bin" executable="launcher.exe">
+                <arg file="${dist.jar}"/>
+            </exec>
+        </target>
+
+    Notice that the overridden target depends on the jar target and not only on 
+    the compile target as the regular run target does. Again, for a list of available 
+    properties which you can use, check the target you are overriding in the
+    nbproject/build-impl.xml file. 
+
+    -->
+</project>

NetBeans Projects/Grafica/manifest.mf

@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+X-COMMENT: Main-Class will be added automatically by build
+

NetBeans Projects/Grafica/nbproject/genfiles.properties

@@ -0,0 +1,8 @@
+build.xml.data.CRC32=acf20e45
+build.xml.script.CRC32=761ebeaf
+build.xml.stylesheet.CRC32=f85dc8f2@1.106.0.48
+# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
+# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
+nbproject/build-impl.xml.data.CRC32=acf20e45
+nbproject/build-impl.xml.script.CRC32=a1851d6a
+nbproject/build-impl.xml.stylesheet.CRC32=12e0a6c2@1.106.0.48

NetBeans Projects/Grafica/nbproject/project.properties

@@ -0,0 +1,95 @@
+annotation.processing.enabled=true
+annotation.processing.enabled.in.editor=false
+annotation.processing.processor.options=
+annotation.processing.processors.list=
+annotation.processing.run.all.processors=true
+annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
+build.classes.dir=${build.dir}/classes
+build.classes.excludes=**/*.java,**/*.form
+# This directory is removed when the project is cleaned:
+build.dir=build
+build.generated.dir=${build.dir}/generated
+build.generated.sources.dir=${build.dir}/generated-sources
+# Only compile against the classpath explicitly listed here:
+build.sysclasspath=ignore
+build.test.classes.dir=${build.dir}/test/classes
+build.test.results.dir=${build.dir}/test/results
+# Uncomment to specify the preferred debugger connection transport:
+#debug.transport=dt_socket
+debug.classpath=\
+    ${run.classpath}
+debug.modulepath=\
+    ${run.modulepath}
+debug.test.classpath=\
+    ${run.test.classpath}
+debug.test.modulepath=\
+    ${run.test.modulepath}
+# Files in build.classes.dir which should be excluded from distribution jar
+dist.archive.excludes=
+# This directory is removed when the project is cleaned:
+dist.dir=dist
+dist.jar=${dist.dir}/Grafica.jar
+dist.javadoc.dir=${dist.dir}/javadoc
+dist.jlink.dir=${dist.dir}/jlink
+dist.jlink.output=${dist.jlink.dir}/Grafica
+excludes=
+includes=**
+jar.compress=false
+javac.classpath=
+# Space-separated list of extra javac options
+javac.compilerargs=
+javac.deprecation=false
+javac.external.vm=true
+javac.modulepath=
+javac.processormodulepath=
+javac.processorpath=\
+    ${javac.classpath}
+javac.source=17
+javac.target=17
+javac.test.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}
+javac.test.modulepath=\
+    ${javac.modulepath}
+javac.test.processorpath=\
+    ${javac.test.classpath}
+javadoc.additionalparam=
+javadoc.author=false
+javadoc.encoding=${source.encoding}
+javadoc.html5=false
+javadoc.noindex=false
+javadoc.nonavbar=false
+javadoc.notree=false
+javadoc.private=false
+javadoc.splitindex=true
+javadoc.use=true
+javadoc.version=false
+javadoc.windowtitle=
+# The jlink additional root modules to resolve
+jlink.additionalmodules=
+# The jlink additional command line parameters
+jlink.additionalparam=
+jlink.launcher=true
+jlink.launcher.name=Grafica
+main.class=shape.ShapesViewer
+manifest.file=manifest.mf
+meta.inf.dir=${src.dir}/META-INF
+mkdist.disabled=false
+platform.active=Zulu_17.0.6_10
+run.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}
+# Space-separated list of JVM arguments used when running the project.
+# You may also define separate properties like run-sys-prop.name=value instead of -Dname=value.
+# To set system properties for unit tests define test-sys-prop.name=value:
+run.jvmargs=
+run.modulepath=\
+    ${javac.modulepath}
+run.test.classpath=\
+    ${javac.test.classpath}:\
+    ${build.test.classes.dir}
+run.test.modulepath=\
+    ${javac.test.modulepath}
+source.encoding=UTF-8
+src.dir=src
+test.src.dir=test

NetBeans Projects/Grafica/nbproject/project.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.java.j2seproject</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
+            <name>Grafica</name>
+            <explicit-platform explicit-source-supported="true"/>
+            <source-roots>
+                <root id="src.dir"/>
+            </source-roots>
+            <test-roots>
+                <root id="test.src.dir"/>
+            </test-roots>
+        </data>
+    </configuration>
+</project>

NetBeans Projects/Grafica/src/shape/Circle.java

@@ -32,8 +32,6 @@ public class Circle extends Shape {
     @Override
     public int hashCode() {
         int hash = 5;
-        hash = 83 * hash + (int) (Double.doubleToLongBits(this.xc) ^ (Double.doubleToLongBits(this.xc) >>> 32));
-        hash = 83 * hash + (int) (Double.doubleToLongBits(this.yc) ^ (Double.doubleToLongBits(this.yc) >>> 32));
         hash = 83 * hash + (int) (Double.doubleToLongBits(this.r) ^ (Double.doubleToLongBits(this.r) >>> 32));
         return hash;
     }
@@ -43,7 +41,7 @@ public class Circle extends Shape {
         if (o == null) return false;
         if (getClass() != o.getClass()) return false;
         Circle c = (Circle) o;
-        return Double.compare(xc, c.xc) == 0 && Double.compare(yc, c.yc) == 0 && Double.compare(r, c.r) == 0;
+        return r == c.r;
     }
     
     @Override

NetBeans Projects/Grafica/src/shape/Geometria.java

@@ -0,0 +1,47 @@
+package shape;
+
+import java.util.ArrayList;
+import java.util.Random;
+import java.awt.Graphics2D;
+
+public class Geometria {
+    private ArrayList<Shape> elementi;
+
+    public Geometria() {
+	elementi = new ArrayList<>();
+    }
+	
+    public void riempiACaso(int size) {
+	Random r = new Random();
+
+	for(int i = 0; i < size; i++) {
+            int s = r.nextInt(3);
+		
+            double x = r.nextDouble()*300;
+            double y = r.nextDouble()*300;
+
+            switch(s) {
+		case 0: 
+                    //circle
+                    double raggio = r.nextDouble()*30;
+                    elementi.add(new Circle(x, y, raggio));
+                    break;
+		case 1:
+                    //square
+                    double lato = r.nextDouble()*40;
+                    elementi.add(new Square(x, y, lato));
+                    break;
+		case 2:
+                    //triangolo
+                    double base = r.nextDouble()*30;
+                    double altezza = r.nextDouble()*30;
+                    elementi.add(new TriangoloRettangolo(x, y, base, altezza));
+                    break;
+            }
+        }
+    }
+
+    public void draw(Graphics2D g2) {
+    	for(Shape s : elementi) s.draw(g2);
+    }
+}

NetBeans Projects/Grafica/src/shape/Square.java

@@ -8,13 +8,10 @@ import java.awt.Rectangle;
  * @author radaelli11353
  */
 public class Square extends Shape {
-    private double x;
-    private double y;
     private double l;
 
     public Square(double x, double y, double l) {
-        this.x = x;
+        super(x, y);
-        this.y = y;
         this.l = l;
     }
 
@@ -28,22 +25,11 @@ public class Square extends Shape {
         return l;
     }
 
-    @Override
-    public double posX() {
-        return x;
-    }
-
-    @Override
-    public double posY() {
-        return y;
-    }
-
     @Override
     public int hashCode() {
         int hash = 7;
-        hash = 97 * hash + (int) (Double.doubleToLongBits(this.x) ^ (Double.doubleToLongBits(this.x) >>> 32));
-        hash = 97 * hash + (int) (Double.doubleToLongBits(this.y) ^ (Double.doubleToLongBits(this.y) >>> 32));
         hash = 97 * hash + (int) (Double.doubleToLongBits(this.l) ^ (Double.doubleToLongBits(this.l) >>> 32));
+        hash = 97 * hash + super.hashCode();
         return hash;
     }
 
@@ -52,7 +38,7 @@ public class Square extends Shape {
         if (o == null) return false;
         if (getClass() != o.getClass()) return false;
         Square s = (Square) o;
-        return Double.compare(l, s.l) == 0 && Double.compare(x, s.x) == 0 && Double.compare(y, s.y) == 0;
+        return l == s.l;
     } 
 
     @Override

NetBeans Projects/Grafica/src/shape/Tester.java

@@ -0,0 +1,21 @@
+package shape;
+
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import javax.swing.JComponent;
+
+/**
+ *
+ * @author radaelli11353
+ */
+public class Tester extends JComponent{
+    public void paintComponent(Graphics g) {
+        Graphics2D g2 = (Graphics2D) g;
+        
+        Geometria geom = new Geometria();
+
+	geom.riempiACaso(10);
+
+	geom.draw(g2);
+    }
+}

NetBeans Projects/Grafica/src/shape/TriangoloRettangolo.java

@@ -11,7 +11,7 @@ public class TriangoloRettangolo extends Shape {
     private double b;
     private double h;
 
-    public TriangoloRettangolo(double b, double h, double x, double y) {
+    public TriangoloRettangolo(double x, double y, double b, double h) {
         super(x, y);
 	this.b = b;
         this.h = h;
@@ -32,33 +32,20 @@ public class TriangoloRettangolo extends Shape {
         int hash = 3;
         hash = 53 * hash + (int) (Double.doubleToLongBits(this.b) ^ (Double.doubleToLongBits(this.b) >>> 32));
         hash = 53 * hash + (int) (Double.doubleToLongBits(this.h) ^ (Double.doubleToLongBits(this.h) >>> 32));
-        hash = 53 * hash + (int) (Double.doubleToLongBits(this.x) ^ (Double.doubleToLongBits(this.x) >>> 32));
+        hash = 53 * hash + super.hashCode();
-        hash = 53 * hash + (int) (Double.doubleToLongBits(this.y) ^ (Double.doubleToLongBits(this.y) >>> 32));
         return hash;
     }
 
     @Override
-    public boolean equals(Object obj) {
+    public boolean equals(Object o) {
-        if (this == obj) {
+        if (o == null || getClass() != o.getClass()) {
-            return true;
-        }
-        if (obj == null) {
             return false;
         }
-        if (getClass() != obj.getClass()) {
+        TriangoloRettangolo t = (TriangoloRettangolo) o;
+        if (Double.doubleToLongBits(b) != Double.doubleToLongBits(t.b)) {
             return false;
         }
-        final TriangoloRettangolo other = (TriangoloRettangolo) obj;
+        return Double.doubleToLongBits(h) != Double.doubleToLongBits(t.h);
-        if (Double.doubleToLongBits(this.b) != Double.doubleToLongBits(other.b)) {
-            return false;
-        }
-        if (Double.doubleToLongBits(this.h) != Double.doubleToLongBits(other.h)) {
-            return false;
-        }
-        if (Double.doubleToLongBits(this.x) != Double.doubleToLongBits(other.x)) {
-            return false;
-        }
-        return Double.doubleToLongBits(this.y) == Double.doubleToLongBits(other.y);
     }
     
     @Override

NetBeans Projects/shape/src/shape/Geometria.java

@@ -1,47 +0,0 @@
-package shape;
-
-import java.util.ArrayList;
-import java.util.Random;
-import java.awt.Graphics2D;
-
-public class Geometria {
-	private ArrayList<Shape> elementi;
-
-	public Geometria() {
-		elementi = new ArrayList<>();
-	}
-	
-	public void riempiACaso(int size) {
-		Random r = new Random();
-
-		for(int i = 0; i < size; i++) {
-			int s = r.nextInt(3);
-			
-			double x = r.nextDouble()*300;
-			double y = r.nextDouble()*300;
-
-			switch(s) {
-				case 0: 
-					//circle
-					double raggio = r.nextDouble()*30;
-					elementi.add(new Circle(x, y, raggio));
-					break;
-				case 1:
-					//square
-					double lato = r.nextDouble()*40;
-					elementi.add(new Square(lato, x, y));
-					break;
-				case 2:
-					//triangolo
-					double base = r.nextDouble()*30;
-					double altezza = r.nextDouble()*30;
-					elementi.add(new TriangoloRettangolo(base, altezza, x, y));
-					break;
-			}
-		}
-	}
-
-	public void draw(Graphics2D g2) {
-		for(Shape s : elementi) s.draw(g2);
-	}
-}

NetBeans Projects/shape/src/shape/Tester.java

@@ -1,33 +0,0 @@
-package shape;
-
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import javax.swing.JComponent;
-
-/**
- *
- * @author radaelli11353
- */
-public class Tester extends JComponent{
-    /*public static void main(String[] args) {
-        Shape c1 = new Circle(2, 3, 1);
-        Shape c2 = new Circle(2, 3, 1);
-        
-        System.out.println(c1.posX() + ", " +c1.posY());
-        System.out.println(c1.width() + ", " +c1.height());
-        System.out.println(c1.equals(c2));
-        
-        ((Circle) c2).setRadius(2);
-        System.out.println(c2.posX() + ", " + c2.posY());
-    }*/
-    
-    public void paintComponent(Graphics g) {
-        Graphics2D g2 = (Graphics2D) g;
-        
-        Geometria geom = new Geometria();
-
-	geom.riempiACaso(10);
-
-	geom.draw(g2);
-    }
-}