d6f0f60e3127f95eaceb32d425fe72e032dd2b4d to master · COUETOUX Basile / graphic-2020

.gitignore0 → 100644

+9
−0

Original line number
Original line
Diff line number
Diff line

.gradle/

.idea/

idea/

build/

*.iml

*.ipr

*.iws

gradle/wrapper/gradle-wrapper.jar

out/

.idea/.name0 → 100644

+1
−0

Original line number
Original line
Diff line number
Diff line

graphic

 No newline at end of file

.idea/compiler.xml0 → 100644

+6
−0

Original line number
Original line
Diff line number
Diff line

<?xml version="1.0" encoding="UTF-8"?>

<project version="4">

  <component name="CompilerConfiguration">

    <bytecodeTargetLevel target="11" />

  </component>

</project>

 No newline at end of file

.idea/gradle.xml

+4
−1

Original line number
Original line
Diff line number
Diff line

<?xml version="1.0" encoding="UTF-8"?>

<?xml version="1.0" encoding="UTF-8"?>

<project version="4">

<project version="4">

  <component name="GradleMigrationSettings" migrationVersion="1" />

  <component name="GradleSettings">

  <component name="GradleSettings">

    <option name="linkedExternalProjectsSettings">

    <option name="linkedExternalProjectsSettings">

      <GradleProjectSettings>

      <GradleProjectSettings>

        <option name="delegatedBuild" value="true" />

        <option name="testRunner" value="GRADLE" />

        <option name="distributionType" value="DEFAULT_WRAPPED" />

        <option name="distributionType" value="DEFAULT_WRAPPED" />

        <option name="externalProjectPath" value="$PROJECT_DIR$" />

        <option name="externalProjectPath" value="$PROJECT_DIR$" />

        <option name="gradleJvm" value="11" />

        <option name="modules">

        <option name="modules">

          <set>

          <set>

            <option value="$PROJECT_DIR$" />

            <option value="$PROJECT_DIR$" />

          </set>

          </set>

        </option>

        </option>

        <option name="useAutoImport" value="true" />

      </GradleProjectSettings>

      </GradleProjectSettings>

    </option>

    </option>

  </component>

  </component>

.idea/jarRepositories.xml0 → 100644

+25
−0

Original line number
Original line
Diff line number
Diff line

<?xml version="1.0" encoding="UTF-8"?>

<project version="4">

  <component name="RemoteRepositoriesConfiguration">

    <remote-repository>

      <option name="id" value="central" />

      <option name="name" value="Maven Central repository" />

      <option name="url" value="https://repo1.maven.org/maven2" />

    </remote-repository>

    <remote-repository>

      <option name="id" value="jboss.community" />

      <option name="name" value="JBoss Community repository" />

      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />

    </remote-repository>

    <remote-repository>

      <option name="id" value="MavenRepo" />

      <option name="name" value="MavenRepo" />

      <option name="url" value="https://repo.maven.apache.org/maven2/" />

    </remote-repository>

    <remote-repository>

      <option name="id" value="maven" />

      <option name="name" value="maven" />

      <option name="url" value="http://pageperso.lif.univ-mrs.fr/~bertrand.estellon/maven" />

    </remote-repository>

  </component>

</project>

 No newline at end of file

.idea/misc.xml

+4
−2

Original line number
Original line
Diff line number
Diff line

<?xml version="1.0" encoding="UTF-8"?>

<project version="4">

<project version="4">

  <component name="ExternalStorageConfigurationManager" enabled="true" />

  <component name="ExternalStorageConfigurationManager" enabled="true" />

  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="11" project-jdk-type="JavaSDK">

  <component name="FrameworkDetectionExcludesConfiguration">

    <file type="web" url="file://$PROJECT_DIR$" />

  </component>

  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="corretto-16" project-jdk-type="JavaSDK">

    <output url="file://$PROJECT_DIR$/out" />

    <output url="file://$PROJECT_DIR$/out" />

  </component>

  </component>

</project>

</project>

 No newline at end of file

build.gradle

+6
−17

Original line number
Original line
Diff line number
Diff line

plugins {

    id 'java'

}

plugins {

plugins {

    id 'application'

    id 'application'

    id "org.openjfx.javafxplugin" version "0.0.8"

    id "org.openjfx.javafxplugin" version "0.0.10"

}

}

javafx {

javafx {

    version = "11"

    version = "17"

    modules = [ 'javafx.controls', 'javafx.fxml' ]

    modules = [ 'javafx.controls', 'javafx.fxml' ]

}

}

version '1.0-SNAPSHOT'

sourceCompatibility = "11"

targetCompatibility = "11"

repositories {

repositories {

    mavenCentral()

    mavenCentral()

    maven {

        url 'http://pageperso.lif.univ-mrs.fr/~bertrand.estellon/maven'

}

}

}

dependencies {

dependencies {

    testCompile group: 'junit', name: 'junit', version: '4.12'

    testImplementation group: 'junit', name: 'junit', version: '4.12'

    testCompile 'org.hamcrest:hamcrest-library:1.3'

    testImplementation 'org.hamcrest:hamcrest-library:1.3'

    implementation 'org.info:painter:1.0'

}

}

mainClassName = "shape.App"

mainClassName = "shape.App"

gradle/wrapper/gradle-wrapper.properties

+1
−1

Original line number
Original line
Diff line number
Diff line

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME

distributionPath=wrapper/dists

distributionPath=wrapper/dists

zipStoreBase=GRADLE_USER_HOME

zipStoreBase=GRADLE_USER_HOME

zipStorePath=wrapper/dists

zipStorePath=wrapper/dists

distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-all.zip

distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip

src/main/java/serializer/App.java

+9
−0

Original line number
Original line
Diff line number
Diff line

@@ -3,6 +3,7 @@ package serializer;

import javafx.application.Application;

import javafx.application.Application;

import javafx.scene.Group;

import javafx.scene.Group;

import javafx.scene.Scene;

import javafx.scene.Scene;

import javafx.scene.control.Button;

import javafx.stage.Stage;

import javafx.stage.Stage;

public class App extends Application {

public class App extends Application {

@@ -18,5 +19,13 @@ public class App extends Application {

        root.getChildren().add(container);

        root.getChildren().add(container);

        primaryStage.setScene(new Scene(root));

        primaryStage.setScene(new Scene(root));

        primaryStage.show();

        primaryStage.show();

        Button save = new Button("save");

        root.getChildren().add(save);

        save.setLayoutX(0);

        save.setLayoutY(0);

        root.setOnKeyPressed(event->container.context.keyPressed(event));

        //save.setOnKeyPressed(event->container.context.keyPressed(event));

        save.setOnAction(event -> container.write());

    }

    }

}

}

 No newline at end of file

src/main/java/serializer/DrawerWithSave.java

+1
−1

Original line number
Original line
Diff line number
Diff line

@@ -39,7 +39,7 @@ public class DrawerWithSave extends state.Drawer {

        File file = fileChooser.showOpenDialog(getScene().getWindow());

        File file = fileChooser.showOpenDialog(getScene().getWindow());

        if (file == null) return;

        if (file == null) return;

        try {

        try {

            super.shapes = ShapeReader.read(file, Collectors.toList());

            super.shapes = ShapeReader.read(file);

            repaint();

            repaint();

        } catch (IOException e) {

        } catch (IOException e) {

            Alert alert = new Alert(Alert.AlertType.INFORMATION);

            Alert alert = new Alert(Alert.AlertType.INFORMATION);

src/main/java/serializer/ShapeReader.java

+7
−1

Original line number
Original line
Diff line number
Diff line

@@ -2,13 +2,19 @@ package serializer;

import shape.Shape;

import shape.Shape;

import java.io.BufferedReader;

import java.io.File;

import java.io.File;

import java.io.FileReader;

import java.io.IOException;

import java.io.IOException;

import java.util.List;

import java.util.List;

import java.util.stream.Collector;

import java.util.stream.Collector;

public class ShapeReader {

public class ShapeReader {

    public static List<Shape> read(File file, Collector<Object,?, List<Object>> toList) throws IOException {

    public static List<Shape> read(File file) throws IOException {

        BufferedReader bufferedReader = new BufferedReader(new FileReader(file));

        /*for(String line : bufferedReader.lines().toList()) {

            System.out.println(line);

        }*/

        return null;

        return null;

    }

    }

}

}

src/main/java/serializer/ShapeWriter.java

+3
−0

Original line number
Original line
Diff line number
Diff line

@@ -4,9 +4,12 @@ import shape.Shape;

import java.io.File;

import java.io.File;

import java.io.IOException;

import java.io.IOException;

import java.io.PrintWriter;

import java.util.List;

import java.util.List;

public class ShapeWriter {

public class ShapeWriter {

    public static void write (File file, List<Shape> shapes) throws IOException {

    public static void write (File file, List<Shape> shapes) throws IOException {

        PrintWriter printWriter = new PrintWriter(file);

        printWriter.println("Coucou");

    }

    }

}

}

src/main/java/state/Drawer.java

+2
−2

Original line number
Original line
Diff line number
Diff line

@@ -10,7 +10,7 @@ import java.util.List;

public class Drawer extends Canvas {

public class Drawer extends Canvas {

    protected List<Shape> shapes = new ArrayList<>();

    protected List<Shape> shapes = new ArrayList<>();

    DrawerContext context = new DrawerContext(this);

    public DrawerContext context = new DrawerContext(this);

    public Drawer(int width, int height) {

    public Drawer(int width, int height) {

        super(width,height);

        super(width,height);

@@ -19,7 +19,7 @@ public class Drawer extends Canvas {

        setOnMouseReleased(event->context.mouseReleased(event));

        setOnMouseReleased(event->context.mouseReleased(event));

        setOnMouseMoved(event->context.mouseMoved(event));

        setOnMouseMoved(event->context.mouseMoved(event));

        setOnMouseDragged(event->context.mouseMoved(event));

        setOnMouseDragged(event->context.mouseMoved(event));

        setOnKeyPressed(event -> context.keyPressed(event));

        //setOnKeyPressed(event -> context.keyPressed(event));

    }

    }

    public void repaint(){

    public void repaint(){

src/main/java/state/DrawerContext.java

+1
−1

Original line number
Original line
Diff line number
Diff line

@@ -24,7 +24,7 @@ public class DrawerContext {

    void mouseMoved(MouseEvent event){}

    void mouseMoved(MouseEvent event){}

    void keyPressed(KeyEvent event) {

    public void keyPressed(KeyEvent event) {

        switch (event.getText()) {

        switch (event.getText()) {

            case "c":

            case "c":

                currentState = new StateCircle0();

                currentState = new StateCircle0();

Loading

Compare revisions

Source

Target

Commits on Source 6

Files

.gitignore

.idea/.name

.idea/compiler.xml

.idea/gradle.xml

.idea/jarRepositories.xml

.idea/misc.xml

build.gradle

gradle/wrapper/gradle-wrapper.properties

src/main/java/serializer/App.java

src/main/java/serializer/DrawerWithSave.java

src/main/java/serializer/ShapeReader.java

src/main/java/serializer/ShapeWriter.java

src/main/java/state/Drawer.java

src/main/java/state/DrawerContext.java