From: Jérôme Benoit Date: Tue, 13 Feb 2018 18:14:10 +0000 (+0100) Subject: Initial code for the TP2. X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=4871c009775e280dcbe246f706b54e6e2498ac2b;p=TP_POO.git Initial code for the TP2. Signed-off-by: Jérôme Benoit --- diff --git a/TP2/Cercle.java b/TP2/Cercle.java new file mode 100644 index 0000000..4bf743f --- /dev/null +++ b/TP2/Cercle.java @@ -0,0 +1,19 @@ + +class Cercle { + private Point pOri; + private double rayon; + + Cercle(Point pO, double r) { + pOri = pO; + rayon = r; + } + + void dessiner(Piletransformations pile) { + + } + + void deplacer(Point p) { + + } + +} diff --git a/TP2/Main.java b/TP2/Main.java new file mode 100644 index 0000000..0a031cd --- /dev/null +++ b/TP2/Main.java @@ -0,0 +1,9 @@ + + +class Main { + + public static void main(String[] args) { + + } + +} diff --git a/TP2/Makefile b/TP2/Makefile new file mode 100644 index 0000000..b8e3c32 --- /dev/null +++ b/TP2/Makefile @@ -0,0 +1,92 @@ +# define compiler and compiler flag variables +# define a variable for compiler flags (JFLAGS) +# define a variable for the compiler (JC) +# define a variable for the Java Virtual Machine (JVM) + +JFLAGS = -g +JC = javac +JVM = java + +# +# Clear any default targets for building .class files from .java files; we +# will provide our own target entry to do this in this makefile. +# make has a set of default targets for different suffixes (like .c.o) +# Currently, clearing the default for .java.class is not necessary since +# make does not have a definition for this target, but later versions of +# make may, so it doesn't hurt to make sure that we clear any default +# definitions for these +# + +.SUFFIXES: .java .class + + +# +# Here is our target entry for creating .class files from .java files +# This is a target entry that uses the suffix rule syntax: +# DSTS: +# rule +# DSTS (Dependency Suffix Target Suffix) +# 'TS' is the suffix of the target file, 'DS' is the suffix of the dependency +# file, and 'rule' is the rule for building a target +# '$*' is a built-in macro that gets the basename of the current target +# Remember that there must be a < tab > before the command line ('rule') +# + +.java.class: + $(JC) $(JFLAGS) $*.java + + +# +# CLASSES is a macro consisting of N words (one for each java source file) +# When a single line is too long, use \ to split lines that then will be +# considered as a single line. For example: +# NAME = Camilo \ + Juan +# is understood as +# NAME = Camilo Juan + +CLASSES = \ + Point.java \ + Segment.java \ + Cercle.java \ + Main.java + +# +# MAIN is a variable with the name of the file containing the main method +# + +MAIN = Main + +# +# the default make target entry +# for this example it is the target classes + +default: classes + + +# Next line is a target dependency line +# This target entry uses Suffix Replacement within a macro: +# $(macroname:string1=string2) +# In the words in the macro named 'macroname' replace 'string1' with 'string2' +# Below we are replacing the suffix .java of all words in the macro CLASSES +# with the .class suffix +# + +classes: $(CLASSES:.java=.class) + + +# Next two lines contain a target for running the program +# Remember the tab in the second line. +# $(JMV) y $(MAIN) are replaced by their values + +run: $(MAIN).class + $(JVM) $(MAIN) + +# this line is to remove all unneeded files from +# the directory when we are finished executing(saves space) +# and "cleans up" the directory of unneeded .class files +# RM is a predefined macro in make (RM = rm -f) +# + +clean: + $(RM) *.class diff --git a/TP2/Point.java b/TP2/Point.java new file mode 100644 index 0000000..e949acc --- /dev/null +++ b/TP2/Point.java @@ -0,0 +1,38 @@ + +class Point { + private double x; + private double y; + + Point() { + } + + Point (double x, double y) { + this.x = x; + this.y = y; + } + + public void setX(double x) { + this.x = x; + } + + public double getX() { + return x; + } + + public void setY(double y) { + this.y = y; + } + + public double getY() { + return y; + } + + public Point additionner(Point p1) { + return new Point(p1.getX() + getX(), p1.getY() + getX()); + } + + public String toString() { + return "(" + x + "," + y + ")"; + } + +} diff --git a/TP2/Segment.java b/TP2/Segment.java new file mode 100644 index 0000000..941820c --- /dev/null +++ b/TP2/Segment.java @@ -0,0 +1,24 @@ + +class Segment { + private Point pOri; + private Point pDest; + + /* Segment() { + pOri = null; + pDest = null; + } */ + + Segment(Point pO, Point pD) { + pOri = pO; + pDest = pD; + } + + void dessiner(Piletransformations pile) { + + } + + void deplacer(Point p) { + + } + +}